diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-08 13:30:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-08 13:45:03 +0000 |
| commit | daa654fb44772009017b0c918903093147df1620 (patch) | |
| tree | c14298da7b1d39608ca5761645223d5068a18b66 | |
| parent | ef683ad85210455e64e9472161c91407fe173ddf (diff) | |
GtkComboBox->VclComboBoxNumeric
Change-Id: Iba1416692a619c1f566f26da5b06ed04342057b3
| -rw-r--r-- | svx/uiconfig/ui/sidebarpossize.ui | 2 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui index e0aa74b9ab95..c135e5c21992 100644 --- a/svx/uiconfig/ui/sidebarpossize.ui +++ b/svx/uiconfig/ui/sidebarpossize.ui @@ -234,7 +234,7 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="rotation:0.00degrees"> + <object class="VclComboBoxNumeric" id="rotation:0.00degrees"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 0d4ca5764834..5aac570883dd 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1351,14 +1351,14 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri if (!sPattern.isEmpty()) { + connectNumericFormatterAdjustment(id, sAdjustment); OString sUnit = extractUnit(sPattern); FieldUnit eUnit = detectMetricUnit(sUnit); SAL_INFO("vcl.layout", "making metric box for " << name.getStr() << " " << sUnit.getStr()); - connectNumericFormatterAdjustment(id, sAdjustment); - MetricBox *pBox = new MetricBox(pParent, nBits|WB_BORDER); - if (bDropdown) - pBox->EnableAutoSize(true); + MetricBox *pBox = new MetricBox(pParent, nBits); + pBox->EnableAutoSize(true); pBox->SetUnit(eUnit); + pBox->SetDecimalDigits(extractDecimalDigits(sPattern)); if (eUnit == FUNIT_CUSTOM) pBox->SetCustomUnitText(OStringToOUString(sUnit, RTL_TEXTENCODING_UTF8)); pWindow = pBox; |