diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 10:37:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 10:37:47 +0000 |
| commit | 32a198206b044aa6bd070dab050ce255920c6011 (patch) | |
| tree | afe3653670b5d568e3d4c6a7687ecda73b1cc304 /svx | |
| parent | e498e25abef87477d04c2455d31f333447a0297b (diff) | |
INTEGRATION: CWS mfdouble (1.34.60); FILE MERGED
2006/12/21 16:38:40 pl 1.34.60.2: RESYNC: (1.34-1.35); FILE MERGED
2006/12/14 19:15:51 pl 1.34.60.1: #i71046# increase precision of MetricField and friends
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/tpline.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/dialog/tpline.cxx b/svx/source/dialog/tpline.cxx index 84217ac1dff3..fa42457270d4 100644 --- a/svx/source/dialog/tpline.cxx +++ b/svx/source/dialog/tpline.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tpline.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: kz $ $Date: 2006-12-12 16:37:01 $ + * last change: $Author: obo $ $Date: 2007-01-23 11:37:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -815,7 +815,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(nSymbolType!=SVX_SYMBOLTYPE_UNKNOWN || bNewSize) { - //wurde also per Auswahl gesetzt oder Gre ist anders + //wurde also per Auswahl gesetzt oder Gr��e ist anders SvxSizeItem aSItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),aSymbolSize); const SfxPoolItem* pSOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE) ); bNewSize = pSOld ? *(const SvxSizeItem *)pSOld != aSItem : bNewSize ; @@ -1627,7 +1627,7 @@ void SvxLineTabPage::FillUserData() //#58425# Symbole auf einer Linie (z.B. StarChart) -//Handler fr Popup-Menue der Symbolauswahl (NumMenueButton) +//Handler f�r Popup-Menue der Symbolauswahl (NumMenueButton) //der folgende Link stammt urspruenglich aus SvxNumOptionsTabPage IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) { @@ -1765,7 +1765,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) return 0; } //#58425# Symbole auf einer Linie (z.B. StarChart) -//Handler fr Popup-Menue der Symbolauswahl (NumMenueButton) +//Handler f�r Popup-Menue der Symbolauswahl (NumMenueButton) //der folgende Link stammt urspruenglich aus SvxNumOptionsTabPage: IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) { @@ -1804,7 +1804,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) } //#58425# Symbole auf einer Linie (z.B. StarChart) -//Handler fr Menuebutton +//Handler f�r Menuebutton IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton ) { USHORT nItemId = pButton->GetCurItemId(); @@ -1847,7 +1847,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton ) SVX_TRACE(213, aStr ); #endif bDontSetSize=TRUE; - bNewSize=false; //frhere nderungen gelten nicht in diesem Fall! + bNewSize=false; //fr�here �nderungen gelten nicht in diesem Fall! nSymbolType=SVX_SYMBOLTYPE_AUTO; bEnable=FALSE; } @@ -1927,8 +1927,8 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) BOOL bWidth = (BOOL)(pField == &aSymbolWidthMF); bLastWidthModified = bWidth; BOOL bRatio = aSymbolRatioCB.IsChecked(); - long nWidthVal = aSymbolWidthMF.Denormalize(aSymbolWidthMF.GetValue(FUNIT_100TH_MM)); - long nHeightVal= aSymbolHeightMF.Denormalize(aSymbolHeightMF.GetValue(FUNIT_100TH_MM)); + long nWidthVal = static_cast<long>(aSymbolWidthMF.Denormalize(aSymbolWidthMF.GetValue(FUNIT_100TH_MM))); + long nHeightVal= static_cast<long>(aSymbolHeightMF.Denormalize(aSymbolHeightMF.GetValue(FUNIT_100TH_MM))); nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit ); nHeightVal = OutputDevice::LogicToLogic(nHeightVal,MAP_100TH_MM,(MapUnit)ePoolUnit); aSymbolSize=Size(nWidthVal,nHeightVal); |