[PATCH 1/8] unicode: delete unused unicode:isBase() method
--- i18nutil/inc/i18nutil/unicode.hxx |1 - i18nutil/source/utility/unicode.cxx |1 - unusedcode.easy |1 - 3 files changed, 0 insertions(+), 3 deletions(-) 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 CONTROLSPACEbit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\ diff --git a/unusedcode.easy b/unusedcode.easy index 33aca1d..c2c6946 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1528,7 +1528,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const, com::sun::star::uno:: ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const, std::__debug::vectorucbhelper::ContentProviderData, std::allocatorucbhelper::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 -- 1.7.9 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 2/8] unicode: delete unused unicode:isPunctuation() method
--- i18nutil/inc/i18nutil/unicode.hxx |1 - i18nutil/source/utility/unicode.cxx |1 - unusedcode.easy |1 - 3 files changed, 0 insertions(+), 3 deletions(-) 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 CONTROLSPACEbit(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 c2c6946..3939d9f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1528,7 +1528,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const, com::sun::star::uno:: ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const, std::__debug::vectorucbhelper::ContentProviderData, std::allocatorucbhelper::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*) -- 1.7.9 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 3/8] unicode: delete unused unicode:isTitle() method
---
i18nutil/inc/i18nutil/unicode.hxx |1 -
i18nutil/source/utility/unicode.cxx |1 -
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 3 deletions(-)
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 3939d9f..ae4ffad 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1528,7 +1528,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString
const, com::sun::star::uno::
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::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
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 4/8] unicode: delete unused unicode:getCharType() method
---
i18nutil/inc/i18nutil/unicode.hxx |1 -
i18nutil/source/utility/unicode.cxx | 64 ---
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 66 deletions(-)
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 ae4ffad..743ba38 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1527,7 +1527,6 @@
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequenceint const)
ucbhelper::Content::insertNewContent(rtl::OUString const,
com::sun::star::uno::Sequenceint const,
com::sun::star::uno::Sequencecom::sun::star::uno::Any const,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
ucbhelper::Content)
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::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
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 5/8] unographic: delete unused GraphicDescriptor::isValid() method
---
svtools/source/graphic/descriptor.cxx |7 ---
svtools/source/graphic/descriptor.hxx |2 --
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/svtools/source/graphic/descriptor.cxx
b/svtools/source/graphic/descriptor.cxx
index a2441c9..378162d 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -116,13 +116,6 @@ void GraphicDescriptor::init( const uno::Reference
io::XInputStream rxIStm,
//
--
-bool GraphicDescriptor::isValid() const
-{
-return( mpGraphic ? ( mpGraphic-GetType() != GRAPHIC_NONE ) : ( meType !=
GRAPHIC_NONE ) );
-}
-
-//
--
-
void GraphicDescriptor::implCreate( SvStream rIStm, const ::rtl::OUString*
pURL )
{
String aURL;
diff --git a/svtools/source/graphic/descriptor.hxx
b/svtools/source/graphic/descriptor.hxx
index 2eeff29..a2b7e26 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -89,8 +89,6 @@ public:
void init( const ::rtl::OUString rURL ) throw();
void init( const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxIStm, const ::rtl::OUString rURL )
throw();
-bool isValid() const;
-
static ::rtl::OUString getImplementationName_Static() throw();
static ::com::sun::star::uno::Sequence ::rtl::OUString
getSupportedServiceNames_Static() throw();
diff --git a/unusedcode.easy b/unusedcode.easy
index 743ba38..a7b1aa3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1527,7 +1527,6 @@
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequenceint const)
ucbhelper::Content::insertNewContent(rtl::OUString const,
com::sun::star::uno::Sequenceint const,
com::sun::star::uno::Sequencecom::sun::star::uno::Any const,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
ucbhelper::Content)
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::ContentProviderData const)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
-unographic::GraphicDescriptor::isValid() const
utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
utl::OConfigurationValueContainer::getServiceFactory() const
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 6/8] utl: delete unused NodeValueAccessor::bind() method
---
unotools/source/config/configvaluecontainer.cxx | 10 --
unusedcode.easy |1 -
2 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/unotools/source/config/configvaluecontainer.cxx
b/unotools/source/config/configvaluecontainer.cxx
index 8a0fdcd..8e5d2bd 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -68,7 +68,6 @@ namespace utl
NodeValueAccessor( const ::rtl::OUString _rNodePath );
void bind( void* _pLocation, const Type _rType );
-void bind( Any* _pLocation );
boolisBound( ) const{ return ( ltUnbound
!= eLocationType ) ( NULL != pLocation ); }
const ::rtl::OUString getPath( ) const{ return
sRelativePath; }
@@ -103,15 +102,6 @@ namespace utl
aDataType = _rType;
}
-void NodeValueAccessor::bind( Any* _pLocation )
-{
-DBG_ASSERT( !isBound(), NodeValueAccessor::bind: already bound! );
-
-eLocationType = ltAnyInstance;
-pLocation = _pLocation;
-aDataType = ::getCppuType( _pLocation );
-}
-
#ifndef UNX
static
#endif
diff --git a/unusedcode.easy b/unusedcode.easy
index a7b1aa3..53c1aea 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1527,7 +1527,6 @@
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequenceint const)
ucbhelper::Content::insertNewContent(rtl::OUString const,
com::sun::star::uno::Sequenceint const,
com::sun::star::uno::Sequencecom::sun::star::uno::Any const,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
ucbhelper::Content)
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::ContentProviderData const)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
-utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
utl::OConfigurationValueContainer::getServiceFactory() const
utl::TransliterationWrapper::compareSubstring(String const, int, int, String
const, int, int) const
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 7/8] vcl: I18nHelper: delete unused getLocal() method
---
unusedcode.easy |1 -
vcl/inc/vcl/i18nhelp.hxx|2 --
vcl/source/app/i18nhelp.cxx |5 -
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/unusedcode.easy b/unusedcode.easy
index 53c1aea..f4115ce 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1531,7 +1531,6 @@ utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNod
utl::OConfigurationValueContainer::getServiceFactory() const
utl::TransliterationWrapper::compareSubstring(String const, int, int, String
const, int, int) const
vcl::I18nHelper::GetDate(Date const) const
-vcl::I18nHelper::getLocale() const
vcl::LabeledElement::setLabel(boost::shared_ptrvcl::WindowArranger const)
vcl::LazyDeletorMenu::is_less(Menu*, Menu*)
vcl::MatrixArranger::addChild(boost::shared_ptrvcl::WindowArranger const,
unsigned int, unsigned int, int)
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index a83afa4..faafdfe 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -79,8 +79,6 @@ public:
I18nHelper( ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory rxMSF, const
::com::sun::star::lang::Locale rLocale );
~I18nHelper();
-const ::com::sun::star::lang::Locale getLocale() const;
-
sal_Int32 CompareString( const String rStr1, const String rStr2 )
const;
sal_BoolMatchString( const String rStr1, const String rStr2 ) const;
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index f8967b2..f1505cc 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -87,11 +87,6 @@ LocaleDataWrapper
vcl::I18nHelper::ImplGetLocaleDataWrapper() const
return *mpLocaleDataWrapper;
}
-const ::com::sun::star::lang::Locale vcl::I18nHelper::getLocale() const
-{
-return maLocale;
-}
-
inline bool is_formatting_mark( sal_Unicode c )
{
if( (c = 0x200B) (c = 0x200F) )// BiDi and zero-width-markers
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 8/8] vcl: I18nHelper: delete unused GetDate() method
---
vcl/inc/vcl/i18nhelp.hxx|1 -
vcl/source/app/i18nhelp.cxx |7 ---
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index faafdfe..610f5cf 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -84,7 +84,6 @@ public:
sal_BoolMatchString( const String rStr1, const String rStr2 ) const;
sal_BoolMatchMnemonic( 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 f1505cc..ea4eb34 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -170,13 +170,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 );
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 0/8] Remove some more unused methods
Here are 8 patches removing some more unused methods in the tree. Hopefully I didn't mess up and delete somethings that were being used by Windows or other architectures, I think my searching was sufficient, but I might have missed something. All of these patches are contributed under the LGPLv3+ / MPL. thanks, greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 4/4] Re: [PATCH 0/4] Remove some unused methods
On Tue, Feb 07, 2012 at 01:26:18AM +0100, Michael Stahl wrote: patches to remove the tools/fsys trainwreck completely and adapt callers to use osl/file.hxx would be appreciated of course :) I've started to look into this. It is safe to say that I should only be cleaning up the usages outside of the tools/ directory? And that any in-tools directory usage is safe in that once all out of the local module users are gone, we can just delete the whole module? thanks, greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH 0/8][PUSHED (partial)] Remove some more unused methods
On Wed, Feb 08, 2012 at 11:24:01AM -0600, Norbert Thiebaud wrote: On Wed, Feb 8, 2012 at 10:57 AM, Greg Kroah-Hartman gre...@linuxfoundation.org wrote: Here are 8 patches removing some more unused methods in the tree. Hopefully I didn't mess up and delete somethings that were being used by Windows or other architectures, I think my searching was sufficient, but I might have missed something. 1,2,3,4 and 8 apply, but 5,6,7 conflict on unusedcode.easy... since the later is basically a throw-able file (it is regenerated regularly) maybe it would be best not to update it ? Good idea, I'll not touch that file anymore. In the mean time I pushed the one that applied cleanly... Thanks, I'll redo the remaining patches and resend them in a bit. greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 0/4] Remove some unused methods
Here are 4 patches removing some unused methods in the tree. All of these patches are contributed under the LGPLv3+ / MPL. Note, I also removed the line in the unusedcode.easy file at the same time, if I shouldn't have done that, let me know and I'll redo these patches. If I messed anything up, or the patches need more information within the body of the changelog, please let me know, and I'll be glad to respin them. thanks, greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 2/4] sot: Delete FileList::GetFormat as it is no longer used
---
sot/inc/sot/filelist.hxx |4
sot/source/base/filelist.cxx | 11 ---
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/sot/inc/sot/filelist.hxx b/sot/inc/sot/filelist.hxx
index 0ba367f..8f18328 100644
--- a/sot/inc/sot/filelist.hxx
+++ b/sot/inc/sot/filelist.hxx
@@ -62,10 +62,6 @@ public:
SOT_DLLPUBLIC friend SvStream operator( SvStream rOStm, const
FileList rFileList );
SOT_DLLPUBLIC friend SvStream operator( SvStream rIStm, FileList
rFileList );
-// Clipboard, DD usw.
-static sal_uLongGetFormat();
-
-
// Liste fuellen/abfragen
void AppendFile( const String rStr );
String GetFile( size_t i ) const;
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 052657e..146ad41 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -67,17 +67,6 @@ FileList FileList::operator=( const FileList rFileList )
return *this;
}
-/*
-|*
-|*FileList::GetFormatName()
-|*
-\*/
-
-sal_uLong FileList::GetFormat()
-{
-return FORMAT_FILE_LIST;
-}
-
/**
|*
|* virtuelle SvData-Methoden
diff --git a/unusedcode.easy b/unusedcode.easy
index be5d0b8..99538e1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -23,7 +23,6 @@ EditView::SetCursor(Cursor const)
EditView::SetPointer(Pointer const)
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const)
-FileList::GetFormat()
FileStat::FileStat()
FileStat::FileStat(void const*)
FileStream::FileStream(rtl::OString const, FileAccessMode)
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 3/4] tools: fsys: Delete unused FileStat::FileStat(const void *)
---
tools/inc/tools/fsys.hxx |4
tools/source/fsys/unx.cxx | 16
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index a39c159..44b1fdc 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -172,10 +172,6 @@ class TOOLS_DLLPUBLIC FileStat
private:
TOOLS_DLLPRIVATE void ImpInit( void* );
-protected:
-// Implementation
-FileStat( SAL_UNUSED_PARAMETER const void *pInfo ); //
CInfoPBRec
-
public:
FileStat();
FileStat( const DirEntry rDirEntry,
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index f8be021..007dc81 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -331,22 +331,6 @@ sal_uInt16 DirReader_Impl::Read()
/*
|*
-|*FileStat::FileStat()
-|*
-*/
-
-FileStat::FileStat( const void * ):
-aDateCreated(0),
-aTimeCreated(0),
-aDateModified(0),
-aTimeModified(0),
-aDateAccessed(0),
-aTimeAccessed(0)
-{
-}
-
-/*
-|*
|*FileStat::Update()
|*
*/
diff --git a/unusedcode.easy b/unusedcode.easy
index 99538e1..8f55ded 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -24,7 +24,6 @@ EditView::SetPointer(Pointer const)
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const)
FileStat::FileStat()
-FileStat::FileStat(void const*)
FileStream::FileStream(rtl::OString const, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const, unsigned short)
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 4/4] tools: fsys: Delete unused FileStat::FileStat()
---
tools/inc/tools/fsys.hxx|1 -
tools/source/fsys/fstat.cxx | 20
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 44b1fdc..34c512d 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -173,7 +173,6 @@ private:
TOOLS_DLLPRIVATE void ImpInit( void* );
public:
-FileStat();
FileStat( const DirEntry rDirEntry,
FSysAccess nAccess = FSYS_ACCESS_FLOPPY );
sal_BoolUpdate( const DirEntry rDirEntry,
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index 3752aad..c3e6822 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -43,26 +43,6 @@
|*
*/
-FileStat::FileStat()
-: // don't use Default-Ctors!
-aDateCreated( sal_uIntPtr(0) ),
-aTimeCreated( sal_uIntPtr(0) ),
-aDateModified( sal_uIntPtr(0) ),
-aTimeModified( sal_uIntPtr(0) ),
-aDateAccessed( sal_uIntPtr(0) ),
-aTimeAccessed( sal_uIntPtr(0) )
-{
-nSize = 0;
-nKindFlags = FSYS_KIND_UNKNOWN;
-nError = FSYS_ERR_OK;
-}
-
-/*
-|*
-|*FileStat::FileStat()
-|*
-*/
-
FileStat::FileStat( const DirEntry rDirEntry, FSysAccess nAccess )
: // don't use Default-Ctors!
aDateCreated( sal_uIntPtr(0) ),
diff --git a/unusedcode.easy b/unusedcode.easy
index 8f55ded..33aca1d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -23,7 +23,6 @@ EditView::SetCursor(Cursor const)
EditView::SetPointer(Pointer const)
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const)
-FileStat::FileStat()
FileStream::FileStream(rtl::OString const, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const, unsigned short)
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 1/4] tools: fsys: Delete unused DirEntry::GetDevice()
---
tools/inc/tools/fsys.hxx |3 +--
tools/source/fsys/unx.cxx | 21 -
unusedcode.easy |1 -
3 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 3ec1799..a39c159 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -102,7 +102,7 @@ typedef ::std::vector FSysSort FSysSortList;
enum DirEntryFlag
{
FSYS_FLAG_NORMAL,
-FSYS_FLAG_VOLUME, // Dir( FSYS_FLAG_VOLUME ) und
GetDevice()
+FSYS_FLAG_VOLUME, // Dir( FSYS_FLAG_VOLUME )
FSYS_FLAG_ABSROOT, // z.B. a:\ oder \
FSYS_FLAG_RELROOT, // z.B. a:, a:. oder .
FSYS_FLAG_CURRENT = FSYS_FLAG_RELROOT, // Synonym fuer FSYS_FLAG_RELROOT
@@ -274,7 +274,6 @@ public:
voidSetBase( const String rBase, char cSep = '.' );
String GetBase(char cSep = '.' ) const;
DirEntryGetPath() const;
-DirEntryGetDevice() const;
String GetVolume() const;
String GetFull( FSysPathStyle eFormatter = FSYS_STYLE_HOST,
sal_Bool bWithDelimiter = sal_False,
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index b53caac..f8be021 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -241,27 +241,6 @@ String DirEntry::GetVolume() const
String());
}
-DirEntry DirEntry::GetDevice() const
-{
- DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
-DirEntry aPath( *this );
-aPath.ToAbs();
-
-struct stat buf;
-while (stat(rtl::OUStringToOString(aPath.GetFull(),
osl_getThreadTextEncoding()).getStr(), buf))
-{
-if (aPath.Level() = 1)
-return String();
-aPath = aPath [1];
-}
-mymnttab rMnt = mymnt::get();
-return ((buf.st_dev == rMnt.mountdevice ||
-GetMountEntry(buf.st_dev, rMnt)) ?
-String( rMnt.mountpoint, osl_getThreadTextEncoding()) :
-String());
-}
-
/*
|*
|*DirEntry::SetCWD()
diff --git a/unusedcode.easy b/unusedcode.easy
index 036c9bb..be5d0b8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -18,7 +18,6 @@ DdeTopic::DdeTopic(String const)
DdeTopic::RemoveItem(DdeItem const)
DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
Dialog::Dialog(Window*, ResId const)
-DirEntry::GetDevice() const
EditView::GetSelectionMode() const
EditView::SetCursor(Cursor const)
EditView::SetPointer(Pointer const)
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 4/4] Re: [PATCH 0/4] Remove some unused methods
On Tue, Feb 07, 2012 at 01:26:18AM +0100, Michael Stahl wrote: On 06/02/12 23:05, Greg Kroah-Hartman wrote: Here are 4 patches removing some unused methods in the tree. All of these patches are contributed under the LGPLv3+ / MPL. great! Note, I also removed the line in the unusedcode.easy file at the same time, if I shouldn't have done that, let me know and I'll redo these patches. doesn't matter too much as that will get updated anyway next time callcatcher tool is run. (also, unusedcode.easy only shows the situation on Linux, see below...) Ah, didn't realize that. If I messed anything up, or the patches need more information within the body of the changelog, please let me know, and I'll be glad to respin them. thanks, greg k-h these tools things are wicked, and have traps prepared for the unwary; it turns out that both DirEntry::GetDevice() and FileStat::FileStat(void const*) have 2 implementations, and the WNT one is actually used in WNT-only code: tools/source/fsys/dirent.cxx:aFromDevice=aFromDevice.GetDevice(); tools/source/fsys/dirent.cxx:aToDevice=aToDevice.GetDevice(); tools/source/fsys/wntmsc.cxx:pTemp-ImpSetStat( new FileStat( (void*) pDosDir ) ); tools/source/fsys/wntmsc.cxx:FileStat *pNewStat = new FileStat( (void*) pDosDir ); (and one of these is inside an #ifdef FEAT_FSYS_DOUBLESPEED ... you can't make these things up i guess...) Ugh, sorry about that, I should have caught that in a grep, my fault. so i've only applied and pushed the part of these patches that removes the Unix implementation (that should hopefully deter people from adding new callers...); please try to be more careful next time (though admittedly checking that generally is a PITA given how name lookup works in C++) Thanks for checking in the bits that didn't break the build. patches to remove the tools/fsys trainwreck completely and adapt callers to use osl/file.hxx would be appreciated of course :) Hm, that looks a bit more fun, I'll work on that... PS: in case you wanted the free t-shirt as the 400th contributor i'm afraid you're probably too late :-P I didn't know you were even offering such a thing, if I did, I would have contributed sooner :) thanks, greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
