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/10/13 11:38:55 UTC
svn commit: r1531658 - in /openoffice/branches/l10n40/main/l10ntools/source:
gConXhpWrap.cxx gL10nMem.cxx gL10nMem.hxx gLang.hxx
Author: jani
Date: Sun Oct 13 09:38:55 2013
New Revision: 1531658
URL: http://svn.apache.org/r1531658
Log:
helpcontent2 has a special directory structure, this should allow it.
Modified:
openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx
openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx
openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx?rev=1531658&r1=1531657&r2=1531658&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx Sun Oct 13 09:38:55 2013
@@ -83,7 +83,7 @@ void convert_xhp::execute()
for (int i = 0; mcMemory.getMergeLang(sLang, sFile); ++i)
{
- sFile2 = sLang + "/" + msSourceFile;
+ sFile2 = sLang + "/text/" + mcMemory.getModuleName().substr(5) + "/" + msSourceFile;
sFile = msTargetPath + sFile2;
mcOutputFiles[i].open(sFile.c_str(), std::ios::binary);
if (!mcOutputFiles[i].is_open())
Modified: openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx?rev=1531658&r1=1531657&r2=1531658&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.cxx Sun Oct 13 09:38:55 2013
@@ -87,6 +87,8 @@ bool l10nMem::isError()
{ return l10nMem_impl::mcImpl->mbInError; }
void l10nMem::setModuleName(const std::string& sM)
{ l10nMem_impl::mcImpl->setModuleName(sM); }
+const std::string& l10nMem::getModuleName ()
+ { return l10nMem_impl::mcImpl->getModuleName(); }
void l10nMem::setLanguage(const std::string& sL, bool bC)
{ l10nMem_impl::mcImpl->mcDb.setLanguage(sL, bC); }
void l10nMem::setConvert(bool bC, bool bS)
@@ -177,6 +179,14 @@ void l10nMem_impl::setModuleName(const s
/********************** I M P L E M E N T A T I O N **********************/
+const std::string& l10nMem_impl::getModuleName()
+{
+ return msModuleName;
+}
+
+
+
+/********************** I M P L E M E N T A T I O N **********************/
void l10nMem_impl::loadEntryKey(int iLineNo,
const std::string& sSourceFile,
const std::string& sKey,
Modified: openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx?rev=1531658&r1=1531657&r2=1531658&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gL10nMem.hxx Sun Oct 13 09:38:55 2013
@@ -167,6 +167,7 @@ class l10nMem_impl
void showVerbose (const std::string& sText, int iLineNo);
void setModuleName (const std::string& sModuleName);
+ const std::string& getModuleName (void);
void loadEntryKey (int iLineNo,
const std::string& sSourceFile,
const std::string& sKey,
Modified: openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx?rev=1531658&r1=1531657&r2=1531658&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gLang.hxx Sun Oct 13 09:38:55 2013
@@ -67,6 +67,7 @@ class l10nMem
bool isError ();
void setModuleName (const std::string& sModuleName);
+ const std::string& getModuleName (void);
void setLanguage (const std::string& sLanguage,
bool bCreate);
void setConvert (bool bConvert,