Kaydet (Commit) 712b33cd authored tarafından Luboš Luňák's avatar Luboš Luňák

pass the storage to the XML import filter

The Calc case of 73a24e70 .

Change-Id: If280dab5bac7fa7719840ebba51bdca61b9d8c2d
üst 925e1422
...@@ -354,6 +354,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) ...@@ -354,6 +354,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
{ MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ MAP_LEN( "OrganizerMode" ), 0, &::getBooleanCppuType(), { MAP_LEN( "OrganizerMode" ), 0, &::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, ::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 } { NULL, 0, 0, NULL, 0, 0 }
}; };
...@@ -420,6 +421,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) ...@@ -420,6 +421,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True));
} }
xInfoSet->setPropertyValue( "SourceStorage", uno::Any( xStorage ) );
sal_Bool bOasis = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 ); sal_Bool bOasis = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 );
// #i103539#: always read meta.xml for generator // #i103539#: always read meta.xml for generator
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment