[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Aug 1 09:37:51 PDT 2012
binfilter/bf_forms/source/inc/property.hxx | 11
binfilter/bf_sc/source/core/tool/sc_callform.cxx | 4
binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx | 24 -
binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx | 13
binfilter/bf_sc/source/ui/inc/imoptdlg.hxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx | 1
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 1
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 1
binfilter/bf_sfx2/source/inc/dlgcont.hxx | 16
binfilter/bf_sfx2/source/inc/helper.hxx | 53 ---
binfilter/bf_sfx2/source/inc/scriptcont.hxx | 16
binfilter/bf_sfx2/source/inc/sfxtypes.hxx | 25 -
binfilter/bf_so3/source/inplace/protocol.cxx | 6
binfilter/bf_svtools/source/filerec/svt_filerec.cxx | 12
binfilter/bf_svtools/source/items1/svt_frqitem.cxx | 7
binfilter/bf_svtools/source/misc/svt_imap2.cxx | 2
binfilter/bf_svtools/source/numbers/numhead.hxx | 33 --
binfilter/bf_svtools/source/numbers/svt_numhead.cxx | 66 ----
binfilter/bf_svx/source/inc/fmshimp.hxx | 32 -
binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx | 11
binfilter/bf_sw/source/core/bastyp/sw_init.cxx | 1
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 11
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 11
binfilter/bf_sw/source/core/inc/dflyobj.hxx | 1
binfilter/bf_sw/source/core/inc/docfunc.hxx | 65 ----
binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx | 6
binfilter/bf_sw/source/ui/app/sw_docsh2.cxx | 1
binfilter/bf_xmloff/source/forms/propertyexport.hxx | 3
binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx | 6
binfilter/inc/bf_sfx2/docfac.hxx | 165 ----------
binfilter/inc/bf_sfx2/minarray.hxx | 307 -------------------
binfilter/inc/bf_sfx2/module.hxx | 11
binfilter/inc/bf_svtools/hint.hxx | 6
binfilter/inc/bf_svtools/ondemand.hxx | 74 ----
binfilter/inc/bf_svtools/smplhint.hxx | 21 -
binfilter/inc/bf_svtools/svarray.hxx | 42 --
binfilter/inc/bf_svx/svdobj.hxx | 24 -
binfilter/inc/bf_svx/unolingu.hxx | 18 -
binfilter/inc/bf_sw/acmplwrd.hxx | 71 ----
binfilter/inc/bf_sw/doc.hxx | 2
binfilter/inc/bf_sw/editsh.hxx | 2
binfilter/inc/bf_sw/shellio.hxx | 14
binfilter/inc/bf_sw/unoprnms.hxx | 3
46 files changed, 1205 deletions(-)
New commits:
commit f7853d70bec0e2b049e01b59511ecaae19513ba0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 31 20:07:46 2012 +0200
Remove unused macros
Change-Id: I38c27fc9d9dc8ed3cf9a08360bddb9c7567857dc
diff --git a/binfilter/bf_forms/source/inc/property.hxx b/binfilter/bf_forms/source/inc/property.hxx
index c438bad..18e45e5 100644
--- a/binfilter/bf_forms/source/inc/property.hxx
+++ b/binfilter/bf_forms/source/inc/property.hxx
@@ -120,12 +120,6 @@ pProps[nPos++] = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID
if (aggregate.is()) \
_rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \
-//------------------------------------------------------------------------------
-#define BEGIN_PROPERTY_ARRAY_HELPER(count) \
- staruno::Sequence<starbeans::Property> aProps(count); \
- starbeans::Property* pProps = aProps.getArray(); \
- sal_Int32 nPos = 0; \
-
// ===
//------------------------------------------------------------------------------
#define DECL_PROP0(varname, type) \
@@ -187,11 +181,6 @@ pProps[nPos++] = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID
#define END_AGGREGATION_PROPERTY_HELPER() \
DBG_ASSERT(nPos == _rProps.getLength(), "<...>::getInfohelper : forgot to adjust the count ?"); \
-//------------------------------------------------------------------------------
-#define END_PROPERTY_ARRAY_HELPER() \
- DBG_ASSERT(nPos == aProps.getLength(), "<...>::getInfohelper : forgot to adjust the count ?"); \
- return new ::cppu::OPropertyArrayHelper(aProps);
-
//.........................................................................
}
//... namespace frm .......................................................
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index 013b30c..d05e6d0 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -75,10 +75,6 @@ typedef void (CALLTYPE* FARPROC) ( void );
#define ADVICE "Advice"
#define UNADVICE "Unadvice"
-#define LIBFUNCNAME( name ) \
- (String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( name ) ))
-
-
/*N*/ FuncData::FuncData(const String& rIName) :
/*N*/ pModuleData (NULL),
/*N*/ aInternalName (rIName),
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
index b361700..975c3e8 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
@@ -61,19 +61,6 @@ namespace binfilter {
//------------------------------------------------------------------
-#define IS_SHARE_HEADER(set) \
- ((SfxBoolItem&) \
- ((SvxSetItem&)(set).Get(ATTR_PAGE_HEADERSET)).GetItemSet(). \
- Get(ATTR_PAGE_SHARED)).GetValue()
-
-#define IS_SHARE_FOOTER(set) \
- ((SfxBoolItem&) \
- ((SvxSetItem&)(set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \
- Get(ATTR_PAGE_SHARED)).GetValue()
-
-#define IS_AVAILABLE(WhichId,ppItem) \
- (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
-
#define SC_PREVIEW_SIZE_X 10000
#define SC_PREVIEW_SIZE_Y 12400
diff --git a/binfilter/bf_sfx2/source/inc/sfxtypes.hxx b/binfilter/bf_sfx2/source/inc/sfxtypes.hxx
index 238edc2..5ac2f78 100644
--- a/binfilter/bf_sfx2/source/inc/sfxtypes.hxx
+++ b/binfilter/bf_sfx2/source/inc/sfxtypes.hxx
@@ -127,16 +127,6 @@ String SearchAndReplace( const String &rSource,
String SfxStringDecode( const String &rSource,
const char *pKey = SFX_PASSWORD_CODE );
-
-#define SFX_DEL_PTRARR(pArr) \
- { \
- for ( USHORT n = (pArr)->Count(); n--; ) \
- delete (pArr)->GetObject(n); \
- DELETEX(pArr); \
- }
-
-#define GPF() *(int*)0 = 0
-
}//end of namespace binfilter
#endif // #ifndef _SFX_SFXTYPES_HXX
diff --git a/binfilter/bf_so3/source/inplace/protocol.cxx b/binfilter/bf_so3/source/inplace/protocol.cxx
index cb93788..7fda4cb 100644
--- a/binfilter/bf_so3/source/inplace/protocol.cxx
+++ b/binfilter/bf_so3/source/inplace/protocol.cxx
@@ -143,20 +143,14 @@ ImplSvEditObjectProtocol::~ImplSvEditObjectProtocol()
(bOpen && bCliOpen && bSvrOpen )
#define IS_EMBED() \
(bEmbed || bCliEmbed || bSvrEmbed )
-#define IS_ALL_EMBED() \
- (bEmbed && bCliEmbed && bSvrEmbed )
#define IS_PLUGIN() \
(bPlugIn || bCliPlugIn || bSvrPlugIn )
-#define IS_ALL_PLUGIN() \
- (bPlugIn && bCliPlugIn && bSvrPlugIn )
#define IS_IPACTIVE() \
(bIPActive || bCliIPActive || bSvrIPActive )
#define IS_ALL_IPACTIVE() \
(bIPActive && bCliIPActive && bSvrIPActive )
#define IS_UIACTIVE() \
(bUIActive || bCliUIActive || bSvrUIActive )
-#define IS_ALL_UIACTIVE() \
- (bUIActive && bCliUIActive && bSvrUIActive )
#ifdef DBG_UTIL
void ImplSvEditObjectProtocol::ClassInvariant() const
diff --git a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
index 78ebc4b..e466cf5 100644
--- a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
+++ b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
@@ -48,18 +48,6 @@ namespace binfilter
#define SFX_REC_CONTENT_VER(n) ( ((n) & 0x000000FF) )
#define SFX_REC_CONTENT_OFS(n) ( ((n) & 0xFFFFFF00) >> 8 )
-//-------------------------------------------------------------------------
-
-/* Die folgenden Makros setzen Teilbereiche zu einem UINT32 Wert zusammen.
- Diese UINT32-Werte werden anstelle der einzelnen Werte gestreamt,
- um Calls zu sparen.
-*/
-
-#define SFX_REC_HEADER(nRecType,nContentTag,nContentVer) \
- ( UINT32(nRecType) | \
- ( UINT32(nContentVer) << 8 ) | \
- ( UINT32(nContentTag) << 16 ) )
-
//=========================================================================
bool SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader )
diff --git a/binfilter/bf_svtools/source/items1/svt_frqitem.cxx b/binfilter/bf_svtools/source/items1/svt_frqitem.cxx
index 8cae1d8..af53c09 100644
--- a/binfilter/bf_svtools/source/items1/svt_frqitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_frqitem.cxx
@@ -34,13 +34,6 @@ TYPEINIT1( SfxFrequencyItem, SfxPoolItem );
#define MAX_GOTO 32000
-#define DECL_SAVE_GOTO() \
- ULONG nSafetyMeasures = 0;
-
-#define SAVE_GOTO(tag) \
- if(nSafetyMeasures < MAX_GOTO) \
- { nSafetyMeasures++; goto tag; }
-
// -----------------------------------------------------------------------
SfxFrequencyItem::SfxFrequencyItem( USHORT which, FrequencyMode eMode, FrequencyTimeMode eTMode,
diff --git a/binfilter/bf_svtools/source/misc/svt_imap2.cxx b/binfilter/bf_svtools/source/misc/svt_imap2.cxx
index f73d2fb..398efee 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap2.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap2.cxx
@@ -35,8 +35,6 @@
#include <bf_svtools/imapcirc.hxx>
#include <bf_svtools/imappoly.hxx>
-#define NOTEOL(c) ((c)!='\0')
-
namespace binfilter
{
diff --git a/binfilter/bf_svx/source/inc/fmshimp.hxx b/binfilter/bf_svx/source/inc/fmshimp.hxx
index 6d24374..30bea05 100644
--- a/binfilter/bf_svx/source/inc/fmshimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmshimp.hxx
@@ -131,38 +131,6 @@ typedef FmXFormShell_Base_Disambiguation FmXFormShell_BASE;
typedef ::utl::ConfigItem FmXFormShell_CFGBASE;
-
-//------------------------------------------------------------------------------
-
-#define DECL_CURSOR_ACTION_THREAD(classname) \
- \
-class classname : public FmCursorActionThread \
-{ \
-public: \
- classname(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDataSource, \
- const UniString& _rPath); \
-protected: \
- virtual void RunImpl(); \
-}; \
-
-
-//------------------------------------------------------------------------------
-
-#define IMPL_CURSOR_ACTION_THREAD(classname, caption, action) \
- \
-classname::classname(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDataSource, \
- const UniString& _rPath) \
- :FmCursorActionThread(_xDataSource, caption, _rPath) \
-{ \
-} \
- \
-void classname::RunImpl() \
-{ \
- m_xDataSource->action; \
-} \
-
-
-
}//end of namespace binfilter
#endif // _SVX_FMSHIMP_HXX
diff --git a/binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx b/binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx
index 30e99a5..eda6e30 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx
@@ -190,17 +190,6 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
}
}
-#define CheckState( state ) \
- switch( state ) \
- { \
- case SFX_ITEM_DONTCARE: \
- case SFX_ITEM_DISABLED: \
- return beans::PropertyState_AMBIGUOUS_VALUE; \
- case SFX_ITEM_READONLY: \
- case SFX_ITEM_SET: \
- return beans::PropertyState_DIRECT_VALUE; \
- }
-
void SvxUnoFontDescriptor::setPropertyToDefault( SfxItemSet& rSet )
{
rSet.InvalidateItem( EE_CHAR_FONTINFO );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index abca478..9ae42f0 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -51,17 +51,6 @@ namespace binfilter {
} while( (_pCurrCrsr=(SwPaM *)_pCurrCrsr->GetNext()) != _pStartCrsr ); \
}
#define PCURSH ((SwCrsrShell*)_pStartShell)
-#define FOREACHSHELL_START( pEShell ) \
- {\
- register ViewShell *_pStartShell = pEShell; \
- do { \
- if( _pStartShell->IsA( TYPE( SwCrsrShell )) ) \
- {
-
-#define FOREACHSHELL_END( pEShell ) \
- } \
- } while((_pStartShell=(ViewShell*)_pStartShell->GetNext())!= pEShell ); \
- }
/*N*/ SwBookmark* SwDoc::MakeBookmark( const SwPaM& rPaM, const KeyCode& rCode,
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index 3842af5..86b3d3d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -42,17 +42,6 @@ namespace binfilter {
* MACROS um ueber alle CrsrShells zu iterieren
*/
#define PCURSH ((SwCrsrShell*)_pStartShell)
-#define FOREACHSHELL_START( pEShell ) \
- {\
- register ViewShell *_pStartShell = pEShell; \
- do { \
- if( _pStartShell->IsA( TYPE( SwCrsrShell )) ) \
- {
-
-#define FOREACHSHELL_END( pEShell ) \
- } \
- } while((_pStartShell=(ViewShell*)_pStartShell->GetNext())!= pEShell ); \
- }
#define PCURCRSR (_pCurrCrsr)
#define FOREACHPAM_START(pSttCrsr) \
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
index 0ad4a1f..bfd3761 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
@@ -94,12 +94,6 @@ const struct SvXMLEnumMapEntry psXML_NamedBorderWidths[] =
DEF_DOUBLE_LINE##n##_IN, \
DEF_DOUBLE_LINE##n##_DIST
-#define TDBORDER_ENTRY( n ) \
- DEF_DOUBLE_LINE##n##_OUT, \
- DEF_DOUBLE_LINE##n##_OUT, \
- DEF_DOUBLE_LINE##n##_IN, \
- DEF_DOUBLE_LINE##n##_DIST
-
const sal_uInt16 aSBorderWidths[] =
{
diff --git a/binfilter/bf_xmloff/source/forms/propertyexport.hxx b/binfilter/bf_xmloff/source/forms/propertyexport.hxx
index 4559f93..5520107 100644
--- a/binfilter/bf_xmloff/source/forms/propertyexport.hxx
+++ b/binfilter/bf_xmloff/source/forms/propertyexport.hxx
@@ -359,9 +359,6 @@ namespace xmloff
#define DBG_CHECK_PROPERTY_NO_TYPE(name) \
dbg_implCheckProperty(name, NULL)
- #define DBG_CHECK_PROPERTY_ASCII( name, type ) \
- dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), &::getCppuType(static_cast< type* >(NULL)))
-
#define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) \
dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), NULL )
#else
diff --git a/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
index 48d61c4..3a753bd 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
@@ -144,12 +144,6 @@ SvXMLEnumMapEntry pXML_NamedBorderWidths[] =
DEF_DOUBLE_LINE##n##_IN, \
DEF_DOUBLE_LINE##n##_DIST
-#define TDBORDER_ENTRY( n ) \
- DEF_DOUBLE_LINE##n##_OUT, \
- DEF_DOUBLE_LINE##n##_OUT, \
- DEF_DOUBLE_LINE##n##_IN, \
- DEF_DOUBLE_LINE##n##_DIST
-
static sal_uInt16 const aSBorderWidths[] =
{
diff --git a/binfilter/inc/bf_sfx2/docfac.hxx b/binfilter/inc/bf_sfx2/docfac.hxx
index aa2c4ae..7b88fce 100644
--- a/binfilter/inc/bf_sfx2/docfac.hxx
+++ b/binfilter/inc/bf_sfx2/docfac.hxx
@@ -531,174 +531,9 @@ extern "C"
//---------------------------------------------------------------------------
-/* SFX_IMPL_SIMPLE_OBJECTFACTORY
-
- [Beschreibung]
-
- Dieses Makro implementiert eine SfxObjectFactory f"ur SfxObjectShell-
- Subklassen, die NICHT von SfxInPlaceObject abgeleitet sind und deren Code
- zum Executable oder zu einer permanent angezogenen DLL gelinkt wird.
-*/
-
-#define SFX_IMPL_SIMPLE_OBJECTFACTORY( Class, nFlags, ShortName ) \
- \
- SfxObjectFactory* Class::pObjectFactory = 0; \
- \
- SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \
- { return new Class(eMode); } \
- \
- SfxObjectFactory& Class::Factory() \
- { \
- if( !pObjectFactory ) \
- { \
- pObjectFactory = new SfxObjectFactory( SvGlobalName(), \
- String(), 0 ); \
- } \
- return *pObjectFactory; \
- } \
- void Class::RegisterFactory( USHORT nPrio ) \
- { \
- Factory().Construct( \
- nPrio, \
- &Class::CreateObject, nFlags, \
- #ShortName ); \
- Factory().RegisterInitFactory( &InitFactory ); \
- } \
- \
- SfxObjectFactory& Class::GetFactory() const \
- { return Factory(); } \
- \
- void Class::InitFactory()
-
-//--------------------------------------------------------------------
-
-/* SFX_IMPL_SIMPLE_OBJECTFACTORY_LOD
-
- [Beschreibung]
-
- Dieses Makro implementiert eine SfxObjectFactory f"ur SfxObjectShell-
- Subklassen, die NICHT von SfxInPlaceObject abgeleitet sind und deren Code
- On-Demand geladen wird. Der mit diesem Makro generierte Code wird zur
- On-Demand zu ladenden DLL gelinkt.
-
- Es wird eine Klasse 'LibName##DLL' vorausgesetzt, die eine statische
- Init()- und Exit()-Methode implementiert. Diese werden gerufen wenn
- die DLL angezogen bzw. freigelassen wird.
-*/
-
-#define SFX_IMPL_SIMPLE_OBJECTFACTORY_LOD( Class, LibName, FactoryPtr ) \
- SfxObjectFactory** Class::GetFactoryAdress() \
- { return &FactoryPtr->p##Class##Factory; } \
- extern "C" Class* __LOADONCALLAPI CreateObj##Class##Dll(int nMode) \
- { \
- SfxObjectCreateMode eMode = (SfxObjectCreateMode) nMode; \
- return new Class(eMode); \
- } \
- SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \
- { \
- return new Class( eMode ); \
- } \
- SfxObjectFactory& Class::Factory() \
- { return **GetFactoryAdress(); } \
- SfxObjectFactory& Class::GetFactory() const \
- { return Factory(); }
-
-//-------------------------------------------------------------------------
-
-/* SFX_IMPL_SIMPLE_OBJECTFACTORY_LIB
-
- [Beschreibung]
-
- Dieses Makro implementiert einen Stub f"ur eine SfxObjectFactory f"ur
- SfxObjectShell-Subklassen, die NICHT von SfxInPlaceObject abgeleitet sind
- und deren Code On-Demand geladen wird. Der mit diesem Makro generierte Code
- wird zum Executeable bzw. einer per Implib geladenen DLL gelinkt.
-*/
-
-#define SFX_IMPL_SIMPLE_OBJECTFACTORY_LIB( Class, nFlags, ShortName, LibName, FactoryPtr ) \
- SfxObjectFactory* Class::pObjectFactory = 0; \
- SfxObjectFactory& Class::Factory() \
- { \
- if( !pObjectFactory ) \
- { \
- pObjectFactory = new SfxObjectFactory( SvGlobalName(), \
- String(), 0 ); \
- } \
- return *pObjectFactory; \
- } \
- void Class::RegisterFactory( USHORT nPrio ) \
- { \
- Factory().Construct( \
- nPrio, \
- &Class::CreateObject, nFlags, \
- #ShortName ); \
- Factory().RegisterInitFactory( &InitFactory ); \
- } \
- \
- SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \
- { \
- SfxCreateExtern_TYPE fCreate = (SfxCreateExtern_TYPE) \
- GetFunc##LibName( "CreateObj" #Class "Dll"); \
- if( fCreate ) \
- return (Class*)(*fCreate)(eMode); \
- return 0; \
- } \
- \
- SfxObjectFactory& Class::GetFactory() const \
- { return Factory(); } \
- \
- void Class::InitFactory()
-
-//--------------------------------------------------------------------
-
#define SFX_FILTER_REGISTRATION(aName, aWild, ePurpose, lClipboardFormat, \
pMacType, pOS2Type, nOS2DocIcon, pUserData)
-// Den eigenen Filter Registrieren und DetectFilter setzen.
-#define SFX_OWN_FILTER_REGISTRATION( \
- pDetectFilter, aName, aWild, \
- ePurpose, lClipboardFormat, \
- pMacType, pOS2Type, nOS2DocIcon, aMimeType, pUserData) \
- { \
- SfxObjectFactory& rFact = (SfxObjectFactory&)Factory(); \
- }
-
-// Einen Filter registrieren. Fuer nicht-Ini Factories ( z.B. Plugins )
-#define SFX_SIMPLE_FILTER_REGISTRATION( \
- aName, aWild, \
- ePurpose, lClipboardFormat, \
- pMacType, pOS2Type, nOS2DocIcon, aMimeType, pUserData) \
- { \
- SfxObjectFactory& rFact = (SfxObjectFactory&)Factory(); \
- }
-
-// Fuer jede Applikation eine
-#define SFX_APP_FILTER_REGISTRATION( aName ) \
- { \
- if( !SFX_APP()->GetFilterMatcher().GetContainer( aName ) ) \
- { \
- SfxFilterContainer* pCont = new SfxFilterContainer( aName ); \
- SFX_APP()->GetFilterMatcher().AddContainer( pCont ); \
- pCont->LoadFilters( \
- aName, TRUE, \
- SFX_FILTER_MAPTOAPPPLUG|SFX_FILTER_PLUGIN ); \
- } \
- }
-
-//====================================================================
-// Kompatibilit"ats-Defines
-
-#ifdef _SFX_HXX
-#define SFX_DECL_DOCUMENTFACTORY(Class) \
- SFX_DECL_OBJECTFACTORY(Class)
-
-#define SFX_DECL_DOCUMENTFACTORY_DLL(Class,ClassFactory) \
- SFX_DECL_OBJECTFACTORY_DLL(Class,ClassFactory)
-
-#define SFX_DECL_SIMPLE_DOCUMENTFACTORY_DLL(Class) \
- SFX_DECL_SIMPLE_OBJECTFACTORY_DLL(Class)
-#endif
-
}//end of namespace binfilter
#endif // #ifndef _SFX_OBJFAC_HXX
diff --git a/binfilter/inc/bf_sfx2/minarray.hxx b/binfilter/inc/bf_sfx2/minarray.hxx
index 1df1609..7df8bed 100644
--- a/binfilter/inc/bf_sfx2/minarray.hxx
+++ b/binfilter/inc/bf_sfx2/minarray.hxx
@@ -34,278 +34,6 @@ namespace binfilter {
#define DEL_ARRAY( X ) X
#endif
-#define DECL_OBJARRAY( ARR, T, nI, nG ) \
-class ARR\
-{\
-private:\
- T* pData;\
- USHORT nUsed;\
- BYTE nGrow;\
- BYTE nUnused;\
-public:\
- ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG );\
- ARR( const ARR& rOrig );\
- ~ARR();\
-\
- ARR& operator= ( const ARR& rOrig );\
-\
- const T& GetObject( USHORT nPos ) const; \
- T& GetObject( USHORT nPos ); \
-\
- void Insert( USHORT nPos, ARR& rIns, USHORT nStart = 0, USHORT nEnd = USHRT_MAX );\
- void Insert( USHORT nPos, const T& rElem );\
- void Insert( USHORT nPos, const T& rElems, USHORT nLen );\
- void Append( const T& rElem );\
-\
- BOOL Remove( const T& rElem );\
- USHORT Remove( USHORT nPos, USHORT nLen );\
-\
- USHORT Count() const { return nUsed; }\
- T* operator*();\
- const T& operator[]( USHORT nPos ) const;\
- T& operator[]( USHORT nPos );\
-\
- BOOL Contains( const T& rItem ) const;\
- void Clear() { Remove( 0, Count() ); }\
-};\
-\
-inline void ARR::Insert( USHORT nPos, ARR& rIns, USHORT nStart, USHORT nEnd )\
-{\
- Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\
-}\
-\
-inline void ARR::Insert( USHORT nPos, const T& rElem )\
-{\
- Insert( nPos, rElem, 1 );\
-}\
-\
-inline T* ARR::operator*()\
-{\
- return ( nUsed==0 ? 0 : pData );\
-} \
-inline const T& ARR::operator[]( USHORT nPos ) const\
-{\
- DBG_ASSERT( nPos < nUsed, "" ); \
- return *(pData+nPos);\
-} \
-inline T& ARR::operator [] (USHORT nPos) \
-{\
- DBG_ASSERT( nPos < nUsed, "" ); \
- return *(pData+nPos); \
-} \
-inline const T& ARR::GetObject( USHORT nPos ) const { return operator[](nPos); } \
-inline T& ARR::GetObject( USHORT nPos ) { return operator[](nPos); } \
-
-#ifndef _lint
-// String too long
-
-#define IMPL_OBJARRAY( ARR, T ) \
-ARR::ARR( BYTE nInitSize, BYTE nGrowSize ): \
- nUsed(0), \
- nUnused(nInitSize), \
- nGrow( nGrowSize ? nGrowSize : 1 ) \
-{ \
- if ( nInitSize != 0 ) \
- { \
- size_t nBytes = nInitSize * sizeof(T); \
- pData = (T*) new char[ nBytes ]; \
- memset( pData, 0, nBytes ); \
- } \
- else \
- pData = 0; \
-} \
-\
-ARR::ARR( const ARR& rOrig ) \
-{ \
- nUsed = rOrig.nUsed; \
- nGrow = rOrig.nGrow; \
- nUnused = rOrig.nUnused; \
-\
- if ( rOrig.pData != 0 ) \
- { \
- size_t nBytes = (nUsed + nUnused) * sizeof(T); \
- pData = (T*) new char [ nBytes ]; \
- memset( pData, 0, nBytes ); \
- for ( USHORT n = 0; n < nUsed; ++n ) \
- *(pData+n) = *(rOrig.pData+n); \
- } \
- else \
- pData = 0; \
-} \
-\
-ARR::~ARR() \
-{ \
- for ( USHORT n = 0; n < nUsed; ++n ) \
- ( pData+n )->T::~T(); \
- delete[] (char*) pData;\
-} \
-\
-ARR& ARR::operator= ( const ARR& rOrig )\
-{ \
- for ( USHORT n = 0; n < nUsed; ++n ) \
- ( pData+n )->T::~T(); \
- delete[] (char*) pData;\
-\
- nUsed = rOrig.nUsed; \
- nGrow = rOrig.nGrow; \
- nUnused = rOrig.nUnused; \
-\
- if ( rOrig.pData != 0 ) \
- { \
- size_t nBytes = (nUsed + nUnused) * sizeof(T); \
- pData = (T*) new char[ nBytes ]; \
- memset( pData, 0, nBytes ); \
- for ( USHORT n = 0; n < nUsed; ++n ) \
- *(pData+n) = *(rOrig.pData+n); \
- } \
- else \
- pData = 0; \
- return *this; \
-} \
-\
-void ARR::Append( const T& aElem ) \
-{ \
- \
- if ( nUnused == 0 ) \
- { \
- USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \
- size_t nBytes = nNewSize * sizeof(T); \
- T* pNewData = (T*) new char[ nBytes ]; \
- memset( pNewData, 0, nBytes ); \
- if ( pData ) \
- { \
- memcpy( pNewData, pData, nUsed * sizeof(T) ); \
- delete[] (char*) pData;\
- } \
- nUnused = (BYTE)(nNewSize-nUsed); \
- pData = pNewData; \
- } \
-\
- \
- pData[nUsed] = aElem; \
- ++nUsed; \
- --nUnused; \
-} \
-\
-USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
-{ \
- DBG_ASSERT( (nPos+nLen) < (nUsed+1), "" ); \
- DBG_ASSERT( nLen > 0, "" ); \
-\
- nLen = Min( (USHORT)(nUsed-nPos), (USHORT)nLen ); \
-\
- if ( nLen == 0 ) \
- return 0; \
-\
- for ( USHORT n = nPos; n < (nPos+nLen); ++n ) \
- ( pData+n )->T::~T(); \
-\
- if ( (nUsed-nLen) == 0 ) \
- { \
- delete[] (char*) pData;\
- pData = 0; \
- nUsed = 0; \
- nUnused = 0; \
- return nLen; \
- } \
-\
- if ( (nUnused+nLen) >= nGrow ) \
- { \
- USHORT nNewUsed = nUsed-nLen; \
- USHORT nNewSize = (nNewUsed+nGrow-1)/nGrow; nNewSize *= nGrow; \
- DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize, \
- "shrink size computation failed" ); \
- size_t nBytes = nNewSize * sizeof(T); \
- T* pNewData = (T*) new char[ nBytes ]; \
- memset( pNewData, 0, nBytes ); \
- if ( nPos > 0 ) \
- memcpy( pNewData, pData, nPos * sizeof(T) ); \
- if ( nNewUsed != nPos ) \
- memcpy(pNewData+nPos, pData+nPos+nLen, (nNewUsed-nPos) * sizeof(T) ); \
- delete[] (char*) pData;\
- pData = pNewData; \
- nUsed = nNewUsed; \
- nUnused = (BYTE)(nNewSize - nNewUsed); \
- return nLen; \
- } \
-\
- \
- if ( nUsed-nPos-nLen > 0 ) \
- { \
- memmove(pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen) * sizeof(T));\
- } \
- nUsed -= (BYTE)nLen; \
- nUnused += (BYTE)nLen; \
- return nLen; \
-} \
-\
-BOOL ARR::Remove( const T& aElem ) \
-{ \
- if ( nUsed == 0 ) \
- return FALSE; \
-\
- const T *pIter = pData + nUsed - 1; \
- for ( USHORT n = 0; n < nUsed; ++n, --pIter ) \
- if ( *pIter == aElem ) \
- { \
- Remove(nUsed-n-1, 1); \
- return TRUE; \
- } \
- return FALSE; \
-} \
-\
-BOOL ARR::Contains( const T& rItem ) const \
-{ \
- if ( !nUsed ) \
- return FALSE; \
- for ( USHORT n = 0; n < nUsed; ++n ) \
- { \
- const T& r2ndItem = GetObject(n); \
- if ( r2ndItem == rItem ) \
- return TRUE; \
- } \
- return FALSE; \
-} \
-\
-void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
-{ \
- DBG_ASSERT( nPos <= nUsed, "" ); \
- \
- if ( nUnused == 0 ) \
- { \
- \
- /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \
- USHORT nNewSize; \
- for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \
- /* empty loop */; \
- size_t nBytes = nNewSize * sizeof(T); \
- T* pNewData = (T*) new char[ nBytes ]; \
- memset( pNewData, 0, nBytes ); \
- \
- if ( pData ) \
- { \
- DBG_ASSERT( nUsed < nNewSize, "" ); \
- memcpy( pNewData, pData, nUsed * sizeof(T) ); \
- delete (char*) pData;\
- } \
- nUnused = (BYTE)(nNewSize-nUsed); \
- pData = pNewData; \
- } \
-\
- \
- if ( nPos < nUsed ) \
- { \
- memmove(pData+nPos+nLen-1, pData+nPos-1, sizeof(T) * (nUsed-nPos)); \
- } \
-\
- memmove(pData+nPos, &rElems, sizeof(T) * nLen); \
- nUsed += nLen; \
- nUnused -= nLen; \
-}
-
-// _lint
-#endif
-
class SfxPtrArr
{
private:
@@ -370,41 +98,6 @@ public:\
};
-
-#define DECL_1BYTEARRAY(ARR, T, nI, nG)\
-class ARR: public ByteArr\
-{\
-public:\
- ARR( BYTE nIni=nI, BYTE nGrowSize=nG ):\
- ByteArr(nIni,nGrowSize) \
- {}\
- ARR( const ARR& rOrig ):\
- ByteArr(rOrig) \
- {}\
- T GetObject( USHORT nPos ) const { return operator[](nPos); } \
- T& GetObject( USHORT nPos ) { return operator[](nPos); } \
- void Insert( USHORT nPos, T aElement ) {\
- ByteArr::Insert(nPos,(char)aElement);\
- }\
- void Append( T aElement ) {\
- ByteArr::Append((char)aElement);\
- }\
- void Remove( T aElement ) {\
- ByteArr::Remove((char)aElement);\
- }\
- void Remove( USHORT nPos, USHORT nLen = 1 ) {\
- ByteArr::Remove( nPos, nLen ); \
- }\
- T* operator *() {\
- return (T*) ByteArr::operator*();\
- }\
- T operator[]( USHORT nPos ) const { \
- return (T) ByteArr::operator[](nPos); } \
- T& operator[]( USHORT nPos ) { \
- return (T&) ByteArr::operator[](nPos); } \
- void Clear() { Remove( 0, Count() ); }\
-};
-
}//end of namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sfx2/module.hxx b/binfilter/inc/bf_sfx2/module.hxx
index dc73d17..73dd4bf 100644
--- a/binfilter/inc/bf_sfx2/module.hxx
+++ b/binfilter/inc/bf_sfx2/module.hxx
@@ -70,17 +70,6 @@ public:
#endif
};
-#define SFX_IMPL_MODULE_LIBRARY( LibName ) \
- \
- extern "C" void _CDECLARE_ Init##LibName##Dll() \
- { \
- LibName##DLL::Init(); \
- } \
- extern "C" void _CDECLARE_ DeInit##LibName##Dll() \
- { \
- LibName##DLL::Exit(); \
- }
-
}//end of namespace binfilter
#endif
diff --git a/binfilter/inc/bf_svtools/hint.hxx b/binfilter/inc/bf_svtools/hint.hxx
index 02020d7..15249a3 100644
--- a/binfilter/inc/bf_svtools/hint.hxx
+++ b/binfilter/inc/bf_svtools/hint.hxx
@@ -51,12 +51,6 @@ public:
BOOL IsOwner() const { return bIsOwner; } \
}
-#define IMPL_PTRHINT_AUTODELETE(Name, Type) \
- TYPEINIT1(Name, SfxHint); \
- Name::Name( Type* pObject, BOOL bOwnedByHint ) \
- { pObj = pObject; bIsOwner = bOwnedByHint; } \
- Name::~Name() { if ( bIsOwner ) delete pObj; }
-
#define IMPL_PTRHINT(Name, Type) \
TYPEINIT1(Name, SfxHint); \
Name::Name( Type* pObject, BOOL bOwnedByHint ) \
diff --git a/binfilter/inc/bf_svtools/smplhint.hxx b/binfilter/inc/bf_svtools/smplhint.hxx
index 3bb7148..312264e 100644
--- a/binfilter/inc/bf_svtools/smplhint.hxx
+++ b/binfilter/inc/bf_svtools/smplhint.hxx
@@ -71,27 +71,6 @@ public:
ULONG GetId() const { return nId; }
};
-//--------------------------------------------------------------------
-
-#define DECL_OBJHINT(Name, Type) \
- class Name: public SfxSimpleHint \
- { \
- Type aObj; \
- \
- public: \
- TYPEINFO(); \
- Name( USHORT nId, const Type& rObject ); \
- ~Name(); \
- const Type& GetObject() const { return aObj; } \
- }
-
-#define IMPL_OBJHINT(Name, Type) \
- TYPEINIT1(Name, SfxSimpleHint); \
- Name::Name( USHORT nID, const Type& rObject ): \
- SfxSimpleHint( nID ), aObj(rObject) \
- { } \
- Name::~Name() {}
-
}
#endif
diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index d087fca..a1a0167 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -717,9 +717,6 @@ private:\
#define SV_DECL_VARARR_SORT(nm, AE, IS, GS)\
_SV_DECL_VARARR_SORT(nm, AE, IS, GS,)
-#define SV_DECL_VARARR_SORT_VISIBILITY(nm, AE, IS, GS, vis)\
-_SV_DECL_VARARR_SORT(nm, AE, IS, GS, vis)
-
#define SV_IMPL_PTRARR_SORT( nm,AE )\
_SV_IMPL_SORTAR_ALG( nm,AE )\
void nm::DeleteAndDestroy( USHORT nP, USHORT nL ) { \
@@ -749,45 +746,6 @@ SV_IMPL_VARARR(nm##_SAR, AE)\
_SV_IMPL_SORTAR_ALG( nm,AE )\
_SV_SEEK_OBJECT( nm,AE )
-#define SV_DECL_PTRARR_STACK(nm, AE, IS, GS)\
-class nm: private SvPtrarr \
-{\
-public:\
- nm( USHORT nIni=IS, BYTE nG=GS )\
- : SvPtrarr(nIni,nG) {}\
- void Insert( const nm *pI, USHORT nP,\
- USHORT nS = 0, USHORT nE = USHRT_MAX ) {\
- SvPtrarr::Insert( pI, nP, nS, nE ); \
- }\
- void Remove( USHORT nP, USHORT nL = 1 ) {\
- SvPtrarr::Remove( nP, nL ); \
- }\
- void Push( const AE &aE ) {\
- SvPtrarr::Insert( (const VoidPtr &)aE, SvPtrarr::Count() );\
- }\
- USHORT Count() const { return SvPtrarr::Count(); }\
- AE operator[](USHORT nP) const {\
- return (AE)SvPtrarr::operator[]( nP );\
- }\
- AE GetObject(USHORT nP) const {\
- return (AE)SvPtrarr::GetObject( nP );\
- }\
- AE Pop(){\
- AE pRet = 0;\
- if( SvPtrarr::Count() ){\
- pRet = GetObject( SvPtrarr::Count()-1 );\
- SvPtrarr::Remove(Count()-1);\
- }\
- return pRet;\
- }\
- AE Top() const {\
- AE pRet = 0;\
- if( SvPtrarr::Count() )\
- pRet = GetObject( SvPtrarr::Count()-1 ); \
- return pRet;\
- }\
-};
-
#if defined (C40) || defined (C41) || defined (C42) || defined(C50) || defined(C52)
#define C40_INSERT( c, p, n) Insert( (c const *) p, n )
#define C40_PUSH( c, p) Push( (c const *) p )
diff --git a/binfilter/inc/bf_sw/unoprnms.hxx b/binfilter/inc/bf_sw/unoprnms.hxx
index 7697cc7..dc77ed0 100644
--- a/binfilter/inc/bf_sw/unoprnms.hxx
+++ b/binfilter/inc/bf_sw/unoprnms.hxx
@@ -725,9 +725,6 @@ inline const SwPropNameLen& GetPropName( USHORT nId )
#define SW_PROP_NAME(nId) \
GetPropName( nId ).pName, GetPropName( nId ).nNameLen
-#define SW_PRPNM_EQLASCI(nId) \
- GetPropName( nId ).pName, 0, GetPropName( nId ).nNameLen
-
#define SW_PROP_NAME_STR(nId) \
GetPropName( nId ).pName
commit 27ccf8d73688fe90835f9b2c978c4fc3566dd8c3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 31 17:46:14 2012 +0200
Remove unused code: those classes are unused
So dump them
Change-Id: I7a7a37d4d6fde4afbee77cf9fadc26118dd88dc1
diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx b/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx
index f8038fd..04fc29d 100644
--- a/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx
+++ b/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx
@@ -26,32 +26,8 @@
#include <rtl/tencinfo.h>
-static const sal_Char pStrFix[] = "FIX";
-
namespace binfilter {
-class ScDelimiterTable
-{
-public:
- ScDelimiterTable( const String& rDelTab )
- : theDelTab ( rDelTab ),
- cSep ( '\t' ),
- nCount ( rDelTab.GetTokenCount('\t') ),
- nIter ( 0 )
- {}
-
- String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); }
- String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); }
-
-private:
- const String theDelTab;
- const sal_Unicode cSep;
- const xub_StrLen nCount;
- xub_StrLen nIter;
-};
-
-//------------------------------------------------------------------------
-
/*N*/ void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc )
/*N*/ {
/*N*/ eCharSet = (nEnc == RTL_TEXTENCODING_DONTKNOW ?
diff --git a/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx b/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
index 3858180..0635c7d 100644
--- a/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
+++ b/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
@@ -36,8 +36,6 @@ namespace binfilter {
//===================================================================
class ScImportOptions;
-class ScDelimiterTable;
-
//------------------------------------------------------------------------
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
index f621378..76c7ac6 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
@@ -79,7 +79,6 @@
#include "appdata.hxx"
#include "misccfg.hxx"
#include "appimp.hxx"
-#include "helper.hxx" // SfxContentHelper::...
#include "app.hxx"
#include <legacysmgr/legacy_binfilters_smgr.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index 0093dda..4697886 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -67,7 +67,6 @@
#include "nochaos.hxx"
#include "fcontnr.hxx"
-#include "helper.hxx" // SfxContentHelper::Kill()
#include <legacysmgr/legacy_binfilters_smgr.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
index b368c47..61a96fa 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
@@ -65,7 +65,6 @@
#include "module.hxx"
#include "openflag.hxx"
#include "appimp.hxx"
-#include "helper.hxx" // SfxContentHelper::Kill()
#include <legacysmgr/legacy_binfilters_smgr.hxx>
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 09bc06d..4fea366 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -93,7 +93,6 @@ using namespace ::com::sun::star::io;
#include <ucbhelper/content.hxx>
#include <sot/stg.hxx>
-#include "helper.hxx"
#include "request.hxx" // SFX_ITEMSET_SET
#include "app.hxx" // GetFilterMatcher
#include "appuno.hxx" // LoadTargetFrame
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 9a11ee6..f68ea41 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -76,7 +76,6 @@
#include "module.hxx"
#include "app.hxx"
#include "openflag.hxx"
-#include "helper.hxx"
#include "dlgcont.hxx"
#include "appuno.hxx"
diff --git a/binfilter/bf_sfx2/source/inc/dlgcont.hxx b/binfilter/bf_sfx2/source/inc/dlgcont.hxx
index 21759fe..868c7b5 100644
--- a/binfilter/bf_sfx2/source/inc/dlgcont.hxx
+++ b/binfilter/bf_sfx2/source/inc/dlgcont.hxx
@@ -71,22 +71,6 @@ public:
};
-// class to represent application container service
-class SfxApplicationDialogLibraryContainer
-{
-public:
- // Service
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
- static ::rtl::OUString impl_getStaticImplementationName();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance
- ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager )
- throw( ::com::sun::star::uno::Exception );
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory
- ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-
-};
-
-
//============================================================================
class SfxDialogLibrary : public SfxLibrary_Impl
diff --git a/binfilter/bf_sfx2/source/inc/helper.hxx b/binfilter/bf_sfx2/source/inc/helper.hxx
deleted file mode 100644
index 35c797b..0000000
--- a/binfilter/bf_sfx2/source/inc/helper.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_HELPER_HXX
-#define _SFX_HELPER_HXX
-
-// include ---------------------------------------------------------------
-
-#include <com/sun/star/uno/Sequence.hxx>
-
-class String;
-
-
-
-namespace binfilter {
-
-// class SfxContentHelper ------------------------------------------------
-
-class SfxContentHelper
-{
-private:
-
-public:
-
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >
- GetResultSet( const String& rURL );
- static String GetActiveHelpString( const String& rURL );
-
-
-
- // please don't use this!
-};
-
-}//end of namespace binfilter
-#endif // #ifndef _SFX_HELPER_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/inc/scriptcont.hxx b/binfilter/bf_sfx2/source/inc/scriptcont.hxx
index 7072e44..20cc719 100644
--- a/binfilter/bf_sfx2/source/inc/scriptcont.hxx
+++ b/binfilter/bf_sfx2/source/inc/scriptcont.hxx
@@ -109,22 +109,6 @@ public:
};
-// class to represent application container service
-class SfxApplicationScriptLibraryContainer
-{
-public:
- // Service
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
- static ::rtl::OUString impl_getStaticImplementationName();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance
- ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager )
- throw( ::com::sun::star::uno::Exception );
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory
- ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-
-};
-
-
//============================================================================
class SfxScriptLibrary : public SfxLibrary_Impl
diff --git a/binfilter/bf_sfx2/source/inc/sfxtypes.hxx b/binfilter/bf_sfx2/source/inc/sfxtypes.hxx
index 53d00ff..238edc2 100644
--- a/binfilter/bf_sfx2/source/inc/sfxtypes.hxx
+++ b/binfilter/bf_sfx2/source/inc/sfxtypes.hxx
@@ -135,21 +135,6 @@ String SfxStringDecode( const String &rSource,
DELETEX(pArr); \
}
-class SfxBoolResetter
-{
- BOOL& _rVar;
- BOOL _bOld;
-
-public:
- SfxBoolResetter( BOOL &rVar )
- : _rVar( rVar ),
- _bOld( rVar )
- {}
-
- ~SfxBoolResetter()
- { _rVar = _bOld; }
-};
-
#define GPF() *(int*)0 = 0
}//end of namespace binfilter
diff --git a/binfilter/bf_svtools/source/numbers/numhead.hxx b/binfilter/bf_svtools/source/numbers/numhead.hxx
index af43465..03c89fa 100644
--- a/binfilter/bf_svtools/source/numbers/numhead.hxx
+++ b/binfilter/bf_svtools/source/numbers/numhead.hxx
@@ -26,39 +26,6 @@
namespace binfilter
{
-
-// -----------------------------------------------------------------------
-
- // "Automatischer" Record-Header mit Groessenangabe
-
-/* wird fuer SvNumberFormatter nicht gebraucht
-class SvNumReadHeader
-{
-private:
- SvStream& rStream;
- ULONG nDataEnd;
-
-public:
- SvNumReadHeader(SvStream& rNewStream);
- ~SvNumReadHeader();
-
- ULONG BytesLeft() const;
-};
-
-class SvNumWriteHeader
-{
-private:
- SvStream& rStream;
- ULONG nDataPos;
- ULONG nDataSize;
-
-public:
- SvNumWriteHeader(SvStream& rNewStream, ULONG nDefault = 0);
- ~SvNumWriteHeader();
-};
-
-*/
-
// Header mit Groessenangaben fuer mehrere Objekte
class ImpSvNumMultipleReadHeader
diff --git a/binfilter/bf_svtools/source/numbers/svt_numhead.cxx b/binfilter/bf_svtools/source/numbers/svt_numhead.cxx
index b002112..1fa89fc 100644
--- a/binfilter/bf_svtools/source/numbers/svt_numhead.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_numhead.cxx
@@ -29,72 +29,6 @@ namespace binfilter
// STATIC DATA -----------------------------------------------------------
-//SEG_EOFGLOBALS()
-
-// =======================================================================
-/* wird fuer SvNumberformatter nicht gebraucht
-//#pragma SEG_FUNCDEF(numhead_01)
-
-SvNumReadHeader::SvNumReadHeader(SvStream& rNewStream) :
- rStream( rNewStream )
-{
- ULONG nDataSize;
- rStream >> nDataSize;
- nDataEnd = rStream.Tell() + nDataSize;
-}
-
-//#pragma SEG_FUNCDEF(numhead_02)
-
-SvNumReadHeader::~SvNumReadHeader()
-{
- ULONG nReadEnd = rStream.Tell();
- DBG_ASSERT( nReadEnd <= nDataEnd, "zuviele Bytes gelesen" );
- if ( nReadEnd != nDataEnd )
- rStream.Seek(nDataEnd); // Rest ueberspringen
-}
-
-//#pragma SEG_FUNCDEF(numhead_03)
-
-ULONG SvNumReadHeader::BytesLeft() const
-{
- ULONG nReadEnd = rStream.Tell();
- if (nReadEnd <= nDataEnd)
- return nDataEnd-nReadEnd;
-
- OSL_FAIL("Fehler bei SvNumReadHeader::BytesLeft");
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-//#pragma SEG_FUNCDEF(numhead_04)
-
-SvNumWriteHeader::SvNumWriteHeader(SvStream& rNewStream, ULONG nDefault) :
- rStream( rNewStream )
-{
- nDataSize = nDefault;
- rStream << nDataSize;
- nDataPos = rStream.Tell();
-}
-
-//#pragma SEG_FUNCDEF(numhead_05)
-
-SvNumWriteHeader::~SvNumWriteHeader()
-{
- ULONG nPos = rStream.Tell();
-
- if ( nPos - nDataPos != nDataSize ) // Default getroffen?
- {
- nDataSize = nPos - nDataPos;
- rStream.Seek(nDataPos - sizeof(sal_uInt32));
- rStream << nDataSize; // Groesse am Anfang eintragen
- rStream.Seek(nPos);
- }
-}
-*/
-
-// =======================================================================
-
//#pragma SEG_FUNCDEF(numhead_06)
//! mit Skip() synchron
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
index d86347e..1b5506f 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
@@ -119,7 +119,6 @@
#include <viscrs.hxx>
#include <fntcache.hxx>
#include <doc.hxx>
-#include <acmplwrd.hxx>
#include <fmtclbl.hxx>
#include <cmdid.h>
#include <breakit.hxx>
diff --git a/binfilter/bf_sw/source/core/inc/dflyobj.hxx b/binfilter/bf_sw/source/core/inc/dflyobj.hxx
index 4320ab5..b2d696b 100644
--- a/binfilter/bf_sw/source/core/inc/dflyobj.hxx
+++ b/binfilter/bf_sw/source/core/inc/dflyobj.hxx
@@ -25,7 +25,6 @@ namespace binfilter {
class SwFlyFrm;
class SwFrmFmt;
-class SdrObjMacroHitRec;
const UINT32 SWGInventor = UINT32('S')*0x00000001+
UINT32('W')*0x00000100+
diff --git a/binfilter/bf_sw/source/core/inc/docfunc.hxx b/binfilter/bf_sw/source/core/inc/docfunc.hxx
deleted file mode 100644
index c6e4664..0000000
--- a/binfilter/bf_sw/source/core/inc/docfunc.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _DOCFUNC_HXX
-#define _DOCFUNC_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-
-// Diese Klasse wird von der Editshell benutz um fuer belibige
-// Doc-Aktionen ueber eine definierte Schnittstelle alle Cursor/
-// Bookmarks/usw. aus dem Loeschbereich zu verschieben, mit einem
-// anschliessenden Join-Node.
-// Das wird zur Zeit vom
-// - Delete
-// - Replace
-// benotigt.
-
-
-#include <bf_tools/string.hxx>
-namespace binfilter {
-class SwPaM;
-
-enum DocFNType { DOC_DELETE, DOC_REPLACE };
-
-class SwCallDocFunction
-{
- // Parameter fuers Replace (leider kein union moeglich; Str-Klasse !!)
- const String aRplStr;
- DocFNType eDocFnType;
- BOOL bRplRegExp;
-
-public:
- // fuer parameterlose Methoden
- SwCallDocFunction( DocFNType eDocFn ) : eDocFnType( eDocFn ), aRplStr() {}
- // fuer das Replace
- SwCallDocFunction( const String& rStr, BOOL bFlag );
-
- BOOL Call( SwPaM& );
-
- // ALLE Methoden stehen im eddel.cxx !!
-};
-
-
-} //namespace binfilter
-#endif
- //_DOCFUNC_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
index 90ab1da..3d72b15 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
@@ -39,8 +39,6 @@
#include <com/sun/star/i18n/WordType.hdl>
#include <com/sun/star/i18n/ScriptType.hdl>
-#include <acmplwrd.hxx>
-
#include <horiornt.hxx>
#include <doc.hxx> // GetDoc()
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
index 6d214eb..ed44dd1 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
@@ -70,7 +70,6 @@
#include <usrpref.hxx>
#include <wdocsh.hxx>
#include <unotxdoc.hxx>
-#include <acmplwrd.hxx>
#include <swmodule.hxx>
#include <unoobj.hxx>
#include <swwait.hxx>
diff --git a/binfilter/inc/bf_svtools/ondemand.hxx b/binfilter/inc/bf_svtools/ondemand.hxx
index a576f28..3721fe5 100644
--- a/binfilter/inc/bf_svtools/ondemand.hxx
+++ b/binfilter/inc/bf_svtools/ondemand.hxx
@@ -237,80 +237,6 @@ public:
CalendarWrapper& operator*() { return *get(); }
};
-/** Load a collator only if it's needed.
- SvNumberformatter uses it upon switching locales.
- @ATTENTION If the default ctor is used the init() method MUST be called
- before accessing the collator.
- */
-class OnDemandCollatorWrapper
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
- ::com::sun::star::lang::Locale aLocale;
- mutable CollatorWrapper* pPtr;
- mutable bool bValid;
- bool bInitialized;
-
-public:
- OnDemandCollatorWrapper()
- : pPtr(0)
- , bValid(false)
- , bInitialized(false)
- {}
- OnDemandCollatorWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
- ::com::sun::star::lang::Locale& rLocale
- )
- : bValid(false)
- , bInitialized(false)
- {
- init( rxSMgr, rLocale );
- }
- ~OnDemandCollatorWrapper()
- {
- delete pPtr;
- }
-
- bool isInitialized() const { return bInitialized; }
-
- bool is() const { return pPtr != NULL; }
-
- void init(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
- ::com::sun::star::lang::Locale& rLocale
- )
- {
- xSMgr = rxSMgr;
- changeLocale( rLocale );
- if ( pPtr )
- {
- delete pPtr;
- pPtr = NULL;
- }
- bInitialized = true;
- }
-
- void changeLocale( ::com::sun::star::lang::Locale& rLocale )
- {
- bValid = false;
- aLocale = rLocale;
- }
-
- const CollatorWrapper* get() const
- {
- if ( !bValid )
- {
- if ( !pPtr )
- pPtr = new CollatorWrapper( xSMgr );
- pPtr->loadDefaultCollator( aLocale, ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
- bValid = true;
- }
- return pPtr;
- }
-
- const CollatorWrapper* operator->() const { return get(); }
- const CollatorWrapper& operator*() const { return *get(); }
-};
-
/** Load a transliteration only if it's needed.
SvNumberformatter uses it upon switching locales.
@ATTENTION If the default ctor is used the init() method MUST be called
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index e55451c..3fef227 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -155,30 +155,6 @@ public:
};
//************************************************************
-// Hilfsklasse SdrObjMacroHitRec
-//************************************************************
-class SdrObjMacroHitRec
-{
-public:
- Point aPos;
- Point aDownPos;
- OutputDevice* pOut;
- const SetOfByte* pVisiLayer;
- const SdrPageView* pPageView;
- USHORT nTol;
- bool bDown;
-
-public:
- SdrObjMacroHitRec()
- : pOut(NULL),
- pVisiLayer(NULL),
- pPageView(NULL),
- nTol(0),
- bDown(FALSE)
- {}
-};
-
-//************************************************************
// Hilfsklasse SdrObjUserData
//
// Anwenderdaten an einem Zeichenobjekt, z.B. applikationsspezifische Daten.
diff --git a/binfilter/inc/bf_svx/unolingu.hxx b/binfilter/inc/bf_svx/unolingu.hxx
index 5730467..c31be40 100644
--- a/binfilter/inc/bf_svx/unolingu.hxx
+++ b/binfilter/inc/bf_svx/unolingu.hxx
@@ -46,24 +46,6 @@ class LinguMgrExitLstnr;
//#define DIC_ERR_ENTRY_NOTEXISTS 6
///////////////////////////////////////////////////////////////////////////
-// SvxLinguConfigUpdate
-// class to update configuration items when (before!) the linguistic is used.
-//
-// This class is called by all the dummy implementations to update all of the
-// configuration (list of used/available services) when the linguistic is
-// accessed for the first time.
-
-class SvxLinguConfigUpdate
-{
- static BOOL bUpdated;
-
-public:
-
- static BOOL IsUpdated() { return bUpdated; }
- static void UpdateAll();
-};
-
-///////////////////////////////////////////////////////////////////////////
class LinguMgr
{
diff --git a/binfilter/inc/bf_sw/acmplwrd.hxx b/binfilter/inc/bf_sw/acmplwrd.hxx
deleted file mode 100644
index f40435f..0000000
--- a/binfilter/inc/bf_sw/acmplwrd.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _ACMPLWRD_HXX
-#define _ACMPLWRD_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-
-#define _SVSTDARR_STRINGSISORTDTOR
-#include <bf_svtools/svstdarr.hxx>
-namespace binfilter {
-
-class SwDoc;
-class SwAutoCompleteWord_Impl;
-class SwAutoCompleteClient;
-
-class SwAutoCompleteWord
-{
- friend class SwAutoCompleteClient;
-
- SvStringsISortDtor aWordLst; // contains extended strings carrying source information
- SvPtrarr aLRULst;
-
- SwAutoCompleteWord_Impl* pImpl;
- USHORT nMaxCount, nMinWrdLen;
- BOOL bLockWordLst;
-
- void DocumentDying(const SwDoc& rDoc);
-public:
- SwAutoCompleteWord( USHORT nWords = 500, USHORT nMWrdLen = 10 );
- ~SwAutoCompleteWord();
-
- BOOL InsertWord( const String& rWord, SwDoc& rDoc );
-
-
-
- USHORT Count() const { return aWordLst.Count(); }
-
- const String& operator[]( USHORT n ) const { return *aWordLst[ n ]; }
-
- BOOL IsLockWordLstLocked() const { return bLockWordLst; }
- void SetLockWordLstLocked( BOOL bFlag ) { bLockWordLst = bFlag; }
-
- USHORT GetMaxCount() const { return nMaxCount; }
-
- USHORT GetMinWordLen() const { return nMinWrdLen; }
-
- const SvStringsISortDtor& GetWordList() const { return aWordLst; }
-};
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index f212c9c..3e1a1d3 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -93,7 +93,6 @@ class SvStringsSort;
class SvxAutoCorrDoc;
class SvxLinkManager;
class SvxBorderLine;
-class SwAutoCompleteWord;
class SwAutoCorrExceptWord;
class SwBookmark;
class SwBookmarks;
@@ -159,7 +158,6 @@ class SwTableBoxFmt;
class SwTableFmt;
class SwTableLineFmt;
class SwTableNode;
-class SwTextBlocks;
class SwTxtFld;
class SwTxtFmtColl;
class SwTxtFmtColls;
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index 10dee27..9ff21ce 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -62,7 +62,6 @@ struct SwDocStat;
class SfxDocumentInfo;
class SvStringsSort;
-class SwAutoCompleteWord;
class SwFmtRefMark;
class SwFmtCol;
@@ -83,7 +82,6 @@ class SwTxtNode; // fuer IsNotMakeTxtNode
class SwFmtINetFmt; // InsertURL
class SwTable;
-class SwTextBlocks; // fuer GlossaryRW
class SwBlockExceptList;
class SwFmtFtn;
class SpellCheck;
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 55c5532..e0c75e2 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -366,20 +366,6 @@ public:
class SwImpBlocks;
-class SwTextBlocks
-{
- friend class Sw2TextBlocks;
- friend class Sw3IoImp;
- SwImpBlocks* pImp;
- ULONG nErr;
-
-public:
- void Flush(){}
-
- ULONG GetError() const { return nErr; }
-};
-
-
extern void _InitFilter();
extern void _FinitFilter();
extern SwRead ReadRtf, ReadAscii, ReadSwg, ReadSw3, ReadHTML;
More information about the Libreoffice-commits
mailing list