1. mst
  2. ooo340

Commits

Thomas Lange [tl]  committed ff014e7 Merge

cws tl77: merge

  • Participants
  • Parent commits 32908f4, 2ae4892
  • Branches default

Comments (0)

Files changed (3)

File editeng/inc/editeng/scripttypeitem.hxx

View file
  • Ignore whitespace
 
 // include ---------------------------------------------------------------
 
+#include "editeng/scripttypeitem.hxx"
+
 #include <svl/intitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <editeng/editengdllapi.h>

File editeng/source/xml/xmltxtimp.cxx

View file
  • Ignore whitespace
     
 
 static void SvxReadXML_Impl( 
-    EditEngine& rEditEngine, 
     SvStream& rStream, 
-    const ESelection& rSel,
     SvxXMLXTextImportComponent *pImporter )
 {
     try
 
         // #110680#
         SvxXMLXTextImportComponent *pImporter = new SvxXMLXTextImportComponent( xServiceFactory, xText );
-        SvxReadXML_Impl( rEditEngine, rStream, rSel, pImporter );
+        SvxReadXML_Impl( rStream, pImporter );
     }
 }
 
         const sal_uInt16 nImportFlags = IMPORT_ALL;
         SvxXMLXTextImportComponent *pImporter = new SvxXMLXTextImportComponent( 
                 nImportFlags, xModel, xServiceFactory, xText );
-        SvxReadXML_Impl( rEditEngine, rStream, rSel, pImporter );
+        SvxReadXML_Impl( rStream, pImporter );
     }
 }
 

File svl/inc/svl/poolitem.hxx

View file
  • Ignore whitespace
 							{ return *pSet; }
 };
 
-// -----------------------------------------------------------------------
-
-#if 0  /* @@@ NOT USED @@@ */
-class SfxInvalidItem: public SfxPoolItem
-{
-friend class SfxItemSet;
-
-	const SfxPoolItem*      pDefaultItem;
-
-private:
-							TYPEINFO();
-							SfxInvalidItem( USHORT nWhich, const SfxPoolItem &rDefault );
-							SfxInvalidItem( const SfxInvalidItem& );
-	virtual                 ~SfxInvalidItem();
-
-public:
-	virtual int             operator==( const SfxPoolItem& ) const;
-
-	virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-									SfxMapUnit eCoreMetric,
-									SfxMapUnit ePresMetric,
-									XubString &rText,
-                                    const IntlWrapper * = 0 ) const;
-	const SfxPoolItem*      GetDefaultItem() const { return pDefaultItem; }
-
-	// von sich selbst eine Kopie erzeugen
-	virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-};
-#endif /* @@@ NOT USED @@@ */
 
 // -----------------------------------------------------------------------
 // Handle Klasse fuer PoolItems
 
 // -----------------------------------------------------------------------
 
-#if 0  /* @@@ NOT USED @@@ */
-class SfxItemChangedHint: public SfxHint
-{
-	const SfxPoolItem& 	_rOld;
-	const SfxPoolItem& 	_rNew;
-
-public:
-						TYPEINFO(); \
-    					SfxItemChangedHint( const SfxPoolItem &rOld,
-											const SfxPoolItem &rNew )
-						:	_rOld( rOld ),
-							_rNew( rNew )
-						{}
-
-	const SfxPoolItem&	GetOldItem() const { return _rOld; }
-	const SfxPoolItem&	GetNewItem() const { return _rNew; }
-};
-
-#endif /* @@@ NOT USED @@@ */
 
 #endif // #ifndef _SFXPOOLITEM_HXX