mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5bdb26880448ce0f71bf1b6639fcf2db3e472a50
This commit is contained in:
Noel Grandin
2013-09-09 12:59:28 +02:00
parent b929c66384
commit a2ea07f0b9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/source/accessibility/AccessibleEditableTextPara.cxx
View File

@@ -2050,7 +2050,7 @@ namespace accessibility
// Translate EE Index to accessible index // Translate EE Index to accessible index
sal_uInt16 nStart = rT.CalcEditEngineIndex( nPara, nEEStart ); 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 ); xRef = new AccessibleHyperlink( rT, new SvxFieldItem( *aField.pFieldItem ), nPara, nEEStart, nStart, nEnd, aField.aCurrentText );
break; break;
} }

8
editeng/source/uno/unoedprx.cxx
View File

@@ -215,7 +215,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa
} }
// #106010# // #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; break;
// #106010# // #106010#
mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.Len()-1, 0); mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0);
// we're within a field // we're within a field
if( aFieldInfo.aPosition.nIndex >= mnEEIndex ) if( aFieldInfo.aPosition.nIndex >= mnEEIndex )
{ {
AreInField(); AreInField();
SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.Len()-1, 0) - (aFieldInfo.aPosition.nIndex - mnEEIndex), SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.getLength()-1, 0) - (aFieldInfo.aPosition.nIndex - mnEEIndex),
aFieldInfo.aCurrentText.Len() ); aFieldInfo.aCurrentText.getLength() );
mnEEIndex = aFieldInfo.aPosition.nIndex ; mnEEIndex = aFieldInfo.aPosition.nIndex ;
break; break;
} }

4
include/editeng/editdata.hxx
View File

@@ -211,7 +211,7 @@ inline void ESelection::Adjust()
struct EDITENG_DLLPUBLIC EFieldInfo struct EDITENG_DLLPUBLIC EFieldInfo
{ {
SvxFieldItem* pFieldItem; SvxFieldItem* pFieldItem;
String aCurrentText; OUString aCurrentText;
EPosition aPosition; EPosition aPosition;
EFieldInfo(); EFieldInfo();
@@ -246,7 +246,7 @@ struct ImportInfo
int nToken; int nToken;
short nTokenValue; short nTokenValue;
String aText; OUString aText;
void* pAttrs; // RTF: SvxRTFItemStackType*, HTML: SfxItemSet* void* pAttrs; // RTF: SvxRTFItemStackType*, HTML: SfxItemSet*

2
sc/source/filter/html/htmlpars.cxx
View File

@@ -2428,7 +2428,7 @@ bool ScHTMLTable::IsEmptyCell() const
bool ScHTMLTable::IsSpaceCharInfo( const ImportInfo& rInfo ) 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 ScHTMLTable::ScHTMLEntryPtr ScHTMLTable::CreateEntry() const