[ooo-build-commit] 2 commits - configure.in patches/vba

[Petr Mladek]

 configure.in                                   |    8 ++++----
 patches/vba/vba-commandbar-document-scope.diff |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5fcd237c5e182049f24ec3fb55299d53352b3a8f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jul 22 15:41:22 2009 +0200

    Fix configure to enable kde and gtk for most distros again
    
    * configure.in: fix the new checks for $with_distro = "CrossWin32"

diff --git a/configure.in b/configure.in
index b9b2cad..e5f58dd 100644
--- a/configure.in
+++ b/configure.in
@@ -641,7 +641,7 @@ AC_CHECK_HEADER(security/pam_appl.h, have_pam=true, have_pam=false)
 AC_CHECK_HEADER(png.h, have_png=true, have_png=false)
 AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false)
 
-if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
+if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
     if test "z$enable_pam" != "zno" && ! $have_pam; then
 	AC_MSG_ERROR(install pam-devel)
     fi
@@ -748,7 +748,7 @@ AC_SUBST(OOOP_TEMPLATES_PACK)
 AC_MSG_CHECKING([for widget sets])
 OOO_WIDGET_FLAGS=
 if test "$enable_kde" != "no"; then
-   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
+   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
       OOO_WIDGET_FLAGS="--enable-kde"
       widget_sets="kde"
    fi
@@ -757,7 +757,7 @@ else
 fi
 
 if test "$enable_kde4" != "no"; then
-   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
+   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
       OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
       widget_sets="$widget_sets kde4"
    fi
@@ -770,7 +770,7 @@ OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
 AC_SUBST(OXYGEN_IMAGES_TAR)
 
 if test "$enable_gtk" != "no"; then
-   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
+   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
       OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
       widget_sets="gtk $widget_sets"
 
commit bdbe99ec33e97b7bf290d7dfcb31571a3c011af3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jul 22 13:33:04 2009 +0200

    Fix warning about missing return valuse
    
    * patches/vba/vba-commandbar-document-scope.diff: return void instead of
      sal_Bool from VbaCommandBarHelper::ApplyChange; It seems that the return
      valuse is not used; similar methods returns void as well

diff --git a/patches/vba/vba-commandbar-document-scope.diff b/patches/vba/vba-commandbar-document-scope.diff
index ef21041..5ed8e87 100644
--- a/patches/vba/vba-commandbar-document-scope.diff
+++ b/patches/vba/vba-commandbar-document-scope.diff
@@ -137,7 +137,7 @@ index 034e506..3cf12f6 100644
 +    // persistChanges();
 +}
 +
-+sal_Bool VbaCommandBarHelper::ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary ) throw (css::uno::RuntimeException)
++void VbaCommandBarHelper::ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary ) throw (css::uno::RuntimeException)
 +{
 +    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
 +    {
@@ -201,7 +201,7 @@ index 64a808d..10ed441 100644
      sal_Bool persistChanges() throw (css::uno::RuntimeException);
 +    css::uno::Reference< css::container::XIndexAccess > getSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
 +    void removeSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
-+    sal_Bool ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary = sal_True ) throw (css::uno::RuntimeException);
++    void ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary = sal_True ) throw (css::uno::RuntimeException);
  
      css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() throw (css::uno::RuntimeException);