[Libreoffice-commits] .: patches/dev300

[René Engelhard]

 patches/dev300/oosplash-etc-libreoffice-sofficerc.diff |   18 +++++++++++++++++
 patches/dev300/oosplash-etc-openoffice-sofficerc.diff  |   18 -----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 00b1e1116bbd7ecd1ad1b326296f2edf63ab0ac0
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Oct 20 22:07:19 2010 +0200

    /etc/openoffice/sofficerc -> /etc/libreoffice/sofficerc

diff --git a/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff b/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff
new file mode 100644
index 0000000..beb9c14
--- /dev/null
+++ b/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff
@@ -0,0 +1,18 @@
+--- desktop/unx/source/start.c-old	2007-10-20 17:48:31.000000000 +0200
++++ desktop/unx/source/start.c	2007-10-20 17:42:52.000000000 +0200
+@@ -456,12 +456,13 @@
+ static void
+ load_splash_defaults( rtl_uString *pAppPath, sal_Bool *pInhibitSplash )
+ {
+-    rtl_uString *pSettings = NULL, *pTmp = NULL;
++    rtl_uString *pSettings = NULL, *pTmp = NULL, *pEtcPath = NULL;;
+     rtlBootstrapHandle handle;
+ 
+     /* costruct the sofficerc file location */
+     rtl_uString_newFromAscii( &pSettings, "file://" );
+-    rtl_uString_newConcat( &pSettings, pSettings, pAppPath );
++    rtl_uString_newFromAscii( &pEtcPath, "/etc/libreoffice" );
++    rtl_uString_newConcat( &pSettings, pSettings, pEtcPath );
+     rtl_uString_newFromAscii( &pTmp, "/" );
+     rtl_uString_newConcat( &pSettings, pSettings, pTmp );
+     rtl_uString_newFromAscii( &pTmp, SAL_CONFIGFILE( "soffice" ) );
diff --git a/patches/dev300/oosplash-etc-openoffice-sofficerc.diff b/patches/dev300/oosplash-etc-openoffice-sofficerc.diff
deleted file mode 100644
index fe81cb9..0000000
--- a/patches/dev300/oosplash-etc-openoffice-sofficerc.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- desktop/unx/source/start.c-old	2007-10-20 17:48:31.000000000 +0200
-+++ desktop/unx/source/start.c	2007-10-20 17:42:52.000000000 +0200
-@@ -456,12 +456,13 @@
- static void
- load_splash_defaults( rtl_uString *pAppPath, sal_Bool *pInhibitSplash )
- {
--    rtl_uString *pSettings = NULL, *pTmp = NULL;
-+    rtl_uString *pSettings = NULL, *pTmp = NULL, *pEtcPath = NULL;;
-     rtlBootstrapHandle handle;
- 
-     /* costruct the sofficerc file location */
-     rtl_uString_newFromAscii( &pSettings, "file://" );
--    rtl_uString_newConcat( &pSettings, pSettings, pAppPath );
-+    rtl_uString_newFromAscii( &pEtcPath, "/etc/openoffice" );
-+    rtl_uString_newConcat( &pSettings, pSettings, pEtcPath );
-     rtl_uString_newFromAscii( &pTmp, "/" );
-     rtl_uString_newConcat( &pSettings, pSettings, pTmp );
-     rtl_uString_newFromAscii( &pTmp, SAL_CONFIGFILE( "soffice" ) );