cleaning of __EXPORT define

28 files changed, 146 insertions, 146 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 83d2d10e1256..49fd4ac3dbf9 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -67,7 +67,7 @@ BasicDocShell::BasicDocShell()
     SetBaseModel( new SIDEModel(this) );
 }
 
-__EXPORT BasicDocShell::~BasicDocShell()
+BasicDocShell::~BasicDocShell()
 {
     delete pPrinter;
 }
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 9ac79df53864..b1bf4b201442 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -178,12 +178,12 @@ BasicLibBox::BasicLibBox( Window* pParent, const uno::Reference< frame::XFrame >
 
 
 
-__EXPORT BasicLibBox::~BasicLibBox()
+BasicLibBox::~BasicLibBox()
 {
     ClearBox();
 }
 
-void __EXPORT BasicLibBox::Update( const SfxStringItem* pItem )
+void BasicLibBox::Update( const SfxStringItem* pItem )
 {
     // Immer auf dem laufenden sein...
 //  if ( !pItem  || !pItem->GetValue().Len() )
@@ -200,7 +200,7 @@ void __EXPORT BasicLibBox::Update( const SfxStringItem* pItem )
         SelectEntry( aCurText );
 }
 
-void __EXPORT BasicLibBox::ReleaseFocus()
+void BasicLibBox::ReleaseFocus()
 {
     SfxViewShell* pCurSh = SfxViewShell::Current();
     DBG_ASSERT( pCurSh, "Current ViewShell not found!" );
@@ -316,7 +316,7 @@ long BasicLibBox::PreNotify( NotifyEvent& rNEvt )
     return nDone ? nDone : ListBox::PreNotify( rNEvt );
 }
 
-void __EXPORT BasicLibBox::Select()
+void BasicLibBox::Select()
 {
     if ( !IsTravelSelect() )
     {
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 01780c4b13b8..6df383e07e2b 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -227,7 +227,7 @@ SbModuleRef ModulWindow::XModule()
     return xModule;
 }
 
-__EXPORT ModulWindow::~ModulWindow()
+ModulWindow::~ModulWindow()
 {
     DBG_DTOR( ModulWindow, 0 );
     nValid = 0;
@@ -236,7 +236,7 @@ __EXPORT ModulWindow::~ModulWindow()
 }
 
 
-void __EXPORT ModulWindow::GetFocus()
+void ModulWindow::GetFocus()
 {
     if ( nValid != VALIDWINDOW  )
         return;
@@ -258,11 +258,11 @@ void ModulWindow::DoInit()
 }
 
 
-void __EXPORT ModulWindow::Paint( const Rectangle& )
+void ModulWindow::Paint( const Rectangle& )
 {
 }
 
-void __EXPORT ModulWindow::Resize()
+void ModulWindow::Resize()
 {
     aXEditorWindow.SetPosSizePixel( Point( 0, 0 ),
                                     Size( GetOutputSizePixel() ) );
@@ -737,7 +737,7 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
     return FALSE;
 }
 
-long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
+long ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     // Ein GoOnTop aktiviert da Fenster, das veraendert aber den Context fuer
@@ -882,7 +882,7 @@ void ModulWindow::EditMacro( const String& rMacroName )
 }
 
 
-void __EXPORT ModulWindow::StoreData()
+void ModulWindow::StoreData()
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     // StoreData wird gerufen, wenn der BasicManager zerstoert oder
@@ -895,20 +895,20 @@ void __EXPORT ModulWindow::StoreData()
 //  xModule->SetModified( FALSE );
 }
 
-BOOL __EXPORT ModulWindow::CanClose()
+BOOL ModulWindow::CanClose()
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     return TRUE;
 }
 
 
-BOOL __EXPORT ModulWindow::AllowUndo()
+BOOL ModulWindow::AllowUndo()
 {
     return GetEditorWindow().CanModify();
 }
 
 
-void __EXPORT ModulWindow::UpdateData()
+void ModulWindow::UpdateData()
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     DBG_ASSERT( XModule().Is(), "Kein Modul!" );
@@ -1012,7 +1012,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
 }
 
 
-void __EXPORT ModulWindow::ExecuteCommand( SfxRequest& rReq )
+void ModulWindow::ExecuteCommand( SfxRequest& rReq )
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     AssertValidEditEngine();
@@ -1127,7 +1127,7 @@ void __EXPORT ModulWindow::ExecuteCommand( SfxRequest& rReq )
 
 
 
-void __EXPORT ModulWindow::GetState( SfxItemSet &rSet )
+void ModulWindow::GetState( SfxItemSet &rSet )
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     SfxWhichIter aIter(rSet);
@@ -1193,7 +1193,7 @@ void __EXPORT ModulWindow::GetState( SfxItemSet &rSet )
 }
 
 
-void __EXPORT ModulWindow::DoScroll( ScrollBar* pCurScrollBar )
+void ModulWindow::DoScroll( ScrollBar* pCurScrollBar )
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     if ( ( pCurScrollBar == GetHScrollBar() ) && GetEditView() )
@@ -1209,14 +1209,14 @@ void __EXPORT ModulWindow::DoScroll( ScrollBar* pCurScrollBar )
 }
 
 
