sot/source/sdstor/stgio.cxx | 3 -
svl/qa/unit/svl.cxx | 4 --
svl/source/numbers/zforlist.cxx | 2 -
svl/source/svdde/ddestrg.cxx | 5 +-
svtools/source/config/slidesorterbaropt.cxx | 4 --
svtools/source/control/calendar.cxx | 7 +---
svtools/source/control/ctrltool.cxx | 3 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 27 ++++++----------
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 3 -
svx/source/svdraw/svdocapt.cxx | 13 ++-----
svx/source/unodraw/unoctabl.cxx | 6 +--
11 files changed, 28 insertions(+), 49 deletions(-)
New commits:
commit d002d3e8c241f32ac931c1998d7820d5b7b97e64
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Nov 23 19:17:30 2019 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Nov 24 00:26:41 2019 +0100
cppcheck: performing init in init list (sot/svl/svtools/svx)
order had been changed in
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
so initialization list was fine
Indeed mpActLineDistFld depends on mpLineDistAtMetricBox
Change-Id: I974e68892fe7ab900774bbe912c51ec56ba4ee43
Reviewed-on: https://gerrit.libreoffice.org/83577
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 08f023c5f52a..7d90c490c634 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -175,9 +175,8 @@ public:
}
EasyFat::EasyFat( StgIo& rIo, StgStrm* pFatStream, sal_Int32 nPSize )
+ : nPages(pFatStream->GetSize() >> 2), nPageSize(nPSize)
{
- nPages = pFatStream->GetSize() >> 2;
- nPageSize = nPSize;
pFat.reset( new sal_Int32[ nPages ] );
pFree.reset( new bool[ nPages ] );
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index d30a7b6279ec..8eb3cf4b6dfa 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -101,10 +101,8 @@ private:
std::unique_ptr<icu::TimeZone> m_pDefaultTimeZone;
};
-Test::Test()
+Test::Test() : m_xContext(cppu::defaultBootstrap_InitialComponentContext())
{
- m_xContext = cppu::defaultBootstrap_InitialComponentContext();
-
uno::Reference<lang::XMultiComponentFactory>
xFactory(m_xContext->getServiceManager());
uno::Reference<lang::XMultiServiceFactory> xSM(xFactory,
uno::UNO_QUERY_THROW);
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 04e32464d8b2..7243d0f7105c 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -196,8 +196,8 @@ public:
};
SvNumberFormatterRegistry_Impl::SvNumberFormatterRegistry_Impl()
+ : eSysLanguage(MsLangId::getRealLanguage( LANGUAGE_SYSTEM ))
{
- eSysLanguage = MsLangId::getRealLanguage( LANGUAGE_SYSTEM );
aSysLocaleOptions.AddListener( this );
}
diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 43fbe5b6d9e4..6789dc1e172f 100644
--- a/svl/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.cxx
@@ -23,10 +23,9 @@
#include <o3tl/char16_t2wchar_t.hxx>
DdeString::DdeString( DWORD hDdeInst, const OUString& r)
- : m_aString(r)
+ : m_aString(r), hString(DdeCreateStringHandleW( hDdeInst,
o3tl::toW(r.getStr()), CP_WINUNICODE )),
+ hInst(hDdeInst)
{
- hString = DdeCreateStringHandleW( hDdeInst, o3tl::toW(r.getStr()),
CP_WINUNICODE );
- hInst = hDdeInst;
}
DdeString::~DdeString()
diff --git a/svtools/source/config/slidesorterbaropt.cxx
b/svtools/source/config/slidesorterbaropt.cxx
index ecf29453c765..83b10595869c 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -120,7 +120,7 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()
// Init baseclasses first
: ConfigItem( ROOTNODE_SLIDESORTERBAR )
-
+ , m_seqPropertyNames(GetPropertyNames())
, m_bVisibleImpressView( false )
, m_bVisibleOutlineView( false )
, m_bVisibleNotesView( false )
@@ -129,8 +129,6 @@
SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()
, m_bVisibleDrawView( false )
{
- m_seqPropertyNames = GetPropertyNames( );
-
// Use our static list of configuration keys to get his values.
Sequence< Any > seqValues = GetProperties( m_seqPropertyNames );
diff --git a/svtools/source/control/calendar.cxx
b/svtools/source/control/calendar.cxx
index 023af05b18bc..d1b7f5d119c9 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -57,12 +57,9 @@ public:
};
ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) :
- FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW )
+ FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ),
+ mpCalendar(nullptr), mpTodayBtn(nullptr), mpNoneBtn(nullptr),
mpFixedLine(nullptr)
{
- mpCalendar = nullptr;
- mpTodayBtn = nullptr;
- mpNoneBtn = nullptr;
- mpFixedLine = nullptr;
}
ImplCFieldFloatWin::~ImplCFieldFloatWin()
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index 0e8e84174bc4..fbf046328a9b 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -83,9 +83,8 @@ private:
public:
ImplFontListFontMetric( const FontMetric& rInfo,
OutputDevice* pDev ) :
- FontMetric( rInfo ), mpNext(nullptr)
+ FontMetric( rInfo ), mpDevice(pDev),
mpNext(nullptr)
{
- mpDevice = pDev;
}
OutputDevice* GetDevice() const { return mpDevice; }
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 2f582d9d8335..90fb26e99b7e 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -54,23 +54,18 @@
using namespace svx;
ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId, vcl::Window*
pParent)
- : SfxPopupWindow(nId, pParent, "ParaLineSpacingControl",
"svx/ui/paralinespacingcontrol.ui")
+ : SfxPopupWindow(nId, pParent, "ParaLineSpacingControl",
"svx/ui/paralinespacingcontrol.ui"),
+ meLNSpaceUnit(MapUnit::Map100thMM),
+ mpSpacing1Button(get<PushButton>("spacing_1")),
+ mpSpacing115Button(get<PushButton>("spacing_115")),
+ mpSpacing15Button(get<PushButton>("spacing_15")),
+ mpSpacing2Button(get<PushButton>("spacing_2")),
+ mpLineDist(get<ListBox>("line_dist")),
+ mpLineDistLabel(get<FixedText>("value_label")),
+ mpLineDistAtPercentBox(get<MetricField>("percent_box")),
+ mpLineDistAtMetricBox(get<MetricField>("metric_box")),
+ mpActLineDistFld(mpLineDistAtPercentBox.get())
{
- mpSpacing1Button = get<PushButton>("spacing_1");
- mpSpacing115Button = get<PushButton>("spacing_115");
- mpSpacing15Button = get<PushButton>("spacing_15");
- mpSpacing2Button = get<PushButton>("spacing_2");
-
- mpLineDist = get<ListBox>("line_dist");
-
- mpLineDistLabel = get<FixedText>("value_label");
- mpLineDistAtPercentBox = get<MetricField>("percent_box");
- mpLineDistAtMetricBox = get<MetricField>("metric_box");
-
- mpActLineDistFld = mpLineDistAtPercentBox.get();
-
- meLNSpaceUnit = MapUnit::Map100thMM;
-
Link<Button*,void> aLink = LINK(this, ParaLineSpacingControl,
PredefinedValuesHandler);
mpSpacing1Button->SetClickHdl(aLink);
mpSpacing115Button->SetClickHdl(aLink);
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index 2816916002fe..9814737aeab2 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -37,8 +37,6 @@ public:
private:
MapUnit meLNSpaceUnit;
- VclPtr<Edit> mpActLineDistFld;
-
VclPtr<PushButton> mpSpacing1Button;
VclPtr<PushButton> mpSpacing115Button;
VclPtr<PushButton> mpSpacing15Button;
@@ -49,6 +47,7 @@ private:
VclPtr<FixedText> mpLineDistLabel;
VclPtr<MetricField> mpLineDistAtPercentBox;
VclPtr<MetricField> mpLineDistAtMetricBox;
+ VclPtr<Edit> mpActLineDistFld;
private:
/// Setup the widgets with values from the document.
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index ea96430322c0..81b34988f0bc 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -84,16 +84,11 @@ public:
public:
ImpCaptParams()
+ : eType(SdrCaptionType::Type3),
+ nGap(0), nEscRel(5000), nEscAbs(0),
+ nLineLen(0), eEscDir(SdrCaptionEscDir::Horizontal),
+ bFitLineLen(true), bEscRel(true), bFixedAngle(false)
{
- eType =SdrCaptionType::Type3;
- bFixedAngle=false;
- nGap =0;
- eEscDir =SdrCaptionEscDir::Horizontal;
- bEscRel =true;
- nEscRel =5000;
- nEscAbs =0;
- nLineLen =0;
- bFitLineLen=true;
}
void CalcEscPos(const Point& rTail, const tools::Rectangle& rRect, Point&
rPt, EscDir& rDir) const;
};
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index a6fa3f74f316..ec338a7d033b 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -63,10 +63,10 @@ public:
};
SvxUnoColorTable::SvxUnoColorTable()
+ : pList(XPropertyList::AsColorList(
+ XPropertyList::CreatePropertyList(
+ XPropertyListType::Color, SvtPathOptions().GetPalettePath(),
"")))
{
- pList = XPropertyList::AsColorList(
- XPropertyList::CreatePropertyList(
- XPropertyListType::Color, SvtPathOptions().GetPalettePath(), ""));
}
sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString&
ServiceName )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
