sc/inc/progress.hxx |
4 ++
sc/source/core/data/column2.cxx |
17 ++++++++++
sc/source/core/data/formulacell.cxx |
8 +++-
sc/source/core/tool/progress.cxx |
13 ++++---
svtools/source/uno/wizard/unowizard.cxx |
2 -
svx/source/accessibility/AccessibleTextHelper.cxx |
6 +--
svx/source/core/extedit.cxx |
2 -
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |
10 ++---
svx/source/dialog/_bmpmask.cxx |
2 -
svx/source/dialog/imapwnd.hxx |
2 -
svx/source/dialog/svxruler.cxx |
2 -
svx/source/engine3d/helperminimaldepth3d.cxx |
2 -
svx/source/engine3d/scene3d.cxx |
4 +-
svx/source/engine3d/view3d.cxx |
2 -
svx/source/fmcomp/fmgridif.cxx |
2 -
svx/source/fmcomp/gridctrl.cxx |
4 +-
svx/source/form/datanavi.cxx |
4 +-
svx/source/form/filtnav.cxx |
6 +--
svx/source/form/fmpgeimp.cxx |
2 -
svx/source/form/fmscriptingenv.cxx |
4 +-
svx/source/form/fmshimp.cxx |
2 -
svx/source/form/fmundo.cxx |
2 -
svx/source/form/fmvwimp.cxx |
4 --
svx/source/form/formcontrolfactory.cxx |
2 -
svx/source/form/formcontroller.cxx |
4 +-
svx/source/form/formcontrolling.cxx |
6 +--
svx/source/form/legacyformcontroller.cxx |
2 -
svx/source/gallery2/codec.hxx |
4 +-
svx/source/gallery2/galbrws2.cxx |
2 -
svx/source/sidebar/EmptyPanel.hxx |
2 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx |
2 -
svx/source/stbctrls/pszctrl.cxx |
2 -
svx/source/stbctrls/selctrl.cxx |
2 -
svx/source/svdraw/svddrgm1.hxx |
12 +++----
svx/source/svdraw/svdhdl.cxx |
2 -
svx/source/svdraw/svdograf.cxx |
2 -
svx/source/svdraw/svdoole2.cxx |
6 +--
svx/source/svdraw/svdopath.cxx |
2 -
svx/source/svdraw/svdotextdecomposition.cxx |
2 -
svx/source/svdraw/svdotextpathdecomposition.cxx |
4 +-
svx/source/svdraw/svdotxln.cxx |
2 -
svx/source/svdraw/svdouno.cxx |
2 -
svx/source/svdraw/svdpage.cxx |
2 -
svx/source/table/accessibletableshape.cxx |
2 -
svx/source/table/propertyset.hxx |
4 +-
svx/source/table/svdotable.cxx |
2 -
svx/source/table/tablecolumns.hxx |
2 -
svx/source/table/tablecontroller.cxx |
2 -
svx/source/table/tablelayouter.hxx |
2 -
svx/source/table/tablemodel.hxx |
6 +--
svx/source/table/tablerows.hxx |
2 -
svx/source/table/tablertfimporter.cxx |
6 +--
svx/source/table/tableundo.hxx |
8 +---
svx/source/table/viewcontactoftableobj.hxx |
2 -
svx/source/tbxctrls/bulletsnumbering.cxx |
2 -
svx/source/tbxctrls/colrctrl.cxx |
9 +----
svx/source/tbxctrls/extrusioncontrols.hxx |
8 ++--
svx/source/tbxctrls/fontworkgallery.cxx |
4 +-
svx/source/tbxctrls/tbunocontroller.cxx |
2 -
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx |
2 -
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx |
2 -
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx |
2 -
svx/source/unodraw/UnoGraphicExporter.cxx |
4 +-
svx/source/unodraw/XPropertyTable.cxx |
12 +++----
svx/source/unodraw/gluepts.cxx |
2 -
svx/source/unodraw/recoveryui.cxx |
2 -
svx/source/unodraw/shapeimpl.hxx |
10 ++---
svx/source/unodraw/unobtabl.cxx |
2 -
svx/source/unodraw/unodtabl.cxx |
2 -
svx/source/unodraw/unogtabl.cxx |
2 -
svx/source/unodraw/unohtabl.cxx |
2 -
svx/source/unodraw/unomod.cxx |
2 -
svx/source/unodraw/unomtabl.cxx |
2 -
svx/source/unodraw/unoshape.cxx |
4 +-
svx/source/unodraw/unottabl.cxx |
2 -
svx/source/unogallery/unogalitem.hxx |
2 -
svx/source/unogallery/unogaltheme.hxx |
2 -
svx/source/xml/xmlgrhlp.cxx |
4 +-
svx/source/xml/xmlxtexp.cxx |
14 ++++----
svx/workben/msview/msview.cxx |
9 +----
svx/workben/msview/xmlconfig.hxx |
16 +++------
sw/qa/core/Test-BigPtrArray.cxx |
4 +-
sw/qa/core/test_ToxTextGenerator.cxx |
2 -
sw/qa/tiledrendering/tiledrendering.cxx |
2 -
sw/source/core/access/accmap.cxx |
8 ++--
sw/source/core/access/accpara.cxx |
4 +-
sw/source/core/access/acctable.cxx |
12 ++-----
sw/source/core/crsr/crsrsh.cxx |
2 -
sw/source/core/crsr/swcrsr.cxx |
2 -
sw/source/core/doc/DocumentLinksAdministrationManager.cxx |
2 -
sw/source/core/doc/acmplwrd.cxx |
2 -
sw/source/core/doc/doccomp.cxx |
8 ++--
sw/source/core/doc/docdesc.cxx |
4 +-
sw/source/core/doc/tblrwcl.cxx |
2 -
sw/source/core/docnode/finalthreadmanager.cxx |
2 -
sw/source/core/docnode/ndtbl.cxx |
2 -
sw/source/core/docnode/nodes.cxx |
3 -
sw/source/core/draw/dcontact.cxx |
2 -
sw/source/core/draw/dflyobj.cxx |
4 +-
sw/source/core/edit/edlingu.cxx |
7 ++--
sw/source/core/fields/reffld.cxx |
2 -
sw/source/core/frmedt/feshview.cxx |
2 -
sw/source/core/frmedt/tblsel.cxx |
2 -
sw/source/core/layout/anchoreddrawobject.cxx |
4 +-
sw/source/core/layout/flycnt.cxx |
2 -
sw/source/core/layout/layouter.cxx |
4 +-
sw/source/core/layout/objectformattertxtfrm.cxx |
2 -
sw/source/core/layout/paintfrm.cxx |
4 +-
sw/source/core/layout/sectfrm.cxx |
2 -
sw/source/core/layout/trvlfrm.cxx |
2 -
sw/source/core/ole/ndole.cxx |
4 +-
sw/source/core/text/inftxt.hxx |
2 -
sw/source/core/text/itratr.hxx |
2 -
sw/source/core/text/itrpaint.hxx |
2 -
sw/source/core/text/itrtxt.hxx |
10 ++---
sw/source/core/text/porexp.hxx |
2 -
sw/source/core/text/porfld.hxx |
4 +-
sw/source/core/text/porfly.hxx |
2 -
sw/source/core/text/porglue.hxx |
10 ++---
sw/source/core/text/porhyph.hxx |
4 +-
sw/source/core/text/portxt.hxx |
6 +--
sw/source/core/text/txtcache.hxx |
2 -
sw/source/core/text/txtdrop.cxx |
2 -
sw/source/core/text/txtpaint.hxx |
14 ++++----
sw/source/core/text/xmldump.cxx |
2 -
sw/source/core/txtnode/fntcap.cxx |
6 +--
sw/source/core/txtnode/modeltoviewhelper.cxx |
2 -
sw/source/core/txtnode/ndtxt.cxx |
2 -
sw/source/core/txtnode/thints.cxx |
8 ++--
sw/source/core/undo/untbl.cxx |
6 +--
sw/source/core/unocore/XMLRangeHelper.cxx |
4 +-
131 files changed, 269 insertions(+), 261 deletions(-)
New commits:
commit e3c1a394a00cef416a81b89b6d5c204891abb286
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed May 27 13:52:36 2015 +0100
Resolves: tdf#91416 setting progress -> resize -> destroy formula context
i.e. setting progress triggers ScTabView::DoResize and an InterpretVisible
and
InterpretDirtyCells which resets the mpFormulaGroupCxt that the current rCxt
points to, which is bad, so disable progress for the duration of the
GetResult
loop
Change-Id: I8e88cee4dd2308ef61dee934d300a38978833703
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index d65c9b5..340c4c1 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -49,6 +49,7 @@ private:
static bool bAllowInterpretProgress;
static ScDocument* pInterpretDoc;
static bool bIdleWasEnabled;
+ bool bEnabled;
SfxProgress* pProgress;
@@ -143,6 +144,9 @@ public:
return pProgress->GetState();
return 0;
}
+ bool Enabled() const { return bEnabled; }
+ void Disable() { bEnabled = false; }
+ void Enable() { bEnabled = true; }
};
#endif
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index eca99eb..566c139 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -43,6 +43,7 @@
#include "formulagroup.hxx"
#include "listenercontext.hxx"
#include "mtvcellfunc.hxx"
+#include "progress.hxx"
#include "scmatrix.hxx"
#include <rowheightcontext.hxx>
@@ -2306,10 +2307,23 @@ bool appendToBlock(
sc::formula_block::iterator itData, itDataEnd;
getBlockIterators<sc::formula_block>(it, nLenRemain, itData,
itDataEnd);
+ /* tdf#91416 setting progress in triggers a resize of the
window
+ and so ScTabView::DoResize and an InterpretVisible and
+ InterpretDirtyCells which resets the mpFormulaGroupCxt that
+ the current rCxt points to, which is bad, so disable
progress
+ during GetResult
+ */
+ ScProgress *pProgress = ScProgress::GetInterpretProgress();
+ bool bTempDisableProgress = pProgress && pProgress->Enabled();
+ if (bTempDisableProgress)
+ pProgress->Disable();
+
for (; itData != itDataEnd; ++itData, ++nPos)
{
ScFormulaCell& rFC = **itData;
+
sc::FormulaResultValue aRes = rFC.GetResult();
+
if (aRes.meType == sc::FormulaResultValue::Invalid ||
aRes.mnError)
{
if (aRes.mnError == ScErrorCodes::errCircularReference)
@@ -2332,6 +2346,9 @@ bool appendToBlock(
(*rColArray.mpNumArray)[nPos] = aRes.mfValue;
}
}
+
+ if (bTempDisableProgress)
+ pProgress->Enable();
}
break;
case sc::element_type_empty:
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 3e8e160..33499ba 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1931,8 +1931,12 @@ void ScFormulaCell::InterpretTail(
ScInterpretTailParameter eTailParam )
}
// Reschedule slows the whole thing down considerably, thus only
execute on percent change
- ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
- pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE
);
+ ScProgress *pProgress = ScProgress::GetInterpretProgress();
+ if (pProgress && pProgress->Enabled())
+ {
+ pProgress->SetStateCountDownOnPercent(
+
pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
+ }
switch (p->GetVolatileType())
{
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index ed5dcdc..e533986 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -70,8 +70,9 @@ static bool lcl_HasControllersLocked( SfxObjectShell& rObjSh )
return false;
}
-ScProgress::ScProgress( SfxObjectShell* pObjSh, const OUString& rText,
- sal_uLong nRange, bool bAllDocs, bool bWait )
+ScProgress::ScProgress(SfxObjectShell* pObjSh, const OUString& rText,
+ sal_uLong nRange, bool bAllDocs, bool bWait)
+ : bEnabled(true)
{
if ( pGlobalProgress || SfxProgress::GetActiveProgress( NULL ) )
@@ -114,9 +115,11 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const
OUString& rText,
}
}
-ScProgress::ScProgress() :
- pProgress( NULL )
-{ // DummyInterpret
+ScProgress::ScProgress()
+ : bEnabled(true)
+ , pProgress(NULL)
+{
+ // DummyInterpret
}
ScProgress::~ScProgress()
commit afe5672fbc87ae2bc7fb72fac4bb5b837b646dea
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed May 27 10:53:55 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: I27c24d3284a8e0678fc5c041426b4a7e71cbd363
diff --git a/svtools/source/uno/wizard/unowizard.cxx
b/svtools/source/uno/wizard/unowizard.cxx
index 7b9cade..8e2635a 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -97,7 +97,7 @@ namespace {
, public Wizard_PBase
{
public:
- Wizard( const uno::Reference< uno::XComponentContext >& i_rContext );
+ explicit Wizard( const uno::Reference< uno::XComponentContext >&
i_rContext );
// lang::XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw(uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index e6b07da..d61257c 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -348,7 +348,7 @@ namespace accessibility
class AccessibleTextHelper_OffsetChildIndex : public
::std::unary_function< ::accessibility::AccessibleEditableTextPara&, void >
{
public:
- AccessibleTextHelper_OffsetChildIndex( sal_Int32 nDifference ) :
mnDifference(nDifference) {}
+ explicit AccessibleTextHelper_OffsetChildIndex( sal_Int32 nDifference
) : mnDifference(nDifference) {}
void operator()( ::accessibility::AccessibleEditableTextPara& rPara )
{
rPara.SetIndexInParent( rPara.GetIndexInParent() + mnDifference );
@@ -848,7 +848,7 @@ namespace accessibility
::accessibility::AccessibleParaManager::WeakChild >
{
public:
- AccessibleTextHelper_UpdateChildBounds( AccessibleTextHelper_Impl&
rImpl ) : mrImpl(rImpl) {}
+ explicit AccessibleTextHelper_UpdateChildBounds(
AccessibleTextHelper_Impl& rImpl ) : mrImpl(rImpl) {}
::accessibility::AccessibleParaManager::WeakChild operator()( const
::accessibility::AccessibleParaManager::WeakChild& rChild )
{
// retrieve hard reference from weak one
@@ -902,7 +902,7 @@ namespace accessibility
class AccessibleTextHelper_LostChildEvent : public ::std::unary_function<
const ::accessibility::AccessibleParaManager::WeakChild&, void >
{
public:
- AccessibleTextHelper_LostChildEvent( AccessibleTextHelper_Impl& rImpl
) : mrImpl(rImpl) {}
+ explicit AccessibleTextHelper_LostChildEvent(
AccessibleTextHelper_Impl& rImpl ) : mrImpl(rImpl) {}
void operator()( const
::accessibility::AccessibleParaManager::WeakChild& rPara )
{
// retrieve hard reference from weak one
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index bb15fca..c705784 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -79,7 +79,7 @@ private:
virtual void execute() SAL_OVERRIDE;
public:
- ExternalToolEditThread(OUString const& rFileName)
+ explicit ExternalToolEditThread(OUString const& rFileName)
: ::salhelper::Thread("ExternalToolEdit")
, m_aFileName(rFileName)
{}
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index f3656a3..32d88f5 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -98,7 +98,7 @@ class ConstantValueExpression : public ExpressionNode
public:
- ConstantValueExpression( double rValue ) :
+ explicit ConstantValueExpression( double rValue ) :
maValue( rValue )
{
}
@@ -792,7 +792,7 @@ class DoubleConstantFunctor
ParserContextSharedPtr mxContext;
public:
- DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) :
+ explicit DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) :
mxContext( rContext )
{
}
@@ -918,7 +918,7 @@ class IfFunctor
public :
- IfFunctor( const ParserContextSharedPtr& rContext ) :
+ explicit IfFunctor( const ParserContextSharedPtr& rContext ) :
mxContext( rContext )
{
}
@@ -1006,7 +1006,7 @@ public:
@param rParserContext
Contains context info for the parser
*/
- ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) :
+ explicit ExpressionGrammar( const ParserContextSharedPtr& rParserContext )
:
mpParserContext( rParserContext )
{
}
@@ -1015,7 +1015,7 @@ public:
{
public:
// grammar definition
- definition( const ExpressionGrammar& self )
+ explicit definition( const ExpressionGrammar& self )
{
using ::boost::spirit::str_p;
using ::boost::spirit::range_p;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index b7b7217..f544be3 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -62,7 +62,7 @@ class ColorWindow : public Control
public:
- ColorWindow(vcl::Window* pParent)
+ explicit ColorWindow(vcl::Window* pParent)
: Control(pParent, WB_BORDER)
, aColor( COL_WHITE )
{
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index ee823a5..fa53b95 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -72,7 +72,7 @@ public:
SdrObjUserData ( IMapInventor,
SVD_IMAP_USERDATA, 0 ),
mpObj ( ) {}
- IMapUserData( const IMapObjectPtr& rIMapObj ) :
+ explicit IMapUserData( const IMapObjectPtr& rIMapObj ) :
SdrObjUserData ( IMapInventor,
SVD_IMAP_USERDATA, 0 ),
mpObj ( rIMapObj ) {}
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 4217958..cbca4a2 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -59,7 +59,7 @@ class RulerDebugWindow : public vcl::Window
{
ListBox aBox;
public:
- RulerDebugWindow(vcl::Window* pParent) :
+ explicit RulerDebugWindow(vcl::Window* pParent) :
Window(pParent,
WB_BORDER|WB_SIZEMOVE|WB_DIALOGCONTROL|WB_CLIPCHILDREN|WB_SYSTEMWINDOW),
aBox(this, WB_BORDER)
{
diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx
b/svx/source/engine3d/helperminimaldepth3d.cxx
index c5781ff..626c31e 100644
--- a/svx/source/engine3d/helperminimaldepth3d.cxx
+++ b/svx/source/engine3d/helperminimaldepth3d.cxx
@@ -46,7 +46,7 @@ namespace drawinglayer
virtual void processBasePrimitive3D(const
primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE;
public:
- MinimalDephInViewExtractor(const geometry::ViewInformation3D&
rViewInformation)
+ explicit MinimalDephInViewExtractor(const
geometry::ViewInformation3D& rViewInformation)
: BaseProcessor3D(rViewInformation),
mfMinimalDepth(DBL_MAX)
{}
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 2876b4d..a488e5e 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -59,7 +59,7 @@ class ImpRemap3DDepth
public:
ImpRemap3DDepth(sal_uInt32 nOrdNum, double fMinimalDepth);
- ImpRemap3DDepth(sal_uInt32 nOrdNum);
+ explicit ImpRemap3DDepth(sal_uInt32 nOrdNum);
~ImpRemap3DDepth();
// for ::std::sort
@@ -116,7 +116,7 @@ class Imp3DDepthRemapper
ImpRemap3DDepthVector maVector;
public:
- Imp3DDepthRemapper(E3dScene& rScene);
+ explicit Imp3DDepthRemapper(E3dScene& rScene);
~Imp3DDepthRemapper();
sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const;
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 7f4ce94..8551300 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -93,7 +93,7 @@ class Impl3DMirrorConstructOverlay
drawinglayer::primitive2d::Primitive2DSequence maFullOverlay;
public:
- Impl3DMirrorConstructOverlay(const E3dView& rView);
+ explicit Impl3DMirrorConstructOverlay(const E3dView& rView);
~Impl3DMirrorConstructOverlay();
void SetMirrorAxis(Point aMirrorAxisA, Point aMirrorAxisB);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index e78f3a8..5adf0c8 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -981,7 +981,7 @@ protected:
FmXGridPeer* m_pPeer;
public:
- GridListenerDelegator( FmXGridPeer* _pPeer );
+ explicit GridListenerDelegator( FmXGridPeer* _pPeer );
virtual ~GridListenerDelegator();
protected:
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 76920e1..04d4746 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -89,7 +89,7 @@ class RowSetEventListener : public
::cppu::WeakImplHelper1<XRowsChangeListener>
{
VclPtr<DbGridControl> m_pControl;
public:
- RowSetEventListener(DbGridControl* i_pControl) : m_pControl(i_pControl)
+ explicit RowSetEventListener(DbGridControl* i_pControl) :
m_pControl(i_pControl)
{
}
@@ -256,7 +256,7 @@ class FmXGridSourcePropListener : public
::comphelper::OPropertyChangeListener
sal_Int16 m_nSuspended;
public:
- FmXGridSourcePropListener(DbGridControl* _pParent);
+ explicit FmXGridSourcePropListener(DbGridControl* _pParent);
void suspend() { ++m_nSuspended; }
void resume() { --m_nSuspended; }
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index ca3acd9..6ec5068 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -119,9 +119,9 @@ namespace svxform
Reference< css::xml::dom::XNode > m_xNode;
Reference< XPropertySet > m_xPropSet;
- ItemNode( const Reference< css::xml::dom::XNode >& _rxNode ) :
+ explicit ItemNode( const Reference< css::xml::dom::XNode >& _rxNode ) :
m_xNode( _rxNode ) {}
- ItemNode( const Reference< XPropertySet >& _rxSet ) :
+ explicit ItemNode( const Reference< XPropertySet >& _rxSet ) :
m_xPropSet( _rxSet ) {}
};
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 0ac78df..792efa8 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -231,7 +231,7 @@ class FmFilterHint : public SfxHint
FmFilterData* m_pData;
public:
- FmFilterHint(FmFilterData* pData):m_pData(pData){}
+ explicit FmFilterHint(FmFilterData* pData):m_pData(pData){}
FmFilterData* GetData() const { return m_pData; }
};
@@ -252,7 +252,7 @@ public:
class FmFilterRemovedHint : public FmFilterHint
{
public:
- FmFilterRemovedHint(FmFilterData* pData)
+ explicit FmFilterRemovedHint(FmFilterData* pData)
:FmFilterHint(pData){}
};
@@ -260,7 +260,7 @@ public:
class FmFilterTextChangedHint : public FmFilterHint
{
public:
- FmFilterTextChangedHint(FmFilterData* pData)
+ explicit FmFilterTextChangedHint(FmFilterData* pData)
:FmFilterHint(pData){}
};
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 463ad07..1956e27 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -127,7 +127,7 @@ namespace
class FormComponentAssignment
{
public:
- FormComponentAssignment( MapControlModels& _out_controlModelMap )
+ explicit FormComponentAssignment( MapControlModels&
_out_controlModelMap )
:m_rControlModelMap( _out_controlModelMap )
{
}
diff --git a/svx/source/form/fmscriptingenv.cxx
b/svx/source/form/fmscriptingenv.cxx
index a0d81a5..07cbcb0 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -87,7 +87,7 @@ namespace svxform
FormScriptingEnvironment *m_pScriptExecutor;
public:
- FormScriptListener( FormScriptingEnvironment * pScriptExecutor );
+ explicit FormScriptListener( FormScriptingEnvironment *
pScriptExecutor );
// XScriptListener
virtual void SAL_CALL firing( const ScriptEvent& aEvent ) throw
(RuntimeException, std::exception) SAL_OVERRIDE;
@@ -152,7 +152,7 @@ namespace svxform
bool m_bDisposed;
public:
- FormScriptingEnvironment( FmFormModel& _rModel );
+ explicit FormScriptingEnvironment( FmFormModel& _rModel );
virtual ~FormScriptingEnvironment();
// callback for FormScriptListener
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d208c14..592f1e8 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2743,7 +2743,7 @@ private:
bool m_bEnabled;
public:
- SuspendPropertyTracking( FmXFormShell& _rShell )
+ explicit SuspendPropertyTracking( FmXFormShell& _rShell )
:m_rShell( _rShell )
,m_bEnabled( false )
{
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index cbd32ba..0b32ca0 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -79,7 +79,7 @@ typedef cppu::WeakImplHelper1< XScriptListener >
ScriptEventListener_BASE;
class ScriptEventListenerWrapper : public ScriptEventListener_BASE
{
public:
- ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException
)
+ explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw (
RuntimeException )
:m_rModel( _rModel )
,m_attemptedListenerCreation( false )
{
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8044e8b..5558b92 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -159,12 +159,10 @@ class FmXFormView::ObjectRemoveListener : public
SfxListener
{
FmXFormView* m_pParent;
public:
- ObjectRemoveListener( FmXFormView* pParent );
+ explicit ObjectRemoveListener( FmXFormView* pParent );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SAL_OVERRIDE;
};
-
-
FormViewPageWindowAdapter::FormViewPageWindowAdapter( const
css::uno::Reference<css::uno::XComponentContext>& _rContext, const
SdrPageWindow& _rWindow, FmXFormView* _pViewImpl )
: m_xControlContainer( _rWindow.GetControlContainer() ),
m_xContext( _rContext ),
diff --git a/svx/source/form/formcontrolfactory.cxx
b/svx/source/form/formcontrolfactory.cxx
index 9aae5de..3af8a0f 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -99,7 +99,7 @@ namespace svxform
{
Reference<XComponentContext> m_xContext;
- FormControlFactory_Data( const Reference<XComponentContext>& _rContext
)
+ explicit FormControlFactory_Data( const Reference<XComponentContext>&
_rContext )
:m_xContext( _rContext )
{
}
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index 861c33f..9e5bef9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -247,7 +247,7 @@ struct ColumnInfo
class ColumnInfoCache
{
public:
- ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSupplier );
+ explicit ColumnInfoCache( const Reference< XColumnsSupplier >&
_rxColSupplier );
size_t getColumnCount() const { return m_aColumns.size(); }
const ColumnInfo& getColumnInfo( size_t _pos );
@@ -717,7 +717,7 @@ namespace
struct RemoveComponentTextListener : public ::std::unary_function<
Reference< XTextComponent >, void >
{
- RemoveComponentTextListener( const Reference< XTextListener >&
_rxListener )
+ explicit RemoveComponentTextListener( const Reference< XTextListener
>& _rxListener )
:m_xListener( _rxListener )
{
}
diff --git a/svx/source/form/formcontrolling.cxx
b/svx/source/form/formcontrolling.cxx
index e2ef294..db5d2be 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -124,7 +124,7 @@ namespace svx
struct MatchFeatureDescriptionByURL : public ::std::unary_function<
FeatureDescription, bool >
{
const OUString& m_rURL;
- MatchFeatureDescriptionByURL( const OUString& _rURL ) :m_rURL(
_rURL ) { }
+ explicit MatchFeatureDescriptionByURL( const OUString& _rURL )
:m_rURL( _rURL ) { }
bool operator()( const FeatureDescription& _compare )
{
@@ -136,7 +136,7 @@ namespace svx
struct MatchFeatureDescriptionBySlotId : public ::std::unary_function<
FeatureDescription, bool >
{
sal_Int32 m_nSlotId;
- MatchFeatureDescriptionBySlotId( sal_Int32 _nSlotId ) :m_nSlotId(
_nSlotId ) { }
+ explicit MatchFeatureDescriptionBySlotId( sal_Int32 _nSlotId )
:m_nSlotId( _nSlotId ) { }
bool operator()( const FeatureDescription& _compare )
{
@@ -148,7 +148,7 @@ namespace svx
struct MatchFeatureDescriptionByFormFeature : public
::std::unary_function< FeatureDescription, bool >
{
sal_Int32 m_nFormFeature;
- MatchFeatureDescriptionByFormFeature( sal_Int32 _nFormFeature )
:m_nFormFeature( _nFormFeature ) { }
+ explicit MatchFeatureDescriptionByFormFeature( sal_Int32
_nFormFeature ) :m_nFormFeature( _nFormFeature ) { }
bool operator()( const FeatureDescription& _compare )
{
diff --git a/svx/source/form/legacyformcontroller.cxx
b/svx/source/form/legacyformcontroller.cxx
index 010fd70..2edb900 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -76,7 +76,7 @@ namespace svxform
}
protected:
- LegacyFormController( const Reference< XComponentContext >& _rxContext
)
+ explicit LegacyFormController( const Reference< XComponentContext >&
_rxContext )
:m_xDelegator( FormController::create(_rxContext) )
{
}
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 2c7bf58..efde247 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -31,8 +31,8 @@ private:
SvStream& rStm;
public:
- GalleryCodec( SvStream& rIOStm );
- ~GalleryCodec();
+ explicit GalleryCodec( SvStream& rIOStm );
+ ~GalleryCodec();
void Write( SvStream& rStmToWrite );
void Read( SvStream& rStmToRead );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index c1d49fe..76dc9d2c 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -99,7 +99,7 @@ struct CommandInfo
css::util::URL URL;
css::uno::Reference< css::frame::XDispatch > Dispatch;
- CommandInfo( const OUString &rURL )
+ explicit CommandInfo( const OUString &rURL )
{
URL.Complete = rURL;
}
diff --git a/svx/source/sidebar/EmptyPanel.hxx
b/svx/source/sidebar/EmptyPanel.hxx
index e85edba..9a0054a 100644
--- a/svx/source/sidebar/EmptyPanel.hxx
+++ b/svx/source/sidebar/EmptyPanel.hxx
@@ -34,7 +34,7 @@ class EmptyPanel
: public Control
{
public:
- EmptyPanel (vcl::Window* pParent);
+ explicit EmptyPanel (vcl::Window* pParent);
virtual ~EmptyPanel();
virtual void dispose() SAL_OVERRIDE;
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index 20e605a..b3d04e5 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -29,7 +29,7 @@ namespace svx {
class ParaLineSpacingControl : public SfxPopupWindow
{
public:
- ParaLineSpacingControl(sal_uInt16 nId);
+ explicit ParaLineSpacingControl(sal_uInt16 nId);
virtual ~ParaLineSpacingControl();
virtual void dispose() SAL_OVERRIDE;
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index d4acca7..951317c 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -94,7 +94,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl,
SvxSizeItem);
class FunctionPopup_Impl : public PopupMenu
{
public:
- FunctionPopup_Impl( sal_uInt16 nCheck );
+ explicit FunctionPopup_Impl( sal_uInt16 nCheck );
sal_uInt16 GetSelected() const { return nSelected; }
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 9fe589a..5ddf609 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -35,7 +35,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl,
SfxUInt16Item);
class SelectionTypePopup : public PopupMenu
{
public:
- SelectionTypePopup( sal_uInt16 nCurrent );
+ explicit SelectionTypePopup( sal_uInt16 nCurrent );
};
/// Item id's cannot start from 0, so we need to convert
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index e9daf6f..059413e 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -35,7 +35,7 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SdrDragMovHdl(SdrDragView& rNewView);
+ explicit SdrDragMovHdl(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
@@ -56,7 +56,7 @@ private:
public:
TYPEINFO_OVERRIDE();
- SdrDragRotate(SdrDragView& rNewView);
+ explicit SdrDragRotate(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
@@ -106,7 +106,7 @@ private:
public:
TYPEINFO_OVERRIDE();
- SdrDragMirror(SdrDragView& rNewView);
+ explicit SdrDragMirror(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
@@ -178,7 +178,7 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SdrDragCrook(SdrDragView& rNewView);
+ explicit SdrDragCrook(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
@@ -209,7 +209,7 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SdrDragDistort(SdrDragView& rNewView);
+ explicit SdrDragDistort(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
@@ -227,7 +227,7 @@ class SdrDragCrop : public SdrDragObjOwn
{
public:
TYPEINFO_OVERRIDE();
- SdrDragCrop(SdrDragView& rNewView);
+ explicit SdrDragCrop(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index c007892..75575da 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -89,7 +89,7 @@ class SdrHdlBitmapSet
BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle&
rRectangle);
public:
- SdrHdlBitmapSet(sal_uInt16 nResId);
+ explicit SdrHdlBitmapSet(sal_uInt16 nResId);
~SdrHdlBitmapSet();
const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16
nInd=0);
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 2fa62cc..1fe09ee 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -111,7 +111,7 @@ class SdrGraphicLink : public sfx2::SvBaseLink
SdrGraphicUpdater* pGraphicUpdater;
public:
- SdrGraphicLink(SdrGrafObj& rObj);
+ explicit SdrGraphicLink(SdrGrafObj& rObj);
virtual ~SdrGraphicLink();
virtual void Closed() SAL_OVERRIDE;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 403646b..e567960 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -118,7 +118,7 @@ class SdrLightEmbeddedClient_Impl : public
::cppu::WeakImplHelper5
public:
- SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj );
+ explicit SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj );
void Release();
void SetSizeScale( const Fraction& aScaleWidth, const Fraction&
aScaleHeight )
@@ -595,7 +595,7 @@ class SdrEmbedObjectLink : public sfx2::SvBaseLink
SdrOle2Obj* pObj;
public:
- SdrEmbedObjectLink(SdrOle2Obj* pObj);
+ explicit SdrEmbedObjectLink(SdrOle2Obj* pObj);
virtual ~SdrEmbedObjectLink();
virtual void Closed() SAL_OVERRIDE;
@@ -692,7 +692,7 @@ public:
SvxUnoShapeModifyListener* mpModifyListener;
- SdrOle2ObjImpl( bool bFrame ) :
+ explicit SdrOle2ObjImpl( bool bFrame ) :
mpGraphic(NULL),
mpGraphicObject(NULL),
pLightClient (NULL),
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index b570e7f..e84014b 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -510,7 +510,7 @@ class ImpPathForDragAndCreate
bool mbCreating;
public:
- ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject);
+ explicit ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject);
~ImpPathForDragAndCreate();
// drag stuff
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 71b4f7e..f10dc92 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -106,7 +106,7 @@ namespace
void impHandleDrawBulletInfo(const DrawBulletInfo& rInfo);
public:
- impTextBreakupHandler(SdrOutliner& rOutliner)
+ explicit impTextBreakupHandler(SdrOutliner& rOutliner)
: maTextPortionPrimitives(),
maLinePrimitives(),
maParagraphPrimitives(),
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx
b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 252d39a..a96a714 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -83,7 +83,7 @@ namespace
bool mbRTL : 1;
public:
- impPathTextPortion(DrawPortionInfo& rInfo)
+ explicit impPathTextPortion(DrawPortionInfo& rInfo)
: maOffset(rInfo.mrStartPos.X(), rInfo.mrStartPos.Y()),
maText(rInfo.maText),
mnTextStart(rInfo.mnTextStart),
@@ -174,7 +174,7 @@ namespace
DECL_LINK(decompositionPathTextPrimitive, DrawPortionInfo* );
public:
- impTextBreakupHandler(SdrOutliner& rOutliner)
+ explicit impTextBreakupHandler(SdrOutliner& rOutliner)
: mrOutliner(rOutliner)
{
}
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index c0913d2..350ffa4 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -40,7 +40,7 @@ class ImpSdrObjTextLink: public ::sfx2::SvBaseLink
SdrTextObj* pSdrObj;
public:
- ImpSdrObjTextLink( SdrTextObj* pObj1 )
+ explicit ImpSdrObjTextLink( SdrTextObj* pObj1 )
: ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL,
SotClipboardFormatId::SIMPLE_FILE ),
pSdrObj( pObj1 )
{}
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index aac9a6d..744fcde 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -71,7 +71,7 @@ protected:
SdrUnoObj* pObj;
public:
- SdrControlEventListenerImpl(SdrUnoObj* _pObj)
+ explicit SdrControlEventListenerImpl(SdrUnoObj* _pObj)
: pObj(_pObj)
{}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 7d2d701..648a675 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -63,7 +63,7 @@ class SdrObjList::WeakSdrObjectContainerType
: public ::std::vector<SdrObjectWeakRef>
{
public:
- WeakSdrObjectContainerType (const sal_Int32 nInitialSize)
+ explicit WeakSdrObjectContainerType (const sal_Int32 nInitialSize)
: ::std::vector<SdrObjectWeakRef>(nInitialSize) {};
};
diff --git a/svx/source/table/accessibletableshape.cxx
b/svx/source/table/accessibletableshape.cxx
index a0841f0..8524cf6 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -64,7 +64,7 @@ typedef std::unordered_map< Reference< XCell >,
rtl::Reference< AccessibleCell >
class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener
>
{
public:
- AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo );
+ explicit AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo
);
void init( const Reference< XAccessible>& xAccessible, const Reference<
XTable >& xTable );
void dispose();
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 001212b..a3605b2 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -39,7 +39,7 @@ typedef std::unordered_map< OUString, ::sal_uInt32,
OUStringHash, std::equal_to<
class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1<
::com::sun::star::beans::XPropertySetInfo >
{
public:
- FastPropertySetInfo( const PropertyVector& rProps );
+ explicit FastPropertySetInfo( const PropertyVector& rProps );
virtual ~FastPropertySetInfo();
void addProperties( const PropertyVector& rProps );
@@ -62,7 +62,7 @@ private:
class FastPropertySet : public ::cppu::WeakAggImplHelper3<
::com::sun::star::beans::XPropertySet,
::com::sun::star::beans::XMultiPropertySet,
::com::sun::star::beans::XFastPropertySet >
{
public:
- FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo );
+ explicit FastPropertySet( const rtl::Reference< FastPropertySetInfo >&
xInfo );
virtual ~FastPropertySet();
// XPropertySet
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index a308c34..a3235a2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -89,7 +89,7 @@ protected:
public:
// basic constructor
- TableProperties(SdrObject& rObj );
+ explicit TableProperties(SdrObject& rObj );
// constructor for copying, but using new object
TableProperties(const TableProperties& rProps, SdrObject& rObj );
diff --git a/svx/source/table/tablecolumns.hxx
b/svx/source/table/tablecolumns.hxx
index e940cb6..093c207 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -32,7 +32,7 @@ namespace sdr { namespace table {
class TableColumns : public ::cppu::WeakAggImplHelper1<
::com::sun::star::table::XTableColumns >
{
public:
- TableColumns( const TableModelRef& xTableModel );
+ explicit TableColumns( const TableModelRef& xTableModel );
virtual ~TableColumns();
void dispose();
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 38a41b5..6efe833 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -86,7 +86,7 @@ namespace sdr { namespace table {
class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper1<
::com::sun::star::util::XModifyListener >
{
public:
- SvxTableControllerModifyListener( SvxTableController* pController )
+ explicit SvxTableControllerModifyListener( SvxTableController* pController
)
: mpController( pController ) {}
// XModifyListener
diff --git a/svx/source/table/tablelayouter.hxx
b/svx/source/table/tablelayouter.hxx
index 642128b..6db1486 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -57,7 +57,7 @@ typedef std::vector< BorderLineVector > BorderLineMap;
class TableLayouter
{
public:
- TableLayouter( const TableModelRef& xTableModel );
+ explicit TableLayouter( const TableModelRef& xTableModel );
virtual ~TableLayouter();
/** try to fit the table into the given rectangle.
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 8ad480e..757711c 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -69,7 +69,7 @@ class TableModel : public ::comphelper::OBaseMutex,
friend class TableModelNotifyGuard;
public:
- TableModel( SdrTableObj* pTableObj );
+ explicit TableModel( SdrTableObj* pTableObj );
TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTable );
virtual ~TableModel();
@@ -183,14 +183,14 @@ private:
class TableModelNotifyGuard
{
public:
- TableModelNotifyGuard( TableModel* pModel )
+ explicit TableModelNotifyGuard( TableModel* pModel )
: mxBroadcaster( static_cast< ::com::sun::star::util::XBroadcaster* >(
pModel ) )
{
if( mxBroadcaster.is() )
mxBroadcaster->lockBroadcasts();
}
- TableModelNotifyGuard( ::com::sun::star::uno::XInterface* pInterface )
+ explicit TableModelNotifyGuard( ::com::sun::star::uno::XInterface*
pInterface )
: mxBroadcaster( pInterface, ::com::sun::star::uno::UNO_QUERY )
{
if( mxBroadcaster.is() )
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index bf681a5..6a8b887 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -32,7 +32,7 @@ namespace sdr { namespace table {
class TableRows : public ::cppu::WeakAggImplHelper1<
::com::sun::star::table::XTableRows >
{
public:
- TableRows( const TableModelRef& xTableModel );
+ explicit TableRows( const TableModelRef& xTableModel );
virtual ~TableRows();
void dispose();
diff --git a/svx/source/table/tablertfimporter.cxx
b/svx/source/table/tablertfimporter.cxx
index e0c8340..6f5655f 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -55,7 +55,7 @@ struct RTFCellDefault
sal_uInt16 mnTwips; // right border of the cell
sal_Int32 mnColSpan; // MergeCell if >1, merged cells if 0
- RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0),
mnTwips(0 ), mnColSpan(1) {}
+ explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ),
mnCol(0), mnTwips(0 ), mnColSpan(1) {}
};
typedef std::vector< boost::shared_ptr< RTFCellDefault > >
RTFCellDefaultVector;
@@ -67,7 +67,7 @@ struct RTFCellInfo
sal_Int32 mnParaCount;
sal_Int32 mnColSpan;
- RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0),
mnParaCount(0), mnColSpan(0) {}
+ explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ),
mnStartPara(0), mnParaCount(0), mnColSpan(0) {}
};
typedef boost::shared_ptr< RTFCellInfo > RTFCellInfoPtr;
@@ -80,7 +80,7 @@ typedef std::vector< RTFColumnVectorPtr > RTFRowVector;
class SdrTableRTFParser
{
public:
- SdrTableRTFParser( SdrTableObj& rTableObj );
+ explicit SdrTableRTFParser( SdrTableObj& rTableObj );
~SdrTableRTFParser();
void Read( SvStream& rStream );
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index c9747cb..630068e 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -170,7 +170,7 @@ private:
class TableColumnUndo : public SdrUndoAction
{
public:
- TableColumnUndo( const TableColumnRef& xCol );
+ explicit TableColumnUndo( const TableColumnRef& xCol );
virtual ~TableColumnUndo();
virtual void Undo() SAL_OVERRIDE;
@@ -202,7 +202,7 @@ private:
class TableRowUndo : public SdrUndoAction
{
public:
- TableRowUndo( const TableRowRef& xRow );
+ explicit TableRowUndo( const TableRowRef& xRow );
virtual ~TableRowUndo();
virtual void Undo() SAL_OVERRIDE;
@@ -230,12 +230,10 @@ private:
bool mbHasRedoData;
};
-
-
class TableStyleUndo : public SdrUndoAction
{
public:
- TableStyleUndo( const SdrTableObj& rTableObj );
+ explicit TableStyleUndo( const SdrTableObj& rTableObj );
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
diff --git a/svx/source/table/viewcontactoftableobj.hxx
b/svx/source/table/viewcontactoftableobj.hxx
index 737fc11..8754454 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -42,7 +42,7 @@ namespace sdr
public:
// basic constructor, used from SdrObject.
- ViewContactOfTableObj(sdr::table::SdrTableObj& rTextObj);
+ explicit ViewContactOfTableObj(sdr::table::SdrTableObj& rTextObj);
virtual ~ViewContactOfTableObj();
};
} // end of namespace contact
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx
b/svx/source/tbxctrls/bulletsnumbering.cxx
index 022bf9bb..894c67a 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -59,7 +59,7 @@ class NumberingToolBoxControl : public
svt::PopupWindowController
bool mbBulletItem;
public:
- NumberingToolBoxControl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
+ explicit NumberingToolBoxControl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
bool IsInImpressDraw();
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 54f7260..dbd7f2f 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -44,7 +44,6 @@ using namespace com::sun::star;
// - SvxColorValueSetData -
-
class SvxColorValueSetData : public TransferableHelper
{
private:
@@ -59,19 +58,15 @@ protected:
public:
- SvxColorValueSetData( const XFillAttrSetItem&
rSetItem ) :
- maData( rSetItem ) {}
+ explicit SvxColorValueSetData( const XFillAttrSetItem& rSetItem ) :
+ maData( rSetItem ) {}
};
-
-
void SvxColorValueSetData::AddSupportedFormats()
{
AddFormat( SotClipboardFormatId::XFA );
}
-
-
bool SvxColorValueSetData::GetData( const css::datatransfer::DataFlavor&
rFlavor, const OUString& /*rDestDoc*/ )
{
bool bRet = false;
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx
b/svx/source/tbxctrls/extrusioncontrols.hxx
index d94de53..c4c4322 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -71,7 +71,7 @@ private:
class ExtrusionDirectionControl : public svt::PopupWindowController
{
public:
- ExtrusionDirectionControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
+ explicit ExtrusionDirectionControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
@@ -118,7 +118,7 @@ public:
class ExtrusionDepthController : public svt::PopupWindowController
{
public:
- ExtrusionDepthController( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
+ explicit ExtrusionDepthController( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
@@ -175,7 +175,7 @@ public:
class ExtrusionLightingControl : public svt::PopupWindowController
{
public:
- ExtrusionLightingControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
+ explicit ExtrusionLightingControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
@@ -219,7 +219,7 @@ public:
class ExtrusionSurfaceControl : public svt::PopupWindowController
{
public:
- ExtrusionSurfaceControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
+ explicit ExtrusionSurfaceControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index 2cd3fa3..e7672fd 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -394,7 +394,7 @@ IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl)
class FontworkAlignmentControl : public svt::PopupWindowController
{
public:
- FontworkAlignmentControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
+ explicit FontworkAlignmentControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
@@ -634,7 +634,7 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl)
class FontworkCharacterSpacingControl : public svt::PopupWindowController
{
public:
- FontworkCharacterSpacingControl( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
+ explicit FontworkCharacterSpacingControl( const
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&
rxContext );
virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx
b/svx/source/tbxctrls/tbunocontroller.cxx
index eb25ce9..09a6cbf 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -47,7 +47,7 @@ class FontHeightToolBoxControl : public
svt::ToolboxController,
public lang::XServiceInfo
{
public:
- FontHeightToolBoxControl(
+ explicit FontHeightToolBoxControl(
const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rServiceManager );
virtual ~FontHeightToolBoxControl();
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 50498b4..5e7f829 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -113,7 +113,7 @@ private:
class ChineseDictionaryDialog : public ModalDialog
{
public:
- ChineseDictionaryDialog( vcl::Window* pParent );
+ explicit ChineseDictionaryDialog( vcl::Window* pParent );
virtual ~ChineseDictionaryDialog();
virtual void dispose() SAL_OVERRIDE;
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 9c39681..95a3a32 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -71,7 +71,7 @@ class ChineseTranslation_UnoDialog : public
::cppu::WeakImplHelper5 <
// ,public ::com::sun::star::lang::XTypeProvider
// implemented by WeakImplHelper
{
public:
- ChineseTranslation_UnoDialog( const ::com::sun::star::uno::Reference<
+ explicit ChineseTranslation_UnoDialog( const
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xContext );
virtual ~ChineseTranslation_UnoDialog();
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 0ec0bf3..cb07155 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -37,7 +37,7 @@ class ChineseDictionaryDialog;
class ChineseTranslationDialog : public ModalDialog
{
public:
- ChineseTranslationDialog( vcl::Window* pParent );
+ explicit ChineseTranslationDialog( vcl::Window* pParent );
virtual ~ChineseTranslationDialog();
virtual void dispose() SAL_OVERRIDE;
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 166b989..449e34c 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -114,7 +114,7 @@ namespace {
Fraction maScaleX;
Fraction maScaleY;
- ExportSettings( SdrModel* pDoc );
+ explicit ExportSettings( SdrModel* pDoc );
};
ExportSettings::ExportSettings( SdrModel* pDoc )
@@ -284,7 +284,7 @@ namespace {
class ImplExportCheckVisisbilityRedirector : public
sdr::contact::ViewObjectContactRedirector
{
public:
- ImplExportCheckVisisbilityRedirector( SdrPage* pCurrentPage );
+ explicit ImplExportCheckVisisbilityRedirector( SdrPage* pCurrentPage );
virtual ~ImplExportCheckVisisbilityRedirector();
virtual drawinglayer::primitive2d::Primitive2DSequence
createRedirectedPrimitive2DSequence(
diff --git a/svx/source/unodraw/XPropertyTable.cxx
b/svx/source/unodraw/XPropertyTable.cxx
index c689c7f..aac26c4 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -246,7 +246,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( )
class SvxUnoXColorTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXColorTable( XPropertyList* pList ) throw() : SvxUnoXPropertyTable(
XATTR_LINECOLOR, pList ) {};
+ explicit SvxUnoXColorTable( XPropertyList* pList ) throw() :
SvxUnoXPropertyTable( XATTR_LINECOLOR, pList ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw()
SAL_OVERRIDE;
@@ -308,7 +308,7 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoXColorTable::getSupportedServiceNames(
class SvxUnoXLineEndTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXLineEndTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_LINEEND, pTable ) {};
+ explicit SvxUnoXLineEndTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_LINEEND, pTable ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw()
SAL_OVERRIDE;
@@ -381,7 +381,7 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoXLineEndTable::getSupportedServiceName
class SvxUnoXDashTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXDashTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable(
XATTR_LINEDASH, pTable ) {};
+ explicit SvxUnoXDashTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_LINEDASH, pTable ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw()
SAL_OVERRIDE;
@@ -462,7 +462,7 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoXDashTable::getSupportedServiceNames(
class SvxUnoXHatchTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXHatchTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable(
XATTR_FILLHATCH, pTable ) {};
+ explicit SvxUnoXHatchTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_FILLHATCH, pTable ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw()
SAL_OVERRIDE;
@@ -538,7 +538,7 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoXHatchTable::getSupportedServiceNames(
class SvxUnoXGradientTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXGradientTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_FILLGRADIENT, pTable ) {};
+ explicit SvxUnoXGradientTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_FILLGRADIENT, pTable ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw()
SAL_OVERRIDE;
@@ -626,7 +626,7 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoXGradientTable::getSupportedServiceNam
class SvxUnoXBitmapTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXBitmapTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {};
+ explicit SvxUnoXBitmapTable( XPropertyList* pTable ) throw() :
SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const
throw(uno::RuntimeException) SAL_OVERRIDE;
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index 08108b2..f2c156b 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -41,7 +41,7 @@ private:
SdrObjectWeakRef mpObject;
public:
- SvxUnoGluePointAccess( SdrObject* pObject ) throw();
+ explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw();
virtual ~SvxUnoGluePointAccess() throw();
// XIdentifierContainer
diff --git a/svx/source/unodraw/recoveryui.cxx
b/svx/source/unodraw/recoveryui.cxx
index ba9b5c8..b7a702c 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -81,7 +81,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2<
css::lang::XServiceInfo
/** @short TODO */
- RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >&
xContext);
+ explicit RecoveryUI(const css::uno::Reference<
css::uno::XComponentContext >& xContext);
/** @short TODO */
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index 4477b85..ba97c9f 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -23,7 +23,7 @@
class SvxShapeCaption : public SvxShapeText
{
public:
- SvxShapeCaption( SdrObject* pObj ) throw();
+ explicit SvxShapeCaption( SdrObject* pObj ) throw();
virtual ~SvxShapeCaption() throw();
};
class SvxPluginShape : public SvxOle2Shape
@@ -34,7 +34,7 @@ protected:
virtual bool getPropertyValueImpl( const OUString& rName, const
SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- SvxPluginShape( SdrObject* pObj ) throw();
+ explicit SvxPluginShape( SdrObject* pObj ) throw();
virtual ~SvxPluginShape() throw();
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -52,7 +52,7 @@ protected:
virtual bool getPropertyValueImpl( const OUString& rName, const
SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- SvxAppletShape( SdrObject* pObj ) throw();
+ explicit SvxAppletShape( SdrObject* pObj ) throw();
virtual ~SvxAppletShape() throw();
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -75,7 +75,7 @@ protected:
std::exception) SAL_OVERRIDE;
public:
- SvxFrameShape( SdrObject* pObj ) throw();
+ explicit SvxFrameShape( SdrObject* pObj ) throw();
virtual ~SvxFrameShape() throw();
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -101,7 +101,7 @@ protected:
public:
- SvxTableShape( SdrObject* pObj ) throw();
+ explicit SvxTableShape( SdrObject* pObj ) throw();
virtual ~SvxTableShape() throw();
};
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 038f6d2..32bed87 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -38,7 +38,7 @@ using namespace ::cppu;
class SvxUnoBitmapTable : public SvxUnoNameItemTable
{
public:
- SvxUnoBitmapTable( SdrModel* pModel ) throw();
+ explicit SvxUnoBitmapTable( SdrModel* pModel ) throw();
virtual ~SvxUnoBitmapTable() throw();
virtual NameOrIndex* createItem() const throw() SAL_OVERRIDE;
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 875aac4..907f409 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -36,7 +36,7 @@ using namespace ::cppu;
class SvxUnoDashTable : public SvxUnoNameItemTable
{
public:
- SvxUnoDashTable( SdrModel* pModel ) throw();
+ explicit SvxUnoDashTable( SdrModel* pModel ) throw();
virtual ~SvxUnoDashTable() throw();
virtual NameOrIndex* createItem() const throw() SAL_OVERRIDE;
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 58e8ff6..6ccdda8 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -35,7 +35,7 @@ using namespace ::cppu;
class SvxUnoGradientTable : public SvxUnoNameItemTable
{
public:
- SvxUnoGradientTable( SdrModel* pModel ) throw();
+ explicit SvxUnoGradientTable( SdrModel* pModel ) throw();
virtual ~SvxUnoGradientTable() throw();
virtual NameOrIndex* createItem() const throw() SAL_OVERRIDE;
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 545397c..738dfe8 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -35,7 +35,7 @@ using namespace ::cppu;
class SvxUnoHatchTable : public SvxUnoNameItemTable
{
public:
- SvxUnoHatchTable( SdrModel* pModel ) throw();
+ explicit SvxUnoHatchTable( SdrModel* pModel ) throw();
virtual ~SvxUnoHatchTable() throw();
virtual NameOrIndex* createItem() const throw() SAL_OVERRIDE;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 05b9384..661ffa4 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -72,7 +72,7 @@ private:
SvxUnoDrawingModel& mrModel;
public:
- SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw();
+ explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw();
virtual ~SvxUnoDrawPagesAccess() throw();
// XDrawPages
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index a0d9e57..0547551 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -59,7 +59,7 @@ private:
ItemPoolVector maItemSetVector;
public:
- SvxUnoMarkerTable( SdrModel* pModel ) throw();
+ explicit SvxUnoMarkerTable( SdrModel* pModel ) throw();
virtual ~SvxUnoMarkerTable() throw();
void dispose();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5a376d3..c24737d 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -144,7 +144,7 @@ struct SvxShapeImpl
class ShapePositionProvider : public PropertyValueProvider
{
public:
- ShapePositionProvider( const SvxShapeImpl& _shapeImpl )
+ explicit ShapePositionProvider( const SvxShapeImpl& _shapeImpl )
:PropertyValueProvider( _shapeImpl.mrAntiImpl, "Position" )
{
}
@@ -160,7 +160,7 @@ protected:
class ShapeSizeProvider : public PropertyValueProvider
{
public:
- ShapeSizeProvider( const SvxShapeImpl& _shapeImpl )
+ explicit ShapeSizeProvider( const SvxShapeImpl& _shapeImpl )
:PropertyValueProvider( _shapeImpl.mrAntiImpl, "Size" )
{
}
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 725f2e8..766dac4 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -35,7 +35,7 @@ using namespace ::cppu;
class SvxUnoTransGradientTable : public SvxUnoNameItemTable
{
public:
- SvxUnoTransGradientTable( SdrModel* pModel ) throw();
+ explicit SvxUnoTransGradientTable( SdrModel* pModel ) throw();
virtual ~SvxUnoTransGradientTable() throw();
virtual NameOrIndex* createItem() const throw() SAL_OVERRIDE;
diff --git a/svx/source/unogallery/unogalitem.hxx
b/svx/source/unogallery/unogalitem.hxx
index 9b57daf..e579e0e 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -107,7 +107,7 @@ class GalleryDrawingModel : public SvxUnoDrawingModel
{
public:
- GalleryDrawingModel( SdrModel* pDoc ) throw();
+ explicit GalleryDrawingModel( SdrModel* pDoc ) throw();
virtual ~GalleryDrawingModel() throw();
UNO3_GETIMPLEMENTATION_DECL( GalleryDrawingModel )
diff --git a/svx/source/unogallery/unogaltheme.hxx
b/svx/source/unogallery/unogaltheme.hxx
index 88d8afd..f09222c 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -47,7 +47,7 @@ class GalleryTheme : public ::cppu::WeakImplHelper2<
public:
- GalleryTheme( const OUString& rThemeName );
+ explicit GalleryTheme( const OUString& rThemeName );
virtual ~GalleryTheme();
static OUString getImplementationName_Static() throw();
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index dba2a91..0088c79 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -90,7 +90,7 @@ private:
public:
- SvXMLGraphicInputStream( const OUString&
rGraphicId );
+ explicit SvXMLGraphicInputStream( const OUString&
rGraphicId );
virtual ~SvXMLGraphicInputStream();
bool Exists() const { return mxStmWrapper.is();
}
@@ -914,7 +914,7 @@ class SvXMLGraphicImportExportHelper :
public impl::SvXMLGraphicImportExportHelper_Base
{
public:
- SvXMLGraphicImportExportHelper( SvXMLGraphicHelperMode eMode );
+ explicit SvXMLGraphicImportExportHelper( SvXMLGraphicHelperMode eMode );
protected:
// is called from WeakComponentImplHelper when XComponent::dispose() was
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 7a58296..aa9107a 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -66,7 +66,7 @@ using com::sun::star::embed::XTransactedObject;
class SvxXMLTableEntryExporter
{
public:
- SvxXMLTableEntryExporter( SvXMLExport& rExport ) : mrExport( rExport ) {}
+ explicit SvxXMLTableEntryExporter( SvXMLExport& rExport ) : mrExport(
rExport ) {}
virtual ~SvxXMLTableEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) =
0;
@@ -78,7 +78,7 @@ protected:
class SvxXMLColorEntryExporter : public SvxXMLTableEntryExporter
{
public:
- SvxXMLColorEntryExporter( SvXMLExport& rExport );
+ explicit SvxXMLColorEntryExporter( SvXMLExport& rExport );
virtual ~SvxXMLColorEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue )
SAL_OVERRIDE;
@@ -87,7 +87,7 @@ public:
class SvxXMLLineEndEntryExporter : public SvxXMLTableEntryExporter
{
public:
- SvxXMLLineEndEntryExporter( SvXMLExport& rExport );
+ explicit SvxXMLLineEndEntryExporter( SvXMLExport& rExport );
virtual ~SvxXMLLineEndEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue )
SAL_OVERRIDE;
@@ -98,7 +98,7 @@ private:
class SvxXMLDashEntryExporter : public SvxXMLTableEntryExporter
{
public:
- SvxXMLDashEntryExporter( SvXMLExport& rExport );
+ explicit SvxXMLDashEntryExporter( SvXMLExport& rExport );
virtual ~SvxXMLDashEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue )
SAL_OVERRIDE;
@@ -110,7 +110,7 @@ private:
class SvxXMLHatchEntryExporter : public SvxXMLTableEntryExporter
{
public:
- SvxXMLHatchEntryExporter( SvXMLExport& rExport );
+ explicit SvxXMLHatchEntryExporter( SvXMLExport& rExport );
virtual ~SvxXMLHatchEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue )
SAL_OVERRIDE;
@@ -121,7 +121,7 @@ private:
class SvxXMLGradientEntryExporter : public SvxXMLTableEntryExporter
{
public:
- SvxXMLGradientEntryExporter( SvXMLExport& rExport );
+ explicit SvxXMLGradientEntryExporter( SvXMLExport& rExport );
virtual ~SvxXMLGradientEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue )
SAL_OVERRIDE;
@@ -132,7 +132,7 @@ private:
class SvxXMLBitmapEntryExporter : public SvxXMLTableEntryExporter
{
public:
- SvxXMLBitmapEntryExporter( SvXMLExport& rExport );
+ explicit SvxXMLBitmapEntryExporter( SvXMLExport& rExport );
virtual ~SvxXMLBitmapEntryExporter();
virtual void exportEntry( const OUString& rStrName, const Any& rValue )
SAL_OVERRIDE;
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index b03b14b..aff2e4e 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -503,13 +503,10 @@ public:
}
};
-
-
-
class AtomContainerTreeListBox : public SvTreeListBox
{
public:
- AtomContainerTreeListBox( vcl::Window* pParent );
+ explicit AtomContainerTreeListBox( vcl::Window* pParent );
~AtomContainerTreeListBox();
void SetRootAtom( const Atom* pAtom );
@@ -705,14 +702,12 @@ void AtomContainerTreeListBox::InsertAtom( const Atom*
pAtom, SvTreeListEntry* p
}
}
-
-
extern void load_config( const OUString& rPath );
class PPTDocument
{
public:
- PPTDocument( const OUString& rFilePath );
+ explicit PPTDocument( const OUString& rFilePath );
~PPTDocument();
Atom* getRootAtom() const;
diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx
index b969602..cf563f7 100644
--- a/svx/workben/msview/xmlconfig.hxx
+++ b/svx/workben/msview/xmlconfig.hxx
@@ -33,8 +33,8 @@ class ElementConfig
public:
ElementConfig() : mnType( ECT_HEXDUMP ) {}
ElementConfig( const OUString& rName, ElementConfigType rType ) : maName(
rName ), mnType( rType ) {}
- ElementConfig( const OUString& rName ) : maName( rName ) {}
- ElementConfig( ElementConfigType rType ) : mnType( rType ) {}
+ explicit ElementConfig( const OUString& rName ) : maName( rName ) {}
+ explicit ElementConfig( ElementConfigType rType ) : mnType( rType ) {}
virtual OUString format( SvStream& rStream, sal_Size& nLength ) const;
@@ -73,8 +73,8 @@ class ElementConfigContainer : public ElementConfig
public:
ElementConfigContainer() : ElementConfig( ETC_CONTAINER ) {}
ElementConfigContainer( const OUString& rName, ElementConfigType rType ) :
ElementConfig( rName, rType ) {}
- ElementConfigContainer( const OUString& rName ) : ElementConfig( rName,
ETC_CONTAINER ) {}
- ElementConfigContainer( ElementConfigType rType ) : ElementConfig( rType )
{}
+ explicit ElementConfigContainer( const OUString& rName ) : ElementConfig(
rName, ETC_CONTAINER ) {}
+ explicit ElementConfigContainer( ElementConfigType rType ) :
ElementConfig( rType ) {}
virtual OUString format( SvStream& rStream, sal_Size& nLength ) const;
@@ -89,7 +89,7 @@ protected:
class CaseElementConfig : public ElementConfigContainer
{
public:
- CaseElementConfig( const OUString& rValue ) : maValue( rValue ) {}
+ explicit CaseElementConfig( const OUString& rValue ) : maValue( rValue ) {}
const OUString& getValue() const { return maValue; }
@@ -97,18 +97,14 @@ private:
OUString maValue;
};
-
-
class SwitchElementConfig : public ElementConfigContainer
{
public:
- SwitchElementConfig( ElementConfigType rType ) : ElementConfigContainer(
rType ) {}
+ explicit SwitchElementConfig( ElementConfigType rType ) :
ElementConfigContainer( rType ) {}
virtual OUString format( SvStream& rStream, sal_Size& nLength ) const;
};
-
-
class AtomConfig : public ElementConfigContainer
{
public:
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 54ae06c..27b8a95 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -41,7 +41,7 @@ namespace /* private */
class BigPtrEntryMock : public BigPtrEntry
{
public:
- BigPtrEntryMock(sal_uLong count) : count_(count)
+ explicit BigPtrEntryMock(sal_uLong count) : count_(count)
{
}
@@ -611,7 +611,7 @@ class PerformanceTracer
public:
public:
- PerformanceTracer(const string& methodName) :
+ explicit PerformanceTracer(const string& methodName) :
startString_(START),
endString_(END)
{
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx
b/sw/qa/core/test_ToxTextGenerator.cxx
index 0dcda9f..18f1681 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -116,7 +116,7 @@ public:
class ToxTextGeneratorWithMockedChapterField : public ToxTextGenerator {
public:
- ToxTextGeneratorWithMockedChapterField(SwForm &form)
+ explicit ToxTextGeneratorWithMockedChapterField(SwForm &form)
: ToxTextGenerator(form, std::make_shared<MockedToxTabStopTokenHandler>()),
mChapterFieldType(), mChapterField(&mChapterFieldType) {;}
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx
b/sw/qa/tiledrendering/tiledrendering.cxx
index 446e430..14e1936 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -67,7 +67,7 @@ private:
VclPtr<FixedImage> mpImage;
public:
- TiledRenderingDialog(TiledRenderingApp * app) :
+ explicit TiledRenderingDialog(TiledRenderingApp * app) :
ModalDialog(nullptr, "TiledRendering", "qa/sw/ui/tiledrendering.ui",
Dialog::InitFlag::NoParent),
mpApp(app)
{
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 7e47ad3..0428b3f 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -127,7 +127,7 @@ protected:
virtual ~SwDrawModellListener_Impl();
public:
- SwDrawModellListener_Impl( SdrModel *pDrawModel );
+ explicit SwDrawModellListener_Impl( SdrModel *pDrawModel );
virtual void SAL_CALL addEventListener( const uno::Reference<
document::XEventListener >& xListener ) throw (uno::RuntimeException,
std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const uno::Reference<
document::XEventListener >& xListener ) throw (uno::RuntimeException,
std::exception) SAL_OVERRIDE;
@@ -232,7 +232,7 @@ public:
#if OSL_DEBUG_LEVEL > 0
bool mbLocked;
#endif
- SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
+ explicit SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
: maMap()
#if OSL_DEBUG_LEVEL > 0
, mbLocked( false )
@@ -375,7 +375,7 @@ public:
"wrong event constructor, DISPOSE only");
}
- SwAccessibleEvent_Impl( EventType eT )
+ explicit SwAccessibleEvent_Impl( EventType eT )
: meType( eT ),
mnStates( AccessibleStates::NONE ),
mpParentFrm( nullptr )
@@ -770,7 +770,7 @@ void SwAccPreviewData::InvalidateSelection( const
SwPageFrm* _pSelectedPageFrm )
struct ContainsPredicate
{
const Point& mrPoint;
- ContainsPredicate( const Point& rPoint ) : mrPoint(rPoint) {}
+ explicit ContainsPredicate( const Point& rPoint ) : mrPoint(rPoint) {}
bool operator() ( const Rectangle& rRect ) const
{
return rRect.IsInside( mrPoint );
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index efda517..c6b433e 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1421,7 +1421,7 @@ com::sun::star::uno::Sequence<
::com::sun::star::style::TabStop > SwAccessiblePa
struct IndexCompare
{
const PropertyValue* pValues;
- IndexCompare( const PropertyValue* pVals ) : pValues(pVals) {}
+ explicit IndexCompare( const PropertyValue* pVals ) : pValues(pVals) {}
bool operator() ( const sal_Int32& a, const sal_Int32& b ) const
{
return (pValues[a].Name < pValues[b].Name);
@@ -3088,7 +3088,7 @@ class SwHyperlinkIter_Impl
size_t nPos;
public:
- SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm );
+ explicit SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm );
const SwTextAttr *next();
size_t getCurrHintPos() const { return nPos-1; }
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 0deb99b..5a94582 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -605,7 +605,11 @@ class SwAccAllTableSelHander_Impl : public
SwAccTableSelHander_Impl
sal_Int32 nCount;
public:
- inline SwAccAllTableSelHander_Impl( sal_Int32 nSize );
+ explicit SwAccAllTableSelHander_Impl(sal_Int32 nSize)
+ : aSelected(nSize, true)
+ , nCount(nSize)
+ {
+ }
uno::Sequence < sal_Int32 > GetSelSequence();
@@ -617,12 +621,6 @@ SwAccAllTableSelHander_Impl::~SwAccAllTableSelHander_Impl()
{
}
-inline SwAccAllTableSelHander_Impl::SwAccAllTableSelHander_Impl( sal_Int32
nSize ) :
- aSelected( nSize, true ),
- nCount( nSize )
-{
-}
-
uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
{
OSL_ENSURE( nCount >= 0, "underflow" );
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 46d3e7c..de3193e 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1372,7 +1372,7 @@ class SwNotifyAccAboutInvalidTextSelections
SwCrsrShell& mrCrsrSh;
public:
- SwNotifyAccAboutInvalidTextSelections( SwCrsrShell& _rCrsrSh )
+ explicit SwNotifyAccAboutInvalidTextSelections( SwCrsrShell& _rCrsrSh )
: mrCrsrSh( _rCrsrSh )
{}
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 9baa901..8b8358e 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -73,7 +73,7 @@ struct _PercentHdl
::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd, 0 );
}
- _PercentHdl( const SwPaM& rPam )
+ explicit _PercentHdl( const SwPaM& rPam )
: pDSh( rPam.GetDoc()->GetDocShell() )
{
sal_uLong nStt, nEnd;
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 2e2db8c..64b62b6 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -56,7 +56,7 @@ namespace
SwTableNode* pTableNd;
SwSectionNode* pSectNd;
- _FindItem(const OUString& rS)
+ explicit _FindItem(const OUString& rS)
: m_Item(rS), pTableNd(0), pSectNd(0)
{}
};
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index c00f1c9..acfcb57 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -69,7 +69,7 @@ class SwAutoCompleteWord_Impl
SwAutoCompleteClientVector aClientVector;
SwAutoCompleteWord& rAutoCompleteWord;
public:
- SwAutoCompleteWord_Impl(SwAutoCompleteWord& rParent) :
+ explicit SwAutoCompleteWord_Impl(SwAutoCompleteWord& rParent) :
rAutoCompleteWord(rParent){}
void AddDocument(SwDoc& rDoc);
void RemoveDocument(const SwDoc& rDoc);
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index df18866..fc01911 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -178,7 +178,7 @@ class Hash
sal_uLong nCount, nPrime;
public:
- Hash( sal_uLong nSize );
+ explicit Hash( sal_uLong nSize );
~Hash();
void CalcHashValue( CompareData& rData );
@@ -344,7 +344,7 @@ private:
int nStt2, int nEnd2 );
public:
- LgstCommonSubseq( ArrayComparator &rComparator );
+ explicit LgstCommonSubseq( ArrayComparator &rComparator );
~LgstCommonSubseq();
int Find( int *pSubseq1, int *pSubseq2 );
@@ -360,7 +360,7 @@ private:
int nStt2, int nEnd2 );
public:
- FastCommonSubseq( ArrayComparator &rComparator )
+ explicit FastCommonSubseq( ArrayComparator &rComparator )
: CommonSubseq( rComparator, CUTOFF )
{
}
@@ -993,7 +993,7 @@ class SwCompareLine : public CompareLine
{
const SwNode& rNode;
public:
- SwCompareLine( const SwNode& rNd );
+ explicit SwCompareLine( const SwNode& rNd );
virtual ~SwCompareLine();
virtual sal_uLong GetHashValue() const SAL_OVERRIDE;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index e24c4fa..6a00e2e 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -809,7 +809,7 @@ IMPL_LINK_NOARG_TYPED( SwDoc, DoUpdateModifiedOLE, Idle *,
void )
}
struct CompareSwPageDescName {
- CompareSwPageDescName(const OUString &rName) : mName(rName) {}
+ explicit CompareSwPageDescName(const OUString &rName) : mName(rName) {}
bool operator () (const SwPageDesc& other) const { return other.GetName()
== mName; }
const OUString &mName;
};
@@ -846,7 +846,7 @@ SwPageDesc* SwDoc::FindPageDesc( const OUString & rName,
size_t* pPos ) const
}
struct CompareSwPageDescToPtr {
- CompareSwPageDescToPtr(const SwPageDesc* ptr) : mPtr(ptr) {}
+ explicit CompareSwPageDescToPtr(const SwPageDesc* ptr) : mPtr(ptr) {}
bool operator () (const SwPageDesc& other) const { return &other == mPtr; }
const SwPageDesc *mPtr;
};
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 08db77b..052df8f 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -87,7 +87,7 @@ struct _CpyTabFrm
} Value;
SwTableBoxFormat *pNewFrameFormat;
- _CpyTabFrm( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( 0 )
+ explicit _CpyTabFrm( SwTableBoxFormat* pAktFrameFormat ) :
pNewFrameFormat( 0 )
{ Value.pFrameFormat = pAktFrameFormat; }
_CpyTabFrm& operator=( const _CpyTabFrm& );
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index bb7e97f..6390ad7 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -36,7 +36,7 @@
class CancelJobsThread : public osl::Thread
{
public:
- CancelJobsThread( std::list< css::uno::Reference<
css::util::XCancellable > > aJobs )
+ explicit CancelJobsThread( std::list< css::uno::Reference<
css::util::XCancellable > > aJobs )
: osl::Thread(),
maMutex(),
maJobs( aJobs ),
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 7a77906..edb6758 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3645,7 +3645,7 @@ struct _SetAFormatTabPara
sal_uInt16 nEndBox, nCurBox;
sal_uInt8 nAFormatLine, nAFormatBox;
- _SetAFormatTabPara( const SwTableAutoFormat& rNew )
+ explicit _SetAFormatTabPara( const SwTableAutoFormat& rNew )
: rTableFormat( (SwTableAutoFormat&)rNew ), pUndo( 0 ),
nEndBox( 0 ), nCurBox( 0 ), nAFormatLine( 0 ), nAFormatBox( 0 )
{}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 30e33ae..83b58b4 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1410,8 +1410,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart,
sal_uLong nCnt )
struct HighLevel
{
sal_uInt16 nLevel, nTop;
- HighLevel( sal_uInt16 nLv ) : nLevel( nLv ), nTop( nLv ) {}
-
+ explicit HighLevel( sal_uInt16 nLv ) : nLevel( nLv ), nTop( nLv ) {}
};
static bool lcl_HighestLevel( const SwNodePtr& rpNode, void * pPara )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 08e628b..f25c278 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2026,7 +2026,7 @@ namespace sdr
public:
/// basic constructor, used from SdrObject.
- VCOfDrawVirtObj(SwDrawVirtObj& rObj)
+ explicit VCOfDrawVirtObj(SwDrawVirtObj& rObj)
: ViewContactOfVirtObj(rObj)
{
}
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index cc81412..efd249f 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -90,7 +90,7 @@ namespace sdr
public:
/// basic constructor, used from SdrObject.
- VCOfSwFlyDrawObj(SwFlyDrawObj& rObj)
+ explicit VCOfSwFlyDrawObj(SwFlyDrawObj& rObj)
: ViewContactOfSdrObj(rObj)
{
}
@@ -269,7 +269,7 @@ namespace sdr
public:
/// basic constructor, used from SdrObject.
- VCOfSwVirtFlyDrawObj(SwVirtFlyDrawObj& rObj)
+ explicit VCOfSwVirtFlyDrawObj(SwVirtFlyDrawObj& rObj)
: ViewContactOfVirtObj(rObj)
{
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 0371f88..30e3d57 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -143,9 +143,10 @@ class SwConvIter : public SwLinguIter
{
SwConversionArgs &rArgs;
public:
- SwConvIter( SwConversionArgs &rConvArgs ) :
- rArgs( rConvArgs )
- {}
+ explicit SwConvIter(SwConversionArgs &rConvArgs)
+ : rArgs(rConvArgs)
+ {
+ }
void Start( SwEditShell *pSh, SwDocPositions eStart, SwDocPositions eEnd );
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c845ed0..f8f8ad5 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -934,7 +934,7 @@ private:
static sal_uInt16 GetFirstUnusedId( std::set<sal_uInt16> &rIds );
public:
- _RefIdsMap( const OUString& rName ) : aName( rName ), bInit( false ) {}
+ explicit _RefIdsMap( const OUString& rName ) : aName( rName ), bInit(
false ) {}
void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, bool
bField );
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index fe38a22..ec52758 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1243,7 +1243,7 @@ namespace
class MarkableObjectsOnly : public svx::ISdrObjectFilter
{
public:
- MarkableObjectsOnly( SdrPageView* i_pPV )
+ explicit MarkableObjectsOnly( SdrPageView* i_pPV )
:m_pPV( i_pPV )
{
}
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 17f9877..a5d3e8a 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -91,7 +91,7 @@ struct _Sort_CellFrm
{
const SwCellFrm* pFrm;
- _Sort_CellFrm( const SwCellFrm& rCFrm )
+ explicit _Sort_CellFrm( const SwCellFrm& rCFrm )
: pFrm( &rCFrm ) {}
};
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index 1de3412..a5141df 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -44,7 +44,7 @@ class SwPosNotify
SwPageFrm* mpOldPageFrm;
public:
- SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj );
+ explicit SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj );
~SwPosNotify();
// #i32795#
Point LastObjPos() const;
@@ -133,7 +133,7 @@ class SwObjPosOscillationControl
std::vector<Point*> maObjPositions;
public:
- SwObjPosOscillationControl( const SwAnchoredDrawObject&
_rAnchoredDrawObj );
+ explicit SwObjPosOscillationControl( const SwAnchoredDrawObject&
_rAnchoredDrawObj );
~SwObjPosOscillationControl();
bool OscillationDetected();
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index fde2e2d..65cf9b9 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -206,7 +206,7 @@ class SwOszControl
std::vector<Point*> maObjPositions;
public:
- SwOszControl( const SwFlyFrm *pFrm );
+ explicit SwOszControl( const SwFlyFrm *pFrm );
~SwOszControl();
bool ChkOsz();
static bool IsInProgress( const SwFlyFrm *pFly );
diff --git a/sw/source/core/layout/layouter.cxx
b/sw/source/core/layout/layouter.cxx
index 54f95fe..b710bf8 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -37,7 +37,7 @@ class SwLooping
sal_uInt16 nCount;
sal_uInt16 mnLoopControlStage;
public:
- SwLooping( SwPageFrm* pPage );
+ explicit SwLooping( SwPageFrm* pPage );
void Control( SwPageFrm* pPage );
void Drastic( SwFrm* pFrm );
bool IsLoopingLouieLight() const { return nCount > LOOP_DETECT - 30; };
@@ -49,7 +49,7 @@ class SwEndnoter
SwSectionFrm* pSect;
SwFootnoteFrms* pEndArr;
public:
- SwEndnoter( SwLayouter* pLay )
+ explicit SwEndnoter( SwLayouter* pLay )
: pMaster( pLay ), pSect( NULL ), pEndArr( NULL ) {}
~SwEndnoter() { delete pEndArr; }
void CollectEndnotes( SwSectionFrm* pSct );
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx
b/sw/source/core/layout/objectformattertxtfrm.cxx
index dc6eee0..3880fa3 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -39,7 +39,7 @@ private:
const bool bOldFollowFormatAllowed;
public:
- SwForbidFollowFormat( SwTextFrm& _rTextFrm )
+ explicit SwForbidFollowFormat( SwTextFrm& _rTextFrm )
: mrTextFrm( _rTextFrm ),
bOldFollowFormatAllowed( _rTextFrm.FollowFormatAllowed() )
{
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 4c0c2b4..36ba345 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2518,7 +2518,7 @@ class SwTabFrmPainter
void AdjustTopLeftFrames();
public:
- SwTabFrmPainter( const SwTabFrm& rTabFrm );
+ explicit SwTabFrmPainter( const SwTabFrm& rTabFrm );
void PaintLines( OutputDevice& rDev, const SwRect& rRect ) const;
};
@@ -3131,7 +3131,7 @@ namespace
const SwViewShell& mrViewShell;
public:
- SwViewObjectContactRedirector( const SwViewShell& rSh )
+ explicit SwViewObjectContactRedirector( const SwViewShell& rSh )
: mrViewShell( rSh )
{};
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index aa2ba0e..e9cc07b 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1083,7 +1083,7 @@ class ExtraFormatToPositionObjs
bool mbExtraFormatPerformed;
public:
- ExtraFormatToPositionObjs( SwSectionFrm& _rSectFrm)
+ explicit ExtraFormatToPositionObjs( SwSectionFrm& _rSectFrm)
: mpSectFrm( &_rSectFrm ),
mbExtraFormatPerformed( false )
{}
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 578192f..999afd1 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1468,7 +1468,7 @@ class DisableCallbackAction
bool mbOldCallbackActionState;
public:
- DisableCallbackAction( const SwRootFrm& _rRootFrm ) :
+ explicit DisableCallbackAction( const SwRootFrm& _rRootFrm ) :
mrRootFrm( const_cast<SwRootFrm&>(_rRootFrm) ),
mbOldCallbackActionState( _rRootFrm.IsCallbackActionEnabled() )
{
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index ddedf77..6096a12 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -90,7 +90,7 @@ class SwOLEListener_Impl : public ::cppu::WeakImplHelper<
embed::XStateChangeLis
{
SwOLEObj* mpObj;
public:
- SwOLEListener_Impl( SwOLEObj* pObj );
+ explicit SwOLEListener_Impl( SwOLEObj* pObj );
void Release();
virtual void SAL_CALL changingState( const lang::EventObject& aEvent,
::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw
(embed::WrongStateException, uno::RuntimeException, std::exception)
SAL_OVERRIDE;
virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent,
::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException,
std::exception) SAL_OVERRIDE;
@@ -147,7 +147,7 @@ class SwEmbedObjectLink : public sfx2::SvBaseLink
SwOLENode* pOleNode;
public:
- SwEmbedObjectLink(SwOLENode* pNode);
+ explicit SwEmbedObjectLink(SwOLENode* pNode);
virtual ~SwEmbedObjectLink();
virtual void Closed() SAL_OVERRIDE;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index a1a30cb..150ef16 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -132,7 +132,7 @@ protected:
public:
void CtorInitTextInfo( SwTextFrm *pFrm );
SwTextInfo( const SwTextInfo &rInf );
- SwTextInfo( SwTextFrm *pFrm ) { CtorInitTextInfo( pFrm ); }
+ explicit SwTextInfo( SwTextFrm *pFrm ) { CtorInitTextInfo( pFrm ); }
SwParaPortion *GetParaPortion() { return m_pPara; }
const SwParaPortion *GetParaPortion() const { return m_pPara; }
sal_Int32 GetTextStart() const { return m_nTextStart; }
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 6f19241..a8cc2e8 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -65,7 +65,7 @@ protected:
void Chg( SwTextAttr *pHt );
void Rst( SwTextAttr *pHt );
void CtorInitAttrIter( SwTextNode& rTextNode, SwScriptInfo& rScrInf,
SwTextFrm* pFrm = 0 );
- SwAttrIter(SwTextNode* pTextNode)
+ explicit SwAttrIter(SwTextNode* pTextNode)
: pShell(0)
, pFnt(0)
, pHints(0)
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index 20fb2df..8ab7bd2 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -32,7 +32,7 @@ class SwTextPainter : public SwTextCursor
long nAdjustBaseLine = 0 );
protected:
void CtorInitTextPainter( SwTextFrm *pFrm, SwTextPaintInfo *pInf );
- SwTextPainter(SwTextNode* pTextNode)
+ explicit SwTextPainter(SwTextNode* pTextNode)
: SwTextCursor(pTextNode)
, bPaintDrop(false)
{
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 95f821d..fdaec18 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -53,7 +53,7 @@ protected:
// Reset in the first line
void Init();
void CtorInitTextIter( SwTextFrm *pFrm, SwTextInfo *pInf );
- SwTextIter(SwTextNode* pTextNode)
+ explicit SwTextIter(SwTextNode* pTextNode)
: SwAttrIter(pTextNode)
, pFrm(NULL)
, pInf(NULL)
@@ -160,7 +160,7 @@ protected:
inline void SetDropLeft( const sal_uInt16 nNew ) { nDropLeft = nNew; }
void CtorInitTextMargin( SwTextFrm *pFrm, SwTextSizeInfo *pInf );
- SwTextMargin(SwTextNode* pTextNode)
+ explicit SwTextMargin(SwTextNode* pTextNode)
: SwTextIter(pTextNode)
, nLeft(0)
, nRight(0)
@@ -239,7 +239,7 @@ class SwTextAdjuster : public SwTextMargin
const SwRect &rCurrRect );
protected:
- inline SwTextAdjuster(SwTextNode* pTextNode) : SwTextMargin(pTextNode) { }
+ explicit SwTextAdjuster(SwTextNode* pTextNode) : SwTextMargin(pTextNode) {
}
// Creates the Glues for adjusted paragraphs
void CalcNewBlock( SwLineLayout *pCurr, const SwLinePortion *pStopAt,
SwTwips nReal = 0, bool bSkipKashida = false );
@@ -274,7 +274,7 @@ class SwTextCursor : public SwTextAdjuster
void _GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* );
protected:
void CtorInitTextCursor( SwTextFrm *pFrm, SwTextSizeInfo *pInf );
- SwTextCursor(SwTextNode* pTextNode) : SwTextAdjuster(pTextNode) { }
+ explicit SwTextCursor(SwTextNode* pTextNode) : SwTextAdjuster(pTextNode) {
}
public:
SwTextCursor( SwTextFrm *pTextFrm, SwTextSizeInfo *pTextSizeInf )
: SwTextAdjuster(pTextFrm->GetTextNode())
@@ -308,7 +308,7 @@ class SwHookOut
VclPtr<OutputDevice> pOut;
bool bOnWin;
public:
- SwHookOut( SwTextSizeInfo& rInfo );
+ explicit SwHookOut( SwTextSizeInfo& rInfo );
~SwHookOut();
};
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index cf2374a..365364f 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -68,7 +68,7 @@ class SwPostItsPortion : public SwExpandPortion
{
bool bScript;
public:
- SwPostItsPortion( bool bScrpt );
+ explicit SwPostItsPortion( bool bScrpt );
virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const
SAL_OVERRIDE;
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index fe96aa4..1e0d5d7 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -220,7 +220,7 @@ class SwCombinedPortion : public SwFieldPortion
sal_uInt16 nLowPos; // the Y position of the lower baseline
sal_uInt8 nProportion; // relative font height
public:
- SwCombinedPortion( const OUString &rExpand );
+ explicit SwCombinedPortion( const OUString &rExpand );
virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const
SAL_OVERRIDE;
@@ -234,7 +234,7 @@ namespace sw { namespace mark {
class SwFieldFormDropDownPortion : public SwFieldPortion
{
public:
- SwFieldFormDropDownPortion(const OUString &rExpand)
+ explicit SwFieldFormDropDownPortion(const OUString &rExpand)
: SwFieldPortion(rExpand)
{
}
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index ff31005..9b9aef0 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -32,7 +32,7 @@ class SwFlyPortion : public SwFixPortion
{
sal_uInt16 nBlankWidth;
public:
- inline SwFlyPortion( const SwRect &rFlyRect )
+ explicit SwFlyPortion( const SwRect &rFlyRect )
: SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index 058d951..182faab 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -29,7 +29,7 @@ class SwGluePortion : public SwLinePortion
private:
sal_uInt16 nFixWidth;
public:
- SwGluePortion( const sal_uInt16 nInitFixWidth );
+ explicit SwGluePortion( const sal_uInt16 nInitFixWidth );
void Join( SwGluePortion *pVictim );
@@ -52,8 +52,8 @@ class SwFixPortion : public SwGluePortion
{
sal_uInt16 nFix; // The width offset in the line
public:
- SwFixPortion( const SwRect &rFlyRect );
- SwFixPortion( const sal_uInt16 nFixWidth, const sal_uInt16 nFixPos );
+ explicit SwFixPortion( const SwRect &rFlyRect );
+ SwFixPortion( const sal_uInt16 nFixWidth, const sal_uInt16 nFixPos );
inline void Fix( const sal_uInt16 nNewFix ) { nFix = nNewFix; }
inline sal_uInt16 Fix() const { return nFix; }
OUTPUT_OPERATOR_OVERRIDE
@@ -62,8 +62,8 @@ public:
class SwMarginPortion : public SwGluePortion
{
public:
- SwMarginPortion( const sal_uInt16 nFixWidth );
- void AdjustRight( const SwLineLayout* pCurr );
+ explicit SwMarginPortion( const sal_uInt16 nFixWidth );
+ void AdjustRight( const SwLineLayout* pCurr );
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 5d4edb7..90af3bf 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -41,7 +41,7 @@ class SwHyphStrPortion : public SwHyphPortion
{
OUString aExpand;
public:
- SwHyphStrPortion(const OUString &rStr)
+ explicit SwHyphStrPortion(const OUString &rStr)
: aExpand(rStr + "-")
{
SetWhichPor( POR_HYPHSTR );
@@ -82,7 +82,7 @@ public:
class SwSoftHyphStrPortion : public SwHyphStrPortion
{
public:
- SwSoftHyphStrPortion( const OUString &rStr );
+ explicit SwSoftHyphStrPortion( const OUString &rStr );
virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 660d38d..644915f 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -76,9 +76,9 @@ class SwHolePortion : public SwLinePortion
{
sal_uInt16 nBlankWidth;
public:
- SwHolePortion( const SwTextPortion &rPor );
- inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
