|
 |
f325b2 |
From 0f0cea28c75a6565c7803b54536d4a8720ead160 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
Date: Tue, 22 Mar 2016 09:03:56 +0100
|
|
|
f325b2 |
Subject: [PATCH] delete hidden pages before deleting unused masters
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I40b624c0e6e6cff2c88815f7d16e862f09d79d5c
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sdext/source/minimizer/impoptimizer.cxx | 14 +++++++-------
|
|
|
f325b2 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
|
|
|
f325b2 |
index 03ba917..53600ed 100644
|
|
|
f325b2 |
--- a/sdext/source/minimizer/impoptimizer.cxx
|
|
|
f325b2 |
+++ b/sdext/source/minimizer/impoptimizer.cxx
|
|
|
f325b2 |
@@ -518,27 +518,27 @@ bool ImpOptimizer::Optimize()
|
|
|
f325b2 |
if ( !maCustomShowName.isEmpty() )
|
|
|
f325b2 |
ImpExtractCustomShow( mxModel, maCustomShowName );
|
|
|
f325b2 |
|
|
|
f325b2 |
- if ( mbDeleteUnusedMasterPages )
|
|
|
f325b2 |
+ if ( mbDeleteHiddenSlides )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
|
|
|
f325b2 |
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
|
|
|
f325b2 |
DispatchStatus();
|
|
|
f325b2 |
- ImpDeleteUnusedMasterPages( mxModel );
|
|
|
f325b2 |
+ ImpDeleteHiddenSlides( mxModel );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
- if ( mbDeleteHiddenSlides )
|
|
|
f325b2 |
+ if ( mbDeleteNotesPages )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
|
|
|
f325b2 |
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
|
|
|
f325b2 |
DispatchStatus();
|
|
|
f325b2 |
- ImpDeleteHiddenSlides( mxModel );
|
|
|
f325b2 |
+ ImpDeleteNotesPages( mxModel );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
- if ( mbDeleteNotesPages )
|
|
|
f325b2 |
+ if ( mbDeleteUnusedMasterPages )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
|
|
|
f325b2 |
SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
|
|
|
f325b2 |
DispatchStatus();
|
|
|
f325b2 |
- ImpDeleteNotesPages( mxModel );
|
|
|
f325b2 |
+ ImpDeleteUnusedMasterPages( mxModel );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
if ( mbOLEOptimization )
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|