[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/editeng svx/source
matteocam
matteo.campanelli at gmail.com
Tue Jun 16 13:31:13 PDT 2015
include/editeng/overflowingtxt.hxx | 10 +++++++---
svx/source/svdraw/svdotextdecomposition.cxx | 2 --
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 17f19d1cca035256176fd0315155a5d4cf27516e
Author: matteocam <matteo.campanelli at gmail.com>
Date: Tue Jun 16 16:30:08 2015 -0400
Exports (Non)OverflowingText classes
Change-Id: I2a4b17e4d08d830cb413fef77af59ed9c031fb1f
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index ef1cfc8..40eaa28 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
#define INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
+#include <editeng/macros.hxx>
+#include <editeng/editengdllapi.h>
class OUString;
@@ -27,8 +29,10 @@ class OUString;
class OutlinerParaObject;
-class OverflowingText {
- public:
+class EDITENG_DLLPUBLIC OverflowingText
+{
+
+public:
OUString mHeadTxt;
const OutlinerParaObject *mpMidParas;
OUString mTailTxt;
@@ -47,7 +51,7 @@ class OverflowingText {
OUString GetEndingLines() const;
};
-class NonOverflowingText {
+class EDITENG_DLLPUBLIC NonOverflowingText {
public:
const OutlinerParaObject *mpHeadParas;
OUString mPreOverflowingTxt;
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 1a56f94..6d1a0c4 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1628,8 +1628,6 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
/* Begin overflow handling */
- TextChain *aTxtChain = new TextChain;
-
// If overflow occurs we have to cut the text at the right point
// If in edit mode ImpEditEngine should have taken care of this
if ( rOutliner.IsPageOverflow() && !IsInEditMode()) {
More information about the Libreoffice-commits
mailing list