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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optinet2.hxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 93d36283ed52..15778e549fac 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -657,7 +657,7 @@ VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox) { WinBits nWinBits = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 548c3b0fc157..379067fda6f0 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -136,7 +136,7 @@ void SvxNoSpaceEdit::Modify() } } -bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue) +bool SvxNoSpaceEdit::set_property(const OString &rKey, const OUString &rValue) { if (rKey == "only-numeric") bOnlyNumeric = toBool(rValue); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index c56ae38198b0..634975e91f6b 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -49,7 +49,7 @@ public: {} virtual void KeyInput(const KeyEvent& rKEvent) override; virtual void Modify() override; - virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual bool set_property(const OString &rKey, const OUString &rValue) override; }; // class SvxProxyTabPage ------------------------------------------------- diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 858a340d7ee7..5cb57a8a3de8 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2451,7 +2451,7 @@ VCL_BUILDER_DECL_FACTORY(AutoCompleteMultiListBox) { WinBits nWinBits = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); + OUString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; |