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/editview.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/editview.cxx')
-rw-r--r-- | editeng/source/editeng/editview.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 980a6a0e8d0a..e0a338c28eeb 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -510,7 +510,7 @@ void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) PIMPE->FormatAndUpdate( this ); } -void EditView::RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich ) +void EditView::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich ) { DBG_CHKTHIS( EditView, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); @@ -600,7 +600,7 @@ void EditView::PasteSpecial() pImpEditView->Paste(aClipBoard, sal_True ); } -Point EditView::GetWindowPosTopLeft( sal_uInt16 nParagraph ) +Point EditView::GetWindowPosTopLeft( sal_Int32 nParagraph ) { DBG_CHKTHIS( EditView, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); @@ -621,7 +621,7 @@ XubString EditView::GetSelected() return PIMPEE->GetSelected( pImpEditView->GetEditSelection() ); } -void EditView::MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos ) +void EditView::MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos ) { DBG_CHKTHIS( EditView, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); @@ -641,8 +641,7 @@ void EditView::MoveParagraphs( long nDiff ) if ( nDiff > 0 ) nDest++; DBG_ASSERT( ( nDest >= 0 ) && ( nDest <= pImpEditView->pEditEngine->GetParagraphCount() ), "MoveParagraphs - wrong Parameters!" ); - MoveParagraphs( aRange, - sal::static_int_cast< sal_uInt16 >( nDest ) ); + MoveParagraphs( aRange, sal::static_int_cast< sal_Int32 >( nDest ) ); } void EditView::SetBackgroundColor( const Color& rColor ) @@ -731,11 +730,11 @@ SfxStyleSheet* EditView::GetStyleSheet() EditSelection aSel( pImpEditView->GetEditSelection() ); aSel.Adjust( PIMPE->GetEditDoc() ); - sal_uInt16 nStartPara = PIMPE->GetEditDoc().GetPos( aSel.Min().GetNode() ); - sal_uInt16 nEndPara = PIMPE->GetEditDoc().GetPos( aSel.Max().GetNode() ); + sal_Int32 nStartPara = PIMPE->GetEditDoc().GetPos( aSel.Min().GetNode() ); + sal_Int32 nEndPara = PIMPE->GetEditDoc().GetPos( aSel.Max().GetNode() ); SfxStyleSheet* pStyle = NULL; - for ( sal_uInt16 n = nStartPara; n <= nEndPara; n++ ) + for ( sal_Int32 n = nStartPara; n <= nEndPara; n++ ) { SfxStyleSheet* pTmpStyle = PIMPE->GetStyleSheet( n ); if ( ( n != nStartPara ) && ( pStyle != pTmpStyle ) ) @@ -1084,7 +1083,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) { ESelection aSel = GetSelection(); aSel.nStartPos = 0; - aSel.nEndPos = 0xFFFF; + aSel.nEndPos = EE_TEXTPOS_ALL; SetSelection( aSel ); } SetAttribs( aAttrs ); @@ -1198,18 +1197,19 @@ void EditView::InsertField( const SvxFieldItem& rFld ) const SvxFieldItem* EditView::GetFieldUnderMousePointer() const { DBG_CHKTHIS( EditView, 0 ); - sal_uInt16 nPara, nPos; + sal_Int32 nPara; + sal_uInt16 nPos; return GetFieldUnderMousePointer( nPara, nPos ); } -const SvxFieldItem* EditView::GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const +const SvxFieldItem* EditView::GetField( const Point& rPos, sal_Int32* pPara, sal_uInt16* pPos ) const { DBG_CHKTHIS( EditView, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); return pImpEditView->GetField( rPos, pPara, pPos ); } -const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const +const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, sal_uInt16& nPos ) const { DBG_CHKTHIS( EditView, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); @@ -1290,7 +1290,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) if( aSel.HasRange() ) { - for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) + for( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) { std::vector<sal_uInt16> aPortions; rEditEngine.GetPortions( nPara, aPortions ); @@ -1299,7 +1299,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) aPortions.push_back( rEditEngine.GetTextLen(nPara) ); const sal_uInt16 nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0; - const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff; + const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : EE_TEXTPOS_ALL; for ( size_t nPos = 0; nPos < aPortions.size(); ++nPos ) { |