Author: jani
Date: Mon Sep 16 07:59:14 2013
New Revision: 1523556
URL: http://svn.apache.org/r1523556
Log:
update to please compiler.
Modified:
openoffice/branches/l10n40/main/l10ntools/source/gCon.cxx
openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx
openoffice/branches/l10n40/main/l10ntools/source/gConPolex.l
openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx
openoffice/branches/l10n40/main/l10ntools/source/gConSrclex.l
openoffice/branches/l10n40/main/l10ntools/source/gConTree.hxx
openoffice/branches/l10n40/main/l10ntools/source/gConTreeWrap.cxx
openoffice/branches/l10n40/main/l10ntools/source/gConTreelex.l
openoffice/branches/l10n40/main/l10ntools/source/gConUlflex.l
openoffice/branches/l10n40/main/l10ntools/source/gConXcslex.l
openoffice/branches/l10n40/main/l10ntools/source/gConXculex.l
openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
openoffice/branches/l10n40/main/l10ntools/source/gConXhplex.l
openoffice/branches/l10n40/main/l10ntools/source/gConXrmlex.l
openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx
openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx
Modified: openoffice/branches/l10n40/main/l10ntools/source/gCon.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gCon.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gCon.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gCon.cxx Mon Sep 16
07:59:14 2013
@@ -35,6 +35,7 @@
#define OS_ACCESS(x,y) _access(x,y)
#define OS_MKDIR(x) _mkdir(x)
#else
+#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#define OS_ACCESS(x,y) access(x,y)
@@ -194,7 +195,7 @@ bool convert_gen::createDir(std::string&
for (oldPos = 0;; oldPos = newPos +1)
{
newPos = sFile.find_first_of("/\\", oldPos);
- if (newPos == std::string::npos)
+ if (newPos == (int)std::string::npos)
break;
sNewDir += sFile.substr(oldPos, newPos-oldPos) + "/";
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConPoWrap.cxx Mon Sep 16
07:59:14 2013
@@ -209,7 +209,7 @@ void convert_po::startSave(const std::st
<< "\"Last-Translator: genLang (build process)\\n\""
<< std::endl
<< "\"Language-Team: \\n\""
<< std::endl
<< "\"MIME-Version: 1.0\\n\""
<< std::endl
- << "\"Content-Type: text/plain; charset=iso-8859-1\\n\""
<< std::endl
+ << "\"Content-Type: text/plain; charset=UTF-8\\n\""
<< std::endl
<< "\"Content-Transfer-Encoding: 8bit\\n\""
<< std::endl
<< "\"X-Generator: genLang\\n\""
<< std::endl
<< std::endl;
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConPolex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConPolex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConPolex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConPolex.l Mon Sep 16
07:59:14 2013
@@ -139,6 +139,10 @@ SPACE [ \t]*
\n {
LOCptr->handleNL();
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
@@ -147,7 +151,6 @@ SPACE [ \t]*
%%
-
void dummyJustForCompiler()
{
char *txt = NULL;
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConSrcWrap.cxx Mon Sep 16
07:59:14 2013
@@ -339,6 +339,9 @@ void convert_src::insertLanguagePart(std
std::string sLang, sText, sTagText;
+ // just to please compiler
+ sKey = sKey;
+
// prepare to read all languages
mcMemory.prepareMerge();
for (; mcMemory.getMergeLang(sLang, sText);)
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConSrclex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConSrclex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConSrclex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConSrclex.l Mon Sep 16
07:59:14 2013
@@ -302,6 +302,10 @@ KEYID [a-zA-Z0-9_-]+
. {
IMPLptr->copySource(yytext);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
%%
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConTree.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConTree.hxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConTree.hxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConTree.hxx Mon Sep 16
07:59:14 2013
@@ -66,10 +66,10 @@ class convert_tree : public convert_gen_
std::string msLine;
std::string msId;
std::string msAppl;
+ std::ofstream *mcOutputFiles;
STATE_TAG meStateTag;
STATE_VAL meStateVal;
int miCntLanguages;
- std::ofstream *mcOutputFiles;
void execute();
};
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConTreeWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConTreeWrap.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConTreeWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConTreeWrap.cxx Mon Sep
16 07:59:14 2013
@@ -32,11 +32,12 @@
/********************** I M P L E M E N T A T I O N **********************/
convert_tree::convert_tree(l10nMem& crMemory)
- : meStateTag(STATE_TAG_NONE),
- meStateVal(STATE_VAL_NONE),
- miCntLanguages(0),
+ : convert_gen_impl(crMemory),
mcOutputFiles(NULL),
- convert_gen_impl(crMemory)
+ meStateTag(STATE_TAG_NONE),
+ meStateVal(STATE_VAL_NONE),
+ miCntLanguages(0)
+
{
// tree files are written through a local routine
mbLoadMode = true;
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConTreelex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConTreelex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConTreelex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConTreelex.l Mon Sep 16
07:59:14 2013
@@ -128,6 +128,10 @@ IDENT [\.a-zA-Z0-9_-]+
.|\n {
LOCptr->copySourceSpecial(yytext, 0);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConUlflex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConUlflex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConUlflex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConUlflex.l Mon Sep 16
07:59:14 2013
@@ -110,6 +110,10 @@ KEYID [a-zA-Z0-9_-]+
.|\n {
IMPLptr->copySource(yytext);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
%%
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXcslex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXcslex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXcslex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXcslex.l Mon Sep 16
07:59:14 2013
@@ -78,6 +78,10 @@
.|\n {
IMPLptr->copySource(yytext);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
%%
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXculex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXculex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXculex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXculex.l Mon Sep 16
07:59:14 2013
@@ -124,6 +124,10 @@ FIN [^/>]*">"
. {
IMPLptr->copySource(yytext, LOCptr->mbNoCollectingData);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx Mon Sep 16
07:59:14 2013
@@ -34,9 +34,9 @@
convert_xhp::convert_xhp(l10nMem& crMemory)
: convert_gen_impl(crMemory),
meExpectValue(VALUE_NOT_USED),
- miCntLanguages(0),
+ msLangText(NULL),
mcOutputFiles(NULL),
- msLangText(NULL)
+ miCntLanguages(0)
{
// xhp files are written through a local routine
mbLoadMode = true;
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXhplex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXhplex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXhplex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXhplex.l Mon Sep 16
07:59:14 2013
@@ -155,6 +155,10 @@ IDENT [\.a-zA-Z0-9_-]+
.|\n {
LOCptr->copySourceSpecial(yytext, 0);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXrmlex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXrmlex.l?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXrmlex.l (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXrmlex.l Mon Sep 16
07:59:14 2013
@@ -98,6 +98,10 @@ SP [ \t]*
.|\n {
IMPLptr->copySource(yytext, LOCptr->mbNoCollectingData);
+
+ // Just to please compiler.
+ if (false)
+ REJECT;
}
Modified: openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gHandler.cxx Mon Sep 16
07:59:14 2013
@@ -290,6 +290,10 @@ void handler::runExtract()
/********************** I M P L E M E N T A T I O N **********************/
void handler::runMerge(bool bKid)
{
+ // just to satisfy compiler
+ if (bKid)
+ return;
+
// no convert
mcMemory.setConvert(false, false);
Modified: openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx?rev=1523556&r1=1523555&r2=1523556&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx Mon Sep 16
07:59:14 2013
@@ -239,9 +239,11 @@ void l10nMem_impl::setSourceKey(int
void l10nMem_impl::saveTemplates(l10nMem& cMem, const std::string& sTargetDir,
bool bKid, bool bForce)
{
int iE, iEsize = mcDb.mcENUSlist.size();
- int iCntDeleted = 0, iCntChanged = 0, iCntAdded = 0;
std::string sFileName = msModuleName + ".pot";
-
+
+ // Dummy to satisfy compiler
+ if (bKid)
+ return;
// and reorganize db if needed
mcDb.miCurFileInx = 0;
@@ -277,7 +279,6 @@ void l10nMem_impl::saveLanguages(l10nMem
{
int iE, iEsize = mcDb.mcENUSlist.size();
int iL, iLsize = mcDb.mcLangList.size();
- int iCntDeleted = 0, iCntChanged = 0, iCntAdded = 0;
std::string sFileName = msModuleName + ".po";
@@ -349,8 +350,6 @@ void l10nMem_impl::dumpMem(const std::st
/********************** I M P L E M E N T A T I O N **********************/
void l10nMem_impl::formatAndShowText(const std::string& sType, int iLineNo,
const std::string& sText)
{
- std::string& cFile = mcDb.mcFileList[mcDb.miCurFileInx].msFileName;
-
std::cout << sType;
if (mcDb.miCurFileInx > 0)
std::cout << " in " << mcDb.mcFileList[mcDb.miCurFileInx].msFileName;
