From 22b80ac8e213ff63ce4f60e7d491f12cb42db313 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 14 Sep 2015 09:21:33 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/basicide/basicbox.cxx | 2 +- basctl/source/basicide/baside2.hxx | 6 +++--- basctl/source/basicide/baside2b.cxx | 2 -- basctl/source/basicide/baside3.cxx | 2 +- basctl/source/basicide/basides1.cxx | 4 ++-- basctl/source/basicide/basidesh.cxx | 2 +- basctl/source/dlged/managelang.cxx | 4 ++-- basctl/source/inc/basidesh.hxx | 6 +++--- basctl/source/inc/managelang.hxx | 8 ++++---- basctl/source/inc/scriptdocument.hxx | 4 ++-- 10 files changed, 19 insertions(+), 21 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 4bb502f8ba5e..8801498bf7d0 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -396,7 +396,7 @@ void LanguageBox::FillBox() m_sCurrentText = GetSelectEntry(); ClearBox(); - boost::shared_ptr pCurMgr(GetShell()->GetCurLocalizationMgr()); + std::shared_ptr pCurMgr(GetShell()->GetCurLocalizationMgr()); if ( pCurMgr->isLibraryLocalized() ) { Enable(); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index b7135ce282d1..7aab76158f51 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -73,8 +73,8 @@ friend class CodeCompleteListBox; private: class ChangesListener; - boost::scoped_ptr pEditView; - boost::scoped_ptr pEditEngine; + std::unique_ptr pEditView; + std::unique_ptr pEditEngine; ModulWindow& rModulWindow; rtl::Reference< ChangesListener > listener_; @@ -92,7 +92,7 @@ private: // progress bar class ProgressInfo; - boost::scoped_ptr pProgress; + std::unique_ptr pProgress; virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 971cb24a2359..f97ffbebf6f7 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -221,8 +221,6 @@ private: EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER), - pEditView(0), - pEditEngine(0), rModulWindow(*pModulWindow), nCurTextWidth(0), aHighlighter(HIGHLIGHT_BASIC), diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 92d6837f83ee..5a3b9c52a122 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1088,7 +1088,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script bool bCopyResourcesForDialog = true; if( bAddDialogLanguagesToLib ) { - boost::shared_ptr pCurMgr = pShell->GetCurLocalizationMgr(); + std::shared_ptr pCurMgr = pShell->GetCurLocalizationMgr(); lang::Locale aFirstLocale; aFirstLocale = aOnlyInImportLanguages[0]; diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index bcaa2a976a79..a4215bb10b74 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -557,7 +557,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) break; case SID_BASICIDE_SHOWWINDOW: { - boost::scoped_ptr< ScriptDocument > pDocument; + std::unique_ptr< ScriptDocument > pDocument; SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false ); if ( pDocumentItem ) @@ -906,7 +906,7 @@ void Shell::GetState(SfxItemSet &rSet) else { OUString aItemStr; - boost::shared_ptr pCurMgr(GetCurLocalizationMgr()); + std::shared_ptr pCurMgr(GetCurLocalizationMgr()); if ( pCurMgr->isLibraryLocalized() ) { Sequence< lang::Locale > aLocaleSeq = pCurMgr->getStringResourceManager()->getLocales(); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index ab3c1acbd11e..7410fea52fb6 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -950,7 +950,7 @@ void Shell::SetCurLibForLocalization( const ScriptDocument& rDocument, const OUS catch (const container::NoSuchElementException& ) {} - m_pCurLocalizationMgr = boost::shared_ptr(new LocalizationMgr(this, rDocument, aLibName, xStringResourceManager)); + m_pCurLocalizationMgr = std::shared_ptr(new LocalizationMgr(this, rDocument, aLibName, xStringResourceManager)); m_pCurLocalizationMgr->handleTranslationbar(); } diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 47e765b8696c..fcc515ac3692 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -55,7 +55,7 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight ) return bRet; } -ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_ptr xLMgr) +ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, std::shared_ptr xLMgr) : ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui") , m_xLocalizationMgr(xLMgr) , m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG)) @@ -230,7 +230,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) // class SetDefaultLanguageDialog ----------------------------------------------- -SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr xLMgr) +SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, std::shared_ptr xLMgr) : ModalDialog(pParent, "DefaultLanguageDialog", "modules/BasicIDE/ui/defaultlanguage.ui") , m_pCheckLangLB(NULL) , m_xLocalizationMgr(xLMgr) diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 9206e01ea381..1dd3fc13b9ee 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include class SfxViewFactory; class SdrView; @@ -69,7 +69,7 @@ private: VclPtr pCurWin; ScriptDocument m_aCurDocument; OUString m_aCurLibName; - boost::shared_ptr m_pCurLocalizationMgr; + std::shared_ptr m_pCurLocalizationMgr; VclPtr aHScrollBar; VclPtr aVScrollBar; @@ -160,7 +160,7 @@ public: BaseWindow* GetCurWindow() const { return pCurWin; } ScriptDocument const& GetCurDocument() const { return m_aCurDocument; } OUString const& GetCurLibName() const { return m_aCurLibName; } - boost::shared_ptr GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } + std::shared_ptr GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } TabBar& GetTabBar() { return *pTabBar; } WindowTable& GetWindowTable() { return aWindowTable; } diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 0bd64d700fbe..469ee685f5ff 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -57,7 +57,7 @@ private: VclPtr m_pDeletePB; VclPtr m_pMakeDefPB; - boost::shared_ptr m_xLocalizationMgr; + std::shared_ptr m_xLocalizationMgr; OUString m_sDefLangStr; OUString m_sCreateLangStr; @@ -72,7 +72,7 @@ private: DECL_LINK(SelectHdl, void *); public: - ManageLanguageDialog( vcl::Window* pParent, boost::shared_ptr _pLMgr ); + ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr _pLMgr ); virtual ~ManageLanguageDialog(); virtual void dispose() SAL_OVERRIDE; }; @@ -87,12 +87,12 @@ private: VclPtr m_pDefinedFT; VclPtr m_pAddedFT; - boost::shared_ptr m_xLocalizationMgr; + std::shared_ptr m_xLocalizationMgr; void FillLanguageBox(); public: - SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr xLMgr); + SetDefaultLanguageDialog(vcl::Window* pParent, std::shared_ptr xLMgr); virtual ~SetDefaultLanguageDialog(); virtual void dispose() SAL_OVERRIDE; diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx index 6b8dc9024674..815c78b80195 100644 --- a/basctl/source/inc/scriptdocument.hxx +++ b/basctl/source/inc/scriptdocument.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include class SfxListener; @@ -67,7 +67,7 @@ namespace basctl { private: class Impl; - boost::shared_ptr m_pImpl; + std::shared_ptr m_pImpl; private: /** creates a ScriptDocument instance which operates on the application-wide -- cgit