diff options
| author | David Tardon <dtardon@redhat.com> | 2016-03-22 09:03:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-22 12:44:05 +0000 |
| commit | c4e6705c72be40764baa6d47e3f45140da3f1ab9 (patch) | |
| tree | 7593f305fb7017202f80205b81bf68adf5135611 /sdext | |
| parent | 5e655ecfe007238080941077c6dc6187005e91fa (diff) | |
delete hidden pages before deleting unused masters
Change-Id: I40b624c0e6e6cff2c88815f7d16e862f09d79d5c
(cherry picked from commit 0f0cea28c75a6565c7803b54536d4a8720ead160)
Reviewed-on: https://gerrit.libreoffice.org/23422
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/minimizer/impoptimizer.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index f2be9365ed66..e0c5f084954e 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -524,27 +524,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 ) |