[Libreoffice-commits] .: 3 commits - configure.in desktop/inc desktop/source

[Libreoffice Gerrit user]

 configure.in                               |   16 +++++++---------
 desktop/inc/app.hxx                        |    4 ----
 desktop/source/deployment/misc/dp_misc.cxx |    6 +++---
 3 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit 2198fc2711bfb3e1025517f2d61ec8ae7d424c20
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 24 19:06:33 2012 +0200

    Typo
    
    Change-Id: Iac9a2715b8a0a517f502c56ef0652e316bd76f52

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index a262816..2c30677 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -213,7 +213,7 @@ bool compareExtensionFolderWithLastSynchronizedFile(
     return bNeedsSync;
 }
 
-bool needToSyncRepostitory(OUString const & name)
+bool needToSyncRepository(OUString const & name)
 {
     OUString folder;
     OUString file;
@@ -558,8 +558,8 @@ void syncRepositories(
     //more revoke and registration calls.
     sal_Bool bModified = false;
     if (force
-        || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-        || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
+        || needToSyncRepository(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
+        || needToSyncRepository(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
     {
         xExtensionManager =
             deployment::ExtensionManager::get(
commit 21ebc2b32de44ed33347b4364d4fd8282b472dba
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 24 19:03:43 2012 +0200

    Unused members
    
    Change-Id: I4f3e6f2c07d1ef55464646a5ab313c305f4a22e8

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index be2c552..8fd717e 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -197,11 +197,8 @@ class Desktop : public Application
         static void                         enableAcceptors();
         static void                         destroyAcceptor(const rtl::OUString& aDescription);
 
-        sal_Bool                        m_bMinimized;
-        sal_Bool                        m_bInvisible;
         bool                            m_bCleanedExtensionCache;
         bool                            m_bServicesRegistered;
-        sal_uInt16                          m_nAppEvents;
         BootstrapError                  m_aBootstrapError;
         BootstrapStatus                 m_aBootstrapStatus;
 
@@ -209,7 +206,6 @@ class Desktop : public Application
         Timer    m_firstRunTimer;
 
         static ResMgr*                  pResMgr;
-        static sal_Bool                 bSuppressOpenDefault;
 };
 
 }
commit 03833c09cbf15ae04bc22a64eee07d7966c00db2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 24 18:58:04 2012 +0200

    Clean up java-target-version indentation etc.
    
    Change-Id: Ia3440508b929b37dd4aa5d045445ca7b73bb85d9

diff --git a/configure.in b/configure.in
index 7d61b11..1cd763e 100644
--- a/configure.in
+++ b/configure.in
@@ -1710,7 +1710,7 @@ AC_ARG_WITH(java,
     [ with_java=java ]
 )
 
-AC_ARG_WITH(java_target_version,
+AC_ARG_WITH(java-target-version,
     AS_HELP_STRING([--with-java-target-version],
         [Generate class files that will work on JVMs with the specified version.
          For example, use --with-java-target-version=1.5 to make sure that the
@@ -5586,19 +5586,18 @@ else
     JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
 fi
 
-_java_target_ver="1.5"
 dnl ===================================================================
 dnl Check for target Java bytecode version
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
     AC_MSG_CHECKING([for target Java bytecode version])
     if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
-    AC_MSG_RESULT([default by $JDK])
-    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
-        AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
-    fi
-    else
-    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
+        _java_target_ver="1.5"
+        AC_MSG_RESULT([default by $JDK])
+        if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
+            AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
+        fi
+    elif test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
         _java_target_ver="$with_java_target_version"
         AC_MSG_RESULT([$_java_target_ver])
     elif test $_jdk_ver -gt 10000; then
@@ -5607,7 +5606,6 @@ if test "$SOLAR_JAVA" != ""; then
     else
         AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
     fi
-    fi
 
     JAVA_SOURCE_VER="$_java_target_ver"
     JAVA_TARGET_VER="$_java_target_ver"