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

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
üst c9983632
......@@ -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
}
......
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