[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                          |    2 ++
 patches/vba/vba-fix-scp2-librarylocation.diff |   22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

New commits:
commit 6f6ec9a2b95d979d3360ebe530c96b1e13d10728
Author: Noel Power <noel.power at novell.com>
Date:   Thu Jan 14 14:01:49 2010 +0000

    fix library location so vba services work for windows
    
    * patches/dev300/apply:
    * patches/vba/vba-fix-scp2-librarylocation.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e484a97..0e4c365 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1655,6 +1655,8 @@ vba-macro-properties.diff, n#566030
 # for consistency use an exe option for controlling commented out
 # basic
 vba-word-executable-option.diff, Fong
+# correct locations of libraries for windows
+patches/vba/vba-fix-scp2-librarylocation.diff
 
 [VBAUntested]
 SectionOwner => noelpwer
diff --git a/patches/vba/vba-fix-scp2-librarylocation.diff b/patches/vba/vba-fix-scp2-librarylocation.diff
new file mode 100644
index 0000000..51389f5
--- /dev/null
+++ b/patches/vba/vba-fix-scp2-librarylocation.diff
@@ -0,0 +1,22 @@
+diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+index 2043c1b..cae8507 100644
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -426,7 +426,7 @@ File gid_File_Lib_Vbaswobj
+     TXT_FILE_BODY;
+     Styles = (PACKED,UNO_COMPONENT);
+     RegistryID = gid_Starregistry_Services_Rdb;
+-    Dir = gid_Dir_Program;
++    Dir = SCP2_OOO_BIN_DIR;
+   #ifdef UNX
+     Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+   #else
+@@ -438,7 +438,7 @@ File gid_File_Lib_Vbamsforms
+     TXT_FILE_BODY;
+     Styles = (PACKED,UNO_COMPONENT);
+     RegistryID = gid_Starregistry_Services_Rdb;
+-    Dir = gid_Dir_Program;
++    Dir = SCP2_OOO_BIN_DIR;
+   #ifdef UNX
+     Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
+   #else