Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	i18npool/inc/i18npool/lang.h
	i18npool/source/isolang/isolang.cxx
	svtools/source/filter/exportdialog.cxx
	svtools/source/graphic/grfmgr.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/window/salframe.cxx
	vcl/inc/sft.hxx
	vcl/inc/unx/pspgraphics.h
	vcl/inc/vcl/cursor.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/settings.hxx
	vcl/prj/d.lst
	vcl/source/app/settings.cxx
	vcl/source/control/edit.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/window/cursor.cxx
	vcl/source/window/window.cxx
	vcl/unx/generic/fontmanager/fontconfig.cxx
	vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
	vcl/unx/kde4/KDESalGraphics.cxx

1 files changed, 26 insertions, 7 deletions

diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index fbb9bcd53c6f..97be7c2332fb 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -194,20 +194,33 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
     if( sFullpath.getLength() < 1 ) return;
 
     rtl::OString   sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 );
-    const char*    path         = sFullpathext.getStr();
 
     // stat
-    if( stat( path  , &statbuf ) < 0 ){   printf("warning: Can not stat %s" , path ); return; }
+    if( stat( sFullpathext.getStr(), &statbuf ) < 0 )
+    {
+        printf("warning: Can not stat %s" , sFullpathext.getStr() );
+        return;
+    }
+
+    if( S_ISDIR(statbuf.st_mode ) == 0 )
+        return;
 
-    if( S_ISDIR(statbuf.st_mode ) == 0 ) {  return; }
+    if( (dir = opendir( sFullpathext.getStr() ) ) == NULL  )
+    {
+        printf("readerror 2 in %s \n",sFullpathext.getStr());
+        return;
+    }
 
-    if( (dir = opendir( path ) ) == NULL  ) {printf("readerror 2 in %s \n",path); return; }
     dirholder aHolder(dir);
 
     const rtl::OString sDot ( "." ) ;
     const rtl::OString sDDot( ".." );
 
-    if ( chdir( path ) == -1 ) { printf("chdir error in %s \n",path); return; }
+    if ( chdir( sFullpathext.getStr() ) == -1 )
+    {
+        printf("chdir error in %s \n",sFullpathext.getStr());
+        return;
+    }
 
     sFullpathext += rtl::OString( "/" );
 
@@ -261,8 +274,14 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
                          }
         }
     }
-    if ( chdir( ".." ) == -1 ) { printf("chdir error in .. \n"); return; }
-    if( aHolder.close() < 0 )   return ;
+    if ( chdir( ".." ) == -1 )
+    {
+        printf("chdir error in .. \n");
+        return;
+    }
+
+    if ( aHolder.close() < 0 )
+        return;
 
     std::sort( aFileVec.begin() , aFileVec.end() , File::lessFile );
     std::sort( aDirVec.begin()  , aDirVec.end()  , Directory::lessDir  );