diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:05:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:05:37 +0000 |
| commit | 8fc4594caaf8108b3757ff25c8299f96abcd4ae9 (patch) | |
| tree | 92d24d5b0b339a340f9876b9b5873aa58024364c | |
| parent | 1315d2cea91c541d0407b7a0e623653e3d2214c9 (diff) | |
INTEGRATION: CWS dba24d (1.46.94); FILE MERGED
2007/11/20 11:51:23 fs 1.46.94.1: #i83774# don't export ImagePosition if it is not present
| -rw-r--r-- | xmloff/source/forms/elementexport.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index f3d597ede3b2..64700c880720 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -4,9 +4,9 @@ * * $RCSfile: elementexport.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:13:42 $ + * last change: $Author: rt $ $Date: 2008-01-30 08:05:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,6 +62,9 @@ #ifndef _TOOLS_TIME_HXX #include <tools/time.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif @@ -1648,7 +1651,8 @@ namespace xmloff m_eType = RADIO; m_nIncludeCommon |= CCA_CURRENT_SELECTED | CCA_SELECTED; } - m_nIncludeSpecial |= SCA_IMAGE_POSITION; + if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) ) + m_nIncludeSpecial |= SCA_IMAGE_POSITION; m_nIncludeDatabase = DA_DATA_FIELD; m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE; break; @@ -1893,7 +1897,7 @@ namespace xmloff } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OControlExport::exportImagePositionAttributes: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } } |