Kaydet (Commit) b52785c9 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.15.220); FILE MERGED

2006/02/23 19:32:20 aw 1.15.220.1: #i55991# Adaptions to warning free code
üst 2a02d8e8
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: svdotxed.cxx,v $ * $RCSfile: svdotxed.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 00:36:29 $ * last change: $Author: hr $ $Date: 2006-06-19 16:44:38 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -270,7 +270,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p ...@@ -270,7 +270,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
} }
// #103516# For complete ver adjust support, set paper min height to 0, here. // #103516# For complete ver adjust support, set paper min height to 0, here.
if(SDRTEXTHORZADJUST_BLOCK != eVAdj || bFitToSize) if(SDRTEXTVERTADJUST_BLOCK != eVAdj || bFitToSize)
{ {
aPaperMin.Height() = 0; aPaperMin.Height() = 0;
} }
...@@ -372,11 +372,11 @@ void SdrTextObj::ImpSetTextEditParams() const ...@@ -372,11 +372,11 @@ void SdrTextObj::ImpSetTextEditParams() const
Size aPaperMax; Size aPaperMax;
Rectangle aEditArea; Rectangle aEditArea;
TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL);
SdrFitToSizeType eFit=GetFitToSize(); //SdrFitToSizeType eFit=GetFitToSize();
FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); //FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
FASTBOOL bContourFrame=IsContourTextFrame(); FASTBOOL bContourFrame=IsContourTextFrame();
EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode();
ULONG nViewAnz=pEdtOutl->GetViewCount(); //ULONG nViewAnz=pEdtOutl->GetViewCount();
pEdtOutl->SetMinAutoPaperSize(aPaperMin); pEdtOutl->SetMinAutoPaperSize(aPaperMin);
pEdtOutl->SetMaxAutoPaperSize(aPaperMax); pEdtOutl->SetMaxAutoPaperSize(aPaperMax);
pEdtOutl->SetPaperSize(Size()); pEdtOutl->SetPaperSize(Size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment