diff options
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 30 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/servobj.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/tablink.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/tpstat.cxx | 8 |
8 files changed, 42 insertions, 42 deletions
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 */ ) { } |