Author: jani
Date: Fri Feb 8 13:25:59 2013
New Revision: 1444004
URL: http://svn.apache.org/r1444004
Log:
update to build correct in ubuntu
Modified:
openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/makefile.mk
Modified: openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx?rev=1444004&r1=1444003&r2=1444004&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConHrcWrap.cxx Fri Feb 8
13:25:59 2013
@@ -90,7 +90,7 @@ void convert_hrc_impl::saveData(std::str
// get all languages (includes en-US)
std::vector<l10nMem_entry *>& cExtraLangauges =
mcMemory.getLanguagesForKey(msKey);
std::string sNewLine;
- int nL = cExtraLangauges.size();
+ nL = cExtraLangauges.size();
for (int i = 0; i < nL; ++i)
{
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx?rev=1444004&r1=1444003&r2=1444004&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx Fri Feb 8
13:25:59 2013
@@ -144,7 +144,7 @@ void convert_src_impl::saveData(std::str
// get all languages (includes en-US)
std::vector<l10nMem_entry *>& cExtraLangauges =
mcMemory.getLanguagesForKey(sKey);
std::string sNewLine;
- int nL = cExtraLangauges.size();
+ nL = cExtraLangauges.size();
for (int i = 0; i < nL; ++i)
{
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx?rev=1444004&r1=1444003&r2=1444004&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcuWrap.cxx Fri Feb 8
13:25:59 2013
@@ -124,7 +124,7 @@ void convert_xcu_impl::stopCollectData(s
// get all languages (includes en-US)
std::vector<l10nMem_entry *>& cExtraLangauges =
mcMemory.getLanguagesForKey(useKey);
std::string sNewLine;
- int nL = cExtraLangauges.size();
+ nL = cExtraLangauges.size();
for (int i = 0; i < nL; ++i)
{
Modified: openoffice/branches/l10n/main/l10ntools/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/makefile.mk?rev=1444004&r1=1444003&r2=1444004&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/makefile.mk (original)
+++ openoffice/branches/l10n/main/l10ntools/source/makefile.mk Fri Feb 8
13:25:59 2013
@@ -167,35 +167,26 @@ APP7STDLIBS+= \
.ENDIF
# localizer for new l10n framework
-#
-APP8OBJS= $(OBJ)$/gLang.obj \
- $(OBJ)$/gL10nMem.obj \
- $(OBJ)$/gHandler.obj \
- $(OBJ)$/gConProp.obj \
- $(OBJ)$/gConHrc.obj \
- $(OBJ)$/gConSrc.obj \
- $(OBJ)$/gConTree.obj \
- $(OBJ)$/gConUlf.obj \
- $(OBJ)$/gConPo.obj \
- $(OBJ)$/gConXcs.obj \
- $(OBJ)$/gConXcu.obj \
- $(OBJ)$/gConXhp.obj \
- $(OBJ)$/gConXrm.obj \
- $(OBJ)$/gCon.obj \
- $(OBJ)$/gConPoWrap.obj \
- $(OBJ)$/gConHrcWrap.obj \
- $(OBJ)$/gConSrcWrap.obj \
- $(OBJ)$/gConXcsWrap.obj \
- $(OBJ)$/gConXcuWrap.obj \
- $(OBJ)$/gConXrmWrap.obj \
+APP8TARGET= genLang
+APP8OBJS= $(OBJ)$/gLang.obj $(OBJ)$/gL10nMem.obj \
+ $(OBJ)$/gHandler.obj $(OBJ)$/gConProp.obj \
+ $(OBJ)$/gConHrc.obj $(OBJ)$/gConSrc.obj \
+ $(OBJ)$/gConTree.obj $(OBJ)$/gConUlf.obj \
+ $(OBJ)$/gConPo.obj $(OBJ)$/gConXcs.obj \
+ $(OBJ)$/gConXcu.obj $(OBJ)$/gConXhp.obj \
+ $(OBJ)$/gConXrm.obj $(OBJ)$/gCon.obj \
+ $(OBJ)$/gConPoWrap.obj $(OBJ)$/gConHrcWrap.obj \
+ $(OBJ)$/gConSrcWrap.obj $(OBJ)$/gConXcsWrap.obj \
+ $(OBJ)$/gConXcuWrap.obj $(OBJ)$/gConXrmWrap.obj \
$(OBJ)$/gConXhpWrap.obj
APP8RPATH= NONE
-APP8STDLIBS+= $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-APP8TARGET= genLang
+APP8STDLIBS=
+APP8LIBS=
+APP8LINKTYPE=STATIC
+APP8LIBSALCPPRT=
+
+
-DEPOBJFILES=$(APP8OBJS)
# localizer for l10n framework
APP9TARGET= localize_sl
@@ -221,6 +212,7 @@ $(MISC)$/%_yy.c : %lex.l
flex -l -w -8 -o$@ $<
+
# --- Files --------------------------------------------------------
