Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2865

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/2865/1

fdo#39468 German comments in vcl/unx/generic/...

Change-Id: I869f5ac346b378ee63832e01ce099f366b7c184f
---
M vcl/unx/generic/app/saldisp.cxx
M vcl/unx/generic/gdi/salgdi.cxx
2 files changed, 19 insertions(+), 20 deletions(-)



diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b303a22..87b4846 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -763,8 +763,7 @@
     nShiftKeySym_   = sal_XModifier2Keysym( pDisp_, pXModMap, ShiftMapIndex );
     nCtrlKeySym_    = sal_XModifier2Keysym( pDisp_, pXModMap, ControlMapIndex );
     nMod1KeySym_    = sal_XModifier2Keysym( pDisp_, pXModMap, Mod1MapIndex );
-    // Auf Sun-Servern und SCO-Severn beruecksichtigt XLookupString
-    // nicht den NumLock Modifier.
+    // on Sun and SCO servers XLookupString does not account for NumLock
     if( GetServerVendor() == vendor_sun )
     {
         XLIB_KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock );
@@ -813,7 +812,7 @@
         nKeySym = XK_0 + (nKeyCode - KEY_0);
     else if( KEY_A <= nKeyCode && nKeyCode <= KEY_Z )
         nKeySym = XK_A + (nKeyCode - KEY_A);
-    else if( KEY_F1 <= nKeyCode && nKeyCode <= KEY_F26 ) // Existiert die Taste
+    else if( KEY_F1 <= nKeyCode && nKeyCode <= KEY_F26 ) // does this key exist?
         nKeySym = XK_F1 + (nKeyCode - KEY_F1);
     else switch( nKeyCode )
     {
@@ -1087,7 +1086,7 @@
         }
         else switch( keysym )
         {
-            // - - - - - Sun X-Server Tastatur ohne Cursorblock ??? - - -
+            // - - - - - Sun X-Server keyboard without Cursorblock ??? - - -
             case XK_R7: // XK_F27:
                 nKey = KEY_HOME;
                 break;
@@ -1115,7 +1114,7 @@
             case XK_R15: // XK_F35:
                 nKey = KEY_PAGEDOWN;
                 break;
-            // - - - - - Sun X-Server Tastatur ??? - - - - - - - - - - - -
+            // - - - - - Sun X-Server keyboard ??? - - - - - - - - - - - -
             case XK_L1: // XK_F11:
                 nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop,
                 // but VCL doesn't have a key defintion for that
@@ -1436,11 +1435,11 @@
             || IsKeypadKey(nKeySym)
             || XK_Delete == nKeySym ) )
     {
-        // Bei einigen X-Servern muss man bei den Keypadtasten
-        // schon sehr genau hinschauen. ZB. Solaris XServer:
-        // 2, 4, 6, 8 werden als Cursorkeys klassifiziert (Up, Down, Left, Right
-        // 1, 3, 5, 9 werden als Functionkeys klassifiziert (F27,F29,F33,F35)
-        // 0 als Keypadkey und der Dezimalpunkt gar nicht (KP_Insert)
+        // For some X-servers special care is needed for Keypad keys.
+        // For example Solaris XServer:
+        // 2, 4, 6, 8 are classified as Cursorkeys (Up, Down, Left, Right)
+        // 1, 3, 5, 9 are classified as Funtionkeys (F27,F29,F33,F35)
+        // 0 as Keypadkey, and the decimal point key not at all (KP_Insert)
         KeySym nNewKeySym = XLookupKeysym( pEvent, nNumLockIndex_ );
         if( nNewKeySym != NoSymbol )
             nKeySym = nNewKeySym;
@@ -1492,7 +1491,7 @@
         case POINTER_WAIT:
             aCur = XCreateFontCursor( pDisp_, XC_watch );
             break;
-        case POINTER_TEXT:          // Mouse Pointer ist ein "I" Beam
+        case POINTER_TEXT:          // Mouse Pointer is a "I" Beam
             aCur = XCreateFontCursor( pDisp_, XC_xterm );
             DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" );
             break;
@@ -1500,7 +1499,7 @@
             aCur = XCreateFontCursor( pDisp_, XC_question_arrow );
             DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" );
             break;
-        case POINTER_CROSS:         // Mouse Pointer ist ein Kreuz
+        case POINTER_CROSS:         // Mouse Pointer is a cross
             aCur = XCreateFontCursor( pDisp_, XC_crosshair );
             DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" );
             break;
@@ -1675,7 +1674,7 @@
         case POINTER_DRAW_CAPTION:
             MAKE_CURSOR( drawcaption_ );
             break;
-        case POINTER_PEN:       // Mouse Pointer ist ein Stift
+        case POINTER_PEN:       // Mouse Pointer is a pencil
             aCur = XCreateFontCursor( pDisp_, XC_pencil );
             DBG_ASSERT( aCur != None, "GetPointer: Could not define cursor" );
             break;
@@ -2404,8 +2403,8 @@
     if( -1 == screen && VisualID(-1) == visualid ) delete visual;
 }
 
-// Konvertiert die Reihenfolge der Bytes eines Pixel in Bytes eines SalColors
-// fuer die 6 XXXA ist das nicht reversibel
+// Converts the order of bytes of a Pixel into bytes of a SalColor
+// This is not reversible for the 6 XXXA
 
 // SalColor is RGB (ABGR) a=0xFF000000, r=0xFF0000, g=0xFF00, b=0xFF
 
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index f4cba0e..36df4b9 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -362,12 +362,12 @@
                                 bool               bClose
                                 )
 {
-    // errechne wie viele Linien XWindow auf einmal zeichnen kann
+    // calculate how many lines XWindow can draw in one go
     sal_uLong nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq))
                       / sizeof(xPoint);
     if( nMaxLines > nPoints ) nMaxLines = nPoints;
 
-    // gebe alle Linien aus, die XWindows zeichnen kann.
+    // print all lines that XWindows can draw
     sal_uLong n;
     for( n = 0; nPoints - n > nMaxLines; n += nMaxLines - 1 )
         XDrawLines( GetXDisplay(),
@@ -391,7 +391,7 @@
     }
 }
 
-// Dithern: Calculate a dither-pixmap and make a brush of it
+// Calculate a dither-pixmap and make a brush of it
 #define P_DELTA         51
 #define DMAP( v, m )    ((v % P_DELTA) > m ? (v / P_DELTA) + 1 : (v / P_DELTA))
 
@@ -766,7 +766,7 @@
                         SelectBrush(),
                         nX, nY, nDX, nDY );
     }
-    // Beschreibung DrawRect verkehrt, deshalb -1
+    // description DrawRect is wrong; thus -1
     if( nPenColor_ != SALCOLOR_NONE )
         XDrawRectangle( GetXDisplay(),
                         GetDrawable(),
@@ -886,7 +886,7 @@
             XClipBox( pXRegA, &aXRect );
 
             GC pGC = SelectBrush();
-            SetClipRegion( pGC, pXRegA ); // ??? doppelt
+            SetClipRegion( pGC, pXRegA ); // ??? twice
             XDestroyRegion( pXRegA );
             bBrushGC_ = sal_False;
 

-- 
To view, visit https://gerrit.libreoffice.org/2865
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I869f5ac346b378ee63832e01ce099f366b7c184f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller <christian.heller63@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.