From 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Sat, 22 Feb 2014 21:20:15 +0100 Subject: Remove unneccessary comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- framework/source/fwe/classes/addonmenu.cxx | 8 +- framework/source/fwe/classes/addonsoptions.cxx | 32 ++--- framework/source/fwe/classes/bmkmenu.cxx | 2 +- framework/source/fwe/classes/framelistanalyzer.cxx | 10 +- framework/source/fwe/classes/fwkresid.cxx | 2 +- framework/source/fwe/dispatch/interaction.cxx | 40 +++--- .../source/fwe/helper/actiontriggerhelper.cxx | 8 +- framework/source/fwe/helper/documentundoguard.cxx | 30 ++--- framework/source/fwe/helper/titlehelper.cxx | 46 +++---- framework/source/fwe/helper/undomanagerhelper.cxx | 134 ++++++++++----------- .../interaction/preventduplicateinteraction.cxx | 16 +-- framework/source/fwe/xml/menudocumenthandler.cxx | 14 +-- .../source/fwe/xml/statusbardocumenthandler.cxx | 8 +- .../source/fwe/xml/toolboxdocumenthandler.cxx | 8 +- 14 files changed, 179 insertions(+), 179 deletions(-) (limited to 'framework/source/fwe') diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 3fb7b8a90914..11c5685ca1c9 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -65,9 +65,9 @@ AddonMenu::~AddonMenu() } } -// ------------------------------------------------------------------------ -// ------------------------------------------------------------------------ + + // Check if command URL string has the unique prefix to identify addon popup menus sal_Bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) { @@ -85,7 +85,7 @@ AddonPopupMenu::~AddonPopupMenu() { } -// ------------------------------------------------------------------------ + static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame ) { @@ -101,7 +101,7 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame return xModel; } -// ------------------------------------------------------------------------ + sal_Bool AddonMenuManager::HasAddonMenuElements() { diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index a22ea22d821d..3ed1f1b6f7e7 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -38,9 +38,9 @@ #include #include -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::std ; using namespace ::utl ; @@ -192,9 +192,9 @@ using namespace ::com::sun::star; #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -//_________________________________________________________________________________________________________________ + // private declarations! -//_________________________________________________________________________________________________________________ + /*-**************************************************************************************************************** @descr struct to hold information about one menu entry. @@ -205,21 +205,21 @@ namespace framework class AddonsOptions_Impl : public ConfigItem { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- + AddonsOptions_Impl(); ~AddonsOptions_Impl(); - //--------------------------------------------------------------------------------------------------------- + // overloaded methods of baseclass - //--------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short called for notify of configmanager @@ -252,9 +252,9 @@ class AddonsOptions_Impl : public ConfigItem virtual void Commit(); - //--------------------------------------------------------------------------------------------------------- + // public interface - //--------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short base implementation of public interface for "SvtDynamicMenuOptions"! @@ -282,9 +282,9 @@ class AddonsOptions_Impl : public ConfigItem const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; void ReadConfigurationData(); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: enum ImageSize @@ -361,9 +361,9 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; sal_Bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName ); diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 4d49b4ee4168..622fcaab13a7 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -88,7 +88,7 @@ sal_uInt16 BmkMenu_Impl::GetMID() return m_nMID; } -// ------------------------------------------------------------------------ + BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :AddonMenu(xFrame) diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index aae1aa421e5d..2aad958b80c5 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -175,7 +175,7 @@ void FrameListAnalyzer::impl_analyze() SAL_INFO("fwk", "FrameListAnalyzer::impl_analyze(): ZOMBIE!"); } - // ------------------------------------------------- + // a) Is it the special help task? // Return it separated from any return list. if ( @@ -187,7 +187,7 @@ void FrameListAnalyzer::impl_analyze() continue; } - // ------------------------------------------------- + // b) Or is includes this task the special backing component? // Return it separated from any return list. // But check if the reference task itself is the backing frame. @@ -210,7 +210,7 @@ void FrameListAnalyzer::impl_analyze() } } - // ------------------------------------------------- + // c) Or is it the a task, which uses the specified model? // Add it to the list of "model frames". if ((m_eDetectMode & E_MODEL) == E_MODEL) @@ -227,11 +227,11 @@ void FrameListAnalyzer::impl_analyze() } } - // ------------------------------------------------- + // d) Or is it the a task, which use another or no model at all? // Add it to the list of "other frames". But look for it's // visible state ... if it's allowed to do so. - // ------------------------------------------------- + sal_Bool bHidden = sal_False; if ((m_eDetectMode & E_HIDDEN) == E_HIDDEN ) { diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index 4316f8f1a545..e428fb5e600d 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -41,7 +41,7 @@ ResMgr* FwkResId::GetResManager() return pResMgr; } -// ----------------------------------------------------------------------- + FwkResId::FwkResId( sal_uInt16 nId ) : ResId( nId, *FwkResId::GetResManager() ) diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index c70b608ee3d8..61dc5bed6b97 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -63,25 +63,25 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st }; // class ContinuationFilterSelect -//--------------------------------------------------------------------------------------------------------- + // initialize continuation with right start values -//--------------------------------------------------------------------------------------------------------- + ContinuationFilterSelect::ContinuationFilterSelect() : m_sFilter( OUString() ) { } -//--------------------------------------------------------------------------------------------------------- + // handler should use it after selection to set user specified filter for transport -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException ) { m_sFilter = sFilter; } -//--------------------------------------------------------------------------------------------------------- + // read access to transported filter -//--------------------------------------------------------------------------------------------------------- + OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) { return m_sFilter; @@ -105,10 +105,10 @@ private: ContinuationFilterSelect* m_pFilter; }; -//--------------------------------------------------------------------------------------------------------- + // initialize instance with all necessary information // We use it without any further checks on our member then ...! -//--------------------------------------------------------------------------------------------------------- + RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) { OUString temp; @@ -126,39 +126,39 @@ RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter ); } -//--------------------------------------------------------------------------------------------------------- + // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- + sal_Bool RequestFilterSelect_Impl::isAbort() const { return m_pAbort->wasSelected(); } -//--------------------------------------------------------------------------------------------------------- + // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- + OUString RequestFilterSelect_Impl::getFilter() const { return m_pFilter->getFilter(); } -//--------------------------------------------------------------------------------------------------------- + // handler call it to get type of request // Is hard coded to "please select filter" here. see ctor for further information. -//--------------------------------------------------------------------------------------------------------- + css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException ) { return m_aRequest; } -//--------------------------------------------------------------------------------------------------------- + // handler call it to get possible continuations // We support "abort/select_filter" only here. // After interaction we support read access on these continuations on our c++ interface to // return user decision. -//--------------------------------------------------------------------------------------------------------- + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException ) { return m_lContinuations; @@ -177,19 +177,19 @@ RequestFilterSelect::~RequestFilterSelect() } -//--------------------------------------------------------------------------------------------------------- + // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- + sal_Bool RequestFilterSelect::isAbort() const { return pImp->isAbort(); } -//--------------------------------------------------------------------------------------------------------- + // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- + OUString RequestFilterSelect::getFilter() const { return pImp->getFilter(); diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 6ccd422bfeeb..70108d6cec9c 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -44,9 +44,9 @@ using namespace com::sun::star::container; namespace framework { -// ---------------------------------------------------------------------------- + // implementation helper ( menu => ActionTrigger ) -// ---------------------------------------------------------------------------- + sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) { @@ -238,9 +238,9 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC } -// ---------------------------------------------------------------------------- + // implementation helper ( ActionTrigger => menu ) -// ---------------------------------------------------------------------------- + Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException ) { diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index cec4c0a253a3..2e839c62ee9a 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -110,84 +110,84 @@ namespace framework bool m_documentDisposed; }; - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; m_nRelativeContextDepth = 0; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; @@ -205,7 +205,7 @@ namespace framework namespace { - //-------------------------------------------------------------------------------------------------------------- + void lcl_init( DocumentUndoGuard_Data& i_data, const Reference< XInterface >& i_undoSupplierComponent ) { try @@ -223,7 +223,7 @@ namespace framework } } - //-------------------------------------------------------------------------------------------------------------- + void lcl_restore( DocumentUndoGuard_Data& i_data ) { try @@ -242,7 +242,7 @@ namespace framework //================================================================================================================== //= DocumentUndoGuard //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent ) :m_pData( new DocumentUndoGuard_Data ) { diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b02549db16b1..9588a0af6905 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -38,7 +38,7 @@ namespace framework{ -//----------------------------------------------- + TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : ::cppu::BaseMutex () , m_xContext (rxContext) @@ -52,12 +52,12 @@ TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext { } -//----------------------------------------------- + TitleHelper::~TitleHelper() { } -//----------------------------------------------- + void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner) { // SYNCHRONIZED -> @@ -90,7 +90,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO } } -//----------------------------------------------- + OUString SAL_CALL TitleHelper::getTitle() throw (css::uno::RuntimeException) { @@ -115,7 +115,7 @@ OUString SAL_CALL TitleHelper::getTitle() // <- SYNCHRONIZED } -//----------------------------------------------- + void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers) { // SYNCHRONIZED -> @@ -126,7 +126,7 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr // <- SYNCHRONIZED } -//----------------------------------------------- + void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) throw (css::uno::RuntimeException) { @@ -142,7 +142,7 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException) { @@ -150,7 +150,7 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } -//----------------------------------------------- + void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException) { @@ -158,7 +158,7 @@ void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< m_aListener.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } -//----------------------------------------------- + void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException) { @@ -176,7 +176,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv impl_updateTitle (); } -//----------------------------------------------- + void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException) { @@ -204,7 +204,7 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) impl_updateTitle (); } -//----------------------------------------------- + void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException) { @@ -232,7 +232,7 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven } } -//----------------------------------------------- + void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) throw (css::uno::RuntimeException) { @@ -268,7 +268,7 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void TitleHelper::impl_sendTitleChangedEvent () { // SYNCHRONIZED -> @@ -297,7 +297,7 @@ void TitleHelper::impl_sendTitleChangedEvent () } } -//----------------------------------------------- + void TitleHelper::impl_updateTitle (bool init) { // SYNCHRONIZED -> @@ -324,7 +324,7 @@ void TitleHelper::impl_updateTitle (bool init) } } -//----------------------------------------------- + void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel, bool init) { // SYNCHRONIZED -> @@ -395,7 +395,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController, bool init) { // SYNCHRONIZED -> @@ -461,7 +461,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame, bool init) { if ( ! xFrame.is ()) @@ -582,7 +582,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer&) } #endif -//----------------------------------------------- + void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel) { css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY); @@ -592,28 +592,28 @@ void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::f xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this)); } -//----------------------------------------------- + void TitleHelper::impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController) { css::uno::Reference< css::frame::XTitle > xSubTitle(xController->getModel (), css::uno::UNO_QUERY); impl_setSubTitle (xSubTitle); } -//----------------------------------------------- + void TitleHelper::impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame) { xFrame->addFrameActionListener(this ); impl_updateListeningForFrame (xFrame); } -//----------------------------------------------- + void TitleHelper::impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XTitle > xSubTitle(xFrame->getController (), css::uno::UNO_QUERY); impl_setSubTitle (xSubTitle); } -//----------------------------------------------- + void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle) { // SYNCHRONIZED -> @@ -640,7 +640,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl xNewBroadcaster->addTitleChangeListener (xThis); } -//----------------------------------------------- + OUString TitleHelper::impl_convertURL2Title(const OUString& sURL) { INetURLObject aURL (sURL); diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 793b6bd04f9e..129dfe517bd6 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -85,7 +85,7 @@ namespace framework const Reference< XUndoAction > m_xUndoAction; }; - //------------------------------------------------------------------------------------------------------------------ + UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction ) :SfxUndoAction() ,m_xUndoAction( i_undoAction ) @@ -93,7 +93,7 @@ namespace framework ENSURE_OR_THROW( m_xUndoAction.is(), "illegal undo action" ); } - //------------------------------------------------------------------------------------------------------------------ + UndoActionWrapper::~UndoActionWrapper() { try @@ -108,7 +108,7 @@ namespace framework } } - //------------------------------------------------------------------------------------------------------------------ + OUString UndoActionWrapper::GetComment() const { OUString sComment; @@ -123,19 +123,19 @@ namespace framework return sComment; } - //------------------------------------------------------------------------------------------------------------------ + void UndoActionWrapper::Undo() { m_xUndoAction->undo(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoActionWrapper::Redo() { m_xUndoAction->redo(); } - //------------------------------------------------------------------------------------------------------------------ + bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const { return false; @@ -195,7 +195,7 @@ namespace framework ::osl::Condition m_finishCondition; }; - //------------------------------------------------------------------------------------------------------------------ + //================================================================================================================== //= UndoManagerHelper_Impl @@ -329,7 +329,7 @@ namespace framework void impl_reset(); }; - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::disposing() { EventObject aEvent; @@ -344,7 +344,7 @@ namespace framework m_disposed = true; } - //------------------------------------------------------------------------------------------------------------------ + UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const { UndoManagerEvent aEvent; @@ -354,14 +354,14 @@ namespace framework return aEvent; } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_notifyModified() { const EventObject aEvent( getXUndoManager() ); m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvent ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::notify( OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) { @@ -377,7 +377,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ) { const EventObject aEvent( getXUndoManager() ); @@ -388,7 +388,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -402,7 +402,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -414,7 +414,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { if ( !i_action.is() ) @@ -434,7 +434,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -446,7 +446,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -458,7 +458,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -470,7 +470,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::lock() { // SYNCHRONIZED ---> @@ -484,7 +484,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::unlock() { // SYNCHRONIZED ---> @@ -501,7 +501,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock ) { // create the request, and add it to our queue @@ -563,7 +563,7 @@ namespace framework while ( true ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_enterUndoContext( const OUString& i_title, const bool i_hidden ) { // SYNCHRONIZED ---> @@ -595,7 +595,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_leaveUndoContext() { // SYNCHRONIZED ---> @@ -655,7 +655,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo ) { ::osl::Guard< ::framework::IMutex > aExternalGuard( i_externalLock.getGuardedMutex() ); @@ -703,7 +703,7 @@ namespace framework // So, we do not need to do this notification here ourself. } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_addUndoAction( const Reference< XUndoAction >& i_action ) { // SYNCHRONIZED ---> @@ -733,7 +733,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_clear() { // SYNCHRONIZED ---> @@ -756,7 +756,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_clearRedo() { // SYNCHRONIZED ---> @@ -779,7 +779,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_reset() { // SYNCHRONIZED ---> @@ -799,7 +799,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -810,7 +810,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -821,7 +821,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment ) { if ( m_bAPIActionRunning ) @@ -830,7 +830,7 @@ namespace framework notify( i_actionComment, &XUndoManagerListener::undoActionAdded ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::cleared() { if ( m_bAPIActionRunning ) @@ -839,7 +839,7 @@ namespace framework notify( &XUndoManagerListener::allActionsCleared ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clearedRedo() { if ( m_bAPIActionRunning ) @@ -848,7 +848,7 @@ namespace framework notify( &XUndoManagerListener::redoActionsCleared ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::resetAll() { if ( m_bAPIActionRunning ) @@ -857,7 +857,7 @@ namespace framework notify( &XUndoManagerListener::resetAll ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -870,7 +870,7 @@ namespace framework notify( i_comment, &XUndoManagerListener::enteredContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -885,7 +885,7 @@ namespace framework notify( i_comment, &XUndoManagerListener::leftContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionLeftAndMerged() { #if OSL_DEBUG_LEVEL > 0 @@ -900,7 +900,7 @@ namespace framework notify( &XUndoManagerListener::leftHiddenContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionCancelled() { #if OSL_DEBUG_LEVEL > 0 @@ -915,7 +915,7 @@ namespace framework notify( &XUndoManagerListener::cancelledContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::undoManagerDying() { // TODO: do we need to care? Or is this the responsibility of our owner? @@ -924,42 +924,42 @@ namespace framework //================================================================================================================== //= UndoManagerHelper //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl ) :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) { } - //------------------------------------------------------------------------------------------------------------------ + UndoManagerHelper::~UndoManagerHelper() { } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::disposing() { m_pImpl->disposing(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( i_title, false, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( OUString(), true, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->leaveUndoContext( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -973,7 +973,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -987,25 +987,25 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { m_pImpl->addUndoAction( i_action, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::undo( IMutexGuard& i_instanceLock ) { m_pImpl->undo( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::redo( IMutexGuard& i_instanceLock ) { m_pImpl->redo( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool UndoManagerHelper::isUndoPossible() const { // SYNCHRONIZED ---> @@ -1017,7 +1017,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool UndoManagerHelper::isRedoPossible() const { // SYNCHRONIZED ---> @@ -1029,7 +1029,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + namespace { //.............................................................................................................. @@ -1077,61 +1077,61 @@ namespace framework } } - //------------------------------------------------------------------------------------------------------------------ + OUString UndoManagerHelper::getCurrentUndoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, true ); } - //------------------------------------------------------------------------------------------------------------------ + OUString UndoManagerHelper::getCurrentRedoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, false ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > UndoManagerHelper::getAllUndoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, true ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > UndoManagerHelper::getAllRedoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, false ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::clear( IMutexGuard& i_instanceLock ) { m_pImpl->clear( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock ) { m_pImpl->clearRedo( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::reset( IMutexGuard& i_instanceLock ) { m_pImpl->reset( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::lock() { m_pImpl->lock(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::unlock() { m_pImpl->unlock(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool UndoManagerHelper::isLocked() { // SYNCHRONIZED ---> @@ -1142,28 +1142,28 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->addUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->removeUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::addModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->addModifyListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::removeModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 1a1d9831c65f..f6124b96e943 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -31,13 +31,13 @@ PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Referen { } -//_________________________________________________________________________________________________________________ + PreventDuplicateInteraction::~PreventDuplicateInteraction() { } -//_________________________________________________________________________________________________________________ + void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler) { @@ -48,7 +48,7 @@ void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::tas // <- SAFE } -//_________________________________________________________________________________________________________________ + void PreventDuplicateInteraction::useDefaultUUIHandler() { @@ -66,7 +66,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler() // <- SAFE } -//_________________________________________________________________________________________________________________ + css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException) { @@ -80,7 +80,7 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u return ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >::queryInterface( aType ); } -//_________________________________________________________________________________________________________________ + void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) throw(css::uno::RuntimeException) @@ -136,7 +136,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css } } -//_________________________________________________________________________________________________________________ + ::sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw (css::uno::RuntimeException) @@ -195,7 +195,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css return false; } -//_________________________________________________________________________________________________________________ + void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo) { @@ -222,7 +222,7 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter // <- SAFE } -//_________________________________________________________________________________________________________________ + sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type& aInteraction, PreventDuplicateInteraction::InteractionInfo* pReturn ) const diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 3b81cbad5a9d..1be57a8b96ee 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -83,9 +83,9 @@ static const char CMD_PROTOCOL[] = ".uno:"; static const char ADDDIRECT_CMD[] = ".uno:AddDirect" ; static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ; -//_________________________________________________________________________________________________________________ + // using namespaces -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -151,7 +151,7 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, } -// ----------------------------------------------------------------------------- + // Base class implementation ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : @@ -222,7 +222,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT; } -// ----------------------------------------------------------------------------- + OReadMenuDocumentHandler::OReadMenuDocumentHandler( const Reference< XIndexContainer >& rMenuBarContainer ) @@ -305,7 +305,7 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) } -// ----------------------------------------------------------------------------- + OReadMenuBarHandler::OReadMenuBarHandler( const Reference< XIndexContainer >& rMenuBarContainer, @@ -455,7 +455,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) } -// ----------------------------------------------------------------------------- + OReadMenuHandler::OReadMenuHandler( @@ -541,7 +541,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) } -// ----------------------------------------------------------------------------- + OReadMenuPopupHandler::OReadMenuPopupHandler( diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index c2a63736c8a1..2a799f3b962d 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -485,9 +485,9 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString() } -//_________________________________________________________________________________________________________________ + // OWriteStatusBarDocumentHandler -//_________________________________________________________________________________________________________________ + OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( const Reference< XIndexAccess >& aStatusBarItems, @@ -570,9 +570,9 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw m_xWriteDocumentHandler->endDocument(); } -//_________________________________________________________________________________________________________________ + // protected member functions -//_________________________________________________________________________________________________________________ + void OWriteStatusBarDocumentHandler::WriteStatusBarItem( const OUString& rCommandURL, diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 7b69a975f925..19e94c9ac1e1 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -656,9 +656,9 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString() } -//_________________________________________________________________________________________________________________ + // OWriteToolBoxDocumentHandler -//_________________________________________________________________________________________________________________ + OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( const Reference< XIndexAccess >& rItemAccess, @@ -761,9 +761,9 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw m_xWriteDocumentHandler->endDocument(); } -//_________________________________________________________________________________________________________________ + // protected member functions -//_________________________________________________________________________________________________________________ + void OWriteToolBoxDocumentHandler::WriteToolBoxItem( const OUString& rCommandURL, -- cgit