summaryrefslogtreecommitdiff
path: root/i18npool/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-22 14:04:06 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-02 11:12:15 +0100
commit23e9b1294471459d386152b1197cfe58514af5da (patch)
tree0c8705260a4f33810e4c69f09a09dca7031e0ea7 /i18npool/inc
parentcc45c96770def8fb3cc8c6d6c3d385c592806ae9 (diff)
loplugin:useuniqueptr in i18npool
Change-Id: Iff39b9298bfad474c5c011b6355b8ebf5be06318 Reviewed-on: https://gerrit.libreoffice.org/49091 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/breakiteratorImpl.hxx2
-rw-r--r--i18npool/inc/calendarImpl.hxx2
-rw-r--r--i18npool/inc/cclass_unicode.hxx3
-rw-r--r--i18npool/inc/characterclassificationImpl.hxx3
-rw-r--r--i18npool/inc/collatorImpl.hxx3
-rw-r--r--i18npool/inc/collator_unicode.hxx2
-rw-r--r--i18npool/inc/inputsequencechecker.hxx3
7 files changed, 11 insertions, 7 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 6ecaef630d3e..6d12a9cf24bd 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -116,7 +116,7 @@ private:
css::lang::Locale aLocale;
css::uno::Reference < XBreakIterator > xBI;
};
- std::vector<lookupTableItem*> lookupTable;
+ std::vector<lookupTableItem> lookupTable;
css::lang::Locale aLocale;
css::uno::Reference < XBreakIterator > xBI;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index aec643dcd59e..8d8f0d3afd23 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -100,7 +100,7 @@ private:
OUString uniqueID;
css::uno::Reference < css::i18n::XCalendar4 > xCalendar;
};
- std::vector<lookupTableItem*> lookupTable;
+ std::vector<lookupTableItem> lookupTable;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
css::uno::Reference < css::i18n::XCalendar4 > xCalendar;
};
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index bea025a231e9..2b6e3d9e890f 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -27,6 +27,7 @@
#include "transliteration_body.hxx"
#include <o3tl/typed_flags_set.hxx>
+#include <memory>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -95,7 +96,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
- Transliteration_casemapping *trans;
+ std::unique_ptr<Transliteration_casemapping> trans;
// --- parser specific (implemented in cclass_unicode_parser.cxx) ---
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 36d37c69e4fc..078a31b116ba 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <cppuhelper/implbase.hxx>
#include <vector>
+#include <memory>
#include <com/sun/star/i18n/KCharacterType.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -80,7 +81,7 @@ private:
aLocale.Variant == rLocale.Variant;
};
};
- std::vector<lookupTableItem*> lookupTable;
+ std::vector<std::unique_ptr<lookupTableItem>> lookupTable;
lookupTableItem *cachedItem;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 534690897731..940031a1480f 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -29,6 +29,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <vector>
+#include <memory>
namespace i18npool {
@@ -88,7 +89,7 @@ private:
algorithm == _algorithm;
}
};
- std::vector<lookupTableItem*> lookupTable;
+ std::vector<std::unique_ptr<lookupTableItem>> lookupTable;
lookupTableItem * cachedItem;
// Service Factory
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index d943bc9bc2c1..275b8f8faf79 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -63,7 +63,7 @@ public:
private:
const sal_Char *implementationName;
- icu::RuleBasedCollator *uca_base, *collator;
+ std::unique_ptr<icu::RuleBasedCollator> uca_base, collator;
#ifndef DISABLE_DYNLOADING
oslModule hModule;
#endif
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 0c27637b9535..a8dbdb80d21f 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
#include <vector>
+#include <memory>
namespace i18npool {
@@ -63,7 +64,7 @@ private:
const sal_Char* aLanguage;
css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xISC;
};
- std::vector<lookupTableItem*> lookupTable;
+ std::vector<std::unique_ptr<lookupTableItem>> lookupTable;
lookupTableItem *cachedItem;
css::uno::Reference < css::uno::XComponentContext > m_xContext;