Author: jani Date: Tue Mar 26 10:36:48 2013 New Revision: 1461052 URL: http://svn.apache.org/r1461052 Log: makefiles require lang separeted by ' ' not ','
Modified: openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx Modified: openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx?rev=1461052&r1=1461051&r2=1461052&view=diff ============================================================================== --- openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx (original) +++ openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx Tue Mar 26 10:36:48 2013 @@ -21,7 +21,7 @@ #include <iostream> #include "gLang.hxx" #include <cstdlib> -#include <iostream> +#include <iostream> #include <fstream> @@ -217,14 +217,14 @@ void handler::checkCommandLine(int argc, msPoOutDir.append("/"); // and convert language to a vector - int current; - int next = -1; - do - { - current = next + 1; - next = sLangText.find_first_of( ",", current ); - mvLanguages.push_back(sLangText.substr(current,next-current)); - } + int current; + int next = -1; + do + { + current = next + 1; + next = sLangText.find_first_of( " ", current ); + mvLanguages.push_back(sLangText.substr(current,next-current)); + } while (next != (int)std::string::npos); // check if source files list needs to be coverted @@ -475,26 +475,26 @@ void handler::loadL10MEM() /********************** I M P L E M E N T A T I O N **********************/ void handler::readFileWithSources() { - std::ifstream fInput; - char buf[256]; - - - if (mvSourceFiles.size() < 2) - throw l10nMem::showError("missing file with sources (-f USEFILE: <filename>)"); - - fInput.open (mvSourceFiles[1].c_str(), std::ifstream::in); - if (!fInput.is_open()) - throw l10nMem::showError("Cannot open file with sources (-f), trying to open" + mvSourceFiles[1]); - - mvSourceFiles.clear(); - - while (fInput.good()) - { - fInput.getline(buf, sizeof(buf)); - if (!buf[0]) - continue; - mvSourceFiles.push_back(buf); - } - + std::ifstream fInput; + char buf[256]; + + + if (mvSourceFiles.size() < 2) + throw l10nMem::showError("missing file with sources (-f USEFILE: <filename>)"); + + fInput.open (mvSourceFiles[1].c_str(), std::ifstream::in); + if (!fInput.is_open()) + throw l10nMem::showError("Cannot open file with sources (-f), trying to open" + mvSourceFiles[1]); + + mvSourceFiles.clear(); + + while (fInput.good()) + { + fInput.getline(buf, sizeof(buf)); + if (!buf[0]) + continue; + mvSourceFiles.push_back(buf); + } + fInput.close(); }