[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

Gert Faller gfaller at kemper.freedesktop.org
Sun Dec 12 01:46:22 PST 2010


 binfilter/bf_svtools/source/svdde/ddeimp.hxx |    6 +--
 binfilter/inc/bf_sfx2/docfac.hxx             |   50 +++++++++++++--------------
 binfilter/inc/bf_so3/iface.hxx               |   10 ++---
 binfilter/inc/bf_svx/svdmodel.hxx            |    4 +-
 binfilter/inc/bf_svx/svdpagv.hxx             |    2 -
 5 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit 26ab051a0d2c9298b2aabefb57323dfba7f2f392
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sun Dec 12 10:45:51 2010 +0100

    cleaning of __EXPORT define

diff --git a/binfilter/bf_svtools/source/svdde/ddeimp.hxx b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
index 17e5ae1..950617f 100644
--- a/binfilter/bf_svtools/source/svdde/ddeimp.hxx
+++ b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
@@ -100,11 +100,11 @@ public:
            ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
 #else
 #if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
-    static HDDEDATA CALLBACK __EXPORT CliCallback
+    static HDDEDATA CALLBACK CliCallback
            ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-    static HDDEDATA CALLBACK __EXPORT SvrCallback
+    static HDDEDATA CALLBACK SvrCallback
            ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-    static HDDEDATA CALLBACK __EXPORT InfCallback
+    static HDDEDATA CALLBACK InfCallback
            ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
 #else
     static HDDEDATA CALLBACK _export CliCallback
diff --git a/binfilter/inc/bf_sfx2/docfac.hxx b/binfilter/inc/bf_sfx2/docfac.hxx
index 812d4b2..085d11c 100644
--- a/binfilter/inc/bf_sfx2/docfac.hxx
+++ b/binfilter/inc/bf_sfx2/docfac.hxx
@@ -269,7 +269,7 @@ public:																\
                                                                             \
         SO2_IMPL_BASIC_CLASS1( Class, SfxObjectFactory, SfxInPlaceObject, aGlobName ) \
                                                                             \
-        SfxObjectShell* __EXPORT Class::CreateObject(SfxObjectCreateMode eMode) \
+        SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \
         { return new Class(eMode); }                						\
                                                                             \
         void Class::RegisterFactory( USHORT nPrio )                         \
@@ -284,24 +284,24 @@ public:																\
             pObjectFactory->Register(); /* Ole Anmeldung */                 \
         }                                                                   \
                                                                             \
-        BOOL __EXPORT Class::DoInitNew( SvStorage *pStor )					\
+        BOOL Class::DoInitNew( SvStorage *pStor )					\
         { return SfxObjectShell::DoInitNew(pStor); }                        \
                                                                             \
-        BOOL __EXPORT Class::DoClose()										\
+        BOOL Class::DoClose()										\
         { return SfxInPlaceObject::DoClose(); }								\
                                                                             \
-        BOOL __EXPORT Class::Close()										\
+        BOOL Class::Close()										\
         {   SvObjectRef aRef(this);											\
             SfxInPlaceObject::Close();                             			\
             return SfxObjectShell::Close(); }								\
                                                                             \
-        void __EXPORT Class::ModifyChanged()								\
+        void Class::ModifyChanged()								\
         { SfxObjectShell::ModifyChanged(); }                                \
                                                                             \
-        SfxObjectFactory& __EXPORT Class::GetFactory() const				\
+        SfxObjectFactory& Class::GetFactory() const				\
         {   return *(SfxObjectFactory*)ClassFactory(); }                     \
                                                                             \
