cleaning of __EXPORT define

18 files changed, 198 insertions, 198 deletions

diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 84c4ced8e42e..a5307103813f 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -123,7 +123,7 @@ SvxPageWindow::~SvxPageWindow()
 
 // -----------------------------------------------------------------------
 
-void __EXPORT SvxPageWindow::Paint( const Rectangle& )
+void SvxPageWindow::Paint( const Rectangle& )
 {
     Fraction aXScale( aWinSize.Width(), std::max( (long) (aSize.Width() * 2 + aSize.Width() / 8), 1L ) );
     Fraction aYScale( aWinSize.Height(), std::max( aSize.Height(), 1L ) );
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index ce02fb26c320..fa3ce019074e 100644
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
@@ -58,7 +58,7 @@ SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId ) :
 
 // -----------------------------------------------------------------------
 
-__EXPORT SvxStandardDialog::~SvxStandardDialog()
+SvxStandardDialog::~SvxStandardDialog()
 {
 }
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index d6aaa70e7c70..9cd13233bd74 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -433,7 +433,7 @@ SvxRuler::SvxRuler
 }
 
 
-__EXPORT SvxRuler::~SvxRuler()
+SvxRuler::~SvxRuler()
 /*
    [Beschreibung]
 
@@ -2794,7 +2794,7 @@ void SvxRuler::EvalModifier()
 }
 
 
-void __EXPORT SvxRuler::Click()
+void SvxRuler::Click()
 
 /*
    [Beschreibung]
@@ -3421,7 +3421,7 @@ void SvxRuler::CalcMinMax()
 }
 
 
-long __EXPORT SvxRuler::StartDrag()
+long SvxRuler::StartDrag()
 
 /*
    [Beschreibung]
@@ -3506,7 +3506,7 @@ long __EXPORT SvxRuler::StartDrag()
 }
 
 
-void  __EXPORT SvxRuler::Drag()
+void  SvxRuler::Drag()
 /*
    [Beschreibung]
 
@@ -3546,7 +3546,7 @@ void  __EXPORT SvxRuler::Drag()
 }
 
 
-void __EXPORT SvxRuler::EndDrag()
+void SvxRuler::EndDrag()
 /*
    [Beschreibung]
 
@@ -3618,7 +3618,7 @@ void __EXPORT SvxRuler::EndDrag()
 }
 
 
-void __EXPORT SvxRuler::ExtraDown()
+void SvxRuler::ExtraDown()
 
 /*
    [Beschreibung]
@@ -3639,7 +3639,7 @@ void __EXPORT SvxRuler::ExtraDown()
 }
 
 
-void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
+void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
 /*
 
    [Beschreibung]
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 1cc3a4c09d52..6e62f23a68c9 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -100,7 +100,7 @@ namespace {
 /*************************************************************************
 |*  Svx3DWin - FloatingWindow
 \************************************************************************/
-__EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
+Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
                 SfxChildWindow *pCW, Window* pParent ) :
         SfxDockingWindow    ( pInBindings, pCW, pParent,
                                     SVX_RES( RID_SVXFLOAT_3D ) ),
@@ -365,7 +365,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
 }
 
 // -----------------------------------------------------------------------
-__EXPORT Svx3DWin::~Svx3DWin()
+Svx3DWin::~Svx3DWin()
 {
     //delete pMatFavSetList;
     delete p3DView;
@@ -2165,7 +2165,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
 }
 
 // -----------------------------------------------------------------------
-void __EXPORT Svx3DWin::Resize()
+void Svx3DWin::Resize()
 {
     if ( !IsFloatingMode() ||
          !GetFloatingWindow()->IsRollUp() )
@@ -3213,7 +3213,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 |* Ableitung vom SfxChildWindow als "Behaelter" fuer Effekte
 |*
 \************************************************************************/
-__EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
+Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
                                                          USHORT nId,
                                                          SfxBindings* pBindings,
                                                          SfxChildWinInfo* pInfo ) :
@@ -3241,7 +3241,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
 }
 
 // -----------------------------------------------------------------------
-void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
+void Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
                         SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ )
 {
 }
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index efa8137aff9c..3c9b427384fc 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -293,7 +293,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( SvStream& /*rIn*/, sal_u
 
     }
 }
