[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Dec 30 11:43:55 PST 2014
writerfilter/inc/dmapper/resourcemodel.hxx | 7 ++----
writerfilter/inc/ooxml/OOXMLDocument.hxx | 4 +--
writerfilter/inc/ooxml/QNameToString.hxx | 4 +--
writerfilter/inc/pch/precompiled_writerfilter.hxx | 2 -
writerfilter/inc/rtftok/RTFDocument.hxx | 2 -
writerfilter/source/dmapper/BorderHandler.hxx | 6 ++---
writerfilter/source/dmapper/CellColorHandler.hxx | 6 ++---
writerfilter/source/dmapper/CellMarginHandler.hxx | 6 ++---
writerfilter/source/dmapper/DomainMapper.cxx | 6 ++---
writerfilter/source/dmapper/DomainMapper.hxx | 12 +++++------
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 8 +++----
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 ++---
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 2 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10 ++++-----
writerfilter/source/dmapper/FFDataHandler.hxx | 2 -
writerfilter/source/dmapper/FontTable.hxx | 6 ++---
writerfilter/source/dmapper/FormControlHelper.hxx | 4 +--
writerfilter/source/dmapper/GraphicHelpers.hxx | 7 ++----
writerfilter/source/dmapper/GraphicImport.hxx | 2 -
writerfilter/source/dmapper/LatentStyleHandler.hxx | 4 +--
writerfilter/source/dmapper/MeasureHandler.hxx | 4 +--
writerfilter/source/dmapper/NumberingManager.cxx | 2 -
writerfilter/source/dmapper/NumberingManager.hxx | 16 +++++++--------
writerfilter/source/dmapper/OLEHandler.hxx | 4 +--
writerfilter/source/dmapper/PageBordersHandler.hxx | 4 +--
writerfilter/source/dmapper/PropertyMap.hxx | 14 ++++++-------
writerfilter/source/dmapper/SectionColumnHandler.hxx | 4 +--
writerfilter/source/dmapper/SettingsTable.hxx | 2 -
writerfilter/source/dmapper/StyleSheetTable.hxx | 8 +++----
writerfilter/source/dmapper/TDefTableHandler.cxx | 2 -
writerfilter/source/dmapper/TDefTableHandler.hxx | 8 +++----
writerfilter/source/dmapper/TableData.hxx | 8 +++----
writerfilter/source/dmapper/TableManager.hxx | 6 ++---
writerfilter/source/dmapper/TablePositionHandler.hxx | 4 +--
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 4 +--
writerfilter/source/dmapper/TagLogger.hxx | 6 ++---
writerfilter/source/dmapper/TblStylePrHandler.hxx | 4 +--
writerfilter/source/dmapper/TextEffectsHandler.hxx | 2 -
writerfilter/source/dmapper/ThemeTable.hxx | 2 -
writerfilter/source/dmapper/TrackChangesHandler.hxx | 5 +---
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 2 -
writerfilter/source/ooxml/OOXMLFactory.hxx | 4 +--
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 +--
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 4 +--
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 1
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 4 +--
writerfilter/source/ooxml/OOXMLParserState.hxx | 2 -
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 4 +--
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 6 ++---
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 2 -
writerfilter/source/ooxml/factory_ns.py | 2 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 16 +++++++--------
writerfilter/source/rtftok/rtflookahead.cxx | 1
writerfilter/source/rtftok/rtflookahead.hxx | 3 +-
writerfilter/source/rtftok/rtfsprm.hxx | 2 -
writerfilter/source/rtftok/rtfvalue.hxx | 8 +++----
57 files changed, 139 insertions(+), 143 deletions(-)
New commits:
commit 54bd92d7fce1ec4d8d779751168c698cc44a33ba
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Dec 30 20:29:56 2014 +0100
writerfilter: boost::shared_ptr -> c++11 std::shared_ptr
Change-Id: Ib5649d8979093bb147c61eebcf95a472ad899672
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index 0e07757..d76a0a4 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -22,7 +22,6 @@
#include <string>
#include <memory>
-#include <boost/shared_ptr.hpp>
#include <sal/types.h>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/uno/Any.hxx>
@@ -86,7 +85,7 @@ public:
@attention The ownership of a reference is transferred when
the reference is passed.
*/
- typedef boost::shared_ptr< Reference<T> > Pointer_t;
+ typedef std::shared_ptr< Reference<T> > Pointer_t;
/**
Resolves the reference.
@@ -136,7 +135,7 @@ protected:
class Table
{
public:
- typedef boost::shared_ptr<Table> Pointer_t;
+ typedef std::shared_ptr<Table> Pointer_t;
/**
Receives an entry of the table.
@@ -184,7 +183,7 @@ public:
/**
Pointer to this stream.
*/
- typedef boost::shared_ptr<Stream> Pointer_t;
+ typedef std::shared_ptr<Stream> Pointer_t;
/**
Receives start mark for group with the same section properties.
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 8882f42..c533e35 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -76,7 +76,7 @@ class OOXMLStream
public:
enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE, NUMBERING,
FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT, FOOTER, HEADER, SIGNATURE };
- typedef boost::shared_ptr<OOXMLStream> Pointer_t;
+ typedef std::shared_ptr<OOXMLStream> Pointer_t;
virtual ~OOXMLStream() {}
@@ -121,7 +121,7 @@ public:
/**
Pointer to this stream.
*/
- typedef boost::shared_ptr<OOXMLDocument> Pointer_t;
+ typedef std::shared_ptr<OOXMLDocument> Pointer_t;
virtual ~OOXMLDocument() {}
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx
index 88abc59..a525eb8 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
#define INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <map>
#include <string>
#include <iostream>
@@ -31,7 +31,7 @@ namespace writerfilter
class QNameToString
{
- typedef boost::shared_ptr<QNameToString> Pointer_t;
+ typedef std::shared_ptr<QNameToString> Pointer_t;
typedef std::map < Id, std::string > Map;
static Pointer_t pInstance;
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 46727f5..ded05d0 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -18,7 +18,7 @@
#include "oox/token/tokens.hxx"
#include <algorithm>
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/tuple/tuple.hpp>
#include <boost/unordered_map.hpp>
#include <com/sun/star/awt/FontPitch.hpp>
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/writerfilter/inc/rtftok/RTFDocument.hxx
index 8b68780..bea19a4 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -26,7 +26,7 @@ class RTFDocument
{
public:
/// Pointer to this stream.
- typedef boost::shared_ptr<RTFDocument> Pointer_t;
+ typedef std::shared_ptr<RTFDocument> Pointer_t;
virtual ~RTFDocument() { }
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 1318901..3210599 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -21,7 +21,7 @@
#include <vector>
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/sequenceasvector.hxx>
@@ -69,14 +69,14 @@ public:
BorderHandler( bool bOOXML );
virtual ~BorderHandler();
- ::boost::shared_ptr<PropertyMap> getProperties();
+ ::std::shared_ptr<PropertyMap> getProperties();
::com::sun::star::table::BorderLine2 getBorderLine();
sal_Int32 getLineDistance() const { return m_nLineDistance;}
bool getShadow() { return m_bShadow;}
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
};
-typedef boost::shared_ptr< BorderHandler > BorderHandlerPtr;
+typedef std::shared_ptr< BorderHandler > BorderHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index a465428..d790625 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -53,7 +53,7 @@ public:
CellColorHandler( );
virtual ~CellColorHandler();
- ::boost::shared_ptr<TablePropertyMap> getProperties();
+ ::std::shared_ptr<TablePropertyMap> getProperties();
void setOutputFormat( OutputFormat format ) { m_OutputFormat = format; }
@@ -62,7 +62,7 @@ public:
void disableInteropGrabBag();
bool isInteropGrabBagEnabled();
};
-typedef boost::shared_ptr< CellColorHandler > CellColorHandlerPtr;
+typedef std::shared_ptr< CellColorHandler > CellColorHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index fab55d1..cb0395d 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLMARGINHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -58,13 +58,13 @@ public:
CellMarginHandler( );
virtual ~CellMarginHandler();
- ::boost::shared_ptr<TablePropertyMap> getProperties();
+ ::std::shared_ptr<TablePropertyMap> getProperties();
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag();
};
-typedef boost::shared_ptr< CellMarginHandler > CellMarginHandlerPtr;
+typedef std::shared_ptr< CellMarginHandler > CellMarginHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 9df50e4..cb45bb4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2780,7 +2780,7 @@ void DomainMapper::PopStyleSheetProperties( bool bAffectTableMngr )
}
}
-void DomainMapper::PushListProperties( ::boost::shared_ptr<PropertyMap> pListProperties )
+void DomainMapper::PushListProperties( ::std::shared_ptr<PropertyMap> pListProperties )
{
m_pImpl->PushListProperties( pListProperties );
}
@@ -3164,7 +3164,7 @@ void DomainMapper::lcl_info(const std::string & /*info_*/)
{
}
-void DomainMapper::handleUnderlineType(const Id nId, const ::boost::shared_ptr<PropertyMap> pContext)
+void DomainMapper::handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap> pContext)
{
sal_Int16 nUnderline = awt::FontUnderline::NONE;
@@ -3228,7 +3228,7 @@ void DomainMapper::handleUnderlineType(const Id nId, const ::boost::shared_ptr<P
pContext->Insert(PROP_CHAR_UNDERLINE, uno::makeAny(nUnderline));
}
-void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::boost::shared_ptr<PropertyMap> pContext, const bool bExchangeLeftRight)
+void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::std::shared_ptr<PropertyMap> pContext, const bool bExchangeLeftRight)
{
sal_Int16 nAdjust = 0;
sal_Int16 nLastLineAdjust = 0;
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 5fc092d..2c20658 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -92,12 +92,12 @@ public:
virtual void data(const sal_uInt8* buf, size_t len,
writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
- void sprmWithProps( Sprm& sprm, ::boost::shared_ptr<PropertyMap> pContext );
+ void sprmWithProps( Sprm& sprm, ::std::shared_ptr<PropertyMap> pContext );
- void PushStyleSheetProperties( ::boost::shared_ptr<PropertyMap> pStyleProperties, bool bAffectTableMngr = false );
+ void PushStyleSheetProperties( ::std::shared_ptr<PropertyMap> pStyleProperties, bool bAffectTableMngr = false );
void PopStyleSheetProperties( bool bAffectTableMngr = false );
- void PushListProperties( ::boost::shared_ptr<PropertyMap> pListProperties );
+ void PushListProperties( ::std::shared_ptr<PropertyMap> pListProperties );
void PopListProperties();
bool IsOOXMLImport() const;
@@ -107,7 +107,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetCurrentTextRange();
OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties );
- boost::shared_ptr< StyleSheetTable > GetStyleSheetTable( );
+ std::shared_ptr< StyleSheetTable > GetStyleSheetTable( );
GraphicZOrderHelper* graphicZOrderHelper();
/// Return the first from the pending (not inserted to the document) shapes, if there are any.
@@ -163,8 +163,8 @@ private:
// Table
virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
- void handleUnderlineType(const Id nId, const ::boost::shared_ptr<PropertyMap> pContext);
- void handleParaJustification(const sal_Int32 nIntValue, const ::boost::shared_ptr<PropertyMap> pContext, const bool bExchangeLeftRight);
+ void handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap> pContext);
+ void handleParaJustification(const sal_Int32 nIntValue, const ::std::shared_ptr<PropertyMap> pContext, const bool bExchangeLeftRight);
bool getColorFromId(const Id, sal_Int32 &nColor);
sal_Int16 getEmphasisValue(const sal_Int32 nIntValue);
OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true);
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index f02ec96..eee27fc 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -30,11 +30,11 @@ namespace dmapper {
typedef css::uno::Reference< css::text::XTextRange > Handle_t;
typedef ::com::sun::star::uno::Sequence< Handle_t> CellSequence_t;
-typedef boost::shared_ptr<CellSequence_t> CellSequencePointer_t;
+typedef std::shared_ptr<CellSequence_t> CellSequencePointer_t;
typedef ::com::sun::star::uno::Sequence< CellSequence_t > RowSequence_t;
-typedef boost::shared_ptr<RowSequence_t> RowSequencePointer_t;
+typedef std::shared_ptr<RowSequence_t> RowSequencePointer_t;
typedef ::com::sun::star::uno::Sequence< RowSequence_t> TableSequence_t;
-typedef boost::shared_ptr<TableSequence_t> TableSequencePointer_t;
+typedef std::shared_ptr<TableSequence_t> TableSequencePointer_t;
typedef ::com::sun::star::text::XTextAppendAndConvert Text_t;
typedef ::com::sun::star::uno::Reference<Text_t> TextReference_t;
@@ -88,7 +88,7 @@ class DomainMapperTableHandler : public TableDataHandler
RowPropertyValuesSeq_t endTableGetRowProperties();
public:
- typedef boost::shared_ptr<DomainMapperTableHandler> Pointer_t;
+ typedef std::shared_ptr<DomainMapperTableHandler> Pointer_t;
DomainMapperTableHandler(TextReference_t const& xText,
DomainMapper_Impl& rDMapper_Impl);
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 3399707..8c674fd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -481,17 +481,17 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
return bRet;
}
-boost::shared_ptr< vector<sal_Int32> > DomainMapperTableManager::getCurrentGrid( )
+std::shared_ptr< vector<sal_Int32> > DomainMapperTableManager::getCurrentGrid( )
{
return m_aTableGrid.back( );
}
-boost::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentSpans( )
+std::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentSpans( )
{
return m_aGridSpans.back( );
}
-boost::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentCellWidths( )
+std::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentCellWidths( )
{
return m_aCellWidths.back( );
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 661b130..3de305a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -36,7 +36,7 @@ class DomainMapper;
class DomainMapperTableManager : public TableManager
{
- typedef boost::shared_ptr< std::vector<sal_Int32> > IntVectorPtr;
+ typedef std::shared_ptr< std::vector<sal_Int32> > IntVectorPtr;
sal_uInt32 m_nRow;
::std::vector< sal_uInt32 > m_nCell;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d93657a..69a8c7d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -221,7 +221,7 @@ struct AnchoredContext
xTextContent( xContent ), bToRemove( false ) {}
};
-typedef boost::shared_ptr<FieldContext> FieldContextPtr;
+typedef std::shared_ptr<FieldContext> FieldContextPtr;
typedef std::stack<ContextType> ContextStack;
typedef std::stack<PropertyMapPtr> PropertyStack;
@@ -362,7 +362,7 @@ private:
// TableManagers are stacked: one for each stream to avoid any confusion
- std::stack< boost::shared_ptr< DomainMapperTableManager > > m_aTableManagers;
+ std::stack< std::shared_ptr< DomainMapperTableManager > > m_aTableManagers;
TableDataHandler::Pointer_t m_pTableHandler;
//each context needs a stack of currently used attributes
@@ -683,13 +683,13 @@ public:
DomainMapperTableManager& getTableManager()
{
- boost::shared_ptr< DomainMapperTableManager > pMngr = m_aTableManagers.top();
+ std::shared_ptr< DomainMapperTableManager > pMngr = m_aTableManagers.top();
return *pMngr.get( );
}
void appendTableManager( )
{
- boost::shared_ptr<DomainMapperTableManager> pMngr(new DomainMapperTableManager());
+ std::shared_ptr<DomainMapperTableManager> pMngr(new DomainMapperTableManager());
m_aTableManagers.push( pMngr );
}
@@ -783,7 +783,7 @@ public:
/// If we're inside <w:rPr>, inside <w:style w:type="table">
bool m_bInTableStyleRunProps;
- boost::shared_ptr<SdtHelper> m_pSdtHelper;
+ std::shared_ptr<SdtHelper> m_pSdtHelper;
/// Document background color, applied to every page style.
boost::optional<sal_Int32> m_oBackgroundColor;
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index cea6587..88991e3 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -27,7 +27,7 @@ class FFDataHandler : public LoggedProperties
{
public:
// typedefs
- typedef ::boost::shared_ptr<FFDataHandler> Pointer_t;
+ typedef ::std::shared_ptr<FFDataHandler> Pointer_t;
typedef ::std::vector<OUString> DropDownEntries_t;
// constructor
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 9b691ab..8c13f04 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FONTTABLE_HXX
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FONTTABLE_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "LoggedResources.hxx"
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/io/XInputStream.hpp>
@@ -32,7 +32,7 @@ namespace dmapper
struct FontTable_Impl;
struct FontEntry
{
- typedef boost::shared_ptr<FontEntry> Pointer_t;
+ typedef std::shared_ptr<FontEntry> Pointer_t;
OUString sFontName;
OUString sFontName1;
@@ -93,7 +93,7 @@ class FontTable : public LoggedProperties, public LoggedTable
virtual void lcl_endShape( ) SAL_OVERRIDE;
};
-typedef boost::shared_ptr< FontTable > FontTablePtr;
+typedef std::shared_ptr< FontTable > FontTablePtr;
class EmbeddedFontHandler : public LoggedProperties
{
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index 88bdd96..71b92a4 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -31,7 +31,7 @@ namespace dmapper {
class FormControlHelper
{
public:
- typedef boost::shared_ptr<FormControlHelper> Pointer_t;
+ typedef std::shared_ptr<FormControlHelper> Pointer_t;
FormControlHelper(FieldId eFieldId,
css::uno::Reference<css::text::XTextDocument> const& rTextDocument,
FFDataHandler::Pointer_t pFFData);
@@ -43,7 +43,7 @@ public:
private:
FFDataHandler::Pointer_t m_pFFData;
struct FormControlHelper_Impl;
- typedef boost::shared_ptr<FormControlHelper_Impl> ImplPointer_t;
+ typedef std::shared_ptr<FormControlHelper_Impl> ImplPointer_t;
ImplPointer_t m_pImpl;
bool createCheckbox(css::uno::Reference<css::text::XTextRange> const& xTextRange,
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index f2f791c..f669bb1 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -22,8 +22,7 @@
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
#include <map>
#include <utility>
@@ -48,7 +47,7 @@ public:
std::pair<OUString, OUString>& m_rPositionOffsets;
std::pair<OUString, OUString>& m_rAligns;
};
-typedef boost::shared_ptr<PositionHandler> PositionHandlerPtr;
+typedef std::shared_ptr<PositionHandler> PositionHandlerPtr;
class WrapHandler: public LoggedProperties
{
@@ -65,7 +64,7 @@ public:
virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE;
virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE;
};
-typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr;
+typedef std::shared_ptr<WrapHandler> WrapHandlerPtr;
} }
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 0d5c07c..6a10ddb 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -123,7 +123,7 @@ public:
void handleWrapTextValue(sal_uInt32 nVal);
};
-typedef boost::shared_ptr<GraphicImport> GraphicImportPtr;
+typedef std::shared_ptr<GraphicImport> GraphicImportPtr;
}}
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 07f3017..d2aecb0 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -10,7 +10,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -36,7 +36,7 @@ public:
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getAttributes() const;
};
-typedef boost::shared_ptr<LatentStyleHandler> LatentStyleHandlerPtr;
+typedef std::shared_ptr<LatentStyleHandler> LatentStyleHandlerPtr;
} // namespace dmapper
} // namespace writerfilter
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index 47b7e5f..c9a392f 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MEASUREHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -57,7 +57,7 @@ public:
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag();
};
-typedef boost::shared_ptr
+typedef std::shared_ptr
< MeasureHandler > MeasureHandlerPtr;
}}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index cae1b6a..dce2fd6 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -140,7 +140,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
}
}
-void ListLevel::SetParaStyle( boost::shared_ptr< StyleSheetEntry > pStyle )
+void ListLevel::SetParaStyle( std::shared_ptr< StyleSheetEntry > pStyle )
{
if (!pStyle)
return;
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index d069106..dffb0de 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -54,12 +54,12 @@ class ListLevel : public PropertyMap
OUString m_sGraphicURL;
com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > m_sGraphicBitmap;
sal_Int32 m_nTabstop;
- boost::shared_ptr< StyleSheetEntry > m_pParaStyle;
+ std::shared_ptr< StyleSheetEntry > m_pParaStyle;
bool m_outline;
public:
- typedef boost::shared_ptr< ListLevel > Pointer;
+ typedef std::shared_ptr< ListLevel > Pointer;
ListLevel() :
m_nIStartAt(-1)
@@ -82,12 +82,12 @@ public:
void SetGraphicURL( const OUString& sValue ) { m_sGraphicURL = sValue; };
void SetGraphicBitmap( com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > const& sValue )
{ m_sGraphicBitmap = sValue; }
- void SetParaStyle( boost::shared_ptr< StyleSheetEntry > pStyle );
+ void SetParaStyle( std::shared_ptr< StyleSheetEntry > pStyle );
void AddRGBXchNums( const OUString& sValue ) { m_sRGBXchNums += sValue; };
// Getters
OUString GetBulletChar( ) { return m_sBulletChar; };
- boost::shared_ptr< StyleSheetEntry > GetParaStyle( ) { return m_pParaStyle; };
+ std::shared_ptr< StyleSheetEntry > GetParaStyle( ) { return m_pParaStyle; };
bool isOutlineNumbering() const { return m_outline; }
// UNO mapping functions
@@ -113,7 +113,7 @@ private:
class NumPicBullet
{
public:
- typedef boost::shared_ptr<NumPicBullet> Pointer;
+ typedef std::shared_ptr<NumPicBullet> Pointer;
NumPicBullet();
virtual ~NumPicBullet();
@@ -147,7 +147,7 @@ private:
::rtl::OUString m_sNumStyleLink;
public:
- typedef boost::shared_ptr< AbstractListDef > Pointer;
+ typedef std::shared_ptr< AbstractListDef > Pointer;
AbstractListDef( );
virtual ~AbstractListDef( );
@@ -184,7 +184,7 @@ private:
css::uno::Reference< css::container::XIndexReplace > m_xNumRules;
public:
- typedef boost::shared_ptr< ListDef > Pointer;
+ typedef std::shared_ptr< ListDef > Pointer;
ListDef( );
virtual ~ListDef( );
@@ -249,7 +249,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFactory);
virtual ~ListsManager();
- typedef boost::shared_ptr< ListsManager > Pointer;
+ typedef std::shared_ptr< ListsManager > Pointer;
// Config methods
void SetLFOImport( bool bLFOImport ) { m_bIsLFOImport = bLFOImport; };
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 02442c6..0bb98a4 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_OLEHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Point.hpp>
@@ -104,7 +104,7 @@ public:
getReplacement() const { return m_xReplacement; }
};
-typedef boost::shared_ptr< OLEHandler > OLEHandlerPtr;
+typedef std::shared_ptr< OLEHandler > OLEHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index bfcd27d..9b78263 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -23,7 +23,7 @@
#include "PropertyMap.hxx"
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/table/BorderLine2.hpp>
@@ -68,7 +68,7 @@ public:
};
void SetBorders( SectionPropertyMap* pSectContext );
};
-typedef boost::shared_ptr< PageBordersHandler > PageBordersHandlerPtr;
+typedef std::shared_ptr< PageBordersHandler > PageBordersHandlerPtr;
} }
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 71a92d9..f411a8b 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/Any.h>
#include "PropertyIds.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/optional.hpp>
#include <map>
#include <vector>
@@ -84,7 +84,7 @@ struct RedlineParams
/// This can hold properties of runs that had formatted 'track changes' properties
css::uno::Sequence<css::beans::PropertyValue> m_aRevertProperties;
};
-typedef boost::shared_ptr< RedlineParams > RedlineParamsPtr;
+typedef std::shared_ptr< RedlineParams > RedlineParamsPtr;
class PropValue
{
@@ -145,7 +145,7 @@ public:
void Erase( PropertyIds eId);
//Imports properties from pMap, overwriting those with the same PropertyIds as the current map
- void InsertProps(const boost::shared_ptr<PropertyMap> pMap);
+ void InsertProps(const std::shared_ptr<PropertyMap> pMap);
//Returns a copy of the property if it exists, .first is its PropertyIds and .second is its Value (type css::uno::Any)
boost::optional<Property> getProperty( PropertyIds eId ) const;
@@ -177,7 +177,7 @@ public:
static com::sun::star::table::ShadowFormat getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder);
};
-typedef boost::shared_ptr<PropertyMap> PropertyMapPtr;
+typedef std::shared_ptr<PropertyMap> PropertyMapPtr;
class SectionPropertyMap : public PropertyMap
{
@@ -326,7 +326,7 @@ public:
/// Handling of margins, header and footer for any kind of sections breaks.
void HandleMarginsHeaderFooter(DomainMapper_Impl& rDM_Impl);
};
-typedef boost::shared_ptr<SectionPropertyMap> SectionPropertyMapPtr;
+typedef std::shared_ptr<SectionPropertyMap> SectionPropertyMapPtr;
@@ -428,7 +428,7 @@ public:
void ResetFrameProperties();
};
-typedef boost::shared_ptr<ParagraphProperties> ParagraphPropertiesPtr;
+typedef std::shared_ptr<ParagraphProperties> ParagraphPropertiesPtr;
/*-------------------------------------------------------------------------
property map of a stylesheet
-----------------------------------------------------------------------*/
@@ -581,7 +581,7 @@ public:
virtual void insertTableProperties( const PropertyMap* ) SAL_OVERRIDE;
};
-typedef boost::shared_ptr<TablePropertyMap> TablePropertyMapPtr;
+typedef std::shared_ptr<TablePropertyMap> TablePropertyMapPtr;
} //namespace dmapper
} //namespace writerfilter
#endif
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index fe2f422..12b8f64 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SECTIONCOLUMNHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace writerfilter {
@@ -59,7 +59,7 @@ public:
const std::vector<_Column>& GetColumns() const { return aCols;}
};
-typedef boost::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr;
+typedef std::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 739bfc5..c74150b 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -88,7 +88,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable
virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
};
-typedef boost::shared_ptr< SettingsTable > SettingsTablePtr;
+typedef std::shared_ptr< SettingsTable > SettingsTablePtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 2250ae4..2709148 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -76,9 +76,9 @@ public:
virtual ~StyleSheetEntry();
};
-typedef boost::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr;
+typedef std::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr;
typedef ::std::deque<StyleSheetEntryPtr> StyleSheetEntryDeque;
-typedef boost::shared_ptr<StyleSheetEntryDeque> StyleSheetEntryDequePtr;
+typedef std::shared_ptr<StyleSheetEntryDeque> StyleSheetEntryDequePtr;
class DomainMapper;
class StyleSheetTable :
@@ -117,7 +117,7 @@ private:
void applyDefaults(bool bParaProperties);
};
-typedef boost::shared_ptr< StyleSheetTable > StyleSheetTablePtr;
+typedef std::shared_ptr< StyleSheetTable > StyleSheetTablePtr;
class TableStyleSheetEntry :
@@ -152,7 +152,7 @@ public:
protected:
PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask );
};
-typedef boost::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr;
+typedef std::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr;
}}
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index ad23035..658bea6 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -450,7 +450,7 @@ PropertyMapPtr TDefTableHandler::getRowProperties() const
void TDefTableHandler::fillCellProperties(
- size_t nCell, ::boost::shared_ptr< TablePropertyMap > pCellProperties ) const
+ size_t nCell, ::std::shared_ptr< TablePropertyMap > pCellProperties ) const
{
if( m_aCellBorderPositions.size() > nCell )
{
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index d8e034e..7128ac4 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TDEFTABLEHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace com{ namespace sun{ namespace star{
namespace table {
@@ -76,15 +76,15 @@ public:
virtual ~TDefTableHandler();
size_t getCellCount() const;
- void fillCellProperties( size_t nCell, ::boost::shared_ptr< TablePropertyMap > pCellProperties) const;
- ::boost::shared_ptr<PropertyMap> getRowProperties() const;
+ void fillCellProperties( size_t nCell, ::std::shared_ptr< TablePropertyMap > pCellProperties) const;
+ ::std::shared_ptr<PropertyMap> getRowProperties() const;
sal_Int32 getTableWidth() const;
void enableInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
static OUString getBorderTypeString(sal_Int32 nType);
static OUString getThemeColorTypeString(sal_Int32 nType);
};
-typedef boost::shared_ptr< TDefTableHandler > TDefTableHandlerPtr;
+typedef std::shared_ptr< TDefTableHandler > TDefTableHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 9151494..a334df2 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -23,7 +23,7 @@
#include <dmapper/resourcemodel.hxx>
#include <vector>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace writerfilter
{
@@ -53,7 +53,7 @@ class CellData
bool mbOpen;
public:
- typedef boost::shared_ptr<CellData> Pointer_t;
+ typedef std::shared_ptr<CellData> Pointer_t;
CellData(css::uno::Reference<css::text::XTextRange> start, TablePropertyMapPtr pProps)
: mStart(start), mEnd(start), mpProps(pProps), mbOpen(true)
@@ -132,7 +132,7 @@ class RowData
mutable TablePropertyMapPtr mpProperties;
public:
- typedef boost::shared_ptr<RowData> Pointer_t;
+ typedef std::shared_ptr<RowData> Pointer_t;
RowData() {}
@@ -293,7 +293,7 @@ class TableData
void newRow() { mpRow = RowPointer_t(new RowData()); }
public:
- typedef boost::shared_ptr<TableData> Pointer_t;
+ typedef std::shared_ptr<TableData> Pointer_t;
TableData(unsigned int nDepth) : mnDepth(nDepth) { newRow(); }
~TableData() {}
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 07803e0..0644a87 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -24,7 +24,7 @@
#include <ooxml/resourceids.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <stack>
#include "TagLogger.hxx"
@@ -43,7 +43,7 @@ namespace dmapper
class TableDataHandler
{
public:
- typedef boost::shared_ptr<TableDataHandler> Pointer_t;
+ typedef std::shared_ptr<TableDataHandler> Pointer_t;
/**
Handle start of table.
@@ -383,7 +383,7 @@ protected:
}
private:
- typedef boost::shared_ptr< css::uno::Reference<css::text::XTextRange> > T_p;
+ typedef std::shared_ptr< css::uno::Reference<css::text::XTextRange> > T_p;
/**
depth of the current cell
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index ff44104..95ff5cd 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -10,7 +10,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEPOSITIONHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/beans/PropertyValue.hpp>
namespace writerfilter
@@ -94,7 +94,7 @@ public:
bool operator== (const TablePositionHandler& rHandler) const;
};
-typedef boost::shared_ptr<TablePositionHandler> TablePositionHandlerPtr;
+typedef std::shared_ptr<TablePositionHandler> TablePositionHandlerPtr;
} // namespace dmapper
} // namespace writerfilter
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index ff3d1bd..cdca8cb 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -25,7 +25,7 @@
#include <TableManager.hxx>
#include <dmapper/resourcemodel.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
@@ -95,7 +95,7 @@ private:
m_pCurrentProperties->InsertProps(pProps);
};
};
-typedef boost::shared_ptr<TablePropertiesHandler> TablePropertiesHandlerPtr;
+typedef std::shared_ptr<TablePropertiesHandler> TablePropertiesHandlerPtr;
} }
diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx
index 228c690..9282f5b 100644
--- a/writerfilter/source/dmapper/TagLogger.hxx
+++ b/writerfilter/source/dmapper/TagLogger.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <dmapper/resourcemodel.hxx>
#include <string>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <libxml/xmlwriter.h>
namespace writerfilter
@@ -33,7 +33,7 @@ namespace writerfilter
class IdToString
{
public:
- typedef boost::shared_ptr<IdToString> Pointer_t;
+ typedef std::shared_ptr<IdToString> Pointer_t;
virtual std::string toString(const Id & id) const = 0;
protected:
@@ -44,7 +44,7 @@ namespace writerfilter
class TagLogger
{
public:
- typedef boost::shared_ptr<TagLogger> Pointer_t;
+ typedef std::shared_ptr<TagLogger> Pointer_t;
private:
xmlTextWriterPtr pWriter;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 36b1f2c..4eca5f2 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -24,7 +24,7 @@
#include <DomainMapper.hxx>
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <comphelper/sequenceasvector.hxx>
namespace writerfilter {
@@ -79,7 +79,7 @@ private:
void resolveSprmProps(Sprm & rSprm);
};
-typedef boost::shared_ptr< TblStylePrHandler > TblStylePrHandlerPtr;
+typedef std::shared_ptr< TblStylePrHandler > TblStylePrHandlerPtr;
}}
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 043b94b..02bd9a9 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -69,7 +69,7 @@ public:
};
-typedef boost::shared_ptr<TextEffectsHandler> TextEffectsHandlerPtr;
+typedef std::shared_ptr<TextEffectsHandler> TextEffectsHandlerPtr;
}}
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 50856b2..d222728 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -56,7 +56,7 @@ public:
OUString fromLocaleToScriptTag(const OUString& sLocale);
OUString fromLCIDToScriptTag(LanguageType lang);
};
-typedef boost::shared_ptr< ThemeTable > ThemeTablePtr;
+typedef std::shared_ptr< ThemeTable > ThemeTablePtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 7d48db0..7ff7b8c 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -10,7 +10,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TRACKCHANGESHANDLER_HXX
#include "LoggedResources.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <DomainMapper_Impl.hxx>
@@ -38,8 +38,7 @@ public:
// Compute the UNO properties for the track changes object based on the received tokens.
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getRedlineProperties() const;
};
-typedef boost::shared_ptr
- < TrackChangesHandler > TrackChangesHandlerPtr;
+typedef std::shared_ptr<TrackChangesHandler> TrackChangesHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 38e5c17..2901472 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -33,7 +33,7 @@ class WrapPolygon
{
public:
typedef comphelper::SequenceAsVector<css::awt::Point> Points_t;
- typedef ::boost::shared_ptr<WrapPolygon> Pointer_t;
+ typedef ::std::shared_ptr<WrapPolygon> Pointer_t;
private:
Points_t mPoints;
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index e369326..720726d 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFACTORY_HXX
#define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFACTORY_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <dmapper/resourcemodel.hxx>
@@ -65,7 +65,7 @@ struct AttributeInfo
class OOXMLFactory_ns {
public:
- typedef boost::shared_ptr<OOXMLFactory_ns> Pointer_t;
+ typedef std::shared_ptr<OOXMLFactory_ns> Pointer_t;
virtual void startAction(OOXMLFastContextHandler * pHandler);
virtual void charactersAction(OOXMLFastContextHandler * pHandler, const OUString & rString);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 9fcd1d9..cbe6af5 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1522,7 +1522,7 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement
mpParserState->startTable();
mnTableDepth++;
- boost::shared_ptr<OOXMLPropertySet> pProps( new OOXMLPropertySetImpl );
+ std::shared_ptr<OOXMLPropertySet> pProps( new OOXMLPropertySetImpl );
{
OOXMLValue::Pointer_t pVal = OOXMLIntegerValue::Create(mnTableDepth);
OOXMLProperty::Pointer_t pProp
@@ -1540,7 +1540,7 @@ void OOXMLFastContextHandlerTextTable::lcl_endFastElement
{
endAction(Element);
- boost::shared_ptr<OOXMLPropertySet> pProps( new OOXMLPropertySetImpl );
+ std::shared_ptr<OOXMLPropertySet> pProps( new OOXMLPropertySetImpl );
{
OOXMLValue::Pointer_t pVal = OOXMLIntegerValue::Create(mnTableDepth);
OOXMLProperty::Pointer_t pProp
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index a90fa84..73a0d3b 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -41,12 +41,12 @@ namespace writerfilter {
namespace ooxml
{
-typedef boost::shared_ptr<Stream> StreamPointer_t;
+typedef std::shared_ptr<Stream> StreamPointer_t;
class OOXMLFastContextHandler: public ::cppu::WeakImplHelper1<css::xml::sax::XFastContextHandler>
{
public:
- typedef boost::shared_ptr<OOXMLFastContextHandler> Pointer_t;
+ typedef std::shared_ptr<OOXMLFastContextHandler> Pointer_t;
enum ResourceEnum_t { UNKNOWN, STREAM, PROPERTIES, TABLE, SHAPE };
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index a8d4180..46aa31f 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -18,7 +18,6 @@
*/
#include <iostream>
-#include <boost/shared_ptr.hpp>
#include "OOXMLFastDocumentHandler.hxx"
#include "OOXMLFastContextHandler.hxx"
#include "oox/token/tokens.hxx"
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index e8263ac..5a142d3 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -99,8 +99,8 @@ private:
#endif
OOXMLDocumentImpl* mpDocument;
sal_Int32 mnXNoteId;
- mutable boost::shared_ptr<OOXMLFastContextHandler> mpContextHandler;
- boost::shared_ptr<OOXMLFastContextHandler> getContextHandler() const;
+ mutable std::shared_ptr<OOXMLFastContextHandler> mpContextHandler;
+ std::shared_ptr<OOXMLFastContextHandler> getContextHandler() const;
};
}}
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 513b468..1aadb00 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -61,7 +61,7 @@ class OOXMLParserState
std::vector<SavedAlternateState> maSavedAlternateStates;
public:
- typedef boost::shared_ptr<OOXMLParserState> Pointer_t;
+ typedef std::shared_ptr<OOXMLParserState> Pointer_t;
OOXMLParserState();
virtual ~OOXMLParserState();
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 25d79eb..5ed7045 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -28,7 +28,7 @@ namespace ooxml
class OOXMLProperty : public Sprm
{
public:
- typedef boost::shared_ptr<OOXMLProperty> Pointer_t;
+ typedef std::shared_ptr<OOXMLProperty> Pointer_t;
virtual ~OOXMLProperty();
@@ -49,7 +49,7 @@ public:
class OOXMLPropertySet : public writerfilter::Reference<Properties>
{
public:
- typedef boost::shared_ptr<OOXMLPropertySet> Pointer_t;
+ typedef std::shared_ptr<OOXMLPropertySet> Pointer_t;
virtual ~OOXMLPropertySet();
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index 9d3ca78..00ca3c2 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -38,7 +38,7 @@ namespace ooxml
class OOXMLValue : public Value
{
public:
- typedef boost::shared_ptr<OOXMLValue> Pointer_t;
+ typedef std::shared_ptr<OOXMLValue> Pointer_t;
OOXMLValue();
virtual ~OOXMLValue();
@@ -65,7 +65,7 @@ private:
Type_t meType;
public:
- typedef boost::shared_ptr<OOXMLProperty> Pointer_t;
+ typedef std::shared_ptr<OOXMLProperty> Pointer_t;
OOXMLPropertyImpl(Id id, OOXMLValue::Pointer_t pValue, Type_t eType);
OOXMLPropertyImpl(const OOXMLPropertyImpl & rSprm);
@@ -281,7 +281,7 @@ public:
class OOXMLTableImpl : public OOXMLTable
{
public:
- typedef boost::shared_ptr<OOXMLValue> ValuePointer_t;
+ typedef std::shared_ptr<OOXMLValue> ValuePointer_t;
private:
typedef std::vector<ValuePointer_t> PropertySets_t;
PropertySets_t mPropertySets;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 52224f3..0bbca73 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -60,7 +60,7 @@ class OOXMLStreamImpl : public OOXMLStream
const OUString & rId,
OUString & rDocumentTarget);
public:
- typedef boost::shared_ptr<OOXMLStreamImpl> Pointer_t;
+ typedef std::shared_ptr<OOXMLStreamImpl> Pointer_t;
OOXMLStreamImpl
(OOXMLStreamImpl & rStream, StreamType_t nType);
diff --git a/writerfilter/source/ooxml/factory_ns.py b/writerfilter/source/ooxml/factory_ns.py
index 99784ed..c9194cf 100644
--- a/writerfilter/source/ooxml/factory_ns.py
+++ b/writerfilter/source/ooxml/factory_ns.py
@@ -31,7 +31,7 @@ namespace ooxml {
print("""class OOXMLFactory_%s : public OOXMLFactory_ns
{
public:
- typedef boost::shared_ptr <OOXMLFactory_ns> Pointer_t;
+ typedef std::shared_ptr <OOXMLFactory_ns> Pointer_t;
static Pointer_t getInstance();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c8ba4f4..5cae015 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2209,7 +2209,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
break;
case RTF_NESTROW:
{
- boost::shared_ptr<TableRowBuffer> const pBuffer(
+ std::shared_ptr<TableRowBuffer> const pBuffer(
new TableRowBuffer(
m_aTableBufferStack.back(),
m_aNestedTableCellsSprms,
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 86f694f..30a69d1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -87,7 +87,7 @@ struct TableRowBuffer;
/// A buffer storing dmapper calls.
typedef ::boost::tuple<RTFBufferTypes, RTFValue::Pointer_t,
- ::boost::shared_ptr<TableRowBuffer> > Buf_t;
+ ::std::shared_ptr<TableRowBuffer> > Buf_t;
typedef std::deque< Buf_t > RTFBuffer_t;
/// holds one nested table row
@@ -324,7 +324,7 @@ class RTFDocumentImpl
: public RTFDocument, public RTFListener
{
public:
- typedef ::boost::shared_ptr<RTFDocumentImpl> Pointer_t;
+ typedef ::std::shared_ptr<RTFDocumentImpl> Pointer_t;
RTFDocumentImpl(css::uno::Reference<css::uno::XComponentContext> const& xContext,
css::uno::Reference<css::io::XInputStream> const& xInputStream,
css::uno::Reference<css::lang::XComponent> const& xDstDoc,
@@ -447,10 +447,10 @@ private:
css::uno::Reference<css::task::XStatusIndicator> const& m_xStatusIndicator;
css::uno::Reference<css::lang::XMultiServiceFactory> m_xModelFactory;
css::uno::Reference<css::document::XDocumentProperties> m_xDocumentProperties;
- boost::shared_ptr<SvStream> m_pInStream;
+ std::shared_ptr<SvStream> m_pInStream;
Stream* m_pMapperStream;
- boost::shared_ptr<RTFSdrImport> m_pSdrImport;
- boost::shared_ptr<RTFTokenizer> m_pTokenizer;
+ std::shared_ptr<RTFSdrImport> m_pSdrImport;
+ std::shared_ptr<RTFTokenizer> m_pTokenizer;
RTFStack m_aStates;
/// Read by RTF_PARD.
RTFParserState m_aDefaultState;
@@ -483,7 +483,7 @@ private:
RTFSprms m_aSettingsTableSprms;
oox::StorageRef m_xStorage;
- boost::shared_ptr<oox::GraphicHelper> m_pGraphicHelper;
+ std::shared_ptr<oox::GraphicHelper> m_pGraphicHelper;
/// cell props buffer for nested tables, reset by \nestrow
/// the \nesttableprops is a destination and must follow the
@@ -546,9 +546,9 @@ private:
* (if we don't use the \objdata we use the \result element)*/
bool m_bObject;
/// Contents of the objdata group.
- boost::shared_ptr<SvStream> m_pObjectData;
+ std::shared_ptr<SvStream> m_pObjectData;
/// If the data for a picture is a binary one, it's stored here.
- boost::shared_ptr<SvStream> m_pBinaryData;
+ std::shared_ptr<SvStream> m_pBinaryData;
RTFReferenceTable::Entries_t m_aFontTableEntries;
int m_nCurrentFontIndex;
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index b90e8dd..812532f 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <boost/shared_ptr.hpp>
#include <tools/stream.hxx>
#include <rtflookahead.hxx>
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index fdf0ece..4254596 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -10,6 +10,7 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
+#include <memory>
#include <rtflistener.hxx>
#include <rtftokenizer.hxx>
@@ -49,7 +50,7 @@ public:
return m_bHasTable;
}
private:
- boost::shared_ptr<RTFTokenizer> m_pTokenizer;
+ std::shared_ptr<RTFTokenizer> m_pTokenizer;
SvStream& m_rStream;
bool m_bHasTable;
};
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 1be31de..26aa791 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -56,7 +56,7 @@ enum class RTFOverwrite
class RTFSprms
{
public:
- typedef ::boost::shared_ptr<RTFSprms> Pointer_t;
+ typedef ::std::shared_ptr<RTFSprms> Pointer_t;
typedef std::pair<Id, RTFValue::Pointer_t> Entry_t;
typedef std::vector<Entry_t>::iterator Iterator_t;
RTFSprms();
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 03c7823..5ea046d 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -25,7 +25,7 @@ class RTFValue
: public Value
{
public:
- typedef boost::shared_ptr<RTFValue> Pointer_t;
+ typedef std::shared_ptr<RTFValue> Pointer_t;
RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms,
css::uno::Reference<css::drawing::XShape> const& xShape,
css::uno::Reference<css::io::XInputStream> const& xStream,
@@ -61,13 +61,13 @@ private:
RTFValue& operator=(RTFValue const& rOther);
int m_nValue;
OUString m_sValue;
- boost::shared_ptr<RTFSprms> m_pAttributes;
- boost::shared_ptr<RTFSprms> m_pSprms;
+ std::shared_ptr<RTFSprms> m_pAttributes;
+ std::shared_ptr<RTFSprms> m_pSprms;
css::uno::Reference<css::drawing::XShape> m_xShape;
css::uno::Reference<css::io::XInputStream> m_xStream;
css::uno::Reference<css::embed::XEmbeddedObject> m_xObject;
bool m_bForceString;
- boost::shared_ptr<RTFShape> m_pShape;
+ std::shared_ptr<RTFShape> m_pShape;
};
} // namespace rtftok
} // namespace writerfilter
More information about the Libreoffice-commits
mailing list