[Libreoffice-commits] .: sc/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Dec 11 14:26:00 PST 2010
sc/source/core/data/cell.cxx | 2
sc/source/core/data/docpool.cxx | 12 -
sc/source/core/data/drawpage.cxx | 2
sc/source/core/data/drwlayer.cxx | 22 +--
sc/source/core/data/global2.cxx | 26 +--
sc/source/core/data/patattr.cxx | 10 -
sc/source/core/data/stlpool.cxx | 8 -
sc/source/core/data/stlsheet.cxx | 14 +-
sc/source/core/tool/chgtrack.cxx | 2
sc/source/core/tool/ddelink.cxx | 6
sc/source/core/tool/docoptio.cxx | 8 -
sc/source/core/tool/editutil.cxx | 6
sc/source/core/tool/userlist.cxx | 2
sc/source/core/tool/viewopti.cxx | 10 -
sc/source/ui/app/client.cxx | 10 -
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/app/inputwin.cxx | 40 +++---
sc/source/ui/app/msgpool.cxx | 4
sc/source/ui/app/template.cxx | 2
sc/source/ui/app/uiitems.cxx | 80 ++++++------
sc/source/ui/attrdlg/attrdlg.cxx | 4
sc/source/ui/attrdlg/condfrmt.cxx | 2
sc/source/ui/attrdlg/tabpages.cxx | 12 -
sc/source/ui/cctrl/cbuttonw.cxx | 2
sc/source/ui/cctrl/popmenu.cxx | 2
sc/source/ui/cctrl/tbinsert.cxx | 10 -
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2
sc/source/ui/dbgui/consdlg.cxx | 6
sc/source/ui/dbgui/dbnamdlg.cxx | 4
sc/source/ui/dbgui/fieldwnd.cxx | 18 +-
sc/source/ui/dbgui/filtdlg.cxx | 6
sc/source/ui/dbgui/pfiltdlg.cxx | 4
sc/source/ui/dbgui/pvlaydlg.cxx | 4
sc/source/ui/dbgui/scendlg.cxx | 2
sc/source/ui/dbgui/scuiimoptdlg.cxx | 2
sc/source/ui/dbgui/sfiltdlg.cxx | 6
sc/source/ui/dbgui/sortdlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 30 ++--
sc/source/ui/dbgui/tpsubt.cxx | 36 ++---
sc/source/ui/dbgui/validate.cxx | 20 +--
sc/source/ui/docshell/arealink.cxx | 8 -
sc/source/ui/docshell/docsh.cxx | 30 ++--
sc/source/ui/docshell/docsh2.cxx | 6
sc/source/ui/docshell/docsh4.cxx | 10 -
sc/source/ui/docshell/docsh6.cxx | 8 -
sc/source/ui/docshell/servobj.cxx | 6
sc/source/ui/docshell/tablink.cxx | 8 -
sc/source/ui/docshell/tpstat.cxx | 8 -
sc/source/ui/drawfunc/drtxtob.cxx | 14 +-
sc/source/ui/drawfunc/drtxtob2.cxx | 4
sc/source/ui/drawfunc/fuconarc.cxx | 8 -
sc/source/ui/drawfunc/fuconcustomshape.cxx | 8 -
sc/source/ui/drawfunc/fuconpol.cxx | 8 -
sc/source/ui/drawfunc/fuconrec.cxx | 8 -
sc/source/ui/drawfunc/fuconstr.cxx | 8 -
sc/source/ui/drawfunc/fuconuno.cxx | 8 -
sc/source/ui/drawfunc/fudraw.cxx | 8 -
sc/source/ui/drawfunc/fuins1.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 6
sc/source/ui/drawfunc/futext.cxx | 8 -
sc/source/ui/formdlg/dwfunctr.cxx | 12 -
sc/source/ui/formdlg/formula.cxx | 4
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 6
sc/source/ui/miscdlgs/crdlg.cxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 4
sc/source/ui/miscdlgs/delcldlg.cxx | 2
sc/source/ui/miscdlgs/delcodlg.cxx | 2
sc/source/ui/miscdlgs/filldlg.cxx | 8 -
sc/source/ui/miscdlgs/groupdlg.cxx | 2
sc/source/ui/miscdlgs/highred.cxx | 4
sc/source/ui/miscdlgs/inscldlg.cxx | 2
sc/source/ui/miscdlgs/inscodlg.cxx | 2
sc/source/ui/miscdlgs/instbdlg.cxx | 4
sc/source/ui/miscdlgs/lbseldlg.cxx | 2
sc/source/ui/miscdlgs/mtrindlg.cxx | 2
sc/source/ui/miscdlgs/mvtabdlg.cxx | 4
sc/source/ui/miscdlgs/scuiautofmt.cxx | 4
sc/source/ui/miscdlgs/shtabdlg.cxx | 2
sc/source/ui/miscdlgs/simpref.cxx | 4
sc/source/ui/miscdlgs/solvrdlg.cxx | 8 -
sc/source/ui/miscdlgs/strindlg.cxx | 2
sc/source/ui/miscdlgs/tabopdlg.cxx | 6
sc/source/ui/miscdlgs/textdlgs.cxx | 4
sc/source/ui/namedlg/namedlg.cxx | 12 -
sc/source/ui/navipi/content.cxx | 8 -
sc/source/ui/navipi/navcitem.cxx | 2
sc/source/ui/navipi/navipi.cxx | 42 +++---
sc/source/ui/optdlg/opredlin.cxx | 8 -
sc/source/ui/optdlg/tpcalc.cxx | 12 -
sc/source/ui/optdlg/tpusrlst.cxx | 12 -
sc/source/ui/pagedlg/hfedtdlg.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 22 +--
sc/source/ui/pagedlg/tphf.cxx | 18 +-
sc/source/ui/pagedlg/tphfedit.cxx | 18 +-
sc/source/ui/styleui/styledlg.cxx | 6
sc/source/ui/undo/target.cxx | 2
sc/source/ui/undo/undobase.cxx | 8 -
sc/source/ui/undo/undoblk.cxx | 192 ++++++++++++++---------------
sc/source/ui/undo/undoblk2.cxx | 12 -
sc/source/ui/undo/undoblk3.cxx | 146 +++++++++++-----------
sc/source/ui/undo/undocell.cxx | 110 ++++++++--------
sc/source/ui/undo/undodat.cxx | 180 +++++++++++++--------------
sc/source/ui/undo/undodraw.cxx | 22 +--
sc/source/ui/view/cellsh.cxx | 2
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/drawattr.cxx | 8 -
sc/source/ui/view/drawvie3.cxx | 2
sc/source/ui/view/drawview.cxx | 8 -
sc/source/ui/view/editsh.cxx | 4
sc/source/ui/view/formatsh.cxx | 4
sc/source/ui/view/gridwin.cxx | 26 +--
sc/source/ui/view/gridwin4.cxx | 4
sc/source/ui/view/hintwin.cxx | 2
sc/source/ui/view/pivotsh.cxx | 2
sc/source/ui/view/preview.cxx | 14 +-
sc/source/ui/view/prevwsh.cxx | 38 ++---
sc/source/ui/view/prevwsh2.cxx | 2
sc/source/ui/view/reffact.cxx | 2
sc/source/ui/view/select.cxx | 28 ++--
sc/source/ui/view/tabsplit.cxx | 8 -
sc/source/ui/view/tabview.cxx | 8 -
sc/source/ui/view/tabview5.cxx | 4
sc/source/ui/view/tabvwsh2.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 40 +++---
sc/source/ui/view/tabvwsh5.cxx | 2
sc/source/ui/view/tabvwsh8.cxx | 2
sc/source/ui/view/tabvwsh9.cxx | 2
sc/source/ui/view/tabvwsha.cxx | 6
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/tabvwshe.cxx | 2
131 files changed, 886 insertions(+), 886 deletions(-)
New commits:
commit b860fc68e241a76f3b0f2f0b0c30ce3fbd37b8a5
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Dec 11 23:25:30 2010 +0100
cleaning of __EXPORT define
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index d437593..d097498 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1837,7 +1837,7 @@ ULONG ScFormulaCell::GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFo
}
-void __EXPORT ScFormulaCell::Notify( SvtBroadcaster&, const SfxHint& rHint)
+void ScFormulaCell::Notify( SvtBroadcaster&, const SfxHint& rHint)
{
if ( !pDocument->IsInDtorClear() && !pDocument->GetHardRecalcState() )
{
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 85c7193..3a06413 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -380,7 +380,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
SetVersionMap( 11, 100, 187, pVersionMap11 );
}
-__EXPORT ScDocumentPool::~ScDocumentPool()
+ScDocumentPool::~ScDocumentPool()
{
Delete();
@@ -597,7 +597,7 @@ void ScDocumentPool::DeleteVersionMaps()
// wird (Assertions).
//
-const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich )
+const SfxPoolItem& ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich )
{
if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special
return SfxItemPool::Put( rItem, nWhich );
@@ -612,7 +612,7 @@ const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHOR
return rNew;
}
-void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem )
+void ScDocumentPool::Remove( const SfxPoolItem& rItem )
{
if ( rItem.Which() == ATTR_PATTERN ) // nur Pattern ist special
{
@@ -676,7 +676,7 @@ void ScDocumentPool::CellStyleCreated( const String& rName )
}
}
-SfxItemPool* __EXPORT ScDocumentPool::Clone() const
+SfxItemPool* ScDocumentPool::Clone() const
{
return new SfxItemPool (*this, TRUE);
}
@@ -784,7 +784,7 @@ SfxItemPresentation lcl_HFPresentation
return ePresentation;
}
-SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
+SfxItemPresentation ScDocumentPool::GetPresentation(
const SfxPoolItem& rItem,
SfxItemPresentation ePresentation,
SfxMapUnit ePresentationMetric,
@@ -1030,7 +1030,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
return ePresentation;
}
-SfxMapUnit __EXPORT ScDocumentPool::GetMetric( USHORT nWhich ) const
+SfxMapUnit ScDocumentPool::GetMetric( USHORT nWhich ) const
{
// eigene Attribute: Twips, alles andere 1/100 mm
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index a0c2c4b..d489d5d 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -52,7 +52,7 @@ ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, BOOL bMasterPa
// -----------------------------------------------------------------------
-__EXPORT ScDrawPage::~ScDrawPage()
+ScDrawPage::~ScDrawPage()
{
}
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index c7de022..cbb2f04 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -122,7 +122,7 @@ ScUndoObjData::ScUndoObjData( SdrObject* pObjP, const ScAddress& rOS, const ScAd
{
}
-__EXPORT ScUndoObjData::~ScUndoObjData()
+ScUndoObjData::~ScUndoObjData()
{
}
@@ -137,7 +137,7 @@ void ScUndoObjData::Undo()
}
}
-void __EXPORT ScUndoObjData::Redo()
+void ScUndoObjData::Redo()
{
ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj );
DBG_ASSERT(pData,"ScUndoObjData: Daten nicht da");
@@ -155,7 +155,7 @@ ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) :
{
}
-__EXPORT ScTabDeletedHint::~ScTabDeletedHint()
+ScTabDeletedHint::~ScTabDeletedHint()
{
}
@@ -164,7 +164,7 @@ ScTabSizeChangedHint::ScTabSizeChangedHint( SCTAB nTabNo ) :
{
}
-__EXPORT ScTabSizeChangedHint::~ScTabSizeChangedHint()
+ScTabSizeChangedHint::~ScTabSizeChangedHint()
{
}
@@ -304,7 +304,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
}
}
-__EXPORT ScDrawLayer::~ScDrawLayer()
+ScDrawLayer::~ScDrawLayer()
{
Broadcast(SdrHint(HINT_MODELCLEARED));
@@ -334,7 +334,7 @@ void ScDrawLayer::UseHyphenator()
}
}
-SdrPage* __EXPORT ScDrawLayer::AllocPage(bool bMasterPage)
+SdrPage* ScDrawLayer::AllocPage(bool bMasterPage)
{
// don't create basic until it is needed
StarBASIC* pBasic = NULL;
@@ -360,7 +360,7 @@ void ScDrawLayer::UpdateBasic()
//! remove this method?
}
-SdrModel* __EXPORT ScDrawLayer::AllocModel() const
+SdrModel* ScDrawLayer::AllocModel() const
{
// #103849# Allocated model (for clipboard etc) must not have a pointer
// to the original model's document, pass NULL as document:
@@ -368,7 +368,7 @@ SdrModel* __EXPORT ScDrawLayer::AllocModel() const
return new ScDrawLayer( NULL, aName );
}
-Window* __EXPORT ScDrawLayer::GetCurDocViewWin()
+Window* ScDrawLayer::GetCurDocViewWin()
{
DBG_ASSERT( pDoc, "ScDrawLayer::GetCurDocViewWin without document" );
if ( !pDoc )
@@ -1985,14 +1985,14 @@ void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static
pGlobalDrawPersist = pPersist;
}
-void __EXPORT ScDrawLayer::SetChanged( sal_Bool bFlg /* = sal_True */ )
+void ScDrawLayer::SetChanged( sal_Bool bFlg /* = sal_True */ )
{
if ( bFlg && pDoc )
pDoc->SetChartListenerCollectionNeedsUpdate( TRUE );
FmFormModel::SetChanged( bFlg );
}
-SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const
+SvStream* ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const
{
DBG_ASSERT( pDoc, "ScDrawLayer::GetDocumentStream without document" );
if ( !pDoc )
@@ -2045,7 +2045,7 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream
return pRet;
}
-SdrLayerID __EXPORT ScDrawLayer::GetControlExportLayerId( const SdrObject & ) const
+SdrLayerID ScDrawLayer::GetControlExportLayerId( const SdrObject & ) const
{
// Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT
return SC_LAYER_FRONT;
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 159835f..fd8eab0 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -469,14 +469,14 @@ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) :
//------------------------------------------------------------------------
-__EXPORT ScConsolidateParam::~ScConsolidateParam()
+ScConsolidateParam::~ScConsolidateParam()
{
ClearDataAreas();
}
//------------------------------------------------------------------------
-void __EXPORT ScConsolidateParam::ClearDataAreas()
+void ScConsolidateParam::ClearDataAreas()
{
if ( ppDataAreas )
{
@@ -490,7 +490,7 @@ void __EXPORT ScConsolidateParam::ClearDataAreas()
//------------------------------------------------------------------------
-void __EXPORT ScConsolidateParam::Clear()
+void ScConsolidateParam::Clear()
{
ClearDataAreas();
@@ -503,7 +503,7 @@ void __EXPORT ScConsolidateParam::Clear()
//------------------------------------------------------------------------
-ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateParam& r )
+ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r )
{
nCol = r.nCol;
nRow = r.nRow;
@@ -519,7 +519,7 @@ ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateP
//------------------------------------------------------------------------
-BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
+BOOL ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
{
BOOL bEqual = (nCol == r.nCol)
&& (nRow == r.nRow)
@@ -544,7 +544,7 @@ BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) cons
//------------------------------------------------------------------------
-void __EXPORT ScConsolidateParam::SetAreas( ScArea* const* ppAreas, USHORT nCount )
+void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, USHORT nCount )
{
ClearDataAreas();
if ( ppAreas && nCount > 0 )
@@ -605,14 +605,14 @@ ScPivotParam::ScPivotParam( const ScPivotParam& r )
//------------------------------------------------------------------------
-__EXPORT ScPivotParam::~ScPivotParam()
+ScPivotParam::~ScPivotParam()
{
}
//------------------------------------------------------------------------
-void __EXPORT ScPivotParam::ClearPivotArrays()
+void ScPivotParam::ClearPivotArrays()
{
memset( aPageArr, 0, PIVOT_MAXPAGEFIELD * sizeof(PivotField) );
memset( aColArr, 0, PIVOT_MAXFIELD * sizeof(PivotField) );
@@ -639,7 +639,7 @@ void ScPivotParam::SetLabelData(const vector<ScDPLabelDataRef>& r)
//------------------------------------------------------------------------
-void __EXPORT ScPivotParam::SetPivotArrays ( const PivotField* pPageArr,
+void ScPivotParam::SetPivotArrays ( const PivotField* pPageArr,
const PivotField* pColArr,
const PivotField* pRowArr,
const PivotField* pDataArr,
@@ -666,7 +666,7 @@ void __EXPORT ScPivotParam::SetPivotArrays ( const PivotField* pPageArr,
//------------------------------------------------------------------------
-ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
+ScPivotParam& ScPivotParam::operator=( const ScPivotParam& r )
{
nCol = r.nCol;
nRow = r.nRow;
@@ -684,7 +684,7 @@ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
//------------------------------------------------------------------------
-BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
+BOOL ScPivotParam::operator==( const ScPivotParam& r ) const
{
BOOL bEqual = (nCol == r.nCol)
&& (nRow == r.nRow)
@@ -758,7 +758,7 @@ ScSolveParam::~ScSolveParam()
//------------------------------------------------------------------------
-ScSolveParam& __EXPORT ScSolveParam::operator=( const ScSolveParam& r )
+ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r )
{
delete pStrTargetVal;
@@ -832,7 +832,7 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r )
//------------------------------------------------------------------------
-BOOL __EXPORT ScTabOpParam::operator==( const ScTabOpParam& r ) const
+BOOL ScTabOpParam::operator==( const ScTabOpParam& r ) const
{
return ( (aRefFormulaCell == r.aRefFormulaCell)
&& (aRefFormulaEnd == r.aRefFormulaEnd)
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 755a55c..f0ece85 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -121,12 +121,12 @@ ScPatternAttr::ScPatternAttr( const ScPatternAttr& rPatternAttr )
pName = NULL;
}
-__EXPORT ScPatternAttr::~ScPatternAttr()
+ScPatternAttr::~ScPatternAttr()
{
delete pName;
}
-SfxPoolItem* __EXPORT ScPatternAttr::Clone( SfxItemPool *pPool ) const
+SfxPoolItem* ScPatternAttr::Clone( SfxItemPool *pPool ) const
{
ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(TRUE, pPool) );
@@ -156,7 +156,7 @@ inline bool EqualPatternSets( const SfxItemSet& rSet1, const SfxItemSet& rSet2 )
return ( 0 == memcmp( pItems1, pItems2, (ATTR_PATTERN_END - ATTR_PATTERN_START + 1) * sizeof(pItems1[0]) ) );
}
-int __EXPORT ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
+int ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
{
// #i62090# Use quick comparison between ScPatternAttr's ItemSets
@@ -164,7 +164,7 @@ int __EXPORT ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
StrCmp( GetStyleName(), static_cast<const ScPatternAttr&>(rCmp).GetStyleName() ) );
}
-SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersion */ ) const
+SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersion */ ) const
{
String* pStr;
BOOL bHasStyle;
@@ -192,7 +192,7 @@ SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersi
return pPattern;
}
-SvStream& __EXPORT ScPatternAttr::Store(SvStream& rStream, USHORT /* nItemVersion */) const
+SvStream& ScPatternAttr::Store(SvStream& rStream, USHORT /* nItemVersion */) const
{
rStream << (BOOL)TRUE;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index b6f6093..3ae27d9 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -81,7 +81,7 @@ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP,
//------------------------------------------------------------------------
-__EXPORT ScStyleSheetPool::~ScStyleSheetPool()
+ScStyleSheetPool::~ScStyleSheetPool()
{
}
@@ -121,7 +121,7 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
//------------------------------------------------------------------------
-SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create(
+SfxStyleSheetBase* ScStyleSheetPool::Create(
const String& rName,
SfxStyleFamily eFamily,
USHORT nMaskP )
@@ -135,7 +135,7 @@ SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create(
//------------------------------------------------------------------------
-SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
+SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
{
DBG_ASSERT( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" );
return new ScStyleSheet( (const ScStyleSheet&) rStyle );
@@ -143,7 +143,7 @@ SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create( const SfxStyleSheetBase& r
//------------------------------------------------------------------------
-void __EXPORT ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
+void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
{
if ( pStyle )
{
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 72e7cee..2b98049 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -85,20 +85,20 @@ ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle )
//------------------------------------------------------------------------
-__EXPORT ScStyleSheet::~ScStyleSheet()
+ScStyleSheet::~ScStyleSheet()
{
}
//------------------------------------------------------------------------
-BOOL __EXPORT ScStyleSheet::HasFollowSupport() const
+BOOL ScStyleSheet::HasFollowSupport() const
{
return FALSE;
}
//------------------------------------------------------------------------
-BOOL __EXPORT ScStyleSheet::HasParentSupport () const
+BOOL ScStyleSheet::HasParentSupport () const
{
BOOL bHasParentSupport = FALSE;
@@ -117,7 +117,7 @@ BOOL __EXPORT ScStyleSheet::HasParentSupport () const
//------------------------------------------------------------------------
-BOOL __EXPORT ScStyleSheet::SetParent( const String& rParentName )
+BOOL ScStyleSheet::SetParent( const String& rParentName )
{
BOOL bResult = FALSE;
String aEffName = rParentName;
@@ -145,7 +145,7 @@ BOOL __EXPORT ScStyleSheet::SetParent( const String& rParentName )
//------------------------------------------------------------------------
-SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
+SfxItemSet& ScStyleSheet::GetItemSet()
{
if ( !pSet )
{
@@ -265,7 +265,7 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
//------------------------------------------------------------------------
-BOOL __EXPORT ScStyleSheet::IsUsed() const
+BOOL ScStyleSheet::IsUsed() const
{
if ( GetFamily() == SFX_STYLE_FAMILY_PARA )
{
@@ -284,7 +284,7 @@ BOOL __EXPORT ScStyleSheet::IsUsed() const
//------------------------------------------------------------------------
-void __EXPORT ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA(SfxSimpleHint) )
if ( ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 63a1284..8ba2807 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -2338,7 +2338,7 @@ void ScChangeTrack::Clear()
}
-void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
+void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
{
if ( !pDoc->IsInDtorClear() )
{
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 56ac77f..118a6dd 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -68,7 +68,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, const String& rA, const String& rT, const
{
}
-__EXPORT ScDdeLink::~ScDdeLink()
+ScDdeLink::~ScDdeLink()
{
// Verbindung aufheben
@@ -138,7 +138,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
rHdr.EndEntry();
}
-void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
+void ScDdeLink::DataChanged( const String& rMimeType,
const ::com::sun::star::uno::Any & rValue )
{
// wir koennen nur Strings...
@@ -241,7 +241,7 @@ void ScDdeLink::ResetValue()
Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
}
-void __EXPORT ScDdeLink::ListenersGone()
+void ScDdeLink::ListenersGone()
{
BOOL bWas = bIsInUpdate;
bIsInUpdate = TRUE; // Remove() kann Reschedule ausloesen??!?
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index b070f3f..b3d3323 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -224,20 +224,20 @@ ScTpCalcItem::ScTpCalcItem( const ScTpCalcItem& rItem )
//------------------------------------------------------------------------
-__EXPORT ScTpCalcItem::~ScTpCalcItem()
+ScTpCalcItem::~ScTpCalcItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScTpCalcItem::GetValueText() const
+String ScTpCalcItem::GetValueText() const
{
return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("ScTpCalcItem") );
}
//------------------------------------------------------------------------
-int __EXPORT ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const
+int ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -248,7 +248,7 @@ int __EXPORT ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScTpCalcItem::Clone( SfxItemPool * ) const
{
return new ScTpCalcItem( *this );
}
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index e4cfa04..bea5887 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -647,7 +647,7 @@ ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, BOOL bDeleteE
{
}
-String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
+String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
USHORT /* nPara */, USHORT /* nPos */,
Color*& /* rTxtColor */, Color*& /* rFldColor */ )
{
@@ -713,7 +713,7 @@ ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pEnginePoolP,
SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS );
}
-String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
+String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
USHORT /* nPara */, USHORT /* nPos */,
Color*& rTxtColor, Color*& /* rFldColor */ )
{
@@ -757,7 +757,7 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
return aRet;
}
-void __EXPORT ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT, USHORT )
+void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT, USHORT )
{
const SvxFieldData* pFld = rField.GetField();
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index aad2f73..7d7f038 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -78,7 +78,7 @@ ScUserListData::ScUserListData(const ScUserListData& rData) :
InitTokens();
}
-__EXPORT ScUserListData::~ScUserListData()
+ScUserListData::~ScUserListData()
{
delete[] pSubStrings;
delete[] pUpperSub;
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 091e003..70711ba 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -141,7 +141,7 @@ ScViewOptions::ScViewOptions( const ScViewOptions& rCpy )
//------------------------------------------------------------------------
-__EXPORT ScViewOptions::~ScViewOptions()
+ScViewOptions::~ScViewOptions()
{
}
@@ -261,20 +261,20 @@ ScTpViewItem::ScTpViewItem( const ScTpViewItem& rItem )
//------------------------------------------------------------------------
-__EXPORT ScTpViewItem::~ScTpViewItem()
+ScTpViewItem::~ScTpViewItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScTpViewItem::GetValueText() const
+String ScTpViewItem::GetValueText() const
{
return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("ScTpViewItem") );
}
//------------------------------------------------------------------------
-int __EXPORT ScTpViewItem::operator==( const SfxPoolItem& rItem ) const
+int ScTpViewItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -285,7 +285,7 @@ int __EXPORT ScTpViewItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScTpViewItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
{
return new ScTpViewItem( *this );
}
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 68cefe7..cd590b5 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -64,7 +64,7 @@ ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrMod
SetObject( pObj->GetObjRef() );
}
-__EXPORT ScClient::~ScClient()
+ScClient::~ScClient()
{
}
@@ -94,7 +94,7 @@ SdrOle2Obj* ScClient::GetDrawObj()
return pOle2Obj;
}
-void __EXPORT ScClient::RequestNewObjectArea( Rectangle& aLogicRect )
+void ScClient::RequestNewObjectArea( Rectangle& aLogicRect )
{
SfxViewShell* pSfxViewSh = GetViewShell();
ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh );
@@ -156,7 +156,7 @@ void __EXPORT ScClient::RequestNewObjectArea( Rectangle& aLogicRect )
}
}
-void __EXPORT ScClient::ObjectAreaChanged()
+void ScClient::ObjectAreaChanged()
{
SfxViewShell* pSfxViewSh = GetViewShell();
ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh );
@@ -184,7 +184,7 @@ void __EXPORT ScClient::ObjectAreaChanged()
pViewSh->ScrollToObject( pDrawObj );
}
-void __EXPORT ScClient::ViewChanged()
+void ScClient::ViewChanged()
{
if ( GetAspect() == embed::Aspects::MSOLE_ICON )
{
@@ -243,7 +243,7 @@ void __EXPORT ScClient::ViewChanged()
}
}
-void __EXPORT ScClient::MakeVisible()
+void ScClient::MakeVisible()
{
SdrOle2Obj* pDrawObj = GetDrawObj();
if (pDrawObj)
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d80108c..e1426a6 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -472,7 +472,7 @@ ScInputHandler::ScInputHandler()
// Bindings (nur noch fuer Invalidate benutzt) werden bei Bedarf aktuell geholt
}
-__EXPORT ScInputHandler::~ScInputHandler()
+ScInputHandler::~ScInputHandler()
{
// Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach SfxApplication::Main
// gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 70bb16b..04d9261 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -119,7 +119,7 @@ ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP,
// GetInfo fliegt wieder raus, wenn es ein SFX_IMPL_TOOLBOX gibt !!!!
-SfxChildWinInfo __EXPORT ScInputWindowWrapper::GetInfo() const
+SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
{
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
return aInfo;
@@ -224,7 +224,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
pImgMgr->RegisterToolBox( this );
}
-__EXPORT ScInputWindow::~ScInputWindow()
+ScInputWindow::~ScInputWindow()
{
BOOL bDown = ( ScGlobal::pSysLocale == NULL ); // after Clear?
@@ -327,7 +327,7 @@ sal_Bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) const
return bSubTotal;
}
-void __EXPORT ScInputWindow::Select()
+void ScInputWindow::Select()
{
ScModule* pScMod = SC_MOD();
ToolBox::Select();
@@ -485,7 +485,7 @@ void __EXPORT ScInputWindow::Select()
}
}
-void __EXPORT ScInputWindow::Resize()
+void ScInputWindow::Resize()
{
ToolBox::Resize();
@@ -601,12 +601,12 @@ void ScInputWindow::SetFormulaMode( BOOL bSet )
aTextWindow.SetFormulaMode(bSet);
}
-void __EXPORT ScInputWindow::SetText( const String& rString )
+void ScInputWindow::SetText( const String& rString )
{
ToolBox::SetText(rString);
}
-String __EXPORT ScInputWindow::GetText() const
+String ScInputWindow::GetText() const
{
return ToolBox::GetText();
}
@@ -748,7 +748,7 @@ ScTextWnd::ScTextWnd( Window* pParent )
SetPointer ( POINTER_TEXT );
}
-__EXPORT ScTextWnd::~ScTextWnd()
+ScTextWnd::~ScTextWnd()
{
while (!maAccTextDatas.empty()) {
maAccTextDatas.back()->Dispose();
@@ -757,7 +757,7 @@ __EXPORT ScTextWnd::~ScTextWnd()
delete pEditEngine;
}
-void __EXPORT ScTextWnd::Paint( const Rectangle& rRec )
+void ScTextWnd::Paint( const Rectangle& rRec )
{
if (pEditView)
pEditView->Paint( rRec );
@@ -783,7 +783,7 @@ void __EXPORT ScTextWnd::Paint( const Rectangle& rRec )
}
}
-void __EXPORT ScTextWnd::Resize()
+void ScTextWnd::Resize()
{
if (pEditView)
{
@@ -804,13 +804,13 @@ void __EXPORT ScTextWnd::Resize()
}
}
-void __EXPORT ScTextWnd::MouseMove( const MouseEvent& rMEvt )
+void ScTextWnd::MouseMove( const MouseEvent& rMEvt )
{
if (pEditView)
pEditView->MouseMove( rMEvt );
}
-void __EXPORT ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
+void ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
{
if (!HasFocus())
{
@@ -826,7 +826,7 @@ void __EXPORT ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-void __EXPORT ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
+void ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
{
if (pEditView)
if (pEditView->MouseButtonUp( rMEvt ))
@@ -842,7 +842,7 @@ void __EXPORT ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
}
}
-void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
+void ScTextWnd::Command( const CommandEvent& rCEvt )
{
bInputMode = TRUE;
USHORT nCommand = rCEvt.GetCommand();
@@ -916,7 +916,7 @@ void ScTextWnd::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
}
}
-void __EXPORT ScTextWnd::KeyInput(const KeyEvent& rKEvt)
+void ScTextWnd::KeyInput(const KeyEvent& rKEvt)
{
bInputMode = TRUE;
if (!SC_MOD()->InputKeyEvent( rKEvt ))
@@ -931,18 +931,18 @@ void __EXPORT ScTextWnd::KeyInput(const KeyEvent& rKEvt)
bInputMode = FALSE;
}
-void __EXPORT ScTextWnd::GetFocus()
+void ScTextWnd::GetFocus()
{
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if ( pViewSh )
pViewSh->SetFormShellAtTop( FALSE ); // focus in input line -> FormShell no longer on top
}
-void __EXPORT ScTextWnd::LoseFocus()
+void ScTextWnd::LoseFocus()
{
}
-String __EXPORT ScTextWnd::GetText() const
+String ScTextWnd::GetText() const
{
// ueberladen, um per Testtool an den Text heranzukommen
@@ -1374,7 +1374,7 @@ ScPosWnd::ScPosWnd( Window* pParent ) :
StartListening( *SFX_APP() ); // fuer Navigator-Bereichsnamen-Updates
}
-__EXPORT ScPosWnd::~ScPosWnd()
+ScPosWnd::~ScPosWnd()
{
EndListening( *SFX_APP() );
@@ -1630,7 +1630,7 @@ void ScPosWnd::Modify()
}
}
-void __EXPORT ScPosWnd::Select()
+void ScPosWnd::Select()
{
ComboBox::Select(); // in VCL gibt GetText() erst danach den ausgewaehlten Eintrag
@@ -1726,7 +1726,7 @@ void ScPosWnd::DoEnter()
ReleaseFocus_Impl();
}
-long __EXPORT ScPosWnd::Notify( NotifyEvent& rNEvt )
+long ScPosWnd::Notify( NotifyEvent& rNEvt )
{
long nHandled = 0;
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index 9068594..409fc43 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -94,7 +94,7 @@ ScMessagePool::ScMessagePool()
}
-__EXPORT ScMessagePool::~ScMessagePool()
+ScMessagePool::~ScMessagePool()
{
Delete();
SetSecondaryPool( NULL ); // before deleting defaults (accesses defaults)
@@ -108,7 +108,7 @@ __EXPORT ScMessagePool::~ScMessagePool()
}
-SfxMapUnit __EXPORT ScMessagePool::GetMetric( USHORT nWhich ) const
+SfxMapUnit ScMessagePool::GetMetric( USHORT nWhich ) const
{
// eigene Attribute: Twips, alles andere 1/100 mm
diff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxx
index afec56d..04c34aa 100644
--- a/sc/source/ui/app/template.cxx
+++ b/sc/source/ui/app/template.cxx
@@ -43,7 +43,7 @@ ScTemplateDlg::ScTemplateDlg(Window * pParent, USHORT nAppResource) :
//------------------------------------------------------------------------
-__EXPORT ScTemplateDlg::~ScTemplateDlg()
+ScTemplateDlg::~ScTemplateDlg()
{
}
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 2d34722..b0f93ae 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -83,17 +83,17 @@ ScInputStatusItem::ScInputStatusItem( const ScInputStatusItem& rItem )
{
}
-__EXPORT ScInputStatusItem::~ScInputStatusItem()
+ScInputStatusItem::~ScInputStatusItem()
{
delete pEditData;
}
-String __EXPORT ScInputStatusItem::GetValueText() const
+String ScInputStatusItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("InputStatus"));
}
-int __EXPORT ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const
+int ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -104,7 +104,7 @@ int __EXPORT ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const
//! Edit-Daten vergleichen!
}
-SfxPoolItem* __EXPORT ScInputStatusItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScInputStatusItem::Clone( SfxItemPool * ) const
{
return new ScInputStatusItem( *this );
}
@@ -190,20 +190,20 @@ ScSortItem::ScSortItem( const ScSortItem& rItem ) :
{
}
-__EXPORT ScSortItem::~ScSortItem()
+ScSortItem::~ScSortItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScSortItem::GetValueText() const
+String ScSortItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("SortItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScSortItem::operator==( const SfxPoolItem& rItem ) const
+int ScSortItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -215,7 +215,7 @@ int __EXPORT ScSortItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScSortItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const
{
return new ScSortItem( *this );
}
@@ -265,7 +265,7 @@ ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) :
{
}
-__EXPORT ScQueryItem::~ScQueryItem()
+ScQueryItem::~ScQueryItem()
{
}
@@ -290,14 +290,14 @@ BOOL ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const
//------------------------------------------------------------------------
-String __EXPORT ScQueryItem::GetValueText() const
+String ScQueryItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("QueryItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScQueryItem::operator==( const SfxPoolItem& rItem ) const
+int ScQueryItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -311,7 +311,7 @@ int __EXPORT ScQueryItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScQueryItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const
{
return new ScQueryItem( *this );
}
@@ -348,20 +348,20 @@ ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) :
{
}
-__EXPORT ScSubTotalItem::~ScSubTotalItem()
+ScSubTotalItem::~ScSubTotalItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScSubTotalItem::GetValueText() const
+String ScSubTotalItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("SubTotalItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
+int ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -373,7 +373,7 @@ int __EXPORT ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScSubTotalItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const
{
return new ScSubTotalItem( *this );
}
@@ -408,21 +408,21 @@ ScUserListItem::ScUserListItem( const ScUserListItem& rItem )
pUserList = NULL;
}
-__EXPORT ScUserListItem::~ScUserListItem()
+ScUserListItem::~ScUserListItem()
{
delete pUserList;
}
//------------------------------------------------------------------------
-String __EXPORT ScUserListItem::GetValueText() const
+String ScUserListItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScUserListItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScUserListItem::operator==( const SfxPoolItem& rItem ) const
+int ScUserListItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -440,7 +440,7 @@ int __EXPORT ScUserListItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScUserListItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const
{
return new ScUserListItem( *this );
}
@@ -475,20 +475,20 @@ ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) :
//------------------------------------------------------------------------
-__EXPORT ScConsolidateItem::~ScConsolidateItem()
+ScConsolidateItem::~ScConsolidateItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScConsolidateItem::GetValueText() const
+String ScConsolidateItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScConsolidateItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
+int ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -499,7 +499,7 @@ int __EXPORT ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScConsolidateItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const
{
return new ScConsolidateItem( *this );
}
@@ -535,21 +535,21 @@ ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) :
//------------------------------------------------------------------------
-__EXPORT ScPivotItem::~ScPivotItem()
+ScPivotItem::~ScPivotItem()
{
delete pSaveData;
}
//------------------------------------------------------------------------
-String __EXPORT ScPivotItem::GetValueText() const
+String ScPivotItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScPivotItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScPivotItem::operator==( const SfxPoolItem& rItem ) const
+int ScPivotItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -562,7 +562,7 @@ int __EXPORT ScPivotItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScPivotItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const
{
return new ScPivotItem( *this );
}
@@ -589,20 +589,20 @@ ScSolveItem::ScSolveItem( const ScSolveItem& rItem )
//------------------------------------------------------------------------
-__EXPORT ScSolveItem::~ScSolveItem()
+ScSolveItem::~ScSolveItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScSolveItem::GetValueText() const
+String ScSolveItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScSolveItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScSolveItem::operator==( const SfxPoolItem& rItem ) const
+int ScSolveItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -613,7 +613,7 @@ int __EXPORT ScSolveItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScSolveItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const
{
return new ScSolveItem( *this );
}
@@ -639,20 +639,20 @@ ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem )
//------------------------------------------------------------------------
-__EXPORT ScTabOpItem::~ScTabOpItem()
+ScTabOpItem::~ScTabOpItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScTabOpItem::GetValueText() const
+String ScTabOpItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScTabOpItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
+int ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -663,7 +663,7 @@ int __EXPORT ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScTabOpItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScTabOpItem::Clone( SfxItemPool * ) const
{
return new ScTabOpItem( *this );
}
@@ -692,20 +692,20 @@ ScCondFrmtItem::ScCondFrmtItem( const ScCondFrmtItem& rItem )
//------------------------------------------------------------------------
-__EXPORT ScCondFrmtItem::~ScCondFrmtItem()
+ScCondFrmtItem::~ScCondFrmtItem()
{
}
//------------------------------------------------------------------------
-String __EXPORT ScCondFrmtItem::GetValueText() const
+String ScCondFrmtItem::GetValueText() const
{
return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScCondFrmtItem"));
}
//------------------------------------------------------------------------
-int __EXPORT ScCondFrmtItem::operator==( const SfxPoolItem& rItem ) const
+int ScCondFrmtItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
@@ -716,7 +716,7 @@ int __EXPORT ScCondFrmtItem::operator==( const SfxPoolItem& rItem ) const
//------------------------------------------------------------------------
-SfxPoolItem* __EXPORT ScCondFrmtItem::Clone( SfxItemPool * ) const
+SfxPoolItem* ScCondFrmtItem::Clone( SfxItemPool * ) const
{
return new ScCondFrmtItem( *this );
}
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index b7716e7..08904ba 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -99,13 +99,13 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
// -----------------------------------------------------------------------
-__EXPORT ScAttrDlg::~ScAttrDlg()
+ScAttrDlg::~ScAttrDlg()
{
}
// -----------------------------------------------------------------------
-void __EXPORT ScAttrDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
+void ScAttrDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx
index c9da6a7..9ea7f7f 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -329,7 +329,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
//----------------------------------------------------------------------------
// Destruktor
-__EXPORT ScConditionalFormatDlg::~ScConditionalFormatDlg()
+ScConditionalFormatDlg::~ScConditionalFormatDlg()
{
}
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index ecc536c..8e08542 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -86,20 +86,20 @@ ScTabPageProtection::ScTabPageProtection( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTabPageProtection::~ScTabPageProtection()
+ScTabPageProtection::~ScTabPageProtection()
{
}
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTabPageProtection::GetRanges()
+USHORT* ScTabPageProtection::GetRanges()
{
return pProtectionRanges;
}
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent,
+SfxTabPage* ScTabPageProtection::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new ScTabPageProtection( pParent, rAttrSet ) );
@@ -107,7 +107,7 @@ SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent,
//------------------------------------------------------------------------
-void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
+void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
{
// Variablen initialisieren
@@ -151,7 +151,7 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
+BOOL ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
{
BOOL bAttrsChanged = FALSE;
USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION );
@@ -185,7 +185,7 @@ BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
//------------------------------------------------------------------------
-int __EXPORT ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
+int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
{
if ( pSetP )
FillItemSet( *pSetP );
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index d6e0729..39b0246 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -47,7 +47,7 @@ ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice )
// -------------------------------------------------------------------------
-__EXPORT ScDDComboBoxButton::~ScDDComboBoxButton()
+ScDDComboBoxButton::~ScDDComboBoxButton()
{
}
diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx
index e473fa3..1e62f86 100644
--- a/sc/source/ui/cctrl/popmenu.cxx
+++ b/sc/source/ui/cctrl/popmenu.cxx
@@ -39,7 +39,7 @@
//------------------------------------------------------------------
-void __EXPORT ScPopupMenu::Select()
+void ScPopupMenu::Select()
{
nSel = GetCurItemId();
bHit = TRUE;
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 810d4f6..0bf8987 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -70,11 +70,11 @@ ScTbxInsertCtrl::ScTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
}
-__EXPORT ScTbxInsertCtrl::~ScTbxInsertCtrl()
+ScTbxInsertCtrl::~ScTbxInsertCtrl()
{
}
-void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eState,
+void ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eState,
const SfxPoolItem* pState )
{
GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) );
@@ -98,7 +98,7 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
}
}
-SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
+SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow()
{
USHORT nSlotId = GetSlotId();
if (nSlotId == SID_TBXCTL_INSERT)
@@ -119,12 +119,12 @@ SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
return NULL;
}
-SfxPopupWindowType __EXPORT ScTbxInsertCtrl::GetPopupWindowType() const
+SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
{
return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
}
-void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
+void ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
{
SfxViewShell* pCurSh( SfxViewShell::Current() );
SfxDispatcher* pDispatch( 0 );
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index f008e6a..c6272a7 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -64,7 +64,7 @@ ScZoomSliderControl::ScZoomSliderControl(
// -----------------------------------------------------------------------
-__EXPORT ScZoomSliderControl::~ScZoomSliderControl()
+ScZoomSliderControl::~ScZoomSliderControl()
{
}
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 6022414..fd2d53d 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -142,7 +142,7 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window
//----------------------------------------------------------------------------
-__EXPORT ScConsolidateDlg::~ScConsolidateDlg()
+ScConsolidateDlg::~ScConsolidateDlg()
{
delete [] pAreaData;
delete pRangeUtil;
@@ -315,7 +315,7 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
//----------------------------------------------------------------------------
-BOOL __EXPORT ScConsolidateDlg::Close()
+BOOL ScConsolidateDlg::Close()
{
return DoClose( ScConsolidateDlgWrapper::GetChildWindowId() );
}
@@ -344,7 +344,7 @@ void ScConsolidateDlg::SetActive()
//----------------------------------------------------------------------------
-void __EXPORT ScConsolidateDlg::Deactivate()
+void ScConsolidateDlg::Deactivate()
{
bDlgLostFocus = TRUE;
}
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 48222c4..f8abca9 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -191,7 +191,7 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
//----------------------------------------------------------------------------
-__EXPORT ScDbNameDlg::~ScDbNameDlg()
+ScDbNameDlg::~ScDbNameDlg()
{
DELETEZ( pSaveObj );
@@ -343,7 +343,7 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
//----------------------------------------------------------------------------
-BOOL __EXPORT ScDbNameDlg::Close()
+BOOL ScDbNameDlg::Close()
{
return DoClose( ScDbNameDlgWrapper::GetChildWindowId() );
}
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 2aa9987..f443b4e 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -96,7 +96,7 @@ void ScDPFieldWindow::Init()
GetStyleSettings();
}
-__EXPORT ScDPFieldWindow::~ScDPFieldWindow()
+ScDPFieldWindow::~ScDPFieldWindow()
{
if (pAccessible)
{
@@ -456,7 +456,7 @@ void ScDPFieldWindow::MoveFieldRel( SCsCOL nDX, SCsROW nDY )
//-------------------------------------------------------------------
-void __EXPORT ScDPFieldWindow::Paint( const Rectangle& /* rRect */ )
+void ScDPFieldWindow::Paint( const Rectangle& /* rRect */ )
{
// #124828# hiding the caption is now done from StateChanged
Redraw();
@@ -476,7 +476,7 @@ void ScDPFieldWindow::UseMnemonic()
UpdateStyle();
}
-void __EXPORT ScDPFieldWindow::DataChanged( const DataChangedEvent& rDCEvt )
+void ScDPFieldWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
@@ -486,7 +486,7 @@ void __EXPORT ScDPFieldWindow::DataChanged( const DataChangedEvent& rDCEvt )
Control::DataChanged( rDCEvt );
}
-void __EXPORT ScDPFieldWindow::MouseButtonDown( const MouseEvent& rMEvt )
+void ScDPFieldWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
if( rMEvt.IsLeft() )
{
@@ -507,7 +507,7 @@ void __EXPORT ScDPFieldWindow::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-void __EXPORT ScDPFieldWindow::MouseButtonUp( const MouseEvent& rMEvt )
+void ScDPFieldWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
if( rMEvt.IsLeft() )
{
@@ -522,7 +522,7 @@ void __EXPORT ScDPFieldWindow::MouseButtonUp( const MouseEvent& rMEvt )
}
}
-void __EXPORT ScDPFieldWindow::MouseMove( const MouseEvent& rMEvt )
+void ScDPFieldWindow::MouseMove( const MouseEvent& rMEvt )
{
if( IsMouseCaptured() )
{
@@ -539,7 +539,7 @@ void __EXPORT ScDPFieldWindow::MouseMove( const MouseEvent& rMEvt )
}
}
-void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
+void ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
{
const KeyCode& rKeyCode = rKEvt.GetKeyCode();
USHORT nCode = rKeyCode.GetCode();
@@ -580,7 +580,7 @@ void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
Control::KeyInput( rKEvt );
}
-void __EXPORT ScDPFieldWindow::GetFocus()
+void ScDPFieldWindow::GetFocus()
{
Control::GetFocus();
Redraw();
@@ -599,7 +599,7 @@ void __EXPORT ScDPFieldWindow::GetFocus()
}
}
-void __EXPORT ScDPFieldWindow::LoseFocus()
+void ScDPFieldWindow::LoseFocus()
{
Control::LoseFocus();
Redraw();
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index d33a674..0180830 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -138,7 +138,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
//----------------------------------------------------------------------------
-__EXPORT ScFilterDlg::~ScFilterDlg()
+ScFilterDlg::~ScFilterDlg()
{
for (USHORT i=0; i<=MAXCOL; i++)
delete pEntryLists[i];
@@ -154,7 +154,7 @@ __EXPORT ScFilterDlg::~ScFilterDlg()
//----------------------------------------------------------------------------
-void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
+void ScFilterDlg::Init( const SfxItemSet& rArgSet )
{
const ScQueryItem& rQueryItem = (const ScQueryItem&)
rArgSet.Get( nWhichQuery );
@@ -341,7 +341,7 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
//----------------------------------------------------------------------------
-BOOL __EXPORT ScFilterDlg::Close()
+BOOL ScFilterDlg::Close()
{
if (pViewData)
pViewData->GetDocShell()->CancelAutoDBRange();
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 5108b69..6b4507b 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -115,7 +115,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent,
//------------------------------------------------------------------------
-__EXPORT ScPivotFilterDlg::~ScPivotFilterDlg()
+ScPivotFilterDlg::~ScPivotFilterDlg()
{
for (USHORT i=0; i<=MAXCOL; i++)
delete pEntryLists[i];
@@ -126,7 +126,7 @@ __EXPORT ScPivotFilterDlg::~ScPivotFilterDlg()
//------------------------------------------------------------------------
-void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
+void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
{
const ScQueryItem& rQueryItem = (const ScQueryItem&)
rArgSet.Get( nWhichQuery );
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index ab0172a..e634089 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -200,7 +200,7 @@ ScDPFieldWindow& ScDPLayoutDlg::GetFieldWindow( ScDPFieldType eType )
return aWndSelect;
}
-void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput)
+void ScDPLayoutDlg::Init(bool bNewOutput)
{
DBG_ASSERT( pViewData && pDoc,
"Ctor-Initialisierung fehlgeschlagen!" );
@@ -361,7 +361,7 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput)
//----------------------------------------------------------------------------
-BOOL __EXPORT ScDPLayoutDlg::Close()
+BOOL ScDPLayoutDlg::Close()
{
return DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
}
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 113274a..28e2340 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -147,7 +147,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b
//------------------------------------------------------------------------
-__EXPORT ScNewScenarioDlg::~ScNewScenarioDlg()
+ScNewScenarioDlg::~ScNewScenarioDlg()
{
}
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 67d874a..d187301 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -242,7 +242,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(
//------------------------------------------------------------------------
-__EXPORT ScImportOptionsDlg::~ScImportOptionsDlg()
+ScImportOptionsDlg::~ScImportOptionsDlg()
{
delete pFieldSepTab;
delete pTextSepTab;
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 2d8c43b..d6d2c58 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -109,7 +109,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
//----------------------------------------------------------------------------
-__EXPORT ScSpecialFilterDlg::~ScSpecialFilterDlg()
+ScSpecialFilterDlg::~ScSpecialFilterDlg()
{
USHORT nEntries = aLbFilterArea.GetEntryCount();
USHORT i;
@@ -130,7 +130,7 @@ __EXPORT ScSpecialFilterDlg::~ScSpecialFilterDlg()
//----------------------------------------------------------------------------
-void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
+void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
{
const ScQueryItem& rQueryItem = (const ScQueryItem&)
rArgSet.Get( nWhichQuery );
@@ -231,7 +231,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
//----------------------------------------------------------------------------
-BOOL __EXPORT ScSpecialFilterDlg::Close()
+BOOL ScSpecialFilterDlg::Close()
{
if (pViewData)
pViewData->GetDocShell()->CancelAutoDBRange();
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 8876d03..a5138a5 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -63,7 +63,7 @@ ScSortDlg::ScSortDlg( Window* pParent,
FreeResource();
}
-__EXPORT ScSortDlg::~ScSortDlg()
+ScSortDlg::~ScSortDlg()
{
}
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6d5f6dc..8957631 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -138,7 +138,7 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTabPageSortFields::~ScTabPageSortFields()
+ScTabPageSortFields::~ScTabPageSortFields()
{
}
@@ -180,14 +180,14 @@ void ScTabPageSortFields::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTabPageSortFields::GetRanges()
+USHORT* ScTabPageSortFields::GetRanges()
{
return pSortRanges;
}
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
+SfxTabPage* ScTabPageSortFields::Create( Window* pParent,
const SfxItemSet& rArgSet )
{
return ( new ScTabPageSortFields( pParent, rArgSet ) );
@@ -195,7 +195,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
// -----------------------------------------------------------------------
-void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
{
bSortByRows = rSortData.bByRow;
bHasHeader = rSortData.bHasHeader;
@@ -263,7 +263,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
{
ScSortParam theSortData = rSortData;
if (pDlg)
@@ -334,7 +334,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
// void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
-void __EXPORT ScTabPageSortFields::ActivatePage()
+void ScTabPageSortFields::ActivatePage()
{
if ( pDlg )
{
@@ -357,7 +357,7 @@ void __EXPORT ScTabPageSortFields::ActivatePage()
// -----------------------------------------------------------------------
-int __EXPORT ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
+int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
{
if ( pDlg )
{
@@ -606,7 +606,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
+ScTabPageSortOptions::~ScTabPageSortOptions()
{
USHORT nEntries = aLbOutPos.GetEntryCount();
@@ -717,7 +717,7 @@ void ScTabPageSortOptions::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
+USHORT* ScTabPageSortOptions::GetRanges()
{
return pSortRanges;
}
@@ -727,7 +727,7 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
#if ENABLE_LAYOUT_EXPERIMENTAL
#undef SfxTabPage
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
-SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
+SfxTabPage* ScTabPageSortOptions::Create(
Window* pParent,
const SfxItemSet& rArgSet )
{
@@ -736,7 +736,7 @@ SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
// -----------------------------------------------------------------------
-void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
{
if ( rSortData.bUserDef )
{
@@ -806,7 +806,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
{
ScSortParam theSortData = rSortData;
if (pDlg)
@@ -856,7 +856,7 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
// void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
-void __EXPORT ScTabPageSortOptions::ActivatePage()
+void ScTabPageSortOptions::ActivatePage()
{
if ( pDlg )
{
@@ -879,7 +879,7 @@ void __EXPORT ScTabPageSortOptions::ActivatePage()
// -----------------------------------------------------------------------
-int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
+int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
{
BOOL bPosInputOk = TRUE;
@@ -1015,7 +1015,7 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
// -----------------------------------------------------------------------
-void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
+void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
{
if ( pEd == &aEdOutPos )
{
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index cceac3d..c919741 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -93,7 +93,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
// -----------------------------------------------------------------------
-__EXPORT ScTpSubTotalGroup::~ScTpSubTotalGroup()
+ScTpSubTotalGroup::~ScTpSubTotalGroup()
{
USHORT nCount = (USHORT)aLbColumns.GetEntryCount();
@@ -134,7 +134,7 @@ void ScTpSubTotalGroup::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTpSubTotalGroup::GetRanges()
+USHORT* ScTpSubTotalGroup::GetRanges()
{
return pSubTotalsRanges;
}
@@ -439,19 +439,19 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb )
//========================================================================
// Abgeleitete Gruppen-TabPages:
-SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent,
+SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent,
const SfxItemSet& rArgSet )
{ return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); }
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent,
+SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent,
const SfxItemSet& rArgSet )
{ return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); }
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent,
+SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent,
const SfxItemSet& rArgSet )
{ return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); }
@@ -474,11 +474,11 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS
#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet ))
-void __EXPORT ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); }
+void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); }
-void __EXPORT ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); }
+void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); }
-void __EXPORT ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); }
+void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); }
#undef RESET
@@ -486,11 +486,11 @@ void __EXPORT ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3);
#define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet ))
-BOOL __EXPORT ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); }
+BOOL ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); }
-BOOL __EXPORT ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); }
+BOOL ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); }
-BOOL __EXPORT ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); }
+BOOL ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); }
#undef FILL
@@ -528,7 +528,7 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTpSubTotalOptions::~ScTpSubTotalOptions()
+ScTpSubTotalOptions::~ScTpSubTotalOptions()
{
}
@@ -552,7 +552,7 @@ void ScTpSubTotalOptions::Init()
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent,
+SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent,
const SfxItemSet& rArgSet )
{
return ( new ScTpSubTotalOptions( pParent, rArgSet ) );
@@ -560,7 +560,7 @@ SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent,
// -----------------------------------------------------------------------
-void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
{
aBtnPagebreak.Check ( rSubTotalData.bPagebreak );
aBtnCase.Check ( rSubTotalData.bCaseSens );
@@ -587,7 +587,7 @@ void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
{
ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt
SfxTabDialog* pDlg = GetTabDialog();
@@ -673,15 +673,15 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox )
return 0;
}
-__EXPORT ScTpSubTotalGroup1::~ScTpSubTotalGroup1()
+ScTpSubTotalGroup1::~ScTpSubTotalGroup1()
{
}
-__EXPORT ScTpSubTotalGroup2::~ScTpSubTotalGroup2()
+ScTpSubTotalGroup2::~ScTpSubTotalGroup2()
{
}
-__EXPORT ScTpSubTotalGroup3::~ScTpSubTotalGroup3()
+ScTpSubTotalGroup3::~ScTpSubTotalGroup3()
{
}
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 23849bf..b42987c 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -693,7 +693,7 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTPValidationHelp::~ScTPValidationHelp()
+ScTPValidationHelp::~ScTPValidationHelp()
{
}
@@ -706,14 +706,14 @@ void ScTPValidationHelp::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTPValidationHelp::GetRanges()
+USHORT* ScTPValidationHelp::GetRanges()
{
return pValueRanges;
}
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent,
+SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
const SfxItemSet& rArgSet )
{
return ( new ScTPValidationHelp( pParent, rArgSet ) );
@@ -721,7 +721,7 @@ SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent,
// -----------------------------------------------------------------------
-void __EXPORT ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
{
const SfxPoolItem* pItem;
@@ -743,7 +743,7 @@ void __EXPORT ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
{
rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, aTsbHelp.GetState() == STATE_CHECK ) );
rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aEdtTitle.GetText() ) );
@@ -780,7 +780,7 @@ ScTPValidationError::ScTPValidationError( Window* pParent,
// -----------------------------------------------------------------------
-__EXPORT ScTPValidationError::~ScTPValidationError()
+ScTPValidationError::~ScTPValidationError()
{
}
@@ -799,14 +799,14 @@ void ScTPValidationError::Init()
//------------------------------------------------------------------------
-USHORT* __EXPORT ScTPValidationError::GetRanges()
+USHORT* ScTPValidationError::GetRanges()
{
return pValueRanges;
}
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent,
+SfxTabPage* ScTPValidationError::Create( Window* pParent,
const SfxItemSet& rArgSet )
{
return ( new ScTPValidationError( pParent, rArgSet ) );
@@ -814,7 +814,7 @@ SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent,
// -----------------------------------------------------------------------
-void __EXPORT ScTPValidationError::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
{
const SfxPoolItem* pItem;
@@ -843,7 +843,7 @@ void __EXPORT ScTPValidationError::Reset( const SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
-BOOL __EXPORT ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
+BOOL ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
{
rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, aTsbShow.GetState() == STATE_CHECK ) );
rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, aLbAction.GetSelectEntryPos() ) );
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 8cbde13..a6d68dc 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -96,13 +96,13 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
SetRefreshControl( pImpl->m_pDocSh->GetDocument()->GetRefreshTimerControlAddress() );
}
-__EXPORT ScAreaLink::~ScAreaLink()
+ScAreaLink::~ScAreaLink()
{
StopRefreshTimer();
delete pImpl;
}
-void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
+void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
{
// use own dialog instead of SvBaseLink::Edit...
// DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
@@ -118,7 +118,7 @@ void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
pDlg->StartExecuteModal( LINK( this, ScAreaLink, AreaEndEditHdl ) );
}
-void __EXPORT ScAreaLink::DataChanged( const String&,
+void ScAreaLink::DataChanged( const String&,
const ::com::sun::star::uno::Any& )
{
// bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im
@@ -154,7 +154,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&,
}
}
-void __EXPORT ScAreaLink::Closed()
+void ScAreaLink::Closed()
{
// Verknuepfung loeschen: Undo
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 2c602f5..c34b407 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -204,7 +204,7 @@ TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: kein Type-Info ?
//------------------------------------------------------------------
-void __EXPORT ScDocShell::FillClass( SvGlobalName* pClassName,
+void ScDocShell::FillClass( SvGlobalName* pClassName,
sal_uInt32* pFormat,
String* /* pAppName */,
String* pFullTypeName,
@@ -484,7 +484,7 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::R
return bRet;
}
-BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
+BOOL ScDocShell::Load( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" );
LoadMediumGuard aLoadGuard(&aDocument);
@@ -534,7 +534,7 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
return bRet;
}
-void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = aDocument.GetVbaEventProcessor();
if ( xVbaEvents.is() ) try
@@ -967,7 +967,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
// Inhalte fuer Organizer laden
-BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
+BOOL ScDocShell::LoadFrom( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" );
LoadMediumGuard aLoadGuard(&aDocument);
@@ -1022,7 +1022,7 @@ static void lcl_parseHtmlFilterOption(const OUString& rOption, LanguageType& rLa
rDateConvert = static_cast<bool>(aTokens[1].toInt32());
}
-BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
+BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" );
@@ -1557,7 +1557,7 @@ ScDocShell::PrepareSaveGuard::~PrepareSaveGuard()
}
-BOOL __EXPORT ScDocShell::Save()
+BOOL ScDocShell::Save()
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Save" );
@@ -1573,7 +1573,7 @@ BOOL __EXPORT ScDocShell::Save()
}
-BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
+BOOL ScDocShell::SaveAs( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::SaveAs" );
@@ -1603,7 +1603,7 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
}
-BOOL __EXPORT ScDocShell::IsInformationLost()
+BOOL ScDocShell::IsInformationLost()
{
/*
const SfxFilter *pFilt = GetMedium()->GetFilter();
@@ -2055,7 +2055,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
rStream.SetNumberFormatInt( nOldNumberFormatInt );
}
-BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
+BOOL ScDocShell::ConvertTo( SfxMedium &rMed )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertTo" );
@@ -2324,13 +2324,13 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
}
-BOOL __EXPORT ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
+BOOL ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
{
return SfxObjectShell::SaveCompleted( xStor );
}
-BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
+BOOL ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
{
BOOL bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
@@ -2379,7 +2379,7 @@ sal_Bool ScDocShell::QuerySlotExecutable( USHORT nSlotId )
}
-USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
+USHORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
{
if(SC_MOD()->GetCurRefDlgId()>0)
{
@@ -2585,7 +2585,7 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags )
//------------------------------------------------------------------
-__EXPORT ScDocShell::~ScDocShell()
+ScDocShell::~ScDocShell()
{
ResetDrawObjectShell(); // #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen
@@ -2622,7 +2622,7 @@ __EXPORT ScDocShell::~ScDocShell()
//------------------------------------------------------------------
-SfxUndoManager* __EXPORT ScDocShell::GetUndoManager()
+SfxUndoManager* ScDocShell::GetUndoManager()
{
return aDocument.GetUndoManager();
}
@@ -2749,7 +2749,7 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat )
}
-SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog(
+SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &rSet )
{
SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet );
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 03ed2e6..e415c0e 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -68,7 +68,7 @@ using namespace com::sun::star;
//------------------------------------------------------------------
-BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
+BOOL ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::InitNew" );
@@ -201,12 +201,12 @@ void ScDocShell::ResetDrawObjectShell()
//------------------------------------------------------------------
-void __EXPORT ScDocShell::Activate()
+void ScDocShell::Activate()
{
}
-void __EXPORT ScDocShell::Deactivate()
+void ScDocShell::Deactivate()
{
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 24c18bf..5f00089 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2252,7 +2252,7 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet )
pVisibleSh->GetState( rSet );
}
-void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, USHORT nAspect )
+void ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, USHORT nAspect )
{
SCTAB nVisTab = aDocument.GetVisibleTab();
@@ -2284,7 +2284,7 @@ void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup *
pDev->SetLayoutMode( nOldLayoutMode );
}
-Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
+Rectangle ScDocShell::GetVisArea( USHORT nAspect ) const
{
SfxObjectCreateMode eShellMode = GetCreateMode();
if ( eShellMode == SFX_CREATE_MODE_ORGANIZER )
@@ -2369,7 +2369,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
rbFooter = ((const SfxBoolItem&)pSet->Get(ATTR_PAGE_ON)).GetValue();
}
-long __EXPORT ScDocShell::DdeGetData( const String& rItem,
+long ScDocShell::DdeGetData( const String& rItem,
const String& rMimeType,
::com::sun::star::uno::Any & rValue )
{
@@ -2418,7 +2418,7 @@ long __EXPORT ScDocShell::DdeGetData( const String& rItem,
return 0;
}
-long __EXPORT ScDocShell::DdeSetData( const String& rItem,
+long ScDocShell::DdeSetData( const String& rItem,
const String& rMimeType,
const ::com::sun::star::uno::Any & rValue )
{
@@ -2457,7 +2457,7 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
return 0;
}
-::sfx2::SvLinkSource* __EXPORT ScDocShell::DdeCreateLinkSource( const String& rItem )
+::sfx2::SvLinkSource* ScDocShell::DdeCreateLinkSource( const String& rItem )
{
// only check for valid item string - range is parsed again in ScServerObject ctor
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index e40b2b2..6b25930 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -99,7 +99,7 @@ inline OUString C2U(const char* s)
// Ole
//
-void __EXPORT ScDocShell::SetVisArea( const Rectangle & rVisArea )
+void ScDocShell::SetVisArea( const Rectangle & rVisArea )
{
// with the SnapVisArea call in SetVisAreaOrSize, it's safe to always
// use both the size and position of the VisArea
@@ -254,7 +254,7 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
// Style-Krempel fuer Organizer etc.
//
-SfxStyleSheetBasePool* __EXPORT ScDocShell::GetStyleSheetPool()
+SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool()
{
return (SfxStyleSheetBasePool*)aDocument.GetStyleSheetPool();
}
@@ -292,7 +292,7 @@ void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool )
}
}
-void __EXPORT ScDocShell::LoadStyles( SfxObjectShell &rSource )
+void ScDocShell::LoadStyles( SfxObjectShell &rSource )
{
aDocument.StylesToNames();
@@ -375,7 +375,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
}
-BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource,
+BOOL ScDocShell::Insert( SfxObjectShell &rSource,
USHORT nSourceIdx1, USHORT nSourceIdx2, USHORT nSourceIdx3,
USHORT &nIdx1, USHORT &nIdx2, USHORT &nIdx3, USHORT &rIdxDeleted )
{
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 7aecfb6..8db7829 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -124,7 +124,7 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) :
StartListening(*SFX_APP()); // for SC_HINT_AREAS_CHANGED
}
-__EXPORT ScServerObject::~ScServerObject()
+ScServerObject::~ScServerObject()
{
Clear();
}
@@ -149,7 +149,7 @@ void ScServerObject::EndListeningAll()
SfxListener::EndListeningAll();
}
-BOOL __EXPORT ScServerObject::GetData(
+BOOL ScServerObject::GetData(
::com::sun::star::uno::Any & rData /*out param*/,
const String & rMimeType, BOOL /* bSynchron */ )
{
@@ -213,7 +213,7 @@ BOOL __EXPORT ScServerObject::GetData(
return 0;
}
-void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
BOOL bDataChanged = FALSE;
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index dcb4629..382e889 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -113,7 +113,7 @@ ScTableLink::ScTableLink(SfxObjectShell* pShell, const String& rFile,
SetRefreshControl( pImpl->m_pDocSh->GetDocument()->GetRefreshTimerControlAddress() );
}
-__EXPORT ScTableLink::~ScTableLink()
+ScTableLink::~ScTableLink()
{
// Verbindung aufheben
@@ -127,7 +127,7 @@ __EXPORT ScTableLink::~ScTableLink()
delete pImpl;
}
-void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
+void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
{
// DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
// ein Optionen-Dialog kommt...
@@ -141,7 +141,7 @@ void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
SvBaseLink::Edit( pParent, LINK( this, ScTableLink, TableEndEditHdl ) );
}
-void __EXPORT ScTableLink::DataChanged( const String&,
+void ScTableLink::DataChanged( const String&,
const ::com::sun::star::uno::Any& )
{
sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
@@ -160,7 +160,7 @@ void __EXPORT ScTableLink::DataChanged( const String&,
}
}
-void __EXPORT ScTableLink::Closed()
+void ScTableLink::Closed()
{
// Verknuepfung loeschen: Undo
ScDocument* pDoc = pImpl->m_pDocSh->GetDocument();
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 640c0a9..6d0cce0 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -45,7 +45,7 @@
// Dokumentinfo-Tabpage:
//========================================================================
-SfxTabPage* __EXPORT ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet )
+SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet )
{
return new ScDocStatPage( pParent, rSet );
}
@@ -80,20 +80,20 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
//------------------------------------------------------------------------
-__EXPORT ScDocStatPage::~ScDocStatPage()
+ScDocStatPage::~ScDocStatPage()
{
}
//------------------------------------------------------------------------
-BOOL __EXPORT ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ )
+BOOL ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ )
{
return FALSE;
}
//------------------------------------------------------------------------
-void __EXPORT ScDocStatPage::Reset( const SfxItemSet& /* rSet */ )
+void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ )
{
}
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index e4d02ed..24ccb21 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -139,7 +139,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DrawText")));
}
-__EXPORT ScDrawTextObjectBar::~ScDrawTextObjectBar()
+ScDrawTextObjectBar::~ScDrawTextObjectBar()
{
if ( pClipEvtLstnr )
{
@@ -159,7 +159,7 @@ __EXPORT ScDrawTextObjectBar::~ScDrawTextObjectBar()
//
//========================================================================
-void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
+void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
{
ScDrawView* pView = pViewData->GetScDrawView();
OutlinerView* pOutView = pView->GetTextEditOutlinerView();
@@ -373,7 +373,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
}
}
-void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
+void ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
{
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
BOOL bHasFontWork = pViewFrm->HasChildWindow(SID_FONTWORK);
@@ -501,7 +501,7 @@ IMPL_LINK( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pData
return 0;
}
-void __EXPORT ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
+void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
{
SdrView* pView = pViewData->GetScDrawView();
if ( !pView->GetTextEditOutlinerView() )
@@ -562,7 +562,7 @@ void __EXPORT ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
//
//========================================================================
-void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
+void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
{
// Unterstreichung
@@ -677,7 +677,7 @@ void lcl_RemoveFields( OutlinerView& rOutView )
rOutView.SetSelection( aOldSel );
}
-void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
+void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
{
SdrView* pView = pViewData->GetScDrawView();
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -876,7 +876,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
}
}
-void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
+void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
{
if ( IsNoteEdit() )
{
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 2934b4f..a700f93 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -70,7 +70,7 @@ BOOL ScDrawTextObjectBar::IsNoteEdit()
// wenn kein Text editiert wird, Funktionen wie in drawsh
-void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
+void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
{
ScTabView* pTabView = pViewData->GetView();
ScDrawView* pView = pTabView->GetScDrawView();
@@ -148,7 +148,7 @@ void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet )
}
}
-void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
+void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
{
ScTabView* pTabView = pViewData->GetView();
ScDrawView* pView = pTabView->GetScDrawView();
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 5cdbd55..cdf1752 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -66,7 +66,7 @@ FuConstArc::~FuConstArc()
|*
\************************************************************************/
-BOOL __EXPORT FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
+BOOL FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -89,7 +89,7 @@ BOOL __EXPORT FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
|*
\************************************************************************/
-BOOL __EXPORT FuConstArc::MouseMove( const MouseEvent& rMEvt )
+BOOL FuConstArc::MouseMove( const MouseEvent& rMEvt )
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -100,7 +100,7 @@ BOOL __EXPORT FuConstArc::MouseMove( const MouseEvent& rMEvt )
|*
\************************************************************************/
-BOOL __EXPORT FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
+BOOL FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -133,7 +133,7 @@ BOOL __EXPORT FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
|*
\************************************************************************/
-BOOL __EXPORT FuConstArc::KeyInput(const KeyEvent& rKEvt)
+BOOL FuConstArc::KeyInput(const KeyEvent& rKEvt)
{
BOOL bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 98d0f02..91c7fda 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -76,7 +76,7 @@ FuConstCustomShape::~FuConstCustomShape()
|*
\************************************************************************/
-BOOL __EXPORT FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
+BOOL FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -114,7 +114,7 @@ BOOL __EXPORT FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
+BOOL FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -125,7 +125,7 @@ BOOL __EXPORT FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
+BOOL FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -150,7 +150,7 @@ BOOL __EXPORT FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstCustomShape::KeyInput(const KeyEvent& rKEvt)
+BOOL FuConstCustomShape::KeyInput(const KeyEvent& rKEvt)
{
BOOL bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 321e347..283d594 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -74,7 +74,7 @@ FuConstPolygon::~FuConstPolygon()
|*
\************************************************************************/
-BOOL __EXPORT FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
+BOOL FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -106,7 +106,7 @@ BOOL __EXPORT FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
+BOOL FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
{
pView->MouseMove(rMEvt, pWindow);
BOOL bReturn = FuConstruct::MouseMove(rMEvt);
@@ -119,7 +119,7 @@ BOOL __EXPORT FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
+BOOL FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -156,7 +156,7 @@ BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
+BOOL FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
{
BOOL bReturn = FuConstruct::KeyInput(rKEvt);
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index e736c2f..36348ed 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -74,7 +74,7 @@ FuConstRectangle::~FuConstRectangle()
|*
\************************************************************************/
-BOOL __EXPORT FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
+BOOL FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -107,7 +107,7 @@ BOOL __EXPORT FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
+BOOL FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
@@ -118,7 +118,7 @@ BOOL __EXPORT FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
+BOOL FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -161,7 +161,7 @@ BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstRectangle::KeyInput(const KeyEvent& rKEvt)
+BOOL FuConstRectangle::KeyInput(const KeyEvent& rKEvt)
{
BOOL bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index f640711..144dc4b 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -83,7 +83,7 @@ BYTE FuConstruct::Command(const CommandEvent& rCEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
+BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -130,7 +130,7 @@ BOOL __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstruct::MouseMove(const MouseEvent& rMEvt)
+BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt)
{
FuDraw::MouseMove(rMEvt);
@@ -177,7 +177,7 @@ BOOL __EXPORT FuConstruct::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
+BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -275,7 +275,7 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt)
+BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt)
{
BOOL bReturn = FALSE;
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 75aaa6a..a80ec0c 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -68,7 +68,7 @@ FuConstUnoControl::~FuConstUnoControl()
|*
\************************************************************************/
-BOOL __EXPORT FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
+BOOL FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
@@ -91,7 +91,7 @@ BOOL __EXPORT FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list