[Libreoffice-commits] core.git: vcl/win
Christian M. Heller
christian.heller63 at gmail.com
Sat Mar 23 10:12:20 PDT 2013
vcl/win/source/app/saldata.cxx | 2 +-
vcl/win/source/app/salinst.cxx | 15 +++++++--------
vcl/win/source/app/saltimer.cxx | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 275dbf60e9a3ea47656dfef0928e5cc83df4762e
Author: Christian M. Heller <christian.heller63 at gmail.com>
Date: Sat Mar 23 13:09:25 2013 -0400
fdo#39468 Translate German comments - vcl/win/source/app
Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
Reviewed-on: https://gerrit.libreoffice.org/2938
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index ff5a10f..2a3ea09 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -61,7 +61,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
char c2;
do
{
- // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
+ // change to LowerCase if the char is between 'A' and 'Z'
c1 = *pStr1;
c2 = *pStr2;
if ( (c1 >= 65) && (c1 <= 90) )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 9f30139..021ebc7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -212,8 +212,7 @@ void ImplSalYieldMutexAcquireWithWait()
SalData* pSalData = GetSalData();
if ( pSalData->mnAppThreadId == nThreadId )
{
- // Wenn wir den Mutex nicht bekommen, muessen wir solange
- // warten, bis wir Ihn bekommen
+ // wait till we get the Mutex
sal_Bool bAcquire = FALSE;
do
{
@@ -399,13 +398,13 @@ SalData::SalData()
}
mnStockPenCount = 0; // count of static pens
mnStockBrushCount = 0; // count of static brushes
- mnSalObjWantKeyEvt = 0; // KeyEvent, welcher vom SalObj-Hook verarbeitet werden soll
+ mnSalObjWantKeyEvt = 0; // KeyEvent for the SalObj hook
mnCacheDCInUse = 0; // count of CacheDC in use
mbObjClassInit = FALSE; // is SALOBJECTCLASS initialised
mbInPalChange = FALSE; // is in WM_QUERYNEWPALETTE
mnAppThreadId = 0; // Id from Applikation-Thread
mbScrSvrEnabled = FALSE; // ScreenSaver enabled
- mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == nicht vorhanden)
+ mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == not available)
mpSageEnableProc = 0; // funktion to deactivate the system agent
mpFirstIcon = 0; // icon cache, points to first icon, NULL if none
mpTempFontItem = 0;
@@ -940,7 +939,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
void SalTimer::Start( sal_uLong nMS )
{
- // Um auf Main-Thread umzuschalten
+ // to switch to Main-Thread
SalData* pSalData = GetSalData();
if ( pSalData->mpFirstInstance )
{
@@ -957,7 +956,7 @@ void SalTimer::Start( sal_uLong nMS )
SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle )
{
- // Um auf Main-Thread umzuschalten
+ // to switch to Main-Thread
return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd );
}
@@ -965,7 +964,7 @@ SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData,
SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle )
{
- // Um auf Main-Thread umzuschalten
+ // to switch to Main-Thread
HWND hWndParent;
if ( pParent )
hWndParent = static_cast<WinSalFrame*>(pParent)->mhWnd;
@@ -987,7 +986,7 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent,
SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows
sal_Bool /*bShow*/ )
{
- // Um auf Main-Thread umzuschalten
+ // to switch to Main-Thread
return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) );
}
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index c042c2f..dbe4ddc 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -42,11 +42,11 @@ void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex )
if ( !bMutex )
pSalData->mnTimerOrgMS = nMS;
- // Periode darf nicht zu gross sein, da Windows mit sal_uInt16 arbeitet
+ // duration has to fit into Window's sal_uInt16
if ( nMS > MAX_SYSPERIOD )
nMS = MAX_SYSPERIOD;
- // Gibt es einen Timer, dann zerstoren
+ // kill timer if it exists
if ( pSalData->mnTimerId )
KillTimer( 0, pSalData->mnTimerId );
More information about the Libreoffice-commits
mailing list