summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-07 11:13:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-07 12:27:32 +0000
commit994a737a317165db736f2a2f6a25b3439207da5d (patch)
treedbeb5441482ec0a093682583ae0ef19b28154c05 /unotools
parentc9e9b3a36ffd2d2b37fbe7267b4707174e8c6312 (diff)
callcatcher: update list
Diffstat (limited to 'unotools')
-rw-r--r--unotools/inc/unotools/intlwrapper.hxx16
-rw-r--r--unotools/source/i18n/intlwrapper.cxx20
2 files changed, 0 insertions, 36 deletions
diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index d614a2088e4e..92aef9d099bc 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -59,17 +59,13 @@ private:
::com::sun::star::lang::Locale aLocale;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
- CharClass* pCharClass;
LocaleDataWrapper* pLocaleData;
- CalendarWrapper* pCalendar;
CollatorWrapper* pCollator;
CollatorWrapper* pCaseCollator;
LanguageType eLanguage;
- void ImplNewCharClass() const;
void ImplNewLocaleData() const;
- void ImplNewCalendar() const;
void ImplNewCollator( sal_Bool bCaseSensitive ) const;
@@ -87,24 +83,12 @@ public:
LanguageType getLanguage() const { return eLanguage; }
const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; }
- const CharClass* getCharClass() const
- {
- if ( !pCharClass )
- ImplNewCharClass();
- return pCharClass;
- }
const LocaleDataWrapper* getLocaleData() const
{
if ( !pLocaleData )
ImplNewLocaleData();
return pLocaleData;
}
- CalendarWrapper* getCalendar() const
- {
- if ( !pCalendar )
- ImplNewCalendar();
- return pCalendar;
- }
/// case insensitive collator, simple IGNORE_CASE
const CollatorWrapper* getCollator() const
{
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index f98d6828efb3..61f86d847b42 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -39,9 +39,7 @@ IntlWrapper::IntlWrapper(
:
aLocale( rLocale ),
xSMgr( xSF ),
- pCharClass( NULL ),
pLocaleData( NULL ),
- pCalendar( NULL ),
pCollator( NULL ),
pCaseCollator( NULL )
{
@@ -54,9 +52,7 @@ IntlWrapper::IntlWrapper(
LanguageType eLang )
:
xSMgr( xSF ),
- pCharClass( NULL ),
pLocaleData( NULL ),
- pCalendar( NULL ),
pCollator( NULL ),
pCaseCollator( NULL ),
eLanguage( eLang )
@@ -67,34 +63,18 @@ IntlWrapper::IntlWrapper(
IntlWrapper::~IntlWrapper()
{
- delete pCharClass;
delete pLocaleData;
- delete pCalendar;
delete pCollator;
delete pCaseCollator;
}
-void IntlWrapper::ImplNewCharClass() const
-{
- ((IntlWrapper*)this)->pCharClass = new CharClass( xSMgr, aLocale );
-}
-
-
void IntlWrapper::ImplNewLocaleData() const
{
((IntlWrapper*)this)->pLocaleData = new LocaleDataWrapper( xSMgr, aLocale );
}
-void IntlWrapper::ImplNewCalendar() const
-{
- CalendarWrapper* p = new CalendarWrapper( xSMgr );
- p->loadDefaultCalendar( aLocale );
- ((IntlWrapper*)this)->pCalendar = p;
-}
-
-
void IntlWrapper::ImplNewCollator( sal_Bool bCaseSensitive ) const
{
CollatorWrapper* p = new CollatorWrapper( xSMgr );