diff options
Diffstat (limited to 'framework/source/fwe/classes')
11 files changed, 0 insertions, 108 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; |