summaryrefslogtreecommitdiff
path: root/sdext/source/minimizer
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-03-22 09:03:56 +0100
committerDavid Tardon <dtardon@redhat.com>2016-03-22 09:05:26 +0100
commit0f0cea28c75a6565c7803b54536d4a8720ead160 (patch)
treefb9ce11c6376b3faa7bf6c07501f9b84a60f583b /sdext/source/minimizer
parentabaf6bde4ee91c628bd55a7ec2e876a5d0ecff6e (diff)
delete hidden pages before deleting unused masters
Change-Id: I40b624c0e6e6cff2c88815f7d16e862f09d79d5c
Diffstat (limited to 'sdext/source/minimizer')
-rw-r--r--sdext/source/minimizer/impoptimizer.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 03ba917617d8..53600ed7bdae 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -518,27 +518,27 @@ bool ImpOptimizer::Optimize()
if ( !maCustomShowName.isEmpty() )
ImpExtractCustomShow( mxModel, maCustomShowName );
- if ( mbDeleteUnusedMasterPages )
+ if ( mbDeleteHiddenSlides )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
- ImpDeleteUnusedMasterPages( mxModel );
+ ImpDeleteHiddenSlides( mxModel );
}
- if ( mbDeleteHiddenSlides )
+ if ( mbDeleteNotesPages )
{
- SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
- ImpDeleteHiddenSlides( mxModel );
+ ImpDeleteNotesPages( mxModel );
}
- if ( mbDeleteNotesPages )
+ if ( mbDeleteUnusedMasterPages )
{
+ SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
- ImpDeleteNotesPages( mxModel );
+ ImpDeleteUnusedMasterPages( mxModel );
}
if ( mbOLEOptimization )