Kaydet (Commit) ba39b8e7 authored tarafından Noel Grandin's avatar Noel Grandin

convert include/svtools/treelistbox.hxx from String to OUString

Change-Id: Ie0416511fd91a523778a312685d3b438118a0c52
üst a7f84fc4
...@@ -294,9 +294,9 @@ protected: ...@@ -294,9 +294,9 @@ protected:
// In-place editing // In-place editing
SvInplaceEdit2* pEdCtrl; SvInplaceEdit2* pEdCtrl;
void EditText( const String&, const Rectangle&,const Selection&); void EditText( const OUString&, const Rectangle&,const Selection&);
void EditText( const String&, const Rectangle&,const Selection&, sal_Bool bMulti); void EditText( const OUString&, const Rectangle&,const Selection&, sal_Bool bMulti);
void EditTextMultiLine( const String&, const Rectangle&,const Selection&); void EditTextMultiLine( const OUString&, const Rectangle&,const Selection&);
void CancelTextEditing(); void CancelTextEditing();
sal_Bool EditingCanceled() const; sal_Bool EditingCanceled() const;
bool IsEmptyTextAllowed() const; bool IsEmptyTextAllowed() const;
...@@ -790,14 +790,14 @@ class SvInplaceEdit2 ...@@ -790,14 +790,14 @@ class SvInplaceEdit2
public: public:
SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, 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 ); const Selection&, sal_Bool bMultiLine = sal_False );
~SvInplaceEdit2(); ~SvInplaceEdit2();
sal_Bool KeyInput( const KeyEvent& rKEvt ); sal_Bool KeyInput( const KeyEvent& rKEvt );
void LoseFocus(); void LoseFocus();
sal_Bool EditingCanceled() const { return bCanceled; } sal_Bool EditingCanceled() const { return bCanceled; }
OUString GetText() const; OUString GetText() const;
String GetSavedValue() const; OUString GetSavedValue() const;
void StopEditing( sal_Bool bCancel = sal_False ); void StopEditing( sal_Bool bCancel = sal_False );
void Hide(); void Hide();
}; };
......
...@@ -118,7 +118,7 @@ SvInplaceEdit2::SvInplaceEdit2 ...@@ -118,7 +118,7 @@ SvInplaceEdit2::SvInplaceEdit2
( (
Window* pParent, const Point& rPos, Window* pParent, const Point& rPos,
const Size& rSize, const Size& rSize,
const String& rData, const OUString& rData,
const Link& rNotifyEditEnd, const Link& rNotifyEditEnd,
const Selection& rSelection, const Selection& rSelection,
sal_Bool bMulti sal_Bool bMulti
...@@ -171,7 +171,7 @@ SvInplaceEdit2::~SvInplaceEdit2() ...@@ -171,7 +171,7 @@ SvInplaceEdit2::~SvInplaceEdit2()
delete pEdit; delete pEdit;
} }
String SvInplaceEdit2::GetSavedValue() const OUString SvInplaceEdit2::GetSavedValue() const
{ {
return pEdit->GetSavedValue(); return pEdit->GetSavedValue();
} }
...@@ -1037,13 +1037,13 @@ void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWit ...@@ -1037,13 +1037,13 @@ void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWit
// InplaceEditing // InplaceEditing
// ****************************************************************** // ******************************************************************
void SvTreeListBox::EditText( const String& rStr, const Rectangle& rRect, void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect,
const Selection& rSel ) const Selection& rSel )
{ {
EditText( rStr, rRect, rSel, sal_False ); 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 ) const Selection& rSel, sal_Bool bMulti )
{ {
DBG_CHKTHIS(SvTreeListBox,0); DBG_CHKTHIS(SvTreeListBox,0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment