diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-20 10:12:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-20 10:12:58 +0200 |
commit | 1d5c39192e81f950289dbdd7991a0e8a67c0aabc (patch) | |
tree | d4104b843ea7867ae24ad99d441e76ba18a433c0 /framework/inc | |
parent | d4857e30b1defde21895ece6b29c8c9829168a50 (diff) |
new loplugin:unusedfields
run it over the framework module
Change-Id: I1220a4be0936ba30136ce22ffd78633c8a7b9d35
Diffstat (limited to 'framework/inc')
-rw-r--r-- | framework/inc/classes/filtercache.hxx | 1 | ||||
-rw-r--r-- | framework/inc/classes/filtercachedata.hxx | 93 | ||||
-rw-r--r-- | framework/inc/dispatch/closedispatcher.hxx | 1 | ||||
-rw-r--r-- | framework/inc/dispatch/startmoduledispatcher.hxx | 7 | ||||
-rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 4 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 7 | ||||
-rw-r--r-- | framework/inc/uielement/uicommanddescription.hxx | 1 | ||||
-rw-r--r-- | framework/inc/xml/acceleratorconfigurationreader.hxx | 3 | ||||
-rw-r--r-- | framework/inc/xml/saxnamespacefilter.hxx | 1 |
9 files changed, 1 insertions, 117 deletions
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index f8f1da247396..7d9e45e21c74 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -84,7 +84,6 @@ class FilterCache : private TransactionBase private: static sal_Int32 m_nRefCount; - static DataContainer* m_pData; static sal_Int32 m_nVersion; static sal_Int16 m_nMode; diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index e20b1a313deb..f41aeb5415eb 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -315,12 +315,6 @@ class SetNodeHash : public std::unordered_map< OUString , OUStringHash , std::equal_to< OUString > > { - // member - - public: - OUStringList lAddedItems; - OUStringList lChangedItems; - OUStringList lRemovedItems; }; // Use these hashes to implement different tables which assign types to frame loader or detect services. @@ -335,93 +329,6 @@ class PerformanceHash : public std::unordered_map< OUString, }; -// Use private static data container to hold all values of configuration! - -class DataContainer -{ - public: - - /** @short identifies different sets of the TypeDetection configuration package. - - @descr Most functions on top of this configuration package are the same ... - but must be executed on different places inside this configuration structures. - These enum values can be used ate some interface methods to specify, which - configuration set should be used. - Further it must be possible to start the same action for more than one cfg type. - That's why these values must be interpreted as flags. Means: its values must be - in range [2^n]! - */ - enum ECFGType - { - E_TYPE = 1, - E_FILTER = 2, - E_DETECTSERVICE = 4, - E_FRAMELOADER = 8, - E_CONTENTHANDLER = 16, - - E_ALL = E_TYPE | E_FILTER | E_DETECTSERVICE | E_FRAMELOADER | E_CONTENTHANDLER - }; - - public: - - DataContainer(); - - SetNodeHash< FileType > m_aTypeCache; /// hold all information about registered file types - SetNodeHash< Filter > m_aFilterCache; /// hold all information about registered filters - SetNodeHash< Detector > m_aDetectorCache; /// hold all information about registered detect services - SetNodeHash< Loader > m_aLoaderCache; /// hold all information about registered loader services - SetNodeHash< ContentHandler > m_aContentHandlerCache; /// hold all information about registered content handler services - PerformanceHash m_aFastFilterCache; /// hold all registered filter for a special file type - PerformanceHash m_aFastDetectorCache; /// hold all registered detect services for a special file type - PerformanceHash m_aFastLoaderCache; /// hold all registered loader services for a special file type - PerformanceHash m_aFastContentHandlerCache; /// hold all registered content handler services for a special file type - OUStringHashMap m_aPreferredTypesCache; /// assignment of extensions to preferred types for it - Loader m_aGenericLoader; /// information about our default frame loader - OUString m_sLocale; /// current set locale of configuration to handle right UIName from set of all UINames! - bool m_bTypesModified; - bool m_bFiltersModified; - bool m_bDetectorsModified; - bool m_bLoadersModified; - bool m_bHandlersModified; -}; - -/*-************************************************************************************************************ - @short capsulate configuration access for filter configuration - @descr We use the ConfigItem mechanism to read/write values from/to configuration. - This implementation could be used to handle standard AND additional filter configurations in the same way. - We set a data container pointer for filling or reading ... this class use it temp. - After successfully calling of read(), we can use filled container directly or merge it with an existing one. - After successfully calling of write() all values of given data container are flushed to our configuration. - @base ConfigItem - - @devstatus ready to use - @threadsafe no -*//*-*************************************************************************************************************/ -class FilterCFGAccess : public ::utl::ConfigItem -{ - - // interface - - public: - FilterCFGAccess ( const OUString& sPath , - sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION , - ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration - virtual ~FilterCFGAccess( ); - - // member - - private: - EFilterPackage m_ePackage; // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter - sal_Int32 m_nVersion; // file format version of configuration! (necessary for "xml2xcd" transformation!) - sal_Int32 m_nKeyCountTypes; // follow key counts present count of configuration properties for types/filters ... and depends from m_nVersion - must be set right! - sal_Int32 m_nKeyCountFilters; - sal_Int32 m_nKeyCountDetectors; - sal_Int32 m_nKeyCountLoaders; - sal_Int32 m_nKeyCountContentHandlers; - OUString m_sProductName; - OUString m_sFormatVersion; -}; - } // namespace framework #endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index bf77143ddee7..523f3c9544aa 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -100,7 +100,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper< /** @short list of registered status listener */ osl::Mutex m_mutex; - ListenerHash m_lStatusListener; /** @short holded alive for internally asynchronous operations! */ css::uno::Reference< css::frame::XDispatchResultListener > m_xResultListener; diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 31ecb62e8c6d..dbb8d3f4dc8e 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -58,12 +58,8 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper< uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short our "context" frame. */ - css::uno::WeakReference< css::frame::XFrame > m_xOwner; - /** @short list of registered status listener */ osl::Mutex m_mutex; - ListenerHash m_lStatusListener; // native interface @@ -80,8 +76,7 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper< @param xFrame the frame where the corresponding dispatch was started. */ - StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::frame::XFrame >& xFrame); + StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext); /** @short does nothing real. */ virtual ~StartModuleDispatcher(); diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index a80fea3293a9..305da2cc5594 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -54,7 +54,6 @@ class StatusBarManager : public ::cppu::WeakImplHelper< public: StatusBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& rResourceName, StatusBar* pStatusBar ); virtual ~StatusBarManager(); @@ -100,12 +99,9 @@ class StatusBarManager : public ::cppu::WeakImplHelper< bool m_bDisposed : 1, m_bFrameActionRegistered : 1, m_bUpdateControllers : 1; - bool m_bModuleIdentified; VclPtr<StatusBar> m_pStatusBar; OUString m_aModuleIdentifier; - OUString m_aResourceName; css::uno::Reference< css::frame::XFrame > m_xFrame; - css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; StatusBarControllerMap m_aControllerMap; osl::Mutex m_mutex; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 2f55097ced66..655228aec03b 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -118,11 +118,6 @@ class ToolBarManager : public ToolbarManager_Base css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::awt::XWindow > xWindow; }; - struct ControllerParams - { - sal_Int16 nWidth; - }; - typedef std::vector< ControllerParams > ControllerParamsVector; protected: DECL_LINK_TYPED( Command, CommandEvent const *, void ); @@ -173,7 +168,6 @@ class ToolBarManager : public ToolbarManager_Base bool m_bDisposed : 1, m_bSmallSymbols : 1, - m_bModuleIdentified : 1, m_bAddedToTaskPaneList : 1, m_bFrameActionRegistered : 1, m_bUpdateControllers : 1, @@ -206,7 +200,6 @@ class ToolBarManager : public ToolbarManager_Base Timer m_aAsyncUpdateControllersTimer; OUString m_sIconTheme; MenuDescriptionMap m_aMenuMap; - bool m_bAcceleratorCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index d57ae4a255c3..9e837cb0c4a2 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -95,7 +95,6 @@ public: UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool ); void impl_fillElements(const sal_Char* _pName); - bool m_bConfigRead; OUString m_aPrivateResourceURL; css::uno::Reference< css::uno::XComponentContext > m_xContext; ModuleToCommandFileMap m_aModuleToCommandFileMap; diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index a865729c23b0..206784213263 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -71,9 +71,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper< css::xml:: private: - /** @short needed to read the xml configuration. */ - css::uno::Reference< css::xml::sax::XDocumentHandler > m_xReader; - /** @short reference to the outside container, where this reader/writer must work on. */ AcceleratorCache& m_rContainer; diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index c5ddc91ff889..cd4c30aa81b0 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -84,7 +84,6 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : css::uno::Reference< css::xml::sax::XLocator > m_xLocator; css::uno::Reference< css::xml::sax::XDocumentHandler> xDocumentHandler; NamespaceStack m_aNamespaceStack; - sal_Int32 m_nDepth; OUString m_aXMLAttributeNamespace; OUString m_aXMLAttributeType; |