ooo-build r11567 - in trunk: . patches/src680 src

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Feb 13 20:18:32 2008
New Revision: 11567
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11567&view=rev

Log:
backport mav28; readd .so.3 change

Added:
   trunk/patches/src680/cws-mav28.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/src/cli_uno_bridge.dll.config.in

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Feb 13 20:18:32 2008
@@ -293,6 +293,9 @@
 # Use stlport just on the archs where it is needed from historical reasons
 cws-newportstl.diff
 
+[ CWSBackports == ooh680-m7 ]
+cws-mav28.diff
+
 [ CWSBackports ]
 #dialog refactor
 cws-npower9.diff

Added: trunk/patches/src680/cws-mav28.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/cws-mav28.diff	Wed Feb 13 20:18:32 2008
@@ -0,0 +1,19 @@
+Index: framework/source/loadenv/loadenv.cxx
+===================================================================
+RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v
+retrieving revision 1.28.20.1
+retrieving revision 1.28.20.1.2.1
+diff -u -u -p -b -w -B -r1.28.20.1 -r1.28.20.1.2.1
+--- framework/source/loadenv/loadenv.cxx	8 Feb 2008 10:33:37 -0000	1.28.20.1
++++ framework/source/loadenv/loadenv.cxx	12 Feb 2008 16:07:06 -0000	1.28.20.1.2.1
+@@ -398,7 +398,9 @@ css::uno::Reference< css::lang::XCompone
+     if (xModel.is ())
+     {
+         ::comphelper::MediaDescriptor lModelDescriptor(xModel->getArgs());
+-        lDescriptor.update (lModelDescriptor);
++        ::comphelper::MediaDescriptor::iterator pIt = lModelDescriptor.find( ::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE() );
++		if ( pIt != lModelDescriptor.end() )
++			lDescriptor[::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()] = pIt->second;
+     }
+ 
+     return lDescriptor;

Modified: trunk/src/cli_uno_bridge.dll.config.in
==============================================================================
--- trunk/src/cli_uno_bridge.dll.config.in	(original)
+++ trunk/src/cli_uno_bridge.dll.config.in	Wed Feb 13 20:18:32 2008
@@ -1,5 +1,5 @@
 <configuration>
   <dllmap dll="cli_uno" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libcli_uno.so"/>
-  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libsal.so"/>
-  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libuno_cppu.so"/>
+  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libsal.so.3"/>
+  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libuno_cppu.so.3"/>
 </configuration>