diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:44:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:44:09 +0000 |
| commit | ad1f95d8912fdd2949634422705da8005120a581 (patch) | |
| tree | 744cf070fe50b21a8ab2ee4c20d53419a0af29e4 /svx/source/svdraw/svdotxat.cxx | |
| parent | c99836322bfdc8716b377457c261de536bcae5ae (diff) | |
INTEGRATION: CWS warnings01 (1.26.220); FILE MERGED
2006/02/22 21:57:13 aw 1.26.220.1: #i55991# Adaptions to warning free code
Diffstat (limited to 'svx/source/svdraw/svdotxat.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxat.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index e72ee89cf6b5..cefc9c7ce747 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdotxat.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:35:54 $ + * last change: $Author: hr $ $Date: 2006-06-19 16:44:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -180,9 +180,9 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, { pEdtOutl->SetMaxAutoPaperSize(aSiz); if (bWdtGrow) { - Size aSiz(pEdtOutl->CalcTextSize()); - nWdt=aSiz.Width()+1; // lieber etwas Tolleranz - if (bHgtGrow) nHgt=aSiz.Height()+1; // lieber etwas Tolleranz + Size aSiz2(pEdtOutl->CalcTextSize()); + nWdt=aSiz2.Width()+1; // lieber etwas Tolleranz + if (bHgtGrow) nHgt=aSiz2.Height()+1; // lieber etwas Tolleranz } else { nHgt=pEdtOutl->GetTextHeight()+1; // lieber etwas Tolleranz } @@ -198,9 +198,9 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } if (bWdtGrow) { - Size aSiz(rOutliner.CalcTextSize()); - nWdt=aSiz.Width()+1; // lieber etwas Tolleranz - if (bHgtGrow) nHgt=aSiz.Height()+1; // lieber etwas Tolleranz + Size aSiz2(rOutliner.CalcTextSize()); + nWdt=aSiz2.Width()+1; // lieber etwas Tolleranz + if (bHgtGrow) nHgt=aSiz2.Height()+1; // lieber etwas Tolleranz } else { nHgt=rOutliner.GetTextHeight()+1; // lieber etwas Tolleranz } |