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

convert include/editeng/editview.hxx from String to OUString

Change-Id: I1d21fd48dfaa8cfe4a2807cd6e50e05db4c24e28
üst f1d4534b
...@@ -541,7 +541,7 @@ void EditView::Redo() ...@@ -541,7 +541,7 @@ void EditView::Redo()
PIMPE->Redo( this ); PIMPE->Redo( this );
} }
sal_uLong EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
{ {
DBG_CHKTHIS( EditView, 0 ); DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
...@@ -1411,7 +1411,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo ...@@ -1411,7 +1411,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
return bRet; return bRet;
} }
String EditView::GetSurroundingText() const OUString EditView::GetSurroundingText() const
{ {
DBG_CHKTHIS( EditView, 0 ); DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
...@@ -1421,13 +1421,13 @@ String EditView::GetSurroundingText() const ...@@ -1421,13 +1421,13 @@ String EditView::GetSurroundingText() const
if( HasSelection() ) if( HasSelection() )
{ {
String aStr = PIMPE->GetSelected(aSel); OUString aStr = PIMPE->GetSelected(aSel);
// Stop reconversion if the selected text includes a line break. // Stop reconversion if the selected text includes a line break.
if ( aStr.Search( 0x0A ) == STRING_NOTFOUND ) if ( aStr.indexOf( 0x0A ) == -1 )
return aStr; return aStr;
else else
return String(); return OUString();
} }
else else
{ {
......
...@@ -79,7 +79,7 @@ public: // Needed for Undo ...@@ -79,7 +79,7 @@ public: // Needed for Undo
private: private:
ImpEditView* pImpEditView; ImpEditView* pImpEditView;
String aDicNameSingle; OUString aDicNameSingle;
EDITENG_DLLPRIVATE EditView( const EditView& ); EDITENG_DLLPRIVATE EditView( const EditView& );
EDITENG_DLLPRIVATE EditView& operator=( const EditView& ); EDITENG_DLLPRIVATE EditView& operator=( const EditView& );
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
sal_Bool IsInsertMode() const; sal_Bool IsInsertMode() const;
void SetInsertMode( sal_Bool bInsert ); void SetInsertMode( sal_Bool bInsert );
void ReplaceSelected( const String& rStr ); void ReplaceSelected( const OUString& rStr );
OUString GetSelected(); OUString GetSelected();
void DeleteSelected(); void DeleteSelected();
...@@ -163,7 +163,7 @@ public: ...@@ -163,7 +163,7 @@ public:
void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 ); void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
void RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs = sal_False ); void RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs = sal_False );
sal_uLong Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
void SetBackgroundColor( const Color& rColor ); void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const; Color GetBackgroundColor() const;
...@@ -218,7 +218,7 @@ public: ...@@ -218,7 +218,7 @@ public:
static bool ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFontList ); static bool ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFontList );
String GetSurroundingText() const; OUString GetSurroundingText() const;
Selection GetSurroundingTextSelection() const; Selection GetSurroundingTextSelection() const;
/** Tries to determine the language of 'rText', returning a matching known /** Tries to determine the language of 'rText', returning a matching known
......
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