summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-08 14:52:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-08 19:28:19 +0200
commit8dc6c96a8036f80c3ba016ea347ce2f83daa9726 (patch)
tree0e53fb33114b21b5f1942fee3b727efea79bb65d /framework
parent9212fadc4d421148e1a3f8b668d82a93f65cc2c3 (diff)
loplugin:simplifyconstruct in filter..framework
Change-Id: Ida4307a92dfb1dbd14da5a30b6ee1f0fd6a9455e Reviewed-on: https://gerrit.libreoffice.org/60194 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx2
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx1
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx1
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx1
-rw-r--r--framework/source/recording/dispatchrecordersupplier.cxx1
-rw-r--r--framework/source/services/frame.cxx1
-rw-r--r--framework/source/services/pathsettings.cxx1
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx1
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx4
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx3
11 files changed, 2 insertions, 16 deletions
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 94eb09221c02..7c02acf1dfa0 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -55,8 +55,6 @@ ActionTriggerPropertySet::ActionTriggerPropertySet()
: OBroadcastHelper ( m_aMutex )
, OPropertySetHelper ( *static_cast< OBroadcastHelper * >(this) )
, OWeakObject ()
- , m_xBitmap ( nullptr )
- , m_xActionTriggerContainer( nullptr )
{
}
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index da691e77276a..6bb685ae24e2 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -146,8 +146,6 @@ static void ExtractMenuParameters( const Sequence< PropertyValue >& rProp,
// Base class implementation
ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
- m_xLocator( nullptr ),
- m_xReader( nullptr ),
m_aType( ITEM_DESCRIPTOR_TYPE ),
m_aLabel( ITEM_DESCRIPTOR_LABEL ),
m_aContainer( ITEM_DESCRIPTOR_CONTAINER ),
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 44abd1d03aef..dcb5ca645bea 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
namespace framework{
SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler > const & rSax1DocumentHandler ) :
- m_xLocator( nullptr ),
xDocumentHandler( rSax1DocumentHandler ),
m_aXMLAttributeNamespace( "xmlns" ),
m_aXMLAttributeType( "CDATA" )
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 276b9cbbad00..d11dc8eb2cd5 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -121,7 +121,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
, m_xModuleManager( ModuleManager::create( xContext ))
, m_xUIElementFactoryManager( ui::theUIElementFactoryManager::get(xContext) )
, m_xPersistentWindowStateSupplier( ui::theWindowStateConfiguration::get( xContext ) )
- , m_pGlobalSettings( nullptr )
, m_aListenerContainer( m_aMutex )
{
// Initialize statusbar member
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 2c712f3b9752..96e96ba143e6 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -60,7 +60,6 @@ ToolbarLayoutManager::ToolbarLayoutManager(
m_pParentLayouter( pParentLayouter ),
m_eDockOperation( DOCKOP_ON_COLROW ),
m_ePreviewDetection( PREVIEWFRAME_UNKNOWN ),
- m_pAddonOptions( nullptr ),
m_bComponentAttached( false ),
m_bLayoutDirty( false ),
m_bGlobalSettings( false ),
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index d78ca5440aea..1abbb05350b8 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -51,7 +51,6 @@ DEFINE_INIT_SERVICE(
it's not necessary to do anything here.
*/
DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& )
- : m_xDispatchRecorder( nullptr )
{
}
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index be0f828cdf5d..c120cdb7d44d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -469,7 +469,6 @@ Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext
, m_bSelfClose ( false ) // Important!
, m_bIsHidden ( true )
, m_xTitleHelper ()
- , m_pWindowCommandDispatch ( nullptr )
, m_lSimpleChangeListener ( m_aMutex )
, m_lVetoChangeListener ( m_aMutex )
, m_aChildFrameContainer ()
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index a95623a1073e..fe422707e3dd 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -441,7 +441,6 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte
: PathSettings_BASE(m_aMutex)
, ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper)
, m_xContext (xContext)
- , m_pPropHelp(nullptr )
{
}
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 6f243811c883..650d44e2a1e4 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -508,7 +508,6 @@ CmdImageList* ImageManagerImpl::implts_getDefaultImageList()
ImageManagerImpl::ImageManagerImpl( const uno::Reference< uno::XComponentContext >& rxContext,::cppu::OWeakObject* pOwner,bool _bUseGlobal ) :
m_xContext( rxContext )
, m_pOwner(pOwner)
- , m_pDefaultImageList( nullptr )
, m_aResourceString( "private:resource/images/moduleimages" )
, m_aListenerContainer( m_mutex )
, m_bUseGlobal(_bUseGlobal)
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 65f78414d938..7d2e47e942d9 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -829,9 +829,7 @@ void ModuleUIConfigurationManager::impl_Initialize()
ModuleUIConfigurationManager::ModuleUIConfigurationManager(
const Reference< XComponentContext >& xContext,
const css::uno::Sequence< css::uno::Any >& aArguments)
- : m_xDefaultConfigStorage( nullptr )
- , m_xUserConfigStorage( nullptr )
- , m_bReadOnly( true )
+ : m_bReadOnly( true )
, m_bModified( false )
, m_bDisposed( false )
, m_aXMLPostfix( ".xml" )
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 4e84354928c9..91cca8cdff4e 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -670,8 +670,7 @@ void UIConfigurationManager::impl_Initialize()
}
UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) :
- m_xDocConfigStorage( nullptr )
- , m_bReadOnly( true )
+ m_bReadOnly( true )
, m_bModified( false )
, m_bDisposed( false )
, m_aXMLPostfix( ".xml" )