-int __EXPORT SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const
+int SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const
 {
     int bRet = SfxPoolItem::operator==( rCmp );
     if ( bRet )
@@ -301,7 +301,7 @@ int __EXPORT SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) c
     return bRet;
 }
 
-SfxItemPresentation __EXPORT SdrCustomShapeGeometryItem::GetPresentation(
+SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
 {
@@ -316,12 +316,12 @@ SfxItemPresentation __EXPORT SdrCustomShapeGeometryItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
+SfxPoolItem* SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
 {
     return new SdrCustomShapeGeometryItem( rIn, nItemVersion );
 }
 
-SvStream& __EXPORT SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
+SvStream& SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     if ( nItemVersion )
     {
@@ -330,7 +330,7 @@ SvStream& __EXPORT SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16
     return rOut;
 }
 
-SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( GetGeometry() );
 //  SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( *this );
@@ -346,7 +346,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrCustomShapeGeometryItem::IsPoolable() const
+int SdrCustomShapeGeometryItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 1d5659469335..336cbd92c246 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -87,7 +87,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* __EXPORT SvxPostItAuthorItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const
 {
     return new SvxPostItAuthorItem( *this );
 }
@@ -136,7 +136,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* __EXPORT SvxPostItDateItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const
 {
     return new SvxPostItDateItem( *this );
 }
@@ -185,7 +185,7 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* __EXPORT SvxPostItTextItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const
 {
     return new SvxPostItTextItem( *this );
 }
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 42ee2b596295..1c3dbf5f0e5a 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -66,18 +66,18 @@ SvxRotateModeItem::SvxRotateModeItem( const SvxRotateModeItem& rItem )
 {
 }
 
-__EXPORT SvxRotateModeItem::~SvxRotateModeItem()
+SvxRotateModeItem::~SvxRotateModeItem()
 {
 }
 
-SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
 {
     USHORT nVal;
     rStream >> nVal;
     return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() );
 }
 
-SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation(
+SfxItemPresentation SvxRotateModeItem::GetPresentation(
                                 SfxItemPresentation ePres,
                                 SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
                                 String& rText, const IntlWrapper * )  const
@@ -100,7 +100,7 @@ SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation(
     return ePres;
 }
 
-String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
+String SvxRotateModeItem::GetValueText( USHORT nVal ) const
 {
     String aText;
 
@@ -119,17 +119,17 @@ String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
     return aText;
 }
 
-USHORT __EXPORT SvxRotateModeItem::GetValueCount() const
+USHORT SvxRotateModeItem::GetValueCount() const
 {
     return 4;       // STANDARD, TOP, CENTER, BOTTOM
 }
 
-SfxPoolItem* __EXPORT SvxRotateModeItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const
 {
     return new SvxRotateModeItem( *this );
 }
 
-USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
+USHORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
 {
     return 0;
 }
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index a21d05775045..57381d64ea59 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -345,7 +345,7 @@ SdrItemPool::SdrItemPool(const SdrItemPool& rPool)
 |*
 \************************************************************************/
 
-SfxItemPool* __EXPORT SdrItemPool::Clone() const
+SfxItemPool* SdrItemPool::Clone() const
 {
     return new SdrItemPool(*this);
 }
@@ -379,7 +379,7 @@ SdrItemPool::~SdrItemPool()
     SetSecondaryPool(NULL);
 }
 
-SfxItemPresentation __EXPORT SdrItemPool::GetPresentation(
+SfxItemPresentation SdrItemPool::GetPresentation(
               const SfxPoolItem& rItem, SfxItemPresentation ePresentation,
               SfxMapUnit ePresentationMetric, XubString& rText,
               const IntlWrapper * pIntlWrapper) const
@@ -642,13 +642,13 @@ 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;
 }
 
-SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation(
+SfxItemPresentation SdrFractionItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
 {
@@ -681,25 +681,25 @@ SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* __EXPORT SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrFractionItem(Which(),rIn);
 }
 
-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;
@@ -712,7 +712,7 @@ int __EXPORT SdrFractionItem::IsPoolable() const
 
 TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
 
-SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation(
+SfxItemPresentation SdrScaleItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
 {
@@ -742,12 +742,12 @@ SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation(
     return ePresentation;
 }
 
-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());
 }
@@ -758,23 +758,23 @@ 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);
 }
 
