diff options
| -rw-r--r-- | include/svtools/treelistbox.hxx | 10 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 4c767df789fa..699300f25497 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -294,9 +294,9 @@ protected: // In-place editing SvInplaceEdit2* pEdCtrl; - void EditText( const String&, const Rectangle&,const Selection&); - void EditText( const String&, const Rectangle&,const Selection&, sal_Bool bMulti); - void EditTextMultiLine( const String&, const Rectangle&,const Selection&); + void EditText( const OUString&, const Rectangle&,const Selection&); + void EditText( const OUString&, const Rectangle&,const Selection&, sal_Bool bMulti); + void EditTextMultiLine( const OUString&, const Rectangle&,const Selection&); void CancelTextEditing(); sal_Bool EditingCanceled() const; bool IsEmptyTextAllowed() const; @@ -790,14 +790,14 @@ class SvInplaceEdit2 public: SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, - const String& rData, const Link& rNotifyEditEnd, + const OUString& rData, const Link& rNotifyEditEnd, const Selection&, sal_Bool bMultiLine = sal_False ); ~SvInplaceEdit2(); sal_Bool KeyInput( const KeyEvent& rKEvt ); void LoseFocus(); sal_Bool EditingCanceled() const { return bCanceled; } OUString GetText() const; - String GetSavedValue() const; + OUString GetSavedValue() const; void StopEditing( sal_Bool bCancel = sal_False ); void Hide(); }; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 39fb9fb5b5fd..cd6112b6c71e 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -118,7 +118,7 @@ SvInplaceEdit2::SvInplaceEdit2 ( Window* pParent, const Point& rPos, const Size& rSize, - const String& rData, + const OUString& rData, const Link& rNotifyEditEnd, const Selection& rSelection, sal_Bool bMulti @@ -171,7 +171,7 @@ SvInplaceEdit2::~SvInplaceEdit2() delete pEdit; } -String SvInplaceEdit2::GetSavedValue() const +OUString SvInplaceEdit2::GetSavedValue() const { return pEdit->GetSavedValue(); } @@ -1037,13 +1037,13 @@ void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWit // InplaceEditing // ****************************************************************** -void SvTreeListBox::EditText( const String& rStr, const Rectangle& rRect, +void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, const Selection& rSel ) { EditText( rStr, rRect, rSel, sal_False ); } -void SvTreeListBox::EditText( const String& rStr, const Rectangle& rRect, +void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, const Selection& rSel, sal_Bool bMulti ) { DBG_CHKTHIS(SvTreeListBox,0); |