Author: hdu Date: Tue Apr 16 12:13:56 2013 New Revision: 1468386 URL: http://svn.apache.org/r1468386 Log: rename local method is_empty() as it is now also part of the std namespace
also mark some related local functions as static Modified: openoffice/trunk/main/i18npool/source/localedata/LocaleNode.cxx Modified: openoffice/trunk/main/i18npool/source/localedata/LocaleNode.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/localedata/LocaleNode.cxx?rev=1468386&r1=1468385&r2=1468386&view=diff ============================================================================== --- openoffice/trunk/main/i18npool/source/localedata/LocaleNode.cxx (original) +++ openoffice/trunk/main/i18npool/source/localedata/LocaleNode.cxx Tue Apr 16 12:13:56 2013 @@ -158,27 +158,27 @@ LocaleNode* LocaleNode::createNode (cons #define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr()) -void print_OUString( const OUString& s ) +static void print_OUString( const OUString& s ) { printf( "%s", OSTR(s)); } -bool is_empty( const OUString& s ) +static bool is_empty_string( const OUString& s ) { return (s.getLength()==0) || (s.getLength()==1 && s[0]=='\n'); } -void print_indent( int depth ) +static void print_indent( int depth ) { for( int i=0; i<depth; i++ ) printf(" "); } -void print_color( int color ) +static void print_color( int color ) { printf("\033[%dm", color); } -void print_node( const LocaleNode* p, int depth=0 ) +static void print_node( const LocaleNode* p, int depth=0 ) { if( !p ) return; @@ -206,7 +206,7 @@ void print_node( const LocaleNode* p, in } printf(">"); printf("\n"); - if( !is_empty( p->getValue() ) ) + if( !is_empty_string( p->getValue() ) ) { print_indent( depth+1 ); printf("value: ");