diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-05 16:54:24 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-05 16:54:24 +0100 |
commit | ad43b68a4d15879d74b597931c4f4edc7e08a353 (patch) | |
tree | 46c47ed8594eb5e327c00a87cf50f0a97b4369e7 /basic | |
parent | delete/delete[] mismatch, thanks to Terrence Enger (diff) | |
download | core-ad43b68a4d15879d74b597931c4f4edc7e08a353.tar.gz core-ad43b68a4d15879d74b597931c4f4edc7e08a353.zip |
I believe the intent is to be non-copyable, so lets use boost on base-class
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/basic/sbmod.hxx | 6 | ||||
-rw-r--r-- | basic/inc/basic/sbobjmod.hxx | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index d7b3d44f4b00..e98fe2cf4f96 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -35,8 +35,8 @@ #include <basic/sbxdef.hxx> #include <rtl/ustring.hxx> #include <vector> - #include <deque> +#include <boost/utility.hpp> #include "basicdllapi.h" class SbMethod; @@ -53,7 +53,7 @@ struct ClassModuleRunInitItem; struct SbClassData; class SbModuleImpl; -class BASIC_DLLPUBLIC SbModule : public SbxObject +class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable { friend class TestToolObj; // allows module initialisation at runtime friend class SbiCodeGen; @@ -64,8 +64,6 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject SbModuleImpl* mpSbModuleImpl; // Impl data std::vector< String > mModuleVariableNames; - BASIC_DLLPRIVATE SbModule(); - BASIC_DLLPRIVATE SbModule(const SbModule&); BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic ); diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx index ba4f6237c28e..3d0e5a50179a 100644 --- a/basic/inc/basic/sbobjmod.hxx +++ b/basic/inc/basic/sbobjmod.hxx @@ -46,9 +46,6 @@ namespace css = ::com::sun::star; class BASIC_DLLPUBLIC SbObjModule : public SbModule { - BASIC_DLLPRIVATE SbObjModule( const SbObjModule& ); - BASIC_DLLPRIVATE SbObjModule(); - protected: virtual ~SbObjModule(); @@ -75,8 +72,6 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule css::uno::Reference<css::frame::XModel> m_xModel; String sFormName; bool mbInit; - BASIC_DLLPRIVATE SbUserFormModule( const SbUserFormModule& ); - BASIC_DLLPRIVATE SbUserFormModule(); //protected: virtual void InitObject(); |