editeng/source/outliner/outlobj.cxx | 4 ++++
include/editeng/outlobj.hxx | 8 +++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit f46a685b27d1504dc050851d244a8a2ef3984ecf
Author: Herbert Dürr <h...@apache.org>
Date: Tue Jan 28 16:24:44 2014 +0000
Resolves: #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.
(cherry picked from commit 2738b2ea2df22759f32b687d08fd6868b425760e)
Change-Id: I0a8250fe3d61819217c913949dfa20a902b3e397
diff --git a/editeng/source/outliner/outlobj.cxx
b/editeng/source/outliner/outlobj.cxx
index 32b76de..f1e87ed 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -96,6 +96,10 @@ OutlinerParaObject::OutlinerParaObject(const EditTextObject&
rEditTextObject, co
{
}
+OutlinerParaObject::OutlinerParaObject( const EditTextObject& rEditTextObject)
+: mpImplOutlinerParaObject( new ImplOutlinerParaObject(
rEditTextObject.Clone(), ParagraphDataVector(), true))
+{}
+
OutlinerParaObject::OutlinerParaObject(const OutlinerParaObject& rCandidate)
: mpImplOutlinerParaObject(rCandidate.mpImplOutlinerParaObject)
{
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 402db4e..23f9a6a 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -42,11 +42,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