-XubString __EXPORT SdrOnOffItem::GetValueTextByVal(BOOL bVal) const
+XubString SdrOnOffItem::GetValueTextByVal(BOOL bVal) const
 {
     if (bVal) return ImpGetResStr(STR_ItemValON);
     else return ImpGetResStr(STR_ItemValOFF);
 }
 
-SfxItemPresentation __EXPORT SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByVal(GetValue());
@@ -789,7 +789,7 @@ SfxItemPresentation __EXPORT SdrOnOffItem::GetPresentation(SfxItemPresentation e
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrOnOffItem::IsPoolable() const
+int SdrOnOffItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -798,23 +798,23 @@ 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);
 }
 
-XubString __EXPORT SdrYesNoItem::GetValueTextByVal(BOOL bVal) const
+XubString SdrYesNoItem::GetValueTextByVal(BOOL bVal) const
 {
     if (bVal) return ImpGetResStr(STR_ItemValYES);
     else return ImpGetResStr(STR_ItemValNO);
 }
 
-SfxItemPresentation __EXPORT SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByVal(GetValue());
@@ -829,7 +829,7 @@ SfxItemPresentation __EXPORT SdrYesNoItem::GetPresentation(SfxItemPresentation e
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrYesNoItem::IsPoolable() const
+int SdrYesNoItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -842,17 +842,17 @@ 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);
 }
 
-SfxItemPresentation __EXPORT SdrPercentItem::GetPresentation(
+SfxItemPresentation SdrPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
@@ -872,7 +872,7 @@ SfxItemPresentation __EXPORT SdrPercentItem::GetPresentation(
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrPercentItem::IsPoolable() const
+int SdrPercentItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -885,17 +885,17 @@ 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);
 }
 
-SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
+SfxItemPresentation SdrAngleItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper * pIntlWrapper) const
 {
@@ -969,7 +969,7 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrAngleItem::IsPoolable() const
+int SdrAngleItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -982,22 +982,22 @@ 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);
 }
 
-bool __EXPORT SdrMetricItem::HasMetrics() const
+bool SdrMetricItem::HasMetrics() const
 {
     return TRUE;
 }
 
-bool __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
+bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
 {
     if (GetValue()!=0) {
         BigInt aVal(GetValue());
@@ -1009,7 +1009,7 @@ bool __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
     return TRUE;
 }
 
-SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString& rText, const IntlWrapper *) const
 {
     long nValue=GetValue();
@@ -1029,7 +1029,7 @@ SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrMetricItem::IsPoolable() const
+int SdrMetricItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
@@ -1042,18 +1042,18 @@ int __EXPORT SdrMetricItem::IsPoolable() const
 
 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; }
 
-XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1069,18 +1069,18 @@ SfxItemPresentation __EXPORT SdrCaptionTypeItem::GetPresentation(SfxItemPresenta
 
 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; }
 
-XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1101,18 +1101,18 @@ SfxItemPresentation __EXPORT SdrCaptionEscDirItem::GetPresentation(SfxItemPresen
 // 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; }
 
-XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1126,11 +1126,11 @@ SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPr
     return ePres;
 }
 
-int  __EXPORT SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; }
+int  SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; }
 
-BOOL __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
+BOOL SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
 
-void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
+void SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
 
 bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
@@ -1159,18 +1159,18 @@ 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; }
 
-XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1209,18 +1209,18 @@ 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
 {
     return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1259,18 +1259,18 @@ 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; }
 
-XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1308,18 +1308,18 @@ 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; }
 
-XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1358,11 +1358,11 @@ 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); }
 
-SfxItemPresentation __EXPORT SdrTextAniDelayItem::GetPresentation(
+SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper *) const
 {
@@ -1384,16 +1384,16 @@ SfxItemPresentation __EXPORT SdrTextAniDelayItem::GetPresentation(
 
 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); }
 
