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

[Tor Lillqvist (via logerrit)]

 vcl/osx/salframe.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c8b1ea92ca8e3290238f48ba70c2ee879c0099a8
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Sun Jul 5 19:23:27 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Nov 15 10:11:44 2020 +0100

    Avoid warning about deprecation in macOS 11.0
    
    Change-Id: Ie1a7e19093b439eb133632ee881e1e3dbe58132d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98176
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105873
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 9065a3de2ff5..c62743425bab 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1278,8 +1278,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
                                          aStyleSettings.GetHighlightTextColor(), mpNSWindow ) );
     aStyleSettings.SetHighlightTextColor( aHighlightTextColor );
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor],
                                          aStyleSettings.GetMenuHighlightColor(), mpNSWindow ) );
+#pragma clang diagnostic pop
     aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor );
     Color aMenuHighlightTextColor( getColor( [NSColor selectedMenuItemTextColor],
                                              aStyleSettings.GetMenuHighlightTextColor(), mpNSWindow ) );