editeng/source/editeng/impedit4.cxx | 25 +--
include/filter/msfilter/escherex.hxx | 1
include/sfx2/Metadatable.hxx | 15 +-
include/sfx2/docmacromode.hxx | 4
include/svl/style.hxx | 4
include/svl/stylepool.hxx | 4
include/svtools/dialogcontrolling.hxx | 9 -
include/svtools/table/tableinputhandler.hxx | 4
include/svtools/table/tablemodel.hxx | 17 --
include/svtools/table/tablerenderer.hxx | 4
include/svtools/toolpanel/drawerlayouter.hxx | 4
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 2
sd/source/core/stlfamily.cxx | 16 +-
sd/source/filter/ppt/pptin.cxx | 4
sfx2/source/doc/Metadatable.cxx | 50 +++---
sfx2/source/doc/docmacromode.cxx | 30 ++--
svl/qa/unit/items/test_IndexedStyleSheets.cxx | 2
svl/source/items/IndexedStyleSheets.cxx | 1
svl/source/items/style.cxx | 60 ++++----
svl/source/items/stylepool.cxx | 26 +--
svtools/source/uno/svtxgridcontrol.cxx | 108 +++++++--------
svtools/source/uno/svtxgridcontrol.hxx | 2
sw/inc/ToxTextGenerator.hxx | 10 -
sw/inc/fmtautofmt.hxx | 10 -
sw/inc/format.hxx | 6
sw/inc/node.hxx | 18 +-
sw/inc/unostyle.hxx | 4
sw/qa/core/test_ToxTextGenerator.cxx | 4
sw/source/core/doc/CntntIdxStore.cxx | 6
sw/source/core/doc/DocumentContentOperationsManager.cxx | 6
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/doctxm.cxx | 8 -
sw/source/core/docnode/ndtbl.cxx | 8 -
sw/source/core/docnode/node.cxx | 16 +-
sw/source/core/docnode/nodedump.cxx | 2
sw/source/core/inc/UndoDelete.hxx | 4
sw/source/core/inc/UndoTable.hxx | 10 -
sw/source/core/inc/frame.hxx | 2
sw/source/core/inc/mvsave.hxx | 4
sw/source/core/inc/rolbck.hxx | 2
sw/source/core/text/txtfld.cxx | 4
sw/source/core/tox/ToxTextGenerator.cxx | 10 -
sw/source/core/txtnode/ndhints.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 8 -
sw/source/core/txtnode/thints.cxx | 22 +--
sw/source/core/txtnode/txtedt.cxx | 4
sw/source/core/undo/unins.cxx | 4
sw/source/core/undo/unsect.cxx | 2
sw/source/core/undo/untbl.cxx | 22 +--
sw/source/core/unocore/unostyle.cxx | 3
sw/source/filter/html/htmlatr.cxx | 7
sw/source/filter/ww8/docxsdrexport.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 2
53 files changed, 297 insertions(+), 309 deletions(-)
New commits:
commit c19c242ec0757d5d5f2936e2a57430e39c692b2b
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 17 16:40:00 2015 +0000
boost->std
Change-Id: I412137e7e7b9b2b87f401bc140a9499d1fc012c6
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index e1231b7..b375a58 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -76,8 +76,7 @@
#include <svtools/rtfkeywd.hxx>
#include <editeng/edtdlg.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <memory>
#include <unordered_map>
#include <vector>
@@ -191,11 +190,11 @@ EditPaM ImpEditEngine::ReadHTML( SvStream& rInput, const
OUString& rBaseURL, Edi
EditPaM ImpEditEngine::ReadBin( SvStream& rInput, EditSelection aSel )
{
// Simply abuse a temporary text object ...
- boost::scoped_ptr<EditTextObject> pObj(EditTextObject::Create( rInput,
NULL ));
+ std::unique_ptr<EditTextObject> xObj(EditTextObject::Create( rInput, NULL
));
EditPaM aLastPaM = aSel.Max();
- if ( pObj )
- aLastPaM = InsertText( *pObj, aSel ).Max();
+ if (xObj)
+ aLastPaM = InsertText( *xObj, aSel ).Max();
return aLastPaM;
}
@@ -293,9 +292,9 @@ static void lcl_FindValidAttribs( ItemList& rLst,
ContentNode* pNode, sal_Int32
sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel,
bool bStoreUnicodeStrings )
{
- boost::scoped_ptr<EditTextObject> pObj(CreateTextObject(aSel, NULL));
- pObj->mpImpl->StoreUnicodeStrings(bStoreUnicodeStrings);
- pObj->Store(rOutput);
+ std::unique_ptr<EditTextObject> xObj(CreateTextObject(aSel, NULL));
+ xObj->mpImpl->StoreUnicodeStrings(bStoreUnicodeStrings);
+ xObj->Store(rOutput);
return 0;
}
@@ -458,7 +457,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput,
EditSelection aSel )
// StyleSheets...
if ( GetStyleSheetPool() )
{
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(GetStyleSheetPool(),
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(GetStyleSheetPool(),
SFX_STYLE_FAMILY_ALL);
// fill aStyleSheetToIdMap
sal_uInt32 nId = 1;
@@ -2496,15 +2495,15 @@ EESpellState ImpEditEngine::StartThesaurus( EditView*
pEditView )
return EE_SPELL_ERRORFOUND;
EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractThesaurusDialog>
pDlg(pFact->CreateThesaurusDialog( pEditView->GetWindow(), xThes, aWord,
GetLanguage( aCurSel.Max() ) ));
- if ( pDlg->Execute() == RET_OK )
+ std::unique_ptr<AbstractThesaurusDialog>
xDlg(pFact->CreateThesaurusDialog( pEditView->GetWindow(), xThes, aWord,
GetLanguage( aCurSel.Max() ) ));
+ if (xDlg->Execute() == RET_OK)
{
// Replace Word...
pEditView->pImpEditView->DrawSelection();
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
- pEditView->InsertText( pDlg->GetWord() );
- pEditView->ShowCursor( true, false );
+ pEditView->InsertText(xDlg->GetWord());
+ pEditView->ShowCursor(true, false);
}
return EE_SPELL_OK;
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index 884829b..75a4752 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <tools/solar.h>
#include <tools/gen.hxx>
#include <tools/stream.hxx>
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index e69fd3f..0cd51ec 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -26,8 +26,7 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/rdf/XMetadatable.hpp>
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star {
@@ -64,9 +63,8 @@ createXmlIdRegistry(const bool i_DocIsClipboard);
previous hooks</li></ul>
</p>
*/
-class SFX2_DLLPUBLIC Metadatable : private boost::noncopyable
+class SFX2_DLLPUBLIC Metadatable
{
-
public:
Metadatable() : m_pReg(0) {}
@@ -90,11 +88,11 @@ public:
const bool i_bCopyPrecedesSource = false);
/** create an Undo Metadatable, which remembers this' reference */
- ::boost::shared_ptr<MetadatableUndo> CreateUndo() const;
- ::boost::shared_ptr<MetadatableUndo> CreateUndoForDelete();
+ std::shared_ptr<MetadatableUndo> CreateUndo() const;
+ std::shared_ptr<MetadatableUndo> CreateUndoForDelete();
/** restore this from Undo Metadatable */
- void RestoreMetadata(::boost::shared_ptr<MetadatableUndo> const& i_pUndo);
+ void RestoreMetadata(std::shared_ptr<MetadatableUndo> const& i_pUndo);
/** merge this and i_rOther into this */
void JoinMetadatable(Metadatable const & i_rOther,
@@ -122,6 +120,9 @@ public:
::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0;
private:
+ Metadatable(const Metadatable&) SAL_DELETED_FUNCTION;
+ Metadatable& operator=(const Metadatable&) SAL_DELETED_FUNCTION;
+
friend class MetadatableClipboard;
friend class MetadatableUndo;
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 6f9d06a..6945c78 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace sfx2
@@ -316,7 +316,7 @@ namespace sfx2
);
private:
- ::boost::shared_ptr< DocumentMacroMode_Data > m_pData;
+ std::shared_ptr< DocumentMacroMode_Data > m_xData;
};
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 82091f1..e49dd2a 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -35,7 +35,7 @@
#include <svl/stylesheetuser.hxx>
#include <svl/style.hrc>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SfxItemSet;
class SfxItemPool;
@@ -183,7 +183,7 @@ private:
friend class SfxStyleSheetBasePool;
};
-typedef ::boost::shared_ptr< SfxStyleSheetIterator > SfxStyleSheetIteratorPtr;
+typedef std::shared_ptr< SfxStyleSheetIterator > SfxStyleSheetIteratorPtr;
class SfxStyleSheetBasePool_Impl;
diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx
index 4a971f0..61eca0b 100644
--- a/include/svl/stylepool.hxx
+++ b/include/svl/stylepool.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVL_STYLEPOOL_HXX
#define INCLUDED_SVL_STYLEPOOL_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <rtl/ustring.hxx>
#include <svl/itemset.hxx>
@@ -31,7 +31,7 @@ class SVL_DLLPUBLIC StylePool
private:
StylePoolImpl *pImpl;
public:
- typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
+ typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
explicit StylePool( SfxItemSet* pIgnorableItems = 0 );
diff --git a/include/svtools/dialogcontrolling.hxx
b/include/svtools/dialogcontrolling.hxx
index 2e4014b..c46f674 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -25,9 +25,8 @@
#include <tools/link.hxx>
#include <vcl/button.hxx>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
-
namespace svt
{
@@ -53,7 +52,7 @@ namespace svt
virtual ~IWindowOperator();
};
- typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator;
+ typedef std::shared_ptr< IWindowOperator > PWindowOperator;
//= IWindowEventFilter
@@ -68,7 +67,7 @@ namespace svt
virtual ~IWindowEventFilter();
};
- typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter;
+ typedef std::shared_ptr< IWindowEventFilter > PWindowEventFilter;
//= DialogController
@@ -123,7 +122,7 @@ namespace svt
DialogController( const DialogController& ) SAL_DELETED_FUNCTION;
DialogController& operator=( const DialogController& )
SAL_DELETED_FUNCTION;
};
- typedef ::boost::shared_ptr< DialogController > PDialogController;
+ typedef std::shared_ptr< DialogController > PDialogController;
//= ControlDependencyManager
diff --git a/include/svtools/table/tableinputhandler.hxx
b/include/svtools/table/tableinputhandler.hxx
index b08cf99..bfcc817 100644
--- a/include/svtools/table/tableinputhandler.hxx
+++ b/include/svtools/table/tableinputhandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX
#define INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
class MouseEvent;
class KeyEvent;
@@ -62,7 +62,7 @@ namespace svt { namespace table
virtual ~ITableInputHandler() { }
};
- typedef ::boost::shared_ptr< ITableInputHandler > PTableInputHandler;
+ typedef std::shared_ptr< ITableInputHandler > PTableInputHandler;
} } // namespace svt::table
diff --git a/include/svtools/table/tablemodel.hxx
b/include/svtools/table/tablemodel.hxx
index 67a0e16..ce2e002 100644
--- a/include/svtools/table/tablemodel.hxx
+++ b/include/svtools/table/tablemodel.hxx
@@ -33,19 +33,12 @@
#include <rtl/ref.hxx>
#include <sal/types.h>
-#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
+#include <memory>
namespace svt { namespace table
{
-
-
-
-
//= ScrollbarVisibility
-
enum ScrollbarVisibility
{
/** enumeration value denoting that a scrollbar should never be
visible, even
@@ -79,7 +72,7 @@ namespace svt { namespace table
/** declares an interface to be implemented by components interested in
changes in an ->ITableModel
*/
- class SAL_NO_VTABLE ITableModelListener : public
::boost::enable_shared_from_this< ITableModelListener >
+ class SAL_NO_VTABLE ITableModelListener : public
std::enable_shared_from_this< ITableModelListener >
{
public:
/** notifies the listener that one or more rows have been inserted into
@@ -157,7 +150,7 @@ namespace svt { namespace table
/// deletes the listener instance
virtual ~ITableModelListener(){};
};
- typedef ::boost::shared_ptr< ITableModelListener > PTableModelListener;
+ typedef std::shared_ptr< ITableModelListener > PTableModelListener;
//= IColumnModel
@@ -311,7 +304,7 @@ namespace svt { namespace table
/// deletes the column model instance
virtual ~IColumnModel() { }
};
- typedef ::boost::shared_ptr< IColumnModel > PColumnModel;
+ typedef std::shared_ptr< IColumnModel > PColumnModel;
//= ITableModel
@@ -532,7 +525,7 @@ namespace svt { namespace table
/// destroys the table model instance
virtual ~ITableModel() { }
};
- typedef ::boost::shared_ptr< ITableModel > PTableModel;
+ typedef std::shared_ptr< ITableModel > PTableModel;
} } // namespace svt::table
diff --git a/include/svtools/table/tablerenderer.hxx
b/include/svtools/table/tablerenderer.hxx
index 9e66e1b..a198465 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -24,7 +24,7 @@
#include <vcl/outdev.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class StyleSettings;
@@ -276,7 +276,7 @@ namespace svt { namespace table
/// deletes the renderer instance
virtual ~ITableRenderer() { }
};
- typedef ::boost::shared_ptr< ITableRenderer > PTableRenderer;
+ typedef std::shared_ptr< ITableRenderer > PTableRenderer;
} } // namespace svt::table
diff --git a/include/svtools/toolpanel/drawerlayouter.hxx
b/include/svtools/toolpanel/drawerlayouter.hxx
index 93b11f4..cba7f02 100644
--- a/include/svtools/toolpanel/drawerlayouter.hxx
+++ b/include/svtools/toolpanel/drawerlayouter.hxx
@@ -24,7 +24,7 @@
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/decklayouter.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace svt
@@ -33,7 +33,7 @@ namespace svt
class ToolPanelViewShell;
class ToolPanelDrawer;
- typedef ::boost::shared_ptr< ToolPanelDrawer > PToolPanelDrawer;
+ typedef std::shared_ptr< ToolPanelDrawer > PToolPanelDrawer;
//= ToolPanelDrawer
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index b7c350b..73baeca 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -83,7 +83,7 @@ namespace drawinglayer
{
namespace attribute
{
- typedef boost::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
+ typedef std::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
} // end of namespace attribute
} // end of namespace drawinglayer
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index fc40f11..7f52b4c 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -36,8 +36,8 @@
#include "sdpage.hxx"
#include "glob.hxx"
-#include <boost/make_shared.hpp>
#include <map>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -74,7 +74,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets()
maStyleSheets.clear();
// The iterator will return only style sheets of family master page
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(),
SD_STYLE_FAMILY_MASTERPAGE);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(),
SD_STYLE_FAMILY_MASTERPAGE);
for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle;
pStyle = aSSSIterator->Next() )
{
@@ -144,7 +144,7 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const
OUString& rName ) throw(NoSuc
}
else
{
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle;
pStyle = aSSSIterator->Next() )
{
@@ -245,7 +245,7 @@ Sequence< OUString > SAL_CALL
SdStyleFamily::getElementNames() throw(RuntimeExce
else
{
std::vector< OUString > aNames;
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle;
pStyle = aSSSIterator->Next() )
{
@@ -275,7 +275,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString&
aName ) throw(Runtim
}
else
{
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle;
pStyle = aSSSIterator->Next() )
{
@@ -313,7 +313,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements()
throw(RuntimeException, std::exce
}
else
{
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
if (aSSSIterator->First())
{
return sal_True;
@@ -337,7 +337,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount()
throw(RuntimeException, std::except
}
else
{
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle;
pStyle = aSSSIterator->Next() )
{
@@ -370,7 +370,7 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index )
throw(IndexOutOfBounds
}
else
{
- SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
+ SfxStyleSheetIteratorPtr aSSSIterator =
std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle;
pStyle = aSSSIterator->Next() )
{
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 31d9cdc..6dc9958 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -92,7 +92,7 @@
#include <oox/ole/olehelper.hxx>
#include <cassert>
-#include <boost/make_shared.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -141,7 +141,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument,
SvStream& rDocStream, SvSto
// iterate over all styles
SdStyleSheetPool* pStyleSheetPool = pDocument->GetSdStyleSheetPool();
SfxStyleSheetIteratorPtr aIter =
- boost::make_shared<SfxStyleSheetIterator>(pStyleSheetPool,
SFX_STYLE_FAMILY_ALL);
+ std::make_shared<SfxStyleSheetIterator>(pStyleSheetPool,
SFX_STYLE_FAMILY_ALL);
for (SfxStyleSheetBase *pSheet = aIter->First(); pSheet; pSheet =
aIter->Next())
{
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 331ad88..c123924 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -235,7 +235,7 @@ public:
const bool i_bCopyPrecedesSource);
/** create a Undo Metadatable for i_rObject. */
- ::boost::shared_ptr<MetadatableUndo> CreateUndo(
+ std::shared_ptr<MetadatableUndo> CreateUndo(
Metadatable const& i_rObject);
/** merge i_rMerged and i_rOther into i_rMerged. */
@@ -339,7 +339,7 @@ private:
const OUString & i_rIdref) const SAL_OVERRIDE;
/** create a Clipboard Metadatable for i_rObject. */
- ::boost::shared_ptr<MetadatableClipboard> CreateClipboard(
+ std::shared_ptr<MetadatableClipboard> CreateClipboard(
const bool i_isInContent);
struct XmlIdRegistry_Impl;
@@ -852,12 +852,12 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable
const& i_rSource,
::std::make_pair(path, idref)));
}
-::boost::shared_ptr<MetadatableUndo>
+std::shared_ptr<MetadatableUndo>
XmlIdRegistryDocument::CreateUndo(Metadatable const& i_rObject)
{
OSL_TRACE("CreateUndo: %p", &i_rObject);
- return ::boost::shared_ptr<MetadatableUndo>(
+ return std::shared_ptr<MetadatableUndo>(
new MetadatableUndo(i_rObject.IsInContent()) );
}
@@ -912,17 +912,17 @@ XmlIdRegistryDocument::JoinMetadatables(
struct RMapEntry
{
- RMapEntry() : m_pLink() { }
+ RMapEntry() : m_xLink() { }
RMapEntry(OUString const& i_rStream,
OUString const& i_rXmlId,
- ::boost::shared_ptr<MetadatableClipboard> const& i_pLink
- = ::boost::shared_ptr<MetadatableClipboard>())
- : m_Stream(i_rStream), m_XmlId(i_rXmlId), m_pLink(i_pLink)
+ std::shared_ptr<MetadatableClipboard> const& i_pLink
+ = std::shared_ptr<MetadatableClipboard>())
+ : m_Stream(i_rStream), m_XmlId(i_rXmlId), m_xLink(i_pLink)
{}
OUString m_Stream;
OUString m_XmlId;
// this would have been an auto_ptr, if only that would have compiled...
- ::boost::shared_ptr<MetadatableClipboard> m_pLink;
+ std::shared_ptr<MetadatableClipboard> m_xLink;
};
/// element -> (stream name, idref, source)
@@ -1041,7 +1041,7 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupXmlId(
"null id in m_XmlIdReverseMap");
o_rStream = iter->second.m_Stream;
o_rIdref = iter->second.m_XmlId;
- o_rpLink = iter->second.m_pLink.get();
+ o_rpLink = iter->second.m_xLink.get();
return true;
}
else
@@ -1235,12 +1235,12 @@ void
XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
-::boost::shared_ptr<MetadatableClipboard>
+std::shared_ptr<MetadatableClipboard>
XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent)
{
OSL_TRACE("CreateClipboard:");
- return ::boost::shared_ptr<MetadatableClipboard>(
+ return std::shared_ptr<MetadatableClipboard>(
new MetadatableClipboard(i_isInContent) );
}
@@ -1275,11 +1275,11 @@
XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
OSL_ENSURE(success, "RegisterCopyClipboard: TryInsert failed?");
(void) success;
}
- const ::boost::shared_ptr<MetadatableClipboard> pLink(
+ const std::shared_ptr<MetadatableClipboard> xLink(
CreateClipboard( isContentFile(i_rReference.First)) );
m_pImpl->m_XmlIdReverseMap.insert(::std::make_pair(&i_rCopy,
- RMapEntry(i_rReference.First, i_rReference.Second, pLink)));
- return *pLink.get();
+ RMapEntry(i_rReference.First, i_rReference.Second, xLink)));
+ return *xLink.get();
}
MetadatableClipboard const*
@@ -1481,7 +1481,7 @@ Metadatable::RegisterAsCopyOf(Metadatable const &
i_rSource,
}
}
-::boost::shared_ptr<MetadatableUndo> Metadatable::CreateUndo() const
+std::shared_ptr<MetadatableUndo> Metadatable::CreateUndo() const
{
OSL_ENSURE(!IsInUndo(), "CreateUndo called for object in undo?");
OSL_ENSURE(!IsInClipboard(), "CreateUndo called for object in clipboard?");
@@ -1491,29 +1491,29 @@ Metadatable::RegisterAsCopyOf(Metadatable const &
i_rSource,
{
XmlIdRegistryDocument * pRegDoc(
dynamic_cast<XmlIdRegistryDocument*>( m_pReg ) );
- ::boost::shared_ptr<MetadatableUndo> pUndo(
+ std::shared_ptr<MetadatableUndo> xUndo(
pRegDoc->CreateUndo(*this) );
- pRegDoc->RegisterCopy(*this, *pUndo, false);
- pUndo->m_pReg = pRegDoc;
- return pUndo;
+ pRegDoc->RegisterCopy(*this, *xUndo, false);
+ xUndo->m_pReg = pRegDoc;
+ return xUndo;
}
}
catch (const uno::Exception &)
{
OSL_FAIL("Metadatable::CreateUndo: exception");
}
- return ::boost::shared_ptr<MetadatableUndo>();
+ return std::shared_ptr<MetadatableUndo>();
}
-::boost::shared_ptr<MetadatableUndo> Metadatable::CreateUndoForDelete()
+std::shared_ptr<MetadatableUndo> Metadatable::CreateUndoForDelete()
{
- ::boost::shared_ptr<MetadatableUndo> const pUndo( CreateUndo() );
+ std::shared_ptr<MetadatableUndo> const xUndo( CreateUndo() );
RemoveMetadataReference();
- return pUndo;
+ return xUndo;
}
void Metadatable::RestoreMetadata(
- ::boost::shared_ptr<MetadatableUndo> const& i_pUndo)
+ std::shared_ptr<MetadatableUndo> const& i_pUndo)
{
OSL_ENSURE(!IsInUndo(), "RestoreMetadata called for object in undo?");
OSL_ENSURE(!IsInClipboard(),
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index a032d805..54fd58e 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -134,7 +134,7 @@ namespace sfx2
DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess&
rDocumentAccess )
- :m_pData( new DocumentMacroMode_Data( rDocumentAccess ) )
+ :m_xData( new DocumentMacroMode_Data( rDocumentAccess ) )
{
}
@@ -146,26 +146,26 @@ namespace sfx2
bool DocumentMacroMode::allowMacroExecution()
{
- m_pData->m_rDocumentAccess.setCurrentMacroExecMode(
MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
+ m_xData->m_rDocumentAccess.setCurrentMacroExecMode(
MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
return true;
}
bool DocumentMacroMode::disallowMacroExecution()
{
- m_pData->m_rDocumentAccess.setCurrentMacroExecMode(
MacroExecMode::NEVER_EXECUTE );
+ m_xData->m_rDocumentAccess.setCurrentMacroExecMode(
MacroExecMode::NEVER_EXECUTE );
return false;
}
bool DocumentMacroMode::adjustMacroMode( const Reference<
XInteractionHandler >& rxInteraction )
{
- sal_uInt16 nMacroExecutionMode =
m_pData->m_rDocumentAccess.getCurrentMacroExecMode();
+ sal_uInt16 nMacroExecutionMode =
m_xData->m_rDocumentAccess.getCurrentMacroExecMode();
if ( SvtSecurityOptions().IsMacroDisabled() )
{
// no macro should be executed at all
- lcl_showMacrosDisabledError( rxInteraction,
m_pData->m_bMacroDisabledMessageShown );
+ lcl_showMacrosDisabledError( rxInteraction,
m_xData->m_bMacroDisabledMessageShown );
return disallowMacroExecution();
}
@@ -217,7 +217,7 @@ namespace sfx2
try
{
- OUString sReferrer(
m_pData->m_rDocumentAccess.getDocumentLocation() );
+ OUString sReferrer(
m_xData->m_rDocumentAccess.getDocumentLocation() );
// get document location from medium name and check whether it is
a trusted one
// the service is created ohne document version, since it is not
of interest here
@@ -236,7 +236,7 @@ namespace sfx2
// at this point it is clear that the document is not in the
secure location
if ( nMacroExecutionMode == MacroExecMode::FROM_LIST_NO_WARN )
{
- lcl_showDocumentMacrosDisabledError( rxInteraction,
m_pData->m_bDocMacroDisabledMessageShown );
+ lcl_showDocumentMacrosDisabledError( rxInteraction,
m_xData->m_bDocMacroDisabledMessageShown );
return disallowMacroExecution();
}
@@ -244,14 +244,14 @@ namespace sfx2
if ( nMacroExecutionMode != MacroExecMode::FROM_LIST )
{
// the trusted macro check will also retrieve the signature
state ( small optimization )
- bool bHasTrustedMacroSignature =
m_pData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode !=
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN );
+ bool bHasTrustedMacroSignature =
m_xData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode !=
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN );
- sal_uInt16 nSignatureState =
m_pData->m_rDocumentAccess.getScriptingSignatureState();
+ sal_uInt16 nSignatureState =
m_xData->m_rDocumentAccess.getScriptingSignatureState();
if ( nSignatureState == SIGNATURESTATE_SIGNATURES_BROKEN )
{
// the signature is broken, no macro execution
if ( nMacroExecutionMode !=
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN )
- m_pData->m_rDocumentAccess.showBrokenSignatureWarning(
rxInteraction );
+ m_xData->m_rDocumentAccess.showBrokenSignatureWarning(
rxInteraction );
return disallowMacroExecution();
}
@@ -274,7 +274,7 @@ namespace sfx2
)
{
if ( nMacroExecutionMode ==
MacroExecMode::FROM_LIST_AND_SIGNED_WARN )
- lcl_showDocumentMacrosDisabledError( rxInteraction,
m_pData->m_bDocMacroDisabledMessageShown );
+ lcl_showDocumentMacrosDisabledError( rxInteraction,
m_xData->m_bDocMacroDisabledMessageShown );
return disallowMacroExecution();
}
@@ -295,7 +295,7 @@ namespace sfx2
if ( eAutoConfirm == eNoAutoConfirm )
{
- OUString sReferrer(
m_pData->m_rDocumentAccess.getDocumentLocation() );
+ OUString sReferrer(
m_xData->m_rDocumentAccess.getDocumentLocation() );
OUString aSystemFileURL;
if ( osl::FileBase::getSystemPathFromFileURL( sReferrer,
aSystemFileURL ) == osl::FileBase::E_None )
@@ -312,7 +312,7 @@ namespace sfx2
bool DocumentMacroMode::isMacroExecutionDisallowed() const
{
- return m_pData->m_rDocumentAccess.getCurrentMacroExecMode() ==
MacroExecMode::NEVER_EXECUTE;
+ return m_xData->m_rDocumentAccess.getCurrentMacroExecMode() ==
MacroExecMode::NEVER_EXECUTE;
}
@@ -369,7 +369,7 @@ namespace sfx2
#if HAVE_FEATURE_SCRIPTING
try
{
- Reference< XEmbeddedScripts > xScripts(
m_pData->m_rDocumentAccess.getEmbeddedDocumentScripts() );
+ Reference< XEmbeddedScripts > xScripts(
m_xData->m_rDocumentAccess.getEmbeddedDocumentScripts() );
Reference< XLibraryContainer > xContainer;
if ( xScripts.is() )
xContainer.set( xScripts->getBasicLibraries(), UNO_QUERY_THROW
);
@@ -422,7 +422,7 @@ namespace sfx2
}
else
{
- if ( m_pData->m_rDocumentAccess.documentStorageHasMacros() ||
hasMacroLibrary() )
+ if ( m_xData->m_rDocumentAccess.documentStorageHasMacros() ||
hasMacroLibrary() )
{
bAllow = adjustMacroMode( rxInteraction );
}
diff --git a/svl/qa/unit/items/test_IndexedStyleSheets.cxx
b/svl/qa/unit/items/test_IndexedStyleSheets.cxx
index a764e91..6509428 100644
--- a/svl/qa/unit/items/test_IndexedStyleSheets.cxx
+++ b/svl/qa/unit/items/test_IndexedStyleSheets.cxx
@@ -16,6 +16,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
+#include <algorithm>
+
using namespace svl;
class MockedStyleSheet : public SfxStyleSheetBase
diff --git a/svl/source/items/IndexedStyleSheets.cxx
b/svl/source/items/IndexedStyleSheets.cxx
index bc5b1cd..dc5b8ed 100644
--- a/svl/source/items/IndexedStyleSheets.cxx
+++ b/svl/source/items/IndexedStyleSheets.cxx
@@ -12,6 +12,7 @@
#include <svl/style.hxx>
#include <stdexcept>
+#include <algorithm>
#include <utility>
using rtl::OUString;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index eb7d722..9fc5cbc 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -35,9 +35,6 @@
#include <algorithm>
#include <comphelper/servicehelper.hxx>
-#include <boost/numeric/conversion/cast.hpp>
-#include <boost/utility.hpp>
-
#include <string.h>
#ifdef DBG_UTIL
@@ -82,8 +79,11 @@ SfxStyleSheetHint::SfxStyleSheetHint
{}
-class SfxStyleSheetBasePool_Impl : boost::noncopyable
+class SfxStyleSheetBasePool_Impl
{
+private:
+ SfxStyleSheetBasePool_Impl(const SfxStyleSheetBasePool_Impl&)
SAL_DELETED_FUNCTION;
+ SfxStyleSheetBasePool_Impl& operator=(const SfxStyleSheetBasePool_Impl&)
SAL_DELETED_FUNCTION;
public:
SfxStyleSheetIteratorPtr pIter;
@@ -93,10 +93,10 @@ public:
* This member is private and not protected in order to have more control
which style sheets are added
* where. Ideally, all calls which add/remove/change style sheets are done
in the base class.
*/
- boost::shared_ptr<svl::IndexedStyleSheets> mpIndexedStyleSheets;
+ std::shared_ptr<svl::IndexedStyleSheets> mxIndexedStyleSheets;
SfxStyleSheetBasePool_Impl() :
- mpIndexedStyleSheets(new svl::IndexedStyleSheets) {}
+ mxIndexedStyleSheets(new svl::IndexedStyleSheets) {}
};
@@ -434,16 +434,16 @@ sal_uInt16 SfxStyleSheetIterator::Count()
sal_uInt16 n = 0;
if( IsTrivialSearch())
{
- n = (sal_uInt16)
pBasePool->pImp->mpIndexedStyleSheets->GetNumberOfStyleSheets();
+ n = (sal_uInt16)
pBasePool->pImp->mxIndexedStyleSheets->GetNumberOfStyleSheets();
}
else if(nMask == SFXSTYLEBIT_ALL)
{
- n =
static_cast<sal_uInt16>(pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily).size());
+ n =
static_cast<sal_uInt16>(pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily).size());
}
else
{
DoesStyleMatchStyleSheetPredicate predicate(this);
- n =
pBasePool->pImp->mpIndexedStyleSheets->GetNumberOfStyleSheetsWithPredicate(predicate);
+ n =
pBasePool->pImp->mxIndexedStyleSheets->GetNumberOfStyleSheetsWithPredicate(predicate);
}
return n;
}
@@ -453,14 +453,14 @@ SfxStyleSheetBase*
SfxStyleSheetIterator::operator[](sal_uInt16 nIdx)
SfxStyleSheetBase* retval = NULL;
if( IsTrivialSearch())
{
- retval =
pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetByPosition(nIdx).get();
+ retval =
pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetByPosition(nIdx).get();
nAktPosition = nIdx;
}
else if(nMask == SFXSTYLEBIT_ALL)
{
rtl::Reference< SfxStyleSheetBase > ref =
- pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetByPosition(
-
pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily).at(nIdx))
+ pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetByPosition(
+
pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily).at(nIdx))
;
retval = ref.get();
nAktPosition = nIdx;
@@ -469,10 +469,10 @@ SfxStyleSheetBase*
SfxStyleSheetIterator::operator[](sal_uInt16 nIdx)
{
DoesStyleMatchStyleSheetPredicate predicate(this);
rtl::Reference< SfxStyleSheetBase > ref =
-
pBasePool->pImp->mpIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate(nIdx,
predicate);
+
pBasePool->pImp->mxIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate(nIdx,
predicate);
if (ref.get() != NULL)
{
- nAktPosition =
pBasePool->pImp->mpIndexedStyleSheets->FindStyleSheetPosition(*ref);
+ nAktPosition =
pBasePool->pImp->mxIndexedStyleSheets->FindStyleSheetPosition(*ref);
retval = ref.get();
}
}
@@ -502,35 +502,35 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
if ( IsTrivialSearch() )
{
- unsigned nStyleSheets =
pBasePool->pImp->mpIndexedStyleSheets->GetNumberOfStyleSheets();
+ unsigned nStyleSheets =
pBasePool->pImp->mxIndexedStyleSheets->GetNumberOfStyleSheets();
unsigned newPosition = nAktPosition +1;
if (nStyleSheets > newPosition)
{
nAktPosition = newPosition;
- retval =
pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetByPosition(nAktPosition).get();
+ retval =
pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetByPosition(nAktPosition).get();
}
}
else if(nMask == SFXSTYLEBIT_ALL)
{
unsigned newPosition = nAktPosition +1;
const std::vector<unsigned>& familyVector =
-
pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily);
+
pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily);
if (familyVector.size() > newPosition)
{
nAktPosition = newPosition;
unsigned stylePosition = familyVector.at(newPosition);
- retval =
pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetByPosition(stylePosition).get();
+ retval =
pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetByPosition(stylePosition).get();
}
}
else
{
DoesStyleMatchStyleSheetPredicate predicate(this);
rtl::Reference< SfxStyleSheetBase > ref =
-
pBasePool->pImp->mpIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate(
+
pBasePool->pImp->mxIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate(
0, predicate, nAktPosition+1);
retval = ref.get();
if (retval != NULL) {
- nAktPosition =
pBasePool->pImp->mpIndexedStyleSheets->FindStyleSheetPosition(*ref);
+ nAktPosition =
pBasePool->pImp->mxIndexedStyleSheets->FindStyleSheetPosition(*ref);
}
}
pAktStyle = retval;
@@ -542,14 +542,14 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Find(const
OUString& rStr)
DoesStyleMatchStyleSheetPredicate predicate(this);
std::vector<unsigned> positions =
-
pBasePool->pImp->mpIndexedStyleSheets->FindPositionsByNameAndPredicate(rStr,
predicate,
+
pBasePool->pImp->mxIndexedStyleSheets->FindPositionsByNameAndPredicate(rStr,
predicate,
svl::IndexedStyleSheets::RETURN_FIRST);
if (positions.empty()) {
return NULL;
}
unsigned pos = positions.front();
- SfxStyleSheetBase* pStyle =
pBasePool->pImp->mpIndexedStyleSheets->GetStyleSheetByPosition(pos).get();
+ SfxStyleSheetBase* pStyle =
pBasePool->pImp->mxIndexedStyleSheets->GetStyleSheetByPosition(pos).get();
nAktPosition = pos;
pAktStyle = pStyle;
return pAktStyle;
@@ -695,7 +695,7 @@ SfxStyleSheetBase& SfxStyleSheetBasePool::Add( const
SfxStyleSheetBase& rSheet )
Remove( pOld );
}
rtl::Reference< SfxStyleSheetBase > xNew( Create( rSheet ) );
- pImp->mpIndexedStyleSheets->AddStyleSheet(xNew);
+ pImp->mxIndexedStyleSheets->AddStyleSheet(xNew);
Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CHANGED, *xNew.get() ) );
return *xNew.get();
}
@@ -730,7 +730,7 @@ SfxStyleSheetBasePool& SfxStyleSheetBasePool::operator+=(
const SfxStyleSheetBas
if( &r != this )
{
AddStyleSheetCallback callback(this);
- pImp->mpIndexedStyleSheets->ApplyToAllStyleSheets(callback);
+ pImp->mxIndexedStyleSheets->ApplyToAllStyleSheets(callback);
}
return *this;
}
@@ -769,7 +769,7 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
{
// Reference to keep p alive until after Broadcast call!
rtl::Reference<SfxStyleSheetBase> xP(p);
- bool bWasRemoved = pImp->mpIndexedStyleSheets->RemoveStyleSheet(xP);
+ bool bWasRemoved = pImp->mxIndexedStyleSheets->RemoveStyleSheet(xP);
if( bWasRemoved )
{
// Adapt all styles which have this style as parant
@@ -843,7 +843,7 @@ struct StyleSheetDisposerFunctor SAL_FINAL : public
svl::StyleSheetDisposer
void SfxStyleSheetBasePool::Clear()
{
StyleSheetDisposerFunctor cleanup(this);
- pImp->mpIndexedStyleSheets->Clear(cleanup);
+ pImp->mxIndexedStyleSheets->Clear(cleanup);
}
void SfxStyleSheetBasePool::ChangeParent(const OUString& rOld,
@@ -981,7 +981,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const
::com::sun::star::un
void
SfxStyleSheetBasePool::StoreStyleSheet(rtl::Reference< SfxStyleSheetBase >
xStyle)
{
- pImp->mpIndexedStyleSheets->AddStyleSheet(xStyle);
+ pImp->mxIndexedStyleSheets->AddStyleSheet(xStyle);
}
namespace
@@ -997,19 +997,19 @@ const ::com::sun::star::uno::Sequence< ::sal_Int8 >&
SfxUnoStyleSheet::getIdenti
void
SfxStyleSheetBasePool::Reindex()
{
- pImp->mpIndexedStyleSheets->Reindex();
+ pImp->mxIndexedStyleSheets->Reindex();
}
const svl::IndexedStyleSheets&
SfxStyleSheetBasePool::GetIndexedStyleSheets() const
{
- return *pImp->mpIndexedStyleSheets;
+ return *pImp->mxIndexedStyleSheets;
}
rtl::Reference<SfxStyleSheetBase>
SfxStyleSheetBasePool::GetStyleSheetByPositionInIndex(unsigned pos)
{
- return pImp->mpIndexedStyleSheets->GetStyleSheetByPosition(pos);
+ return pImp->mxIndexedStyleSheets->GetStyleSheetByPosition(pos);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 5d478ac..1471b88 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -17,15 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vector>
-#include <map>
-
#include <svl/stylepool.hxx>
#include <svl/itemiter.hxx>
#include <svl/itempool.hxx>
-#include <boost/scoped_ptr.hpp>
-
-using namespace boost;
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <vector>
namespace {
/** A "Node" represents a subset of inserted SfxItemSets
@@ -400,27 +398,27 @@ StylePool::SfxItemSet_Pointer_t
StylePoolImpl::insertItemSet( const SfxItemSet&
// Every SfxPoolItem in the SfxItemSet causes a step deeper into the tree,
// a complete empty SfxItemSet would stay at the root node.
// #i86923# insert ignorable items to the tree leaves.
- boost::scoped_ptr<SfxItemSet> pFoundIgnorableItems;
+ std::unique_ptr<SfxItemSet> xFoundIgnorableItems;
if ( mpIgnorableItems )
{
- pFoundIgnorableItems.reset( new SfxItemSet( *mpIgnorableItems ) );
+ xFoundIgnorableItems.reset( new SfxItemSet( *mpIgnorableItems ) );
}
while( pItem )
{
if( !rSet.GetPool()->IsItemFlag(pItem->Which(), SFX_ITEM_POOLABLE ) )
bNonPoolable = true;
- if ( !pFoundIgnorableItems.get() ||
- ( pFoundIgnorableItems.get() &&
- pFoundIgnorableItems->Put( *pItem ) == 0 ) )
+ if ( !xFoundIgnorableItems.get() ||
+ ( xFoundIgnorableItems.get() &&
+ xFoundIgnorableItems->Put( *pItem ) == 0 ) )
{
pCurNode = pCurNode->findChildNode( *pItem );
}
pItem = aIter.NextItem();
}
- if ( pFoundIgnorableItems.get() &&
- pFoundIgnorableItems->Count() > 0 )
+ if ( xFoundIgnorableItems.get() &&
+ xFoundIgnorableItems->Count() > 0 )
{
- SfxItemIter aIgnorableItemsIter( *pFoundIgnorableItems );
+ SfxItemIter aIgnorableItemsIter( *xFoundIgnorableItems );
pItem = aIgnorableItemsIter.GetCurItem();
while( pItem )
{
diff --git a/svtools/source/uno/svtxgridcontrol.cxx
b/svtools/source/uno/svtxgridcontrol.cxx
index df7c51b..6fec302 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -77,7 +77,7 @@ typedef ::com::sun::star::util::Color UnoColor;
SVTXGridControl::SVTXGridControl()
- :m_pTableModel( new UnoControlTableModel() )
+ :m_xTableModel( new UnoControlTableModel() )
,m_bTableModelInitCompleted( false )
,m_aSelectionListeners( *this )
{
@@ -203,7 +203,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
break;
}
- m_pTableModel->setRowHeaderWidth( rowHeaderWidth );
+ m_xTableModel->setRowHeaderWidth( rowHeaderWidth );
// TODO: the model should broadcast this change itself, and the
table should invalidate itself as needed
pTable->Invalidate();
}
@@ -226,7 +226,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
break;
}
- m_pTableModel->setColumnHeaderHeight( columnHeaderHeight );
+ m_xTableModel->setColumnHeaderHeight( columnHeaderHeight );
// TODO: the model should broadcast this change itself, and the
table should invalidate itself as needed
pTable->Invalidate();
}
@@ -235,7 +235,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
case BASEPROPERTY_USE_GRID_LINES:
{
GridTableRenderer* pGridRenderer = dynamic_cast<
GridTableRenderer* >(
- m_pTableModel->getRenderer().get() );
+ m_xTableModel->getRenderer().get() );
if ( !pGridRenderer )
{
SAL_WARN( "svtools.uno",
"SVTXGridControl::setProperty(UseGridLines): invalid renderer!" );
@@ -260,7 +260,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
{
aValue >>= rowHeight;
}
- m_pTableModel->setRowHeight( rowHeight );
+ m_xTableModel->setRowHeight( rowHeight );
if ( rowHeight <= 0 )
{
SAL_WARN( "svtools.uno", "SVTXGridControl::setProperty:
illegal row height!" );
@@ -306,7 +306,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
{
bool bHScroll = true;
if( aValue >>= bHScroll )
- m_pTableModel->setHorizontalScrollbarVisibility( bHScroll ?
ScrollbarShowAlways : ScrollbarShowSmart );
+ m_xTableModel->setHorizontalScrollbarVisibility( bHScroll ?
ScrollbarShowAlways : ScrollbarShowSmart );
break;
}
@@ -315,7 +315,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
bool bVScroll = true;
if( aValue >>= bVScroll )
{
- m_pTableModel->setVerticalScrollbarVisibility( bVScroll ?
ScrollbarShowAlways : ScrollbarShowSmart );
+ m_xTableModel->setVerticalScrollbarVisibility( bVScroll ?
ScrollbarShowAlways : ScrollbarShowSmart );
}
break;
}
@@ -325,59 +325,59 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
bool rowHeader = true;
if( aValue >>= rowHeader )
{
- m_pTableModel->setRowHeaders(rowHeader);
+ m_xTableModel->setRowHeaders(rowHeader);
}
break;
}
case BASEPROPERTY_GRID_ROW_BACKGROUND_COLORS:
- m_pTableModel->setRowBackgroundColors( aValue );
+ m_xTableModel->setRowBackgroundColors( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_GRID_LINE_COLOR:
- m_pTableModel->setLineColor( aValue );
+ m_xTableModel->setLineColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_GRID_HEADER_BACKGROUND:
- m_pTableModel->setHeaderBackgroundColor( aValue );
+ m_xTableModel->setHeaderBackgroundColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_GRID_HEADER_TEXT_COLOR:
- m_pTableModel->setHeaderTextColor( aValue );
+ m_xTableModel->setHeaderTextColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_ACTIVE_SEL_BACKGROUND_COLOR:
- m_pTableModel->setActiveSelectionBackColor( aValue );
+ m_xTableModel->setActiveSelectionBackColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_INACTIVE_SEL_BACKGROUND_COLOR:
- m_pTableModel->setInactiveSelectionBackColor( aValue );
+ m_xTableModel->setInactiveSelectionBackColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_ACTIVE_SEL_TEXT_COLOR:
- m_pTableModel->setActiveSelectionTextColor( aValue );
+ m_xTableModel->setActiveSelectionTextColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_INACTIVE_SEL_TEXT_COLOR:
- m_pTableModel->setInactiveSelectionTextColor( aValue );
+ m_xTableModel->setInactiveSelectionTextColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_TEXTCOLOR:
- m_pTableModel->setTextColor( aValue );
+ m_xTableModel->setTextColor( aValue );
pTable->Invalidate();
break;
case BASEPROPERTY_TEXTLINECOLOR:
- m_pTableModel->setTextLineColor( aValue );
+ m_xTableModel->setTextLineColor( aValue );
pTable->Invalidate();
break;
@@ -385,7 +385,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
{
VerticalAlignment eAlign( VerticalAlignment_TOP );
if ( aValue >>= eAlign )
- m_pTableModel->setVerticalAlign( eAlign );
+ m_xTableModel->setVerticalAlign( eAlign );
break;
}
@@ -394,7 +394,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
bool colHeader = true;
if( aValue >>= colHeader )
{
- m_pTableModel->setColumnHeaders(colHeader);
+ m_xTableModel->setColumnHeaders(colHeader);
}
break;
}
@@ -404,7 +404,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
if ( !xDataModel.is() )
throw GridInvalidDataException("Invalid data model.", *this );
- m_pTableModel->setDataModel( xDataModel );
+ m_xTableModel->setDataModel( xDataModel );
impl_checkTableModelInit();
}
break;
@@ -417,10 +417,10 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
throw GridInvalidModelException("Invalid column model.", *this
);
// remove all old columns
- m_pTableModel->removeAllColumns();
+ m_xTableModel->removeAllColumns();
// announce to the TableModel
- m_pTableModel->setColumnModel( xColumnModel );
+ m_xTableModel->setColumnModel( xColumnModel );
impl_checkTableModelInit();
// add new columns
@@ -436,23 +436,23 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
void SVTXGridControl::impl_checkTableModelInit()
{
- if ( !m_bTableModelInitCompleted && m_pTableModel->hasColumnModel() &&
m_pTableModel->hasDataModel() )
+ if ( !m_bTableModelInitCompleted && m_xTableModel->hasColumnModel() &&
m_xTableModel->hasDataModel() )
{
TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
if ( pTable )
{
- pTable->SetModel( PTableModel( m_pTableModel ) );
+ pTable->SetModel( PTableModel( m_xTableModel ) );
m_bTableModelInitCompleted = true;
// ensure default columns exist, if they have not previously been
added
- Reference< XGridDataModel > const xDataModel(
m_pTableModel->getDataModel(), UNO_QUERY_THROW );
- Reference< XGridColumnModel > const xColumnModel(
m_pTableModel->getColumnModel(), UNO_QUERY_THROW );
+ Reference< XGridDataModel > const xDataModel(
m_xTableModel->getDataModel(), UNO_QUERY_THROW );
+ Reference< XGridColumnModel > const xColumnModel(
m_xTableModel->getColumnModel(), UNO_QUERY_THROW );
sal_Int32 const nDataColumnCount = xDataModel->getColumnCount();
if ( ( nDataColumnCount > 0 ) && ( xColumnModel->getColumnCount()
== 0 ) )
xColumnModel->setDefaultColumns( nDataColumnCount );
- // this will trigger notifications, which in turn will let us
update our m_pTableModel
+ // this will trigger notifications, which in turn will let us
update our m_xTableModel
}
}
}
@@ -497,31 +497,31 @@ Any SVTXGridControl::getProperty( const OUString&
PropertyName ) throw(RuntimeEx
}
case BASEPROPERTY_GRID_SHOWROWHEADER:
- aPropertyValue <<= m_pTableModel->hasRowHeaders();
+ aPropertyValue <<= m_xTableModel->hasRowHeaders();
break;
case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
- aPropertyValue <<= m_pTableModel->hasColumnHeaders();
+ aPropertyValue <<= m_xTableModel->hasColumnHeaders();
break;
case BASEPROPERTY_GRID_DATAMODEL:
- aPropertyValue <<= m_pTableModel->getDataModel();
+ aPropertyValue <<= m_xTableModel->getDataModel();
break;
case BASEPROPERTY_GRID_COLUMNMODEL:
- aPropertyValue <<= m_pTableModel->getColumnModel();
+ aPropertyValue <<= m_xTableModel->getColumnModel();
break;
case BASEPROPERTY_HSCROLL:
{
- bool const bHasScrollbar = (
m_pTableModel->getHorizontalScrollbarVisibility() != ScrollbarShowNever );
+ bool const bHasScrollbar = (
m_xTableModel->getHorizontalScrollbarVisibility() != ScrollbarShowNever );
aPropertyValue <<= bHasScrollbar;
break;
}
case BASEPROPERTY_VSCROLL:
{
- bool const bHasScrollbar = (
m_pTableModel->getVerticalScrollbarVisibility() != ScrollbarShowNever );
+ bool const bHasScrollbar = (
m_xTableModel->getVerticalScrollbarVisibility() != ScrollbarShowNever );
aPropertyValue <<= bHasScrollbar;
break;
}
@@ -529,7 +529,7 @@ Any SVTXGridControl::getProperty( const OUString&
PropertyName ) throw(RuntimeEx
case BASEPROPERTY_USE_GRID_LINES:
{
GridTableRenderer* pGridRenderer = dynamic_cast< GridTableRenderer* >(
- m_pTableModel->getRenderer().get() );
+ m_xTableModel->getRenderer().get() );
if ( !pGridRenderer )
{
SAL_WARN( "svtools.uno",
"SVTXGridControl::getProperty(UseGridLines): invalid renderer!" );
@@ -542,7 +542,7 @@ Any SVTXGridControl::getProperty( const OUString&
PropertyName ) throw(RuntimeEx
case BASEPROPERTY_GRID_ROW_BACKGROUND_COLORS:
{
- ::boost::optional< ::std::vector< ::Color > > aColors(
m_pTableModel->getRowBackgroundColors() );
+ ::boost::optional< ::std::vector< ::Color > > aColors(
m_xTableModel->getRowBackgroundColors() );
if ( !aColors )
aPropertyValue.clear();
else
@@ -558,39 +558,39 @@ Any SVTXGridControl::getProperty( const OUString&
PropertyName ) throw(RuntimeEx
break;
case BASEPROPERTY_GRID_LINE_COLOR:
- lcl_convertColor( m_pTableModel->getLineColor(), aPropertyValue );
+ lcl_convertColor( m_xTableModel->getLineColor(), aPropertyValue );
break;
case BASEPROPERTY_GRID_HEADER_BACKGROUND:
- lcl_convertColor( m_pTableModel->getHeaderBackgroundColor(),
aPropertyValue );
+ lcl_convertColor( m_xTableModel->getHeaderBackgroundColor(),
aPropertyValue );
break;
case BASEPROPERTY_GRID_HEADER_TEXT_COLOR:
- lcl_convertColor( m_pTableModel->getHeaderTextColor(), aPropertyValue
);
+ lcl_convertColor( m_xTableModel->getHeaderTextColor(), aPropertyValue
);
break;
case BASEPROPERTY_ACTIVE_SEL_BACKGROUND_COLOR:
- lcl_convertColor( m_pTableModel->getActiveSelectionBackColor(),
aPropertyValue );
+ lcl_convertColor( m_xTableModel->getActiveSelectionBackColor(),
aPropertyValue );
break;
case BASEPROPERTY_INACTIVE_SEL_BACKGROUND_COLOR:
- lcl_convertColor( m_pTableModel->getInactiveSelectionBackColor(),
aPropertyValue );
+ lcl_convertColor( m_xTableModel->getInactiveSelectionBackColor(),
aPropertyValue );
break;
case BASEPROPERTY_ACTIVE_SEL_TEXT_COLOR:
- lcl_convertColor( m_pTableModel->getActiveSelectionTextColor(),
aPropertyValue );
+ lcl_convertColor( m_xTableModel->getActiveSelectionTextColor(),
aPropertyValue );
break;
case BASEPROPERTY_INACTIVE_SEL_TEXT_COLOR:
- lcl_convertColor( m_pTableModel->getInactiveSelectionTextColor(),
aPropertyValue );
+ lcl_convertColor( m_xTableModel->getInactiveSelectionTextColor(),
aPropertyValue );
break;
case BASEPROPERTY_TEXTCOLOR:
- lcl_convertColor( m_pTableModel->getTextColor(), aPropertyValue );
+ lcl_convertColor( m_xTableModel->getTextColor(), aPropertyValue );
break;
case BASEPROPERTY_TEXTLINECOLOR:
- lcl_convertColor( m_pTableModel->getTextLineColor(), aPropertyValue );
+ lcl_convertColor( m_xTableModel->getTextLineColor(), aPropertyValue );
break;
default:
@@ -605,7 +605,7 @@ Any SVTXGridControl::getProperty( const OUString&
PropertyName ) throw(RuntimeEx
void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event )
throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- m_pTableModel->notifyRowsInserted( i_event );
+ m_xTableModel->notifyRowsInserted( i_event );
}
@@ -613,7 +613,7 @@ void SAL_CALL
SVTXGridControl::rowsRemoved( const GridDataEvent& i_event ) throw
(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- m_pTableModel->notifyRowsRemoved( i_event );
+ m_xTableModel->notifyRowsRemoved( i_event );
}
@@ -621,7 +621,7 @@ void SAL_CALL SVTXGridControl::dataChanged( const
GridDataEvent& i_event ) throw
{
SolarMutexGuard aGuard;
- m_pTableModel->notifyDataChanged( i_event );
+ m_xTableModel->notifyDataChanged( i_event );
// if the data model is sortable, a dataChanged event is also fired in
case the sort order changed.
// So, just in case, invalidate the column header area, too.
@@ -650,9 +650,9 @@ void SAL_CALL SVTXGridControl::elementInserted( const
ContainerEvent& i_event )
Reference< XGridColumn > const xGridColumn( i_event.Element,
UNO_QUERY_THROW );
- sal_Int32 nIndex( m_pTableModel->getColumnCount() );
+ sal_Int32 nIndex( m_xTableModel->getColumnCount() );
OSL_VERIFY( i_event.Accessor >>= nIndex );
- m_pTableModel->insertColumn( nIndex, xGridColumn );
+ m_xTableModel->insertColumn( nIndex, xGridColumn );
}
@@ -662,7 +662,7 @@ void SAL_CALL SVTXGridControl::elementRemoved( const
ContainerEvent& i_event ) t
sal_Int32 nIndex( -1 );
OSL_VERIFY( i_event.Accessor >>= nIndex );
- m_pTableModel->removeColumn( nIndex );
+ m_xTableModel->removeColumn( nIndex );
}
@@ -857,7 +857,7 @@ void SVTXGridControl::setEnable( sal_Bool bEnable )
throw(::com::sun::star::uno:
{
SolarMutexGuard aGuard;
- m_pTableModel->setEnabled( bEnable );
+ m_xTableModel->setEnabled( bEnable );
vcl::Window * pWindow = GetWindow();
if ( pWindow )
{
@@ -889,7 +889,7 @@ void SVTXGridControl::ImplCallItemListeners()
void SVTXGridControl::impl_updateColumnsFromModel_nothrow()
{
- Reference< XGridColumnModel > const xColumnModel(
m_pTableModel->getColumnModel() );
+ Reference< XGridColumnModel > const xColumnModel(
m_xTableModel->getColumnModel() );
ENSURE_OR_RETURN_VOID( xColumnModel.is(), "no model!" );
TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
ENSURE_OR_RETURN_VOID( pTable != NULL, "no table!" );
@@ -908,7 +908,7 @@ void SVTXGridControl::impl_updateColumnsFromModel_nothrow()
continue;
}
- m_pTableModel->appendColumn( *colRef );
+ m_xTableModel->appendColumn( *colRef );
}
}
catch( const Exception& )
diff --git a/svtools/source/uno/svtxgridcontrol.hxx
b/svtools/source/uno/svtxgridcontrol.hxx
index 2deadde..f533a19 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -51,7 +51,7 @@ typedef ::cppu::ImplInheritanceHelper4 < VCLXWindow
class SVTXGridControl : public SVTXGridControl_Base
{
private:
- ::boost::shared_ptr< ::svt::table::UnoControlTableModel > m_pTableModel;
+ std::shared_ptr< ::svt::table::UnoControlTableModel > m_xTableModel;
bool
m_bTableModelInitCompleted;
SelectionListenerMultiplexer
m_aSelectionListeners;
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 45af131..57f9089 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -24,7 +24,7 @@
#include "sal/types.h"
#include "swdllapi.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
class SfxItemSet;
@@ -57,7 +57,7 @@ class ToxTabStopTokenHandler;
class ToxTextGenerator
{
public:
- ToxTextGenerator(const SwForm& toxForm,
boost::shared_ptr<ToxTabStopTokenHandler> tabStopHandler);
+ ToxTextGenerator(const SwForm& toxForm,
std::shared_ptr<ToxTabStopTokenHandler> tabStopHandler);
virtual ~ToxTextGenerator();
@@ -72,8 +72,8 @@ public:
private:
const SwForm& mToxForm;
- boost::shared_ptr<ToxLinkProcessor> mLinkProcessor;
- boost::shared_ptr<ToxTabStopTokenHandler> mTabStopTokenHandler;
+ std::shared_ptr<ToxLinkProcessor> mLinkProcessor;
+ std::shared_ptr<ToxTabStopTokenHandler> mTabStopTokenHandler;
/** A handled text token.
* It contains the information which should be added to the target text
node.
@@ -116,7 +116,7 @@ private:
* @param hint The hint from which the attributes are taken
* @param pool The attribute pool for the new items
*/
- static boost::shared_ptr<SfxItemSet>
+ static std::shared_ptr<SfxItemSet>
CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool);
/** This method will call GetNumStringOfFirstNode() of the first node in
the provided SwTOXSortTabBase.
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 6a8381d..dea9fc0 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -21,11 +21,11 @@
#include <svl/poolitem.hxx>
#include <format.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SwFmtAutoFmt: public SfxPoolItem
{
- boost::shared_ptr<SfxItemSet> mpHandle;
+ std::shared_ptr<SfxItemSet> mpHandle;
public:
SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
@@ -54,9 +54,9 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) SAL_OVERRIDE;
- void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle =
pHandle; }
- const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return
mpHandle; }
- boost::shared_ptr<SfxItemSet> GetStyleHandle() { return mpHandle; }
+ void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle =
pHandle; }
+ const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return
mpHandle; }
+ std::shared_ptr<SfxItemSet> GetStyleHandle() { return mpHandle; }
};
#endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index c54fb05..ec7ae44 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -24,7 +24,7 @@
#include <swatrset.hxx>
#include <calbck.hxx>
#include <hintids.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class IDocumentSettingAccess;
class IDocumentDrawModelAccess;
@@ -37,7 +37,7 @@ class SfxGrabBagItem;
namespace drawinglayer { namespace attribute {
class SdrAllFillAttributesHelper;
- typedef boost::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
+ typedef std::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
}}
/// Base class for various Writer styles.
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwFmt : public SwModify
bool bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
at format (UI-side!). */
bool bHidden : 1;
- boost::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style
InteropGrabBag.
+ std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
protected:
SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index c6e1731..03dc719 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -20,11 +20,6 @@
#ifndef INCLUDED_SW_INC_NODE_HXX
#define INCLUDED_SW_INC_NODE_HXX
-#include <vector>
-
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
-
#include <sal/types.h>
#include <tools/mempool.hxx>
@@ -34,6 +29,9 @@
#include <index.hxx>
#include <fmtcol.hxx>
+#include <memory>
+#include <vector>
+
// forward declarations
class SwCntntFrm;
@@ -77,7 +75,7 @@ typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx
//UUUU
namespace drawinglayer { namespace attribute {
class SdrAllFillAttributesHelper;
- typedef boost::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
+ typedef std::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
}}
/// Base class of the Writer document model elements.
@@ -363,7 +361,7 @@ protected:
/** Attribute-set for all auto attributes of a CntntNode.
(e.g. TxtNode or NoTxtNode). */
- boost::shared_ptr<const SfxItemSet> mpAttrSet;
+ std::shared_ptr<const SfxItemSet> mpAttrSet;
/// Make respective nodes create the specific AttrSets.
virtual void NewAttrSet( SwAttrPool& ) = 0;
@@ -525,12 +523,14 @@ private:
class SwSectionNode
: public SwStartNode
- , private ::boost::noncopyable
{
friend class SwNodes;
private:
- ::std::unique_ptr<SwSection> const m_pSection;
+ SwSectionNode(const SwSectionNode&) SAL_DELETED_FUNCTION;
+ SwSectionNode& operator=(const SwSectionNode&) SAL_DELETED_FUNCTION;
+
+ std::unique_ptr<SwSection> const m_pSection;
protected:
virtual ~SwSectionNode();
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 7d21040..be8c04b 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_UNOSTYLE_HXX
#define INCLUDED_SW_INC_UNOSTYLE_HXX
-#include <boost/shared_ptr.hpp>
#include <svl/style.hxx>
#include <svl/lstner.hxx>
#include <unocoll.hxx>
@@ -41,6 +40,7 @@
#include <com/sun/star/style/XAutoStyle.hpp>
#include <istyleaccess.hxx>
+#include <memory>
class SwDocShell;
class SfxItemPropertySet;
@@ -49,7 +49,7 @@ class SwStyleProperties_Impl;
class SwAutoStylesEnumImpl;
class IStyleAccess;
class SfxItemSet;
-typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
+typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
class SwXStyleFamilies : public cppu::WeakImplHelper4
<
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx
b/sw/qa/core/test_ToxTextGenerator.cxx
index 7f622d0..2101c4a 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -15,7 +15,7 @@
#include "ToxTextGenerator.hxx"
#include "ToxTabStopTokenHandler.hxx"
-#include <boost/make_shared.hpp>
+#include <memory>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
@@ -117,7 +117,7 @@ public:
class ToxTextGeneratorWithMockedChapterField : public ToxTextGenerator {
public:
ToxTextGeneratorWithMockedChapterField(SwForm &form)
- : ToxTextGenerator(form,
boost::make_shared<MockedToxTabStopTokenHandler>()),
+ : ToxTextGenerator(form, std::make_shared<MockedToxTabStopTokenHandler>()),
mChapterFieldType(), mChapterField(&mChapterFieldType) {;}
SwChapterField&
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index 439b1b3..25d4ca3 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -19,7 +19,6 @@
#include <bookmrk.hxx>
#include <boost/function.hpp>
-#include <boost/make_shared.hpp>
#include <cntfrm.hxx>
#include <doc.hxx>
#include <IDocumentRedlineAccess.hxx>
@@ -39,6 +38,7 @@
#include <sal/types.h>
#include <unocrsr.hxx>
#include <edimp.hxx>
+#include <memory>
using namespace ::boost;
using namespace ::sw::mark;
@@ -437,9 +437,9 @@ void CntntIdxStoreImpl::RestoreShellCrsrs(updater_t&
rUpdater)
}
namespace sw { namespace mark {
- boost::shared_ptr<CntntIdxStore> CntntIdxStore::Create()
+ std::shared_ptr<CntntIdxStore> CntntIdxStore::Create()
{
- return boost::make_shared<CntntIdxStoreImpl>();
+ return std::make_shared<CntntIdxStoreImpl>();
}
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 4323e00..99366fb 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1959,7 +1959,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
bSplit = true;
const sal_Int32 nMkCntnt = rPaM.GetMark()->nContent.GetIndex();
- const boost::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(),
rPos.nContent.GetIndex(), true );
pTNd = pTNd->SplitCntntNode( rPos )->GetTxtNode();
@@ -2880,7 +2880,7 @@ bool DocumentContentOperationsManager::SplitNode( const
SwPosition &rPos, bool b
}
}
- const boost::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(),
rPos.nContent.GetIndex(), true );
// FIXME: only SwTxtNode has a valid implementation of SplitCntntNode!
OSL_ENSURE(pNode->IsTxtNode(), "splitting non-text node?");
@@ -4096,7 +4096,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM&
rPam, SwPosition& rPos,
SwUndoCpyDoc* pUndo = 0;
// lcl_DeleteRedlines may delete the start or end node of the cursor when
// removing the redlines so use cursor that is corrected by PaMCorrAbs
- ::boost::scoped_ptr<SwUnoCrsr> const pCopyPam(pDoc->CreateUnoCrsr(rPos));
+ std::unique_ptr<SwUnoCrsr> const pCopyPam(pDoc->CreateUnoCrsr(rPos));
SwTblNumFmtMerge aTNFM( m_rDoc, *pDoc );
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 01c0b16..e3cc45e 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -378,7 +378,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
}
pOldTxtNd->FmtToTxtAttr( pTxtNd );
- const boost::shared_ptr< sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr< sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
pCntntStore->Save( pDoc, aOldIdx.GetIndex(), pOldTxtNd->Len()
);
SwIndex aAlphaIdx(pTxtNd);
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 35fb4c5..e0fa41f 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -73,7 +73,7 @@
#include <ToxTabStopTokenHandler.hxx>
#include <tools/datetimeutils.hxx>
-#include <boost/make_shared.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -995,8 +995,8 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
// to method <GenerateText(..)>.
::SetProgressState( 0, pDoc->GetDocShell() );
- boost::shared_ptr<sw::ToxTabStopTokenHandler> tabStopTokenHandler =
- boost::make_shared<sw::DefaultToxTabStopTokenHandler>(
+ std::shared_ptr<sw::ToxTabStopTokenHandler> tabStopTokenHandler =
+ std::make_shared<sw::DefaultToxTabStopTokenHandler>(
pSectNd->GetIndex(), *pDefaultPageDesc,
GetTOXForm().IsRelTabPos(),
pDoc->GetDocumentSettingManager().get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT)
?
sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_INDENT :
@@ -1678,7 +1678,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
const SwTOXInternational& rIntl )
{
// collect starts end ends of main entry character style
- boost::scoped_ptr< std::vector<sal_uInt16> > xCharStyleIdx(pMainEntryNums
? new std::vector<sal_uInt16> : 0);
+ std::unique_ptr< std::vector<sal_uInt16> > xCharStyleIdx(pMainEntryNums ?
new std::vector<sal_uInt16> : 0);
OUString sSrchStr = OUStringBuffer().append(C_NUM_REPL).
append(S_PAGE_DELI).append(C_NUM_REPL).makeStringAndClear();
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c0cceb4..fa262de 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -748,8 +748,8 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
if( pTAFmt || ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) )
{
sal_uInt8 nBoxArrLen = pTAFmt ? 16 : 4;
- boost::scoped_ptr< DfltBoxAttrList_t > aBoxFmtArr1;
- boost::scoped_ptr< std::vector<SwTableBoxFmt*> > aBoxFmtArr2;
+ std::unique_ptr< DfltBoxAttrList_t > aBoxFmtArr1;
+ std::unique_ptr< std::vector<SwTableBoxFmt*> > aBoxFmtArr2;
if( bUseBoxFmt )
{
aBoxFmtArr1.reset(new DfltBoxAttrList_t( nBoxArrLen, NULL ));
@@ -1052,7 +1052,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange&
rRange, sal_Unicode cCh,
SwStartNode* pSttNd;
SwPosition aCntPos( aSttIdx, SwIndex( pTxtNd ));
- const boost::shared_ptr< sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr< sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
pCntntStore->Save( pDoc, aSttIdx.GetIndex(),
pTxtNd->GetTxt().getLength() );
if( T2T_PARA != cCh )
@@ -1520,7 +1520,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara*
pDelPara )
pDelPara->pUndo->AddBoxPos( *pDoc, nNdIdx,
aDelRg.aEnd.GetIndex(),
aCntIdx.GetIndex() );
- const boost::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
const sal_Int32 nOldTxtLen = aCntIdx.GetIndex();
pCntntStore->Save( pDoc, nNdIdx,
pCurTxtNd->GetTxt().getLength() );
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 544352d..d9700e9 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -81,7 +81,7 @@ TYPEINIT2( SwCntntNode, SwModify, SwIndexReg )
namespace AttrSetHandleHelper
{
-void GetNewAutoStyle( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+void GetNewAutoStyle( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode,
SwAttrSet& rNewAttrSet )
{
@@ -96,7 +96,7 @@ void GetNewAutoStyle( boost::shared_ptr<const SfxItemSet>&
rpAttrSet,
rNode.SetModifyAtAttr( bSetModifyAtAttr );
}
-void SetParent( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode,
const SwFmt* pParentFmt,
const SwFmt* pConditionalFmt )
@@ -132,7 +132,7 @@ void SetParent( boost::shared_ptr<const SfxItemSet>&
rpAttrSet,
}
}
-const SfxPoolItem* Put( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+const SfxPoolItem* Put( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode,
const SfxPoolItem& rAttr )
{
@@ -143,7 +143,7 @@ const SfxPoolItem* Put( boost::shared_ptr<const
SfxItemSet>& rpAttrSet,
return pRet;
}
-bool Put( boost::shared_ptr<const SfxItemSet>& rpAttrSet, const SwCntntNode&
rNode,
+bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwCntntNode&
rNode,
const SfxItemSet& rSet )
{
SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -171,7 +171,7 @@ bool Put( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNo
return nRet;
}
-bool Put_BC( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode, const SfxPoolItem& rAttr,
SwAttrSet* pOld, SwAttrSet* pNew )
{
@@ -190,7 +190,7 @@ bool Put_BC( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
return nRet;
}
-bool Put_BC( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode, const SfxItemSet& rSet,
SwAttrSet* pOld, SwAttrSet* pNew )
{
@@ -224,7 +224,7 @@ bool Put_BC( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
return nRet;
}
-sal_uInt16 ClearItem_BC( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode, sal_uInt16 nWhich,
SwAttrSet* pOld, SwAttrSet* pNew )
{
@@ -237,7 +237,7 @@ sal_uInt16 ClearItem_BC( boost::shared_ptr<const
SfxItemSet>& rpAttrSet,
return nRet;
}
-sal_uInt16 ClearItem_BC( boost::shared_ptr<const SfxItemSet>& rpAttrSet,
+sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
const SwCntntNode& rNode,
sal_uInt16 nWhich1, sal_uInt16 nWhich2,
SwAttrSet* pOld, SwAttrSet* pNew )
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 24f35e4..7ab7fe8 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -324,7 +324,7 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) const
if (pHint->Which() == RES_TXTATR_AUTOFMT)
{
- boost::shared_ptr<SfxItemSet> const
pSet(pHint->GetAutoFmt().GetStyleHandle());
+ std::shared_ptr<SfxItemSet> const
pSet(pHint->GetAutoFmt().GetStyleHandle());
writer.startElement("autofmt");
pSet->dumpAsXml(writer);
writer.endElement();
diff --git a/sw/source/core/inc/UndoDelete.hxx
b/sw/source/core/inc/UndoDelete.hxx
index 4cec6dc..965bfe8 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -40,8 +40,8 @@ class SwUndoDelete
OUString *pSttStr, *pEndStr;
SwRedlineData* pRedlData;
SwRedlineSaveDatas* pRedlSaveData;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
OUString sTableName;
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 8eb9ba3..6aac04f 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -21,12 +21,12 @@
#define INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
#include <undobj.hxx>
-#include <vector>
#include <set>
#include <swtypes.hxx>
#include <itabenum.hxx>
+#include <memory>
+#include <vector>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
class SfxItemSet;
@@ -145,7 +145,7 @@ class SwUndoTblAutoFmt : public SwUndo
{
sal_uLong nSttNode;
_SaveTable* pSaveTbl;
- ::std::vector< ::boost::shared_ptr<SwUndoTblNumFmt> > m_Undos;
+ std::vector< std::shared_ptr<SwUndoTblNumFmt> > m_Undos;
bool bSaveCntntAttr;
sal_uInt16 m_nRepeatHeading;
@@ -173,8 +173,8 @@ class SwUndoTblNdsChg : public SwUndo, private
boost::noncopyable
_BoxMove(sal_uLong idx, bool moved=false) : index(idx),
hasMoved(moved) {};
bool operator<(const _BoxMove other) const { return index <
other.index; };
};
- boost::scoped_ptr< std::set<_BoxMove> > pNewSttNds;
- boost::scoped_ptr< SwUndoSaveSections > pDelSects;
+ std::unique_ptr< std::set<_BoxMove> > pNewSttNds;
+ std::unique_ptr< SwUndoSaveSections > pDelSects;
long nMin, nMax; // for redo of delete column
sal_uLong nSttNode, nCurrBox;
sal_uInt16 nCount, nRelDiff, nAbsDiff, nSetColType;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index f103eca..aeed003 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -203,7 +203,7 @@ enum MakePageType
//UUUU
namespace drawinglayer { namespace attribute {
class SdrAllFillAttributesHelper;
- typedef boost::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
+ typedef std::shared_ptr< SdrAllFillAttributesHelper >
SdrAllFillAttributesHelperPtr;
}}
/**
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index c3de3be..412f290 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -68,7 +68,7 @@ namespace sw { namespace mark
sal_uLong m_nNode2;
sal_Int32 m_nCntnt1;
sal_Int32 m_nCntnt2;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndo;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndo;
};
/// Takes care of storing relevant attributes of an SwTxtNode before
split, then restore them on the new node.
@@ -81,7 +81,7 @@ namespace sw { namespace mark
virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32
nOffset=0, bool bAuto = false) =0;
virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32
nCorrLen) =0;
virtual ~CntntIdxStore() {};
- static boost::shared_ptr<CntntIdxStore> Create();
+ static std::shared_ptr<CntntIdxStore> Create();
};
}}
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 65bb964..c26665e 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -260,7 +260,7 @@ class SwHistoryBookmark : public SwHistoryHint
const bool m_bSaveOtherPos;
const bool m_bHadOtherPos;
const IDocumentMarkAccess::MarkType m_eBkmkType;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndo;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndo;
};
class SwHistorySetAttrSet : public SwHistoryHint
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index fc5cb0d..e98104e 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -427,10 +427,10 @@ static void checkApplyParagraphMarkFormatToNumbering(
SwFont* pNumFnt, SwTxtForm
if( hint->Which() == RES_TXTATR_AUTOFMT && hint->GetEnd() != NULL
&& hint->GetStart() == *hint->GetEnd() && hint->GetStart() ==
node->Len())
{
- boost::shared_ptr<SfxItemSet>
pSet(hint->GetAutoFmt().GetStyleHandle());
+ std::shared_ptr<SfxItemSet>
pSet(hint->GetAutoFmt().GetStyleHandle());
// Check each item and in case it should be ignored, then
clear it.
- boost::shared_ptr<SfxItemSet> pCleanedSet;
+ std::shared_ptr<SfxItemSet> pCleanedSet;
if (pSet.get())
{
pCleanedSet.reset(pSet->Clone());
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx
b/sw/source/core/tox/ToxTextGenerator.cxx
index 56f753f..eb4194a 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -41,8 +41,8 @@
#include "svl/itemiter.hxx"
-#include <boost/make_shared.hpp>
#include <cassert>
+#include <memory>
namespace {
@@ -92,7 +92,7 @@ ToxTextGenerator::GetNumStringOfFirstNode( const
SwTOXSortTabBase& rBase, bool b
ToxTextGenerator::ToxTextGenerator(const SwForm& toxForm,
- boost::shared_ptr<ToxTabStopTokenHandler> tabStopHandler)
+ std::shared_ptr<ToxTabStopTokenHandler> tabStopHandler)
: mToxForm(toxForm),
mLinkProcessor(new ToxLinkProcessor()),
mTabStopTokenHandler(tabStopHandler)
@@ -264,10 +264,10 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const
std::vector<SwTOXSortTabBase*>
mLinkProcessor->InsertLinkAttributes(*pTOXNd);
}
-/*static*/ boost::shared_ptr<SfxItemSet>
+/*static*/ std::shared_ptr<SfxItemSet>
ToxTextGenerator::CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool&
pool)
{
- boost::shared_ptr<SfxItemSet> retval(new SfxItemSet(pool));
+ std::shared_ptr<SfxItemSet> retval(new SfxItemSet(pool));
if (hint.Which() != RES_TXTATR_AUTOFMT) {
return retval;
}
@@ -304,7 +304,7 @@ ToxTextGenerator::HandleTextToken(const SwTOXSortTabBase&
source, SwAttrPool& po
const SwpHints& hints = pSrc->GetSwpHints();
for (size_t i = 0; i < hints.Count(); ++i) {
const SwTxtAttr* hint = hints[i];
- boost::shared_ptr<SfxItemSet> attributesToClone =
CollectAttributesForTox(*hint, pool);
+ std::shared_ptr<SfxItemSet> attributesToClone =
CollectAttributesForTox(*hint, pool);
if (attributesToClone->Count() <= 0) {
continue;
}
diff --git a/sw/source/core/txtnode/ndhints.cxx
b/sw/source/core/txtnode/ndhints.cxx
index 6cd9ec9..bbaea16 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -173,7 +173,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
SwTxtAttr const*const pHint(m_HintStarts[i]);
if (RES_TXTATR_AUTOFMT == pHint->Which())
{
- boost::shared_ptr<SfxItemSet> const pSet(
+ std::shared_ptr<SfxItemSet> const pSet(
pHint->GetAutoFmt().GetStyleHandle());
if (pSet->Count() == 1 && pSet->GetItem(RES_CHRATR_RSID,
false))
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 9b1b4a2..e157578 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -85,7 +85,7 @@
#include <sortedobjs.hxx>
#include <switerator.hxx>
#include <attrhint.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//UUUU
#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
@@ -636,7 +636,7 @@ SwCntntNode *SwTxtNode::JoinNext()
if( SwCntntNode::CanJoinNext( &aIdx ) )
{
SwDoc* pDoc = rNds.GetDoc();
- const boost::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
pCntntStore->Save(pDoc, aIdx.GetIndex(), SAL_MAX_INT32);
SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
sal_Int32 nOldLen = m_Text.getLength();
@@ -730,7 +730,7 @@ SwCntntNode *SwTxtNode::JoinPrev()
if( SwCntntNode::CanJoinPrev( &aIdx ) )
{
SwDoc* pDoc = rNds.GetDoc();
- const boost::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
pCntntStore->Save( pDoc, aIdx.GetIndex(), SAL_MAX_INT32);
SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
const sal_Int32 nLen = pTxtNode->Len();
@@ -848,7 +848,7 @@ void SwTxtNode::Update(
{
SetAutoCompleteWordDirty( true );
- boost::scoped_ptr<SwpHts> pCollector;
+ std::unique_ptr<SwpHts> pCollector;
const sal_Int32 nChangePos = rPos.GetIndex();
if ( HasHints() )
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index 343eb64..a22b7dc 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -74,7 +74,7 @@
#include <svl/smplhint.hxx>
#include <algorithm>
#include <map>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#ifdef DBG_UTIL
#define CHECK Check(true);
@@ -768,7 +768,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr&
rNewHint,
// the new character format:
OSL_ENSURE( RES_TXTATR_AUTOFMT == (*aIter)->Which(),
"AUTOSTYLES - Misc trouble" );
SwTxtAttr* pOther = *aIter;
- boost::shared_ptr<SfxItemSet> pOldStyle =
static_cast<const SwFmtAutoFmt&>(pOther->GetAttr()).GetStyleHandle();
+ std::shared_ptr<SfxItemSet> pOldStyle = static_cast<const
SwFmtAutoFmt&>(pOther->GetAttr()).GetStyleHandle();
// For each attribute in the automatic style check if it
// is also set the new character style:
@@ -836,10 +836,10 @@ void SwpHints::BuildPortions( SwTxtNode& rNode,
SwTxtAttr& rNewHint,
++aIter;
}
- boost::shared_ptr<SfxItemSet> pNewStyle = static_cast<const
SwFmtAutoFmt&>(rNewHint.GetAttr()).GetStyleHandle();
+ std::shared_ptr<SfxItemSet> pNewStyle = static_cast<const
SwFmtAutoFmt&>(rNewHint.GetAttr()).GetStyleHandle();
if ( pCurrentAutoStyle )
{
- boost::shared_ptr<SfxItemSet> pCurrentStyle =
static_cast<const SwFmtAutoFmt&>(pCurrentAutoStyle->GetAttr()).GetStyleHandle();
+ std::shared_ptr<SfxItemSet> pCurrentStyle = static_cast<const
SwFmtAutoFmt&>(pCurrentAutoStyle->GetAttr()).GetStyleHandle();
// Merge attributes
SfxItemSet aNewSet( *pCurrentStyle );
@@ -1013,7 +1013,7 @@ SwTxtAttr* MakeTxtAttr(
// If the attribute is an auto-style which refers to a pool that is
// different from rDoc's pool, we have to correct this:
const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_cast<const
SwFmtAutoFmt&>(rAttr).GetStyleHandle();
- boost::scoped_ptr<const SfxItemSet> pNewSet(
+ std::unique_ptr<const SfxItemSet> pNewSet(
pAutoStyle->SfxItemSet::Clone( true, &rDoc.GetAttrPool() ));
SwTxtAttr* pNew = MakeTxtAttr( rDoc, *pNewSet, nStt, nEnd );
return pNew;
@@ -1900,7 +1900,7 @@ bool SwTxtNode::SetAttr(
const bool bAutoStyle = SfxItemState::SET == aTxtSet.GetItemState(
RES_TXTATR_AUTOFMT, false, &pItem );
if ( bAutoStyle )
{
- boost::shared_ptr<SfxItemSet> pAutoStyleSet =
static_cast<const SwFmtAutoFmt*>(pItem)->GetStyleHandle();
+ std::shared_ptr<SfxItemSet> pAutoStyleSet = static_cast<const
SwFmtAutoFmt*>(pItem)->GetStyleHandle();
const bool bRet = SetAttr( *pAutoStyleSet );
if( 1 == aTxtSet.Count() )
return bRet;
@@ -2130,7 +2130,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32
nStt, sal_Int32 nEnd,
else // es ist ein Bereich definiert
{
// #i75299#
- boost::scoped_ptr< std::vector< SwPoolItemEndPair > > pAttrArr;
+ std::unique_ptr< std::vector< SwPoolItemEndPair > > pAttrArr;
const size_t coArrSz = RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN;
@@ -2165,7 +2165,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32
nStt, sal_Int32 nEnd,
if( bChkInvalid )
{
// uneindeutig ?
- boost::scoped_ptr< SfxItemIter > pItemIter;
+ std::unique_ptr< SfxItemIter > pItemIter;
const SfxPoolItem* pItem = 0;
if ( RES_TXTATR_AUTOFMT == pHt->Which() )
@@ -2458,7 +2458,7 @@ SwTxtNode::impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet)
// there already is an automatic style on that span:
// create new one and remove the original one
SwTxtAttr* const
pAutoStyle(const_cast<SwTxtAttr*>(aAutoStyleIt->second));
- const boost::shared_ptr<SfxItemSet> pOldStyle(
+ const std::shared_ptr<SfxItemSet> pOldStyle(
static_cast<const SwFmtAutoFmt&>(
pAutoStyle->GetAttr()).GetStyleHandle());
aCurSet.Put(*pOldStyle);
@@ -2672,7 +2672,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
// check for RSID-only AUTOFMT
if (RES_TXTATR_AUTOFMT == pHt->Which())
{
- boost::shared_ptr<SfxItemSet> const pSet(
+ std::shared_ptr<SfxItemSet> const pSet(
pHt->GetAutoFmt().GetStyleHandle());
if ((pSet->Count() == 1) && pSet->GetItem(RES_CHRATR_RSID, false))
{
@@ -2989,7 +2989,7 @@ bool SwpHints::TryInsertHint(
// #i75430# Recalc hidden flags if necessary
case RES_TXTATR_AUTOFMT:
{
- boost::shared_ptr<SfxItemSet> const pSet(
pHint->GetAutoFmt().GetStyleHandle() );
+ std::shared_ptr<SfxItemSet> const pSet(
pHint->GetAutoFmt().GetStyleHandle() );
if (pHint->GetStart() == *pHint->GetEnd())
{
if (pSet->Count() == 1 && pSet->GetItem(RES_CHRATR_RSID, false))
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 13ea4c1..c40f1a6 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -302,7 +302,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess&
rStyleAccess,
const SfxItemSet* pSet1,
sal_uInt16 nWhichId,
const SfxItemSet& rSet2,
- boost::shared_ptr<SfxItemSet>&
pStyleHandle )
+ std::shared_ptr<SfxItemSet>&
pStyleHandle )
{
bool bRet = false;
@@ -450,7 +450,7 @@ void SwTxtNode::RstTxtAttr(
// Default behavior is to process all attributes:
bool bSkipAttr = false;
- boost::shared_ptr<SfxItemSet> pStyleHandle;
+ std::shared_ptr<SfxItemSet> pStyleHandle;
// 1. case: We want to reset only the attributes listed in pSet:
if ( pSet )
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 51d540f..1a68e2a 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -492,8 +492,8 @@ class SwUndoReplace::Impl
bool m_bSplitNext : 1;
bool m_bRegExp : 1;
// metadata references for paragraph and following para (if m_bSplitNext)
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
public:
Impl(SwPaM const& rPam, OUString const& rIns, bool const bRegExp);
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index b00e5aa..4fbf9f4 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -277,7 +277,7 @@ private:
::std::unique_ptr<SwSectionData> const m_pSectionData; /// section not TOX
::std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX
::std::unique_ptr<SfxItemSet> const m_pAttrSet;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo;
+ std::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo;
sal_uLong const m_nStartNode;
sal_uLong const m_nEndNode;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 9778de2..1e83bd0 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vector>
-
-#include <boost/shared_ptr.hpp>
-
#include <UndoTable.hxx>
#include <UndoRedline.hxx>
#include <UndoDelete.hxx>
@@ -67,6 +63,8 @@
#include <comcore.hrc>
#include <unochart.hxx>
#include <switerator.hxx>
+#include <memory>
+#include <vector>
#ifdef DBG_UTIL
#define CHECK_TABLE(t) (t).CheckConsistency();
@@ -80,7 +78,7 @@
#define _DEBUG_REDLINE( pDoc )
#endif
-typedef std::vector<boost::shared_ptr<SfxItemSet> > SfxItemSets;
+typedef std::vector<std::shared_ptr<SfxItemSet> > SfxItemSets;
class SwUndoSaveSections : public boost::ptr_vector<SwUndoSaveSection> {
public:
@@ -206,8 +204,8 @@ struct SwTblToTxtSave
sal_Int32 m_nCntnt;
SwHistory* m_pHstry;
// metadata references for first and last paragraph in cell
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
- ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
+ std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
SwTblToTxtSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32
nCntnt );
~SwTblToTxtSave() { delete m_pHstry; }
@@ -543,7 +541,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd,
sal_uLong nEndNd,
SwTableLine* pLine = new SwTableLine( pLineFmt, rSavedData.size(), 0 );
pTblNd->GetTable().GetTabLines().insert(
pTblNd->GetTable().GetTabLines().begin(), pLine );
- const boost::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
+ const std::shared_ptr<sw::mark::CntntIdxStore>
pCntntStore(sw::mark::CntntIdxStore::Create());
for( size_t n = rSavedData.size(); n; )
{
const SwTblToTxtSave* pSave = &rSavedData[ --n ];
@@ -895,7 +893,7 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine
)
if( USHRT_MAX == nRet )
{
// Create copy of ItemSet
- boost::shared_ptr<SfxItemSet> pSet( new SfxItemSet(
*pFmt->GetAttrSet().GetPool(),
+ std::shared_ptr<SfxItemSet> pSet( new SfxItemSet(
*pFmt->GetAttrSet().GetPool(),
bIsLine ? aTableLineSetRange : aTableBoxSetRange ) );
pSet->Put( pFmt->GetAttrSet() );
// When a formula is set, never save the value. It possibly must be
@@ -1274,7 +1272,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable&
rSTbl )
SwCntntNode* pCNd = rNds[ n ]->GetCntntNode();
if( pCNd )
{
- boost::shared_ptr<SfxItemSet> pSet( (*Ptrs.pCntntAttrs)[
nSet++ ] );
+ std::shared_ptr<SfxItemSet> pSet( (*Ptrs.pCntntAttrs)[
nSet++ ] );
if( pSet )
{
sal_uInt16 *pRstAttr = aSave_BoxCntntSet;
@@ -1313,7 +1311,7 @@ void _SaveBox::SaveCntntAttrs( SwDoc* pDoc )
SwCntntNode* pCNd = pDoc->GetNodes()[ n ]->GetCntntNode();
if( pCNd )
{
- boost::shared_ptr<SfxItemSet> pSet;
+ std::shared_ptr<SfxItemSet> pSet;
if( pCNd->HasSwAttrSet() )
{
pSet.reset( new SfxItemSet( pDoc->GetAttrPool(),
@@ -1436,7 +1434,7 @@ SwUndoTblAutoFmt::~SwUndoTblAutoFmt()
void SwUndoTblAutoFmt::SaveBoxCntnt( const SwTableBox& rBox )
{
- ::boost::shared_ptr<SwUndoTblNumFmt> const p(new SwUndoTblNumFmt(rBox));
+ std::shared_ptr<SwUndoTblNumFmt> const p(new SwUndoTblNumFmt(rBox));
m_Undos.push_back(p);
}
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 6141ea6..499e73b 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -83,12 +83,11 @@
#include <swunohelper.hxx>
#include <svx/xbtmpit.hxx>
-#include <boost/shared_ptr.hpp>
-
#include "ccoll.hxx"
#include "unocore.hrc"
#include <cassert>
+#include <memory>
#include <set>
#define STYLE_FAMILY_COUNT 5 // we have 5 style families
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index d94fcc7..5897f90 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -77,7 +77,7 @@
#include <svtools/HtmlWriter.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace css;
@@ -202,7 +202,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType(
sal_uInt16 nScriptType )
struct SwHTMLTxtCollOutputInfo
{
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
