diff options
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
| -rw-r--r-- | svtools/inc/svtools/syntaxhighlight.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/edit/editsyntaxhighlighter.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/edit/syntaxhighlight.cxx | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bbb7baf17b4e..b2a01828fa06 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -787,7 +787,7 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine ) { if ( bDoSyntaxHighlight ) { - String aLine( pEditEngine->GetText( nLine ) ); + OUString aLine( pEditEngine->GetText( nLine ) ); Range aChanges = aHighlighter.notifyChange( nLine, 0, &aLine, 1 ); if ( aChanges.Len() ) { @@ -935,7 +935,7 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted ) if ( bDoSyntaxHighlight ) { - String aDummy; + OUString aDummy; aHighlighter.notifyChange( nPara, bInserted ? 1 : (-1), &aDummy, 1 ); } } diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx index 33d9149e7151..60e917dd967a 100644 --- a/svtools/inc/svtools/syntaxhighlight.hxx +++ b/svtools/inc/svtools/syntaxhighlight.hxx @@ -131,8 +131,8 @@ public: SimpleTokenizer_Impl( HighlighterLanguage aLang = HIGHLIGHT_BASIC ); ~SimpleTokenizer_Impl( void ); - sal_uInt16 parseLine( sal_uInt32 nLine, const String* aSource ); - void getHighlightPortions( sal_uInt32 nParseLine, const String& rLine, + sal_uInt16 parseLine( sal_uInt32 nLine, const OUString* aSource ); + void getHighlightPortions( sal_uInt32 nParseLine, const OUString& rLine, /*out*/HighlightPortions& portions ); void setKeyWords( const char** ppKeyWords, sal_uInt16 nCount ); }; @@ -165,9 +165,9 @@ public: void initialize( HighlighterLanguage eLanguage_ ); const Range notifyChange( sal_uInt32 nLine, sal_Int32 nLineCountDifference, - const String* pChangedLines, sal_uInt32 nArrayLength); + const OUString* pChangedLines, sal_uInt32 nArrayLength); - void getHighlightPortions( sal_uInt32 nLine, const String& rLine, + void getHighlightPortions( sal_uInt32 nLine, const OUString& rLine, HighlightPortions& pPortions ); HighlighterLanguage GetLanguage() { return eLanguage;} diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index af68d0515a40..62a7a254b55f 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -167,7 +167,7 @@ void MultiLineEditSyntaxHighlight::UpdateData() sal_Bool bTempModified = GetTextEngine()->IsModified(); for (unsigned int nLine=0; nLine < GetTextEngine()->GetParagraphCount(); nLine++) { - String aLine( GetTextEngine()->GetText( nLine ) ); + OUString aLine( GetTextEngine()->GetText( nLine ) ); aHighlighter.notifyChange( nLine, 0, &aLine, 1 ); GetTextEngine()->RemoveAttribs( nLine, sal_True ); diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx index 0d261d6c5e61..8d33ac306f2b 100644 --- a/svtools/source/edit/syntaxhighlight.cxx +++ b/svtools/source/edit/syntaxhighlight.cxx @@ -636,10 +636,10 @@ SimpleTokenizer_Impl* getSimpleTokenizer( void ) return pSimpleTokenizer; } -sal_uInt16 SimpleTokenizer_Impl::parseLine( sal_uInt32 nParseLine, const String* aSource ) +sal_uInt16 SimpleTokenizer_Impl::parseLine( sal_uInt32 nParseLine, const OUString* aSource ) { // Set the position to the beginning of the source string - mpStringBegin = mpActualPos = aSource->GetBuffer(); + mpStringBegin = mpActualPos = aSource->getStr(); // Initialize row and column nLine = nParseLine; @@ -658,11 +658,11 @@ sal_uInt16 SimpleTokenizer_Impl::parseLine( sal_uInt32 nParseLine, const String* return nTokenCount; } -void SimpleTokenizer_Impl::getHighlightPortions( sal_uInt32 nParseLine, const String& rLine, +void SimpleTokenizer_Impl::getHighlightPortions( sal_uInt32 nParseLine, const OUString& rLine, /*out*/HighlightPortions& portions ) { // Set the position to the beginning of the source string - mpStringBegin = mpActualPos = rLine.GetBuffer(); + mpStringBegin = mpActualPos = rLine.getStr(); // Initialize row and column nLine = nParseLine; @@ -722,7 +722,7 @@ void SyntaxHighlighter::initialize( HighlighterLanguage eLanguage_ ) } const Range SyntaxHighlighter::notifyChange( sal_uInt32 nLine, sal_Int32 nLineCountDifference, - const String* pChangedLines, sal_uInt32 nArrayLength) + const OUString* pChangedLines, sal_uInt32 nArrayLength) { (void)nLineCountDifference; @@ -732,7 +732,7 @@ const Range SyntaxHighlighter::notifyChange( sal_uInt32 nLine, sal_Int32 nLineCo return Range( nLine, nLine + nArrayLength-1 ); } -void SyntaxHighlighter::getHighlightPortions( sal_uInt32 nLine, const String& rLine, +void SyntaxHighlighter::getHighlightPortions( sal_uInt32 nLine, const OUString& rLine, /*out*/HighlightPortions& portions ) { m_pSimpleTokenizer->getHighlightPortions( nLine, rLine, portions ); |