[Libreoffice-commits] core.git: 2 commits - sw/source vcl/source

[Szymon Kłos (via logerrit)]

 sw/source/uibase/docvw/AnnotationWin2.cxx |    3 +++
 vcl/source/window/builder.cxx             |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2a881af4e93f8744bc6bea43f3a06fa531626c22
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Sat Nov 6 15:47:08 2021 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Dec 29 13:23:36 2021 +0100

    lok: no need to layout comments in writer
    
    Annotations in writer use EditEngine what caused to
    send cursor position from that EditEngine to online
    and showing cursor in the top left corner of a document
    after comment insertion.
    
    We don't need to resize/update position comment windows
    as we send only abstract description of the comments
    and later rendering is handled by client.
    
    Change-Id: I1df0e44f9500c438efd00942a372754c7fbaa170
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124794
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127677
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx 
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index c10d205d3848..6981b422ca0e 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -805,6 +805,9 @@ void SwAnnotationWin::DoResize()
 
 void SwAnnotationWin::SetSizePixel( const Size& rNewSize )
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     InterimItemWindow::SetSizePixel(rNewSize);
 
     if (mpShadow)
commit d434be2d76febe3302047640a4c4f1820ecb8870
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Oct 27 13:04:47 2021 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Dec 29 13:23:25 2021 +0100

    jsdialogs: use for MessageDialogs
    
    Change-Id: Ie82558356cd9669f21afefd1ee88d769bf28eb8d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124270
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127676
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1e0e8a047f81..5aa38a038ea8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -210,9 +210,9 @@ std::unique_ptr<weld::Builder> 
Application::CreateInterimBuilder(vcl::Window* pP
 
 weld::MessageDialog* Application::CreateMessageDialog(weld::Widget* pParent, 
VclMessageType eMessageType,
                                                       VclButtonsType 
eButtonType, const OUString& rPrimaryMessage,
-                                                      bool bMobile)
+                                                      bool /*bMobile*/)
 {
-    if (bMobile)
+    if (comphelper::LibreOfficeKit::isActive())
         return JSInstanceBuilder::CreateMessageDialog(pParent, eMessageType, 
eButtonType, rPrimaryMessage);
     else
         return ImplGetSVData()->mpDefInst->CreateMessageDialog(pParent, 
eMessageType, eButtonType, rPrimaryMessage);