Author: damjan
Date: Tue Sep 4 16:52:58 2018
New Revision: 1840051
URL: http://svn.apache.org/viewvc?rev=1840051&view=rev
Log:
Windows really really wants a vector delete operator in salhelper's
simplereferenceobject, and won't link without it, so give it one
but keep it private so subclasses (hopefuly) can't use it, as intended.
Patch by: me
Modified:
openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
openoffice/trunk/main/salhelper/source/simplereferenceobject.cxx
Modified:
openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx?rev=1840051&r1=1840050&r2=1840051&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
(original)
+++ openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx Tue
Sep 4 16:52:58 2018
@@ -65,6 +65,10 @@ namespace salhelper {
operators new[] and delete[]. But since arrays of reference-counted
objects are of no use, anyway, it seems best to simply declare and not
define (private) operators new[] and delete[].
+
+ Note how during the move to gbuild, the delete[] had to be implemented,
+ as missing vector delete errors stopped linking. The small consolation is
+ that is a private method, so it may as well not exist. Right?
*/
class SALHELPER_DLLPUBLIC SimpleReferenceObject
{
Modified: openoffice/trunk/main/salhelper/source/simplereferenceobject.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/source/simplereferenceobject.cxx?rev=1840051&r1=1840050&r2=1840051&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/source/simplereferenceobject.cxx (original)
+++ openoffice/trunk/main/salhelper/source/simplereferenceobject.cxx Tue Sep 4
16:52:58 2018
@@ -68,3 +68,9 @@ void SimpleReferenceObject::operator del
::operator delete(pPtr, std::nothrow);
#endif // WNT
}
+
+void SimpleReferenceObject::operator delete[](void * pPtr)
+ SAL_THROW(())
+{
+ ::operator delete[](pPtr);
+}
