openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1562109 - in /openoffice/trunk/main/editeng: inc/editeng/outlobj.hxx source/outliner/outlobj.cxx
Date Tue, 28 Jan 2014 16:24:45 GMT
Author: hdu
Date: Tue Jan 28 16:24:44 2014
New Revision: 1562109

URL: http://svn.apache.org/r1562109
Log:
#i123228# ParagraphData symbols shouldn't be required for outlobj.hxx users

Avoid the ParagraphDataVector default constructor in the editeng/outlobj.hxx
header. ParagraphData symbols are not DLLPUBLIC so they are not available
outside of editeng. When inlining is disabled (e.g. for debugging) this may
break the build as observed when building svx in debug mode on Solaris.

Modified:
    openoffice/trunk/main/editeng/inc/editeng/outlobj.hxx
    openoffice/trunk/main/editeng/source/outliner/outlobj.cxx

Modified: openoffice/trunk/main/editeng/inc/editeng/outlobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/outlobj.hxx?rev=1562109&r1=1562108&r2=1562109&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/inc/editeng/outlobj.hxx (original)
+++ openoffice/trunk/main/editeng/inc/editeng/outlobj.hxx Tue Jan 28 16:24:44 2014
@@ -46,11 +46,9 @@ private:
 
 public:
     // constructors/destructor
-    OutlinerParaObject(
-        const EditTextObject& rEditTextObject, 
-        const ParagraphDataVector& rParagraphDataVector = ParagraphDataVector(), 
-        bool bIsEditDoc = true);
-    OutlinerParaObject(const OutlinerParaObject& rCandidate);
+    OutlinerParaObject( const EditTextObject&, const ParagraphDataVector&, bool bIsEditDoc
= true);
+    OutlinerParaObject( const EditTextObject&);
+    OutlinerParaObject( const OutlinerParaObject&);
     ~OutlinerParaObject();
 
 	// assignment operator

Modified: openoffice/trunk/main/editeng/source/outliner/outlobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/outliner/outlobj.cxx?rev=1562109&r1=1562108&r2=1562109&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/outliner/outlobj.cxx (original)
+++ openoffice/trunk/main/editeng/source/outliner/outlobj.cxx Tue Jan 28 16:24:44 2014
@@ -98,6 +98,10 @@ OutlinerParaObject::OutlinerParaObject(c
 {
 }
 
+OutlinerParaObject::OutlinerParaObject( const EditTextObject& rEditTextObject)
+:   mpImplOutlinerParaObject( new ImplOutlinerParaObject( rEditTextObject.Clone(), ParagraphDataVector(),
true))
+{}
+
 OutlinerParaObject::OutlinerParaObject(const OutlinerParaObject& rCandidate)
 :   mpImplOutlinerParaObject(rCandidate.mpImplOutlinerParaObject)
 {



Mime
View raw message