You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/05 22:44:24 UTC
svn commit: r1442765 - in /openoffice/branches/l10n/main/l10ntools/source:
gConHrcWrap.cxx gConHrclex.l gConPoWrap.cxx gConSrcWrap.cxx gConXcsWrap.cxx
gConXcuWrap.cxx gConXhpWrap.cxx gConXrmWrap.cxx
Author: jani
Date: Tue Feb 5 21:44:24 2013
New Revision: 1442765
URL: http://svn.apache.org/viewvc?rev=1442765&view=rev
Log:
removed need for force:multiple linker option
Modified:
openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConHrclex.l
openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXhpWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXrmWrap.cxx
Modified: openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx Tue Feb 5 21:44:24 2013
@@ -35,7 +35,10 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace HrcWrap
+{
#include "gConHrc_yy.c"
+}
@@ -65,7 +68,7 @@ void convert_hrc_impl::addCommentToSet(L
// loop and collect whole comment
for (check_comment_terminate = false, buf[1] = '\0';;)
{
- buf[0] = yyinput();
+ buf[0] = HrcWrap::yyinput();
// end of file ?
if (!buf[0])
@@ -98,5 +101,5 @@ void convert_hrc_impl::addCommentToSet(L
/********************** I M P L E M E N T A T I O N **********************/
void convert_hrc_impl::runLex()
{
- genSrc_lex();
+ HrcWrap::genHrc_lex();
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConHrclex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConHrclex.l?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConHrclex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConHrclex.l Tue Feb 5 21:44:24 2013
@@ -49,7 +49,7 @@
/* --- The following options are for future use (maybe) */
/* yyclass= --> subClass yyFlexLexer to allow own functions */
/* c++ --> generate C++ classes */
-%option 8bit noyywrap never-interactive prefix="genSrc_"
+%option 8bit noyywrap never-interactive prefix="genHrc_"
%p 24000
%e 1200
%n 500
Modified: openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx Tue Feb 5 21:44:24 2013
@@ -32,14 +32,17 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace PoWrap
+{
#include "gConPo_yy.c"
+}
/********************** I M P L E M E N T A T I O N **********************/
void convert_po_impl::runLex()
{
- genpo_lex();
+ PoWrap::genpo_lex();
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx Tue Feb 5 21:44:24 2013
@@ -35,7 +35,10 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace SrcWrap
+{
#include "gConSrc_yy.c"
+}
@@ -65,7 +68,7 @@ void convert_src_impl::addCommentToSet(L
// loop and collect whole comment
for (check_comment_terminate = false, buf[1] = '\0';;)
{
- buf[0] = yyinput();
+ buf[0] = SrcWrap::yyinput();
// end of file ?
if (!buf[0])
@@ -98,5 +101,5 @@ void convert_src_impl::addCommentToSet(L
/********************** I M P L E M E N T A T I O N **********************/
void convert_src_impl::runLex()
{
- genSrc_lex();
+ SrcWrap::genSrc_lex();
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcsWrap.cxx Tue Feb 5 21:44:24 2013
@@ -32,7 +32,10 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace XcsWrap
+{
#include "gConXcs_yy.c"
+}
@@ -40,7 +43,7 @@ using namespace std;
void convert_xcs_impl::runLex()
{
// currently no .xcs files generate en-US translation, so stop trying
- // genxcs_lex();
+ XcsWrap::genxcs_lex();
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx Tue Feb 5 21:44:24 2013
@@ -32,14 +32,17 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace XcuWrap
+{
#include "gConXcu_yy.c"
+}
/********************** I M P L E M E N T A T I O N **********************/
void convert_xcu_impl::runLex()
{
- genxcu_lex();
+ XcuWrap::genxcu_lex();
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXhpWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXhpWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXhpWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXhpWrap.cxx Tue Feb 5 21:44:24 2013
@@ -32,14 +32,16 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace XhpWrap
+{
#include "gConXhp_yy.c"
-
+}
/********************** I M P L E M E N T A T I O N **********************/
void convert_xhp_impl::runLex()
{
- genXhp_lex();
+ XhpWrap::genXhp_lex();
if (mbMergeMode)
writeSourceFile(msCollector);
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXrmWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXrmWrap.cxx?rev=1442765&r1=1442764&r2=1442765&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXrmWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXrmWrap.cxx Tue Feb 5 21:44:24 2013
@@ -32,14 +32,16 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
+namespace XrmWrap
+{
#include "gConXrm_yy.c"
-
+}
/********************** I M P L E M E N T A T I O N **********************/
void convert_xrm_impl::runLex()
{
- genXrm_lex();
+ XrmWrap::genXrm_lex();
// write last part of file.
if (mbMergeMode)