Tag: cws_src680_reportdesign01 User: oj Date: 2007-10-11 11:53:28+0000 Modified: dba/reportdesign/source/ui/inspection/GeometryHandler.cxx dba/reportdesign/source/ui/report/ReportWindow.cxx dba/reportdesign/source/ui/report/StartMarker.cxx
Log: #i81963# field unit corrected File Changes: Directory: /dba/reportdesign/source/ui/inspection/ ================================================== File [changed]: GeometryHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/GeometryHandler.cxx?r1=1.4.20.9&r2=1.4.20.10 Delta lines: +3 -3 ------------------- --- GeometryHandler.cxx 2007-10-11 10:00:26+0000 1.4.20.9 +++ GeometryHandler.cxx 2007-10-11 11:53:26+0000 1.4.20.10 @@ -4,9 +4,9 @@ * * $RCSfile: GeometryHandler.cxx,v $ * - * $Revision: 1.4.20.9 $ + * $Revision: 1.4.20.10 $ * - * last change: $Author: oj $ $Date: 2007/10/11 10:00:26 $ + * last change: $Author: oj $ $Date: 2007/10/11 11:53:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -951,8 +951,8 @@ const sal_Int16 nDisplayUnit = VCLUnoHelper::ConvertToMeasurementUnit( MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH, 1 ); uno::Reference< inspection::XNumericControl > xNumericControl(aOut.Control,uno::UNO_QUERY); xNumericControl->setDecimalDigits( 2 ); - xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0)); xNumericControl->setValueUnit( util::MeasureUnit::MM_100TH ); + xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0)); if ( nDisplayUnit != -1 ) xNumericControl->setDisplayUnit( nDisplayUnit ); uno::Reference< report::XReportComponent> xComp(m_xReportComponent,uno::UNO_QUERY); Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportWindow.cxx?r1=1.3&r2=1.3.20.1 Delta lines: +7 -3 ------------------- --- ReportWindow.cxx 2007-08-02 14:40:37+0000 1.3 +++ ReportWindow.cxx 2007-10-11 11:53:26+0000 1.3.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: ReportWindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.20.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:40:37 $ + * last change: $Author: oj $ $Date: 2007/10/11 11:53:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,6 +102,8 @@ #include "dlgedfac.hxx" #endif #include <boost/bind.hpp> +#include <toolkit/helper/vclunohelper.hxx> +#include <svtools/syslocale.hxx> #define SECTION_OFFSET 3 namespace rptui @@ -137,6 +139,8 @@ m_aHRuler.SetIndents(); m_aHRuler.SetMargin1(); m_aHRuler.SetMargin2(); + const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); + m_aHRuler.SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH); m_pObjFac = new DlgEdFactory(); File [changed]: StartMarker.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/StartMarker.cxx?r1=1.3&r2=1.3.20.1 Delta lines: +7 -3 ------------------- --- StartMarker.cxx 2007-08-03 10:04:34+0000 1.3 +++ StartMarker.cxx 2007-10-11 11:53:26+0000 1.3.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: StartMarker.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.20.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 10:04:34 $ + * last change: $Author: oj $ $Date: 2007/10/11 11:53:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,6 +66,8 @@ #endif #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <svtools/syslocale.hxx> #ifndef _SFXSMPLHINT_HXX #include <svtools/smplhint.hxx> #endif @@ -112,6 +114,8 @@ m_aVRuler.SetIndents(); m_aVRuler.SetMargin1(); m_aVRuler.SetMargin2(); + const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); + m_aVRuler.SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
