diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-28 16:24:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-29 09:11:57 +0000 |
| commit | f46a685b27d1504dc050851d244a8a2ef3984ecf (patch) | |
| tree | 4bab8602877aa4b12fe7c2c365f7fb03b4b30db7 | |
| parent | 00a63ba1c7e89563ea1aeeca46873e3e205e8632 (diff) | |
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
| -rw-r--r-- | editeng/source/outliner/outlobj.cxx | 4 | ||||
| -rw-r--r-- | include/editeng/outlobj.hxx | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx index 32b76de5300f..f1e87edaf6fc 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 402db4e16a75..23f9a6a39c97 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 |