diff options
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 173 | ||||
| -rw-r--r-- | framework/source/services/desktop.cxx | 30 | ||||
| -rw-r--r-- | framework/source/services/dispatchhelper.cxx | 11 | ||||
| -rw-r--r-- | framework/source/services/frame.cxx | 93 | ||||
| -rw-r--r-- | framework/source/services/mediatypedetectionhelper.cxx | 4 | ||||
| -rw-r--r-- | framework/source/services/modulemanager.cxx | 3 | ||||
| -rw-r--r-- | framework/source/services/pathsettings.cxx | 39 | ||||
| -rw-r--r-- | framework/source/services/sessionlistener.cxx | 3 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 7 | ||||
| -rw-r--r-- | framework/source/services/tabwindowservice.cxx | 24 | ||||
| -rw-r--r-- | framework/source/services/taskcreatorsrv.cxx | 11 | ||||
| -rw-r--r-- | framework/source/services/uriabbreviation.cxx | 5 | ||||
| -rw-r--r-- | framework/source/services/urltransformer.cxx | 3 |
13 files changed, 0 insertions, 406 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 58e48d4157fd..f9eccb764128 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -104,7 +104,6 @@ using namespace framework; namespace { - /** @short hold all needed information for an asynchronous dispatch alive. @descr Because some operations are forced to be executed asynchronously @@ -127,7 +126,6 @@ public: public: - /** @short can be set from outside and is provided to our internal started operations. @@ -139,16 +137,13 @@ public: */ css::uno::Reference< css::task::XStatusIndicator > m_xProgress; - /** TODO document me */ OUString m_sSavePath; - /** @short define the current cache entry, which should be used for current backup or cleanUp operation ... which is may be done asynchronous */ sal_Int32 m_nWorkingEntryID; - /** @short used for asyncoperations, to prevent us from dying. @descr If our dispatch() method was forced to start the @@ -160,7 +155,6 @@ public: css::uno::Reference< css::uno::XInterface > m_xHoldRefForAsyncOpAlive; }; - /** implements the functionality of AutoSave and AutoRecovery of documents - including features of an EmergencySave in @@ -264,13 +258,11 @@ public: E_USER_AUTO_SAVE = 2048 }; - /** @short combine different information about one office document. */ struct TDocumentInfo { public: - TDocumentInfo() : DocumentState (E_UNKNOWN) , UsedForSaving (sal_False) @@ -279,11 +271,9 @@ public: , ID (-1 ) {} - /** @short points to the document. */ css::uno::Reference< css::frame::XModel > Document; - /** @short knows, if the document is really modified since the last autosave, or was postponed, because it was an active one etcpp... @@ -296,14 +286,12 @@ public: */ sal_Int32 DocumentState; - /** Because our applications not ready for concurrent save requests at the same time, we have supress our own AutoSave for the moment, a document will be already saved by others. */ sal_Bool UsedForSaving; - /** For every user action, which modifies a document (e.g. key input) we get a notification as XModifyListener. That seems to be a "performance issue" .-) So we decided to listen for such modify events only for the time in which the document @@ -311,7 +299,6 @@ public: */ sal_Bool ListenForModify; - /** For SessionSave we must close all open documents by ourself. But because we are listen for documents events, we get some ... and deregister these documents from our configuration. @@ -320,7 +307,6 @@ public: */ sal_Bool IgnoreClosing; - /** TODO: document me */ OUString OrgURL; OUString FactoryURL; @@ -341,104 +327,86 @@ public: sal_Int32 ID; }; - /** @short used to know every currently open document. */ typedef ::std::vector< TDocumentInfo > TDocumentList; - // member private: - /** @short the global uno service manager. @descr Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short points to the underlying recovery configuration. @descr This instance does not cache - it calls directly the configuration API! */ css::uno::Reference< css::container::XNameAccess > m_xRecoveryCFG; - /** @short proxy weak binding to forward Events to ourself without an ownership cycle */ css::uno::Reference< css::util::XChangesListener > m_xRecoveryCFGListener; - /** @short points to the used configuration package or.openoffice.Setup @descr This instance does not cache - it calls directly the configuration API! */ css::uno::Reference< css::container::XNameAccess > m_xModuleCFG; - /** @short holds the global event broadcaster alive, where we listen for new created documents. */ css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xNewDocBroadcaster; - /** @short proxy weak binding to forward Events to ourself without an ownership cycle */ css::uno::Reference< css::document::XEventListener > m_xNewDocBroadcasterListener; - /** @short because we stop/restart listening sometimes, it's a good idea to know if we already registered as listener .-) */ sal_Bool m_bListenForDocEvents; sal_Bool m_bListenForConfigChanges; - /** @short specify the time intervall between two save actions. @descr Time is measured in [min]. */ sal_Int32 m_nAutoSaveTimeIntervall; - /** @short for an asynchronous operation we must know, if there is at least one running job (may be asynchronous!). */ sal_Int32 m_eJob; - /** @short the timer, which is used to be informed about the next saving time ... */ Timer m_aTimer; - /** @short make our dispatch asynchronous ... if required to do so! */ ::vcl::EventPoster m_aAsyncDispatcher; - /** @see DispatchParams */ DispatchParams m_aDispatchParams; - /** @short indicates, which time period is currently used by the internal timer. */ ETimerType m_eTimerType; - /** @short this cache is used to hold all information about recovery/emergency save documents alive. */ TDocumentList m_lDocCache; - // TODO document me sal_Int32 m_nIdPool; - /** @short contains all status listener registered at this instance. */ ListenerHash m_lListener; @@ -466,7 +434,6 @@ private: sal_Int32 m_nMinSpaceDocSave; sal_Int32 m_nMinSpaceConfigSave; - /** @short special debug option to make testing faster. @descr We dont interpret the timer unit as [min] ... @@ -477,11 +444,9 @@ private: sal_Bool m_dbg_bMakeItFaster; #endif - // HACK ... TODO css::uno::Reference< css::task::XStatusIndicator > m_xExternalProgress; - // interface public: @@ -522,7 +487,6 @@ public: // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) @@ -536,7 +500,6 @@ public: const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.document.XEventListener /** @short informs about created/opened documents. @@ -550,24 +513,20 @@ public: virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.util.XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, @@ -591,7 +550,6 @@ protected: private: virtual void SAL_CALL disposing() SAL_OVERRIDE; - /** @short open the underlying configuration. @descr This method must be called every time @@ -610,7 +568,6 @@ private: */ css::uno::Reference< css::container::XNameAccess > implts_openConfig(); - /** @short read the underlying configuration. @descr After that we know the initial state - means: @@ -625,7 +582,6 @@ private: */ void implts_readConfig(); - /** @short read the underlying configuration... @descr ... but only keys related to the AutoSave mechanism. @@ -639,22 +595,18 @@ private: */ void implts_readAutoSaveConfig(); - // TODO document me void implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo , sal_Bool bRemoveIt = sal_False); - // TODO document me void implts_startListening(); void implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo); - // TODO document me void implts_stopListening(); void implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo); - /** @short stops and may be(!) restarts the timer. @descr A running timer is stopped every time here. @@ -669,7 +621,6 @@ private: */ void implts_updateTimer(); - /** @short stop the timer. @descr Double calls will be ignored - means we do @@ -682,21 +633,17 @@ private: */ void implts_stopTimer(); - /** @short callback of our internal timer. */ DECL_LINK(implts_timerExpired, void*); - /** @short makes our dispatch() method asynchronous! */ DECL_LINK(implts_asyncDispatch, void*); - /** @short implements the dispatch real. */ void implts_dispatch(const DispatchParams& aParams); - /** @short validate new detected document and add it into the internal document list. @@ -712,7 +659,6 @@ private: */ void implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument); - /** @short remove the specified document from our internal document list. @param xDocument @@ -729,24 +675,19 @@ private: void implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bStopListening = sal_True); - // TODO document me void implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument); - // TODO document me void implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument); - // TODO document me void implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bSaveInProgress); - // TODO document me void implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument); - /** @short search a document inside given list. @param rList @@ -765,12 +706,10 @@ private: static TDocumentList::iterator impl_searchDocument( AutoRecovery::TDocumentList& rList , const css::uno::Reference< css::frame::XModel >& xDocument); - /** TODO document me */ void implts_changeAllDocVisibility(sal_Bool bVisible); void implts_prepareSessionShutdown(); - /** @short save all current opened documents to a specific backup directory. @@ -810,7 +749,6 @@ private: sal_Bool bRemoveLockFiles, const DispatchParams* pParams = 0); - /** @short save one of the current documents to a specific backup directory. @@ -848,7 +786,6 @@ private: AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress); - /** @short recovery all documents, which was saved during a crash before. @@ -858,19 +795,16 @@ private: */ AutoRecovery::ETimerType implts_openDocs(const DispatchParams& aParams); - // TODO document me void implts_openOneDoc(const OUString& sURL , utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ); - // TODO document me void implts_generateNewTempURL(const OUString& sBackupPath , utl::MediaDescriptor& rMediaDescriptor, AutoRecovery::TDocumentInfo& rInfo ); - /** @short notifies all interested listener about the current state of the currently running operation. @@ -890,7 +824,6 @@ private: void implts_informListener( sal_Int32 eJob , const css::frame::FeatureStateEvent& aEvent); - /** short create a feature event struct, which can be send to any interested listener. @@ -913,7 +846,6 @@ private: const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ); - class ListenerInformer { private: @@ -933,16 +865,12 @@ private: } }; - - // TODO document me void implts_resetHandleStates(sal_Bool bLoadCache); - // TODO document me void implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo); - // TODO document me void implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo); @@ -956,39 +884,30 @@ private: */ void implts_persistAllActiveViewNames(); - // TODO document me void implts_prepareEmergencySave(); - // TODO document me void implts_doEmergencySave(const DispatchParams& aParams); - // TODO document me void implts_doRecovery(const DispatchParams& aParams); - // TODO document me void implts_doSessionSave(const DispatchParams& aParams); - // TODO document me void implts_doSessionQuietQuit(const DispatchParams& aParams); - // TODO document me void implts_doSessionRestore(const DispatchParams& aParams); - // TODO document me void implts_backupWorkingEntry(const DispatchParams& aParams); - // TODO document me void implts_cleanUpWorkingEntry(const DispatchParams& aParams); - /** try to make sure that all changed config items (not our used config access only) will be flushed back to disc. @@ -999,13 +918,11 @@ private: */ void impl_flushALLConfigChanges(); - // TODO document me AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource , const OUString& sTargetPath, const OUString& sTargetName); - /** @short converts m_eJob into a job description, which can be used to inform an outside listener about the current running operation @@ -1020,7 +937,6 @@ private: */ static OUString implst_getJobDescription(sal_Int32 eJob); - /** @short mape the given URL to an internal int representation. @param aURL @@ -1042,7 +958,6 @@ private: /// TODO document me static void impl_showFullDiscError(); - /** @short try to create/use a progress and set it inside the environment. @@ -1074,7 +989,6 @@ private: utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); - /** try to remove the specified file from disc. Every URL supported by our UCB component can be used here. @@ -1092,7 +1006,6 @@ private: */ void st_impl_removeFile(const OUString& sURL); - /** try to remove ".lock" file from disc if office will be terminated not using the offical way .-) @@ -1102,8 +1015,6 @@ private: void st_impl_removeLockFile(); }; - - // recovery.xcu static const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/"; static const char CFG_ENTRY_RECOVERYLIST[] = "RecoveryList"; @@ -1206,7 +1117,6 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in // force "return sal_False" for the method impl_enoughDiscSpace(). // #define SIMULATE_FULL_DISC - class CacheLockGuard { private: @@ -1237,7 +1147,6 @@ class CacheLockGuard void unlock(); }; - CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , osl::Mutex& rMutex , sal_Int32& rCacheLock , @@ -1250,14 +1159,12 @@ CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , lock(bLockForAddRemoveVectorItems); } - CacheLockGuard::~CacheLockGuard() { unlock(); m_xOwner.clear(); } - void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) { /* SAFE */ { @@ -1292,7 +1199,6 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) } /* SAFE */ } - void CacheLockGuard::unlock() { /* SAFE */ { @@ -1314,13 +1220,11 @@ void CacheLockGuard::unlock() } /* SAFE */ } - DispatchParams::DispatchParams() : m_nWorkingEntryID(-1) { }; - DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& lArgs , const css::uno::Reference< css::uno::XInterface >& xOwner) { @@ -1330,7 +1234,6 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& m_xHoldRefForAsyncOpAlive = xOwner; }; - DispatchParams::DispatchParams(const DispatchParams& rCopy) { m_xProgress = rCopy.m_xProgress; @@ -1339,11 +1242,9 @@ DispatchParams::DispatchParams(const DispatchParams& rCopy) m_xHoldRefForAsyncOpAlive = rCopy.m_xHoldRefForAsyncOpAlive; }; - DispatchParams::~DispatchParams() {}; - DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) { m_xProgress = rCopy.m_xProgress; @@ -1353,7 +1254,6 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) return *this; } - void DispatchParams::forget() { m_sSavePath = ""; @@ -1362,7 +1262,6 @@ void DispatchParams::forget() m_xHoldRefForAsyncOpAlive.clear(); }; - AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext) : AutoRecovery_BASE (m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) @@ -1397,7 +1296,6 @@ void AutoRecovery::initListeners() m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired)); } - AutoRecovery::~AutoRecovery() { disposing(); @@ -1424,7 +1322,6 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::R ); } - void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) @@ -1521,7 +1418,6 @@ void AutoRecovery::ListenerInformer::stop() m_bStopped = true; } - void AutoRecovery::implts_dispatch(const DispatchParams& aParams) { sal_Int32 eJob; @@ -1659,7 +1555,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) implts_startListening(); } - void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) @@ -1693,7 +1588,6 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr } /* SAFE */ } - void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) @@ -1704,7 +1598,6 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: m_lListener.removeInterface(aURL.Complete, xListener); } - void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1773,7 +1666,6 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent } } - void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1827,7 +1719,6 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven implts_updateTimer(); } - void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1838,7 +1729,6 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) implts_markDocumentModifiedAgainstLastBackup(xDocument); } - void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1870,7 +1760,6 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) } /* SAFE */ } - css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConfig() { /* SAFE */ { @@ -1923,7 +1812,6 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf return xCFG; } - void AutoRecovery::implts_readAutoSaveConfig() { css::uno::Reference< css::container::XHierarchicalNameAccess > xCommonRegistry(implts_openConfig(), css::uno::UNO_QUERY); @@ -1969,7 +1857,6 @@ void AutoRecovery::implts_readAutoSaveConfig() } /* SAFE */ } - void AutoRecovery::implts_readConfig() { implts_readAutoSaveConfig(); @@ -2056,7 +1943,6 @@ void AutoRecovery::implts_readConfig() implts_updateTimer(); } - void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo) { if (rInfo.AppModule.isEmpty()) @@ -2119,7 +2005,6 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume } } - void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo) { ENSURE_OR_THROW2( @@ -2137,7 +2022,6 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService; } - void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i_rInfo ) { ENSURE_OR_THROW2( i_rInfo.Document.is(), "need at document, at the very least", *this ); @@ -2178,7 +2062,6 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() ); } - void AutoRecovery::implts_persistAllActiveViewNames() { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2194,7 +2077,6 @@ void AutoRecovery::implts_persistAllActiveViewNames() } } - void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo, sal_Bool bRemoveIt) { css::uno::Reference< css::container::XHierarchicalNameAccess > xCFG; @@ -2300,7 +2182,6 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn while(nRetry>0); } - void AutoRecovery::implts_startListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; @@ -2346,7 +2227,6 @@ void AutoRecovery::implts_startListening() } } - void AutoRecovery::implts_stopListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; @@ -2379,7 +2259,6 @@ void AutoRecovery::implts_stopListening() } } - void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo) { if (rInfo.ListenForModify) @@ -2394,7 +2273,6 @@ void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& } } - void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo) { if (! rInfo.ListenForModify) @@ -2409,7 +2287,6 @@ void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& } } - void AutoRecovery::implts_updateTimer() { implts_stopTimer(); @@ -2449,7 +2326,6 @@ void AutoRecovery::implts_updateTimer() } /* SAFE */ } - void AutoRecovery::implts_stopTimer() { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2459,7 +2335,6 @@ void AutoRecovery::implts_stopTimer() m_aTimer.Stop(); } - IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) { try @@ -2556,7 +2431,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) return 0; } - IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) { DispatchParams aParams; @@ -2577,7 +2451,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) return 0; } - void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument) { // ignore corrupted events, where no document is given ... Runtime Error ?! @@ -2700,7 +2573,6 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame aCacheLock.unlock(); } - void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bStopListening) { @@ -2748,7 +2620,6 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config } - void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2770,7 +2641,6 @@ void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno:: } /* SAFE */ } - void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2801,7 +2671,6 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr } /* SAFE */ } - void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bSaveInProgress) { @@ -2819,7 +2688,6 @@ void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Refer } /* SAFE */ } - void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2870,7 +2738,6 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr AutoRecovery::st_impl_removeFile(sRemoveURL2); } - AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( AutoRecovery::TDocumentList& rList , const css::uno::Reference< css::frame::XModel >& xDocument) { @@ -2886,7 +2753,6 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( Au return pIt; } - namespace { void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, sal_Bool i_bVisible ) @@ -2913,14 +2779,12 @@ namespace } } - void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible) { css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create(m_xContext), css::uno::UNO_QUERY); lcl_changeVisibility( xDesktop, bVisible ); } - /* Currently the document is not closed in case of crash, so the lock file must be removed explicitly */ @@ -2948,8 +2812,6 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo) #endif } - - void AutoRecovery::implts_prepareSessionShutdown() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_prepareSessionShutdown() starts ..."); @@ -3014,7 +2876,6 @@ void AutoRecovery::implts_prepareSessionShutdown() } /* SAFE */ } - /* TODO WORKAROUND: #i64599# @@ -3042,7 +2903,6 @@ sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo) return bNoAutoSave; } - AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAllowUserIdleLoop, sal_Bool bRemoveLockFiles, const DispatchParams* pParams ) @@ -3215,7 +3075,6 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl return eTimer; } - void AutoRecovery::implts_saveOneDoc(const OUString& sBackupPath , AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress) @@ -3348,7 +3207,6 @@ void AutoRecovery::implts_saveOneDoc(const OUString& AutoRecovery::st_impl_removeFile(sRemoveFile); } - AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams) { AutoRecovery::ETimerType eTimer = AutoRecovery::E_DONT_START_TIMER; @@ -3543,7 +3401,6 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa return eTimer; } - void AutoRecovery::implts_openOneDoc(const OUString& sURL , utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ) @@ -3663,7 +3520,6 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL , } } - void AutoRecovery::implts_generateNewTempURL(const OUString& sBackupPath , utl::MediaDescriptor& /*rMediaDescriptor*/, AutoRecovery::TDocumentInfo& rInfo ) @@ -3699,7 +3555,6 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack rInfo.NewTempURL = aTempFile.GetURL(); } - void AutoRecovery::implts_informListener( sal_Int32 eJob , const css::frame::FeatureStateEvent& aEvent) { @@ -3727,7 +3582,6 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ } } - OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) { // describe the current running operation @@ -3764,7 +3618,6 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) return sFeature.makeStringAndClear(); } - sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) { if ( aURL.Protocol == CMD_PROTOCOL ) @@ -3795,7 +3648,6 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) return AutoRecovery::E_NO_JOB; } - css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( sal_Int32 eJob , const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ) @@ -3824,7 +3676,6 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( return aEvent; } - void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -3850,7 +3701,6 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) } /* SAFE */ } - void AutoRecovery::implts_prepareEmergencySave() { // Be sure to know all open documents really .-) @@ -3860,7 +3710,6 @@ void AutoRecovery::implts_prepareEmergencySave() implts_changeAllDocVisibility(sal_False); } - void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) { // Write a hint "we chrashed" into the configuration, so @@ -3909,7 +3758,6 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) AutoRecovery::st_impl_removeLockFile(); } - void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) { AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; @@ -3936,7 +3784,6 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) ::comphelper::ConfigurationHelper::E_STANDARD); } - void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionSave()"); @@ -3975,7 +3822,6 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) impl_flushALLConfigChanges(); } - void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionQuietQuit()"); @@ -4006,8 +3852,6 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) impl_flushALLConfigChanges(); } - - void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionRestore() ..."); @@ -4042,7 +3886,6 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_doSessionRestore()"); } - void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -4079,7 +3922,6 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) } } - void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_ADD_REMOVE); @@ -4102,7 +3944,6 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) } } - AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource , const OUString& sTargetPath, const OUString& sTargetName) @@ -4142,7 +3983,6 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& s return AutoRecovery::E_COPIED; } - sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*aConvertedValue*/, css::uno::Any& /*aOldValue*/ , sal_Int32 /*nHandle*/ , @@ -4153,7 +3993,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /* return sal_False; } - void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const css::uno::Any& /*aValue*/ ) throw(css::uno::Exception, std::exception) @@ -4161,7 +4000,6 @@ void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 // not needed currently } - void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const { @@ -4208,7 +4046,6 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , } } - const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor() { const css::beans::Property pPropertys[] = @@ -4221,7 +4058,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto return lPropertyDescriptor; } - ::cppu::IPropertyArrayHelper& SAL_CALL AutoRecovery::getInfoHelper() { static ::cppu::OPropertyArrayHelper* pInfoHelper = 0; @@ -4238,7 +4074,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto return (*pInfoHelper); } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { @@ -4257,7 +4092,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPr return (*pInfo); } - void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() ..."); @@ -4330,7 +4164,6 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()"); } - sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) { #ifdef SIMULATE_FULL_DISC @@ -4359,7 +4192,6 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) #endif // SIMULATE_FULL_DISC } - void AutoRecovery::impl_showFullDiscError() { OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); @@ -4379,7 +4211,6 @@ void AutoRecovery::impl_showFullDiscError() dlgError.Execute(); } - void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4445,7 +4276,6 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress); } - void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4480,7 +4310,6 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& } } - void AutoRecovery::impl_flushALLConfigChanges() { try @@ -4503,7 +4332,6 @@ void AutoRecovery::impl_flushALLConfigChanges() } } - void AutoRecovery::st_impl_removeFile(const OUString& sURL) { if ( sURL.isEmpty()) @@ -4519,7 +4347,6 @@ void AutoRecovery::st_impl_removeFile(const OUString& sURL) } } - void AutoRecovery::st_impl_removeLockFile() { try diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 98190049e2dc..d8483d0830bf 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -98,14 +98,12 @@ void Desktop::constructorInit() OFrames* pFramesHelper = new OFrames( this, &m_aChildTaskContainer ); m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY ); - // Initialize a new dispatchhelper-object to handle dispatches. // We use these helper as slave for our interceptor helper ... not directly! // But he is event listener on THIS instance! DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this ); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY ); - // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism. // Set created dispatch provider as slowest slave of it. // Hold interception helper by reference only - not by pointer! @@ -213,7 +211,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::u ); } - sal_Bool SAL_CALL Desktop::terminate() throw( css::uno::RuntimeException, std::exception ) { @@ -231,7 +228,6 @@ sal_Bool SAL_CALL Desktop::terminate() aReadLock.clear(); - // Ask normal terminate listener. They could stop terminate without closing any open document. Desktop::TTerminateListenerList lCalledTerminationListener; sal_Bool bVeto = sal_False; @@ -242,7 +238,6 @@ sal_Bool SAL_CALL Desktop::terminate() return sal_False; } - // try to close all open frames. // Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past. sal_Bool bAllowUI = sal_True; @@ -253,7 +248,6 @@ sal_Bool SAL_CALL Desktop::terminate() return sal_False; } - // Normal listener had no problem ... // all frames was closed ... // now it's time to ask our specialized listener. @@ -375,7 +369,6 @@ bool SAL_CALL Desktop::terminateQuickstarterToo() return terminate(); } - void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { @@ -414,7 +407,6 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener ); } - void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { @@ -719,7 +711,6 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor ); } - void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw( css::uno::RuntimeException, std::exception) { @@ -871,7 +862,6 @@ sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::ex return sal_True; } - sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >& /*xComponentWindow*/ , const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception ) { @@ -896,7 +886,6 @@ void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::f { } - // css::frame::XFrame void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception ) { @@ -934,7 +923,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS { css::uno::Reference< css::frame::XFrame > xTarget; - // 0) Ignore wrong parameter! // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names @@ -952,12 +940,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS return NULL; } - // I) check for special defined targets first which must be handled exclusive. // force using of "if() else if() ..." - - // I.I) "_blank" // create a new task as child of this desktop instance // Note: Used helper TaskCreator use us automaticly ... @@ -968,7 +953,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = aCreator.createTask(sTargetFrameName,sal_False); } - // I.II) "_top" // We are top by definition @@ -977,7 +961,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = this; } - // I.III) "_self", "" // This mean this "frame" in every case. @@ -999,8 +982,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // TASK and CREATE are handled special. // But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT. - - // II.I) SELF // Check for right name. If it's the searched one return ourself - otherwise // ignore this flag. @@ -1013,7 +994,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = this; } - // II.II) TASKS // This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees. // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement @@ -1030,7 +1010,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = m_aChildTaskContainer.searchOnDirectChildrens(sTargetFrameName); } - // II.III) CHILDREN // Search on all children for the given target name. // An empty name value can't occur here - because it must be already handled as "_self" @@ -1045,7 +1024,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = m_aChildTaskContainer.searchOnAllChildrens(sTargetFrameName); } - // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create // a new one ... we should do that. Used TaskCreator use us automaticly as parent! @@ -1329,7 +1307,6 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio } } - ::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) @@ -1338,7 +1315,6 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio return m_xTitleNumberGenerator->leaseNumber (xComponent); } - void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) @@ -1347,7 +1323,6 @@ void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) m_xTitleNumberGenerator->releaseNumber (nNumber); } - void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) @@ -1356,7 +1331,6 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css m_xTitleNumberGenerator->releaseNumberForComponent (xComponent); } - OUString SAL_CALL Desktop::getUntitledPrefix() throw (css::uno::RuntimeException, std::exception) { @@ -1685,7 +1659,6 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty return lPropertyDescriptor; } - void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lCalledListener, sal_Bool& bVeto ) { @@ -1726,7 +1699,6 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC } } - void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerList& lCalledListener) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1751,7 +1723,6 @@ void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerL } } - void Desktop::impl_sendNotifyTerminationEvent() { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1782,7 +1753,6 @@ void Desktop::impl_sendNotifyTerminationEvent() } } - sal_Bool Desktop::impl_closeFrames(sal_Bool bAllowUI) { SolarMutexClearableGuard aReadLock; diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 355ad53115d3..f69767c93ba9 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -28,7 +28,6 @@ namespace framework{ - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper , @@ -38,8 +37,6 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper , DEFINE_INIT_SERVICE( DispatchHelper, {} ) - - /** ctor. @param xSMGR the global uno service manager, which can be used to create own needed services. @@ -49,16 +46,12 @@ DispatchHelper::DispatchHelper( const css::uno::Reference< css::uno::XComponentC { } - - /** dtor. */ DispatchHelper::~DispatchHelper() { } - - /** capsulate all steps of a dispatch request and provide so an easy way for dispatches. @param xDispatchProvider @@ -147,8 +140,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( return aResult; } - - /** callback for started dispatch with guaranteed notifications. We must save the result, so the method executeDispatch() can return it. @@ -167,8 +158,6 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult m_xBroadcaster.clear(); } - - /** we has to realease our broadcaster reference. @param aEvent diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index ce6f4a42abae..2c2d1d16292a 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -174,7 +174,6 @@ public: return aSeq; } - // XComponentLoader virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( @@ -186,15 +185,12 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // XFramesSupplier virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFrame virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -217,19 +213,16 @@ public: virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XComponent virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XStatusIndicatorFactory virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , @@ -238,19 +231,16 @@ public: virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XDispatchProviderInterception virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XDispatchInformationProvider virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XWindowListener // Attention: windowResized() and windowShown() are implement only! All other are empty! @@ -259,14 +249,12 @@ public: virtual void SAL_CALL windowShown ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL windowHidden ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFocusListener // Attention: focusLost() not implemented yet! virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; - // XTopWindowListener // Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty! @@ -278,12 +266,10 @@ public: virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; - // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XActionLockable virtual sal_Bool SAL_CALL isActionLocked ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -292,32 +278,26 @@ public: virtual void SAL_CALL setActionLocks ( sal_Int16 nLock ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL resetActionLocks( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCloseable virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCloseBroadcaster virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XTitle virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // XFrame2 attributes virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getUserDefinedAttributes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -328,8 +308,6 @@ public: virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getLayoutManager() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLayoutManager(const css::uno::Reference<css::uno::XInterface>&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // PropertySetHelper => XPropertySet, XPropertySetInfo private: @@ -343,10 +321,8 @@ private: virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ) SAL_OVERRIDE; - // private methods - private: /*-**************************************************************************************************** @@ -373,11 +349,9 @@ private: void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , sal_Bool bState ); void impl_disposeContainerWindow ( css::uno::Reference< css::awt::XWindow >& xWindow ); - // debug methods // (should be private everyway!) - /*-**************************************************************************************************** @short debug-method to check incoming parameter of some other mehods of this class @descr The following methods are used to check parameters for other methods @@ -409,7 +383,6 @@ private: static sal_Bool implcp_windowDeactivated ( const css::lang::EventObject& aEvent ); static sal_Bool implcp_disposing ( const css::lang::EventObject& aEvent ); - // variables // -threadsafe by SolarMutex @@ -479,7 +452,6 @@ protected: css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame2 >(); - // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_22 ( Frame , @@ -582,18 +554,15 @@ void Frame::initListeners() { css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW); - // Initialize a new dispatchhelper-object to handle dispatches. // We use these helper as slave for our interceptor helper ... not directly! // But he is event listener on THIS instance! DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this ); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY ); - DispatchInformationProvider* pInfoHelper = new DispatchInformationProvider(m_xContext, this); m_xDispatchInfoHelper = css::uno::Reference< css::frame::XDispatchInformationProvider >( static_cast< ::cppu::OWeakObject* >(pInfoHelper), css::uno::UNO_QUERY ); - // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism. // Set created dispatch provider as slowest slave of it. // Hold interception helper by reference only - not by pointer! @@ -601,7 +570,6 @@ void Frame::initListeners() InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider ); m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY ); - // Initialize a new XFrames-helper-object to handle XIndexAccess and XElementAccess. // We hold member as reference ... not as pointer too! // Attention: We share our frame container with this helper. Container is threadsafe himself ... So I think we can do that. @@ -609,7 +577,6 @@ void Frame::initListeners() OFrames* pFramesHelper = new OFrames( this, &m_aChildFrameContainer ); m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY ); - // Initialize a the drop target listener. // We hold member as reference ... not as pointer too! OpenFileDropTargetListener* pDropListener = new OpenFileDropTargetListener( m_xContext, this ); @@ -622,16 +589,13 @@ void Frame::initListeners() SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Frame::Frame(): Frames helper isn't valid. XFrames, XIndexAccess and XElementAcces are not supported!" ); SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper isn't valid. Drag and drop without functionality!" ); - // establish notifies for changing of "disabled commands" configuration during runtime m_aCommandOptions.EstablisFrameCallback(this); - // Create an initial layout manager // Create layout manager and connect it to the newly created frame m_xLayoutManager = css::frame::LayoutManager::create(m_xContext); - // set information about all supported properties at the base class helper PropertySetHelper impl_initializePropInfo(); } @@ -1097,7 +1061,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr { css::uno::Reference< css::frame::XFrame > xTarget; - // 0) Ignore wrong parameter! // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names @@ -1112,11 +1075,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr return NULL; } - // I) check for special defined targets first which must be handled exclusive. // force using of "if() else if() ..." - // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ SolarMutexResettableGuard aReadLock; @@ -1127,7 +1088,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr aReadLock.clear(); /* } SAFE */ - // I.I) "_blank" // Not allowed for a normal frame - but for the desktop. // Use helper class to do so. It use the desktop automaticly. @@ -1138,7 +1098,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = aCreator.createTask(sTargetFrameName,sal_False); } - // I.II) "_parent" // It doesn't matter if we have a valid parent or not. User ask for him and get it. // An empty result is a valid result too. @@ -1148,7 +1107,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = xParent; } - // I.III) "_top" // If we are not the top frame in this hierarchy, we must forward request to our parent. // Otherwhise we must return ourself. @@ -1161,7 +1119,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = xParent->findFrame(SPECIALTARGET_TOP,0); } - // I.IV) "_self", "" // This mean this frame in every case. @@ -1173,7 +1130,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = this; } - // I.V) "_beamer" // This is a special sub frame of any task. We must return it if we found it on our direct children // or create it there if it not already exists. @@ -1208,7 +1164,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT // TASK and CREATE are handled special. - // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.reset(); @@ -1216,7 +1171,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr aReadLock.clear(); /* } SAFE */ - // II.I) SELF // Check for right name. If it's the searched one return ourself - otherwise // ignore this flag. @@ -1229,7 +1183,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = this; } - // II.II) CHILDREN // Search on all children for the given target name. // An empty name value can't occur here - because it must be already handled as "_self" @@ -1244,7 +1197,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = m_aChildFrameContainer.searchOnAllChildrens(sTargetFrameName); } - // II.III) TASKS // This is a special flag. It regulate search on this task tree only or allow search on // all other ones (which are sibling trees of us) too. @@ -1308,7 +1260,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr } } - // II.III.II) PARENT // Forward search to our parent (if he exists.) // To prevent us against recursive and superflous calls (which can occur if we allow him @@ -1331,7 +1282,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr } } - // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create // a new one ... we should do that. Used TaskCreator use Desktop instance automaticly as parent! @@ -1416,7 +1366,6 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio aWriteLock.clear(); /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - // 1) If I'am not active before ... if( eState == E_INACTIVE ) { @@ -1449,7 +1398,6 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_ACTIVATED ); } - // 2) I was active before or current activated and there is a path from here to bottom, who CAN be active. // But ouer direct child of path is not active yet. // (It can be, if activation occur in the middle of a current path!) @@ -1459,7 +1407,6 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio xActiveChild->activate(); } - // 3) I was active before or current activated. But if I have no active child => I will get the focus! if ( eState == E_ACTIVE && !xActiveChild.is() ) { @@ -1514,7 +1461,6 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except xActiveChild->deactivate(); } - // 2) If I have the focus - I will lost it now. if( eState == E_FOCUS ) { @@ -1527,7 +1473,6 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_DEACTIVATING ); } - // 3) If I'am active - I will be deactivated now. if( eState == E_ACTIVE ) { @@ -1539,7 +1484,6 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_DEACTIVATING ); } - // 4) If there is a path from here to my parent ... // ... I'am on the top or in the middle of deactivated subtree and action was started here. // I must deactivate all frames from here to top, which are members of current path. @@ -1640,7 +1584,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // Get threadsafe some copies of used members. /* SAFE { */ SolarMutexClearableGuard aReadLock; @@ -1653,7 +1596,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aReadLock.clear(); /* } SAFE */ - // stop listening on old window // May it produce some trouble. // But don't forget to listen on new window again ... or reactivate listening @@ -1664,7 +1606,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X if (bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_DETACHING ); - // otherwise release old component first // Always release controller before releasing window, // because controller may want to access its window! @@ -1700,7 +1641,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X xOldController = NULL; } - // Now it's time to release the component window. // If controller wasn't released successfully - this code line shouldn't be reached. // Because in case of "suspend()==false" we return immediately with false ... @@ -1731,7 +1671,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X xOldComponentWindow = NULL; } - // Now it's time to set the new component ... // By the way - find out our new "load state" - means if we have a valid component inside. /* SAFE { */ @@ -1743,14 +1682,12 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aWriteLock.clear(); /* } SAFE */ - // notifies all interest listener, that current component was changed or a new one was loaded if (bIsConnected && bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_REATTACHED ); else if (bIsConnected && !bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED ); - // A new component window doesn't know anything about current active/focus states. // Set this information on it! if ( @@ -2001,7 +1938,6 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } - OUString SAL_CALL Frame::getTitle() throw (css::uno::RuntimeException, std::exception) { @@ -2016,7 +1952,6 @@ OUString SAL_CALL Frame::getTitle() return xTitle->getTitle(); } - void SAL_CALL Frame::setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) { @@ -2031,7 +1966,6 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle ) xTitle->setTitle(sTitle); } - void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -2046,7 +1980,6 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra xTitle->addTitleChangeListener(xListener); } - void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { @@ -2095,7 +2028,6 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter m_xLayoutManager.set(p1, css::uno::UNO_QUERY); } - /*-****************************************************************************************************/ void Frame::implts_forgetSubFrames() { @@ -2470,7 +2402,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups() return m_xDispatchInfoHelper->getSupportedCommandGroups(); } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw(css::uno::RuntimeException, std::exception) { @@ -2839,7 +2770,6 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException, return nCurrentLocks; } - void Frame::impl_initializePropInfo() { impl_setPropertyChangeBroadcaster(static_cast< css::frame::XFrame* >(this)); @@ -2880,7 +2810,6 @@ void Frame::impl_initializePropInfo() css::beans::PropertyAttribute::TRANSIENT)); } - void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle , const css::uno::Any& aValue ) @@ -2940,7 +2869,6 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, } } - css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { @@ -3143,7 +3071,6 @@ void Frame::implts_setIconOnWindow() // We must reset it to any fallback value - if no search step returns a valid result. sal_Int32 nIcon = -1; - // b) try to find information on controller propertyset directly // Don't forget to catch possible exceptions - because these property is an optional one! css::uno::Reference< css::beans::XPropertySet > xSet( xController, css::uno::UNO_QUERY ); @@ -3161,7 +3088,6 @@ void Frame::implts_setIconOnWindow() } } - // c) if b) failed ... analyze argument list of currently loaded document insde the frame to find the filter. // He can be used to detect right factory - and these can be used to match factory to icon ... if( nIcon == -1 ) @@ -3175,14 +3101,12 @@ void Frame::implts_setIconOnWindow() } } - // d) if all steps failed - use fallback! if( nIcon == -1 ) { nIcon = 0; } - // e) set icon on container window now // Don't forget SolarMutex! We use vcl directly :-( // Check window pointer for right WorkWindow class too!!! @@ -3257,7 +3181,6 @@ void Frame::implts_startWindowListening() } } - void Frame::implts_stopWindowListening() { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -3335,8 +3258,6 @@ void Frame::implts_checkSuicide() {} } - - /** little helper to enable/disable the menu closer at the menubar of the given frame. @param xFrame @@ -3368,8 +3289,6 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame {} } - - /** it checks, which of the top level task frames must have the special menu closer for switching to the backing window mode. @@ -3406,7 +3325,6 @@ void Frame::impl_checkMenuCloser() // specify the new frame, which must have this special state ... css::uno::Reference< css::frame::XFrame2 > xNewCloserFrame; - // a) // If there exist ate least one other frame - there are two frames currently open. // But we can enable this closer only, if one of these two tasks includes the help module. @@ -3455,11 +3373,8 @@ void Frame::impl_checkMenuCloser() } } - // debug methods - - // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer! // And we accept frames only! No tasks and desktops! sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) @@ -3467,49 +3382,41 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF return css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is(); } - sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) { return !aEvent.Source.is(); } - sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) { return !aEvent.Source.is(); } - sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); } - sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 77c5e723bcef..8ba63897f8fa 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -27,7 +27,6 @@ namespace framework using namespace ::com::sun::star ; using namespace ::rtl ; - // constructor MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) @@ -35,7 +34,6 @@ MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang:: { } - // destructor MediaTypeDetectionHelper::~MediaTypeDetectionHelper() @@ -53,10 +51,8 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper, } ) - // XStringMapping - sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq) throw (uno::RuntimeException, std::exception) { diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 15d4e52b38e0..62e84736bc37 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -49,13 +49,11 @@ class ModuleManager: { private: - /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** points to the underlying configuration. This ModuleManager does not cache - it calls directly the configuration API! @@ -121,7 +119,6 @@ public: private: - /** @short makes the real identification of the module. @descr It checks for the optional but preferred interface diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 0ceeebb4c561..21fb2908cc63 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -394,7 +394,6 @@ private: void impl_subst(PathSettings::PathInfo& aPath , sal_Bool bReSubst); - /** converts our new string list schema to the old ";" separated schema ... */ OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; OUStringList impl_convertOldStyle2Path(const OUString& sOldStylePath) const; @@ -434,7 +433,6 @@ private: const PathSettings::PathInfo* pPathOld, const PathSettings::PathInfo* pPathNew); - // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, css::uno::Any& aOldValue, @@ -457,7 +455,6 @@ private: css::uno::Reference< css::container::XNameAccess > fa_getCfgNew(); }; - PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : PathSettings_BASE(m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) @@ -467,7 +464,6 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte { } - PathSettings::~PathSettings() { disposing(); @@ -491,7 +487,6 @@ void SAL_CALL PathSettings::disposing() m_pPropHelp = 0; } - css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) { @@ -501,7 +496,6 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp return aRet; } - css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) throw(css::uno::RuntimeException, std::exception) { @@ -511,7 +505,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) ); } - void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception) { @@ -542,7 +535,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven impl_rebuildPropertyDescriptor(); } - void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException, std::exception) { @@ -552,7 +544,6 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) m_xCfgNew.clear(); } - OUString PathSettings::getStringProperty(const OUString& p1) throw(css::uno::RuntimeException) { @@ -562,14 +553,12 @@ OUString PathSettings::getStringProperty(const OUString& p1) return s; } - void PathSettings::setStringProperty(const OUString& p1, const OUString& p2) throw(css::uno::RuntimeException) { ::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2)); } - void PathSettings::impl_readAll() { try @@ -592,7 +581,6 @@ void PathSettings::impl_readAll() impl_rebuildPropertyDescriptor(); } - // NO substitution here ! It's done outside ... OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) { @@ -619,7 +607,6 @@ OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) return aPathVal; } - // NO substitution here ! It's done outside ... PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) { @@ -671,7 +658,6 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) return aPathVal; } - void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) { m_bIgnoreEvents = sal_True; @@ -717,7 +703,6 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) m_bIgnoreEvents = sal_False; } - void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, const OUStringList& lOld ) { @@ -746,7 +731,6 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, } } - PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath , sal_Bool bNotifyListener) { @@ -853,7 +837,6 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath return eOp; } - css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUString& sPath) { OUString sOldStyleProp = sPath; @@ -897,7 +880,6 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt return lIDs; } - void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ , const OUString& sPath , const PathSettings::PathInfo* pPathOld, @@ -975,7 +957,6 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ } } - void PathSettings::impl_subst( OUStringList& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , sal_Bool bReSubst) @@ -997,7 +978,6 @@ void PathSettings::impl_subst( OUStringList& } } - void PathSettings::impl_subst(PathSettings::PathInfo& aPath , sal_Bool bReSubst) { @@ -1011,7 +991,6 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, sal_False); } - OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; @@ -1048,7 +1027,6 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r return sPathVal.makeStringAndClear(); } - OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePath) const { OUStringList lList; @@ -1064,7 +1042,6 @@ OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePa return lList; } - void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, OUStringList& lList) { @@ -1093,7 +1070,6 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, lList.erase(pItem); } - void PathSettings::impl_rebuildPropertyDescriptor() { // SAFE -> @@ -1153,7 +1129,6 @@ void PathSettings::impl_rebuildPropertyDescriptor() // <- SAFE } - css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const { const PathSettings::PathInfo* pPath = impl_getPathAccessConst(nID); @@ -1192,7 +1167,6 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const return aVal; } - void PathSettings::impl_setPathValue( sal_Int32 nID , const css::uno::Any& aVal) { @@ -1299,7 +1273,6 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , pOrgPath->takeOver(aChangePath); } - sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const { OUStringList::const_iterator pIt; @@ -1315,7 +1288,6 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const return sal_True; } - sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const { // allow empty path to reset a path. @@ -1328,7 +1300,6 @@ sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const return (! INetURLObject(sPath).HasError()); } - OUString impl_extractBaseFromPropName(const OUString& sPropName) { sal_Int32 i = sPropName.indexOf(POSTFIX_INTERNAL_PATHS); @@ -1344,7 +1315,6 @@ OUString impl_extractBaseFromPropName(const OUString& sPropName) return sPropName; } - PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) { // SAFE -> @@ -1364,7 +1334,6 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) // <- SAFE } - const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nHandle) const { // SAFE -> @@ -1384,7 +1353,6 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH // <- SAFE } - sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aConvertedValue, css::uno::Any& aOldValue , sal_Int32 nHandle , @@ -1401,7 +1369,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC aConvertedValue); } - void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::uno::Exception, std::exception) @@ -1410,20 +1377,17 @@ void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 impl_setPathValue(nHandle, aValue); } - void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const { aValue = impl_getPathValue(nHandle); } - ::cppu::IPropertyArrayHelper& SAL_CALL PathSettings::getInfoHelper() { return *m_pPropHelp; } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { @@ -1431,7 +1395,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPr ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); } - css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubstitution() { css::uno::Reference< css::util::XStringSubstitution > xSubst; @@ -1457,7 +1420,6 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti return xSubst; } - css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() { const OUString CFG_NODE_OLD("org.openoffice.Office.Common/Path/Current"); @@ -1486,7 +1448,6 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() return xCfg; } - css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() { const OUString CFG_NODE_NEW("org.openoffice.Office.Paths/Paths"); diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index a426404b7a34..3b68e9561b93 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -100,7 +100,6 @@ private: sal_Bool m_bAllowUserInteractionOnQuit; sal_Bool m_bTerminated; - // in case of synchronous call the caller should do saveDone() call himself! void StoreSession( sal_Bool bAsync ); @@ -294,7 +293,6 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve } } - sal_Bool SAL_CALL SessionListener::doRestore() throw (RuntimeException, std::exception) { @@ -320,7 +318,6 @@ sal_Bool SAL_CALL SessionListener::doRestore() return m_bRestored; } - void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ ) throw (RuntimeException, std::exception) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index bef035e68c17..db50d8ffd0bc 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -394,10 +394,8 @@ static const FixedVariable aFixedVarTable[] = { RTL_CONSTASCII_STRINGPARAM("$(brandbaseurl)"),PREDEFVAR_BRANDBASEURL, true } }; - // Implementation helper classes - OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const OUString& aOSString ) { for ( int i = 0; i < OS_COUNT; i++ ) @@ -488,11 +486,8 @@ void SubstitutePathVariables_Impl::Commit() { } - - // private methods - OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem() { #ifdef SOLARIS @@ -823,10 +818,8 @@ throw ( NoSuchElementException, RuntimeException, std::exception ) return impl_getSubstituteVariableValue( aVariable ); } - // protected methods - IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 331025b6212a..94c2daaeb216 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -121,10 +121,8 @@ public: return aSeq; } - // XSimpleTabController - virtual sal_Int32 SAL_CALL insertTab() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setTabProps( sal_Int32 nID, const css::uno::Sequence< css::beans::NamedValue >& aProperties ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -134,10 +132,8 @@ public: virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -200,8 +196,6 @@ DEFINE_XTYPEPROVIDER_6 ( TabWindowService , css::beans::XPropertySetInfo ) - - // constructor TabWindowService::TabWindowService() @@ -227,7 +221,6 @@ void TabWindowService::initProperties() m_aTransactionManager.setWorkingMode( E_WORK ); } - // destructor TabWindowService::~TabWindowService() @@ -237,7 +230,6 @@ TabWindowService::~TabWindowService() m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) ); } - // XSimpleTabController ::sal_Int32 SAL_CALL TabWindowService::insertTab() @@ -253,7 +245,6 @@ TabWindowService::~TabWindowService() return nID; } - // XSimpleTabController void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) @@ -271,7 +262,6 @@ void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) pTabWin->RemovePage(nID); } - // XSimpleTabController void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 nID , @@ -297,7 +287,6 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 } } - // XSimpleTabController css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabProps(::sal_Int32 nID) @@ -313,7 +302,6 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabPr return rInfo.m_lProperties; } - // XSimpleTabController void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) @@ -331,7 +319,6 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) pTabWin->ActivatePage(nID); } - // XSimpleTabController ::sal_Int32 SAL_CALL TabWindowService::getActiveTabID() @@ -341,7 +328,6 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) return m_nCurrentPageIndex; } - // XSimpleTabController void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) @@ -350,7 +336,6 @@ void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::a m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } - // XSimpleTabController void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) @@ -359,7 +344,6 @@ void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } - // XComponent void SAL_CALL TabWindowService::dispose() @@ -379,7 +363,6 @@ void SAL_CALL TabWindowService::dispose() m_xTabWin.clear(); } - // XComponent void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) @@ -388,7 +371,6 @@ void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css: m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } - // XComponent void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) @@ -397,7 +379,6 @@ void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } - void TabWindowService::impl_initializePropInfo() { impl_setPropertyChangeBroadcaster(static_cast< css::awt::XSimpleTabController* >(this)); @@ -410,7 +391,6 @@ void TabWindowService::impl_initializePropInfo() css::beans::PropertyAttribute::TRANSIENT)); } - void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 /*nHandle */, const css::uno::Any& /*aValue */) @@ -418,7 +398,6 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sPropert { } - css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { @@ -441,7 +420,6 @@ css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& / return aValue; } - // TabWindowService IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) @@ -510,7 +488,6 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) return 0; } - // TabWindowService void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) @@ -527,7 +504,6 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) } } - // TabWindowService TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 2407f739e886..d187419a1c32 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -56,7 +56,6 @@ class TaskCreatorService : private cppu::BaseMutex, { private: - /** @short the global uno service manager. @descr Must be used to create own needed services. */ @@ -116,19 +115,16 @@ private: OUString impl_filterNames( const OUString& sName ); }; - TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext) : TaskCreatorService_BASE(m_aMutex) , m_xContext (xContext ) { } - TaskCreatorService::~TaskCreatorService() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -136,7 +132,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >()); } - css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -219,7 +214,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return css::uno::Reference< css::uno::XInterface >(xFrame, css::uno::UNO_QUERY_THROW); } - void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const { // SYNCHRONIZED -> @@ -230,7 +224,6 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< // <- SYNCHRONIZED } - css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow , const css::awt::Rectangle& aPosSize , sal_Bool bTopWindow ) @@ -287,7 +280,6 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai return xWindow; } - css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow, const OUString& sName ) @@ -316,7 +308,6 @@ css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFram return xNewFrame; } - void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -331,7 +322,6 @@ void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Re xInit->initialize(lInitData); } - void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -345,7 +335,6 @@ void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Refe xInit->initialize(lInitData); } - void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { TitleBarUpdate* pHelper = new TitleBarUpdate (m_xContext); diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 3f60751bd7a2..82a39a4f8055 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -30,7 +30,6 @@ namespace framework { - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , @@ -65,8 +64,4 @@ OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< c } // namespace framework - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 4ee2f705af9a..7511af83e98a 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -175,7 +175,6 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css return sal_False; } - // XURLTransformer sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, @@ -231,7 +230,6 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, } } - // XURLTransformer sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) { @@ -293,7 +291,6 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u return sal_False; } - // XURLTransformer OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL, |