ooo-build r11648 - trunk/patches/src680

[michael svn gnome org]

Author: michael
Date: Wed Feb 20 17:06:37 2008
New Revision: 11648
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11648&view=rev

Log:
misc. fixes


Modified:
   trunk/patches/src680/unit-comphelper.diff

Modified: trunk/patches/src680/unit-comphelper.diff
==============================================================================
--- trunk/patches/src680/unit-comphelper.diff	(original)
+++ trunk/patches/src680/unit-comphelper.diff	Wed Feb 20 17:06:37 2008
@@ -67,27 +67,6 @@
  
  .INCLUDE : target.mk
 --- /dev/null	2007-09-21 22:50:58.000000000 +0100
-+++ comphelper/inc/comphelper/unitbootstrap.hxx	2008-02-20 16:37:16.000000000 +0000
-@@ -0,0 +1,18 @@
-+#ifndef UNIT_BOOTSTRAP_HXX
-+#define UNIT_BOOTSTRAP_HXX
-+
-+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-+#include "com/sun/star/uno/XComponentContext.hpp"
-+
-+class UnitBootstrap
-+{
-+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
-+    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
-+  public:
-+    UnitBootstrap(const char *pSetup);
-+    ~UnitBootstrap();
-+    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-+        getMSF() { return mxMSF; }
-+};
-+
-+#endif // UNIT_BOOTSTRAP_HXX
---- /dev/null	2007-09-21 22:50:58.000000000 +0100
 +++ comphelper/source/unit/unitbootstrap.cxx	2008-02-20 16:59:30.000000000 +0000
 @@ -0,0 +1,121 @@
 +// To debug me use:
@@ -677,3 +656,48 @@
 +++ comphelper/source/unit/README	2008-02-20 16:56:45.000000000 +0000
 @@ -0,0 +1 @@
 +This includes pieces required to bootstrap a unit test from a build tree, cf. prj/d.lst
+Index: solenv/inc/libs.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/libs.mk,v
+retrieving revision 1.123
+diff -u -p -r1.123 libs.mk
+--- solenv/inc/libs.mk	12 Dec 2007 13:15:14 -0000	1.123
++++ solenv/inc/libs.mk	20 Feb 2008 17:01:35 -0000
+@@ -69,6 +69,7 @@ SALHELPERLIB=-luno_salhelper$(COMID)
+ XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)
+ .INCLUDE .IGNORE : comphelper$/version.mk
+ COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
++UNITBOOTSTRAPLIB=-lunitbootstrap
+ CONNECTIVITYLIB=-lconnectivity
+ LDAPBERLIB=-lldapber
+ TOOLSLIBST=-latools
+@@ -349,6 +351,7 @@ GPC3RDLIB=gpc.lib
+ SALHELPERLIB=isalhelper.lib
+ XMLSCRIPTLIB=ixcr.lib
+ COMPHELPERLIB=icomphelp.lib
++UNITBOOTSTRAPLIB=iunitbootstrap.lib
+ CONNECTIVITYLIB=connectivity.lib
+ LDAPBERLIB=ldapber.lib
+ CPPULIB=icppu.lib
+--- /dev/null	2007-09-21 22:50:58.000000000 +0100
++++ comphelper/inc/comphelper/unitbootstrap.hxx	2008-02-20 17:10:41.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef UNIT_BOOTSTRAP_HXX
++#define UNIT_BOOTSTRAP_HXX
++
++#include "comphelper/comphelperdllapi.h"
++#include "com/sun/star/lang/XMultiServiceFactory.hpp"
++#include "com/sun/star/uno/XComponentContext.hpp"
++
++class COMPHELPER_DLLPUBLIC UnitBootstrap
++{
++    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
++    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
++  public:
++    UnitBootstrap(const char *pSetup);
++    ~UnitBootstrap();
++    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
++        getMSF() { return mxMSF; }
++};
++
++#endif // UNIT_BOOTSTRAP_HXX