connectivity/source/drivers/firebird/Connection.cxx | 2 connectivity/source/drivers/firebird/Connection.hxx | 2 connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 2 connectivity/source/drivers/firebird/Driver.hxx | 2 connectivity/source/drivers/firebird/Statement.hxx | 2 connectivity/source/drivers/firebird/StatementCommonBase.hxx | 2 connectivity/source/drivers/firebird/User.hxx | 4 connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 2 connectivity/source/drivers/kab/KCatalog.hxx | 2 connectivity/source/drivers/kab/KDatabaseMetaData.hxx | 2 connectivity/source/drivers/kab/KDriver.hxx | 4 connectivity/source/drivers/kab/KResultSet.hxx | 2 connectivity/source/drivers/kab/KStatement.hxx | 4 connectivity/source/drivers/kab/kcondition.hxx | 8 connectivity/source/drivers/macab/MacabCatalog.hxx | 2 connectivity/source/drivers/macab/MacabConnection.hxx | 2 connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx | 2 connectivity/source/drivers/macab/MacabDriver.hxx | 2 connectivity/source/drivers/macab/MacabRecord.hxx | 2 connectivity/source/drivers/macab/MacabRecords.hxx | 4 connectivity/source/drivers/macab/MacabResultSet.hxx | 2 connectivity/source/drivers/macab/MacabStatement.hxx | 4 connectivity/source/drivers/macab/macabcondition.hxx | 2 connectivity/source/drivers/mork/MCatalog.hxx | 2 connectivity/source/drivers/mork/MColumnAlias.hxx | 2 connectivity/source/drivers/mork/MConnection.hxx | 2 connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 2 connectivity/source/drivers/mork/MDriver.hxx | 2 connectivity/source/drivers/mork/MNSINIParser.hxx | 2 connectivity/source/drivers/mork/MQueryHelper.hxx | 4 connectivity/source/drivers/mork/MResultSet.hxx | 2 connectivity/source/drivers/mork/MStatement.hxx | 4 connectivity/source/drivers/mork/MorkParser.hxx | 2 connectivity/source/drivers/mozab/MCatalog.hxx | 2 connectivity/source/drivers/mozab/MColumnAlias.hxx | 2 connectivity/source/drivers/mozab/MConnection.hxx | 2 connectivity/source/drivers/mozab/MDatabaseMetaData.hxx | 2 connectivity/source/drivers/mozab/MDriver.hxx | 2 connectivity/source/drivers/mozab/MResultSet.hxx | 2 connectivity/source/drivers/mozab/MStatement.hxx | 4 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 2 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx | 2 connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx | 5 connectivity/source/drivers/odbc/ORealDriver.cxx | 2 connectivity/source/drivers/postgresql/pq_driver.hxx | 2 connectivity/source/drivers/postgresql/pq_tools.hxx | 4 connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 2 connectivity/source/drivers/postgresql/pq_xcontainer.hxx | 2 connectivity/source/manager/mdrivermanager.cxx | 10 connectivity/source/manager/mdrivermanager.hxx | 2 connectivity/workben/iniParser/main.cxx | 2 cui/source/customize/macropg_impl.hxx | 2 cui/source/dialogs/colorpicker.cxx | 2 cui/source/factory/dlgfact.hxx | 4 cui/source/options/certpath.hxx | 2 cui/source/options/connpooloptions.cxx | 2 cui/source/options/optaboutconfig.hxx | 2 cui/source/options/optcolor.cxx | 4 cui/source/options/optjava.hxx | 4 cui/source/options/optlingu.cxx | 4 cui/source/options/optpath.cxx | 2 cui/source/options/personalization.hxx | 2 cui/source/options/treeopt.cxx | 2 cui/source/options/tsaurls.hxx | 2 cui/source/options/webconninfo.hxx | 2 cui/source/tabpages/autocdlg.cxx | 2 cui/source/tabpages/backgrnd.cxx | 2 forms/source/xforms/binding.cxx | 6 starmath/inc/parse.hxx | 58 +- starmath/source/parse.cxx | 217 ++++------ svx/source/xoutdev/xattr.cxx | 19 sw/uiconfig/swriter/ui/mailmerge.ui | 2 vcl/inc/salframe.hxx | 4 vcl/source/app/salvtables.cxx | 2 vcl/source/window/paint.cxx | 2 vcl/unx/gtk/window/gtksalframe.cxx | 18 76 files changed, 242 insertions(+), 263 deletions(-)
New commits: commit 6dc1d2706f519d91617ac1a12fc2051d97ef98c0 Author: Caolán McNamara <[email protected]> Date: Mon Jun 15 10:56:33 2015 +0100 another stab at tdf#91393 block paints only if the new requested size is larger than the original and unblock on explicit expose events as well as configure ones Change-Id: I72829a5b6e55d6bbdaf934af427ee3b50fe11fd4 diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index f5213a1..d576b60 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -102,7 +102,7 @@ class VCL_PLUGIN_PUBLIC SalFrame , public SalGeometryProvider { protected: - bool m_bAwaitingSizeConfirmation; + bool m_bPaintsBlocked; private: // the VCL window corresponding to this frame VclPtr<vcl::Window> m_pWindow; @@ -246,7 +246,7 @@ public: long CallCallback( sal_uInt16 nEvent, const void* pEvent ) const { return m_pProc ? long(m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent )) : 0; } - bool AwaitingSizeConfirmation() const { return m_bAwaitingSizeConfirmation; } + bool PaintsBlocked() const { return m_bPaintsBlocked; } }; #endif // INCLUDED_VCL_INC_SALFRAME_HXX diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7a68df2..4c56363 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -30,7 +30,7 @@ SalFrame::SalFrame() - : m_bAwaitingSizeConfirmation(false) + : m_bPaintsBlocked(false) , m_pWindow(NULL) , m_pProc(NULL) { diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 2bca30e..0bac418 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -587,7 +587,7 @@ IMPL_LINK_NOARG_TYPED(Window, ImplHandlePaintHdl, Idle *, void) // save paint events until resizing or initial sizing done if (!ImplDoTiledRendering() && mpWindowImpl->mbFrame && (mpWindowImpl->mpFrameData->maResizeIdle.IsActive() || - mpWindowImpl->mpFrame->AwaitingSizeConfirmation())) + mpWindowImpl->mpFrame->PaintsBlocked())) { mpWindowImpl->mpFrameData->maPaintIdle.Start(); } diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index d13acf0..4a658cb 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -936,23 +936,23 @@ void GtkSalFrame::moveWindow( long nX, long nY ) void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight) { gint nOrigwidth, nOrigheight; - gtk_widget_get_size_request(m_pWindow, &nOrigwidth, &nOrigheight); - if (nOrigwidth != nWidth || nOrigheight != nHeight) + gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight); + if (nWidth > nOrigwidth || nHeight > nOrigheight) { - m_bAwaitingSizeConfirmation = true; - gtk_widget_set_size_request(m_pWindow, nWidth, nHeight ); + m_bPaintsBlocked = true; } + gtk_widget_set_size_request(m_pWindow, nWidth, nHeight ); } void GtkSalFrame::window_resize(long nWidth, long nHeight) { gint nOrigwidth, nOrigheight; gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight); - if (nOrigwidth != nWidth || nOrigheight != nHeight) + if (nWidth > nOrigwidth || nHeight > nOrigheight) { - m_bAwaitingSizeConfirmation = true; - gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); + m_bPaintsBlocked = true; } + gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); } void GtkSalFrame::resizeWindow( long nWidth, long nHeight ) @@ -3535,6 +3535,7 @@ void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect) gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) { GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); + pThis->m_bPaintsBlocked = false; cairo_save(cr); @@ -3557,6 +3558,7 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) { GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); + pThis->m_bPaintsBlocked = false; struct SalPaintEvent aEvent( pEvent->area.x, pEvent->area.y, pEvent->area.width, pEvent->area.height ); @@ -3709,7 +3711,7 @@ gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame ) { GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - pThis->m_bAwaitingSizeConfirmation = false; + pThis->m_bPaintsBlocked = false; bool bMoved = false, bSized = false; int x = pEvent->x, y = pEvent->y; commit 1303f209415b6cf95f9cbe9924d03c87ed4337d6 Author: Caolán McNamara <[email protected]> Date: Sun Jun 14 21:27:57 2015 +0100 set ok as default button for mail merge dialog Change-Id: I2b1a20abb52a2ccc07f77a878b4b9e68c301a5f7 diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui index 7116132..9ce2cbf 100644 --- a/sw/uiconfig/swriter/ui/mailmerge.ui +++ b/sw/uiconfig/swriter/ui/mailmerge.ui @@ -26,6 +26,8 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> </object> commit 9b010ed70ef9468d5f0d89c44738e63df3c3c57d Author: Caolán McNamara <[email protected]> Date: Sun Jun 14 21:22:08 2015 +0100 cppcheck: variableScope Change-Id: Idbf5301d17d413077c7dc436a6f140a412ae71cd diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index a46bfe9..d83941c9 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -855,12 +855,12 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case 0: { uno::Sequence< beans::PropertyValue > aPropSeq; - ::com::sun::star::drawing::LineDash aLineDash; - OUString aName; - bool bLineDash( false ); if ( rVal >>= aPropSeq ) { + css::drawing::LineDash aLineDash; + OUString aName; + bool bLineDash( false ); for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ ) { if ( aPropSeq[n].Name == "Name" ) @@ -2591,12 +2591,12 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI case 0: { uno::Sequence< beans::PropertyValue > aPropSeq; - ::com::sun::star::awt::Gradient aGradient2; - OUString aName; - bool bGradient( false ); if ( rVal >>= aPropSeq ) { + css::awt::Gradient aGradient2; + OUString aName; + bool bGradient( false ); for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ ) { if ( aPropSeq[n].Name == "Name" ) @@ -3046,12 +3046,11 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case 0: { uno::Sequence< beans::PropertyValue > aPropSeq; - ::com::sun::star::drawing::Hatch aUnoHatch; - OUString aName; - bool bHatch( false ); - if ( rVal >>= aPropSeq ) { + css::drawing::Hatch aUnoHatch; + OUString aName; + bool bHatch( false ); for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ ) { if ( aPropSeq[n].Name == "Name" ) commit ac34f33dca9d9e4a83e64f70ed0f395a157f0325 Author: Caolán McNamara <[email protected]> Date: Sun Jun 14 21:18:11 2015 +0100 cppcheck: silence bogus unusedScopedObject Change-Id: I033b9e141bde73820972f285e97f5c14d60b1a43 diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index fc40be8..4c04e80 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -62,35 +62,35 @@ class SmParser inline bool TokenInGroup( sal_uLong nGroup ); // grammar - void Table(); - void Line(); - void Expression(); - void Relation(); - void Sum(); - void Product(); - void SubSup(sal_uLong nActiveGroup); - void OpSubSup(); - void Power(); - void Blank(); - void Term(bool bGroupNumberIdent); - void Escape(); - void Operator(); - void Oper(); - void UnOper(); - void Align(); - void FontAttribut(); - void Attribut(); - void Font(); - void FontSize(); - void Color(); - void Brace(); - void Bracebody(bool bIsLeftRight); - void Function(); - void Binom(); - void Stack(); - void Matrix(); - void Special(); - void GlyphSpecial(); + void DoTable(); + void DoLine(); + void DoExpression(); + void DoRelation(); + void DoSum(); + void DoProduct(); + void DoSubSup(sal_uLong nActiveGroup); + void DoOpSubSup(); + void DoPower(); + void DoBlank(); + void DoTerm(bool bGroupNumberIdent); + void DoEscape(); + void DoOperator(); + void DoOper(); + void DoUnOper(); + void DoAlign(); + void DoFontAttribut(); + void DoAttribut(); + void DoFont(); + void DoFontSize(); + void DoColor(); + void DoBrace(); + void DoBracebody(bool bIsLeftRight); + void DoFunction(); + void DoBinom(); + void DoStack(); + void DoMatrix(); + void DoSpecial(); + void DoGlyphSpecial(); // end of grammar LanguageType GetLanguage() const { return m_nLang; } diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 04843d0..4a45a2f 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -952,21 +952,17 @@ void SmParser::NextToken() m_nBufferIndex = aRes.EndPos; } - - // grammar - - -void SmParser::Table() +void SmParser::DoTable() { SmNodeArray LineArray; - Line(); + DoLine(); while (m_aCurToken.eType == TNEWLINE) { NextToken(); - Line(); + DoLine(); } if (m_aCurToken.eType != TEND) @@ -987,8 +983,7 @@ void SmParser::Table() m_aNodeStack.push_front(pSNode); } - -void SmParser::Align() +void SmParser::DoAlign() // parse alignment info (if any), then go on with rest of expression { SmStructureNode *pSNode = 0; @@ -1008,7 +1003,7 @@ void SmParser::Align() } } - Expression(); + DoExpression(); if (pSNode) { @@ -1017,8 +1012,7 @@ void SmParser::Align() } } - -void SmParser::Line() +void SmParser::DoLine() { sal_uInt16 n = 0; SmNodeArray ExpressionArray; @@ -1029,14 +1023,15 @@ void SmParser::Line() // (and go on with expressions that must not have alignment // statements in 'while' loop below. See also 'Expression()'.) if (m_aCurToken.eType != TEND && m_aCurToken.eType != TNEWLINE) - { Align(); + { + DoAlign(); ExpressionArray.resize(++n); ExpressionArray[n - 1] = popOrZero(m_aNodeStack); } while (m_aCurToken.eType != TEND && m_aCurToken.eType != TNEWLINE) { - Expression(); + DoExpression(); ExpressionArray.resize(++n); ExpressionArray[n - 1] = popOrZero(m_aNodeStack); } @@ -1056,8 +1051,7 @@ void SmParser::Line() m_aNodeStack.push_front(pSNode); } - -void SmParser::Expression() +void SmParser::DoExpression() { bool bUseExtraSpaces = true; if (!m_aNodeStack.empty()) @@ -1074,12 +1068,13 @@ void SmParser::Expression() RelationArray.resize(n); - Relation(); + DoRelation(); RelationArray.resize(++n); RelationArray[n - 1] = popOrZero(m_aNodeStack); while (m_aCurToken.nLevel >= 4) - { Relation(); + { + DoRelation(); RelationArray.resize(++n); RelationArray[n - 1] = popOrZero(m_aNodeStack); } @@ -1098,48 +1093,45 @@ void SmParser::Expression() } } - -void SmParser::Relation() +void SmParser::DoRelation() { - Sum(); + DoSum(); while (TokenInGroup(TGRELATION)) { SmStructureNode *pSNode = new SmBinHorNode(m_aCurToken); SmNode *pFirst = popOrZero(m_aNodeStack); - OpSubSup(); + DoOpSubSup(); SmNode *pSecond = popOrZero(m_aNodeStack); - Sum(); + DoSum(); pSNode->SetSubNodes(pFirst, pSecond, popOrZero(m_aNodeStack)); m_aNodeStack.push_front(pSNode); } } - -void SmParser::Sum() +void SmParser::DoSum() { - Product(); + DoProduct(); while (TokenInGroup(TGSUM)) { SmStructureNode *pSNode = new SmBinHorNode(m_aCurToken); SmNode *pFirst = popOrZero(m_aNodeStack); - OpSubSup(); + DoOpSubSup(); SmNode *pSecond = popOrZero(m_aNodeStack); - Product(); + DoProduct(); pSNode->SetSubNodes(pFirst, pSecond, popOrZero(m_aNodeStack)); m_aNodeStack.push_front(pSNode); } } - -void SmParser::Product() +void SmParser::DoProduct() { - Power(); + DoPower(); while (TokenInGroup(TGPRODUCT)) { SmStructureNode *pSNode; @@ -1165,7 +1157,7 @@ void SmParser::Product() m_aCurToken.eType = TBOPER; m_aCurToken.nGroup = TGPRODUCT; - GlyphSpecial(); + DoGlyphSpecial(); pOper = popOrZero(m_aNodeStack); break; @@ -1194,11 +1186,11 @@ void SmParser::Product() default: pSNode = new SmBinHorNode(m_aCurToken); - OpSubSup(); + DoOpSubSup(); pOper = popOrZero(m_aNodeStack); } - Power(); + DoPower(); if (bSwitchArgs) { @@ -1213,8 +1205,7 @@ void SmParser::Product() } } - -void SmParser::SubSup(sal_uLong nActiveGroup) +void SmParser::DoSubSup(sal_uLong nActiveGroup) { OSL_ENSURE(nActiveGroup == TGPOWER || nActiveGroup == TGLIMIT, "Sm: wrong token group"); @@ -1250,13 +1241,14 @@ void SmParser::SubSup(sal_uLong nActiveGroup) if (eType == TFROM || eType == TTO) { // parse limits in old 4.0 and 5.0 style - Relation(); + DoRelation(); } else - Term(true); + DoTerm(true); switch (eType) - { case TRSUB : nIndex = (int) RSUB; break; + { + case TRSUB : nIndex = (int) RSUB; break; case TRSUP : nIndex = (int) RSUP; break; case TFROM : case TCSUB : nIndex = (int) CSUB; break; @@ -1281,8 +1273,7 @@ void SmParser::SubSup(sal_uLong nActiveGroup) m_aNodeStack.push_front(pNode); } - -void SmParser::OpSubSup() +void SmParser::DoOpSubSup() { // push operator symbol m_aNodeStack.push_front(new SmMathSymbolNode(m_aCurToken)); @@ -1290,20 +1281,18 @@ void SmParser::OpSubSup() NextToken(); // get sub- supscripts if any if (TokenInGroup(TGPOWER)) - SubSup(TGPOWER); + DoSubSup(TGPOWER); } - -void SmParser::Power() +void SmParser::DoPower() { // get body for sub- supscripts on top of stack - Term(false); + DoTerm(false); - SubSup(TGPOWER); + DoSubSup(TGPOWER); } - -void SmParser::Blank() +void SmParser::DoBlank() { OSL_ENSURE(TokenInGroup(TGBLANK), "Sm : wrong token"); SmBlankNode *pBlankNode = new SmBlankNode(m_aCurToken); @@ -1324,13 +1313,12 @@ void SmParser::Blank() m_aNodeStack.push_front(pBlankNode); } - -void SmParser::Term(bool bGroupNumberIdent) +void SmParser::DoTerm(bool bGroupNumberIdent) { switch (m_aCurToken.eType) { case TESCAPE : - Escape(); + DoEscape(); break; case TNOSPACE : @@ -1345,7 +1333,7 @@ void SmParser::Term(bool bGroupNumberIdent) if (m_aCurToken.eType != TLGROUP) { m_aNodeStack.pop_front(); // get rid of the 'no space' node pushed above - Term(false); + DoTerm(false); } else { @@ -1364,7 +1352,7 @@ void SmParser::Term(bool bGroupNumberIdent) } else // go as usual { - Align(); + DoAlign(); if (m_aCurToken.eType != TRGROUP) Error(PE_RGROUP_EXPECTED); else @@ -1375,12 +1363,12 @@ void SmParser::Term(bool bGroupNumberIdent) break; case TLEFT : - Brace(); + DoBrace(); break; case TBLANK : case TSBLANK : - Blank(); + DoBlank(); break; case TTEXT : @@ -1505,30 +1493,33 @@ void SmParser::Term(bool bGroupNumberIdent) break; case TSPECIAL: - Special(); + DoSpecial(); break; case TBINOM: - Binom(); + DoBinom(); break; case TSTACK: - Stack(); + DoStack(); break; case TMATRIX: - Matrix(); + DoMatrix(); break; default: if (TokenInGroup(TGLBRACES)) - { Brace(); + { + DoBrace(); } else if (TokenInGroup(TGOPER)) - { Operator(); + { + DoOperator(); } else if (TokenInGroup(TGUNOPER)) - { UnOper(); + { + DoUnOper(); } else if ( TokenInGroup(TGATTRIBUT) || TokenInGroup(TGFONTATTR)) @@ -1541,9 +1532,9 @@ void SmParser::Term(bool bGroupNumberIdent) { aArray.resize(n + 1); if (bIsAttr) - Attribut(); + DoAttribut(); else - FontAttribut(); + DoFontAttribut(); SmNode* pTmp = popOrZero(m_aNodeStack); @@ -1554,7 +1545,7 @@ void SmParser::Term(bool bGroupNumberIdent) n++; } - Power(); + DoPower(); SmNode *pFirstNode = popOrZero(m_aNodeStack); while (n > 0) @@ -1566,15 +1557,14 @@ void SmParser::Term(bool bGroupNumberIdent) } else if (TokenInGroup(TGFUNCTION)) { - Function(); + DoFunction(); } else Error(PE_UNEXPECTED_CHAR); } } - -void SmParser::Escape() +void SmParser::DoEscape() { NextToken(); @@ -1611,29 +1601,27 @@ void SmParser::Escape() NextToken(); } - -void SmParser::Operator() +void SmParser::DoOperator() { if (TokenInGroup(TGOPER)) { SmStructureNode *pSNode = new SmOperNode(m_aCurToken); // put operator on top of stack - Oper(); + DoOper(); if (TokenInGroup(TGLIMIT) || TokenInGroup(TGPOWER)) - SubSup(m_aCurToken.nGroup); + DoSubSup(m_aCurToken.nGroup); SmNode *pOperator = popOrZero(m_aNodeStack); // get argument - Power(); + DoPower(); pSNode->SetSubNodes(pOperator, popOrZero(m_aNodeStack)); m_aNodeStack.push_front(pSNode); } } - -void SmParser::Oper() +void SmParser::DoOper() { SmTokenType eType (m_aCurToken.eType); SmNode *pNode = NULL; @@ -1686,8 +1674,7 @@ void SmParser::Oper() NextToken(); } - -void SmParser::UnOper() +void SmParser::DoUnOper() { OSL_ENSURE(TokenInGroup(TGUNOPER), "Sm: wrong token"); @@ -1713,7 +1700,7 @@ void SmParser::UnOper() case TNROOT : NextToken(); - Power(); + DoPower(); pExtra = popOrZero(m_aNodeStack); break; @@ -1722,7 +1709,7 @@ void SmParser::UnOper() //Let the glyph know what it is... m_aCurToken.eType = TUOPER; m_aCurToken.nGroup = TGUNOPER; - GlyphSpecial(); + DoGlyphSpecial(); pOper = popOrZero(m_aNodeStack); break; @@ -1732,7 +1719,7 @@ void SmParser::UnOper() case TMINUSPLUS : case TNEG : case TFACT : - OpSubSup(); + DoOpSubSup(); pOper = popOrZero(m_aNodeStack); break; @@ -1741,7 +1728,7 @@ void SmParser::UnOper() } // get argument - Power(); + DoPower(); pArg = popOrZero(m_aNodeStack); if (eType == TABS) @@ -1784,8 +1771,7 @@ void SmParser::UnOper() m_aNodeStack.push_front(pSNode); } - -void SmParser::Attribut() +void SmParser::DoAttribut() { OSL_ENSURE(TokenInGroup(TGATTRIBUT), "Sm: wrong token group"); @@ -1821,7 +1807,7 @@ void SmParser::Attribut() } -void SmParser::FontAttribut() +void SmParser::DoFontAttribut() { OSL_ENSURE(TokenInGroup(TGFONTATTR), "Sm: wrong token group"); @@ -1837,15 +1823,15 @@ void SmParser::FontAttribut() break; case TSIZE : - FontSize(); + DoFontSize(); break; case TFONT : - Font(); + DoFont(); break; case TCOLOR : - Color(); + DoColor(); break; default : @@ -1853,8 +1839,7 @@ void SmParser::FontAttribut() } } - -void SmParser::Color() +void SmParser::DoColor() { OSL_ENSURE(m_aCurToken.eType == TCOLOR, "Sm : Ooops..."); @@ -1874,8 +1859,7 @@ void SmParser::Color() m_aNodeStack.push_front(new SmFontNode(aToken)); } - -void SmParser::Font() +void SmParser::DoFont() { OSL_ENSURE(m_aCurToken.eType == TFONT, "Sm : Ooops..."); @@ -1918,7 +1902,7 @@ static bool lcl_IsNumber(const OUString& rText) return true; } -void SmParser::FontSize() +void SmParser::DoFontSize() { OSL_ENSURE(m_aCurToken.eType == TSIZE, "Sm : Ooops..."); @@ -1986,8 +1970,7 @@ void SmParser::FontSize() m_aNodeStack.push_front(pFontNode); } - -void SmParser::Brace() +void SmParser::DoBrace() { OSL_ENSURE(m_aCurToken.eType == TLEFT || TokenInGroup(TGLBRACES), "Sm: kein Klammer Ausdruck"); @@ -2010,7 +1993,7 @@ void SmParser::Brace() pLeft = new SmMathSymbolNode(m_aCurToken); NextToken(); - Bracebody(true); + DoBracebody(true); pBody = popOrZero(m_aNodeStack); if (m_aCurToken.eType == TRIGHT) @@ -2038,7 +2021,7 @@ void SmParser::Brace() pLeft = new SmMathSymbolNode(m_aCurToken); NextToken(); - Bracebody(false); + DoBracebody(false); pBody = popOrZero(m_aNodeStack); SmTokenType eExpectedType = TUNKNOWN; @@ -2085,8 +2068,7 @@ void SmParser::Brace() } } - -void SmParser::Bracebody(bool bIsLeftRight) +void SmParser::DoBracebody(bool bIsLeftRight) { SmStructureNode *pBody = new SmBracebodyNode(m_aCurToken); SmNodeArray aNodes; @@ -2104,7 +2086,8 @@ void SmParser::Bracebody(bool bIsLeftRight) nNum++; } else if (m_aCurToken.eType != TRIGHT) - { Align(); + { + DoAlign(); nNum++; if (m_aCurToken.eType != TMLINE && m_aCurToken.eType != TRIGHT) @@ -2123,7 +2106,8 @@ void SmParser::Bracebody(bool bIsLeftRight) nNum++; } else if (!TokenInGroup(TGRBRACES)) - { Align(); + { + DoAlign(); nNum++; if (m_aCurToken.eType != TMLINE && !TokenInGroup(TGRBRACES)) @@ -2144,8 +2128,7 @@ void SmParser::Bracebody(bool bIsLeftRight) m_aNodeStack.push_front(pBody); } - -void SmParser::Function() +void SmParser::DoFunction() { switch (m_aCurToken.eType) { @@ -2181,16 +2164,15 @@ void SmParser::Function() } } - -void SmParser::Binom() +void SmParser::DoBinom() { SmNodeArray ExpressionArray; SmStructureNode *pSNode = new SmTableNode(m_aCurToken); NextToken(); - Sum(); - Sum(); + DoSum(); + DoSum(); ExpressionArray.resize(2); @@ -2203,8 +2185,7 @@ void SmParser::Binom() m_aNodeStack.push_front(pSNode); } - -void SmParser::Stack() +void SmParser::DoStack() { SmNodeArray ExpressionArray; NextToken(); @@ -2215,7 +2196,7 @@ void SmParser::Stack() do { NextToken(); - Align(); + DoAlign(); n++; } while (m_aCurToken.eType == TPOUND); @@ -2244,8 +2225,7 @@ void SmParser::Stack() Error(PE_LGROUP_EXPECTED); } - -void SmParser::Matrix() +void SmParser::DoMatrix() { SmNodeArray ExpressionArray; @@ -2257,7 +2237,7 @@ void SmParser::Matrix() do { NextToken(); - Align(); + DoAlign(); c++; } while (m_aCurToken.eType == TPOUND); @@ -2269,7 +2249,7 @@ void SmParser::Matrix() NextToken(); for (sal_uInt16 i = 0; i < c; i++) { - Align(); + DoAlign(); if (i < (c - 1)) { if (m_aCurToken.eType == TPOUND) @@ -2307,8 +2287,7 @@ void SmParser::Matrix() Error(PE_LGROUP_EXPECTED); } - -void SmParser::Special() +void SmParser::DoSpecial() { bool bReplace = false; OUString &rName = m_aCurToken.aText; @@ -2349,14 +2328,12 @@ void SmParser::Special() NextToken(); } - -void SmParser::GlyphSpecial() +void SmParser::DoGlyphSpecial() { m_aNodeStack.push_front(new SmGlyphSpecialNode(m_aCurToken)); NextToken(); } - void SmParser::Error(SmParseError eError) { SmStructureNode *pSNode = new SmExpressionNode(m_aCurToken); @@ -2406,7 +2383,7 @@ SmNode *SmParser::Parse(const OUString &rBuffer) SetLanguage( Application::GetSettings().GetUILanguageTag().getLanguageType() ); NextToken(); - Table(); + DoTable(); SmNode* result = popOrZero(m_aNodeStack); return result; @@ -2427,7 +2404,7 @@ SmNode *SmParser::ParseExpression(const OUString &rBuffer) SetLanguage( Application::GetSettings().GetUILanguageTag().getLanguageType() ); NextToken(); - Expression(); + DoExpression(); SmNode* result = popOrZero(m_aNodeStack); return result; commit 8d8f264f57517823a7073eff73f8a8b9c2610ed1 Author: Caolán McNamara <[email protected]> Date: Sun Jun 14 21:02:27 2015 +0100 cppcheck: passedByValue Change-Id: I444c40340bcfd64f88dac34da6cc858f66996fe6 diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 96487e3..face92b 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -660,7 +660,7 @@ void Binding::bind( bool bForceRebind ) // helper for Binding::valueModified -static void lcl_modified( const Binding::XModifyListener_t xListener, +static void lcl_modified( const Binding::XModifyListener_t& xListener, const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -668,7 +668,7 @@ static void lcl_modified( const Binding::XModifyListener_t xListener, } // helper for Binding::valueModified -static void lcl_listentry( const Binding::XListEntryListener_t xListener, +static void lcl_listentry( const Binding::XListEntryListener_t& xListener, const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -677,7 +677,7 @@ static void lcl_listentry( const Binding::XListEntryListener_t xListener, } // helper for Binding::valueModified -static void lcl_validate( const Binding::XValidityConstraintListener_t xListener, +static void lcl_validate( const Binding::XValidityConstraintListener_t& xListener, const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); commit 8066c73940a30e97d8634655ea39d73fa8cf3c20 Author: Caolán McNamara <[email protected]> Date: Sun Jun 14 20:57:16 2015 +0100 cppcheck: noExplicitConstructor Change-Id: I2b5fba9cdd950349a8e8d22bbd7bb6e17f008920 diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 6ba3b1c..6e3fc15 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -112,7 +112,7 @@ void SAL_CALL Connection::release() throw() struct ConnectionGuard { oslInterlockedCount& m_refCount; - ConnectionGuard(oslInterlockedCount& refCount) + explicit ConnectionGuard(oslInterlockedCount& refCount) : m_refCount(refCount) { osl_atomic_increment(&m_refCount); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 5ce3387..1e90581 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -171,7 +171,7 @@ namespace connectivity OUString transformPreparedStatement(const OUString& _sSQL); public: - Connection(FirebirdDriver* _pDriver); + explicit Connection(FirebirdDriver* _pDriver); virtual ~Connection(); void construct( const ::rtl::OUString& url, diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index abb4c1d..fb43242 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -40,7 +40,7 @@ namespace connectivity ::rtl::Reference<Connection> m_pConnection; public: - ODatabaseMetaData(Connection* _pCon); + explicit ODatabaseMetaData(Connection* _pCon); virtual ~ODatabaseMetaData(); // as I mentioned before this interface is really BIG diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index d8785e8..34bfb97 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -63,7 +63,7 @@ namespace connectivity public: - FirebirdDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + explicit FirebirdDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); virtual ~FirebirdDriver(); const css::uno::Reference<css::uno::XComponentContext>& getContext() const { return m_aContext; } diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index cf785b6..f8673cf4 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -44,7 +44,7 @@ namespace connectivity public: // a constructor, which is required for returning objects: - OStatement( Connection* _pConnection) + explicit OStatement( Connection* _pConnection) : OStatementCommonBase( _pConnection), m_pSqlda(0) {} diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 8ebbad6..29c4b28 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -104,7 +104,7 @@ namespace connectivity public: ::cppu::OBroadcastHelper& rBHelper; - OStatementCommonBase(Connection* _pConnection); + explicit OStatementCommonBase(Connection* _pConnection); using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx index 775cf9c..89133ff 100644 --- a/connectivity/source/drivers/firebird/User.hxx +++ b/connectivity/source/drivers/firebird/User.hxx @@ -29,7 +29,7 @@ namespace connectivity /** * Create a "new" descriptor, which isn't yet in the database. */ - User(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection); + explicit User(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection); /** * For a user that already exists in the db. */ @@ -46,4 +46,4 @@ namespace connectivity #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USER_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index a542403..1eded7b 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -37,7 +37,7 @@ namespace connectivity protected: virtual ~OConnectionController() {m_pDriver = NULL;} public: - OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){} + explicit OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){} // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index 682f66a..abcc26f 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -34,7 +34,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: - KabCatalog(KabConnection* _pCon); + explicit KabCatalog(KabConnection* _pCon); inline KabConnection* getConnection() const { return m_pConnection; } diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index d3de2e4..21c51eb 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -41,7 +41,7 @@ namespace connectivity public: - KabDatabaseMetaData(KabConnection* _pCon); + explicit KabDatabaseMetaData(KabConnection* _pCon); static const OUString & getAddressBookTableName(); virtual ~KabDatabaseMetaData(); diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index 429b9f8..42cea30 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -65,7 +65,7 @@ namespace connectivity KDEVersionCheckFunction m_pKDEVersionCheckFunc; public: - KabImplModule( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + explicit KabImplModule( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); /** determines whether there is a KDE present in the environment */ @@ -155,7 +155,7 @@ namespace connectivity static OUString impl_getConfigurationSettingsPath(); protected: - KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + explicit KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 78fbffe..fc347d4 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -91,7 +91,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - KabResultSet(KabCommonStatement *pStmt); + explicit KabResultSet(KabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index 9c45ea1..bd01eaf 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -93,7 +93,7 @@ namespace connectivity public: ::cppu::OBroadcastHelper& rBHelper; - KabCommonStatement(KabConnection *_pConnection); + explicit KabCommonStatement(KabConnection *_pConnection); using KabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper @@ -151,7 +151,7 @@ namespace connectivity virtual ~KabStatement() { } public: - KabStatement(KabConnection* _pConnection); + explicit KabStatement(KabConnection* _pConnection); DECLARE_SERVICE_INFO(); }; } diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index 7d1a303..bc088d7 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -44,7 +44,7 @@ class KabConditionConstant : public KabCondition bool m_bValue; public: - KabConditionConstant(const bool bValue); + explicit KabConditionConstant(const bool bValue); virtual bool isAlwaysTrue() const SAL_OVERRIDE; virtual bool isAlwaysFalse() const SAL_OVERRIDE; virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; @@ -58,7 +58,7 @@ class KabConditionColumn : public KabCondition QString value(const ::KABC::Addressee &aAddressee) const; public: - KabConditionColumn( + explicit KabConditionColumn( const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual bool isAlwaysTrue() const SAL_OVERRIDE; virtual bool isAlwaysFalse() const SAL_OVERRIDE; @@ -67,7 +67,7 @@ class KabConditionColumn : public KabCondition class KabConditionNull : public KabConditionColumn { public: - KabConditionNull( + explicit KabConditionNull( const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; @@ -75,7 +75,7 @@ class KabConditionNull : public KabConditionColumn class KabConditionNotNull : public KabConditionColumn { public: - KabConditionNotNull( + explicit KabConditionNotNull( const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index c02251d..0a4c7b9 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -34,7 +34,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: - MacabCatalog(MacabConnection* _pCon); + explicit MacabCatalog(MacabConnection* _pCon); inline MacabConnection* getConnection() const { return m_pConnection; } diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index f0e6d51..36ed86e 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -67,7 +67,7 @@ namespace connectivity public: virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - MacabConnection(MacabDriver* _pDriver); + explicit MacabConnection(MacabDriver* _pDriver); virtual ~MacabConnection(); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index eddecd80..691da30f 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -43,7 +43,7 @@ namespace connectivity inline MacabConnection* getOwnConnection() const { return m_xConnection.get(); } - MacabDatabaseMetaData(MacabConnection* _pCon); + explicit MacabDatabaseMetaData(MacabConnection* _pCon); virtual ~MacabDatabaseMetaData(); // this interface is really BIG diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 0c667e5..508cae0 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -132,7 +132,7 @@ namespace connectivity static OUString impl_getConfigurationSettingsPath(); protected: - MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + explicit MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index 3e8cf7a..0f84bc9 100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.hxx @@ -49,7 +49,7 @@ namespace connectivity void releaseFields(); public: MacabRecord(); - MacabRecord(const sal_Int32 _size); + explicit MacabRecord(const sal_Int32 _size); virtual ~MacabRecord(); void insertAtColumn (CFTypeRef _value, ABPropertyType _type, const sal_Int32 _column); bool contains(const macabfield *_field) const; diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index 5a50352..615c8ba 100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.hxx @@ -78,8 +78,8 @@ namespace connectivity void insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const OUString& _propertyName, const CFTypeRef _propertyValue) const; public: MacabRecords(const ABAddressBookRef _addressBook, MacabHeader *_header, MacabRecord **_records, sal_Int32 _numRecords); - MacabRecords(const MacabRecords *_copy); - MacabRecords(const ABAddressBookRef _addressBook); + explicit MacabRecords(const MacabRecords *_copy); + explicit MacabRecords(const ABAddressBookRef _addressBook); ~MacabRecords(); void initialize(); diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 747b6a1..61b4cb0 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -91,7 +91,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - MacabResultSet(MacabCommonStatement *pStmt); + explicit MacabResultSet(MacabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index fc3a1d1..79d420e 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -96,7 +96,7 @@ namespace connectivity public: ::cppu::OBroadcastHelper& rBHelper; - MacabCommonStatement(MacabConnection *_pConnection); + explicit MacabCommonStatement(MacabConnection *_pConnection); using MacabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper @@ -157,7 +157,7 @@ namespace connectivity virtual ~MacabStatement() { } public: - MacabStatement(MacabConnection* _pConnection); + explicit MacabStatement(MacabConnection* _pConnection); DECLARE_SERVICE_INFO(); }; } diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 6ee7d5e..9ecfb42 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -46,7 +46,7 @@ class MacabConditionConstant : public MacabCondition bool m_bValue; public: - MacabConditionConstant(const bool bValue); + explicit MacabConditionConstant(const bool bValue); virtual bool isAlwaysTrue() const SAL_OVERRIDE; virtual bool isAlwaysFalse() const SAL_OVERRIDE; virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index 3094727..4c0f9d0 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -41,7 +41,7 @@ namespace connectivity virtual void refreshUsers() SAL_OVERRIDE ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - OCatalog(OConnection* _pCon); + explicit OCatalog(OConnection* _pCon); OConnection* getConnection() const { return m_pConnection; } sdbcx::OCollection* getPrivateTables() const { return m_pTables;} diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index f45453b..742451d 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -56,7 +56,7 @@ namespace connectivity AliasMap m_aAliasMap; public: - OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); + explicit OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); inline bool hasAlias( const OUString& _rAlias ) const { diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index f843f8e..ac4616b 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -59,7 +59,7 @@ namespace connectivity public: void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - OConnection(MorkDriver* const driver); + explicit OConnection(MorkDriver* const driver); virtual ~OConnection(); MorkDriver* getDriver() {return m_pDriver;}; diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index f9b6930..d67b177 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -45,7 +45,7 @@ namespace connectivity inline OConnection* getOwnConnection() const { return m_pConnection; } - ODatabaseMetaData(OConnection* _pCon); + explicit ODatabaseMetaData(OConnection* _pCon); private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 9aa9e1b..4c83294 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -51,7 +51,7 @@ class MorkDriver: private boost::noncopyable { public: - MorkDriver(css::uno::Reference< css::uno::XComponentContext > const context); + explicit MorkDriver(css::uno::Reference< css::uno::XComponentContext > const context); static OUString getImplementationName_Static() throw(css::uno::RuntimeException); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() diff --git a/connectivity/source/drivers/mork/MNSINIParser.hxx b/connectivity/source/drivers/mork/MNSINIParser.hxx index 3dbbaa6..fd3c518 100644 --- a/connectivity/source/drivers/mork/MNSINIParser.hxx +++ b/connectivity/source/drivers/mork/MNSINIParser.hxx @@ -60,7 +60,7 @@ class IniParser IniSectionMap mAllSection; public: IniSectionMap& getAllSection() { return mAllSection; } - IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException); + explicit IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException); }; #endif diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index cdf6043..23cffe2 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -64,7 +64,7 @@ namespace connectivity node_type m_eNodeType; MQueryExpressionBase() : m_eNodeType( Unknown ) {} - MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {} + explicit MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {} public: virtual ~MQueryExpressionBase() {} @@ -193,7 +193,7 @@ namespace connectivity sal_Int32 doQueryListTable(OConnection* xConnection, OString& ouStringTable); public: - MQueryHelper(const OColumnAlias& _ca); + explicit MQueryHelper(const OColumnAlias& _ca); virtual ~MQueryHelper(); void reset(); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 7a18d3a..6be1c27 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -345,7 +345,7 @@ public: class ResultSetEntryGuard : public ::osl::MutexGuard { public: - ResultSetEntryGuard( OResultSet& _rRS ) : ::osl::MutexGuard( _rRS.getMutex() ) + explicit ResultSetEntryGuard( OResultSet& _rRS ) : ::osl::MutexGuard( _rRS.getMutex() ) { _rRS.methodEntry(); } diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index b5eaffc..2818aeb 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -149,7 +149,7 @@ namespace connectivity // other methods OConnection* getOwnConnection() const { return m_pConnection;} - OCommonStatement(OConnection* _pConnection ); + explicit OCommonStatement(OConnection* _pConnection ); using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper @@ -187,7 +187,7 @@ namespace connectivity virtual ~OStatement(){} public: // a constructor, for when the object needs to be returned: - OStatement( OConnection* _pConnection); + explicit OStatement( OConnection* _pConnection); DECLARE_SERVICE_INFO(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index d73acc8..01d47e3 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -83,7 +83,7 @@ class LO_DLLPUBLIC_MORK MorkParser { public: - MorkParser( int defaultScope = 0x80 ); + explicit MorkParser( int defaultScope = 0x80 ); /// Open and parse mork file diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx index 6ebfcb6..3df1ab8 100644 --- a/connectivity/source/drivers/mozab/MCatalog.hxx +++ b/connectivity/source/drivers/mozab/MCatalog.hxx @@ -41,7 +41,7 @@ namespace connectivity virtual void refreshUsers() ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); public: - OCatalog(OConnection* _pCon); + explicit OCatalog(OConnection* _pCon); OConnection* getConnection() const { return m_pConnection; } sdbcx::OCollection* getPrivateTables() const { return m_pTables;} diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 4067fd6..807cb11 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx @@ -56,7 +56,7 @@ namespace connectivity AliasMap m_aAliasMap; public: - OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); + explicit OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); inline bool hasAlias( const OUString& _rAlias ) const { diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index ec7d017..597b73b 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -128,7 +128,7 @@ namespace connectivity public: virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - OConnection(MozabDriver* _pDriver); + explicit OConnection(MozabDriver* _pDriver); virtual ~OConnection(); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 553aff5..4c94105 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -45,7 +45,7 @@ namespace connectivity inline OConnection* getOwnConnection() const { return m_pConnection; } - ODatabaseMetaData(OConnection* _pCon); + explicit ODatabaseMetaData(OConnection* _pCon); private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index 37545c8..fc2555c 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -71,7 +71,7 @@ namespace connectivity virtual ~MozabDriver(); public: - MozabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + explicit MozabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 22e30ec..3c1ac24 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -346,7 +346,7 @@ public: class ResultSetEntryGuard : public ::osl::MutexGuard { public: - ResultSetEntryGuard( OResultSet& _rRS ) : ::osl::MutexGuard( _rRS.getMutex() ) + explicit ResultSetEntryGuard( OResultSet& _rRS ) : ::osl::MutexGuard( _rRS.getMutex() ) { _rRS.methodEntry(); } diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 59b30fb..b6ce3eb 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -151,7 +151,7 @@ namespace connectivity // other methods OConnection* getOwnConnection() const { return m_pConnection;} - OCommonStatement(OConnection* _pConnection ); + explicit OCommonStatement(OConnection* _pConnection ); using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper @@ -189,7 +189,7 @@ namespace connectivity ~OStatement(){} public: // a constructor, for when the object needs to be returned: - OStatement( OConnection* _pConnection) : OCommonStatement( _pConnection){} + expliit OStatement( OConnection* _pConnection) : OCommonStatement( _pConnection){} DECLARE_SERVICE_INFO(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 58ff8fd..81637f4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -48,7 +48,7 @@ namespace connectivity public: void Init(); - MozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + explicit MozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index b901156..dc3e274 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -59,7 +59,7 @@ class IniParser IniSectionMap mAllSection; public: IniSectionMap& getAllSection() { return mAllSection; } - IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException); + explicit IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException); }; #endif diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index 524fe5e..523e376 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -63,7 +63,7 @@ namespace connectivity node_type m_eNodeType; MQueryExpressionBase() : m_eNodeType( Unknown ) {} - MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {} + explicit MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {} public: sal_Bool isUnknown( ) const { return m_eNodeType == Unknown; } @@ -254,8 +254,7 @@ namespace connectivity inline const ErrorDescriptor& getError() const { return m_aError; } public: -// MQuery(); - MQuery( const OColumnAlias& _ca ); + explicit MQuery( const OColumnAlias& _ca ); virtual ~MQuery(); static MNameMapper* CreateNameMapper(); static void FreeNameMapper( MNameMapper* _ptr ); diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index 27b23ff..f5f4f2e 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -97,7 +97,7 @@ namespace connectivity virtual oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const SAL_OVERRIDE; virtual SQLHANDLE EnvironmentHandle(OUString &_rPath) SAL_OVERRIDE; public: - ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} + explicit ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} }; diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index 0751184..b100776 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -74,7 +74,7 @@ class Driver : public MutexHolder, public DriverBase com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_smgr; public: - Driver ( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > & ctx ) + explicit Driver ( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > & ctx ) : DriverBase( this->m_mutex ), m_ctx( ctx ), m_smgr( ctx->getServiceManager() ) diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index 00a3858..f08cebc 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -146,7 +146,7 @@ class DisposeGuard { com::sun::star::uno::Reference< com::sun::star::uno::XInterface > d; public: - DisposeGuard(const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); + explicit DisposeGuard(const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); ~DisposeGuard(); }; @@ -157,7 +157,7 @@ class TransactionGuard bool m_commited; public: /// takes over ownership of given statemet - TransactionGuard( const com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > &stmt ); + explicit TransactionGuard( const com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > &stmt ); ~TransactionGuard( ); void commit(); diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index a5d8f86..66f917e 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -240,7 +240,7 @@ class ContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_vec; sal_Int32 m_index; public: - ContainerEnumeration( const com::sun::star::uno::Sequence< com::sun::star::uno::Any > &vec ) + explicit ContainerEnumeration( const com::sun::star::uno::Sequence< com::sun::star::uno::Any > &vec ) : m_vec( vec ), m_index( -1 ) {} diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index c585489..1fe97dc 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -70,7 +70,7 @@ class RefreshedBroadcaster : public EventBroadcastHelper { com::sun::star::lang::EventObject m_event; public: - RefreshedBroadcaster(const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & source ) : + explicit RefreshedBroadcaster(const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & source ) : m_event( source ) {} diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index b64e935..7f2e7f0 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -68,7 +68,7 @@ class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > protected: virtual ~ODriverEnumeration(); public: - ODriverEnumeration(const DriverArray& _rDriverSequence); + explicit ODriverEnumeration(const DriverArray& _rDriverSequence); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -106,7 +106,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess > { - EnsureDriver( const Reference< XComponentContext > &rxContext ) + explicit EnsureDriver( const Reference< XComponentContext > &rxContext ) : mxContext( rxContext ) {} const DriverAccess& operator()( const DriverAccess& _rDescriptor ) const @@ -151,7 +151,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W /// an STL functor which loads a driver described by a DriverAccess, and extracts the SdbcDriver struct ExtractAfterLoad : public ExtractAfterLoad_BASE { - ExtractAfterLoad( const Reference< XComponentContext > &rxContext ) + explicit ExtractAfterLoad( const Reference< XComponentContext > &rxContext ) : ExtractAfterLoad_BASE( ExtractDriverFromAccess(), EnsureDriver( rxContext ) ) {} }; @@ -171,7 +171,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W public: // ctor - AcceptsURL( const OUString& _rURL ) : m_rURL( _rURL ) { } + explicit AcceptsURL( const OUString& _rURL ) : m_rURL( _rURL ) { } bool operator()( const Reference<XDriver>& _rDriver ) const @@ -241,7 +241,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W struct EqualDriverAccessToName : public ::std::binary_function< DriverAccess, OUString, bool > { OUString m_sImplName; - EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){} + explicit EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){} bool operator()( const DriverAccess& lhs) { diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index ec4dea8..0f40800 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -77,7 +77,7 @@ namespace drivermanager sal_Int32 m_nLoginTimeout; private: - OSDBCDriverManager( + explicit OSDBCDriverManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); virtual ~OSDBCDriverManager(); diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index e562e06..1ac73c5 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -64,7 +64,7 @@ public: return &mAllSection[secName]; return NULL; } - IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException ) + explicit IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException ) { OUString curDirPth; OUString iniUrl; diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index f80697f..36a52f8 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -23,7 +23,7 @@ class _SvxMacroTabPage_Impl { public: - _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ); + explicit _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ); VclPtr<PushButton> pAssignPB; VclPtr<PushButton> pAssignComponentPB; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 755c4aa..a0ab700 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1514,7 +1514,7 @@ class ColorPicker : protected ::comphelper::OBaseMutex, // Struct for right i public ColorPickerBase { public: - ColorPicker( Reference< XComponentContext > const & xContext ); + explicit ColorPicker( Reference< XComponentContext > const & xContext ); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 756b23c..943811d 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -64,7 +64,7 @@ using namespace svx; #define DECL_ABSTDLG_BASE(Class,DialogClass) \ ScopedVclPtr<DialogClass> pDlg; \ public: \ - Class( DialogClass* p) \ + explicit Class( DialogClass* p) \ : pDlg(p) \ {} \ virtual short Execute() SAL_OVERRIDE ; @@ -80,7 +80,7 @@ class VclAbstractDialog2_Impl : public VclAbstractDialog2 ScopedVclPtr<Dialog> m_pDlg; Link<> m_aEndDlgHdl; public: - VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} + explicit VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} virtual ~VclAbstractDialog2_Impl(); virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; virtual long GetResult() SAL_OVERRIDE; diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 29a3e1a..5a09f9c 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -33,7 +33,7 @@ private: void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const OUString &rProfile, const OUString &rPath); public: - CertPathDialog(vcl::Window* pParent); + explicit CertPathDialog(vcl::Window* pParent); virtual ~CertPathDialog(); virtual void dispose() SAL_OVERRIDE; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index b36887c..b8253a6 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -46,7 +46,7 @@ namespace offapp Link<> m_aRowChangeHandler; public: - DriverListControl(vcl::Window* _pParent); + explicit DriverListControl(vcl::Window* _pParent); virtual void Init() SAL_OVERRIDE; void Update(const DriverPoolingSettings& _rSettings); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 8d4f2f1..f487418 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -64,7 +64,7 @@ private: DECL_LINK( SearchHdl_Impl, void* ); public: - CuiAboutConfigTabPage(vcl::Window* pParent); + explicit CuiAboutConfigTabPage(vcl::Window* pParent); virtual ~CuiAboutConfigTabPage(); virtual void dispose() SAL_OVERRIDE; void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 9487c9a..9098a79 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -174,7 +174,7 @@ class ColorConfigWindow_Impl , public VclBuilderContainer { public: - ColorConfigWindow_Impl(vcl::Window* pParent); + explicit ColorConfigWindow_Impl(vcl::Window* pParent); virtual ~ColorConfigWindow_Impl() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; @@ -855,7 +855,7 @@ class ColorConfigCtrl_Impl : public VclVBox virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; public: - ColorConfigCtrl_Impl(vcl::Window* pParent); + explicit ColorConfigCtrl_Impl(vcl::Window* pParent); virtual ~ColorConfigCtrl_Impl(); virtual void dispose() SAL_OVERRIDE; diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index b73e2c3..025118f 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -140,7 +140,7 @@ private: public: - SvxJavaParameterDlg( vcl::Window* pParent ); + explicit SvxJavaParameterDlg( vcl::Window* pParent ); virtual ~SvxJavaParameterDlg(); virtual void dispose() SAL_OVERRIDE; @@ -173,7 +173,7 @@ private: m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } public: - SvxJavaClassPathDlg( vcl::Window* pParent ); + explicit SvxJavaClassPathDlg( vcl::Window* pParent ); virtual ~SvxJavaClassPathDlg(); virtual void dispose() SAL_OVERRIDE; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7f42d50..ab5bea68 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -216,7 +216,7 @@ class DicUserData sal_uLong nVal; public: - DicUserData( sal_uLong nUserData ) : nVal( nUserData ) {} + explicit DicUserData( sal_uLong nUserData ) : nVal( nUserData ) {} DicUserData( sal_uInt16 nEID, bool bChecked, bool bEditable, bool bDeletable ); @@ -388,7 +388,7 @@ class OptionsUserData void SetModified(); public: - OptionsUserData( sal_uLong nUserData ) : nVal( nUserData ) {} + explicit OptionsUserData( sal_uLong nUserData ) : nVal( nUserData ) {} OptionsUserData( sal_uInt16 nEID, bool bHasNV, sal_uInt16 nNumVal, bool bCheckable, bool bChecked ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5e13382..6bebf7f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -94,7 +94,7 @@ struct PathUserData_Impl OUString sUserPath; OUString sWritablePath; - PathUserData_Impl( sal_uInt16 nId ) : + explicit PathUserData_Impl( sal_uInt16 nId ) : nRealId( nId ), eState( SfxItemState::UNKNOWN ) {} }; diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 0ec920d..f580502 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -92,7 +92,7 @@ private: OUString m_aAppliedPersona; public: - SelectPersonaDialog( vcl::Window *pParent ); + explicit SelectPersonaDialog( vcl::Window *pParent ); virtual ~SelectPersonaDialog(); virtual void dispose() SAL_OVERRIDE; ::rtl::Reference< SearchAndParseThread > m_rSearchThread; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 5aeaafb..269cce7 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -471,7 +471,7 @@ struct OptionsPageInfo OUString m_sEventHdl; VclPtr<ExtensionsTabPage> m_pExtPage; - OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {} + explicit OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {} }; struct OptionsGroupInfo diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index 0b25238..4217101 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -30,7 +30,7 @@ private: void AddTSAURL(const OUString &rURL); public: - TSAURLsDialog(vcl::Window* pParent); + explicit TSAURLsDialog(vcl::Window* pParent); virtual ~TSAURLsDialog(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 36aac63..9b830af 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -59,7 +59,7 @@ namespace svx void FillPasswordList(); public: - WebConnectionInfoDialog( vcl::Window* pParent ); + explicit WebConnectionInfoDialog( vcl::Window* pParent ); virtual ~WebConnectionInfoDialog(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index ecd32b85..69f5147 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -307,7 +307,7 @@ class OfaAutoFmtPrcntSet : public ModalDialog { VclPtr<MetricField> m_pPrcntMF; public: - OfaAutoFmtPrcntSet(vcl::Window* pParent) + explicit OfaAutoFmtPrcntSet(vcl::Window* pParent) : ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui") { get(m_pPrcntMF, "margin"); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 94b68db..8d731f3 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -149,7 +149,7 @@ sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) class BackgroundPreviewImpl : public vcl::Window { public: - BackgroundPreviewImpl(vcl::Window* pParent); + explicit BackgroundPreviewImpl(vcl::Window* pParent); void setBmp(bool bBmp); virtual ~BackgroundPreviewImpl(); virtual void dispose() SAL_OVERRIDE;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
