diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-10-25 11:26:43 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-25 12:04:26 +0100 |
commit | c7bac4da02d51f8180aaad5b3768f4ff5bd80d4d (patch) | |
tree | 32ec907be54a638847a6ff3f27b30b1178ad8e10 /cui | |
parent | c627560d7a2e5f5c9b8ec8ea7d82291da67a7a31 (diff) |
XubString->OUString
Change-Id: I5835696a3246b4d8f401a1617d2b53ec8c7c5626
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 12 | ||||
-rw-r--r-- | cui/source/inc/acccfg.hxx | 3 | ||||
-rw-r--r-- | cui/source/options/optHeaderTabListbox.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optHeaderTabListbox.hxx | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 0d6eb9e4a5ab..a3ac4500cc61 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -663,13 +663,13 @@ void SfxAccCfgLBoxString_Impl::Paint( } //----------------------------------------------- -void SfxAccCfgTabListBox_Impl::InitEntry( SvTreeListEntry* pEntry , - const XubString& sText , - const Image& aImage1, - const Image& aImage2, - SvLBoxButtonKind eButtonKind) +void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, + const OUString& rText, + const Image& rImage1, + const Image& rImage2, + SvLBoxButtonKind eButtonKind) { - SvTabListBox::InitEntry(pEntry, sText, aImage1, aImage2, eButtonKind); + SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind); } //----------------------------------------------- diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index b2309e947da9..a837b8d2d441 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -61,7 +61,8 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox void KeyInput( const KeyEvent &rKEvt ); protected: - virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, + const Image&, SvLBoxButtonKind eButtonKind); public: SfxAccCfgTabListBox_Impl( diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 6149c15b8f1c..32ba1070735e 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -57,7 +57,7 @@ OptHeaderTabListBox::OptHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : } // ----------------------------------------------------------------------- -void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, +void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind ) { diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index 472dcc13449b..8124a1c3205d 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -30,7 +30,7 @@ namespace svx public: OptHeaderTabListBox( Window* pParent, WinBits nBits ); - virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); }; } // svx #endif // SVX_OPTHEADERTABLISTBOX_HXX |