diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-01 18:06:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-01 18:06:14 +0000 |
| commit | 1a227e4b57b2f92ff853b6c09ff0dab7caafa141 (patch) | |
| tree | b7281f68f495503a69759d879253a456e7647f5e /embeddedobj/source/msole/olemisc.cxx | |
| parent | 74fece5e9983167d7cc28163041a1a7609c4b4f3 (diff) | |
INTEGRATION: CWS mav19 (1.19.12); FILE MERGED
2005/11/17 18:17:18 mav 1.19.12.2: RESYNC: (1.19-1.20); FILE MERGED
2005/11/16 10:03:28 mav 1.19.12.1: #i52224# handle object size and resizing correctly
Diffstat (limited to 'embeddedobj/source/msole/olemisc.cxx')
| -rw-r--r-- | embeddedobj/source/msole/olemisc.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 5f6ee3a39b..77d8972ae6 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olemisc.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2006-01-20 09:52:12 $ + * last change: $Author: kz $ $Date: 2006-02-01 19:06:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,8 +81,9 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_bNewVisReplInStream( sal_True ) , m_bIsLink( sal_False ) , m_bHasCachedSize( sal_False ) -, m_bHasSizeToSet( sal_False ) , m_nCachedAspect( 0 ) +, m_bHasSizeToSet( sal_False ) +, m_nAspectToSet( 0 ) , m_bGotStatus( sal_False ) , m_nStatus( 0 ) , m_nStatusAspect( 0 ) @@ -111,8 +112,9 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_bNewVisReplInStream( sal_True ) , m_bIsLink( bLink ) , m_bHasCachedSize( sal_False ) -, m_bHasSizeToSet( sal_False ) , m_nCachedAspect( 0 ) +, m_bHasSizeToSet( sal_False ) +, m_nAspectToSet( 0 ) , m_bGotStatus( sal_False ) , m_nStatus( 0 ) , m_nStatusAspect( 0 ) @@ -140,8 +142,9 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_bNewVisReplInStream( sal_True ) , m_bIsLink( sal_False ) , m_bHasCachedSize( sal_False ) -, m_bHasSizeToSet( sal_False ) , m_nCachedAspect( 0 ) +, m_bHasSizeToSet( sal_False ) +, m_nAspectToSet( 0 ) , m_bGotStatus( sal_False ) , m_nStatus( 0 ) , m_nStatusAspect( 0 ) |