mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starmath: Make ctors explicit

Browse Source 
Change-Id: Ic1b7ce74f73bd41824e0af78675b4e18af32b1f5
Reviewed-on: https://gerrit.libreoffice.org/25960
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
This commit is contained in:
Takeshi Abe
2016-06-06 19:31:23 +09:00
parent b3f1afc28f
commit 5012f694d4
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
starmath/inc/ElementsDockingWindow.hxx
View File

@@ -109,7 +109,7 @@ class SmElementsControl : public Control
void LayoutOrPaintContents(vcl::RenderContext *pContext = nullptr); void LayoutOrPaintContents(vcl::RenderContext *pContext = nullptr);
public: public:
SmElementsControl(vcl::Window *pParent); explicit SmElementsControl(vcl::Window *pParent);
virtual ~SmElementsControl(); virtual ~SmElementsControl();
virtual void dispose() override; virtual void dispose() override;

4
starmath/inc/document.hxx
View File

@@ -72,7 +72,7 @@ class SmPrinterAccess
VclPtr<Printer> pPrinter; VclPtr<Printer> pPrinter;
VclPtr<OutputDevice> pRefDev; VclPtr<OutputDevice> pRefDev;
public: public:
SmPrinterAccess( SmDocShell &rDocShell ); explicit SmPrinterAccess( SmDocShell &rDocShell );
~SmPrinterAccess(); ~SmPrinterAccess();
Printer* GetPrinter() { return pPrinter.get(); } Printer* GetPrinter() { return pPrinter.get(); }
OutputDevice* GetRefDev() { return pRefDev.get(); } OutputDevice* GetRefDev() { return pRefDev.get(); }
@@ -149,7 +149,7 @@ private:
static void InitInterface_Impl(); static void InitInterface_Impl();
public: public:
SmDocShell( SfxModelFlags i_nSfxCreationFlags ); explicit SmDocShell( SfxModelFlags i_nSfxCreationFlags );
virtual ~SmDocShell(); virtual ~SmDocShell();
static void LoadSymbols(); static void LoadSymbols();

2
starmath/inc/edit.hxx
View File

@@ -83,7 +83,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
void UpdateStatus(bool bSetDocModified = false); void UpdateStatus(bool bSetDocModified = false);
public: public:
SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
virtual ~SmEditWindow(); virtual ~SmEditWindow();
virtual void dispose() override; virtual void dispose() override;

56
starmath/inc/node.hxx
View File

