diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 18:54:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:47 +0300 |
commit | 88bea0a5a8b1e5c1fb601f4e4ba61ba7bce38a3a (patch) | |
tree | 3efd83cf3c67f727f473b73da69e30963f08dc0f /unotools/source/i18n | |
parent | dcb88d170b6ced0ee805b787c1e9be820ff90d25 (diff) |
Kill superfluous vertical whitespace
Change-Id: I949ba575951998d36cb4d38746f2182633046b3b
Diffstat (limited to 'unotools/source/i18n')
-rw-r--r-- | unotools/source/i18n/calendarwrapper.cxx | 28 | ||||
-rw-r--r-- | unotools/source/i18n/caserotate.cxx | 1 | ||||
-rw-r--r-- | unotools/source/i18n/charclass.cxx | 27 | ||||
-rw-r--r-- | unotools/source/i18n/intlwrapper.cxx | 3 | ||||
-rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 53 | ||||
-rw-r--r-- | unotools/source/i18n/nativenumberwrapper.cxx | 6 | ||||
-rw-r--r-- | unotools/source/i18n/numberformatcodewrapper.cxx | 7 | ||||
-rw-r--r-- | unotools/source/i18n/readwritemutexguard.cxx | 3 | ||||
-rw-r--r-- | unotools/source/i18n/textsearch.cxx | 6 | ||||
-rw-r--r-- | unotools/source/i18n/transliterationwrapper.cxx | 11 |
10 files changed, 0 insertions, 145 deletions
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index c7b96eedbe29..5ca9ad966aff 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/strbuf.hxx> #include <tools/debug.hxx> #include <unotools/calendarwrapper.hxx> @@ -28,10 +27,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; - const double MILLISECONDS_PER_DAY = 1000.0 * 60.0 * 60.0 * 24.0; - CalendarWrapper::CalendarWrapper( const Reference< uno::XComponentContext > & rxContext ) @@ -45,7 +42,6 @@ CalendarWrapper::~CalendarWrapper() { } - void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale ) { try @@ -59,7 +55,6 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& } } - void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ) { try @@ -74,7 +69,6 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun: } } - ::com::sun::star::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const { try @@ -90,7 +84,6 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun: return ::com::sun::star::uno::Sequence< OUString > (0); } - OUString CalendarWrapper::getUniqueID() const { try @@ -105,7 +98,6 @@ OUString CalendarWrapper::getUniqueID() const return OUString(); } - void CalendarWrapper::setDateTime( double nTimeInDays ) { try @@ -119,7 +111,6 @@ void CalendarWrapper::setDateTime( double nTimeInDays ) } } - double CalendarWrapper::getDateTime() const { try @@ -134,7 +125,6 @@ double CalendarWrapper::getDateTime() const return 0.0; } - sal_Int32 CalendarWrapper::getCombinedOffsetInMillis( sal_Int16 nParentFieldIndex, sal_Int16 nChildFieldIndex ) const { @@ -158,21 +148,18 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis( return nOffset; } - sal_Int32 CalendarWrapper::getZoneOffsetInMillis() const { return getCombinedOffsetInMillis( CalendarFieldIndex::ZONE_OFFSET, CalendarFieldIndex::ZONE_OFFSET_SECOND_MILLIS); } - sal_Int32 CalendarWrapper::getDSTOffsetInMillis() const { return getCombinedOffsetInMillis( CalendarFieldIndex::DST_OFFSET, CalendarFieldIndex::DST_OFFSET_SECOND_MILLIS); } - void CalendarWrapper::setLocalDateTime( double nTimeInDays ) { try @@ -223,7 +210,6 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays ) } } - double CalendarWrapper::getLocalDateTime() const { try @@ -244,7 +230,6 @@ double CalendarWrapper::getLocalDateTime() const return 0.0; } - void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) { try @@ -258,7 +243,6 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) } } - bool CalendarWrapper::isValid() const { try @@ -273,7 +257,6 @@ bool CalendarWrapper::isValid() const return false; } - sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const { try @@ -288,7 +271,6 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const return 0; } - void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount ) { try @@ -302,7 +284,6 @@ void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount ) } } - sal_Int16 CalendarWrapper::getFirstDayOfWeek() const { try @@ -317,7 +298,6 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const return 0; } - sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const { try @@ -332,7 +312,6 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const return 0; } - sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const { try @@ -347,7 +326,6 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const return 0; } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getMonths() const { try @@ -362,7 +340,6 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getDays() const { try @@ -377,7 +354,6 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0); } - OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType ) const { try @@ -392,7 +368,6 @@ OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_I return OUString(); } - // --- XExtendedCalendar ----------------------------------------------------- OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) const @@ -409,7 +384,6 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_ return OUString(); } - // --- XCalendar3 ------------------------------------------------------------ ::com::sun::star::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const @@ -426,7 +400,6 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_ return ::com::sun::star::i18n::Calendar2(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonths() const { try @@ -441,7 +414,6 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_ return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMonths() const { try diff --git a/unotools/source/i18n/caserotate.cxx b/unotools/source/i18n/caserotate.cxx index 23d0813cca2b..14a2d7a0624f 100644 --- a/unotools/source/i18n/caserotate.cxx +++ b/unotools/source/i18n/caserotate.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "unotools/caserotate.hxx" #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index ba86a2b531fc..ac627ecf44b1 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/processfactory.hxx> #include <unotools/charclass.hxx> #include <rtl/character.hxx> @@ -29,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; - CharClass::CharClass( const Reference< uno::XComponentContext > & rxContext, const LanguageTag& rLanguageTag @@ -40,7 +38,6 @@ CharClass::CharClass( xCC = CharacterClassification::create( rxContext ); } - CharClass::CharClass( const LanguageTag& rLanguageTag ) : @@ -49,33 +46,28 @@ CharClass::CharClass( xCC = CharacterClassification::create( comphelper::getProcessComponentContext() ); } - CharClass::~CharClass() { } - void CharClass::setLanguageTag( const LanguageTag& rLanguageTag ) { ::osl::MutexGuard aGuard( aMutex ); maLanguageTag = rLanguageTag; } - const LanguageTag& CharClass::getLanguageTag() const { ::osl::MutexGuard aGuard( aMutex ); return maLanguageTag; } - const ::com::sun::star::lang::Locale& CharClass::getMyLocale() const { ::osl::MutexGuard aGuard( aMutex ); return maLanguageTag.getLocale(); } - // static bool CharClass::isAsciiNumeric( const OUString& rStr ) { @@ -94,7 +86,6 @@ bool CharClass::isAsciiNumeric( const OUString& rStr ) return true; } - // static bool CharClass::isAsciiAlpha( const OUString& rStr ) { @@ -113,8 +104,6 @@ bool CharClass::isAsciiAlpha( const OUString& rStr ) return true; } - - bool CharClass::isAlpha( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -136,8 +125,6 @@ bool CharClass::isAlpha( const OUString& rStr, sal_Int32 nPos ) const } } - - bool CharClass::isLetter( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -159,7 +146,6 @@ bool CharClass::isLetter( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isLetter( const OUString& rStr ) const { try @@ -176,7 +162,6 @@ bool CharClass::isLetter( const OUString& rStr ) const } } - bool CharClass::isDigit( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[ nPos ]; @@ -198,7 +183,6 @@ bool CharClass::isDigit( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isNumeric( const OUString& rStr ) const { try @@ -215,7 +199,6 @@ bool CharClass::isNumeric( const OUString& rStr ) const } } - bool CharClass::isAlphaNumeric( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -237,7 +220,6 @@ bool CharClass::isAlphaNumeric( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isLetterNumeric( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -259,7 +241,6 @@ bool CharClass::isLetterNumeric( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isLetterNumeric( const OUString& rStr ) const { try @@ -340,7 +321,6 @@ sal_Int16 CharClass::getType( const OUString& rStr, sal_Int32 nPos ) const } } - sal_Int16 CharClass::getCharacterDirection( const OUString& rStr, sal_Int32 nPos ) const { try @@ -357,7 +337,6 @@ sal_Int16 CharClass::getCharacterDirection( const OUString& rStr, sal_Int32 nPos } } - sal_Int16 CharClass::getScript( const OUString& rStr, sal_Int32 nPos ) const { try @@ -374,7 +353,6 @@ sal_Int16 CharClass::getScript( const OUString& rStr, sal_Int32 nPos ) const } } - sal_Int32 CharClass::getCharacterType( const OUString& rStr, sal_Int32 nPos ) const { try @@ -391,7 +369,6 @@ sal_Int32 CharClass::getCharacterType( const OUString& rStr, sal_Int32 nPos ) co } } - sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try @@ -408,7 +385,6 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In } } - ::com::sun::star::i18n::ParseResult CharClass::parseAnyToken( const OUString& rStr, sal_Int32 nPos, @@ -433,7 +409,6 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In } } - ::com::sun::star::i18n::ParseResult CharClass::parsePredefinedToken( sal_Int32 nTokenType, const OUString& rStr, @@ -459,6 +434,4 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index d8a1a8b4e638..e345f9794b5f 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unotools/intlwrapper.hxx" #include <com/sun/star/i18n/CollatorOptions.hpp> #include <i18nlangtag/mslangid.hxx> @@ -53,13 +52,11 @@ IntlWrapper::~IntlWrapper() delete pCaseCollator; } - void IntlWrapper::ImplNewLocaleData() const { ((IntlWrapper*)this)->pLocaleData = new LocaleDataWrapper( m_xContext, maLanguageTag ); } - void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const { CollatorWrapper* p = new CollatorWrapper( m_xContext ); diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 3ef632634b36..671ed8a91c99 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <string> @@ -95,7 +94,6 @@ LocaleDataWrapper::~LocaleDataWrapper() { } - void LocaleDataWrapper::setLanguageTag( const LanguageTag& rLanguageTag ) { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nCriticalChange ); @@ -103,21 +101,18 @@ void LocaleDataWrapper::setLanguageTag( const LanguageTag& rLanguageTag ) invalidateData(); } - const LanguageTag& LocaleDataWrapper::getLanguageTag() const { ::utl::ReadWriteGuard aGuard( aMutex ); return maLanguageTag; } - const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const { ::utl::ReadWriteGuard aGuard( aMutex ); return maLanguageTag.getLocale(); } - void LocaleDataWrapper::invalidateData() { aCurrSymbol = ""; @@ -145,7 +140,6 @@ void LocaleDataWrapper::invalidateData() cCurrZeroChar = '0'; } - /* FIXME-BCP47: locale data should provide a language tag instead that could be * passed on. */ ::com::sun::star::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const @@ -161,7 +155,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::i18n::LanguageCountryInfo(); } - ::com::sun::star::i18n::LocaleDataItem LocaleDataWrapper::getLocaleItem() const { try @@ -175,7 +168,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::i18n::LocaleDataItem(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies() const { try @@ -189,7 +181,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > LocaleDataWrapper::getAllFormats() const { try @@ -203,7 +194,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0); } - ::com::sun::star::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const { try @@ -217,7 +207,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::i18n::ForbiddenCharacters(); } - ::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const { try @@ -231,7 +220,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::uno::Sequence< OUString >(0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > LocaleDataWrapper::getAllInstalledLocaleNames() const { uno::Sequence< lang::Locale > &rInstalledLocales = InstalledLocales::get(); @@ -250,7 +238,6 @@ void LocaleDataWrapper::invalidateData() return rInstalledLocales; } - // --- Impl and helpers ---------------------------------------------------- // static @@ -355,7 +342,6 @@ const OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const return aLocaleItem[nItem]; } - void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem ) { if ( !bLocaleDataItemValid ) @@ -421,7 +407,6 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem ) } } - void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) { if ( !bReservedWordValid ) @@ -434,7 +419,6 @@ void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) aReservedWord[nWord] = aReservedWordSeq[nWord]; } - const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -451,7 +435,6 @@ const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const return aReservedWord[nWord]; } - MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const OUString& rMS ) const { //! TODO: could be cached too @@ -461,7 +444,6 @@ MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const OUString& return MEASURE_US; } - void LocaleDataWrapper::getDefaultCalendarImpl() { if (!xDefaultCalendar) @@ -485,7 +467,6 @@ void LocaleDataWrapper::getDefaultCalendarImpl() } } - const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -497,19 +478,16 @@ const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper return xDefaultCalendar; } - const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarDays() const { return getDefaultCalendar()->Days; } - const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarMonths() const { return getDefaultCalendar()->Months; } - // --- currencies ----------------------------------------------------- const OUString& LocaleDataWrapper::getCurrSymbol() const @@ -523,7 +501,6 @@ const OUString& LocaleDataWrapper::getCurrSymbol() const return aCurrSymbol; } - const OUString& LocaleDataWrapper::getCurrBankSymbol() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -535,7 +512,6 @@ const OUString& LocaleDataWrapper::getCurrBankSymbol() const return aCurrBankSymbol; } - sal_uInt16 LocaleDataWrapper::getCurrPositiveFormat() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -547,7 +523,6 @@ sal_uInt16 LocaleDataWrapper::getCurrPositiveFormat() const return nCurrPositiveFormat; } - sal_uInt16 LocaleDataWrapper::getCurrNegativeFormat() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -559,7 +534,6 @@ sal_uInt16 LocaleDataWrapper::getCurrNegativeFormat() const return nCurrNegativeFormat; } - sal_uInt16 LocaleDataWrapper::getCurrDigits() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -571,7 +545,6 @@ sal_uInt16 LocaleDataWrapper::getCurrDigits() const return nCurrDigits; } - void LocaleDataWrapper::getCurrSymbolsImpl() { Sequence< Currency2 > aCurrSeq = getAllCurrencies(); @@ -607,7 +580,6 @@ void LocaleDataWrapper::getCurrSymbolsImpl() nCurrDigits = pCurrArr[nElem].DecimalPlaces; } - void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ) @@ -829,7 +801,6 @@ void LocaleDataWrapper::getCurrFormatsImpl() } } - // --- date ----------------------------------------------------------- DateFormat LocaleDataWrapper::getDateFormat() const @@ -843,7 +814,6 @@ DateFormat LocaleDataWrapper::getDateFormat() const return (DateFormat) nDateFormat; } - DateFormat LocaleDataWrapper::getLongDateFormat() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -855,7 +825,6 @@ DateFormat LocaleDataWrapper::getLongDateFormat() const return (DateFormat) nLongDateFormat; } - DateFormat LocaleDataWrapper::scanDateFormatImpl( const OUString& rCode ) { // Only some european versions were translated, the ones with different @@ -937,7 +906,6 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const OUString& rCode ) } } - void LocaleDataWrapper::getDateFormatsImpl() { NumberFormatCodeWrapper aNumberFormatCode( m_xContext, getMyLocale() ); @@ -1026,7 +994,6 @@ void LocaleDataWrapper::getDateFormatsImpl() } } - // --- digit grouping ------------------------------------------------- void LocaleDataWrapper::getDigitGroupingImpl() @@ -1061,7 +1028,6 @@ void LocaleDataWrapper::getDigitGroupingImpl() } } - const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGrouping() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -1073,7 +1039,6 @@ const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGr return aGrouping; } - // --- simple number formatting helpers ------------------------------- // The ImplAdd... methods are taken from class International and modified to @@ -1104,7 +1069,6 @@ static sal_Unicode* ImplAddUNum( sal_Unicode* pBuf, sal_uInt64 nNumber ) return pBuf; } - static sal_Unicode* ImplAddUNum( sal_Unicode* pBuf, sal_uInt64 nNumber, int nMinLen ) { // fill temp buffer with digits @@ -1139,7 +1103,6 @@ static sal_Unicode* ImplAddUNum( sal_Unicode* pBuf, sal_uInt64 nNumber, int nMin return pBuf; } - static sal_Unicode* ImplAdd2UNum( sal_Unicode* pBuf, sal_uInt16 nNumber, bool bLeading ) { DBG_ASSERT( nNumber < 100, "ImplAdd2UNum() - Number >= 100" ); @@ -1200,7 +1163,6 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr ) return pBuf; } - inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c ) { *pBuf = c; @@ -1208,14 +1170,12 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c ) return pBuf; } - inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen ) { memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) ); return pBuf + nLen; } - sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const @@ -1323,7 +1283,6 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, return pBuf; } - // --- simple date and time formatting -------------------------------- OUString LocaleDataWrapper::getDate( const Date& rDate ) const @@ -1372,7 +1331,6 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const return OUString(aBuf, pBuf-aBuf); } - OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1401,7 +1359,6 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec return OUString(aBuf, pBuf - aBuf); } - OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek, bool bDayOfMonthWithLeadingZero, sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const @@ -1446,7 +1403,6 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa return aStr; } - OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1477,7 +1433,6 @@ OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100 return OUString(aBuf, pBuf-aBuf); } - // --- simple number formatting --------------------------------------- inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal_uInt16 nDecimals ) @@ -1491,7 +1446,6 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal return nGuess; } - OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const { @@ -1712,7 +1666,6 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, return aNumber; } - // --- mixed ---------------------------------------------------------- LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const @@ -1721,7 +1674,6 @@ LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const return LanguageTag( lang::Locale( aLCInfo.Language, aLCInfo.Country, aLCInfo.Variant )); } - OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1735,14 +1687,12 @@ OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const return aDebugMsg.makeStringAndClear(); } - // static void LocaleDataWrapper::outputCheckMessage( const OUString& rMsg ) { outputCheckMessage(OUStringToOString(rMsg, RTL_TEXTENCODING_UTF8).getStr()); } - // static void LocaleDataWrapper::outputCheckMessage( const char* pStr ) { @@ -1751,7 +1701,6 @@ void LocaleDataWrapper::outputCheckMessage( const char* pStr ) OSL_TRACE("%s", pStr); } - // static void LocaleDataWrapper::evaluateLocaleDataChecking() { @@ -1784,7 +1733,6 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() } } - // --- XLocaleData3 ---------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars() const @@ -1800,7 +1748,6 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0); } - // --- XLocaleData4 ---------------------------------------------------------- ::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index 2a9ba2af0556..2b0c1c01e6d2 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/nativenumberwrapper.hxx> #include <tools/debug.hxx> #include <com/sun/star/i18n/NativeNumberSupplier.hpp> @@ -31,12 +30,10 @@ NativeNumberWrapper::NativeNumberWrapper( xNNS = i18n::NativeNumberSupplier::create(rxContext); } - NativeNumberWrapper::~NativeNumberWrapper() { } - OUString NativeNumberWrapper::getNativeNumberString( const OUString& rNumberString, @@ -55,7 +52,6 @@ NativeNumberWrapper::getNativeNumberString( return OUString(); } - i18n::NativeNumberXmlAttributes NativeNumberWrapper::convertToXmlAttributes( const ::com::sun::star::lang::Locale& rLocale, @@ -73,7 +69,6 @@ NativeNumberWrapper::convertToXmlAttributes( return i18n::NativeNumberXmlAttributes(); } - sal_Int16 NativeNumberWrapper::convertFromXmlAttributes( const i18n::NativeNumberXmlAttributes& rAttr ) const @@ -90,5 +85,4 @@ NativeNumberWrapper::convertFromXmlAttributes( return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx index 6c7954f0595b..f139976f01f9 100644 --- a/unotools/source/i18n/numberformatcodewrapper.cxx +++ b/unotools/source/i18n/numberformatcodewrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/numberformatcodewrapper.hxx> #include <com/sun/star/i18n/NumberFormatMapper.hpp> #include <tools/debug.hxx> @@ -26,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; - NumberFormatCodeWrapper::NumberFormatCodeWrapper( const Reference< uno::XComponentContext > & rxContext, const lang::Locale& rLocale @@ -36,18 +34,15 @@ NumberFormatCodeWrapper::NumberFormatCodeWrapper( xNFC = i18n::NumberFormatMapper::create( rxContext ); } - NumberFormatCodeWrapper::~NumberFormatCodeWrapper() { } - void NumberFormatCodeWrapper::setLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLocale = rLocale; } - ::com::sun::star::i18n::NumberFormatCode NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const { @@ -62,7 +57,6 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const return ::com::sun::star::i18n::NumberFormatCode(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const { @@ -77,7 +71,6 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > NumberFormatCodeWrapper::getAllFormatCodes() const { diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx index 08327250fe8f..5c01cc07d0fc 100644 --- a/unotools/source/i18n/readwritemutexguard.cxx +++ b/unotools/source/i18n/readwritemutexguard.cxx @@ -20,7 +20,6 @@ #include "unotools/readwritemutexguard.hxx" #include <tools/debug.hxx> - namespace utl { ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP, @@ -60,7 +59,6 @@ ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP, } } - ReadWriteGuard::~ReadWriteGuard() { if ( nMode & ReadWriteGuardMode::nWrite ) @@ -79,7 +77,6 @@ ReadWriteGuard::~ReadWriteGuard() } } - void ReadWriteGuard::changeReadToWrite() { bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical)); diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 27e2405bd1d2..17f8fe81c9f2 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -32,11 +32,9 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - namespace utl { - SearchParam::SearchParam( const OUString &rText, SearchType eType, bool bCaseSensitive, @@ -197,7 +195,6 @@ void TextSearch::SetLocale( const ::com::sun::star::util::SearchOptions& rOption xTextSearch = getXTextSearch( aSOpt ); } - TextSearch::~TextSearch() { } @@ -238,7 +235,6 @@ bool TextSearch::SearchForward( const OUString &rStr, return nRet; } - bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart, sal_Int32* pEnde, SearchResult* pRes ) { @@ -358,8 +354,6 @@ void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, const OUString &r } } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 7a457e0ebf82..ecaaf0c8196b 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/transliterationwrapper.hxx> #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> @@ -38,12 +37,10 @@ TransliterationWrapper::TransliterationWrapper( { } - TransliterationWrapper::~TransliterationWrapper() { } - OUString TransliterationWrapper::transliterate(const OUString& rStr, sal_uInt16 nLang, sal_Int32 nStart, sal_Int32 nLen, Sequence <sal_Int32>* pOffset ) @@ -68,7 +65,6 @@ OUString TransliterationWrapper::transliterate(const OUString& rStr, sal_uInt16 return sRet; } - OUString TransliterationWrapper::transliterate( const OUString& rStr, sal_Int32 nStart, sal_Int32 nLen, Sequence <sal_Int32>* pOffset ) const @@ -101,7 +97,6 @@ bool TransliterationWrapper::needLanguageForTheMode() const (sal_uInt32) TransliterationModulesExtra::TOGGLE_CASE == (sal_uInt32) nType; } - void TransliterationWrapper::setLanguageLocaleImpl( sal_uInt16 nLang ) { if( LANGUAGE_NONE == nLang ) @@ -109,7 +104,6 @@ void TransliterationWrapper::setLanguageLocaleImpl( sal_uInt16 nLang ) aLanguageTag.reset( nLang); } - void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) { bool bLoad = bFirstCall; @@ -143,7 +137,6 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) } } - void TransliterationWrapper::loadModuleImpl() const { if ( bFirstCall ) @@ -162,7 +155,6 @@ void TransliterationWrapper::loadModuleImpl() const bFirstCall = false; } - void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName, sal_uInt16 nLang ) { @@ -184,7 +176,6 @@ void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName, bFirstCall = false; } - bool TransliterationWrapper::equals( const OUString& rStr1, sal_Int32 nPos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& rStr2, sal_Int32 nPos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) const @@ -219,7 +210,6 @@ sal_Int32 TransliterationWrapper::compareString( const OUString& rStr1, const OU return 0; } - // --- helpers -------------------------------------------------------- bool TransliterationWrapper::isEqual( const OUString& rStr1, const OUString& rStr2 ) const @@ -231,7 +221,6 @@ bool TransliterationWrapper::isEqual( const OUString& rStr1, const OUString& rSt return bMatch; } - bool TransliterationWrapper::isMatch( const OUString& rStr1, const OUString& rStr2 ) const { sal_Int32 nMatch1, nMatch2; |