[Libreoffice-commits] core.git: starmath/inc
Takeshi Abe
tabe at fixedpoint.jp
Tue Jun 7 02:02:27 UTC 2016
starmath/inc/ElementsDockingWindow.hxx | 2 -
starmath/inc/document.hxx | 4 +-
starmath/inc/edit.hxx | 2 -
starmath/inc/node.hxx | 56 ++++++++++++++++-----------------
starmath/inc/smmod.hxx | 4 +-
starmath/inc/unomodel.hxx | 2 -
starmath/inc/utility.hxx | 2 -
starmath/inc/view.hxx | 2 -
starmath/inc/visitors.hxx | 2 -
9 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 5012f694d46bd20263d2ceebc28143be1999c0fd
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Jun 6 19:31:23 2016 +0900
starmath: Make ctors explicit
Change-Id: Ic1b7ce74f73bd41824e0af78675b4e18af32b1f5
Reviewed-on: https://gerrit.libreoffice.org/25960
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 2e32787..fd61025 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -109,7 +109,7 @@ class SmElementsControl : public Control
void LayoutOrPaintContents(vcl::RenderContext *pContext = nullptr);
public:
- SmElementsControl(vcl::Window *pParent);
+ explicit SmElementsControl(vcl::Window *pParent);
virtual ~SmElementsControl();
virtual void dispose() override;
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 03fac87..1b51926 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -72,7 +72,7 @@ class SmPrinterAccess
VclPtr<Printer> pPrinter;
VclPtr<OutputDevice> pRefDev;
public:
- SmPrinterAccess( SmDocShell &rDocShell );
+ explicit SmPrinterAccess( SmDocShell &rDocShell );
~SmPrinterAccess();
Printer* GetPrinter() { return pPrinter.get(); }
OutputDevice* GetRefDev() { return pRefDev.get(); }
@@ -149,7 +149,7 @@ private:
static void InitInterface_Impl();
public:
- SmDocShell( SfxModelFlags i_nSfxCreationFlags );
+ explicit SmDocShell( SfxModelFlags i_nSfxCreationFlags );
virtual ~SmDocShell();
static void LoadSymbols();
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index c33dbb9..85d4293 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -83,7 +83,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
void UpdateStatus(bool bSetDocModified = false);
public:
- SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
+ explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
virtual ~SmEditWindow();
virtual void dispose() override;
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 00b457d..9e09269 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -380,7 +380,7 @@ class SmRectangleNode : public SmGraphicNode
Size aToSize;
public:
- SmRectangleNode(const SmToken &rNodeToken)
+ explicit SmRectangleNode(const SmToken &rNodeToken)
: SmGraphicNode(NRECTANGLE, rNodeToken)
{}
@@ -405,7 +405,7 @@ class SmPolyLineNode : public SmGraphicNode
long nWidth;
public:
- SmPolyLineNode(const SmToken &rNodeToken);
+ explicit SmPolyLineNode(const SmToken &rNodeToken);
long GetWidth() const { return nWidth; }
tools::Polygon &GetPolygon() { return aPoly; }
@@ -497,7 +497,7 @@ protected:
SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 _nFontDesc);
public:
- SmSpecialNode(const SmToken &rNodeToken);
+ explicit SmSpecialNode(const SmToken &rNodeToken);
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
@@ -518,7 +518,7 @@ public:
class SmGlyphSpecialNode : public SmSpecialNode
{
public:
- SmGlyphSpecialNode(const SmToken &rNodeToken)
+ explicit SmGlyphSpecialNode(const SmToken &rNodeToken)
: SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
{}
@@ -543,7 +543,7 @@ protected:
}
public:
- SmMathSymbolNode(const SmToken &rNodeToken);
+ explicit SmMathSymbolNode(const SmToken &rNodeToken);
virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth) override;
virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override;
@@ -564,7 +564,7 @@ public:
class SmMathIdentifierNode : public SmMathSymbolNode
{
public:
- SmMathIdentifierNode(const SmToken &rNodeToken)
+ explicit SmMathIdentifierNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NMATHIDENT, rNodeToken) {}
};
@@ -580,7 +580,7 @@ class SmRootSymbolNode : public SmMathSymbolNode
sal_uLong nBodyWidth; // width of body (argument) of root sign
public:
- SmRootSymbolNode(const SmToken &rNodeToken)
+ explicit SmRootSymbolNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NROOTSYMBOL, rNodeToken)
, nBodyWidth(0)
{
@@ -607,7 +607,7 @@ class SmDynIntegralSymbolNode : public SmMathSymbolNode
public:
- SmDynIntegralSymbolNode(const SmToken &rNodeToken)
+ explicit SmDynIntegralSymbolNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NDYNINTSYMBOL, rNodeToken)
{}
@@ -626,7 +626,7 @@ public:
class SmPlaceNode : public SmMathSymbolNode
{
public:
- SmPlaceNode(const SmToken &rNodeToken)
+ explicit SmPlaceNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NPLACE, rNodeToken)
{
}
@@ -669,7 +669,7 @@ class SmTableNode : public SmStructureNode
{
long nFormulaBaseline;
public:
- SmTableNode(const SmToken &rNodeToken)
+ explicit SmTableNode(const SmToken &rNodeToken)
: SmStructureNode(NTABLE, rNodeToken)
, nFormulaBaseline(0)
{
@@ -701,7 +701,7 @@ protected:
}
public:
- SmLineNode(const SmToken &rNodeToken)
+ explicit SmLineNode(const SmToken &rNodeToken)
: SmStructureNode(NLINE, rNodeToken)
{
bUseExtraSpaces = true;
@@ -725,7 +725,7 @@ public:
class SmExpressionNode : public SmLineNode
{
public:
- SmExpressionNode(const SmToken &rNodeToken)
+ explicit SmExpressionNode(const SmToken &rNodeToken)
: SmLineNode(NEXPRESSION, rNodeToken)
{}
@@ -742,7 +742,7 @@ public:
class SmUnHorNode : public SmStructureNode
{
public:
- SmUnHorNode(const SmToken &rNodeToken)
+ explicit SmUnHorNode(const SmToken &rNodeToken)
: SmStructureNode(NUNHOR, rNodeToken)
{
SetNumSubNodes(2);
@@ -772,7 +772,7 @@ protected:
static Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra);
public:
- SmRootNode(const SmToken &rNodeToken)
+ explicit SmRootNode(const SmToken &rNodeToken)
: SmStructureNode(NROOT, rNodeToken)
{
SetNumSubNodes(3);
@@ -802,7 +802,7 @@ public:
class SmDynIntegralNode : public SmStructureNode
{
public:
- SmDynIntegralNode(const SmToken &rNodeToken)
+ explicit SmDynIntegralNode(const SmToken &rNodeToken)
: SmStructureNode(NDYNINT, rNodeToken)
{
SetNumSubNodes(2);
@@ -833,7 +833,7 @@ public:
class SmBinHorNode : public SmStructureNode
{
public:
- SmBinHorNode(const SmToken &rNodeToken)
+ explicit SmBinHorNode(const SmToken &rNodeToken)
: SmStructureNode(NBINHOR, rNodeToken)
{
SetNumSubNodes(3);
@@ -866,7 +866,7 @@ public:
class SmBinVerNode : public SmStructureNode
{
public:
- SmBinVerNode(const SmToken &rNodeToken)
+ explicit SmBinVerNode(const SmToken &rNodeToken)
: SmStructureNode(NBINVER, rNodeToken)
{
SetNumSubNodes(3);
@@ -898,7 +898,7 @@ class SmBinDiagonalNode : public SmStructureNode
const Point &rDiagPoint, double fAngleDeg) const;
public:
- SmBinDiagonalNode(const SmToken &rNodeToken);
+ explicit SmBinDiagonalNode(const SmToken &rNodeToken);
bool IsAscending() const { return bAscending; }
void SetAscending(bool bVal) { bAscending = bVal; }
@@ -953,7 +953,7 @@ class SmSubSupNode : public SmStructureNode
bool bUseLimits;
public:
- SmSubSupNode(const SmToken &rNodeToken)
+ explicit SmSubSupNode(const SmToken &rNodeToken)
: SmStructureNode(NSUBSUP, rNodeToken)
{
SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES);
@@ -1004,7 +1004,7 @@ public:
class SmBraceNode : public SmStructureNode
{
public:
- SmBraceNode(const SmToken &rNodeToken)
+ explicit SmBraceNode(const SmToken &rNodeToken)
: SmStructureNode(NBRACE, rNodeToken)
{
SetNumSubNodes(3);
@@ -1037,7 +1037,7 @@ class SmBracebodyNode : public SmStructureNode
long nBodyHeight;
public:
- inline SmBracebodyNode(const SmToken &rNodeToken);
+ explicit inline SmBracebodyNode(const SmToken &rNodeToken);
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
long GetBodyHeight() const { return nBodyHeight; }
@@ -1067,7 +1067,7 @@ inline SmBracebodyNode::SmBracebodyNode(const SmToken &rNodeToken) :
class SmVerticalBraceNode : public SmStructureNode
{
public:
- inline SmVerticalBraceNode(const SmToken &rNodeToken);
+ explicit inline SmVerticalBraceNode(const SmToken &rNodeToken);
SmNode* Body();
const SmNode* Body() const;
@@ -1101,7 +1101,7 @@ inline SmVerticalBraceNode::SmVerticalBraceNode(const SmToken &rNodeToken) :
class SmOperNode : public SmStructureNode
{
public:
- SmOperNode(const SmToken &rNodeToken)
+ explicit SmOperNode(const SmToken &rNodeToken)
: SmStructureNode(NOPER, rNodeToken)
{
SetNumSubNodes(2);
@@ -1127,7 +1127,7 @@ public:
class SmAlignNode : public SmStructureNode
{
public:
- SmAlignNode(const SmToken &rNodeToken)
+ explicit SmAlignNode(const SmToken &rNodeToken)
: SmStructureNode(NALIGN, rNodeToken)
{}
@@ -1149,7 +1149,7 @@ public:
class SmAttributNode : public SmStructureNode
{
public:
- SmAttributNode(const SmToken &rNodeToken)
+ explicit SmAttributNode(const SmToken &rNodeToken)
: SmStructureNode(NATTRIBUT, rNodeToken)
{}
@@ -1174,7 +1174,7 @@ class SmFontNode : public SmStructureNode
Fraction aFontSize;
public:
- SmFontNode(const SmToken &rNodeToken)
+ explicit SmFontNode(const SmToken &rNodeToken)
: SmStructureNode(NFONT, rNodeToken)
{
nSizeType = FontSizeType::MULTIPLY;
@@ -1203,7 +1203,7 @@ class SmMatrixNode : public SmStructureNode
nNumCols;
public:
- SmMatrixNode(const SmToken &rNodeToken)
+ explicit SmMatrixNode(const SmToken &rNodeToken)
: SmStructureNode(NMATRIX, rNodeToken)
{
nNumRows = nNumCols = 0;
@@ -1230,7 +1230,7 @@ class SmBlankNode : public SmGraphicNode
sal_uInt16 nNum;
public:
- SmBlankNode(const SmToken &rNodeToken)
+ explicit SmBlankNode(const SmToken &rNodeToken)
: SmGraphicNode(NBLANK, rNodeToken)
{
nNum = 0;
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 2142d05..6810c19 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -56,7 +56,7 @@ class VirtualDevice;
class SmResId : public ResId
{
public:
- SmResId(sal_uInt16 nId);
+ explicit SmResId(sal_uInt16 nId);
};
#define SM_RESSTR(x) SmResId(x).toString()
@@ -101,7 +101,7 @@ private:
static void InitInterface_Impl();
public:
- SmModule(SfxObjectFactory* pObjFact);
+ explicit SmModule(SfxObjectFactory* pObjFact);
virtual ~SmModule();
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 95c15d9..86bfc93 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -59,7 +59,7 @@ protected:
virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
public:
- SmModel( SfxObjectShell *pObjSh = nullptr );
+ explicit SmModel( SfxObjectShell *pObjSh = nullptr );
virtual ~SmModel() throw ();
//XInterface
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 6e8b977..c0524ed 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -118,7 +118,7 @@ protected:
static OUString GetStringItem(const vcl::Font &rItem);
public:
- SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
+ explicit SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
virtual ~SmFontPickList() { Clear(); }
virtual void Insert(const vcl::Font &rFont);
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 1fc1b25..40de4e4 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -98,7 +98,7 @@ private:
void CaretBlinkStart();
void CaretBlinkStop();
public:
- SmGraphicWindow(SmViewShell* pShell);
+ explicit SmGraphicWindow(SmViewShell* pShell);
virtual ~SmGraphicWindow();
virtual void dispose() override;
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 22816b6..ee9732c 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -293,7 +293,7 @@ class SmCaretPosGraphBuildingVisitor : public SmVisitor
{
public:
/** Builds a caret position graph for pRootNode */
- SmCaretPosGraphBuildingVisitor( SmNode* pRootNode );
+ explicit SmCaretPosGraphBuildingVisitor( SmNode* pRootNode );
virtual ~SmCaretPosGraphBuildingVisitor();
void Visit( SmTableNode* pNode ) override;
void Visit( SmBraceNode* pNode ) override;
More information about the Libreoffice-commits
mailing list