summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-12-11 23:23:07 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-12-11 23:23:07 +0100
commit3648fb3c27f87e9b03679b42b9616785d02a3c22 (patch)
treef9e76ff40844a3c668dad75d2eefb5980cfcd8a2 /editeng
parent27e1d912bea0170ab470c32517d5fc9a2108ba5e (diff)
cleaning of __EXPORT define
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editeng.cxx30
-rw-r--r--editeng/source/editeng/editobj.cxx24
-rw-r--r--editeng/source/editeng/editsel.cxx14
-rw-r--r--editeng/source/editeng/editundo.cxx60
-rw-r--r--editeng/source/editeng/edtspell.cxx18
-rw-r--r--editeng/source/editeng/eertfpar.cxx32
-rw-r--r--editeng/source/items/flditem.cxx64
-rw-r--r--editeng/source/items/svdfield.cxx10
-rw-r--r--editeng/source/outliner/outliner.cxx6
-rw-r--r--editeng/source/outliner/outlvw.cxx6
10 files changed, 132 insertions, 132 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index ddb540ddb4c2..bb429ef22081 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 b5fe642df53e..4b2b47f02938 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 03aa2187251d..8ac37c60b73f 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 19ca7dcaf68f..8d9096c65c58 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 71dcb38efa4b..d1ab8919124b 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 49967ac72df8..4bf2e8afc7ab 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 b11534a22dd6..739c394cf0d0 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 52a3edf6d362..c3248a3857d2 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 2f5107f80f11..659ce6bdd141 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 650526cda9be..ab2d53c349b3 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() )