diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-11-04 12:04:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@hemulen.(none)> | 2010-11-04 12:09:29 +0200 |
| commit | f3d96e6a3510b38b8c432b8d195d7aa2d2c0dc11 (patch) | |
| tree | fe7a72cd8d7da95c8f8c06833b1a305957800229 /salhelper/inc | |
| parent | 21b6978637e61f349c57846fcf04772898ec58e2 (diff) | |
Attempt to fix some vos removal fallout on Windows
After of the vos removal, some classes in other parts of the code now
are subclasses of SimpleReferenceObject.
To avoid compilation and linking errors in those other parts, we seem
to need to have the operator new[] and operator delete[] in
SimpleReferenceObject as protected instead of private. We also need an
implementation of operator delete[]. As it can be unimplemented with
gcc, I hope it isn't actually called, though, so it for now crashes
intentionally if called.
Will see later if this actually works, this is just a commit to make
stuff build.
Diffstat (limited to 'salhelper/inc')
| -rw-r--r-- | salhelper/inc/salhelper/simplereferenceobject.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx index a7ae201fb3fa..c5ef6dbbd070 100644 --- a/salhelper/inc/salhelper/simplereferenceobject.hxx +++ b/salhelper/inc/salhelper/simplereferenceobject.hxx @@ -121,6 +121,12 @@ private: */ void operator =(SimpleReferenceObject); +#ifdef _MSC_VER +/* We can't now have these private with MSVC2008 at least, it leads to + compilation errors in xmloff and other places. +*/ +protected: +#endif /** not implemented (see general class documentation) @internal */ |