[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - scp2/source

[René Engelhard]

 scp2/source/templates/module_helppack.sct |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adeccd1a844d52beba67a40a8fc44cb9d490856f
Merge: 3261a8b... 2155898...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 17 17:57:22 2010 +0100

    Merge branch 'feature/helppack' into libreoffice-3-3

commit 215589865eb4847f560d6400be298a828b23d1cb
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Dec 17 16:40:08 2010 +0000

    fix #if for #else to avoid explosion

diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
index ac8779a..3b80cd8 100644
--- a/scp2/source/templates/module_helppack.sct
+++ b/scp2/source/templates/module_helppack.sct
@@ -32,7 +32,7 @@ Module gid_Module_Helppack_Root_<LANGUAGE_>
     MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
 #ifdef WITH_HELPPACK_INTEGRATION
     Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
-#ifdef WITH_HELPPACK_INTEGRATION
+#else
     Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
 #endif
 End