desktop/source/app/app.cxx | 4 +-
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 -
desktop/source/deployment/gui/dp_gui_service.cxx | 2 -
desktop/source/deployment/gui/license_dialog.cxx | 2 -
desktop/source/deployment/manager/dp_manager.h | 2 -
desktop/source/deployment/registry/component/dp_component.cxx | 2 -
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 15
+++------
desktop/source/deployment/registry/executable/dp_executable.cxx | 2 -
desktop/source/deployment/registry/help/dp_help.cxx | 2 -
desktop/source/deployment/registry/package/dp_package.cxx | 2 -
desktop/source/deployment/registry/script/dp_script.cxx | 2 -
desktop/source/migration/migration_impl.hxx | 4 +-
desktop/source/migration/services/misc.hxx | 2 -
extensions/source/logging/filehandler.cxx | 2 -
extensions/source/propctrlr/browserlistbox.hxx | 2 -
extensions/source/propctrlr/cellbindinghandler.hxx | 2 -
extensions/source/propctrlr/composeduiupdate.hxx | 2 -
extensions/source/propctrlr/defaultforminspection.hxx | 4 --
extensions/source/propctrlr/eformspropertyhandler.hxx | 2 -
extensions/source/propctrlr/eventhandler.cxx | 2 -
extensions/source/propctrlr/formcomponenthandler.hxx | 2 -
extensions/source/propctrlr/formlinkdialog.hxx | 10
++----
extensions/source/propctrlr/inspectormodelbase.cxx | 2 -
extensions/source/propctrlr/inspectormodelbase.hxx | 2 -
extensions/source/propctrlr/propcontroller.hxx | 2 -
extensions/source/propctrlr/propertycomposer.hxx | 4 --
extensions/source/propctrlr/propertycontrolextender.hxx | 2 -
extensions/source/propctrlr/propertyhandler.hxx | 2 -
extensions/source/propctrlr/submissionhandler.hxx | 2 -
extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 2 -
forms/source/component/ComboBox.hxx | 2 -
forms/source/component/Edit.hxx | 2 -
forms/source/component/Pattern.hxx | 2 -
forms/source/component/cachedrowset.hxx | 2 -
forms/source/component/clickableimage.hxx | 2 -
forms/source/inc/controlfeatureinterception.hxx | 4 --
forms/source/inc/formnavigation.hxx | 8
+----
forms/source/richtext/richtextmodel.cxx | 1
forms/source/richtext/richtextmodel.hxx | 2 -
forms/source/xforms/datatypes.cxx | 4 --
forms/source/xforms/datatypes.hxx | 2 -
forms/source/xforms/submission/replace.cxx | 6
+--
forms/source/xforms/submission/submission.hxx | 2 -
forms/source/xforms/submission/submission_post.cxx | 2 -
forms/source/xforms/submission/submission_put.cxx | 2 -
framework/inc/uiconfiguration/imagemanager.hxx | 2 -
framework/inc/uiconfiguration/moduleimagemanager.hxx | 4 --
i18npool/inc/localedata.hxx | 2 -
idlc/source/astexpression.cxx | 10
+-----
l10ntools/source/helpmerge.cxx | 2 -
linguistic/source/convdic.hxx | 4 +-
lotuswordpro/source/filter/lwpbreaksoverride.cxx | 2 -
lotuswordpro/source/filter/lwpcharborderoverride.cxx | 4 +-
lotuswordpro/source/filter/lwpfilter.cxx | 2 -
lotuswordpro/source/filter/lwpoverride.cxx | 14
+++-----
lotuswordpro/source/filter/lwppara.cxx | 2 -
lotuswordpro/source/filter/lwppara1.cxx | 16
++--------
lotuswordpro/source/filter/lwpparaborderoverride.cxx | 10
++----
lotuswordpro/source/filter/lwpparastyle.cxx | 4 --
mysqlc/source/mysqlc_connection.cxx | 2 -
mysqlc/source/mysqlc_connection.hxx | 2 -
package/source/zippackage/ZipPackageFolder.cxx | 2 -
registry/source/reflread.cxx | 2 -
registry/source/regimpl.cxx | 10
+-----
64 files changed, 91 insertions(+), 137 deletions(-)
New commits:
commit 2d7b5dd5f943a898fec190eff565639245a9c14b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:28:26 2014 +0200
registry: std::auto_ptr -> std::unique_ptr
Change-Id: I9489f90a63d477e8802634e7850d3a3fa8e4d133
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 4245ddf..3f0a994 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1146,7 +1146,7 @@ REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE
typereg_reader_create(
*result = 0;
return true;
}
- std::auto_ptr< TypeRegistryEntry > entry;
+ std::unique_ptr< TypeRegistryEntry > entry;
try {
entry.reset(
new TypeRegistryEntry(
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index f043eef..3d44092 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -726,9 +726,7 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const
OUString& keyName,
break;
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< ORegKey > p(new ORegKey(path, this));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr< ORegKey > p(new ORegKey(path, this));
i = m_openKeyTable.insert(std::make_pair(path, p.get())).first;
p.release();
} else {
@@ -905,7 +903,7 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const
OUString& regFileName,
RegError _ret = REG_NO_ERROR;
ORegKey* pKey = static_cast< ORegKey* >(hKey);
- std::auto_ptr< ORegistry > pReg (new ORegistry());
+ std::unique_ptr< ORegistry > pReg (new ORegistry());
_ret = pReg->initRegistry(regFileName, REG_READONLY);
if (_ret != REG_NO_ERROR)
return _ret;
@@ -953,9 +951,7 @@ RegError ORegistry::saveKey(RegKeyHandle hKey, const
OUString& regFileName,
RegError _ret = REG_NO_ERROR;
ORegKey* pKey = static_cast< ORegKey* >(hKey);
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< ORegistry > pReg (new ORegistry());
-SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr< ORegistry > pReg (new ORegistry());
_ret = pReg->initRegistry(regFileName, REG_CREATE);
if (_ret != REG_NO_ERROR)
return _ret;
commit 61d048b71bd76eec6a4dbe861646e184b55345ac
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:28:17 2014 +0200
package: std::auto_ptr -> std::unique_ptr
Change-Id: Iac189fef77c930e35cbd20452027662127047e01
diff --git a/package/source/zippackage/ZipPackageFolder.cxx
b/package/source/zippackage/ZipPackageFolder.cxx
index 8d994c6..ce01b92 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -336,7 +336,7 @@ bool ZipPackageFolder::saveChild( const OUString
&rShortName, const ContentInfo
{
// if pTempEntry is necessary, it will be released and passed to the
ZipOutputStream
// and be deleted in the ZipOutputStream destructor
- auto_ptr < ZipEntry > pAutoTempEntry ( new ZipEntry );
+ unique_ptr < ZipEntry > pAutoTempEntry ( new ZipEntry );
ZipEntry* pTempEntry = pAutoTempEntry.get();
// In case the entry we are reading is also the entry we are writing,
we will
commit f94fffaf529052b4b959a64c2a6bf2671e7750ed
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:28:08 2014 +0200
mysqlc: std::auto_ptr -> std::unique_ptr
Change-Id: I0eb5f9fab5955d1f5790d3f5d269e069aff1c201
diff --git a/mysqlc/source/mysqlc_connection.cxx
b/mysqlc/source/mysqlc_connection.cxx
index 9773703..588fb6e 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -215,7 +215,7 @@ void OConnection::construct(const OUString& url, const
Sequence< PropertyValue >
0,
Any());
}
- std::auto_ptr<sql::Statement>
stmt(m_settings.cppConnection->createStatement());
+ std::unique_ptr<sql::Statement>
stmt(m_settings.cppConnection->createStatement());
stmt->executeUpdate("SET session sql_mode='ANSI_QUOTES'");
stmt->executeUpdate("SET NAMES utf8");
}
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index 05eb3bd..5a20051 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -73,7 +73,7 @@ namespace connectivity
struct ConnectionSettings
{
rtl_TextEncoding encoding;
- std::auto_ptr<sql::Connection> cppConnection;
+ std::unique_ptr<sql::Connection> cppConnection;
OUString schema;
OUString quoteIdentifier;
OUString connectionURL;
commit 5e557a5f987b70f064e3381bda45bd882d651546
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:27:58 2014 +0200
lotuswordpro: std::auto_ptr -> std::unique_ptr
Change-Id: I205b84f6dcb996935bd59ac9927313c6a88066b4
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx
b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
index bdc689e..12a855a 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
@@ -73,7 +73,7 @@ LwpBreaksOverride::LwpBreaksOverride(LwpBreaksOverride const&
rOther)
: LwpOverride(rOther)
, m_pNextStyle(0)
{
- std::auto_ptr<LwpAtomHolder> pNextStyle(::clone(rOther.m_pNextStyle));
+ std::unique_ptr<LwpAtomHolder> pNextStyle(::clone(rOther.m_pNextStyle));
m_pNextStyle = pNextStyle.release();
}
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.cxx
b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
index a65d7dd..bbe4de5 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
@@ -84,8 +84,8 @@
LwpCharacterBorderOverride::LwpCharacterBorderOverride(LwpCharacterBorderOverrid
, m_nAboveWidth(rOther.m_nAboveWidth)
, m_nBelowWidth(rOther.m_nBelowWidth)
{
- std::auto_ptr<LwpBorderStuff> pBorderStuff(::clone(rOther.m_pBorderStuff));
- std::auto_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins));
+ std::unique_ptr<LwpBorderStuff>
pBorderStuff(::clone(rOther.m_pBorderStuff));
+ std::unique_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins));
m_pBorderStuff = pBorderStuff.release();
m_pMargins = pMargins.release();
}
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx
b/lotuswordpro/source/filter/lwpfilter.cxx
index e4d7606..9e66d7b 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -104,7 +104,7 @@ using namespace OpenStormBento;
bool Decompress(SvStream *pCompressed, SvStream * & pOutDecompressed)
{
pCompressed->Seek(0);
- std::auto_ptr<SvStream> aDecompressed(new SvMemoryStream(4096, 4096));
+ std::unique_ptr<SvStream> aDecompressed(new SvMemoryStream(4096, 4096));
unsigned char buffer[512];
pCompressed->Read(buffer, 16);
aDecompressed->Write(buffer, 16);
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx
b/lotuswordpro/source/filter/lwpoverride.cxx
index 1563f9a..60eea05 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -386,12 +386,10 @@ LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride
const& rOther)
, m_pParaSpacingAbove(0)
, m_pParaSpacingBelow(0)
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpSpacingCommonOverride>
pSpacing(::clone(rOther.m_pSpacing));
- std::auto_ptr<LwpSpacingCommonOverride>
pAboveLineSpacing(::clone(rOther.m_pAboveLineSpacing));
- std::auto_ptr<LwpSpacingCommonOverride>
pParaSpacingAbove(::clone(rOther.m_pParaSpacingAbove));
- std::auto_ptr<LwpSpacingCommonOverride>
pParaSpacingBelow(::clone(rOther.m_pParaSpacingBelow));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr<LwpSpacingCommonOverride>
pSpacing(::clone(rOther.m_pSpacing));
+ std::unique_ptr<LwpSpacingCommonOverride>
pAboveLineSpacing(::clone(rOther.m_pAboveLineSpacing));
+ std::unique_ptr<LwpSpacingCommonOverride>
pParaSpacingAbove(::clone(rOther.m_pParaSpacingAbove));
+ std::unique_ptr<LwpSpacingCommonOverride>
pParaSpacingBelow(::clone(rOther.m_pParaSpacingBelow));
m_pSpacing = pSpacing.release();
m_pAboveLineSpacing = pAboveLineSpacing.release();
m_pParaSpacingAbove = pParaSpacingAbove.release();
@@ -469,9 +467,7 @@ LwpAmikakeOverride::LwpAmikakeOverride(LwpAmikakeOverride
const& rOther)
, m_pBackgroundStuff(0)
, m_nType(rOther.m_nType)
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpBackgroundStuff>
pBackgroundStuff(::clone(rOther.m_pBackgroundStuff));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr<LwpBackgroundStuff>
pBackgroundStuff(::clone(rOther.m_pBackgroundStuff));
m_pBackgroundStuff = pBackgroundStuff.release();
}
diff --git a/lotuswordpro/source/filter/lwppara.cxx
b/lotuswordpro/source/filter/lwppara.cxx
index c18319e..8ac7c8c 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -361,7 +361,7 @@ void LwpPara::RegisterStyle()
if (GetParaStyle()->GetIndent())
{
- std::auto_ptr<LwpIndentOverride>
pIndentOverride(GetParaStyle()->GetIndent()->clone());
+ std::unique_ptr<LwpIndentOverride>
pIndentOverride(GetParaStyle()->GetIndent()->clone());
delete m_pIndentOverride;
m_pIndentOverride = pIndentOverride.release();
}
diff --git a/lotuswordpro/source/filter/lwppara1.cxx
b/lotuswordpro/source/filter/lwppara1.cxx
index b508c6c..834174f 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -388,13 +388,11 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps,
XFParaStyle* pOverStyl
}
LwpOverride* pBreaks = pParaStyle->GetBreaks();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpBreaksOverride> pFinalBreaks(
+ std::unique_ptr<LwpBreaksOverride> pFinalBreaks(
pBreaks
? polymorphic_downcast<LwpBreaksOverride*>(pBreaks->clone())
: new LwpBreaksOverride)
;
- SAL_WNODEPRECATED_DECLARATIONS_POP
// get local breaks
pBreaks =
static_cast<LwpParaBreaksProperty*>(pProps)->GetLocalParaBreaks();
@@ -475,13 +473,11 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
m_bHasBullet = true;
LwpOverride* pBullet= pParaStyle->GetBulletOverride();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpBulletOverride> pFinalBullet(
+ std::unique_ptr<LwpBulletOverride> pFinalBullet(
pBullet
?
polymorphic_downcast<LwpBulletOverride*>(pBullet->clone())
: new LwpBulletOverride)
;
- SAL_WNODEPRECATED_DECLARATIONS_POP
boost::scoped_ptr<LwpBulletOverride> const
pLocalBullet2(pLocalBullet->clone());
pLocalBullet2->Override(pFinalBullet.get());
@@ -515,9 +511,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
m_pSilverBullet->SetFoundry(m_pFoundry);
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpBulletOverride>
pBulletOverride(pBullOver->clone());
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr<LwpBulletOverride>
pBulletOverride(pBullOver->clone());
delete m_pBullOver;
m_pBullOver = pBulletOverride.release();
}
@@ -537,9 +531,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps)
}
LwpNumberingOverride* pParaNumbering = pParaStyle->GetNumberingOverride();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpNumberingOverride> pOver(new LwpNumberingOverride);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr<LwpNumberingOverride> pOver(new LwpNumberingOverride);
//Override with the local numbering, if any
if (pProps)
{
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.cxx
b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
index 4a3ab50..318ff8d 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
@@ -101,12 +101,10 @@
LwpParaBorderOverride::LwpParaBorderOverride(LwpParaBorderOverride const& rOther
, m_nRightWidth(rOther.m_nRightWidth)
, m_nBetweenMargin(rOther.m_nBetweenMargin)
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpBorderStuff> pBorderStuff(::clone(rOther.m_pBorderStuff));
- std::auto_ptr<LwpBorderStuff>
pBetweenStuff(::clone(rOther.m_pBetweenStuff));
- std::auto_ptr<LwpShadow> pShadow(::clone(rOther.m_pShadow));
- std::auto_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr<LwpBorderStuff>
pBorderStuff(::clone(rOther.m_pBorderStuff));
+ std::unique_ptr<LwpBorderStuff>
pBetweenStuff(::clone(rOther.m_pBetweenStuff));
+ std::unique_ptr<LwpShadow> pShadow(::clone(rOther.m_pShadow));
+ std::unique_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins));
m_pBorderStuff = pBorderStuff.release();
m_pBetweenStuff = pBetweenStuff.release();
m_pShadow = pShadow.release();
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx
b/lotuswordpro/source/filter/lwpparastyle.cxx
index 825648a..244189f 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -442,9 +442,7 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle*
pParaStyle, LwpInden
else
pParentPara = NULL;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<LwpIndentOverride> pTotalIndent(new LwpIndentOverride);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr<LwpIndentOverride> pTotalIndent(new LwpIndentOverride);
if (pIndent->IsUseRelative() && pParentPara)
{
LwpIndentOverride* pParentIndent = pParentPara->GetIndent();
commit 7bc8c92bd9a261d81fd48219c2868f2b9ceff56d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:27:46 2014 +0200
linguistic: std::auto_ptr -> std::unique_ptr
Change-Id: I4eb6a5aee50709093e70d5c4863f0c029d691471
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index a43fa91..9831557 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -82,9 +82,9 @@ protected:
::cppu::OInterfaceContainerHelper aFlushListeners;
ConvMap aFromLeft;
- std::auto_ptr< ConvMap > pFromRight; // only available for
bidirectional conversion dictionaries
+ std::unique_ptr< ConvMap > pFromRight; // only available for
bidirectional conversion dictionaries
- std::auto_ptr< PropTypeMap > pConvPropType;
+ std::unique_ptr< PropTypeMap > pConvPropType;
OUString aMainURL; // URL to file
OUString aName;
commit 67009cf202e2a9bca3ac095870f6d64a47f09157
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:27:35 2014 +0200
l10ntools: std::auto_ptr -> std::unique_ptr
Change-Id: I595506b8c6d127abaa8d86bd0ed263edba210bb5
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 20773de..492f6f7c 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -81,7 +81,7 @@ bool HelpParser::CreatePO(
SimpleXMLParser aParser;
//TODO: explicit BOM handling?
- std::auto_ptr <XMLFile> file ( aParser.Execute( sHelpFile, pXmlFile ) );
+ std::unique_ptr <XMLFile> file ( aParser.Execute( sHelpFile, pXmlFile ) );
if(file.get() == NULL)
{
commit 3b094090b6f856f3683a97ca66b46df1e79694b2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:27:24 2014 +0200
idlc: std::auto_ptr -> std::unique_ptr
Change-Id: I0d64c9b2b7aeddfd70541a14c8a325fea9944c39
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 1f22e9c..ec56a94 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -960,7 +960,7 @@ AstExprValue* AstExpression::eval_bin_op(EvalKind ek)
if (m_subExpr2->getExprValue() == NULL)
return NULL;
- std::auto_ptr< AstExprValue > retval(new AstExprValue());
+ std::unique_ptr< AstExprValue > retval(new AstExprValue());
retval->et = eType;
switch (m_combOperator)
@@ -1010,9 +1010,7 @@ AstExprValue* AstExpression::eval_bit_op(EvalKind ek)
if (m_subExpr2->getExprValue() == NULL)
return NULL;
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< AstExprValue > retval(new AstExprValue());
-SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr< AstExprValue > retval(new AstExprValue());
retval->et = ET_long;
switch (m_combOperator)
@@ -1055,9 +1053,7 @@ AstExprValue* AstExpression::eval_un_op(EvalKind ek)
if (m_subExpr1->getExprValue() == NULL)
return NULL;
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< AstExprValue > retval(new AstExprValue());
-SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr< AstExprValue > retval(new AstExprValue());
retval->et = ET_double;
switch (m_combOperator)
commit 381044bf28ef081a0eaf54007ed34af8c309261b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:27:16 2014 +0200
i18npool: std::auto_ptr -> std::unique_ptr
Change-Id: I084e8dfd026d59374d92d9b4cb45d63af2aea470
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 8b84822..8bf9ef8 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -124,7 +124,7 @@ public:
private :
friend bool operator ==(const com::sun::star::lang::Locale& l1, const
com::sun::star::lang::Locale& l2);
- ::std::auto_ptr< LocaleDataLookupTableItem > cachedItem;
+ ::std::unique_ptr< LocaleDataLookupTableItem > cachedItem;
oslGenericFunction SAL_CALL getFunctionSymbol( const
com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw(
com::sun::star::uno::RuntimeException );
oslGenericFunction SAL_CALL getFunctionSymbolByName( const OUString&
localeName, const sal_Char* pFunction );
commit 00061554c5df8034e2dc4803bb1433b8eb074f8f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:27:04 2014 +0200
framework: std::auto_ptr -> std::unique_ptr
Change-Id: I6ef5e9018d1e33c205eae934c404d3391a4693f2
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx
b/framework/inc/uiconfiguration/imagemanager.hxx
index 1a18839..bb0f524 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -110,7 +110,7 @@ namespace framework
void setStorage( const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage >& Storage ) throw
(::com::sun::star::uno::RuntimeException);
private:
- ::std::auto_ptr<ImageManagerImpl> m_pImpl;
+ ::std::unique_ptr<ImageManagerImpl> m_pImpl;
};
}
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx
b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 0775d1d..7cd3c13 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -95,9 +95,7 @@ namespace framework
virtual sal_Bool SAL_CALL isReadOnly() throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<ImageManagerImpl>
m_pImpl;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<ImageManagerImpl>
m_pImpl;
};
}
commit 3b206d4818270997166421e332ecfe2578c56f70
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:26:55 2014 +0200
forms: std::auto_ptr -> std::unique_ptr
Change-Id: Ia8f045715a508de77c8ce86cf224a3038162faac
diff --git a/forms/source/component/ComboBox.hxx
b/forms/source/component/ComboBox.hxx
index 3229f07..ad3ed57 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -60,7 +60,7 @@ class OComboBoxModel
::com::sun::star::form::ListSourceType m_eListSourceType; //
ListSource's type
bool m_bEmptyIsNull; // Empty
string is interpreted as NULL
- ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter;
+ ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter;
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index d8eda8b..fb34214 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -34,7 +34,7 @@ namespace frm
class OEditModel
:public OEditBaseModel
{
- ::std::auto_ptr< ::dbtools::FormattedColumnValue >
+ ::std::unique_ptr< ::dbtools::FormattedColumnValue >
m_pValueFormatter;
bool m_bMaxTextLenModified : 1; // set to <TRUE/> when
we change the MaxTextLen of the aggregate
diff --git a/forms/source/component/Pattern.hxx
b/forms/source/component/Pattern.hxx
index 8b2504d..dfcdde0 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -35,7 +35,7 @@ class OPatternModel
{
private:
::com::sun::star::uno::Any m_aLastKnownValue;
- ::std::auto_ptr< ::dbtools::FormattedColumnValue >
+ ::std::unique_ptr< ::dbtools::FormattedColumnValue >
m_pFormattedValue;
protected:
diff --git a/forms/source/component/cachedrowset.hxx
b/forms/source/component/cachedrowset.hxx
index b7a7aff..ebbe73a 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -72,7 +72,7 @@ namespace frm
void setConnection ( const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XConnection >& _rxConnection );
private:
- ::std::auto_ptr< CachedRowSet_Data > m_pData;
+ ::std::unique_ptr< CachedRowSet_Data > m_pData;
};
diff --git a/forms/source/component/clickableimage.hxx
b/forms/source/component/clickableimage.hxx
index 8fb17f5..60f03b8 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -178,7 +178,7 @@ namespace frm
private:
OImageProducerThread_Impl* m_pThread;
::cppu::OInterfaceContainerHelper m_aSubmissionVetoListeners;
- ::std::auto_ptr< ControlFeatureInterception >
+ ::std::unique_ptr< ControlFeatureInterception >
m_pFeatureInterception;
protected:
diff --git a/forms/source/inc/controlfeatureinterception.hxx
b/forms/source/inc/controlfeatureinterception.hxx
index 381eb32..54c0a2c 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -49,9 +49,7 @@ namespace frm
private:
::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProviderInterceptor >
m_xFirstDispatchInterceptor;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< UrlTransformer > m_pUrlTransformer;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< UrlTransformer > m_pUrlTransformer;
public:
/** retrieves our URL transformer, so our clients may use it, too
diff --git a/forms/source/inc/formnavigation.hxx
b/forms/source/inc/formnavigation.hxx
index c323c2b..6bd725f 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -66,10 +66,8 @@ namespace frm
private:
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >
m_xORB;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ControlFeatureInterception >
+ ::std::unique_ptr< ControlFeatureInterception >
m_pFeatureInterception;
- SAL_WNODEPRECATED_DECLARATIONS_POP
// all supported features
FeatureMap m_aSupportedFeatures;
@@ -181,9 +179,7 @@ namespace frm
class OFormNavigationMapper
{
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< UrlTransformer > m_pUrlTransformer;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< UrlTransformer > m_pUrlTransformer;
public:
OFormNavigationMapper(
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index 3e3f149..af5ec75 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -90,7 +90,6 @@ namespace frm
ORichTextModel::ORichTextModel( const ORichTextModel* _pOriginal, const
Reference< XComponentContext >& _rxFactory )
:OControlModel ( _pOriginal, _rxFactory, false )
,FontControlModel ( _pOriginal )
- ,m_pEngine ( NULL )
,m_bSettingEngineText( false )
,m_aModifyListeners ( m_aMutex )
{
diff --git a/forms/source/richtext/richtextmodel.hxx
b/forms/source/richtext/richtextmodel.hxx
index 1df1bc4..f64d22b 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -89,7 +89,7 @@ namespace frm
bool m_bMultiLine;
// </properties_for_awt_edit_compatibility>
- ::std::auto_ptr<RichTextEngine>
+ ::std::unique_ptr<RichTextEngine>
m_pEngine;
bool m_bSettingEngineText;
diff --git a/forms/source/xforms/datatypes.cxx
b/forms/source/xforms/datatypes.cxx
index 4cc14ba..6c8d643 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -192,8 +192,7 @@ namespace xforms
namespace
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- static void lcl_initializePatternMatcher( ::std::auto_ptr<
RegexMatcher >& _rpMatcher, const OUString& _rPattern )
+ static void lcl_initializePatternMatcher( ::std::unique_ptr<
RegexMatcher >& _rpMatcher, const OUString& _rPattern )
{
UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aIcuPattern( reinterpret_cast<const UChar
*>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in
MinGW
@@ -201,7 +200,6 @@ namespace xforms
OSL_ENSURE( U_SUCCESS( nMatchStatus ),
"lcl_initializePatternMatcher: invalid pattern property!" );
// if asserts, then something changed our pattern without
going to convertFastPropertyValue/checkPropertySanity
}
- SAL_WNODEPRECATED_DECLARATIONS_POP
static bool lcl_matchString( RegexMatcher& _rMatcher, const OUString&
_rText )
{
diff --git a/forms/source/xforms/datatypes.hxx
b/forms/source/xforms/datatypes.hxx
index 4aa9f50..d881300 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -62,7 +62,7 @@ namespace xforms
sal_uInt16 m_nWST;
// </properties>
- ::std::auto_ptr< U_NAMESPACE_QUALIFIER RegexMatcher >
+ ::std::unique_ptr< U_NAMESPACE_QUALIFIER RegexMatcher >
m_pPatternMatcher;
bool m_bPatternMatcherDirty;
diff --git a/forms/source/xforms/submission/replace.cxx
b/forms/source/xforms/submission/replace.cxx
index 88a7238..2c2f670 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -107,11 +107,10 @@ CSubmission::SubmissionResult CSubmission::replace(const
OUString& aReplace, con
return CSubmission::UNKNOWN_ERROR;
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< CSerialization > CSubmission::createSerialization(const
Reference< XInteractionHandler >& _xHandler,Reference<XCommandEnvironment>&
_rOutEnv)
+::std::unique_ptr< CSerialization > CSubmission::createSerialization(const
Reference< XInteractionHandler >& _xHandler,Reference<XCommandEnvironment>&
_rOutEnv)
{
// PUT always uses application/xml
- ::std::auto_ptr< CSerialization > apSerialization(new
CSerializationAppXML());
+ ::std::unique_ptr< CSerialization > apSerialization(new
CSerializationAppXML());
apSerialization->setSource(m_aFragment);
apSerialization->serialize();
@@ -130,6 +129,5 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
_rOutEnv = pHelper;
return apSerialization;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/submission/submission.hxx
b/forms/source/xforms/submission/submission.hxx
index 7ac4eefd..0cca950 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -117,7 +117,7 @@ protected:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
OUString m_aEncoding;
- ::std::auto_ptr< CSerialization > createSerialization(const
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler
>& aHandler
+ ::std::unique_ptr< CSerialization > createSerialization(const
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler
>& aHandler
,com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment>&
_rOutEnv);
public:
diff --git a/forms/source/xforms/submission/submission_post.cxx
b/forms/source/xforms/submission/submission_post.cxx
index 0aecefc..cd1cba2 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -48,7 +48,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const
css::uno::Reference<
{
// PUT always uses application/xml
css::uno::Reference< XCommandEnvironment > aEnvironment;
- auto_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
+ unique_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
try {
ucbhelper::Content
aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment,
comphelper::getProcessComponentContext());
diff --git a/forms/source/xforms/submission/submission_put.cxx
b/forms/source/xforms/submission/submission_put.cxx
index aedbd8c..3d7284c 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -45,7 +45,7 @@ CSubmissionPut::CSubmissionPut(const OUString& aURL, const
css::uno::Reference<
CSubmission::SubmissionResult CSubmissionPut::submit(const
css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
{
css::uno::Reference< XCommandEnvironment > aEnvironment;
- auto_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
+ unique_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
try {
ucbhelper::Content
aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment,
comphelper::getProcessComponentContext());
commit 3b5345e1234d2ede54cb971ff2881719da26e6a7
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:26:40 2014 +0200
extensions: std::auto_ptr -> std::unique_ptr
Change-Id: I2d9d2e145584013d8e94f5aea2ec7732452b240c
diff --git a/extensions/source/logging/filehandler.cxx
b/extensions/source/logging/filehandler.cxx
index c82175f..dd75190 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -93,7 +93,7 @@ namespace logging
Reference<XComponentContext> m_xContext;
LogHandlerHelper m_aHandlerHelper;
OUString m_sFileURL;
- ::std::auto_ptr< ::osl::File > m_pFile;
+ ::std::unique_ptr< ::osl::File > m_pFile;
FileValidity m_eFileValidity;
protected:
diff --git a/extensions/source/propctrlr/browserlistbox.hxx
b/extensions/source/propctrlr/browserlistbox.hxx
index b61911c..272d4e4 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -95,7 +95,7 @@ namespace pcr
protected:
Window m_aLinesPlayground;
ScrollBar m_aVScroll;
- ::std::auto_ptr< InspectorHelpWindow >
+ ::std::unique_ptr< InspectorHelpWindow >
m_pHelpWindow;
ListBoxLines m_aLines;
IPropertyLineListener* m_pLineListener;
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx
b/extensions/source/propctrlr/cellbindinghandler.hxx
index 588a4a4..e07bfa0 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -42,7 +42,7 @@ namespace pcr
class CellBindingPropertyHandler : public CellBindingPropertyHandler_Base
{
private:
- ::std::auto_ptr< CellBindingHelper > m_pHelper;
+ ::std::unique_ptr< CellBindingHelper > m_pHelper;
::rtl::Reference< IPropertyEnumRepresentation >
m_pCellExchangeConverter;
public:
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx
b/extensions/source/propctrlr/composeduiupdate.hxx
index 7d612b7..7b9dffa 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -69,7 +69,7 @@ namespace pcr
class ComposedPropertyUIUpdate
{
private:
- ::std::auto_ptr< MapHandlerToUI > m_pCollectedUIs;
+ ::std::unique_ptr< MapHandlerToUI > m_pCollectedUIs;
::com::sun::star::uno::Reference<
::com::sun::star::inspection::XObjectInspectorUI >
m_xDelegatorUI;
oslInterlockedCount m_nSuspendCounter;
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx
b/extensions/source/propctrlr/defaultforminspection.hxx
index cfc98ef..22e17de 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -39,9 +39,7 @@ namespace pcr
bool m_bConstructed;
/// access to property meta data
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< OPropertyInfoService > m_pInfoService;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< OPropertyInfoService > m_pInfoService;
protected:
virtual ~DefaultFormComponentInspectorModel();
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx
b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 3ca1874..d343041 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -38,7 +38,7 @@ namespace pcr
class EFormsPropertyHandler : public EFormsPropertyHandler_Base
{
private:
- ::std::auto_ptr< EFormsHelper > m_pHelper;
+ ::std::unique_ptr< EFormsHelper > m_pHelper;
/** current value of the Model property, if there is no binding, yet
*/
OUString m_sBindingLessModelName;
diff --git a/extensions/source/propctrlr/eventhandler.cxx
b/extensions/source/propctrlr/eventhandler.cxx
index 34c00994..34a2dd0 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -854,7 +854,7 @@ namespace pcr
if ( !pFactory )
return InteractiveSelectionResult_Cancelled;
- ::std::auto_ptr< VclAbstractDialog > pDialog(
pFactory->CreateSvxMacroAssignDlg(
+ ::std::unique_ptr< VclAbstractDialog > pDialog(
pFactory->CreateSvxMacroAssignDlg(
PropertyHandlerHelper::getDialogParentWindow( m_xContext ),
impl_getContextFrame_nothrow(),
m_bIsDialogElement,
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx
b/extensions/source/propctrlr/formcomponenthandler.hxx
index 5eed30a..a923df8 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -451,7 +451,7 @@ namespace pcr
class WaitCursor
{
private:
- ::std::auto_ptr< WaitObject > m_aWaitObject;
+ ::std::unique_ptr< WaitObject > m_aWaitObject;
public:
WaitCursor( vcl::Window* _pWindow )
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx
b/extensions/source/propctrlr/formlinkdialog.hxx
index e4fc3f0..94b386e 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -47,12 +47,10 @@ namespace pcr
FixedText* m_pExplanation;
FixedText* m_pDetailLabel;
FixedText* m_pMasterLabel;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< FieldLinkRow > m_aRow1;
- ::std::auto_ptr< FieldLinkRow > m_aRow2;
- ::std::auto_ptr< FieldLinkRow > m_aRow3;
- ::std::auto_ptr< FieldLinkRow > m_aRow4;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< FieldLinkRow > m_aRow1;
+ ::std::unique_ptr< FieldLinkRow > m_aRow2;
+ ::std::unique_ptr< FieldLinkRow > m_aRow3;
+ ::std::unique_ptr< FieldLinkRow > m_aRow4;
OKButton* m_pOK;
PushButton* m_pSuggest;
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx
b/extensions/source/propctrlr/inspectormodelbase.cxx
index 9a2f336..8dd806a 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -63,7 +63,7 @@ namespace pcr
sal_Int32 m_nMinHelpTextLines;
sal_Int32 m_nMaxHelpTextLines;
bool m_bIsReadOnly;
- ::std::auto_ptr< ::cppu::IPropertyArrayHelper >
+ ::std::unique_ptr< ::cppu::IPropertyArrayHelper >
m_pPropertyInfo;
public:
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx
b/extensions/source/propctrlr/inspectormodelbase.hxx
index fc08a0a..34ed5fb 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -54,7 +54,7 @@ namespace pcr
,public ImplInspectorModel_PBase
{
protected:
- ::std::auto_ptr< InspectorModelProperties >
m_pProperties;
+ ::std::unique_ptr< InspectorModelProperties >
m_pProperties;
protected:
virtual ~ImplInspectorModel();
diff --git a/extensions/source/propctrlr/propcontroller.hxx
b/extensions/source/propctrlr/propcontroller.hxx
index 62c73a6..5dbe78a 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -121,7 +121,7 @@ namespace pcr
PropertyHandlerMultiRepository m_aDependencyHandlers;
PropertyHandlerRef m_xInteractiveHandler;
- ::std::auto_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer;
+ ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer;
/// our InspectorModel
::com::sun::star::uno::Reference<
::com::sun::star::inspection::XObjectInspectorModel >
diff --git a/extensions/source/propctrlr/propertycomposer.hxx
b/extensions/source/propctrlr/propertycomposer.hxx
index 725f971..4c71696 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -60,9 +60,7 @@ namespace pcr
private:
HandlerArray m_aSlaveHandlers;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer;
PropertyChangeListeners m_aPropertyListeners;
bool
m_bSupportedPropertiesAreKnown;
PropertyBag m_aSupportedProperties;
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx
b/extensions/source/propctrlr/propertycontrolextender.hxx
index 8290dff..3795917 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -55,7 +55,7 @@ namespace pcr
virtual ~PropertyControlExtender();
private:
- ::std::auto_ptr< PropertyControlExtender_Data > m_pData;
+ ::std::unique_ptr< PropertyControlExtender_Data > m_pData;
};
diff --git a/extensions/source/propctrlr/propertyhandler.hxx
b/extensions/source/propctrlr/propertyhandler.hxx
index ee669ca..2b1ebcd 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -94,7 +94,7 @@ namespace pcr
/// type converter, needed on various occasions
::com::sun::star::uno::Reference<
::com::sun::star::script::XTypeConverter > m_xTypeConverter;
/// access to property meta data
- ::std::auto_ptr< OPropertyInfoService >
m_pInfoService;
+ ::std::unique_ptr< OPropertyInfoService >
m_pInfoService;
protected:
PropertyHandler(
diff --git a/extensions/source/propctrlr/submissionhandler.hxx
b/extensions/source/propctrlr/submissionhandler.hxx
index 04563ce..a689aad 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -70,7 +70,7 @@ namespace pcr
{
private:
::osl::Mutex m_aMutex;
- ::std::auto_ptr< SubmissionHelper > m_pHelper;
+ ::std::unique_ptr< SubmissionHelper > m_pHelper;
::comphelper::OPropertyChangeMultiplexer* m_pPropChangeMultiplexer;
public:
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index ff8bb26..ce23f78 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -38,7 +38,7 @@ namespace pcr
class XSDValidationPropertyHandler : public
XSDValidationPropertyHandler_Base
{
private:
- ::std::auto_ptr< XSDValidationHelper > m_pHelper;
+ ::std::unique_ptr< XSDValidationHelper > m_pHelper;
public:
XSDValidationPropertyHandler(
commit fddabddb0ad178ce6989d254c6001126d7bd23c4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 30 12:26:27 2014 +0200
desktop: std::auto_ptr -> std::unique_ptr
Change-Id: I450ee7134454321365d9d153522b8942a3d7d811
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index da0d927..b2c3433 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1332,8 +1332,8 @@ struct ExecuteGlobals
Reference < css::document::XDocumentEventListener > xGlobalBroadcaster;
bool bRestartRequested;
bool bUseSystemFileDialog;
- std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
- std::auto_ptr<SvtPathOptions> pPathOptions;
+ std::unique_ptr<SvtLanguageOptions> pLanguageOptions;
+ std::unique_ptr<SvtPathOptions> pPathOptions;
ExecuteGlobals()
: bRestartRequested( false )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e40c291..dd93edb 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -92,7 +92,7 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString,
StrAllFiles >
{
const OUString operator () () {
const SolarMutexGuard guard;
- ::std::auto_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr(
"fps_office" ) );
+ ::std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr(
"fps_office" ) );
OSL_ASSERT( resmgr.get() != 0 );
return ResId(STR_FILTERNAME_ALL, *resmgr.get()).toString();
}
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx
b/desktop/source/deployment/gui/dp_gui_service.cxx
index e4185bb..84bf5b7 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -211,7 +211,7 @@ void ServiceImpl::startExecuteModal(
throw (RuntimeException, std::exception)
{
bool bCloseDialog = true; // only used if m_bShowUpdateOnly is true
- ::std::auto_ptr<Application> app;
+ ::std::unique_ptr<Application> app;
//ToDo: synchronize access to s_dialog !!!
if (! dp_gui::TheExtensionManager::s_ExtMgr.is())
{
diff --git a/desktop/source/deployment/gui/license_dialog.cxx
b/desktop/source/deployment/gui/license_dialog.cxx
index ff375208..c9aab53 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -307,7 +307,7 @@ sal_Int16 LicenseDialog::execute() throw (RuntimeException,
std::exception)
sal_Int16 LicenseDialog::solar_execute()
{
- std::auto_ptr<LicenseDialogImpl> dlg(
+ std::unique_ptr<LicenseDialogImpl> dlg(
new LicenseDialogImpl(
VCLUnoHelper::GetWindow(m_parent),
m_xComponentContext, m_sExtensionName, m_sLicenseText));
diff --git a/desktop/source/deployment/manager/dp_manager.h
b/desktop/source/deployment/manager/dp_manager.h
index 91e7257..f342eda 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -50,7 +50,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder,
public t_pm_helper
OUString m_activePackages;
OUString m_activePackages_expanded;
- ::std::auto_ptr< ActivePackages > m_activePackagesDB;
+ ::std::unique_ptr< ActivePackages > m_activePackagesDB;
//This mutex is only used for synchronization in addPackage
::osl::Mutex m_addMutex;
css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 636d2ad..fe30080 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -292,7 +292,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
OUString m_commonRDB_orig;
OUString m_nativeRDB_orig;
- std::auto_ptr<ComponentBackendDb> m_backendDb;
+ std::unique_ptr<ComponentBackendDb> m_backendDb;
void addDataToDb(OUString const & url, ComponentBackendDb::Data const &
data);
ComponentBackendDb::Data readDataFromDb(OUString const & url);
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 0408442..4af0fe3 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -46,6 +46,7 @@
#include <com/sun/star/util/XRefreshable.hpp>
#include <list>
#include <memory>
+#include <utility>
#include "dp_configurationbackenddb.hxx"
@@ -103,7 +104,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
bool m_configmgrini_inited;
bool m_configmgrini_modified;
- std::auto_ptr<ConfigurationBackendDb> m_backendDb;
+ std::unique_ptr<ConfigurationBackendDb> m_backendDb;
// PackageRegistryBackend
virtual Reference<deployment::XPackage> bindPackage_(
@@ -113,7 +114,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
#if HAVE_FEATURE_EXTENSIONS
// for backwards compatibility - nil if no (compatible) back-compat db
present
- ::std::auto_ptr<PersistentMap> m_registeredPackages;
+ ::std::unique_ptr<PersistentMap> m_registeredPackages;
#endif
virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -218,9 +219,7 @@ BackendImpl::BackendImpl(
configmgrini_verify_init( xCmdEnv );
#if HAVE_FEATURE_EXTENSIONS
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<PersistentMap> pMap;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<PersistentMap> pMap;
OUString aCompatURL( makeURL( getCachePath(),
"registered_packages.pmap" ) );
// Don't create it if it doesn't exist already
@@ -228,9 +227,7 @@ BackendImpl::BackendImpl(
{
try
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- pMap = ::std::auto_ptr<PersistentMap>( new PersistentMap(
aCompatURL, false ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pMap.reset( new PersistentMap( aCompatURL, false ) );
}
catch (const Exception &e)
{
@@ -240,7 +237,7 @@ BackendImpl::BackendImpl(
dp_misc::writeConsole( aStr.getStr() );
}
}
- m_registeredPackages = pMap;
+ m_registeredPackages = std::move(pMap);
#endif
}
}
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx
b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 5df3919..034ccb2 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -86,7 +86,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
void revokeEntryFromDb(OUString const & url);
Reference<deployment::XPackageTypeInfo> m_xExecutableTypeInfo;
- std::auto_ptr<ExecutableBackendDb> m_backendDb;
+ std::unique_ptr<ExecutableBackendDb> m_backendDb;
public:
BackendImpl( Sequence<Any> const & args,
Reference<XComponentContext> const & xComponentContext );
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index 41a429b..51feccc 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -111,7 +111,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo;
Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
- std::auto_ptr<HelpBackendDb> m_backendDb;
+ std::unique_ptr<HelpBackendDb> m_backendDb;
public:
BackendImpl( Sequence<Any> const & args,
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index de7968a..5e4f96d 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -240,7 +240,7 @@ class BackendImpl : public ImplBaseT
const Reference<deployment::XPackageTypeInfo> m_xLegacyBundleTypeInfo;
Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
- std::auto_ptr<ExtensionBackendDb> m_backendDb;
+ std::unique_ptr<ExtensionBackendDb> m_backendDb;
void addDataToDb(OUString const & url, ExtensionBackendDb::Data const &
data);
ExtensionBackendDb::Data readDataFromDb(OUString const & url);
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx
b/desktop/source/deployment/registry/script/dp_script.cxx
index c5ef149..cf1bc1f 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -93,7 +93,7 @@ class BackendImpl : public t_helper
const Reference<deployment::XPackageTypeInfo> m_xBasicLibTypeInfo;
const Reference<deployment::XPackageTypeInfo> m_xDialogLibTypeInfo;
Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
- std::auto_ptr<ScriptBackendDb> m_backendDb;
+ std::unique_ptr<ScriptBackendDb> m_backendDb;
public:
BackendImpl( Sequence<Any> const & args,
Reference<XComponentContext> const & xComponentContext );
diff --git a/desktop/source/migration/migration_impl.hxx
b/desktop/source/migration/migration_impl.hxx
index 5f8e345..4bb99e4 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -51,7 +51,7 @@ struct install_info
};
typedef std::vector< OUString > strings_v;
-typedef std::auto_ptr< strings_v > strings_vr;
+typedef std::unique_ptr< strings_v > strings_vr;
struct migration_step
{
@@ -73,7 +73,7 @@ struct supported_migration
};
typedef std::vector< migration_step > migrations_v;
-typedef std::auto_ptr< migrations_v > migrations_vr;
+typedef std::unique_ptr< migrations_v > migrations_vr;
typedef std::vector< supported_migration > migrations_available;
diff --git a/desktop/source/migration/services/misc.hxx
b/desktop/source/migration/services/misc.hxx
index 13013bb..f6018ed 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -31,7 +31,7 @@ namespace migration
typedef ::std::vector< OUString > TStringVector;
- typedef ::std::auto_ptr< TStringVector > TStringVectorPtr;
+ typedef ::std::unique_ptr< TStringVector > TStringVectorPtr;
} // namespace migration
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