-bool __EXPORT SdrTextAniAmountItem::HasMetrics() const
+bool SdrTextAniAmountItem::HasMetrics() const
 {
     return GetValue()>0;
 }
 
-bool __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
+bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
 {
     if (GetValue()>0) {
         BigInt aVal(GetValue());
@@ -1405,7 +1405,7 @@ bool __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
     } else return FALSE;
 }
 
-SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
+SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
     XubString& rText, const IntlWrapper *) const
 {
@@ -1456,7 +1456,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_
         SetValue( bValue );
     }
 }
-SfxItemPresentation __EXPORT SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres,
+SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/,
                                         String &rText, const IntlWrapper * ) const
 {
@@ -1470,11 +1470,11 @@ SfxItemPresentation __EXPORT SdrTextFixedCellHeightItem::GetPresentation( SfxIte
     }
     return ePres;
 }
-SfxPoolItem* __EXPORT SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
+SfxPoolItem* SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
 {
     return new SdrTextFixedCellHeightItem( rIn, nItemVersion );
 }
-SvStream& __EXPORT SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
+SvStream& SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     if ( nItemVersion )
     {
@@ -1483,7 +1483,7 @@ SvStream& __EXPORT SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16
     }
     return rOut;
 }
-SfxPoolItem* __EXPORT SdrTextFixedCellHeightItem::Clone( SfxItemPool * /*pPool*/) const
+SfxPoolItem* SdrTextFixedCellHeightItem::Clone( SfxItemPool * /*pPool*/) const
 {
     return new SdrTextFixedCellHeightItem( GetValue() );
 }
@@ -1506,7 +1506,7 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI
     return true;
 }
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrTextFixedCellHeightItem::IsPoolable() const
+int SdrTextFixedCellHeightItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
@@ -1542,7 +1542,7 @@ SdrCustomShapeAdjustmentItem::~SdrCustomShapeAdjustmentItem()
         delete (SdrCustomShapeAdjustmentValue*)pPtr;
 }
 
-int __EXPORT SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
+int SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
 {
     int bRet = SfxPoolItem::operator==( rCmp );
     if ( bRet )
@@ -1564,7 +1564,7 @@ int __EXPORT SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp )
     return bRet;
 }
 
-SfxItemPresentation __EXPORT SdrCustomShapeAdjustmentItem::GetPresentation(
+SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
 {
@@ -1586,12 +1586,12 @@ SfxItemPresentation __EXPORT SdrCustomShapeAdjustmentItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
+SfxPoolItem* SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
 {
     return new SdrCustomShapeAdjustmentItem( rIn, nItemVersion );
 }
 
-SvStream& __EXPORT SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
+SvStream& SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     if ( nItemVersion )
     {
@@ -1603,7 +1603,7 @@ SvStream& __EXPORT SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt
     return rOut;
 }
 
-SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const
+SfxPoolItem* SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const
 {
     sal_uInt32 i;
     SdrCustomShapeAdjustmentItem* pItem = new SdrCustomShapeAdjustmentItem;
@@ -1616,7 +1616,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool
 }
 
 #ifdef SDR_ISPOOLABLE
-int __EXPORT SdrCustomShapeAdjustmentItem::IsPoolable() const
+int SdrCustomShapeAdjustmentItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
@@ -1695,18 +1695,18 @@ bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMembe
 // 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; }
 
-XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1886,18 +1886,18 @@ bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 // 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; }
 
-XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1935,18 +1935,18 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 
 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; }
 
-XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -1984,18 +1984,18 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 
 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; }
 
-XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -2033,13 +2033,13 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 
 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; }
 
-XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
 {
     XubString aRetval;
 
@@ -2051,7 +2051,7 @@ XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
     return aRetval;
 }
 
-SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -2088,18 +2088,18 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 // 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; }
 
-XubString __EXPORT SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
 {
     return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
 }
 
-SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
+SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
@@ -2142,17 +2142,17 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item );
 
 
-SfxPoolItem* __EXPORT SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SdrSignedPercentItem( Which(), GetValue() );
 }
 
