[Libreoffice-commits] .: basic/source basic/workben editeng/source formula/source sfx2/source svx/source svx/workben xmloff/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Dec 11 14:23:33 PST 2010
basic/source/classes/sb.cxx | 4
basic/workben/mgrtest.cxx | 16 -
editeng/source/editeng/editeng.cxx | 30 +--
editeng/source/editeng/editobj.cxx | 24 +-
editeng/source/editeng/editsel.cxx | 14 -
editeng/source/editeng/editundo.cxx | 60 +++----
editeng/source/editeng/edtspell.cxx | 18 +-
editeng/source/editeng/eertfpar.cxx | 32 +--
editeng/source/items/flditem.cxx | 64 +++----
editeng/source/items/svdfield.cxx | 10 -
editeng/source/outliner/outliner.cxx | 6
editeng/source/outliner/outlvw.cxx | 6
formula/source/ui/dlg/funcutl.cxx | 4
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/control/shell.cxx | 4
sfx2/source/dialog/newstyle.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 4
svx/source/dialog/pagectrl.cxx | 2
svx/source/dialog/stddlg.cxx | 2
svx/source/dialog/svxruler.cxx | 14 -
svx/source/engine3d/float3d.cxx | 10 -
svx/source/items/customshapeitem.cxx | 12 -
svx/source/items/postattr.cxx | 6
svx/source/items/rotmodit.cxx | 14 -
svx/source/svdraw/svdattr.cxx | 294 +++++++++++++++++------------------
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdibrow.cxx | 24 +-
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdoattr.cxx | 2
svx/source/svdraw/svdocirc.cxx | 2
svx/source/svdraw/svdoedge.cxx | 2
svx/source/svdraw/svdovirt.cxx | 2
svx/source/svdraw/svdpagv.cxx | 2
svx/source/svdraw/svdpntv.cxx | 2
svx/source/tbxctrls/linectrl.cxx | 2
svx/workben/edittest.cxx | 48 ++---
xmloff/source/draw/sdxmlexp.cxx | 2
37 files changed, 373 insertions(+), 373 deletions(-)
New commits:
commit 18fad722e13066eb1b7280fe2f8707f83a0dc4e1
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Dec 11 23:23:07 2010 +0100
cleaning of __EXPORT define
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0d50799..7b8c8c9 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1282,7 +1282,7 @@ USHORT StarBASIC::StepPoint( USHORT l, USHORT c1, USHORT c2 )
return BreakHdl();
}
-USHORT __EXPORT StarBASIC::BreakHdl()
+USHORT StarBASIC::BreakHdl()
{
return (USHORT) ( aBreakHdl.IsSet()
? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
@@ -1627,7 +1627,7 @@ USHORT StarBASIC::GetErl()
return 0;
}
-BOOL __EXPORT StarBASIC::ErrorHdl()
+BOOL StarBASIC::ErrorHdl()
{
return (BOOL) ( aErrorHdl.IsSet()
? aErrorHdl.Call( this ) : FALSE );
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index dfdf83a..0e03fff 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -509,11 +509,11 @@ void TestWindow::CheckError()
}
}
-void __EXPORT TestWindow::Paint( const Rectangle& rRec )
+void TestWindow::Paint( const Rectangle& rRec )
{
}
-void __EXPORT TestWindow::Resize()
+void TestWindow::Resize()
{
Size aTBSz = aToolBox.CalcWindowSizePixel();
aToolBox.SetSizePixel( Size( GetOutputSizePixel().Width(), aTBSz.Height()) );
@@ -521,7 +521,7 @@ void __EXPORT TestWindow::Resize()
ShowInfo();
}
-void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt )
+void TestWindow::KeyInput( const KeyEvent& rKEvt )
{
char nCharCode = rKEvt.GetCharCode();
USHORT nCode = rKEvt.GetKeyCode().GetCode();
@@ -535,16 +535,16 @@ void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt )
UpdateToolBox();
}
-void __EXPORT TestWindow::MouseMove( const MouseEvent& rMEvt )
+void TestWindow::MouseMove( const MouseEvent& rMEvt )
{
}
-void __EXPORT TestWindow::MouseButtonDown( const MouseEvent& rMEvt )
+void TestWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
ShowInfo();
}
-void __EXPORT TestWindow::MouseButtonUp( const MouseEvent& rMEvt )
+void TestWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
UpdateToolBox();
}
@@ -569,12 +569,12 @@ IMPL_LINK( TestWindow, BasicErrorHdl, StarBASIC *, pBasic )
return 0;
}
-void __EXPORT TestApp::Main( void )
+void TestApp::Main( void )
{
Main( 0, NULL );
}
-void __EXPORT TestApp::Main( int, char*[] )
+void TestApp::Main( int, char*[] )
{
BasicDLL aBasiDLL;
SvFactory::Init();
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1d31960..3b9b25e 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2172,7 +2172,7 @@ LanguageType EditEngine::GetDefaultLanguage() const
return pImpEditEngine->GetDefaultLanguage();
}
-sal_Bool __EXPORT EditEngine::SpellNextDocument()
+sal_Bool EditEngine::SpellNextDocument()
{
DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
@@ -2223,7 +2223,7 @@ sal_Bool EditEngine::HasConvertibleTextPortion( LanguageType nLang )
return pImpEditEngine->HasConvertibleTextPortion( nLang );
}
-sal_Bool __EXPORT EditEngine::ConvertNextDocument()
+sal_Bool EditEngine::ConvertNextDocument()
{
DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
@@ -2463,7 +2463,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
// =====================================================================
// ====================== Virtuelle Methoden =======================
// =====================================================================
-void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT,
+void EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT,
const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE,
const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool,
const ::com::sun::star::lang::Locale*, const Color&, const Color&)
@@ -2472,7 +2472,7 @@ void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT, U
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
+void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
const String& /*rChar*/, const SvxFont& /*rFont*/,
USHORT /*nPara*/, xub_StrLen /*nIndex*/,
BYTE /*nRightToLeft*/, bool /*bEndOfLine*/,
@@ -2482,12 +2482,12 @@ void __EXPORT EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
+void EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::ParagraphInserted( sal_uInt16 nPara )
+void EditEngine::ParagraphInserted( sal_uInt16 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2500,7 +2500,7 @@ void __EXPORT EditEngine::ParagraphInserted( sal_uInt16 nPara )
}
}
-void __EXPORT EditEngine::ParagraphDeleted( sal_uInt16 nPara )
+void EditEngine::ParagraphDeleted( sal_uInt16 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2517,24 +2517,24 @@ void EditEngine::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT /*nRightP
DBG_CHKTHIS( EditEngine, 0 );
}
-sal_Bool __EXPORT EditEngine::FormattingParagraph( sal_uInt16 )
+sal_Bool EditEngine::FormattingParagraph( sal_uInt16 )
{
// return sal_True, wenn die Attribute geaendert wurden...
DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
}
-void __EXPORT EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
+void EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::StyleSheetChanged( SfxStyleSheet* /* pStyle */ )
+void EditEngine::StyleSheetChanged( SfxStyleSheet* /* pStyle */ )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
+void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2547,7 +2547,7 @@ void __EXPORT EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
}
}
-XubString __EXPORT EditEngine::GetUndoComment( sal_uInt16 nId ) const
+XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
{
DBG_CHKTHIS( EditEngine, 0 );
XubString aComment;
@@ -2605,18 +2605,18 @@ Rectangle EditEngine::GetBulletArea( sal_uInt16 )
return Rectangle( Point(), Point() );
}
-XubString __EXPORT EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& )
+XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& )
{
DBG_CHKTHIS( EditEngine, 0 );
return ' ';
}
-void __EXPORT EditEngine::FieldClicked( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
+void EditEngine::FieldClicked( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::FieldSelected( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
+void EditEngine::FieldSelected( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
{
DBG_CHKTHIS( EditEngine, 0 );
}
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 5f5ced9..f433f60 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -302,7 +302,7 @@ EditTextObject::EditTextObject( const EditTextObject& r )
nWhich = r.nWhich;
}
-__EXPORT EditTextObject::~EditTextObject()
+EditTextObject::~EditTextObject()
{
DBG_DTOR( EE_EditTextObject, 0 );
}
@@ -425,14 +425,14 @@ void EditTextObject::SetStyleSheet( USHORT /*nPara*/, const XubString& /*rName*/
DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
}
-BOOL __EXPORT EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
+BOOL EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
const XubString&, SfxStyleFamily )
{
DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
return FALSE;
}
-void __EXPORT EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
+void EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
const XubString& /*rOldName*/, const XubString& /*rNewName*/ )
{
DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
@@ -557,12 +557,12 @@ void EditTextObject::Skip( SvStream& rIStream )
rIStream.Seek( nStartPos + nFullSz );
}
-void __EXPORT EditTextObject::StoreData( SvStream& ) const
+void EditTextObject::StoreData( SvStream& ) const
{
DBG_ERROR( "StoreData: Basisklasse!" );
}
-void __EXPORT EditTextObject::CreateData( SvStream& )
+void EditTextObject::CreateData( SvStream& )
{
DBG_ERROR( "CreateData: Basisklasse!" );
}
@@ -719,7 +719,7 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
}
}
-__EXPORT BinTextObject::~BinTextObject()
+BinTextObject::~BinTextObject()
{
if(!bOwnerOfPool && pPool)
{
@@ -793,7 +793,7 @@ void BinTextObject::DeleteContents()
aContents.Remove( 0, aContents.Count() );
}
-EditTextObject* __EXPORT BinTextObject::Clone() const
+EditTextObject* BinTextObject::Clone() const
{
return new BinTextObject( *this );
}
@@ -1151,7 +1151,7 @@ BOOL BinTextObject::ImpChangeStyleSheets(
return bChanges;
}
-BOOL __EXPORT BinTextObject::ChangeStyleSheets(
+BOOL BinTextObject::ChangeStyleSheets(
const XubString& rOldName, SfxStyleFamily eOldFamily,
const XubString& rNewName, SfxStyleFamily eNewFamily )
{
@@ -1162,13 +1162,13 @@ BOOL __EXPORT BinTextObject::ChangeStyleSheets(
return bChanges;
}
-void __EXPORT BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
+void BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
const XubString& rOldName, const XubString& rNewName )
{
ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily );
}
-void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
+void BinTextObject::StoreData( SvStream& rOStream ) const
{
USHORT nVer = 602;
rOStream << nVer;
@@ -1343,7 +1343,7 @@ void __EXPORT BinTextObject::StoreData( SvStream& rOStream ) const
}
}
-void __EXPORT BinTextObject::CreateData( SvStream& rIStream )
+void BinTextObject::CreateData( SvStream& rIStream )
{
rIStream >> nVersion;
@@ -1661,7 +1661,7 @@ bool BinTextObject::isWrongListEqual(const BinTextObject& rCompare) const
#define CHARSETMARKER 0x9999
-void __EXPORT BinTextObject::CreateData300( SvStream& rIStream )
+void BinTextObject::CreateData300( SvStream& rIStream )
{
// Fuer Aufwaertskompatibilitaet.
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 4c26189..fa68068 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -43,18 +43,18 @@ EditSelFunctionSet::EditSelFunctionSet()
pCurView = NULL;
}
-void __EXPORT EditSelFunctionSet::CreateAnchor()
+void EditSelFunctionSet::CreateAnchor()
{
if ( pCurView )
pCurView->pImpEditView->CreateAnchor();
}
-void __EXPORT EditSelFunctionSet::DestroyAnchor()
+void EditSelFunctionSet::DestroyAnchor()
{
// Nur bei Mehrfachselektion
}
-BOOL __EXPORT EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
+BOOL EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
{
if ( pCurView )
return pCurView->pImpEditView->SetCursorAtPoint( rPointPixel );
@@ -62,7 +62,7 @@ BOOL __EXPORT EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BO
return FALSE;
}
-BOOL __EXPORT EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
+BOOL EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
{
if ( pCurView )
return pCurView->pImpEditView->IsSelectionAtPoint( rPointPixel );
@@ -70,20 +70,20 @@ BOOL __EXPORT EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
return FALSE;
}
-void __EXPORT EditSelFunctionSet::DeselectAtPoint( const Point& )
+void EditSelFunctionSet::DeselectAtPoint( const Point& )
{
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// ! Implementieren, wenn Mehrfachselektion moeglich !
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
}
-void __EXPORT EditSelFunctionSet::BeginDrag()
+void EditSelFunctionSet::BeginDrag()
{
// Nur bei Mehrfachselektion
}
-void __EXPORT EditSelFunctionSet::DeselectAll()
+void EditSelFunctionSet::DeselectAll()
{
if ( pCurView )
pCurView->pImpEditView->DeselectAll();
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 79e1a6c..8e16a6e 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -75,7 +75,7 @@ EditUndoManager::EditUndoManager( ImpEditEngine* p )
pImpEE = p;
}
-BOOL __EXPORT EditUndoManager::Undo( USHORT nCount )
+BOOL EditUndoManager::Undo( USHORT nCount )
{
if ( GetUndoActionCount() == 0 )
return FALSE;
@@ -110,7 +110,7 @@ BOOL __EXPORT EditUndoManager::Undo( USHORT nCount )
return bDone;
}
-BOOL __EXPORT EditUndoManager::Redo( USHORT nCount )
+BOOL EditUndoManager::Redo( USHORT nCount )
{
if ( GetRedoActionCount() == 0 )
return FALSE;
@@ -160,18 +160,18 @@ EditUndo::~EditUndo()
DBG_DTOR( EditUndo, 0 );
}
-USHORT __EXPORT EditUndo::GetId() const
+USHORT EditUndo::GetId() const
{
DBG_CHKTHIS( EditUndo, 0 );
return nId;
}
-BOOL __EXPORT EditUndo::CanRepeat(SfxRepeatTarget&) const
+BOOL EditUndo::CanRepeat(SfxRepeatTarget&) const
{
return FALSE;
}
-XubString __EXPORT EditUndo::GetComment() const
+XubString EditUndo::GetComment() const
{
XubString aComment;
if ( pImpEE )
@@ -199,7 +199,7 @@ EditUndoDelContent::~EditUndoDelContent()
delete pContentNode;
}
-void __EXPORT EditUndoDelContent::Undo()
+void EditUndoDelContent::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
GetImpEditEngine()->InsertContent( pContentNode, nNode );
@@ -208,7 +208,7 @@ void __EXPORT EditUndoDelContent::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
}
-void __EXPORT EditUndoDelContent::Redo()
+void EditUndoDelContent::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
@@ -273,7 +273,7 @@ EditUndoConnectParas::~EditUndoConnectParas()
{
}
-void __EXPORT EditUndoConnectParas::Undo()
+void EditUndoConnectParas::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
@@ -303,7 +303,7 @@ void __EXPORT EditUndoConnectParas::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
}
-void __EXPORT EditUndoConnectParas::Redo()
+void EditUndoConnectParas::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, bBackward );
@@ -325,14 +325,14 @@ EditUndoSplitPara::~EditUndoSplitPara()
{
}
-void __EXPORT EditUndoSplitPara::Undo()
+void EditUndoSplitPara::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, FALSE );
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
}
-void __EXPORT EditUndoSplitPara::Redo()
+void EditUndoSplitPara::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM = GetImpEditEngine()->SplitContent( nNode, nSepPos );
@@ -348,7 +348,7 @@ EditUndoInsertChars::EditUndoInsertChars( ImpEditEngine* _pImpEE, const EPaM& rE
{
}
-void __EXPORT EditUndoInsertChars::Undo()
+void EditUndoInsertChars::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -358,7 +358,7 @@ void __EXPORT EditUndoInsertChars::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aNewPaM, aNewPaM ) );
}
-void __EXPORT EditUndoInsertChars::Redo()
+void EditUndoInsertChars::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -368,7 +368,7 @@ void __EXPORT EditUndoInsertChars::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aNewPaM ) );
}
-BOOL __EXPORT EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
+BOOL EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
{
if ( !pNextAction->ISA( EditUndoInsertChars ) )
return FALSE;
@@ -395,7 +395,7 @@ EditUndoRemoveChars::EditUndoRemoveChars( ImpEditEngine* _pImpEE, const EPaM& rE
{
}
-void __EXPORT EditUndoRemoveChars::Undo()
+void EditUndoRemoveChars::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -405,7 +405,7 @@ void __EXPORT EditUndoRemoveChars::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
}
-void __EXPORT EditUndoRemoveChars::Redo()
+void EditUndoRemoveChars::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -430,7 +430,7 @@ EditUndoInsertFeature::~EditUndoInsertFeature()
delete pFeature;
}
-void __EXPORT EditUndoInsertFeature::Undo()
+void EditUndoInsertFeature::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -442,7 +442,7 @@ void __EXPORT EditUndoInsertFeature::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
}
-void __EXPORT EditUndoInsertFeature::Redo()
+void EditUndoInsertFeature::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -469,7 +469,7 @@ EditUndoMoveParagraphs::~EditUndoMoveParagraphs()
{
}
-void __EXPORT EditUndoMoveParagraphs::Undo()
+void EditUndoMoveParagraphs::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
Range aTmpRange( nParagraphs );
@@ -492,7 +492,7 @@ void __EXPORT EditUndoMoveParagraphs::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
-void __EXPORT EditUndoMoveParagraphs::Redo()
+void EditUndoMoveParagraphs::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( nParagraphs, nDest, 0 ) );
@@ -518,7 +518,7 @@ EditUndoSetStyleSheet::~EditUndoSetStyleSheet()
{
}
-void __EXPORT EditUndoSetStyleSheet::Undo()
+void EditUndoSetStyleSheet::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
GetImpEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aPrevName, ePrevFamily ) );
@@ -526,7 +526,7 @@ void __EXPORT EditUndoSetStyleSheet::Undo()
lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara );
}
-void __EXPORT EditUndoSetStyleSheet::Redo()
+void EditUndoSetStyleSheet::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
GetImpEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aNewName, eNewFamily ) );
@@ -548,14 +548,14 @@ EditUndoSetParaAttribs::~EditUndoSetParaAttribs()
{
}
-void __EXPORT EditUndoSetParaAttribs::Undo()
+void EditUndoSetParaAttribs::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
GetImpEditEngine()->SetParaAttribs( nPara, aPrevItems );
lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara );
}
-void __EXPORT EditUndoSetParaAttribs::Redo()
+void EditUndoSetParaAttribs::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
GetImpEditEngine()->SetParaAttribs( nPara, aNewItems );
@@ -601,7 +601,7 @@ EditUndoSetAttribs::~EditUndoSetAttribs()
}
}
-void __EXPORT EditUndoSetAttribs::Undo()
+void EditUndoSetAttribs::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
ImpEditEngine* _pImpEE = GetImpEditEngine();
@@ -634,7 +634,7 @@ void __EXPORT EditUndoSetAttribs::Undo()
ImpSetSelection( GetImpEditEngine()->GetActiveView() );
}
-void __EXPORT EditUndoSetAttribs::Redo()
+void EditUndoSetAttribs::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
ImpEditEngine* _pImpEE = GetImpEditEngine();
@@ -670,7 +670,7 @@ EditUndoTransliteration::~EditUndoTransliteration()
delete pTxtObj;
}
-void __EXPORT EditUndoTransliteration::Undo()
+void EditUndoTransliteration::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
@@ -710,7 +710,7 @@ void __EXPORT EditUndoTransliteration::Undo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
-void __EXPORT EditUndoTransliteration::Redo()
+void EditUndoTransliteration::Redo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
ImpEditEngine* _pImpEE = GetImpEditEngine();
@@ -732,7 +732,7 @@ EditUndoMarkSelection::~EditUndoMarkSelection()
{
}
-void __EXPORT EditUndoMarkSelection::Undo()
+void EditUndoMarkSelection::Undo()
{
DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" );
if ( GetImpEditEngine()->GetActiveView() )
@@ -744,7 +744,7 @@ void __EXPORT EditUndoMarkSelection::Undo()
}
}
-void __EXPORT EditUndoMarkSelection::Redo()
+void EditUndoMarkSelection::Redo()
{
// Fuer Redo unwichtig, weil am Anfang der Undo-Klammerung
}
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 0a04b04..a582b90 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -64,7 +64,7 @@ EditSpellWrapper::EditSpellWrapper( Window* _pWin,
pEditView = pView;
}
-void __EXPORT EditSpellWrapper::SpellStart( SvxSpellArea eArea )
+void EditSpellWrapper::SpellStart( SvxSpellArea eArea )
{
ImpEditEngine* pImpEE = pEditView->GetImpEditEngine();
SpellInfo* pSpellInfo = pImpEE->GetSpellInfo();
@@ -126,18 +126,18 @@ sal_Bool EditSpellWrapper::SpellContinue()
return GetLast().is();
}
-void __EXPORT EditSpellWrapper::SpellEnd()
+void EditSpellWrapper::SpellEnd()
{
// Base class will show language errors...
SvxSpellWrapper::SpellEnd();
}
-sal_Bool __EXPORT EditSpellWrapper::HasOtherCnt()
+sal_Bool EditSpellWrapper::HasOtherCnt()
{
return sal_False;
}
-sal_Bool __EXPORT EditSpellWrapper::SpellMore()
+sal_Bool EditSpellWrapper::SpellMore()
{
ImpEditEngine* pImpEE = pEditView->GetImpEditEngine();
SpellInfo* pSpellInfo = pImpEE->GetSpellInfo();
@@ -157,14 +157,14 @@ sal_Bool __EXPORT EditSpellWrapper::SpellMore()
return bMore;
}
-void __EXPORT EditSpellWrapper::ScrollArea()
+void EditSpellWrapper::ScrollArea()
{
// Keine weitere Aktion noetig...
// Es sei denn, der Bereich soll in die Mitte gescrollt werden,
// und nicht irgendwo stehen.
}
-void __EXPORT EditSpellWrapper::ReplaceAll( const String &rNewText,
+void EditSpellWrapper::ReplaceAll( const String &rNewText,
sal_Int16 )
{
// Wird gerufen, wenn Wort in ReplaceList des SpellCheckers
@@ -172,7 +172,7 @@ void __EXPORT EditSpellWrapper::ReplaceAll( const String &rNewText,
CheckSpellTo();
}
-void __EXPORT EditSpellWrapper::ChangeWord( const String& rNewWord,
+void EditSpellWrapper::ChangeWord( const String& rNewWord,
const sal_uInt16 )
{
// Wird gerufen, wenn Wort Button Change
@@ -185,13 +185,13 @@ void __EXPORT EditSpellWrapper::ChangeWord( const String& rNewWord,
CheckSpellTo();
}
-void __EXPORT EditSpellWrapper::ChangeThesWord( const String& rNewWord )
+void EditSpellWrapper::ChangeThesWord( const String& rNewWord )
{
pEditView->InsertText( rNewWord );
CheckSpellTo();
}
-void __EXPORT EditSpellWrapper::AutoCorrect( const String&, const String& )
+void EditSpellWrapper::AutoCorrect( const String&, const String& )
{
}
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index d92da49..3b8d109 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -99,7 +99,7 @@ EditRTFParser::~EditRTFParser()
{
}
-SvParserState __EXPORT EditRTFParser::CallParser()
+SvParserState EditRTFParser::CallParser()
{
DBG_ASSERT( !aCurSel.HasRange(), "Selection bei CallParser!" );
// Den Teil, in den importiert wird, vom Rest abtrennen.
@@ -190,7 +190,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
}
}
-void __EXPORT EditRTFParser::NextToken( int nToken )
+void EditRTFParser::NextToken( int nToken )
{
switch( nToken )
{
@@ -242,7 +242,7 @@ void __EXPORT EditRTFParser::NextToken( int nToken )
}
}
-void __EXPORT EditRTFParser::UnknownAttrToken( int nToken, SfxItemSet* )
+void EditRTFParser::UnknownAttrToken( int nToken, SfxItemSet* )
{
// fuer Tokens, die im ReadAttr nicht ausgewertet werden
// Eigentlich nur fuer Calc (RTFTokenHdl), damit RTF_INTBL
@@ -255,7 +255,7 @@ void __EXPORT EditRTFParser::UnknownAttrToken( int nToken, SfxItemSet* )
}
}
-void __EXPORT EditRTFParser::InsertText()
+void EditRTFParser::InsertText()
{
String aText( aToken );
if ( pImpEditEngine->aImportHdl.IsSet() )
@@ -268,7 +268,7 @@ void __EXPORT EditRTFParser::InsertText()
nLastAction = ACTION_INSERTTEXT;
}
-void __EXPORT EditRTFParser::InsertPara()
+void EditRTFParser::InsertPara()
{
if ( pImpEditEngine->aImportHdl.IsSet() )
{
@@ -279,7 +279,7 @@ void __EXPORT EditRTFParser::InsertPara()
nLastAction = ACTION_INSERTPARABRK;
}
-void __EXPORT EditRTFParser::MovePos( int bForward )
+void EditRTFParser::MovePos( int bForward )
{
if( bForward )
aCurSel = pImpEditEngine->CursorRight( aCurSel.Max(), ::com::sun::star::i18n::CharacterIteratorMode::SKIPCHARACTER );
@@ -287,7 +287,7 @@ void __EXPORT EditRTFParser::MovePos( int bForward )
aCurSel = pImpEditEngine->CursorLeft( aCurSel.Max(), ::com::sun::star::i18n::CharacterIteratorMode::SKIPCHARACTER );
}
-void __EXPORT EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
+void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
USHORT& rCntPos )
{
// Gewollt ist: von der aktuellen Einfuegeposition den vorherigen
@@ -306,12 +306,12 @@ void __EXPORT EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
rCntPos = pPrevNode->Len();
}
-int __EXPORT EditRTFParser::IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const
+int EditRTFParser::IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const
{
return ( nCnt == ( ((EditNodeIdx*)pNd)->GetNode()->Len()) );
}
-void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
+void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
{
ContentNode* pSttNode = ((EditNodeIdx&)rSet.GetSttNode()).GetNode();
ContentNode* pEndNode = ((EditNodeIdx&)rSet.GetEndNode()).GetNode();
@@ -499,7 +499,7 @@ void EditRTFParser::CreateStyleSheets()
}
}
-void __EXPORT EditRTFParser::CalcValue()
+void EditRTFParser::CalcValue()
{
const MapUnit eDestUnit = static_cast< MapUnit >( aEditMapMode.GetMapUnit() );
const MapUnit eSrcUnit = aRTFMapMode.GetMapUnit();
@@ -602,33 +602,33 @@ void EditRTFParser::SkipGroup()
SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
-ULONG __EXPORT EditNodeIdx::GetIdx() const
+ULONG EditNodeIdx::GetIdx() const
{
return pImpEditEngine->GetEditDoc().GetPos( pNode );
}
-SvxNodeIdx* __EXPORT EditNodeIdx::Clone() const
+SvxNodeIdx* EditNodeIdx::Clone() const
{
return new EditNodeIdx( pImpEditEngine, pNode );
}
-SvxPosition* __EXPORT EditPosition::Clone() const
+SvxPosition* EditPosition::Clone() const
{
return new EditPosition( pImpEditEngine, pCurSel );
}
-SvxNodeIdx* __EXPORT EditPosition::MakeNodeIdx() const
+SvxNodeIdx* EditPosition::MakeNodeIdx() const
{
return new EditNodeIdx( pImpEditEngine, pCurSel->Max().GetNode() );
}
-ULONG __EXPORT EditPosition::GetNodeIdx() const
+ULONG EditPosition::GetNodeIdx() const
{
ContentNode* pN = pCurSel->Max().GetNode();
return pImpEditEngine->GetEditDoc().GetPos( pN );
}
-USHORT __EXPORT EditPosition::GetCntIdx() const
+USHORT EditPosition::GetCntIdx() const
{
return pCurSel->Max().GetIndex();
}
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index ce4ce58..0aa8a49 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -472,21 +472,21 @@ MetaAction* SvxURLField::createBeginComment() const
SV_IMPL_PERSIST1( SvxPageField, SvxFieldData );
-SvxFieldData* __EXPORT SvxPageField::Clone() const
+SvxFieldData* SvxPageField::Clone() const
{
return new SvxPageField; // leer
}
-int __EXPORT SvxPageField::operator==( const SvxFieldData& rCmp ) const
+int SvxPageField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxPageField) );
}
-void __EXPORT SvxPageField::Load( SvPersistStream & /*rStm*/ )
+void SvxPageField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxPageField::Save( SvPersistStream & /*rStm*/ )
+void SvxPageField::Save( SvPersistStream & /*rStm*/ )
{
}
@@ -498,41 +498,41 @@ MetaAction* SvxPageField::createBeginComment() const
SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData );
-SvxFieldData* __EXPORT SvxPagesField::Clone() const
+SvxFieldData* SvxPagesField::Clone() const
{
return new SvxPagesField; // leer
}
-int __EXPORT SvxPagesField::operator==( const SvxFieldData& rCmp ) const
+int SvxPagesField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxPagesField) );
}
-void __EXPORT SvxPagesField::Load( SvPersistStream & /*rStm*/ )
+void SvxPagesField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxPagesField::Save( SvPersistStream & /*rStm*/ )
+void SvxPagesField::Save( SvPersistStream & /*rStm*/ )
{
}
SV_IMPL_PERSIST1( SvxTimeField, SvxFieldData );
-SvxFieldData* __EXPORT SvxTimeField::Clone() const
+SvxFieldData* SvxTimeField::Clone() const
{
return new SvxTimeField; // leer
}
-int __EXPORT SvxTimeField::operator==( const SvxFieldData& rCmp ) const
+int SvxTimeField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxTimeField) );
}
-void __EXPORT SvxTimeField::Load( SvPersistStream & /*rStm*/ )
+void SvxTimeField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxTimeField::Save( SvPersistStream & /*rStm*/ )
+void SvxTimeField::Save( SvPersistStream & /*rStm*/ )
{
}
@@ -543,41 +543,41 @@ MetaAction* SvxTimeField::createBeginComment() const
SV_IMPL_PERSIST1( SvxFileField, SvxFieldData );
-SvxFieldData* __EXPORT SvxFileField::Clone() const
+SvxFieldData* SvxFileField::Clone() const
{
return new SvxFileField; // leer
}
-int __EXPORT SvxFileField::operator==( const SvxFieldData& rCmp ) const
+int SvxFileField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxFileField) );
}
-void __EXPORT SvxFileField::Load( SvPersistStream & /*rStm*/ )
+void SvxFileField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxFileField::Save( SvPersistStream & /*rStm*/ )
+void SvxFileField::Save( SvPersistStream & /*rStm*/ )
{
}
SV_IMPL_PERSIST1( SvxTableField, SvxFieldData );
-SvxFieldData* __EXPORT SvxTableField::Clone() const
+SvxFieldData* SvxTableField::Clone() const
{
return new SvxTableField; // leer
}
-int __EXPORT SvxTableField::operator==( const SvxFieldData& rCmp ) const
+int SvxTableField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxTableField) );
}
-void __EXPORT SvxTableField::Load( SvPersistStream & /*rStm*/ )
+void SvxTableField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxTableField::Save( SvPersistStream & /*rStm*/ )
+void SvxTableField::Save( SvPersistStream & /*rStm*/ )
{
}
@@ -1011,21 +1011,21 @@ SvClassManager& SvxFieldItem::GetClassManager()
SV_IMPL_PERSIST1( SvxHeaderField, SvxFieldData );
-SvxFieldData* __EXPORT SvxHeaderField::Clone() const
+SvxFieldData* SvxHeaderField::Clone() const
{
return new SvxHeaderField; // leer
}
-int __EXPORT SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
+int SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxHeaderField) );
}
-void __EXPORT SvxHeaderField::Load( SvPersistStream & /*rStm*/ )
+void SvxHeaderField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxHeaderField::Save( SvPersistStream & /*rStm*/ )
+void SvxHeaderField::Save( SvPersistStream & /*rStm*/ )
{
}
@@ -1033,21 +1033,21 @@ void __EXPORT SvxHeaderField::Save( SvPersistStream & /*rStm*/ )
SV_IMPL_PERSIST1( SvxFooterField, SvxFieldData );
-SvxFieldData* __EXPORT SvxFooterField::Clone() const
+SvxFieldData* SvxFooterField::Clone() const
{
return new SvxFooterField; // leer
}
-int __EXPORT SvxFooterField::operator==( const SvxFieldData& rCmp ) const
+int SvxFooterField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxFooterField) );
}
-void __EXPORT SvxFooterField::Load( SvPersistStream & /*rStm*/ )
+void SvxFooterField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxFooterField::Save( SvPersistStream & /*rStm*/ )
+void SvxFooterField::Save( SvPersistStream & /*rStm*/ )
{
}
@@ -1055,21 +1055,21 @@ void __EXPORT SvxFooterField::Save( SvPersistStream & /*rStm*/ )
SV_IMPL_PERSIST1( SvxDateTimeField, SvxFieldData );
-SvxFieldData* __EXPORT SvxDateTimeField::Clone() const
+SvxFieldData* SvxDateTimeField::Clone() const
{
return new SvxDateTimeField; // leer
}
-int __EXPORT SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
+int SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxDateTimeField) );
}
-void __EXPORT SvxDateTimeField::Load( SvPersistStream & /*rStm*/ )
+void SvxDateTimeField::Load( SvPersistStream & /*rStm*/ )
{
}
-void __EXPORT SvxDateTimeField::Save( SvPersistStream & /*rStm*/ )
+void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ )
{
}
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 8f26271..ea2be15 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -36,28 +36,28 @@
SV_IMPL_PERSIST1(SdrMeasureField,SvxFieldData);
-__EXPORT SdrMeasureField::~SdrMeasureField()
+SdrMeasureField::~SdrMeasureField()
{
}
-SvxFieldData* __EXPORT SdrMeasureField::Clone() const
+SvxFieldData* SdrMeasureField::Clone() const
{
return new SdrMeasureField(*this);
}
-int __EXPORT SdrMeasureField::operator==(const SvxFieldData& rSrc) const
+int SdrMeasureField::operator==(const SvxFieldData& rSrc) const
{
return eMeasureFieldKind==((SdrMeasureField&)rSrc).GetMeasureFieldKind();
}
-void __EXPORT SdrMeasureField::Load(SvPersistStream& rIn)
+void SdrMeasureField::Load(SvPersistStream& rIn)
{
UINT16 nFieldKind;
rIn>>nFieldKind;
eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
}
-void __EXPORT SdrMeasureField::Save(SvPersistStream& rOut)
+void SdrMeasureField::Save(SvPersistStream& rOut)
{
rOut<<(UINT16)eMeasureFieldKind;
}
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d9a4227..f73dbde 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -661,7 +661,7 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
pEditEngine->SetUpdateMode( bUpdate );
}
-void __EXPORT Outliner::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void Outliner::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
{
DBG_CHKTHIS(Outliner,0);
@@ -674,7 +674,7 @@ void __EXPORT Outliner::FieldClicked( const SvxFieldItem& rField, USHORT nPara,
}
-void __EXPORT Outliner::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void Outliner::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
{
DBG_CHKTHIS(Outliner,0);
if ( !aFieldClickedHdl.IsSet() )
@@ -686,7 +686,7 @@ void __EXPORT Outliner::FieldSelected( const SvxFieldItem& rField, USHORT nPara,
}
-XubString __EXPORT Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
DBG_CHKTHIS(Outliner,0);
if ( !aCalcFieldValueHdl.IsSet() )
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 57a13a0..b4fd849 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -317,7 +317,7 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
return nPara;
}
-BOOL __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
+BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -334,7 +334,7 @@ BOOL __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
}
-BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
+BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
{
DBG_CHKTHIS(OutlinerView,0);
if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -385,7 +385,7 @@ BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
}
-BOOL __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
+BOOL OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
{
DBG_CHKTHIS(OutlinerView,0);
if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index ecff775..6213b19 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -78,7 +78,7 @@ ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window( pParent, rId )
//----------------------------------------------------------------------------
-void __EXPORT ValWnd::Paint( const Rectangle& )
+void ValWnd::Paint( const Rectangle& )
{
DrawText( aRectOut.TopLeft(), aStrValue );
}
@@ -123,7 +123,7 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
// Cursor control for Edit Fields in Argument Dialog
-void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
+void ArgEdit::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aCode = rKEvt.GetKeyCode();
BOOL bUp = (aCode.GetCode() == KEY_UP);
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 8842888..2d51d86 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -93,7 +93,7 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
SetSwitchToUCS2( TRUE );
}
-__EXPORT SfxHTMLParser::~SfxHTMLParser()
+SfxHTMLParser::~SfxHTMLParser()
{
DBG_ASSERT( !pDLMedium, "Da ist ein File-Download stehengeblieben" );
delete pDLMedium;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 4f0283a..0e56783 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -123,11 +123,11 @@ String SfxShellIdent_Impl( const SfxShell *pSh )
// SfxShell
//=========================================================================
-void __EXPORT SfxShell::EmptyExecStub(SfxShell *, SfxRequest &)
+void SfxShell::EmptyExecStub(SfxShell *, SfxRequest &)
{
}
-void __EXPORT SfxShell::EmptyStateStub(SfxShell *, SfxItemSet &)
+void SfxShell::EmptyStateStub(SfxShell *, SfxItemSet &)
{
}
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index bc43e20..0efa5b0 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -101,7 +101,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool
// -----------------------------------------------------------------------
-__EXPORT SfxNewStyleDlg::~SfxNewStyleDlg()
+SfxNewStyleDlg::~SfxNewStyleDlg()
{
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index a0e8880..f5a6ca3 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -120,12 +120,12 @@ SfxTabDialogItem::SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet )
{
}
-SfxPoolItem* __EXPORT SfxTabDialogItem::Clone(SfxItemPool* pToPool) const
+SfxPoolItem* SfxTabDialogItem::Clone(SfxItemPool* pToPool) const
{
return new SfxTabDialogItem( *this, pToPool );
}
-SfxPoolItem* __EXPORT SfxTabDialogItem::Create(SvStream& /*rStream*/, USHORT /*nVersion*/) const
+SfxPoolItem* SfxTabDialogItem::Create(SvStream& /*rStream*/, USHORT /*nVersion*/) const
{
DBG_ERROR( "Use it only in UI!" );
return NULL;
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6f073f4..19a91a1 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 6021b23..16d0853 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 61dbd9a..6440fc5 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 d0d6777..d79c78d 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 d7023c2..e366934 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 17d18a3..8f85162 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 b94b7b7..17bfc8b 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 f027e77..2d27a35 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 2be2f0f..278cd26 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 8abca70..a217d92 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 a40350c..30bc089 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 ce8378a..d692ffe 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -137,7 +137,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list