summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-20 10:12:32 +0200
committerNoel Grandin <noel@peralex.com>2015-11-20 10:12:58 +0200
commit1d5c39192e81f950289dbdd7991a0e8a67c0aabc (patch)
treed4104b843ea7867ae24ad99d441e76ba18a433c0 /framework/source
parentd4857e30b1defde21895ece6b29c8c9829168a50 (diff)
new loplugin:unusedfields
run it over the framework module Change-Id: I1220a4be0936ba30136ce22ffd78633c8a7b9d35
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/dispatch/closedispatcher.cxx1
-rw-r--r--framework/source/dispatch/dispatchprovider.cxx2
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx5
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx1
-rw-r--r--framework/source/services/autorecovery.cxx3
-rw-r--r--framework/source/services/substitutepathvars.cxx39
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx1
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx1
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx6
-rw-r--r--framework/source/uielement/statusbarmanager.cxx3
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx4
-rw-r--r--framework/source/uielement/uicommanddescription.cxx2
13 files changed, 23 insertions, 47 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 401bde5335f8..0915738266d3 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -60,7 +60,6 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent
, m_aAsyncCallback(
new vcl::EventPoster(LINK(this, CloseDispatcher, impl_asyncCallback)))
, m_eOperation(E_CLOSE_DOC)
- , m_lStatusListener(m_mutex)
, m_pSysWindow(nullptr)
{
uno::Reference<frame::XFrame> xTarget = static_impl_searchRightTargetFrame(xFrame, sTarget);
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index bed75e26a957..c26328e02930 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -594,7 +594,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
case E_STARTMODULEDISPATCHER :
{
- StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( m_xContext, xOwner );
+ StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( m_xContext );
xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
}
break;
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 726802cbb050..ff9fdb6cc85b 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -48,11 +48,8 @@ namespace framework{
#endif
namespace fpf = ::framework::pattern::frame;
-StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const css::uno::Reference< css::frame::XFrame >& xFrame)
+StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
: m_xContext (rxContext )
- , m_xOwner (xFrame )
- , m_lStatusListener (m_mutex)
{
}
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 4971462efdb6..07b1f6c15bcf 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -38,7 +38,6 @@ namespace framework{
SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) :
m_xLocator( nullptr ),
xDocumentHandler( rSax1DocumentHandler ),
- m_nDepth( 0 ),
m_aXMLAttributeNamespace( "xmlns" ),
m_aXMLAttributeType( "CDATA" )
{
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 9c90fae0ddb8..8e765f049e34 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -443,9 +443,6 @@ private:
sal_Bool m_dbg_bMakeItFaster;
#endif
- // HACK ... TODO
- css::uno::Reference< css::task::XStatusIndicator > m_xExternalProgress;
-
// interface
public:
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 7ddb1648817a..3bf6c89b9219 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -292,7 +292,6 @@ private:
struct FixedVariable
{
const char* pVarName;
- sal_Int32 nStrLen;
PreDefVariable nEnumValue;
bool bAbsPath;
};
@@ -344,25 +343,25 @@ static const sal_Int16 aEnvPrioTable[ET_COUNT] =
// Table with all fixed/predefined variables supported.
static const FixedVariable aFixedVarTable[] =
{
- { RTL_CONSTASCII_STRINGPARAM("$(inst)"), PREDEFVAR_INST, true },
- { RTL_CONSTASCII_STRINGPARAM("$(prog)"), PREDEFVAR_PROG, true },
- { RTL_CONSTASCII_STRINGPARAM("$(user)"), PREDEFVAR_USER, true },
- { RTL_CONSTASCII_STRINGPARAM("$(work)"), PREDEFVAR_WORK, true }, // Special variable (transient)!
- { RTL_CONSTASCII_STRINGPARAM("$(home)"), PREDEFVAR_HOME, true },
- { RTL_CONSTASCII_STRINGPARAM("$(temp)"), PREDEFVAR_TEMP, true },
- { RTL_CONSTASCII_STRINGPARAM("$(path)"), PREDEFVAR_PATH, true },
- { RTL_CONSTASCII_STRINGPARAM("$(langid)"), PREDEFVAR_LANGID, false },
- { RTL_CONSTASCII_STRINGPARAM("$(vlang)"), PREDEFVAR_VLANG, false },
- { RTL_CONSTASCII_STRINGPARAM("$(instpath)"), PREDEFVAR_INSTPATH, true },
- { RTL_CONSTASCII_STRINGPARAM("$(progpath)"), PREDEFVAR_PROGPATH, true },
- { RTL_CONSTASCII_STRINGPARAM("$(userpath)"), PREDEFVAR_USERPATH, true },
- { RTL_CONSTASCII_STRINGPARAM("$(insturl)"), PREDEFVAR_INSTURL, true },
- { RTL_CONSTASCII_STRINGPARAM("$(progurl)"), PREDEFVAR_PROGURL, true },
- { RTL_CONSTASCII_STRINGPARAM("$(userurl)"), PREDEFVAR_USERURL, true },
- { RTL_CONSTASCII_STRINGPARAM("$(workdirurl)"), PREDEFVAR_WORKDIRURL, true }, // Special variable (transient) and don't use for resubstitution!
- { RTL_CONSTASCII_STRINGPARAM("$(baseinsturl)"), PREDEFVAR_BASEINSTURL, true },
- { RTL_CONSTASCII_STRINGPARAM("$(userdataurl)"), PREDEFVAR_USERDATAURL, true },
- { RTL_CONSTASCII_STRINGPARAM("$(brandbaseurl)"),PREDEFVAR_BRANDBASEURL, true }
+ { "$(inst)", PREDEFVAR_INST, true },
+ { "$(prog)", PREDEFVAR_PROG, true },
+ { "$(user)", PREDEFVAR_USER, true },
+ { "$(work)", PREDEFVAR_WORK, true }, // Special variable (transient)!
+ { "$(home)", PREDEFVAR_HOME, true },
+ { "$(temp)", PREDEFVAR_TEMP, true },
+ { "$(path)", PREDEFVAR_PATH, true },
+ { "$(langid)", PREDEFVAR_LANGID, false },
+ { "$(vlang)", PREDEFVAR_VLANG, false },
+ { "$(instpath)", PREDEFVAR_INSTPATH, true },
+ { "$(progpath)", PREDEFVAR_PROGPATH, true },
+ { "$(userpath)", PREDEFVAR_USERPATH, true },
+ { "$(insturl)", PREDEFVAR_INSTURL, true },
+ { "$(progurl)", PREDEFVAR_PROGURL, true },
+ { "$(userurl)", PREDEFVAR_USERURL, true },
+ { "$(workdirurl)", PREDEFVAR_WORKDIRURL, true }, // Special variable (transient) and don't use for resubstitution!
+ { "$(baseinsturl)", PREDEFVAR_BASEINSTURL, true },
+ { "$(userdataurl)", PREDEFVAR_USERDATAURL, true },
+ { "$(brandbaseurl)",PREDEFVAR_BRANDBASEURL, true }
};
// Implementation helper classes
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 5b5c0f59deb3..caea44e3569f 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -507,7 +507,6 @@ ImageManagerImpl::ImageManagerImpl( const uno::Reference< uno::XComponentContext
m_xContext( rxContext )
, m_pOwner(pOwner)
, m_pDefaultImageList( nullptr )
- , m_aXMLPostfix( ".xml" )
, m_aResourceString( ModuleImageList )
, m_aListenerContainer( m_mutex )
, m_bUseGlobal(_bUseGlobal)
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index f9c36ea3706f..f756f0b0ab9d 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -166,7 +166,6 @@ namespace framework
::cppu::OWeakObject* m_pOwner;
rtl::Reference< GlobalImageList > m_pGlobalImageList;
CmdImageList* m_pDefaultImageList;
- OUString m_aXMLPostfix;
OUString m_aModuleIdentifier;
OUString m_aResourceString;
osl::Mutex m_mutex;
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 0f8927124922..4b902436b4f4 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -51,12 +51,6 @@ using namespace framework;
namespace {
-struct ModuleToCategory
-{
- const char* pModuleId;
- const char* pCommands;
-};
-
static const char GENERIC_MODULE_NAME[] = "generic";
static const char CONFIGURATION_ROOT_ACCESS[] = "/org.openoffice.Office.UI.";
static const char CONFIGURATION_CATEGORY_ELEMENT_ACCESS[] = "/Commands/Categories";
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 92673de99a6f..13f06912c241 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -131,14 +131,11 @@ static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle )
StatusBarManager::StatusBarManager(
const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< frame::XFrame >& rFrame,
- const OUString& rResourceName,
StatusBar* pStatusBar ) :
m_bDisposed( false ),
m_bFrameActionRegistered( false ),
m_bUpdateControllers( false ),
- m_bModuleIdentified( false ),
m_pStatusBar( pStatusBar ),
- m_aResourceName( rResourceName ),
m_xFrame( rFrame ),
m_aListenerContainer( m_mutex ),
m_xContext( rxContext )
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 7c3b82a6fe60..6557ee1aa017 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -111,7 +111,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK );
pStatusBar = VclPtr<FrameworkStatusBar>::Create( pWindow, nStyles );
- pStatusBarManager = new StatusBarManager( m_xContext, xFrame, m_aResourceURL, pStatusBar );
+ pStatusBarManager = new StatusBarManager( m_xContext, xFrame, pStatusBar );
static_cast<FrameworkStatusBar*>(pStatusBar)->SetStatusBarManager( pStatusBarManager );
m_xStatusBarManager.set( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY );
pStatusBar->SetUniqueId( HID_STATUSBAR );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index c1c23a6f4da6..ce608f7bbec2 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -177,7 +177,6 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
ToolBox* pToolBar ) :
m_bDisposed( false ),
m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ),
- m_bModuleIdentified( false ),
m_bAddedToTaskPaneList( true ),
m_bFrameActionRegistered( false ),
m_bUpdateControllers( false ),
@@ -189,8 +188,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
m_xFrame( rFrame ),
m_aListenerContainer( m_mutex ),
m_xContext( rxContext ),
- m_sIconTheme( SvtMiscOptions().GetIconTheme() ),
- m_bAcceleratorCfg( false )
+ m_sIconTheme( SvtMiscOptions().GetIconTheme() )
{
OSL_ASSERT( m_xContext.is() );
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 926f5c094be1..01e9285d356b 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -614,7 +614,6 @@ void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEven
UICommandDescription::UICommandDescription(const Reference< XComponentContext >& rxContext)
: UICommandDescription_BASE(m_aMutex)
- , m_bConfigRead(false)
, m_aPrivateResourceURL(PRIVATE_RESOURCE_URL)
, m_xContext(rxContext)
{
@@ -632,7 +631,6 @@ UICommandDescription::UICommandDescription(const Reference< XComponentContext >&
UICommandDescription::UICommandDescription(const Reference< XComponentContext >& rxContext, bool)
: UICommandDescription_BASE(m_aMutex)
- , m_bConfigRead(false)
, m_xContext(rxContext)
{
}