diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-16 14:15:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-17 08:34:42 +0000 |
| commit | 7a60e90ef05c84923f83882efc01c33fef1ed305 (patch) | |
| tree | 4c49f1ab14fda2a79e0d8efdb731d4d6fe924eba /i18npool/inc | |
| parent | a9367c1b39600d5a5e2d0067113f06ad59cc37a1 (diff) | |
new loplugin: useuniqueptr: helpcompiler..io
Change-Id: I6b394163c144e6b5540cb160abb613d56fe327de
Reviewed-on: https://gerrit.libreoffice.org/33165
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 4 | ||||
| -rw-r--r-- | i18npool/inc/defaultnumberingprovider.hxx | 4 | ||||
| -rw-r--r-- | i18npool/inc/indexentrysupplier_common.hxx | 5 | ||||
| -rw-r--r-- | i18npool/inc/indexentrysupplier_default.hxx | 6 |
4 files changed, 14 insertions, 5 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 98f48bc1e0e6..a83969c15ce3 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -25,6 +25,8 @@ #include <unicode/calendar.h> #include <rtl/ref.hxx> +#include <memory> + // class Calendar_gregorian @@ -97,7 +99,7 @@ public: protected: const Era *eraArray; - icu::Calendar *body; + std::unique_ptr<icu::Calendar> body; rtl::Reference<NativeNumberSupplierService> mxNatNum; const sal_Char* cCalendar; css::lang::Locale aLocale; diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 5140a553ef6b..200dc0b529bd 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -29,6 +29,8 @@ #include <transliterationImpl.hxx> +#include <memory> + namespace com { namespace sun { namespace star { namespace i18n { class DefaultNumberingProvider : public cppu::WeakImplHelper @@ -83,7 +85,7 @@ public: private: css::uno::Reference < css::uno::XComponentContext > m_xContext; css::uno::Reference < css::container::XHierarchicalNameAccess > xHierarchicalNameAccess; - TransliterationImpl* translit; + std::unique_ptr<TransliterationImpl> translit; OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ) throw(css::uno::RuntimeException, std::exception); bool SAL_CALL isScriptFlagEnabled(const OUString& aName ) diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index cf3120b36276..f25731dce934 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -25,6 +25,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <collatorImpl.hxx> +#include <memory> + namespace com { namespace sun { namespace star { namespace i18n { @@ -90,7 +92,8 @@ public: protected: const sal_Char * implementationName; bool usePhonetic; - CollatorImpl* collator; + std::unique_ptr<CollatorImpl> + collator; css::lang::Locale aLocale; OUString aAlgorithm; diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx index 49b35580e3f4..901dc1d0f4c9 100644 --- a/i18npool/inc/indexentrysupplier_default.hxx +++ b/i18npool/inc/indexentrysupplier_default.hxx @@ -21,6 +21,8 @@ #include <indexentrysupplier_common.hxx> +#include <memory> + namespace com { namespace sun { namespace star { namespace i18n { class Index; @@ -53,7 +55,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - Index *index; + std::unique_ptr<Index> index; }; struct IndexKey { @@ -97,7 +99,7 @@ public: sal_Int16 mkeys[MAX_KEYS]; sal_Int16 mkey_count; OUString skipping_chars; - CollatorImpl *collator; + std::unique_ptr<CollatorImpl> collator; sal_Int16 compare(sal_Unicode c1, sal_Unicode c2); }; |