summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-08-26 17:20:39 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-08-26 17:20:39 +0100
commit74881f6a87c260fa32bd3ba5489c6ce6f5b9caf0 (patch)
tree5ac2002086fc69c33d1eed4dbc3ac109c1d35cd6 /sd
parentmisc. comment cleanup, and non-exporting of symbols not used externally (diff)
downloadcore-74881f6a87c260fa32bd3ba5489c6ce6f5b9caf0.tar.gz
core-74881f6a87c260fa32bd3ba5489c6ce6f5b9caf0.zip
export the source storage to import filter, to mirror TargetStorage for export
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 0810204842c2..eb531436424c 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -490,7 +490,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
// -------------------------------------
- /** property map for export info set */
+ /** property map for import info set */
PropertyMapEntry aImportInfoMap[] =
{
// necessary properties for XML progress bar at load time
@@ -517,6 +517,8 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
{ MAP_LEN( "OrganizerMode" ), 0,
&::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "SourceStorage" ), 0, &embed::XStorage::static_type(),
+ ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
@@ -594,6 +596,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
Reference<io::XInputStream> xInputStream;
uno::Reference < embed::XStorage > xStorage = mrMedium.GetStorage();
+ OUString sSourceStorage( RTL_CONSTASCII_USTRINGPARAM("SourceStorage") );
+ xInfoSet->setPropertyValue( sSourceStorage, Any( xStorage ) );
+
if( !xStorage.is() )
nRet = SD_XML_READERROR;