diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:11:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:11:03 +0000 |
| commit | 0ff88bef1cb53a28734d3d6b73ff16a8c1cb7873 (patch) | |
| tree | 5eaccd3d74f712db75d3c40aa0b100801e5050d7 /embeddedobj | |
| parent | 1ba93d58cb73fb3fcb95aa31beaf38bac2e5a8db (diff) | |
INTEGRATION: CWS oj14 (1.10.12); FILE MERGED
2006/11/08 08:07:54 oj 1.10.12.5: use new MimeConfigurationHelper
2006/11/07 08:42:52 oj 1.10.12.4: RESYNC: (1.15-1.19); FILE MERGED
2006/07/04 07:25:37 oj 1.10.12.3: RESYNC: (1.12-1.15); FILE MERGED
2006/03/20 13:48:33 oj 1.10.12.2: RESYNC: (1.10-1.12); FILE MERGED
2006/03/20 08:42:52 oj 1.10.12.1: use mimeconfighelper
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 314a7ab45e6e..b77493f000a1 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olevisual.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: mav $ $Date: 2006-10-16 06:20:56 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:11:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,12 +67,13 @@ #include <oleembobj.hxx> #include <olecomponent.hxx> -#include <convert.hxx> - +#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ +#include <comphelper/mimeconfighelper.hxx> +#endif #include <comphelper/seqstream.hxx> using namespace ::com::sun::star; - +using namespace ::comphelper; embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFormat_Impl( const uno::Reference< io::XStream > xCachedVisRepr ) @@ -143,7 +144,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt // If cached size is not set, that means that this is the size initialization, so there is no need to set the real size sal_Bool bAllowToSetExtent = ( ( getStatus( nAspect ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE ) - && !ClassIDsEqual( m_aClassID, GetSequenceClassID( 0x00020906L, 0x0000, 0x0000, + && !MimeConfigurationHelper::ClassIDsEqual( m_aClassID, MimeConfigurationHelper::GetSequenceClassID( 0x00020906L, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 ) ) && m_bHasCachedSize ); |