filter/source/msfilter/eschesdo.cxx | 43 +++++++++++++++--------------------- 1 file changed, 19 insertions(+), 24 deletions(-)
New commits: commit 5e07e1be570f711f5324a1a116f11673881efaf7 Author: Julien Nabet <serval2...@yahoo.fr> Date: Sat Dec 5 16:24:53 2015 +0100 Simplify and remove this do/while There wasn't even a kind of "finally" block! Change-Id: Ib6836e8e8bd7369c2049c0fd26081002dfbfecba diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index d325345..c011ec3 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -868,32 +868,27 @@ ImplEscherExSdr::~ImplEscherExSdr() bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage ) { - do + SvxDrawPage* pSvxDrawPage; + if ( mpSdrPage != &rPage || !mXDrawPage.is() ) { - SvxDrawPage* pSvxDrawPage; - if ( mpSdrPage != &rPage || !mXDrawPage.is() ) - { - // eventually write SolverContainer of current page, deletes the Solver - ImplFlushSolverContainer(); - - mpSdrPage = nullptr; - mXDrawPage = pSvxDrawPage = new SvxFmDrawPage( const_cast<SdrPage*>(&rPage) ); - mXShapes.set( mXDrawPage, UNO_QUERY ); - if ( !mXShapes.is() ) - break; - if ( !ImplInitPageValues() ) // ImplEESdrWriter - break; - mpSdrPage = &rPage; - - mpSolverContainer = new EscherSolverContainer; - } - else - pSvxDrawPage = SvxDrawPage::getImplementation(mXDrawPage); - - return pSvxDrawPage != nullptr; - } while ( false ); + // eventually write SolverContainer of current page, deletes the Solver + ImplFlushSolverContainer(); + + mpSdrPage = nullptr; + mXDrawPage = pSvxDrawPage = new SvxFmDrawPage( const_cast<SdrPage*>(&rPage) ); + mXShapes.set( mXDrawPage, UNO_QUERY ); + if ( !mXShapes.is() ) + return false; + if ( !ImplInitPageValues() ) // ImplEESdrWriter + return false; + mpSdrPage = &rPage; + + mpSolverContainer = new EscherSolverContainer; + } + else + pSvxDrawPage = SvxDrawPage::getImplementation(mXDrawPage); - return false; + return pSvxDrawPage != nullptr; } bool ImplEscherExSdr::ImplInitUnoShapes( const Reference< XShapes >& rxShapes ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits