summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/table/tablebackgroundstylecontext.cxx2
-rw-r--r--oox/source/drawingml/table/tablecell.cxx2
-rw-r--r--oox/source/dump/dumperbase.cxx4
-rw-r--r--oox/source/ole/vbacontrol.cxx2
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx10
-rw-r--r--oox/source/vml/vmlshapecontainer.cxx8
6 files changed, 14 insertions, 14 deletions
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index 2281d0423041..ea6f7a0647c5 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -48,7 +48,7 @@ TableBackgroundStyleContext::onCreateContext( ::sal_Int32 aElementToken, const A
// EG_ThemeableFillStyle (choice)
case A_TOKEN( fill ): // CT_FillProperties
{
- boost::shared_ptr< FillProperties >& rxFillProperties = mrTableStyle.getBackgroundFillProperties();
+ std::shared_ptr< FillProperties >& rxFillProperties = mrTableStyle.getBackgroundFillProperties();
rxFillProperties.reset( new FillProperties );
return new FillPropertiesContext( *this, *rxFillProperties );
}
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 45486fd16377..2d8dfb8ad7b7 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -365,7 +365,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
Color aBgColor;
sal_Int32 nPhClr = API_RGB_TRANSPARENT;
- boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
+ std::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
::oox::drawingml::ShapeStyleRef& rBackgroundFillStyle( rTable.getBackgroundFillStyleRef() );
if (rBackgroundFillPropertiesPtr.get())
aBgColor = rBackgroundFillPropertiesPtr->getBestSolidColor();
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 404bd9f5d07c..8ff5972183b7 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1359,7 +1359,7 @@ void SharedConfigData::createShortList( const OUString& rData )
sal_Int64 nStartKey;
if( StringHelper::convertStringToInt( nStartKey, aDataVec[ 1 ] ) )
{
- ::boost::shared_ptr< MultiList > xList = createNameList< MultiList >( aDataVec[ 0 ] );
+ std::shared_ptr< MultiList > xList = createNameList< MultiList >( aDataVec[ 0 ] );
if( xList.get() )
{
aDataVec.erase( aDataVec.begin(), aDataVec.begin() + 2 );
@@ -1382,7 +1382,7 @@ void SharedConfigData::createUnitConverter( const OUString& rData )
double fFactor;
if( StringHelper::convertStringToDouble( fFactor, aFactor ) && (fFactor != 0.0) )
{
- ::boost::shared_ptr< UnitConverter > xList = createNameList< UnitConverter >( aDataVec[ 0 ] );
+ std::shared_ptr< UnitConverter > xList = createNameList< UnitConverter >( aDataVec[ 0 ] );
if( xList.get() )
{
xList->setFactor( bRecip ? (1.0 / fFactor) : fFactor );
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index b59094f916f0..82bc27d9606f 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -419,7 +419,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla
BinaryXInputStream aXStrm( rStrg.openInputStream( "x" ), true );
pMultiPage->importPageAndMultiPageProperties( aXStrm, maControls.size() );
}
- typedef std::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap;
+ typedef std::unordered_map< sal_uInt32, std::shared_ptr< VbaFormControl > > IdToPageMap;
IdToPageMap idToPage;
VbaFormControlVector::iterator it = maControls.begin();
VbaFormControlVector::iterator it_end = maControls.end();
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index aed94381a41b..e4910ad037d0 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -28,8 +28,8 @@
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/drawingml/themefragmenthandler.hxx"
-#include <boost/scoped_ptr.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <memory>
namespace oox { namespace shape {
@@ -105,7 +105,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShape
{
case XML_chart:
{
- boost::scoped_ptr<ContextHandler2Helper> pFragmentHandler(
+ std::unique_ptr<ContextHandler2Helper> pFragmentHandler(
new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" ));
mxChartShapeContext.set(new ChartGraphicDataContext(*pFragmentHandler, mpShape, true));
@@ -170,7 +170,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element )
{
if (! mxGraphicShapeContext.is())
{
- boost::shared_ptr<ContextHandler2Helper> pFragmentHandler
+ std::shared_ptr<ContextHandler2Helper> pFragmentHandler
(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
ShapePtr pMasterShape;
@@ -226,7 +226,7 @@ ShapeContextHandler::getDiagramShapeContext()
{
if (!mxDiagramShapeContext.is())
{
- boost::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+ std::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
mpShape.reset(new Shape());
mxDiagramShapeContext.set(new DiagramGraphicDataContext(*pFragmentHandler, mpShape));
}
@@ -428,7 +428,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
if ( getContextHandler() == getDrawingShapeContext() )
{
mpDrawing->finalizeFragmentImport();
- if( boost::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() )
+ if( std::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() )
xResult = pShape->convertAndInsert( xShapes );
// Only now remove the recursion mark, because getShape() is called in writerfilter
// after endFastElement().
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index 3b40e56c4d2e..a7fbb785ab20 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -61,7 +61,7 @@ ShapeContainer::~ShapeContainer()
ShapeType& ShapeContainer::createShapeType()
{
- ::boost::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) );
+ std::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) );
maTypes.push_back( xShape );
return *xShape;
}
@@ -103,13 +103,13 @@ const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId, bool bD
return 0;
}
-boost::shared_ptr< ShapeBase > ShapeContainer::takeLastShape()
+std::shared_ptr< ShapeBase > ShapeContainer::takeLastShape()
{
OSL_ENSURE( mrDrawing.getType() == VMLDRAWING_WORD, "ShapeContainer::takeLastShape - illegal call, Word filter only" );
assert( !markStack.empty());
if( markStack.top() >= maShapes.size())
- return boost::shared_ptr< ShapeBase >();
- boost::shared_ptr< ShapeBase > ret = maShapes.back();
+ return std::shared_ptr< ShapeBase >();
+ std::shared_ptr< ShapeBase > ret = maShapes.back();
maShapes.pop_back();
return ret;
}
generated by cgit (git 2.34.1) at 2024-07-16 00:05:57 +0000