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 /sw | |
| parent | Do not die when using old configure options (diff) | |
| download | core-c7bac4da02d51f8180aaad5b3768f4ff5bd80d4d.tar.gz core-c7bac4da02d51f8180aaad5b3768f4ff5bd80d4d.zip | |
XubString->OUString
Change-Id: I5835696a3246b4d8f401a1617d2b53ec8c7c5626
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/inc/conttree.hxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/utlui/content.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 29445acf584d..3d2686322e16 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -110,7 +110,7 @@ class SwContentTree : public SvTreeListBox protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); SwNavigationPI* GetParentWindow(){return @@ -292,7 +292,7 @@ protected: virtual void GetFocus(); virtual void SelectHdl(); virtual void DeselectHdl(); - virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); void Clear(); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 86f8718c62b6..78a749db98f1 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -3135,7 +3135,7 @@ public: }; void SwContentTree::InitEntry(SvTreeListEntry* pEntry, - const XubString& rStr ,const Image& rImg1,const Image& rImg2, + const OUString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) { sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2" diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 4d2d08cd3390..c086b4f44947 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -1224,7 +1224,7 @@ IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) } void SwGlobalTree::InitEntry(SvTreeListEntry* pEntry, - const XubString& rStr ,const Image& rImg1,const Image& rImg2, + const OUString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) { sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2" |