-        void __EXPORT Class::InitFactory()
+        void Class::InitFactory()
 
 //---------------------------------------------------------------------------
 /*	SFX_IMPL_MODULE_LIB
@@ -330,7 +330,7 @@ extern "C"
 #define SFX_IMPL_MODULE_LIB( LibName, LibString )					\
     void * GetFunc##LibName( const char * pFuncName );				\
     static ::osl::Module* pLibHandle##LibName = NULL; 				\
-    BOOL __EXPORT LoadLib##LibName()   								\
+    BOOL LoadLib##LibName()   								\
     {																\
         if( pLibHandle##LibName == NULL )							\
         {															\
@@ -344,7 +344,7 @@ extern "C"
         }															\
         return pLibHandle##LibName->is();   						\
     }																\
-    void __EXPORT FreeLib##LibName()								\
+    void FreeLib##LibName()								\
     {																\
         if( pLibHandle##LibName && pLibHandle##LibName->is() )      \
         {															\
@@ -354,7 +354,7 @@ extern "C"
                 (*fFunc)();											\
         }															\
     }																\
-    void* __EXPORT GetFunc##LibName( const char * pFuncName )		\
+    void* GetFunc##LibName( const char * pFuncName )		\
     {																\
         if( LoadLib##LibName() )									\
             return pLibHandle##LibName->getSymbol( ::rtl::OUString::createFromAscii(pFuncName) );\
@@ -429,12 +429,12 @@ extern "C"
 // Gemeinsame Funktionen in DLL und LIB
 #define SFX_IMPL_OBJECTFACTORY_GEN( Class, LibType )						\
                                                                             \
-        SfxObjectShell* __EXPORT Class::CreateObject(SfxObjectCreateMode eMode) \
+        SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \
         {																	\
             SfxObjectShell* pDoc = CreateObj##Class##LibType((int)eMode); \
             return pDoc;													\
         }																	\
-        SfxObjectFactory& __EXPORT Class::GetFactory() const				\
+        SfxObjectFactory& Class::GetFactory() const				\
         { 																	\
             return Factory();                                               \
         }
@@ -450,7 +450,7 @@ extern "C"
                 return (ClassName *)(*fCreate)();								  \
             return NULL;														  \
         }																		  \
-        SotFactory* __EXPORT ClassName::ClassFactory()                                     \
+        SotFactory* ClassName::ClassFactory()                                     \
         {                                                                         \
             if( !pObjectFactory )                                                     \
             {                                                                     \
@@ -460,7 +460,7 @@ extern "C"
             }                                                                     \
             return pObjectFactory;                                                    \
         }                                                                         \
-        void* __EXPORT ClassName::CreateInstance( SotObject ** ppObj )            \
+        void* ClassName::CreateInstance( SotObject ** ppObj )            \
         {                                                                         \
             ClassName * p = Create##ClassName##Lib();                         	  \
             SfxInPlaceObject* pSuper1 = p;                 						  \
@@ -469,7 +469,7 @@ extern "C"
                 *ppObj = pBasicObj;                                               \
             return p;                                                             \
         }																		  \
-        void __EXPORT ClassName::RegisterFactory( USHORT nPrio )			\
+        void ClassName::RegisterFactory( USHORT nPrio )			\
         {																	\
             Factory().Construct(											\
                 nPrio,														\
@@ -478,7 +478,7 @@ extern "C"
             Factory().RegisterInitFactory( &InitFactory );                  \
             Factory().Register();                                           \
         }																	\
-        ClassName* __EXPORT CreateObj##ClassName##Lib(int nMode)				\
+        ClassName* CreateObj##ClassName##Lib(int nMode)				\
         {																	\
             SfxCreateExtern_TYPE fCreate = (SfxCreateExtern_TYPE)			\
                 GetFunc##LibName( "CreateObj" #ClassName "Dll");            \
@@ -489,7 +489,7 @@ extern "C"
                                                                             \
         SFX_IMPL_OBJECTFACTORY_GEN( ClassName, Lib )						\
                                                                             \
-        void __EXPORT ClassName::InitFactory()
+        void ClassName::InitFactory()
 
 // Funktionen und Methoden in der DLL
 #define SFX_IMPL_OBJECTFACTORY_LOD( Class, ShortName, aGlobName, LibName ) \
@@ -544,10 +544,10 @@ extern "C"
                                                                             \
         SfxObjectFactory* Class::pObjectFactory = 0;						\
                                                                             \
-        SfxObjectShell* __EXPORT Class::CreateObject(SfxObjectCreateMode eMode) \
+        SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \
         { return new Class(eMode); }                						\
                                                                             \
-        SfxObjectFactory& __EXPORT Class::Factory()                                     \
+        SfxObjectFactory& Class::Factory()                                     \
         {                                                                         \
             if( !pObjectFactory )                                                     \
             {                                                                     \
@@ -565,10 +565,10 @@ extern "C"
             Factory().RegisterInitFactory( &InitFactory   );          \
         }                                                                   \
                                                                             \
-        SfxObjectFactory& __EXPORT Class::GetFactory() const				\
+        SfxObjectFactory& Class::GetFactory() const				\
         {   return Factory(); }                                             \
                                                                             \
-        void __EXPORT Class::InitFactory()
+        void Class::InitFactory()
 
 //--------------------------------------------------------------------
 
@@ -617,7 +617,7 @@ extern "C"
 
 #define SFX_IMPL_SIMPLE_OBJECTFACTORY_LIB( Class, nFlags, ShortName, LibName, FactoryPtr ) \
     SfxObjectFactory* Class::pObjectFactory = 0;                        \
-    SfxObjectFactory& __EXPORT Class::Factory()                                     \
+    SfxObjectFactory& Class::Factory()                                     \
     {                                                                         \
         if( !pObjectFactory )                                                     \
         {                                                                     \
@@ -626,7 +626,7 @@ extern "C"
         }                                                                     \
         return *pObjectFactory;                                                    \
     }                                                                         \
-    void __EXPORT Class::RegisterFactory( USHORT nPrio )					  \
+    void Class::RegisterFactory( USHORT nPrio )					  \
     {																		  \
             Factory().Construct(                                        \
                 nPrio,														  \
@@ -644,10 +644,10 @@ extern "C"
         return 0;															  \
     }																		  \
                                                                               \
-    SfxObjectFactory& __EXPORT Class::GetFactory() const 					  \
+    SfxObjectFactory& Class::GetFactory() const 					  \
         { return Factory(); }                                                \
                                                                               \
-    void __EXPORT Class::InitFactory()
+    void Class::InitFactory()
 
 //--------------------------------------------------------------------
 
diff --git a/binfilter/inc/bf_so3/iface.hxx b/binfilter/inc/bf_so3/iface.hxx
index 0fbf093..bcb88c4 100644
--- a/binfilter/inc/bf_so3/iface.hxx
+++ b/binfilter/inc/bf_so3/iface.hxx
@@ -73,7 +73,7 @@ class  SvSoIPCService;
 /**************************************************************************
 **************************************************************************/
 #define SO2_IMPL_INTERFACE(ClassName)                                     \
