mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i123228# ParagraphData symbols shouldn't be required...

Browse Source 
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
This commit is contained in:
Herbert Dürr 2014-01-28 16:24:44 +00:00 committed by Caolán McNamara
parent 00a63ba1c7
commit f46a685b27
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editeng/source/outliner/outlobj.cxx
View File

@ -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)
{

8
include/editeng/outlobj.hxx
View File

@ -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