boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

12 files changed, 27 insertions, 29 deletions

diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.hxx b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
index ae9daf31e3d1..fe3db8d85295 100644
--- a/lotuswordpro/inc/pch/precompiled_lwpft.hxx
+++ b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
@@ -19,7 +19,6 @@
 #include <assert.h>
 #include <boost/cast.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <cassert>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index c77114fe8a34..01250b9bb286 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -129,7 +129,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
     }
 
     LwpObjectID aBulletID = pBullOver->GetSilverBullet();
-    boost::shared_ptr<LwpBulletOverride> pBulletOver(pBullOver->clone());
+    std::shared_ptr<LwpBulletOverride> pBulletOver(pBullOver->clone());
 
     sal_uInt16 nNameIndex = 0;
     std::vector <OverridePair>::iterator iter;
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index a256a899d266..98a83ab2733d 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -61,8 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBULLETSTYLEMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBULLETSTYLEMGR_HXX
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "lwpheader.hxx"
 #include "lwpfoundry.hxx"
@@ -90,7 +89,7 @@ public:
     inline void SetCurrentSilverBullet(const LwpObjectID& rNewID);
 
 private:
-    typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair;
+    typedef std::pair<std::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair;
     std::vector <OUString> m_vStyleNameList;
     std::vector <OverridePair> m_vIDsPairList;
     LwpFoundry* m_pFoundry;
@@ -98,7 +97,7 @@ private:
     bool m_bContinue;
     bool m_bIsBulletSkipped;
     LwpObjectID m_aCurrentNumberingID;
