diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:18 +0200 |
| commit | c8d090428ba2a9d710499baf62ddfe252c16aa1f (patch) | |
| tree | bcfd816b53c19e6925f5ae0f450e466fc34e3742 /sd/source/filter/xml/sdxmlwrp.cxx | |
| parent | 48fa46fd02b8d1633a7b078e34afe4acc18a0d74 (diff) | |
| parent | a095da08d2f018c9354767543239d0d0962fe590 (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
sd/source/ui/app/res_bmp.src
Diffstat (limited to 'sd/source/filter/xml/sdxmlwrp.cxx')
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 5b7f42d3878b..0810204842c2 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -514,6 +514,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "OrganizerMode" ), 0, + &::getBooleanCppuType(), + ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -631,6 +634,13 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) } } + if (SDXMLMODE_Organizer == meFilterMode) + { + ::rtl::OUString const sOrganizerMode( + RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); + } + // ------------------------------------- if( 0 == nRet ) @@ -656,13 +666,14 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) sal_uInt32 nWarn = 0; sal_uInt32 nWarn2 = 0; // read storage streams + // #i103539#: always read meta.xml for generator + nWarn = ReadThroughComponent( + xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory, + pServices->mpMeta, + aEmptyArgs, aName, sal_False ); + if( meFilterMode != SDXMLMODE_Organizer ) { - nWarn = ReadThroughComponent( - xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory, - pServices->mpMeta, - aEmptyArgs, aName, sal_False ); - nWarn2 = ReadThroughComponent( xStorage, xModelComp, "settings.xml", NULL, xServiceFactory, pServices->mpSettings, |