summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-09 14:14:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-09 14:14:26 +0200
commitb43e03cdd822d093eccd9bcf5c9b227cd7b6d127 (patch)
tree1ffb5c011e3caad95f42cd58cb584b47dff6612e /toolkit
parent20fb1bfc72e626251b435bcff2339e1e425c7130 (diff)
Clean up function declarations and some unused functions
Change-Id: Ia7fdd39b700c597a85280b39550e5de2bf193756
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/asynccallback.cxx8
-rw-r--r--toolkit/source/controls/unocontrol.cxx10
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx4
-rw-r--r--toolkit/source/helper/accessibilityclient.cxx10
-rw-r--r--toolkit/source/helper/property.cxx11
5 files changed, 14 insertions, 29 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 63346a9172e2..b8cb52eff2e1 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include <boost/noncopyable.hpp>
#include "vcl/svapp.hxx"
#include "osl/mutex.hxx"
#include "sal/config.h"
@@ -34,7 +36,8 @@ namespace {
class AsyncCallback:
public ::cppu::WeakImplHelper2<
css::lang::XServiceInfo,
- css::awt::XRequestCallback>
+ css::awt::XRequestCallback>,
+ private boost::noncopyable
{
public:
AsyncCallback() {}
@@ -60,9 +63,6 @@ private:
DECL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData* );
- AsyncCallback(AsyncCallback &); // not defined
- void operator =(AsyncCallback &); // not defined
-
virtual ~AsyncCallback() {}
};
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index ee55d5bcc4de..cce2b3be406f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/awt/WindowAttribute.hpp>
#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
@@ -92,7 +95,7 @@ static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiProp
}
-class VclListenerLock
+class VclListenerLock: private boost::noncopyable
{
private:
VCLXWindow* m_pLockWindow;
@@ -109,11 +112,6 @@ public:
if ( m_pLockWindow )
m_pLockWindow->resumeVclEventListening( );
}
-
-private:
- VclListenerLock(); // never implemented
- VclListenerLock( const VclListenerLock& ); // never implemented
- VclListenerLock& operator=( const VclListenerLock& ); // never implemented
};
typedef ::std::map< OUString, sal_Int32 > MapString2Int;
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 543e6d820468..f3c85ef16def 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -84,10 +84,6 @@ public:
*/
ControlIdentifier addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName );
- /** returns the number of controls in the list
- */
- inline size_t size() const { return maControls.size(); }
-
/** determines whether or not the list is empty
*/
inline bool empty() const { return maControls.empty(); }
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 0c4bd00d2f71..8c77223f9d2e 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
+
#include <toolkit/helper/accessibilityclient.hxx>
#include <toolkit/helper/accessiblefactory.hxx>
#include <osl/module.h>
@@ -61,7 +65,8 @@ namespace toolkit
//= AccessibleDummyFactory
- class AccessibleDummyFactory : public IAccessibleFactory
+ class AccessibleDummyFactory:
+ public IAccessibleFactory, private boost::noncopyable
{
public:
AccessibleDummyFactory();
@@ -70,9 +75,6 @@ namespace toolkit
virtual ~AccessibleDummyFactory();
private:
- AccessibleDummyFactory( const AccessibleDummyFactory& ); // never implemented
- AccessibleDummyFactory& operator=( const AccessibleDummyFactory& ); // never implemented
-
oslInterlockedCount m_refCount;
public:
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 408b27800b86..5ace0a7d341f 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -67,13 +67,6 @@ struct ImplPropertyInfo
sal_Int16 nAttribs;
bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
- ImplPropertyInfo()
- {
- nPropId = 0;
- nAttribs = 0;
- bDependsOnOthers = false;
- }
-
ImplPropertyInfo( OUString const & theName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
sal_Int16 nAttrs, bool bDepends = false )
: aName( theName )
@@ -311,10 +304,6 @@ struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,
{
return lhs.aName.compareTo(rhs) < 0;
}
- inline bool operator()(const OUString& lhs,const ImplPropertyInfo& rhs) const
- {
- return lhs.compareTo(rhs.aName) < 0;
- }
};
void ImplAssertValidPropertyArray()