summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-05-22 10:11:38 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-05-22 20:45:40 +0200
commitf18a00184733867ca9b43e0b0cf7bb6f3ceec764 (patch)
tree1d7504d8e266ebfe761727736198b622d2721c47 /sd
parent8b952c68c22bdd0e737fa67171c3a46f52607550 (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. Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260 (cherry picked from commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4)
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/docshell/docshel4.cxx11
1 files changed, 0 insertions, 11 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index b61aa4582ede..654d6a8f204a 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -506,12 +506,7 @@ bool DrawDocShell::Save()
bool bRet = SfxObjectShell::Save();
if( bRet )
- {
- // Call UpdateDocInfoForSave() before export
- UpdateDocInfoForSave();
-
bRet = SdXMLFilter( *GetMedium(), *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export();
- }
return bRet;
}
@@ -545,11 +540,7 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium )
bool bRet = SfxObjectShell::SaveAs( rMedium );
if( bRet )
- {
- // Call UpdateDocInfoForSave() before export
- UpdateDocInfoForSave();
bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export();
- }
if( GetError() == ERRCODE_NONE )
SetError( nVBWarning, OSL_LOG_PREFIX );
@@ -587,13 +578,11 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
aTypeName.indexOf( "impress8" ) >= 0 )
{
pFilter = new SdXMLFilter( rMedium, *this, true );
- UpdateDocInfoForSave();
}
else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 ||
aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 )
{
pFilter = new SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 );
- UpdateDocInfoForSave();
}
else
{