From b929c663847fb8167824609a8748d55549418a81 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 9 Sep 2013 11:00:48 +0200 Subject: convert include/editeng/editeng.hxx from String to OUString Change-Id: I92f69364667abec1b7a31080ce48fc55c4042165 --- editeng/source/editeng/editeng.cxx | 6 +++--- editeng/source/outliner/outleeng.cxx | 2 +- editeng/source/outliner/outleeng.hxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index e8b30c672c28..d45347c3054b 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -984,7 +984,7 @@ void EditEngine::SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, s 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); } @@ -1542,7 +1542,7 @@ void EditEngine::SetText( const OUString& rText ) 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 ); sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled(); @@ -2601,7 +2601,7 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_uInt16, sal_uIn } 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_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/, bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/, diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index 9396e68f8630..2b66d3bb96f9 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -161,7 +161,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText 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, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, const Color& rTextLineColor) diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 960e45221bb5..a104ac711394 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -57,7 +57,7 @@ public: const Color& rTextLineColor); 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, bool bEndOfLine, bool bEndOfParagraph, -- cgit