summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-03 15:02:05 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-04 19:44:59 +0100
commit0dcfe46be095a0bd570e37d4dcbf569766957fe7 (patch)
treef1dfbee784ef20ccc2f6eec86b8ace54334606d2 /include
parent708688556cf820d8fda2e9bc7a6b7d098b76738a (diff)
tdf#129107 objects in basic disappear
Reverts part of "loplugin:useuniqueptr in SbModule" This reverts commit 263d7325691f4b0a1bda155f1c53bbcf712e9f09. because SbClassModuleObject is playing silly buggers with ownership by messing with fields in its SbModule superclass. Change-Id: I725332d080663e94b57f4bd4e1fb05aeeddf9038 Reviewed-on: https://gerrit.libreoffice.org/84352 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 30c707666dbe810c577dc14bc995dc91c2293b17) Reviewed-on: https://gerrit.libreoffice.org/84429
Diffstat (limited to 'include')
-rw-r--r--include/basic/sbmod.hxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index afc4897311b9..8ba26e4568ae 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -27,7 +27,6 @@
#include <rtl/ustring.hxx>
#include <vector>
#include <deque>
-#include <memory>
#include <basic/basicdllapi.h>
#include <com/sun/star/uno/Reference.hxx>
@@ -63,9 +62,9 @@ protected:
css::uno::Reference< css::script::XInvocation > mxWrapper;
OUString aOUSource;
OUString aComment;
- std::unique_ptr<SbiImage> pImage; // the Image
- std::unique_ptr<SbiBreakpoints> pBreaks; // Breakpoints
- std::unique_ptr<SbClassData> pClassData;
+ SbiImage* pImage; // the Image
+ SbiBreakpoints* pBreaks; // Breakpoints
+ std::unique_ptr<SbClassData> pClassData;
bool mbVBACompat;
sal_Int32 mnType;
SbxObjectRef pDocObject; // an impl object ( used by Document Modules )