[Libreoffice-commits] .: 5 commits - i18nutil/inc i18nutil/source unusedcode.easy vcl/inc vcl/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Wed Feb 8 09:24:04 PST 2012


 i18nutil/inc/i18nutil/unicode.hxx   |    4 --
 i18nutil/source/utility/unicode.cxx |   67 ------------------------------------
 unusedcode.easy                     |    4 --
 vcl/inc/vcl/i18nhelp.hxx            |    1 
 vcl/source/app/i18nhelp.cxx         |    7 ---
 5 files changed, 83 deletions(-)

New commits:
commit 737a584d9a1cc29d2688871bdebbb0a7175c542c
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Wed Feb 8 08:57:45 2012 -0800

    vcl: I18nHelper: delete unused GetDate() method

diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index a83afa4..32f9e16 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -86,7 +86,6 @@ public:
     sal_Bool    MatchString( const String& rStr1, const String& rStr2 ) const;
     sal_Bool    MatchMnemonic( const String& rString, sal_Unicode cMnemonicChar ) const;
 
-    String      GetDate( const Date& rDate ) const;
     String      GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const;
 
     static String filterFormattingChars( const String& );
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index f8967b2..0c1c3fa 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -175,13 +175,6 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String& rString, sal_Unicode cMne
 }
 
 
-String vcl::I18nHelper::GetDate( const Date& rDate ) const
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
-
-    return ImplGetLocaleDataWrapper().getDate( rDate );
-}
-
 String vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const
 {
     return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals, bUseThousandSep, bTrailingZeros );
commit d857f0938b8acd491f297d104889588bb986aa66
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Wed Feb 8 08:57:41 2012 -0800

    unicode: delete unused unicode:getCharType() method

diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index 7fce041..f9ff6e1 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -48,7 +48,6 @@ public:
     static sal_Unicode SAL_CALL getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type);
     static sal_Unicode SAL_CALL getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type);
     static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
-    static sal_Int32 SAL_CALL getCharType( const sal_Unicode ch );
     static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
     static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
     static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 056e78a..dcc5b36 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -425,70 +425,6 @@ sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) {
     return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & (CONTROLSPACE)));
 }
 
-sal_Int32 SAL_CALL unicode::getCharType( const sal_Unicode ch )
-{
-    using namespace ::com::sun::star::i18n::KCharacterType;
-
-    switch ( getUnicodeType( ch ) ) {
-    // Upper
-    case UnicodeType::UPPERCASE_LETTER :
-        return UPPER|LETTER|PRINTABLE|BASE_FORM;
-
-    // Lower
-    case UnicodeType::LOWERCASE_LETTER :
-        return LOWER|LETTER|PRINTABLE|BASE_FORM;
-
-    // Title
-    case UnicodeType::TITLECASE_LETTER :
-        return TITLE_CASE|LETTER|PRINTABLE|BASE_FORM;
-
-    // Letter
-    case UnicodeType::MODIFIER_LETTER :
-    case UnicodeType::OTHER_LETTER :
-        return LETTER|PRINTABLE|BASE_FORM;
-
-    // Digit
-    case UnicodeType::DECIMAL_DIGIT_NUMBER:
-    case UnicodeType::LETTER_NUMBER:
-    case UnicodeType::OTHER_NUMBER:
-        return DIGIT|PRINTABLE|BASE_FORM;
-
-    // Base
-    case UnicodeType::NON_SPACING_MARK:
-    case UnicodeType::ENCLOSING_MARK:
-    case UnicodeType::COMBINING_SPACING_MARK:
-        return BASE_FORM|PRINTABLE;
-
-    // Print
-    case UnicodeType::SPACE_SEPARATOR:
-
-    case UnicodeType::DASH_PUNCTUATION:
-    case UnicodeType::INITIAL_PUNCTUATION:
-    case UnicodeType::FINAL_PUNCTUATION:
-    case UnicodeType::CONNECTOR_PUNCTUATION:
-    case UnicodeType::OTHER_PUNCTUATION:
-
-    case UnicodeType::MATH_SYMBOL:
-    case UnicodeType::CURRENCY_SYMBOL:
-    case UnicodeType::MODIFIER_SYMBOL:
-    case UnicodeType::OTHER_SYMBOL:
-        return PRINTABLE;
-
-    // Control
-    case UnicodeType::CONTROL:
-    case UnicodeType::FORMAT:
-        return CONTROL;
-
-    case UnicodeType::LINE_SEPARATOR:
-    case UnicodeType::PARAGRAPH_SEPARATOR:
-        return CONTROL|PRINTABLE;
-
-    // for all others
-    default:
-        return 0;
-    }
-}
-
 sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
 {
     //See unicode/uscript.h
diff --git a/unusedcode.easy b/unusedcode.easy
index 6ef2359..a8e8543 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1541,7 +1541,6 @@ ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequence<int> const&)
 ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, ucbhelper::Content&)
 ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::__debug::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
 ucbhelper::SimpleCertificateValidationRequest::getResponse() const
