[ooo-build-commit] .: basic/inc basic/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Sep 30 01:11:54 PDT 2010
basic/inc/basic/sbxdef.hxx | 6 +++---
basic/source/app/basmsg.hrc | 12 ++++++------
basic/source/app/printer.hxx | 12 ++++++------
basic/source/app/svtmsg.src | 12 ++++++------
basic/source/app/textedit.cxx | 16 ++++++++--------
basic/source/app/ttmsg.src | 13 +++++++------
6 files changed, 36 insertions(+), 35 deletions(-)
New commits:
commit e269c250de3879feb71e04870555c2ff634bf1df
Author: Andreas Mantke <maand at gmx.de>
Date: Wed Sep 29 23:06:26 2010 +0200
date-iso-fix and translation of comments from German to English
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 98c26bc..6cb9a42 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -86,9 +86,9 @@ enum SbxDataType {
SbxUSERDEF = 29, // user defined
SbxLPSTR = 30, // * null terminated string
SbxLPWSTR = 31, // wide null terminated string
- SbxCoreSTRING = 32, // from 1997/4/10 for GetCoreString(), only for converting
- SbxWSTRING = 33, // from 2000/10/4 Reimplemented for backwards compatibility (#78919)
- SbxWCHAR = 34, // from 2000/10/4 Reimplemented for backwards compatibility (#78919)
+ SbxCoreSTRING = 32, // from 1997-4-10 for GetCoreString(), only for converting
+ SbxWSTRING = 33, // from 2000-10-4 Reimplemented for backwards compatibility (#78919)
+ SbxWCHAR = 34, // from 2000-10-4 Reimplemented for backwards compatibility (#78919)
SbxSALINT64 = 35, // for UNO hyper
SbxSALUINT64 = 36, // for UNO unsigned hyper
SbxDECIMAL = 37, // for UNO/automation Decimal
diff --git a/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc
index e3accf1..feea22a 100644
--- a/basic/source/app/basmsg.hrc
+++ b/basic/source/app/basmsg.hrc
@@ -27,17 +27,17 @@
#include "basic/ttglobal.hrc"
-// Hier sind die Messages aus dem Verzeichnis /basic/source/app enhalten
+// Here are included the messages of the folder /basic/source/app
///////////////////////////////
-// Fehlermeldungen, die in das Resultfile gelangen.
+// Error messages which go to the result file.
// *********************
-// *** !!ACHTUNG!! ***
+// *** !!ATTENTION!! ***
// *********************
-// Die Nummern dürfen sich NIE! ändern,
-// da sie in den Resultfiles gespeichert sind, und bei erneutem Anzeigen
-// statdessen die entsprechenden neuen oder garkeine Strings angzeigt werden.
+// The numbers must NEVER(!) change,
+// because they are saved in the result files and a renewed display
+// would display new strings or no strings.
///////////////////////////////
#define S_PROG_START ( BAS_START + 0 )
diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index 5251ebc..b3f5223 100644
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
@@ -36,13 +36,13 @@ class BasicPrinter
boost::shared_ptr<Printer> mpPrinter;
boost::shared_ptr<vcl::OldStylePrintAdaptor> mpListener;
- short nLine; // aktuelle Zeile
- short nPage; // aktuelle Seite
- short nLines; // Zeilen pro Seite
- short nYoff; // Zeilenabstand in Points
- String aFile; // Dateiname
+ short nLine; // current row
+ short nPage; // current page
+ short nLines; // lines per page
+ short nYoff; // line spacing in points
+ String aFile; // file name
- void Header(); // Seitenkopf drucken
+ void Header(); // print page header
void StartPage();
public:
BasicPrinter();
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index 6b98fd2..f280bc8 100644
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -27,17 +27,17 @@
#include "svtmsg.hrc"
-// Hier sind die Messages aus dem Verzeichnis /basic/source/app enhalten
+// Here are included the messages of the folder /basic/source/app
///////////////////////////////
-// Fehlermeldungen, die in das Resultfile gelangen.
+// Error messages which go to the result file.
// *********************
-// *** !!ACHTUNG!! ***
+// *** !!ATTENTION!! ***
// *********************
-// Die Nummern dürfen sich NIE! ändern,
-// da sie in den Resultfiles gespeichert sind, und bei erneutem Anzeigen
-// statdessen die entsprechenden neuen oder garkeine Strings angzeigt werden.
+// The numbers must NEVER(!) change,
+// because they are saved in the result files and a renewed display
+// would display new strings or no strings.
///////////////////////////////
String S_GPF_ABORT
{
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 0d0ec1e..89a0657 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -199,10 +199,10 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
return;
SbTextPortion& rLast = aPortionList[nCount-1];
- if ( rLast.nStart > rLast.nEnd ) // Nur bis Bug von MD behoben
+ if ( rLast.nStart > rLast.nEnd ) // Only up to the bug of MD repaired
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ERROR( "MD-Bug nicht beseitigt!" );
+ DBG_ERROR( "MD-Bug is not repaired!" );
#endif
nCount--;
aPortionList.Remove( nCount);
@@ -278,7 +278,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
{
SbTextPortion& r = aPortionList[i];
// DBG_ASSERT( r.nStart <= r.nEnd, "Highlight: Start > End?" );
- if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoben
+ if ( r.nStart > r.nEnd ) // Only up to the bug of MD repaired
continue;
SbTextType eCol = r.eType;
@@ -338,11 +338,11 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
void TextEditImp::DoSyntaxHighlight( ULONG nPara )
{
- // Due to delayed syntax highlight it can happend that the
- // paragraph does no longer exist
+ // Due to delayed syntax highlight it can happen that the
+ // paragraph does no longer exist
if ( nPara < pTextEngine->GetParagraphCount() )
{
- // leider weis ich nicht, ob genau diese Zeile Modified() ...
+ // unfortunatly I don't know if exact this line Modified() ...
// if ( pProgress )
// pProgress->StepProgress();
pTextEngine->RemoveAttribs( nPara );
@@ -384,7 +384,7 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
aSyntaxLineTable.Remove( nLine );
/* if ( Application::AnyInput() )
{
- aSyntaxIdleTimer.Start(); // Starten, falls wir in einem Dialog landen
+ aSyntaxIdleTimer.Start(); // Launch if we are landing in a dialog
pTextView->ShowCursor( TRUE, TRUE );
pTextEngine->SetUpdateMode( TRUE );
bHighlightning = FALSE;
@@ -419,7 +419,7 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
aImplSyntaxIdleTimer.Start();
// while ( Application::AnyInput() )
-// Application::Reschedule(); // Reschedule, da der UserEvent keine Paints etc. durchlässt
+// Application::Reschedule(); // Reschedule, because the UserEvent let pass no paints etc.
return 0;
}
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index 6ea5f0a..dd75f7b 100644
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -27,18 +27,19 @@
#include "ttmsg.hrc"
-// Hier sind die Messages aus dem Verzeichnis /basic/source/testtool enhalten
+// Here are included the messages of the folder /basic/source/testtool
///////////////////////////////
-// Fehlermeldungen, die in das Resultfile gelangen.
+// Error messages which go to the result file.
// *********************
-// *** !!ACHTUNG!! ***
+// *** !!ATTENTION!! ***
// *********************
-// Die Nummern dürfen sich NIE! ändern,
-// da sie in den Resultfiles gespeichert sind, und bei erneutem Anzeigen
-// statdessen die entsprechenden neuen oder garkeine Strings angzeigt werden.
+// The numbers must NEVER(!) change,
+// because they are saved in the result files and a renewed display
+// would display new strings or no strings.
///////////////////////////////
+
String S_NAME_NOT_THERE
{
Text[ en-US ] = "Name doesn't exist: #($Arg1)";
More information about the ooo-build-commit
mailing list