summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-11 13:11:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-11 13:58:57 +0100
commit3927105e19d335da6461d853ba5cedda788067da (patch)
tree1d2bbd20c059611410bbaccd967fcb47904d331f /vcl
parentb897cc4dfc7111eb8dfd5d8aa8c970f21ab035d6 (diff)
convert ruler menu to .ui
Change-Id: I5f9b0033288ccd4b58e055998834185970f987b0
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/field.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 394fb8f73bf9..68baa147006a 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1023,7 +1023,7 @@ static const OUString ImplMetricToString( FieldUnit rUnit )
return OUString();
}
-static FieldUnit ImplStringToMetric(const OUString &rMetricString)
+FieldUnit MetricFormatter::StringToMetric(const OUString &rMetricString)
{
FieldUnitStringList* pList = ImplGetCleanedFieldUnits();
if( pList )
@@ -1042,8 +1042,8 @@ static FieldUnit ImplStringToMetric(const OUString &rMetricString)
static FieldUnit ImplMetricGetUnit(const OUString& rStr)
{
- OUString aStr = ImplMetricGetUnitText( rStr );
- return ImplStringToMetric( aStr );
+ OUString aStr = ImplMetricGetUnitText(rStr);
+ return MetricFormatter::StringToMetric(aStr);
}
#define K *1000L