editeng/source/outliner/overflowingtxt.cxx | 9 ++++----- include/editeng/editeng.hxx | 2 ++ include/editeng/outliner.hxx | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit d5b80ee6210e9efac8f2a609ec8d9df5ce1153c9 Author: matteocam <matteo.campane...@gmail.com> Date: Sat Aug 15 11:14:50 2015 +0200 [unbuildable] Included required headers Change-Id: I4f525b06982d34e0946e15cbcaa5fc8996d70f90 diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index a443a82..3a97c89 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -26,6 +26,10 @@ #include <editeng/editobj.hxx> #include <editeng/editdata.hxx> +// XXX +#include <outleeng.hxx> +#include "../editeng/editdoc.hxx" + #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> @@ -193,11 +197,6 @@ OutlinerParaObject *OverflowingText::JuxtaposeParaObject(Outliner *pOutl, Outlin OutlinerParaObject *OverflowingText::impMakeOverflowingParaObject(Outliner *pOutliner) { - if (mpContentTextObj == NULL) { - fprintf(stderr, "[Chaining] OverflowingText's mpContentTextObj is NULL!\n"); - return NULL; - } - // Simply Juxtaposing; no within-para merging OutlinerParaObject *pOverflowingPObj = new OutlinerParaObject(*mpContentTextObj); // the OutlinerParaObject constr. at the prev line gives no valid outliner mode, so we set it diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 98f5d7c..e5604461 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -145,6 +145,8 @@ class EDITENG_DLLPUBLIC EditEngine friend class EditDbg; friend class Outliner; + friend class OverflowingText; + public: typedef std::vector<EditView*> ViewsType; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 07d9215..833a9ad 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -585,7 +585,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster friend class OutlinerUndoCheckPara; friend class OutlinerUndoChangeParaFlags; - friend class NonOverflowingText; + friend class OverflowingText; OutlinerEditEng* pEditEngine; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits