diff options
| author | Henry Castro <hcastro@collabora.com> | 2019-03-29 09:01:05 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2019-11-12 16:22:15 +0100 |
| commit | 6befb7712f7dbe8500fe0bfa64167a8f3f0b7be8 (patch) | |
| tree | e3f4ff599499f2dc36b2e8809243b940b69e5433 /sc | |
| parent | c6cf2bec7148e403e2ee9592b4410cc73bad8f46 (diff) | |
sc lok: avoid save incorrect data, whether the pane has ...
horizontal / vertical splits
In the tiled rendering case the horizontal / vertical splits were
not implemented, so the leftmost visible column is 0.
So preserve horizontal / vertical splits when saving the document
Change-Id: I15b6f009910e51fdaf475de5aac1ebded16c1956
Reviewed-on: https://gerrit.libreoffice.org/69926
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/70079
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/82517
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 23 |
2 files changed, 16 insertions, 11 deletions
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 40dad1b62e69..b0b6a44f055e 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -394,8 +394,8 @@ public: SCTAB GetTabNo() const { return nTabNo; } ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; } - SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; } - SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; } + SCCOL GetPosX( ScHSplitPos eWhich ) const; + SCROW GetPosY( ScVSplitPos eWhich ) const; SCCOL GetCurX() const { return pThisTab->nCurX; } SCROW GetCurY() const { return pThisTab->nCurY; } SCCOL GetCurXForTab( SCTAB nTabIndex ) const; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 8ff09126c54d..05e6fc024e16 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -568,7 +568,6 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV sal_Int32 nTempPosHTw(0); bool bHasVSplitInTwips = false; bool bHasHSplitInTwips = false; - bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive(); for (sal_Int32 i = 0; i < nCount; i++) { OUString sName(aSettings[i].Name); @@ -620,26 +619,22 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV else if (sName == SC_POSITIONLEFT) { aSettings[i].Value >>= nTemp32; - nPosX[SC_SPLIT_LEFT] = bIsTiledRendering ? 0 : - SanitizeCol( static_cast<SCCOL>(nTemp32)); + nPosX[SC_SPLIT_LEFT] = SanitizeCol( static_cast<SCCOL>(nTemp32)); } else if (sName == SC_POSITIONRIGHT) { aSettings[i].Value >>= nTemp32; - nPosX[SC_SPLIT_RIGHT] = bIsTiledRendering ? 0 : - SanitizeCol( static_cast<SCCOL>(nTemp32)); + nPosX[SC_SPLIT_RIGHT] = SanitizeCol( static_cast<SCCOL>(nTemp32)); } else if (sName == SC_POSITIONTOP) { aSettings[i].Value >>= nTemp32; - nPosY[SC_SPLIT_TOP] = bIsTiledRendering ? 0 : - SanitizeRow( static_cast<SCROW>(nTemp32)); + nPosY[SC_SPLIT_TOP] = SanitizeRow( static_cast<SCROW>(nTemp32)); } else if (sName == SC_POSITIONBOTTOM) { aSettings[i].Value >>= nTemp32; - nPosY[SC_SPLIT_BOTTOM] = bIsTiledRendering ? 0 : - SanitizeRow( static_cast<SCROW>(nTemp32)); + nPosY[SC_SPLIT_BOTTOM] = SanitizeRow( static_cast<SCROW>(nTemp32)); } else if (sName == SC_ZOOMTYPE) { @@ -1300,6 +1295,16 @@ void ScViewData::ResetOldCursor() pThisTab->mbOldCursorValid = false; } +SCCOL ScViewData::GetPosX( ScHSplitPos eWhich ) const +{ + return comphelper::LibreOfficeKit::isActive() ? 0 : pThisTab->nPosX[eWhich]; +} + +SCROW ScViewData::GetPosY( ScVSplitPos eWhich ) const +{ + return comphelper::LibreOfficeKit::isActive() ? 0 : pThisTab->nPosY[eWhich]; +} + SCCOL ScViewData::GetCurXForTab( SCTAB nTabIndex ) const { if (!ValidTab(nTabIndex) || (nTabIndex >= static_cast<SCTAB>(maTabData.size()))) |