[Libreoffice-commits] .: Branch 'integration/dev300_m101' - rsc/source

[Michael Meeks]

 rsc/source/rsc/rsc.cxx |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 53e0091c24f7ea41db7855ffac0d3d563f2cde8b
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Mar 17 17:59:00 2011 +0000

    be more paranoid about eliding empty path params we get

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 0f982db..e313d04 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -231,14 +231,18 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
             else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) )
             {  // additional language specific include for system dependent files
                 const ByteString    aSysSearchDir( (*ppStr)+5 );
-                DirEntry            aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) );
 
-                m_aOutputFiles.back().aSysSearchDirs.push_back( ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) );
-
-                if( m_aOutputFiles.back().aLangSearchPath.Len() )
-                    m_aOutputFiles.back().aLangSearchPath.Append( ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) );
-
-                m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir );
+                // ignore empty -lip= arguments that we get lots of these days
+                if (aSysSearchDir.Len())
+                {
+                    DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) );
+                    m_aOutputFiles.back().aSysSearchDirs.push_back(
+                        ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) );
+                    if( m_aOutputFiles.back().aLangSearchPath.Len() )
+                        m_aOutputFiles.back().aLangSearchPath.Append(
+                        ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) );
+                    m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir );
+                }
             }
             else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
             { // anderer Name fuer .srs-file