diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:01:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:01:10 +0000 |
| commit | 604352562d9feb8f2b8b7cc5dd241fb6e1b16c35 (patch) | |
| tree | 4f71814862d1345ccfef0a6b7c8eea6b5fc03bcc /desktop/source/pkgchk | |
| parent | 8cd31f813291d6799f947a0eafa831648875789b (diff) | |
INTEGRATION: CWS sb71 (1.4.8); FILE MERGED
2007/08/27 11:17:00 sb 1.4.8.5: Fixed merge conflict.
2007/08/23 18:15:31 sb 1.4.8.4: RESYNC: (1.6-1.9); FILE MERGED
2007/06/15 08:27:23 sb 1.4.8.3: RESYNC: (1.5-1.6); FILE MERGED
2007/05/30 14:47:46 sb 1.4.8.2: RESYNC: (1.4-1.5); FILE MERGED
2007/04/16 13:46:36 sb 1.4.8.1: #i75466# Cleaned up UNO bootstrapping (not clear what problem the original way was supposed to solve).
Diffstat (limited to 'desktop/source/pkgchk')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 27098215ca..fe083310f0 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unopkg_misc.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ihi $ $Date: 2007-08-20 13:50:55 $ + * last change: $Author: vg $ $Date: 2007-10-15 13:01:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,12 +48,11 @@ #include "osl/process.h" #include "osl/file.h" #include "osl/thread.hxx" -#include "cppuhelper/servicefactory.hxx" #include "ucbhelper/contentbroker.hxx" #include "ucbhelper/configurationkeys.hxx" #include "unotools/processfactory.hxx" #include "unotools/configmgr.hxx" -#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "cppuhelper/bootstrap.hxx" #include <stdio.h> |