[Libreoffice-commits] core.git: 3 commits - fpicker/source framework/source

[Tor Lillqvist]

 fpicker/source/aqua/SalAquaFilePicker.mm   |    4 ----
 framework/source/helper/titlebarupdate.cxx |    7 ++++---
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit ea65158833c292c385e534cdf8b0184cd7ff255e
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Dec 26 18:28:08 2013 +0200

    The #ifndef MACOSX can surround even more code
    
    Change-Id: Ia771d36711364bcf53789b3f7a623582451d175d

diff --git a/framework/source/helper/titlebarupdate.cxx 
b/framework/source/helper/titlebarupdate.cxx
index 07fdbaa..b958b94 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -141,6 +141,8 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
         return;
 
     OUString sApplicationID;
+
+#if !defined(MACOSX)
     try
     {
         // SYNCHRONIZED ->
@@ -152,7 +154,6 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
         css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
             css::frame::ModuleManager::create( xContext );
 
-#if !defined(MACOSX)
         OUString sDesktopName;
         OUString aModuleId = xModuleManager->identify(xFrame);
         if ( aModuleId == "com.sun.star.text.TextDocument" ||
@@ -186,11 +187,11 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
         sApplicationID += "-";
         sApplicationID += sDesktopName.toAsciiLowerCase();
 #endif
-#endif
     }
     catch(const css::uno::Exception&)
     {
     }
+#endif
 
     // VCL SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
commit 4274e6a9af56e64b1f98e59a96623fabe8d80b94
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Dec 26 18:19:45 2013 +0200

    WaE: unused variables
    
    Change-Id: I42549eaa7048a6bcb248d3bd1bb28ca2c7c38763

diff --git a/framework/source/helper/titlebarupdate.cxx 
b/framework/source/helper/titlebarupdate.cxx
index e9badc6..07fdbaa 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -152,9 +152,9 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
         css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
             css::frame::ModuleManager::create( xContext );
 
-        OUString aModuleId = xModuleManager->identify(xFrame);
-        OUString sDesktopName;
 #if !defined(MACOSX)
+        OUString sDesktopName;
+        OUString aModuleId = xModuleManager->identify(xFrame);
         if ( aModuleId == "com.sun.star.text.TextDocument" ||
              aModuleId == "com.sun.star.text.GlobalDocument" ||
              aModuleId == "com.sun.star.text.WebDocument" ||
commit a3b9461ad3edb3f7460ade96538f44061e117303
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Dec 26 18:12:26 2013 +0200

    WaE: unused variables
    
    Change-Id: I95f0afc4b71dd62c7635f0a56b0917463db08c35

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm 
b/fpicker/source/aqua/SalAquaFilePicker.mm
index 75f57fc..a75bb24 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -72,10 +72,6 @@ using namespace ::com::sun::star::uno;
 
 namespace
 {
-    // controlling event notifications
-    const bool STARTUP_SUSPENDED = true;
-    const bool STARTUP_ALIVE     = false;
-
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits