diff options
author | Peter Burow <pb@openoffice.org> | 2000-10-09 10:43:14 +0000 |
---|---|---|
committer | Peter Burow <pb@openoffice.org> | 2000-10-09 10:43:14 +0000 |
commit | baba7ea93e4604256695a49c121c09a2141041a3 (patch) | |
tree | db5fde9e4d0d8e474b6f65cb58959092ecb32535 /svx/source/dialog/_contdlg.cxx | |
parent | 583b9c8d9befc05eb042ab4e65c5128685b4f9f0 (diff) |
chg: replaced SfxOptions::GetMetric() with getModuleFieldUnit()
Diffstat (limited to 'svx/source/dialog/_contdlg.cxx')
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 850fbb824e46..ad1ed156b9ba 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: _contdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:01:06 $ + * last change: $Author: pb $ $Date: 2000-10-09 11:38:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,9 +80,6 @@ #ifndef _SFXDISPATCH_HXX #include <sfx2/dispatch.hxx> #endif -#ifndef _SFX_SAVEOPT_HXX //autogen -#include <sfx2/saveopt.hxx> -#endif #include <sfx2/viewfrm.hxx> #pragma hdrstop @@ -106,6 +103,7 @@ #include "contwnd.hxx" #include "svdtrans.hxx" #include "svdopath.hxx" +#include "dlgutil.hxx" /******************************************************************************/ @@ -896,10 +894,10 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) { - String aStr; - const FieldUnit eFieldUnit = SFX_APP()->GetOptions().GetMetric(); - const Point& rMousePos = pWnd->GetMousePos(); - const sal_Unicode cSep = International().GetNumDecimalSep(); + String aStr; + const FieldUnit eFieldUnit = GetModuleFieldUnit(); + const Point& rMousePos = pWnd->GetMousePos(); + const sal_Unicode cSep = International().GetNumDecimalSep(); aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) ); aStr.Append( String::CreateFromAscii( " / " ) ); @@ -910,7 +908,6 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) return 0L; } - /************************************************************************* |* |* @@ -919,10 +916,10 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) { - String aStr; - const FieldUnit eFieldUnit = SFX_APP()->GetOptions().GetMetric(); - const Size& rSize = pWnd->GetGraphicSize(); - const sal_Unicode cSep = International().GetNumDecimalSep(); + String aStr; + const FieldUnit eFieldUnit = GetModuleFieldUnit(); + const Size& rSize = pWnd->GetGraphicSize(); + const sal_Unicode cSep = International().GetNumDecimalSep(); aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) ); aStr.Append( String::CreateFromAscii( " x " ) ); @@ -933,7 +930,6 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) return 0L; } - /************************************************************************* |* |* |