diff options
Diffstat (limited to 'sw/source/ui')
28 files changed, 35 insertions, 54 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 3456e45a21a3..d2affa0ceaff 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -61,8 +61,6 @@ #include <helpid.h> #include <unomid.h> -#include <boost/scoped_ptr.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index ee30e49e9e7d..6501cae53220 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -40,7 +40,6 @@ #include <dbui.hrc> #include <helpid.h> #include <unomid.h> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 9e9c4fef304b..e0821ee696d5 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -33,7 +33,6 @@ #include <svtools/treelistentry.hxx> #include <vector> -#include <boost/scoped_ptr.hpp> #include <globals.hrc> #include <dbui.hrc> #include <helpid.h> diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 02188173c99b..c9efadf3c8b6 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 0193f2de2a1a..0295fd7bb6b4 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -29,8 +29,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <helpid.h> -#include <boost/scoped_ptr.hpp> - using namespace svt; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index b80389cd7774..8068ea7d47d1 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -72,7 +72,6 @@ #include <statstr.hrc> #include <unomid.h> #include <comphelper/string.hxx> -#include <boost/scoped_ptr.hpp> using namespace svt; using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index c2f84e933b78..dd458860e03c 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -23,7 +23,6 @@ #include <vcl/msgbox.hxx> #include <dbui.hrc> #include <swtypes.hxx> -#include <boost/scoped_ptr.hpp> SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent) : svt::OWizardPage(pParent, "MMOutputTypePage", diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 6ed6e3d6fae7..eb1c3d16c7d7 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -33,7 +33,6 @@ #include <dbui.hrc> #include <helpid.h> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::sdbcx; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index e1d8502f0125..48ca34d85095 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -63,7 +63,7 @@ #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> #include <svx/flagsdef.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -780,7 +780,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void) size_t nNewPos = rDocFormats.GetPos(pFormat); if ( SIZE_MAX != nNewPos ) { - boost::scoped_ptr<SfxItemSet> pSet(pFormat->GetAttrSet().Clone( false )); + std::unique_ptr<SfxItemSet> pSet(pFormat->GetAttrSet().Clone( false )); if( pFormat->GetCol() != pRepr->GetCol() ) pSet->Put( pRepr->GetCol() ); @@ -1323,7 +1323,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFile OUString sFileName, sFilterName, sPassword; if ( _pFileDlg->GetError() == ERRCODE_NONE ) { - boost::scoped_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium()); + std::unique_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium()); if ( pMedium ) { sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); @@ -1798,7 +1798,7 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, { if ( _pFileDlg->GetError() == ERRCODE_NONE ) { - boost::scoped_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium()); + std::unique_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium()); if ( pMedium ) { m_sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index ed9e52e9d397..b49ce96b1853 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -45,7 +45,6 @@ #include <algorithm> #include <memory> -#include <boost/scoped_ptr.hpp> #include "swabstdlg.hxx" #include "chrdlg.hrc" @@ -280,7 +279,7 @@ IMPL_LINK_TYPED( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); const OUString sFormatStr = pColl->GetName(); - boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFormatStr)); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFormatStr)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) { diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 649db1512e4a..9a3d59448c7f 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -27,7 +27,6 @@ #include "uitool.hxx" #include "envprt.hrc" -#include <boost/scoped_ptr.hpp> SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvPrinterPage", diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 12297627e5bb..4d739aba8eb0 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -35,7 +35,6 @@ #include "../../uibase/envelp/label.hrc" #include "labfmt.hrc" #include <unomid.h> -#include <boost/scoped_ptr.hpp> using namespace utl; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index cd4b1404fdc9..7e8907772dd4 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -26,7 +26,6 @@ #include <labimg.hxx> #include <cmdid.h> -#include <boost/scoped_ptr.hpp> SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelOptionsPage", diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 0886666bc541..083b7efe6214 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -25,7 +25,7 @@ #include <flddropdown.hxx> #include <fldui.hrc> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -94,7 +94,7 @@ void sw::DropDownFieldDialog::Apply() { rSh.StartAllAction(); - boost::scoped_ptr<SwDropDownField> const pCopy( + std::unique_ptr<SwDropDownField> const pCopy( static_cast<SwDropDownField *>( pDropField->CopyField() ) ); pCopy->SetPar1(sSelect); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 91c2dcc4b272..4d4131039c62 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <swuiexp.hxx> void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr) @@ -329,7 +329,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void) SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aSet, + std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aSet, pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_ADDR )); OSL_ENSURE(pDlg, "Dialog creation failed!"); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 983d9a0d8059..5f272d4f96a7 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -69,7 +69,7 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <vcl/graphicfilter.hxx> #include <vcl/builderfactory.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::sfx2; @@ -2768,7 +2768,7 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet ) const SfxPoolItem* pItem; if ( SfxItemState::SET == rSet->GetItemState( SID_DOCFRAME, true, &pItem)) { - boost::scoped_ptr<TargetList> pList(new TargetList); + std::unique_ptr<TargetList> pList(new TargetList); static_cast<const SfxFrameItem*>(pItem)->GetFrame()->GetTargetList(*pList); if( !pList->empty() ) { @@ -2805,7 +2805,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) { bool bModified = false; const SwFormatURL* pOldURL = static_cast<const SwFormatURL*>(GetOldItem(*rSet, RES_URL)); - boost::scoped_ptr<SwFormatURL> pFormatURL; + std::unique_ptr<SwFormatURL> pFormatURL; if(pOldURL) pFormatURL.reset(static_cast<SwFormatURL*>(pOldURL->Clone())); else diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 433cf5cdff94..2f419441c642 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star::uno; using namespace com::sun::star::ui::dialogs; using namespace ::sfx2; #include <svtools/editbrowsebox.hxx> -#include <boost/scoped_ptr.hpp> static const sal_Unicode aDeliStart = '['; // for the form static const sal_Unicode aDeliEnd = ']'; // for the form diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 79603ad3f89e..269731cd1dfb 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -59,7 +59,6 @@ #include <SwRewriter.hxx> #include <unomid.h> -#include <boost/scoped_ptr.hpp> #define POS_CONTENT 0 #define POS_INDEX 1 diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 56d0beeb8d41..cdea464d6b50 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -36,7 +36,7 @@ #include <misc.hrc> #include <frmui.hrc> #include <SwStyleNameMapper.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> SwFootNoteOptionDlg::SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rS) : SfxTabDialog(pParent, "FootEndnoteDialog", "modules/swriter/ui/footendnotedialog.ui") @@ -145,7 +145,7 @@ void SwEndNoteOptionPage::dispose() void SwEndNoteOptionPage::Reset( const SfxItemSet* ) { - boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() ) + std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() ) : new SwFootnoteInfo( pSh->GetFootnoteInfo() )); SfxObjectShell * pDocSh = SfxObjectShell::Current(); @@ -364,7 +364,7 @@ static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFo bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) { - boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo()); + std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo()); pInf->nFootnoteOffset = static_cast< sal_uInt16 >(m_pOffsetField->GetValue() -1); pInf->aFormat.SetNumberingType(m_pNumViewBox->GetSelectedNumberingType() ); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index e65f3334beca..6162a97d18be 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -68,7 +68,7 @@ #include <swmodule.hxx> #include <sfx2/filedlghelper.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include "access.hrc" @@ -559,7 +559,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) const SfxPoolItem* pItem; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, + std::unique_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), SID_EVENTCONFIG )); if ( pMacroDlg && pMacroDlg->Execute() == RET_OK && SfxItemState::SET == pMacroDlg->GetOutputItemSet()->GetItemState( RES_FRMMACRO, false, &pItem ) ) @@ -1035,7 +1035,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - boost::scoped_ptr<AbstractSvxMultiPathDialog> pDlg(pFact->CreateSvxPathSelectDialog(pBtn)); + std::unique_ptr<AbstractSvxMultiPathDialog> pDlg(pFact->CreateSvxPathSelectDialog(pBtn)); OSL_ENSURE(pDlg, "Dialog creation failed!"); SvtPathOptions aPathOpt; const OUString sGlosPath( aPathOpt.GetAutoTextPath() ); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 86ccba7b3b26..8d81fbb8fc9f 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -38,7 +38,7 @@ #include <sfx2/viewfrm.hxx> #include <vcl/layout.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> static bool bFootnote = true; @@ -114,7 +114,7 @@ IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) aAllSet.Put( rFont ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aAllSet, + std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aAllSet, rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if (RET_OK == pDlg->Execute()) { diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index a76528e6a576..f2b2a07e186c 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -55,8 +55,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <boost/scoped_ptr.hpp> - using namespace ::com::sun::star; class SwNumNamesDlg : public ModalDialog diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index ff28147f2523..d7f627c8d334 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -41,7 +41,7 @@ #include <globals.hrc> #include <misc.hrc> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -157,7 +157,7 @@ VclPtr<SfxTabPage> SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet void SwFootNotePage::Reset(const SfxItemSet *rSet) { // if no example exists, otherwise Init here in Activate - boost::scoped_ptr<SwPageFootnoteInfo> pDefFootnoteInfo; + std::unique_ptr<SwPageFootnoteInfo> pDefFootnoteInfo; const SwPageFootnoteInfo* pFootnoteInfo; const SfxPoolItem* pItem = SfxTabPage::GetItem(*rSet, FN_PARAM_FTN_INFO); if( pItem ) diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index a6c7ef7e91d5..49e6978e81d9 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -42,7 +42,7 @@ #include <node.hxx> #include <tblsel.hxx> #include <sfx2/request.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> static bool bCheck1 = true; static bool bCheck2 = false; @@ -399,7 +399,7 @@ IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) { SfxAllItemSet aSet( rSh.GetAttrPool() ); aSet.Put( SfxInt32Item( SID_ATTR_CHAR, GetDelimChar() ) ); - boost::scoped_ptr<SfxAbstractDialog> pMap(pFact->CreateSfxDialog( m_pDelimPB, aSet, + std::unique_ptr<SfxAbstractDialog> pMap(pFact->CreateSfxDialog( m_pDelimPB, aSet, rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if( RET_OK == pMap->Execute() ) { diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index e8f166506de4..8c429de2032d 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -34,8 +34,8 @@ #include "app.hrc" #include "table.hrc" #include "swabstdlg.hxx" -#include <boost/scoped_ptr.hpp> #include <swuiexp.hxx> +#include <memory> //keep the state of the buttons on runtime static int nSaveButtonState = -1; // 0: tab, 1: semicolon, 2: paragraph, 3: other, -1: not yet used @@ -202,7 +202,7 @@ IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFormat)); + std::unique_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFormat)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index ad62d2def1e7..4543d83df4c6 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -32,8 +32,8 @@ #include "table.hrc" #include "swabstdlg.hxx" -#include <boost/scoped_ptr.hpp> #include <swuiexp.hxx> +#include <memory> #define ROW_COL_PROD 16384 @@ -204,7 +204,7 @@ IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFormat)); + std::unique_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFormat)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index c52ecc24cffa..42e9042c3a39 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -39,7 +39,6 @@ #include "tblafmt.hxx" #include "tautofmt.hxx" #include "shellres.hxx" -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index f30c724f6c96..ba87cee454f4 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/beans/XPropertyContainer.hpp> #include <ooo/vba/word/WdBuiltInProperty.hpp> #include <ooo/vba/office/MsoDocProperties.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> #include "wordvbahelper.hxx" #include "fesh.hxx" #include "docsh.hxx" @@ -357,9 +357,9 @@ class DocPropInfo public: OUString msMSODesc; OUString msOOOPropName; - boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; + std::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; - static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) + static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, std::shared_ptr< PropertGetSetHelper >& rHelper ) { DocPropInfo aItem; aItem.msMSODesc = sDesc; @@ -368,7 +368,7 @@ public: return aItem; } - static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) + static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, std::shared_ptr< PropertGetSetHelper >& rHelper ) { return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper ); } @@ -401,8 +401,8 @@ class BuiltInIndexHelper public: explicit BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel ) { - boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) ); - boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) ); + std::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) ); + std::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) ); m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", aStandardHelper ); m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", aStandardHelper ); @@ -790,7 +790,7 @@ class CustomPropertiesImpl : public PropertiesImpl_BASE uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< frame::XModel > m_xModel; uno::Reference< beans::XPropertySet > mxUserDefinedProp; - boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; + std::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; public: CustomPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ) { |