[Libreoffice-commits] .: svl/source svtools/source svtools/workben toolkit/workben
Gert Faller
gfaller at kemper.freedesktop.org
Sat Dec 11 08:59:16 PST 2010
svl/source/svdde/ddecli.cxx | 6 ++--
svl/source/svdde/ddeinf.cxx | 2 -
svl/source/svdde/ddesvr.cxx | 18 +++++++-------
svtools/source/contnr/svicnvw.cxx | 32 +++++++++++++-------------
svtools/source/contnr/svimpbox.cxx | 28 +++++++++++------------
svtools/source/contnr/svimpicn.cxx | 6 ++--
svtools/source/contnr/svlbox.cxx | 2 -
svtools/source/contnr/svtabbx.cxx | 2 -
svtools/source/control/scrwin.cxx | 8 +++---
svtools/source/control/svxbox.cxx | 6 ++--
svtools/source/edit/textundo.cxx | 34 ++++++++++++++--------------
svtools/source/edit/textview.cxx | 14 +++++------
svtools/source/svhtml/parhtml.cxx | 4 +--
svtools/workben/toolpanel/toolpaneltest.cxx | 2 -
toolkit/workben/layout/sortdlg.cxx | 2 -
toolkit/workben/layout/tpsort.cxx | 30 ++++++++++++------------
16 files changed, 98 insertions(+), 98 deletions(-)
New commits:
commit 222e70d75901202d62ab6425c993a6741c3e1eeb
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Dec 11 17:58:44 2010 +0100
cleaning of __EXPORT define
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 14afb9f..bcdaba1 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -363,7 +363,7 @@ const String& DdeTransaction::GetName() const
// --- DdeTransaction::Data() --------------------------------------
-void __EXPORT DdeTransaction::Data( const DdeData* p )
+void DdeTransaction::Data( const DdeData* p )
{
if ( ::tools::SolarMutex::Acquire() )
{
@@ -374,7 +374,7 @@ void __EXPORT DdeTransaction::Data( const DdeData* p )
// --- DdeTransaction::Done() --------------------------------------
-void __EXPORT DdeTransaction::Done( BOOL bDataValid )
+void DdeTransaction::Done( BOOL bDataValid )
{
aDone.Call( (void*)bDataValid );
}
@@ -396,7 +396,7 @@ DdeLink::~DdeLink()
// --- DdeLink::Notify() -----------------------------------------
-void __EXPORT DdeLink::Notify()
+void DdeLink::Notify()
{
aNotify.Call( NULL );
}
diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index a6ff306..89091ed 100644
--- a/svl/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.cxx
@@ -42,7 +42,7 @@ HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
#else
#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
-HDDEDATA CALLBACK __EXPORT DdeInternal::InfCallback(
+HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
#else
HDDEDATA CALLBACK _export DdeInternal::InfCallback(
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 50f2945..df51f18 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -66,7 +66,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback(
HDDEDATA hData, DWORD, DWORD )
#else
#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
-HDDEDATA CALLBACK __EXPORT DdeInternal::SvrCallback(
+HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
#else
@@ -718,21 +718,21 @@ void DdeTopic::NotifyClient( const String& rItem )
// --- DdeTopic::Connect() -----------------------------------------
-void __EXPORT DdeTopic::Connect( long nId )
+void DdeTopic::Connect( long nId )
{
aConnectLink.Call( (void*)nId );
}
// --- DdeTopic::Disconnect() --------------------------------------
-void __EXPORT DdeTopic::Disconnect( long nId )
+void DdeTopic::Disconnect( long nId )
{
aDisconnectLink.Call( (void*)nId );
}
// --- DdeTopic::_Disconnect() --------------------------------------
-void __EXPORT DdeTopic::_Disconnect( long nId )
+void DdeTopic::_Disconnect( long nId )
{
for( DdeItem* pItem = aItems.First(); pItem; pItem = aItems.Next() )
pItem->DecMonitor( nId );
@@ -742,7 +742,7 @@ void __EXPORT DdeTopic::_Disconnect( long nId )
// --- DdeTopic::Get() ---------------------------------------------
-DdeData* __EXPORT DdeTopic::Get( ULONG nFmt )
+DdeData* DdeTopic::Get( ULONG nFmt )
{
if ( aGetLink.IsSet() )
return (DdeData*)aGetLink.Call( (void*)nFmt );
@@ -752,7 +752,7 @@ DdeData* __EXPORT DdeTopic::Get( ULONG nFmt )
// --- DdeTopic::Put() ---------------------------------------------
-BOOL __EXPORT DdeTopic::Put( const DdeData* r )
+BOOL DdeTopic::Put( const DdeData* r )
{
if ( aPutLink.IsSet() )
return (BOOL)aPutLink.Call( (void*) r );
@@ -762,7 +762,7 @@ BOOL __EXPORT DdeTopic::Put( const DdeData* r )
// --- DdeTopic::Execute() -----------------------------------------
-BOOL __EXPORT DdeTopic::Execute( const String* r )
+BOOL DdeTopic::Execute( const String* r )
{
if ( aExecLink.IsSet() )
return (BOOL)aExecLink.Call( (void*)r );
@@ -1071,14 +1071,14 @@ String DdeService::Status()
// --- DdeService::IsBusy() ----------------------------------------
-BOOL __EXPORT DdeService::IsBusy()
+BOOL DdeService::IsBusy()
{
return FALSE;
}
// --- DdeService::GetHelp() ----------------------------------------
-String __EXPORT DdeService::GetHelp()
+String DdeService::GetHelp()
{
return String();
}
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index 825db6d..ba7df68 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 df6d5d3..4aa8587 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 1053855..5bba7af 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 b192d98..6eb2860 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 0440afa..d242fe8 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 1723099..1a53b3f 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 3abffa9..6682570 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 4670ae0..6a02439 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 d11de87..21a4784 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 c08729a..e8a47cc 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 645bea7..b898b17 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();
diff --git a/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx
index 8ee1121..4e75ed2 100644
--- a/toolkit/workben/layout/sortdlg.cxx
+++ b/toolkit/workben/layout/sortdlg.cxx
@@ -65,7 +65,7 @@ ScSortDlg::ScSortDlg( Window* pParent,
FreeResource();
}
-__EXPORT ScSortDlg::~ScSortDlg()
+ScSortDlg::~ScSortDlg()
{
}
diff --git a/toolkit/workben/layout/tpsort.cxx b/toolkit/workben/layout/tpsort.cxx
index be1d256..f5826a9 100644
--- a/toolkit/workben/layout/tpsort.cxx
+++ b/toolkit/workben/layout/tpsort.cxx
@@ -148,7 +148,7 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTabPageSortFields::~ScTabPageSortFields()
+ScTabPageSortFields::~ScTabPageSortFields()
{
}
@@ -192,14 +192,14 @@ void ScTabPageSortFields::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTabPageSortFields::GetRanges()
+USHORT* ScTabPageSortFields::GetRanges()
{
return pSortRanges;
}
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
+SfxTabPage* ScTabPageSortFields::Create( Window* pParent,
const SfxItemSet& rArgSet )
{
return ( new ScTabPageSortFields( pParent, rArgSet ) );
@@ -207,7 +207,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
// -----------------------------------------------------------------------
-void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
{
bSortByRows = rSortData.bByRow;
bHasHeader = rSortData.bHasHeader;
@@ -267,7 +267,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
{
ScSortParam theSortData = rSortData;
if (pDlg)
@@ -338,7 +338,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
// void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
-void __EXPORT ScTabPageSortFields::ActivatePage()
+void ScTabPageSortFields::ActivatePage()
{
if ( pDlg )
{
@@ -361,7 +361,7 @@ void __EXPORT ScTabPageSortFields::ActivatePage()
// -----------------------------------------------------------------------
-int __EXPORT ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
+int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
{
if ( pDlg )
{
@@ -615,7 +615,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
+ScTabPageSortOptions::~ScTabPageSortOptions()
{
#if !TEST_LAYOUT
USHORT nEntries = aLbOutPos.GetEntryCount();
@@ -738,7 +738,7 @@ void ScTabPageSortOptions::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
+USHORT* ScTabPageSortOptions::GetRanges()
{
return pSortRanges;
}
@@ -748,7 +748,7 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
#if ENABLE_LAYOUT
#undef SfxTabPage
#endif /* ENABLE_LAYOUT */
-SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
+SfxTabPage* ScTabPageSortOptions::Create(
Window* pParent,
const SfxItemSet& rArgSet )
{
@@ -757,7 +757,7 @@ SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
// -----------------------------------------------------------------------
-void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
{
if ( rSortData.bUserDef )
{
@@ -827,7 +827,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
{
ScSortParam theSortData = rSortData;
if (pDlg)
@@ -878,7 +878,7 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
// void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
-void __EXPORT ScTabPageSortOptions::ActivatePage()
+void ScTabPageSortOptions::ActivatePage()
{
if ( pDlg )
{
@@ -901,7 +901,7 @@ void __EXPORT ScTabPageSortOptions::ActivatePage()
// -----------------------------------------------------------------------
-int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
+int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
{
BOOL bPosInputOk = TRUE;
@@ -1037,7 +1037,7 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
// -----------------------------------------------------------------------
-void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
+void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
{
if ( pEd == &aEdOutPos )
{
More information about the Libreoffice-commits
mailing list