diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 13:43:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:24:05 +0000 |
| commit | 3744d8506ef231d642785faf6da4926cea64c6a0 (patch) | |
| tree | 2d57ca5be9eda54aafb5065d7010bb50a37053ac /sw/source/filter/ww8 | |
| parent | 7a17c038a6f4c433a69c6c1ed04aca2e5c929027 (diff) | |
boost->std
Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8toolbar.hxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 4b42c1d1299a..d5872cbe230e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3406,10 +3406,10 @@ void WW8Export::PrepareStorage() { if ( SvtFilterOptions::Get().IsEnableWordPreview() ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(false); uno::Sequence<sal_uInt8> metaFile( - sfx2::convertMetaFile(pMetaFile.get())); + sfx2::convertMetaFile(xMetaFile.get())); sfx2::SaveOlePropertySet(xDocProps, &GetWriter().GetStorage(), &metaFile); } else diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1c3096cdc434..58d1c79be674 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -837,11 +837,11 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, // with a Frame, else if( bIsSimpleDrawingTextBox ) { - ::boost::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( + std::shared_ptr<SvxMSDffShapeInfo> const xTmpRec( new SvxMSDffShapeInfo(0, pImpRec->nShapeId)); SvxMSDffShapeInfos_ById::const_iterator const it = - GetShapeInfos()->find(pTmpRec); + GetShapeInfos()->find(xTmpRec); if (it != GetShapeInfos()->end()) { SvxMSDffShapeInfo& rInfo = **it; diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index e6d80e2b8dd5..3f125d3b1030 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -29,8 +29,8 @@ class SwCTBWrapper; class SwTBC : public TBBase { TBCHeader tbch; - boost::shared_ptr< sal_uInt32 > cid; // optional - boost::shared_ptr<TBCData> tbcd; + std::shared_ptr< sal_uInt32 > cid; // optional + std::shared_ptr<TBCData> tbcd; public: SwTBC(); @@ -126,7 +126,7 @@ class Customization : public TBBase sal_uInt16 reserved1; sal_uInt16 ctbds; SwCTBWrapper* pWrapper; - boost::shared_ptr< SwCTB > customizationDataCTB; + std::shared_ptr< SwCTB > customizationDataCTB; std::vector< TBDelta > customizationDataTBDelta; bool bIsDroppedMenuTB; bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); |