diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-22 10:11:38 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-22 16:39:08 +0200 |
| commit | b1a04f9326a7c52944f391364e72049eea6ee629 (patch) | |
| tree | ab930ac4ba87a03a4df24b6456dc557e6e0a2d43 /sd | |
| parent | 9023bfdd3ec8a7711fe0dfba1fd00645ffd0c685 (diff) | |
cp#1000077: Set 'modified' document property more consistently.
Update document info at one place, so that it works for other formats
like .doc, .docx, ... too.
(cherry picked from commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4)
Conflicts:
sd/source/ui/docshell/docshel4.cxx
sw/source/core/uibase/app/docsh.cxx
Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 90128697ad0f..e40c0f202149 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -505,12 +505,7 @@ sal_Bool DrawDocShell::Save() sal_Bool bRet = SfxObjectShell::Save(); if( bRet ) - { - // Call UpdateDocInfoForSave() before export - UpdateDocInfoForSave(); - bRet = SdXMLFilter( *GetMedium(), *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export(); - } return bRet; } @@ -530,11 +525,7 @@ sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium ) sal_Bool bRet = SfxObjectShell::SaveAs( rMedium ); if( bRet ) - { - // Call UpdateDocInfoForSave() before export - UpdateDocInfoForSave(); bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export(); - } if( GetError() == ERRCODE_NONE ) SetError( nVBWarning, OSL_LOG_PREFIX ); @@ -572,13 +563,11 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) aTypeName.indexOf( "impress8" ) >= 0 ) { pFilter = new SdXMLFilter( rMedium, *this, sal_True ); - UpdateDocInfoForSave(); } else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 || aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 ) { pFilter = new SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ); - UpdateDocInfoForSave(); } else { |