diff options
author | Eike Rathke <erack@redhat.com> | 2013-05-08 18:12:32 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-05-10 14:01:38 +0000 |
commit | 2af1f5691e8d64afd5246d245d7876b5a2cd5cd8 (patch) | |
tree | e8a51d852010730d4af4a14d445664cf8ee6475c /starmath/source/accessibility.cxx | |
parent | ebef182253e7d49c5439ab5053a7243ad24207a7 (diff) |
resolved fdo#35756 import more than 64k HTML table cells
Enhanced EditEngine to be able to hold more than 64k paragraphs. Used
also in RTF import Calc and Writer, so that could benefit as well.
* changed all EditEngine,Outliner,... related paragraph index/count
variables from sal_uInt16 to sal_Int32
* sal_Int32 instead of sal_uInt32 to match accessibility API
* matched some Outliner methods' paragraph parameters from sal_uLong
to sal_Int32
* containers capable to hold size_t nevertheless are limited to a
maximum of sal_Int32
* changed definition of EE_PARA_NOT_FOUND and EE_PARA_ALL to
SAL_MAX_INT32
+ added EE_PARA_MAX_COUNT and EE_TEXTPOS_MAX_COUNT to initialize
ESelection with what previously were hard coded 0xFFFF all over the
place
+ for similar reason added EE_TEXTPOS_ALL corresponding to EE_PARA_ALL
to initialize an ESelection spanning all available text like
aSel(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL)
Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00
Reviewed-on: https://gerrit.libreoffice.org/3838
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'starmath/source/accessibility.cxx')
-rw-r--r-- | starmath/source/accessibility.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 8702c160db8f..d5dc93efc9d6 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -976,13 +976,13 @@ IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify*, aNotify) return 0; } -sal_uInt16 SmTextForwarder::GetParagraphCount() const +sal_Int32 SmTextForwarder::GetParagraphCount() const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetParagraphCount() : 0; } -sal_uInt16 SmTextForwarder::GetTextLen( sal_uInt16 nParagraph ) const +sal_uInt16 SmTextForwarder::GetTextLen( sal_Int32 nParagraph ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetTextLen( nParagraph ) : 0; @@ -1027,7 +1027,7 @@ SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHa } } -SfxItemSet SmTextForwarder::GetParaAttribs( sal_uInt16 nPara ) const +SfxItemSet SmTextForwarder::GetParaAttribs( sal_Int32 nPara ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); OSL_ENSURE( pEditEngine, "EditEngine missing" ); @@ -1048,7 +1048,7 @@ SfxItemSet SmTextForwarder::GetParaAttribs( sal_uInt16 nPara ) const return aSet; } -void SmTextForwarder::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ) +void SmTextForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); if (pEditEngine) @@ -1068,7 +1068,7 @@ void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRem pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); } -void SmTextForwarder::GetPortions( sal_uInt16 nPara, std::vector<sal_uInt16>& rList ) const +void SmTextForwarder::GetPortions( sal_Int32 nPara, std::vector<sal_uInt16>& rList ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); if (pEditEngine) @@ -1111,7 +1111,7 @@ sal_Bool SmTextForwarder::IsValid() const return pEditEngine ? pEditEngine->GetUpdateMode() : sal_False; } -OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) +OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) { XubString aTxt; EditEngine *pEditEngine = rEditAcc.GetEditEngine(); @@ -1120,7 +1120,7 @@ OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 return aTxt; } -void SmTextForwarder::FieldClicked(const SvxFieldItem&, sal_uInt16, sal_uInt16) +void SmTextForwarder::FieldClicked(const SvxFieldItem&, sal_Int32, sal_uInt16) { } @@ -1133,7 +1133,7 @@ static sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESel SfxItemState eState = SFX_ITEM_DEFAULT; // check all paragraphs inside the selection - for( sal_uInt16 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ ) + for( sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ ) { SfxItemState eParaState = SFX_ITEM_DEFAULT; @@ -1225,7 +1225,7 @@ sal_uInt16 SmTextForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWh return nState; } -sal_uInt16 SmTextForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const +sal_uInt16 SmTextForwarder::GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const { sal_uInt16 nState = SFX_ITEM_DISABLED; EditEngine *pEditEngine = rEditAcc.GetEditEngine(); @@ -1237,30 +1237,30 @@ sal_uInt16 SmTextForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) return nState; } -LanguageType SmTextForwarder::GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const +LanguageType SmTextForwarder::GetLanguage( sal_Int32 nPara, sal_uInt16 nIndex ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetLanguage(nPara, nIndex) : LANGUAGE_NONE; } -sal_uInt16 SmTextForwarder::GetFieldCount( sal_uInt16 nPara ) const +sal_uInt16 SmTextForwarder::GetFieldCount( sal_Int32 nPara ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetFieldCount(nPara) : 0; } -EFieldInfo SmTextForwarder::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const +EFieldInfo SmTextForwarder::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetFieldInfo( nPara, nField ) : EFieldInfo(); } -EBulletInfo SmTextForwarder::GetBulletInfo( sal_uInt16 /*nPara*/ ) const +EBulletInfo SmTextForwarder::GetBulletInfo( sal_Int32 /*nPara*/ ) const { return EBulletInfo(); } -Rectangle SmTextForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const +Rectangle SmTextForwarder::GetCharBounds( sal_Int32 nPara, sal_uInt16 nIndex ) const { Rectangle aRect(0,0,0,0); EditEngine *pEditEngine = rEditAcc.GetEditEngine(); @@ -1284,7 +1284,7 @@ Rectangle SmTextForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) return aRect; } -Rectangle SmTextForwarder::GetParaBounds( sal_uInt16 nPara ) const +Rectangle SmTextForwarder::GetParaBounds( sal_Int32 nPara ) const { Rectangle aRect(0,0,0,0); EditEngine *pEditEngine = rEditAcc.GetEditEngine(); @@ -1312,7 +1312,7 @@ OutputDevice* SmTextForwarder::GetRefDevice() const return pEditEngine ? pEditEngine->GetRefDevice() : 0; } -sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, sal_uInt16& nIndex ) const +sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_uInt16& nIndex ) const { sal_Bool bRes = sal_False; EditEngine *pEditEngine = rEditAcc.GetEditEngine(); @@ -1326,7 +1326,7 @@ sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, return bRes; } -sal_Bool SmTextForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const +sal_Bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const { sal_Bool bRes = sal_False; EditEngine *pEditEngine = rEditAcc.GetEditEngine(); @@ -1347,7 +1347,7 @@ sal_Bool SmTextForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, s return bRes; } -sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const +sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? @@ -1355,25 +1355,25 @@ sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& : sal_False; } -sal_uInt16 SmTextForwarder::GetLineCount( sal_uInt16 nPara ) const +sal_uInt16 SmTextForwarder::GetLineCount( sal_Int32 nPara ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetLineCount(nPara) : 0; } -sal_uInt16 SmTextForwarder::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const +sal_uInt16 SmTextForwarder::GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetLineLen(nPara, nLine) : 0; } -void SmTextForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const +void SmTextForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nPara, sal_uInt16 nLine ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); pEditEngine->GetLineBoundaries(rStart, rEnd, nPara, nLine); } -sal_uInt16 SmTextForwarder::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const +sal_uInt16 SmTextForwarder::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->GetLineNumberAtIndex(nPara, nIndex) : 0; @@ -1391,13 +1391,13 @@ sal_Bool SmTextForwarder::QuickFormatDoc( sal_Bool /*bFull*/ ) return bRes; } -sal_Int16 SmTextForwarder::GetDepth( sal_uInt16 /*nPara*/ ) const +sal_Int16 SmTextForwarder::GetDepth( sal_Int32 /*nPara*/ ) const { // math has no outliner... return -1; } -sal_Bool SmTextForwarder::SetDepth( sal_uInt16 /*nPara*/, sal_Int16 nNewDepth ) +sal_Bool SmTextForwarder::SetDepth( sal_Int32 /*nPara*/, sal_Int16 nNewDepth ) { // math has no outliner... return -1 == nNewDepth; // is it the value from 'GetDepth' ? @@ -1446,12 +1446,12 @@ void SmTextForwarder::AppendParagraph() EditEngine *pEditEngine = rEditAcc.GetEditEngine(); if (pEditEngine) { - sal_uInt16 nParaCount = pEditEngine->GetParagraphCount(); + sal_Int32 nParaCount = pEditEngine->GetParagraphCount(); pEditEngine->InsertParagraph( nParaCount, String() ); } } -xub_StrLen SmTextForwarder::AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet ) +xub_StrLen SmTextForwarder::AppendTextPortion( sal_Int32 nPara, const String &rText, const SfxItemSet &rSet ) { xub_StrLen nRes = 0; EditEngine *pEditEngine = rEditAcc.GetEditEngine(); |