diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:44:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:44:38 +0000 |
| commit | b52785c92a93eb43ec68f8d06d34591b18178d98 (patch) | |
| tree | 5193b9cfb230fc5ddd5976d5d90fed6a86fa6e73 /svx/source/svdraw/svdotxed.cxx | |
| parent | 2a02d8e89605e63a37395b4eba7d3a22391a1766 (diff) | |
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
Diffstat (limited to 'svx/source/svdraw/svdotxed.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 8d36a8a1254f..da270755f770 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -4,9 +4,9 @@ * * $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 terms of GNU Lesser General Public License Version 2.1. @@ -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. - if(SDRTEXTHORZADJUST_BLOCK != eVAdj || bFitToSize) + if(SDRTEXTVERTADJUST_BLOCK != eVAdj || bFitToSize) { aPaperMin.Height() = 0; } @@ -372,11 +372,11 @@ void SdrTextObj::ImpSetTextEditParams() const Size aPaperMax; Rectangle aEditArea; TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); - SdrFitToSizeType eFit=GetFitToSize(); - FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + //SdrFitToSizeType eFit=GetFitToSize(); + //FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); FASTBOOL bContourFrame=IsContourTextFrame(); - EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); - ULONG nViewAnz=pEdtOutl->GetViewCount(); + //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); + //ULONG nViewAnz=pEdtOutl->GetViewCount(); pEdtOutl->SetMinAutoPaperSize(aPaperMin); pEdtOutl->SetMaxAutoPaperSize(aPaperMax); pEdtOutl->SetPaperSize(Size()); |