mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forms: std::auto_ptr -> std::unique_ptr

Browse Source 
Change-Id: Ia8f045715a508de77c8ce86cf224a3038162faac
This commit is contained in:
Stephan Bergmann
2014-09-30 12:26:55 +02:00
parent 3b5345e123
commit 3b206d4818
15 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/source/component/ComboBox.hxx
View File

@@ -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;

2
forms/source/component/Edit.hxx
View File

@@ -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

2
forms/source/component/Pattern.hxx
View File

@@ -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:

2
forms/source/component/cachedrowset.hxx
View File

@@ -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;
};

2
forms/source/component/clickableimage.hxx
View File

@@ -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:

4
forms/source/inc/controlfeatureinterception.hxx
View File

@@ -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

8
forms/source/inc/formnavigation.hxx
View File

@@ -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(

1
forms/source/richtext/richtextmodel.cxx
View File

@@ -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 )
{

2
forms/source/richtext/richtextmodel.hxx
View File

@@ -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;

4
forms/source/xforms/datatypes.cxx
View File

@@ -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 )
{

2
forms/source/xforms/datatypes.hxx
View File

@@ -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;

6
forms/source/xforms/submission/replace.cxx
View File

@@ -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: */

2
forms/source/xforms/submission/submission.hxx
View File

@@ -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:

2
forms/source/xforms/submission/submission_post.cxx
View File

@@ -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());

2
forms/source/xforms/submission/submission_put.cxx
View File

@@ -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());