strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GtkComboBox->VclComboBoxNumeric

Browse source 
Change-Id: Iba1416692a619c1f566f26da5b06ed04342057b3
This commit is contained in:
Caolán McNamara 2014-01-08 13:30:06 +00:00
parent ef683ad852
commit daa654fb44
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
svx/uiconfig/ui/sidebarpossize.ui
View file

@ -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>

8
vcl/source/window/builder.cxx
View file

@ -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;