[Libreoffice-commits] .: fpicker/source

[Tor Lillqvist]

 fpicker/source/aqua/SalAquaPicker.mm |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 079c042d1994b6a8532e72e55aaaa617a7acd387
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jul 28 14:43:55 2012 +0300

    WaE: ignoring #pragma GCC diagnostic
    
    Change-Id: I45db1175d18a5284cbbb6b9e34534cf2c25728d2

diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index b292138..d2825d6 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -180,7 +180,10 @@ int SalAquaPicker::run()
         startDirectory = NSHomeDirectory();
     }
 
+#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#pragma GCC diagnostic push
 #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif
     switch(m_nDialogType) {
         case NAVIGATIONSERVICES_DIRECTORY:
         case NAVIGATIONSERVICES_OPEN:
@@ -200,8 +203,9 @@ int SalAquaPicker::run()
             implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]);
         }
     }
-#pragma GCC diagnostic error "-Wdeprecated-declarations"
-
+#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#pragma GCC diagnostic pop
+#endif
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
     [pool release];