diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:11:27 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:11:27 +0000 |
commit | b022274ce1b350735b8486ac5f174443377ec913 (patch) | |
tree | e5a59b81a42fa825313ade00a28191280da74ca6 /embeddedobj | |
parent | 0ff88bef1cb53a28734d3d6b73ff16a8c1cb7873 (diff) |
INTEGRATION: CWS oj14 (1.3.24); FILE MERGED
2007/03/14 15:48:06 mav 1.3.24.4: #i75401# no need to use implementation service names any more
2006/11/07 08:43:23 oj 1.3.24.3: RESYNC: (1.5-1.6); FILE MERGED
2006/07/04 07:25:46 oj 1.3.24.2: RESYNC: (1.3-1.5); FILE MERGED
2006/03/20 08:42:52 oj 1.3.24.1: use mimeconfighelper
Diffstat (limited to 'embeddedobj')
-rw-r--r-- | embeddedobj/source/msole/ownview.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 11e8dcd246ab..f70956025623 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ownview.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:45:36 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:11:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -101,13 +101,18 @@ #include <cppuhelper/implbase1.hxx> #endif +#ifndef _COMPHELPER_STORAGEHELPER_HXX #include <comphelper/storagehelper.hxx> +#endif +#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ +#include <comphelper/mimeconfighelper.hxx> +#endif + #include "ownview.hxx" -#include <convert.hxx> using namespace ::com::sun::star; - +using namespace ::comphelper; ::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); ::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); @@ -508,7 +513,7 @@ void OwnView_Impl::CreateNative() { sal_Bool bOk = sal_False; - if ( ClassIDsEqual( aPackageClassID, aStorClassID ) ) + if ( MimeConfigurationHelper::ClassIDsEqual( aPackageClassID, aStorClassID ) ) { // the storage represents Object Package |