[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/source

[Noel Grandin (via logerrit)]

 vcl/inc/osx/salframe.h       |    2 --
 vcl/inc/salframe.hxx         |    4 ----
 vcl/osx/salframe.cxx         |    9 ---------
 vcl/source/window/dialog.cxx |    3 ---
 4 files changed, 18 deletions(-)

New commits:
commit 0ffbaecea3316a5c723f6e0eb7250611b5d0f3d7
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Apr 25 21:16:53 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Apr 25 22:30:34 2020 +0200

    tf#131549 No titlebar on modal dialogs on macOS
    
    regression from
        commit e5230535877e30c3b874495e8794faa3a42d8017
        Date:   Tue Mar 17 21:34:21 2020 +0200
        simplify ORefVector code
    where a half-finished patch of mine snuck into another patch.
    
    Change-Id: I01f59a9d451f4535197d3abd7b37bfdbc8461c15
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92901
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 60b4e82f2540..3d0f19f418a0 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -163,8 +163,6 @@ public:
 
     void UpdateFrameGeometry();
 
-    virtual void BeginSheet(SalFrame* pSheetFrame) const override;
-
     // trigger painting of the window
     void SendPaintEvent( const tools::Rectangle* pRect = nullptr );
 
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index bc1127d1989b..b83138e29d40 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -259,10 +259,6 @@ public:
         return false;
     }
 
-    /** only does anything on MACOSX where it indicates to the OS that this window is a modal-dialog
-     * and  should be displayed using the special sheet mode */
-    virtual void BeginSheet(SalFrame* /*pSheetWindow*/) const {}
-
     // return true to indicate tooltips are shown natively, false otherwise
     virtual bool            ShowTooltip(const OUString& /*rHelpText*/, const tools::Rectangle& /*rHelpArea*/)
     {
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index b2990d3ede17..6f7a395522cf 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1822,13 +1822,4 @@ void AquaSalFrame::EndSetClipRegion()
     // shadow is invalidated when view gets drawn again
 }
 
-void AquaSalFrame::BeginSheet(SalFrame* pSheetFrame) const
-{
-    NSWindow* pSheetNSWindow = static_cast<AquaSalFrame*>(pSheetFrame)->mpNSWindow;
-//    [mpNSWindow beginSheet:pSheetNSWindow];
-//    beginSheet(mpNSWindow];
-
-    [mpNSWindow beginSheet:pSheetNSWindow completionHandler:nil ];
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 34d38021a73f..9ea561abe64f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -966,9 +966,6 @@ bool Dialog::ImplStartExecute()
     // FIXME: no layouting, workaround some clipping issues
     ImplAdjustNWFSizes();
 
-    if (mpDialogParent)
-        mpDialogParent->ImplGetFrame()->BeginSheet(ImplGetFrame()); //  only does anything on macOS
-
     css::uno::Reference< css::uno::XComponentContext > xContext(
         comphelper::getProcessComponentContext());
     bool bForceFocusAndToFront(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext));