diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 09:29:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 09:29:35 +0000 |
| commit | 636594086efeb2dab07a17af82f08c095e208f19 (patch) | |
| tree | ea4f34b810e8a04643df349b9fcf8f7365e5c6f6 | |
| parent | 10089a547807c9abcdc74bf0de3c37652103b6d4 (diff) | |
INTEGRATION: CWS impresstables2 (1.126.70); FILE MERGED
2008/03/06 18:12:10 cl 1.126.70.10: fixing merge errors
2008/01/01 18:32:20 cl 1.126.70.9: #i68103# export preview image for draw tables
2007/12/01 19:18:36 cl 1.126.70.8: RESYNC: (1.132-1.133); FILE MERGED
2007/10/11 21:31:03 cl 1.126.70.7: RESYNC: (1.130-1.132); FILE MERGED
2007/08/01 14:07:42 cl 1.126.70.6: RESYNC: (1.129-1.130); FILE MERGED
2007/07/26 16:51:24 cl 1.126.70.5: #i68103# removed usage of using namespace ::rtl
2007/06/27 14:57:23 cl 1.126.70.4: RESYNC: (1.128-1.129); FILE MERGED
2007/05/07 16:59:30 cl 1.126.70.3: RESYNC: (1.126-1.128); FILE MERGED
2007/05/07 10:20:24 larsbehr 1.126.70.2: initial impress table support
2007/04/18 14:56:24 cl 1.126.70.1: #i68103# draft code for table shape import and export
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f7a762e301e1..2282c04b0d8b 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlexp.cxx,v $ * - * $Revision: 1.135 $ + * $Revision: 1.136 $ * - * last change: $Author: kz $ $Date: 2008-03-05 16:46:25 $ + * last change: $Author: rt $ $Date: 2008-03-12 10:29:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -206,6 +206,7 @@ #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif + #ifndef _XMLOFF_PROPERTYSETMERGER_HXX_ #include "PropertySetMerger.hxx" #endif @@ -223,7 +224,8 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -using namespace ::rtl; +using ::rtl::OUString; + using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -328,6 +330,8 @@ public: // --> PB 2007-07-06 #i146851# sal_Bool mbSaveBackwardCompatibleODF; // <-- + + uno::Reference< embed::XStorage > mxTargetStorage; }; SvXMLExport_Impl::SvXMLExport_Impl() @@ -804,7 +808,6 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen xValue, UNO_QUERY ); if( xTmpPropertySet.is() ) mxExportInfo = xTmpPropertySet; - } if( mxExportInfo.is() ) @@ -851,6 +854,11 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen aAny >>= (mpImpl->mbOutlineStyleAsNormalListStyle); } // <-- + + + OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") ); + if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) ) + mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage; } } @@ -2364,6 +2372,11 @@ const sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const } // <-- +uno::Reference< embed::XStorage > SvXMLExport::GetTargetStorage() +{ + return mpImpl->mxTargetStorage; +} + //============================================================================= void SvXMLElementExport::StartElement( SvXMLExport& rExp, |