tl | 2 May 2005 10:34
Favicon

[sw-cvs] CVS update [cws_src680_tl12]: /sw/starmath/inc/

Tag: cws_src680_tl12
User: tl      
Date: 05/05/02 01:34:59

Modified:
 /sw/starmath/inc/
  document.hxx, smmod.hxx, symbol.hxx, utility.hxx

Log:
 #i44468# have all documents use the same SmSymSetManager

File Changes:

Directory: /sw/starmath/inc/
============================

File [changed]: document.hxx
Url: http://sw.openoffice.org/source/browse/sw/starmath/inc/document.hxx?r1=1.22&r2=1.22.12.1
Delta lines:  +3 -11
--------------------
--- document.hxx	4 Apr 2005 08:02:55 -0000	1.22
+++ document.hxx	2 May 2005 08:34:55 -0000	1.22.12.1
 <at>  <at>  -2,9 +2,9  <at>  <at> 
  *
  *  $RCSfile: document.hxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.22.12.1 $
  *
- *  last change: $Author: rt $ $Date: 2005/04/04 08:02:55 $
+ *  last change: $Author: tl $ $Date: 2005/05/02 08:34:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
 <at>  <at>  -95,7 +95,6  <at>  <at> 
 #include <vcl/jobset.hxx>

 class SmNode;
-class SmSymSetManager;
 class SfxPrinter;
 class Printer;

 <at>  <at>  -156,7 +155,6  <at>  <at> 
 	SmFormat   			aFormat;
 	SmParser	  		aInterpreter;
     String              aAccText;
-	SmSymSetManager	   *pSymSetMgr;
 	SmNode		  	   *pTree;
 	SfxMenuBarManager  *pMenuMgr;
 	SfxItemPool		   *pEditEngineItemPool;
 <at>  <at>  -248,12 +246,6  <at>  <at> 

 	EditEngine & 	GetEditEngine();
 	SfxItemPool &	GetEditEngineItemPool();
-
-	SmSymSetManager &		GetSymSetManager();
-	const SmSymSetManager &	GetSymSetManager() const
-	{
-		return ((SmDocShell *) this)->GetSymSetManager();
-	}

 	void		Draw(OutputDevice &rDev, Point &rPosition);
 	Size		GetSize();

File [changed]: smmod.hxx
Url: http://sw.openoffice.org/source/browse/sw/starmath/inc/smmod.hxx?r1=1.11&r2=1.11.210.1
Delta lines:  +8 -8
-------------------
--- smmod.hxx	19 Sep 2003 08:51:40 -0000	1.11
+++ smmod.hxx	2 May 2005 08:34:55 -0000	1.11.210.1
 <at>  <at>  -2,9 +2,9  <at>  <at> 
  *
  *  $RCSfile: smmod.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.11.210.1 $
  *
- *  last change: $Author: rt $ $Date: 2003/09/19 08:51:40 $
+ *  last change: $Author: tl $ $Date: 2005/05/02 08:34:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
 <at>  <at>  -83,6 +83,7  <at>  <at> 
 class SfxObjectFactory;
 class SmConfig;
 class SmModule;
+class SmSymSetManager;

 /*************************************************************************
 |*
 <at>  <at>  -96,7 +97,6  <at>  <at> 
 |*
 \************************************************************************/

-class SmRectCache;
 class SvtSysLocale;
 class VirtualDevice;

 <at>  <at>  -164,7 +164,7  <at>  <at> 
     svtools::ColorConfig        *pColorConfig;
     SmConfig                *pConfig;
     SmLocalizedSymbolData   *pLocSymbolData;
-    SmRectCache             *pRectCache;
+    SmSymSetManager         *pSymSetMgr;
     SvtSysLocale            *pSysLocale;
     VirtualDevice           *pVirtualDev;

 <at>  <at>  -187,7 +187,7  <at>  <at> 
     svtools::ColorConfig &  GetColorConfig();

     SmConfig *          GetConfig();
-	SmRectCache *		GetRectCache()	   { return pRectCache; }
+    SmSymSetManager &       GetSymSetManager();

     SmLocalizedSymbolData &   GetLocSymbolData() const;

File [changed]: symbol.hxx
Url: http://sw.openoffice.org/source/browse/sw/starmath/inc/symbol.hxx?r1=1.11&r2=1.11.12.1
Delta lines:  +11 -9
--------------------
--- symbol.hxx	4 Apr 2005 08:03:27 -0000	1.11
+++ symbol.hxx	2 May 2005 08:34:56 -0000	1.11.12.1
 <at>  <at>  -2,9 +2,9  <at>  <at> 
  *
  *  $RCSfile: symbol.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.11.12.1 $
  *
- *  last change: $Author: rt $ $Date: 2005/04/04 08:03:27 $
+ *  last change: $Author: tl $ $Date: 2005/05/02 08:34:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
 <at>  <at>  -245,6 +245,8  <at>  <at> 

 	SmSymSetManager&   operator = (const SmSymSetManager& rSymbolSetManager);

+    void        GetSymbols( std::vector< SmSym > &rSymbols ) const;
+

 	USHORT		AddSymbolSet(SmSymSet* pSymbolSet);
 	void		ChangeSymbolSet(SmSymSet* pSymbolSet);

File [changed]: utility.hxx
Url: http://sw.openoffice.org/source/browse/sw/starmath/inc/utility.hxx?r1=1.5&r2=1.5.12.1
Delta lines:  +3 -41
--------------------
--- utility.hxx	4 Apr 2005 08:03:57 -0000	1.5
+++ utility.hxx	2 May 2005 08:34:56 -0000	1.5.12.1
 <at>  <at>  -2,9 +2,9  <at>  <at> 
  *
  *  $RCSfile: utility.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.5.12.1 $
  *
- *  last change: $Author: rt $ $Date: 2005/04/04 08:03:57 $
+ *  last change: $Author: tl $ $Date: 2005/05/02 08:34:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
 <at>  <at>  -134,44 +134,6  <at>  <at> 

 class SmViewShell;
 SmViewShell * SmGetActiveView();
-
-
-////////////////////////////////////////////////////////////
-//
-// SmRectCache
-//
-
-class SmRectCache
-{
-	VirtualDevice *pVirDev;
-
-	SmRectCache(const SmRectCache &);
-	SmRectCache & operator = (const SmRectCache &);
-
-public:
-	struct Key
-	{	XubString 	aText,
-					aFontName;
-		Size	 	aFontSize;
-		FontWeight  eFontWeight;
-		FontItalic  eFontItalic;
-
-		Key(const XubString &rText, const Font &rFont);
-
-		BOOL operator <  (const Key &rKey) const;
-		BOOL operator == (const Key &rKey) const;
-	};
-
-	SmRectCache();
-	~SmRectCache();
-
-	const SmRect *	Search(const Key &rKey) const;
-	const SmRect *	Add(const Key &rKey, const SmRect &rRect);
-
-	VirtualDevice * GetVirDev();
-
-	void Reset();
-};

 
 ////////////////////////////////////////////////////////////

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe <at> sw.openoffice.org
For additional commands, e-mail: cvs-help <at> sw.openoffice.org

Gmane