[Libreoffice-commits] core.git: 2 commits - comphelper/source sc/source sd/source sfx2/source starmath/source sw/source toolkit/source vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Jul 27 10:03:01 UTC 2016
comphelper/source/misc/threadpool.cxx | 4 ++--
sc/source/ui/undo/undobase.cxx | 2 +-
sd/source/ui/animations/CustomAnimationBox.cxx | 2 +-
sd/source/ui/animations/SlideTransitionBox.cxx | 2 +-
sd/source/ui/table/TableDesignBox.cxx | 2 +-
sd/source/ui/unoidl/unoobj.cxx | 2 +-
sfx2/source/notebookbar/DropdownBox.cxx | 2 +-
sfx2/source/notebookbar/DropdownBox.hxx | 2 +-
sfx2/source/notebookbar/NotebookBarPopupMenu.hxx | 2 +-
sfx2/source/notebookbar/PriorityHBox.cxx | 2 +-
starmath/source/uiobject.hxx | 2 +-
sw/source/core/ole/ndole.cxx | 4 ++--
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
vcl/source/control/notebookbar.cxx | 2 +-
vcl/source/uitest/uno/uiobject_uno.hxx | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 5733910b2b3ac82cb3cf7a1be6b3576c2e97145e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 27 10:58:41 2016 +0100
change from a 2 min dbgutil failure to a 3 min
to try and align with the crashtesting timeout
Change-Id: Ife3a4a3d63bbb9d9d5b612675e3728900262bf6c
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 6846f4b..45425fb 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -336,8 +336,8 @@ void ThreadTaskTag::waitUntilDone()
#endif
#ifdef DBG_UTIL
- // 2 minute timeout in debug mode so our tests fail sooner rather than later
- osl::Condition::Result rv = maTasksComplete.wait(TimeValue { 2*60, 0 });
+ // 3 minute timeout in debug mode so our tests fail sooner rather than later
+ osl::Condition::Result rv = maTasksComplete.wait(TimeValue { 3*60, 0 });
assert(rv != osl::Condition::result_timeout);
#else
// 10 minute timeout in production so the app eventually throws some kind of error
commit 93f9a32cdf720ee76f56f987a1ded2fd89145659
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 10:27:49 2016 +0100
cppcheck: noExplicitConstructor
Change-Id: Id0a6cd461b2ba56e3b9b944514f3b0d0eb75cc44
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 63e201d..eefce30 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -104,7 +104,7 @@ namespace
ScDocument& m_rDoc;
bool m_bUndoEnabled;
public:
- DisableUndoGuard(ScDocShell *pDocShell)
+ explicit DisableUndoGuard(ScDocShell *pDocShell)
: m_rDoc(pDocShell->GetDocument())
, m_bUndoEnabled(m_rDoc.IsUndoEnabled())
{
diff --git a/sd/source/ui/animations/CustomAnimationBox.cxx b/sd/source/ui/animations/CustomAnimationBox.cxx
index d37de23..b0e07c0 100644
--- a/sd/source/ui/animations/CustomAnimationBox.cxx
+++ b/sd/source/ui/animations/CustomAnimationBox.cxx
@@ -32,7 +32,7 @@ class CustomAnimationBox : public VclVBox
bool m_bIsInitialized;
public:
- CustomAnimationBox(vcl::Window* pParent);
+ explicit CustomAnimationBox(vcl::Window* pParent);
~CustomAnimationBox() override;
virtual void dispose() override;
diff --git a/sd/source/ui/animations/SlideTransitionBox.cxx b/sd/source/ui/animations/SlideTransitionBox.cxx
index 7a70010..1cc992a 100644
--- a/sd/source/ui/animations/SlideTransitionBox.cxx
+++ b/sd/source/ui/animations/SlideTransitionBox.cxx
@@ -33,7 +33,7 @@ class SlideTransitionBox : public VclVBox
bool m_bIsInitialized;
public:
- SlideTransitionBox(vcl::Window* pParent);
+ explicit SlideTransitionBox(vcl::Window* pParent);
~SlideTransitionBox() override;
virtual void dispose() override;
diff --git a/sd/source/ui/table/TableDesignBox.cxx b/sd/source/ui/table/TableDesignBox.cxx
index 981a9dc..6fa1299 100644
--- a/sd/source/ui/table/TableDesignBox.cxx
+++ b/sd/source/ui/table/TableDesignBox.cxx
@@ -32,7 +32,7 @@ class TableDesignBox : public VclVBox
bool m_bIsInitialized;
public:
- TableDesignBox(vcl::Window* pParent);
+ explicit TableDesignBox(vcl::Window* pParent);
~TableDesignBox() override;
virtual void dispose() override;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 4051fa4..4d49bb3 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1113,7 +1113,7 @@ private:
SdXShape* mpShape;
public:
- SdUnoEventsAccess( SdXShape* pShape ) throw();
+ explicit SdUnoEventsAccess(SdXShape* pShape) throw();
// XNameReplace
virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
diff --git a/sfx2/source/notebookbar/DropdownBox.cxx b/sfx2/source/notebookbar/DropdownBox.cxx
index 0058c89..63bf89c 100644
--- a/sfx2/source/notebookbar/DropdownBox.cxx
+++ b/sfx2/source/notebookbar/DropdownBox.cxx
@@ -37,7 +37,7 @@ private:
ScopedVclPtr<DropdownBox> m_pParent;
public:
- Popup(VclPtr<DropdownBox> pParent)
+ explicit Popup(VclPtr<DropdownBox> pParent)
: FloatingWindow(pParent, "Popup", "sfx/ui/notebookbarpopup.ui")
, m_pParent(pParent)
{
diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx
index a44d970..cf6011b 100644
--- a/sfx2/source/notebookbar/DropdownBox.hxx
+++ b/sfx2/source/notebookbar/DropdownBox.hxx
@@ -38,7 +38,7 @@ private:
VclPtr<Popup> m_pPopup;
public:
- DropdownBox(vcl::Window *pParent);
+ explicit DropdownBox(vcl::Window *pParent);
virtual ~DropdownBox() override;
virtual void dispose() override;
diff --git a/sfx2/source/notebookbar/NotebookBarPopupMenu.hxx b/sfx2/source/notebookbar/NotebookBarPopupMenu.hxx
index 2fca135..b8ea6c6 100644
--- a/sfx2/source/notebookbar/NotebookBarPopupMenu.hxx
+++ b/sfx2/source/notebookbar/NotebookBarPopupMenu.hxx
@@ -15,7 +15,7 @@
class NotebookBarPopupMenu : public PopupMenu
{
public:
- NotebookBarPopupMenu(ResId aRes);
+ explicit NotebookBarPopupMenu(ResId aRes);
void Execute(NotebookBar* pNotebookbar,
css::uno::Reference<css::frame::XFrame>& xFrame);
};
diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx
index 52ce58a..0b02f63 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -45,7 +45,7 @@ private:
std::vector<IPrioritable*> m_aSortedChilds;
public:
- PriorityHBox(vcl::Window *pParent)
+ explicit PriorityHBox(vcl::Window *pParent)
: VclHBox(pParent)
, m_bInitialized(false)
, m_nNeededWidth(0)
diff --git a/starmath/source/uiobject.hxx b/starmath/source/uiobject.hxx
index 1975b88..4ad2249 100644
--- a/starmath/source/uiobject.hxx
+++ b/starmath/source/uiobject.hxx
@@ -42,7 +42,7 @@ private:
public:
- ElementSelectorUIObject(VclPtr<SmElementsControl> xElementSelector);
+ explicit ElementSelectorUIObject(VclPtr<SmElementsControl> xElementSelector);
virtual StringMap get_state() override;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 4619737..6f94d01 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -664,7 +664,7 @@ private:
std::shared_ptr<comphelper::ThreadTaskTag> mpTag;
public:
- DeflateData(const uno::Reference< frame::XModel >& rXModel)
+ explicit DeflateData(const uno::Reference< frame::XModel >& rXModel)
: maXModel(rXModel),
maPrimitive2DSequence(),
maRange(),
@@ -712,7 +712,7 @@ class DeflateThread : public comphelper::ThreadTask
DeflateData& mrDeflateData;
public:
- DeflateThread(DeflateData& rDeflateData)
+ explicit DeflateThread(DeflateData& rDeflateData)
: comphelper::ThreadTask(rDeflateData.mpTag), mrDeflateData(rDeflateData)
{
}
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 7916de7..d616e04 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -146,7 +146,7 @@ extern "C" typedef vcl::Window* (SAL_CALL *FN_SvtCreateWindow)(
class Pause : public Idle
{
public:
- Pause(sal_Int32 nPauseMilliseconds) :
+ explicit Pause(sal_Int32 nPauseMilliseconds) :
Idle("pause"),
m_nPauseMilliseconds(nPauseMilliseconds)
{
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index a47cb03..cb2611d 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -19,7 +19,7 @@ class NotebookBarContextChangeEventListener : public ::cppu::WeakImplHelper<css:
{
VclPtr<NotebookBar> mpParent;
public:
- NotebookBarContextChangeEventListener(NotebookBar *p) : mpParent(p) {}
+ explicit NotebookBarContextChangeEventListener(NotebookBar *p) : mpParent(p) {}
virtual ~NotebookBarContextChangeEventListener() {}
// XContextChangeEventListener
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx b/vcl/source/uitest/uno/uiobject_uno.hxx
index fe0669a..3384112 100644
--- a/vcl/source/uitest/uno/uiobject_uno.hxx
+++ b/vcl/source/uitest/uno/uiobject_uno.hxx
@@ -34,7 +34,7 @@ private:
public:
- UIObjectUnoObj(std::unique_ptr<UIObject> pObj);
+ explicit UIObjectUnoObj(std::unique_ptr<UIObject> pObj);
virtual ~UIObjectUnoObj();
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID)
More information about the Libreoffice-commits
mailing list