[Libreoffice-commits] .: 3 commits - xml2cmp/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Oct 15 10:28:47 PDT 2010
xml2cmp/source/finder/dependy.cxx | 1 -
xml2cmp/source/support/list.hxx | 4 ++--
xml2cmp/source/support/sistr.hxx | 4 ++--
xml2cmp/source/xcd/cr_index.cxx | 2 +-
xml2cmp/source/xcd/main.cxx | 7 +++----
xml2cmp/source/xcd/parse.cxx | 6 +-----
6 files changed, 9 insertions(+), 15 deletions(-)
New commits:
commit 8996fe4c6b1b09dd47fa7626acb7b58ab4266e40
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Thu Oct 14 22:26:49 2010 -0700
Better English messages and comments in ure/xml2cmp
Signed-off-by: Laurent Charrière <lcharriere at gmail.com>
diff --git a/xml2cmp/source/support/sistr.hxx b/xml2cmp/source/support/sistr.hxx
index 7ed5840..deb7d6e 100644
--- a/xml2cmp/source/support/sistr.hxx
+++ b/xml2cmp/source/support/sistr.hxx
@@ -51,8 +51,8 @@ class Simstr
// diverse utility functions
const char * str() const { return sz; }
- char * s(); // ATTENTION !!! // Only to be used, when a function needs a 'char*' but
- // nevertheless THAT WILL BE NOT CHANGED!
+ char * s(); // CAUTION!!! // Only use when a function needs a 'char*' but
+ // still will NOT MODIFY THE STRING!
// Typecasts to 'const char*' are performed automatically.
int l() const; // Length of string without '\0' at end.
Simstr operator+(
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index 377cd9a..3f3a325 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -134,10 +134,10 @@ Do_IndexCommandLine(const CommandLine & i_rCommandLine)
i_rCommandLine.IdlRootPath(),
i_rCommandLine.IndexedTags() );
- std::cout << "Gather xml-files ..." << std::endl;
+ std::cout << "Gathering xml-files ..." << std::endl;
GatherFileNames( aFiles, i_rCommandLine.XmlSrcDirectory() );
- std::cout << "Create output ..." << std::endl;
+ std::cout << "Creating output ..." << std::endl;
aIndex.GatherData(aFiles);
aIndex.WriteOutput( i_rCommandLine.IndexOutputFile() );
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index 20198cf..9a7b4f6 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/xml2cmp/source/xcd/parse.cxx
@@ -216,7 +216,7 @@ X2CParser::Parse_SglAttr( Simstr & o_sAttrValue,
Pass_White();
if (*text == '>')
- SyntaxError("no attribute found, where one was expected");
+ SyntaxError("no attribute found where one was expected");
Simstr sAttrName;
Get_Attribute(o_sAttrValue, sAttrName);
if (sAttrName != i_sAttrName)
commit fbb785b6e8227d7c46b0c26cd5f03f223f7d7858
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Thu Oct 14 22:26:48 2010 -0700
Delete commented out code in ure/xml2cmp
Signed-off-by: Laurent Charrière <lcharriere at gmail.com>
diff --git a/xml2cmp/source/finder/dependy.cxx b/xml2cmp/source/finder/dependy.cxx
index 4daca23..1b34b56 100644
--- a/xml2cmp/source/finder/dependy.cxx
+++ b/xml2cmp/source/finder/dependy.cxx
@@ -104,7 +104,6 @@ DependencyFinder::FindNeededServices( StringVector & o_rLibraries,
aResult_Libraries.erase( aResult_Libraries.begin(), aResult_Libraries.end() );
aResult_Services.erase( aResult_Services.begin(), aResult_Services.end() );
-// const ServiceInfo & rSInfo = (*itService).second->FirstImplementation();
Add2Result( *(*itService).second );
for ( std::set< Simstr >::const_iterator il = aResult_Libraries.begin();
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index 7e13807..377cd9a 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -213,7 +213,6 @@ Create_TypeInfo( const char * o_sOutputFile,
if ( 0 == strcmp(pHeapTop->Key(), pLastHeapTop->Key()) )
continue;
delete pLastHeapTop;
- // pLastHeapTop = 0;
}
pLastHeapTop = pHeapTop;
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index 906b407..20198cf 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/xml2cmp/source/xcd/parse.cxx
@@ -442,10 +442,6 @@ X2CParser::SyntaxError( const char * i_sText )
void
X2CParser::TestCurChar()
{
-// if (*text == '\0')
-// SyntaxError("unexpected end of file");
-// else
-
if (*text == '\n')
nFileLine++;
}
commit 000f11b73bdeaf491399e9ce495f7ea62592725c
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Thu Oct 14 22:26:47 2010 -0700
Translate German comments in ure/xml2cmp
Signed-off-by: Laurent Charrière <lcharriere at gmail.com>
diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
index 7678752..6de123e 100644
--- a/xml2cmp/source/support/list.hxx
+++ b/xml2cmp/source/support/list.hxx
@@ -165,7 +165,7 @@ template <class XX>
void
List<XX>::checkSize(unsigned newLength)
{
- // neuen Platzbedarf pruefen:
+ // test new size requirement:
unsigned newSpace = space();
if (newLength > newSpace)
{
@@ -184,7 +184,7 @@ List<XX>::checkSize(unsigned newLength)
}
}
- // Veraenderung ?:
+ // change?
if (newSpace != space())
alloc(newSpace,true);
}
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index f4f0d28..aef1432 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -241,7 +241,7 @@ Index::WriteHeap( std::ostream & o_rOut,
-/** Übersicht der Struktur
+/** Structure overview
MODULEDESCRIPTION
{
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index c40e09f..7e13807 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -128,7 +128,7 @@ Do_SingleFileCommandLine(const CommandLine & i_rCommandLine)
int
Do_IndexCommandLine(const CommandLine & i_rCommandLine)
{
- // Parsen files:
+ // Parse files:
List<Simstr> aFiles;
Index aIndex( i_rCommandLine.OutputDirectory(),
i_rCommandLine.IdlRootPath(),
More information about the Libreoffice-commits
mailing list