diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-04 17:38:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-08 22:11:43 +0100 |
| commit | 1a18c92a527cd53abfb0919246935a4fd4ef421d (patch) | |
| tree | bad1fa7cd87a402c8b9ddd6175e1995b7ed55db6 /embeddedobj | |
| parent | 3b63d2b9371baa5f526d0fcd41043ec76abb0d50 (diff) | |
consolidate MSO format ClassID magic numbers in msfilter/classids.hxx
Change-Id: I673eeaa4168f769cb002995c43d986ee5f2030b2
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index cb129871f512..5be4ed5b077a 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -28,6 +28,7 @@ #include <oleembobj.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/seqstream.hxx> +#include <filter/msfilter/classids.hxx> #if defined WNT #include <olecomponent.hxx> @@ -113,8 +114,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 ) - && !MimeConfigurationHelper::ClassIDsEqual( m_aClassID, MimeConfigurationHelper::GetSequenceClassID( 0x00020906L, 0x0000, 0x0000, - 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 ) ) + && !MimeConfigurationHelper::ClassIDsEqual(m_aClassID, MimeConfigurationHelper::GetSequenceClassID(MSO_WW8_CLASSID)) && m_bHasCachedSize ); if ( m_nObjectState == embed::EmbedStates::LOADED && bAllowToSetExtent ) |