[Libreoffice-commits] core.git: sc/source

Marco Cecchetti (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 26 13:21:34 UTC 2021


 sc/source/ui/view/tabview3.cxx |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

New commits:
commit 818b7e508bcabae48cb1c96c987a9f83d83ff6e0
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Wed Apr 21 18:28:13 2021 +0200
Commit:     Marco Cecchetti <marco.cecchetti at collabora.com>
CommitDate: Mon Apr 26 15:20:53 2021 +0200

    lok: calc: formula breaking to multiple lines partly shown in edit mode
    
    visible cells report wrong number because of the wrong grid size is
    retrieved that in turn is due to the fact that the size of the visible
    area in Online is used to set up only the active pane,
    
    So when we have windows splitting, even though there is no real split,
    the height can be computed using a non active pane whose size is not
    be synchronized with Online.
    
    Until we lack that synchronization, we use the implemented workaround
    for fixing the problem.
    
    Change-Id: I9df9e4b0ef77a2a8a5847ce77fe90d83ec75019d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114429
    Tested-by: Jenkins
    Reviewed-by: Marco Cecchetti <marco.cecchetti at collabora.com>

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 94ac00f7187b..4bca2a4d92f8 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2982,6 +2982,17 @@ void ScTabView::UpdateInputContext()
 
 tools::Long ScTabView::GetGridWidth( ScHSplitPos eWhich )
 {
+    // at present only the size of the current pane is synchronized with
+    // the size of the visible area in Online;
+    // as a workaround we use the same width for all panes independently
+    // from the eWhich value
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        ScGridWindow* pGridWindow = aViewData.GetActiveWin();
+        if (pGridWindow)
+            return pGridWindow->GetSizePixel().Width();
+    }
+
     ScSplitPos eGridWhich = ( eWhich == SC_SPLIT_LEFT ) ? SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT;
     if (pGridWin[eGridWhich])
         return pGridWin[eGridWhich]->GetSizePixel().Width();
@@ -2993,6 +3004,17 @@ tools::Long ScTabView::GetGridWidth( ScHSplitPos eWhich )
 
 tools::Long ScTabView::GetGridHeight( ScVSplitPos eWhich )
 {
+    // at present only the size of the current pane is synchronized with
+    // the size of the visible area in Online;
+    // as a workaround we use the same height for all panes independently
+    // from the eWhich value
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        ScGridWindow* pGridWindow = aViewData.GetActiveWin();
+        if (pGridWindow)
+            return pGridWindow->GetSizePixel().Height();
+    }
+
     ScSplitPos eGridWhich = ( eWhich == SC_SPLIT_TOP ) ? SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT;
     if (pGridWin[eGridWhich])
         return pGridWin[eGridWhich]->GetSizePixel().Height();


More information about the Libreoffice-commits mailing list