Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi,

see the attached patch, the Mozilla plugin still says "OpenOffice path"
(yes, even without .org!) when invoked. Should be changed,

And I think we shouldn't show this at all unless someone wants to debug
this so I added #idef OSL_DEBUG_LEVEL > 0 around it.

OK for libreoffice-3-3?

Grüße/Regards,

René
-- 
 .''`.  René Engelhard -- Debian GNU/Linux Developer
 : :' : http://www.debian.org | http://people.debian.org/~rene/
 `. `'  rene@debian.org | GnuPG-Key ID: D03E3E70
   `-   Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70
From e8f9818af738d9f8eba923070fe3b933ab101f2c Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 9 Jan 2011 20:45:46 +0100
Subject: [PATCH] fix nsplugin for LibreOffice name

- OpenOffice path -> LibreOffice path
- only split "LibreOffice path [...] out with OSL_DEBUG_LEVEL > 0
---
 extensions/source/nsplugin/source/so_env.cxx |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extensions/source/nsplugin/source/so_env.cxx 
b/extensions/source/nsplugin/source/so_env.cxx
index 2dd4f8f..8f8e436 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -205,7 +205,9 @@ int nspluginOOoModuleHook (void** aResult)
         strcpy (realFileName, libFileName);
     }
 
-    fprintf (stderr, "OpenOffice path before fixup is '%s'\n", realFileName);
+#if OSL_DEBUG_LEVEL > 0
+    fprintf (stderr, "LibreOffice path before fixup is '%s'\n", realFileName);
+#endif
 
     if (realFileName[0] != '/') {
         /* a relative sym-link and we need to get an absolute path */
@@ -224,8 +226,10 @@ int nspluginOOoModuleHook (void** aResult)
 
     *aResult = realFileName;
 
-    fprintf (stderr, "OpenOffice path is '%s'\n", realFileName);
-   
+#if OSL_DEBUG_LEVEL > 0
+    fprintf (stderr, "LibreOffice path is '%s'\n", realFileName);
+#endif
+
     return 0;
 }
 #endif
-- 
1.7.2.3


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.