-::IUnknown * __EXPORT ClassName::GetInterface( const SvGlobalName & rName ) \
+::IUnknown * ClassName::GetInterface( const SvGlobalName & rName ) \
 {                                                                         \
     ::IUnknown * p = GetMemberInterface( rName );                           \
     return p;                                                             \
@@ -92,7 +92,7 @@ SotFactory * ClassName::pFactory = NULL;                                   \
 /**************************************************************************
 **************************************************************************/
 #define SO2_IMPL_INTERFACE1(ClassName,Super1)                             \
-::IUnknown * __EXPORT ClassName::GetInterface( const SvGlobalName & rName ) \
+::IUnknown * ClassName::GetInterface( const SvGlobalName & rName ) \
 {                                                                         \
     ::IUnknown * p = GetMemberInterface( rName );                           \
     if( !p )                                                              \
@@ -120,7 +120,7 @@ SO2_IMPL_CLASS1_DLL(ClassName,FactoryName,Super1,                     \
 /**************************************************************************
 **************************************************************************/
 #define SO2_IMPL_INTERFACE2(ClassName,Super1,Super2)                          \
-::IUnknown * __EXPORT ClassName::GetInterface( const SvGlobalName & rName ) \
+::IUnknown * ClassName::GetInterface( const SvGlobalName & rName ) \
 {                                                                         \
     ::IUnknown * p = GetMemberInterface( rName );                           \
     if( !p )                                                              \
@@ -150,7 +150,7 @@ SotFactory * ClassName::pFactory = NULL;                                   \
 /**************************************************************************
 **************************************************************************/
 #define SO2_IMPL_INTERFACE3(ClassName,Super1,Super2,Super3)               \
-::IUnknown * __EXPORT ClassName::GetInterface( const SvGlobalName & rName ) \
+::IUnknown * ClassName::GetInterface( const SvGlobalName & rName ) \
 {                                                                         \
     ::IUnknown * p = GetMemberInterface( rName );                           \
     if( !p )                                                              \
@@ -182,7 +182,7 @@ SotFactory * ClassName::pFactory = NULL;                                   \
 /**************************************************************************
 **************************************************************************/
 #define SO2_IMPL_INTERFACE4(ClassName,Super1,Super2,Super3,Super4)        \
-::IUnknown * __EXPORT ClassName::GetInterface( const SvGlobalName & rName ) \
+::IUnknown * ClassName::GetInterface( const SvGlobalName & rName ) \
 {                                                                         \
     ::IUnknown * p = GetMemberInterface( rName );                           \
     if( !p )                                                              \
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index da3eac0..b708125 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -628,7 +628,7 @@ public:
 
     // Hier kann die Applikation einen Handler setzen, der die auflaufenden
     // UndoActions einsammelt. Der Handler hat folgendes Aussehen:
-    //   void __EXPORT NotifyUndoActionHdl(SfxUndoAction* pUndoAction);
+    //   void NotifyUndoActionHdl(SfxUndoAction* pUndoAction);
     // Beim Aufruf des Handlers findet eine Eigentumsuebereignung statt; die
     // UndoAction gehoert somit dem Handler, nicht mehr dem SdrModel.
     void        SetNotifyUndoActionHdl(const Link& rLink)    { aUndoLink=rLink; }
@@ -637,7 +637,7 @@ public:
     // Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen
     // wird und ungefaehre Auskunft ueber den Fortschreitungszustand der
     // Funktion gibt. Der Handler muss folgendes Aussehen haben:
-    //   void __EXPORT class::IOProgressHdl(const USHORT& nPercent);
+    //   void class::IOProgressHdl(const USHORT& nPercent);
     // Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte
     // mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99.
     // Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei
diff --git a/binfilter/inc/bf_svx/svdpagv.hxx b/binfilter/inc/bf_svx/svdpagv.hxx
index 92965fe..334dc8a 100644
--- a/binfilter/inc/bf_svx/svdpagv.hxx
+++ b/binfilter/inc/bf_svx/svdpagv.hxx
@@ -357,7 +357,7 @@ public:
     // Painten aller Objekte eines Layer der Page ohne MasterPage
     // pOut==NULL -> alle OutputDevices
     // Der Handler in pPaintProc hat folgendes aussehen:
-    // void __EXPORT class::PaintProcHdl(const SdrPaintProcRec& rPaintProcRec);
+    // void class::PaintProcHdl(const SdrPaintProcRec& rPaintProcRec);
 
 
     // MasterPage ueber VirtualDevice Painten


More information about the Libreoffice-commits mailing list