diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-11 23:25:30 +0100 |
|---|---|---|
| committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-11 23:25:30 +0100 |
| commit | b860fc68e241a76f3b0f2f0b0c30ce3fbd37b8a5 (patch) | |
| tree | c6054f3814eb095b5d9fcc13282bfe3597c6c4bf /sc | |
| parent | 79ef07ec3c2d93f6f5f9fab057518647c4ce73a7 (diff) | |
cleaning of __EXPORT define
Diffstat (limited to 'sc')
131 files changed, 886 insertions, 886 deletions
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index d437593fe..d0974981c 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 85c719308..3a064139c 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 a0c2c4bdf..d489d5d3b 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 c7de022a5..cbb2f0405 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 159835f14..fd8eab07c 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 755a55cd1..f0ece851b 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 b6f609389..3ae27d925 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 72e7cee32..2b9804959 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 63a128448..8ba28073b 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 56ac77fa2..118a6dda2 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 b070f3f39..b3d332353 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 e4cfa0417..bea58871e 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 aad2f730a..7d7f0388d 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 091e00324..70711bae8 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 68cefe782..cd590b5f7 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 d80108ca7..e1426a681 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 70bb16bba..04d92619f 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 9068594c2..409fc4338 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 afec56dd0..04c34aa67 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 2d3472263..b0f93aece 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 b7716e75f..08904ba47 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 c9da6a740..9ea7f7f7b 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 ecc536c0b..8e0854284 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 d6e072901..39b0246d8 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 e473fa3ae..1e62f865f 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 810d4f67b..0bf89871a 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 f008e6ad9..c6272a7e1 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 602241485..fd2d53dae 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 48222c4d9..f8abca9e4 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 2aa998705..f443b4e5b 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 d33a67431..018083074 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 5108b69b2..6b4507baa 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 ab0172a81..e634089bb 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 113274a25..28e2340eb 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 67d874a0a..d18730167 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 2d8c43b88..d6d2c58c1 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 8876d037f..a5138a5ad 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 6d5f6dc5c..89576316e 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 cceac3df7..c91974105 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 23849bf74..b42987cc3 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 8cbde1374..a6d68dc1b 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 2c602f57f..c34b4075d 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 03ed2e6c8..e415c0e2c 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 24c18bfed..5f00089c6 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 e40b2b2d3..6b25930fd 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 7aecfb6d0..8db782969 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 dcb46290b..382e88914 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 640c0a9b6..6d0cce02b 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 e4d02ed69..24ccb21f8 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 2934b4f77..a700f9391 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 5cdbd551b..cdf175203 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 98d0f0266..91c7fda0f 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 321e34770..283d594c1 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 e736c2fe0..36348ed5f 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 f640711df..144dc4bf3 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 75aaa6a3a..a80ec0c4f 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) |* \************************************************************************/ -BOOL __EXPORT FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) +BOOL FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -102,7 +102,7 @@ BOOL __EXPORT FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) +BOOL FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -127,7 +127,7 @@ BOOL __EXPORT FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuConstUnoControl::KeyInput(const KeyEvent& rKEvt) +BOOL FuConstUnoControl::KeyInput(const KeyEvent& rKEvt) { BOOL bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index e07b1a9dd..1ae036bc2 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -159,7 +159,7 @@ void FuDraw::ResetModifiers() |* \************************************************************************/ -BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt) +BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -174,7 +174,7 @@ BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt) +BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) { // #106438# evaluate modifiers only if in a drawing layer action // (don't interfere with keyboard shortcut handling) @@ -190,7 +190,7 @@ BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuDraw::MouseButtonUp(const MouseEvent& rMEvt) +BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -241,7 +241,7 @@ BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEven return bReturn; } -BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) +BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { BOOL bReturn = FALSE; ScViewData& rViewData = *pViewShell->GetViewData(); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 26dc67b1b..544ad366e 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -87,7 +87,7 @@ // ////------------------------------------------------------------------------ // -//__EXPORT ImportProgress::~ImportProgress() +//ImportProgress::~ImportProgress() //{ // aProgress.SetState( 100 ); //} diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index aaddde201..d467a6a8c 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -108,7 +108,7 @@ BYTE FuSelection::Command(const CommandEvent& rCEvt) |* \************************************************************************/ -BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -343,7 +343,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt) +BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) { BOOL bReturn = FuDraw::MouseMove(rMEvt); @@ -390,7 +390,7 @@ BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) +BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 72f2f011e..e73c428b4 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -132,7 +132,7 @@ FuText::~FuText() |* \************************************************************************/ -BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) +BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -343,7 +343,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt) +BOOL FuText::MouseMove(const MouseEvent& rMEvt) { BOOL bReturn = FALSE; @@ -387,7 +387,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt) +BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -580,7 +580,7 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */) |* \************************************************************************/ -BOOL __EXPORT FuText::KeyInput(const KeyEvent& rKEvt) +BOOL FuText::KeyInput(const KeyEvent& rKEvt) { BOOL bReturn = FALSE; diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 2e0f67e37..f003caac7 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -75,7 +75,7 @@ SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX ) #* #************************************************************************/ -__EXPORT ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, +ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -183,7 +183,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, #* #************************************************************************/ -__EXPORT ScFunctionDockWin::~ScFunctionDockWin() +ScFunctionDockWin::~ScFunctionDockWin() { EndListening( GetBindings() ); } @@ -643,7 +643,7 @@ void ScFunctionDockWin::SetDescription() #* #************************************************************************/ -void __EXPORT ScFunctionDockWin::Resizing( Size& rNewSize ) +void ScFunctionDockWin::Resizing( Size& rNewSize ) { if((ULONG)rNewSize.Width()<nMinWidth) rNewSize.Width()=nMinWidth; if((ULONG)rNewSize.Height()<nMinHeight) rNewSize.Height()=nMinHeight; @@ -664,7 +664,7 @@ void __EXPORT ScFunctionDockWin::Resizing( Size& rNewSize ) #* #************************************************************************/ -BOOL __EXPORT ScFunctionDockWin::Close() +BOOL ScFunctionDockWin::Close() { SfxBoolItem aItem( FID_FUNCTION_BOX, FALSE ); @@ -692,7 +692,7 @@ BOOL __EXPORT ScFunctionDockWin::Close() #* Output: Das uebergebene Alignment #* #************************************************************************/ -SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */, +SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */, SfxChildAlignment aChildAlign) { String aString = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww")); @@ -787,7 +787,7 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ ) #* #************************************************************************/ -void __EXPORT ScFunctionDockWin::Resize() +void ScFunctionDockWin::Resize() { if ( !IsFloatingMode() || !GetFloatingWindow()->IsRollUp() ) diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index a2dbe6ef8..7a5ec0be6 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -265,7 +265,7 @@ void ScFormulaDlg::fill() } } -__EXPORT ScFormulaDlg::~ScFormulaDlg() +ScFormulaDlg::~ScFormulaDlg() { ScModule* pScMod = SC_MOD(); ScFormEditData* pData = pScMod->GetFormEditData(); @@ -320,7 +320,7 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell,PtrTabVi } -BOOL __EXPORT ScFormulaDlg::Close() +BOOL ScFormulaDlg::Close() { DoEnter(FALSE); return TRUE; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 011f6566b..b06afe0b4 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -244,7 +244,7 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) } } -void __EXPORT ScAcceptChgDlg::Init() +void ScAcceptChgDlg::Init() { String aAreaStr; ScRange aRange; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index a37eea235..e5d05b93f 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -817,14 +817,14 @@ BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 //---------------------------------------------------------------------------- -BOOL __EXPORT ScRefHandler::IsRefInputMode() const +BOOL ScRefHandler::IsRefInputMode() const { return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen } //---------------------------------------------------------------------------- -BOOL __EXPORT ScRefHandler::DoClose( USHORT nId ) +BOOL ScRefHandler::DoClose( USHORT nId ) { m_aHelper.DoClose(nId); return TRUE; @@ -851,7 +851,7 @@ void ScRefHandler::AddRefEntry() //---------------------------------------------------------------------------- -BOOL __EXPORT ScRefHandler::IsTableLocked() const +BOOL ScRefHandler::IsTableLocked() const { // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index f9413dda2..ee6e3fcd4 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -71,7 +71,7 @@ ScColOrRowDlg::ScColOrRowDlg( Window* pParent, //------------------------------------------------------------------------ -__EXPORT ScColOrRowDlg::~ScColOrRowDlg() +ScColOrRowDlg::~ScColOrRowDlg() { } diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index ccb84b0a4..1d84b6d27 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -132,7 +132,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, #* #************************************************************************/ -__EXPORT ScColRowNameRangesDlg::~ScColRowNameRangesDlg() +ScColRowNameRangesDlg::~ScColRowNameRangesDlg() { } @@ -444,7 +444,7 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD #* #************************************************************************/ -BOOL __EXPORT ScColRowNameRangesDlg::Close() +BOOL ScColRowNameRangesDlg::Close() { return DoClose( ScColRowNameRangesDlgWrapper::GetChildWindowId() ); } diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 6ece4b648..2809d4f43 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -113,7 +113,7 @@ DelCellCmd ScDeleteCellDlg::GetDelCellCmd() const return nReturn; } -__EXPORT ScDeleteCellDlg::~ScDeleteCellDlg() +ScDeleteCellDlg::~ScDeleteCellDlg() { } diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index c98721eb4..a25a9b99d 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -173,7 +173,7 @@ IMPL_LINK_INLINE_START( ScDeleteContentsDlg, DelAllHdl, void *, EMPTYARG ) } IMPL_LINK_INLINE_END( ScDeleteContentsDlg, DelAllHdl, void *, EMPTYARG ) -__EXPORT ScDeleteContentsDlg::~ScDeleteContentsDlg() +ScDeleteContentsDlg::~ScDeleteContentsDlg() { } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index aa70e7cfb..4bbe7e09e 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -110,7 +110,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, //---------------------------------------------------------------------------- -__EXPORT ScFillSeriesDlg::~ScFillSeriesDlg() +ScFillSeriesDlg::~ScFillSeriesDlg() { } @@ -231,7 +231,7 @@ void ScFillSeriesDlg::Init( USHORT nPossDir ) //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckStartVal() +BOOL ScFillSeriesDlg::CheckStartVal() { BOOL bValOk = FALSE; sal_uInt32 nKey = 0; @@ -251,7 +251,7 @@ BOOL __EXPORT ScFillSeriesDlg::CheckStartVal() //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() +BOOL ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; String aStr( aEdIncrement.GetText() ); @@ -262,7 +262,7 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckEndVal() +BOOL ScFillSeriesDlg::CheckEndVal() { BOOL bValOk = FALSE; sal_uInt32 nKey = 0; diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 63bf0053b..e4123da5e 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -76,7 +76,7 @@ BOOL ScGroupDlg::GetColsChecked() const //------------------------------------------------------------------------ -__EXPORT ScGroupDlg::~ScGroupDlg() +ScGroupDlg::~ScGroupDlg() { } diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 7f0ac1e4d..8ea1218a6 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -115,7 +115,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg() SetDispatcherLock( FALSE ); } -void __EXPORT ScHighlightChgDlg::Init() +void ScHighlightChgDlg::Init() { String aAreaStr; ScRange aRange; @@ -192,7 +192,7 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } //---------------------------------------------------------------------------- -BOOL __EXPORT ScHighlightChgDlg::Close() +BOOL ScHighlightChgDlg::Close() { return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() ); } diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 99d92f08a..21e9fc322 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -113,7 +113,7 @@ InsCellCmd ScInsertCellDlg::GetInsCellCmd() const return nReturn; } -__EXPORT ScInsertCellDlg::~ScInsertCellDlg() +ScInsertCellDlg::~ScInsertCellDlg() { } diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index b96ccb134..59914db85 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -333,7 +333,7 @@ IMPL_LINK( ScInsertContentsDlg, LinkBtnHdl, void*, EMPTYARG ) return 0; } -__EXPORT ScInsertContentsDlg::~ScInsertContentsDlg() +ScInsertContentsDlg::~ScInsertContentsDlg() { ScInsertContentsDlg::nPreviousChecks2 = 0; if(aBtnSkipEmptyCells.IsChecked()) diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 5ee5e824e..de2567706 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -105,7 +105,7 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT //------------------------------------------------------------------------ -__EXPORT ScInsertTableDlg::~ScInsertTableDlg() +ScInsertTableDlg::~ScInsertTableDlg() { if (pDocShTables) pDocShTables->DoClose(); @@ -170,7 +170,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) #define ModalDialog Dialog #endif /* ENABLE_LAYOUT */ -short __EXPORT ScInsertTableDlg::Execute() +short ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager Window* pOldDefParent = Application::GetDefDialogParent(); diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index f2a9a73c7..5f55d1765 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -94,7 +94,7 @@ IMPL_LINK_INLINE_END( ScSelEntryDlg, DblClkHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -__EXPORT ScSelEntryDlg::~ScSelEntryDlg() +ScSelEntryDlg::~ScSelEntryDlg() { } diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 510f5785f..02ddf6829 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -87,7 +87,7 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, //------------------------------------------------------------------------ -__EXPORT ScMetricInputDlg::~ScMetricInputDlg() +ScMetricInputDlg::~ScMetricInputDlg() { } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index a000b1dfd..8664da50b 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -83,7 +83,7 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent ) //------------------------------------------------------------------------ -__EXPORT ScMoveTableDlg::~ScMoveTableDlg() +ScMoveTableDlg::~ScMoveTableDlg() { } @@ -110,7 +110,7 @@ void ScMoveTableDlg::EnableCopyTable(BOOL bFlag) //------------------------------------------------------------------------ -void __EXPORT ScMoveTableDlg::Init() +void ScMoveTableDlg::Init() { aBtnOk.SetClickHdl ( LINK( this, ScMoveTableDlg, OkHdl ) ); aLbDoc.SetSelectHdl ( LINK( this, ScMoveTableDlg, SelHdl ) ); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 25e97a456..82e986338 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -112,7 +112,7 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, //------------------------------------------------------------------------ -__EXPORT ScAutoFormatDlg::~ScAutoFormatDlg() +ScAutoFormatDlg::~ScAutoFormatDlg() { delete pWndPreview; } @@ -467,7 +467,7 @@ IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -String __EXPORT ScAutoFormatDlg::GetCurrFormatName() +String ScAutoFormatDlg::GetCurrFormatName() { String aResult; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 230920bf7..c4478b912 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -104,7 +104,7 @@ IMPL_LINK_INLINE_START( ScShowTabDlg, DblClkHdl, void *, EMPTYARG ) } IMPL_LINK_INLINE_END( ScShowTabDlg, DblClkHdl, void *, EMPTYARG ) -__EXPORT ScShowTabDlg::~ScShowTabDlg() +ScShowTabDlg::~ScShowTabDlg() { } diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 2a8186f05..344becb4f 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -94,7 +94,7 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP } //---------------------------------------------------------------------------- -__EXPORT ScSimpleRefDlg::~ScSimpleRefDlg() +ScSimpleRefDlg::~ScSimpleRefDlg() { SetDispatcherLock( FALSE ); // Modal-Modus einschalten } @@ -160,7 +160,7 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) //---------------------------------------------------------------------------- -BOOL __EXPORT ScSimpleRefDlg::Close() +BOOL ScSimpleRefDlg::Close() { CancelBtnHdl(&aBtnCancel); return TRUE; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index e718ba7be..99558858d 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -93,13 +93,13 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, //---------------------------------------------------------------------------- -__EXPORT ScSolverDlg::~ScSolverDlg() +ScSolverDlg::~ScSolverDlg() { } //---------------------------------------------------------------------------- -void __EXPORT ScSolverDlg::Init() +void ScSolverDlg::Init() { String aStr; @@ -128,7 +128,7 @@ void __EXPORT ScSolverDlg::Init() //---------------------------------------------------------------------------- -BOOL __EXPORT ScSolverDlg::Close() +BOOL ScSolverDlg::Close() { return DoClose( ScSolverDlgWrapper::GetChildWindowId() ); } @@ -212,7 +212,7 @@ BOOL ScSolverDlg::IsRefInputMode() const //---------------------------------------------------------------------------- -BOOL __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal ) +BOOL ScSolverDlg::CheckTargetValue( String& rStrVal ) { sal_uInt32 n1 = 0; double n2; diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index c35b4e9d6..062164bb5 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -100,7 +100,7 @@ void ScStringInputDlg::GetInputString( String& rString ) const rString = aEdInput.GetText(); } -__EXPORT ScStringInputDlg::~ScStringInputDlg() +ScStringInputDlg::~ScStringInputDlg() { } diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 7fe01494a..d5e2d2ed1 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -91,14 +91,14 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, //---------------------------------------------------------------------------- -__EXPORT ScTabOpDlg::~ScTabOpDlg() +ScTabOpDlg::~ScTabOpDlg() { Hide(); } //---------------------------------------------------------------------------- -void __EXPORT ScTabOpDlg::Init() +void ScTabOpDlg::Init() { aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); @@ -128,7 +128,7 @@ void __EXPORT ScTabOpDlg::Init() //---------------------------------------------------------------------------- -BOOL __EXPORT ScTabOpDlg::Close() +BOOL ScTabOpDlg::Close() { return DoClose( ScTabOpDlgWrapper::GetChildWindowId() ); } diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index a6747798e..3db7f23d4 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -66,7 +66,7 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, // ----------------------------------------------------------------------- -void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch( nId ) @@ -112,7 +112,7 @@ ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) : // ----------------------------------------------------------------------- -void __EXPORT ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { switch( nId ) { diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 6130f1ccc..d31fbc144 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -160,7 +160,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, //---------------------------------------------------------------------------- -__EXPORT ScNameDlg::~ScNameDlg() +ScNameDlg::~ScNameDlg() { DELETEZ( pSaveObj ); } @@ -168,7 +168,7 @@ __EXPORT ScNameDlg::~ScNameDlg() //---------------------------------------------------------------------------- -void __EXPORT ScNameDlg::Init() +void ScNameDlg::Init() { String aAreaStr; ScRange aRange; @@ -252,7 +252,7 @@ void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) //---------------------------------------------------------------------------- -BOOL __EXPORT ScNameDlg::Close() +BOOL ScNameDlg::Close() { return DoClose( ScNameDlgWrapper::GetChildWindowId() ); } @@ -269,7 +269,7 @@ void ScNameDlg::SetActive() //---------------------------------------------------------------------------- -void __EXPORT ScNameDlg::UpdateChecks() +void ScNameDlg::UpdateChecks() { USHORT nCurPos=0; @@ -314,7 +314,7 @@ void __EXPORT ScNameDlg::UpdateChecks() //---------------------------------------------------------------------------- -void __EXPORT ScNameDlg::UpdateNames() +void ScNameDlg::UpdateNames() { USHORT nRangeCount = aLocalRangeName.GetCount(); @@ -359,7 +359,7 @@ void __EXPORT ScNameDlg::UpdateNames() //---------------------------------------------------------------------------- -void __EXPORT ScNameDlg::CalcCurTableAssign( String& aAssign, USHORT nCurPos ) +void ScNameDlg::CalcCurTableAssign( String& aAssign, USHORT nCurPos ) { ScRangeData* pRangeData = (ScRangeData*)(aLocalRangeName.At( nCurPos )); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index d77a50cb5..8f6581ac6 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -407,12 +407,12 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) SvTreeListBox::KeyInput(rKEvt); } -//BOOL __EXPORT ScContentTree::Drop( const DropEvent& rEvt ) +//BOOL ScContentTree::Drop( const DropEvent& rEvt ) //{ // return pParentWindow->Drop(rEvt); // Drop auf Navigator //} -//BOOL __EXPORT ScContentTree::QueryDrop( DropEvent& rEvt ) +//BOOL ScContentTree::QueryDrop( DropEvent& rEvt ) //{ // return pParentWindow->QueryDrop(rEvt); // Drop auf Navigator //} @@ -436,7 +436,7 @@ void ScContentTree::DragFinished( sal_Int8 /* nAction */ ) { } -void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) +void ScContentTree::Command( const CommandEvent& rCEvt ) { BOOL bDone = FALSE; @@ -531,7 +531,7 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt ) SvTreeListBox::Command(rCEvt); } -void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt ) +void ScContentTree::RequestHelp( const HelpEvent& rHEvt ) { BOOL bDone = FALSE; if( rHEvt.GetMode() & HELPMODE_QUICK ) diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index d531e6baf..9bf563ab5 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -56,7 +56,7 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( USHORT nIdP, //------------------------------------------------------------------------ -void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxItemState /* eState */, +void ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxItemState /* eState */, const SfxPoolItem* pItem ) { switch( GetId() ) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 65cda3395..cbb1f00a8 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -105,13 +105,13 @@ ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) //------------------------------------------------------------------------ -__EXPORT ColumnEdit::~ColumnEdit() +ColumnEdit::~ColumnEdit() { } //------------------------------------------------------------------------ -long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt ) +long ColumnEdit::Notify( NotifyEvent& rNEvt ) { long nHandled = SpinField::Notify( rNEvt ); @@ -143,7 +143,7 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt ) //------------------------------------------------------------------------ -void __EXPORT ColumnEdit::LoseFocus() +void ColumnEdit::LoseFocus() { EvalText(); } @@ -151,7 +151,7 @@ void __EXPORT ColumnEdit::LoseFocus() //------------------------------------------------------------------------ -void __EXPORT ColumnEdit::Up() +void ColumnEdit::Up() { nCol++; @@ -168,7 +168,7 @@ void __EXPORT ColumnEdit::Up() //------------------------------------------------------------------------ -void __EXPORT ColumnEdit::Down() +void ColumnEdit::Down() { if ( nCol>1 ) SetCol( nCol-1 ); @@ -180,7 +180,7 @@ void __EXPORT ColumnEdit::Down() //------------------------------------------------------------------------ -void __EXPORT ColumnEdit::First() +void ColumnEdit::First() { nCol = 1; SetText( 'A' ); @@ -188,7 +188,7 @@ void __EXPORT ColumnEdit::First() //------------------------------------------------------------------------ -void __EXPORT ColumnEdit::Last() +void ColumnEdit::Last() { String aStr; nCol = NumToAlpha( SCNAV_MAXCOL, aStr ); @@ -316,13 +316,13 @@ RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) //------------------------------------------------------------------------ -__EXPORT RowEdit::~RowEdit() +RowEdit::~RowEdit() { } //------------------------------------------------------------------------ -long __EXPORT RowEdit::Notify( NotifyEvent& rNEvt ) +long RowEdit::Notify( NotifyEvent& rNEvt ) { long nHandled = NumericField::Notify( rNEvt ); @@ -343,7 +343,7 @@ long __EXPORT RowEdit::Notify( NotifyEvent& rNEvt ) //------------------------------------------------------------------------ -void __EXPORT RowEdit::LoseFocus() +void RowEdit::LoseFocus() { } @@ -370,13 +370,13 @@ ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) //------------------------------------------------------------------------ -__EXPORT ScDocListBox::~ScDocListBox() +ScDocListBox::~ScDocListBox() { } //------------------------------------------------------------------------ -void __EXPORT ScDocListBox::Select() +void ScDocListBox::Select() { ScNavigatorDlg::ReleaseFocus(); @@ -401,7 +401,7 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) //------------------------------------------------------------------------ -__EXPORT CommandToolBox::~CommandToolBox() +CommandToolBox::~CommandToolBox() { } @@ -452,14 +452,14 @@ void CommandToolBox::Select( USHORT nSelId ) } } -void __EXPORT CommandToolBox::Select() +void CommandToolBox::Select() { Select( GetCurItemId() ); } //------------------------------------------------------------------------ -void __EXPORT CommandToolBox::Click() +void CommandToolBox::Click() { } @@ -635,7 +635,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( //!? pNavigator->Show(); } -void __EXPORT ScNavigatorDialogWrapper::Resizing( Size& rSize ) +void ScNavigatorDialogWrapper::Resizing( Size& rSize ) { ((ScNavigatorDlg*)GetWindow())->Resizing(rSize); } @@ -763,7 +763,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win //------------------------------------------------------------------------ -__EXPORT ScNavigatorDlg::~ScNavigatorDlg() +ScNavigatorDlg::~ScNavigatorDlg() { aContentTimer.Stop(); @@ -780,7 +780,7 @@ __EXPORT ScNavigatorDlg::~ScNavigatorDlg() //------------------------------------------------------------------------ -void __EXPORT ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? +void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? { FloatingWindow* pFloat = pContextWin->GetFloatingWindow(); if ( pFloat ) @@ -830,7 +830,7 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) //------------------------------------------------------------------------ -void __EXPORT ScNavigatorDlg::Resize() +void ScNavigatorDlg::Resize() { DoResize(); } @@ -896,7 +896,7 @@ void ScNavigatorDlg::DoResize() //------------------------------------------------------------------------ -void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA(SfxSimpleHint) ) { @@ -1463,7 +1463,7 @@ void ScNavigatorDlg::EndOfDataArea() //------------------------------------------------------------------------ -SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment( +SfxChildAlignment ScNavigatorDlg::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { SfxChildAlignment eRetAlign; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 82f2770c3..3199c4771 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -81,16 +81,16 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, aRemoveColorLB.SetSelectHdl( aLk ); } -__EXPORT ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() +ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() { } -SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new ScRedlineOptionsTabPage( pParent, rSet ); } -BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) +BOOL ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) { ScAppOptions aAppOptions=SC_MOD()->GetAppOptions(); @@ -157,7 +157,7 @@ BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) return FALSE; } -void __EXPORT ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) +void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) { XColorTable* pColorTbl = XColorTable::GetStdColorTable(); diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 0a3d6bab2..8399b1862 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -106,7 +106,7 @@ ScTpCalcOptions::ScTpCalcOptions( Window* pParent, //----------------------------------------------------------------------- -__EXPORT ScTpCalcOptions::~ScTpCalcOptions() +ScTpCalcOptions::~ScTpCalcOptions() { delete pOldOptions; delete pLocalOptions; @@ -125,21 +125,21 @@ void ScTpCalcOptions::Init() //----------------------------------------------------------------------- -USHORT* __EXPORT ScTpCalcOptions::GetRanges() +USHORT* ScTpCalcOptions::GetRanges() { return pCalcOptRanges; } //----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpCalcOptions( pParent, rAttrSet ) ); } //----------------------------------------------------------------------- -void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) +void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) { USHORT d,m,y; @@ -190,7 +190,7 @@ void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) //----------------------------------------------------------------------- -BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +BOOL ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert pLocalOptions->SetIterCount( (USHORT)aEdSteps.GetValue() ); @@ -217,7 +217,7 @@ BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) //------------------------------------------------------------------------ -int __EXPORT ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) +int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) { int nReturn = KEEP_PAGE; diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 2f3253bfa..558e43a39 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -115,7 +115,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent, // ----------------------------------------------------------------------- -__EXPORT ScTpUserLists::~ScTpUserLists() +ScTpUserLists::~ScTpUserLists() { delete pUserLists; delete pRangeUtil; @@ -173,21 +173,21 @@ void ScTpUserLists::Init() // ----------------------------------------------------------------------- -USHORT* __EXPORT ScTpUserLists::GetRanges() +USHORT* ScTpUserLists::GetRanges() { return pUserListsRanges; } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpUserLists( pParent, rAttrSet ) ); } // ----------------------------------------------------------------------- -void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) +void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) { const ScUserListItem& rUserListItem = (const ScUserListItem&) rCoreAttrs.Get( nWhichUserLists ); @@ -238,7 +238,7 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) // ----------------------------------------------------------------------- -BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) +BOOL ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { // Modifikationen noch nicht uebernommen? // -> Click auf Add-Button simulieren @@ -279,7 +279,7 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) // ----------------------------------------------------------------------- -int __EXPORT ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) +int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) FillItemSet( *pSetP ); diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index d2409e34c..c1a386435 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -168,13 +168,13 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, // ----------------------------------------------------------------------- -__EXPORT ScHFEditDlg::~ScHFEditDlg() +ScHFEditDlg::~ScHFEditDlg() { } // ----------------------------------------------------------------------- -void __EXPORT ScHFEditDlg::PageCreated( USHORT /* nId */, SfxTabPage& rPage ) +void ScHFEditDlg::PageCreated( USHORT /* nId */, SfxTabPage& rPage ) { // kann ja nur ne ScHFEditPage sein... diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index eb793570b..0c2ddead4 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -172,7 +172,7 @@ ScHFEditPage::ScHFEditPage( Window* pParent, // ----------------------------------------------------------------------- -__EXPORT ScHFEditPage::~ScHFEditPage() +ScHFEditPage::~ScHFEditPage() { } @@ -187,7 +187,7 @@ void ScHFEditPage::SetNumType(SvxNumType eNumType) #define IS_AVAILABLE(w)(rCoreSet.GetItemState( (w) ) >= SFX_ITEM_AVAILABLE) -void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) +void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) { if ( IS_AVAILABLE( nWhich ) ) { @@ -208,7 +208,7 @@ void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) // ----------------------------------------------------------------------- -BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) +BOOL ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) { ScPageHFItem aItem( nWhich ); EditTextObject* pLeft = aWndLeft .CreateTextObject(); @@ -925,12 +925,12 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& // ----------------------------------------------------------------------- -USHORT* __EXPORT ScRightHeaderEditPage::GetRanges() +USHORT* ScRightHeaderEditPage::GetRanges() { return pPageRightHeaderRanges; } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; @@ -945,12 +945,12 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r // ----------------------------------------------------------------------- -USHORT* __EXPORT ScLeftHeaderEditPage::GetRanges() +USHORT* ScLeftHeaderEditPage::GetRanges() { return pPageLeftHeaderRanges; } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; //======================================================================== @@ -964,12 +964,12 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& // ----------------------------------------------------------------------- -USHORT* __EXPORT ScRightFooterEditPage::GetRanges() +USHORT* ScRightFooterEditPage::GetRanges() { return pPageRightFooterRanges; } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; //======================================================================== @@ -983,12 +983,12 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r // ----------------------------------------------------------------------- -USHORT* __EXPORT ScLeftFooterEditPage::GetRanges() +USHORT* ScLeftFooterEditPage::GetRanges() { return pPageLeftFooterRanges; } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index f673a7a3a..42fe96ffb 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -105,13 +105,13 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, //------------------------------------------------------------------ -__EXPORT ScHFPage::~ScHFPage() +ScHFPage::~ScHFPage() { } //------------------------------------------------------------------ -void __EXPORT ScHFPage::Reset( const SfxItemSet& rSet ) +void ScHFPage::Reset( const SfxItemSet& rSet ) { SvxHFPage::Reset( rSet ); TurnOnHdl( 0 ); @@ -119,7 +119,7 @@ void __EXPORT ScHFPage::Reset( const SfxItemSet& rSet ) //------------------------------------------------------------------ -BOOL __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet ) +BOOL ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { BOOL bResult = SvxHFPage::FillItemSet( rOutSet ); @@ -139,7 +139,7 @@ BOOL __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet ) //------------------------------------------------------------------ -void __EXPORT ScHFPage::ActivatePage( const SfxItemSet& rSet ) +void ScHFPage::ActivatePage( const SfxItemSet& rSet ) { USHORT nPageWhich = GetWhich( SID_ATTR_PAGE ); const SvxPageItem& rPageItem = (const SvxPageItem&) @@ -157,7 +157,7 @@ void __EXPORT ScHFPage::ActivatePage( const SfxItemSet& rSet ) //------------------------------------------------------------------ -int __EXPORT ScHFPage::DeactivatePage( SfxItemSet* pSetP ) +int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) if ( pSetP ) @@ -291,14 +291,14 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) //------------------------------------------------------------------ -SfxTabPage* __EXPORT ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScHeaderPage( pParent, rCoreSet ) ); } //------------------------------------------------------------------ -USHORT* __EXPORT ScHeaderPage::GetRanges() +USHORT* ScHeaderPage::GetRanges() { return SvxHeaderPage::GetRanges(); } @@ -314,14 +314,14 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) //------------------------------------------------------------------ -SfxTabPage* __EXPORT ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScFooterPage( pParent, rCoreSet ) ); } //------------------------------------------------------------------ -USHORT* __EXPORT ScFooterPage::GetRanges() +USHORT* ScFooterPage::GetRanges() { return SvxHeaderPage::GetRanges(); } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 8dbbd4ce6..390edc130 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -130,7 +130,7 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo // ----------------------------------------------------------------------- -__EXPORT ScEditWindow::~ScEditWindow() +ScEditWindow::~ScEditWindow() { // delete Accessible object before deleting EditEngine and EditView if (pAcc) @@ -153,7 +153,7 @@ void ScEditWindow::SetNumType(SvxNumType eNumType) // ----------------------------------------------------------------------- -EditTextObject* __EXPORT ScEditWindow::CreateTextObject() +EditTextObject* ScEditWindow::CreateTextObject() { // wegen #38841# die Absatzattribute zuruecksetzen // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck) @@ -237,7 +237,7 @@ void ScEditWindow::SetCharAttriutes() // ----------------------------------------------------------------------- -void __EXPORT ScEditWindow::Paint( const Rectangle& rRec ) +void ScEditWindow::Paint( const Rectangle& rRec ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetWindowColor(); @@ -253,14 +253,14 @@ void __EXPORT ScEditWindow::Paint( const Rectangle& rRec ) // ----------------------------------------------------------------------- -void __EXPORT ScEditWindow::MouseMove( const MouseEvent& rMEvt ) +void ScEditWindow::MouseMove( const MouseEvent& rMEvt ) { pEdView->MouseMove( rMEvt ); } // ----------------------------------------------------------------------- -void __EXPORT ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) +void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !HasFocus() ) GrabFocus(); @@ -270,14 +270,14 @@ void __EXPORT ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) // ----------------------------------------------------------------------- -void __EXPORT ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt ) +void ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt ) { pEdView->MouseButtonUp( rMEvt ); } // ----------------------------------------------------------------------- -void __EXPORT ScEditWindow::KeyInput( const KeyEvent& rKEvt ) +void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) { USHORT nKey = rKEvt.GetKeyCode().GetModifier() + rKEvt.GetKeyCode().GetCode(); @@ -301,7 +301,7 @@ void ScEditWindow::Command( const CommandEvent& rCEvt ) // ----------------------------------------------------------------------- -void __EXPORT ScEditWindow::GetFocus() +void ScEditWindow::GetFocus() { pActiveEdWnd = this; @@ -314,7 +314,7 @@ void __EXPORT ScEditWindow::GetFocus() pAcc = NULL; } -void __EXPORT ScEditWindow::LoseFocus() +void ScEditWindow::LoseFocus() { ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is() && pAcc) diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index ae9d2e98c..8d686e9f0 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -131,13 +131,13 @@ ScStyleDlg::ScStyleDlg( Window* pParent, // ----------------------------------------------------------------------- -__EXPORT ScStyleDlg::~ScStyleDlg() +ScStyleDlg::~ScStyleDlg() { } // ----------------------------------------------------------------------- -void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage ) +void ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage ) { if ( nDlgRsc == RID_SCDLG_STYLES_PAR ) { @@ -206,7 +206,7 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage ) // ----------------------------------------------------------------------- -const SfxItemSet* __EXPORT ScStyleDlg::GetRefreshedSet() +const SfxItemSet* ScStyleDlg::GetRefreshedSet() { SfxItemSet* pItemSet = GetInputSetImpl(); pItemSet->ClearItem(); diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx index 6c7c29f08..9bd82e989 100644 --- a/sc/source/ui/undo/target.cxx +++ b/sc/source/ui/undo/target.cxx @@ -41,7 +41,7 @@ TYPEINIT1(ScTabViewTarget, SfxRepeatTarget); -__EXPORT ScTabViewTarget::~ScTabViewTarget() +ScTabViewTarget::~ScTabViewTarget() { } diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 38e7addc4..9b9e83ddb 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -62,12 +62,12 @@ ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) : { } -__EXPORT ScSimpleUndo::~ScSimpleUndo() +ScSimpleUndo::~ScSimpleUndo() { delete pDetectiveUndo; } -BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) +BOOL ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) { // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren // der Detektiv-Pfeile gehoeren. @@ -177,7 +177,7 @@ ScBlockUndo::ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange, pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); } -__EXPORT ScBlockUndo::~ScBlockUndo() +ScBlockUndo::~ScBlockUndo() { DeleteSdrUndoAction( pDrawUndo ); } @@ -286,7 +286,7 @@ ScMoveUndo::ScMoveUndo( ScDocShell* pDocSh, ScDocument* pRefDoc, ScRefUndoData* pDrawUndo = GetSdrUndoAction( pDoc ); } -__EXPORT ScMoveUndo::~ScMoveUndo() +ScMoveUndo::~ScMoveUndo() { delete pRefUndoData; delete pRefUndoDoc; diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 17795fd6c..f2367974d 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -131,14 +131,14 @@ ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoInsertCells::~ScUndoInsertCells() +ScUndoInsertCells::~ScUndoInsertCells() { delete pPasteUndo; delete []pTabs; delete []pScenarios; } -String __EXPORT ScUndoInsertCells::GetComment() const +String ScUndoInsertCells::GetComment() const { return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS ); } @@ -294,7 +294,7 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo ) pViewShell->CellContentChanged(); } -void __EXPORT ScUndoInsertCells::Undo() +void ScUndoInsertCells::Undo() { if ( pPasteUndo ) pPasteUndo->Undo(); // undo paste first @@ -305,7 +305,7 @@ void __EXPORT ScUndoInsertCells::Undo() EndUndo(); } -void __EXPORT ScUndoInsertCells::Redo() +void ScUndoInsertCells::Redo() { WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginRedo(); @@ -316,7 +316,7 @@ void __EXPORT ScUndoInsertCells::Redo() pPasteUndo->Redo(); // redo paste last } -void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) +void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -332,7 +332,7 @@ void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -370,13 +370,13 @@ ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoDeleteCells::~ScUndoDeleteCells() +ScUndoDeleteCells::~ScUndoDeleteCells() { delete []pTabs; delete []pScenarios; } -String __EXPORT ScUndoDeleteCells::GetComment() const +String ScUndoDeleteCells::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // "Loeschen" } @@ -529,7 +529,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo ) // CellContentChanged kommt mit der Markierung } -void __EXPORT ScUndoDeleteCells::Undo() +void ScUndoDeleteCells::Undo() { WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginUndo(); @@ -548,7 +548,7 @@ void __EXPORT ScUndoDeleteCells::Undo() } } -void __EXPORT ScUndoDeleteCells::Redo() +void ScUndoDeleteCells::Redo() { WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginRedo(); @@ -561,13 +561,13 @@ void __EXPORT ScUndoDeleteCells::Redo() pViewShell->DoneBlockMode(); // aktuelle weg } -void __EXPORT ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget) +void ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, TRUE ); } -BOOL __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -593,12 +593,12 @@ ScUndoDeleteMulti::ScUndoDeleteMulti( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoDeleteMulti::~ScUndoDeleteMulti() +ScUndoDeleteMulti::~ScUndoDeleteMulti() { delete [] pRanges; } -String __EXPORT ScUndoDeleteMulti::GetComment() const +String ScUndoDeleteMulti::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells } @@ -675,7 +675,7 @@ void ScUndoDeleteMulti::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -void __EXPORT ScUndoDeleteMulti::Undo() +void ScUndoDeleteMulti::Undo() { WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginUndo(); @@ -721,7 +721,7 @@ void __EXPORT ScUndoDeleteMulti::Undo() SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -void __EXPORT ScUndoDeleteMulti::Redo() +void ScUndoDeleteMulti::Redo() { WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference BeginRedo(); @@ -753,14 +753,14 @@ void __EXPORT ScUndoDeleteMulti::Redo() SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -void __EXPORT ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget) +void ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget) { // DeleteCells, falls einfache Selektion if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, TRUE ); } -BOOL __EXPORT ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -782,12 +782,12 @@ ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoCut::~ScUndoCut() +ScUndoCut::~ScUndoCut() { delete pUndoDoc; } -String __EXPORT ScUndoCut::GetComment() const +String ScUndoCut::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CUT ); // "Ausschneiden" } @@ -842,14 +842,14 @@ void ScUndoCut::DoChange( const BOOL bUndo ) pViewShell->CellContentChanged(); } -void __EXPORT ScUndoCut::Undo() +void ScUndoCut::Undo() { BeginUndo(); DoChange( TRUE ); EndUndo(); } -void __EXPORT ScUndoCut::Redo() +void ScUndoCut::Redo() { BeginRedo(); ScDocument* pDoc = pDocShell->GetDocument(); @@ -859,13 +859,13 @@ void __EXPORT ScUndoCut::Redo() EndRedo(); } -void __EXPORT ScUndoCut::Repeat(SfxRepeatTarget& rTarget) +void ScUndoCut::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, TRUE ); } -BOOL __EXPORT ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -910,7 +910,7 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoPaste::~ScUndoPaste() +ScUndoPaste::~ScUndoPaste() { delete pUndoDoc; delete pRedoDoc; @@ -918,7 +918,7 @@ __EXPORT ScUndoPaste::~ScUndoPaste() delete pRefRedoData; } -String __EXPORT ScUndoPaste::GetComment() const +String ScUndoPaste::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PASTE ); // "Einfuegen" } @@ -1086,7 +1086,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo ) pViewShell->CellContentChanged(); } -void __EXPORT ScUndoPaste::Undo() +void ScUndoPaste::Undo() { BeginUndo(); DoChange( TRUE ); @@ -1095,7 +1095,7 @@ void __EXPORT ScUndoPaste::Undo() SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -void __EXPORT ScUndoPaste::Redo() +void ScUndoPaste::Redo() { BeginRedo(); ScDocument* pDoc = pDocShell->GetDocument(); @@ -1106,7 +1106,7 @@ void __EXPORT ScUndoPaste::Redo() SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -void __EXPORT ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) +void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -1124,7 +1124,7 @@ void __EXPORT ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1166,11 +1166,11 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoDragDrop::~ScUndoDragDrop() +ScUndoDragDrop::~ScUndoDragDrop() { } -String __EXPORT ScUndoDragDrop::GetComment() const +String ScUndoDragDrop::GetComment() const { // "Verschieben" : "Kopieren" return bCut ? ScGlobal::GetRscString( STR_UNDO_MOVE ) : @@ -1276,7 +1276,7 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const PaintArea( aPaintRange, nExtFlags ); } -void __EXPORT ScUndoDragDrop::Undo() +void ScUndoDragDrop::Undo() { BeginUndo(); DoUndo(aDestRange); @@ -1286,7 +1286,7 @@ void __EXPORT ScUndoDragDrop::Undo() SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -void __EXPORT ScUndoDragDrop::Redo() +void ScUndoDragDrop::Redo() { BeginRedo(); @@ -1369,11 +1369,11 @@ void __EXPORT ScUndoDragDrop::Redo() SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -void __EXPORT ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // geht nicht } @@ -1393,13 +1393,13 @@ ScUndoListNames::ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRang { } -__EXPORT ScUndoListNames::~ScUndoListNames() +ScUndoListNames::~ScUndoListNames() { delete pUndoDoc; delete pRedoDoc; } -String __EXPORT ScUndoListNames::GetComment() const +String ScUndoListNames::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_LISTNAMES ); } @@ -1417,27 +1417,27 @@ void ScUndoListNames::DoChange( ScDocument* pSrcDoc ) const pViewShell->CellContentChanged(); } -void __EXPORT ScUndoListNames::Undo() +void ScUndoListNames::Undo() { BeginUndo(); DoChange(pUndoDoc); EndUndo(); } -void __EXPORT ScUndoListNames::Redo() +void ScUndoListNames::Redo() { BeginRedo(); DoChange(pRedoDoc); EndRedo(); } -void __EXPORT ScUndoListNames::Repeat(SfxRepeatTarget& rTarget) +void ScUndoListNames::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->InsertNameList(); } -BOOL __EXPORT ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1467,17 +1467,17 @@ ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell, aRange.aEnd.SetTab(rDestArea.nTab); } -__EXPORT ScUndoUseScenario::~ScUndoUseScenario() +ScUndoUseScenario::~ScUndoUseScenario() { delete pUndoDoc; } -String __EXPORT ScUndoUseScenario::GetComment() const +String ScUndoUseScenario::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_USESCENARIO ); } -void __EXPORT ScUndoUseScenario::Undo() +void ScUndoUseScenario::Undo() { BeginUndo(); @@ -1532,7 +1532,7 @@ void __EXPORT ScUndoUseScenario::Undo() EndUndo(); } -void __EXPORT ScUndoUseScenario::Redo() +void ScUndoUseScenario::Redo() { SCTAB nTab = aRange.aStart.Tab(); BeginRedo(); @@ -1550,7 +1550,7 @@ void __EXPORT ScUndoUseScenario::Redo() EndRedo(); } -void __EXPORT ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) +void ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -1559,7 +1559,7 @@ void __EXPORT ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const { if (rTarget.ISA(ScTabViewTarget)) { @@ -1590,12 +1590,12 @@ ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell, aMarkData.MarkToMulti(); } -__EXPORT ScUndoSelectionStyle::~ScUndoSelectionStyle() +ScUndoSelectionStyle::~ScUndoSelectionStyle() { delete pUndoDoc; } -String __EXPORT ScUndoSelectionStyle::GetComment() const +String ScUndoSelectionStyle::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE ); } @@ -1644,21 +1644,21 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo ) ShowTable( aWorkRange.aStart.Tab() ); } -void __EXPORT ScUndoSelectionStyle::Undo() +void ScUndoSelectionStyle::Undo() { BeginUndo(); DoChange( TRUE ); EndUndo(); } -void __EXPORT ScUndoSelectionStyle::Redo() +void ScUndoSelectionStyle::Redo() { BeginRedo(); DoChange( FALSE ); EndRedo(); } -void __EXPORT ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) +void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -1677,12 +1677,12 @@ void __EXPORT ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } -USHORT __EXPORT ScUndoSelectionStyle::GetId() const +USHORT ScUndoSelectionStyle::GetId() const { return STR_UNDO_APPLYCELLSTYLE; } @@ -1702,12 +1702,12 @@ ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& r SetChangeTrack(); } -__EXPORT ScUndoEnterMatrix::~ScUndoEnterMatrix() +ScUndoEnterMatrix::~ScUndoEnterMatrix() { delete pUndoDoc; } -String __EXPORT ScUndoEnterMatrix::GetComment() const +String ScUndoEnterMatrix::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERMATRIX ); } @@ -1723,7 +1723,7 @@ void ScUndoEnterMatrix::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -void __EXPORT ScUndoEnterMatrix::Undo() +void ScUndoEnterMatrix::Undo() { BeginUndo(); @@ -1744,7 +1744,7 @@ void __EXPORT ScUndoEnterMatrix::Undo() EndUndo(); } -void __EXPORT ScUndoEnterMatrix::Redo() +void ScUndoEnterMatrix::Redo() { BeginRedo(); @@ -1764,7 +1764,7 @@ void __EXPORT ScUndoEnterMatrix::Redo() EndRedo(); } -void __EXPORT ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) +void ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -1773,7 +1773,7 @@ void __EXPORT ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1801,18 +1801,18 @@ ScUndoIndent::ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark, { } -__EXPORT ScUndoIndent::~ScUndoIndent() +ScUndoIndent::~ScUndoIndent() { delete pUndoDoc; } -String __EXPORT ScUndoIndent::GetComment() const +String ScUndoIndent::GetComment() const { USHORT nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT; return ScGlobal::GetRscString( nId ); } -void __EXPORT ScUndoIndent::Undo() +void ScUndoIndent::Undo() { BeginUndo(); @@ -1827,7 +1827,7 @@ void __EXPORT ScUndoIndent::Undo() EndUndo(); } -void __EXPORT ScUndoIndent::Redo() +void ScUndoIndent::Redo() { BeginRedo(); @@ -1838,13 +1838,13 @@ void __EXPORT ScUndoIndent::Redo() EndRedo(); } -void __EXPORT ScUndoIndent::Repeat(SfxRepeatTarget& rTarget) +void ScUndoIndent::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->ChangeIndent( bIsIncrement ); } -BOOL __EXPORT ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1863,17 +1863,17 @@ ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMark { } -__EXPORT ScUndoTransliterate::~ScUndoTransliterate() +ScUndoTransliterate::~ScUndoTransliterate() { delete pUndoDoc; } -String __EXPORT ScUndoTransliterate::GetComment() const +String ScUndoTransliterate::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TRANSLITERATE ); } -void __EXPORT ScUndoTransliterate::Undo() +void ScUndoTransliterate::Undo() { BeginUndo(); @@ -1888,7 +1888,7 @@ void __EXPORT ScUndoTransliterate::Undo() EndUndo(); } -void __EXPORT ScUndoTransliterate::Redo() +void ScUndoTransliterate::Redo() { BeginRedo(); @@ -1899,13 +1899,13 @@ void __EXPORT ScUndoTransliterate::Redo() EndRedo(); } -void __EXPORT ScUndoTransliterate::Repeat(SfxRepeatTarget& rTarget) +void ScUndoTransliterate::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->TransliterateText( nTransliterationType ); } -BOOL __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1932,18 +1932,18 @@ ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& pWhich[i] = pW[i]; } -__EXPORT ScUndoClearItems::~ScUndoClearItems() +ScUndoClearItems::~ScUndoClearItems() { delete pUndoDoc; delete pWhich; } -String __EXPORT ScUndoClearItems::GetComment() const +String ScUndoClearItems::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); } -void __EXPORT ScUndoClearItems::Undo() +void ScUndoClearItems::Undo() { BeginUndo(); @@ -1954,7 +1954,7 @@ void __EXPORT ScUndoClearItems::Undo() EndUndo(); } -void __EXPORT ScUndoClearItems::Redo() +void ScUndoClearItems::Redo() { BeginRedo(); @@ -1965,7 +1965,7 @@ void __EXPORT ScUndoClearItems::Redo() EndRedo(); } -void __EXPORT ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget) +void ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -1975,7 +1975,7 @@ void __EXPORT ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1993,17 +1993,17 @@ ScUndoRemoveBreaks::ScUndoRemoveBreaks( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoRemoveBreaks::~ScUndoRemoveBreaks() +ScUndoRemoveBreaks::~ScUndoRemoveBreaks() { delete pUndoDoc; } -String __EXPORT ScUndoRemoveBreaks::GetComment() const +String ScUndoRemoveBreaks::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVEBREAKS ); } -void __EXPORT ScUndoRemoveBreaks::Undo() +void ScUndoRemoveBreaks::Undo() { BeginUndo(); @@ -2018,7 +2018,7 @@ void __EXPORT ScUndoRemoveBreaks::Undo() EndUndo(); } -void __EXPORT ScUndoRemoveBreaks::Redo() +void ScUndoRemoveBreaks::Redo() { BeginRedo(); @@ -2034,7 +2034,7 @@ void __EXPORT ScUndoRemoveBreaks::Redo() EndRedo(); } -void __EXPORT ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget) +void ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -2043,7 +2043,7 @@ void __EXPORT ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -2061,17 +2061,17 @@ ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoRemoveMerge::~ScUndoRemoveMerge() +ScUndoRemoveMerge::~ScUndoRemoveMerge() { delete pUndoDoc; } -String __EXPORT ScUndoRemoveMerge::GetComment() const +String ScUndoRemoveMerge::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben" } -void __EXPORT ScUndoRemoveMerge::Undo() +void ScUndoRemoveMerge::Undo() { using ::std::set; @@ -2102,7 +2102,7 @@ void __EXPORT ScUndoRemoveMerge::Undo() EndUndo(); } -void __EXPORT ScUndoRemoveMerge::Redo() +void ScUndoRemoveMerge::Redo() { using ::std::set; @@ -2149,13 +2149,13 @@ void __EXPORT ScUndoRemoveMerge::Redo() EndRedo(); } -void __EXPORT ScUndoRemoveMerge::Repeat(SfxRepeatTarget& rTarget) +void ScUndoRemoveMerge::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveMerge(); } -BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -2203,7 +2203,7 @@ ScUndoBorder::ScUndoBorder( ScDocShell* pNewDocShell, pInner = new SvxBoxInfoItem(rNewInner); } -__EXPORT ScUndoBorder::~ScUndoBorder() +ScUndoBorder::~ScUndoBorder() { delete pUndoDoc; delete pRanges; @@ -2211,12 +2211,12 @@ __EXPORT ScUndoBorder::~ScUndoBorder() delete pInner; } -String __EXPORT ScUndoBorder::GetComment() const +String ScUndoBorder::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String? } -void __EXPORT ScUndoBorder::Undo() +void ScUndoBorder::Undo() { BeginUndo(); @@ -2252,12 +2252,12 @@ void ScUndoBorder::Redo() EndRedo(); } -void __EXPORT ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */) { //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist) } -BOOL __EXPORT ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // s.o. } diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index 101dcc9b1..a393f63c7 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -87,7 +87,7 @@ ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell, pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); } -__EXPORT ScUndoWidthOrHeight::~ScUndoWidthOrHeight() +ScUndoWidthOrHeight::~ScUndoWidthOrHeight() { delete[] pRanges; delete pUndoDoc; @@ -95,7 +95,7 @@ __EXPORT ScUndoWidthOrHeight::~ScUndoWidthOrHeight() DeleteSdrUndoAction( pDrawUndo ); } -String __EXPORT ScUndoWidthOrHeight::GetComment() const +String ScUndoWidthOrHeight::GetComment() const { // [ "optimale " ] "Spaltenbreite" | "Zeilenhoehe" return ( bWidth ? @@ -109,7 +109,7 @@ String __EXPORT ScUndoWidthOrHeight::GetComment() const ) ); } -void __EXPORT ScUndoWidthOrHeight::Undo() +void ScUndoWidthOrHeight::Undo() { BeginUndo(); @@ -168,7 +168,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo() EndUndo(); } -void __EXPORT ScUndoWidthOrHeight::Redo() +void ScUndoWidthOrHeight::Redo() { BeginRedo(); @@ -202,13 +202,13 @@ void __EXPORT ScUndoWidthOrHeight::Redo() EndRedo(); } -void __EXPORT ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget) +void ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, TRUE ); } -BOOL __EXPORT ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 6b25be0ef..9a9e42d49 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -119,7 +119,7 @@ ScUndoDeleteContents::ScUndoDeleteContents( //---------------------------------------------------------------------------- -__EXPORT ScUndoDeleteContents::~ScUndoDeleteContents() +ScUndoDeleteContents::~ScUndoDeleteContents() { delete pUndoDoc; DeleteSdrUndoAction( pDrawUndo ); @@ -128,7 +128,7 @@ __EXPORT ScUndoDeleteContents::~ScUndoDeleteContents() //---------------------------------------------------------------------------- -String __EXPORT ScUndoDeleteContents::GetComment() const +String ScUndoDeleteContents::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen" } @@ -212,7 +212,7 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo ) //---------------------------------------------------------------------------- -void __EXPORT ScUndoDeleteContents::Undo() +void ScUndoDeleteContents::Undo() { BeginUndo(); DoChange( TRUE ); @@ -231,7 +231,7 @@ void __EXPORT ScUndoDeleteContents::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoDeleteContents::Redo() +void ScUndoDeleteContents::Redo() { BeginRedo(); DoChange( FALSE ); @@ -250,7 +250,7 @@ void __EXPORT ScUndoDeleteContents::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) +void ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, TRUE ); @@ -259,7 +259,7 @@ void __EXPORT ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -298,7 +298,7 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoFillTable::~ScUndoFillTable() +ScUndoFillTable::~ScUndoFillTable() { delete pUndoDoc; } @@ -306,7 +306,7 @@ __EXPORT ScUndoFillTable::~ScUndoFillTable() //---------------------------------------------------------------------------- -String __EXPORT ScUndoFillTable::GetComment() const +String ScUndoFillTable::GetComment() const { return ScGlobal::GetRscString( STR_FILL_TAB ); } @@ -395,7 +395,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo ) //---------------------------------------------------------------------------- -void __EXPORT ScUndoFillTable::Undo() +void ScUndoFillTable::Undo() { BeginUndo(); DoChange( TRUE ); @@ -405,7 +405,7 @@ void __EXPORT ScUndoFillTable::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoFillTable::Redo() +void ScUndoFillTable::Redo() { BeginRedo(); DoChange( FALSE ); @@ -415,7 +415,7 @@ void __EXPORT ScUndoFillTable::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget) +void ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->FillTab( nFlags, nFunction, bSkipEmpty, bAsLink ); @@ -424,7 +424,7 @@ void __EXPORT ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -461,7 +461,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoSelectionAttr::~ScUndoSelectionAttr() +ScUndoSelectionAttr::~ScUndoSelectionAttr() { ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); pPool->Remove(*pApplyPattern); @@ -476,7 +476,7 @@ __EXPORT ScUndoSelectionAttr::~ScUndoSelectionAttr() //---------------------------------------------------------------------------- -String __EXPORT ScUndoSelectionAttr::GetComment() const +String ScUndoSelectionAttr::GetComment() const { //"Attribute" "/Linien" return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR ); @@ -553,7 +553,7 @@ void ScUndoSelectionAttr::ChangeEditData( const bool bUndo ) //---------------------------------------------------------------------------- -void __EXPORT ScUndoSelectionAttr::Undo() +void ScUndoSelectionAttr::Undo() { BeginUndo(); DoChange( TRUE ); @@ -563,7 +563,7 @@ void __EXPORT ScUndoSelectionAttr::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoSelectionAttr::Redo() +void ScUndoSelectionAttr::Redo() { BeginRedo(); DoChange( FALSE ); @@ -573,7 +573,7 @@ void __EXPORT ScUndoSelectionAttr::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) +void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -588,7 +588,7 @@ void __EXPORT ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -627,7 +627,7 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoAutoFill::~ScUndoAutoFill() +ScUndoAutoFill::~ScUndoAutoFill() { pDocShell->GetDocument()->EraseNonUsedSharedNames(nMaxSharedIndex); delete pUndoDoc; @@ -636,7 +636,7 @@ __EXPORT ScUndoAutoFill::~ScUndoAutoFill() //---------------------------------------------------------------------------- -String __EXPORT ScUndoAutoFill::GetComment() const +String ScUndoAutoFill::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Ausfuellen" } @@ -655,7 +655,7 @@ void ScUndoAutoFill::SetChangeTrack() //---------------------------------------------------------------------------- -void __EXPORT ScUndoAutoFill::Undo() +void ScUndoAutoFill::Undo() { BeginUndo(); @@ -721,7 +721,7 @@ void __EXPORT ScUndoAutoFill::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoAutoFill::Redo() +void ScUndoAutoFill::Redo() { BeginRedo(); @@ -772,7 +772,7 @@ void __EXPORT ScUndoAutoFill::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) +void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -788,7 +788,7 @@ void __EXPORT ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -973,7 +973,7 @@ ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoAutoFormat::~ScUndoAutoFormat() +ScUndoAutoFormat::~ScUndoAutoFormat() { delete pUndoDoc; } @@ -981,7 +981,7 @@ __EXPORT ScUndoAutoFormat::~ScUndoAutoFormat() //---------------------------------------------------------------------------- -String __EXPORT ScUndoAutoFormat::GetComment() const +String ScUndoAutoFormat::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format" } @@ -989,7 +989,7 @@ String __EXPORT ScUndoAutoFormat::GetComment() const //---------------------------------------------------------------------------- -void __EXPORT ScUndoAutoFormat::Undo() +void ScUndoAutoFormat::Undo() { BeginUndo(); @@ -1034,7 +1034,7 @@ void __EXPORT ScUndoAutoFormat::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoAutoFormat::Redo() +void ScUndoAutoFormat::Redo() { BeginRedo(); @@ -1117,7 +1117,7 @@ void __EXPORT ScUndoAutoFormat::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget) +void ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, TRUE ); @@ -1126,7 +1126,7 @@ void __EXPORT ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1158,7 +1158,7 @@ ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark, //---------------------------------------------------------------------------- -__EXPORT ScUndoReplace::~ScUndoReplace() +ScUndoReplace::~ScUndoReplace() { delete pUndoDoc; delete pSearchItem; @@ -1196,7 +1196,7 @@ void ScUndoReplace::SetChangeTrack() //---------------------------------------------------------------------------- -String __EXPORT ScUndoReplace::GetComment() const +String ScUndoReplace::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen" } @@ -1204,7 +1204,7 @@ String __EXPORT ScUndoReplace::GetComment() const //---------------------------------------------------------------------------- -void __EXPORT ScUndoReplace::Undo() +void ScUndoReplace::Undo() { BeginUndo(); @@ -1282,7 +1282,7 @@ void __EXPORT ScUndoReplace::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoReplace::Redo() +void ScUndoReplace::Redo() { BeginRedo(); @@ -1321,7 +1321,7 @@ void __EXPORT ScUndoReplace::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoReplace::Repeat(SfxRepeatTarget& rTarget) +void ScUndoReplace::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, TRUE, FALSE ); @@ -1330,7 +1330,7 @@ void __EXPORT ScUndoReplace::Repeat(SfxRepeatTarget& rTarget) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1367,7 +1367,7 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoTabOp::~ScUndoTabOp() +ScUndoTabOp::~ScUndoTabOp() { delete pUndoDoc; } @@ -1375,7 +1375,7 @@ __EXPORT ScUndoTabOp::~ScUndoTabOp() //---------------------------------------------------------------------------- -String __EXPORT ScUndoTabOp::GetComment() const +String ScUndoTabOp::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation" } @@ -1383,7 +1383,7 @@ String __EXPORT ScUndoTabOp::GetComment() const //---------------------------------------------------------------------------- -void __EXPORT ScUndoTabOp::Undo() +void ScUndoTabOp::Undo() { BeginUndo(); @@ -1407,7 +1407,7 @@ void __EXPORT ScUndoTabOp::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoTabOp::Redo() +void ScUndoTabOp::Redo() { BeginRedo(); @@ -1427,14 +1427,14 @@ void __EXPORT ScUndoTabOp::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoTabOp::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoTabOp::Repeat(SfxRepeatTarget& /* rTarget */) { } //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -1466,7 +1466,7 @@ ScUndoConversion::ScUndoConversion( //---------------------------------------------------------------------------- -__EXPORT ScUndoConversion::~ScUndoConversion() +ScUndoConversion::~ScUndoConversion() { delete pUndoDoc; delete pRedoDoc; @@ -1601,13 +1601,13 @@ nFlags ( nNewFlag ) SetChangeTrack(); } -__EXPORT ScUndoRefConversion::~ScUndoRefConversion() +ScUndoRefConversion::~ScUndoRefConversion() { delete pUndoDoc; delete pRedoDoc; } -String __EXPORT ScUndoRefConversion::GetComment() const +String ScUndoRefConversion::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe" } @@ -1642,7 +1642,7 @@ void ScUndoRefConversion::DoChange( ScDocument* pRefDoc) if (pViewShell) pViewShell->CellContentChanged(); } -void __EXPORT ScUndoRefConversion::Undo() +void ScUndoRefConversion::Undo() { BeginUndo(); if (pUndoDoc) @@ -1653,7 +1653,7 @@ void __EXPORT ScUndoRefConversion::Undo() EndUndo(); } -void __EXPORT ScUndoRefConversion::Redo() +void ScUndoRefConversion::Redo() { BeginRedo(); if (pRedoDoc) @@ -1662,13 +1662,13 @@ void __EXPORT ScUndoRefConversion::Redo() EndRedo(); } -void __EXPORT ScUndoRefConversion::Repeat(SfxRepeatTarget& rTarget) +void ScUndoRefConversion::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->DoRefConversion(); } -BOOL __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1692,7 +1692,7 @@ ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoRefreshLink::~ScUndoRefreshLink() +ScUndoRefreshLink::~ScUndoRefreshLink() { delete pUndoDoc; delete pRedoDoc; @@ -1701,7 +1701,7 @@ __EXPORT ScUndoRefreshLink::~ScUndoRefreshLink() //---------------------------------------------------------------------------- -String __EXPORT ScUndoRefreshLink::GetComment() const +String ScUndoRefreshLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); } @@ -1709,7 +1709,7 @@ String __EXPORT ScUndoRefreshLink::GetComment() const //---------------------------------------------------------------------------- -void __EXPORT ScUndoRefreshLink::Undo() +void ScUndoRefreshLink::Undo() { BeginUndo(); @@ -1759,7 +1759,7 @@ void __EXPORT ScUndoRefreshLink::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoRefreshLink::Redo() +void ScUndoRefreshLink::Redo() { DBG_ASSERT(pRedoDoc, "Kein RedoDoc bei ScUndoRefreshLink::Redo"); @@ -1792,7 +1792,7 @@ void __EXPORT ScUndoRefreshLink::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */) { // gippsnich } @@ -1800,7 +1800,7 @@ void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -1854,14 +1854,14 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoInsertAreaLink::~ScUndoInsertAreaLink() +ScUndoInsertAreaLink::~ScUndoInsertAreaLink() { } //---------------------------------------------------------------------------- -String __EXPORT ScUndoInsertAreaLink::GetComment() const +String ScUndoInsertAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK ); } @@ -1869,7 +1869,7 @@ String __EXPORT ScUndoInsertAreaLink::GetComment() const //---------------------------------------------------------------------------- -void __EXPORT ScUndoInsertAreaLink::Undo() +void ScUndoInsertAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); @@ -1885,7 +1885,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoInsertAreaLink::Redo() +void ScUndoInsertAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument(); sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); @@ -1904,7 +1904,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) { //! .... } @@ -1912,7 +1912,7 @@ void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -1944,14 +1944,14 @@ ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink() +ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink() { } //---------------------------------------------------------------------------- -String __EXPORT ScUndoRemoveAreaLink::GetComment() const +String ScUndoRemoveAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ?? } @@ -1959,7 +1959,7 @@ String __EXPORT ScUndoRemoveAreaLink::GetComment() const //---------------------------------------------------------------------------- -void __EXPORT ScUndoRemoveAreaLink::Undo() +void ScUndoRemoveAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); @@ -1978,7 +1978,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoRemoveAreaLink::Redo() +void ScUndoRemoveAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument(); sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); @@ -1994,7 +1994,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) { // gippsnich } @@ -2002,7 +2002,7 @@ void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -2046,7 +2046,7 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell, //---------------------------------------------------------------------------- -__EXPORT ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink() +ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink() { delete pUndoDoc; delete pRedoDoc; @@ -2055,7 +2055,7 @@ __EXPORT ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink() //---------------------------------------------------------------------------- -String __EXPORT ScUndoUpdateAreaLink::GetComment() const +String ScUndoUpdateAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ?? } @@ -2124,7 +2124,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const //---------------------------------------------------------------------------- -void __EXPORT ScUndoUpdateAreaLink::Undo() +void ScUndoUpdateAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); @@ -2143,7 +2143,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoUpdateAreaLink::Redo() +void ScUndoUpdateAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument(); sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); @@ -2162,7 +2162,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo() //---------------------------------------------------------------------------- -void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) { // gippsnich } @@ -2170,7 +2170,7 @@ void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) //---------------------------------------------------------------------------- -BOOL __EXPORT ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 0a96ee409..1ba5fd503 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -95,7 +95,7 @@ ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell, pApplyPattern = (ScPatternAttr*) &pPool->Put( *pApplyPat ); } -__EXPORT ScUndoCursorAttr::~ScUndoCursorAttr() +ScUndoCursorAttr::~ScUndoCursorAttr() { ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); pPool->Remove(*pNewPattern); @@ -103,7 +103,7 @@ __EXPORT ScUndoCursorAttr::~ScUndoCursorAttr() pPool->Remove(*pApplyPattern); } -String __EXPORT ScUndoCursorAttr::GetComment() const +String ScUndoCursorAttr::GetComment() const { //! eigener Text fuer automatische Attributierung @@ -148,7 +148,7 @@ void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern, const share pDocShell->PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PAINT_GRID, nFlags ); } -void __EXPORT ScUndoCursorAttr::Undo() +void ScUndoCursorAttr::Undo() { BeginUndo(); DoChange(pOldPattern, pOldEditData); @@ -166,20 +166,20 @@ void __EXPORT ScUndoCursorAttr::Undo() EndUndo(); } -void __EXPORT ScUndoCursorAttr::Redo() +void ScUndoCursorAttr::Redo() { BeginRedo(); DoChange(pNewPattern, pNewEditData); EndRedo(); } -void __EXPORT ScUndoCursorAttr::Repeat(SfxRepeatTarget& rTarget) +void ScUndoCursorAttr::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->ApplySelectionPattern( *pApplyPattern ); } -BOOL __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -210,7 +210,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell, SetChangeTrack(); } -__EXPORT ScUndoEnterData::~ScUndoEnterData() +ScUndoEnterData::~ScUndoEnterData() { for (USHORT i=0; i<nCount; i++) if (ppOldCells[i]) @@ -224,7 +224,7 @@ __EXPORT ScUndoEnterData::~ScUndoEnterData() delete pNewEditData; } -String __EXPORT ScUndoEnterData::GetComment() const +String ScUndoEnterData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe" } @@ -271,7 +271,7 @@ void ScUndoEnterData::SetChangeTrack() nEndChangeAction = 0; } -void __EXPORT ScUndoEnterData::Undo() +void ScUndoEnterData::Undo() { BeginUndo(); @@ -316,7 +316,7 @@ void __EXPORT ScUndoEnterData::Undo() } } -void __EXPORT ScUndoEnterData::Redo() +void ScUndoEnterData::Redo() { BeginRedo(); @@ -349,7 +349,7 @@ void __EXPORT ScUndoEnterData::Redo() } } -void __EXPORT ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) +void ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -358,7 +358,7 @@ void __EXPORT ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -380,13 +380,13 @@ ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& r SetChangeTrack(); } -__EXPORT ScUndoEnterValue::~ScUndoEnterValue() +ScUndoEnterValue::~ScUndoEnterValue() { if (pOldCell) pOldCell->Delete(); } -String __EXPORT ScUndoEnterValue::GetComment() const +String ScUndoEnterValue::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe" } @@ -406,7 +406,7 @@ void ScUndoEnterValue::SetChangeTrack() nEndChangeAction = 0; } -void __EXPORT ScUndoEnterValue::Undo() +void ScUndoEnterValue::Undo() { BeginUndo(); @@ -424,7 +424,7 @@ void __EXPORT ScUndoEnterValue::Undo() EndUndo(); } -void __EXPORT ScUndoEnterValue::Redo() +void ScUndoEnterValue::Redo() { BeginRedo(); @@ -437,12 +437,12 @@ void __EXPORT ScUndoEnterValue::Redo() EndRedo(); } -void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */) { // gippsnich } -BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -464,7 +464,7 @@ ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos SetChangeTrack(); } -__EXPORT ScUndoPutCell::~ScUndoPutCell() +ScUndoPutCell::~ScUndoPutCell() { if (pOldCell) pOldCell->Delete(); @@ -472,7 +472,7 @@ __EXPORT ScUndoPutCell::~ScUndoPutCell() pEnteredCell->Delete(); } -String __EXPORT ScUndoPutCell::GetComment() const +String ScUndoPutCell::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe" } @@ -492,7 +492,7 @@ void ScUndoPutCell::SetChangeTrack() nEndChangeAction = 0; } -void __EXPORT ScUndoPutCell::Undo() +void ScUndoPutCell::Undo() { BeginUndo(); @@ -510,7 +510,7 @@ void __EXPORT ScUndoPutCell::Undo() EndUndo(); } -void __EXPORT ScUndoPutCell::Redo() +void ScUndoPutCell::Redo() { BeginRedo(); @@ -526,12 +526,12 @@ void __EXPORT ScUndoPutCell::Redo() EndRedo(); } -void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */) { // gippsnich } -BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -554,11 +554,11 @@ ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoPageBreak::~ScUndoPageBreak() +ScUndoPageBreak::~ScUndoPageBreak() { } -String __EXPORT ScUndoPageBreak::GetComment() const +String ScUndoPageBreak::GetComment() const { //"Spaltenumbruch" | "Zeilenumbruch" "einfuegen" | "loeschen" return String ( bColumn ? @@ -590,21 +590,21 @@ void ScUndoPageBreak::DoChange( BOOL bInsertP ) const } } -void __EXPORT ScUndoPageBreak::Undo() +void ScUndoPageBreak::Undo() { BeginUndo(); DoChange(!bInsert); EndUndo(); } -void __EXPORT ScUndoPageBreak::Redo() +void ScUndoPageBreak::Redo() { BeginRedo(); DoChange(bInsert); EndRedo(); } -void __EXPORT ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) +void ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -617,7 +617,7 @@ void __EXPORT ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -638,11 +638,11 @@ ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoPrintZoom::~ScUndoPrintZoom() +ScUndoPrintZoom::~ScUndoPrintZoom() { } -String __EXPORT ScUndoPrintZoom::GetComment() const +String ScUndoPrintZoom::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE ); } @@ -668,21 +668,21 @@ void ScUndoPrintZoom::DoChange( BOOL bUndo ) } } -void __EXPORT ScUndoPrintZoom::Undo() +void ScUndoPrintZoom::Undo() { BeginUndo(); DoChange(TRUE); EndUndo(); } -void __EXPORT ScUndoPrintZoom::Redo() +void ScUndoPrintZoom::Redo() { BeginRedo(); DoChange(FALSE); EndRedo(); } -void __EXPORT ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget) +void ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -692,7 +692,7 @@ void __EXPORT ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -726,13 +726,13 @@ ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell, pOldCell->Delete(); } -__EXPORT ScUndoThesaurus::~ScUndoThesaurus() +ScUndoThesaurus::~ScUndoThesaurus() { delete pUndoTObject; delete pRedoTObject; } -String __EXPORT ScUndoThesaurus::GetComment() const +String ScUndoThesaurus::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus" } @@ -751,7 +751,7 @@ void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell ) nEndChangeAction = 0; } -void __EXPORT ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr, +void ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr, const EditTextObject* pTObj ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -795,7 +795,7 @@ void __EXPORT ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr, pDocShell->PostPaintCell( nCol, nRow, nTab ); } -void __EXPORT ScUndoThesaurus::Undo() +void ScUndoThesaurus::Undo() { BeginUndo(); DoChange( TRUE, aUndoStr, pUndoTObject ); @@ -805,20 +805,20 @@ void __EXPORT ScUndoThesaurus::Undo() EndUndo(); } -void __EXPORT ScUndoThesaurus::Redo() +void ScUndoThesaurus::Redo() { BeginRedo(); DoChange( FALSE, aRedoStr, pRedoTObject ); EndRedo(); } -void __EXPORT ScUndoThesaurus::Repeat(SfxRepeatTarget& rTarget) +void ScUndoThesaurus::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->DoThesaurus( TRUE ); } -BOOL __EXPORT ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -988,13 +988,13 @@ ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell, } } -__EXPORT ScUndoDetective::~ScUndoDetective() +ScUndoDetective::~ScUndoDetective() { DeleteSdrUndoAction( pDrawUndo ); delete pOldList; } -String __EXPORT ScUndoDetective::GetComment() const +String ScUndoDetective::GetComment() const { USHORT nId = STR_UNDO_DETDELALL; if ( !bIsDelete ) @@ -1011,7 +1011,7 @@ String __EXPORT ScUndoDetective::GetComment() const } -void __EXPORT ScUndoDetective::Undo() +void ScUndoDetective::Undo() { BeginUndo(); @@ -1048,7 +1048,7 @@ void __EXPORT ScUndoDetective::Undo() EndUndo(); } -void __EXPORT ScUndoDetective::Redo() +void ScUndoDetective::Redo() { BeginRedo(); @@ -1068,12 +1068,12 @@ void __EXPORT ScUndoDetective::Redo() EndRedo(); } -void __EXPORT ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */) { // hammanich } -BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -1091,13 +1091,13 @@ ScUndoRangeNames::ScUndoRangeNames( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoRangeNames::~ScUndoRangeNames() +ScUndoRangeNames::~ScUndoRangeNames() { delete pOldRanges; delete pNewRanges; } -String __EXPORT ScUndoRangeNames::GetComment() const +String ScUndoRangeNames::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_RANGENAMES ); } @@ -1117,26 +1117,26 @@ void ScUndoRangeNames::DoChange( BOOL bUndo ) SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) ); } -void __EXPORT ScUndoRangeNames::Undo() +void ScUndoRangeNames::Undo() { BeginUndo(); DoChange( TRUE ); EndUndo(); } -void __EXPORT ScUndoRangeNames::Redo() +void ScUndoRangeNames::Redo() { BeginRedo(); DoChange( FALSE ); EndRedo(); } -void __EXPORT ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */) { // hammanich } -BOOL __EXPORT ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 6dd1c57d9..b2b7bf3bc 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -99,19 +99,19 @@ ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoDoOutline::~ScUndoDoOutline() +ScUndoDoOutline::~ScUndoDoOutline() { delete pUndoDoc; } -String __EXPORT ScUndoDoOutline::GetComment() const +String ScUndoDoOutline::GetComment() const { // Detail einblenden" "Detail ausblenden" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) : ScGlobal::GetRscString( STR_UNDO_REDOOUTLINE ); } -void __EXPORT ScUndoDoOutline::Undo() +void ScUndoDoOutline::Undo() { BeginUndo(); @@ -146,7 +146,7 @@ void __EXPORT ScUndoDoOutline::Undo() EndUndo(); } -void __EXPORT ScUndoDoOutline::Redo() +void ScUndoDoOutline::Redo() { BeginRedo(); @@ -166,11 +166,11 @@ void __EXPORT ScUndoDoOutline::Redo() EndRedo(); } -void __EXPORT ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // geht nicht } @@ -192,19 +192,19 @@ ScUndoMakeOutline::ScUndoMakeOutline( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoMakeOutline::~ScUndoMakeOutline() +ScUndoMakeOutline::~ScUndoMakeOutline() { delete pUndoTable; } -String __EXPORT ScUndoMakeOutline::GetComment() const +String ScUndoMakeOutline::GetComment() const { // "Gruppierung" "Gruppierung aufheben" return bMake ? ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) : ScGlobal::GetRscString( STR_UNDO_REMAKEOUTLINE ); } -void __EXPORT ScUndoMakeOutline::Undo() +void ScUndoMakeOutline::Undo() { BeginUndo(); @@ -225,7 +225,7 @@ void __EXPORT ScUndoMakeOutline::Undo() EndUndo(); } -void __EXPORT ScUndoMakeOutline::Redo() +void ScUndoMakeOutline::Redo() { BeginRedo(); @@ -243,7 +243,7 @@ void __EXPORT ScUndoMakeOutline::Redo() EndRedo(); } -void __EXPORT ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget) +void ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -256,7 +256,7 @@ void __EXPORT ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -280,18 +280,18 @@ ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoOutlineLevel::~ScUndoOutlineLevel() +ScUndoOutlineLevel::~ScUndoOutlineLevel() { delete pUndoDoc; delete pUndoTable; } -String __EXPORT ScUndoOutlineLevel::GetComment() const +String ScUndoOutlineLevel::GetComment() const { // "Gliederungsebene auswaehlen"; return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL ); } -void __EXPORT ScUndoOutlineLevel::Undo() +void ScUndoOutlineLevel::Undo() { BeginUndo(); @@ -323,7 +323,7 @@ void __EXPORT ScUndoOutlineLevel::Undo() EndUndo(); } -void __EXPORT ScUndoOutlineLevel::Redo() +void ScUndoOutlineLevel::Redo() { BeginRedo(); @@ -340,13 +340,13 @@ void __EXPORT ScUndoOutlineLevel::Redo() EndRedo(); } -void __EXPORT ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget) +void ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, TRUE ); } -BOOL __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -368,20 +368,20 @@ ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoOutlineBlock::~ScUndoOutlineBlock() +ScUndoOutlineBlock::~ScUndoOutlineBlock() { delete pUndoDoc; delete pUndoTable; } -String __EXPORT ScUndoOutlineBlock::GetComment() const +String ScUndoOutlineBlock::GetComment() const { // "Detail einblenden" "Detail ausblenden" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) : ScGlobal::GetRscString( STR_UNDO_REDOOUTLINEBLK ); } -void __EXPORT ScUndoOutlineBlock::Undo() +void ScUndoOutlineBlock::Undo() { BeginUndo(); @@ -426,7 +426,7 @@ void __EXPORT ScUndoOutlineBlock::Undo() EndUndo(); } -void __EXPORT ScUndoOutlineBlock::Redo() +void ScUndoOutlineBlock::Redo() { BeginRedo(); @@ -441,7 +441,7 @@ void __EXPORT ScUndoOutlineBlock::Redo() EndRedo(); } -void __EXPORT ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget) +void ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -454,7 +454,7 @@ void __EXPORT ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -475,18 +475,18 @@ ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines() +ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines() { delete pUndoDoc; delete pUndoTable; } -String __EXPORT ScUndoRemoveAllOutlines::GetComment() const +String ScUndoRemoveAllOutlines::GetComment() const { // "Gliederung entfernen" return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS ); } -void __EXPORT ScUndoRemoveAllOutlines::Undo() +void ScUndoRemoveAllOutlines::Undo() { BeginUndo(); @@ -521,7 +521,7 @@ void __EXPORT ScUndoRemoveAllOutlines::Undo() EndUndo(); } -void __EXPORT ScUndoRemoveAllOutlines::Redo() +void ScUndoRemoveAllOutlines::Redo() { BeginRedo(); @@ -539,13 +539,13 @@ void __EXPORT ScUndoRemoveAllOutlines::Redo() EndRedo(); } -void __EXPORT ScUndoRemoveAllOutlines::Repeat(SfxRepeatTarget& rTarget) +void ScUndoRemoveAllOutlines::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveAllOutlines( TRUE ); } -BOOL __EXPORT ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -566,18 +566,18 @@ ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoAutoOutline::~ScUndoAutoOutline() +ScUndoAutoOutline::~ScUndoAutoOutline() { delete pUndoDoc; delete pUndoTable; } -String __EXPORT ScUndoAutoOutline::GetComment() const +String ScUndoAutoOutline::GetComment() const { // "Auto-Gliederung" return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE ); } -void __EXPORT ScUndoAutoOutline::Undo() +void ScUndoAutoOutline::Undo() { BeginUndo(); @@ -617,7 +617,7 @@ void __EXPORT ScUndoAutoOutline::Undo() EndUndo(); } -void __EXPORT ScUndoAutoOutline::Redo() +void ScUndoAutoOutline::Redo() { BeginRedo(); @@ -648,13 +648,13 @@ void __EXPORT ScUndoAutoOutline::Redo() EndRedo(); } -void __EXPORT ScUndoAutoOutline::Repeat(SfxRepeatTarget& rTarget) +void ScUndoAutoOutline::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->AutoOutline( TRUE ); } -BOOL __EXPORT ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -679,7 +679,7 @@ ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, { } -__EXPORT ScUndoSubTotals::~ScUndoSubTotals() +ScUndoSubTotals::~ScUndoSubTotals() { delete pUndoDoc; delete pUndoTable; @@ -687,12 +687,12 @@ __EXPORT ScUndoSubTotals::~ScUndoSubTotals() delete pUndoDB; } -String __EXPORT ScUndoSubTotals::GetComment() const +String ScUndoSubTotals::GetComment() const { // "Teilergebnisse" return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS ); } -void __EXPORT ScUndoSubTotals::Undo() +void ScUndoSubTotals::Undo() { BeginUndo(); @@ -770,7 +770,7 @@ void __EXPORT ScUndoSubTotals::Undo() EndUndo(); } -void __EXPORT ScUndoSubTotals::Redo() +void ScUndoSubTotals::Redo() { BeginRedo(); @@ -787,11 +787,11 @@ void __EXPORT ScUndoSubTotals::Redo() EndRedo(); } -void __EXPORT ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // geht nicht wegen Spaltennummern } @@ -820,18 +820,18 @@ ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell, } } -__EXPORT ScUndoSort::~ScUndoSort() +ScUndoSort::~ScUndoSort() { delete pUndoDoc; delete pUndoDB; } -String __EXPORT ScUndoSort::GetComment() const +String ScUndoSort::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_SORT ); } -void __EXPORT ScUndoSort::Undo() +void ScUndoSort::Undo() { BeginUndo(); @@ -886,7 +886,7 @@ void __EXPORT ScUndoSort::Undo() EndUndo(); } -void __EXPORT ScUndoSort::Redo() +void ScUndoSort::Redo() { BeginRedo(); @@ -913,11 +913,11 @@ void __EXPORT ScUndoSort::Redo() EndRedo(); } -void __EXPORT ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // geht nicht wegen Spaltennummern } @@ -955,7 +955,7 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); } -__EXPORT ScUndoQuery::~ScUndoQuery() +ScUndoQuery::~ScUndoQuery() { delete pUndoDoc; // delete pUndoDBData; @@ -963,12 +963,12 @@ __EXPORT ScUndoQuery::~ScUndoQuery() DeleteSdrUndoAction( pDrawUndo ); } -String __EXPORT ScUndoQuery::GetComment() const +String ScUndoQuery::GetComment() const { // "Filtern"; return ScGlobal::GetRscString( STR_UNDO_QUERY ); } -void __EXPORT ScUndoQuery::Undo() +void ScUndoQuery::Undo() { BeginUndo(); @@ -1071,7 +1071,7 @@ void __EXPORT ScUndoQuery::Undo() EndUndo(); } -void __EXPORT ScUndoQuery::Redo() +void ScUndoQuery::Redo() { BeginRedo(); @@ -1089,11 +1089,11 @@ void __EXPORT ScUndoQuery::Redo() EndRedo(); } -void __EXPORT ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // geht nicht wegen Spaltennummern } @@ -1182,18 +1182,18 @@ ScUndoDBData::ScUndoDBData( ScDocShell* pNewDocShell, { } -__EXPORT ScUndoDBData::~ScUndoDBData() +ScUndoDBData::~ScUndoDBData() { delete pUndoColl; delete pRedoColl; } -String __EXPORT ScUndoDBData::GetComment() const +String ScUndoDBData::GetComment() const { // "Datenbankbereiche aendern"; return ScGlobal::GetRscString( STR_UNDO_DBDATA ); } -void __EXPORT ScUndoDBData::Undo() +void ScUndoDBData::Undo() { BeginUndo(); @@ -1211,7 +1211,7 @@ void __EXPORT ScUndoDBData::Undo() EndUndo(); } -void __EXPORT ScUndoDBData::Redo() +void ScUndoDBData::Redo() { BeginRedo(); @@ -1229,11 +1229,11 @@ void __EXPORT ScUndoDBData::Redo() EndRedo(); } -void __EXPORT ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; // geht nicht } @@ -1262,7 +1262,7 @@ ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab, // redo doc doesn't contain imported data (but everything else) } -__EXPORT ScUndoImportData::~ScUndoImportData() +ScUndoImportData::~ScUndoImportData() { delete pUndoDoc; delete pRedoDoc; @@ -1270,12 +1270,12 @@ __EXPORT ScUndoImportData::~ScUndoImportData() delete pRedoDBData; } -String __EXPORT ScUndoImportData::GetComment() const +String ScUndoImportData::GetComment() const { // "Importieren"; return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA ); } -void __EXPORT ScUndoImportData::Undo() +void ScUndoImportData::Undo() { BeginUndo(); @@ -1364,7 +1364,7 @@ void __EXPORT ScUndoImportData::Undo() EndUndo(); } -void __EXPORT ScUndoImportData::Redo() +void ScUndoImportData::Redo() { BeginRedo(); @@ -1436,7 +1436,7 @@ void __EXPORT ScUndoImportData::Redo() EndRedo(); } -void __EXPORT ScUndoImportData::Repeat(SfxRepeatTarget& rTarget) +void ScUndoImportData::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { @@ -1451,7 +1451,7 @@ void __EXPORT ScUndoImportData::Repeat(SfxRepeatTarget& rTarget) } } -BOOL __EXPORT ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const { // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt @@ -1490,7 +1490,7 @@ ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab, } } -__EXPORT ScUndoRepeatDB::~ScUndoRepeatDB() +ScUndoRepeatDB::~ScUndoRepeatDB() { delete pUndoDoc; delete pUndoTable; @@ -1498,12 +1498,12 @@ __EXPORT ScUndoRepeatDB::~ScUndoRepeatDB() delete pUndoDB; } -String __EXPORT ScUndoRepeatDB::GetComment() const +String ScUndoRepeatDB::GetComment() const { // "Wiederholen"; //! bessere Beschreibung! return ScGlobal::GetRscString( STR_UNDO_REPEATDB ); } -void __EXPORT ScUndoRepeatDB::Undo() +void ScUndoRepeatDB::Undo() { BeginUndo(); @@ -1603,7 +1603,7 @@ void __EXPORT ScUndoRepeatDB::Undo() EndUndo(); } -void __EXPORT ScUndoRepeatDB::Redo() +void ScUndoRepeatDB::Redo() { BeginRedo(); @@ -1623,13 +1623,13 @@ void __EXPORT ScUndoRepeatDB::Redo() EndRedo(); } -void __EXPORT ScUndoRepeatDB::Repeat(SfxRepeatTarget& rTarget) +void ScUndoRepeatDB::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) ((ScTabViewTarget&)rTarget).GetViewShell()->RepeatDB( TRUE ); } -BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } @@ -1654,7 +1654,7 @@ ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, pNewDPObject = new ScDPObject( *pNewObj ); } -__EXPORT ScUndoDataPilot::~ScUndoDataPilot() +ScUndoDataPilot::~ScUndoDataPilot() { delete pOldDPObject; delete pNewDPObject; @@ -1662,7 +1662,7 @@ __EXPORT ScUndoDataPilot::~ScUndoDataPilot() delete pNewUndoDoc; } -String __EXPORT ScUndoDataPilot::GetComment() const +String ScUndoDataPilot::GetComment() const { USHORT nIndex; if ( pOldUndoDoc && pNewUndoDoc ) @@ -1675,7 +1675,7 @@ String __EXPORT ScUndoDataPilot::GetComment() const return ScGlobal::GetRscString( nIndex ); } -void __EXPORT ScUndoDataPilot::Undo() +void ScUndoDataPilot::Undo() { BeginUndo(); @@ -1760,7 +1760,7 @@ void __EXPORT ScUndoDataPilot::Undo() EndUndo(); } -void __EXPORT ScUndoDataPilot::Redo() +void ScUndoDataPilot::Redo() { BeginRedo(); @@ -1787,12 +1787,12 @@ void __EXPORT ScUndoDataPilot::Redo() EndRedo(); } -void __EXPORT ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */) { //! allow deletion } -BOOL __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const { //! allow deletion return FALSE; @@ -1818,19 +1818,19 @@ ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rA { } -__EXPORT ScUndoConsolidate::~ScUndoConsolidate() +ScUndoConsolidate::~ScUndoConsolidate() { delete pUndoDoc; delete pUndoTab; delete pUndoData; } -String __EXPORT ScUndoConsolidate::GetComment() const +String ScUndoConsolidate::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CONSOLIDATE ); } -void __EXPORT ScUndoConsolidate::Undo() +void ScUndoConsolidate::Undo() { BeginUndo(); @@ -1927,7 +1927,7 @@ void __EXPORT ScUndoConsolidate::Undo() EndUndo(); } -void __EXPORT ScUndoConsolidate::Redo() +void ScUndoConsolidate::Redo() { BeginRedo(); @@ -1944,11 +1944,11 @@ void __EXPORT ScUndoConsolidate::Redo() EndRedo(); } -void __EXPORT ScUndoConsolidate::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoConsolidate::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } @@ -1993,16 +1993,16 @@ ScUndoChartData::ScUndoChartData( ScDocShell* pNewDocShell, const String& rName, Init(); } -__EXPORT ScUndoChartData::~ScUndoChartData() +ScUndoChartData::~ScUndoChartData() { } -String __EXPORT ScUndoChartData::GetComment() const +String ScUndoChartData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CHARTDATA ); } -void __EXPORT ScUndoChartData::Undo() +void ScUndoChartData::Undo() { BeginUndo(); @@ -2012,7 +2012,7 @@ void __EXPORT ScUndoChartData::Undo() EndUndo(); } -void __EXPORT ScUndoChartData::Redo() +void ScUndoChartData::Redo() { BeginRedo(); @@ -2022,11 +2022,11 @@ void __EXPORT ScUndoChartData::Redo() EndRedo(); } -void __EXPORT ScUndoChartData::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoChartData::Repeat(SfxRepeatTarget& /* rTarget */) { } -BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx index 11f98d144..afaefedbb 100644 --- a/sc/source/ui/undo/undodraw.cxx +++ b/sc/source/ui/undo/undodraw.cxx @@ -178,7 +178,7 @@ ScUndoDraw::ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ) : { } -__EXPORT ScUndoDraw::~ScUndoDraw() +ScUndoDraw::~ScUndoDraw() { delete pDrawUndo; } @@ -188,7 +188,7 @@ void ScUndoDraw::ForgetDrawUndo() pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden) } -String __EXPORT ScUndoDraw::GetComment() const +String ScUndoDraw::GetComment() const { if (pDrawUndo) return pDrawUndo->GetComment(); @@ -196,7 +196,7 @@ String __EXPORT ScUndoDraw::GetComment() const return String(); } -String __EXPORT ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const +String ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const { if (pDrawUndo) return pDrawUndo->GetRepeatComment(rTarget); @@ -204,7 +204,7 @@ String __EXPORT ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const return String(); } -USHORT __EXPORT ScUndoDraw::GetId() const +USHORT ScUndoDraw::GetId() const { if (pDrawUndo) return pDrawUndo->GetId(); @@ -212,7 +212,7 @@ USHORT __EXPORT ScUndoDraw::GetId() const return 0; } -BOOL __EXPORT ScUndoDraw::IsLinked() +BOOL ScUndoDraw::IsLinked() { if (pDrawUndo) return pDrawUndo->IsLinked(); @@ -220,13 +220,13 @@ BOOL __EXPORT ScUndoDraw::IsLinked() return FALSE; } -void __EXPORT ScUndoDraw::SetLinked( BOOL bIsLinked ) +void ScUndoDraw::SetLinked( BOOL bIsLinked ) { if (pDrawUndo) pDrawUndo->SetLinked(bIsLinked); } -BOOL __EXPORT ScUndoDraw::Merge( SfxUndoAction* pNextAction ) +BOOL ScUndoDraw::Merge( SfxUndoAction* pNextAction ) { if (pDrawUndo) return pDrawUndo->Merge(pNextAction); @@ -234,7 +234,7 @@ BOOL __EXPORT ScUndoDraw::Merge( SfxUndoAction* pNextAction ) return FALSE; } -void __EXPORT ScUndoDraw::Undo() +void ScUndoDraw::Undo() { if (pDrawUndo) { @@ -243,7 +243,7 @@ void __EXPORT ScUndoDraw::Undo() } } -void __EXPORT ScUndoDraw::Redo() +void ScUndoDraw::Redo() { if (pDrawUndo) { @@ -252,13 +252,13 @@ void __EXPORT ScUndoDraw::Redo() } } -void __EXPORT ScUndoDraw::Repeat(SfxRepeatTarget& rTarget) +void ScUndoDraw::Repeat(SfxRepeatTarget& rTarget) { if (pDrawUndo) pDrawUndo->Repeat(rTarget); } -BOOL __EXPORT ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const +BOOL ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const { if (pDrawUndo) return pDrawUndo->CanRepeat(rTarget); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index a3104a17b..44af8ad53 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -448,7 +448,7 @@ IMPL_LINK( ScCellShell, ClipboardChanged, TransferableDataHelper*, pDataHelper ) } -void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet ) +void ScCellShell::GetClipState( SfxItemSet& rSet ) { // SID_PASTE // SID_PASTE_SPECIAL diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 1ef175cac..2934a1554 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1194,7 +1194,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } } -void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) +void ScCellShell::GetDBState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScViewData* pData = GetViewData(); diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index d85c0ccbb..65c99274f 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -35,14 +35,14 @@ //------------------------------------------------------------------------ -String __EXPORT SvxDrawToolItem::GetValueText() const +String SvxDrawToolItem::GetValueText() const { return GetValueText(GetValue()); } //------------------------------------------------------------------------ -String __EXPORT SvxDrawToolItem::GetValueText( USHORT nVal ) const +String SvxDrawToolItem::GetValueText( USHORT nVal ) const { const sal_Char* p; @@ -65,14 +65,14 @@ String __EXPORT SvxDrawToolItem::GetValueText( USHORT nVal ) const //------------------------------------------------------------------------ -SfxPoolItem* __EXPORT SvxDrawToolItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxDrawToolItem::Clone( SfxItemPool * ) const { return new SvxDrawToolItem(*this); } //------------------------------------------------------------------------ -SfxPoolItem* __EXPORT SvxDrawToolItem::Create( SvStream& rStream, USHORT nVer ) const +SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, USHORT nVer ) const { USHORT nVal; rStream >> nVal; diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 3c9fb3352..97a7c0d82 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -119,7 +119,7 @@ ScAnchorType ScDrawView::GetAnchor() const return SCA_DONTKNOW; } -void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) +void ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht { diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 40b67f4bf..875ccec40 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -148,7 +148,7 @@ void ScDrawView::ImplClearCalcDropMarker() } } -__EXPORT ScDrawView::~ScDrawView() +ScDrawView::~ScDrawView() { ImplClearCalcDropMarker(); } @@ -570,7 +570,7 @@ void ScDrawView::MarkListHasChanged() } -void __EXPORT ScDrawView::ModelHasChanged() +void ScDrawView::ModelHasChanged() { SdrObject* pEditObj = GetTextEditObject(); if ( pEditObj && !pEditObj->IsInserted() && pViewData ) @@ -584,7 +584,7 @@ void __EXPORT ScDrawView::ModelHasChanged() FmFormView::ModelHasChanged(); } -void __EXPORT ScDrawView::UpdateUserViewOptions() +void ScDrawView::UpdateUserViewOptions() { if (pViewData) { @@ -714,7 +714,7 @@ void ScDrawView::LockCalcLayer( SdrLayerID nLayer, bool bLock ) SetLayerLocked( pLockLayer->GetName(), bLock ); } -void __EXPORT ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin ) +void ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin ) { //! rWin richtig auswerten //! ggf Zoom aendern diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index bc038a01e..0cfac15f2 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -626,7 +626,7 @@ void lcl_DisableAll( SfxItemSet& rSet ) // disable all slots } } -void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) +void ScEditShell::GetState( SfxItemSet& rSet ) { // #125326# When deactivating the view, edit mode is stopped, but the EditShell is left active // (a shell can't be removed from within Deactivate). In that state, the EditView isn't inserted @@ -747,7 +747,7 @@ IMPL_LINK( ScEditShell, ClipboardChanged, TransferableDataHelper*, pDataHelper ) return 0; } -void __EXPORT ScEditShell::GetClipState( SfxItemSet& rSet ) +void ScEditShell::GetClipState( SfxItemSet& rSet ) { if ( !pClipEvtLstnr ) { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index c81c28ca8..4b2c51b79 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -179,7 +179,7 @@ ScFormatShell::~ScFormatShell() //------------------------------------------------------------------ -void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) +void ScFormatShell::GetStyleState( SfxItemSet& rSet ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -273,7 +273,7 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) //------------------------------------------------------------------ -void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) +void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { // Wenn ToolBar vertikal : if ( !rReq.GetArgs() ) diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index adea7a086..0d32bae85 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -235,7 +235,7 @@ ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, { } -__EXPORT ScFilterListBox::~ScFilterListBox() +ScFilterListBox::~ScFilterListBox() { if (IsMouseCaptured()) ReleaseMouse(); @@ -252,7 +252,7 @@ void ScFilterListBox::EndInit() bInit = FALSE; } -void __EXPORT ScFilterListBox::LoseFocus() +void ScFilterListBox::LoseFocus() { #ifndef UNX Hide(); @@ -287,13 +287,13 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) return nDone ? nDone : ListBox::PreNotify( rNEvt ); } -void __EXPORT ScFilterListBox::Select() +void ScFilterListBox::Select() { ListBox::Select(); SelectHdl(); } -void __EXPORT ScFilterListBox::SelectHdl() +void ScFilterListBox::SelectHdl() { if ( !IsTravelSelect() && !bInit && !bCancelled ) { @@ -487,7 +487,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic EnableRTL( FALSE ); } -__EXPORT ScGridWindow::~ScGridWindow() +ScGridWindow::~ScGridWindow() { // #114409# ImpDestroyOverlayObjects(); @@ -497,7 +497,7 @@ __EXPORT ScGridWindow::~ScGridWindow() delete pNoteMarker; } -void __EXPORT ScGridWindow::Resize( const Size& ) +void ScGridWindow::Resize( const Size& ) { // gar nix } @@ -1472,7 +1472,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) return bNewPointer; } -void __EXPORT ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt ) +void ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt ) { nNestedButtonState = SC_NESTEDBUTTON_DOWN; @@ -1793,7 +1793,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } } -void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) +void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) { aCurMousePos = rMEvt.GetPosPixel(); ScDocument* pDoc = pViewData->GetDocument(); @@ -2246,7 +2246,7 @@ void ScGridWindow::FakeButtonUp() } } -void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) +void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) { aCurMousePos = rMEvt.GetPosPixel(); @@ -2636,7 +2636,7 @@ void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Window* pWi pWin->SetCursorRect( &aEditArea ); } -void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) +void ScGridWindow::Command( const CommandEvent& rCEvt ) { // The command event is send to the window after a possible context // menu from an inplace client is closed. Now we have the chance to @@ -3076,7 +3076,7 @@ static void ClearSingleSelection( ScViewData* pViewData ) } } -void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) +void ScGridWindow::KeyInput(const KeyEvent& rKEvt) { // #96965# Cursor control for ref input dialog const KeyCode& rKeyCode = rKEvt.GetKeyCode(); @@ -4550,7 +4550,7 @@ void ScGridWindow::ShowCursor() --nCursorHideCount; } -void __EXPORT ScGridWindow::GetFocus() +void ScGridWindow::GetFocus() { ScTabViewShell* pViewShell = pViewData->GetViewShell(); pViewShell->GotFocus(); @@ -4573,7 +4573,7 @@ void __EXPORT ScGridWindow::GetFocus() Window::GetFocus(); } -void __EXPORT ScGridWindow::LoseFocus() +void ScGridWindow::LoseFocus() { ScTabViewShell* pViewShell = pViewData->GetViewShell(); pViewShell->LostFocus(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index b0e41277a..ddaf6b8ba 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -310,7 +310,7 @@ void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) //------------------------------------------------------------------------ -void __EXPORT ScGridWindow::PrePaint() +void ScGridWindow::PrePaint() { // forward PrePaint to DrawingLayer ScTabViewShell* pTabViewShell = pViewData->GetViewShell(); @@ -328,7 +328,7 @@ void __EXPORT ScGridWindow::PrePaint() //------------------------------------------------------------------------ -void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) +void ScGridWindow::Paint( const Rectangle& rRect ) { //TODO/LATER: how to get environment? Do we need that?! /* diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index de7dc79e0..73972f0bc 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -92,7 +92,7 @@ ScHintWindow::~ScHintWindow() } -void __EXPORT ScHintWindow::Paint( const Rectangle& /* rRect */ ) +void ScHintWindow::Paint( const Rectangle& /* rRect */ ) { SetFont( aHeadFont ); DrawText( Point(HINT_MARGIN,HINT_MARGIN), aTitle ); diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index f50feafd9..00600cf64 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -155,7 +155,7 @@ void ScPivotShell::Execute( SfxRequest& rReq ) } //------------------------------------------------------------------------ -void __EXPORT ScPivotShell::GetState( SfxItemSet& rSet ) +void ScPivotShell::GetState( SfxItemSet& rSet ) { ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 6e970f318..da6823146 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -144,7 +144,7 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView } -__EXPORT ScPreview::~ScPreview() +ScPreview::~ScPreview() { delete pDrawView; delete pLocationData; @@ -484,7 +484,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) } //Issue51656 Add resizeable margin on page preview from maoyg -void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ ) +void ScPreview::Paint( const Rectangle& /* rRect */ ) { if (!bValid) { @@ -672,7 +672,7 @@ void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ ) } //Issue51656 Add resizeable margin on page preview from maoyg -void __EXPORT ScPreview::Command( const CommandEvent& rCEvt ) +void ScPreview::Command( const CommandEvent& rCEvt ) { USHORT nCmd = rCEvt.GetCommand(); if ( nCmd == COMMAND_WHEEL || nCmd == COMMAND_STARTAUTOSCROLL || nCmd == COMMAND_AUTOSCROLL ) @@ -688,7 +688,7 @@ void __EXPORT ScPreview::Command( const CommandEvent& rCEvt ) } -void __EXPORT ScPreview::KeyInput( const KeyEvent& rKEvt ) +void ScPreview::KeyInput( const KeyEvent& rKEvt ) { // The + and - keys can't be configured as accelerator entries, so they must be handled directly // (in ScPreview, not ScPreviewShell -> only if the preview window has the focus) @@ -1010,7 +1010,7 @@ void ScPreview::DataChanged( const DataChangedEvent& rDCEvt ) } //Issue51656 Add resizeable margin on page preview from maoyg -void __EXPORT ScPreview::MouseButtonDown( const MouseEvent& rMEvt ) +void ScPreview::MouseButtonDown( const MouseEvent& rMEvt ) { Fraction aPreviewZoom( nZoom, 100 ); Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 ); @@ -1093,7 +1093,7 @@ void __EXPORT ScPreview::MouseButtonDown( const MouseEvent& rMEvt ) } } -void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) +void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) { Fraction aPreviewZoom( nZoom, 100 ); Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 ); @@ -1340,7 +1340,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) ReleaseMouse(); } -void __EXPORT ScPreview::MouseMove( const MouseEvent& rMEvt ) +void ScPreview::MouseMove( const MouseEvent& rMEvt ) { Fraction aPreviewZoom( nZoom, 100 ); Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 93b23bee7..90024de6e 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -172,7 +172,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, } } -__EXPORT ScPreviewShell::~ScPreviewShell() +ScPreviewShell::~ScPreviewShell() { // #108333#; notify Accessibility that Shell is dying and before destroy all BroadcastAccessibility( SfxSimpleHint( SFX_HINT_DYING ) ); @@ -201,12 +201,12 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) //------------------------------------------------------------------ -String __EXPORT ScPreviewShell::GetDescription() const +String ScPreviewShell::GetDescription() const { return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(" ** Test ** ")); } -Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const +Size ScPreviewShell::GetOptimalSizePixel() const { Size aOptSize(100,100); @@ -242,7 +242,7 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const return aOptSize; } -void __EXPORT ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) +void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) { long nBarW = GetViewFrame()->GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize(); long nBarH = nBarW; @@ -266,12 +266,12 @@ void __EXPORT ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size UpdateScrollBars(); } -void __EXPORT ScPreviewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) +void ScPreviewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) { AdjustPosSizePixel( rOfs,rSize ); } -void __EXPORT ScPreviewShell::OuterResizePixel( const Point &rOfs, const Size &rSize ) +void ScPreviewShell::OuterResizePixel( const Point &rOfs, const Size &rSize ) { AdjustPosSizePixel( rOfs,rSize ); } @@ -471,17 +471,17 @@ BOOL ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt ) return bDone; } -SfxPrinter* __EXPORT ScPreviewShell::GetPrinter( BOOL bCreate ) +SfxPrinter* ScPreviewShell::GetPrinter( BOOL bCreate ) { return pDocShell->GetPrinter(bCreate); } -USHORT __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool ) +USHORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool ) { return pDocShell->SetPrinter( pNewPrinter, nDiffFlags ); } -PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent ) +PrintDialog* ScPreviewShell::CreatePrintDialog( Window* pParent ) { pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen (void)GetPrinter(); @@ -525,7 +525,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt return 0; } -void __EXPORT ScPreviewShell::PreparePrint( PrintDialog* pPrintDialog ) +void ScPreviewShell::PreparePrint( PrintDialog* pPrintDialog ) { SfxViewShell::PreparePrint( pPrintDialog ); @@ -551,7 +551,7 @@ ErrCode ScPreviewShell::DoPrint( SfxPrinter *pPrinter, return nRet; } -USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) +USHORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) { pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen @@ -587,7 +587,7 @@ USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, Prin //------------------------------------------------------------------------ -void __EXPORT ScPreviewShell::Activate(BOOL bMDI) +void ScPreviewShell::Activate(BOOL bMDI) { SfxViewShell::Activate(bMDI); @@ -602,7 +602,7 @@ void __EXPORT ScPreviewShell::Activate(BOOL bMDI) } } -void __EXPORT ScPreviewShell::Deactivate(BOOL bMDI) +void ScPreviewShell::Deactivate(BOOL bMDI) { SfxViewShell::Deactivate(bMDI); @@ -613,7 +613,7 @@ void __EXPORT ScPreviewShell::Deactivate(BOOL bMDI) //------------------------------------------------------------------------ -void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) +void ScPreviewShell::Execute( SfxRequest& rReq ) { USHORT nSlot = rReq.GetSlot(); const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -827,7 +827,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) } } -void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet ) +void ScPreviewShell::GetState( SfxItemSet& rSet ) { pPreview->SetInGetState(TRUE); @@ -955,7 +955,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) // eNumType kennt der Dialog selber } -void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */) +void ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */) { // nZoom // nPageNo @@ -965,7 +965,7 @@ void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */) rData += String::CreateFromInt32(pPreview->GetPageNo()); } -void __EXPORT ScPreviewShell::ReadUserData(const String& rData, BOOL /* bBrowse */) +void ScPreviewShell::ReadUserData(const String& rData, BOOL /* bBrowse */) { xub_StrLen nCount = rData.GetTokenCount(); if (nCount) @@ -977,7 +977,7 @@ void __EXPORT ScPreviewShell::ReadUserData(const String& rData, BOOL /* bBrowse } } -void __EXPORT ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue >& rSeq, sal_Bool /* bBrowse */) +void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue >& rSeq, sal_Bool /* bBrowse */) { rSeq.realloc(3); beans::PropertyValue* pSeq = rSeq.getArray(); @@ -995,7 +995,7 @@ void __EXPORT ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::Prope } } -void __EXPORT ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq, sal_Bool /* bBrowse */) +void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq, sal_Bool /* bBrowse */) { sal_Int32 nCount(rSeq.getLength()); if (nCount) diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 72a7a7aa4..58c048d19 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -310,7 +310,7 @@ // ----------------------------------------------------------------------- -void __EXPORT ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { BOOL bDataChanged = FALSE; diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 6c31e3b41..8bb3a3b27 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -75,7 +75,7 @@ SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT ) //<!--Added by PengYunQuan for Validity Cell Range Picker //SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE ) SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE) -SfxChildWinInfo __EXPORT ScValidityRefChildWin::GetInfo() const +SfxChildWinInfo ScValidityRefChildWin::GetInfo() const { SfxChildWinInfo anInfo = SfxChildWindow::GetInfo(); diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index cae66699b..0063d025b 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -85,7 +85,7 @@ void ScViewFunctionSet::SetSelectionEngine( ScViewSelectionEngine* pSelEngine ) // Drag & Drop -void __EXPORT ScViewFunctionSet::BeginDrag() +void ScViewFunctionSet::BeginDrag() { SCTAB nTab = pViewData->GetTabNo(); @@ -160,7 +160,7 @@ void __EXPORT ScViewFunctionSet::BeginDrag() // Selection -void __EXPORT ScViewFunctionSet::CreateAnchor() +void ScViewFunctionSet::CreateAnchor() { if (bAnchor) return; @@ -215,7 +215,7 @@ void ScViewFunctionSet::SetAnchor( SCCOL nPosX, SCROW nPosY ) bAnchor = TRUE; } -void __EXPORT ScViewFunctionSet::DestroyAnchor() +void ScViewFunctionSet::DestroyAnchor() { BOOL bRefMode = SC_MOD()->IsFormulaMode(); if (bRefMode) @@ -231,7 +231,7 @@ void ScViewFunctionSet::SetAnchorFlag( BOOL bSet ) bAnchor = bSet; } -BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL /* bDontSelectAtCursor */ ) +BOOL ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL /* bDontSelectAtCursor */ ) { if ( bDidSwitch ) { @@ -612,7 +612,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol return TRUE; } -BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) +BOOL ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) { BOOL bRefMode = SC_MOD()->IsFormulaMode(); if (bRefMode) @@ -633,12 +633,12 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) return FALSE; } -void __EXPORT ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ ) +void ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ ) { // gibt's nicht } -void __EXPORT ScViewFunctionSet::DeselectAll() +void ScViewFunctionSet::DeselectAll() { if (pViewData->IsAnyFillMode()) return; @@ -696,12 +696,12 @@ void ScHeaderFunctionSet::SetWhich( ScSplitPos eNew ) eWhich = eNew; } -void __EXPORT ScHeaderFunctionSet::BeginDrag() +void ScHeaderFunctionSet::BeginDrag() { // gippsnich } -void __EXPORT ScHeaderFunctionSet::CreateAnchor() +void ScHeaderFunctionSet::CreateAnchor() { if (bAnchor) return; @@ -721,13 +721,13 @@ void __EXPORT ScHeaderFunctionSet::CreateAnchor() bAnchor = TRUE; } -void __EXPORT ScHeaderFunctionSet::DestroyAnchor() +void ScHeaderFunctionSet::DestroyAnchor() { pViewData->GetView()->DoneBlockMode( TRUE ); bAnchor = FALSE; } -BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL /* bDontSelectAtCursor */ ) +BOOL ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL /* bDontSelectAtCursor */ ) { if ( bDidSwitch ) { @@ -830,7 +830,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B return TRUE; } -BOOL __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) +BOOL ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) { SCsCOL nPosX; SCsROW nPosY; @@ -844,11 +844,11 @@ BOOL __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel return rMark.IsRowMarked( nPosY ); } -void __EXPORT ScHeaderFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ ) +void ScHeaderFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ ) { } -void __EXPORT ScHeaderFunctionSet::DeselectAll() +void ScHeaderFunctionSet::DeselectAll() { pViewData->GetView()->DoneBlockMode( FALSE ); bAnchor = FALSE; diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index eda248c8f..79e4f2741 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -54,7 +54,7 @@ ScTabSplitter::~ScTabSplitter() { } -void __EXPORT ScTabSplitter::MouseMove( const MouseEvent& rMEvt ) +void ScTabSplitter::MouseMove( const MouseEvent& rMEvt ) { if (bFixed) Window::MouseMove( rMEvt ); @@ -62,7 +62,7 @@ void __EXPORT ScTabSplitter::MouseMove( const MouseEvent& rMEvt ) Splitter::MouseMove( rMEvt ); } -void __EXPORT ScTabSplitter::MouseButtonUp( const MouseEvent& rMEvt ) +void ScTabSplitter::MouseButtonUp( const MouseEvent& rMEvt ) { if (bFixed) Window::MouseButtonUp( rMEvt ); @@ -70,7 +70,7 @@ void __EXPORT ScTabSplitter::MouseButtonUp( const MouseEvent& rMEvt ) Splitter::MouseButtonUp( rMEvt ); } -void __EXPORT ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) +void ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) { if (bFixed) Window::MouseButtonDown( rMEvt ); @@ -78,7 +78,7 @@ void __EXPORT ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) Splitter::MouseButtonDown( rMEvt ); } -void __EXPORT ScTabSplitter::Splitting( Point& rSplitPos ) +void ScTabSplitter::Splitting( Point& rSplitPos ) { Window* pParent = GetParent(); Point aScreenPos = pParent->OutputToNormalizedScreenPixel( rSplitPos ); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 535a0400c..33f70680c 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -177,11 +177,11 @@ ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditi EnableRTL( FALSE ); } -__EXPORT ScCornerButton::~ScCornerButton() +ScCornerButton::~ScCornerButton() { } -void __EXPORT ScCornerButton::Paint( const Rectangle& rRect ) +void ScCornerButton::Paint( const Rectangle& rRect ) { Size aSize = GetOutputSizePixel(); long nPosX = aSize.Width()-1; @@ -247,12 +247,12 @@ void ScCornerButton::DataChanged( const DataChangedEvent& rDCEvt ) } -void __EXPORT ScCornerButton::Resize() +void ScCornerButton::Resize() { Invalidate(); } -void __EXPORT ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) +void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) { ScModule* pScMod = SC_MOD(); BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 0c83060d1..57e804c06 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -73,7 +73,7 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -void __EXPORT ScTabView::Init() +void ScTabView::Init() { /* RTL layout of the view windows is done manually, because it depends on the sheet orientation, not the UI setting. Note: controls that are @@ -148,7 +148,7 @@ void __EXPORT ScTabView::Init() TestHintWindow(); } -__EXPORT ScTabView::~ScTabView() +ScTabView::~ScTabView() { USHORT i; diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index c9069b543..45ae0c307 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -71,7 +71,7 @@ // ----------------------------------------------------------------------- -SdrView* __EXPORT ScTabViewShell::GetDrawView() const +SdrView* ScTabViewShell::GetDrawView() const { return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 80cdd8d40..8d7156393 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -114,7 +114,7 @@ USHORT ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; // ----------------------------------------------------------------------- -void __EXPORT ScTabViewShell::Activate(BOOL bMDI) +void ScTabViewShell::Activate(BOOL bMDI) { SfxViewShell::Activate(bMDI); @@ -228,7 +228,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) // beim Umschalten zwischen Dokumenten) } -void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) +void ScTabViewShell::Deactivate(BOOL bMDI) { HideTip(); @@ -283,7 +283,7 @@ void ScTabViewShell::SetActive() ActiveGrabFocus(); } -USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing) +USHORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing) { // Call EnterHandler even in formula mode here, // so a formula change in an embedded object isn't lost @@ -319,7 +319,7 @@ USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing) //------------------------------------------------------------------ -Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const +Size ScTabViewShell::GetOptimalSizePixel() const { Size aOptSize; @@ -367,12 +367,12 @@ void ScTabViewShell::UpdateOleZoom() } } -void __EXPORT ScTabViewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) +void ScTabViewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) { OuterResizePixel( rPos, rSize ); } -void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) +void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) { Size aNewSize( rSize ); if ( GetViewFrame()->GetFrame().IsInPlace() ) @@ -416,7 +416,7 @@ void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &r GetViewData()->GetDocShell()->SetDocumentModified(); } -void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &rSize ) +void ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &rSize ) { SvBorder aBorder; GetBorderSize( aBorder, rSize ); @@ -430,7 +430,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r ForceMove(); } -void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) +void ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) { // fuer OLE... @@ -458,7 +458,7 @@ void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fract SfxViewShell::SetZoomFactor( rZoomX, rZoomY ); } -void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const +void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const { // auf ganze Zellen anpassen (in 1/100 mm) @@ -489,7 +489,7 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const //------------------------------------------------------------------ -void __EXPORT ScTabViewShell::Move() +void ScTabViewShell::Move() { Point aNewPos = GetViewFrame()->GetWindow().OutputToScreenPixel(Point()); @@ -502,7 +502,7 @@ void __EXPORT ScTabViewShell::Move() //------------------------------------------------------------------ -void __EXPORT ScTabViewShell::ShowCursor(bool /* bOn */) +void ScTabViewShell::ShowCursor(bool /* bOn */) { /*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. Der CursorLockCount am Gridwin muss hier direkt auf 0 gesetzt werden @@ -516,7 +516,7 @@ void __EXPORT ScTabViewShell::ShowCursor(bool /* bOn */) //------------------------------------------------------------------ -void __EXPORT ScTabViewShell::WriteUserData(String& rData, BOOL /* bBrowse */) +void ScTabViewShell::WriteUserData(String& rData, BOOL /* bBrowse */) { GetViewData()->WriteUserData(rData); } @@ -526,7 +526,7 @@ void ScTabViewShell::WriteUserDataSequence (uno::Sequence < beans::PropertyValue GetViewData()->WriteUserDataSequence (rSettings); } -void __EXPORT ScTabViewShell::ReadUserData(const String& rData, BOOL /* bBrowse */) +void ScTabViewShell::ReadUserData(const String& rData, BOOL /* bBrowse */) { if ( !GetViewData()->GetDocShell()->IsPreview() ) DoReadUserData( rData ); @@ -1088,18 +1088,18 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell() //------------------------------------------------------------------ -SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( BOOL bCreate ) +SfxPrinter* ScTabViewShell::GetPrinter( BOOL bCreate ) { // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) return GetViewData()->GetDocShell()->GetPrinter(bCreate); } -USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool ) +USHORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool ) { return GetViewData()->GetDocShell()->SetPrinter( pNewPrinter, nDiffFlags ); } -PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent ) +PrintDialog* ScTabViewShell::CreatePrintDialog( Window *pParent ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocShell->GetDocument(); @@ -1165,7 +1165,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt return 0; } -void __EXPORT ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog ) +void ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -1225,7 +1225,7 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, return nRet; } -USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, +USHORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -1568,7 +1568,7 @@ BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent) return sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKeyEvent )); } -bool __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) +bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) { // return SfxViewShell::KeyInput( rKeyEvent ); return TabKeyInput( rKeyEvent ); @@ -1881,7 +1881,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, //------------------------------------------------------------------ -__EXPORT ScTabViewShell::~ScTabViewShell() +ScTabViewShell::~ScTabViewShell() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); EndListening(*pDocSh); diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 920a6e3ee..1ab221ced 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -57,7 +57,7 @@ //================================================================== -void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) +void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (rHint.ISA(SfxSimpleHint)) // ohne Parameter { diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index 9ab882efb..9a2c6e2b1 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -61,7 +61,7 @@ void ScTabViewShell::SetDefaultFrameLine( const SvxBorderLine* pLine ) //------------------------------------------------------------------ -BOOL __EXPORT ScTabViewShell::HasSelection( BOOL bText ) const +BOOL ScTabViewShell::HasSelection( BOOL bText ) const { BOOL bHas = FALSE; ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index e320c5604..8ec750425 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -172,7 +172,7 @@ ScInputHandler* ScTabViewShell::GetInputHandler() const //------------------------------------------------------------------ -String __EXPORT ScTabViewShell::GetDescription() const +String ScTabViewShell::GetDescription() const { return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(" ** Test ** ")); } diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 0cdce33d3..11a1100df 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -162,7 +162,7 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) // FID_VALIDATION -void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) +void ScTabViewShell::GetState( SfxItemSet& rSet ) { ScViewData* pViewData = GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); @@ -706,7 +706,7 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ) //------------------------------------------------------------------ -void __EXPORT ScTabViewShell::ExecuteSave( SfxRequest& rReq ) +void ScTabViewShell::ExecuteSave( SfxRequest& rReq ) { // nur SID_SAVEDOC / SID_SAVEASDOC @@ -722,7 +722,7 @@ void __EXPORT ScTabViewShell::ExecuteSave( SfxRequest& rReq ) GetViewData()->GetDocShell()->ExecuteSlot( rReq ); } -void __EXPORT ScTabViewShell::GetSaveState( SfxItemSet& rSet ) +void ScTabViewShell::GetSaveState( SfxItemSet& rSet ) { SfxShell* pDocSh = GetViewData()->GetDocShell(); diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index e663fbbeb..a09e02989 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -220,7 +220,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) return ( !(nErr & ERRCODE_ERROR_MASK) ); } -ErrCode __EXPORT ScTabViewShell::DoVerb(long nVerb) +ErrCode ScTabViewShell::DoVerb(long nVerb) { SdrView* pView = GetSdrView(); if (!pView) diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 554611b4d..ac0ca964b 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -57,7 +57,7 @@ //================================================================== -String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) +String ScTabViewShell::GetSelectionText( BOOL bWholeWord ) { String aStrSelection; |