delete hidden pages before deleting unused masters
Change-Id: I40b624c0e6e6cff2c88815f7d16e862f09d79d5c
This commit is contained in:
@@ -518,14 +518,6 @@ bool ImpOptimizer::Optimize()
|
||||
if ( !maCustomShowName.isEmpty() )
|
||||
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 )
|
||||
{
|
||||
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
|
||||
@@ -541,6 +533,14 @@ bool ImpOptimizer::Optimize()
|
||||
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 )
|
||||
{
|
||||
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) );
|
||||
|
Reference in New Issue
Block a user