[ooo-build-commit] .: patches/dev300 patches/vba

[Noel Power]

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

New commits:
commit dab81022e24c835d9ca533dc8c5a4906309b44fa
Author: Noel Power <noel.power at novell.com>
Date:   Mon Jan 25 17:55:50 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 20eb3e0..8d2f468 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1649,6 +1649,8 @@ vba-fixup-vbasupportcws.diff
 # some field related code cannot be included in vbasupportdev300 as
 # it depends on field support stuff
 vba-enable-fieldrelatedbits.diff
+# correct locations of libraries for windows
+vba-fix-scp2-librarylocation.diff
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-fix-scp2-librarylocation.diff b/patches/vba/vba-fix-scp2-librarylocation.diff
new file mode 100644
index 0000000..58a1657
--- /dev/null
+++ b/patches/vba/vba-fix-scp2-librarylocation.diff
@@ -0,0 +1,31 @@
+diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+index 2043c1b..9ed1d32 100644
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -75,7 +75,7 @@ File gid_File_Lib_Vbaevent
+     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(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+   #else
+@@ -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