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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 5955e50f71d2..549643b07d14 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3491,7 +3491,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) rOutliner.SetUpdateMode( sal_False ); rOutliner.SetVertical( pText->IsVerticalWriting() ); - sal_uInt16 nParaIndex = 0; + sal_Int32 nParaIndex = 0; sal_Int32 nParaSize; const sal_Unicode* pCurrent, *pBuf = rText.getStr(); const sal_Unicode* pEnd = rText.getStr() + rText.getLength(); @@ -4253,7 +4253,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r rOutliner.SetText( *pParaObj ); VirtualDevice aVirDev( 1 ); aVirDev.SetMapMode( MAP_100TH_MM ); - sal_uInt32 i, nParagraphs = rOutliner.GetParagraphCount(); + sal_Int32 i, nParagraphs = rOutliner.GetParagraphCount(); if ( nParagraphs ) { sal_Bool bCreateNewParaObject = sal_False; @@ -4262,9 +4262,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r sal_Bool bIsRTL = aVirDev.GetTextIsRTL( rOutliner.GetText( rOutliner.GetParagraph( i ) ), 0, STRING_LEN ); if ( bIsRTL ) { - SfxItemSet aSet2( rOutliner.GetParaAttribs( (sal_uInt16)i ) ); + SfxItemSet aSet2( rOutliner.GetParaAttribs( i ) ); aSet2.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); - rOutliner.SetParaAttribs( (sal_uInt16)i, aSet2 ); + rOutliner.SetParaAttribs( i, aSet2 ); bCreateNewParaObject = sal_True; } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d8fa17d7f19d..4d942b4ee6ba 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2245,7 +2245,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* nCurrentIndex += nCharacters; } } - sal_uInt16 nParaIndex = (sal_uInt16)pTextObj->GetCurrentIndex(); + sal_Int32 nParaIndex = pTextObj->GetCurrentIndex(); SfxStyleSheet* pS = ( ppStyleSheetAry ) ? ppStyleSheetAry[ pPara->pParaSet->mnDepth ] : pSheet; ESelection aSelection( nParaIndex, 0, nParaIndex, 0 ); |