mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete hidden pages before deleting unused masters

Browse Source 
Change-Id: I40b624c0e6e6cff2c88815f7d16e862f09d79d5c
This commit is contained in:
David Tardon
2016-03-22 09:03:56 +01:00
parent abaf6bde4e
commit 0f0cea28c7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sdext/source/minimizer/impoptimizer.cxx
View File

@@ -518,14 +518,6 @@ bool ImpOptimizer::Optimize()
if ( !maCustomShowName.isEmpty() ) if ( !maCustomShowName.isEmpty() )
ImpExtractCustomShow( mxModel, maCustomShowName ); ImpExtractCustomShow( mxModel, maCustomShowName );
if ( mbDeleteUnusedMasterPages )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
ImpDeleteUnusedMasterPages( mxModel );
}
if ( mbDeleteHiddenSlides ) if ( mbDeleteHiddenSlides )
{ {
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) ); SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
@@ -541,6 +533,14 @@ bool ImpOptimizer::Optimize()
ImpDeleteNotesPages( mxModel ); ImpDeleteNotesPages( mxModel );
} }
if ( mbDeleteUnusedMasterPages )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
ImpDeleteUnusedMasterPages( mxModel );
}
if ( mbOLEOptimization ) if ( mbOLEOptimization )
{ {
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) ); SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) );