Remove unused macros

Change-Id: I38c27fc9d9dc8ed3cf9a08360bddb9c7567857dc

22 files changed, 0 insertions, 700 deletions

diff --git a/binfilter/bf_forms/source/inc/property.hxx b/binfilter/bf_forms/source/inc/property.hxx
index c438bad6a..18e45e547 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 013b30c22..d05e6d05b 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 b36170064..975c3e868 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 238edc2d4..5ac2f7864 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 cb937880a..7fda4cb99 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 78ebc4be3..e466cf536 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 8cae1d8f1..af53c0940 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 f73d2fbcc..398efee64 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 6d24374c5..30bea0537 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 30e99a5e8..eda6e30d7 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 abca47807..9ae42f0bb 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 3842af5de..86b3d3d9b 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 0ad4a1f29..bfd37618b 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 4559f932c..5520107e8 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 48d61c48d..3a753bd63 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 aa2c4aeac..7b88fce0a 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 1df1609d5..7df8bed86 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 dc73d17c3..73dd4bfb7 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 02020d7dc..15249a338 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 3bb7148e9..312264ef9 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 d087fcab8..a1a0167a4 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 7697cc792..dc77ed05f 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