[Libreoffice-commits] .: sot/inc svl/source tools/inc
Gert Faller
gfaller at kemper.freedesktop.org
Sun Dec 12 01:34:29 PST 2010
sot/inc/sot/object.hxx | 50 ++++++++++++++++++++++----------------------
svl/source/svdde/ddeimp.hxx | 6 ++---
tools/inc/tools/link.hxx | 6 ++---
3 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 28274c945acb8b6eac1bd318674eb12b7e1bd126
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Dec 12 10:33:58 2010 +0100
cleaning of __EXPORT define
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index c59fc90..96796b9 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -46,35 +46,35 @@
void TestMemberInvariant( BOOL bPrint );
#define SO2_IMPL_INVARIANT(ClassName) \
-void __EXPORT ClassName::TestObjRef( BOOL bFree ) \
+void ClassName::TestObjRef( BOOL bFree ) \
{ \
TestMemberObjRef( bFree ); \
} \
-void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
+void ClassName::TestInvariant( BOOL bPrint ) \
{ \
TestMemberInvariant( bPrint ); \
}
#define SO2_IMPL_INVARIANT1(ClassName,Super1) \
-void __EXPORT ClassName::TestObjRef( BOOL bFree ) \
+void ClassName::TestObjRef( BOOL bFree ) \
{ \
TestMemberObjRef( bFree ); \
Super1::TestObjRef( bFree ); \
} \
-void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
+void ClassName::TestInvariant( BOOL bPrint ) \
{ \
TestMemberInvariant( bPrint ); \
Super1::TestInvariant( bPrint ); \
}
#define SO2_IMPL_INVARIANT2(ClassName,Super1,Super2) \
-void __EXPORT ClassName::TestObjRef( BOOL bFree ) \
+void ClassName::TestObjRef( BOOL bFree ) \
{ \
TestMemberObjRef( bFree ); \
Super1::TestObjRef( bFree ); \
Super2::TestObjRef( bFree ); \
} \
-void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
+void ClassName::TestInvariant( BOOL bPrint ) \
{ \
TestMemberInvariant( bPrint ); \
Super1::TestInvariant( bPrint ); \
@@ -82,14 +82,14 @@ void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
}
#define SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3) \
-void __EXPORT ClassName::TestObjRef( BOOL bFree ) \
+void ClassName::TestObjRef( BOOL bFree ) \
{ \
TestMemberObjRef( bFree ); \
Super1::TestObjRef( bFree ); \
Super2::TestObjRef( bFree ); \
Super3::TestObjRef( bFree ); \
} \
-void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
+void ClassName::TestInvariant( BOOL bPrint ) \
{ \
TestMemberInvariant( bPrint ); \
Super1::TestInvariant( bPrint ); \
@@ -98,7 +98,7 @@ void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
}
#define SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4) \
-void __EXPORT ClassName::TestObjRef( BOOL bFree ) \
+void ClassName::TestObjRef( BOOL bFree ) \
{ \
TestMemberObjRef( bFree ); \
Super1::TestObjRef( bFree ); \
@@ -106,7 +106,7 @@ void __EXPORT ClassName::TestObjRef( BOOL bFree ) \
Super3::TestObjRef( bFree ); \
Super4::TestObjRef( bFree ); \
} \
-void __EXPORT ClassName::TestInvariant( BOOL bPrint ) \
+void ClassName::TestInvariant( BOOL bPrint ) \
{ \
TestMemberInvariant( bPrint ); \
Super1::TestInvariant( bPrint ); \
@@ -171,18 +171,18 @@ SotFactory * ClassName::ClassFactory() \
} \
return *ppFactory; \
} \
-void * __EXPORT ClassName::CreateInstance( SotObject ** ppObj ) \
+void * ClassName::CreateInstance( SotObject ** ppObj ) \
{ \
ClassName * p = new ClassName(); \
if( ppObj ) \
*ppObj = p; \
return p; \
} \
-const SotFactory * __EXPORT ClassName::GetSvFactory() const \
+const SotFactory * ClassName::GetSvFactory() const \
{ \
return ClassFactory(); \
} \
-void * __EXPORT ClassName::Cast( const SotFactory * pFact ) \
+void * ClassName::Cast( const SotFactory * pFact ) \
{ \
void * pRet = NULL; \
if( !pFact || pFact == ClassFactory() ) \
@@ -209,7 +209,7 @@ SotFactory * ClassName::ClassFactory() \
} \
return *ppFactory; \
} \
-void * __EXPORT ClassName::CreateInstance( SotObject ** ppObj ) \
+void * ClassName::CreateInstance( SotObject ** ppObj ) \
{ \
ClassName * p = new ClassName(); \
Super1* pSuper1 = p; \
@@ -218,11 +218,11 @@ void * __EXPORT ClassName::CreateInstance( SotObject ** ppObj ) \
*ppObj = pBasicObj; \
return p; \
} \
-const SotFactory * __EXPORT ClassName::GetSvFactory() const \
+const SotFactory * ClassName::GetSvFactory() const \
{ \
return ClassFactory(); \
} \
-void * __EXPORT ClassName::Cast( const SotFactory * pFact ) \
+void * ClassName::Cast( const SotFactory * pFact ) \
{ \
void * pRet = NULL; \
if( !pFact || pFact == ClassFactory() ) \
@@ -252,18 +252,18 @@ SotFactory * ClassName::ClassFactory() \
} \
return *ppFactory; \
} \
-void * __EXPORT ClassName::CreateInstance( SotObject ** ppObj ) \
+void * ClassName::CreateInstance( SotObject ** ppObj ) \
{ \
ClassName * p = new ClassName(); \
if( ppObj ) \
*ppObj = p; \
return p; \
} \
-const SotFactory * __EXPORT ClassName::GetSvFactory() const \
+const SotFactory * ClassName::GetSvFactory() const \
{ \
return ClassFactory(); \
} \
-void * __EXPORT ClassName::Cast( const SotFactory * pFact ) \
+void * ClassName::Cast( const SotFactory * pFact ) \
{ \
void * pRet = NULL; \
if( !pFact || pFact == ClassFactory() ) \
@@ -295,18 +295,18 @@ SotFactory * ClassName::ClassFactory() \
} \
return *pFactory; \
} \
-void * __EXPORT ClassName::CreateInstance( SotObject ** ppObj ) \
+void * ClassName::CreateInstance( SotObject ** ppObj ) \
{ \
ClassName * p = new ClassName(); \
if( ppObj ) \
*ppObj = p; \
return p; \
} \
-const SotFactory * __EXPORT ClassName::GetSvFactory() const \
+const SotFactory * ClassName::GetSvFactory() const \
{ \
return ClassFactory(); \
} \
-void * __EXPORT ClassName::Cast( const SotFactory * pFact ) \
+void * ClassName::Cast( const SotFactory * pFact ) \
{ \
void * pRet = NULL; \
if( !pFact || pFact == ClassFactory() ) \
@@ -342,18 +342,18 @@ SotFactory * ClassName::ClassFactory() \
} \
return *ppFactory; \
} \
-void * __EXPORT ClassName::CreateInstance( SotObject ** ppObj ) \
+void * ClassName::CreateInstance( SotObject ** ppObj ) \
{ \
ClassName * p = new ClassName(); \
if( ppObj ) \
*ppObj = p; \
return p; \
} \
-const SotFactory * __EXPORT ClassName::GetSvFactory() const \
+const SotFactory * ClassName::GetSvFactory() const \
{ \
return ClassFactory(); \
} \
-void * __EXPORT ClassName::Cast( const SotFactory * pFact ) \
+void * ClassName::Cast( const SotFactory * pFact ) \
{ \
void * pRet = NULL; \
if( !pFact || pFact == ClassFactory() ) \
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 61be170..9c94086 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -96,11 +96,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/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx
index e2f80a1..ad82c1b 100644
--- a/tools/inc/tools/link.hxx
+++ b/tools/inc/tools/link.hxx
@@ -57,16 +57,16 @@ typedef long (*PSTUB)( void*, void* );
long Class::Method( ArgType ArgName )
#define IMPL_STUB(Class, Method, ArgType) \
- long __EXPORT Class::LinkStub##Method( void* pThis, void* pCaller) \
+ long Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
return ((Class*)pThis )->Method( (ArgType)pCaller ); \
}
#define IMPL_STATIC_LINK( Class, Method, ArgType, ArgName ) \
- long __EXPORT Class::Method( Class* pThis, ArgType ArgName )
+ long Class::Method( Class* pThis, ArgType ArgName )
#define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
- long __EXPORT Class::Method( Class*, ArgType ArgName )
+ long Class::Method( Class*, ArgType ArgName )
#define LINK( Inst, Class, Member ) \
Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member )
More information about the Libreoffice-commits
mailing list