summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-05 16:54:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-05 16:54:24 +0100
commitc3ea4c410bbb384257845c425446f168b51ec1a9 (patch)
tree393989d4a386933a20f2b511caf31a168f52a8a7
parent418a3c31234b9662eb10d739845d14d517cc0f5e (diff)
I believe the intent is to be non-copyable, so lets use boost on base-class
-rw-r--r--basic/inc/basic/sbmod.hxx6
-rw-r--r--basic/inc/basic/sbobjmod.hxx5
2 files changed, 2 insertions, 9 deletions
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 2d9b33d84e..31305d76bd 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 ba4f6237c2..3d0e5a5017 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();