[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/source

[Henry Castro (via logerrit)]

 include/vcl/dialog.hxx       |    1 +
 vcl/source/window/dialog.cxx |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 597bb960d049ab1c8f5272d2535062d465873244
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Dec 4 15:38:35 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Jan 18 20:35:11 2021 +0100

    lok: jsbuilder: fix disable dialog tunneling
    
    When a client side issue command to show the Macro Selector Dialog
    to the server side, it is not necessary the dialog sends window
    invalidate.
    
    I guess the dialog tunneling progressively will be deprecated in
    favor of JSDialog, that it will send JSON data to client side,
    then it will be constructed to html element using a javascript
    dialog builder. (I am wondering why sending JSON?, the server side
    can just send the HTML string, and no need for javascript dialog builder).
    
    Change-Id: Ia88f431ed9a860bb9bb30caaaf0f7f889d765115
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107240
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109133
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index d02772ce0e63..0e6cb9bf262a 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -103,6 +103,7 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual void    Command( const CommandEvent& rCEvt ) override;
+    virtual void    PixelInvalidate(const tools::Rectangle* pRectangle) override;
 
     virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override;
     virtual bool set_property(const OString &rKey, const OUString &rValue) override;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 536228b97ec8..ab9a30430b4c 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -393,6 +393,14 @@ void Dialog::ImplInitDialogData()
     mpDialogImpl.reset(new DialogImpl);
 }
 
+void Dialog::PixelInvalidate(const tools::Rectangle* pRectangle)
+{
+    if (!mpDialogImpl->m_bLOKTunneling)
+        return;
+
+    Window::PixelInvalidate(pRectangle);
+}
+
 vcl::Window* Dialog::GetDefaultParent(WinBits nStyle)
 {
     vcl::Window* pParent = Application::GetDefDialogParent();