diff options
author | Eike Rathke <erack@redhat.com> | 2013-05-08 18:12:32 +0200 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-28 12:00:06 +0000 |
commit | da11528150df545a31df3c9863bd4c3925ccdf21 (patch) | |
tree | ad7eb65227b7d03972637fcaf23a8b96cc1c55a4 /editeng/source/editeng/editobj.cxx | |
parent | 7f50f4092b7beafa5545a9a783dde760b260df4c (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)
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>
(cherry picked from commit 2af1f5691e8d64afd5246d245d7876b5a2cd5cd8)
Conflicts:
editeng/inc/editeng/editeng.hxx
editeng/inc/editeng/outliner.hxx
editeng/inc/editeng/unoedprx.hxx
editeng/inc/editeng/unoedsrc.hxx
editeng/inc/editeng/unofored.hxx
editeng/inc/editeng/unoforou.hxx
editeng/inc/editeng/unotext.hxx
editeng/source/accessibility/AccessibleHyperlink.cxx
editeng/source/accessibility/AccessibleHyperlink.hxx
editeng/source/editeng/editeng.cxx
editeng/source/editeng/editobj.cxx
editeng/source/editeng/editobj2.hxx
editeng/source/editeng/impedit.hxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
editeng/source/outliner/outleeng.cxx
editeng/source/outliner/outleeng.hxx
editeng/source/outliner/outliner.cxx
editeng/source/outliner/outlvw.cxx
editeng/source/uno/unoedprx.cxx
editeng/source/uno/unofored.cxx
editeng/source/uno/unoforou.cxx
editeng/source/uno/unotext.cxx
include/editeng/editobj.hxx
sc/inc/editutil.hxx
sc/qa/unit/subsequent_filters-test.cxx
sc/source/core/data/cellvalue.cxx
sc/source/core/tool/editutil.cxx
sc/source/filter/xml/xmlcelli.hxx
sc/source/ui/unoobj/fielduno.cxx
sd/source/ui/inc/OutlineView.hxx
sd/source/ui/view/drtxtob1.cxx
starmath/source/accessibility.cxx
starmath/source/accessibility.hxx
svx/inc/svx/svdoutl.hxx
svx/source/accessibility/AccessibleEmptyEditSource.cxx
svx/source/sdr/properties/textproperties.cxx
svx/source/svdraw/svdoutl.cxx
Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00
Reviewed-on: https://gerrit.libreoffice.org/4368
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'editeng/source/editeng/editobj.cxx')
-rw-r--r-- | editeng/source/editeng/editobj.cxx | 81 |
1 files changed, 48 insertions, 33 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 669f003fa607..20561cd7303d 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -194,30 +194,30 @@ EditTextObject::~EditTextObject() DBG_DTOR( EE_EditTextObject, 0 ); } -size_t EditTextObject::GetParagraphCount() const +sal_Int32 EditTextObject::GetParagraphCount() const { OSL_FAIL( "Virtual method direct from EditTextObject!" ); return 0; } -String EditTextObject::GetText(size_t /* nParagraph */) const +String EditTextObject::GetText(sal_Int32 /* nParagraph */) const { OSL_FAIL( "Virtual method direct from EditTextObject!" ); return String(); } -void EditTextObject::Insert(const EditTextObject& /* rObj */, size_t /* nPara */) +void EditTextObject::Insert(const EditTextObject& /* rObj */, sal_Int32 /* nPara */) { OSL_FAIL( "Virtual method direct from EditTextObject!" ); } -EditTextObject* EditTextObject::CreateTextObject(size_t /*nPara*/, size_t /*nParas*/) const +EditTextObject* EditTextObject::CreateTextObject(sal_Int32 /*nPara*/, sal_Int32 /*nParas*/) const { OSL_FAIL( "Virtual method direct from EditTextObject!" ); return 0; } -void EditTextObject::RemoveParagraph(size_t /*nPara*/) +void EditTextObject::RemoveParagraph(sal_Int32 /*nPara*/) { OSL_FAIL( "Virtual method direct from EditTextObject!" ); } @@ -245,7 +245,7 @@ sal_Bool EditTextObject::HasCharAttribs( sal_uInt16 ) const return false; } -void EditTextObject::GetCharAttribs( sal_uInt16 /*nPara*/, std::vector<EECharAttrib>& /*rLst*/ ) const +void EditTextObject::GetCharAttribs( sal_Int32 /*nPara*/, std::vector<EECharAttrib>& /*rLst*/ ) const { OSL_FAIL( "Virtual method direct from EditTextObject!" ); } @@ -273,13 +273,13 @@ sal_Bool EditTextObject::HasField( TypeId /*aType*/ ) const return false; } -SfxItemSet EditTextObject::GetParaAttribs(size_t /*nPara*/) const +SfxItemSet EditTextObject::GetParaAttribs(sal_Int32 /*nPara*/) const { OSL_FAIL( "Virtual method direct from EditTextObject!" ); return SfxItemSet( *(SfxItemPool*)NULL ); } -void EditTextObject::SetParaAttribs(size_t /*nPara*/, const SfxItemSet& /*rAttribs*/) +void EditTextObject::SetParaAttribs(sal_Int32 /*nPara*/, const SfxItemSet& /*rAttribs*/) { OSL_FAIL( "Virtual method direct from EditTextObject!" ); } @@ -302,12 +302,12 @@ sal_Bool EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFami return false; } -void EditTextObject::GetStyleSheet(size_t /*nPara*/, String& /*rName*/, SfxStyleFamily& /*eFamily*/) const +void EditTextObject::GetStyleSheet(sal_Int32 /*nPara*/, String& /*rName*/, SfxStyleFamily& /*eFamily*/) const { OSL_FAIL( "Virtual method direct from EditTextObject!" ); } -void EditTextObject::SetStyleSheet(size_t /*nPara*/, const String& /*rName*/, const SfxStyleFamily& /*eFamily*/) +void EditTextObject::SetStyleSheet(sal_Int32 /*nPara*/, const String& /*rName*/, const SfxStyleFamily& /*eFamily*/) { OSL_FAIL( "Virtual method direct from EditTextObject!" ); } @@ -676,27 +676,33 @@ ContentInfo* BinTextObject::CreateAndInsertContent() return &aContents.back(); } -size_t BinTextObject::GetParagraphCount() const +sal_Int32 BinTextObject::GetParagraphCount() const { - return aContents.size(); + size_t nSize = aContents.size(); + if (nSize > EE_PARA_MAX_COUNT) + { + SAL_WARN( "editeng", "EditTextObjectImpl::GetParagraphCount - overflow " << nSize); + return EE_PARA_MAX_COUNT; + } + return static_cast<sal_Int32>(nSize); } -String BinTextObject::GetText(size_t nPara) const +String BinTextObject::GetText(sal_Int32 nPara) const { - if (nPara >= aContents.size()) + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) return String(); return aContents[nPara].GetText(); } -void BinTextObject::Insert(const EditTextObject& rObj, size_t nDestPara) +void BinTextObject::Insert(const EditTextObject& rObj, sal_Int32 nDestPara) { DBG_ASSERT( rObj.Which() == EE_FORMAT_BIN, "UTO: unknown Textobjekt" ); const BinTextObject& rBinObj = (const BinTextObject&)rObj; - if (nDestPara > aContents.size()) - nDestPara = aContents.size(); + if (static_cast<size_t>(nDestPara) > aContents.size()) + nDestPara = static_cast<sal_Int32>(aContents.size()); const ContentInfosType& rCIs = rBinObj.aContents; for (size_t i = 0, n = rCIs.size(); i < n; ++i) @@ -710,9 +716,9 @@ void BinTextObject::Insert(const EditTextObject& rObj, size_t nDestPara) ClearPortionInfo(); } -EditTextObject* BinTextObject::CreateTextObject(size_t nPara, size_t nParas) const +EditTextObject* BinTextObject::CreateTextObject(sal_Int32 nPara, sal_Int32 nParas) const { - if (nPara >= aContents.size() || !nParas) + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size() || nParas <= 0) return NULL; // Only split the Pool, when a the Pool is set externally. @@ -734,10 +740,10 @@ EditTextObject* BinTextObject::CreateTextObject(size_t nPara, size_t nParas) con return pObj; } -void BinTextObject::RemoveParagraph(size_t nPara) +void BinTextObject::RemoveParagraph(sal_Int32 nPara) { - DBG_ASSERT( nPara < aContents.size(), "BinTextObject::GetText: Paragraph does not exist!" ); - if (nPara >= aContents.size()) + DBG_ASSERT( nPara >= 0 && static_cast<size_t>(nPara) < aContents.size(), "BinTextObject::GetText: Paragraph does not exist!" ); + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) return; ContentInfosType::iterator it = aContents.begin(); @@ -791,8 +797,11 @@ sal_Bool BinTextObject::HasCharAttribs( sal_uInt16 _nWhich ) const return false; } -void BinTextObject::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const +void BinTextObject::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const { + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) + return; + rLst.clear(); const ContentInfo& rC = aContents[nPara]; for (size_t nAttr = 0; nAttr < rC.aAttribs.size(); ++nAttr) @@ -878,14 +887,17 @@ sal_Bool BinTextObject::HasField( TypeId aType ) const return false; } -SfxItemSet BinTextObject::GetParaAttribs(size_t nPara) const +SfxItemSet BinTextObject::GetParaAttribs(sal_Int32 nPara) const { const ContentInfo& rC = aContents[nPara]; return rC.GetParaAttribs(); } -void BinTextObject::SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs) +void BinTextObject::SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs) { + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) + return; + ContentInfo& rC = aContents[nPara]; rC.GetParaAttribs().Set(rAttribs); ClearPortionInfo(); @@ -895,7 +907,7 @@ sal_Bool BinTextObject::RemoveCharAttribs( sal_uInt16 _nWhich ) { sal_Bool bChanged = false; - for ( sal_uInt16 nPara = aContents.size(); nPara; ) + for ( size_t nPara = aContents.size(); nPara; ) { ContentInfo& rC = aContents[--nPara]; @@ -959,9 +971,9 @@ sal_Bool BinTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eF return false; } -void BinTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& rFamily) const +void BinTextObject::GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& rFamily) const { - if (nPara >= aContents.size()) + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) return; const ContentInfo& rC = aContents[nPara]; @@ -969,9 +981,9 @@ void BinTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& r rFamily = rC.GetFamily(); } -void BinTextObject::SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& rFamily) +void BinTextObject::SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& rFamily) { - if (nPara >= aContents.size()) + if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) return; ContentInfo& rC = aContents[nPara]; @@ -1060,13 +1072,16 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // The number of paragraphs ... size_t nParagraphs = aContents.size(); - rOStream << static_cast<sal_uInt16>(nParagraphs); + // FIXME: this truncates, check usage of stream and if it can be changed, + // i.e. is not persistent, adapt this and reader. + sal_uInt16 nParagraphs_Stream = static_cast<sal_uInt16>(nParagraphs); + rOStream << nParagraphs_Stream; sal_Unicode nUniChar = CH_FEATURE; char cFeatureConverted = rtl::OString(&nUniChar, 1, eEncoding).toChar(); // The individual paragraphs ... - for (size_t nPara = 0; nPara < nParagraphs; ++nPara) + for (size_t nPara = 0; nPara < nParagraphs_Stream; ++nPara) { const ContentInfo& rC = aContents[nPara]; @@ -1191,7 +1206,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const rOStream << static_cast<sal_Bool>(bStoreUnicodeStrings); if ( bStoreUnicodeStrings ) { - for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ ) + for ( size_t nPara = 0; nPara < nParagraphs_Stream; nPara++ ) { const ContentInfo& rC = aContents[nPara]; sal_uInt16 nL = rC.GetText().Len(); |