[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/po.hxx |4 +---
l10ntools/source/merge.cxx | 15 ---
l10ntools/source/po.cxx| 38 +-
3 files changed, 10 insertions(+), 47 deletions(-)
New commits:
commit dddca20c4871c7f7694510123f2366c3a179c06c
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Tue Dec 11 19:11:35 2012 +0100
Skip poheader
Po headers can be various and they don not
contain any needed information for merge so
skip it without any checking.
Change-Id: I6d81b7c85bfdbfd961361d98131ed80ba304e9ba
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index ace9e09..a84b5a0 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -122,12 +122,11 @@ class PoIfstream: private boost::noncopyable
private:
std::ifstream m_aInPut;
-boolm_bIsAfterHeader;
boolm_bEof;
public:
-enum Exception { INVALIDENTRY, INVALIDHEADER };
+enum Exception { INVALIDENTRY };
PoIfstream();
~PoIfstream();
@@ -136,7 +135,6 @@ public:
voidopen(const OString rFileName);
voidclose();
-voidreadHeader(PoHeader rHeader);
voidreadEntry(PoEntry rPo);
};
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 4f065fb..34f590c 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -175,21 +175,6 @@ MergeDataFile::MergeDataFile(
printf( Warning : Can't open %s\n, sPoFileName.getStr() );
return;
}
-PoHeader aPoHeader;
-try
-{
-aPoInput.readHeader( aPoHeader );
-}
-catch( PoIfstream::Exception aException )
-{
-if( aException == PoIfstream::INVALIDHEADER )
-{
-printf(
-Warning : %s has invalid header\n,
-sPoFileName.getStr() );
-return;
-}
-}
OString sLang;
//Get language id from path
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index c59a4f8..8d51671 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -735,7 +735,6 @@ void PoOfstream::writeEntry( const PoEntry rPoEntry )
PoIfstream::PoIfstream()
: m_aInPut()
-, m_bIsAfterHeader( false )
, m_bEof( false )
{
}
@@ -752,7 +751,14 @@ void PoIfstream::open( const OString rFileName )
{
assert( !isOpen() );
m_aInPut.open( rFileName.getStr(), std::ios_base::in );
-m_bIsAfterHeader = false;
+
+//Skip header
+std::string sTemp;
+std::getline(m_aInPut,sTemp);
+while( !sTemp.empty() !m_aInPut.eof() )
+{
+std::getline(m_aInPut,sTemp);
+}
m_bEof = false;
}
@@ -762,35 +768,9 @@ void PoIfstream::close()
m_aInPut.close();
}
-void PoIfstream::readHeader( PoHeader rPoHeader )
-{
-assert( isOpen() !eof() !m_bIsAfterHeader );
-GenPoEntry aGenPo;
-aGenPo.readFromFile( m_aInPut );
-if( !aGenPo.getExtractCom().isEmpty()
-aGenPo.getMsgId().isEmpty()
-!aGenPo.getMsgStr().isEmpty() )
-{
-if( rPoHeader.m_pGenPo )
-{
-*(rPoHeader.m_pGenPo) = aGenPo;
-}
-else
-{
-rPoHeader.m_pGenPo = new GenPoEntry( aGenPo );
-}
-rPoHeader.m_bIsInitialized = true;
-m_bIsAfterHeader = true;
-}
-else
-{
-throw INVALIDHEADER;
-}
-}
-
void PoIfstream::readEntry( PoEntry rPoEntry )
{
-assert( isOpen() !eof() m_bIsAfterHeader );
+assert( isOpen() !eof() );
GenPoEntry aGenPo;
aGenPo.readFromFile( m_aInPut );
if( aGenPo.isNull() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx|2 ++
l10ntools/source/export.cxx | 16 +---
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit e1a91a9ceda6020bb256739e83dc371a50af3b1d
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sun Dec 9 17:03:56 2012 +0100
Make src lists modifiable
This work when appending elements to the end of
list or deleting elements from list.
Change-Id: Ic0b920f79c72ebc3bf700640b13d2aca
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index af94c17..ecc9e2e 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -39,6 +39,7 @@
#include vector /* std::vector*/
#include queue
#include string
+#include map
#include unistd.h
#ifdef WNT
@@ -329,6 +330,7 @@ public:
private:
static std::vectorrtl::OString aLanguages;
static std::vectorrtl::OString aForcedLanguages;
+std::mapOString,OString aOrigListItems;
sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False
);// called befor dest. cur ResData
sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 13870da..471ac10 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -988,7 +988,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool
bCreateNew )
rtl::OString sList( pairedlist );
WriteExportList( pResData, pResData-pPairedList, sList, bCreateNew );
if ( bCreateNew )
-pResData-pItemList = 0;
+pResData-pPairedList = 0;
}
if ( pResData-pUIEntries ) {
rtl::OString sList( uientries );
@@ -1531,6 +1531,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString rText,
sal_uInt16 nTyp,
}
PFormEntrys *pEntrys = pMergeDataFile-GetPFormEntrys( pResData );
+const OString sKey = pResData-sId + pResData-sGId + pResData-sResTyp;
pResData-sId = sOldId;
pResData-sGId = sOldGId;
pResData-sResTyp = sOldTyp;
@@ -1548,6 +1549,9 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString rText,
sal_uInt16 nTyp,
return sal_False; // no data found
}
+if (rLangIndex == en-US)
+
aOrigListItems.insert(std::pairOString,OString(sKey,rText.copy(nStart+1,nEnd-nStart-1)));
+
if (Export::isSourceLanguage(rLangIndex))
return sal_False;
@@ -1687,14 +1691,12 @@ void Export::MergeRest( ResData *pResData, sal_uInt16
nMode )
if ( pList )
nMaxIndex =
pList-GetSourceLanguageListEntryCount();
pEntrys = pMergeDataFile-GetPFormEntrys( pResData );
-while( pEntrys ( nLIndex nMaxIndex )) {
+while( nLIndex nMaxIndex ) {
rtl::OString sText;
-sal_Bool bText;
-bText = pEntrys-GetTransex3Text( sText,
STRING_TYP_TEXT, sCur, sal_True );
-if( !bText )
-bText = pEntrys-GetTransex3Text( sText ,
STRING_TYP_TEXT, SOURCE_LANGUAGE , sal_False );
+if( !pEntrys || !pEntrys-GetTransex3Text( sText,
STRING_TYP_TEXT, sCur, sal_True ) )
+sText = aOrigListItems.find(pResData-sId +
pResData-sGId + pResData-sResTyp)-second;
-if ( bText !sText.isEmpty())
+if (!sText.isEmpty())
{
if ( nIdx == 1 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx |5 +++--
l10ntools/source/helpex.cxx|5 +++--
l10ntools/source/lngmerge.cxx |2 +-
l10ntools/source/merge.cxx |5 +++--
l10ntools/source/propmerge.cxx |3 ++-
l10ntools/source/treemerge.cxx |2 +-
6 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 05ac3878bba25f39077b98ad2ac2fee908aea265
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sun Dec 2 05:07:46 2012 +0100
Ignore qtz in ulfex and some other places
Installation not works well with qtz so ignore
it in ulf files.
In those executables which work with one lang at
a time it is unwanted to store the useless qtz strings
at all call.
Change-Id: I1d65ec340da1832404001ad18820407e56615db6
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 28807f6..af94c17 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -460,8 +460,9 @@ class MergeDataFile
const rtl::OString rQHTEXT, const rtl::OString rTITLE,
const rtl::OString sFilename, bool bCaseSensitive);
public:
-explicit MergeDataFile(const rtl::OString rFileName,
-const rtl::OString rFile, bool bCaseSensitive);
+explicit MergeDataFile(
+const rtl::OString rFileName, const rtl::OString rFile,
+bool bCaseSensitive, bool bWithQtz = true );
~MergeDataFile();
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 7ab581a..21a8b9d 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -81,7 +81,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
std::cerr Helpex error: cannot open input file\n;
return 1;
}
-MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, OString(), false);
+MergeDataFile aMergeDataFile(
+aArgs.m_sMergeSrc, OString(), false, false );
std::string sTemp;
aInput sTemp;
while( !aInput.eof() )
@@ -104,7 +105,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
{
HelpParser aParser( aArgs.m_sInputFile );
MergeDataFile aMergeDataFile(
-aArgs.m_sMergeSrc, aArgs.m_sInputFile, false );
+aArgs.m_sMergeSrc, aArgs.m_sInputFile, false, false );
hasNoError =
aParser.Merge(
aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 7294e27..9da45b6 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
-MergeDataFile aMergeDataFile( rSDFFile, sSource, false );
+MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
rtl::OString sTmp( Export::sLanguages );
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(ALL)) )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 98334be..4f065fb 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -151,7 +151,7 @@ sal_Bool MergeData::operator==( ResData *pData )
MergeDataFile::MergeDataFile(
const rtl::OString rFileName, const rtl::OString rFile,
-bool bCaseSensitive)
+bool bCaseSensitive, bool bWithQtz )
{
std::ifstream aInputStream( rFileName.getStr() );
if ( !aInputStream.is_open() )
@@ -261,7 +261,8 @@ MergeDataFile::MergeDataFile(
aActPo.getLocalId(), sHack, sLang, sText,
sQHText, sTitle, aActPo.getSourceFile(), bCaseSensitive );
-if( bFirstLang ( strcmp(getenv(ENABLE_RELEASE_BUILD),TRUE)
) )
+if( bFirstLang bWithQtz
+( strcmp(getenv(ENABLE_RELEASE_BUILD),TRUE) ) )
{
aLanguageSet.insert(qtz);
InsertEntry(
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index a4440e9..79c737e 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -180,7 +180,8 @@ void PropParser::Merge( const OString rMergeSrc, const
OString rDestinationFil
return;
}
-MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
+MergeDataFile aMergeDataFile(
+rMergeSrc, m_sSource, false, m_sLang == qtz );
const std::vectorOString vLanguages = aMergeDataFile.GetLanguages();
if( m_sLang != qtz vLanguages.size()=2
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index bc9596c..8f022de 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -280,7 +280,7 @@ void TreeParser::Merge(
else
{
MergeDataFile aMergeDataFile(
-rMergeSrc, static_castOString( m_pSource-name ), false );
+rMergeSrc, static_castOString( m_pSource-name
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/po.hxx| 24 ++--
l10ntools/inc/propmerge.hxx |5 ++
l10ntools/inc/treemerge.hxx |6 +++
l10ntools/source/po.cxx | 85 +++-
4 files changed, 61 insertions(+), 59 deletions(-)
New commits:
commit d02dc1da4a3cff852b4f29bef2fb8ce88140ef7b
Author: Zolnai Tamás zolnaitamas20...@gmail.com
Date: Sun Nov 25 14:22:24 2012 +0100
Some cosmetics in l10ntools
Add comment to new classes
Delete unneeded getLanguage() method
Make inline GenPoEntry's setter methods
Fix some typo
Change-Id: I8f337b8c57e1eab7696415dc7297c64e2436f35d
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 856c7bb..ace9e09 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -18,6 +18,16 @@ class PoOfstream;
class PoIfstream;
class GenPoEntry;
+
+/** Interface to use po entries in localization
+
+PoEntry based on GenPoEntry class which stores attributes
+of general po entry(see po.cxx). It makes easy to get/set
+all information needed to localize one english(US) string.
+It contains some basic checkings and some string
+transformations between po string and string used by
+localization tools.
+*/
class PoEntry
{
private:
@@ -61,6 +71,12 @@ public:
};
+/** Interface to work with header of po/pot files
+
+This class stores informations which are in header of
+a po file. It's main function to generate header to
+template po files(pot).
+*/
class PoHeader: private boost::noncopyable
{
private:
@@ -73,16 +89,14 @@ public:
friend class PoOfstream;
friend class PoIfstream;
-enum Exception { NOLANG };
-
PoHeader();
PoHeader( const OString rExtSrc );
PoHeader( std::ifstream rOldPo );
~PoHeader();
-
-OString getLanguage() const;
};
+/** Interface to write po entry to files as output streams
+*/
class PoOfstream: private boost::noncopyable
{
private:
@@ -101,6 +115,8 @@ public:
voidwriteEntry(const PoEntry rPo);
};
+/** Interface to read po entry from files as input streams
+*/
class PoIfstream: private boost::noncopyable
{
private:
diff --git a/l10ntools/inc/propmerge.hxx b/l10ntools/inc/propmerge.hxx
index 4f0e327..a44649c 100644
--- a/l10ntools/inc/propmerge.hxx
+++ b/l10ntools/inc/propmerge.hxx
@@ -13,6 +13,11 @@
#include rtl/string.hxx
#include vector
+/** Class for properties localization
+
+Parse *.properties files, extract translatable strings
+and merge translated strings.
+*/
class PropParser
{
private:
diff --git a/l10ntools/inc/treemerge.hxx b/l10ntools/inc/treemerge.hxx
index 3b68112..98f5a02 100644
--- a/l10ntools/inc/treemerge.hxx
+++ b/l10ntools/inc/treemerge.hxx
@@ -14,6 +14,12 @@
#include rtl/string.hxx
#include vector
+/** Class for tree localization
+
+Parse *.tree files, extract translatable strings,
+merge translated strings and update reference and title
+of referred help files.
+*/
class TreeParser
{
private:
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 8ee7dc9..d767db3 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -26,8 +26,11 @@
using namespace U_ICU_NAMESPACE;
-//Class GenPoEntry
+/** Container of po entry
+Provide all file operations related to LibreOffice specific
+po entry and store it's attributes.
+*/
class GenPoEntry
{
private:
@@ -54,12 +57,30 @@ public:
virtual boolisFuzzy() const { return m_bFuzzy; }
virtual boolisNull() const { return m_bNull; }
-virtual voidsetExtractCom(const OString rExtractCom);
-virtual voidsetReference(const OString rReference);
-virtual voidsetMsgCtxt(const OString rMsgCtxt);
-virtual voidsetMsgId(const OString rMsgId);
-virtual voidsetMsgStr(const OString rMsgStr);
-virtual voidsetFuzzy(const bool bFuzzy);
+virtual voidsetExtractCom(const OString rExtractCom)
+{
+m_sExtractCom = rExtractCom;
+}
+virtual voidsetReference(const OString rReference)
+{
+m_sReference = rReference;
+}
+virtual voidsetMsgCtxt(const OString rMsgCtxt)
+{
+m_sMsgCtxt = rMsgCtxt;
+}
+virtual voidsetMsgId(const OString rMsgId)
+{
+m_sMsgId = rMsgId;
+}
+virtual voidsetMsgStr(const OString rMsgStr)
+{
+m_sMsgStr = rMsgStr;
+}
+virtual voidsetFuzzy(const bool bFuzzy)
+{
+m_bFuzzy = bFuzzy;
+
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/tokens.h|2 +-
l10ntools/source/cfglex.l |8
l10ntools/source/srclex.l |6 +++---
l10ntools/source/xrmlex.l |6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 13148009769be7619bdd34b2ce56e6fbfb65c809
Author: Andras Timar ati...@suse.com
Date: Mon Sep 24 12:06:10 2012 +0200
typo: COMMEND-COMMENT
Change-Id: I1bac574d44b1fbbdd2cde41ba1af033e952d811a
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 1d035a7..694bead 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -26,7 +26,7 @@
/*--*/
/*--*/
#define IGNOREDTOKENS 400 /* #include | #pragma | //... | ... */
-#define COMMEND 401 /*... */
+#define COMMENT 401 /*... */
#define DEFINEDRES 402 /* Text = { */
#define ANYTOKEN404 /* XYZ */
#define UNKNOWNTOKEN405 /* XYZ[ \t]$*/
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index 7476cbf..16ddf28 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -89,8 +89,8 @@ int bText=0;
pChar[1] = 0x00;
pChar[0] = c3;
- workOnTokenSet( COMMEND, yytext );
- workOnTokenSet( COMMEND, pChar );
+ workOnTokenSet( COMMENT, yytext );
+ workOnTokenSet( COMMENT, pChar );
for(;;) {
if ( c3 == EOF )
@@ -102,7 +102,7 @@ int bText=0;
c3 = yyinput();
pChar[0] = c3;
- workOnTokenSet( COMMEND, pChar );
+ workOnTokenSet( COMMENT, pChar );
}
}
@@ -114,7 +114,7 @@ int bText=0;
\[^\\!]*\ {
bText = 0;
if ( yytext[ 1 ] == '!' yytext[ 2 ] == '-' yytext[ 3 ] == '-' )
- workOnTokenSet( COMMEND, yytext );
+ workOnTokenSet( COMMENT, yytext );
else
workOnTokenSet( CFG_UNKNOWNTAG, yytext );
}
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index e99eea4..01be0df 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -82,8 +82,8 @@ void YYWarning();
pChar[1] = 0x00;
pChar[0] = c2;
- WorkOnTokenSet( COMMEND, yytext );
- WorkOnTokenSet( COMMEND, pChar );
+ WorkOnTokenSet( COMMENT, yytext );
+ WorkOnTokenSet( COMMENT, pChar );
for(;;) {
if ( c2 == EOF )
break;
@@ -92,7 +92,7 @@ void YYWarning();
c1 = c2;
c2 = yyinput();
pChar[0] = c2;
- WorkOnTokenSet( COMMEND, pChar );
+ WorkOnTokenSet( COMMENT, pChar );
}
}
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 9e9aa5c..eadb19f 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -144,8 +144,8 @@ int bText=0;
pChar[1] = 0x00;
pChar[0] = c3;
- WorkOnTokenSet( COMMEND, yytext );
- WorkOnTokenSet( COMMEND, pChar );
+ WorkOnTokenSet( COMMENT, yytext );
+ WorkOnTokenSet( COMMENT, pChar );
for(;;) {
if ( c3 == EOF )
@@ -156,7 +156,7 @@ int bText=0;
c2 = c3;
c3 = yyinput();
pChar[0] = c3;
- WorkOnTokenSet( COMMEND, pChar );
+ WorkOnTokenSet( COMMENT, pChar );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/gsicheck.hxx| 26 --
l10ntools/source/gsicheck.cxx | 11 +++
l10ntools/source/gsimain.cxx | 19 +++
3 files changed, 30 insertions(+), 26 deletions(-)
New commits:
commit 76e0a9a9d9ca5e5ea9df04baa8326688afd1336d
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Sep 7 07:36:38 2012 +0200
-Werror,-Wunused-function
Change-Id: I6736d1295a662527e2bfd12cfbebc0ef4634b397
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 266ea96..a33796c 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -163,34 +163,8 @@ public:
void LazyOpen();
};
-namespace {
-
sal_Int32 const MAX_GID_LID_LEN = 250;
-rtl::OString copyUpTo(
-rtl::OString const text, sal_Int32 start, sal_Int32 maximumLength)
-{
-assert(start = 0 start = text.getLength());
-return text.copy(start, std::min(text.getLength() - start, maximumLength));
-}
-
-rtl::OString addSuffix(
-rtl::OString const pathname, rtl::OString const suffix)
-{
-sal_Int32 n = pathname.lastIndexOf('.');
-if (n == -1) {
-fprintf(
-stderr,
-(Error: pathname \%s\ does not contain dot to add suffix in
- front of\n),
-pathname.getStr());
-exit(EXIT_FAILURE);
-}
-return pathname.replaceAt(n, 0, suffix);
-}
-
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 3a4c0af..082f9ef 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -42,6 +42,17 @@
#include tagtest.hxx
#include gsicheck.hxx
+namespace {
+
+rtl::OString copyUpTo(
+rtl::OString const text, sal_Int32 start, sal_Int32 maximumLength)
+{
+assert(start = 0 start = text.getLength());
+return text.copy(start, std::min(text.getLength() - start, maximumLength));
+}
+
+}
+
/*/
void PrintMessage( rtl::OString const aType, rtl::OString const aMsg,
rtl::OString const aPrefix,
rtl::OString const aContext, sal_Bool bPrintContext,
std::size_t nLine, rtl::OString aUniqueId )
diff --git a/l10ntools/source/gsimain.cxx b/l10ntools/source/gsimain.cxx
index 4ed9d69..7558731 100644
--- a/l10ntools/source/gsimain.cxx
+++ b/l10ntools/source/gsimain.cxx
@@ -42,6 +42,25 @@
#include tagtest.hxx
#include gsicheck.hxx
+namespace {
+
+rtl::OString addSuffix(
+rtl::OString const pathname, rtl::OString const suffix)
+{
+sal_Int32 n = pathname.lastIndexOf('.');
+if (n == -1) {
+fprintf(
+stderr,
+(Error: pathname \%s\ does not contain dot to add suffix in
+ front of\n),
+pathname.getStr());
+exit(EXIT_FAILURE);
+}
+return pathname.replaceAt(n, 0, suffix);
+}
+
+}
+
void Help()
{
fprintf( stdout, \n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc l10ntools/source unusedcode.easy
l10ntools/inc/xmlparse.hxx|6
l10ntools/source/xmlparse.cxx | 61 --
unusedcode.easy |2 -
3 files changed, 69 deletions(-)
New commits:
commit a84e97e58fe0915376801f98e1c0d24470f1e1d3
Author: Santiago Martinez smvar...@gmail.com
Date: Tue Mar 27 21:16:50 2012 +0200
Remove unused code in l10ntools.
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index cd9bc2b..0731a9f 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -169,13 +169,7 @@ public:
XMLChildNode *pChild , size_t pos /// the new child
);
-int RemoveChild( XMLElement *pRefElement );
void RemoveAndDeleteAllChildren();
-
-/// returns a child element which matches the given one
-XMLElement *GetChildElement(
-XMLElement *pRefElement // the reference elelement
-);
};
//-
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index e646308..5be1f0e 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -159,37 +159,6 @@ void XMLParentNode::AddChild( XMLChildNode *pChild ,
size_t pos )
}
/*/
-int XMLParentNode::RemoveChild( XMLElement *pRefElement )
-/*/
-{
-XMLElement* a;
-if ( pChildList ){
-for ( size_t i = 0; i pChildList-size(); i++ ) {
-XMLChildNode *pChild = (*pChildList)[ i ];
-if ( pChild-GetNodeType() == XML_NODE_TYPE_ELEMENT ){
-a = static_castXMLElement* (pChild);
-rtl::OString elemid(a-GetId().toAsciiLowerCase());
-rtl::OString elemLID(a-GetLanguageId().toAsciiLowerCase());
-rtl::OString pRefLID(
-pRefElement-GetLanguageId().toAsciiLowerCase());
-if (elemid == pRefElement-GetId() elemLID == pRefLID)
-{
-if( pRefElement-ToOString().compareTo( a-ToOString()
)==0 ){
-XMLChildNodeList::iterator it = pChildList-begin();
-::std::advance( it, i );
-pChildList-erase( it );
-delete a; // Test
-return i;
-}
-}
-}
-
-}
-}
-return -1;
-}
-
-/*/
void XMLParentNode::RemoveAndDeleteAllChildren(){
/*/
if ( pChildList ) {
@@ -199,36 +168,6 @@ void XMLParentNode::RemoveAndDeleteAllChildren(){
}
}
-/*/
-XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
-/*/
-{
-for ( size_t i = 0; i pChildList-size(); i++ ) {
-XMLChildNode *pChild = (*pChildList)[ i ];
-if ( pChild-GetNodeType() == XML_NODE_TYPE_ELEMENT )
-if ((( XMLElement * ) pChild )-GetName() ==
-pRefElement-GetName())
-{
-XMLAttributeList *pList = pRefElement-GetAttributeList();
-if ( !pList )
-return ( XMLElement * ) pChild;
-
-sal_Bool bMatch = sal_False;
-for ( size_t j = 0; j pList-size() bMatch; j++ ) {
-XMLAttribute *pAttribute = (*pList)[ j ];
-XMLAttribute *pCandidate =
-(( XMLElement * ) pChild )-GetAttribute(
-pAttribute-GetName() );
-if ( !pCandidate || !pAttribute-IsEqual( *pCandidate ))
-bMatch = sal_False;
-}
-if ( bMatch )
-return ( XMLElement * ) pChild;
-}
-}
-return NULL;
-}
-
//
// class XMLFile
//
diff --git a/unusedcode.easy b/unusedcode.easy
index 54ba512..79a729f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -341,8 +341,6 @@ XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
XMLParentNode::AddChild(XMLChildNode*, unsigned long)
-XMLParentNode::GetChildElement(XMLElement*)
-XMLParentNode::RemoveChild(XMLElement*)
XMLPropertyBackpatcherrtl::OUString::XMLPropertyBackpatcher(char const*)
XMLPropertyBackpatcherrtl::OUString::XMLPropertyBackpatcher(char const*,
char const*, unsigned char, rtl::OUString)
XMLPropertyBackpatcherrtl::OUString::XMLPropertyBackpatcher(rtl::OUString
const, rtl::OUString const, unsigned char, rtl::OUString)
[Libreoffice-commits] .: l10ntools/inc l10ntools/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source
l10ntools/inc/export.hxx |1
l10ntools/source/merge.cxx | 16 -
tools/inc/tools/multisel.hxx |2 -
tools/source/memtools/multisel.cxx | 45 -
unusedcode.easy| 10
vcl/inc/vcl/field.hxx |3 --
vcl/inc/vcl/metaact.hxx|3 --
vcl/inc/vcl/morebtn.hxx|1
vcl/inc/vcl/msgbox.hxx |1
vcl/inc/vcl/settings.hxx |1
vcl/source/app/settings.cxx| 14 ---
vcl/source/control/field.cxx | 20
vcl/source/control/morebtn.cxx | 17 -
vcl/source/gdi/metaact.cxx | 19 ---
vcl/source/window/msgbox.cxx |8 --
15 files changed, 161 deletions(-)
New commits:
commit 8f1270db7d871df1a6155c1e4f51568753a54b04
Author: Alexander Bergmann myadd...@gmx.de
Date: Mon Feb 13 13:17:19 2012 +
unusedcode.easy: Removed unused code
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ff6a960..5e08239 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -463,7 +463,6 @@ class MergeDataFile
const rtl::OString nLang, const rtl::OString rTEXT,
const rtl::OString rQHTEXT, const rtl::OString rTITLE,
const rtl::OString sFilename, bool bCaseSensitive);
-rtl::OString Dump();
public:
explicit MergeDataFile(const rtl::OString rFileName,
const rtl::OString rFile, bool bErrLog, bool bCaseSensitive =
false);
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 65c720a..c56bdaf 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -222,22 +222,6 @@ MergeDataFile::~MergeDataFile()
delete aI-second;
}
-rtl::OString MergeDataFile::Dump()
-{
-rtl::OString sRet(RTL_CONSTASCII_STRINGPARAM(MergeDataFile\n));
-
-printf(MergeDataFile\n);
-MergeDataHashMap::const_iterator idbg;
-for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
-{
-printf(aMap[ %s ] = ,idbg-first.getStr());
-idbg-second-Dump();
-printf(\n);
-}
-printf(\n);
-return sRet;
-}
-
std::vectorrtl::OString MergeDataFile::GetLanguages()
{
return std::vectorrtl::OString(aLanguageSet.begin(),aLanguageSet.end());
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 20f1c63..8410019 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -91,7 +91,6 @@ public:
voidSetTotalRange( const Range rTotRange );
voidInsert( long nIndex, long nCount = 1 );
voidRemove( long nIndex );
-voidAppend( long nCount = 1 );
const RangeGetTotalRange() const { return aTotRange; }
sal_BoolIsCurValid() const { return bCurValid; }
@@ -99,7 +98,6 @@ public:
longFirstSelected( sal_Bool bInverse = sal_False );
longLastSelected();
longNextSelected();
-longPrevSelected();
size_t GetRangeCount() const { return aSels.size(); }
const RangeGetRange( size_t nRange ) const {
diff --git a/tools/source/memtools/multisel.cxx
b/tools/source/memtools/multisel.cxx
index 3853fe4..fd61bcb 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -521,21 +521,6 @@ void MultiSelection::Remove( long nIndex )
// ---
-void MultiSelection::Append( long nCount )
-{
-long nPrevLast = aTotRange.Max();
-aTotRange.Max() += nCount;
-if ( bSelectNew )
-{
-nSelCount += nCount;
-aSels.push_back( new Range( nPrevLast+1, nPrevLast + nCount ) );
-if ( aSels.size() 1 )
-ImplMergeSubSelections( aSels.size() - 2, aSels.size() );
-}
-}
-
-// ---
-
long MultiSelection::ImplFwdUnselected()
{
if ( !bCurValid )
@@ -637,36 +622,6 @@ long MultiSelection::NextSelected()
// ---
-long MultiSelection::PrevSelected()
-{
-if ( !bCurValid )
-return SFX_ENDOFSELECTION;
-
-if ( bInverseCur )
-{
---nCurIndex;
-return ImplBwdUnselected();
-}
-else
-{
-// is the previous index in the current sub selection too?
-if ( nCurIndex aSels[ nCurSubSel ]-Min() )
-return --nCurIndex;
-
-// are there previous sub selections?
-if ( nCurSubSel 0 )
-{
---nCurSubSel;
-return nCurIndex = aSels[ nCurSubSel ]-Max();
-}
-
-// we are at the beginning!
-return SFX_ENDOFSELECTION;
-}
-}
-
-// ---
-
void
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx | 12 +-
l10ntools/inc/lngmerge.hxx|8 -
l10ntools/source/cfgmerge.cxx | 47 ++
l10ntools/source/export.cxx | 75 -
l10ntools/source/export2.cxx | 27 ++
l10ntools/source/lngmerge.cxx | 184 +++---
l10ntools/source/makefile.mk |5 -
l10ntools/source/merge.cxx| 58 +
8 files changed, 198 insertions(+), 218 deletions(-)
New commits:
commit b57f88ce679bba4758db98ab130548db224b6a1f
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 10 21:53:20 2012 +0100
Various more l10ntools clean up
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index e6d0057..ff6a960 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -34,8 +34,6 @@
#include cstddef
#include fstream
-#include comphelper/string.hxx
-
#ifndef L10NTOOLS_DIRECTORY_HXX
#define L10NTOOLS_DIRECTORY_HXX
#include l10ntools/directory.hxx
@@ -56,6 +54,8 @@
#include direct.h
#endif
+#include helper.hxx
+
#define NO_TRANSLATE_ISOx-no-translate
class PFormEntrys;
@@ -196,8 +196,8 @@ public:
pPairedList( NULL ),
sPForm( rPF )
{
-sGId = comphelper::string::remove(sGId, '\r');
-sPForm = comphelper::string::remove(sPForm, '\r');
+helper::searchAndReplaceAll(sGId, \r, rtl::OString());
+helper::searchAndReplaceAll(sPForm, \r, rtl::OString());
}
ResData(const rtl::OString rPF, const rtl::OString rGId , const
rtl::OString rFilename)
@@ -227,8 +227,8 @@ public:
pPairedList( NULL ),
sPForm( rPF )
{
-sGId = comphelper::string::remove(sGId, '\r');
-sPForm = comphelper::string::remove(sPForm, '\r');
+helper::searchAndReplaceAll(sGId, \r, rtl::OString());
+helper::searchAndReplaceAll(sPForm, \r, rtl::OString());
}
};
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 99c852d..9649c34 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -36,11 +36,9 @@
typedef std::vector rtl::OString* LngLineList;
#define LNG_OK 0x
-#define LNG_FILE_NOTFOUND 0x0001
-#define LNG_COULD_NOT_OPEN 0x0002
-#define SDF_OK 0x0003
-#define SDF_FILE_NOTFOUND 0x0004
-#define SDF_COULD_NOT_OPEN 0x0005
+#define LNG_COULD_NOT_OPEN 0x0001
+#define SDF_OK 0x0002
+#define SDF_COULD_NOT_OPEN 0x0003
//
// class LngParser
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 60872d8..1d15fc7 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -34,8 +34,7 @@
#include cstring
#include boost/scoped_ptr.hpp
-
-#include comphelper/string.hxx
+#include rtl/strbuf.hxx
#include common.hxx
#include helper.hxx
@@ -43,8 +42,6 @@
#include cfgmerge.hxx
#include tokens.h
-using comphelper::string::getToken;
-
extern C { int yyerror(char const *); }
namespace {
@@ -277,7 +274,12 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char
*pToken )
case ANYTOKEN:
case CFG_TEXT_START:
{
-sTokenName = getToken(getToken(getToken(sToken, 1, ''), 0, ''),
0, ' ');
+sal_Int32 n = 0;
+rtl::OString t(sToken.getToken(1, '', n));
+n = 0;
+t = t.getToken(0, '', n);
+n = 0;
+sTokenName = t.getToken(0, ' ', n);
if ( !IsTokenClosed( sToken )) {
rtl::OString sSearch;
@@ -305,15 +307,16 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char
*pToken )
if ( sCurrentResTyp != sTokenName ) {
WorkOnRessourceEnd();
rtl::OString sCur;
-for( unsigned int n = 0; n aLanguages.size();
n++ ){
-sCur = aLanguages[ n ];
+for( unsigned int i = 0; i aLanguages.size();
++i ){
+sCur = aLanguages[ i ];
pStackData-sText[ sCur ] = rtl::OString();
}
}
sCurrentResTyp = sTokenName;
rtl::OString sTemp = sToken.copy( sToken.indexOf(
xml:lang= ));
-sCurrentIsoLang = getToken(getToken(sTemp, 1, '\'),
0, '\');
+n = 0;
+sCurrentIsoLang = sTemp.getToken(1, '', n);
if ( sCurrentIsoLang == NO_TRANSLATE_ISO )
bLocalize = sal_False;
@@ -327,7 +330,8 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char
*pToken )
if ( !sSearch.isEmpty())
{
rtl::OString sTemp = sToken.copy( sToken.indexOf( sSearch
));
-sTokenId = getToken(getToken(sTemp, 1, '\'), 0, '\');
+
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx|2
l10ntools/source/export.cxx | 199 +---
2 files changed, 60 insertions(+), 141 deletions(-)
New commits:
commit e747a4e87e6abf581a5b0c381f706b581c2a0fbc
Author: Christina Rossmanith chrrossman...@web.de
Date: Sun Feb 5 15:03:30 2012 +0100
Reduced duplicate code (simian) / l10ntools
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index d8e3c96..ba086b5 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -352,7 +352,7 @@ private:
sal_Bool PrepareTextToMerge(rtl::OString rText, sal_uInt16 nTyp,
rtl::OString rLangIndex, ResData *pResData);
-
+void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const
rtl::OString rTextType );
void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
void ConvertMergeContent( rtl::OString rText );
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 204214f..b41ff8a 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1859,6 +1859,58 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString rText,
sal_uInt16 nTyp,
return sal_True;
}
+void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const
rtl::OString rTextType )
+{
+sal_Bool bAddSemicolon = sal_False;
+sal_Bool bFirst = sal_True;
+rtl::OString sCur;
+
+for( unsigned int n = 0; n aLanguages.size(); n++ ){
+sCur = aLanguages[ n ];
+
+rtl::OString sText;
+sal_Bool bText = pEntry-GetTransex3Text( sText, nType, sCur ,
sal_True );
+if ( bText !sText.isEmpty() sText != - ) {
+rtl::OString sOutput;
+if ( bNextMustBeDefineEOL) {
+if ( bFirst )
+sOutput += \t\\\n;
+else
+sOutput += ;\t\\\n;
+}
+bFirst=sal_False;
+sOutput += \t;
+
+sOutput += rTextType;
+
+if ( ! Export::isSourceLanguage( sCur ) ) {
+sOutput += [ ;
+sOutput += sCur;
+sOutput += ] ;
+}
+sOutput += = ;
+ConvertMergeContent( sText );
+sOutput += sText;
+
+if ( bDefine )
+sOutput += ;\\\n;
+else if ( !bNextMustBeDefineEOL )
+sOutput += ;\n;
+else
+bAddSemicolon = sal_True;
+for ( sal_uInt16 j = 1; j nLevel; j++ )
+sOutput += \t;
+WriteToMerged( sOutput , true );
+}
+}
+
+
+if ( bAddSemicolon ) {
+rtl::OString sOutput( ; );
+WriteToMerged( sOutput , false );
+}
+}
+
/*/
void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
/*/
@@ -1876,150 +1928,17 @@ void Export::MergeRest( ResData *pResData, sal_uInt16
nMode )
case MERGE_MODE_NORMAL : {
PFormEntrys *pEntry = pMergeDataFile-GetPFormEntrys( pResData );
-bool bWriteNoSlash = false;
-if ( pEntry pResData-bText ) {
-
-sal_Bool bAddSemikolon = sal_False;
-sal_Bool bFirst = sal_True;
-rtl::OString sCur;
-for( unsigned int n = 0; n aLanguages.size(); n++ ){
-sCur = aLanguages[ n ];
-
-rtl::OString sText;
-sal_Bool bText = pEntry-GetTransex3Text( sText,
STRING_TYP_TEXT, sCur , sal_True );
-if ( bText !sText.isEmpty() sText != - ) {
-rtl::OString sOutput;
-if ( bNextMustBeDefineEOL) {
-if ( bFirst )
-sOutput += \t\\\n;
-else
-sOutput += ;\t\\\n;
-}
-bFirst=sal_False;
-sOutput += \t;
-sOutput += pResData-sTextTyp;
-if ( ! Export::isSourceLanguage( sCur ) ) {
-sOutput += [ ;
-sOutput += sCur;
-sOutput += ] ;
-}
-sOutput += = ;
-ConvertMergeContent( sText );
-sOutput += sText;
+if ( pEntry ) {
+if ( pResData-bText )
+ResData2Output( pEntry, STRING_TYP_TEXT,
pResData-sTextTyp );
-if ( bDefine bWriteNoSlash )
-sOutput += ;\n;
+if ( pResData-bQuickHelpText )
+ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT,
rtl::OString(QuickHelpText) );
-if ( bDefine
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/export.hxx |8 l10ntools/inc/helpmerge.hxx|5 -- l10ntools/inc/lngmerge.hxx |1 l10ntools/inc/xmlparse.hxx |1 l10ntools/source/cfglex.l |3 - l10ntools/source/export.cxx| 50 - l10ntools/source/export2.cxx | 79 - l10ntools/source/helpex.cxx|4 -- l10ntools/source/helpmerge.cxx | 36 -- l10ntools/source/lngex.cxx |4 -- l10ntools/source/lngmerge.cxx | 18 - l10ntools/source/srclex.l |4 -- l10ntools/source/xrmlex.l |4 -- l10ntools/source/xrmmerge.cxx |3 - 14 files changed, 220 deletions(-) New commits: commit b57f55cf23ef11d446330fbbadd18803b5cbcc98 Author: Andras Timar ati...@suse.com Date: Wed Sep 21 19:27:44 2011 +0200 remove unused (and buggy) language fallback functionality Fallback to en-US is done in translations module. Fallback to other languages is not supported, but if we ever needed it, it would be easier to solve the problem in a script language instead of C++ in translations module. diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 8c42647..5206540 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -181,7 +181,6 @@ public: sal_uInt16 nTitleRefId; ByteString sTextTyp; -ByteStringHashMap aFallbackData; ByteStringHashMap aMergedLanguages; ExportList *pStringList; @@ -193,8 +192,6 @@ public: ByteString sPForm; void Dump(); -void addFallbackData( ByteString sId , const ByteString sText ); -bool getFallbackData( ByteString sId , ByteString sText); void addMergedLanguage(rtl::OString rLang); bool isMerged(rtl::OString rLang); @@ -353,9 +350,6 @@ public: static void getRandomName( const ByteString sPrefix , ByteString sRandStr , const ByteString sPostfix ); static void getCurrentDir( std::string dir ); -static ByteString GetFallbackLanguage( const ByteString nLanguage ); -static void FillInFallbacks( ResData *pResData ); -static void FillInListFallbacks( ExportList *pList, const ByteString nSource, const ByteString nFallback ); static ByteString GetTimeStamp(); static sal_Bool ConvertLineEnds( ByteString sSource, ByteString sDestination ); static ByteString GetNativeFile( ByteString sSource ); @@ -376,8 +370,6 @@ private: ByteString FullId();// creates cur. GID -bool PairedListFallback( ByteString sText , ResData aResData ); - ByteString GetPairedListID ( const ByteString sText ); ByteString GetPairedListString ( const ByteString sText ); ByteString StripList( const ByteString sText ); diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index 2553624..a160b15 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -32,7 +32,6 @@ #include rtl/ustrbuf.hxx #include rtl/strbuf.hxx #include memory /* auto_ptr */ -#include tools/isofallback.hxx #define MOVEFILE_REPLACE_EXISTING 0x01 @@ -44,10 +43,6 @@ private: bool bUTF8; bool bHasInputList; -/// Copy fallback language String (ENUS,DE) into position of the numeric language iso code -/// @PRECOND 0 langIdx_in MAX_IDX -static void FillInFallbacks( LangHashMap rElem_out, ByteString sLangIdx_in ); - #if OSL_DEBUG_LEVEL 2 /// Debugmethod, prints the content of the map to stdout static void Dump(LangHashMap* rElem_in , const ByteString sKey_in); diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index 8aaf98d..e658817 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -53,7 +53,6 @@ private: bool bQuiet; std::vectorByteString aLanguages; -void FillInFallbacks( ByteStringHashMap Text ); bool isNextGroup( ByteString sGroup_out , ByteString sLine_in); void ReadLine( const ByteString sLine_in , ByteStringHashMap rText_inout ); void WriteSDF( SvFileStream aSDFStream , ByteStringHashMap rText_inout , diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index b2603c0..1c5f0d0 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -36,7 +36,6 @@ #include tools/string.hxx #define ENABLE_BYTESTRING_STREAM_OPERATORS #include tools/stream.hxx -#include tools/isofallback.hxx #include export.hxx #include xmlutil.hxx diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l index feb2882..94648a6 100644 --- a/l10ntools/source/cfglex.l +++ b/l10ntools/source/cfglex.l @@ -188,10 +188,7 @@ main( int argc, char* argv[]) fprintf( stdout, -g[:dtd]: enables generation of properties (dtds if :dtd is set) - in this case FileOut is the output path\n ); fprintf( stdout, -d: enables generation of *.don if work is done\n ); fprintf( stdout, -L: Restrict the handled languages.
