diff options
Diffstat (limited to 'framework/source/fwe')
28 files changed, 0 insertions, 351 deletions
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 95e3a91d4695..904b3e3fae2e 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -36,7 +36,6 @@ ActionTriggerContainer::ActionTriggerContainer() : { } - ActionTriggerContainer::~ActionTriggerContainer() { } diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 402d277ae0f2..7a6a478eda62 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/actiontriggerpropertyset.hxx> #include <threadhelp/lockhelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -26,7 +25,6 @@ #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::beans; diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index d9e3a1aa6598..956fdddf4c2c 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/actiontriggerseparatorpropertyset.hxx> #include <threadhelp/lockhelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -26,7 +25,6 @@ #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::beans; diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 0f4c16be95a5..4eed572f2ad2 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -65,9 +65,6 @@ AddonMenu::~AddonMenu() } } - - - // Check if command URL string has the unique prefix to identify addon popup menus bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) { @@ -85,8 +82,6 @@ AddonPopupMenu::~AddonPopupMenu() { } - - static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame ) { // Query for the model to get check the context information @@ -101,8 +96,6 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame return xModel; } - - bool AddonMenuManager::HasAddonMenuElements() { return AddonsOptions().HasAddonsMenu(); @@ -150,7 +143,6 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos ) return ( nPos == MENU_APPEND ) ? MENU_APPEND : ( nPos+1 ); } - static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand ) { sal_uInt16 nPos = 0; @@ -166,7 +158,6 @@ static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand ) return USHRT_MAX; } - // Merge the Add-Ons help menu items into the given menu bar at a defined pos void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, MenuBar* pMergeMenuBar ) { diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 9008a3dc4509..e723cb4d24f1 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -38,10 +38,8 @@ #include <algorithm> #include <vector> - // namespaces - using namespace ::std ; using namespace ::utl ; using namespace ::osl ; @@ -152,7 +150,6 @@ using namespace ::com::sun::star; #define OFFSET_STATUSBARITEM_OWNERDRAW 5 #define OFFSET_STATUSBARITEM_WIDTH 6 - // The following order is mandatory. Please add properties at the end! #define PROPERTYCOUNT_IMAGES 8 #define PROPERTYCOUNT_EMBEDDED_IMAGES 4 @@ -192,10 +189,8 @@ using namespace ::com::sun::star; #define EXPAND_PROTOCOL "vnd.sun.star.expand:" - // private declarations! - /*-**************************************************************************************************************** @descr struct to hold information about one menu entry. ****************************************************************************************************************-*/ @@ -208,19 +203,15 @@ class AddonsOptions_Impl : public ConfigItem // public methods - public: // constructor / destructor - AddonsOptions_Impl(); virtual ~AddonsOptions_Impl(); - // overloaded methods of baseclass - /*-**************************************************************************************************** @short called for notify of configmanager @descr These method is called from the ConfigManager before application ends or from the @@ -252,10 +243,8 @@ class AddonsOptions_Impl : public ConfigItem virtual void Commit() SAL_OVERRIDE; - // public interface - /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! @descr These class is used as static member of "SvtDynamicMenuOptions" ... @@ -282,10 +271,8 @@ class AddonsOptions_Impl : public ConfigItem const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; void ReadConfigurationData(); - // private methods - private: enum ImageSize { @@ -311,7 +298,6 @@ class AddonsOptions_Impl : public ConfigItem typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars; typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > > ToolbarMergingInstructions; - /*-**************************************************************************************************** @short return list of key names of our configuration management which represent oue module tree @descr These methods return the current list of key names! We need it to get needed values from our @@ -360,10 +346,8 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; - // private member - private: ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName ); @@ -399,7 +383,6 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize eSize, aURL[(int)eSize] = rURL; } - // constructor AddonsOptions_Impl::AddonsOptions_Impl() @@ -470,7 +453,6 @@ AddonsOptions_Impl::AddonsOptions_Impl() EnableNotification( aNotifySeq ); } - // destructor AddonsOptions_Impl::~AddonsOptions_Impl() @@ -508,7 +490,6 @@ void AddonsOptions_Impl::ReadConfigurationData() ReadStatusbarMergeInstructions( m_aCachedStatusbarMergingInstructions ); } - // public method void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ ) @@ -516,7 +497,6 @@ void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ Application::PostUserEvent( STATIC_LINK( 0, AddonsOptions, Notify ) ); } - // public method void AddonsOptions_Impl::Commit() @@ -524,7 +504,6 @@ void AddonsOptions_Impl::Commit() OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" ); } - // public method bool AddonsOptions_Impl::HasAddonsMenu() const @@ -532,7 +511,6 @@ bool AddonsOptions_Impl::HasAddonsMenu() const return ( m_aCachedMenuProperties.getLength() > 0 ); } - // public method sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const @@ -540,7 +518,6 @@ sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const return m_aCachedToolBarPartProperties.size(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const @@ -548,7 +525,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() return m_aCachedMenuProperties; } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const @@ -556,7 +532,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBa return m_aCachedMenuBarPartProperties; } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const @@ -567,7 +542,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa return m_aEmptyAddonToolBar; } - // public method const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const @@ -578,7 +552,6 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd return OUString(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const @@ -586,7 +559,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMe return m_aCachedHelpMenuProperties; } - // public method const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const @@ -594,7 +566,6 @@ const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstruction return m_aCachedMergeMenuInsContainer; } - // public method bool AddonsOptions_Impl::GetMergeToolbarInstructions( @@ -616,7 +587,6 @@ const MergeStatusbarInstructionContainer& AddonsOptions_Impl::GetMergeStatusbarI return m_aCachedStatusbarMergingInstructions; } - // public method static Image ScaleImage( const Image &rImage, bool bBig ) @@ -678,7 +648,6 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool return aImage; } - // private method bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq ) @@ -717,7 +686,6 @@ bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > > return ( rAddonMenuSeq.getLength() > 0 ); } - // private method bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq ) @@ -756,7 +724,6 @@ bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > return ( rAddonOfficeHelpMenuSeq.getLength() > 0 ); } - // private method bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq ) @@ -812,7 +779,6 @@ bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue return ( rAddonOfficeMenuBarSeq.getLength() > 0 ); } - // private method bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames ) @@ -835,8 +801,6 @@ bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBa return ( !rAddonOfficeToolBars.empty() ); } - - // private method bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) @@ -923,10 +887,8 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } } - // private method - OUString AddonsOptions_Impl::GeneratePrefixURL() { // Create an unique prefixed Add-On popup menu URL so it can be identified later as a runtime popup menu. @@ -939,10 +901,8 @@ OUString AddonsOptions_Impl::GeneratePrefixURL() return aPopupMenuURL; } - // private method - bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer ) { const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" ); @@ -1009,7 +969,6 @@ bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContaine return true; } - // private method bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ) @@ -1026,7 +985,6 @@ bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructi return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu ); } - // private method bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions ) @@ -1101,7 +1059,6 @@ bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction return true; } - // private method bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) @@ -1114,7 +1071,6 @@ bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstru return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems ); } - bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer ) { const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" ); @@ -1249,7 +1205,6 @@ bool AddonsOptions_Impl::ReadStatusBarItem( return bResult; } - // private method bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu ) @@ -1323,7 +1278,6 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< return bResult; } - // private method bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ) @@ -1364,7 +1318,6 @@ bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequ return bResult; } - // private method bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ) @@ -1385,7 +1338,6 @@ bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopu return true; } - // private method bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ) @@ -1442,7 +1394,6 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, return bResult; } - // private method bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq ) @@ -1472,7 +1423,6 @@ bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMen return true; } - // private method bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) @@ -1482,7 +1432,6 @@ bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) return ( pIter != m_aImageManager.end() ); } - // private method void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) @@ -1499,7 +1448,6 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) } } - // private method Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) @@ -1533,7 +1481,6 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) return aImage; } - // private method void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId ) @@ -1561,7 +1508,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS m_aImageManager.insert( ImageManager::value_type( aURL, aImageEntry )); } - // private method AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName ) @@ -1610,7 +1556,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin return pEntry; } - // private method bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const @@ -1652,7 +1597,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin return lResult; } - // private method Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const @@ -1668,7 +1612,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri return lResult; } - // private method Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const @@ -1703,7 +1646,6 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem( return lResult; } - // private method Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const @@ -1723,7 +1665,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& return lResult; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -1731,7 +1672,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; sal_Int32 AddonsOptions::m_nRefCount = 0 ; - // constructor AddonsOptions::AddonsOptions() @@ -1747,7 +1687,6 @@ AddonsOptions::AddonsOptions() } } - // destructor AddonsOptions::~AddonsOptions() @@ -1765,7 +1704,6 @@ AddonsOptions::~AddonsOptions() } } - // public method bool AddonsOptions::HasAddonsMenu() const @@ -1774,17 +1712,14 @@ bool AddonsOptions::HasAddonsMenu() const return m_pDataContainer->HasAddonsMenu(); } - // public method - sal_Int32 AddonsOptions::GetAddonsToolBarCount() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsToolBarCount(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() const @@ -1793,7 +1728,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() cons return m_pDataContainer->GetAddonsMenu(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart() const @@ -1802,7 +1736,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart return m_pDataContainer->GetAddonsMenuBarPart(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart( sal_uInt32 nIndex ) const @@ -1811,7 +1744,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart return m_pDataContainer->GetAddonsToolBarPart( nIndex ); } - // public method const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const @@ -1820,7 +1752,6 @@ const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) return m_pDataContainer->GetAddonsToolbarResourceName( nIndex ); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() const @@ -1829,7 +1760,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() return m_pDataContainer->GetAddonsHelpMenu(); } - // public method const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() const @@ -1838,7 +1768,6 @@ const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() c return m_pDataContainer->GetMergeMenuInstructions(); } - // public method bool AddonsOptions::GetMergeToolbarInstructions( @@ -1856,7 +1785,6 @@ const MergeStatusbarInstructionContainer& AddonsOptions::GetMergeStatusbarInstru return m_pDataContainer->GetMergeStatusbarInstructions(); } - // public method Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ) const @@ -1865,7 +1793,6 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig, bool bNoS return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale ); } - // public method Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const @@ -1873,7 +1800,6 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const return GetImageFromURL( aURL, bBig, false ); } - // private method Mutex& AddonsOptions::GetOwnStaticMutex() @@ -1898,7 +1824,6 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } - // private method IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 622fcaab13a7..f2f5b384b03a 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -70,7 +70,6 @@ class BmkMenu_Impl sal_uInt16 BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START; - BmkMenu_Impl::BmkMenu_Impl() : m_bInitialized(sal_False) { @@ -88,8 +87,6 @@ sal_uInt16 BmkMenu_Impl::GetMID() return m_nMID; } - - BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :AddonMenu(xFrame) ,m_nType( nType ) diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 616ca9040bf6..b3cc463ce49a 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -173,7 +173,6 @@ 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 ( @@ -185,7 +184,6 @@ 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. @@ -208,7 +206,6 @@ 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) @@ -225,7 +222,6 @@ 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. diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index e428fb5e600d..f90289227110 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "classes/fwkresid.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -41,8 +40,6 @@ ResMgr* FwkResId::GetResManager() return pResMgr; } - - FwkResId::FwkResId( sal_uInt16 nId ) : ResId( nId, *FwkResId::GetResManager() ) { diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index f51751d6fd76..3693ec06d03f 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/imagewrapper.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -40,17 +39,14 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() return seqID ; } - ImageWrapper::ImageWrapper( const Image& aImage ) : m_aImage( aImage ) { } - ImageWrapper::~ImageWrapper() { } - Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() { return impl_getStaticIdentifier(); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index d6079fb82a73..88ab372c8786 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/rootactiontriggercontainer.hxx> #include <classes/actiontriggercontainer.hxx> #include <classes/actiontriggerpropertyset.hxx> @@ -34,7 +33,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace com::sun::star::beans; - namespace framework { diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index 9ba7fabf5a1e..a1f0826a23f8 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/sfxhelperfunctions.hxx> #include <tools/diagnose_ex.h> @@ -29,8 +28,6 @@ static pfunc_createDockingWindow pCreateDockingWindow = NULL; static pfunc_isDockingWindowVisible pIsDockingWindowVisible = NULL; static pfunc_activateToolPanel pActivateToolPanel = NULL; - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index ba76e8dc440b..76ab044bece2 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -62,8 +62,6 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st }; // class ContinuationFilterSelect - - // initialize continuation with right start values ContinuationFilterSelect::ContinuationFilterSelect() @@ -71,7 +69,6 @@ ContinuationFilterSelect::ContinuationFilterSelect() { } - // 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, std::exception ) @@ -79,7 +76,6 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) thr m_sFilter = sFilter; } - // read access to transported filter OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception ) @@ -105,7 +101,6 @@ private: ContinuationFilterSelect* m_pFilter; }; - // initialize instance with all necessary information // We use it without any further checks on our member then ...! @@ -126,7 +121,6 @@ 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! @@ -135,7 +129,6 @@ 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! @@ -144,7 +137,6 @@ 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. @@ -153,7 +145,6 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::R 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 @@ -164,7 +155,6 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > return m_lContinuations; } - RequestFilterSelect::RequestFilterSelect( const OUString& sURL ) { pImp = new RequestFilterSelect_Impl( sURL ); @@ -176,8 +166,6 @@ RequestFilterSelect::~RequestFilterSelect() pImp->release(); } - - // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! @@ -186,7 +174,6 @@ 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! diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 0ea11f910f3c..dd47309dda03 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -40,14 +40,11 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - namespace framework { - // implementation helper ( menu => ActionTrigger ) - sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) { Reference< XServiceInfo > xServiceInfo( xPropertySet, UNO_QUERY ); @@ -237,11 +234,8 @@ 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 ) { Reference< XPropertySet > xPropSet; diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index 9b32e23fe192..a51b485cad11 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/configimporter.hxx> #include <framework/toolboxconfiguration.hxx> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index bcfd1552f1e5..debb6b024f89 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/documentundoguard.hxx" #include <com/sun/star/document/XUndoManagerSupplier.hpp> @@ -26,11 +25,9 @@ #include <rtl/ref.hxx> #include <tools/diagnose_ex.h> - namespace framework { - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -47,7 +44,6 @@ namespace framework using ::com::sun::star::document::UndoManagerEvent; using ::com::sun::star::lang::EventObject; - //= UndoManagerContextListener typedef ::cppu::WeakImplHelper1 < XUndoManagerListener @@ -110,91 +106,78 @@ namespace framework bool m_documentDisposed; }; - void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; m_nRelativeContextDepth = 0; } - void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; m_documentDisposed = true; } - //= DocumentUndoGuard_Data struct DocumentUndoGuard_Data @@ -223,7 +206,6 @@ namespace framework } } - void lcl_restore( DocumentUndoGuard_Data& i_data ) { try @@ -239,10 +221,8 @@ namespace framework } } - //= DocumentUndoGuard - DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent ) :m_pData( new DocumentUndoGuard_Data ) { @@ -254,8 +234,6 @@ namespace framework lcl_restore( *m_pData ); } - } // namespace framework - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index 4cff53f8ca1a..24cd403b3a42 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/imageproducer.hxx> namespace framework @@ -33,7 +32,6 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) return pOldFunc; } - Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& aURL, diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 2eea34c93421..e659c03bb90d 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -38,12 +38,10 @@ PropertySetContainer::PropertySetContainer() { } - PropertySetContainer::~PropertySetContainer() { } - // XInterface void SAL_CALL PropertySetContainer::acquire() throw () { diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index aa04ecd4d723..1e0d8d8dbfdf 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -35,10 +35,8 @@ #include <osl/mutex.hxx> #include <tools/urlobj.hxx> - namespace framework{ - TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : ::cppu::BaseMutex () , m_xContext (rxContext) @@ -52,12 +50,10 @@ 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 +86,6 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO } } - OUString SAL_CALL TitleHelper::getTitle() throw (css::uno::RuntimeException, std::exception) { @@ -115,7 +110,6 @@ OUString SAL_CALL TitleHelper::getTitle() // <- SYNCHRONIZED } - void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers) { // SYNCHRONIZED -> @@ -126,7 +120,6 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr // <- SYNCHRONIZED } - void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) throw (css::uno::RuntimeException, std::exception) { @@ -142,7 +135,6 @@ 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, std::exception) { @@ -150,7 +142,6 @@ 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, std::exception) { @@ -158,7 +149,6 @@ 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, std::exception) { @@ -176,7 +166,6 @@ 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, std::exception) { @@ -204,7 +193,6 @@ 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, std::exception) { @@ -232,7 +220,6 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven } } - void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception) { @@ -268,7 +255,6 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) impl_sendTitleChangedEvent (); } - void TitleHelper::impl_sendTitleChangedEvent () { // SYNCHRONIZED -> @@ -297,7 +283,6 @@ void TitleHelper::impl_sendTitleChangedEvent () } } - void TitleHelper::impl_updateTitle (bool init) { // SYNCHRONIZED -> @@ -324,7 +309,6 @@ void TitleHelper::impl_updateTitle (bool init) } } - void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel, bool init) { // SYNCHRONIZED -> @@ -395,7 +379,6 @@ 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 +444,6 @@ 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 ()) @@ -507,7 +489,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } - void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent) { @@ -518,7 +499,6 @@ void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle.append (xTitle->getTitle ()); } - void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) { OUString name(utl::ConfigManager::getProductName()); @@ -530,7 +510,6 @@ void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) } } - void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) { // SYNCHRONIZED -> @@ -563,7 +542,6 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) {} } - #ifdef DBG_UTIL void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) { @@ -582,7 +560,6 @@ 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 +569,24 @@ 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 +613,6 @@ 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 0e1fe7354556..565ddfa6bac2 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/undomanagerhelper.hxx" #include <com/sun/star/lang/XComponent.hpp> @@ -34,11 +33,9 @@ #include <queue> #include <boost/function.hpp> - namespace framework { - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -65,7 +62,6 @@ namespace framework using ::com::sun::star::util::XModifyListener; using ::svl::IUndoManager; - //= UndoActionWrapper class UndoActionWrapper : public SfxUndoAction @@ -85,7 +81,6 @@ namespace framework const Reference< XUndoAction > m_xUndoAction; }; - UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction ) :SfxUndoAction() ,m_xUndoAction( i_undoAction ) @@ -93,7 +88,6 @@ namespace framework ENSURE_OR_THROW( m_xUndoAction.is(), "illegal undo action" ); } - UndoActionWrapper::~UndoActionWrapper() { try @@ -108,7 +102,6 @@ namespace framework } } - OUString UndoActionWrapper::GetComment() const { OUString sComment; @@ -123,25 +116,21 @@ namespace framework return sComment; } - void UndoActionWrapper::Undo() { m_xUndoAction->undo(); } - void UndoActionWrapper::Redo() { m_xUndoAction->redo(); } - bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const { return false; } - //= UndoManagerRequest class UndoManagerRequest : public ::comphelper::AnyEvent @@ -195,9 +184,6 @@ namespace framework ::osl::Condition m_finishCondition; }; - - - //= UndoManagerHelper_Impl class UndoManagerHelper_Impl : public SfxUndoListener @@ -241,13 +227,11 @@ namespace framework { } - IUndoManager& getUndoManager() const { return m_rUndoManagerImplementation.getImplUndoManager(); } - Reference< XUndoManager > getXUndoManager() const { return m_rUndoManagerImplementation.getThis(); @@ -329,7 +313,6 @@ namespace framework void impl_reset(); }; - void UndoManagerHelper_Impl::disposing() { EventObject aEvent; @@ -344,7 +327,6 @@ namespace framework m_disposed = true; } - UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const { UndoManagerEvent aEvent; @@ -354,14 +336,12 @@ 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 +357,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ) { const EventObject aEvent( getXUndoManager() ); @@ -388,7 +367,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -402,7 +380,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -414,7 +391,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { if ( !i_action.is() ) @@ -434,7 +410,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -446,7 +421,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -458,7 +432,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -470,7 +443,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::lock() { // SYNCHRONIZED ---> @@ -484,7 +456,6 @@ namespace framework // <--- SYNCHRONIZED } - void UndoManagerHelper_Impl::unlock() { // SYNCHRONIZED ---> @@ -501,7 +472,6 @@ 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 +533,6 @@ namespace framework while ( true ); } - void UndoManagerHelper_Impl::impl_enterUndoContext( const OUString& i_title, const bool i_hidden ) { // SYNCHRONIZED ---> @@ -595,7 +564,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_leaveUndoContext() { // SYNCHRONIZED ---> @@ -655,7 +623,6 @@ 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 +670,6 @@ 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 +699,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_clear() { // SYNCHRONIZED ---> @@ -756,7 +721,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_clearRedo() { // SYNCHRONIZED ---> @@ -779,7 +743,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_reset() { // SYNCHRONIZED ---> @@ -799,7 +762,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -810,7 +772,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -821,7 +782,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment ) { if ( m_bAPIActionRunning ) @@ -830,7 +790,6 @@ namespace framework notify( i_actionComment, &XUndoManagerListener::undoActionAdded ); } - void UndoManagerHelper_Impl::cleared() { if ( m_bAPIActionRunning ) @@ -839,7 +798,6 @@ namespace framework notify( &XUndoManagerListener::allActionsCleared ); } - void UndoManagerHelper_Impl::clearedRedo() { if ( m_bAPIActionRunning ) @@ -848,7 +806,6 @@ namespace framework notify( &XUndoManagerListener::redoActionsCleared ); } - void UndoManagerHelper_Impl::resetAll() { if ( m_bAPIActionRunning ) @@ -857,7 +814,6 @@ namespace framework notify( &XUndoManagerListener::resetAll ); } - void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -870,7 +826,6 @@ namespace framework notify( i_comment, &XUndoManagerListener::enteredContext ); } - void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -885,7 +840,6 @@ namespace framework notify( i_comment, &XUndoManagerListener::leftContext ); } - void UndoManagerHelper_Impl::listActionLeftAndMerged() { #if OSL_DEBUG_LEVEL > 0 @@ -900,7 +854,6 @@ namespace framework notify( &XUndoManagerListener::leftHiddenContext ); } - void UndoManagerHelper_Impl::listActionCancelled() { #if OSL_DEBUG_LEVEL > 0 @@ -915,51 +868,42 @@ namespace framework notify( &XUndoManagerListener::cancelledContext ); } - void UndoManagerHelper_Impl::undoManagerDying() { // TODO: do we need to care? Or is this the responsibility of our owner? } - //= 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 +917,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -987,25 +930,21 @@ 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 ); } - bool UndoManagerHelper::isUndoPossible() const { // SYNCHRONIZED ---> @@ -1017,7 +956,6 @@ namespace framework // <--- SYNCHRONIZED } - bool UndoManagerHelper::isRedoPossible() const { // SYNCHRONIZED ---> @@ -1029,7 +967,6 @@ namespace framework // <--- SYNCHRONIZED } - namespace { @@ -1054,7 +991,6 @@ namespace framework // <--- SYNCHRONIZED } - Sequence< OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { // SYNCHRONIZED ---> @@ -1077,61 +1013,51 @@ 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(); } - bool UndoManagerHelper::isLocked() { // SYNCHRONIZED ---> @@ -1142,36 +1068,30 @@ 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() ) m_pImpl->removeModifyListener( i_listener ); } - } // namespace framework - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 3f3f320d4639..caef1881d302 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -31,14 +31,10 @@ PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Referen { } - - PreventDuplicateInteraction::~PreventDuplicateInteraction() { } - - void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler) { // SAFE -> @@ -48,8 +44,6 @@ void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::tas // <- SAFE } - - void PreventDuplicateInteraction::useDefaultUUIHandler() { // SAFE -> @@ -66,7 +60,6 @@ void PreventDuplicateInteraction::useDefaultUUIHandler() // <- SAFE } - css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) { @@ -80,8 +73,6 @@ 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, std::exception) { @@ -136,8 +127,6 @@ 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, std::exception) { @@ -195,8 +184,6 @@ sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const c return false; } - - void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo) { // SAFE -> @@ -222,8 +209,6 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter // <- SAFE } - - bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type& aInteraction, PreventDuplicateInteraction::InteractionInfo* pReturn ) const { diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 3e3600128517..8b87cdde2b23 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -49,12 +49,10 @@ MenuConfiguration::MenuConfiguration( { } - MenuConfiguration::~MenuConfiguration() { } - Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( Reference< XInputStream >& rInputStream ) throw ( WrappedTargetException ) @@ -66,7 +64,6 @@ throw ( WrappedTargetException ) aInputSource.aInputStream = rInputStream; - // create menu bar Reference< XIndexContainer > xItemContainer( static_cast< cppu::OWeakObject *>( new RootItemContainer()), UNO_QUERY ); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 85479e99aaa3..4f02287d7001 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sal/macros.h> @@ -34,7 +33,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/attributelist.hxx> - #define XMLNS_MENU "http://openoffice.org/2001/menu" #define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" @@ -83,10 +81,8 @@ 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; using namespace ::com::sun::star::beans; @@ -109,7 +105,6 @@ MenuStyleItem MenuItemStyles[ ] = { { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } }; - sal_Int32 nMenuStyleItemEntries = (sizeof (MenuItemStyles) / sizeof (MenuItemStyles[0])); static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, @@ -150,8 +145,6 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, } } - - // Base class implementation ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : @@ -222,8 +215,6 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT; } - - OReadMenuDocumentHandler::OReadMenuDocumentHandler( const Reference< XIndexContainer >& rMenuBarContainer ) : m_nElementDepth( 0 ), @@ -237,13 +228,11 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler() { } - void SAL_CALL OReadMenuDocumentHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuDocumentHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { @@ -255,7 +244,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument(void) } } - void SAL_CALL OReadMenuDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -275,13 +263,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -304,9 +290,6 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) } } - - - OReadMenuBarHandler::OReadMenuBarHandler( const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) @@ -317,24 +300,20 @@ OReadMenuBarHandler::OReadMenuBarHandler( { } - OReadMenuBarHandler::~OReadMenuBarHandler() { } - void SAL_CALL OReadMenuBarHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuBarHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuBarHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -424,13 +403,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuBarHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void OReadMenuBarHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -454,10 +431,6 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) } } - - - - OReadMenuHandler::OReadMenuHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : @@ -468,24 +441,20 @@ OReadMenuHandler::OReadMenuHandler( { } - OReadMenuHandler::~OReadMenuHandler() { } - void SAL_CALL OReadMenuHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception) { } - void SAL_CALL OReadMenuHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -510,13 +479,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -540,10 +507,6 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) } } - - - - OReadMenuPopupHandler::OReadMenuPopupHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : @@ -556,18 +519,15 @@ OReadMenuPopupHandler::OReadMenuPopupHandler( { } - OReadMenuPopupHandler::~OReadMenuPopupHandler() { } - void SAL_CALL OReadMenuPopupHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuPopupHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception) { @@ -714,13 +674,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuPopupHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -767,10 +725,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) } } - // --------------------------------- Write XML --------------------------------- - OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( const Reference< XIndexAccess >& rMenuBarContainer, const Reference< XDocumentHandler >& rDocumentHandler ) : @@ -782,12 +738,10 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); } - OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler() { } - void OWriteMenuDocumentHandler::WriteMenuDocument() throw ( SAXException, RuntimeException ) { @@ -823,7 +777,6 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->endDocument(); } - void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer ) throw ( SAXException, RuntimeException ) { @@ -904,7 +857,6 @@ throw ( SAXException, RuntimeException ) } } - void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; @@ -952,7 +904,6 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, cons m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUITEM ) ); } - void OWriteMenuDocumentHandler::WriteMenuSeparator() { m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index cff7cf734497..894e7f11c25d 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ @@ -36,7 +35,6 @@ using namespace ::com::sun::star::uno; namespace framework{ - SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) : m_xLocator( 0 ), xDocumentHandler( rSax1DocumentHandler ), diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 0a9c3d8843b5..69aaf0c097c6 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/statusbarconfiguration.hxx> #include <xml/statusbardocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - namespace framework { diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 6837dbb8d170..cf4ce24b5aa6 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/statusbardocumenthandler.hxx> @@ -143,7 +142,6 @@ StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_EN { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_HELPURL } }; - OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( const Reference< XIndexContainer >& rStatusBarItems ) : m_aStatusBarItems( rStatusBarItems ) @@ -482,11 +480,8 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteStatusBarDocumentHandler - OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( const Reference< XIndexAccess >& aStatusBarItems, const Reference< XDocumentHandler >& rWriteDocumentHandler ) : @@ -567,10 +562,8 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteStatusBarDocumentHandler::WriteStatusBarItem( const OUString& rCommandURL, const OUString& /*rHelpURL*/, diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 26bd8d66f6bc..013702dec886 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/toolboxconfiguration.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - namespace framework { @@ -80,7 +78,6 @@ bool ToolBoxConfiguration::LoadToolBox( } } - bool ToolBoxConfiguration::StoreToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 854cb4b4fa03..f4425bc8be0b 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/toolboxdocumenthandler.hxx> @@ -42,7 +41,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; - #define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" namespace framework @@ -653,11 +651,8 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteToolBoxDocumentHandler - OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( const Reference< XIndexAccess >& rItemAccess, Reference< XDocumentHandler >& rWriteDocumentHandler ) : @@ -758,10 +753,8 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteToolBoxDocumentHandler::WriteToolBoxItem( const OUString& rCommandURL, const OUString& rLabel, diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index 12c252b6dfd2..d44c06c7c1ec 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xml/xmlnamespaces.hxx> using namespace ::com::sun::star::xml::sax; |