diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-06-30 15:36:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-02 12:09:03 +0200 |
| commit | 884a2cd39a7c0433a5bbbf4e83e2a9b16cdad71c (patch) | |
| tree | 2e67f47eab10f09115616cc2da005c31d31a47da /svx | |
| parent | 99c0922f9b16e0f2a015db41f1acbeece3cc5e69 (diff) | |
loplugin:singlevalfields
Change-Id: I091fac5ed41b2fb58dee5e3e1b8dd805c8dc4966
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153813
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/framelinkarray.cxx | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 80a245a0f27c..8d3e2640caa3 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -65,7 +65,6 @@ public: SvxRotateMode meRotMode; double mfOrientation; - bool mbMergeOrig; bool mbOverlapX; bool mbOverlapY; @@ -90,7 +89,7 @@ public: const Style& GetStyleTLBR() const { return maTLBR; } const Style& GetStyleBLTR() const { return maBLTR; } - bool IsMerged() const { return mbMergeOrig || mbOverlapX || mbOverlapY; } + bool IsMerged() const { return mbOverlapX || mbOverlapY; } bool IsRotated() const { return mfOrientation != 0.0; } void MirrorSelfX(); @@ -209,7 +208,6 @@ Cell::Cell() : mnAddBottom( 0 ), meRotMode(SvxRotateMode::SVX_ROTATE_MODE_STANDARD ), mfOrientation( 0.0 ), - mbMergeOrig( false ), mbOverlapX( false ), mbOverlapY( false ) { @@ -236,7 +234,6 @@ bool Cell::operator==(const SfxPoolItem& rItem) const && mnAddTop == rOther.mnAddTop && mnAddBottom == rOther.mnAddBottom && meRotMode == rOther.meRotMode - && mbMergeOrig == rOther.mbMergeOrig && mbOverlapX == rOther.mbOverlapX && mbOverlapY == rOther.mbOverlapY; } @@ -270,14 +267,12 @@ static void lclSetMergedRange( SfxItemPool& rPool, CellVec& rCells, sal_Int32 nW { const Cell* pCell = rCells[ nRow * nWidth + nCol ]; Cell aTempCell(*pCell); - aTempCell.mbMergeOrig = false; aTempCell.mbOverlapX = nCol > nFirstCol; aTempCell.mbOverlapY = nRow > nFirstRow; rCells[ nRow * nWidth + nCol ] = &rPool.Put(aTempCell); } } Cell aTempCell(*rCells[ nFirstRow * nWidth + nFirstCol ]); - aTempCell.mbMergeOrig = false; rCells[ nFirstRow * nWidth + nFirstCol ] = &rPool.Put(aTempCell); } @@ -1070,20 +1065,6 @@ void Array::MirrorSelfX() aNewCells.push_back( &mxImpl->mxPool->Put(aTempCell) ); } } - for( nRow = 0; nRow < mxImpl->mnHeight; ++nRow ) - { - for( nCol = 0; nCol < mxImpl->mnWidth; ++nCol ) - { - if( CELL( nCol, nRow ).mbMergeOrig ) - { - sal_Int32 nLastCol = mxImpl->GetMergedLastCol( nCol, nRow ); - sal_Int32 nLastRow = mxImpl->GetMergedLastRow( nCol, nRow ); - lclSetMergedRange( *mxImpl->mxPool, aNewCells, mxImpl->mnWidth, - mxImpl->GetMirrorCol( nLastCol ), nRow, - mxImpl->GetMirrorCol( nCol ), nLastRow ); - } - } - } mxImpl->maCells.swap( aNewCells ); std::reverse( mxImpl->maWidths.begin(), mxImpl->maWidths.end() ); |