summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-06 09:46:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-06 16:45:13 +0000
commitc7258cfccdf9f4c5235da1b135801f957a5b0ec1 (patch)
treed5af5085ad1327afe2d41045ea452e017fea1fb6 /cui
parent027c383584bff4ea2aa7aa2b9e294e614087f28f (diff)
shared_ptr<T>(new T(args)) -> make_shared<T>(args)
and boost:make_shared->std::make_shared Change-Id: Ic1e187c52c856a7b27817967b2caa8920f23a98d
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/certpath.cxx2
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--cui/source/options/optbasic.cxx4
-rw-r--r--cui/source/options/optgdlg.cxx4
-rw-r--r--cui/source/options/optmemory.cxx6
-rw-r--r--cui/source/options/optopencl.cxx2
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/personalization.cxx2
8 files changed, 10 insertions, 14 deletions
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index a31c25211a50..d6345be31a3d 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -119,7 +119,7 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
{
try
{
- boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Security::Scripting::CertDir::set(
getDirectory(), batch);
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index a0e92f960275..5dab12aeef06 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -170,7 +170,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
if(pConfig->IsModified())
pConfig->Commit();
pConfig->Apply();
- boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
if(m_pFontHeightLB->IsValueChangedFromSaved())
officecfg::Office::Common::Font::SourceViewFont::FontHeight::set(
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index db24702e6124..2c5498e97934 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -69,7 +69,7 @@ void SvxBasicIDEOptionsPage::LoadConfig()
bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
- boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
+ std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
if( pAutocloseProcChk->IsValueChangedFromSaved() )
{
@@ -80,7 +80,7 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
if( pCodeCompleteChk->IsValueChangedFromSaved() )
{
- //boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
+ //std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch );
CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk->IsChecked() );
bModified = true;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index cc82f2897930..512e8ad2c024 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -143,7 +143,7 @@ OpenGLCfg::~OpenGLCfg()
{
if (mbModified)
{
- boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
+ std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
batch->commit();
@@ -318,7 +318,7 @@ SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAtt
bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
- boost::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
+ std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
SvtHelpOptions aHelpOptions;
if ( m_pToolTipsCB->IsValueChangedFromSaved() )
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 2faa4ea7bda4..ea3cdd8af441 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -147,20 +147,16 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
{
}
-
-
SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new OfaMemoryOptionsPage( pParent, *rAttrSet );
}
-
-
bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
- boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
if ( m_pUndoEdit->IsValueChangedFromSaved() )
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 63475ea2a7f1..cbc8a38cf2ab 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -121,7 +121,7 @@ SfxTabPage* SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rA
bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
- boost::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
+ std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
if (mpUseOpenCL->IsValueChangedFromSaved())
maConfig.mbUseOpenCL = mpUseOpenCL->IsChecked();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 9ecb25296b31..a92f7896523a 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -517,7 +517,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
// Set configuration flag to notify file picker that it's necessary
// to take over the path provided.
- boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Path::Info::WorkPathChanged::set(
true, batch);
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index dbc1463f2980..1bf0132ab6ef 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -319,7 +319,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
}
// write
- boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
+ std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
if( aPersona == "no" )
m_aPersonaSettings.clear();
officecfg::Office::Common::Misc::Persona::set( aPersona, batch );