[ooo-build-commit] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                         |    4 ++++
 patches/dev300/buildfix-enable-lockdown.diff |   12 ++++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit 1d8ad58a672957deb1c3f066b23b93fcb30fb132
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri May 21 20:02:33 2010 +0200

    Fix ENABLE_LOCKDOWN build in shell.
    
    * patches/dev300/apply: Temporary, fixed in m78 up-stream.
    * patches/dev300/buildfix-enable-lockdown.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d342908..e467121 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -280,6 +280,10 @@ sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
 # don't let HelpLinker be miscompiled with g++ 4.3
 # FIXME dev300-m77 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
+[ TemporaryHacks < dev300-m78 ]
+# fix build in shell; this is in m78
+buildfix-enable-lockdown.diff, jholesov
+
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
diff --git a/patches/dev300/buildfix-enable-lockdown.diff b/patches/dev300/buildfix-enable-lockdown.diff
new file mode 100644
index 0000000..61ad6f7
--- /dev/null
+++ b/patches/dev300/buildfix-enable-lockdown.diff
@@ -0,0 +1,12 @@
+diff --git shell/source/backends/gconfbe/gconfaccess.cxx shell/source/backends/gconfbe/gconfaccess.cxx
+index e234757..cafa787 100644
+--- shell/source/backends/gconfbe/gconfaccess.cxx
++++ shell/source/backends/gconfbe/gconfaccess.cxx
+@@ -448,7 +448,6 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
+ #ifdef ENABLE_LOCKDOWN
+         case SETTING_AUTO_SAVE:
+         {
+-            GConfClient* aClient = GconfBackend::getGconfClient();
+             GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_AUTO_SAVE_KEY, NULL );
+ 
+             if( ( aGconfValue != NULL ) )