[Libreoffice-commits] .: Branch 'feature/killsdf' - 2 commits - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/propmerge.hxx    |    2 +-
 l10ntools/source/export2.cxx   |    4 ----
 l10ntools/source/propmerge.cxx |    6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 0c7f8e6d0c2a414150c5f77d3419479bb8eeddb0
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Mon Oct 29 12:53:18 2012 +0100

    Delete some unneeded checking from export2.cxx
    
    Change-Id: Ib41c81629fbc5a8bd709391091c2777d49f9d9c4

diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 64a5b1b..5ef2231 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -95,10 +95,6 @@ bool Export::handleArguments(
     int argc, char * argv[], HandledArgs& o_aHandledArgs)
 {
     o_aHandledArgs = HandledArgs();
-    if ( argc <= 1  )
-    {
-        return false;
-    }
     sLanguages = "";
     sal_uInt16 nState = STATE_NON;
 
commit 8f57a9d2a186a2cd5d71ed8bbed106ab927322d4
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Mon Oct 29 11:52:54 2012 +0100

    Correct some naming in propex
    
    Change-Id: Id5b17be8155f13529439dd9a46b42f6ffeed79b1

diff --git a/l10ntools/inc/propmerge.hxx b/l10ntools/inc/propmerge.hxx
index 3465635..4f0e327 100644
--- a/l10ntools/inc/propmerge.hxx
+++ b/l10ntools/inc/propmerge.hxx
@@ -30,7 +30,7 @@ public:
     bool isInitialized() const { return m_bIsInitialized; }
     void Extract(
         const OString& rSDFFile, const OString& rPrj, const OString& rRoot );
-    void Merge( const OString &rSDFFile, const OString &rDestinationFile );
+    void Merge( const OString &rMergeSrc, const OString &rDestinationFile );
 };
 
 #endif //_PROPMERGE_INCLUDED
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 0f1b20b..6140014 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -168,7 +168,7 @@ void PropParser::Extract(
 }
 
 //Merge strings to source file
-void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile )
+void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFile )
 {
     assert( m_bIsInitialized );
     std::ofstream aDestination(
@@ -180,14 +180,14 @@ void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile
         return;
     }
 
-    MergeDataFile aMergeDataFile( rSDFFile, m_sSource, false );
+    MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
 
     if( aMergeDataFile.GetLanguages()[0] != m_sLang )
     {
         std::cerr
             << "Propex error: given language conflicts with "
             << "language of Mergedata file: "
-            << m_sLang.getStr() << " - " << rSDFFile.getStr() << std::endl;
+            << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl;
         return;
     }