-BOOL __EXPORT ModulWindow::IsModified()
+BOOL ModulWindow::IsModified()
 {
     return GetEditEngine() ? GetEditEngine()->IsModified() : FALSE;
 }
 
 
 
-void __EXPORT ModulWindow::GoOnTop()
+void ModulWindow::GoOnTop()
 {
     IDE_DLL()->GetShell()->GetViewFrame()->ToTop();
 }
@@ -1231,7 +1231,7 @@ String ModulWindow::GetSbModuleName()
 
 
 
-String __EXPORT ModulWindow::GetTitle()
+String ModulWindow::GetTitle()
 {
     return GetSbModuleName();
 }
@@ -1262,7 +1262,7 @@ void ModulWindow::ShowCursor( BOOL bOn )
 }
 
 
-Window* __EXPORT ModulWindow::GetLayoutWindow()
+Window* ModulWindow::GetLayoutWindow()
 {
     return pLayout;
 }
@@ -1318,14 +1318,14 @@ USHORT ModulWindow::StartSearchAndReplace( const SvxSearchItem& rSearchItem, BOO
     return nFound;
 }
 
-SfxUndoManager* __EXPORT ModulWindow::GetUndoManager()
+SfxUndoManager* ModulWindow::GetUndoManager()
 {
     if ( GetEditEngine() )
         return &GetEditEngine()->GetUndoManager();
     return NULL;
 }
 
-USHORT __EXPORT ModulWindow::GetSearchOptions()
+USHORT ModulWindow::GetSearchOptions()
 {
     USHORT nOptions = SEARCH_OPTIONS_SEARCH |
                       SEARCH_OPTIONS_WHOLE_WORDS |
@@ -1344,7 +1344,7 @@ USHORT __EXPORT ModulWindow::GetSearchOptions()
     return nOptions;
 }
 
-void __EXPORT ModulWindow::BasicStarted()
+void ModulWindow::BasicStarted()
 {
     if ( XModule().Is() )
     {
@@ -1364,7 +1364,7 @@ void __EXPORT ModulWindow::BasicStarted()
     }
 }
 
-void __EXPORT ModulWindow::BasicStopped()
+void ModulWindow::BasicStopped()
 {
     aStatus.bIsRunning = FALSE;
     GetBreakPointWindow().SetMarkerPos( MARKER_NOMARKER );
@@ -1508,14 +1508,14 @@ ModulWindowLayout::~ModulWindowLayout()
     m_aColorConfig.RemoveListener(this);
 }
 
-void __EXPORT ModulWindowLayout::Resize()
+void ModulWindowLayout::Resize()
 {
     // ScrollBars, etc. passiert in BasicIDEShell:Adjust...
     ArrangeWindows();
 //  Invalidate();
 }
 
-void __EXPORT ModulWindowLayout::Paint( const Rectangle& )
+void ModulWindowLayout::Paint( const Rectangle& )
 {
     DrawText( Point(), String( IDEResId( RID_STR_NOMODULE ) ) );
 }
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 4157d8284d84..4dcaf94ef75f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -180,7 +180,7 @@ EditorWindow::EditorWindow( Window* pParent ) :
 
 
 
-__EXPORT EditorWindow::~EditorWindow()
+EditorWindow::~EditorWindow()
 {
     pSourceViewConfig->RemoveListener(this);
     delete pSourceViewConfig;
@@ -244,7 +244,7 @@ String EditorWindow::GetWordAtCursor()
     return aWord;
 }
 
-void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
+void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 {
     BOOL bDone = FALSE;
 
@@ -314,7 +314,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 }
 
 
-void __EXPORT EditorWindow::Resize()
+void EditorWindow::Resize()
 {
     // ScrollBars, etc. happens in Adjust...
     if ( pEditView )
@@ -341,14 +341,14 @@ void __EXPORT EditorWindow::Resize()
 }
 
 
-void __EXPORT EditorWindow::MouseMove( const MouseEvent &rEvt )
+void EditorWindow::MouseMove( const MouseEvent &rEvt )
 {
     if ( pEditView )
         pEditView->MouseMove( rEvt );
 }
 
 
-void __EXPORT EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
+void EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
 {
     if ( pEditView )
     {
@@ -359,7 +359,7 @@ void __EXPORT EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
     }
 }
 
-void __EXPORT EditorWindow::MouseButtonDown( const MouseEvent &rEvt )
+void EditorWindow::MouseButtonDown( const MouseEvent &rEvt )
 {
     GrabFocus();
     if ( pEditView )
@@ -368,7 +368,7 @@ void __EXPORT EditorWindow::MouseButtonDown( const MouseEvent &rEvt )
     }
 }
 
-void __EXPORT EditorWindow::Command( const CommandEvent& rCEvt )
+void EditorWindow::Command( const CommandEvent& rCEvt )
 {
     if ( pEditView )
     {
@@ -400,7 +400,7 @@ BOOL EditorWindow::ImpCanModify()
     return bCanModify;
 }
 
-void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
+void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 {
     if ( !pEditView )   // Happens in Win95
         return;
@@ -465,7 +465,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-void __EXPORT EditorWindow::Paint( const Rectangle& rRect )
+void EditorWindow::Paint( const Rectangle& rRect )
 {
     if ( !pEditEngine )     // We need it now at latest
         CreateEditEngine();
@@ -473,7 +473,7 @@ void __EXPORT EditorWindow::Paint( const Rectangle& rRect )
     pEditView->Paint( rRect );
 }
 
-void __EXPORT EditorWindow::LoseFocus()
+void EditorWindow::LoseFocus()
 {
     SetSourceInBasic();
     Window::LoseFocus();
@@ -944,20 +944,20 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) :
 
 
 
-__EXPORT BreakPointWindow::~BreakPointWindow()
+BreakPointWindow::~BreakPointWindow()
 {
 }
 
 
 
-void __EXPORT BreakPointWindow::Resize()
+void BreakPointWindow::Resize()
 {
 /// Invalidate();
 }
 
 
 
-void __EXPORT BreakPointWindow::Paint( const Rectangle& )
+void BreakPointWindow::Paint( const Rectangle& )
 {
     if ( SyncYOffset() )
         return;
@@ -1052,7 +1052,7 @@ BreakPoint* BreakPointWindow::FindBreakPoint( const Point& rMousePos )
     return 0;
 }
 
-void __EXPORT BreakPointWindow::MouseButtonDown( const MouseEvent& rMEvt )
+void BreakPointWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.GetClicks() == 2 )
     {
@@ -1068,7 +1068,7 @@ void __EXPORT BreakPointWindow::MouseButtonDown( const MouseEvent& rMEvt )
 
 
 
-void __EXPORT BreakPointWindow::Command( const CommandEvent& rCEvt )
+void BreakPointWindow::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
     {
@@ -1229,14 +1229,14 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
 
 
-__EXPORT WatchWindow::~WatchWindow()
+WatchWindow::~WatchWindow()
 {
     GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
 }
 
 
 
-void __EXPORT WatchWindow::Paint( const Rectangle& )
+void WatchWindow::Paint( const Rectangle& )
 {
     DrawText( Point( DWBORDER, 7 ), aWatchStr );
     lcl_DrawIDEWindowFrame( this );
@@ -1244,7 +1244,7 @@ void __EXPORT WatchWindow::Paint( const Rectangle& )
 
 
 
-void __EXPORT WatchWindow::Resize()
+void WatchWindow::Resize()
 {
     Size aSz = GetOutputSizePixel();
     Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER );
@@ -1529,14 +1529,14 @@ StackWindow::StackWindow( Window* pParent ) :
 
 
 
-__EXPORT StackWindow::~StackWindow()
+StackWindow::~StackWindow()
 {
     GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
 }
 
 
 
-void __EXPORT StackWindow::Paint( const Rectangle& )
+void StackWindow::Paint( const Rectangle& )
 {
     DrawText( Point( DWBORDER, 7 ), aStackStr );
     lcl_DrawIDEWindowFrame( this );
@@ -1544,7 +1544,7 @@ void __EXPORT StackWindow::Paint( const Rectangle& )
 
 
 
-void __EXPORT StackWindow::Resize()
+void StackWindow::Resize()
 {
     Size aSz = GetOutputSizePixel();
     Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER );
@@ -1579,7 +1579,7 @@ IMPL_LINK_INLINE_END( StackWindow, ButtonHdl, ImageButton *, pButton )
 
 
 
-void __EXPORT StackWindow::UpdateCalls()
+void StackWindow::UpdateCalls()
 {
     aTreeListBox.SetUpdateMode( FALSE );
     aTreeListBox.Clear();
@@ -1666,7 +1666,7 @@ ComplexEditorWindow::ComplexEditorWindow( ModulWindow* pParent ) :
 
 
 
-void __EXPORT ComplexEditorWindow::Resize()
+void ComplexEditorWindow::Resize()
 {
     Size aOutSz = GetOutputSizePixel();
     Size aSz( aOutSz );
@@ -1901,7 +1901,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
     return pSBX;
 }
 
-BOOL __EXPORT WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+BOOL WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 {
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
 
@@ -1930,7 +1930,7 @@ BOOL __EXPORT WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
     return bEdit;
 }
 
-BOOL __EXPORT WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
+BOOL WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
 {
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
     String aVName( pItem->maName );
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 6b1ec9cfea16..224be1723349 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -278,7 +278,7 @@ IMPL_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction )
 
 
 
-void __EXPORT DialogWindow::DoInit()
+void DialogWindow::DoInit()
 {
     GetHScrollBar()->Show();
     GetVScrollBar()->Show();
@@ -287,12 +287,12 @@ void __EXPORT DialogWindow::DoInit()
 
 
 
-void __EXPORT DialogWindow::DoScroll( ScrollBar* pCurScrollBar )
+void DialogWindow::DoScroll( ScrollBar* pCurScrollBar )
 {
     pEditor->DoScroll( pCurScrollBar );
 }
 
-void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
+void DialogWindow::GetState( SfxItemSet& rSet )
 {
     SfxWhichIter aIter(rSet);
     for ( USHORT nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich() )
@@ -419,7 +419,7 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
 
 
 
-void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq )
+void DialogWindow::ExecuteCommand( SfxRequest& rReq )
 {
     switch ( rReq.GetSlot() )
     {
@@ -1264,12 +1264,12 @@ DlgEdView* DialogWindow::GetView() const
     return pEditor ? pEditor->GetView() : NULL;
 }
 
-BOOL __EXPORT DialogWindow::IsModified()
+BOOL DialogWindow::IsModified()
 {
     return pEditor->IsModified();
 }
 
-SfxUndoManager* __EXPORT DialogWindow::GetUndoManager()
+SfxUndoManager* DialogWindow::GetUndoManager()
 {
     return pUndoMgr;
 }
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 0ad75f2fd725..12bcaee7aec3 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -84,7 +84,7 @@ using namespace ::com::sun::star::frame;
 class SvxSearchItem;
 
 //  Egal was, einfach ans aktuelle Fenster:
-void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
+void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
 {
     if ( !pCurWin )
         return;
@@ -265,7 +265,7 @@ void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
 }
 
 //  Egal, wer oben, Einfluss auf die Shell:
-void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
+void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
 {
     USHORT nSlot = rReq.GetSlot();
     switch ( nSlot )
@@ -779,7 +779,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
     }
 }
 
-void __EXPORT BasicIDEShell::GetState(SfxItemSet &rSet)
+void BasicIDEShell::GetState(SfxItemSet &rSet)
 {
     SfxWhichIter aIter(rSet);
     for ( USHORT nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich() )
@@ -1303,7 +1303,7 @@ ModulWindow* BasicIDEShell::ShowActiveModuleWindow( StarBASIC* pBasic )
     return 0;
 }
 
-void __EXPORT BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
+void BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
 {
     // Nicht wenn minimiert, weil dann bei Restore der Text verschoben ist.
     if ( GetViewFrame()->GetWindow().GetOutputSizePixel().Height() == 0 )
@@ -1352,7 +1352,7 @@ Reference< XModel > BasicIDEShell::GetCurrentDocument() const
     return xDocument;
 }
 
-void __EXPORT BasicIDEShell::Activate( BOOL bMDI )
+void BasicIDEShell::Activate( BOOL bMDI )
 {
     SfxViewShell::Activate( bMDI );
 
@@ -1365,7 +1365,7 @@ void __EXPORT BasicIDEShell::Activate( BOOL bMDI )
     }
 }
 
-void __EXPORT BasicIDEShell::Deactivate( BOOL bMDI )
+void BasicIDEShell::Deactivate( BOOL bMDI )
 {
     // bMDI TRUE heisst, dass ein anderes MDI aktiviert wurde, bei einem
     // Deactivate durch eine MessageBox ist bMDI FALSE
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 4092529a5e17..850bd4e627e2 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -91,7 +91,7 @@ Reference< view::XRenderable > BasicIDEShell::GetRenderable()
 }
 
 #if 0
-USHORT __EXPORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog )
+USHORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog )
 {
     if ( pCurWin )
     {
@@ -144,7 +144,7 @@ String BasicIDEShell::GetSelectionText( BOOL bWholeWord )
     return aText;
 }
 
-SfxPrinter* __EXPORT BasicIDEShell::GetPrinter( BOOL bCreate )
+SfxPrinter* BasicIDEShell::GetPrinter( BOOL bCreate )
 {
     if ( pCurWin ) // && pCurWin->ISA( ModulWindow ) )
     {
@@ -155,7 +155,7 @@ SfxPrinter* __EXPORT BasicIDEShell::GetPrinter( BOOL bCreate )
     return 0;
 }
 
-USHORT __EXPORT BasicIDEShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool )
+USHORT BasicIDEShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool )
 {
     (void)nDiffFlags;
     BasicDocShell* pDocShell = (BasicDocShell*)GetViewFrame()->GetObjectShell();
@@ -323,13 +323,13 @@ ModulWindow* BasicIDEShell::FindBasWin( const ScriptDocument& rDocument, const S
     return pModWin;
 }
 
-void __EXPORT BasicIDEShell::Move()
+void BasicIDEShell::Move()
 {
     if ( pCurWin && pCurWin->ISA( ModulWindow ) )
         ((ModulWindow*)pCurWin)->FrameWindowMoved();
 }
 
-void __EXPORT BasicIDEShell::ShowCursor( bool bOn )
+void BasicIDEShell::ShowCursor( bool bOn )
 {
     if ( pCurWin && pCurWin->ISA( ModulWindow ) )
         ((ModulWindow*)pCurWin)->ShowCursor( bOn );
@@ -339,7 +339,7 @@ void __EXPORT BasicIDEShell::ShowCursor( bool bOn )
 sal_Int32 getBasicIDEShellCount( void );
 
 // Nur wenn Basicfenster oben:
-void __EXPORT BasicIDEShell::ExecuteBasic( SfxRequest& rReq )
+void BasicIDEShell::ExecuteBasic( SfxRequest& rReq )
 {
     if ( !pCurWin || !pCurWin->IsA( TYPE( ModulWindow ) ) )
         return;
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 3825eaef11bf..3e504a18c827 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -167,7 +167,7 @@ SdrView* BasicIDEShell::GetCurDlgView() const
 }
 
 // Nur wenn Dialogfenster oben:
-void __EXPORT BasicIDEShell::ExecuteDialog( SfxRequest& rReq )
+void BasicIDEShell::ExecuteDialog( SfxRequest& rReq )
 {
     if ( pCurWin && ( pCurWin->IsA( TYPE( DialogWindow) ) ||
         (rReq.GetSlot() == SID_IMPORT_DIALOG &&pCurWin->IsA( TYPE( ModulWindow) ) ) ) )
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 5300784fa9aa..11c20d3a9d3d 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -252,7 +252,7 @@ void BasicIDEShell::Init()
     UpdateWindows();
 }
 
-__EXPORT BasicIDEShell::~BasicIDEShell()
+BasicIDEShell::~BasicIDEShell()
 {
     m_aNotifier.dispose();
 
@@ -407,7 +407,7 @@ void BasicIDEShell::StoreAllWindowData( BOOL bPersistent )
 }
 
 
-USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
+USHORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
 {
     (void)bForBrowsing;
 
@@ -469,14 +469,14 @@ void BasicIDEShell::InitTabBar()
 }
 
 
-Size __EXPORT BasicIDEShell::GetOptimalSizePixel() const
+Size BasicIDEShell::GetOptimalSizePixel() const
 {
     return Size( 400, 300 );
 }
 
 
 
-void __EXPORT BasicIDEShell::OuterResizePixel( const Point &rPos, const Size &rSize )
+void BasicIDEShell::OuterResizePixel( const Point &rPos, const Size &rSize )
 {
     // Adjust fliegt irgendwann raus...
     AdjustPosSizePixel( rPos, rSize );
@@ -602,7 +602,7 @@ void BasicIDEShell::ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy )
 
 
 
-void __EXPORT BasicIDEShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId&,
+void BasicIDEShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId&,
                                         const SfxHint& rHint, const TypeId& )
 {
     if ( IDE_DLL()->GetShell() )
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index d8224f586aa3..ebb6ba5d72b8 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -605,7 +605,7 @@ void BasicTreeListBox::UpdateEntries()
     SetCurrentEntry( aCurDesc );
 }
 
-SvLBoxEntry* __EXPORT BasicTreeListBox::CloneEntry( SvLBoxEntry* pSource )
+SvLBoxEntry* BasicTreeListBox::CloneEntry( SvLBoxEntry* pSource )
 {
     SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource );
     BasicEntry* pUser = (BasicEntry*)pSource->GetUserData();
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 9b1a18614f1e..2c8b1949d64c 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -53,7 +53,7 @@ SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 )
 SV_IMPL_VARARR( EntryArray, SvLBoxEntry*);
 
 
-void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
+void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
 {
     BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
     ScriptDocument aDocument( aDesc.GetDocument() );
@@ -144,7 +144,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
     }
 }
 
-void __EXPORT BasicTreeListBox::ExpandedHdl()
+void BasicTreeListBox::ExpandedHdl()
 {
     SvLBoxEntry* pEntry = GetHdlEntry();
     DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 245fba82626d..0cf854765708 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -82,7 +82,7 @@ IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument,
 
 
 
-__EXPORT IDEBaseWindow::~IDEBaseWindow()
+IDEBaseWindow::~IDEBaseWindow()
 {
     DBG_DTOR( IDEBaseWindow, 0 );
     if ( pShellVScrollBar )
@@ -105,7 +105,7 @@ void IDEBaseWindow::Init()
 
 
 
-void __EXPORT IDEBaseWindow::DoInit()
+void IDEBaseWindow::DoInit()
 {
 }
 
@@ -131,14 +131,14 @@ IMPL_LINK_INLINE_END( IDEBaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
 
 
 
-void __EXPORT IDEBaseWindow::ExecuteCommand( SfxRequest& )
+void IDEBaseWindow::ExecuteCommand( SfxRequest& )
 {
     DBG_CHKTHIS( IDEBaseWindow, 0 );
 }
 
 
 
-void __EXPORT IDEBaseWindow::GetState( SfxItemSet& )
+void IDEBaseWindow::GetState( SfxItemSet& )
 {
     DBG_CHKTHIS( IDEBaseWindow, 0 );
 }
@@ -176,34 +176,34 @@ long IDEBaseWindow::Notify( NotifyEvent& rNEvt )
 }
 
 
-void __EXPORT IDEBaseWindow::DoScroll( ScrollBar* )
+void IDEBaseWindow::DoScroll( ScrollBar* )
 {
     DBG_CHKTHIS( IDEBaseWindow, 0 );
 }
 
 
-void __EXPORT IDEBaseWindow::StoreData()
+void IDEBaseWindow::StoreData()
 {
 }
 
-BOOL __EXPORT IDEBaseWindow::CanClose()
+BOOL IDEBaseWindow::CanClose()
 {
     return TRUE;
 }
 
-BOOL __EXPORT IDEBaseWindow::AllowUndo()
+BOOL IDEBaseWindow::AllowUndo()
 {
     return TRUE;
 }
 
 
 
-void __EXPORT IDEBaseWindow::UpdateData()
+void IDEBaseWindow::UpdateData()
 {
 }
 
 
-String __EXPORT IDEBaseWindow::GetTitle()
+String IDEBaseWindow::GetTitle()
 {
     return String();
 }
@@ -235,30 +235,30 @@ BOOL IDEBaseWindow::IsReadOnly()
     return FALSE;
 }
 
-void __EXPORT IDEBaseWindow::BasicStarted()
+void IDEBaseWindow::BasicStarted()
 {
 }
 
-void __EXPORT IDEBaseWindow::BasicStopped()
+void IDEBaseWindow::BasicStopped()
 {
 }
 
-BOOL __EXPORT IDEBaseWindow::IsModified()
+BOOL IDEBaseWindow::IsModified()
 {
     return TRUE;
 }
 
-BOOL __EXPORT IDEBaseWindow::IsPasteAllowed()
+BOOL IDEBaseWindow::IsPasteAllowed()
 {
     return FALSE;
 }
 
-Window* __EXPORT IDEBaseWindow::GetLayoutWindow()
+Window* IDEBaseWindow::GetLayoutWindow()
 {
     return this;
 }
 
-SfxUndoManager* __EXPORT IDEBaseWindow::GetUndoManager()
+SfxUndoManager* IDEBaseWindow::GetUndoManager()
 {
     return NULL;
 }
@@ -417,7 +417,7 @@ void IDEBaseWindow::Deactivating()
 {
 }
 
-USHORT __EXPORT IDEBaseWindow::GetSearchOptions()
+USHORT IDEBaseWindow::GetSearchOptions()
 {
     return 0;
 }
@@ -432,7 +432,7 @@ BasicDockingWindow::BasicDockingWindow( Window* pParent ) :
 
 
 
-BOOL __EXPORT BasicDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
+BOOL BasicDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 {
     ModulWindowLayout* pLayout = (ModulWindowLayout*)GetParent();
     Rectangle aTmpRec( rRect );
@@ -451,7 +451,7 @@ BOOL __EXPORT BasicDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
 
 
-void __EXPORT BasicDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
+void BasicDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
 {
     if ( bFloatMode )
         DockingWindow::EndDocking( rRect, bFloatMode );
@@ -465,7 +465,7 @@ void __EXPORT BasicDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloa
 
 
 
-void __EXPORT BasicDockingWindow::ToggleFloatingMode()
+void BasicDockingWindow::ToggleFloatingMode()
 {
     ModulWindowLayout* pLayout = (ModulWindowLayout*)GetParent();
     if ( IsFloatingMode() )
@@ -479,7 +479,7 @@ void __EXPORT BasicDockingWindow::ToggleFloatingMode()
 
 
 
-BOOL __EXPORT BasicDockingWindow::PrepareToggleFloatingMode()
+BOOL BasicDockingWindow::PrepareToggleFloatingMode()
 {
     if ( IsFloatingMode() )
     {
@@ -492,7 +492,7 @@ BOOL __EXPORT BasicDockingWindow::PrepareToggleFloatingMode()
 
 
 
-void __EXPORT BasicDockingWindow::StartDocking()
+void BasicDockingWindow::StartDocking()
 {
     // Position und Groesse auf dem Desktop merken...
     if ( IsFloatingMode() )
@@ -554,7 +554,7 @@ BasicIDETabBar::BasicIDETabBar( Window* pParent ) :
     SetHelpId( HID_BASICIDE_TABBAR );
 }
 
-void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt )
+void BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() && ( rMEvt.GetClicks() == 2 ) && !IsInEditMode() )
     {
@@ -572,7 +572,7 @@ void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt )
+void BasicIDETabBar::Command( const CommandEvent& rCEvt )
 {
     if ( ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) && !IsInEditMode() )
     {
@@ -658,7 +658,7 @@ long BasicIDETabBar::AllowRenaming()
 }
 
 
-void __EXPORT BasicIDETabBar::EndRenaming()
+void BasicIDETabBar::EndRenaming()
 {
     if ( !IsEditModeCanceled() )
     {
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 58f0ade3bec7..f39f0d214d4c 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -209,7 +209,7 @@ void MacroChooser::RestoreMacroDescription()
     }
 }
 
-short __EXPORT MacroChooser::Execute()
+short MacroChooser::Execute()
 {
     RestoreMacroDescription();
     aRunButton.GrabFocus();
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 908aca7e0abd..ebceaed39af4 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -180,7 +180,7 @@ BasicCheckBox::BasicCheckBox( Window* pParent, const ResId& rResId )
 
 //----------------------------------------------------------------------------
 
-__EXPORT BasicCheckBox::~BasicCheckBox()
+BasicCheckBox::~BasicCheckBox()
 {
     delete pCheckButton;
 
@@ -287,7 +287,7 @@ void BasicCheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+BOOL BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 {
     if ( nMode != LIBMODE_MANAGER )
         return FALSE;
@@ -346,7 +346,7 @@ BOOL __EXPORT BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
+BOOL BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
 {
     BOOL bValid = ( rNewText.Len() <= 30 ) && BasicIDE::IsValidSbxName( rNewText );
     String aCurText( GetEntryText( pEntry, 0 ) );
@@ -603,7 +603,7 @@ void LibPage::CheckButtons()
 
 //----------------------------------------------------------------------------
 
-void __EXPORT LibPage::ActivatePage()
+void LibPage::ActivatePage()
 {
     SetCurLib();
 }
@@ -611,7 +611,7 @@ void __EXPORT LibPage::ActivatePage()
 //----------------------------------------------------------------------------
 
 
-void __EXPORT LibPage::DeactivatePage()
+void LibPage::DeactivatePage()
 {
 }
 
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0b5df85985e6..5bcd4f4850c5 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -74,7 +74,7 @@ ExtBasicTreeListBox::~ExtBasicTreeListBox()
 {
 }
 
-BOOL __EXPORT ExtBasicTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+BOOL ExtBasicTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 {
     BOOL bRet = FALSE;
 
@@ -100,7 +100,7 @@ BOOL __EXPORT ExtBasicTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection&
     return bRet;
 }
 
-BOOL __EXPORT ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
+BOOL ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText )
 {
     BOOL bValid = BasicIDE::IsValidSbxName( rNewText );
     if ( !bValid )
@@ -152,7 +152,7 @@ BOOL __EXPORT ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const Strin
 }
 
 
-DragDropMode __EXPORT ExtBasicTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
+DragDropMode ExtBasicTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
 {
     DragDropMode nMode_ = SV_DRAGDROP_NONE;
 
@@ -192,7 +192,7 @@ DragDropMode __EXPORT ExtBasicTreeListBox::NotifyStartDrag( TransferDataContaine
 }
 
 
-BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
+BOOL ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
 {
     // don't drop on a BasicManager (nDepth == 0)
     USHORT nDepth = pEntry ? GetModel()->GetDepth( pEntry ) : 0;
@@ -258,7 +258,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
 }
 
 
-BOOL __EXPORT ExtBasicTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+BOOL ExtBasicTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos )
 {
     return NotifyCopyingMoving( pTarget, pEntry,
@@ -266,7 +266,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEnt
 }
 
 
-BOOL __EXPORT ExtBasicTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+BOOL ExtBasicTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos )
 {
 //  return FALSE;   // Wie kopiere ich ein SBX ?!
@@ -331,7 +331,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >&
 }
 
 
-BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+BOOL ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove )
 {
     (void)pEntry;
@@ -508,7 +508,7 @@ OrganizeDialog::OrganizeDialog( Window* pParent, INT16 tabId, BasicEntryDescript
     }
 }
 
-__EXPORT OrganizeDialog::~OrganizeDialog()
+OrganizeDialog::~OrganizeDialog()
 {
     for ( USHORT i = 0; i < aTabCtrl.GetPageCount(); i++ )
         delete aTabCtrl.GetTabPage( aTabCtrl.GetPageId( i ) );
@@ -607,12 +607,12 @@ void ObjectPage::SetCurrentEntry( BasicEntryDescriptor& rDesc )
     aBasicBox.SetCurrentEntry( rDesc );
 }
 
-void __EXPORT ObjectPage::ActivatePage()
+void ObjectPage::ActivatePage()
 {
     aBasicBox.UpdateEntries();
 }
 
-void __EXPORT ObjectPage::DeactivatePage()
+void ObjectPage::DeactivatePage()
 {
 }
 
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 7b4169dcb138..157fee998955 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -135,18 +135,18 @@ ObjectCatalog::~ObjectCatalog()
     GetParent()->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
 }
 
-void __EXPORT ObjectCatalog::Move()
+void ObjectCatalog::Move()
 {
     IDE_DLL()->GetExtraData()->SetObjectCatalogPos( GetPosPixel() );
 }
 
-BOOL __EXPORT ObjectCatalog::Close()
+BOOL ObjectCatalog::Close()
 {
     aCancelHdl.Call( this );
     return TRUE;
 }
 
-void __EXPORT ObjectCatalog::Resize()
+void ObjectCatalog::Resize()
 {
     Size aOutSz = GetOutputSizePixel();
     IDE_DLL()->GetExtraData()->SetObjectCatalogSize( aOutSz );
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index 9b23a1386963..008338956289 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -80,7 +80,7 @@ XubString SvxClickInfoCtr::GetText() const
 }
 
 //-----------------------------------------------------------------------------
-__EXPORT SvxClickInfoCtr::~SvxClickInfoCtr()
+SvxClickInfoCtr::~SvxClickInfoCtr()
 {
 }
 
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 3f7f70e536bc..d8885a25f142 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -426,7 +426,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
    return p;
 }
 
-void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
+void SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
 {
     SFEntry* userData = 0;
     if ( !pEntry )
@@ -446,7 +446,7 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
     }
 }
 
-void __EXPORT SFTreeListBox::ExpandedHdl()
+void SFTreeListBox::ExpandedHdl()
 {
 }
 
@@ -562,7 +562,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag
     FreeResource();
 }
 
-__EXPORT SvxScriptOrgDialog::~SvxScriptOrgDialog()
+SvxScriptOrgDialog::~SvxScriptOrgDialog()
 {
     // clear the SelectHdl so that it isn't called during the dtor
     aScriptsBox.SetSelectHdl( Link() );
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index b33be88ebf32..3e5c2aab9547 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -284,12 +284,12 @@ SvxChartColorTableItem::SvxChartColorTableItem( const SvxChartColorTableItem& rO
 {
 }
 
-SfxPoolItem* __EXPORT SvxChartColorTableItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const
 {
     return new SvxChartColorTableItem( *this );
 }
 
-int __EXPORT SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const
+int SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "SvxChartColorTableItem::operator== : types differ" );
 
@@ -302,7 +302,7 @@ int __EXPORT SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) cons
     return 0;
 }
 
-void __EXPORT SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const
+void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const
 {
     if ( pOpts )
         pOpts->SetDefaultColors( m_aColorTable );
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 509313d4c719..d1cfdd1b67e3 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -119,12 +119,12 @@ void SvxDefaultColorOptPage::Construct()
 }
 
 
-SfxTabPage* __EXPORT SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs )
+SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs )
 {
     return new SvxDefaultColorOptPage( pParent, rAttrs );
 }
 
-BOOL __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+BOOL SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     if( pColorConfig )
         rOutAttrs.Put( *SAL_STATIC_CAST( SfxPoolItem*, pColorConfig ));
@@ -132,7 +132,7 @@ BOOL __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
     return TRUE;
 }
 
-void __EXPORT SvxDefaultColorOptPage::Reset( const SfxItemSet& )
+void SvxDefaultColorOptPage::Reset( const SfxItemSet& )
 {
     aLbChartColors.SelectEntryPos( 0 );
     ListClickedHdl( &aLbChartColors );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 903ae3eeb55d..f89ee9a6ef6a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -355,7 +355,7 @@ public:
 /*********************************************************************/
 
 
-void __EXPORT OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, USHORT /*nFlags*/,
+void OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, USHORT /*nFlags*/,
     SvLBoxEntry* pEntry )
 {
     rDev.DrawText( rPos, GetText() );
@@ -522,7 +522,7 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol)
 /*********************************************************************/
 
 
-__EXPORT OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
+OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
 {
     delete (ImpUserData*) aCheckLB.GetUserData( REPLACE_BULLETS );
     delete (ImpUserData*) aCheckLB.GetUserData( APPLY_NUMBERING );
@@ -534,7 +534,7 @@ __EXPORT OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
 /*                                                                   */
 /*********************************************************************/
 
-SfxTabPage* __EXPORT OfaSwAutoFmtOptionsPage::Create( Window* pParent,
+SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet);
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 8962d489d8c5..20f448209ec8 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -180,7 +180,7 @@ SvxConnectionPage::~SvxConnectionPage()
 |*
 \************************************************************************/
 
-void __EXPORT SvxConnectionPage::Reset( const SfxItemSet& rAttrs )
+void SvxConnectionPage::Reset( const SfxItemSet& rAttrs )
 {
     const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_EDGENODE1HORZDIST );
     const SfxItemPool* pPool = rAttrs.GetPool();
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index d45ba2df61ca..cfd7d7327d2c 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -161,7 +161,7 @@ void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)
 |*
 \************************************************************************/
 
-void __EXPORT SvxDistributePage::Reset(const SfxItemSet& )
+void SvxDistributePage::Reset(const SfxItemSet& )
 {
     maBtnHorNone.SetState(FALSE);
     maBtnHorLeft.SetState(FALSE);
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 237d9a899112..0fc4235d98ba 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -599,7 +599,7 @@ void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEvent
 }
 
 
-SvStringsDtor* __EXPORT _ImpGetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String& rLanguage )
+SvStringsDtor* _ImpGetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String& rLanguage )
 {
     SvStringsDtor* pNew = new SvStringsDtor;
     SfxApplication* pSfxApp = SFX_APP();
@@ -661,7 +661,7 @@ SvStringsDtor* __EXPORT _ImpGetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const Stri
 }
 
 // besorgen der Funktionen eines Bereiches
-SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl(
+SvStringsDtor* _ImpGetMacrosOfRangeHdl(
     _SfxMacroTabPage* /*pTbPg*/,
     const String& /*rLanguage*/,
     const String& /*rRange*/ )
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index a6f198151f26..0c306fbe051a 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -187,7 +187,7 @@ SvxMeasurePage::~SvxMeasurePage()
 |*
 \************************************************************************/
 
-void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs )
+void SvxMeasurePage::Reset( const SfxItemSet& rAttrs )
 {
     SfxItemPool* pPool = rAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 398b6bf8c7e1..c4c9dde501f6 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2011,7 +2011,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
 
 // -----------------------------------------------------------------------
 
-__EXPORT SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
+SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
 {
 }
 
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index e489a91546e5..b44b9a86237f 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -59,7 +59,7 @@ static USHORT pRanges[] =
 |*
 \************************************************************************/
 
-__EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
+SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
                                 const SfxItemSet* pAttr,
                                 const SdrView* pSdrView ) :
         SfxTabDialog        ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ),
@@ -78,7 +78,7 @@ __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
 |*
 \************************************************************************/
 
-void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
 {
     switch( nId )
     {
@@ -177,7 +177,7 @@ SvxTextAnimationPage::~SvxTextAnimationPage()
 |*
 \************************************************************************/
 
-void __EXPORT SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
+void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
 {
     const SfxItemPool* pPool = rAttrs.GetPool();
 
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index cdb3286127a5..67c97784e417 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -134,7 +134,7 @@ SvxTextAttrPage::~SvxTextAttrPage()
 |*
 \************************************************************************/
 
-void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
+void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
 {
     SfxItemPool* pPool = rAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );