[Libreoffice-commits] core.git: 2 commits - desktop/source sfx2/source

[Tor Lillqvist]

 desktop/source/deployment/registry/configuration/dp_configuration.cxx |    2 +-
 sfx2/source/doc/docfile.cxx                                           |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1370a0161ca7d33beff508f8d72c4f0c2150399a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 26 19:18:43 2013 +0200

    WaE: unused variables
    
    Change-Id: Ie75bdf5b3d9f9e46d9b46f91192df14fc90b4095

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 3830b11..3c49849 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -132,12 +132,12 @@ using namespace ::com::sun::star::io;
 
 namespace {
 
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
+
 static const sal_Int8 LOCK_UI_NOLOCK = 0;
 static const sal_Int8 LOCK_UI_SUCCEEDED = 1;
 static const sal_Int8 LOCK_UI_TRY = 2;
 
-#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
-
 bool IsSystemFileLockingUsed()
 {
 #if HAVE_FEATURE_MACOSX_SANDBOX
commit 500448212a479df99cfc1f943db54245ca06d5ea
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 26 19:00:20 2013 +0200

    WaE: unused variable 'url'
    
    Change-Id: I6ae6a95bdf9b0f82384dfdcbdefc6a546f81ef0f

diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 17b0f16..41c23ff 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -548,13 +548,13 @@ BackendImpl::PackageImpl::isRegistered_(
     Reference<XCommandEnvironment> const & )
 {
     BackendImpl * that = getMyBackend();
-    const OUString url(getURL());
 
     bool bReg = false;
     if (that->hasActiveEntry(getURL()))
         bReg = true;
 
 #if HAVE_FEATURE_EXTENSIONS
+    const OUString url(getURL());
     if (!bReg && that->m_registeredPackages.get())
     {
         // fallback for user extension registered in berkeley DB