[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff

Gert Faller gfaller at kemper.freedesktop.org
Sat Dec 11 14:12:57 PST 2010


 binfilter/bf_basic/source/classes/sb.cxx            |    4 
 binfilter/bf_sc/source/core/data/sc_attrib.cxx      |   94 ++++----
 binfilter/bf_sc/source/core/data/sc_cell.cxx        |    2 
 binfilter/bf_sc/source/core/data/sc_docpool.cxx     |    6 
 binfilter/bf_sc/source/core/data/sc_drawpage.cxx    |    2 
 binfilter/bf_sc/source/core/data/sc_drwlayer.cxx    |   12 -
 binfilter/bf_sc/source/core/data/sc_global2.cxx     |   22 +-
 binfilter/bf_sc/source/core/data/sc_pagepar.cxx     |    8 
 binfilter/bf_sc/source/core/data/sc_patattr.cxx     |   10 
 binfilter/bf_sc/source/core/data/sc_stlpool.cxx     |    6 
 binfilter/bf_sc/source/core/data/sc_stlsheet.cxx    |   10 
 binfilter/bf_sc/source/core/data/sc_userdat.cxx     |    8 
 binfilter/bf_sc/source/core/tool/sc_chartlis.cxx    |    2 
 binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx    |    2 
 binfilter/bf_sc/source/core/tool/sc_ddelink.cxx     |    4 
 binfilter/bf_sc/source/core/tool/sc_editutil.cxx    |    4 
 binfilter/bf_sc/source/core/tool/sc_userlist.cxx    |    2 
 binfilter/bf_sc/source/core/tool/sc_viewopti.cxx    |    2 
 binfilter/bf_sc/source/ui/app/sc_msgpool.cxx        |    4 
 binfilter/bf_sc/source/ui/app/sc_sclib.cxx          |    2 
 binfilter/bf_sc/source/ui/app/sc_uiitems.cxx        |   14 -
 binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx  |    4 
 binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx     |   20 -
 binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx    |    2 
 binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx    |    2 
 binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx    |    4 
 binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx   |    4 
 binfilter/bf_sch/source/ui/app/sch_schdll.cxx       |    4 
 binfilter/bf_sch/source/ui/app/sch_schlib.cxx       |   22 +-
 binfilter/bf_sd/source/ui/app/sd_sdlib.cxx          |    2 
 binfilter/bf_svtools/source/svdde/svt_ddecli.cxx    |    6 
 binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx    |    2 
 binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx    |   18 -
 binfilter/bf_svx/source/editeng/svx_editeng.cxx     |   18 -
 binfilter/bf_svx/source/editeng/svx_editobj.cxx     |   24 +-
 binfilter/bf_svx/source/editeng/svx_editsel.cxx     |   14 -
 binfilter/bf_svx/source/editeng/svx_editundo.cxx    |   30 +-
 binfilter/bf_svx/source/engine3d/svx_float3d.cxx    |    2 
 binfilter/bf_svx/source/items/svx_flditem.cxx       |   40 +--
 binfilter/bf_svx/source/items/svx_rotmodit.cxx      |   10 
 binfilter/bf_svx/source/outliner/svx_outliner.cxx   |    2 
 binfilter/bf_svx/source/svdraw/svx_svdattr.cxx      |  214 ++++++++++----------
 binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx      |    2 
 binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx      |    2 
 binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx     |    2 
 binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx     |    2 
 binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx     |    2 
 binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx     |   12 -
 binfilter/bf_svx/source/svdraw/svx_svdopage.cxx     |    2 
 binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx     |    2 
 binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx     |    2 
 binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx      |    2 
 binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx      |    2 
 binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx     |   10 
 binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx   |   14 -
 binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx |    4 
 binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx     |    2 
 binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx     |    2 
 binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx |    2 
 59 files changed, 365 insertions(+), 365 deletions(-)

New commits:
commit d28e038f7a60b209324282192407c960149a3695
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sat Dec 11 23:12:19 2010 +0100

    cleaning of __EXPORT define

diff --git a/binfilter/bf_basic/source/classes/sb.cxx b/binfilter/bf_basic/source/classes/sb.cxx
index ef00f54..e0881ee 100644
--- a/binfilter/bf_basic/source/classes/sb.cxx
+++ b/binfilter/bf_basic/source/classes/sb.cxx
@@ -862,7 +862,7 @@ BOOL StarBASIC::IsRunning()
 *
 **************************************************************************/
 
-USHORT __EXPORT StarBASIC::BreakHdl()
+USHORT StarBASIC::BreakHdl()
 {
     return (USHORT) ( aBreakHdl.IsSet()
         ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
@@ -1042,7 +1042,7 @@ void StarBASIC::Error( SbError /*n*/, const String& /*rMsg*/ ) { }
 
 void StarBASIC::FatalError( SbError /*n*/ ) { }
 
-BOOL __EXPORT StarBASIC::ErrorHdl()
+BOOL StarBASIC::ErrorHdl()
 {
     return (BOOL) ( aErrorHdl.IsSet()
         ? aErrorHdl.Call( this ) : FALSE );
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index 0b59fbc..db60d41 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -104,7 +104,7 @@ using namespace ::com::sun::star;
 /*N*/ 	nRowMerge = rItem.nRowMerge;
 /*N*/ }
 
-/*N*/ __EXPORT ScMergeAttr::~ScMergeAttr()
+/*N*/ ScMergeAttr::~ScMergeAttr()
 /*N*/ {
 /*N*/ }
 
@@ -113,7 +113,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ int __EXPORT ScMergeAttr::operator==( const SfxPoolItem& rItem ) const
+/*N*/ int ScMergeAttr::operator==( const SfxPoolItem& rItem ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" );
 /*N*/ 	return (Which() == rItem.Which())
@@ -123,14 +123,14 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScMergeAttr::Clone( SfxItemPool * ) const
+/*N*/ SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/ 	return new ScMergeAttr(*this);
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScMergeAttr::Create( SvStream& rStream, USHORT nVer ) const
+/*N*/ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	INT16	nCol;
 /*N*/ 	INT16	nRow;
@@ -141,7 +141,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SvStream& __EXPORT ScMergeAttr::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScMergeAttr::Store( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	rStream << nColMerge;
 /*N*/ 	rStream << nRowMerge;
@@ -164,7 +164,7 @@ using namespace ::com::sun::star;
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScMergeFlagAttr::~ScMergeFlagAttr()
+/*N*/ ScMergeFlagAttr::~ScMergeFlagAttr()
 /*N*/ {
 /*N*/ }
 
@@ -204,13 +204,13 @@ using namespace ::com::sun::star;
 /*N*/ 	bHidePrint	 = rItem.bHidePrint;
 /*N*/ }
 
-/*N*/ __EXPORT ScProtectionAttr::~ScProtectionAttr()
+/*N*/ ScProtectionAttr::~ScProtectionAttr()
 /*N*/ {
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ bool __EXPORT ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*N*/ {
 /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
 /*N*/     switch ( nMemberId  )
@@ -241,7 +241,7 @@ using namespace ::com::sun::star;
 /*N*/ 	return true;
 /*N*/ }
 
-/*N*/ bool __EXPORT ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
 /*N*/ {
 /*N*/ 	bool bRet = false;
 /*N*/   sal_Bool bVal;
@@ -286,7 +286,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ int __EXPORT ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const
+/*N*/ int ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" );
 /*N*/ 	return (Which() == rItem.Which())
@@ -298,14 +298,14 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScProtectionAttr::Clone( SfxItemPool * ) const
+/*N*/ SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const
 /*N*/ {
 /*N*/ 	return new ScProtectionAttr(*this);
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScProtectionAttr::Create( SvStream& rStream, USHORT n ) const
+/*N*/ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, USHORT n ) const
 /*N*/ {
 /*N*/ 	BOOL bProtect;
 /*N*/ 	BOOL bHFormula;
@@ -322,7 +322,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SvStream& __EXPORT ScProtectionAttr::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScProtectionAttr::Store( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	rStream << bProtection;
 /*N*/ 	rStream << bHideFormula;
@@ -354,7 +354,7 @@ using namespace ::com::sun::star;
 
 // -----------------------------------------------------------------------
 
-/*N*/ int __EXPORT ScRangeItem::operator==( const SfxPoolItem& rAttr ) const
+/*N*/ int ScRangeItem::operator==( const SfxPoolItem& rAttr ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
 /*N*/ 
@@ -363,7 +363,7 @@ using namespace ::com::sun::star;
 
 // -----------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScRangeItem::Clone( SfxItemPool* ) const
+/*N*/ SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const
 /*N*/ {
 /*N*/ 	return new ScRangeItem( *this );
 /*N*/ }
@@ -373,14 +373,14 @@ using namespace ::com::sun::star;
 
 //-----------------------------------------------------------------------
 
-/*N*/ USHORT __EXPORT ScRangeItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT ScRangeItem::GetVersion( USHORT nFileVersion ) const
 /*N*/ {
 /*N*/ 	return 2;
 /*N*/ }
 
 //-----------------------------------------------------------------------
 
-/*N*/ SvStream& __EXPORT ScRangeItem::Store( SvStream& rStrm, USHORT nVer ) const
+/*N*/ SvStream& ScRangeItem::Store( SvStream& rStrm, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	rStrm << aRange;
 /*N*/ 	rStrm << nFlags;
@@ -390,7 +390,7 @@ using namespace ::com::sun::star;
 
 //-----------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScRangeItem::Create( SvStream& rStream, USHORT nVersion ) const
+/*N*/ SfxPoolItem* ScRangeItem::Create( SvStream& rStream, USHORT nVersion ) const
 /*N*/ {
 /*N*/ 	ScRange aNewRange;
 /*N*/ 	BOOL	nNewFlags = FALSE;
@@ -473,7 +473,7 @@ using namespace ::com::sun::star;
 
 // -----------------------------------------------------------------------
 
-/*N*/ __EXPORT ScTableListItem::~ScTableListItem()
+/*N*/ ScTableListItem::~ScTableListItem()
 /*N*/ {
 /*N*/ 	delete [] pTabArr;
 /*N*/ }
@@ -489,7 +489,7 @@ using namespace ::com::sun::star;
 
 // -----------------------------------------------------------------------
 
-/*N*/ int __EXPORT ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
+/*N*/ int ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
 /*N*/ 
@@ -513,7 +513,7 @@ using namespace ::com::sun::star;
 
 // -----------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScTableListItem::Clone( SfxItemPool* ) const
+/*N*/ SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const
 /*N*/ {
 /*N*/ 	return new ScTableListItem( *this );
 /*N*/ }
@@ -523,7 +523,7 @@ using namespace ::com::sun::star;
 
 //-----------------------------------------------------------------------
 
-/*N*/ SvStream& __EXPORT ScTableListItem::Store( SvStream& rStrm, USHORT nVer ) const
+/*N*/ SvStream& ScTableListItem::Store( SvStream& rStrm, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	rStrm << nCount;
 /*N*/ 
@@ -536,7 +536,7 @@ using namespace ::com::sun::star;
 
 //-----------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScTableListItem::Create( SvStream& rStrm, USHORT ) const
+/*N*/ SfxPoolItem* ScTableListItem::Create( SvStream& rStrm, USHORT ) const
 /*N*/ {
 /*N*/ 	ScTableListItem* pNewItem;
 /*N*/ 	List			 aList;
@@ -617,7 +617,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScPageHFItem::~ScPageHFItem()
+/*N*/ ScPageHFItem::~ScPageHFItem()
 /*N*/ {
 /*N*/ 	delete pLeftArea;
 /*N*/ 	delete pCenterArea;
@@ -626,7 +626,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ bool __EXPORT ScPageHFItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool ScPageHFItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 /*N*/ {
 /*N*/ 	uno::Reference<sheet::XHeaderFooterContent> xContent =
 /*N*/ 		new ScHeaderFooterContentObj( pLeftArea, pCenterArea, pRightArea );
@@ -635,7 +635,7 @@ using namespace ::com::sun::star;
 /*N*/ 	return true;
 /*N*/ }
 
-/*N*/ bool __EXPORT ScPageHFItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool ScPageHFItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 /*N*/ {
 /*N*/ 	bool bRet = false;
 /*N*/ 	uno::Reference<sheet::XHeaderFooterContent> xContent;
@@ -686,14 +686,14 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ String __EXPORT ScPageHFItem::GetValueText() const
+/*N*/ String ScPageHFItem::GetValueText() const
 /*N*/ {
 /*N*/ 	return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScPageHFItem"));
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ int __EXPORT ScPageHFItem::operator==( const SfxPoolItem& rItem ) const
+/*N*/ int ScPageHFItem::operator==( const SfxPoolItem& rItem ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
 /*N*/ 
@@ -706,14 +706,14 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScPageHFItem::Clone( SfxItemPool* ) const
+/*N*/ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const
 /*N*/ {
 /*N*/ 	return new ScPageHFItem( *this );
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ USHORT __EXPORT ScPageHFItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT ScPageHFItem::GetVersion( USHORT nFileVersion ) const
 /*N*/ {
 /*N*/ 	// 0 = ohne Feldbefehle
 /*N*/ 	// 1 = Titel bzw. Dateiname mit SvxFileField
@@ -783,7 +783,7 @@ using namespace ::com::sun::star;
 
 #define SC_FIELD_COUNT	6
 
-/*N*/ SfxPoolItem* __EXPORT ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
+/*N*/ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	EditTextObject* pLeft	= EditTextObject::Create(rStream);
 /*N*/ 	EditTextObject* pCenter = EditTextObject::Create(rStream);
@@ -939,7 +939,7 @@ using namespace ::com::sun::star;
 /*N*/ 		pArea->Store( rStream );
 /*N*/ }
 
-/*N*/ SvStream& __EXPORT ScPageHFItem::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScPageHFItem::Store( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	if ( pLeftArea && pCenterArea && pRightArea )
 /*N*/ 	{
@@ -999,7 +999,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
+/*N*/ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
 /*N*/ {
 /*N*/ 	delete pLeftArea;
 /*N*/ 	pLeftArea = rNew.Clone();
@@ -1007,7 +1007,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPageHFItem::SetCenterArea( const EditTextObject& rNew )
+/*N*/ void ScPageHFItem::SetCenterArea( const EditTextObject& rNew )
 /*N*/ {
 /*N*/ 	delete pCenterArea;
 /*N*/ 	pCenterArea = rNew.Clone();
@@ -1015,13 +1015,13 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPageHFItem::SetRightArea( const EditTextObject& rNew )
+/*N*/ void ScPageHFItem::SetRightArea( const EditTextObject& rNew )
 /*N*/ {
 /*N*/ 	delete pRightArea;
 /*N*/ 	pRightArea = rNew.Clone();
 /*N*/ }
 
-/*N*/ void __EXPORT ScPageHFItem::SetArea( EditTextObject *pNew, int nArea )
+/*N*/ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea )
 /*N*/ {
 /*N*/ 	switch ( nArea )
 /*N*/ 	{
@@ -1051,7 +1051,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScViewObjectModeItem::~ScViewObjectModeItem()
+/*N*/ ScViewObjectModeItem::~ScViewObjectModeItem()
 /*N*/ {
 /*N*/ }
 
@@ -1063,28 +1063,28 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ USHORT __EXPORT ScViewObjectModeItem::GetValueCount() const
+/*N*/ USHORT ScViewObjectModeItem::GetValueCount() const
 /*N*/ {
 /*N*/ 	return 3;
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScViewObjectModeItem::Clone( SfxItemPool* ) const
+/*N*/ SfxPoolItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const
 /*N*/ {
 /*N*/  	return new ScViewObjectModeItem( *this );
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ USHORT __EXPORT ScViewObjectModeItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT ScViewObjectModeItem::GetVersion( USHORT nFileVersion ) const
 /*N*/ {
 /*N*/ 	return 1;
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScViewObjectModeItem::Create(
+/*N*/ SfxPoolItem* ScViewObjectModeItem::Create(
 /*N*/ 									SvStream&	rStream,
 /*N*/ 									USHORT		nVersion ) const
 /*N*/ {
@@ -1121,14 +1121,14 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ String __EXPORT ScDoubleItem::GetValueText() const
+/*N*/ String ScDoubleItem::GetValueText() const
 /*N*/ {
 /*N*/ 	return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDoubleItem"));
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ int __EXPORT ScDoubleItem::operator==( const SfxPoolItem& rItem ) const
+/*N*/ int ScDoubleItem::operator==( const SfxPoolItem& rItem ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
 /*N*/     const ScDoubleItem& _rItem = (const ScDoubleItem&)rItem;
@@ -1138,14 +1138,14 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScDoubleItem::Clone( SfxItemPool* ) const
+/*N*/ SfxPoolItem* ScDoubleItem::Clone( SfxItemPool* ) const
 /*N*/ {
 /*N*/ 	return new ScDoubleItem( *this );
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxPoolItem* __EXPORT ScDoubleItem::Create( SvStream& rStream, USHORT nVer ) const
+/*N*/ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	double nTmp=0;
 /*N*/ 	rStream >> nTmp;
@@ -1157,7 +1157,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ SvStream& __EXPORT ScDoubleItem::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScDoubleItem::Store( SvStream& rStream, USHORT nVer ) const
 /*N*/ {
 /*N*/ 	rStream << nValue;
 /*N*/ 
@@ -1166,7 +1166,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScDoubleItem::~ScDoubleItem()
+/*N*/ ScDoubleItem::~ScDoubleItem()
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index c35fca2..e0f79f1 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -1405,7 +1405,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ 			ULONG nValidation = ((const SfxUI
 /*N*/ }
 
 
-/*N*/ void __EXPORT ScFormulaCell::SFX_NOTIFY( SfxBroadcaster& rBC,
+/*N*/ void ScFormulaCell::SFX_NOTIFY( SfxBroadcaster& rBC,
 /*N*/ 		const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType )
 /*N*/ {
 /*N*/ 	if ( !pDocument->IsInDtorClear() && !pDocument->GetHardRecalcState() )
diff --git a/binfilter/bf_sc/source/core/data/sc_docpool.cxx b/binfilter/bf_sc/source/core/data/sc_docpool.cxx
index 888137d..8784d5b 100644
--- a/binfilter/bf_sc/source/core/data/sc_docpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_docpool.cxx
@@ -349,7 +349,7 @@ namespace binfilter {
 /*N*/ 	SetVersionMap( 9, 100, 182, pVersionMap9 );
 /*N*/ }
 
-/*N*/ __EXPORT ScDocumentPool::~ScDocumentPool()
+/*N*/ ScDocumentPool::~ScDocumentPool()
 /*N*/ {
 /*N*/ 	Delete();
 /*N*/ 
@@ -532,7 +532,7 @@ namespace binfilter {
 //	wird (Assertions).
 //
 
-/*N*/ const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich )
+/*N*/ const SfxPoolItem& ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich )
 /*N*/ {
 /*N*/ 	if ( rItem.Which() != ATTR_PATTERN )				// nur Pattern ist special
 /*N*/ 		return SfxItemPool::Put( rItem, nWhich );
@@ -547,7 +547,7 @@ namespace binfilter {
 /*N*/ 	return rNew;
 /*N*/ }
 
-/*N*/ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem )
+/*N*/ void ScDocumentPool::Remove( const SfxPoolItem& rItem )
 /*N*/ {
 /*N*/ 	if ( rItem.Which() == ATTR_PATTERN )				// nur Pattern ist special
 /*N*/ 	{
diff --git a/binfilter/bf_sc/source/core/data/sc_drawpage.cxx b/binfilter/bf_sc/source/core/data/sc_drawpage.cxx
index 43559bf..4777100 100644
--- a/binfilter/bf_sc/source/core/data/sc_drawpage.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drawpage.cxx
@@ -50,7 +50,7 @@ namespace binfilter {
 
 // -----------------------------------------------------------------------
 
-/*N*/ __EXPORT ScDrawPage::~ScDrawPage()
+/*N*/ ScDrawPage::~ScDrawPage()
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
index 2ce344a..f13f906 100644
--- a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
@@ -93,7 +93,7 @@ BOOL bDrawIsInUndo = FALSE;			//! Member
 
 // -----------------------------------------------------------------------
 
-/*N*/ __EXPORT ScTabDeletedHint::~ScTabDeletedHint()
+/*N*/ ScTabDeletedHint::~ScTabDeletedHint()
 /*N*/ {
 /*N*/ }
 
@@ -102,7 +102,7 @@ BOOL bDrawIsInUndo = FALSE;			//! Member
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScTabSizeChangedHint::~ScTabSizeChangedHint()
+/*N*/ ScTabSizeChangedHint::~ScTabSizeChangedHint()
 /*N*/ {
 /*N*/ }
 
@@ -216,7 +216,7 @@ BOOL bDrawIsInUndo = FALSE;			//! Member
 /*N*/ 	}
 /*N*/ }
 
-/*N*/ __EXPORT ScDrawLayer::~ScDrawLayer()
+/*N*/ ScDrawLayer::~ScDrawLayer()
 /*N*/ {
 /*N*/ 	Broadcast(SdrHint(HINT_MODELCLEARED));
 /*N*/ 
@@ -231,7 +231,7 @@ BOOL bDrawIsInUndo = FALSE;			//! Member
 /*N*/ }
 
 
-/*N*/ SdrPage* __EXPORT ScDrawLayer::AllocPage(bool bMasterPage)
+/*N*/ SdrPage* ScDrawLayer::AllocPage(bool bMasterPage)
 /*N*/ {
 /*N*/ 	//	don't create basic until it is needed
 /*N*/ 	StarBASIC* pBasic = NULL;
@@ -849,14 +849,14 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ 				RecalcPos( pObj, pData );
 // static:
 
 
-/*N*/ void __EXPORT ScDrawLayer::SetChanged( bool bFlg /* =TRUE */ )
+/*N*/ void ScDrawLayer::SetChanged( bool bFlg /* =TRUE */ )
 /*N*/ {
 /*N*/ 	if ( bFlg && pDoc )
 /*N*/ 		pDoc->SetChartListenerCollectionNeedsUpdate( TRUE );
 /*N*/ 	FmFormModel::SetChanged( bFlg );
 /*N*/ }
 
-/*N*/ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const
+/*N*/ SvStream* ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( pDoc, "ScDrawLayer::GetDocumentStream without document" );
 /*N*/ 	if ( !pDoc )
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index 00ac5cc..c6187c2 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -623,14 +623,14 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScConsolidateParam::~ScConsolidateParam()
+/*N*/ ScConsolidateParam::~ScConsolidateParam()
 /*N*/ {
 /*N*/ 	ClearDataAreas();
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScConsolidateParam::ClearDataAreas()
+/*N*/ void ScConsolidateParam::ClearDataAreas()
 /*N*/ {
 /*N*/ 	if ( ppDataAreas )
 /*N*/ 	{
@@ -644,7 +644,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScConsolidateParam::Clear()
+/*N*/ void ScConsolidateParam::Clear()
 /*N*/ {
 /*N*/ 	ClearDataAreas();
 /*N*/ 
@@ -655,7 +655,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateParam& r )
+/*N*/ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r )
 /*N*/ {
 /*N*/ 	nCol			= r.nCol;
 /*N*/ 	nRow			= r.nRow;
@@ -674,7 +674,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScConsolidateParam::SetAreas( ScArea* const* ppAreas, USHORT nCount )
+/*N*/ void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, USHORT nCount )
 /*N*/ {
 /*N*/ 	ClearDataAreas();
 /*N*/ 	if ( ppAreas && nCount > 0 )
@@ -751,7 +751,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScPivotParam::~ScPivotParam()
+/*N*/ ScPivotParam::~ScPivotParam()
 /*N*/ {
 /*N*/ 	ClearLabelData();
 /*N*/ }
@@ -761,7 +761,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPivotParam::ClearLabelData()
+/*N*/ void ScPivotParam::ClearLabelData()
 /*N*/ {
 /*N*/ 	if ( (nLabels > 0) && ppLabelArr )
 /*N*/ 	{
@@ -778,7 +778,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPivotParam::SetLabelData( LabelData**	pLabArr,
+/*N*/ void ScPivotParam::SetLabelData( LabelData**	pLabArr,
 /*N*/ 										  USHORT		nLab )
 /*N*/ {
 /*N*/ 	ClearLabelData();
@@ -794,7 +794,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPivotParam::SetPivotArrays	( const PivotField*	pColArr,
+/*N*/ void ScPivotParam::SetPivotArrays	( const PivotField*	pColArr,
 /*N*/ 											  const PivotField*	pRowArr,
 /*N*/ 											  const PivotField*	pDataArr,
 /*N*/ 											  USHORT			nColCnt,
@@ -806,7 +806,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001  	ClearPivotArrays();
 
 //------------------------------------------------------------------------
 
-/*N*/ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
+/*N*/ ScPivotParam& ScPivotParam::operator=( const ScPivotParam& r )
 /*N*/ {
 /*N*/ 	nCol			  = r.nCol;
 /*N*/ 	nRow			  = r.nRow;
@@ -898,7 +898,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001  	ClearPivotArrays();
 /*N*/ 	bShown = rCpy.bShown;
 /*N*/ }
 
-/*N*/ __EXPORT ScPostIt::~ScPostIt()
+/*N*/ ScPostIt::~ScPostIt()
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/core/data/sc_pagepar.cxx b/binfilter/bf_sc/source/core/data/sc_pagepar.cxx
index 5e8999b..bf1b789 100644
--- a/binfilter/bf_sc/source/core/data/sc_pagepar.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pagepar.cxx
@@ -49,13 +49,13 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScPageTableParam::~ScPageTableParam()
+/*N*/ ScPageTableParam::~ScPageTableParam()
 /*N*/ {
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPageTableParam::Reset()
+/*N*/ void ScPageTableParam::Reset()
 /*N*/ {
 /*N*/ 	bNotes=bGrid=bHeaders=bDrawings=
 /*N*/ 	bLeftRight=bScaleAll=bScalePageNum=
@@ -89,13 +89,13 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScPageAreaParam::~ScPageAreaParam()
+/*N*/ ScPageAreaParam::~ScPageAreaParam()
 /*N*/ {
 /*N*/ }
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScPageAreaParam::Reset()
+/*N*/ void ScPageAreaParam::Reset()
 /*N*/ {
 /*N*/ 	bPrintArea = bRepeatRow = bRepeatCol = FALSE;
 /*N*/ 
diff --git a/binfilter/bf_sc/source/core/data/sc_patattr.cxx b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
index 62e7295..86a1aa3 100644
--- a/binfilter/bf_sc/source/core/data/sc_patattr.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
@@ -114,12 +114,12 @@ inline long HMMToTwips(long nHMM)	{ return (nHMM * 72 + 63) / 127; }
 /*N*/ 		pName = NULL;
 /*N*/ }
 
-/*N*/ __EXPORT ScPatternAttr::~ScPatternAttr()
+/*N*/ ScPatternAttr::~ScPatternAttr()
 /*N*/ {
 /*N*/ 	delete pName;
 /*N*/ }
 
-/*N*/ SfxPoolItem* __EXPORT ScPatternAttr::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* ScPatternAttr::Clone( SfxItemPool *pPool ) const
 /*N*/ {
 /*N*/ 	ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(TRUE, pPool) );
 /*N*/ 
@@ -134,13 +134,13 @@ inline long HMMToTwips(long nHMM)	{ return (nHMM * 72 + 63) / 127; }
 /*N*/ 	return ( pStr1 ? ( pStr2 ? ( *pStr1 == *pStr2 ) : FALSE ) : ( pStr2 ? FALSE : TRUE ) );
 /*N*/ }
 
-/*N*/ int __EXPORT ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
+/*N*/ int ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
 /*N*/ {
 /*N*/ 	return ( SfxSetItem::operator==(rCmp) &&
 /*N*/ 			 StrCmp( GetStyleName(), ((const ScPatternAttr&)rCmp).GetStyleName() ) );
 /*N*/ }
 
-/*N*/ SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT nVersion ) const
+/*N*/ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, USHORT nVersion ) const
 /*N*/ {
 /*N*/ 	String* pStr;
 /*N*/ 	BOOL	bHasStyle;
@@ -168,7 +168,7 @@ inline long HMMToTwips(long nHMM)	{ return (nHMM * 72 + 63) / 127; }
 /*N*/ 	return pPattern;
 /*N*/ }
 
-/*N*/ SvStream& __EXPORT ScPatternAttr::Store(SvStream& rStream, USHORT nItemVersion) const
+/*N*/ SvStream& ScPatternAttr::Store(SvStream& rStream, USHORT nItemVersion) const
 /*N*/ {
 /*N*/ 	rStream << (BOOL)TRUE;
 /*N*/ 
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index d1cf762..60dd644 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -83,7 +83,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScStyleSheetPool::~ScStyleSheetPool()
+/*N*/ ScStyleSheetPool::~ScStyleSheetPool()
 /*N*/ {
 /*N*/ }
 
@@ -130,7 +130,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create(
+/*N*/ SfxStyleSheetBase* ScStyleSheetPool::Create(
 /*N*/ 											const String&	rName,
 /*N*/ 											SfxStyleFamily	eFamily,
 /*N*/ 											USHORT			nMask )
@@ -144,7 +144,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
+/*N*/ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
 /*N*/ {
 /*?*/ 	DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 DBG_ASSERT( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" );
 /*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx b/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
index 3ae2b14..8962bf4 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
@@ -79,7 +79,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScStyleSheet::~ScStyleSheet()
+/*N*/ ScStyleSheet::~ScStyleSheet()
 /*N*/ {
 /*N*/ }
 
@@ -91,7 +91,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ BOOL __EXPORT ScStyleSheet::SetParent( const String& rParentName )
+/*N*/ BOOL ScStyleSheet::SetParent( const String& rParentName )
 /*N*/ {
 /*N*/ 	BOOL bResult = FALSE;
 /*N*/ 	String aEffName = rParentName;
@@ -119,7 +119,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
+/*N*/ SfxItemSet& ScStyleSheet::GetItemSet()
 /*N*/ {
 /*N*/ 	if ( !pSet )
 /*N*/ 	{
@@ -231,7 +231,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ BOOL __EXPORT ScStyleSheet::IsUsed() const
+/*N*/ BOOL ScStyleSheet::IsUsed() const
 /*N*/ {
 /*N*/ 	if ( GetFamily() == SFX_STYLE_FAMILY_PARA )
 /*N*/ 	{
@@ -250,7 +250,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScStyleSheet::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+/*N*/ void ScStyleSheet::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 /*N*/ 						   const SfxHint& rHint, const TypeId& rHintType )
 /*N*/ {
 /*N*/ 	if ( rHint.ISA(SfxSimpleHint) )
diff --git a/binfilter/bf_sc/source/core/data/sc_userdat.cxx b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
index a9fa6b0..8143ed2 100644
--- a/binfilter/bf_sc/source/core/data/sc_userdat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
@@ -685,16 +685,16 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScIMapInfo::~ScIMapInfo()
+/*N*/ ScIMapInfo::~ScIMapInfo()
 /*N*/ {
 /*N*/ }
 /*N*/ 
-/*N*/ SdrObjUserData* __EXPORT ScIMapInfo::Clone( SdrObject* pObj ) const
+/*N*/ SdrObjUserData* ScIMapInfo::Clone( SdrObject* pObj ) const
 /*N*/ {
 /*N*/ 	return new ScIMapInfo( *this );
 /*N*/ }
 /*N*/ 
-/*N*/ void __EXPORT ScIMapInfo::WriteData( SvStream& rOStm )
+/*N*/ void ScIMapInfo::WriteData( SvStream& rOStm )
 /*N*/ {
 /*N*/ 	SdrObjUserData::WriteData( rOStm );
 /*N*/ 
@@ -704,7 +704,7 @@ namespace binfilter {
             rOStm, ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE));
 /*N*/ }
 /*N*/ 
-/*N*/ void __EXPORT ScIMapInfo::ReadData( SvStream& rIStm )
+/*N*/ void ScIMapInfo::ReadData( SvStream& rIStm )
 /*N*/ {
 /*N*/ 	SdrObjUserData::ReadData( rIStm );
 /*N*/ 
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index d26ff12..1a06804 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -137,7 +137,7 @@ using namespace ::com::sun::star;
 /*N*/ 	return uno::Reference< chart::XChartData >();
 /*N*/ }
 
-/*N*/ void __EXPORT ScChartListener::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+/*N*/ void ScChartListener::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 /*N*/ {
 /*N*/ 	const ScHint* p = PTR_CAST( ScHint, &rHint );
 /*N*/ 	if( p && (p->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING)) )
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index ed4666b..cc2f075 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -2218,7 +2218,7 @@ const USHORT ScChangeTrack::nContentSlots =
 /*N*/ }
 
 
-/*N*/ void __EXPORT ScChangeTrack::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+/*N*/ void ScChangeTrack::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 /*N*/ {
 /*N*/ 	if ( !pDoc->IsInDtorClear() )
 /*N*/ 	{
diff --git a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
index 808bc4b..f63d7b7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
@@ -67,7 +67,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScDdeLink::~ScDdeLink()
+/*N*/ ScDdeLink::~ScDdeLink()
 /*N*/ {
 /*N*/ 	// Verbindung aufheben
 /*N*/ 
@@ -123,7 +123,7 @@ namespace binfilter {
 /*N*/ 	rHdr.EndEntry();
 /*N*/ }
 
-/*N*/ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
+/*N*/ void ScDdeLink::DataChanged( const String& rMimeType,
 /*N*/ 								const ::com::sun::star::uno::Any & rValue )
 /*N*/ {
 /*?*/ 	DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //	wir koennen nur Strings...
diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
index add53b0..12f4f93 100644
--- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
@@ -395,7 +395,7 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
 /*N*/ {
 /*N*/ }
 
-/*N*/ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
+/*N*/ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
 /*N*/ 									USHORT nPara, USHORT nPos,
 /*N*/ 									Color*& rTxtColor, Color*& rFldColor )
 /*N*/ {
@@ -462,7 +462,7 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
 /*N*/ 	SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS );
 /*N*/ }
 
-/*N*/ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
+/*N*/ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
 /*N*/ 									USHORT nPara, USHORT nPos,
 /*N*/ 									Color*& rTxtColor, Color*& rFldColor )
 /*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
index 84218b5..321ed37 100644
--- a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
@@ -76,7 +76,7 @@ namespace binfilter {
 /*N*/ 	InitTokens();
 /*N*/ }
 
-/*N*/ __EXPORT ScUserListData::~ScUserListData()
+/*N*/ ScUserListData::~ScUserListData()
 /*N*/ {
 /*N*/ 	delete[] pSubStrings;
 /*N*/ 	delete[] pUpperSub;
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index 5bfcbff..efba420 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -171,7 +171,7 @@ using namespace ::com::sun::star::uno;
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScViewOptions::~ScViewOptions()
+/*N*/ ScViewOptions::~ScViewOptions()
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx b/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx
index 4d463e2..7dcd4c6 100644
--- a/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx
@@ -95,7 +95,7 @@ namespace binfilter {
 /*N*/ }
 
 
-/*N*/ __EXPORT ScMessagePool::~ScMessagePool()
+/*N*/ ScMessagePool::~ScMessagePool()
 /*N*/ {
 /*N*/ 	Delete();
 /*N*/ 	SetSecondaryPool( NULL );		// before deleting defaults (accesses defaults)
@@ -109,7 +109,7 @@ namespace binfilter {
 /*N*/ }
 
 
-/*N*/ SfxMapUnit __EXPORT ScMessagePool::GetMetric( USHORT nWhich ) const
+/*N*/ SfxMapUnit ScMessagePool::GetMetric( USHORT nWhich ) const
 /*N*/ {
 /*N*/ 	//	eigene Attribute: Twips, alles andere 1/100 mm
 /*N*/ 
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 8018db3..0ccdd87 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -307,7 +307,7 @@ BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
         return FALSE;
 }
 
-/*N*/ ULONG __EXPORT ScDLL::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
+/*N*/ ULONG ScDLL::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
 /*N*/ 									SfxFilterFlags nMust, SfxFilterFlags nDont )
 /*N*/ {
 /*N*/ 	//	#59915# laut MBA darf hier nur ERRCODE_NONE, ERRCODE_ABORT und ERRCODE_FORCEQUIET
diff --git a/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx b/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx
index a455d5b..ab6a638 100644
--- a/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_uiitems.cxx
@@ -102,7 +102,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScSortItem::~ScSortItem()
+/*N*/ ScSortItem::~ScSortItem()
 /*N*/ {
 /*N*/ }
 
@@ -140,7 +140,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScQueryItem::~ScQueryItem()
+/*N*/ ScQueryItem::~ScQueryItem()
 /*N*/ {
 /*N*/ }
 
@@ -179,7 +179,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT ScSubTotalItem::~ScSubTotalItem()
+/*N*/ ScSubTotalItem::~ScSubTotalItem()
 /*N*/ {
 /*N*/ }
 
@@ -213,7 +213,7 @@ namespace binfilter {
 /*N*/ 		pUserList = NULL;
 /*N*/ }
 
-/*N*/ __EXPORT ScUserListItem::~ScUserListItem()
+/*N*/ ScUserListItem::~ScUserListItem()
 /*N*/ {
 /*N*/ 	delete pUserList;
 /*N*/ }
@@ -253,7 +253,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScConsolidateItem::~ScConsolidateItem()
+/*N*/ ScConsolidateItem::~ScConsolidateItem()
 /*N*/ {
 /*N*/ }
 
@@ -297,7 +297,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScPivotItem::~ScPivotItem()
+/*N*/ ScPivotItem::~ScPivotItem()
 /*N*/ {
 /*N*/ 	delete pSaveData;
 /*N*/ }
@@ -333,7 +333,7 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ __EXPORT ScSolveItem::~ScSolveItem()
+/*N*/ ScSolveItem::~ScSolveItem()
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
index 61b375b..797cf2e 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
@@ -77,13 +77,13 @@ namespace binfilter {
 /*N*/ 	SetRefreshControl( pDocShell->GetDocument()->GetRefreshTimerControlAddress() );
 /*N*/ }
 
-/*N*/ __EXPORT ScAreaLink::~ScAreaLink()
+/*N*/ ScAreaLink::~ScAreaLink()
 /*N*/ {
 /*N*/ 	StopRefreshTimer();
 /*N*/ }
 
 
-/*N*/  void __EXPORT ScAreaLink::DataChanged( const String&,
+/*N*/  void ScAreaLink::DataChanged( const String&,
 /*N*/  									   const ::com::sun::star::uno::Any& )
 /*N*/ {
         DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ 	//	bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index b07d86f..d4cfb65 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -132,7 +132,7 @@ static const sal_Char pFilterRtf[]		= "Rich Text Format (StarCalc)";
 
 //------------------------------------------------------------------
 
-/*N*/ void __EXPORT ScDocShell::FillClass( SvGlobalName* pClassName,
+/*N*/ void ScDocShell::FillClass( SvGlobalName* pClassName,
 /*N*/ 										ULONG* pFormat,
 /*N*/ 										String* pAppName,
 /*N*/ 										String* pFullTypeName,
@@ -576,7 +576,7 @@ static const sal_Char pFilterRtf[]		= "Rich Text Format (StarCalc)";
 /*N*/ 	return bRet;
 /*N*/ }
 
-/*N*/ BOOL __EXPORT ScDocShell::Load( SvStorage* pStor )
+/*N*/ BOOL ScDocShell::Load( SvStorage* pStor )
 /*N*/ {
 /*N*/ 	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" );
 /*N*/ 
@@ -631,7 +631,7 @@ static const sal_Char pFilterRtf[]		= "Rich Text Format (StarCalc)";
 /*N*/ }
 
 
-/*N*/ void __EXPORT ScDocShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+/*N*/ void ScDocShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 /*N*/ 						 const SfxHint& rHint, const TypeId& rHintType )
 /*N*/ {
 /*N*/ 	if (rHint.ISA(SfxSimpleHint))								// ohne Parameter
@@ -665,7 +665,7 @@ static const sal_Char pFilterRtf[]		= "Rich Text Format (StarCalc)";
 
 
 
-/*N*/ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
+/*N*/ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
 /*N*/ {
 /*N*/ 	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" );
 /*N*/ 
@@ -910,7 +910,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ //			SvStream* pStream =
 /*N*/ }
 
 
-/*N*/ void __EXPORT ScDocShell::HandsOff()
+/*N*/ void ScDocShell::HandsOff()
 /*N*/ {
 /*N*/ 	ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
 /*N*/ 
@@ -921,7 +921,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ //			SvStream* pStream =
 /*N*/ }
 
 
-/*N*/ BOOL __EXPORT ScDocShell::Save()
+/*N*/ BOOL ScDocShell::Save()
 /*N*/ {
 /*N*/ 	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Save" );
 /*N*/ 
@@ -958,7 +958,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ //			SvStream* pStream =
 /*N*/ }
 
 
-/*N*/ BOOL __EXPORT ScDocShell::SaveAs( SvStorage* pStor )
+/*N*/ BOOL ScDocShell::SaveAs( SvStorage* pStor )
 /*N*/ {
 /*N*/ 	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::SaveAs" );
 /*N*/ 
@@ -1008,13 +1008,13 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ //			SvStream* pStream =
 
 
 
-/*N*/ BOOL __EXPORT ScDocShell::SaveCompleted( SvStorage * pStor )
+/*N*/ BOOL ScDocShell::SaveCompleted( SvStorage * pStor )
 /*N*/ {
 /*N*/ 	return SfxInPlaceObject::SaveCompleted( pStor );
 /*N*/ }
 
 
-/*N*/ BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
+/*N*/ BOOL ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
 /*N*/ {
 /*N*/ 	BOOL bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
 /*N*/ 
@@ -1139,7 +1139,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ //			SvStream* pStream =
 
 //------------------------------------------------------------------
 
-/*N*/ __EXPORT ScDocShell::~ScDocShell()
+/*N*/ ScDocShell::~ScDocShell()
 /*N*/ {
 /*N*/ 	ResetDrawObjectShell();	// #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen
 /*N*/ 
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
index 6df6d9a..674ea04 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------
 
-/*N*/ BOOL __EXPORT ScDocShell::InitNew( SvStorage * pStor )
+/*N*/ BOOL ScDocShell::InitNew( SvStorage * pStor )
 /*N*/ {
 /*N*/ 	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::InitNew" );
 /*N*/ 
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
index 9a2fcea..abcc381 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
@@ -157,7 +157,7 @@ namespace binfilter {
 
 
 
-/*N*/ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
+/*N*/ Rectangle ScDocShell::GetVisArea( USHORT nAspect ) const
 /*N*/ {
 /*N*/ 	SfxObjectCreateMode eShellMode = GetCreateMode();
 /*N*/ 	if ( eShellMode == SFX_CREATE_MODE_ORGANIZER )
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
index 32ba61d..e4e1891 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
@@ -176,7 +176,7 @@ namespace binfilter {
 //
 
 
-/*N*/ void __EXPORT ScDocShell::SetVisArea( const Rectangle & rVisArea )
+/*N*/ void ScDocShell::SetVisArea( const Rectangle & rVisArea )
 /*N*/ {
 /*N*/ 	//	with the SnapVisArea call in SetVisAreaOrSize, it's safe to always
 /*N*/ 	//	use both the size and position of the VisArea
@@ -221,7 +221,7 @@ namespace binfilter {
 //	Style-Krempel fuer Organizer etc.
 //
 
-/*N*/ SfxStyleSheetBasePool* __EXPORT ScDocShell::GetStyleSheetPool()
+/*N*/ SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool()
 /*N*/ {
 /*N*/ 	return (SfxStyleSheetBasePool*)aDocument.GetStyleSheetPool();
 /*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
index a979415..d8a4b96 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
@@ -89,7 +89,7 @@ namespace binfilter {
 /*N*/ 	SetRefreshControl( pDocShell->GetDocument()->GetRefreshTimerControlAddress() );
 /*N*/ }
 
-/*N*/ __EXPORT ScTableLink::~ScTableLink()
+/*N*/ ScTableLink::~ScTableLink()
 /*N*/ {
 /*N*/ 	// Verbindung aufheben
 /*N*/ 
@@ -103,7 +103,7 @@ namespace binfilter {
 /*N*/ }
 
 
-/*N*/ void __EXPORT ScTableLink::DataChanged( const String&,
+/*N*/ void ScTableLink::DataChanged( const String&,
 /*N*/ 										const ::com::sun::star::uno::Any& )
 /*N*/ {
 /*N*/ 	SvxLinkManager* pLinkManager=pDocShell->GetDocument()->GetLinkManager();
diff --git a/binfilter/bf_sch/source/ui/app/sch_schdll.cxx b/binfilter/bf_sch/source/ui/app/sch_schdll.cxx
index 1a147a1..5037e6b 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schdll.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schdll.cxx
@@ -48,7 +48,7 @@ namespace binfilter {
 |*
 \************************************************************************/
 
-/*N*/ void __EXPORT SchDLL::Init()
+/*N*/ void SchDLL::Init()
 /*N*/ {
 /*N*/ 	// called directly after loading the DLL
 /*N*/ 	// do whatever you want, you may use Sd-DLL too
@@ -73,7 +73,7 @@ namespace binfilter {
 |*
 \************************************************************************/
 
-/*N*/ void __EXPORT SchDLL::Exit()
+/*N*/ void SchDLL::Exit()
 /*N*/ {
 /*N*/ 	// the SchModule must be destroyed
 /*N*/ 	SchModuleDummy** ppShlPtr = (SchModuleDummy**) GetAppData(BF_SHL_SCH);
diff --git a/binfilter/bf_sch/source/ui/app/sch_schlib.cxx b/binfilter/bf_sch/source/ui/app/sch_schlib.cxx
index 843e86d..81ffd43 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schlib.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schlib.cxx
@@ -55,7 +55,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 /*?*/ SFX_IMPL_OBJECTFACTORY_LIB( SchChartDocShell, SFXOBJECTSHELL_STD_NORMAL, schart,
                             SvGlobalName(BF_SO3_SCH_CLASSID), Sch, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME )) )
-// from macro: void __EXPORT SchChartDocShell::InitFactory()
+// from macro: void SchChartDocShell::InitFactory()
 /*?*/ {
 /*?*/ 	ULONG nFormat50 = SOT_FORMATSTR_ID_STARCHART_50;
 /*?*/ 	SfxObjectFactory& rFactory = (SfxObjectFactory&)Factory();
@@ -121,7 +121,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 \************************************************************************/
 
 
-/*N*/ void __EXPORT SchDLL::Update( SvInPlaceObjectRef aIPObj, SchMemChart* pData, OutputDevice* pOut )
+/*N*/ void SchDLL::Update( SvInPlaceObjectRef aIPObj, SchMemChart* pData, OutputDevice* pOut )
 /*N*/ {
 /*N*/ 	void (__LOADONCALLAPI*fp)(SvInPlaceObjectRef, SchMemChart*, OutputDevice*);
 /*N*/ 
@@ -140,7 +140,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 \************************************************************************/
 
 
-/*N*/ SchMemChart* __EXPORT SchDLL::GetChartData (SvInPlaceObjectRef aIPObj)
+/*N*/ SchMemChart* SchDLL::GetChartData (SvInPlaceObjectRef aIPObj)
 /*N*/ {
 /*N*/ 	SchMemChart* (__LOADONCALLAPI*fp)(SvInPlaceObjectRef);
 /*N*/ 
@@ -157,7 +157,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 |*
 \************************************************************************/
 
-/*N*/ SchMemChart* __EXPORT SchDLL::NewMemChart (short nCols, short nRows)
+/*N*/ SchMemChart* SchDLL::NewMemChart (short nCols, short nRows)
 /*N*/ {
 /*N*/ 	SchMemChart* (__LOADONCALLAPI*fp)(short, short);
 /*N*/ 
@@ -176,7 +176,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 |*
 \************************************************************************/
 
-/*N*/ void __EXPORT SchDLL::GetDefaultForColumnText( const SchMemChart& rMemChart, sal_Int32 nCol, String& aResult )
+/*N*/ void SchDLL::GetDefaultForColumnText( const SchMemChart& rMemChart, sal_Int32 nCol, String& aResult )
 /*N*/ {
 /*N*/ 	void (__LOADONCALLAPI*fp)( const SchMemChart&, sal_Int32, String& );
 /*N*/ 
@@ -188,7 +188,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*N*/ 	}
 /*N*/ }
 
-/*N*/ void __EXPORT SchDLL::GetDefaultForRowText( const SchMemChart& rMemChart, sal_Int32 nRow, String& aResult )
+/*N*/ void SchDLL::GetDefaultForRowText( const SchMemChart& rMemChart, sal_Int32 nRow, String& aResult )
 /*N*/ {
 /*N*/ 	void (__LOADONCALLAPI*fp)( const SchMemChart&, sal_Int32, String& );
 /*N*/ 
@@ -200,7 +200,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*N*/ 	}
 /*N*/ }
 
-/*N*/ void __EXPORT SchDLL::ConvertChartRangeForWriter( SchMemChart& rMemChart,
+/*N*/ void SchDLL::ConvertChartRangeForWriter( SchMemChart& rMemChart,
 /*N*/ 													BOOL bOldToNew )
 /*N*/ {
 /*N*/ 	void (__LOADONCALLAPI* fp )( SchMemChart&, BOOL )
@@ -210,7 +210,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*N*/ 		fp( rMemChart, bOldToNew );
 /*N*/ }
 
-/*N*/ void __EXPORT SchDLL::MemChartInsertCols( SchMemChart& rMemChart,
+/*N*/ void SchDLL::MemChartInsertCols( SchMemChart& rMemChart,
 /*N*/ 											short nAtCol, short nCount)
 /*N*/ {
 /*N*/ 	void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
@@ -219,7 +219,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*N*/ 	if( fp )
 /*N*/ 		fp( rMemChart, nAtCol, nCount );
 /*N*/ }
-/*?*/ void __EXPORT SchDLL::MemChartRemoveCols( SchMemChart& rMemChart,
+/*?*/ void SchDLL::MemChartRemoveCols( SchMemChart& rMemChart,
 /*?*/ 											short nAtCol, short nCount)
 /*?*/ {
 /*?*/ 	void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
@@ -229,7 +229,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*?*/ 		fp( rMemChart, nAtCol, nCount );
 /*?*/ }
 
-/*N*/ void __EXPORT SchDLL::MemChartInsertRows( SchMemChart& rMemChart,
+/*N*/ void SchDLL::MemChartInsertRows( SchMemChart& rMemChart,
 /*N*/ 											short nAtRow, short nCount )
 /*N*/ {
 /*N*/ 	void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
@@ -238,7 +238,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 /*N*/ 	if( fp )
 /*N*/ 		fp( rMemChart, nAtRow, nCount );
 /*N*/ }
-/*?*/ void __EXPORT SchDLL::MemChartRemoveRows( SchMemChart& rMemChart,
+/*?*/ void SchDLL::MemChartRemoveRows( SchMemChart& rMemChart,
 /*?*/ 											short nAtRow, short nCount )
 /*?*/ {
 /*?*/ 	void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
diff --git a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
index e75dd04..e3a3c5e 100644
--- a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
@@ -118,7 +118,7 @@ void SdDLL::LibExit()
     DELETEZ( SD_MOD() );
 }
 
-ULONG __EXPORT SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** pFilter, SfxFilterFlags nMust, SfxFilterFlags nDont)
+ULONG SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** pFilter, SfxFilterFlags nMust, SfxFilterFlags nDont)
 {
     ULONG nReturn = ERRCODE_ABORT;  // Erkennung fehlgeschlagen, Filter ungueltig
     BOOL bStorage = FALSE;
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx b/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx
index fd1922f..852db9a 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddecli.cxx
@@ -367,7 +367,7 @@ const String& DdeTransaction::GetName() const
 // --- DdeTransaction::Data() --------------------------------------
 
 
-void __EXPORT DdeTransaction::Data( const DdeData* p )
+void DdeTransaction::Data( const DdeData* p )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -376,7 +376,7 @@ void __EXPORT DdeTransaction::Data( const DdeData* p )
 
 // --- DdeTransaction::Done() --------------------------------------
 
-void __EXPORT DdeTransaction::Done( BOOL bDataValid )
+void DdeTransaction::Done( BOOL bDataValid )
 {
     aDone.Call( (void*)bDataValid );
 }
@@ -398,7 +398,7 @@ DdeLink::~DdeLink()
 
 // --- DdeLink::Notify() -----------------------------------------
 
-void __EXPORT DdeLink::Notify()
+void DdeLink::Notify()
 {
     aNotify.Call( NULL );
 }
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx b/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx
index 445cb55..c7c49a3 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx
@@ -45,7 +45,7 @@ HDDEDATA CALLBACK DdeInternal::InfCallback(
                 WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
 #else
 #if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
-HDDEDATA CALLBACK __EXPORT DdeInternal::InfCallback(
+HDDEDATA CALLBACK DdeInternal::InfCallback(
                 WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
 #else
 HDDEDATA CALLBACK _export DdeInternal::InfCallback(
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index 64dcbe1..156b0ac 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -71,7 +71,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback(
             HDDEDATA hData, DWORD, DWORD )
 #else
 #if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
-HDDEDATA CALLBACK __EXPORT DdeInternal::SvrCallback(
+HDDEDATA CALLBACK DdeInternal::SvrCallback(
             WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
             HDDEDATA hData, DWORD, DWORD )
 #else
@@ -679,21 +679,21 @@ void DdeTopic::NotifyClient( const String& rItem )
 
 // --- DdeTopic::Connect() -----------------------------------------
 
-void __EXPORT DdeTopic::Connect( long nId )
+void DdeTopic::Connect( long nId )
 {
     aConnectLink.Call( (void*)nId );
 }
 
 // --- DdeTopic::Disconnect() --------------------------------------
 
-void __EXPORT DdeTopic::Disconnect( long nId )
+void DdeTopic::Disconnect( long nId )
 {
     aDisconnectLink.Call( (void*)nId );
 }
 
 // --- DdeTopic::_Disconnect() --------------------------------------
 
-void __EXPORT DdeTopic::_Disconnect( long nId )
+void DdeTopic::_Disconnect( long nId )
 {
     for( DdeItem* pItem = aItems.First(); pItem; pItem = aItems.Next() )
         pItem->DecMonitor( nId );
@@ -703,7 +703,7 @@ void __EXPORT DdeTopic::_Disconnect( long nId )
 
 // --- DdeTopic::Get() ---------------------------------------------
 
-DdeData* __EXPORT DdeTopic::Get( ULONG nFmt )
+DdeData* DdeTopic::Get( ULONG nFmt )
 {
     if ( aGetLink.IsSet() )
         return (DdeData*)aGetLink.Call( (void*)nFmt );
@@ -713,7 +713,7 @@ DdeData* __EXPORT DdeTopic::Get( ULONG nFmt )
 
 // --- DdeTopic::Put() ---------------------------------------------
 
-BOOL __EXPORT DdeTopic::Put( const DdeData* r )
+BOOL DdeTopic::Put( const DdeData* r )
 {
     if ( aPutLink.IsSet() )
         return (BOOL)aPutLink.Call( (void*) r );
@@ -723,7 +723,7 @@ BOOL __EXPORT DdeTopic::Put( const DdeData* r )
 
 // --- DdeTopic::Execute() -----------------------------------------
 
-BOOL __EXPORT DdeTopic::Execute( const String* r )
+BOOL DdeTopic::Execute( const String* r )
 {
     if ( aExecLink.IsSet() )
         return (BOOL)aExecLink.Call( (void*)r );
@@ -1032,14 +1032,14 @@ String DdeService::Status()
 
 // --- DdeService::IsBusy() ----------------------------------------
 
-BOOL __EXPORT DdeService::IsBusy()
+BOOL DdeService::IsBusy()
 {
     return FALSE;
 }
 
 // --- DdeService::GetHelp() ----------------------------------------
 
-String __EXPORT DdeService::GetHelp()
+String DdeService::GetHelp()
 {
     return String();
 }
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 451a236..902f8ae 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -1094,17 +1094,17 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
 // =====================================================================
 // ======================   Virtuelle Methoden   =======================
 // =====================================================================
-/*N*/ void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT nTextStart, USHORT nTextLen, const sal_Int32*, const SvxFont&, sal_uInt16 nPara, sal_uInt16 nIndex, BYTE nRightToLeft )
+/*N*/ void EditEngine::DrawingText( const Point&, const XubString&, USHORT nTextStart, USHORT nTextLen, const sal_Int32*, const SvxFont&, sal_uInt16 nPara, sal_uInt16 nIndex, BYTE nRightToLeft )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ }
 
-/*N*/ void __EXPORT EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
+/*N*/ void EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ }
 
-/*N*/ void __EXPORT EditEngine::ParagraphInserted( sal_uInt16 nPara )
+/*N*/ void EditEngine::ParagraphInserted( sal_uInt16 nPara )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ 
@@ -1114,7 +1114,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
 /*N*/     }
 /*N*/ }
 
-/*N*/ void __EXPORT EditEngine::ParagraphDeleted( sal_uInt16 nPara )
+/*N*/ void EditEngine::ParagraphDeleted( sal_uInt16 nPara )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ 
@@ -1124,20 +1124,20 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
 /*N*/     }
 /*N*/ }
 
-/*N*/ sal_Bool __EXPORT EditEngine::FormattingParagraph( sal_uInt16 )
+/*N*/ sal_Bool EditEngine::FormattingParagraph( sal_uInt16 )
 /*N*/ {
 /*N*/ 	// return sal_True, wenn die Attribute geaendert wurden...
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ 	return sal_False;
 /*N*/ }
 
-/*N*/ void __EXPORT EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
+/*N*/ void EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ }
 
 
-/*N*/ void __EXPORT EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
+/*N*/ void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ 
@@ -1147,7 +1147,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
 /*N*/     }
 /*N*/ }
 
-/*N*/ XubString __EXPORT EditEngine::GetUndoComment( sal_uInt16 nId ) const
+/*N*/ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ 	XubString aComment;
@@ -1205,7 +1205,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
 /*N*/ 	return Rectangle( Point(), Point() );
 /*N*/ }
 
-/*N*/ XubString __EXPORT EditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16, sal_uInt16, Color*&, Color*& )
+/*N*/ XubString EditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16, sal_uInt16, Color*&, Color*& )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
 /*N*/ 	return ' ';
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index bed0287..df500d6 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -235,7 +235,7 @@ namespace binfilter {
 /*N*/ 	nWhich = r.nWhich;
 /*N*/ }
 
-/*N*/ __EXPORT EditTextObject::~EditTextObject()
+/*N*/ EditTextObject::~EditTextObject()
 /*N*/ {
 /*N*/ 	DBG_DTOR( EE_EditTextObject, 0 );
 /*N*/ }
@@ -299,14 +299,14 @@ namespace binfilter {
 /*N*/ 	DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 /*N*/ }
 
-/*N*/ BOOL __EXPORT EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
+/*N*/ BOOL EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
 /*N*/ 											const XubString&, SfxStyleFamily )
 /*N*/ {
 /*N*/ 	DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
 /*N*/ 	return FALSE;
 /*N*/ }
 
-/*N*/ void __EXPORT EditTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
+/*N*/ void EditTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
 /*N*/ 				const XubString& rOldName, const XubString& rNewName )
 /*N*/ {
 /*N*/ 	DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
@@ -403,12 +403,12 @@ namespace binfilter {
 /*N*/ }
 
 
-/*N*/ void __EXPORT EditTextObject::StoreData( SvStream& rOStream ) const
+/*N*/ void EditTextObject::StoreData( SvStream& rOStream ) const
 /*N*/ {
 /*N*/ 	DBG_ERROR( "StoreData: Basisklasse!" );
 /*N*/ }
 
-/*N*/ void __EXPORT EditTextObject::CreateData( SvStream& rIStream )
+/*N*/ void EditTextObject::CreateData( SvStream& rIStream )
 /*N*/ {
 /*N*/ 	DBG_ERROR( "CreateData: Basisklasse!" );
 /*N*/ }
@@ -499,7 +499,7 @@ namespace binfilter {
 /*N*/ 	}
 /*N*/ }
 
-/*N*/ __EXPORT BinTextObject::~BinTextObject()
+/*N*/ BinTextObject::~BinTextObject()
 /*N*/ {
 /*N*/ 	ClearPortionInfo();
 /*N*/ 	DeleteContents();
@@ -556,7 +556,7 @@ namespace binfilter {
 /*N*/ 	aContents.Remove( 0, aContents.Count() );
 /*N*/ }
 
-/*N*/ EditTextObject*	__EXPORT BinTextObject::Clone() const
+/*N*/ EditTextObject*	BinTextObject::Clone() const
 /*N*/ {
 /*N*/ 	return new BinTextObject( *this );
 /*N*/ }
@@ -727,7 +727,7 @@ namespace binfilter {
 /*N*/ 	return bChanges;
 /*N*/ }
 
-/*N*/ BOOL __EXPORT BinTextObject::ChangeStyleSheets(
+/*N*/ BOOL BinTextObject::ChangeStyleSheets(
 /*N*/ 					const XubString& rOldName, SfxStyleFamily eOldFamily,
 /*N*/ 					const XubString& rNewName, SfxStyleFamily eNewFamily )
 /*N*/ {
@@ -738,13 +738,13 @@ namespace binfilter {
 /*N*/ 	return bChanges;
 /*N*/ }
 
-/*N*/ void __EXPORT BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
+/*N*/ void BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
 /*N*/ 				const XubString& rOldName, const XubString& rNewName )
 /*N*/ {
 /*N*/ 	ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily );
 /*N*/ }
 
-/*N*/ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
+/*N*/ void BinTextObject::StoreData( SvStream& rOStream ) const
 /*N*/ {
 /*N*/ 	USHORT nVer = 602;
 /*N*/ 	rOStream << nVer;
@@ -925,7 +925,7 @@ namespace binfilter {
 /*N*/ 	}
 /*N*/ }
 
-/*N*/ void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
+/*N*/ void BinTextObject::CreateData( SvStream& rIStream )
 /*N*/ {
 /*N*/ 	rIStream >> nVersion;
 /*N*/ 
@@ -1461,7 +1461,7 @@ namespace binfilter {
 
 /*N*/ #define CHARSETMARKER	0x9999
 
-/*N*/ void __EXPORT BinTextObject::CreateData300( SvStream& rIStream )
+/*N*/ void BinTextObject::CreateData300( SvStream& rIStream )
 /*N*/ {
 /*N*/ 	// Fuer Aufwaertskompatibilitaet.
 /*N*/ 
diff --git a/binfilter/bf_svx/source/editeng/svx_editsel.cxx b/binfilter/bf_svx/source/editeng/svx_editsel.cxx
index 48cb274..6695fbb 100644
--- a/binfilter/bf_svx/source/editeng/svx_editsel.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editsel.cxx
@@ -48,39 +48,39 @@ namespace binfilter {
 /*N*/ 	pCurView = NULL;
 /*N*/ }
 
-/*N*/ void __EXPORT EditSelFunctionSet::CreateAnchor()
+/*N*/ void EditSelFunctionSet::CreateAnchor()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditSelFunctionSet::DestroyAnchor()
+/*N*/ void EditSelFunctionSet::DestroyAnchor()
 /*N*/ {
 /*N*/ 	// Nur bei Mehrfachselektion
 /*N*/ }
 
-/*N*/ BOOL __EXPORT EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
+/*N*/ BOOL EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ 	return FALSE;
 /*N*/ }
 
-/*N*/ BOOL __EXPORT EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
+/*N*/ BOOL EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/     return FALSE;
 /*N*/ }
 
-/*N*/ void __EXPORT EditSelFunctionSet::DeselectAtPoint( const Point& )
+/*N*/ void EditSelFunctionSet::DeselectAtPoint( const Point& )
 /*N*/ {
 /*N*/ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 /*N*/ // !  Implementieren, wenn Mehrfachselektion moeglich  !
 /*N*/ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 /*N*/ }
 
-/*N*/ void __EXPORT EditSelFunctionSet::BeginDrag()
+/*N*/ void EditSelFunctionSet::BeginDrag()
 /*N*/ {
 /*N*/ 	// Nur bei Mehrfachselektion
 /*N*/ }
 
 
-/*N*/ void __EXPORT EditSelFunctionSet::DeselectAll()
+/*N*/ void EditSelFunctionSet::DeselectAll()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
diff --git a/binfilter/bf_svx/source/editeng/svx_editundo.cxx b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
index 9cbb22f..0c38f81 100644
--- a/binfilter/bf_svx/source/editeng/svx_editundo.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
@@ -74,14 +74,14 @@ DBG_NAME( EditUndo )
 /*N*/ 	DBG_DTOR( EditUndo, 0 );
 /*N*/ }
 
-/*N*/ USHORT __EXPORT EditUndo::GetId() const
+/*N*/ USHORT EditUndo::GetId() const
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS( EditUndo, 0 );
 /*N*/ 	return nId;
 /*N*/ }
 
 
-/*N*/ XubString __EXPORT EditUndo::GetComment() const
+/*N*/ XubString EditUndo::GetComment() const
 /*N*/ {
 /*N*/ 	XubString aComment;
 /*N*/ 	if ( pImpEE )
@@ -101,15 +101,15 @@ DBG_NAME( EditUndo )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoInsertChars::Undo()
+/*N*/ void EditUndoInsertChars::Undo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoInsertChars::Redo()
+/*N*/ void EditUndoInsertChars::Redo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ BOOL __EXPORT EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
+/*N*/ BOOL EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
 /*N*/ {
 /*N*/ 	if ( !pNextAction->ISA( EditUndoInsertChars ) )
 /*N*/ 		return FALSE;
@@ -127,7 +127,7 @@ DBG_NAME( EditUndo )
 /*N*/ 	return FALSE;
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoInsertChars::Repeat()
+/*N*/ void EditUndoInsertChars::Repeat()
 /*N*/ {
 /*N*/ 	DBG_ERROR( "EditUndoInsertChars::Repeat nicht implementiert!" );
 /*N*/ }
@@ -154,15 +154,15 @@ DBG_NAME( EditUndo )
 /*N*/ 	delete pFeature;
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoInsertFeature::Undo()
+/*N*/ void EditUndoInsertFeature::Undo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoInsertFeature::Redo()
+/*N*/ void EditUndoInsertFeature::Redo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoInsertFeature::Repeat()
+/*N*/ void EditUndoInsertFeature::Repeat()
 /*N*/ {
 /*N*/ 	DBG_ERROR( "EditUndoInsertFeature::Repeat nicht implementiert!" );
 /*N*/ }
@@ -194,15 +194,15 @@ DBG_NAME( EditUndo )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoSetStyleSheet::Undo()
+/*N*/ void EditUndoSetStyleSheet::Undo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoSetStyleSheet::Redo()
+/*N*/ void EditUndoSetStyleSheet::Redo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoSetStyleSheet::Repeat()
+/*N*/ void EditUndoSetStyleSheet::Repeat()
 /*N*/ {
 /*N*/ 	DBG_ERROR( "EditUndoSetStyleSheet::Repeat nicht implementiert!" );
 /*N*/ }
@@ -222,15 +222,15 @@ DBG_NAME( EditUndo )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoSetParaAttribs::Undo()
+/*N*/ void EditUndoSetParaAttribs::Undo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoSetParaAttribs::Redo()
+/*N*/ void EditUndoSetParaAttribs::Redo()
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
-/*N*/ void __EXPORT EditUndoSetParaAttribs::Repeat()
+/*N*/ void EditUndoSetParaAttribs::Repeat()
 /*N*/ {
 /*N*/ 	DBG_ERROR( "EditUndoSetParaAttribs::Repeat nicht implementiert!" );
 /*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_float3d.cxx b/binfilter/bf_svx/source/engine3d/svx_float3d.cxx
index a6d7b66..62b6759 100644
--- a/binfilter/bf_svx/source/engine3d/svx_float3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_float3d.cxx
@@ -47,7 +47,7 @@ namespace binfilter {
 |* Ableitung vom SfxChildWindow als "Behaelter" fuer Effekte
 |*
 \************************************************************************/
-/*N*/ __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* pParent,
+/*N*/ Svx3DChildWindow::Svx3DChildWindow( Window* pParent,
 /*N*/ 														 USHORT nId,
 /*N*/ 														 SfxBindings* pBindings,
 /*N*/ 														 SfxChildWinInfo* pInfo ) :
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index b25d662..9fa2d1e 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -394,21 +394,21 @@ namespace binfilter {
 
 /*N*/ SV_IMPL_PERSIST1( SvxPageField, SvxFieldData );
 
-/*N*/ SvxFieldData* __EXPORT SvxPageField::Clone() const
+/*N*/ SvxFieldData* SvxPageField::Clone() const
 /*N*/ {
 /*N*/ 	return new SvxPageField;		// leer
 /*N*/ }
 
-/*N*/ int __EXPORT SvxPageField::operator==( const SvxFieldData& rCmp ) const
+/*N*/ int SvxPageField::operator==( const SvxFieldData& rCmp ) const
 /*N*/ {
 /*N*/ 	return ( rCmp.Type() == TYPE(SvxPageField) );
 /*N*/ }
 
-/*N*/ void __EXPORT SvxPageField::Load( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxPageField::Load( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT SvxPageField::Save( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxPageField::Save( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
@@ -416,82 +416,82 @@ namespace binfilter {
 
 /*N*/ SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData );
 
-/*N*/ SvxFieldData* __EXPORT SvxPagesField::Clone() const
+/*N*/ SvxFieldData* SvxPagesField::Clone() const
 /*N*/ {
 /*N*/ 	return new SvxPagesField;	// leer
 /*N*/ }
 
-/*N*/ int __EXPORT SvxPagesField::operator==( const SvxFieldData& rCmp ) const
+/*N*/ int SvxPagesField::operator==( const SvxFieldData& rCmp ) const
 /*N*/ {
 /*N*/ 	return ( rCmp.Type() == TYPE(SvxPagesField) );
 /*N*/ }
 
-/*N*/ void __EXPORT SvxPagesField::Load( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxPagesField::Load( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT SvxPagesField::Save( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxPagesField::Save( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
 /*N*/ SV_IMPL_PERSIST1( SvxTimeField, SvxFieldData );
 
-/*N*/ SvxFieldData* __EXPORT SvxTimeField::Clone() const
+/*N*/ SvxFieldData* SvxTimeField::Clone() const
 /*N*/ {
 /*N*/ 	return new SvxTimeField;	// leer
 /*N*/ }
 
-/*N*/ int __EXPORT SvxTimeField::operator==( const SvxFieldData& rCmp ) const
+/*N*/ int SvxTimeField::operator==( const SvxFieldData& rCmp ) const
 /*N*/ {
 /*N*/ 	return ( rCmp.Type() == TYPE(SvxTimeField) );
 /*N*/ }
 
-/*N*/ void __EXPORT SvxTimeField::Load( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxTimeField::Load( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT SvxTimeField::Save( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxTimeField::Save( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
 
 /*N*/ SV_IMPL_PERSIST1( SvxFileField, SvxFieldData );
 
-/*N*/ SvxFieldData* __EXPORT SvxFileField::Clone() const
+/*N*/ SvxFieldData* SvxFileField::Clone() const
 /*N*/ {
 /*N*/ 	return new SvxFileField;	// leer
 /*N*/ }
 
-/*N*/ int __EXPORT SvxFileField::operator==( const SvxFieldData& rCmp ) const
+/*N*/ int SvxFileField::operator==( const SvxFieldData& rCmp ) const
 /*N*/ {
 /*N*/ 	return ( rCmp.Type() == TYPE(SvxFileField) );
 /*N*/ }
 
-/*N*/ void __EXPORT SvxFileField::Load( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxFileField::Load( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT SvxFileField::Save( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxFileField::Save( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
 /*N*/ SV_IMPL_PERSIST1( SvxTableField, SvxFieldData );
 
-/*N*/ SvxFieldData* __EXPORT SvxTableField::Clone() const
+/*N*/ SvxFieldData* SvxTableField::Clone() const
 /*N*/ {
 /*N*/ 	return new SvxTableField;	// leer
 /*N*/ }
 
-/*N*/ int __EXPORT SvxTableField::operator==( const SvxFieldData& rCmp ) const
+/*N*/ int SvxTableField::operator==( const SvxFieldData& rCmp ) const
 /*N*/ {
 /*N*/ 	return ( rCmp.Type() == TYPE(SvxTableField) );
 /*N*/ }
 
-/*N*/ void __EXPORT SvxTableField::Load( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxTableField::Load( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
-/*N*/ void __EXPORT SvxTableField::Save( SvPersistStream & /*rStm*/ )
+/*N*/ void SvxTableField::Save( SvPersistStream & /*rStm*/ )
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_svx/source/items/svx_rotmodit.cxx b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
index 27f70d7..f906e35 100644
--- a/binfilter/bf_svx/source/items/svx_rotmodit.cxx
+++ b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
@@ -58,11 +58,11 @@ using namespace ::com::sun::star;
 /*N*/ {
 /*N*/ }
 
-/*N*/ __EXPORT SvxRotateModeItem::~SvxRotateModeItem()
+/*N*/ SvxRotateModeItem::~SvxRotateModeItem()
 /*N*/ {
 /*N*/ }
 
-/*N*/ SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
+/*N*/ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
 /*N*/ {
 /*N*/ 	USHORT nVal;
 /*N*/ 	rStream >> nVal;
@@ -71,17 +71,17 @@ using namespace ::com::sun::star;
 
 
 
-/*?*/ USHORT __EXPORT SvxRotateModeItem::GetValueCount() const
+/*?*/ USHORT SvxRotateModeItem::GetValueCount() const
 /*?*/ {
 /*?*/ 	return 4;		// STANDARD, TOP, CENTER, BOTTOM
 /*?*/ }
 
-/*N*/ SfxPoolItem* __EXPORT SvxRotateModeItem::Clone( SfxItemPool* ) const
+/*N*/ SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const
 /*N*/ {
 /*N*/ 	return new SvxRotateModeItem( *this );
 /*N*/ }
 
-/*N*/ USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
+/*N*/ USHORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
 /*N*/ {
 /*N*/ 	return 0;
 /*N*/ }
diff --git a/binfilter/bf_svx/source/outliner/svx_outliner.cxx b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
index ea91b0a..5f35bf7 100644
--- a/binfilter/bf_svx/source/outliner/svx_outliner.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
@@ -434,7 +434,7 @@ namespace binfilter {
 /*N*/ 	DBG_ASSERT( pEditEngine->GetParagraphCount()==rPObj.Count(),"SetText failed");
 /*N*/ }
 
-/*N*/ XubString __EXPORT Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+/*N*/ XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
 /*N*/ {
 /*N*/ 	DBG_CHKTHIS(Outliner,0);
 /*N*/ 	if ( !aCalcFieldValueHdl.IsSet() )
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
index 8c2f8d2..d782fa2 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
@@ -424,7 +424,7 @@ SdrItemPool::SdrItemPool(const SdrItemPool& rPool):
 |*
 \************************************************************************/
 
-SfxItemPool* __EXPORT SdrItemPool::Clone() const
+SfxItemPool* SdrItemPool::Clone() const
 {
     return new SdrItemPool(*this);
 }
@@ -470,7 +470,7 @@ SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn):
     nValue=Fraction(nMul,nDiv);
 }
 
-int __EXPORT SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
+int SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
 {
     return SfxPoolItem::operator==(rCmp) &&
         ((SdrFractionItem&)rCmp).GetValue()==nValue;
@@ -478,20 +478,20 @@ int __EXPORT SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
 
 
 
-SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, USHORT nItemVers) const
+SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT nItemVers) const
 {
     rOut<<INT32(nValue.GetNumerator());
     rOut<<INT32(nValue.GetDenominator());
     return rOut;
 }
 
-SfxPoolItem* __EXPORT SdrFractionItem::Clone(SfxItemPool *pPool) const
+SfxPoolItem* SdrFractionItem::Clone(SfxItemPool *pPool) const
 {
     return new SdrFractionItem(Which(),GetValue());
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrFractionItem::IsPoolable() const
+int SdrFractionItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -505,12 +505,12 @@ int __EXPORT SdrFractionItem::IsPoolable() const
 TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
 
 
-SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, USHORT nVer) const
 {
     return new SdrScaleItem(Which(),rIn);
 }
 
-SfxPoolItem* __EXPORT SdrScaleItem::Clone(SfxItemPool *pPool) const
+SfxPoolItem* SdrScaleItem::Clone(SfxItemPool *pPool) const
 {
     return new SdrScaleItem(Which(),GetValue());
 }
@@ -521,12 +521,12 @@ SfxPoolItem* __EXPORT SdrScaleItem::Clone(SfxItemPool *pPool) const
 
 TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem);
 
-SfxPoolItem* __EXPORT SdrOnOffItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* pPool) const
 {
     return new SdrOnOffItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, USHORT nVer) const
 {
     return new SdrOnOffItem(Which(),rIn);
 }
@@ -534,7 +534,7 @@ SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, USHORT nVer) const
 
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrOnOffItem::IsPoolable() const
+int SdrOnOffItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -543,12 +543,12 @@ int __EXPORT SdrOnOffItem::IsPoolable() const
 
 TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
 
-SfxPoolItem* __EXPORT SdrYesNoItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* pPool) const
 {
     return new SdrYesNoItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, USHORT nVer) const
 {
     return new SdrYesNoItem(Which(),rIn);
 }
@@ -556,7 +556,7 @@ SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, USHORT nVer) const
 
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrYesNoItem::IsPoolable() const
+int SdrYesNoItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -569,19 +569,19 @@ int __EXPORT SdrYesNoItem::IsPoolable() const
 
 TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item);
 
-SfxPoolItem* __EXPORT SdrPercentItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* pPool) const
 {
     return new SdrPercentItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, USHORT nVer) const
 {
     return new SdrPercentItem(Which(),rIn);
 }
 
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrPercentItem::IsPoolable() const
+int SdrPercentItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -594,19 +594,19 @@ int __EXPORT SdrPercentItem::IsPoolable() const
 
 TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item);
 
-SfxPoolItem* __EXPORT SdrAngleItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* pPool) const
 {
     return new SdrAngleItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, USHORT nVer) const
 {
     return new SdrAngleItem(Which(),rIn);
 }
 
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrAngleItem::IsPoolable() const
+int SdrAngleItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -619,12 +619,12 @@ int __EXPORT SdrAngleItem::IsPoolable() const
 
 TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item);
 
-SfxPoolItem* __EXPORT SdrMetricItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* pPool) const
 {
     return new SdrMetricItem(Which(),GetValue());
 }
 
-SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, USHORT nVer) const
 {
     return new SdrMetricItem(Which(),rIn);
 }
@@ -633,7 +633,7 @@ SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, USHORT nVer) const
 
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrMetricItem::IsPoolable() const
+int SdrMetricItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -656,12 +656,12 @@ SdrShadowSetItem::SdrShadowSetItem(SfxItemPool* pItemPool):
 {
 }
 
-SfxPoolItem* __EXPORT SdrShadowSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrShadowSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrShadowSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersion) const
 {
     SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
                                       SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST);
@@ -675,21 +675,21 @@ SfxPoolItem* __EXPORT SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersio
 
 TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrCaptionTypeItem::Clone(SfxItemPool* pPool) const                { return new SdrCaptionTypeItem(*this); }
+SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* pPool) const                { return new SdrCaptionTypeItem(*this); }
 
-SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, USHORT nVer) const       { return new SdrCaptionTypeItem(rIn); }
+SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, USHORT nVer) const       { return new SdrCaptionTypeItem(rIn); }
 
-USHORT __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
+USHORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
 
 
 
 TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Clone(SfxItemPool* pPool) const              { return new SdrCaptionEscDirItem(*this); }
+SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* pPool) const              { return new SdrCaptionEscDirItem(*this); }
 
-SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT nVer) const     { return new SdrCaptionEscDirItem(rIn); }
+SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT nVer) const     { return new SdrCaptionEscDirItem(rIn); }
 
-USHORT __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
+USHORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
 
 
 
@@ -699,12 +699,12 @@ USHORT __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
 
 TYPEINIT1(SdrCaptionSetItem,SfxSetItem);
 
-SfxPoolItem* __EXPORT SdrCaptionSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrCaptionSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrCaptionSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrCaptionSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrCaptionSetItem::Create(SvStream& rStream, USHORT nVersion) const
 {
     SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
                                       SDRATTR_CAPTION_FIRST, SDRATTR_CAPTION_LAST);
@@ -723,12 +723,12 @@ SdrOutlinerSetItem::SdrOutlinerSetItem(SfxItemPool* pItemPool):
 {
 }
 
-SfxPoolItem* __EXPORT SdrOutlinerSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrOutlinerSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrOutlinerSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVersion) const
 {
     SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
                                       EE_ITEMS_START, EE_ITEMS_END);
@@ -743,11 +743,11 @@ SfxPoolItem* __EXPORT SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVers
 // FitToSize
 TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Clone(SfxItemPool* pPool) const         { return new SdrTextFitToSizeTypeItem(*this); }
+SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* pPool) const         { return new SdrTextFitToSizeTypeItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextFitToSizeTypeItem(rIn); }
+SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextFitToSizeTypeItem(rIn); }
 
-USHORT __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
+USHORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
 
 
 bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
@@ -777,11 +777,11 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Clone(SfxItemPool* pPool) const            { return new SdrTextVertAdjustItem(*this); }
+SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* pPool) const            { return new SdrTextVertAdjustItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextVertAdjustItem(rIn); }
+SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextVertAdjustItem(rIn); }
 
-USHORT __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
+USHORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
 
 
 
@@ -810,13 +810,13 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Clone(SfxItemPool* pPool) const { return new SdrTextHorzAdjustItem(*this); }
+SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* pPool) const { return new SdrTextHorzAdjustItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextHorzAdjustItem(rIn); }
+SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextHorzAdjustItem(rIn); }
 
-USHORT __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
+USHORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
 
-XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
 {DBG_BF_ASSERT(0, "STRIP");XubString a; return a; //STRIP001
 }
 
@@ -846,11 +846,11 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrTextAniKindItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniKindItem(*this); }
+SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniKindItem(rIn); }
+SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniKindItem(rIn); }
 
-USHORT __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
+USHORT SdrTextAniKindItem::GetValueCount() const { return 5; }
 
 
 
@@ -878,11 +878,11 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDirectionItem(*this); }
+SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDirectionItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDirectionItem(rIn); }
+SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDirectionItem(rIn); }
 
-USHORT __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
+USHORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
 
 
 
@@ -911,16 +911,16 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
 
-SfxPoolItem* __EXPORT SdrTextAniDelayItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDelayItem(*this); }
+SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDelayItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDelayItem(rIn); }
+SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDelayItem(rIn); }
 
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
 
-SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniAmountItem(*this); }
+SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniAmountItem(*this); }
 
-SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniAmountItem(rIn); }
+SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniAmountItem(rIn); }
 
 
 
@@ -952,7 +952,7 @@ SdrAutoShapeAdjustmentItem::~SdrAutoShapeAdjustmentItem()
         delete (SdrAutoShapeAdjustmentValue*)pPtr;
 }
 
-int __EXPORT SdrAutoShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
+int SdrAutoShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
 {
     int bRet = SfxPoolItem::operator==( rCmp );
     if ( bRet )
@@ -970,12 +970,12 @@ int __EXPORT SdrAutoShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) c
 }
 
 
-SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
+SfxPoolItem* SdrAutoShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
 {
     return new SdrAutoShapeAdjustmentItem( rIn, nItemVersion );
 }
 
-SvStream& __EXPORT SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
+SvStream& SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     if ( nItemVersion )
     {
@@ -987,7 +987,7 @@ SvStream& __EXPORT SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16
     return rOut;
 }
 
-SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Clone( SfxItemPool *pPool ) const
+SfxPoolItem* SdrAutoShapeAdjustmentItem::Clone( SfxItemPool *pPool ) const
 {
     sal_uInt32 i;
     SdrAutoShapeAdjustmentItem* pItem = new SdrAutoShapeAdjustmentItem;
@@ -998,7 +998,7 @@ SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Clone( SfxItemPool *pPool ) co
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrAutoShapeAdjustmentItem::IsPoolable() const
+int SdrAutoShapeAdjustmentItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
@@ -1017,12 +1017,12 @@ sal_uInt16 SdrAutoShapeAdjustmentItem::GetVersion( sal_uInt16 nFileFormatVersion
 
 TYPEINIT1(SdrMiscSetItem,SfxSetItem);
 
-SfxPoolItem* __EXPORT SdrMiscSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrMiscSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrMiscSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion) const
 {
     SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
                                       SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
@@ -1037,11 +1037,11 @@ SfxPoolItem* __EXPORT SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion)
 // EdgeKind
 TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrEdgeKindItem::Clone(SfxItemPool* pPool) const            { return new SdrEdgeKindItem(*this); }
+SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* pPool) const            { return new SdrEdgeKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrEdgeKindItem(rIn); }
+SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrEdgeKindItem(rIn); }
 
-USHORT __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
+USHORT SdrEdgeKindItem::GetValueCount() const { return 4; }
 
 
 
@@ -1098,12 +1098,12 @@ bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1(SdrEdgeSetItem,SfxSetItem);
 
-SfxPoolItem* __EXPORT SdrEdgeSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrEdgeSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrEdgeSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion) const
 {
     SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
                                       SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST);
@@ -1118,11 +1118,11 @@ SfxPoolItem* __EXPORT SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion)
 // MeasureKind
 TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrMeasureKindItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureKindItem(*this); }
+SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureKindItem(rIn); }
+SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureKindItem(rIn); }
 
-USHORT __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
+USHORT SdrMeasureKindItem::GetValueCount() const { return 2; }
 
 
 
@@ -1130,20 +1130,20 @@ USHORT __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
 
 TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextHPosItem(*this); }
+SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextHPosItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextHPosItem(rIn); }
+SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextHPosItem(rIn); }
 
-USHORT __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
+USHORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
 
 
 TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextVPosItem(*this); }
+SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextVPosItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextVPosItem(rIn); }
+SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextVPosItem(rIn); }
 
-USHORT __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
+USHORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
 
 
 
@@ -1151,11 +1151,11 @@ USHORT __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
 
 TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrMeasureUnitItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureUnitItem(*this); }
+SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureUnitItem(*this); }
 
-SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureUnitItem(rIn); }
+SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureUnitItem(rIn); }
 
-USHORT __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
+USHORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
 
 
 
@@ -1167,12 +1167,12 @@ USHORT __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
 
 TYPEINIT1(SdrMeasureSetItem,SfxSetItem);
 
-SfxPoolItem* __EXPORT SdrMeasureSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrMeasureSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrMeasureSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersion) const
 {
     SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
                                       SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST);
@@ -1187,11 +1187,11 @@ SfxPoolItem* __EXPORT SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersi
 // CircKind
 TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
 
-SfxPoolItem* __EXPORT SdrCircKindItem::Clone(SfxItemPool* pPool) const          { return new SdrCircKindItem(*this); }
+SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* pPool) const          { return new SdrCircKindItem(*this); }
 
-SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCircKindItem(rIn); }
+SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCircKindItem(rIn); }
 
-USHORT __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
+USHORT SdrCircKindItem::GetValueCount() const { return 4; }
 
 
 bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
@@ -1216,12 +1216,12 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 TYPEINIT1(SdrCircSetItem,SfxSetItem);
 
-SfxPoolItem* __EXPORT SdrCircSetItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SdrCircSetItem::Clone(SfxItemPool* pToPool) const
 {
     return new SdrCircSetItem(*this,pToPool);
 }
 
-SfxPoolItem* __EXPORT SdrCircSetItem::Create(SvStream& rStream, USHORT nVersion) const

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list