From 8550b42a1d304054ee878c9c6debae0a10b0bf39 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 17 Mar 2012 10:06:47 +0000 Subject: remove extra string casts --- svtools/inc/svtools/ivctrl.hxx | 2 +- svtools/inc/svtools/svtreebx.hxx | 2 +- svtools/source/contnr/fileview.cxx | 6 +++--- svtools/source/contnr/ivctrl.cxx | 2 +- svtools/source/contnr/svtreebx.cxx | 2 +- svtools/source/uno/treecontrolpeer.cxx | 11 +++++------ svtools/source/uno/treecontrolpeer.hxx | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index 9dae703e3bff..46e8cc7e122e 100644 --- a/svtools/inc/svtools/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -241,7 +241,7 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, sal_Bool bCancelled ); + virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString& rNewText, sal_Bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx index 0b45b0556305..8f883c62451a 100644 --- a/svtools/inc/svtools/svtreebx.hxx +++ b/svtools/inc/svtools/svtreebx.hxx @@ -250,7 +250,7 @@ public: // Editiert das erste StringItem des Entries, 0==Cursor void EditEntry( SvLBoxEntry* pEntry = NULL ); virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); sal_Bool IsEditingActive() const { return SvLBox::IsEditingActive(); } void EndEditing( sal_Bool bCancel = sal_False ) { SvLBox::EndEditing( bCancel ); } sal_Bool EditingCanceled() const { return SvLBox::EditingCanceled(); } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index de0c2afdb45e..384dd5dd01c8 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -203,7 +203,7 @@ public: virtual void Resize(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); void ClearAll(); HeaderBar* GetHeaderBar() const { return mpHeaderBar; } @@ -1047,7 +1047,7 @@ void ViewTabListBox_Impl::DeleteEntries() // ----------------------------------------------------------------------- sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry, - const XubString& rNewText ) + const rtl::OUString& rNewText ) { sal_Bool bRet = sal_False; @@ -1087,7 +1087,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry, if ( canRename ) { Any aValue; - aValue <<= OUString( rNewText ); + aValue <<= rNewText; aContent.setPropertyValue( aPropName, aValue ); mpParent->EntryRenamed( aURL, rNewText ); diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 62628d7ccff5..31cbe4e4d9f3 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -104,7 +104,7 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con return pEntry; } -sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, sal_Bool ) +sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString&, sal_Bool ) { return sal_True; } diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index ae7f599b75c1..074ce945d08c 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -698,7 +698,7 @@ sal_Bool SvTreeListBox::EditingEntry( SvLBoxEntry*, Selection& ) return sal_True; } -sal_Bool SvTreeListBox::EditedEntry( SvLBoxEntry* /*pEntry*/,const XubString& /*rNewText*/) +sal_Bool SvTreeListBox::EditedEntry( SvLBoxEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/) { DBG_CHKTHIS(SvTreeListBox,0); return sal_True; diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index f656a249cdb4..67dab976e10b 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -101,7 +101,7 @@ public: virtual void RequestingChildren( SvLBoxEntry* pParent ); virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); DECL_LINK(OnSelectionChangeHdl, void *); DECL_LINK(OnExpandingHdl, void *); @@ -997,22 +997,21 @@ bool TreeControlPeer::onEditingEntry( UnoTreeListEntry* pEntry ) return true; } -bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const XubString& rNewText ) +bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText ) { if( mpTreeImpl && pEntry && pEntry->mxNode.is() ) try { LockGuard aLockGuard( mnEditLock ); - const OUString aNewText( rNewText ); if( maTreeEditListeners.getLength() > 0 ) { - maTreeEditListeners.nodeEdited( pEntry->mxNode, aNewText ); + maTreeEditListeners.nodeEdited( pEntry->mxNode, rNewText ); return false; } else { Reference< XMutableTreeNode > xMutableNode( pEntry->mxNode, UNO_QUERY ); if( xMutableNode.is() ) - xMutableNode->setDisplayValue( Any( aNewText ) ); + xMutableNode->setDisplayValue( Any( rNewText ) ); else return false; } @@ -1597,7 +1596,7 @@ sal_Bool UnoTreeListBoxImpl::EditingEntry( SvLBoxEntry* pEntry, Selection& ) // -------------------------------------------------------------------- -sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ) +sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ) { return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false; } diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index c1987aa33db0..5d8b89b723fe 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -124,7 +124,7 @@ private: void disposeControl(); bool onEditingEntry( UnoTreeListEntry* pEntry ); - bool onEditedEntry( UnoTreeListEntry* pEntry, const XubString& rNewText ); + bool onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText ); void eraseTree( UnoTreeListBoxImpl& rTree ); void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel ); -- cgit