diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-08 09:40:25 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-11 16:17:28 -0500 |
| commit | a4a60b677cd31ecaf040abce20da256fed06523c (patch) | |
| tree | 23316f010d5f79be30b952a4d5d4ea1e37c6e175 /i18npool/inc | |
| parent | Mutex access to the global theIndexTable. (diff) | |
| download | core-a4a60b677cd31ecaf040abce20da256fed06523c.tar.gz core-a4a60b677cd31ecaf040abce20da256fed06523c.zip | |
Revert "Guard CharacterClassificationImpl with mutex."
This reverts commit fc04b55f7f96a4f70f31c145dafd44c1d9276a41.
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/characterclassificationImpl.hxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index 24221d10f7b4..e220968640b0 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "osl/mutex.hxx" - namespace com { namespace sun { namespace star { namespace i18n { class CharacterClassificationImpl : public cppu::WeakImplHelper2 @@ -95,19 +93,17 @@ private: aLocale.Variant == rLocale.Variant; }; }; + std::vector<lookupTableItem*> lookupTable; + lookupTableItem *cachedItem; + + com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; + com::sun::star::uno::Reference < XCharacterClassification > xUCI; com::sun::star::uno::Reference < XCharacterClassification > SAL_CALL getLocaleSpecificCharacterClassification(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const com::sun::star::lang::Locale& rLocale); -private: - std::vector<lookupTableItem*> lookupTable; - lookupTableItem *cachedItem; - - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference < XCharacterClassification > xUCI; - osl::Mutex maMtx; }; } } } } |