-SfxPoolItem* __EXPORT SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrSignedPercentItem( Which(), rIn );
 }
 
-SfxItemPresentation __EXPORT SdrSignedPercentItem::GetPresentation(
+SfxItemPresentation SdrSignedPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper *) const
 {
@@ -2173,7 +2173,7 @@ SfxItemPresentation __EXPORT SdrSignedPercentItem::GetPresentation(
 
 #ifdef SDR_ISPOOLABLE
 
-int __EXPORT SdrSignedPercentItem::IsPoolable() const
+int SdrSignedPercentItem::IsPoolable() const
 {
     USHORT nId=Which();
     return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
@@ -2186,12 +2186,12 @@ int __EXPORT SdrSignedPercentItem::IsPoolable() const
 
 TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem );
 
-SfxPoolItem* __EXPORT SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafRedItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafRedItem( rIn );
 }
@@ -2202,12 +2202,12 @@ SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) co
 
 TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem );
 
-SfxPoolItem* __EXPORT SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafGreenItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafGreenItem( rIn );
 }
@@ -2218,12 +2218,12 @@ SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/)
 
 TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem );
 
-SfxPoolItem* __EXPORT SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafBlueItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafBlueItem( rIn );
 }
@@ -2234,12 +2234,12 @@ SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) c
 
 TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem );
 
-SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafLuminanceItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafLuminanceItem( rIn );
 }
@@ -2250,12 +2250,12 @@ SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer
 
 TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem );
 
-SfxPoolItem* __EXPORT SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafContrastItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafContrastItem( rIn );
 }
@@ -2266,12 +2266,12 @@ SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*
 
 TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item );
 
-SfxPoolItem* __EXPORT SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const
+SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const
 {
     return new SdrGrafGamma100Item( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafGamma100Item( rIn );
 }
@@ -2298,12 +2298,12 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 
 TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem );
 
-SfxPoolItem* __EXPORT SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafInvertItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafInvertItem( rIn );
 }
@@ -2314,12 +2314,12 @@ SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/)
 
 TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem );
 
-SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafTransparenceItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafTransparenceItem( rIn );
 }
@@ -2330,22 +2330,22 @@ SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*n
 
 TYPEINIT1( SdrGrafModeItem, SfxEnumItem );
 
-SfxPoolItem* __EXPORT SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
+SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SdrGrafModeItem( *this );
 }
 
-SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const
 {
     return new SdrGrafModeItem( rIn );
 }
 
-USHORT __EXPORT SdrGrafModeItem::GetValueCount() const
+USHORT SdrGrafModeItem::GetValueCount() const
 {
     return 4;
 }
 
-XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
+XubString SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
 {
     XubString aStr;
 
@@ -2376,7 +2376,7 @@ XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
     return aStr;
 }
 
-SfxItemPresentation __EXPORT SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
+SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
                                                                SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
                                                                XubString& rText, const IntlWrapper *) const
 {
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0201c21347ad..2296fe79d97c 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -155,7 +155,7 @@ void SdrObjEditView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-void __EXPORT SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SdrGlueEditView::Notify(rBC,rHint);
     // Printerwechsel waerend des Editierens
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index e1d0740af773..ba52976f9f52 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -188,11 +188,11 @@ public:
     virtual void KeyInput(const KeyEvent& rEvt);
 };
 
-__EXPORT ImpItemEdit::~ImpItemEdit()
+ImpItemEdit::~ImpItemEdit()
 {
 }
 
-void __EXPORT ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
+void ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
 {
     _SdrItemBrowserControl* pBrowseMerk = pBrowse;
 
@@ -229,7 +229,7 @@ _SdrItemBrowserControl::_SdrItemBrowserControl(Window* pParent, WinBits nBits):
     ImpCtor();
 }
 
-__EXPORT _SdrItemBrowserControl::~_SdrItemBrowserControl()
+_SdrItemBrowserControl::~_SdrItemBrowserControl()
 {
     if(pEditControl)
         delete pEditControl;
@@ -303,12 +303,12 @@ void _SdrItemBrowserControl::Clear()
     BrowseBox::Clear();
 }
 
