[Libreoffice-commits] core.git: canvas/source chart2/source comphelper/source connectivity/source cppcanvas/source cppu/source cui/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 6 12:39:23 UTC 2018
canvas/source/cairo/cairo_canvashelper.cxx | 2 -
chart2/source/controller/accessibility/AccessibleChartView.cxx | 3 -
chart2/source/controller/accessibility/AccessibleTextHelper.cxx | 1
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 3 -
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 2 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 2 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 4 +-
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 4 +-
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 4 +-
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 2 -
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 -
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 3 -
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 1
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 1
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 1
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 3 -
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 2 -
chart2/source/controller/main/ChartController.cxx | 4 --
chart2/source/controller/main/ChartFrameloader.cxx | 4 +-
chart2/source/model/main/ChartModel.cxx | 7 +---
chart2/source/tools/LifeTime.cxx | 2 -
chart2/source/tools/ObjectIdentifier.cxx | 7 +---
chart2/source/tools/WrappedPropertySet.cxx | 3 -
chart2/source/view/axes/Tickmarks.cxx | 2 -
chart2/source/view/axes/Tickmarks_Dates.cxx | 1
chart2/source/view/axes/Tickmarks_Equidistant.cxx | 8 +----
chart2/source/view/axes/VAxisBase.cxx | 2 -
chart2/source/view/axes/VAxisProperties.cxx | 1
chart2/source/view/axes/VCartesianAxis.cxx | 4 +-
chart2/source/view/axes/VCoordinateSystem.cxx | 5 ---
chart2/source/view/axes/VPolarGrid.cxx | 4 +-
chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 -
chart2/source/view/charttypes/AreaChart.cxx | 8 +----
chart2/source/view/charttypes/BarChart.cxx | 2 -
chart2/source/view/charttypes/CandleStickChart.cxx | 6 +--
chart2/source/view/charttypes/NetChart.cxx | 4 --
chart2/source/view/charttypes/PieChart.cxx | 8 ++---
chart2/source/view/diagram/VDiagram.cxx | 11 +-----
chart2/source/view/main/ChartItemPool.cxx | 2 -
chart2/source/view/main/ChartView.cxx | 8 ++---
chart2/source/view/main/DrawModelWrapper.cxx | 2 -
chart2/source/view/main/PlotterBase.cxx | 5 ---
chart2/source/view/main/PlottingPositionHelper.cxx | 3 -
chart2/source/view/main/VButton.cxx | 5 ---
chart2/source/view/main/VDataSeries.cxx | 16 ----------
chart2/source/view/main/VTitle.cxx | 5 ---
comphelper/source/container/container.cxx | 1
comphelper/source/misc/instancelocker.cxx | 3 -
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 4 --
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2 -
connectivity/source/commontools/TKeys.cxx | 2 -
connectivity/source/commontools/parameters.cxx | 1
connectivity/source/drivers/dbase/DIndex.cxx | 2 -
connectivity/source/drivers/dbase/DTable.cxx | 2 -
connectivity/source/drivers/dbase/dindexnode.cxx | 1
connectivity/source/drivers/evoab2/NColumns.cxx | 2 -
connectivity/source/drivers/evoab2/NConnection.cxx | 1
connectivity/source/drivers/evoab2/NTables.cxx | 2 -
connectivity/source/drivers/file/FColumns.cxx | 2 -
connectivity/source/drivers/file/FDriver.cxx | 2 -
connectivity/source/drivers/file/FResultSet.cxx | 4 --
connectivity/source/drivers/file/FStatement.cxx | 1
connectivity/source/drivers/file/FTable.cxx | 2 -
connectivity/source/drivers/firebird/Connection.cxx | 1
connectivity/source/drivers/firebird/ResultSet.cxx | 1
connectivity/source/drivers/hsqldb/HTables.cxx | 2 -
connectivity/source/drivers/mork/MColumns.cxx | 2 -
connectivity/source/drivers/mork/MResultSet.cxx | 2 -
connectivity/source/drivers/mork/MTables.cxx | 2 -
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 1
connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx | 1
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 2 -
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 2 -
connectivity/source/drivers/odbc/OResultSet.cxx | 3 -
connectivity/source/drivers/odbc/OStatement.cxx | 2 -
connectivity/source/sdbcx/VCatalog.cxx | 4 --
connectivity/source/sdbcx/VGroup.cxx | 2 -
connectivity/source/sdbcx/VIndex.cxx | 2 -
connectivity/source/sdbcx/VKey.cxx | 2 -
connectivity/source/sdbcx/VUser.cxx | 2 -
cppcanvas/source/mtfrenderer/emfpbrush.cxx | 5 ---
cppcanvas/source/mtfrenderer/emfppen.cxx | 2 -
cppcanvas/source/mtfrenderer/emfpregion.cxx | 1
cppu/source/AffineBridge/AffineBridge.cxx | 4 --
cppu/source/typelib/typelib.cxx | 5 +--
cui/source/customize/acccfg.cxx | 1
cui/source/customize/cfg.cxx | 6 ---
cui/source/customize/macropg.cxx | 2 -
cui/source/dialogs/cuicharmap.cxx | 1
cui/source/dialogs/cuifmsearch.cxx | 1
cui/source/dialogs/hangulhanjadlg.cxx | 2 -
cui/source/dialogs/hyphen.cxx | 2 -
cui/source/dialogs/iconcdlg.cxx | 3 -
cui/source/dialogs/srchxtra.cxx | 1
cui/source/dialogs/thesdlg.cxx | 1
cui/source/inc/cfg.hxx | 3 -
cui/source/options/optcolor.cxx | 2 -
cui/source/options/optlingu.cxx | 4 --
cui/source/tabpages/backgrnd.cxx | 10 +-----
cui/source/tabpages/numfmt.cxx | 2 -
cui/source/tabpages/numpages.cxx | 12 -------
cui/source/tabpages/tparea.cxx | 6 ---
cui/source/tabpages/tpbitmap.cxx | 1
cui/source/tabpages/tplneend.cxx | 1
106 files changed, 74 insertions(+), 255 deletions(-)
New commits:
commit c289c25523496f58b81e061cea82757c99e99957
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 6 10:30:58 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 6 14:38:52 2018 +0200
loplugin:simplifyconstruct in canvas..cui
Change-Id: I02eba1df117a9d0df42bcac13c3251cb4fa6da14
Reviewed-on: https://gerrit.libreoffice.org/60074
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 9db2102cf13d..8a80912886a5 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1086,7 +1086,7 @@ namespace cairocanvas
bool bHasAlpha )
{
SurfaceSharedPtr pSurface=pInputSurface;
- uno::Reference< rendering::XCachedPrimitive > rv(nullptr);
+ uno::Reference< rendering::XCachedPrimitive > rv;
geometry::IntegerSize2D aBitmapSize = rSize;
if( mpCairo )
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 977d32f204e6..783764b93fa9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -56,8 +56,7 @@ AccessibleChartView::AccessibleChartView(SdrView* pView ) :
true, // has children
true // always transparent
),
- m_pSdrView( pView ),
- m_pViewForwarder( nullptr )
+ m_pSdrView( pView )
{
AddState( AccessibleStateType::OPAQUE );
}
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 598466ae70a4..c7ca6380f30a 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -46,7 +46,6 @@ namespace chart
AccessibleTextHelper::AccessibleTextHelper(
DrawViewWrapper * pDrawViewWrapper ) :
impl::AccessibleTextHelper_Base( m_aMutex ),
- m_pTextHelper( nullptr ),
m_pDrawViewWrapper( pDrawViewWrapper )
{}
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 9c904996ebee..c25f2467ea33 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -44,8 +44,7 @@ Chart2ModelContact::Chart2ModelContact(
const Reference< uno::XComponentContext > & xContext ) :
m_xContext( xContext ),
m_xChartModel( nullptr ),
- mpModel( nullptr ),
- m_xChartView(nullptr)
+ mpModel( nullptr )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 2c54837a80cf..471bb1a8e193 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -910,7 +910,7 @@ void ChartDocumentWrapper::impl_resetAddIn()
if( xInit.is() )
{
uno::Any aParam;
- uno::Reference< css::chart::XChartDocument > xDoc( nullptr );
+ uno::Reference< css::chart::XChartDocument > xDoc;
aParam <<= xDoc;
uno::Sequence< uno::Any > aSeq( &aParam, 1 );
xInit->initialize( aSeq );
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index c04474627727..8b5d0800b25f 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -447,7 +447,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2Model
, m_nSeriesIndexInNewAPI( -1 )
, m_nPointIndex( -1 )
, m_bLinesAllowed(true)
- , m_xDataSeries(nullptr)
{
//need initialize call afterwards
}
@@ -487,7 +486,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(eType _eType,
, m_nSeriesIndexInNewAPI( nSeriesIndexInNewAPI )
, m_nPointIndex( (_eType == DATA_POINT) ? nPointIndex : -1 )
, m_bLinesAllowed( false )
- , m_xDataSeries(nullptr)
{
}
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 85073ee957fe..6a2f056e785c 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1494,7 +1494,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
DiagramHelper::tTemplateWithServiceName aTemplateAndService =
DiagramHelper::getTemplateForDiagram( xDiagram, xFact );
- uno::Reference< chart2::XChartTypeTemplate > xTemplate(nullptr);
+ uno::Reference< chart2::XChartTypeTemplate > xTemplate;
if( aTemplateAndService.second == "com.sun.star.chart2.template.ColumnWithLine" )
{
if( nNewValue != 0 )
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 658f626b83b6..42f140e4beb4 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -155,7 +155,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropert
void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue )
{
- Reference< beans::XPropertySet > xPropSet(nullptr);
+ Reference< beans::XPropertySet > xPropSet;
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
Sequence< Reference< chart2::XChartType > > aTypes(
@@ -193,7 +193,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty
{
Any aRet;
- Reference< beans::XPropertySet > xPropSet(nullptr);
+ Reference< beans::XPropertySet > xPropSet;
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
Sequence< Reference< chart2::XChartType > > aTypes(
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index e235e4bd21ee..e59dc5b14b02 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -162,7 +162,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getProperty
}
void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue )
{
- Reference< beans::XPropertySet > xPropSet(nullptr);
+ Reference< beans::XPropertySet > xPropSet;
Sequence< Reference< chart2::XChartType > > aTypes(
::chart::DiagramHelper::getChartTypesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) );
@@ -185,7 +185,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN
{
Any aRet;
- Reference< beans::XPropertySet > xPropSet(nullptr);
+ Reference< beans::XPropertySet > xPropSet;
Sequence< Reference< chart2::XChartType > > aTypes(
::chart::DiagramHelper::getChartTypesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 233350b4a29a..4002929b6a99 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -149,7 +149,7 @@ css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference
uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const
{
- uno::Reference< chart2::XChartTypeTemplate > xTemplate(nullptr);
+ uno::Reference< chart2::XChartTypeTemplate > xTemplate;
if(!xFactory.is())
return xTemplate;
@@ -213,7 +213,7 @@ css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference
}
uno::Reference< chart2::XChartTypeTemplate > WrappedUpDownProperty::getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const
{
- uno::Reference< chart2::XChartTypeTemplate > xTemplate(nullptr);
+ uno::Reference< chart2::XChartTypeTemplate > xTemplate;
if( bNewValue ) //add open series
{
if( rCurrentTemplate == "com.sun.star.chart2.template.StockLowHighClose" )
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 2a158f8a7297..6e330aa3d45b 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -262,7 +262,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
const ChartTypeParameter& rParameter
, const uno::Reference< lang::XMultiServiceFactory >& xTemplateManager ) const
{
- uno::Reference< XChartTypeTemplate > xTemplate(nullptr);
+ uno::Reference< XChartTypeTemplate > xTemplate;
OUString aServiceName( getServiceNameForParameter( rParameter ) );
if(!aServiceName.isEmpty())
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 9390c9ffe18b..69004f9bc1c6 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -39,9 +39,7 @@ using namespace ::com::sun::star;
CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponentContext >& xContext )
: OComponentHelper( m_aMutex )
- , m_xChartModel( nullptr )
, m_xCC( xContext )
- , m_xParentWindow( nullptr )
, m_pDialog( nullptr )
, m_bUnlockControllersOnExecute(false)
{
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 6d509a41b66e..47315d30a9ce 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -100,7 +100,6 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString
, m_bShowAxisOrigin(false)
, m_bIsCrossingAxisIsCategoryAxis(false)
, m_aCategories()
- , m_xChartDocument( nullptr )
, m_bComplexCategoriesAxis( false )
, m_nNbPoints( 0 )
{
@@ -330,8 +329,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
, m_pParameter( pDialogParameter )
, m_pViewElementListProvider( pViewElementListProvider )
, m_pNumberFormatter(nullptr)
- , m_pSymbolShapeProperties(nullptr)
- , m_pAutoSymbolGraphic(nullptr)
, m_fAxisMinorStepWidthForErrorBarDecimals(0.1)
, m_bOKPressed(false)
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 489a60a9343d..fb27b035eb22 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -209,7 +209,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window*
: TabPage ( pWindow
,"tp_3D_SceneIllumination"
,"modules/schart/ui/tp_3D_SceneIllumination.ui")
- , m_pLightSourceInfoList(nullptr)
, m_xSceneProperties( xSceneProperties )
, m_aTimerTriggeredControllerLock( xChartModel )
, m_bInCommitToModel( false )
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 906ac1986446..38a4dc9a68ea 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -31,7 +31,6 @@ namespace chart
SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "tp_ChartType", "modules/schart/ui/tp_ChartType.ui", &rInAttrs)
- , m_pGeometryResources(nullptr)
{
m_pGeometryResources.reset(new BarGeometryResources( this ));
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index ddd8500423a0..a0776b6fff24 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -69,7 +69,6 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent
, m_nChangingControlCalls(0)
, m_bIsDirty(false)
, m_aLastValidRangeString()
- , m_xCurrentChartTypeTemplate(nullptr)
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel( rDialogModel )
, m_pParentDialog( pParentDialog )
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 36b22e93860d..6f151d647956 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star;
ViewElementListProvider::ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper )
: m_pDrawModelWrapper( pDrawModelWrapper )
- , m_pFontList(nullptr)
{
}
@@ -118,7 +117,7 @@ XPatternListRef ViewElementListProvider::GetPatternList() const
SdrObjList* ViewElementListProvider::GetSymbolList() const
{
SdrObjList* pSymbolList = nullptr;
- uno::Reference< drawing::XShapes > xSymbols(nullptr);//@todo this keeps the first drawinglayer alive ...
+ uno::Reference< drawing::XShapes > xSymbols;//@todo this keeps the first drawinglayer alive ...
try
{
if(!pSymbolList || !pSymbolList->GetObjCount())
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 64755663375e..9d4fd5669841 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -37,7 +37,6 @@ ItemConverter::ItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool ) :
m_xPropertySet( rPropertySet ),
- m_xPropertySetInfo( nullptr ),
m_rItemPool( rItemPool )
{
resetPropertySet( m_xPropertySet );
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index f08370c548ae..9439dcc2ceb1 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -111,7 +111,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
for (auto const& series : aSeriesList)
{
uno::Reference< beans::XPropertySet > xObjectProperties(series, uno::UNO_QUERY);
- uno::Reference< uno::XComponentContext> xContext(nullptr);//do not need Context for label properties
+ uno::Reference< uno::XComponentContext> xContext;//do not need Context for label properties
sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, series, -1/*nPointIndex*/, ChartModelHelper::findDiagram( xChartModel ) );
sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel(
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 9fbc7b6de301..17a0f12bb6c7 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -108,20 +108,17 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const &
m_aLifeTimeManager( nullptr ),
m_bSuspended( false ),
m_xCC(xContext), //@todo is it allowed to hold this context??
- m_xFrame( nullptr ),
m_aModelMutex(),
m_aModel( nullptr, m_aModelMutex ),
m_xViewWindow(),
m_xChartView(),
m_pDrawModelWrapper(),
- m_pDrawViewWrapper(nullptr),
m_eDragMode(SdrDragMode::Move),
m_bWaitingForDoubleClick(false),
m_bWaitingForMouseUp(false),
m_bFieldButtonDown(false),
m_bConnectingToView(false),
m_bDisposed(false),
- m_xUndoManager( nullptr ),
m_aDispatchContainer( m_xCC ),
m_eDrawMode( CHARTDRAW_SELECT ),
mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
@@ -138,7 +135,6 @@ ChartController::~ChartController()
ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) :
m_xModel( xModel ),
- m_xCloseable( nullptr ),
m_bOwnership( true )
{
m_xCloseable =
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index e14a064fcbdd..b55d6ee48f58 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -104,8 +104,8 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
}
//create the controller(+XWindow)
- uno::Reference< frame::XController > xController = nullptr;
- uno::Reference< awt::XWindow > xComponentWindow = nullptr;
+ uno::Reference< frame::XController > xController;
+ uno::Reference< awt::XWindow > xComponentWindow;
{
xController.set(
m_xCC->getServiceManager()->createInstanceWithContext(
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 91fa80cd8f8a..7c689e72de2a 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -101,13 +101,10 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
, m_nInLoad(0)
, m_bUpdateNotificationsPending(false)
, mbTimeBased(false)
- , m_pUndoManager( nullptr )
, m_aControllers( m_aModelMutex )
, m_nControllerLockCount(0)
, m_xContext( xContext )
, m_aVisualAreaSize( ChartModelHelper::getDefaultPageSize() )
- , m_xDataProvider( nullptr )
- , m_xInternalDataProvider( nullptr )
, m_xPageBackground( new PageBackground )
, m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType<OUString>::get(),
"com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY)
@@ -146,8 +143,8 @@ ChartModel::ChartModel( const ChartModel & rOther )
, m_xContext( rOther.m_xContext )
// @note: the old model aggregate must not be shared with other models if it
// is, you get mutex deadlocks
- , m_xOldModelAgg( nullptr ) //rOther.m_xOldModelAgg )
- , m_xStorage( nullptr ) //rOther.m_xStorage )
+ //, m_xOldModelAgg( nullptr ) //rOther.m_xOldModelAgg )
+ // m_xStorage( nullptr ) //rOther.m_xStorage )
, m_aVisualAreaSize( rOther.m_aVisualAreaSize )
, m_aGraphicObjectVector( rOther.m_aGraphicObjectVector )
, m_xDataProvider( rOther.m_xDataProvider )
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 431678e485cd..e9b25fee8dcb 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -326,7 +326,7 @@ void CloseableLifeTimeManager::impl_doClose()
NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex );
//mutex is not acquired, mutex will be reacquired at the end of this method automatically
- uno::Reference< util::XCloseable > xCloseable=nullptr;
+ uno::Reference< util::XCloseable > xCloseable;
try
{
xCloseable.set(m_pCloseable);
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index c8aca33c28cc..a424dbd29595 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -243,13 +243,11 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID
ObjectIdentifier::ObjectIdentifier()
:m_aObjectCID( OUString() )
- ,m_xAdditionalShape( nullptr )
{
}
ObjectIdentifier::ObjectIdentifier( const OUString& rObjectCID )
:m_aObjectCID( rObjectCID )
- ,m_xAdditionalShape( nullptr )
{
}
@@ -261,7 +259,6 @@ ObjectIdentifier::ObjectIdentifier( const Reference< drawing::XShape >& rxShape
ObjectIdentifier::ObjectIdentifier( const Any& rAny )
:m_aObjectCID( OUString() )
- ,m_xAdditionalShape( nullptr )
{
const uno::Type& rType = rAny.getValueType();
if ( rType == cppu::UnoType<OUString>::get() )
@@ -1212,7 +1209,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
if(!xChartModel.is())
return nullptr;
- Reference< beans::XPropertySet > xObjectProperties = nullptr;
+ Reference< beans::XPropertySet > xObjectProperties;
try
{
ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID );
@@ -1408,7 +1405,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel )
{
- Reference< XDataSeries > xSeries(nullptr);
+ Reference< XDataSeries > xSeries;
Reference< XDiagram > xDiagram;
Reference< XCoordinateSystem > xCooSys;
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index c099bc76dfc6..d195c59a7c29 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -34,9 +34,6 @@ using ::com::sun::star::uno::Any;
WrappedPropertySet::WrappedPropertySet()
: MutexContainer()
- , m_xInfo(nullptr)
- , m_pPropertyArrayHelper(nullptr)
- , m_pWrappedPropertyMap(nullptr)
{
}
WrappedPropertySet::~WrappedPropertySet()
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 2fa86b6510e2..33ce421205d3 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -37,7 +37,6 @@ TickInfo::TickInfo( const uno::Reference<chart2::XScaling>& xInverse )
, xInverseScaling( xInverse )
, aTickScreenPosition(0.0,0.0)
, bPaintIt( true )
-, xTextShape( nullptr )
, nFactorForLimitedTextWidth(1)
{
}
@@ -91,7 +90,6 @@ TickFactory::TickFactory(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
: m_rScale( rScale )
, m_rIncrement( rIncrement )
- , m_xInverseScaling(nullptr)
{
//@todo: make sure that the scale is valid for the scaling
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
index 9b1d7a50543e..9fe4c657b5f0 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -37,7 +37,6 @@ DateTickFactory::DateTickFactory(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
: m_aScale( rScale )
, m_aIncrement( rIncrement )
- , m_xInverseScaling(nullptr)
{
//@todo: make sure that the scale is valid for the scaling
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 1566ca41da8d..7b319974bbb5 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -74,8 +74,6 @@ EquidistantTickFactory::EquidistantTickFactory(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
: m_rScale( rScale )
, m_rIncrement( rIncrement )
- , m_xInverseScaling(nullptr)
- , m_pfCurrentValues(nullptr)
{
//@todo: make sure that the scale is valid for the scaling
@@ -418,8 +416,7 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do
, m_pInfoTicks(nullptr)
, m_rIncrement(rIncrement)
, m_nMaxDepth(0)
- , m_nTickCount(0), m_pnPositions(nullptr)
- , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr)
+ , m_nTickCount(0)
, m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
{
initIter( nMaxDepth );
@@ -432,8 +429,7 @@ EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks
, m_pInfoTicks(&rTicks)
, m_rIncrement(rIncrement)
, m_nMaxDepth(0)
- , m_nTickCount(0), m_pnPositions(nullptr)
- , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr)
+ , m_nTickCount(0)
, m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
{
initIter( nMaxDepth );
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index db7d798bfe9b..3ab5ce3ae633 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -231,7 +231,7 @@ void VAxisBase::removeTextShapesFromTicks()
void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter )
{
- Reference< XScaling > xInverseScaling( nullptr );
+ Reference< XScaling > xInverseScaling;
if( m_aScale.Scaling.is() )
xInverseScaling = m_aScale.Scaling->getInverseScaling();
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 03b392c2a676..c2385db62631 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -176,7 +176,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel
, m_nAxisType(AxisType::REALNUMBER)
, m_bComplexCategories(false)
, m_pExplicitCategoriesProvider(pExplicitCategoriesProvider)
- , m_xAxisTextProvider(nullptr)
, m_bLimitSpaceForLabels(false)
{
}
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 13cd0b7dba02..a047f7239b59 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -324,7 +324,7 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick
aStaggerDirection.normalize();
sal_Int32 nDistance=0;
- Reference< drawing::XShape > xShape2DText(nullptr);
+ Reference< drawing::XShape > xShape2DText;
for( TickInfo* pTickInfo = rIter.firstInfo()
; pTickInfo
; pTickInfo = rIter.nextInfo() )
@@ -353,7 +353,7 @@ void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance )
{
if(rStaggerDistance.getLength()==0.0)
return;
- Reference< drawing::XShape > xShape2DText(nullptr);
+ Reference< drawing::XShape > xShape2DText;
for( TickInfo* pTickInfo = rIter.firstInfo()
; pTickInfo
; pTickInfo = rIter.nextInfo() )
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 9d7373cc4abe..a9143d498aac 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -73,10 +73,6 @@ std::unique_ptr<VCoordinateSystem> VCoordinateSystem::createCoordinateSystem(
VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys )
: m_xCooSysModel(xCooSys)
- , m_xLogicTargetForGrids(nullptr)
- , m_xLogicTargetForAxes(nullptr)
- , m_xFinalTarget(nullptr)
- , m_xShapeFactory(nullptr)
, m_aMatrixSceneToScreen()
, m_eLeftWallPos(CuboidPlanePosition_Left)
, m_eBackWallPos(CuboidPlanePosition_Back)
@@ -84,7 +80,6 @@ VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCoo
, m_aMergedMinMaxSupplier()
, m_aExplicitScales(3)
, m_aExplicitIncrements(3)
- , m_apExplicitCategoriesProvider(nullptr)
{
if( !m_xCooSysModel.is() || m_xCooSysModel->getDimension()<3 )
{
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index b0e3f2c86faa..f2b1e2687a4c 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -73,7 +73,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
, PolarPlottingPositionHelper const * pPosHelper
, double fLogicRadius, double fLogicZ )
{
- Reference< XScaling > xInverseScaling( nullptr );
+ Reference< XScaling > xInverseScaling;
if( rScale.Scaling.is() )
xInverseScaling = rScale.Scaling->getInverseScaling();
@@ -164,7 +164,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1];
const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0];
- Reference< XScaling > xInverseRadiusScaling( nullptr );
+ Reference< XScaling > xInverseRadiusScaling;
if( rRadiusScale.Scaling.is() )
xInverseRadiusScaling = rRadiusScale.Scaling->getInverseScaling();
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 703cae0129bf..a652c5fad2bd 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -130,7 +130,7 @@ void VPolarRadiusAxis::createShapes()
TickFactory aAngleTickFactory( rAngleScale, rAngleIncrement );
aAngleTickFactory.getAllTicks( aAngleTickInfos );
- uno::Reference< XScaling > xInverseScaling( nullptr );
+ uno::Reference< XScaling > xInverseScaling;
if( rAngleScale.Scaling.is() )
xInverseScaling = rAngleScale.Scaling->getInverseScaling();
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index c7932cbe590a..58acc66a749c 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -66,10 +66,6 @@ AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel
, m_eCurveStyle(CurveStyle_LINES)
, m_nCurveResolution(20)
, m_nSplineOrder(3)
- , m_xSeriesTarget(nullptr)
- , m_xErrorBarTarget(nullptr)
- , m_xTextTarget(nullptr)
- , m_xRegressionCurveEquationTarget(nullptr)
{
m_pMainPosHelper->AllowShiftXAxisPos(true);
m_pMainPosHelper->AllowShiftZAxisPos(true);
@@ -415,7 +411,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries
pPosHelper->transformScaledLogicToScene( aPoly );
//create line:
- uno::Reference< drawing::XShape > xShape(nullptr);
+ uno::Reference< drawing::XShape > xShape;
if(m_nDimension==3)
{
double fDepth = getTransformedDepth();
@@ -511,7 +507,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries
pPosHelper->transformScaledLogicToScene( aPoly );
//create area:
- uno::Reference< drawing::XShape > xShape(nullptr);
+ uno::Reference< drawing::XShape > xShape;
if(m_nDimension==3)
{
xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 3a7bf3f6a599..3d9aae4bf942 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar(
SAL_WARN("chart2", "Exception caught. " << e );
}
- uno::Reference< drawing::XShape > xShape(nullptr);
+ uno::Reference< drawing::XShape > xShape;
switch( nGeometry3D )
{
case DataPointGeometry3D::CYLINDER:
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 3342bee2df56..cff376eac322 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -115,8 +115,8 @@ void CandleStickChart::createShapes()
{
m_xChartTypeModelProps->getPropertyValue( "ShowFirst" ) >>= bShowFirst;
- uno::Reference< beans::XPropertySet > xWhiteDayProps(nullptr);
- uno::Reference< beans::XPropertySet > xBlackDayProps(nullptr);
+ uno::Reference< beans::XPropertySet > xWhiteDayProps;
+ uno::Reference< beans::XPropertySet > xBlackDayProps;
m_xChartTypeModelProps->getPropertyValue( "Japanese" ) >>= bJapaneseStyle;
m_xChartTypeModelProps->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps;
m_xChartTypeModelProps->getPropertyValue( "BlackDay" ) >>= xBlackDayProps;
@@ -213,7 +213,7 @@ void CandleStickChart::createShapes()
xLossGainTarget = xLossTarget;
uno::Reference< beans::XPropertySet > xPointProp( pSeries->getPropertiesOfPoint( nIndex ));
- uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(nullptr);
+ uno::Reference< drawing::XShapes > xPointGroupShape_Shapes;
{
OUString aPointCID = ObjectIdentifier::createPointCID( pSeries->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(pSeries.get(), xSeriesTarget) );
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index d08547f54b88..c5f38386bd3f 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -59,8 +59,6 @@ NetChart::NetChart( const uno::Reference<XChartType>& xChartTypeModel
, m_pMainPosHelper(std::move(pPlottingPositionHelper))
, m_bArea(!bNoArea)
, m_bLine(bNoArea)
- , m_xSeriesTarget(nullptr)
- , m_xTextTarget(nullptr)
{
// we only support 2D Net charts
assert(nDimensionCount == 2);
@@ -158,7 +156,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries
pPosHelper->transformScaledLogicToScene( aPoly );
//create line:
- uno::Reference< drawing::XShape > xShape(nullptr);
+ uno::Reference< drawing::XShape > xShape;
{
xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes
, PolyToPointSequence( aPoly ) );
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index febee25a0806..7f03317b5daa 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -238,7 +238,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint(
}
//create point
- uno::Reference< drawing::XShape > xShape(nullptr);
+ uno::Reference< drawing::XShape > xShape;
if(m_nDimension==3)
{
xShape = m_pShapeFactory->createPieSegment( xTarget
@@ -661,7 +661,7 @@ void PieChart::createShapes()
aParam.mfUnitCircleOuterRadius = m_pPosHelper->transformToRadius( fLogicOuterRadius );
///point color:
- std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(nullptr);
+ std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap;
if (!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is())
{
apOverwritePropertiesMap.reset( new tPropertyNameValueMap );
@@ -754,8 +754,8 @@ bool lcl_isInsidePage( const awt::Point& rPos, const awt::Size& rSize, const awt
}//end anonymous namespace
PieChart::PieLabelInfo::PieLabelInfo()
- : xTextShape(nullptr), xLabelGroupShape(nullptr), aFirstPosition(), aOrigin(), fValue(0.0)
- , bMovementAllowed(false), bMoved(false), xTextTarget(nullptr), pPrevious(nullptr),pNext(nullptr)
+ : aFirstPosition(), aOrigin(), fValue(0.0)
+ , bMovementAllowed(false), bMoved(false), pPrevious(nullptr),pNext(nullptr)
{
}
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index f751469d19b9..29a33b248a46 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -50,12 +50,7 @@ using namespace ::com::sun::star::chart2;
VDiagram::VDiagram(
const uno::Reference<XDiagram> & xDiagram, const drawing::Direction3D& rPreferredAspectRatio,
sal_Int32 nDimension )
- : m_xTarget(nullptr)
- , m_xShapeFactory(nullptr)
- , m_pShapeFactory(nullptr)
- , m_xOuterGroupShape(nullptr)
- , m_xCoordinateRegionShape(nullptr)
- , m_xWall2D(nullptr)
+ : m_pShapeFactory(nullptr)
, m_nDimensionCount(nDimension)
, m_xDiagram(xDiagram)
, m_aPreferredAspectRatio(rPreferredAspectRatio)
@@ -490,7 +485,7 @@ void VDiagram::createShapes_3d()
//add walls
{
- uno::Reference< beans::XPropertySet > xWallProp( nullptr );
+ uno::Reference< beans::XPropertySet > xWallProp;
if( m_xDiagram.is() )
xWallProp.set( m_xDiagram->getWall() );
@@ -614,7 +609,7 @@ void VDiagram::createShapes_3d()
//add floor plate
{
- uno::Reference< beans::XPropertySet > xFloorProp( nullptr );
+ uno::Reference< beans::XPropertySet > xFloorProp;
if( m_xDiagram.is() )
xFloorProp.set( m_xDiagram->getFloor() );
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 44129345dd5c..eb3395507659 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -180,7 +180,7 @@ ChartItemPool::ChartItemPool():
}
ChartItemPool::ChartItemPool(const ChartItemPool& rPool):
- SfxItemPool(rPool), pItemInfos(nullptr)
+ SfxItemPool(rPool)
{
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 4c393df4edbe..80d99d8d5e4e 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1496,8 +1496,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D
drawing::Direction3D aPreferredAspectRatio =
rParam.mpSeriesPlotterContainer->getPreferredAspectRatio();
- uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(nullptr);
- uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(nullptr);
+ uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis;
+ uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis;
VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
{//create diagram
@@ -1592,7 +1592,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D
for( std::unique_ptr<VSeriesPlotter>& aPlotter : rSeriesPlotterList )
{
VSeriesPlotter* pSeriesPlotter = aPlotter.get();
- uno::Reference< drawing::XShapes > xSeriesTarget(nullptr);
+ uno::Reference< drawing::XShapes > xSeriesTarget;
if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() )
xSeriesTarget = xSeriesTargetInFrontOfAxis;
else
@@ -2427,7 +2427,7 @@ void lcl_removeEmptyGroupShapes( const Reference< drawing::XShapes>& xParent )
for( sal_Int32 nN = xParent->getCount(); nN--; )
{
uno::Any aAny = xParent->getByIndex( nN );
- Reference< drawing::XShapes> xShapes(nullptr);
+ Reference< drawing::XShapes> xShapes;
if( aAny >>= xShapes )
lcl_removeEmptyGroupShapes( xShapes );
if( xShapes.is() && xShapes->getCount()==0 )
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 94b6a96323d3..c405b75a0bff 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -52,8 +52,6 @@ namespace chart
DrawModelWrapper::DrawModelWrapper()
: SdrModel()
, m_pChartItemPool(nullptr)
- , m_xMainDrawPage(nullptr)
- , m_xHiddenDrawPage(nullptr)
{
m_pChartItemPool = ChartItemPool::CreateChartItemPool();
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 0778c2954a42..2962f31758a0 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -30,10 +30,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
PlotterBase::PlotterBase( sal_Int32 nDimensionCount )
- : m_xLogicTarget(nullptr)
- , m_xFinalTarget(nullptr)
- , m_xShapeFactory(nullptr)
- , m_pShapeFactory(nullptr)
+ : m_pShapeFactory(nullptr)
, m_aCID()
, m_nDimension(nDimensionCount)
, m_pPosHelper(nullptr)
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 6c05d96b233a..164f0a8d5f64 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::chart2;
PlottingPositionHelper::PlottingPositionHelper()
: m_aScales()
, m_aMatrixScreenToScene()
- , m_xTransformationLogicToScene(nullptr)
, m_bSwapXAndY( false )
, m_nXResolution( 1000 )
, m_nYResolution( 1000 )
@@ -62,7 +61,7 @@ PlottingPositionHelper::PlottingPositionHelper()
PlottingPositionHelper::PlottingPositionHelper( const PlottingPositionHelper& rSource )
: m_aScales( rSource.m_aScales )
, m_aMatrixScreenToScene( rSource.m_aMatrixScreenToScene )
- , m_xTransformationLogicToScene( nullptr ) //should be recalculated
+ // m_xTransformationLogicToScene( nullptr ) //should be recalculated
, m_bSwapXAndY( rSource.m_bSwapXAndY )
, m_nXResolution( rSource.m_nXResolution )
, m_nYResolution( rSource.m_nYResolution )
diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx
index 7dde0f25369a..bd8c5f9749eb 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -30,10 +30,7 @@ namespace chart
using namespace css;
VButton::VButton()
- : m_xShapeFactory(nullptr)
- , m_xTarget(nullptr)
- , m_xShape(nullptr)
- , m_bShowArrow(true)
+ : m_bShowArrow(true)
, m_nArrowColor(0x00000000)
, m_nBGColor(0x00E6E6E6)
{
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index ec17514df816..34532c8a824f 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -151,12 +151,6 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
, m_fLogicMinX(0.0)
, m_fLogicMaxX(0.0)
, m_fLogicZPos(0.0)
- , m_xGroupShape(nullptr)
- , m_xLabelsGroupShape(nullptr)
- , m_xErrorXBarsGroupShape(nullptr)
- , m_xErrorYBarsGroupShape(nullptr)
- , m_xFrontSubGroupShape(nullptr)
- , m_xBackSubGroupShape(nullptr)
, m_xDataSeries(xDataSeries)
, m_nPointCount(0)
@@ -175,16 +169,6 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
, m_nGlobalSeriesIndex(0)
- , m_apLabel_Series(nullptr)
- , m_apLabelPropNames_Series(nullptr)
- , m_apLabelPropValues_Series(nullptr)
- , m_apSymbolProperties_Series(nullptr)
-
- , m_apLabel_AttributedPoint(nullptr)
- , m_apLabelPropNames_AttributedPoint(nullptr)
- , m_apLabelPropValues_AttributedPoint(nullptr)
- , m_apSymbolProperties_AttributedPoint(nullptr)
- , m_apSymbolProperties_InvisibleSymbolForSelection(nullptr)
, m_nCurrentAttributedPoint(-1)
, m_nMissingValueTreatment(css::chart::MissingValueTreatment::LEAVE_GAP)
, m_bAllowPercentValueInDataLabel(false)
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index 1ccbe29939a3..5d55b09c479c 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -37,10 +37,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
VTitle::VTitle( const uno::Reference< XTitle > & xTitle )
- : m_xTarget(nullptr)
- , m_xShapeFactory(nullptr)
- , m_xTitle(xTitle)
- , m_xShape(nullptr)
+ : m_xTitle(xTitle)
, m_aCID()
, m_fRotationAngleDegree(0.0)
, m_nXPos(0)
diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx
index ce5c2f15f648..a9edef8a458f 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.cxx
@@ -31,7 +31,6 @@ namespace comphelper
IndexAccessIterator::IndexAccessIterator(css::uno::Reference< css::uno::XInterface> const & xStartingPoint)
:m_xStartingPoint(xStartingPoint)
- ,m_xCurrentObject(nullptr)
{
OSL_ENSURE(m_xStartingPoint.is(), "IndexAccessIterator::IndexAccessIterator : no starting point !");
}
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index ec0b27f4180b..61b6338b67ca 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -40,8 +40,7 @@ using namespace ::com::sun::star;
OInstanceLocker::OInstanceLocker()
-: m_pListenersContainer( nullptr )
-, m_bDisposed( false )
+: m_bDisposed( false )
, m_bInitialized( false )
{
}
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 1323f79a22de..c6f91ffa7c1b 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -80,9 +80,7 @@ static OUString const g_aUserDirMacro("$(userdataurl)");
OfficeInstallationDirectories::OfficeInstallationDirectories(
const uno::Reference< uno::XComponentContext > & xCtx )
-: m_xCtx( xCtx ),
- m_pOfficeBrandDir( nullptr ),
- m_pUserDir( nullptr )
+: m_xCtx( xCtx )
{
}
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index cfc283d7e86f..bef6e6c5584f 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -55,7 +55,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet()
:ODatabaseMetaDataResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
,m_nColPos(0)
,m_bBOF(true)
,m_bEOF(true)
@@ -68,7 +67,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet( MetaDataResultSetType _e
:ODatabaseMetaDataResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
,m_nColPos(0)
,m_bBOF(true)
,m_bEOF(true)
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 34259d93e334..81479b491d92 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -50,7 +50,7 @@ OKeysHelper::OKeysHelper( OTableHelper* _pTable,
sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
{
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(!_rName.isEmpty())
{
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 52b07c3ab6f9..e1184f3d69ee 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -57,7 +57,6 @@ namespace dbtools
:m_rMutex ( _rMutex )
,m_aParameterListeners( _rMutex )
,m_xContext ( _rxContext )
- ,m_pOuterParameters ( nullptr )
,m_nInnerCount ( 0 )
,m_bUpToDate ( false )
{
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index e43223460457..70e9eed51335 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -56,7 +56,6 @@ IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.
ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable)
: OIndex(true/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
- , m_pFileStream(nullptr)
, m_nCurNode(NODE_NOTFOUND)
, m_nPageCount(0)
, m_nRootPage(0)
@@ -71,7 +70,6 @@ ODbaseIndex::ODbaseIndex( ODbaseTable* _pTable,
const NDXHeader& _rHeader,
const OUString& _rName)
: OIndex(_rName, OUString(), _rHeader.db_unique, false, false, true)
- , m_pFileStream(nullptr)
, m_aHeader(_rHeader)
, m_nCurNode(NODE_NOTFOUND)
, m_nPageCount(0)
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 469a773378f2..a21ac9a5ebef 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -431,7 +431,6 @@ void ODbaseTable::fillColumns()
ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConnection)
: ODbaseTable_BASE(_pTables,_pConnection)
- , m_pMemoStream(nullptr)
{
// initialize the header
memset(&m_aHeader, 0, sizeof(m_aHeader));
@@ -450,7 +449,6 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
Description,
SchemaName,
CatalogName)
- , m_pMemoStream(nullptr)
{
memset(&m_aHeader, 0, sizeof(m_aHeader));
m_eEncoding = getConnection()->getTextEncoding();
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 0db31184a876..e7f71d493988 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -73,7 +73,6 @@ ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
, nCount(0)
, aParent(pParent)
, rIndex(rInd)
- , ppNodes(nullptr)
{
sal_uInt16 nT = rIndex.getHeader().db_maxkeys;
ppNodes.reset( new ONDXNode[nT] );
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 46c42c69b137..aae512bb2b5d 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -47,7 +47,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
sTableName,
_rName);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if (xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 4697d572360a..6b12d72fa8b1 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang;
OEvoabConnection::OEvoabConnection(OEvoabDriver const & _rDriver)
: m_rDriver(_rDriver)
, m_eSDBCAddressType(SDBCAddress::EVO_LOCAL)
- , m_xCatalog(nullptr)
{
}
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index b5b5e3f4fc1e..8acf5507033b 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -50,7 +50,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),"%",aName,aTypes);
- ObjectType xRet = nullptr;
+ ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index f964e1f7d355..4fe835fc921b 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -42,7 +42,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(),
sSchemaName, sTableName, _rName);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 29a295757373..fd55eb5bb62a 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -188,7 +188,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODriver_BASE::rBHelper.bDisposed);
- Reference< XTablesSupplier > xTab = nullptr;
+ Reference< XTablesSupplier > xTab;
Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY);
if(xTunnel.is())
{
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 7c17c55c1e41..ecf1d34b2ee1 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -75,10 +75,7 @@ IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.drivers.file.ResultSet","c
OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIterator) : OResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(OResultSet_BASE::rBHelper)
- ,m_aAssignValues(nullptr)
,m_aSkipDeletedSet(this)
- ,m_pFileSet(nullptr)
- ,m_pSortIndex(nullptr)
,m_pParseTree(pStmt->getParseTree())
,m_pSQLAnalyzer(nullptr)
,m_aSQLIterator(_aSQLIterator)
@@ -87,7 +84,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
,m_nFetchDirection(FetchDirection::FORWARD)
,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
,m_nRowPos(-1)
,m_nFilePos(0)
,m_nLastVisitedPos(-1)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index eeed72c50bbe..2457d52be051 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -58,7 +58,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,m_aSQLIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser )
,m_pConnection(_pConnection)
,m_pParseTree(nullptr)
- ,m_pSQLAnalyzer(nullptr)
,m_nMaxFieldSize(0)
,m_nMaxRows(0)
,m_nQueryTimeOut(0)
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 0c805dbae645..f85a33e5e5f9 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::container;
OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_pConnection(_pConnection)
- ,m_pFileStream(nullptr)
,m_nFilePos(0)
,m_nBufferSize(0)
,m_bWriteable(false)
@@ -60,7 +59,6 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
SchemaName,
CatalogName)
, m_pConnection(_pConnection)
- , m_pFileStream(nullptr)
, m_nFilePos(0)
, m_nBufferSize(0)
, m_bWriteable(false)
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 1c3da2b91647..04c4cb821daa 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -86,7 +86,6 @@ Connection::Connection()
, m_sConnectionURL()
, m_sFirebirdURL()
, m_bIsEmbedded(false)
- , m_xEmbeddedStorage(nullptr)
, m_bIsFile(false)
, m_bIsAutoCommit(false)
, m_bIsReadOnly(false)
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index 555741a12171..f08be6983771 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -69,7 +69,6 @@ OResultSet::OResultSet(Connection* pConnection,
, m_pConnection(pConnection)
, m_rMutex(rMutex)
, m_xStatement(xStatement)
- , m_xMetaData(nullptr)
, m_pSqlda(pSqlda)
, m_statementHandle(aStatementHandle)
, m_bWasNull(false)
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 2f6047e7703f..4f5b266b8201 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -60,7 +60,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
aCatalog <<= sCatalog;
Reference< XResultSet > xResult = m_xMetaData->getTables(aCatalog,sSchema,sTable,sTableTypes);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx
index b5f791f2bbb4..f1b41deae6f9 100644
--- a/connectivity/source/drivers/mork/MColumns.cxx
+++ b/connectivity/source/drivers/mork/MColumns.cxx
@@ -37,7 +37,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
aCatalog, sSchemaName, sTableName, _rName);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index fcaff0496c7b..d169e8259b0d 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -69,7 +69,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_pStatement(pStmt)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bWasNull(false)
,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
@@ -80,7 +79,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,m_CurrentRowCount(0)
,m_nParamIndex(0)
,m_bIsAlwaysFalseQuery(false)
- ,m_pKeySet(nullptr)
,m_bIsReadOnly(TRISTATE_INDET)
{
//m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index 1bc3ad5f3d39..37a8771b0809 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -37,7 +37,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
- sdbcx::ObjectType xRet = nullptr;
+ sdbcx::ObjectType xRet;
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index a194b77b9f46..7348abbed855 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -75,7 +75,6 @@ OPreparedResultSet::OPreparedResultSet(OConnection& rConn, OPreparedStatement* p
, OPropertySetHelper(OPreparedResultSet_BASE::rBHelper)
, m_rConnection(rConn)
, m_aStatement(static_cast<OWeakObject*>(pPrepared))
- , m_xMetaData(nullptr)
, m_pStmt(pStmt)
, m_encoding(rConn.getConnectionEncoding())
{
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 9234ad532ea5..cc3b3fff1258 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -101,7 +101,6 @@ OResultSet::OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* p
, m_aRow(nullptr)
, m_pMysql(rConn.getMysqlConnection())
, m_aStatement(static_cast<OWeakObject*>(pStmt))
- , m_xMetaData(nullptr)
, m_pResult(pResult)
, fieldCount(0)
, m_encoding(_encoding)
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index ef6fb720402d..215b75577c25 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -53,8 +53,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection
,m_aStatementHandle(_pConnection->createStatementHandle())
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
- ,m_pRowStatusArray(nullptr)
,m_pConnection(_pConnection)
,m_nTextEncoding(_pConnection->getTextEncoding())
,m_nRowPos(-1)
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 9f0da27ae997..94fb54f670a9 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -240,7 +240,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( )
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- Reference< XResultSet > rs = nullptr;
+ Reference< XResultSet > rs;
prepareStatement();
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 1da3a883a457..a35a52182760 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -88,10 +88,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
,m_aStatementHandle(_pStatementHandle)
,m_aConnectionHandle(pStmt->getConnectionHandle())
,m_pStatement(pStmt)
- ,m_pSkipDeletedSet(nullptr)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
- ,m_pRowStatusArray( nullptr )
,m_nTextEncoding(pStmt->getOwnConnection()->getTextEncoding())
,m_nRowPos(0)
,m_nUseBookmarks(ODBC_SQL_NOT_DEFINED)
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 0ebc71e7dbde..eea0d2d147c2 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -426,7 +426,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- Reference< XResultSet > xRS = nullptr;
+ Reference< XResultSet > xRS;
// Execute the statement. If execute returns true, a result
// set exists.
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index b10fd7882917..85d9ce2b6cd7 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -37,10 +37,6 @@ using namespace ::com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(OCatalog,"com.sun.star.comp.connectivity.OCatalog","com.sun.star.sdbcx.DatabaseDefinition")
OCatalog::OCatalog(const Reference< XConnection> &_xConnection) : OCatalog_BASE(m_aMutex)
- ,m_pTables(nullptr)
- ,m_pViews(nullptr)
- ,m_pGroups(nullptr)
- ,m_pUsers(nullptr)
{
try
{
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 01059f70f023..8ca532323067 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -39,13 +39,11 @@ IMPLEMENT_SERVICE_INFO(OGroup,"com.sun.star.sdbcx.VGroup","com.sun.star.sdbcx.Gr
OGroup::OGroup(bool _bCase) : OGroup_BASE(m_aMutex)
, ODescriptor(OGroup_BASE::rBHelper,_bCase)
- , m_pUsers(nullptr)
{
}
OGroup::OGroup(const OUString& Name, bool _bCase) : OGroup_BASE(m_aMutex)
,ODescriptor(OGroup_BASE::rBHelper,_bCase)
- ,m_pUsers(nullptr)
{
m_Name = Name;
}
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index af272e62758e..85f87ee23ae8 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -66,7 +66,6 @@ OIndex::OIndex(bool _bCase) : ODescriptor_BASE(m_aMutex)
,m_IsUnique(false)
,m_IsPrimaryKeyIndex(false)
,m_IsClustered(false)
- ,m_pColumns(nullptr)
{
}
@@ -81,7 +80,6 @@ OIndex::OIndex( const OUString& Name,
,m_IsUnique(_isUnique)
,m_IsPrimaryKeyIndex(_isPrimaryKeyIndex)
,m_IsClustered(_isClustered)
- ,m_pColumns(nullptr)
{
m_Name = Name;
}
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index aea6d6adaca3..5e61d46f93dc 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -62,7 +62,6 @@ sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName )
OKey::OKey(bool _bCase) : ODescriptor_BASE(m_aMutex)
, ODescriptor(ODescriptor_BASE::rBHelper, _bCase, true)
, m_aProps(new KeyProperties())
- , m_pColumns(nullptr)
{
}
@@ -70,7 +69,6 @@ OKey::OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps, b
: ODescriptor_BASE(m_aMutex)
,ODescriptor(ODescriptor_BASE::rBHelper, _bCase)
,m_aProps(_rProps)
- ,m_pColumns(nullptr)
{
m_Name = Name;
}
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index ad3f32064191..396c3f65801e 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -40,13 +40,11 @@ IMPLEMENT_SERVICE_INFO(OUser,"com.sun.star.sdbcx.VUser","com.sun.star.sdbcx.User
OUser::OUser(bool _bCase) : OUser_BASE(m_aMutex)
, ODescriptor(OUser_BASE::rBHelper,_bCase,true)
- , m_pGroups(nullptr)
{
}
OUser::OUser(const OUString& Name, bool _bCase) : OUser_BASE(m_aMutex)
,ODescriptor(OUser_BASE::rBHelper,_bCase)
- ,m_pGroups(nullptr)
{
m_Name = Name;
}
diff --git a/cppcanvas/source/mtfrenderer/emfpbrush.cxx b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
index 5f3e867f9180..dc676c33a5d8 100644
--- a/cppcanvas/source/mtfrenderer/emfpbrush.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
@@ -54,14 +54,9 @@ namespace cppcanvas
, areaHeight(0.0)
, hasTransformation(false)
, blendPoints(0)
- , blendPositions(nullptr)
, blendFactors(nullptr)
, colorblendPoints(0)
- , colorblendPositions(nullptr)
- , colorblendColors(nullptr)
, surroundColorsNumber(0)
- , surroundColors(nullptr)
- , path(nullptr)
, hatchStyle(HatchStyleHorizontal)
{
}
diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx b/cppcanvas/source/mtfrenderer/emfppen.cxx
index 6c5b4c7acbb8..adf578a117e9 100644
--- a/cppcanvas/source/mtfrenderer/emfppen.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppen.cxx
@@ -84,9 +84,7 @@ namespace cppcanvas
, dashOffset(0.0)
, alignment(0)
, customStartCapLen(0)
- , customStartCap(nullptr)
, customEndCapLen(0)
- , customEndCap(nullptr)
{
}
diff --git a/cppcanvas/source/mtfrenderer/emfpregion.cxx b/cppcanvas/source/mtfrenderer/emfpregion.cxx
index b8a92436c6fd..545cf0ac404e 100644
--- a/cppcanvas/source/mtfrenderer/emfpregion.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpregion.cxx
@@ -48,7 +48,6 @@ namespace cppcanvas
{
EMFPRegion::EMFPRegion()
: parts(0)
- , combineMode(nullptr)
, initialState(0)
, ix(0.0)
, iy(0.0)
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 55bf58d7e917..2a14b3c890d8 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -131,10 +131,8 @@ AffineBridge::AffineBridge()
m_pCallee (nullptr),
m_pParam (nullptr),
m_innerThreadId(0),
- m_pInnerThread (nullptr),
m_enterCount (0),
- m_outerThreadId(0),
- m_pOuterThread (nullptr)
+ m_outerThreadId(0)
{
SAL_INFO("cppu.affinebridge", "LIFE: AffineBridge::AffineBridge(uno_Environment * pEnv) -> " << this);
}
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index ec51f2128143..3afc22e9cead 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -198,10 +198,9 @@ struct TypeDescriptor_Init_Impl
sal_Int32 nTypeDescriptionReferenceCount;
#endif
- TypeDescriptor_Init_Impl():
- pWeakMap(nullptr), pCallbacks(nullptr), pCache(nullptr), pMutex(nullptr)
+ TypeDescriptor_Init_Impl()
#if OSL_DEBUG_LEVEL > 0
- , nTypeDescriptionCount(0), nCompoundTypeDescriptionCount(0),
+ : nTypeDescriptionCount(0), nCompoundTypeDescriptionCount(0),
nIndirectTypeDescriptionCount(0),
nEnumTypeDescriptionCount(0),
nInterfaceMethodTypeDescriptionCount(0),
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 00717a1a7547..a06a68703d8d 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -886,7 +886,6 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxItemSet& aSet )
: SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet)
, m_pMacroInfoItem()
- , m_pFileDlg(nullptr)
, aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
, aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))
, aFilterCfgStr(CuiResId(RID_SVXSTR_FILTERNAME_CFG))
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e7e4565e5d8b..fac9928510cc 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -395,8 +395,7 @@ MenuSaveInData::MenuSaveInData(
m_aMenuResourceURL(
ITEM_MENUBAR_URL ),
m_aDescriptorContainer(
- ITEM_DESCRIPTOR_CONTAINER ),
- pRootEntry( nullptr )
+ ITEM_DESCRIPTOR_CONTAINER )
{
try
{
@@ -1887,7 +1886,6 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
weld::Window* pParent, SvxEntries* entries,
SvxConfigEntry const * selection, bool bCreateMenu )
: GenericDialogController(pParent, "cui/ui/movemenu.ui", "MoveMenuDialog")
- , mpEntries(nullptr)
, m_xMenuBox(m_xBuilder->weld_widget("namebox"))
, m_xMenuNameEdit(m_xBuilder->weld_entry("menuname"))
, m_xMenuListBox(m_xBuilder->weld_tree_view("menulist"))
@@ -2034,7 +2032,6 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
, bIsModified( false )
, bIsVisible( true )
, nStyle( 0 )
- , mpEntries( nullptr )
{
if (bPopUp)
{
@@ -2075,7 +2072,6 @@ ToolbarSaveInData::ToolbarSaveInData(
bool docConfig ) :
SaveInData ( xCfgMgr, xParentCfgMgr, aModuleId, docConfig ),
- pRootEntry ( nullptr ),
m_aDescriptorContainer ( ITEM_DESCRIPTOR_CONTAINER )
{
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index dbba1ebe1aa2..e0ab01b783f2 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -214,8 +214,6 @@ void SvxMacroTabPage_::EnableButtons()
SvxMacroTabPage_::SvxMacroTabPage_(vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet)
: SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ),
- m_xAppEvents(nullptr),
- m_xDocEvents(nullptr),
bDocModified(false),
bAppEvents(false),
bInitialized(false)
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 4caf324c9ecd..e544ff18fce5 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -55,7 +55,6 @@ using namespace css;
SvxCharacterMap::SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet, bool bInsert)
: GenericDialogController(pParent, "cui/ui/specialcharacters.ui", "SpecialCharactersDialog")
, m_xVirDev(VclPtr<VirtualDevice>::Create())
- , pSubsetMap( nullptr )
, isSearchMode(true)
, m_bHasInsert(bInsert)
, mxContext(comphelper::getProcessComponentContext())
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 75425a9672df..103e3c599e94 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -76,7 +76,6 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex
,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) )
,m_pPreSearchFocus( nullptr )
,m_lnkContextSupplier(lnkContextSupplier)
- ,m_pConfig( nullptr )
{
get(m_prbSearchForText,"rbSearchForText");
get(m_prbSearchForNull,"rbSearchForNull");
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index bb7c12b627ef..9da0f6a2d2f8 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1098,7 +1098,6 @@ namespace svx
HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent)
: ModalDialog( _pParent, "HangulHanjaOptDialog",
"cui/ui/hangulhanjaoptdialog.ui" )
- , m_xConversionDictionaryList(nullptr)
{
get(m_pDictsLB, "dicts");
get(m_pIgnorepostCB, "ignorepost");
@@ -1723,7 +1722,6 @@ namespace svx
,m_aEditHintText ( CuiResId(RID_SVXSTR_EDITHINT) )
,m_rDictList ( _rDictList )
,m_nCurrentDict ( 0xFFFFFFFF )
- ,m_pSuggestions ( nullptr )
,m_nTopPos ( 0 )
,m_bModifiedSuggestions ( false )
,m_bModifiedOriginal ( false )
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index c055268dd9f3..ba55b4c3bc26 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -422,8 +422,6 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
SvxSpellWrapper* pWrapper)
: SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui")
, m_pHyphWrapper(pWrapper)
- , m_xHyphenator(nullptr)
- , m_xPossHyph(nullptr)
, m_aActWord(rWord)
, m_nActLanguage(nLang)
, m_nMaxHyphenationPos(0)
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 969bf03cdf36..9147492639e6 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -150,8 +150,7 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
mnCurrentPageId ( HyperLinkPageType::NONE ),
pSet ( nullptr ),
- pExampleSet ( nullptr ),
- pRanges ( nullptr )
+ pExampleSet ( nullptr )
{
get(m_pOKBtn, "ok");
get(m_pApplyBtn, "apply");
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 0f2907ce02dc..edfb1d0df063 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -35,7 +35,6 @@
SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet)
- , m_pFontList(nullptr)
, m_nNamePageId(0)
, m_nParaStdPageId(0)
, m_nParaAlignPageId(0)
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0438c335d4e3..003568a0f2fa 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -441,7 +441,6 @@ SvxThesaurusDialog::SvxThesaurusDialog(
LanguageType nLanguage)
: SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui")
, m_aErrStr(CuiResId(RID_SVXSTR_ERR_TEXTNOTFOUND))
- , xThesaurus(nullptr)
, aLookUpText()
, nLookUpLanguage(LANGUAGE_NONE)
, m_bWordFound(false)
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 00ef79f0f552..b151dad1433f 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -284,8 +284,7 @@ public:
bIsParentData( false ),
bIsModified( false ),
bIsVisible( true ),
- nStyle( 0 ),
- mpEntries( nullptr )
+ nStyle( 0 )
{}
~SvxConfigEntry();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 91b9d75a2269..48b7874f850e 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -982,8 +982,6 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet)
, bFillItemSetCalled(false)
- , pColorConfig(nullptr)
- , pExtColorConfig(nullptr)
{
get(m_pColorSchemeLB, "colorschemelb");
m_pColorSchemeLB->SetStyle(m_pColorSchemeLB->GetStyle() | WB_SORT);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index c427c10cd9dd..afd2f4c5de2a 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -948,9 +948,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
sNumPreBreak (CuiResId(RID_SVXSTR_NUM_PRE_BREAK)),
sNumPostBreak (CuiResId(RID_SVXSTR_NUM_POST_BREAK)),
sHyphAuto (CuiResId(RID_SVXSTR_HYPH_AUTO)),
- sHyphSpecial (CuiResId(RID_SVXSTR_HYPH_SPECIAL)),
-
- pLinguData(nullptr)
+ sHyphSpecial (CuiResId(RID_SVXSTR_HYPH_SPECIAL))
{
get(m_pLinguModulesFT, "lingumodulesft");
get(m_pLinguModulesCLB, "lingumodules");
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c6c325b38fe3..5bf5038bb93c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -170,7 +170,6 @@ private:
BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent)
: Window(pParent, WB_BORDER)
, bIsBmp(false)
- , pBitmap(nullptr)
, aDrawRect(Point(0,0), GetOutputSizePixel())
{
SetBorderStyle(WindowBorderStyle::MONO);
@@ -321,9 +320,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe
, bCharBackColor(false)
, m_bColorSelected(false)
, pPageImpl(new SvxBackgroundPage_Impl)
- , pImportDlg(nullptr)
- , pTableBck_Impl(nullptr)
- , pHighlighting(nullptr)
{
get(m_pAsGrid, "asgrid");
get(m_pSelectTxt, "asft");
@@ -902,7 +898,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = nullptr;
- XColorListRef pColorTable = nullptr;
+ XColorListRef pColorTable;
if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
{
pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
@@ -1455,7 +1451,7 @@ SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = nullptr;
- XColorListRef pColorTable = nullptr;
+ XColorListRef pColorTable;
if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
{
pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
@@ -1464,7 +1460,7 @@ SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
if ( !pColorTable.is() )
pColorTable = XColorList::CreateStdColorList();
- XBitmapListRef pBitmapList = nullptr;
+ XBitmapListRef pBitmapList;
if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_BITMAP_LIST ) ) ) )
{
pBitmapList = static_cast<const SvxBitmapListItem*>(pItem)->GetBitmapList();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 304bfbe6187f..dad69bc6dc1c 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -234,8 +234,6 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent,
const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "NumberingFormatPage",
"cui/ui/numberingformatpage.ui", &rCoreAttrs)
- , pNumItem(nullptr)
- , pNumFmtShell(nullptr)
, nInitFormat(ULONG_MAX)
, sAutomaticEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY))
, pLastActivWindow(nullptr)
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0ed2f6b325c9..6f5445084751 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -173,8 +173,6 @@ static const vcl::Font& lcl_GetDefaultBulletFont()
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet)
- , pActNum(nullptr)
- , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
@@ -362,8 +360,6 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void)
SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet)
- , pActNum(nullptr)
- , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
@@ -523,8 +519,6 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet)
- , pActNum(nullptr)
- , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -771,8 +765,6 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet)
- , pActNum(nullptr)
- , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -1066,8 +1058,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void)
SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet)
- , pActNum(nullptr)
- , pSaveNum(nullptr)
, bLastWidthModified(false)
, bModified(false)
, bPreset(false)
@@ -2554,8 +2544,6 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool
SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet)
- , pActNum(nullptr)
- , pSaveNum(nullptr)
, nActNumLvl(1)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 655c532a1aab..2386d48f527f 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -84,12 +84,6 @@ void lclExtendSize(Size& rSize, const Size& rInputSize)
SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SvxTabPage(pParent, "cui/ui/areatabpage.ui", "AreaTabPage", rInAttrs)
- , m_pFillTabPage(nullptr)
- , m_pColorList(nullptr)
- , m_pGradientList(nullptr)
- , m_pHatchingList(nullptr)
- , m_pBitmapList(nullptr)
- , m_pPatternList(nullptr)
// local fixed not o be changed values for local pointers
, maFixed_ChangeType(ChangeType::NONE)
// init with pointers to fixed ChangeType
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 7e8682d255ac..089e07342d39 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -70,7 +70,6 @@ const sal_uInt16 SvxBitmapTabPage::pBitmapRanges[] =
SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SvxTabPage(pParent, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", rInAttrs)
, m_rOutAttrs(rInAttrs)
- , m_pBitmapList(nullptr)
, m_pnBitmapListState(nullptr)
, m_fObjectWidth(0.0)
, m_fObjectHeight(0.0)
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index a94926300d8f..4f525e922563 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -65,7 +65,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
- pLineEndList ( nullptr ),
pnLineEndListState ( nullptr ),
pPageType ( nullptr ),
nDlgType ( 0 ),
More information about the Libreoffice-commits
mailing list