Author: jani
Date: Tue Aug 27 19:17:06 2013
New Revision: 1517928
URL: http://svn.apache.org/r1517928
Log:
changes to get helpcontent2 == old system
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk
openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx
openoffice/branches/l10n40/main/languages/source/templates/help_sbasic.pot
openoffice/branches/l10n40/main/languages/source/templates/help_scalc.pot
openoffice/branches/l10n40/main/languages/source/templates/help_schart.pot
openoffice/branches/l10n40/main/languages/source/templates/help_sdraw.pot
openoffice/branches/l10n40/main/languages/source/templates/help_shared.pot
openoffice/branches/l10n40/main/languages/source/templates/help_simpress.pot
openoffice/branches/l10n40/main/languages/source/templates/help_smath.pot
openoffice/branches/l10n40/main/languages/source/templates/help_swriter.pot
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk
(original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -23,8 +23,7 @@ PRJ=../../..
PRJNAME=help_sbasic
TARGET=helper
-LANGUAGE_FILELIST=../../auxiliary/sbasic.tree \
-guide/create_dialog.xhp \
+LANGUAGE_FILELIST= guide/create_dialog.xhp \
guide/insert_control.xhp \
guide/sample_code.xhp \
guide/show_dialog.xhp \
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk
(original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -34,8 +34,7 @@ TARGET = text_scalc
MODULE = scalc
# --- Settings -----------------------------------------------------
-LANGUAGE_FILELIST=../../auxiliary/scalc.tree \
-00/00000004.xhp \
+LANGUAGE_FILELIST= 00/00000004.xhp \
00/00000402.xhp \
00/00000403.xhp \
00/00000404.xhp \
@@ -57,6 +56,7 @@ LANGUAGE_FILELIST=../../auxiliary/scalc.
01/02150000.xhp \
01/02160000.xhp \
01/02170000.xhp \
+01/02180000.xhp \
01/02190000.xhp \
01/02190100.xhp \
01/02190200.xhp \
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk
(original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -35,8 +35,7 @@ TARGET = text_schart
MODULE = schart
# --- Settings -----------------------------------------------------
-LANGUAGE_FILELIST=../../auxiliary/schart.tree \
-00/00000004.xhp \
+LANGUAGE_FILELIST= 00/00000004.xhp \
01/03010000.xhp \
01/04010000.xhp \
01/04020000.xhp \
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk
(original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -35,8 +35,7 @@ TARGET = text_shared
MODULE = shared
# --- Settings -----------------------------------------------------
-LANGUAGE_FILELIST=../../auxiliary/shared.tree \
-00/00000001.xhp \
+LANGUAGE_FILELIST= 00/00000001.xhp \
00/00000002.xhp \
00/00000003.xhp \
00/00000004.xhp \
@@ -434,6 +433,8 @@ LANGUAGE_FILELIST=../../auxiliary/shared
02/08020000.xhp \
02/09010000.xhp \
02/09020000.xhp \
+02/09030000.xhp \
+02/09050000.xhp \
02/09060000.xhp \
02/09070000.xhp \
02/09070100.xhp \
@@ -825,6 +826,7 @@ guide/xforms.xhp \
guide/xsltfilter_create.xhp \
guide/xsltfilter_distribute.xhp \
guide/xsltfilter.xhp \
+guide/sidebar_window.xhp \
main0108.xhp \
main0201.xhp \
main0204.xhp \
@@ -922,7 +924,8 @@ optionen/testaccount.xhp \
optionen/viewcertificate_c.xhp \
optionen/viewcertificate_d.xhp \
optionen/viewcertificate_g.xhp \
-optionen/viewcertificate.xhp
+optionen/viewcertificate.xhp \
+tree_strings.xhp
.IF "$(MAKETARGETS)"!="genPO"
.INCLUDE : settings.mk
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
---
openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
(original)
+++
openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -26,8 +26,7 @@ PRJ = ..$/..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = help_simpress
-LANGUAGE_FILELIST=../../auxiliary/simpress.tree \
-main0103.xhp \
+LANGUAGE_FILELIST= main0103.xhp \
main0104.xhp \
main0113.xhp \
04/presenter.xhp \
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk
(original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -26,8 +26,7 @@ PRJ = ..$/..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = help_smath
-LANGUAGE_FILELIST=../../auxiliary/smath.tree \
-main0103.xhp \
+LANGUAGE_FILELIST= main0103.xhp \
04/01020000.xhp \
02/03010000.xhp \
main0102.xhp \
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
---
openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk
(original)
+++
openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk
Tue Aug 27 19:17:06 2013
@@ -26,8 +26,7 @@ PRJ = ..$/..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = help_swriter
-LANGUAGE_FILELIST=../../auxiliary/swriter.tree \
-main0103.xhp \
+LANGUAGE_FILELIST= main0103.xhp \
main0104.xhp \
04/01020000.xhp \
02/18030700.xhp \
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx Tue Aug 27
19:17:06 2013
@@ -122,7 +122,7 @@ void convert_xhp::openTag(char *yytext)
if (meExpectValue == VALUE_IS_VALUE)
{
meExpectValue = VALUE_IS_VALUE_TAG;
- msCollector += "\\";
+//FIX msCollector += "\\";
}
copySourceSpecial(yytext, 0);
}
@@ -138,7 +138,7 @@ void convert_xhp::closeTag(char *yytext)
{
case VALUE_IS_VALUE_TAG:
newState = VALUE_IS_VALUE;
- msCollector += "\\";
+//FIX msCollector += "\\";
break;
case VALUE_IS_TAG_TRANS:
Modified: openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx?rev=1517928&r1=1517927&r2=1517928&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx Tue Aug 27
19:17:06 2013
@@ -202,7 +202,7 @@ void l10nMem_impl::setSourceKey(int
for (i = 0; (i = newText.find("\\", i)) != (int)std::string::npos;)
{
++i;
- if (i < (int)newText.size() && (newText[i] == '<' || newText[i] == '>' ||
newText[i] == 'n' || newText[i] == 't'))
+ if (i < (int)newText.size() && (newText[i] == '\\' || newText[i] == '<' ||
newText[i] == '>' || newText[i] == 'n' || newText[i] == 't'))
++i;
else
{
