reportdesign/source/ui/dlg/AddField.cxx | 2 --
reportdesign/source/ui/dlg/Condition.cxx | 2 --
reportdesign/source/ui/dlg/GroupsSorting.cxx | 1 -
reportdesign/source/ui/misc/UITools.cxx | 2 +-
reportdesign/source/ui/report/ReportSection.cxx | 2 --
reportdesign/source/ui/report/ScrollHelper.cxx | 1 -
reportdesign/source/ui/report/dlgedfunc.cxx | 1 -
sal/qa/rtl/ref/rtl_ref.cxx | 2 +-
sax/source/expatwrap/saxwriter.cxx | 3 +--
sax/source/tools/CachedOutputStream.hxx | 1 -
10 files changed, 3 insertions(+), 14 deletions(-)
New commits:
commit 4b3430f27a01a256e268aa19d51f7c2e1a61534c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Sep 9 19:41:49 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 10 11:34:25 2018 +0200
loplugin:simplifyconstruct in reportdesign..sax
Change-Id: I7d2a754cdc5576b5a5b35db2fbffd19ea17c16ff
Reviewed-on: https://gerrit.libreoffice.org/60224
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/reportdesign/source/ui/dlg/AddField.cxx
b/reportdesign/source/ui/dlg/AddField.cxx
index 46b8850ac552..cb244049b9fe 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -153,8 +153,6 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent
,const uno::Reference< bea
,
m_pListBox(VclPtr<OAddFieldWindowListBox>::Create(get<vcl::Window>("box"),
this))
, m_nCommandType(0)
, m_bEscapeProcessing(false)
- , m_pChangeListener(nullptr)
- , m_pContainerListener(nullptr)
{
get(m_aActions, "toolbox");
m_nSortUpId = m_aActions->GetItemId(0);
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index 5aa87cd98d03..d3382478b766 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -108,8 +108,6 @@ Condition::Condition( vcl::Window* _pParent,
IConditionalFormatAction& _rAction,
, m_aColorWrapper(this)
, m_rController(_rController)
, m_rAction(_rAction)
- , m_pBtnUpdaterFontColor(nullptr)
- , m_pBtnUpdaterBackgroundColor(nullptr)
, m_nCondIndex(0)
, m_bInDestruction(false)
{
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 816c5df9dcce..5858755c9f3e 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -803,7 +803,6 @@ OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window*
_pParent, bool _bReadOnl
: FloatingWindow(_pParent, "FloatingSort",
"modules/dbreport/ui/floatingsort.ui")
, OPropertyChangeListener(m_aMutex)
, m_pController(_pController)
- , m_pCurrentGroupListener(nullptr)
, m_xGroups(m_pController->getReportDefinition()->getGroups())
, m_bReadOnly(_bReadOnly)
{
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index ee453e217c60..af753020146d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -176,7 +176,7 @@ void adjustSectionName(const uno::Reference< report::XGroup
>& _xGroup,sal_Int32
::rtl::Reference< comphelper::OPropertyChangeMultiplexer>
addStyleListener(const uno::Reference< report::XReportDefinition >&
_xReportDefinition,::comphelper::OPropertyChangeListener* _pListener)
{
- ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pRet = nullptr;
+ ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pRet;
if ( _xReportDefinition.is() )
{
uno::Reference<beans::XPropertySet>
xPageStyle(getUsedStyle(_xReportDefinition),uno::UNO_QUERY);
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index 07f6d4bf72c2..69129616d46e 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -82,8 +82,6 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const
uno::Reference< re
, m_pPage(nullptr)
, m_pView(nullptr)
, m_pParent(_pParent)
- , m_pMulti(nullptr)
- , m_pReportListener(nullptr)
, m_xSection(_xSection)
, m_nPaintEntranceCount(0)
, m_eMode(DlgEdMode::Select)
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx
b/reportdesign/source/ui/report/ScrollHelper.cxx
index 12251126cea5..aeb340042b0e 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -50,7 +50,6 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView*
_pDesignView)
,m_aCornerWin( VclPtr<ScrollBarBox>::Create(this) )
,m_pParent(_pDesignView)
,m_aReportWindow(VclPtr<rptui::OReportWindow>::Create(this,m_pParent))
- ,m_pReportDefinitionMultiPlexer(nullptr)
{
SetMapMode( MapMode( MapUnit::Map100thMM ) );
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 8226116cb32c..477abefed1d2 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -113,7 +113,6 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
: m_pParent(_pParent)
, m_rView(_pParent->getSectionView())
- , m_xOverlappingObj(nullptr)
, m_pOverlappingObj(nullptr)
, m_nOverlappedControlColor(0)
, m_nOldColor(0)
diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx
index e3987d9bb267..a2c22d2e8da5 100644
--- a/sal/qa/rtl/ref/rtl_ref.cxx
+++ b/sal/qa/rtl/ref/rtl_ref.cxx
@@ -84,7 +84,7 @@ class TestReferenceRefCounting : public CppUnit::TestFixture
static_cast<long>(2), test2->use_count());
// use count should decrement
- test2 = rtl::Reference< MoveTestClass >(nullptr);
+ test2 = rtl::Reference< MoveTestClass >();
CPPUNIT_ASSERT_EQUAL_MESSAGE("test1.use_count() == 1",
static_cast<long>(1), test1->use_count());
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index e35bb5c2b0e3..bbe1d5840538 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -939,8 +939,7 @@ class SAXWriter :
{
public:
SAXWriter()
- : m_pSaxWriterHelper(nullptr)
- , m_bDocStarted(false)
+ : m_bDocStarted(false)
, m_bIsCDATA(false)
, m_bForceLineBreak(false)
, m_bAllowLineBreak(false)
diff --git a/sax/source/tools/CachedOutputStream.hxx
b/sax/source/tools/CachedOutputStream.hxx
index a71b9788ba5a..8eca0a4c84e1 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -47,7 +47,6 @@ public:
, mpCache(mnMaximumSize)
, pSeq(mpCache.get())
, mbWriteToOutStream(true)
- , mpForMerge(nullptr)
{}
const css::uno::Reference< css::io::XOutputStream >& getOutputStream()
const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
