mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "oox: replace boost::ptr_vector with std::vector<std::unique_ptr>"

Browse Source 
This reverts commit d29e614ff9, it broke
CppunitTest_sd_export_tests.

Change-Id: I908cc46cdf4df706ad64d04777b8e1401e0800c1
This commit is contained in:
Stephan Bergmann
2015-10-23 15:50:55 +02:00
parent 0db68ef9ca
commit 237a840ef7
4 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oox/source/drawingml/effectproperties.cxx
View File

@@ -14,7 +14,6 @@
#include "oox/token/tokens.hxx"
#include <basegfx/numeric/ftools.hxx>
#include <o3tl/make_unique.hxx>
namespace oox {
namespace drawingml {
@@ -29,21 +28,14 @@ void EffectShadowProperties::assignUsed(const EffectShadowProperties& rSourcePro
void EffectProperties::assignUsed( const EffectProperties& rSourceProps )
{
maShadow.assignUsed(rSourceProps.maShadow);
if (!rSourceProps.m_Effects.empty())
{
m_Effects.reserve(rSourceProps.m_Effects.size());
for (auto const& it : rSourceProps.m_Effects)
{
m_Effects.push_back(o3tl::make_unique<Effect>(*it));
}
}
if( rSourceProps.maEffects.size() > 0 )
maEffects = rSourceProps.maEffects;
}
void EffectProperties::pushToPropMap( PropertyMap& rPropMap,
const GraphicHelper& rGraphicHelper ) const
{
for (auto const& it : m_Effects)
{
for( boost::ptr_vector< Effect >::const_iterator it = maEffects.begin(); it != maEffects.end(); ++it )
if( it->msName == "outerShdw" )
{
sal_Int32 nAttrDir = 0, nAttrDist = 0;
@@ -67,7 +59,6 @@ void EffectProperties::pushToPropMap( PropertyMap& rPropMap,
rPropMap.setProperty( PROP_ShadowColor, it->moColor.getColor(rGraphicHelper ) );
rPropMap.setProperty( PROP_ShadowTransparence, it->moColor.getTransparency());
}
}
}
css::beans::PropertyValue Effect::getEffect()

13
oox/source/drawingml/effectproperties.hxx
View File

@@ -10,12 +10,11 @@
#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
#include <map>
#include <oox/drawingml/color.hxx>
#include <oox/helper/propertymap.hxx>
#include <memory>
#include <vector>
#include <map>
#include <boost/ptr_container/ptr_vector.hpp>
namespace oox {
namespace drawingml {
@@ -45,13 +44,7 @@ struct EffectProperties
EffectShadowProperties maShadow;
/** Stores all effect properties, including those not supported by core yet */
std::vector<std::unique_ptr<Effect>> m_Effects;
EffectProperties() {}
EffectProperties(EffectProperties const& rOther)
{
assignUsed(rOther);
}
boost::ptr_vector< Effect > maEffects;
/** Overwrites all members that are explicitly set in rSourceProps. */
void assignUsed( const EffectProperties& rSourceProps );

32
oox/source/drawingml/effectpropertiescontext.cxx
View File

@@ -13,8 +13,6 @@
#include "drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/helper/attributelist.hxx"
#include <o3tl/make_unique.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
@@ -72,28 +70,28 @@ void EffectPropertiesContext::saveUnsupportedAttribs( Effect& rEffect, const Att
ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
{
sal_Int32 nPos = mrEffectProperties.m_Effects.size();
mrEffectProperties.m_Effects.push_back(o3tl::make_unique<Effect>());
sal_Int32 nPos = mrEffectProperties.maEffects.size();
mrEffectProperties.maEffects.push_back( new Effect() );
switch( nElement )
{
case A_TOKEN( outerShdw ):
{
mrEffectProperties.m_Effects[nPos]->msName = "outerShdw";
saveUnsupportedAttribs(*mrEffectProperties.m_Effects[nPos], rAttribs);
mrEffectProperties.maEffects[nPos].msName = "outerShdw";
saveUnsupportedAttribs( mrEffectProperties.maEffects[nPos], rAttribs );
mrEffectProperties.maShadow.moShadowDist = rAttribs.getInteger( XML_dist, 0 );
mrEffectProperties.maShadow.moShadowDir = rAttribs.getInteger( XML_dir, 0 );
return new ColorContext(*this, mrEffectProperties.m_Effects[nPos]->moColor);
return new ColorContext( *this, mrEffectProperties.maEffects[nPos].moColor );
}
break;
case A_TOKEN( innerShdw ):
{
mrEffectProperties.m_Effects[nPos]->msName = "innerShdw";
saveUnsupportedAttribs(*mrEffectProperties.m_Effects[nPos], rAttribs);
mrEffectProperties.maEffects[nPos].msName = "innerShdw";
saveUnsupportedAttribs( mrEffectProperties.maEffects[nPos], rAttribs );
mrEffectProperties.maShadow.moShadowDist = rAttribs.getInteger( XML_dist, 0 );
mrEffectProperties.maShadow.moShadowDir = rAttribs.getInteger( XML_dir, 0 );
return new ColorContext(*this, mrEffectProperties.m_Effects[nPos]->moColor);
return new ColorContext( *this, mrEffectProperties.maEffects[nPos].moColor );
}
break;
case A_TOKEN( glow ):
@@ -102,20 +100,20 @@ ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 nElement,
case A_TOKEN( blur ):
{
if( nElement == A_TOKEN( glow ) )
mrEffectProperties.m_Effects[nPos]->msName = "glow";
mrEffectProperties.maEffects[nPos].msName = "glow";
else if( nElement == A_TOKEN( softEdge ) )
mrEffectProperties.m_Effects[nPos]->msName = "softEdge";
mrEffectProperties.maEffects[nPos].msName = "softEdge";
else if( nElement == A_TOKEN( reflection ) )
mrEffectProperties.m_Effects[nPos]->msName = "reflection";
mrEffectProperties.maEffects[nPos].msName = "reflection";
else if( nElement == A_TOKEN( blur ) )
mrEffectProperties.m_Effects[nPos]->msName = "blur";
saveUnsupportedAttribs(*mrEffectProperties.m_Effects[nPos], rAttribs);
return new ColorContext(*this, mrEffectProperties.m_Effects[nPos]->moColor);
mrEffectProperties.maEffects[nPos].msName = "blur";
saveUnsupportedAttribs( mrEffectProperties.maEffects[nPos], rAttribs );
return new ColorContext( *this, mrEffectProperties.maEffects[nPos].moColor );
}
break;
}
mrEffectProperties.m_Effects.pop_back();
mrEffectProperties.maEffects.pop_back();
return 0;
}

7
oox/source/drawingml/shape.cxx
View File

@@ -953,11 +953,12 @@ Reference< XShape > Shape::createAndInsert(
}
// store unsupported effect attributes in the grab bag
if (!aEffectProperties.m_Effects.empty())
if( aEffectProperties.maEffects.size() > 0 )
{
Sequence<PropertyValue> aEffects(aEffectProperties.m_Effects.size());
Sequence< PropertyValue > aEffects( aEffectProperties.maEffects.size() );
sal_uInt32 i = 0;
for (auto const& it : aEffectProperties.m_Effects)
for( boost::ptr_vector< Effect >::iterator it = aEffectProperties.maEffects.begin();
it != aEffectProperties.maEffects.end(); ++it )
{
PropertyValue aEffect = it->getEffect();
if( !aEffect.Name.isEmpty() )