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 /svx/source/sdr/properties/textproperties.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 'svx/source/sdr/properties/textproperties.cxx')
-rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index db1a34a849d8..023e05cae937 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -108,9 +108,9 @@ namespace sdr pOutliner->SetText(*pParaObj); } - sal_uInt32 nParaCount(pOutliner->GetParagraphCount()); + sal_Int32 nParaCount(pOutliner->GetParagraphCount()); - for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) + for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { SfxItemSet aSet(pOutliner->GetParaAttribs(nPara)); aSet.Put(rSet); @@ -128,7 +128,7 @@ namespace sdr mpItemSet->Put(aNewSet); } - OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount); pOutliner->Clear(); rObj.NbcSetOutlinerParaObjectForText(pTemp,pText); @@ -180,14 +180,14 @@ namespace sdr if( pParaObj ) { rOutliner.SetText(*pParaObj); - sal_uInt32 nParaCount(rOutliner.GetParagraphCount()); + sal_Int32 nParaCount(rOutliner.GetParagraphCount()); if(nParaCount) { - ESelection aSelection( 0, 0, EE_PARA_ALL, EE_PARA_ALL); + ESelection aSelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL); rOutliner.RemoveAttribs(aSelection, sal_True, 0); - OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); rOutliner.Clear(); rObj.NbcSetOutlinerParaObjectForText( pTemp, pText ); @@ -257,11 +257,11 @@ namespace sdr // apply StyleSheet to all paragraphs rOutliner.SetText(*pParaObj); - sal_uInt32 nParaCount(rOutliner.GetParagraphCount()); + sal_Int32 nParaCount(rOutliner.GetParagraphCount()); if(nParaCount) { - for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) + for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { SfxItemSet* pTempSet = 0L; @@ -278,7 +278,7 @@ namespace sdr { String aNewStyleSheetName(GetStyleSheet()->GetName()); aNewStyleSheetName.Erase(aNewStyleSheetName.Len() - 1, 1); - sal_Int16 nDepth = rOutliner.GetDepth((sal_uInt16)nPara); + sal_Int16 nDepth = rOutliner.GetDepth(nPara); aNewStyleSheetName += String::CreateFromInt32( nDepth <= 0 ? 1 : nDepth + 1); SdrModel* pModel = rObj.GetModel(); @@ -328,7 +328,7 @@ namespace sdr if(nW >= EE_ITEMS_START && nW <= EE_ITEMS_END) { - rOutliner.QuickRemoveCharAttribs((sal_uInt16)nPara, nW); + rOutliner.QuickRemoveCharAttribs(nPara, nW); } } pItem = aIter.NextItem(); @@ -342,7 +342,7 @@ namespace sdr } } - OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); rOutliner.Clear(); rObj.NbcSetOutlinerParaObjectForText(pTemp, pText); } @@ -417,13 +417,13 @@ namespace sdr pOutliner->SetText(*pParaObj); - sal_uInt32 nParaCount(pOutliner->GetParagraphCount()); + sal_Int32 nParaCount(pOutliner->GetParagraphCount()); if(nParaCount) { sal_Bool bBurnIn(sal_False); - for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) + for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { SfxStyleSheet* pSheet = pOutliner->GetStyleSheet(nPara); @@ -457,7 +457,7 @@ namespace sdr { EditEngine* pEditEngine = const_cast<EditEngine*>(&(pOutliner->GetEditEngine())); std::vector<EECharAttrib> aAttribs; - pEditEngine->GetCharAttribs((sal_uInt16)nPara, aAttribs); + pEditEngine->GetCharAttribs(nPara, aAttribs); for(std::vector<EECharAttrib>::iterator i = aAttribs.begin(); i < aAttribs.end(); ++i) { @@ -486,7 +486,7 @@ namespace sdr SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR ); aColorSet.Put(aSet, sal_False); - ESelection aSel((sal_uInt16)nPara, 0); + ESelection aSel(nPara, 0); for(std::vector<EECharAttrib>::iterator i = aAttribs.begin(); i < aAttribs.end(); ++i) { @@ -501,7 +501,7 @@ namespace sdr } } - aSel.nEndPos = pEditEngine->GetTextLen((sal_uInt16)nPara); + aSel.nEndPos = pEditEngine->GetTextLen(nPara); if(aSel.nStartPos != aSel.nEndPos) { @@ -525,7 +525,7 @@ namespace sdr if(bBurnIn) { - OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount); rObj.NbcSetOutlinerParaObjectForText(pTemp,pText); } } |