svn commit: r1527384 - /openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx

[jani]

Author: jani
Date: Sun Sep 29 18:54:43 2013
New Revision: 1527384

URL: http://svn.apache.org/r1527384
Log:
testing merge of ulf file type.

Modified:
    openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx

Modified: openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx?rev=1527384&r1=1527383&r2=1527384&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx Sun Sep 29 
18:54:43 2013
@@ -154,6 +154,7 @@ void handler::checkCommandLine(int argc,
         case DO_MERGE:
              useSoption  = 0;
              useLangText = 1;
+             useToption  = 1;
              break;
 
         case DO_CONVERT:
@@ -172,9 +173,9 @@ void handler::checkCommandLine(int argc,
       if (msSourceDir.size() && useSoption == 1)
         throw "-s <source dir> is mandatory";
       if (msTargetDir.size() && useToption == -1)
-        throw "-s <target dir> is not valid";
-      if (msTargetDir.size() && useToption == 1)
-        throw "-s <target dir> is mandatory";
+        throw "-t <target dir> is not valid";
+      if (!msTargetDir.size() && useToption == 1)
+        throw "-t <target dir> is mandatory";
     }
 
     if (msTargetDir.size() && !convert_gen::checkAccess(msTargetDir))
@@ -252,7 +253,6 @@ void handler::run()
       case DO_EXTRACT:     runExtract(false); break;
       case DO_EXTRACT_KID: runExtract(true);  break;
       case DO_MERGE:       runMerge();        break;
-      case DO_MERGE_KID:   runMerge();        break;
       case DO_CONVERT:     runConvert(false); break;
       case DO_CONVERT_POT: runConvert(true);  break;
     }