diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-28 15:21:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-28 17:32:43 +0200 |
| commit | 836c9bbb6486e9c0c81de9d7534b934699131d3d (patch) | |
| tree | acf708b1da9dfb686781e5c624a08a246bd2c959 /svx | |
| parent | 9e6b275a19b3f11e9a5d87d1cbb9ad192705572f (diff) | |
move builder attributes from OString to OUString
Change-Id: I235188c9a086337b104e600f31a1c81deeca6c17
Reviewed-on: https://gerrit.libreoffice.org/37076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 10 | ||||
| -rw-r--r-- | svx/source/dialog/relfld.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 760261e00a48..def4825ac14d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1035,7 +1035,7 @@ HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle) VCL_BUILDER_DECL_FACTORY(HatchingLB) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; VclPtrInstance<HatchingLB> pListBox(pParent, nWinStyle); @@ -1075,7 +1075,7 @@ GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB) VCL_BUILDER_DECL_FACTORY(GradientLB) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; VclPtrInstance<GradientLB> pListBox(pParent, nWinStyle); @@ -1115,7 +1115,7 @@ BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB) VCL_BUILDER_DECL_FACTORY(BitmapLB) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; VclPtrInstance<BitmapLB> pListBox(pParent, nWinStyle); @@ -1252,7 +1252,7 @@ VCL_BUILDER_DECL_FACTORY(LineLB) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; VclPtrInstance<LineLB> pListBox(pParent, nWinBits); @@ -1350,7 +1350,7 @@ VCL_BUILDER_DECL_FACTORY(LineEndLB) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; VclPtrInstance<LineEndLB> pListBox(pParent, nWinBits); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 452a15f253c6..84c564f5864e 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -39,7 +39,7 @@ SvxRelativeField::SvxRelativeField( VCL_BUILDER_DECL_FACTORY(SvxRelativeField) { - OString const custom(VclBuilder::extractCustomProperty(rMap)); + OUString const custom(VclBuilder::extractCustomProperty(rMap)); FieldUnit const eUnit(VclBuilder::detectUnit(custom)); rRet = VclPtr<SvxRelativeField>::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 4836db8009a6..72250ca8eb8a 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -45,7 +45,7 @@ VCL_BUILDER_DECL_FACTORY(SvxTextEncodingBox) bool bDropdown = VclBuilder::extractDropdown(rMap); if (bDropdown) nWinBits |= WB_DROPDOWN; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; VclPtrInstance<SvxTextEncodingBox> pListBox(pParent, nWinBits); |