-unicode::getCharType(unsigned short)
 unographic::GraphicDescriptor::isValid() const
 utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
 utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
commit 7267ab13157d8891bf544660bd0ea60e60be551f
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Wed Feb 8 08:57:40 2012 -0800

    unicode: delete unused unicode:isTitle() method

diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index 75b5730..7fce041 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -51,7 +51,6 @@ public:
     static sal_Int32 SAL_CALL getCharType( const sal_Unicode ch );
     static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
     static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
-    static sal_Bool SAL_CALL isTitle( const sal_Unicode ch);
     static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
     static sal_Bool SAL_CALL isControl( const sal_Unicode ch);
     static sal_Bool SAL_CALL isPrint( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 9ebc9d8..056e78a 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -411,7 +411,6 @@ sal_Bool SAL_CALL func( const sal_Unicode ch) {\
 
 IsType(unicode::isUpper, UPPERMASK)
 IsType(unicode::isLower, LOWERMASK)
-IsType(unicode::isTitle, DIGITMASK)
 IsType(unicode::isControl, CONTROLMASK)
 IsType(unicode::isPrint, PRINTMASK)
 IsType(unicode::isAlpha, ALPHAMASK)
diff --git a/unusedcode.easy b/unusedcode.easy
index ae8e7d8..6ef2359 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1542,7 +1542,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::
 ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::__debug::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
 ucbhelper::SimpleCertificateValidationRequest::getResponse() const
 unicode::getCharType(unsigned short)
-unicode::isTitle(unsigned short)
 unographic::GraphicDescriptor::isValid() const
 utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
 utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
commit ba2619e1067969e85a1d59b715b0c2be9c2cb35c
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Wed Feb 8 08:57:39 2012 -0800

    unicode: delete unused unicode:isPunctuation() method

diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index 23ed754..75b5730 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -59,7 +59,6 @@ public:
     static sal_Bool SAL_CALL isSpace( const sal_Unicode ch);
     static sal_Bool SAL_CALL isWhiteSpace( const sal_Unicode ch);
     static sal_Bool SAL_CALL isAlphaDigit( const sal_Unicode ch);
-    static sal_Bool SAL_CALL isPunctuation( const sal_Unicode ch);
 
     //Map an ISO 15924 script code to Latin/Asian/Complex/Weak
     static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript);
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 873ecd8..9ebc9d8 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -418,7 +418,6 @@ IsType(unicode::isAlpha, ALPHAMASK)
 IsType(unicode::isDigit, DIGITMASK)
 IsType(unicode::isAlphaDigit, ALPHAMASK|DIGITMASK)
 IsType(unicode::isSpace, SPACEMASK)
-IsType(unicode::isPunctuation, PUNCTUATIONMASK)
 
 #define CONTROLSPACE    bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\
             bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f)
diff --git a/unusedcode.easy b/unusedcode.easy
index 4296434..ae8e7d8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1542,7 +1542,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::
 ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::__debug::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
 ucbhelper::SimpleCertificateValidationRequest::getResponse() const
 unicode::getCharType(unsigned short)
-unicode::isPunctuation(unsigned short)
 unicode::isTitle(unsigned short)
 unographic::GraphicDescriptor::isValid() const
 utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
commit def4a1ed06f4c1abbb68f2a4cb0caeb7f9fc5f7e
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date:   Wed Feb 8 08:57:38 2012 -0800

    unicode: delete unused unicode:isBase() method

diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index 24e9c63..23ed754 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -55,7 +55,6 @@ public:
     static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
     static sal_Bool SAL_CALL isControl( const sal_Unicode ch);
     static sal_Bool SAL_CALL isPrint( const sal_Unicode ch);
-    static sal_Bool SAL_CALL isBase( const sal_Unicode ch);
     static sal_Bool SAL_CALL isAlpha( const sal_Unicode ch);
     static sal_Bool SAL_CALL isSpace( const sal_Unicode ch);
     static sal_Bool SAL_CALL isWhiteSpace( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 00d4e80..873ecd8 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -418,7 +418,6 @@ IsType(unicode::isAlpha, ALPHAMASK)
 IsType(unicode::isDigit, DIGITMASK)
 IsType(unicode::isAlphaDigit, ALPHAMASK|DIGITMASK)
 IsType(unicode::isSpace, SPACEMASK)
-IsType(unicode::isBase, BASEMASK)
 IsType(unicode::isPunctuation, PUNCTUATIONMASK)
 
 #define CONTROLSPACE    bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\
diff --git a/unusedcode.easy b/unusedcode.easy
index 6e6303b..4296434 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1542,7 +1542,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::
 ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::__debug::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
 ucbhelper::SimpleCertificateValidationRequest::getResponse() const
 unicode::getCharType(unsigned short)
-unicode::isBase(unsigned short)
 unicode::isPunctuation(unsigned short)
 unicode::isTitle(unsigned short)
 unographic::GraphicDescriptor::isValid() const


More information about the Libreoffice-commits mailing list