fe6cce01c8
...where the get member function is defined on a std::__shared_ptr base class, so loplugin:simplifypointertobool used to miss those until now. (While e.g. using libc++ on macOS found those cases.)366d08f2f6"new loplugin:simplifypointertobool" was mistaken in breaking isSmartPointerType(const clang::Type* t) out of isSmartPointerType(const Expr* e);c874294ad9"Fix detection of std::unique_ptr/shared_ptr in loplugin:redundantpointerops" had introduced that indivisible two-step algorithm on purpose. The amount of additional hits (on Linux) apparently asked for turning loplugin:simplifypointertobool into a rewriting plugin. Which in turn showed that the naive adivce to just "drop the get()" is not sufficient in places that are not contextually converted to bool, as those places need to be wrapped in a bool(...) functional cast now. If the expression was already wrapped in parentheses, those could be reused as part of the functional cast, but implementing that showed that such cases are not yet found at all by the existing loplugin:simplifypointertobool. Lets leave that TODO for another commit. Besides the changes to compilerplugins/ itself, this change has been generated fully automatically with the rewriting plugin on Linux. Change-Id: I83107d6f634fc9ac232986f49044d7017df83e2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94888 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
186 lines
8.3 KiB
C++
186 lines
8.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <oox/ppt/pptshape.hxx>
|
|
#include <oox/ppt/pptgraphicshapecontext.hxx>
|
|
#include <oox/ppt/pptshapepropertiescontext.hxx>
|
|
#include <oox/ppt/slidepersist.hxx>
|
|
#include <drawingml/shapestylecontext.hxx>
|
|
#include <oox/drawingml/drawingmltypes.hxx>
|
|
#include <drawingml/textbodycontext.hxx>
|
|
#include <oox/helper/attributelist.hxx>
|
|
#include <oox/token/namespaces.hxx>
|
|
#include <oox/token/tokens.hxx>
|
|
|
|
using namespace oox::core;
|
|
using namespace ::com::sun::star;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::text;
|
|
|
|
namespace oox::ppt {
|
|
|
|
// CT_Shape
|
|
PPTGraphicShapeContext::PPTGraphicShapeContext( ContextHandler2Helper const & rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr )
|
|
: oox::drawingml::GraphicShapeContext( rParent, pMasterShapePtr, pShapePtr )
|
|
, mpSlidePersistPtr( rSlidePersistPtr )
|
|
{
|
|
}
|
|
|
|
ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
|
|
{
|
|
switch( aElementToken )
|
|
{
|
|
// nvSpPr CT_ShapeNonVisual begin
|
|
// case NMSP_PPT|XML_drElemPr:
|
|
// break;
|
|
case PPT_TOKEN(cNvPr):
|
|
mpShapePtr->setId( rAttribs.getString( XML_id ).get() );
|
|
mpShapePtr->setName( rAttribs.getString( XML_name ).get() );
|
|
break;
|
|
case PPT_TOKEN(ph):
|
|
{
|
|
sal_Int32 nSubType( rAttribs.getToken( XML_type, XML_obj ) );
|
|
mpShapePtr->setSubType( nSubType );
|
|
OUString sIdx( rAttribs.getString( XML_idx ).get() );
|
|
bool bHasIdx = !sIdx.isEmpty();
|
|
sal_Int32 nIdx = sIdx.toInt32();
|
|
if( rAttribs.hasAttribute( XML_idx ) )
|
|
mpShapePtr->setSubTypeIndex( nIdx );
|
|
|
|
if ( nSubType || bHasIdx )
|
|
{
|
|
PPTShape* pPPTShapePtr = dynamic_cast< PPTShape* >( mpShapePtr.get() );
|
|
if ( pPPTShapePtr )
|
|
{
|
|
oox::ppt::ShapeLocation eShapeLocation = pPPTShapePtr->getShapeLocation();
|
|
oox::drawingml::ShapePtr pPlaceholder;
|
|
|
|
if ( bHasIdx && eShapeLocation == Slide )
|
|
{
|
|
// TODO: use id to shape map
|
|
SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() );
|
|
if ( pMasterPersist && rAttribs.hasAttribute( XML_idx ) )
|
|
pPlaceholder = PPTShape::findPlaceholderByIndex( nIdx, pMasterPersist->getShapes()->getChildren() );
|
|
}
|
|
if ( !pPlaceholder && ( ( eShapeLocation == Slide ) || ( eShapeLocation == Layout ) ) )
|
|
{
|
|
// inheriting properties from placeholder objects by cloning shape
|
|
|
|
sal_Int32 nFirstPlaceholder = 0;
|
|
sal_Int32 nSecondPlaceholder = 0;
|
|
switch( nSubType )
|
|
{
|
|
case XML_ctrTitle : // slide/layout
|
|
nFirstPlaceholder = XML_ctrTitle;
|
|
nSecondPlaceholder = XML_title;
|
|
break;
|
|
case XML_subTitle : // slide/layout
|
|
nFirstPlaceholder = XML_subTitle;
|
|
nSecondPlaceholder = XML_title;
|
|
break;
|
|
case XML_obj : // slide/layout
|
|
nFirstPlaceholder = XML_body;
|
|
break;
|
|
case XML_dt : // slide/layout/master/notes/notesmaster/handoutmaster
|
|
case XML_sldNum : // slide/layout/master/notes/notesmaster/handoutmaster
|
|
case XML_ftr : // slide/layout/master/notes/notesmaster/handoutmaster
|
|
case XML_hdr : // notes/notesmaster/handoutmaster
|
|
case XML_body : // slide/layout/master/notes/notesmaster
|
|
case XML_title : // slide/layout/master/
|
|
case XML_chart : // slide/layout
|
|
case XML_tbl : // slide/layout
|
|
case XML_clipArt : // slide/layout
|
|
case XML_dgm : // slide/layout
|
|
case XML_media : // slide/layout
|
|
case XML_sldImg : // notes/notesmaster
|
|
case XML_pic : // slide/layout
|
|
nFirstPlaceholder = nSubType;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
if ( nFirstPlaceholder )
|
|
{
|
|
if ( eShapeLocation == Layout ) // for layout objects the referenced object can be found within the same shape tree
|
|
pPlaceholder = PPTShape::findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
|
|
pPPTShapePtr->getSubTypeIndex(), mpSlidePersistPtr->getShapes()->getChildren(), true );
|
|
else if ( eShapeLocation == Slide ) // normal slide shapes have to search within the corresponding master tree for referenced objects
|
|
{
|
|
SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() );
|
|
if ( pMasterPersist )
|
|
pPlaceholder = PPTShape::findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
|
|
pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() );
|
|
}
|
|
}
|
|
}
|
|
if ( pPlaceholder )
|
|
{
|
|
bool bUseText = true;
|
|
switch( pPlaceholder->getSubType() )
|
|
{
|
|
case XML_title :
|
|
case XML_body :
|
|
case XML_ctrTitle :
|
|
case XML_subTitle :
|
|
case XML_dt :
|
|
case XML_sldNum :
|
|
case XML_ftr :
|
|
case XML_hdr :
|
|
case XML_obj :
|
|
case XML_chart :
|
|
case XML_tbl :
|
|
case XML_clipArt :
|
|
case XML_dgm :
|
|
case XML_media :
|
|
case XML_sldImg :
|
|
case XML_pic :
|
|
bUseText = false;
|
|
}
|
|
mpShapePtr->applyShapeReference( *pPlaceholder, bUseText );
|
|
PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
|
|
if ( pPPTShape )
|
|
pPPTShape->setReferenced( true );
|
|
pPPTShapePtr->setPlaceholder( pPlaceholder );
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
// nvSpPr CT_ShapeNonVisual end
|
|
|
|
case PPT_TOKEN(spPr):
|
|
return new PPTShapePropertiesContext( *this, *mpShapePtr );
|
|
|
|
case PPT_TOKEN(style):
|
|
return new oox::drawingml::ShapeStyleContext( *this, *mpShapePtr );
|
|
|
|
case PPT_TOKEN(txBody):
|
|
{
|
|
oox::drawingml::TextBodyPtr xTextBody = std::make_shared<oox::drawingml::TextBody>();
|
|
mpShapePtr->setTextBody( xTextBody );
|
|
return new oox::drawingml::TextBodyContext( *this, *xTextBody );
|
|
}
|
|
}
|
|
|
|
return GraphicShapeContext::onCreateContext( aElementToken, rAttribs );
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|