diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-11 17:58:44 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-11 17:58:44 +0100 |
commit | ec03cebe17848ff9b6851f4fb6d42515a79b8776 (patch) | |
tree | cb50a8b548a7947668366c62b75bb5284817f0ed /svtools | |
parent | 56dd29dbd60005d3dc5d1929e8d7049364418c10 (diff) |
cleaning of __EXPORT define
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/svicnvw.cxx | 32 | ||||
-rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 28 | ||||
-rw-r--r-- | svtools/source/contnr/svimpicn.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/svlbox.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/scrwin.cxx | 8 | ||||
-rw-r--r-- | svtools/source/control/svxbox.cxx | 6 | ||||
-rw-r--r-- | svtools/source/edit/textundo.cxx | 34 | ||||
-rw-r--r-- | svtools/source/edit/textview.cxx | 14 | ||||
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 4 | ||||
-rw-r--r-- | svtools/workben/toolpanel/toolpaneltest.cxx | 2 |
11 files changed, 69 insertions, 69 deletions
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index 7aaf2314b8a3..03a1a13b0b6d 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -230,27 +230,27 @@ void SvIconView::RequestingChilds( SvLBoxEntry* pParent ) InsertEntry( String::CreateFromAscii("<dummy>"), pParent, FALSE, LIST_APPEND ); } -void __EXPORT SvIconView::Paint( const Rectangle& rRect ) +void SvIconView::Paint( const Rectangle& rRect ) { pImp->Paint( rRect ); } -void __EXPORT SvIconView::MouseButtonDown( const MouseEvent& rMEvt ) +void SvIconView::MouseButtonDown( const MouseEvent& rMEvt ) { pImp->MouseButtonDown( rMEvt ); } -void __EXPORT SvIconView::MouseButtonUp( const MouseEvent& rMEvt ) +void SvIconView::MouseButtonUp( const MouseEvent& rMEvt ) { pImp->MouseButtonUp( rMEvt ); } -void __EXPORT SvIconView::MouseMove( const MouseEvent& rMEvt ) +void SvIconView::MouseMove( const MouseEvent& rMEvt ) { pImp->MouseMove( rMEvt ); } -void __EXPORT SvIconView::KeyInput( const KeyEvent& rKEvt ) +void SvIconView::KeyInput( const KeyEvent& rKEvt ) { // unter OS/2 bekommen wir auch beim Editieren Key-Up/Down if( IsEditingActive() ) @@ -263,19 +263,19 @@ void __EXPORT SvIconView::KeyInput( const KeyEvent& rKEvt ) nImpFlags &= ~SVLBOX_IS_TRAVELSELECT; } -void __EXPORT SvIconView::Resize() +void SvIconView::Resize() { pImp->Resize(); SvLBox::Resize(); } -void __EXPORT SvIconView::GetFocus() +void SvIconView::GetFocus() { pImp->GetFocus(); SvLBox::GetFocus(); } -void __EXPORT SvIconView::LoseFocus() +void SvIconView::LoseFocus() { pImp->LoseFocus(); SvLBox::LoseFocus(); @@ -302,46 +302,46 @@ void SvIconView::SetModel( SvLBoxTreeList* pNewModel, SvLBoxEntry* pParent ) pImp->SetModel( pNewModel, pParent ); } -void __EXPORT SvIconView::ModelHasCleared() +void SvIconView::ModelHasCleared() { SvLBox::ModelHasCleared(); pImp->Clear(); } -void __EXPORT SvIconView::ModelHasInserted( SvListEntry* pEntry ) +void SvIconView::ModelHasInserted( SvListEntry* pEntry ) { if( !(nIcnVwFlags & ICNVW_BLOCK_ENTRYINS ) ) pImp->EntryInserted( (SvLBoxEntry*)pEntry ); } -void __EXPORT SvIconView::ModelHasInsertedTree( SvListEntry* pEntry ) +void SvIconView::ModelHasInsertedTree( SvListEntry* pEntry ) { pImp->TreeInserted( (SvLBoxEntry*)pEntry ); } -void __EXPORT SvIconView::ModelIsMoving(SvListEntry* pSource, +void SvIconView::ModelIsMoving(SvListEntry* pSource, SvListEntry* /* pTargetParent */ , ULONG /* nChildPos */ ) { pImp->MovingEntry( (SvLBoxEntry*)pSource ); } -void __EXPORT SvIconView::ModelHasMoved(SvListEntry* pSource ) +void SvIconView::ModelHasMoved(SvListEntry* pSource ) { pImp->EntryMoved( (SvLBoxEntry*)pSource ); } -void __EXPORT SvIconView::ModelIsRemoving( SvListEntry* pEntry ) +void SvIconView::ModelIsRemoving( SvListEntry* pEntry ) { pImp->RemovingEntry( (SvLBoxEntry*)pEntry ); NotifyRemoving( (SvLBoxEntry*)pEntry ); } -void __EXPORT SvIconView::ModelHasRemoved( SvListEntry* /* pEntry */ ) +void SvIconView::ModelHasRemoved( SvListEntry* /* pEntry */ ) { pImp->EntryRemoved(); } -void __EXPORT SvIconView::ModelHasEntryInvalidated( SvListEntry* pEntry ) +void SvIconView::ModelHasEntryInvalidated( SvListEntry* pEntry ) { // die einzelnen Items des Entries reinitialisieren SvLBox::ModelHasEntryInvalidated( pEntry ); diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 6d3801a2dbab..3d92ed19580a 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2670,7 +2670,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) return bKeyUsed; } -void __EXPORT SvImpLBox::GetFocus() +void SvImpLBox::GetFocus() { if( pCursor ) { @@ -2706,7 +2706,7 @@ void __EXPORT SvImpLBox::GetFocus() } } -void __EXPORT SvImpLBox::LoseFocus() +void SvImpLBox::LoseFocus() { aEditTimer.Stop(); if( pCursor ) @@ -2736,7 +2736,7 @@ inline void SvImpLBox::SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect ) pView->Select( pEntry, bSelect ); } -__EXPORT ImpLBSelEng::ImpLBSelEng( SvImpLBox* pImpl, SelectionEngine* pSEng, +ImpLBSelEng::ImpLBSelEng( SvImpLBox* pImpl, SelectionEngine* pSEng, SvTreeListBox* pV ) { pImp = pImpl; @@ -2744,40 +2744,40 @@ __EXPORT ImpLBSelEng::ImpLBSelEng( SvImpLBox* pImpl, SelectionEngine* pSEng, pView = pV; } -__EXPORT ImpLBSelEng::~ImpLBSelEng() +ImpLBSelEng::~ImpLBSelEng() { } -void __EXPORT ImpLBSelEng::BeginDrag() +void ImpLBSelEng::BeginDrag() { pImp->BeginDrag(); } /* -void __EXPORT ImpLBSelEng::EndDrag( const Point& ) +void ImpLBSelEng::EndDrag( const Point& ) { } */ -void __EXPORT ImpLBSelEng::CreateAnchor() +void ImpLBSelEng::CreateAnchor() { pImp->pAnchor = pImp->pCursor; } -void __EXPORT ImpLBSelEng::DestroyAnchor() +void ImpLBSelEng::DestroyAnchor() { pImp->pAnchor = 0; } /* -void __EXPORT ImpLBSelEng::CreateCursor() +void ImpLBSelEng::CreateCursor() { pImp->pAnchor = 0; } */ -BOOL __EXPORT ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelectAtCursor) +BOOL ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelectAtCursor) { SvLBoxEntry* pNewCursor = pImp->MakePointVisible( rPoint ); if( pNewCursor != pImp->pCursor ) @@ -2795,7 +2795,7 @@ BOOL __EXPORT ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelec return FALSE; } -BOOL __EXPORT ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint ) +BOOL ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint ) { SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint ); if( pEntry ) @@ -2803,7 +2803,7 @@ BOOL __EXPORT ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint ) return FALSE; } -void __EXPORT ImpLBSelEng::DeselectAtPoint( const Point& rPoint ) +void ImpLBSelEng::DeselectAtPoint( const Point& rPoint ) { SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint ); if( !pEntry ) @@ -2812,7 +2812,7 @@ void __EXPORT ImpLBSelEng::DeselectAtPoint( const Point& rPoint ) } /* -void __EXPORT ImpLBSelEng::SelectAtPoint( const Point& rPoint ) +void ImpLBSelEng::SelectAtPoint( const Point& rPoint ) { SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint ); if( !pEntry ) @@ -2821,7 +2821,7 @@ void __EXPORT ImpLBSelEng::SelectAtPoint( const Point& rPoint ) } */ -void __EXPORT ImpLBSelEng::DeselectAll() +void ImpLBSelEng::DeselectAll() { pImp->SelAllDestrAnch( FALSE, FALSE ); // SelectionEngine nicht resetten! pImp->nFlags &= (~F_DESEL_ALL); diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index ccded0e72008..793128ffe59e 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -1871,7 +1871,7 @@ void SvImpIconView::AdjustScrollBars() aOutputSize.Height() = nRealHeight; } -void __EXPORT SvImpIconView::Resize() +void SvImpIconView::Resize() { StopEditTimer(); Rectangle aRect; @@ -1980,7 +1980,7 @@ void SvImpIconView::CheckScrollBars() } -void __EXPORT SvImpIconView::GetFocus() +void SvImpIconView::GetFocus() { if( pCursor ) { @@ -1989,7 +1989,7 @@ void __EXPORT SvImpIconView::GetFocus() } } -void __EXPORT SvImpIconView::LoseFocus() +void SvImpIconView::LoseFocus() { StopEditTimer(); if( pCursor ) diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 1b1552a707aa..3f7a07951832 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -737,7 +737,7 @@ SvLBox::SvLBox( Window* pParent, const ResId& rResId ) : SetType(WINDOW_TREELISTBOX); } -__EXPORT SvLBox::~SvLBox() +SvLBox::~SvLBox() { DBG_DTOR(SvLBox,0); delete pEdCtrl; diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 955d8215e13a..0a820406138e 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -415,7 +415,7 @@ ULONG SvTabListBox::GetEntryPos( const SvLBoxEntry* pEntry ) const return 0xffffffff; } -void __EXPORT SvTabListBox::Resize() +void SvTabListBox::Resize() { SvTreeListBox::Resize(); } diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 4c748b17ce3e..dc007438583b 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -115,7 +115,7 @@ void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) //------------------------------------------------------------------- -Size __EXPORT ScrollableWindow::GetOutputSizePixel() const +Size ScrollableWindow::GetOutputSizePixel() const { Size aSz( Window::GetOutputSizePixel() ); @@ -183,7 +183,7 @@ IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll ) //------------------------------------------------------------------- -void __EXPORT ScrollableWindow::Resize() +void ScrollableWindow::Resize() { // get the new output-size in pixel Size aOutPixSz = Window::GetOutputSizePixel(); @@ -305,13 +305,13 @@ void __EXPORT ScrollableWindow::Resize() //------------------------------------------------------------------- -void __EXPORT ScrollableWindow::StartScroll() +void ScrollableWindow::StartScroll() { } //------------------------------------------------------------------- -void __EXPORT ScrollableWindow::EndScroll( long, long ) +void ScrollableWindow::EndScroll( long, long ) { } diff --git a/svtools/source/control/svxbox.cxx b/svtools/source/control/svxbox.cxx index f3404e80a4d8..7bb17b83ea9e 100644 --- a/svtools/source/control/svxbox.cxx +++ b/svtools/source/control/svxbox.cxx @@ -83,7 +83,7 @@ SvxListBox::SvxListBox(Window* pParent, const ResId& rId): Beschreibung: Basisklasse Dtor --------------------------------------------------------------------*/ -__EXPORT SvxListBox::~SvxListBox() +SvxListBox::~SvxListBox() { aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count()); @@ -351,7 +351,7 @@ SvxComboBox::SvxComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ): Beschreibung: Basisklasse Dtor --------------------------------------------------------------------*/ -__EXPORT SvxComboBox::~SvxComboBox() +SvxComboBox::~SvxComboBox() { aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count()); @@ -575,7 +575,7 @@ void SvxComboBox::InsertSorted(SvxBoxEntry* pEntry) Beschreibung: Je nach Option bestimmte Zeichen ausblenden --------------------------------------------------------------------*/ -void __EXPORT SvxComboBox::KeyInput( const KeyEvent& rKEvt ) +void SvxComboBox::KeyInput( const KeyEvent& rKEvt ) { sal_Unicode cChar = rKEvt.GetCharCode(); diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx index fc8ffe127bf7..fcecb59452f5 100644 --- a/svtools/source/edit/textundo.cxx +++ b/svtools/source/edit/textundo.cxx @@ -55,7 +55,7 @@ TextUndoManager::~TextUndoManager() { } -BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) +BOOL TextUndoManager::Undo( USHORT nCount ) { if ( GetUndoActionCount() == 0 ) return FALSE; @@ -71,7 +71,7 @@ BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) return bDone; } -BOOL __EXPORT TextUndoManager::Redo( USHORT nCount ) +BOOL TextUndoManager::Redo( USHORT nCount ) { if ( GetRedoActionCount() == 0 ) return FALSE; @@ -121,13 +121,13 @@ TextUndo::~TextUndo() { } -USHORT __EXPORT TextUndo::GetId() const +USHORT TextUndo::GetId() const { //nId sollte mal entfallen => GetId ueberall ueberladen... return mnId; } -XubString __EXPORT TextUndo::GetComment() const +XubString TextUndo::GetComment() const { // return mpTextEngine->GetUndoComment( this ); return String(); @@ -154,7 +154,7 @@ TextUndoDelPara::~TextUndoDelPara() delete mpNode; } -void __EXPORT TextUndoDelPara::Undo() +void TextUndoDelPara::Undo() { GetTextEngine()->InsertContent( mpNode, mnPara ); mbDelObject = FALSE; // gehoert wieder der Engine @@ -166,7 +166,7 @@ void __EXPORT TextUndoDelPara::Undo() } } -void __EXPORT TextUndoDelPara::Redo() +void TextUndoDelPara::Redo() { // pNode stimmt nicht mehr, falls zwischendurch Undos, in denen // Absaetze verschmolzen sind. @@ -202,13 +202,13 @@ TextUndoConnectParas::~TextUndoConnectParas() { } -void __EXPORT TextUndoConnectParas::Undo() +void TextUndoConnectParas::Undo() { TextPaM aPaM = GetTextEngine()->SplitContent( mnPara, mnSepPos ); SetSelection( aPaM ); } -void __EXPORT TextUndoConnectParas::Redo() +void TextUndoConnectParas::Redo() { TextPaM aPaM = GetTextEngine()->ConnectContents( mnPara ); SetSelection( aPaM ); @@ -226,13 +226,13 @@ TextUndoSplitPara::~TextUndoSplitPara() { } -void __EXPORT TextUndoSplitPara::Undo() +void TextUndoSplitPara::Undo() { TextPaM aPaM = GetTextEngine()->ConnectContents( mnPara ); SetSelection( aPaM ); } -void __EXPORT TextUndoSplitPara::Redo() +void TextUndoSplitPara::Redo() { TextPaM aPaM = GetTextEngine()->SplitContent( mnPara, mnSepPos ); SetSelection( aPaM ); @@ -245,7 +245,7 @@ TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM { } -void __EXPORT TextUndoInsertChars::Undo() +void TextUndoInsertChars::Undo() { TextSelection aSel( maTextPaM, maTextPaM ); aSel.GetEnd().GetIndex() = aSel.GetEnd().GetIndex() + maText.Len(); @@ -253,7 +253,7 @@ void __EXPORT TextUndoInsertChars::Undo() SetSelection( aPaM ); } -void __EXPORT TextUndoInsertChars::Redo() +void TextUndoInsertChars::Redo() { TextSelection aSel( maTextPaM, maTextPaM ); GetTextEngine()->ImpInsertText( aSel, maText ); @@ -262,7 +262,7 @@ void __EXPORT TextUndoInsertChars::Redo() SetSelection( TextSelection( aSel.GetStart(), aNewPaM ) ); } -BOOL __EXPORT TextUndoInsertChars::Merge( SfxUndoAction* pNextAction ) +BOOL TextUndoInsertChars::Merge( SfxUndoAction* pNextAction ) { if ( !pNextAction->ISA( TextUndoInsertChars ) ) return FALSE; @@ -287,7 +287,7 @@ TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM { } -void __EXPORT TextUndoRemoveChars::Undo() +void TextUndoRemoveChars::Undo() { TextSelection aSel( maTextPaM, maTextPaM ); GetTextEngine()->ImpInsertText( aSel, maText ); @@ -295,7 +295,7 @@ void __EXPORT TextUndoRemoveChars::Undo() SetSelection( aSel ); } -void __EXPORT TextUndoRemoveChars::Redo() +void TextUndoRemoveChars::Redo() { TextSelection aSel( maTextPaM, maTextPaM ); aSel.GetEnd().GetIndex() = aSel.GetEnd().GetIndex() + maText.Len(); @@ -319,7 +319,7 @@ TextUndoSetAttribs::~TextUndoSetAttribs() // ............... } -void __EXPORT TextUndoSetAttribs::Undo() +void TextUndoSetAttribs::Undo() { for ( ULONG nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ ) { @@ -334,7 +334,7 @@ void __EXPORT TextUndoSetAttribs::Undo() SetSelection( maSelection ); } -void __EXPORT TextUndoSetAttribs::Redo() +void TextUndoSetAttribs::Redo() { // if ( !bSetIsRemove ) // GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial ); diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 1d7b9ee9694e..292cf03ce86a 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -2386,11 +2386,11 @@ TextSelFunctionSet::TextSelFunctionSet( TextView* pView ) mpView = pView; } -void __EXPORT TextSelFunctionSet::BeginDrag() +void TextSelFunctionSet::BeginDrag() { } -void __EXPORT TextSelFunctionSet::CreateAnchor() +void TextSelFunctionSet::CreateAnchor() { // TextSelection aSel( mpView->GetSelection() ); // aSel.GetStart() = aSel.GetEnd(); @@ -2401,27 +2401,27 @@ void __EXPORT TextSelFunctionSet::CreateAnchor() mpView->ImpSetSelection( mpView->mpImpl->maSelection.GetEnd() ); } -BOOL __EXPORT TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL ) +BOOL TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL ) { return mpView->SetCursorAtPoint( rPointPixel ); } -BOOL __EXPORT TextSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) +BOOL TextSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) { return mpView->IsSelectionAtPoint( rPointPixel ); } -void __EXPORT TextSelFunctionSet::DeselectAll() +void TextSelFunctionSet::DeselectAll() { CreateAnchor(); } -void __EXPORT TextSelFunctionSet::DeselectAtPoint( const Point& ) +void TextSelFunctionSet::DeselectAtPoint( const Point& ) { // Nur bei Mehrfachselektion } -void __EXPORT TextSelFunctionSet::DestroyAnchor() +void TextSelFunctionSet::DestroyAnchor() { // Nur bei Mehrfachselektion } diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 94d7ba445438..ca71c740c13b 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -336,7 +336,7 @@ HTMLParser::~HTMLParser() delete pOptions; } -SvParserState __EXPORT HTMLParser::CallParser() +SvParserState HTMLParser::CallParser() { eState = SVPAR_WORKING; nNextCh = GetNextChar(); @@ -1099,7 +1099,7 @@ int HTMLParser::_GetNextRawToken() } // scanne das naechste Token, -int __EXPORT HTMLParser::_GetNextToken() +int HTMLParser::_GetNextToken() { int nRet = 0; sSaveToken.Erase(); diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx index a3b3f6d4f9c8..edd45575538f 100644 --- a/svtools/workben/toolpanel/toolpaneltest.cxx +++ b/svtools/workben/toolpanel/toolpaneltest.cxx @@ -860,7 +860,7 @@ Reference< XMultiServiceFactory > PanelDemo::createApplicationServiceManager() } //----------------------------------------------------------------------------- -int __EXPORT PanelDemo::Main() +int PanelDemo::Main() { // create service factory Reference< XMultiServiceFactory > xSMgr = createApplicationServiceManager(); |