diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-18 13:00:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-18 13:47:31 +0100 |
| commit | cc0b40f6a94f05b36b31b1a7a55431e1b5f2608e (patch) | |
| tree | b51e62ce3f7d2b7f0926bf8439c6fc1773569150 /vcl | |
| parent | e45d6b4e503b2a795ff79aaf3f3f8a7b065f9488 (diff) | |
add some a11y relations and enable translation of ms
Change-Id: Ib509a7ae62aefc919bdaed269c1605ac6bae9564
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/field.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/src/units.src | 1 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 7ff247ce958b..27367d770dae 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1304,11 +1304,12 @@ double MetricField::ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, sa eOutUnit == FUNIT_NONE || eOutUnit == FUNIT_DEGREE || eOutUnit == FUNIT_SECOND || + eOutUnit == FUNIT_MILLISECOND || eOutUnit == FUNIT_PIXEL || eInUnit == FUNIT_CUSTOM || eInUnit == FUNIT_NONE || eInUnit == FUNIT_DEGREE || - eInUnit == FUNIT_SECOND || + eInUnit == FUNIT_MILLISECOND || eInUnit == FUNIT_PIXEL ) return nValue; else @@ -1400,6 +1401,7 @@ double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, eInUnit == FUNIT_NONE || eInUnit == FUNIT_DEGREE || eInUnit == FUNIT_SECOND || + eInUnit == FUNIT_MILLISECOND || eInUnit == FUNIT_PIXEL || eOutUnit == MAP_PIXEL || eOutUnit == MAP_SYSFONT || diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src index 8f07c7f4b5bf..3445e921e283 100644 --- a/vcl/source/src/units.src +++ b/vcl/source/src/units.src @@ -47,6 +47,7 @@ StringArray SV_FUNIT_STRINGS < " pixel" ; FUNIT_PIXEL ; > ; < "°" ; FUNIT_DEGREE ; > ; < "sec" ; FUNIT_SECOND ; > ; + < "ms" ; FUNIT_MILLISECOND ; > ; }; }; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 728eae56b7a6..8641ed2fbcd9 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -833,6 +833,8 @@ namespace eUnit = FUNIT_DEGREE; else if ((sUnit == "sec") || (sUnit == "seconds") || (sUnit == "second")) eUnit = FUNIT_SECOND; + else if ((sUnit == "ms") || (sUnit == "milliseconds") || (sUnit == "millisecond")) + eUnit = FUNIT_MILLISECOND; else if (sUnit != "0") eUnit = FUNIT_CUSTOM; |