editeng/inc/editeng/outlobj.hxx | 8 +++----- editeng/source/outliner/outlobj.cxx | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 2738b2ea2df22759f32b687d08fd6868b425760e Author: Herbert Dürr <[email protected]> Date: Tue Jan 28 16:24:44 2014 +0000 #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. diff --git a/editeng/inc/editeng/outlobj.hxx b/editeng/inc/editeng/outlobj.hxx index b08284e..c0f4d9d 100644 --- a/editeng/inc/editeng/outlobj.hxx +++ b/editeng/inc/editeng/outlobj.hxx @@ -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 diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx index 81b9176..b285599 100644 --- a/editeng/source/outliner/outlobj.cxx +++ b/editeng/source/outliner/outlobj.cxx @@ -98,6 +98,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) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
