diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-06 16:31:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-11 09:45:32 +0200 |
commit | c049ec85893180a444a2d3638f07b4bc1104d4f8 (patch) | |
tree | 658ea3e6d5f4f15b2a2a54dc722bcbf5da98948c | |
parent | b0f07a96489f3aa5d65b53322e61f5be747899fd (diff) |
convert include/editeng/outliner.hxx from String to OUString
Change-Id: I53a9f334845e163625ed245859bdeb030ae61baa
-rw-r--r-- | editeng/source/outliner/outlin2.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 18 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 6 | ||||
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 4 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 36 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextpathdecomposition.cxx | 2 |
7 files changed, 38 insertions, 38 deletions
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 83b83c97d131..91e7cb07749c 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -193,7 +193,7 @@ OUString Outliner::GetWordDelimiters() const return pEditEngine->GetWordDelimiters(); } -String Outliner::GetWord( sal_Int32 nPara, sal_uInt16 nIndex ) +OUString Outliner::GetWord( sal_Int32 nPara, sal_uInt16 nIndex ) { DBG_CHKTHIS(Outliner,0); return pEditEngine->GetWord( nPara, nIndex ); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 49465fbd69e8..80ef22b4c331 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1151,7 +1151,7 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_Int32 nPara ) } } -sal_uLong Outliner::Read( SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) +sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) { DBG_CHKTHIS(Outliner,0); @@ -1813,13 +1813,13 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_u } } -void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, const SvxFont& rFont, +void Outliner::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) { if(aDrawPortionHdl.IsSet()) { - DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.Len(), rFont, nPara, nIndex, NULL, NULL, + DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nPara, nIndex, NULL, NULL, NULL, NULL, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false); aDrawPortionHdl.Call( &aInfo ); @@ -2051,17 +2051,17 @@ void Outliner::SetFlatMode( sal_Bool bFlat ) } } -String Outliner::ImplGetBulletText( sal_Int32 nPara ) +OUString Outliner::ImplGetBulletText( sal_Int32 nPara ) { - String aRes; + OUString aRes; Paragraph* pPara = pParaList->GetParagraph( nPara ); - if (pPara) - { + if (pPara) + { // Enable optimization again ... // if( pPara->nFlags & PARAFLAG_SETBULLETTEXT ) ImplCalcBulletText( nPara, sal_False, sal_False ); - aRes = pPara->GetText(); - } + aRes = pPara->GetText(); + } return aRes; } diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 5534781f89e1..9e4e87eaaf7e 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1482,7 +1482,7 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg ) pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg ); } -sal_uLong OutlinerView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) +sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) { DBG_CHKTHIS(OutlinerView,0); sal_Int32 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount(); @@ -1542,7 +1542,7 @@ sal_uInt16 OutlinerView::GetSelectedScriptType() const return pEditView->GetSelectedScriptType(); } -String OutlinerView::GetSurroundingText() const +OUString OutlinerView::GetSurroundingText() const { DBG_CHKTHIS(OutlinerView,0); return pEditView->GetSurroundingText(); @@ -1585,7 +1585,7 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( } -void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ) +void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const OUString &rSynonmText ) { // get selection to use ESelection aCurSel( rEditView.GetSelection() ); diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 9369d5633535..e566928cc0ca 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -198,7 +198,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { - mnIndex += aBulletInfo.aText.Len(); + mnIndex += aBulletInfo.aText.getLength(); } for( nCurrField=0; nCurrField < nFieldCount; ++nCurrField ) @@ -247,7 +247,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& aBulletInfo.bVisible && aBulletInfo.nType != SVX_NUM_BITMAP ) { - sal_Int32 nBulletLen = aBulletInfo.aText.Len(); + sal_Int32 nBulletLen = aBulletInfo.aText.getLength(); if( nIndex < nBulletLen ) { diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 3eab1441f81d..484f08c47e04 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -272,9 +272,9 @@ public: void Indent( short nDiff ); void AdjustDepth( short nDX ); // Later replace with Indent! - sal_Bool AdjustHeight( long nDY ); + sal_Bool AdjustHeight( long nDY ); - 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 InsertText( const OUString& rNew, sal_Bool bSelect = sal_False ); void InsertText( const OutlinerParaObject& rParaObj ); @@ -372,21 +372,21 @@ public: */ void EnableBullets(); - sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False ); - sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False ); + sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False ); + sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False ); void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); void SetInvalidateMore( sal_uInt16 nPixel ); - sal_uInt16 GetInvalidateMore() const; + sal_uInt16 GetInvalidateMore() const; - String GetSurroundingText() const; - Selection GetSurroundingTextSelection() const; + OUString GetSurroundingText() const; + Selection GetSurroundingTextSelection() const; }; // some thesaurus functionality to avoid code duplication in different projects... bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( OUString &rStatusVal, LanguageType &rLang, const EditView &rEditView ); -void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ); +void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const OUString &rSynonmText ); typedef ::std::vector< OutlinerView* > ViewList; @@ -394,7 +394,7 @@ class EDITENG_DLLPUBLIC DrawPortionInfo { public: const Point& mrStartPos; - const String& mrText; + const OUString maText; sal_uInt16 mnTextStart; sal_uInt16 mnTextLen; sal_Int32 mnPara; @@ -423,7 +423,7 @@ public: DrawPortionInfo( const Point& rPos, - const String& rTxt, + const OUString& rTxt, sal_uInt16 nTxtStart, sal_uInt16 nTxtLen, const SvxFont& rFnt, @@ -442,7 +442,7 @@ public: bool bEndOfParagraph, bool bEndOfBullet) : mrStartPos(rPos), - mrText(rTxt), + maText(rTxt), mnTextStart(nTxtStart), mnTextLen(nTxtLen), mnPara(nPar), @@ -561,9 +561,9 @@ public: struct EBulletInfo { - sal_Bool bVisible; - sal_uInt16 nType; // see SvxNumberType - String aText; + sal_Bool bVisible; + sal_uInt16 nType; // see SvxNumberType + OUString aText; SvxFont aFont; Graphic aGraphic; sal_Int32 nParagraph; @@ -644,7 +644,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster Size ImplGetBulletSize( sal_Int32 nPara ); sal_uInt16 ImplGetNumbering( sal_Int32 nPara, const SvxNumberFormat* pParaFmt ); void ImplCalcBulletText( sal_Int32 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChildren ); - String ImplGetBulletText( sal_Int32 nPara ); + OUString ImplGetBulletText( sal_Int32 nPara ); void ImplCheckNumBulletItem( sal_Int32 nPara ); void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction = sal_False ); void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = NULL ); @@ -859,7 +859,7 @@ public: void SetWordDelimiters( const OUString& rDelimiters ); OUString GetWordDelimiters() const; - String GetWord( sal_Int32 nPara, xub_StrLen nIndex ); + OUString GetWord( sal_Int32 nPara, xub_StrLen nIndex ); void StripPortions(); @@ -876,7 +876,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, @@ -921,7 +921,7 @@ public: sal_uInt16 GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const; sal_uLong GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine = 0 ); - sal_uLong Read( SvStream& rInput, const String& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); ::svl::IUndoManager& GetUndoManager(); ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 75238f69ac68..9384184cf041 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -174,7 +174,7 @@ namespace void impTextBreakupHandler::impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo) { - if(rInfo.mrText.Len() && rInfo.mnTextLen) + if(!rInfo.maText.isEmpty() && rInfo.mnTextLen) { basegfx::B2DVector aFontScaling; drawinglayer::attribute::FontAttribute aFontAttribute( @@ -327,7 +327,7 @@ namespace // attributes for TextSimplePortionPrimitive2D aNewTransform, - rInfo.mrText, + rInfo.maText, rInfo.mnTextStart, rInfo.mnTextLen, aDXArray, @@ -354,7 +354,7 @@ namespace // TextSimplePortionPrimitive2D is enough pNewPrimitive = new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( aNewTransform, - rInfo.mrText, + rInfo.maText, rInfo.mnTextStart, rInfo.mnTextLen, aDXArray, @@ -584,7 +584,7 @@ namespace const basegfx::B2DRange aTextBoundRect( aTextLayouterDevice.getTextBoundRect( - pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen)); + pInfo->maText, pInfo->mnTextStart, pInfo->mnTextLen)); const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition); if(!maClipRange.isInside(aTopLeft)) diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 513345c81358..528a5aec696c 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -86,7 +86,7 @@ namespace public: impPathTextPortion(DrawPortionInfo& rInfo) : maOffset(rInfo.mrStartPos.X(), rInfo.mrStartPos.Y()), - maText(rInfo.mrText), + maText(rInfo.maText), mnTextStart(rInfo.mnTextStart), mnTextLength(rInfo.mnTextLen), mnParagraph(rInfo.mnPara), |