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

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

Change-Id: I92f69364667abec1b7a31080ce48fc55c4042165
üst d178cb40
...@@ -984,7 +984,7 @@ void EditEngine::SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, s ...@@ -984,7 +984,7 @@ void EditEngine::SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, s
pImpEditEngine->SetAttribs(rSel, rSet, nSpecial); pImpEditEngine->SetAttribs(rSel, rSet, nSpecial);
} }
String EditEngine::GetSelected(const EditSelection& rSel, const LineEnd eParaSep) const OUString EditEngine::GetSelected(const EditSelection& rSel, const LineEnd eParaSep) const
{ {
return pImpEditEngine->GetSelected(rSel, eParaSep); return pImpEditEngine->GetSelected(rSel, eParaSep);
} }
...@@ -1542,7 +1542,7 @@ void EditEngine::SetText( const OUString& rText ) ...@@ -1542,7 +1542,7 @@ void EditEngine::SetText( const OUString& rText )
pImpEditEngine->FormatAndUpdate(); pImpEditEngine->FormatAndUpdate();
} }
sal_uLong EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ ) sal_uLong EditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
{ {
DBG_CHKTHIS( EditEngine, 0 ); DBG_CHKTHIS( EditEngine, 0 );
sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled(); sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
...@@ -2601,7 +2601,7 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_uInt16, sal_uIn ...@@ -2601,7 +2601,7 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_uInt16, sal_uIn
} }
void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/, void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
const String& /*rChar*/, const SvxFont& /*rFont*/, const OUString& /*rChar*/, const SvxFont& /*rFont*/,
sal_Int32 /*nPara*/, xub_StrLen /*nIndex*/, sal_Int32 /*nPara*/, xub_StrLen /*nIndex*/,
sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/, sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/,
bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/, bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/,
......
...@@ -161,7 +161,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText ...@@ -161,7 +161,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText
pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor); pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor);
} }
void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
bool bEndOfLine, bool bEndOfParagraph, bool bEndOfLine, bool bEndOfParagraph,
const Color& rOverlineColor, const Color& rTextLineColor) const Color& rOverlineColor, const Color& rTextLineColor)
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
const Color& rTextLineColor); const Color& rTextLineColor);
virtual void DrawingTab( virtual void DrawingTab(
const Point& rStartPos, long nWidth, const String& rChar, const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
bool bEndOfLine, bool bEndOfLine,
bool bEndOfParagraph, bool bEndOfParagraph,
......
...@@ -66,7 +66,6 @@ class EditUndo; ...@@ -66,7 +66,6 @@ class EditUndo;
class SvxFont; class SvxFont;
class SfxItemPool; class SfxItemPool;
class SfxStyleSheet; class SfxStyleSheet;
class String;
class SfxStyleSheetPool; class SfxStyleSheetPool;
class SvxSearchItem; class SvxSearchItem;
class SvxFieldItem; class SvxFieldItem;
...@@ -345,7 +344,7 @@ public: ...@@ -345,7 +344,7 @@ public:
void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
// sal_uInt32: Error code of the stream. // sal_uInt32: Error code of the stream.
sal_uLong Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
sal_uLong Write( SvStream& rOutput, EETextFormat ); sal_uLong Write( SvStream& rOutput, EETextFormat );
void SetStatusEventHdl( const Link& rLink ); void SetStatusEventHdl( const Link& rLink );
...@@ -471,7 +470,7 @@ public: ...@@ -471,7 +470,7 @@ public:
const Color& rTextLineColor); const Color& rTextLineColor);
virtual void DrawingTab( virtual void DrawingTab(
const Point& rStartPos, long nWidth, const String& rChar, const Point& rStartPos, long nWidth, const OUString& rChar,
const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
bool bEndOfLine, bool bEndOfLine,
bool bEndOfParagraph, bool bEndOfParagraph,
...@@ -554,7 +553,7 @@ public: ...@@ -554,7 +553,7 @@ public:
void SetParaAttribsOnly(sal_Int32 nPara, const SfxItemSet& rSet); void SetParaAttribsOnly(sal_Int32 nPara, const SfxItemSet& rSet);
void SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0); void SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0);
String GetSelected(const EditSelection& rSel, const LineEnd eParaSep = LINEEND_LF) const; OUString GetSelected(const EditSelection& rSel, const LineEnd eParaSep = LINEEND_LF) const;
EditPaM DeleteSelected(const EditSelection& rSel); EditPaM DeleteSelected(const EditSelection& rSel);
sal_uInt16 GetScriptType(const EditSelection& rSel) const; sal_uInt16 GetScriptType(const EditSelection& rSel) const;
......
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