diff options
| -rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unoedprx.cxx | 8 | ||||
| -rw-r--r-- | include/editeng/editdata.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 9702c440e10b..33525163ac72 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -2050,7 +2050,7 @@ namespace accessibility // Translate EE Index to accessible index sal_uInt16 nStart = rT.CalcEditEngineIndex( nPara, nEEStart ); - sal_uInt16 nEnd = nStart + aField.aCurrentText.Len(); + sal_uInt16 nEnd = nStart + aField.aCurrentText.getLength(); xRef = new AccessibleHyperlink( rT, new SvxFieldItem( *aField.pFieldItem ), nPara, nEEStart, nStart, nEnd, aField.aCurrentText ); break; } diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index e566928cc0ca..722c6b555312 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -215,7 +215,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa } // #106010# - mnIndex += ::std::max(aFieldInfo.aCurrentText.Len()-1, 0); + mnIndex += ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0); } } @@ -269,14 +269,14 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& break; // #106010# - mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.Len()-1, 0); + mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0); // we're within a field if( aFieldInfo.aPosition.nIndex >= mnEEIndex ) { AreInField(); - SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.Len()-1, 0) - (aFieldInfo.aPosition.nIndex - mnEEIndex), - aFieldInfo.aCurrentText.Len() ); + SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0) - (aFieldInfo.aPosition.nIndex - mnEEIndex), + aFieldInfo.aCurrentText.getLength() ); mnEEIndex = aFieldInfo.aPosition.nIndex ; break; } diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index 3f782e420cb7..f0485a275f87 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -211,7 +211,7 @@ inline void ESelection::Adjust() struct EDITENG_DLLPUBLIC EFieldInfo { SvxFieldItem* pFieldItem; - String aCurrentText; + OUString aCurrentText; EPosition aPosition; EFieldInfo(); @@ -246,7 +246,7 @@ struct ImportInfo int nToken; short nTokenValue; - String aText; + OUString aText; void* pAttrs; // RTF: SvxRTFItemStackType*, HTML: SfxItemSet* diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 2a33cb87276f..fa89af0976bd 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2428,7 +2428,7 @@ bool ScHTMLTable::IsEmptyCell() const bool ScHTMLTable::IsSpaceCharInfo( const ImportInfo& rInfo ) { - return (rInfo.nToken == HTML_TEXTTOKEN) && (rInfo.aText.Len() == 1) && (rInfo.aText.GetChar( 0 ) == ' '); + return (rInfo.nToken == HTML_TEXTTOKEN) && (rInfo.aText.getLength() == 1) && (rInfo.aText[ 0 ] == ' '); } ScHTMLTable::ScHTMLEntryPtr ScHTMLTable::CreateEntry() const |