diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-13 23:44:29 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-13 23:44:29 +0200 |
commit | a6611be6bc145a9f538a9f1bbe6d40f32ebad1c9 (patch) | |
tree | 9f816a202a4d299ba7cabb2406c5d31bd6a63422 /extensions/source/abpilot | |
parent | f5051821bc5da0fa7b3de78d21aee305fce3d46b (diff) |
Clean up function declarations and some unused functions
Change-Id: Ie81d270267b6c3c3620ade62eb393b28d995a654
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r-- | extensions/source/abpilot/abpservices.cxx | 9 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 8 | ||||
-rw-r--r-- | extensions/source/abpilot/unodialogabp.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/unodialogabp.hxx | 1 |
4 files changed, 5 insertions, 15 deletions
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index 4a2ef7fe53c5..efa0867c4441 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -18,20 +18,13 @@ */ #include "componentmodule.hxx" - - +#include "unodialogabp.hxx" using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - - -extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno(); - - - extern "C" void SAL_CALL abp_initializeModule() { static sal_Bool s_bInit = sal_False; diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index c5ded237a463..c8372da0895e 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -23,6 +23,7 @@ #include "componentmodule.hxx" #include "datasourcehandling.hxx" +#include <boost/noncopyable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -160,18 +161,13 @@ namespace abp //= ODataSourceContextImpl - struct ODataSourceContextImpl + struct ODataSourceContextImpl: private boost::noncopyable { Reference< XComponentContext > xORB; Reference< XNameAccess > xContext; /// the UNO data source context StringBag aDataSourceNames; /// for quicker name checks (without the UNO overhead) ODataSourceContextImpl( const Reference< XComponentContext >& _rxORB ) : xORB( _rxORB ) { } - ODataSourceContextImpl( const ODataSourceContextImpl& _rSource ) - :xORB ( _rSource.xORB ) - ,xContext ( _rSource.xContext ) - { - } }; diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index f3e3bd5dadcb..1ed507b60dc2 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -24,7 +24,7 @@ #include <comphelper/sequence.hxx> #include <vcl/msgbox.hxx> -extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno() +void SAL_CALL createRegistryInfo_OABSPilotUno() { static ::abp::OMultiInstanceAutoRegistration< ::abp::OABSPilotUno > aAutoRegistration; } diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index dc24fad4e860..8844798f578a 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -91,6 +91,7 @@ namespace abp } // namespace abp +extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno(); #endif // EXTENSIONS_ABP_UNODIALOG_HXX |