summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-11-24 16:36:16 +0100
committerJulien Nabet <serval2412@yahoo.fr>2019-11-24 20:00:38 +0100
commit17c3d827e12d9ca99b869132f23ba212b11f909a (patch)
treef9e9b6ae7ba07cf0d935a9fcb8c74add48b44fd4 /framework
parent3e1f0c060f02db4515b2dc705bda17ee068d51b4 (diff)
cppcheck: performing init in init list (filter/fpicker/framework)
Change-Id: I7b602d17949f75c32dfe87acb92498111812ac32 Reviewed-on: https://gerrit.libreoffice.org/83612 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx3
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx8
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx9
-rw-r--r--framework/source/uielement/uicommanddescription.cxx12
4 files changed, 11 insertions, 21 deletions
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index ef851093e70e..01411804fb8b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -194,9 +194,8 @@ class InteractionRequest_Impl : public ::cppu::WeakImplHelper< css::task::XInter
public:
InteractionRequest_Impl( const css::uno::Any& aRequest,
const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations )
+ : m_aRequest(aRequest), m_lContinuations(lContinuations)
{
- m_aRequest = aRequest;
- m_lContinuations = lContinuations;
}
virtual uno::Any SAL_CALL getRequest() override;
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 5acec278f5e3..2c27f0403914 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -96,16 +96,14 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
// XInterface, XTypeProvider
ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) :
- m_aConfigCategoryAccess( "/org.openoffice.Office.UI." ),
+ // Create configuration hierarchical access name
+ m_aConfigCategoryAccess( "/org.openoffice.Office.UI." + aModuleName + "/Commands/Categories"),
m_aPropUIName( "Name" ),
m_xGenericUICategories( rGenericUICategories ),
+ m_xConfigProvider(theDefaultProvider::get( rxContext )),
m_bConfigAccessInitialized( false ),
m_bCacheFilled( false )
{
- // Create configuration hierarchical access name
- m_aConfigCategoryAccess += aModuleName + "/Commands/Categories";
-
- m_xConfigProvider = theDefaultProvider::get( rxContext );
}
ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 2b75292c3a12..fe3697162a0e 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -214,15 +214,12 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon
};
ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) :
- m_aConfigWindowAccess( "/org.openoffice.Office.UI." ),
+ // Create configuration hierarchical access name
+ m_aConfigWindowAccess( "/org.openoffice.Office.UI." + aModuleName + "/UIElements/States"),
+ m_xConfigProvider(theDefaultProvider::get( rxContext )),
m_bConfigAccessInitialized( false ),
m_bModified( false )
{
- // Create configuration hierarchical access name
- m_aConfigWindowAccess += aModuleName
- + "/UIElements/States";
- m_xConfigProvider = theDefaultProvider::get( rxContext );
-
// Initialize access array with property names.
sal_Int32 n = 0;
while ( CONFIGURATION_PROPERTIES[n] )
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 85c97cee559d..76a2f03391c1 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -153,20 +153,16 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
// XInterface, XTypeProvider
ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) :
- m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS ),
- m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS ),
+ // Create configuration hierarchical access name
+ m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS + aModuleName + "/UserInterface/Commands"),
+ m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS + aModuleName + "/UserInterface/Popups"),
m_aPropProperties( "Properties" ),
m_xGenericUICommands( rGenericUICommands ),
+ m_xConfigProvider( theDefaultProvider::get( rxContext ) ),
m_bConfigAccessInitialized( false ),
m_bCacheFilled( false ),
m_bGenericDataRetrieved( false )
{
- // Create configuration hierarchical access name
- m_aConfigCmdAccess += aModuleName + "/UserInterface/Commands";
-
- m_xConfigProvider = theDefaultProvider::get( rxContext );
-
- m_aConfigPopupAccess += aModuleName + "/UserInterface/Popups";
}
ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()