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 /dbaccess | |
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 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/WNameMatch.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/tabletree.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WNameMatch.cxx | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 96b5ce3e5944..c62068e533fc 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -156,7 +156,7 @@ void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) } // ------------------------------------------------------------------------- -void DBTreeListBox::InitEntry( SvTreeListEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) +void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) { SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind); SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 94b2d32652d4..a2d41151c00e 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -422,7 +422,7 @@ void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bCheck } //------------------------------------------------------------------------ -void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) +void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) { OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind); diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 038b7032a8e6..0beb95559bee 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -35,7 +35,7 @@ namespace dbaui { sal_Bool m_bReadOnly; protected: - virtual void InitEntry(SvTreeListEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); + virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); public: OColumnTreeBox( Window* pParent, const ResId& rResId ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index de6e45a9d6e3..f61c8ad7e30b 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -123,7 +123,7 @@ namespace dbaui virtual void KeyInput( const KeyEvent& rKEvt ); virtual void StateChanged( StateChangedType nStateChange ); - virtual void InitEntry( SvTreeListEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); + virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); // enable editing for tables/views and queries virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 50688d9a8519..960f426d7e04 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -145,7 +145,7 @@ public: sal_Bool isWildcardChecked(SvTreeListEntry* _pEntry) const; protected: - virtual void InitEntry(SvTreeListEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind); + virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind); virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry); diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 44d8da76293d..6a40a71f7f4e 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -358,9 +358,9 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId ) SetSelectionMode( SINGLE_SELECTION ); } //------------------------------------------------------------------------ -void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) +void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) { - DBTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind ); + DBTreeListBox::InitEntry(pEntry, rStr, rImg1, rImg2, eButtonKind); SvLBoxString* pString = new OColumnString(pEntry, 0, rStr,sal_False); if (pString) pEntry->ReplaceItem( pString, pEntry->ItemCount() - 1 ); |