From 3b8a5089df071a9e17cf140c6b90f020c10cacd2 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 21 Mar 2011 14:14:28 +0100 Subject: test123l10n04: path fixed --- l10ntools/scripts/localize.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'l10ntools') diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl index e432869d3a7b..6dac386011e0 100755 --- a/l10ntools/scripts/localize.pl +++ b/l10ntools/scripts/localize.pl @@ -175,7 +175,7 @@ sub splitfile{ exit( -1 ); } my $src_root = $ENV{SOURCE_ROOT_DIR}; - my $ooo_src_root = $src_root."/l10n/l10n"; + my $ooo_src_root = $src_root."/l10n"; my $so_l10n_path = $src_root."/sun/l10n_so/source"; my $ooo_l10n_path = $ooo_src_root."/l10n/source"; -- cgit From 9d5e820097199b5ab5ebd17460a5bb068471e52e Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 28 Mar 2011 18:35:35 +0200 Subject: masterfix DEV300: fix for string corruption --- l10ntools/source/directory.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'l10ntools') diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx index f7330a9b5ed9..c354d54ad4ea 100644 --- a/l10ntools/source/directory.cxx +++ b/l10ntools/source/directory.cxx @@ -187,21 +187,18 @@ void Directory::readDirectory( const rtl::OUString& sFullpath ) struct stat statbuf2; struct dirent *dirp; DIR *dir; - //int ret; - //char *ptr; if( sFullpath.getLength() < 1 ) return; rtl::OString sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 , sFullpath.getLength() ).getStr(); - //printf("%s\n",sFullpathext.getStr()); - const char* path = sFullpathext.getStr(); // stat - if( stat( path , &statbuf ) < 0 ){ printf("warning: Can not stat %s" , path ); return; }// error } + if( stat( sFullpathext.getStr() , &statbuf ) < 0 ){ printf("warning: Can not stat %s" , sFullpathext.getStr() ); return; }// error } if( S_ISDIR(statbuf.st_mode ) == 0 ) { return; }// error } return; // not dir - if( (dir = opendir( path ) ) == NULL ) {printf("readerror 2 in %s \n",path); return; } // error } return; // error + if( (dir = opendir( sFullpathext.getStr() ) ) == NULL ) {printf("readerror 2 in %s \n",sFullpathext.getStr()); return; } // error } return; // error + dirholder aHolder(dir); sFullpathext += rtl::OString( "/" ); @@ -209,7 +206,7 @@ void Directory::readDirectory( const rtl::OUString& sFullpath ) const rtl::OString sDot ( "." ) ; const rtl::OString sDDot( ".." ); - if ( chdir( path ) == -1 ) { printf("chdir error in %s \n",path); return; } // error + if ( chdir( sFullpathext.getStr() ) == -1 ) { printf("chdir error in %s \n",sFullpathext.getStr()); return; } // error while( ( dirp = readdir( dir ) ) != NULL ) { -- cgit From 96198071f8a75ac34c49e0f8186d22df03da1ca5 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 29 Mar 2011 16:48:23 +0200 Subject: masterfix DEV300: skip .hg subdirs --- l10ntools/source/srciter.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'l10ntools') diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx index 0c5071fca053..3434d4c39c55 100644 --- a/l10ntools/source/srciter.cxx +++ b/l10ntools/source/srciter.cxx @@ -70,6 +70,7 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory ) static rtl::OUString WCARD5 ( rtl::OUString::createFromAscii( "unxmac" ) ); static rtl::OUString WCARD6 ( rtl::OUString::createFromAscii( "unxubt" ) ); static rtl::OUString WCARD7 ( rtl::OUString::createFromAscii( ".svn" ) ); + static rtl::OUString WCARD8 ( rtl::OUString::createFromAscii( ".hg" ) ); if( sDirName.indexOf( WCARD1 , 0 ) > -1 || @@ -78,7 +79,8 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory ) sDirName.indexOf( WCARD4 , 0 ) > -1 || sDirName.indexOf( WCARD5 , 0 ) > -1 || sDirName.indexOf( WCARD6 , 0 ) > -1 || - sDirName.indexOf( WCARD7 , 0 ) > -1 + sDirName.indexOf( WCARD7 , 0 ) > -1 || + sDirName.indexOf( WCARD8 , 0 ) > -1 ) return; //printf("**** %s \n", OUStringToOString( sDirName , RTL_TEXTENCODING_UTF8 , sDirName.getLength() ).getStr() ); -- cgit