-long __EXPORT _SdrItemBrowserControl::GetRowCount() const
+long _SdrItemBrowserControl::GetRowCount() const
 {
     return aList.Count();
 }
 
-BOOL __EXPORT _SdrItemBrowserControl::SeekRow(long nRow)
+BOOL _SdrItemBrowserControl::SeekRow(long nRow)
 {
     nAktPaintRow=nRow;
     return TRUE;
@@ -357,7 +357,7 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
     return sRet;
 }
 
-void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const
+void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const
 {
     if (nAktPaintRow<0 || (ULONG)nAktPaintRow>=aList.Count()) {
         return;
@@ -405,7 +405,7 @@ USHORT _SdrItemBrowserControl::GetCurrentWhich() const
     return nRet;
 }
 
-void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
+void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
 {
     ULONG nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
@@ -413,7 +413,7 @@ void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
     }
 }
 
-void __EXPORT _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
+void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 {
     USHORT nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
     bool bAusgewertet = false;
@@ -458,7 +458,7 @@ sal_Int32 _SdrItemBrowserControl::GetFieldIndexAtPoint(sal_Int32 /*_nRow*/,sal_I
     return -1;
 }
 
-void __EXPORT _SdrItemBrowserControl::Select()
+void _SdrItemBrowserControl::Select()
 {
     EndChangeEntry();
     BrowseBox::Select();
@@ -1084,16 +1084,16 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits):
     aBrowse.Show();
 }
 
-__EXPORT _SdrItemBrowserWindow::~_SdrItemBrowserWindow()
+_SdrItemBrowserWindow::~_SdrItemBrowserWindow()
 {
 }
 
-void __EXPORT _SdrItemBrowserWindow::Resize()
+void _SdrItemBrowserWindow::Resize()
 {
     aBrowse.SetSizePixel(GetOutputSizePixel());
 }
 
-void __EXPORT _SdrItemBrowserWindow::GetFocus()
+void _SdrItemBrowserWindow::GetFocus()
 {
     aBrowse.GrabFocus();
 }
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index ca7bd1509c2d..7958f24043c3 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -194,7 +194,7 @@ SdrMarkView::~SdrMarkView()
     delete mpSdrViewSelection;
 }
 
-void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
     if (pSdrHint!=NULL)
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 504406952839..abf73b4a31f7 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -137,7 +137,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // syntactical sugar for ItemSet accesses
 
-void __EXPORT SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
+void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
     BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 0e30d71a896b..09dffdd0c8bf 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1074,7 +1074,7 @@ Point SdrCircObj::GetSnapPoint(sal_uInt32 i) const
     }
 }
 
-void __EXPORT SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+void SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SetXPolyDirty();
     SdrRectObj::Notify(rBC,rHint);
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index dd0b255c8e39..ded0163f19c5 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1547,7 +1547,7 @@ je Objekt variiert von 0-3:
 'C':  n  0-3  0-3   = 1+U+1
 */
 
-void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
     ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 2d7ca7c75510..57d930fa79a0 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -92,7 +92,7 @@ SdrObject& SdrVirtObj::ReferencedObj()
     return rRefObj;
 }
 
-void __EXPORT SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
+void SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
 {
     bClosedObj=rRefObj.IsClosedObj();
     SetRectsDirty(); // hier noch Optimieren.
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index fa5c6aae5a93..4d75681b47c9 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -263,7 +263,7 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow)
     return xReturn;
 }
 
-void __EXPORT SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
+void SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
 {
     // not really interested in
 }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 07d728189f37..9213a2502cb3 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -321,7 +321,7 @@ SdrPaintView::~SdrPaintView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void __EXPORT SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     //If the stylesheet has been destroyed
     if (&rBC == pDefaultStyleSheet)
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 62ab6864ee82..e6593dafb297 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -599,7 +599,7 @@ void SvxLineEndWindow::Resize()
 
 // -----------------------------------------------------------------------
 
-void __EXPORT SvxLineEndWindow::Resizing( Size& rNewSize )
+void SvxLineEndWindow::Resizing( Size& rNewSize )
 {
     Size aBitmapSize = aBmpSize; // -> Member
     aBitmapSize.Width()  += 6; //