@@ -380,7 +380,7 @@ class SmRectangleNode : public SmGraphicNode
Size aToSize; Size aToSize;
public: public:
SmRectangleNode(const SmToken &rNodeToken) explicit SmRectangleNode(const SmToken &rNodeToken)
: SmGraphicNode(NRECTANGLE, rNodeToken) : SmGraphicNode(NRECTANGLE, rNodeToken)
{} {}
@@ -405,7 +405,7 @@ class SmPolyLineNode : public SmGraphicNode
long nWidth; long nWidth;
public: public:
SmPolyLineNode(const SmToken &rNodeToken); explicit SmPolyLineNode(const SmToken &rNodeToken);
long GetWidth() const { return nWidth; } long GetWidth() const { return nWidth; }
tools::Polygon &GetPolygon() { return aPoly; } tools::Polygon &GetPolygon() { return aPoly; }
@@ -497,7 +497,7 @@ protected:
SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 _nFontDesc); SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 _nFontDesc);
public: public:
SmSpecialNode(const SmToken &rNodeToken); explicit SmSpecialNode(const SmToken &rNodeToken);
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override; virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override; virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
@@ -518,7 +518,7 @@ public:
class SmGlyphSpecialNode : public SmSpecialNode class SmGlyphSpecialNode : public SmSpecialNode
{ {
public: public:
SmGlyphSpecialNode(const SmToken &rNodeToken) explicit SmGlyphSpecialNode(const SmToken &rNodeToken)
: SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH) : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
{} {}
@@ -543,7 +543,7 @@ protected:
} }
public: public:
SmMathSymbolNode(const SmToken &rNodeToken); explicit SmMathSymbolNode(const SmToken &rNodeToken);
virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth) override; virtual void AdaptToX(OutputDevice &rDev, sal_uLong nWidth) override;
virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override; virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override;
@@ -564,7 +564,7 @@ public:
class SmMathIdentifierNode : public SmMathSymbolNode class SmMathIdentifierNode : public SmMathSymbolNode
{ {
public: public:
SmMathIdentifierNode(const SmToken &rNodeToken) explicit SmMathIdentifierNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NMATHIDENT, rNodeToken) {} : SmMathSymbolNode(NMATHIDENT, rNodeToken) {}
}; };
@@ -580,7 +580,7 @@ class SmRootSymbolNode : public SmMathSymbolNode
sal_uLong nBodyWidth; // width of body (argument) of root sign sal_uLong nBodyWidth; // width of body (argument) of root sign
public: public:
SmRootSymbolNode(const SmToken &rNodeToken) explicit SmRootSymbolNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NROOTSYMBOL, rNodeToken) : SmMathSymbolNode(NROOTSYMBOL, rNodeToken)
, nBodyWidth(0) , nBodyWidth(0)
{ {
@@ -607,7 +607,7 @@ class SmDynIntegralSymbolNode : public SmMathSymbolNode
public: public:
SmDynIntegralSymbolNode(const SmToken &rNodeToken) explicit SmDynIntegralSymbolNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NDYNINTSYMBOL, rNodeToken) : SmMathSymbolNode(NDYNINTSYMBOL, rNodeToken)
{} {}
@@ -626,7 +626,7 @@ public:
class SmPlaceNode : public SmMathSymbolNode class SmPlaceNode : public SmMathSymbolNode
{ {
public: public:
SmPlaceNode(const SmToken &rNodeToken) explicit SmPlaceNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NPLACE, rNodeToken) : SmMathSymbolNode(NPLACE, rNodeToken)
{ {
} }
@@ -669,7 +669,7 @@ class SmTableNode : public SmStructureNode
{ {
long nFormulaBaseline; long nFormulaBaseline;
public: public:
SmTableNode(const SmToken &rNodeToken) explicit SmTableNode(const SmToken &rNodeToken)
: SmStructureNode(NTABLE, rNodeToken) : SmStructureNode(NTABLE, rNodeToken)
, nFormulaBaseline(0) , nFormulaBaseline(0)
{ {
@@ -701,7 +701,7 @@ protected:
} }
public: public:
SmLineNode(const SmToken &rNodeToken) explicit SmLineNode(const SmToken &rNodeToken)
: SmStructureNode(NLINE, rNodeToken) : SmStructureNode(NLINE, rNodeToken)
{ {
bUseExtraSpaces = true; bUseExtraSpaces = true;
@@ -725,7 +725,7 @@ public:
class SmExpressionNode : public SmLineNode class SmExpressionNode : public SmLineNode
{ {
public: public:
SmExpressionNode(const SmToken &rNodeToken) explicit SmExpressionNode(const SmToken &rNodeToken)
: SmLineNode(NEXPRESSION, rNodeToken) : SmLineNode(NEXPRESSION, rNodeToken)
{} {}
@@ -742,7 +742,7 @@ public:
class SmUnHorNode : public SmStructureNode class SmUnHorNode : public SmStructureNode
{ {
public: public:
SmUnHorNode(const SmToken &rNodeToken) explicit SmUnHorNode(const SmToken &rNodeToken)
: SmStructureNode(NUNHOR, rNodeToken) : SmStructureNode(NUNHOR, rNodeToken)
{ {
SetNumSubNodes(2); SetNumSubNodes(2);
@@ -772,7 +772,7 @@ protected:
static Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra); static Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra);
public: public:
SmRootNode(const SmToken &rNodeToken) explicit SmRootNode(const SmToken &rNodeToken)
: SmStructureNode(NROOT, rNodeToken) : SmStructureNode(NROOT, rNodeToken)
{ {
SetNumSubNodes(3); SetNumSubNodes(3);
@@ -802,7 +802,7 @@ public:
class SmDynIntegralNode : public SmStructureNode class SmDynIntegralNode : public SmStructureNode
{ {
public: public:
SmDynIntegralNode(const SmToken &rNodeToken) explicit SmDynIntegralNode(const SmToken &rNodeToken)
: SmStructureNode(NDYNINT, rNodeToken) : SmStructureNode(NDYNINT, rNodeToken)
{ {
SetNumSubNodes(2); SetNumSubNodes(2);
@@ -833,7 +833,7 @@ public:
class SmBinHorNode : public SmStructureNode class SmBinHorNode : public SmStructureNode
{ {
public: public:
SmBinHorNode(const SmToken &rNodeToken) explicit SmBinHorNode(const SmToken &rNodeToken)
: SmStructureNode(NBINHOR, rNodeToken) : SmStructureNode(NBINHOR, rNodeToken)
{ {
SetNumSubNodes(3); SetNumSubNodes(3);
@@ -866,7 +866,7 @@ public:
class SmBinVerNode : public SmStructureNode class SmBinVerNode : public SmStructureNode
{ {
public: public:
SmBinVerNode(const SmToken &rNodeToken) explicit SmBinVerNode(const SmToken &rNodeToken)
: SmStructureNode(NBINVER, rNodeToken) : SmStructureNode(NBINVER, rNodeToken)
{ {
SetNumSubNodes(3); SetNumSubNodes(3);
@@ -898,7 +898,7 @@ class SmBinDiagonalNode : public SmStructureNode
const Point &rDiagPoint, double fAngleDeg) const; const Point &rDiagPoint, double fAngleDeg) const;
public: public:
SmBinDiagonalNode(const SmToken &rNodeToken); explicit SmBinDiagonalNode(const SmToken &rNodeToken);
bool IsAscending() const { return bAscending; } bool IsAscending() const { return bAscending; }
void SetAscending(bool bVal) { bAscending = bVal; } void SetAscending(bool bVal) { bAscending = bVal; }
@@ -953,7 +953,7 @@ class SmSubSupNode : public SmStructureNode
bool bUseLimits; bool bUseLimits;
public: public:
SmSubSupNode(const SmToken &rNodeToken) explicit SmSubSupNode(const SmToken &rNodeToken)
: SmStructureNode(NSUBSUP, rNodeToken) : SmStructureNode(NSUBSUP, rNodeToken)
{ {
SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES); SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES);
@@ -1004,7 +1004,7 @@ public:
class SmBraceNode : public SmStructureNode class SmBraceNode : public SmStructureNode
{ {
public: public:
SmBraceNode(const SmToken &rNodeToken) explicit SmBraceNode(const SmToken &rNodeToken)
: SmStructureNode(NBRACE, rNodeToken) : SmStructureNode(NBRACE, rNodeToken)
{ {
SetNumSubNodes(3); SetNumSubNodes(3);
@@ -1037,7 +1037,7 @@ class SmBracebodyNode : public SmStructureNode
long nBodyHeight; long nBodyHeight;
public: public:
inline SmBracebodyNode(const SmToken &rNodeToken); explicit inline SmBracebodyNode(const SmToken &rNodeToken);
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override; virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
long GetBodyHeight() const { return nBodyHeight; } long GetBodyHeight() const { return nBodyHeight; }
@@ -1067,7 +1067,7 @@ inline SmBracebodyNode::SmBracebodyNode(const SmToken &rNodeToken) :
class SmVerticalBraceNode : public SmStructureNode class SmVerticalBraceNode : public SmStructureNode
{ {
public: public:
inline SmVerticalBraceNode(const SmToken &rNodeToken); explicit inline SmVerticalBraceNode(const SmToken &rNodeToken);
SmNode* Body(); SmNode* Body();
const SmNode* Body() const; const SmNode* Body() const;
@@ -1101,7 +1101,7 @@ inline SmVerticalBraceNode::SmVerticalBraceNode(const SmToken &rNodeToken) :
class SmOperNode : public SmStructureNode class SmOperNode : public SmStructureNode
{ {
public: public:
SmOperNode(const SmToken &rNodeToken) explicit SmOperNode(const SmToken &rNodeToken)
: SmStructureNode(NOPER, rNodeToken) : SmStructureNode(NOPER, rNodeToken)
{ {
SetNumSubNodes(2); SetNumSubNodes(2);
@@ -1127,7 +1127,7 @@ public:
class SmAlignNode : public SmStructureNode class SmAlignNode : public SmStructureNode
{ {
public: public:
SmAlignNode(const SmToken &rNodeToken) explicit SmAlignNode(const SmToken &rNodeToken)
: SmStructureNode(NALIGN, rNodeToken) : SmStructureNode(NALIGN, rNodeToken)
{} {}
@@ -1149,7 +1149,7 @@ public:
class SmAttributNode : public SmStructureNode class SmAttributNode : public SmStructureNode
{ {
public: public:
SmAttributNode(const SmToken &rNodeToken) explicit SmAttributNode(const SmToken &rNodeToken)
: SmStructureNode(NATTRIBUT, rNodeToken) : SmStructureNode(NATTRIBUT, rNodeToken)
{} {}
@@ -1174,7 +1174,7 @@ class SmFontNode : public SmStructureNode
Fraction aFontSize; Fraction aFontSize;
public: public:
SmFontNode(const SmToken &rNodeToken) explicit SmFontNode(const SmToken &rNodeToken)
: SmStructureNode(NFONT, rNodeToken) : SmStructureNode(NFONT, rNodeToken)
{ {
nSizeType = FontSizeType::MULTIPLY; nSizeType = FontSizeType::MULTIPLY;
@@ -1203,7 +1203,7 @@ class SmMatrixNode : public SmStructureNode
nNumCols; nNumCols;
public: public:
SmMatrixNode(const SmToken &rNodeToken) explicit SmMatrixNode(const SmToken &rNodeToken)
: SmStructureNode(NMATRIX, rNodeToken) : SmStructureNode(NMATRIX, rNodeToken)
{ {
nNumRows = nNumCols = 0; nNumRows = nNumCols = 0;
@@ -1230,7 +1230,7 @@ class SmBlankNode : public SmGraphicNode
sal_uInt16 nNum; sal_uInt16 nNum;
public: public:
SmBlankNode(const SmToken &rNodeToken) explicit SmBlankNode(const SmToken &rNodeToken)
: SmGraphicNode(NBLANK, rNodeToken) : SmGraphicNode(NBLANK, rNodeToken)
{ {
nNum = 0; nNum = 0;

4
starmath/inc/smmod.hxx
View File

@@ -56,7 +56,7 @@ class VirtualDevice;
class SmResId : public ResId class SmResId : public ResId
{ {
public: public:
SmResId(sal_uInt16 nId); explicit SmResId(sal_uInt16 nId);
}; };
#define SM_RESSTR(x) SmResId(x).toString() #define SM_RESSTR(x) SmResId(x).toString()
@@ -101,7 +101,7 @@ private:
static void InitInterface_Impl(); static void InitInterface_Impl();
public: public:
SmModule(SfxObjectFactory* pObjFact); explicit SmModule(SfxObjectFactory* pObjFact);
virtual ~SmModule(); virtual ~SmModule();
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override; virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;

2
starmath/inc/unomodel.hxx
View File

@@ -59,7 +59,7 @@ protected:
virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
public: public:
SmModel( SfxObjectShell *pObjSh = nullptr ); explicit SmModel( SfxObjectShell *pObjSh = nullptr );
virtual ~SmModel() throw (); virtual ~SmModel() throw ();
//XInterface //XInterface

2
starmath/inc/utility.hxx
View File

@@ -118,7 +118,7 @@ protected:
static OUString GetStringItem(const vcl::Font &rItem); static OUString GetStringItem(const vcl::Font &rItem);
public: public:
SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {} explicit SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
virtual ~SmFontPickList() { Clear(); } virtual ~SmFontPickList() { Clear(); }
virtual void Insert(const vcl::Font &rFont); virtual void Insert(const vcl::Font &rFont);

2
starmath/inc/view.hxx
View File

@@ -98,7 +98,7 @@ private:
void CaretBlinkStart(); void CaretBlinkStart();
void CaretBlinkStop(); void CaretBlinkStop();
public: public:
SmGraphicWindow(SmViewShell* pShell); explicit SmGraphicWindow(SmViewShell* pShell);
virtual ~SmGraphicWindow(); virtual ~SmGraphicWindow();
virtual void dispose() override; virtual void dispose() override;

2
starmath/inc/visitors.hxx
View File

@@ -293,7 +293,7 @@ class SmCaretPosGraphBuildingVisitor : public SmVisitor
{ {
public: public:
/** Builds a caret position graph for pRootNode */ /** Builds a caret position graph for pRootNode */
SmCaretPosGraphBuildingVisitor( SmNode* pRootNode ); explicit SmCaretPosGraphBuildingVisitor( SmNode* pRootNode );
virtual ~SmCaretPosGraphBuildingVisitor(); virtual ~SmCaretPosGraphBuildingVisitor();
void Visit( SmTableNode* pNode ) override; void Visit( SmTableNode* pNode ) override;
void Visit( SmBraceNode* pNode ) override; void Visit( SmBraceNode* pNode ) override;