svx/source/svdraw/svdotext.cxx | 27 ++++++++++++++++-----------
svx/source/svdraw/svdotextdecomposition.cxx | 3 +--
svx/source/svdraw/svdotxed.cxx | 25 +++++++++++++------------
3 files changed, 30 insertions(+), 25 deletions(-)
New commits:
commit f907f74a5ef3372f275c2ef5cb51d38823383e34
Author: matteocam <matteo.campane...@gmail.com>
Date: Tue Aug 12 17:39:32 2014 +0200
Reverted changes from i119885
Change-Id: I8fc1ab70e6be8801e6ad0a60d3b60f7b622fe89f
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 1cc03b0..ad1ae75 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -718,11 +718,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
Rectangle& rTextRect, boo
sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
- // FIXME(matteocam)
- bool bChainedFrame = true; // XXX: should be returned from a method
-
- if (!bChainedFrame) {
-
if (!bContourFrame)
{
rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -748,15 +743,21 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
Rectangle& rTextRect, boo
if (eAniDirection==SDRTEXTANI_UP ||
eAniDirection==SDRTEXTANI_DOWN) nHgt=1000000;
}
- // #i119885# Do not limit/force height to geometrical frame (vice
versa for vertical writing)
- if(IsVerticalWriting())
- {
- nWdt = 1000000;
- }
- else
- {
- nHgt = 1000000;
- }
+ // FIXME(matteocam)
+ bool bChainedFrame = true; // XXX: should be returned from a method
+
+ if (!bChainedFrame) {
+
+ // #i119885# Do not limit/force height to geometrical frame
(vice versa for vertical writing)
+ if(IsVerticalWriting())
+ {
+ nWdt = 1000000;
+ }
+ else
+ {
+ nHgt = 1000000;
+ }
+ } // END if (!bChainedFrame)
rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
}
@@ -773,7 +774,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
Rectangle& rTextRect, boo
rOutliner.SetMinAutoPaperSize(Size(0, nAnkHgt));
}
}
- } // END if (!bChainedFrame)
rOutliner.SetPaperSize(aNullSize);
if (bContourFrame)
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 882136b..4ed8b58 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -935,8 +935,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
rOutliner.SetFixedCellHeight(rSdrBlockTextPrimitive.isFixedCellHeight());
rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE);
rOutliner.SetMinAutoPaperSize(aNullSize);
- //rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
- rOutliner.SetMaxAutoPaperSize(Size(1000000,2000));
+ rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
// Resolves: fdo#35779 set background color of this shape as the editeng
background if there
// is one. Check the shape itself, then the host page, then that page's
master page.
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index a671681..2cbf851 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -186,16 +186,20 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size*
pPaperMax, Rectangle* p
if (eAniDirection==SDRTEXTANI_UP ||
eAniDirection==SDRTEXTANI_DOWN) nMaxHgt=1000000;
}
- // #i119885# Do not limit/force height to geometrical frame (vice
versa for vertical writing)
- if(IsVerticalWriting())
- {
- nMaxWdt = 1000000;
- }
- else
- {
- nMaxHgt = 1000000;
+ // FIXME(matteocam)
+ bool bChainedFrame = true; // XXX: should be returned from a method
+
+ if ( !bChainedFrame ) {
+ // #i119885# Do not limit/force height to geometrical frame
(vice versa for vertical writing)
+ if(IsVerticalWriting())
+ {
+ nMaxWdt = 1000000;
+ }
+ else
+ {
+ nMaxHgt = 1000000;
+ }
}
-
aPaperMax.Width()=nMaxWdt;
aPaperMax.Height()=nMaxHgt;
}
@@ -249,10 +253,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size*
pPaperMax, Rectangle* p
aPaperMin.Height() = 0;
}
- // FIXME(matteocam)
- aPaperMax.Height() = 2000;
- aPaperMin.Height() = 2000;
-
if (pPaperMin!=NULL) *pPaperMin=aPaperMin;
if (pPaperMax!=NULL) *pPaperMax=aPaperMax;
if (pViewInit!=NULL) *pViewInit=aViewInit;
commit 80e25868d2b1fa90f00e89988a4301106a3f412e
Author: matteocam <matteo.campane...@gmail.com>
Date: Tue Aug 12 17:12:06 2014 +0200
Drafted changes for IsChainedFrame
Change-Id: I23056cfcfa2d4fe96e595c3288acc8599370f6df
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index aefaca8..1cc03b0 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -717,6 +717,12 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
Rectangle& rTextRect, boo
bool bFrame=IsTextFrame();
sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
+
+ // FIXME(matteocam)
+ bool bChainedFrame = true; // XXX: should be returned from a method
+
+ if (!bChainedFrame) {
+
if (!bContourFrame)
{
rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -750,8 +756,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
Rectangle& rTextRect, boo
else
{
nHgt = 1000000;
- // FIXME(matteocam)
- nHgt = 2000;
}
rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
@@ -769,6 +773,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
Rectangle& rTextRect, boo
rOutliner.SetMinAutoPaperSize(Size(0, nAnkHgt));
}
}
+ } // END if (!bChainedFrame)
rOutliner.SetPaperSize(aNullSize);
if (bContourFrame)
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 57e1ed9..a671681 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -251,6 +251,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size*
pPaperMax, Rectangle* p
// FIXME(matteocam)
aPaperMax.Height() = 2000;
+ aPaperMin.Height() = 2000;
if (pPaperMin!=NULL) *pPaperMin=aPaperMin;
if (pPaperMax!=NULL) *pPaperMax=aPaperMax;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
