[Libreoffice-commits] core.git: 4 commits - desktop/source forms/source vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Oct 7 07:11:31 PDT 2015
desktop/source/app/app.cxx | 4 +--
desktop/source/app/cmdlineargs.cxx | 6 ++++-
desktop/source/app/cmdlineargs.hxx | 2 +
forms/source/component/CheckBox.hxx | 2 -
forms/source/component/Columns.hxx | 6 ++---
forms/source/component/ComboBox.hxx | 2 -
forms/source/component/Currency.hxx | 2 -
forms/source/component/DatabaseForm.cxx | 4 +--
forms/source/component/DatabaseForm.hxx | 2 -
forms/source/component/Date.hxx | 2 -
forms/source/component/Edit.hxx | 2 -
forms/source/component/EventThread.hxx | 2 -
forms/source/component/Filter.hxx | 2 -
forms/source/component/FormComponent.cxx | 6 ++---
forms/source/component/FormattedField.hxx | 2 -
forms/source/component/FormsCollection.hxx | 2 -
forms/source/component/GroupBox.hxx | 2 -
forms/source/component/GroupManager.hxx | 4 +--
forms/source/component/ImageButton.hxx | 2 -
forms/source/component/ImageControl.hxx | 2 -
forms/source/component/ListBox.cxx | 6 ++---
forms/source/component/ListBox.hxx | 2 -
forms/source/component/Numeric.hxx | 2 -
forms/source/component/Pattern.hxx | 2 -
forms/source/component/RadioButton.hxx | 2 -
forms/source/component/Time.hxx | 2 -
forms/source/component/clickableimage.hxx | 4 +--
forms/source/component/entrylisthelper.hxx | 2 -
forms/source/component/errorbroadcaster.hxx | 2 -
forms/source/component/imgprod.cxx | 4 +--
forms/source/richtext/clipboarddispatcher.hxx | 2 -
forms/source/richtext/richtextengine.hxx | 2 -
forms/source/richtext/richtextviewport.hxx | 2 -
forms/source/richtext/rtattributehandler.hxx | 8 +++----
forms/source/runtime/formoperations.hxx | 4 +--
forms/source/solar/component/navbarcontrol.hxx | 4 +--
forms/source/solar/control/navtoolbar.cxx | 2 -
forms/source/xforms/datatypes.hxx | 4 +--
forms/source/xforms/enumeration.hxx | 2 -
forms/source/xforms/model_helper.hxx | 4 +--
vcl/source/app/svapp.cxx | 9 +++-----
vcl/source/window/dialog.cxx | 26 ++++++++++++-------------
42 files changed, 80 insertions(+), 75 deletions(-)
New commits:
commit bd4ef9aa4ccf2152c2780275d931994f94036f1f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 7 15:08:45 2015 +0100
afl-eventtesting: quit on next cycle if testing stops early
Change-Id: Ie313009ee0d10872f5e705d017e6a73ff83c2761
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index d4b197b..2c01744 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -351,12 +351,14 @@ namespace
void CloseDialogsAndQuit()
{
+ Scheduler::ProcessTaskScheduling(true);
vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow();
while (pAppWindow)
{
Dialog::EndAllDialogs(pAppWindow);
pAppWindow = Application::GetNextTopLevelWindow(pAppWindow);
}
+ Scheduler::ProcessTaskScheduling(true);
Application::Quit();
}
}
@@ -378,11 +380,8 @@ IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void)
--mnEventTestLimit;
if (!mpEventTestInput->good())
{
- delete mpEventTestInput;
- delete mpEventTestingIdle;
- SAL_INFO("vcl.eventtesting", "Event Input exhausted, exiting" << mnEventTestLimit);
- CloseDialogsAndQuit();
- return;
+ SAL_INFO("vcl.eventtesting", "Event Input exhausted, exit next cycle");
+ mnEventTestLimit = 0;
}
Scheduler::ProcessTaskScheduling(true);
mpEventTestingIdle->Start();
commit 15e54074665b13e57cb5a2177078e9512573dc2f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 7 15:08:20 2015 +0100
fix some indent
Change-Id: I59f5a38f6c62b97eb73d85177be408996568e2cd
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 7c8c309..b0f4c83 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -989,19 +989,19 @@ long Dialog::GetResult() const
void Dialog::EndAllDialogs( vcl::Window* pParent )
{
- ImplSVData* pSVData = ImplGetSVData();
- Dialog* pTempModDialog;
- Dialog* pModDialog = pSVData->maWinData.mpLastExecuteDlg;
- while ( pModDialog )
- {
- pTempModDialog = pModDialog->mpPrevExecuteDlg;
- if(!pParent || pParent->IsWindowOrChild(pModDialog,true))
- {
- pModDialog->EndDialog();
- pModDialog->PostUserEvent( Link<void*,void>() );
- }
- pModDialog = pTempModDialog;
- }
+ ImplSVData* pSVData = ImplGetSVData();
+ Dialog* pTempModDialog;
+ Dialog* pModDialog = pSVData->maWinData.mpLastExecuteDlg;
+ while (pModDialog)
+ {
+ pTempModDialog = pModDialog->mpPrevExecuteDlg;
+ if(!pParent || pParent->IsWindowOrChild(pModDialog,true))
+ {
+ pModDialog->EndDialog();
+ pModDialog->PostUserEvent( Link<void*,void>() );
+ }
+ pModDialog = pTempModDialog;
+ }
}
void Dialog::SetModalInputMode( bool bModal )
commit c65aa43e254b956fe23a94624f0b8e99d88e9ec1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 7 15:07:20 2015 +0100
afl-eventtesting: it has learned to open the file dialog
but the system dialogs are not under our control
Change-Id: Icb4029b2447e8cddbe4e48137fdefc377ef50414
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e2ede55..58567e9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1474,7 +1474,7 @@ int Desktop::Main()
}
}
- if ( rCmdLineArgs.IsHeadless() )
+ if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() )
{
// Ensure that we use not the system file dialogs as
// headless mode relies on Application::EnableHeadlessMode()
@@ -1645,7 +1645,7 @@ int Desktop::doShutdown()
delete pResMgr, pResMgr = NULL;
// Restore old value
const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
- if ( rCmdLineArgs.IsHeadless() )
+ if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() )
SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog );
OUString pidfileName = rCmdLineArgs.GetPidfileName();
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index a388f7d..f6bd390 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -185,6 +185,10 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
{
setHeadless();
}
+ else if ( oArg == "eventtesting" )
+ {
+ m_eventtesting = true;
+ }
else if ( oArg == "cat" )
{
m_textcat = true;
@@ -494,7 +498,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
// vcl/unx/generic/app/sm.cxx:
oArg != "session=" &&
#endif
- oArg != "eventtesting" &&
//ignore additional legacy options that don't do anything anymore
oArg != "nocrashreport" &&
m_unknown.isEmpty())
@@ -599,6 +602,7 @@ void CommandLineArgs::InitParamValues()
m_invisible = false;
m_headless = false;
#endif
+ m_eventtesting = false;
m_quickstart = false;
m_noquickstart = false;
m_terminateafterinit = false;
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index fe8ea8b..c0b1f35 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -61,6 +61,7 @@ class CommandLineArgs: private boost::noncopyable
bool IsNoRestore() const { return m_norestore;}
bool IsNoDefault() const { return m_nodefault;}
bool IsHeadless() const { return m_headless;}
+ bool IsEventTesting() const { return m_eventtesting;}
bool IsQuickstart() const { return m_quickstart;}
bool IsNoQuickstart() const { return m_noquickstart;}
bool IsTerminateAfterInit() const { return m_terminateafterinit;}
@@ -123,6 +124,7 @@ class CommandLineArgs: private boost::noncopyable
bool m_invisible;
bool m_norestore;
bool m_headless;
+ bool m_eventtesting;
bool m_quickstart;
bool m_noquickstart;
bool m_terminateafterinit;
commit 7ba7a974f6d9f4b265e72b8e91c5a175bc3a3b14
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 7 14:36:11 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: I32c6728ce7423fd997cdbec66feb8a6ba39948d2
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index 1468cb0..9971367 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -64,7 +64,7 @@ protected:
class OCheckBoxControl : public OBoundControl
{
public:
- OCheckBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
+ explicit OCheckBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
// XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index f352ba4..c67f431 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -63,7 +63,7 @@ protected:
public:
OGridColumn(const css::uno::Reference<css::uno::XComponentContext>& _rContext, const OUString& _sModelName = OUString());
- OGridColumn(const OGridColumn* _pOriginal );
+ explicit OGridColumn(const OGridColumn* _pOriginal );
virtual ~OGridColumn();
// UNO binding
@@ -119,8 +119,8 @@ class ClassName
,public OAggregationArrayUsageHelper< ClassName > \
{ \
public: \
- ClassName(const css::uno::Reference<css::uno::XComponentContext>& _rContext ); \
- ClassName(const ClassName* _pCloneFrom); \
+ explicit ClassName(const css::uno::Reference<css::uno::XComponentContext>& _rContext ); \
+ explicit ClassName(const ClassName* _pCloneFrom); \
\
virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; \
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 454cf88..ee48b9b 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -142,7 +142,7 @@ protected:
class OComboBoxControl : public OBoundControl
{
public:
- OComboBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
+ explicit OComboBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
// XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index 6e6d56b..ce13dab 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -73,7 +73,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
+ explicit OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index a4438c7..b11d663 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -122,7 +122,7 @@ namespace frm
class DocumentModifyGuard
{
public:
- DocumentModifyGuard( const Reference< XInterface >& _rxFormComponent )
+ explicit DocumentModifyGuard( const Reference< XInterface >& _rxFormComponent )
:m_xDocumentModify( getXModel( _rxFormComponent ), UNO_QUERY )
{
impl_changeModifiableFlag_nothrow( false );
@@ -167,7 +167,7 @@ protected:
public:
- OFormSubmitResetThread(ODatabaseForm* pControl) : OComponentEventThread(pControl) { }
+ explicit OFormSubmitResetThread(ODatabaseForm* pControl) : OComponentEventThread(pControl) { }
};
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 8deeb00..acdc4be 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -218,7 +218,7 @@ class ODatabaseForm :public OFormComponents
bool m_bSharingConnection : 1; // sal_True if the connection we're using is shared with out parent
public:
- ODatabaseForm(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit ODatabaseForm(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
ODatabaseForm( const ODatabaseForm& _cloneSource );
virtual ~ODatabaseForm();
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 2e46601..c817a70 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -95,7 +95,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- ODateControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit ODateControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl)
// css::lang::XServiceInfo
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index c18402a..4384d2e 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -131,7 +131,7 @@ class OEditControl : public OBoundControl
ImplSVEvent * m_nKeyEvent;
public:
- OEditControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
+ explicit OEditControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
virtual ~OEditControl();
DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl)
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 83ccfa2..a447b25 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -86,7 +86,7 @@ public:
DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject)
virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- OComponentEventThread(::cppu::OComponentHelper* pCompImpl);
+ explicit OComponentEventThread(::cppu::OComponentHelper* pCompImpl);
virtual ~OComponentEventThread();
void addEvent( const css::lang::EventObject* _pEvt, bool bFlag = false );
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index ebbb04a..8ce3368 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -84,7 +84,7 @@ namespace frm
void initControlModel(css::uno::Reference< css::beans::XPropertySet >& xControlModel);
public:
- OFilterControl( const css::uno::Reference< css::uno::XComponentContext >& _rxORB );
+ explicit OFilterControl( const css::uno::Reference< css::uno::XComponentContext >& _rxORB );
DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject)
css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 6b653b4..f9e67b9 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -95,9 +95,9 @@ void ControlModelLock::addPropertyNotification( const sal_Int32 _nHandle, const
class FieldChangeNotifier
{
public:
- FieldChangeNotifier( ControlModelLock& _rLock )
- :m_rLock( _rLock )
- ,m_rModel( dynamic_cast< OBoundControlModel& >( _rLock.getModel() ) )
+ explicit FieldChangeNotifier(ControlModelLock& _rLock)
+ : m_rLock( _rLock )
+ , m_rModel( dynamic_cast< OBoundControlModel& >( _rLock.getModel() ) )
{
m_xOldField = m_rModel.getField();
}
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index f2f33bc..55a4082 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -152,7 +152,7 @@ class OFormattedModel
ImplSVEvent * m_nKeyEvent;
public:
- OFormattedControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
+ explicit OFormattedControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
virtual ~OFormattedControl();
DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl)
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index e2633fb..16377d0 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -49,7 +49,7 @@ class OFormsCollection
css::uno::Reference<css::uno::XInterface> m_xParent; // Parent
public:
- OFormsCollection(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OFormsCollection(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
OFormsCollection( const OFormsCollection& _cloneSource );
virtual ~OFormsCollection();
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index b3684df..0f496d5 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -61,7 +61,7 @@ protected:
class OGroupBoxControl : public OControl
{
public:
- OGroupBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OGroupBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
// XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 42fc607..eee2fd0 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -142,7 +142,7 @@ class OGroup
friend class OGroupLess;
public:
- OGroup( const OUString& rGroupName );
+ explicit OGroup(const OUString& rGroupName);
virtual ~OGroup();
bool operator==( const OGroup& rGroup ) const;
@@ -176,7 +176,7 @@ class OGroupManager : public ::cppu::WeakImplHelper< css::beans::XPropertyChange
void removeFromGroupMap(const OUString& _sGroupName,const css::uno::Reference< css::beans::XPropertySet>& _xSet);
public:
- OGroupManager(const css::uno::Reference< css::container::XContainer >& _rxContainer);
+ explicit OGroupManager(const css::uno::Reference< css::container::XContainer >& _rxContainer);
virtual ~OGroupManager();
// css::lang::XEventListener
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 671e256..6a108af 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -63,7 +63,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OImageButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OImageButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
// XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index df17da4..699c41b 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -156,7 +156,7 @@ private:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OImageControlControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OImageControlControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
// UNO
DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl )
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 5cf73b0..24e456f 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -96,7 +96,7 @@ namespace frm
struct AppendRowSetValueString : public ::std::unary_function< OUString, void >
{
- AppendRowSetValueString( OUString& _string )
+ explicit AppendRowSetValueString( OUString& _string )
:m_string( _string )
{
}
@@ -1434,7 +1434,7 @@ namespace frm
const Sequence< OUString >& m_rList;
public:
- ExtractStringFromSequence_Safe( const Sequence< OUString >& _rList ) : m_rList( _rList ) { }
+ explicit ExtractStringFromSequence_Safe( const Sequence< OUString >& _rList ) : m_rList( _rList ) { }
OUString operator ()( sal_Int16 _nIndex )
{
@@ -1485,7 +1485,7 @@ namespace frm
const ValueList& m_rList;
public:
- ExtractAnyFromValueList_Safe( const ValueList& _rList ) : m_rList( _rList ) { }
+ explicit ExtractAnyFromValueList_Safe( const ValueList& _rList ) : m_rList( _rList ) { }
Any operator ()( sal_Int16 _nIndex )
{
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 7776d4c..e99e486 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -269,7 +269,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OListBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OListBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
virtual ~OListBoxControl();
// UNO Anbindung
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index ed9d724..eb04846 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -72,7 +72,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- ONumericControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit ONumericControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index 97d6810..85404d6 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -79,7 +79,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OPatternControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OPatternControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 7a40974..7f894c3 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -75,7 +75,7 @@ private:
class ORadioButtonControl: public OBoundControl
{
public:
- ORadioButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit ORadioButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
// XServiceInfo
OUString SAL_CALL getImplementationName()
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 4fe59e7..c7da88c 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -94,7 +94,7 @@ protected:
virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OTimeControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
+ explicit OTimeControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl)
// css::lang::XServiceInfo
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 1b852dd..eb6c8cd 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -162,7 +162,7 @@ namespace frm
typedef ::osl::MutexGuard GuardBase;
public:
- ImageModelMethodGuard( OClickableImageBaseModel& _rModel )
+ explicit ImageModelMethodGuard( OClickableImageBaseModel& _rModel )
:GuardBase( _rModel.getMutex( OClickableImageBaseModel::GuardAccess() ) )
{
if ( NULL == _rModel.getImageProducer( OClickableImageBaseModel::GuardAccess() ) )
@@ -271,7 +271,7 @@ namespace frm
bool ) SAL_OVERRIDE;
public:
- OImageProducerThread_Impl( OClickableImageBaseControl *pControl ) :
+ explicit OImageProducerThread_Impl( OClickableImageBaseControl *pControl ) :
OComponentEventThread( pControl )
{}
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 7f6c5c0..b956993 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -58,7 +58,7 @@ namespace frm
protected:
- OEntryListHelper( OControlModel& _rControlModel );
+ explicit OEntryListHelper( OControlModel& _rControlModel );
OEntryListHelper( const OEntryListHelper& _rSource, OControlModel& _rControlModel );
virtual ~OEntryListHelper( );
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index f5846af..03d3b81 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -40,7 +40,7 @@ namespace frm
::cppu::OInterfaceContainerHelper m_aErrorListeners;
protected:
- OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper );
+ explicit OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper );
virtual ~OErrorBroadcaster( );
void SAL_CALL disposing();
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 3872abc..81c29d3 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -42,8 +42,8 @@ class ImgProdLockBytes : public SvLockBytes
public:
- ImgProdLockBytes( SvStream* pStm, bool bOwner );
- ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStreamRef );
+ ImgProdLockBytes( SvStream* pStm, bool bOwner );
+ explicit ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStreamRef );
virtual ~ImgProdLockBytes();
virtual ErrCode ReadAt( sal_uInt64 nPos, void* pBuffer, sal_Size nCount, sal_Size * pRead ) const SAL_OVERRIDE;
diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx
index 6bf9525..b0d0569 100644
--- a/forms/source/richtext/clipboarddispatcher.hxx
+++ b/forms/source/richtext/clipboarddispatcher.hxx
@@ -69,7 +69,7 @@ namespace frm
bool m_bPastePossible;
public:
- OPasteClipboardDispatcher( EditView& _rView );
+ explicit OPasteClipboardDispatcher( EditView& _rView );
protected:
virtual ~OPasteClipboardDispatcher();
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index 98ddf5e..528a2d3 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -60,7 +60,7 @@ namespace frm
protected:
/** constructs a new RichTextEngine. The instances takes the ownership of the given SfxItemPool
*/
- RichTextEngine( SfxItemPool* _pPool );
+ explicit RichTextEngine( SfxItemPool* _pPool );
private:
RichTextEngine( const RichTextEngine& ) SAL_DELETED_FUNCTION;
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index f6f380e..59d6704 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -33,7 +33,7 @@ namespace frm
bool m_bHideInactiveSelection;
public:
- RichTextViewPort( vcl::Window* _pParent );
+ explicit RichTextViewPort( vcl::Window* _pParent );
void setView( EditView& _rView );
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index 15a9b12..6555369 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/forms/source/richtext/rtattributehandler.hxx
@@ -88,7 +88,7 @@ namespace frm
SvxAdjust m_eAdjust;
public:
- ParaAlignmentHandler( AttributeId _nAttributeId );
+ explicit ParaAlignmentHandler( AttributeId _nAttributeId );
public:
virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE;
@@ -101,7 +101,7 @@ namespace frm
sal_uInt16 m_nLineSpace;
public:
- LineSpacingHandler( AttributeId _nAttributeId );
+ explicit LineSpacingHandler( AttributeId _nAttributeId );
public:
virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE;
@@ -114,7 +114,7 @@ namespace frm
SvxEscapement m_eEscapement;
public:
- EscapementHandler( AttributeId _nAttributeId );
+ explicit EscapementHandler( AttributeId _nAttributeId );
public:
virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE;
@@ -162,7 +162,7 @@ namespace frm
SvxAdjust m_eOppositeDefaultAdjustment;
public:
- ParagraphDirectionHandler( AttributeId _nAttributeId );
+ explicit ParagraphDirectionHandler( AttributeId _nAttributeId );
public:
virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE;
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 7ec21d0..0c1b984 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -77,7 +77,7 @@ namespace frm
#endif
public:
- FormOperations( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
+ explicit FormOperations( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
// XServiceInfo - static versions
static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException);
@@ -351,7 +351,7 @@ namespace frm
bool m_bCleared;
public:
- inline MethodGuard( FormOperations& _rOwner )
+ explicit MethodGuard( FormOperations& _rOwner )
:m_rOwner( _rOwner )
,m_bCleared( false )
{
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 8e77610..3d10396 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -44,7 +44,7 @@ namespace frm
{
css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- ONavigationBarControl(
+ explicit ONavigationBarControl(
const css::uno::Reference< css::uno::XComponentContext >& _rxORB
);
@@ -95,7 +95,7 @@ namespace frm
);
protected:
- ONavigationBarPeer(
+ explicit ONavigationBarPeer(
const css::uno::Reference< css::uno::XComponentContext >& _rxORB
);
virtual ~ONavigationBarPeer();
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index d10d448..3831bfc 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -101,7 +101,7 @@ namespace frm
const IFeatureDispatcher* m_pDispatcher;
public:
- ImplNavToolBar( vcl::Window* _pParent )
+ explicit ImplNavToolBar( vcl::Window* _pParent )
:ToolBox( _pParent, WB_3DLOOK )
,m_pDispatcher( NULL )
{
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 407a2e2..e4ab9cc 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -246,7 +246,7 @@ namespace xforms
class OBooleanType : public OBooleanType_Base
{
public:
- OBooleanType( const OUString& _rName );
+ explicit OBooleanType( const OUString& _rName );
protected:
DECLARE_DEFAULT_CLONING( OBooleanType )
@@ -318,7 +318,7 @@ namespace xforms
class classname : public classname##_Base \
{ \
public: \
- classname( const OUString& _rName ); \
+ explicit classname( const OUString& _rName ); \
\
protected: \
DECLARE_DEFAULT_CLONING( classname ) \
diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx
index 59eec1c..8a7a993 100644
--- a/forms/source/xforms/enumeration.hxx
+++ b/forms/source/xforms/enumeration.hxx
@@ -41,7 +41,7 @@ class Enumeration
sal_Int32 mnIndex;
public:
- Enumeration( css::container::XIndexAccess* );
+ explicit Enumeration( css::container::XIndexAccess* );
virtual sal_Bool SAL_CALL hasMoreElements()
throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx
index 9191c0d..97e0138 100644
--- a/forms/source/xforms/model_helper.hxx
+++ b/forms/source/xforms/model_helper.hxx
@@ -52,7 +52,7 @@ class BindingCollection : public NamedCollection<css::uno::Reference<css::beans:
Model* mpModel;
public:
- BindingCollection( Model* pModel ) : mpModel( pModel ) {}
+ explicit BindingCollection( Model* pModel ) : mpModel( pModel ) {}
virtual ~BindingCollection() {}
virtual bool isValid( const T& t ) const SAL_OVERRIDE
@@ -79,7 +79,7 @@ class SubmissionCollection : public NamedCollection<css::uno::Reference<css::bea
Model* mpModel;
public:
- SubmissionCollection( Model* pModel ) : mpModel( pModel ) {}
+ explicit SubmissionCollection( Model* pModel ) : mpModel( pModel ) {}
virtual ~SubmissionCollection() {}
public:
More information about the Libreoffice-commits
mailing list