summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-16 10:11:04 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-12 22:06:19 -0400
commit2d2ae27b7e7aa147351655a40ed324b67cecf828 (patch)
treeeb52bec1a946d147e3e8b9f3d5db6e250d533f85 /forms
parentc5cdfe39d3afca716e7b11f8f8e169ce378861ea (diff)
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other plugins too. Reviewed-on: https://gerrit.libreoffice.org/25057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit 2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae) Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/DatabaseForm.hxx4
-rw-r--r--forms/source/component/FormComponent.cxx10
-rw-r--r--forms/source/inc/FormComponent.hxx2
-rw-r--r--forms/source/inc/frm_resource.hxx2
-rw-r--r--forms/source/inc/property.hxx2
5 files changed, 8 insertions, 12 deletions
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 469116b3289a..4694567ffe14 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -108,10 +108,6 @@ public:
,nRepresentation( _nRepresent )
{
}
-
- HtmlSuccessfulObj()
- {
- }
};
typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 75c09cc6a91b..24e70e52344e 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -296,7 +296,7 @@ Reference<XWindowPeer> SAL_CALL OControl::getPeer() throw ( RuntimeException, st
sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) throw ( RuntimeException, std::exception)
{
if ( !m_xControl.is() )
- return sal_False;
+ return false;
bool bSuccess = m_xControl->setModel( Model );
impl_resetStateGuard_nothrow();
@@ -1120,7 +1120,7 @@ void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles,
_rNewValues.getConstArray(),
_rOldValues.getConstArray(),
_rHandles.getLength(),
- sal_False
+ false
);
}
@@ -1878,13 +1878,13 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException, std::exce
// but for those derivees which did not use this feature, we need an
// explicit transfer
transferControlValueToExternal( aLock );
- return sal_True;
+ return true;
}
OSL_ENSURE( !hasExternalValueBinding(), "OBoundControlModel::commit: control flow broken!" );
// we reach this only if we're not working with an external binding
if ( !hasField() )
- return sal_True;
+ return true;
::cppu::OInterfaceIteratorHelper aIter( m_aUpdateListeners );
EventObject aEvent;
aEvent.Source = static_cast< XWeak* >( this );
@@ -2334,7 +2334,7 @@ void OBoundControlModel::reset() throw (RuntimeException, std::exception)
{
if ( bIsNewRecord )
{
- // reset the control to it's default
+ // reset the control to its default
resetNoBroadcast();
// and immediately commit the changes to the DB column, to keep consistency
commitControlValueToDbColumn( true );
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 89730654cf58..aeec7ffce0fe 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -1174,7 +1174,7 @@ private:
/** connects to an external value binding
- <p>Note that by definition, external data bindings superseede the SQL data binding which
+ <p>Note that by definition, external data bindings supersede the SQL data binding which
is defined by our RowSet-column-related properties. This means that in case we're currently
connected to a database column when this is called, this connection is suspended.</p>
diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index d25e9d68b40e..b098531416b3 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -35,7 +35,7 @@ namespace frm
static SimpleResMgr* m_pImpl;
private:
// no instantiation allowed
- ResourceManager() { }
+ ResourceManager() = delete;
~ResourceManager() { }
// we'll instantiate one static member of the following class, which, in it's dtor,
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index a6dd9d05a344..23829961ca7d 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -81,7 +81,7 @@ private:
};
public:
- PropertyInfoService() { }
+ PropertyInfoService() = delete;
static sal_Int32 getPropertyId(const OUString& _rName);