[Libreoffice-commits] .: automation/source basctl/source basic/inc basic/source UnoControls/source
Michael Meeks
michael at kemper.freedesktop.org
Fri Nov 25 03:18:14 PST 2011
UnoControls/source/base/basecontainercontrol.cxx | 4 ++--
automation/source/simplecm/simplecm.cxx | 14 +++++++-------
automation/source/testtool/cmdstrm.cxx | 4 ++--
basctl/source/basicide/basidesh.cxx | 3 +--
basctl/source/basicide/tbxctl.cxx | 4 ++--
basctl/source/inc/svheader.hxx | 2 +-
basic/inc/basic/testtool.hxx | 2 +-
basic/source/app/textedit.cxx | 4 ++--
basic/source/classes/sbunoobj.cxx | 2 +-
basic/source/comp/symtbl.cxx | 2 +-
basic/source/runtime/props.cxx | 2 +-
11 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit 5c76e221fec40db02d2c6de5204e0d43dc5420fd
Author: mikew <mikew at whiteley.org>
Date: Thu Nov 24 23:56:22 2011 -0800
Some German to English comment translations.
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 469146b..af1d349 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -208,8 +208,8 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
{
- // Zuerst der Welt mitteilen, da� der Container wegfliegt. Dieses ist um einiges
- // schneller wenn die Welt sowohl an den Controls als auch am Container horcht
+ // Tell everything that this container is now gone.
+ // It's faster if you listen to both the control and the container.
// Ready for multithreading
MutexGuard aGuard( m_aMutex );
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index b5087f2..ba9b799 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -376,7 +376,7 @@ ByteString CommunicationManager::GetMyName( CM_NameType )
void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
{
- pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
+ pCL->StartCallback(); // This should already have been called.
pCL->aStart = DateTime();
pCL->aLastAccess = pCL->aStart;
bIsCommunicationRunning = sal_True;
@@ -385,7 +385,7 @@ void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
xLastNewLink = pCL;
INFO_MSG( CByteString("C+:").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
- CByteString("Verbindung aufgebaut: ").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
+ CByteString("Connection established: ").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
CM_OPEN, pCL );
ConnectionOpened( pCL );
pCL->FinishCallback();
@@ -393,11 +393,11 @@ void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
{
- pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
+ pCL->StartCallback(); // This should already have been called.
pCL->aLastAccess = DateTime();
INFO_MSG( CByteString("C-:").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
- CByteString("Verbindung abgebrochen: ").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
+ CByteString("Connection broken: ").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
CM_CLOSE, pCL );
ConnectionClosed( pCL );
@@ -410,9 +410,9 @@ void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
{
- pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
+ pCL->StartCallback(); // Should have already been called
pCL->aLastAccess = DateTime();
- CommunicationLinkRef rHold(pCL); // H�lt den Zeiger bis zum Ende des calls
+ CommunicationLinkRef rHold(pCL); // Keep the pointer for a bit.
// should be impossible but happens for mysterious reasons
if ( !pCL->pServiceData )
@@ -494,7 +494,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
void CommunicationManager::CallInfoMsg( InfoString aMsg )
{
- // Hier wird es wohl kein Housekeeping geben
+ // Probably no housekeeping here.
InfoMsg( aMsg );
}
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 023fc4c..6aba838 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -372,8 +372,8 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
break;
}
- /// #59513# nicht mehr ben�tigt ( siehe oben )
-// rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder zur�cksetzen, so da� auch alles sauber ist.
+ /// #59513# //don't need this anymore (see prior comment?)
+// rPar->Get( 2*n-1 )->SetUserData(nUserData); // Set it back, so everything's clean.
}
}
else
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 566563f..141523c 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -242,8 +242,7 @@ BasicIDEShell::~BasicIDEShell()
BasicIDEGlobals::ShellDestroyed(this);
- // Damit bei einem Basic-Fehler beim Speichern die Shell nicht sofort
- // wieder hoch kommt:
+ // so that on a basic saving error, the shell doesn't pop right up again
BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() = sal_True;
SetWindow( 0 );
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 186c941..c6a68d0 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -52,7 +52,7 @@ SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem )
/*************************************************************************
|*
-|* Klasse fuer Toolbox
+|* Toolbox Class
|*
\************************************************************************/
@@ -67,7 +67,7 @@ TbxControls::TbxControls( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
/*************************************************************************
|*
-|* Wenn man ein PopupWindow erzeugen will
+|* If you want to create a pop-up window
|*
\************************************************************************/
SfxPopupWindowType TbxControls::GetPopupWindowType() const
diff --git a/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx
index 152495d..b1820ec 100644
--- a/basctl/source/inc/svheader.hxx
+++ b/basctl/source/inc/svheader.hxx
@@ -38,7 +38,7 @@
//#define _SELENG_HXX
#define _VIRTDEV_HXX
-// Wenn Brkdlg ohne PCH:
+// For Brkdlg without PCH:
// #define _SPIN_HXX
// #define _FIELD_HXX
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index ab79f54..d6e8f58 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -62,7 +62,7 @@ sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
} \
P_FEHLERLISTE->C40_INSERT(ErrorEntry, pErr, P_FEHLERLISTE->Count());\
}
-// ??? Irgendwann noch was mit der UID anfangen !!
+// ??? Either way, start with the UID
#define ADD_ERROR(nNr, aStr) { \
if ( !SbxBase::IsError() ) \
SbxBase::SetError( nNr ); \
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index a2226bd..2cfed14 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -255,9 +255,9 @@ void TextEditImp::ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff )
for ( i = 0; i < nCount; i++ )
{
SbTextPortion& r = aPortionList[i];
- DBG_ASSERT( r.nLine == nLine1, "doch mehrere Zeilen ?" );
+ DBG_ASSERT( r.nLine == nLine1, "still more lines ?" );
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 fix Bug until MD
continue;
if ( r.nStart > nLastEnd )
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index ae9d857..6cf067c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -115,7 +115,7 @@ typedef WeakImplHelper1< XAllListener > BasicAllListenerHelper;
//#define INVOCATION_ONLY
-// Identifier fuer die dbg_-Properies als Strings anlegen
+// Identifiers for creating the strings for dbg_Properties
static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
static char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
static char const ID_DBG_METHODS[] = "Dbg_Methods";
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 22b31ea..c81a1f3 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -455,7 +455,7 @@ void SbiProcDef::Match( SbiProcDef* pOld )
}
if( !pIn && pOld->pIn )
{
- // Alten Eintrag durch neuen ersetzen
+ // Replace old entry with the new one
SbiSymDef** pData = (SbiSymDef**) pOld->pIn->aData.GetData();
pData[ pOld->nPos ] = this;
nPos = pOld->nPos;
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 5610e20..d2ff28b 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -90,7 +90,7 @@ RTLFUNC(Nothing)
(void)pBasic;
(void)bWrite;
- // liefert eine leere Objekt-Variable.
+ // return an empty object
rPar.Get( 0 )->PutObject( NULL );
}
More information about the Libreoffice-commits
mailing list