required/CWS internatiodel : Removed class International

Type
required

Title
Removed class International

Posted by
[email protected]

Affected
,all

Effective from
CWS internatiodel

Summary

Entire class International removed. Please don't introduce any new dependencies.

- tools/intn.hxx
+ tools/mslangid.hxx // for all MsLangId::... methods

- static LanguageType International::GetRealLanguage( LanguageType );
+ static LanguageType MsLangId::getRealLanguageWithoutConfig( LanguageType );

- static LanguageType SvNumberFormatter::GetProperLanguage( LanguageType );
+ static LanguageType MsLangId::getRealLanguage( LanguageType );

- static LanguageType SvNumberFormatter::ConvertLanguageToLocale( LanguageType );
+ static LanguageType MsLangId::convertLanguageToLocale( LanguageType, bool bResolveSystem = true );

- static LanguageType ::GetSystemLanguage( USHORT nIndex = INTERNATIONAL_SYSTEM_DEFAULT );
+ static LanguageType MsLangId::getSystemLanguage();

- static LanguageType ::GetSystemUILanguage( USHORT nIndex = INTERNATIONAL_SYSTEM_DEFAULT );
+ static LanguageType MsLangId::getSystemUILanguage();

vcl/svapp.hxx
- static const International& Application::GetAppInternational();
+ static const LocaleDataWrapper& Application::GetAppLocaleDataWrapper();

tools/date.hxx
- enum WeekCountStart
- USHORT Date::GetWeekOfYear( DayOfWeek eStartDay = MONDAY, WeekCountStart eWeekStart = WEEKCOUNT_FIRST4DAYWEEK ) const;
+ USHORT Date::GetWeekOfYear( DayOfWeek eStartDay = MONDAY, sal_Int16 nMinimumNumberOfDaysInWeek = 4 ) const;

removed entire class International legacy code from resource compiler:
tools/rc.h
- #define NUMERICFORMATTER_I12
- #define DATEFORMATTER_I12
- #define TIMEFORMATTER_I12
- all #define INT1_*
- all #define INT2_*
tools/rcid.h
- #define RSC_INTERNATIONAL

svtools/calendar.hxx
- const International& Calendar::GetInternational() const;
+ const CalendarWrapper& Calendar::GetCalendarWrapper() const;
+ void Calendar::SetWeekStart( sal_Int16 nDay );
+ void Calendar::SetMinimumNumberOfDaysInWeek( sal_Int16 nDays );

Description

Removed the entire class International and replaced remaining calls to
its functionality with calls to LocaleDataWrapper respectively
CalendarWrapper.

One remaining uncertainty:
USHORT SvxLanguageItem::GetValueCount() const;
previously returned LANGUAGE_COUNT (125), which was wrong anyway as it
didn't match any real existing language count. Now pops up an assertion
"SvxLanguageItem::GetValueCount: supposed to return a count of what?"
and returns 0. If needed, for possible return values please see
comments in svx/source/items/textitem.cxx

Consolidated MS-LangID related methods into class MsLangId.

#ifndef INCLUDED_TOOLS_MSLANGID_HXX
#include <tools/mslangid.hxx>
#endif

Omitted method's descriptions because the Description field can't cope
with the length. See comments in the header file.

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]