INTEGRATION: CWS mfdouble (1.23.138); FILE MERGED

2006/12/14 19:15:51 pl 1.23.138.1: #i71046# increase precision of MetricField and friends

2 files changed, 12 insertions, 12 deletions

diff --git a/svx/source/dialog/tparea.cxx b/svx/source/dialog/tparea.cxx
index 0ef69a102616..8d6536e0440e 100644
--- a/svx/source/dialog/tparea.cxx
+++ b/svx/source/dialog/tparea.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tparea.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: obo $ $Date: 2006-10-12 12:29:54 $
+ *  last change: $Author: obo $ $Date: 2007-01-23 11:37:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1291,7 +1291,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
                     // Prozentwerte werden negativ gesetzt, damit
                     // diese nicht skaliert werden; dieses wird
                     // im Item beruecksichtigt ( KA05.11.96 )
-                    pItem = new XFillBmpSizeXItem( -labs( aMtrFldXSize.GetValue() ) );
+                    pItem = new XFillBmpSizeXItem( -labs( static_cast<long>(aMtrFldXSize.GetValue()) ) );
                 }
             }
             else if( aTsbOriginal.IsEnabled() &&
@@ -1328,7 +1328,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
                     // Prozentwerte werden negativ gesetzt, damit
                     // diese vom MetricItem nicht skaliert werden;
                     // dieses wird im Item beruecksichtigt ( KA05.11.96 )
-                    pItem = new XFillBmpSizeYItem( -labs( aMtrFldYSize.GetValue() ) );
+                    pItem = new XFillBmpSizeYItem( -labs( static_cast<long>(aMtrFldYSize.GetValue()) ) );
                 }
             }
             else if( aTsbOriginal.IsEnabled() &&
@@ -2473,7 +2473,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG )
         if( eScaleState == STATE_NOCHECK )
             pItem = new XFillBmpSizeXItem( GetCoreValue( aMtrFldXSize, ePoolUnit ) );
         else
-            pItem = new XFillBmpSizeXItem( -labs( aMtrFldXSize.GetValue() ) );
+            pItem = new XFillBmpSizeXItem( -labs( static_cast<long>(aMtrFldXSize.GetValue()) ) );
 
         rXFSet.Put( *pItem );
 
@@ -2494,7 +2494,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG )
         if( eScaleState == STATE_NOCHECK )
             pItem = new XFillBmpSizeYItem( GetCoreValue( aMtrFldYSize, ePoolUnit ) );
         else
-            pItem = new XFillBmpSizeYItem( -labs( aMtrFldYSize.GetValue() ) );
+            pItem = new XFillBmpSizeYItem( -labs( static_cast<long>(aMtrFldYSize.GetValue()) ) );
 
         rXFSet.Put( *pItem );
 
diff --git a/svx/source/dialog/tphatch.cxx b/svx/source/dialog/tphatch.cxx
index c0a5bb5d35f8..9ed17b93022f 100644
--- a/svx/source/dialog/tphatch.cxx
+++ b/svx/source/dialog/tphatch.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tphatch.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: obo $ $Date: 2006-10-12 12:30:44 $
+ *  last change: $Author: obo $ $Date: 2007-01-23 11:37:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -368,7 +368,7 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
                 pXHatch = new XHatch( aLbLineColor.GetSelectEntryColor(),
                                  (XHatchStyle) aLbLineType.GetSelectEntryPos(),
                                  GetCoreValue( aMtrDistance, ePoolUnit ),
-                                 aMtrAngle.GetValue() * 10 );
+                                 static_cast<long>(aMtrAngle.GetValue() * 10) );
             }
             DBG_ASSERT( pXHatch, "XHatch konnte nicht erzeugt werden" );
             rSet.Put( XFillStyleItem( XFILL_HATCH ) );
@@ -439,7 +439,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
     XHatch aXHatch( aLbLineColor.GetSelectEntryColor(),
                     (XHatchStyle) aLbLineType.GetSelectEntryPos(),
                     GetCoreValue( aMtrDistance, ePoolUnit ),
-                    aMtrAngle.GetValue() * 10 );
+                    static_cast<long>(aMtrAngle.GetValue() * 10) );
 
     rXFSet.Put( XFillHatchItem( String(), aXHatch ) );
     XOut.SetFillAttr( aXFillAttr.GetItemSet() );
@@ -604,7 +604,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         XHatch aXHatch( aLbLineColor.GetSelectEntryColor(),
                         (XHatchStyle) aLbLineType.GetSelectEntryPos(),
                         GetCoreValue( aMtrDistance, ePoolUnit ),
-                        aMtrAngle.GetValue() * 10 );
+                        static_cast<long>(aMtrAngle.GetValue() * 10) );
         XHatchEntry* pEntry = new XHatchEntry( aXHatch, aName );
 
         pHatchingList->Insert( pEntry, nCount );
@@ -680,7 +680,7 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
                 XHatch aXHatch( aLbLineColor.GetSelectEntryColor(),
                                 (XHatchStyle) aLbLineType.GetSelectEntryPos(),
                                  GetCoreValue( aMtrDistance, ePoolUnit ),
-                                aMtrAngle.GetValue() * 10 );
+                                static_cast<long>(aMtrAngle.GetValue() * 10) );
 
                 XHatchEntry* pEntry = new XHatchEntry( aXHatch, aName );