summaryrefslogtreecommitdiff
path: root/sc/source/core
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-12-11 23:25:30 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-12-11 23:25:30 +0100
commitb9a388b78d737e3810ca45f2f8011d2d91f81d92 (patch)
tree6dc3f312205940c81e00f058bb3fd3233d76ba33 /sc/source/core
parenta4106c6cb8995a0471df59de5706447f59f6796e (diff)
cleaning of __EXPORT define
Diffstat (limited to 'sc/source/core')
-rw-r--r--sc/source/core/data/cell.cxx2
-rw-r--r--sc/source/core/data/docpool.cxx12
-rw-r--r--sc/source/core/data/drawpage.cxx2
-rw-r--r--sc/source/core/data/drwlayer.cxx22
-rw-r--r--sc/source/core/data/global2.cxx26
-rw-r--r--sc/source/core/data/patattr.cxx10
-rw-r--r--sc/source/core/data/stlpool.cxx8
-rw-r--r--sc/source/core/data/stlsheet.cxx14
-rw-r--r--sc/source/core/tool/chgtrack.cxx2
-rw-r--r--sc/source/core/tool/ddelink.cxx6
-rw-r--r--sc/source/core/tool/docoptio.cxx8
-rw-r--r--sc/source/core/tool/editutil.cxx6
-rw-r--r--sc/source/core/tool/userlist.cxx2
-rw-r--r--sc/source/core/tool/viewopti.cxx10
14 files changed, 65 insertions, 65 deletions
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 49676e29525d..cc63d4669182 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 5f72e0ba466b..7966cb8d3809 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 541318df0c8c..4f881eff0794 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 0217b92b2111..1f98f3e9689a 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) // s
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 c9aaff566b15..4f6935571181 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 eef90c7df8df..de590cd41d1c 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 c391f09b1380..a2a15e7a90fb 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 c77fc710b325..c97708adcfa6 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 f793196018c3..633bf8ea0b88 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 00b97d430f0c..72add25aff78 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 7f3cc4afe8f5..f85ead331872 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 55399fd4ecc2..f4193b7da003 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 deb070005653..edbaf7aba3c0 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 68feb2cca82b..3372e1f55768 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 );
}