[Libreoffice-commits] .: fpicker/source

Caolán McNamara caolan at kemper.freedesktop.org
Sat Jul 28 07:49:41 PDT 2012


 fpicker/source/aqua/SalAquaFilePicker.mm |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 36aae9cda39e08c450ecef048f763bdd023d03a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 28 15:48:53 2012 +0100

    having a stab at silencing this warning
    
    i.e. use same pattern as 079c042d1994b6a8532e72e55aaaa617a7acd387
    
    Change-Id: I149ed933567fcdc5e404589b2b77bba7e02c5b37

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 25bd923..66c3536 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -773,9 +773,14 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
         rtl::OUString suffix = (*(aStringList.begin())).copy(1);
         NSString *requiredFileType = [NSString stringWithOUString:suffix];
 
+#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#pragma GCC diagnostic push
 #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif
         [m_pDialog setRequiredFileType:requiredFileType];
-#pragma GCC diagnostic error "-Wdeprecated-declarations"
+#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#pragma GCC diagnostic pop
+#endif
 
         OSL_TRACE("disallowing other file types");
         [m_pDialog setAllowsOtherFileTypes:NO];


More information about the Libreoffice-commits mailing list