-    boost::scoped_ptr<LwpNumberingOverride> m_pCurrentNumOverride;
+    std::unique_ptr<LwpNumberingOverride> m_pCurrentNumOverride;
 };
 
 inline void LwpBulletStyleMgr::SetFoundry(LwpFoundry* pFoundry)
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 68ff39c9fb91..fcf84ef77055 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -743,7 +743,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
             LwpCellLayout * pLeftNeighbour = GetCellByRowCol(nRow+iLoop, GetLeftColID(nCol), pTableLayout);
             if (pLeftNeighbour)
             {
-                boost::scoped_ptr<XFBorders> pNeighbourBorders(pLeftNeighbour->GetXFBorders());
+                std::unique_ptr<XFBorders> pNeighbourBorders(pLeftNeighbour->GetXFBorders());
                 if (pNeighbourBorders)
                 {
                     XFBorder& rRightBorder = pNeighbourBorders->GetRight();
@@ -770,7 +770,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
             LwpCellLayout * pBelowNeighbour = GetCellByRowCol(nRow + nRowSpan, nCol+iLoop, pTableLayout);
             if (pBelowNeighbour)
             {
-                boost::scoped_ptr<XFBorders> pBelowBorders(pBelowNeighbour->GetXFBorders());
+                std::unique_ptr<XFBorders> pBelowBorders(pBelowNeighbour->GetXFBorders());
                 if (pBelowBorders)
                 {
                     XFBorder& rTopBorder = pBelowBorders->GetTop();
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 8f93df0ce5cd..f84f700b79fd 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -79,7 +79,7 @@
 
 #include <sfx2/docfile.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::lang;
@@ -109,13 +109,13 @@ using namespace OpenStormBento;
     pCompressed->Read(buffer, 16);
     aDecompressed->Write(buffer, 16);
 
-    boost::scoped_ptr<LwpSvStream> aLwpStream(new LwpSvStream(pCompressed));
+    std::unique_ptr<LwpSvStream> aLwpStream(new LwpSvStream(pCompressed));
     LtcBenContainer* pBentoContainer;
     sal_uLong ulRet = BenOpenContainer(aLwpStream.get(), &pBentoContainer);
     if (ulRet != BenErr_OK)
         return false;
 
-    boost::scoped_ptr<LtcUtBenValueStream> aWordProData(pBentoContainer->FindValueStreamWithPropertyName("WordProData"));
+    std::unique_ptr<LtcUtBenValueStream> aWordProData(pBentoContainer->FindValueStreamWithPropertyName("WordProData"));
 
     if (!aWordProData.get())
         return false;
@@ -182,9 +182,9 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa
     try
     {
         LwpSvStream *pRawLwpSvStream = NULL;
-        boost::scoped_ptr<LwpSvStream> aLwpSvStream;
-        boost::scoped_ptr<LwpSvStream> aCompressedLwpSvStream;
-        boost::scoped_ptr<SvStream> aDecompressed;
+        std::unique_ptr<LwpSvStream> aLwpSvStream;
+        std::unique_ptr<LwpSvStream> aCompressedLwpSvStream;
+        std::unique_ptr<SvStream> aDecompressed;
         if (GetLwpSvStream(&rStream, pRawLwpSvStream) && pRawLwpSvStream)
         {
             SvStream *pDecompressed = pRawLwpSvStream->GetStream();
@@ -203,7 +203,7 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa
 
         aLwpSvStream.reset(pRawLwpSvStream);
 
-        boost::scoped_ptr<IXFStream> pStrm(new XFSaxStream(xHandler));
+        std::unique_ptr<IXFStream> pStrm(new XFSaxStream(xHandler));
         Lwp9Reader reader(aLwpSvStream.get(), pStrm.get());
         //Reset all static objects,because this function may be called many times.
         XFGlobalReset();
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 4499b53af8e5..becdbec6af40 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -60,7 +60,7 @@
 */
 #include <stdio.h>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include "lwp9reader.hxx"
 #include "lwpgrfobj.hxx"
@@ -342,7 +342,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData)
     // if small file, use the compressed stream for BENTO
     LwpSvStream* pStream = m_pStrm->GetCompressedStream() ?  m_pStrm->GetCompressedStream(): m_pStrm;
 
-    boost::scoped_ptr<OpenStormBento::LtcBenContainer> pBentoContainer;
+    std::unique_ptr<OpenStormBento::LtcBenContainer> pBentoContainer;
     {
         OpenStormBento::LtcBenContainer* pTmp(0);
         sal_uLong ulRet = OpenStormBento::BenOpenContainer(pStream, &pTmp);
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index a08e1f09c68e..1d51cc2da907 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1544,7 +1544,7 @@ XFColumns* LwpLayout::GetXFColumns()
 
     XFColumns* pColumns = new XFColumns();
     //set XFColumnSep
-    boost::scoped_ptr<XFColumnSep> pColumnSep(GetColumnSep());
+    std::unique_ptr<XFColumnSep> pColumnSep(GetColumnSep());
     if(pColumnSep)
     {
         pColumns->SetSeparator(*pColumnSep);
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 981aab94f404..4718f42f7cf5 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -384,7 +384,7 @@ void LwpPara::RegisterStyle()
                     OverrideAlignment(NULL,static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),pOverStyle);
                 else
                 {
-                    boost::scoped_ptr<LwpAlignmentOverride> const pAlign(
+                    std::unique_ptr<LwpAlignmentOverride> const pAlign(
                             rParaStyle.GetAlignment()->clone());
                     OverrideAlignment(pAlign.get(),
                             static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),
@@ -411,7 +411,7 @@ void LwpPara::RegisterStyle()
                     OverrideSpacing(NULL,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
                 else
                 {
-                    boost::scoped_ptr<LwpSpacingOverride> const
+                    std::unique_ptr<LwpSpacingOverride> const
                         pSpacing(rParaStyle.GetSpacing()->clone());
                     OverrideSpacing(pSpacing.get(),
                             static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index d9e0a31b65fd..b0d24878006e 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include "lwpfribheader.hxx"
 #include "lwpobj.hxx"
@@ -227,7 +227,7 @@ protected:
     LwpObjectID m_aSilverBulletID;
     LwpSilverBullet* m_pSilverBullet;
     LwpBulletOverride* m_pBullOver;
-    boost::scoped_ptr<LwpNumberingOverride> m_pParaNumbering;
+    std::unique_ptr<LwpNumberingOverride> m_pParaNumbering;
     OUString m_aBulletStyleName;
     bool m_bBullContinue;
     //end add
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 50866f077ead..5784d345d1e9 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -350,7 +350,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl
     }
 
     LwpOverride* pBorder = pParaStyle->GetParaBorder();
-    boost::scoped_ptr<LwpParaBorderOverride> pFinalBorder(
+    std::unique_ptr<LwpParaBorderOverride> pFinalBorder(
         pBorder
             ? polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone())
             : new LwpParaBorderOverride)
@@ -360,7 +360,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl
     pBorder = static_cast<LwpParaBorderProperty*>(pProps)->GetLocalParaBorder();
     if (pBorder)
     {
-        boost::scoped_ptr<LwpParaBorderOverride> pLocalBorder(
+        std::unique_ptr<LwpParaBorderOverride> pLocalBorder(
                 polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone()));
         pLocalBorder->Override(pFinalBorder.get());
     }
@@ -392,7 +392,7 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl
     pBreaks = static_cast<LwpParaBreaksProperty*>(pProps)->GetLocalParaBreaks();
     if (pBreaks)
     {
-        boost::scoped_ptr<LwpBreaksOverride> const pLocalBreaks(
+        std::unique_ptr<LwpBreaksOverride> const pLocalBreaks(
                 polymorphic_downcast<LwpBreaksOverride*>(pBreaks->clone()));
         pLocalBreaks->Override(pFinalBreaks.get());
     }
@@ -473,7 +473,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
                     : new LwpBulletOverride)
                 ;
 
-            boost::scoped_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone());
+            std::unique_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone());
             pLocalBullet2->Override(pFinalBullet.get());
 
             aSilverBulletID = pFinalBullet->GetSilverBullet();
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index 9d67ea96ebaf..b83e517a408a 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -58,7 +58,7 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include "lwpparastyle.hxx"
 #include "lwpfilehdr.hxx"
@@ -174,7 +174,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle)
         {
             if (!m_pBulletOverride->IsInValid())// for remove bullet indent in named bullet style
             {
-                boost::scoped_ptr<LwpIndentOverride> pNewIndent(pIndent->clone());
+                std::unique_ptr<LwpIndentOverride> pNewIndent(pIndent->clone());
                 pNewIndent->SetMFirst(0);
                 pNewIndent->SetMRest(0);
                 ApplyIndent(NULL, pParaStyle, pNewIndent.get());
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 7d6e844e2933..c41e039f55a9 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -263,7 +263,7 @@ double LwpSuperTableLayout::GetTableWidth()
 void LwpSuperTableLayout::ApplyShadow(XFTableStyle *pTableStyle)
 {
     // use shadow property of supertable
-    boost::scoped_ptr<XFShadow> pXFShadow(GetXFShadow());
+    std::unique_ptr<XFShadow> pXFShadow(GetXFShadow());
     if(pXFShadow)
     {
         pTableStyle->SetShadow(pXFShadow->GetPosition(), pXFShadow->GetOffset(), pXFShadow->GetColor());