sc/source/filter/oox/workbookfragment.cxx | 9 +++++----
svx/source/dialog/frmsel.cxx | 3 +++
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit b73c7f5420e2117a3e2916d9797840a51e1b70e9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Apr 9 20:50:58 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Apr 10 22:49:42 2021 +0200
Resolves: tdf#139075 diagonal focus rects contain focus rects of old size
since...
commit 356f6c5d89dd4dd92b2351898e07f99b96cb34cc
Date: Tue Jan 15 08:55:00 2013 +0000
teach FrameSelector to be resizable
Change-Id: I5ac4d1d12f60086349e7dbb3b78d29977f22c226
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113856
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 8854f7d8272c..a7ea0ebedce7 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -413,6 +413,9 @@ void FrameSelectorImpl::InitBorderGeometry()
maHor.AddFocusPolygon( tools::Rectangle( mnLine1 - mnFocusOffs, mnLine2
- mnFocusOffs, mnLine3 + mnFocusOffs, mnLine2 + mnFocusOffs ) );
maBottom.AddFocusPolygon( tools::Rectangle( mnLine1 - mnFocusOffs, mnLine3
- mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs ) );
+ maTLBR.ClearFocusArea();
+ maBLTR.ClearFocusArea();
+
for( nCol = 0, nCols = maArray.GetColCount(); nCol < nCols; ++nCol )
{
for( nRow = 0, nRows = maArray.GetRowCount(); nRow < nRows; ++nRow )
commit c93177241495f7fe521f8c066a53d8f5cf353710
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Apr 8 17:27:41 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Apr 10 22:49:33 2021 +0200
tdf#141416: partial revert of the fix for tdf#81396
d4743045a0b320449d07a957463a76bb8b13f939 < the cells need to
be imported before we handle charts, tdf#81396 >
Import time of sample file in tdf#141416 goes from more than an hour
to 1 minute while keeping tdf#81396 fixed
Unittest for tdf#81396 added in 9a59068fc31d7150e255ada91c59b8299636f185
Change-Id: Ic15d57945069397076c483b6ef8f3070057db317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113818
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 30f222c91fa816a7863bf4bfc4a36e503e0bf2d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113768
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index 33605a09fc3f..d535b0fb0b79 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -481,13 +481,10 @@ void WorkbookFragment::finalizeImport()
// final conversions, e.g. calculation settings and view settings
finalizeWorkbookImport();
- //
+
//stop preventing establishment of listeners as is done in
//ScDocShell::AfterXMLLoading() for ods
getScDocument().SetInsertingFromOtherDoc(false);
- getDocImport().finalize();
-
- recalcFormulaCells();
for( WorksheetHelper* pHelper : aHelpers )
{
@@ -501,6 +498,10 @@ void WorkbookFragment::finalizeImport()
rxSheetGlob.reset();
}
+ getDocImport().finalize();
+
+ recalcFormulaCells();
+
OUString aRevHeadersPath =
getFragmentPathFromFirstType(CREATE_OFFICEDOC_RELATION_TYPE("revisionHeaders"));
if (!aRevHeadersPath.isEmpty())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
