mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support stock text in checkboxes and radiobuttons

Browse Source 
Change-Id: I03b2e125736b7f8a7127174a7a837760f76f8249
Reviewed-on: https://gerrit.libreoffice.org/43893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2017-10-26 14:13:29 +01:00
parent bdd7c74a49
commit 1b87cdadb8
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vcl/source/window/builder.cxx
View File

@ -1263,6 +1263,11 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
VclPtr<RadioButton> xButton = VclPtr<RadioButton>::Create(pParent, nBits); VclPtr<RadioButton> xButton = VclPtr<RadioButton>::Create(pParent, nBits);
xButton->SetImageAlign(ImageAlign::Left); //default to left xButton->SetImageAlign(ImageAlign::Left); //default to left
xWindow = xButton; xWindow = xButton;
if (::extractStock(rMap))
{
xWindow->SetText(getStockText(extractLabel(rMap)));
}
} }
else if (name == "GtkCheckButton") else if (name == "GtkCheckButton")
{ {
@ -1280,7 +1285,13 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
if (bIsTriState) if (bIsTriState)
xCheckBox->SetState(TRISTATE_INDET); xCheckBox->SetState(TRISTATE_INDET);
xCheckBox->SetImageAlign(ImageAlign::Left); //default to left xCheckBox->SetImageAlign(ImageAlign::Left); //default to left
xWindow = xCheckBox; xWindow = xCheckBox;
if (::extractStock(rMap))
{
xWindow->SetText(getStockText(extractLabel(rMap)));
}
} }
else if (name == "GtkSpinButton") else if (name == "GtkSpinButton")
{ {