[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                       |    4 ----
 patches/dev300/fit-list-to-size-popup.diff |   16 ++++++++++++----
 patches/dev300/sal-xdg-config-dir.diff     |   18 ------------------
 3 files changed, 12 insertions(+), 26 deletions(-)

New commits:
commit d09e4fe9c7c071f060be3d9cd4c0b59bc82ffc88
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 11:58:46 2009 +0300

    sal-xdg-config-dir.diff is upstream
    
    * patches/dev300/sal-xdg-config-dir.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9f2b52b..26ae38d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2703,10 +2703,6 @@ fit-list-to-size-popup.diff, i#94086, thorsten
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
 #vcl-disable-mouse-grab.diff
 
-# adhere to
-# http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
-sal-xdg-config-dir.diff, i#91247, thorsten
-
 # temporary fix. does no harm and gets the job done but its not
 # beautiful. Since the whole section needs to be refactored anyway decided not
 # to waste for time with this fix but to focus on the refactoring
diff --git a/patches/dev300/sal-xdg-config-dir.diff b/patches/dev300/sal-xdg-config-dir.diff
deleted file mode 100644
index 9892a56..0000000
--- a/patches/dev300/sal-xdg-config-dir.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- sal/osl/unx/security.c	10 Apr 2008 11:12:04 -0000	1.27
-+++ sal/osl/unx/security.c	21 May 2008 15:49:31 -0000
-@@ -787,7 +787,14 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSe
- 
- static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
- {
--	return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
-+    sal_Char *pStr = getenv("XDG_CONFIG_HOME");
-+    
-+    if ((pStr == NULL) || (strlen(pStr) == 0) ||
-+        (access(pStr, 0) != 0))
-+        return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
-+
-+    strncpy(pszDirectory, pStr, nMax);
-+    return sal_True;
- }
- 
- #else
commit ca5b94691da6b921eac5cbae110b04a27f78c6f1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 11:56:54 2009 +0300

    Adapt fit-list-to-size-popup.diff for dev300-m54
    
    * patches/dev300/fit-list-to-size-popup.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/fit-list-to-size-popup.diff b/patches/dev300/fit-list-to-size-popup.diff
index c32ff3b..6c4d986 100644
--- a/patches/dev300/fit-list-to-size-popup.diff
+++ b/patches/dev300/fit-list-to-size-popup.diff
@@ -16,14 +16,22 @@ diff --git sd/inc/app.hrc sd/inc/app.hrc
 index 83cfa86..9bd8aee 100644
 --- sd/inc/app.hrc
 +++ sd/inc/app.hrc
-@@ -459,6 +459,7 @@
- #define SID_DISPLAY_MASTER_BACKGROUND       (SID_SD_START+436)
+@@ -459,11 +459,12 @@
  #define SID_DISPLAY_MASTER_OBJECTS          (SID_SD_START+437)
  #define SID_INSERTPAGE_LAYOUT_MENU          (SID_SD_START+438)
-+#define SID_OUTLINE_TEXT_AUTOFIT            (SID_SD_START+439)
+ #define SID_TP_EDIT_MASTER					(SID_SD_START+439)
++#define SID_OUTLINE_TEXT_AUTOFIT            (SID_SD_START+440)
  
  // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
- #define SID_SHOW_SLIDE                      (SID_SD_START+440)
+-#define SID_SHOW_SLIDE                      (SID_SD_START+440)
++#define SID_SHOW_SLIDE                      (SID_SD_START+441)
+ 
+-#define SID_ADD_MOTION_PATH					(SID_SD_START+441)
+-#define SID_TABLE_TOOLBOX					(SID_SD_START+442)
++#define SID_ADD_MOTION_PATH					(SID_SD_START+442)
++#define SID_TABLE_TOOLBOX					(SID_SD_START+443)
+ 
+ #endif
 diff --git sd/sdi/_drvwsh.sdi sd/sdi/_drvwsh.sdi
 index c895d2e..44a6ae0 100644
 --- sd/sdi/_drvwsh.sdi