Attachment 62888 Details for Bug 39468 – Translated German Strings in xmloff (complete), vcl (partial)

[patch] Translated German Strings in xmloff (complete), vcl (partial)

0001-Translated-German-Strings-in-xmloff-complete-vcl-par.patch (text/plain), 39.41 KB, created by madmuffin on 2012-06-11 07:16:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: madmuffin

Created: 2012-06-11 07:16:24 UTC

Size: 39.41 KB

patch

obsolete

>From 2f2d39477759e22f6c8655fc43d9322449fb8fa2 Mon Sep 17 00:00:00 2001
>From: Patrick Brueckner <kontakt+libreoffice@patrick-brueckner.de>
>Date: Mon, 11 Jun 2012 16:11:19 +0200
>Subject: [PATCH] Translated German Strings in xmloff (complete), vcl (partial)
>
>---
> vcl/inc/helpwin.hxx             |    4 +-
> vcl/inc/ilstbox.hxx             |   61 ++++++++++++++++++++-------------------
> vcl/inc/outfont.hxx             |   46 ++++++++++++++--------------
> vcl/inc/salwtype.hxx            |   18 +++++------
> vcl/inc/svdata.hxx              |    8 ++--
> vcl/inc/vcl/accel.hxx           |    2 +-
> vcl/inc/vcl/gdimtf.hxx          |    8 ++--
> vcl/inc/vcl/menu.hxx            |    8 ++--
> vcl/inc/vcl/salbtype.hxx        |   13 ++++----
> vcl/inc/vcl/seleng.hxx          |   17 +++++------
> vcl/inc/vcl/svapp.hxx           |    4 +-
> vcl/inc/vcl/window.hxx          |    6 ++--
> vcl/inc/win/saldata.hxx         |    6 ++--
> vcl/source/app/dbggui.cxx       |    4 +-
> vcl/source/app/help.cxx         |   12 +++----
> vcl/source/window/brdwin.cxx    |   32 +++++++++-----------
> xmloff/source/draw/sdxmlexp.cxx |    2 +-
> 17 files changed, 122 insertions(+), 129 deletions(-)
>
>diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
>index 0c1368b..d00a0c5 100644
>--- a/vcl/inc/helpwin.hxx
>+++ b/vcl/inc/helpwin.hxx
>@@ -40,9 +40,9 @@ class HelpTextWindow : public FloatingWindow
> {
> private:
>     Point               maPos;
>-    Rectangle           maHelpArea; // Wenn naechste Hilfe fuers gleiche Rectangle, gleicher Text, dann Fenster stehen lassen
>+    Rectangle           maHelpArea; // If next help entry has same rectangle, same text, keep window
> 
>-    Rectangle           maTextRect; // Bei umgebrochenen Text in QuickHelp
>+    Rectangle           maTextRect; // If text has linebreak to QuickHelp
> 
>     String              maHelpText;
>     String              maStatusText;
>diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
>index e8074eb..1efe350 100644
>--- a/vcl/inc/ilstbox.hxx
>+++ b/vcl/inc/ilstbox.hxx
>@@ -205,48 +205,49 @@ public:
> class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList
> {
> private:
>-    ImplEntryList*  mpEntryList;     // EntryListe
>+    ImplEntryList*  mpEntryList;     // EntryList
>     Rectangle       maFocusRect;
> 
>     Size            maUserItemSize;
> 
>-    long            mnMaxTxtHeight;  // Maximale Hoehe eines Text-Items
>-    long            mnMaxTxtWidth;   // Maximale Breite eines Text-Items
>-                                     // Entry ohne Image
>-    long            mnMaxImgTxtWidth;// Maximale Breite eines Text-Items
>-                                     // Entry UND Image
>-    long            mnMaxImgWidth;   // Maximale Breite eines Image-Items
>-    long            mnMaxImgHeight;  // Maximale Hoehe eines Image-Items
>-    long            mnMaxWidth;      // Maximale Breite eines Eintrags
>-    long            mnMaxHeight;     // Maximale Hoehe eines Eintrags
>+    long            mnMaxTxtHeight;  // max height of text item
>+    long            mnMaxTxtWidth;   // max width of text item
>+                                     // entry w/o image
> 
>-    sal_uInt16          mnCurrentPos;    // Position (Focus)
>-    sal_uInt16          mnTrackingSaveSelection; // Selektion vor Tracking();
>+    long            mnMaxImgTxtWidth;// max width of text/image item
>+                                     // entry w/ image
>+    long            mnMaxImgWidth;   // max width of image-item
>+    long            mnMaxImgHeight;  // max height of image-item
>+    long            mnMaxWidth;      // max width of entry
>+    long            mnMaxHeight;     // max height of entry
> 
>-    sal_uInt16          mnSeparatorPos; // Separator
>+    sal_uInt16          mnCurrentPos;    // position (focus)
>+    sal_uInt16          mnTrackingSaveSelection; // selection before Tracking();
>+
>+    sal_uInt16          mnSeparatorPos; // separator
> 
>     sal_uInt16          mnUserDrawEntry;
> 
>-    sal_uInt16          mnTop;           // Ausgabe ab Zeile
>-    long            mnLeft;          // Ausgabe ab Spalte
>-    long            mnBorder;        // Abstand Rahmen - Text
>-    long            mnTextHeight;    // Texthoehe
>+    sal_uInt16          mnTop;           // output from line
>+    long            mnLeft;          // output from column
>+    long            mnBorder;        // distance frame - text
>+    long            mnTextHeight;    // text height
>     ProminentEntry  meProminentType; // where is the "prominent" entry
> 
>-    sal_uInt16          mnSelectModifier;   // Modifiers
>+    sal_uInt16          mnSelectModifier;   // modifiers
> 
>     sal_Bool            mbHasFocusRect:         1,
>-                    mbSort:                 1,  // ListBox sortiert
>+                    mbSort:                 1,  // ListBox sorted
>                     mbTrack:                1,  // Tracking
>                     mbMulti:                1,  // MultiListBox
>                     mbStackMode:            1,  // StackSelection
>-                    mbSimpleMode:           1,  // SimpleMode fuer MultiListBox
>-                    mbImgsDiffSz:           1,  // Images haben verschiedene Groessen
>+                    mbSimpleMode:           1,  // SimpleMode for MultiListBox
>+                    mbImgsDiffSz:           1,  // Images have differing sizes
>                     mbTravelSelect:         1,  // TravelSelect
>-                    mbTrackingSelect:       1,  // Selektiert bei MouseMove
>-                    mbSelectionChanged:     1,  // Select() nicht zu oft rufen...
>-                    mbMouseMoveSelect:      1,  // Selektieren bei MouseMove
>-                    mbGrabFocus:            1,  // Focus bei MBDown grabben
>+                    mbTrackingSelect:       1,  // selecting at MouseMove
>+                    mbSelectionChanged:     1,  // preventing Select() from being called too often
>+                    mbMouseMoveSelect:      1,  // selecting at MouseMove
>+                    mbGrabFocus:            1,  // grab focus at MBDown
>                     mbUserDrawEnabled:      1,  // UserDraw possible
>                     mbInUserDraw:           1,  // In UserDraw
>                     mbReadOnly:             1,  // ReadOnly
>@@ -406,10 +407,10 @@ private:
>     ScrollBar*          mpHScrollBar;
>     ScrollBar*          mpVScrollBar;
>     ScrollBarBox*       mpScrollBarBox;
>-    sal_Bool                mbVScroll       : 1,    // VScroll an oder aus
>-                        mbHScroll       : 1,    // HScroll an oder aus
>-                        mbAutoHScroll   : 1;    // AutoHScroll an oder aus
>-    Link                maScrollHdl;    // Weil der vom ImplListBoxWindow selbst benoetigt wird.
>+    sal_Bool                mbVScroll       : 1,    // VScroll on or off
>+                        mbHScroll       : 1,    // HScroll on or off
>+                        mbAutoHScroll   : 1;    // AutoHScroll on or off
>+    Link                maScrollHdl;    // Since it is needed by ImplListBoxWindow itself.
>     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
> 
> protected:
>@@ -568,7 +569,7 @@ class ImplWin : public Control
> {
> private:
> 
>-    sal_uInt16          mnItemPos;  // wegen UserDraw muss ich wissen, welches Item ich darstelle.
>+    sal_uInt16          mnItemPos;  // for UserDraw I need to know which item i am representing
>     XubString       maString;
>     Image           maImage;
> 
>diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
>index 19c2c3a..daa8c01 100644
>--- a/vcl/inc/outfont.hxx
>+++ b/vcl/inc/outfont.hxx
>@@ -295,29 +295,29 @@ public: // TODO: hide members behind accessor methods
>     // font metrics that are usually derived from the measurements
>     long                mnUnderlineSize;            // Lineheight of Underline
>     long                mnUnderlineOffset;          // Offset from Underline to Baseline
>-    long                mnBUnderlineSize;           // Hoehe von fetter Unterstreichung
>-    long                mnBUnderlineOffset;         // Offset von fetter Unterstreichung zur Baseline
>-    long                mnDUnderlineSize;           // Hoehe von doppelter Unterstreichung
>-    long                mnDUnderlineOffset1;        // Offset von doppelter Unterstreichung zur Baseline
>-    long                mnDUnderlineOffset2;        // Offset von doppelter Unterstreichung zur Baseline
>-    long                mnWUnderlineSize;           // Hoehe von WaveLine-Unterstreichung
>-    long                mnWUnderlineOffset;         // Offset von WaveLine-Unterstreichung zur Baseline, jedoch zentriert zur WaveLine
>-    long                mnAboveUnderlineSize;       // Hoehe von einfacher Unterstreichung (for Vertical Right)
>-    long                mnAboveUnderlineOffset;     // Offset von einfacher Unterstreichung zur Baseline (for Vertical Right)
>-    long                mnAboveBUnderlineSize;      // Hoehe von fetter Unterstreichung (for Vertical Right)
>-    long                mnAboveBUnderlineOffset;    // Offset von fetter Unterstreichung zur Baseline (for Vertical Right)
>-    long                mnAboveDUnderlineSize;      // Hoehe von doppelter Unterstreichung (for Vertical Right)
>-    long                mnAboveDUnderlineOffset1;   // Offset von doppelter Unterstreichung zur Baseline (for Vertical Right)
>-    long                mnAboveDUnderlineOffset2;   // Offset von doppelter Unterstreichung zur Baseline (for Vertical Right)
>-    long                mnAboveWUnderlineSize;      // Hoehe von WaveLine-Unterstreichung (for Vertical Right)
>-    long                mnAboveWUnderlineOffset;    // Offset von WaveLine-Unterstreichung zur Baseline, jedoch zentriert zur WaveLine (for Vertical Right)
>-    long                mnStrikeoutSize;            // Hoehe von einfacher Durchstreichung
>-    long                mnStrikeoutOffset;          // Offset von einfacher Durchstreichung zur Baseline
>-    long                mnBStrikeoutSize;           // Hoehe von fetter Durchstreichung
>-    long                mnBStrikeoutOffset;         // Offset von fetter Durchstreichung zur Baseline
>-    long                mnDStrikeoutSize;           // Hoehe von doppelter Durchstreichung
>-    long                mnDStrikeoutOffset1;        // Offset von doppelter Durchstreichung zur Baseline
>-    long                mnDStrikeoutOffset2;        // Offset von doppelter Durchstreichung zur Baseline
>+    long                mnBUnderlineSize;           // height of bold underlining
>+    long                mnBUnderlineOffset;         // Offset from bold underlining to Baseline
>+    long                mnDUnderlineSize;           // height of double underlining
>+    long                mnDUnderlineOffset1;        // Offset from double underlining to Baseline
>+    long                mnDUnderlineOffset2;        // Offset from double underlining to Baseline
>+    long                mnWUnderlineSize;           // height of WaveLine-underlining
>+    long                mnWUnderlineOffset;         // Offset from WaveLine-underlining to Baseline, though centered to WaveLine
>+    long                mnAboveUnderlineSize;       // height of single underlining (for Vertical Right)
>+    long                mnAboveUnderlineOffset;     // Offset from single underlining to Baseline (for Vertical Right)
>+    long                mnAboveBUnderlineSize;      // height of bold underlining (for Vertical Right)
>+    long                mnAboveBUnderlineOffset;    // Offset from bold underlining to Baseline (for Vertical Right)
>+    long                mnAboveDUnderlineSize;      // height of double underlining (for Vertical Right)
>+    long                mnAboveDUnderlineOffset1;   // Offset from double underlining to Baseline (for Vertical Right)
>+    long                mnAboveDUnderlineOffset2;   // Offset from double underlining to Baseline (for Vertical Right)
>+    long                mnAboveWUnderlineSize;      // height of WaveLine-underlining (for Vertical Right)
>+    long                mnAboveWUnderlineOffset;    // Offset from WaveLine-underlining to Baseline, though centered to WaveLine (for Vertical Right)
>+    long                mnStrikeoutSize;            // height of single linetrough
>+    long                mnStrikeoutOffset;          // Offset from single linetrough to Baseline
>+    long                mnBStrikeoutSize;           // height of bold linetrough
>+    long                mnBStrikeoutOffset;         // Offset from bold linetrough to Baseline
>+    long                mnDStrikeoutSize;           // height of double linetrough
>+    long                mnDStrikeoutOffset1;        // Offset from double linetrough to Baseline
>+    long                mnDStrikeoutOffset2;        // Offset from double linetrough to Baseline
> };
> 
> // -----------------
>diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
>index 549d521..79bd285 100644
>--- a/vcl/inc/salwtype.hxx
>+++ b/vcl/inc/salwtype.hxx
>@@ -44,8 +44,7 @@ class FontSelectPattern;
> // - SalExtInput -
> // ---------------
> 
>-// Muessen mit den Defines in cmdevt.hxx uebereinstimmen, da diese
>-// nicht konvertiert werden
>+// Must match defines in cmdevt.hxx, because they will not be converted
> #define SAL_EXTTEXTINPUT_ATTR_GRAYWAVELINE          ((sal_uInt16)0x0100)
> #define SAL_EXTTEXTINPUT_ATTR_UNDERLINE             ((sal_uInt16)0x0200)
> #define SAL_EXTTEXTINPUT_ATTR_BOLDUNDERLINE         ((sal_uInt16)0x0400)
>@@ -176,9 +175,9 @@ struct SalWheelMouseEvent
>     sal_uLong           mnTime;         // Time in ms, when event is created
>     long            mnX;            // X-Position (Pixel, TopLeft-Output)
>     long            mnY;            // Y-Position (Pixel, TopLeft-Output)
>-    long            mnDelta;        // Anzahl Drehungen
>-    long            mnNotchDelta;   // Anzahl feste Drehungen
>-    sal_uLong           mnScrollLines;  // Aktuelle Anzahl zu scrollende Zeilen
>+    long            mnDelta;        // Amount wheel turns
>+    long            mnNotchDelta;   // Amount fixed turns
>+    sal_uLong           mnScrollLines;  // current lines to scroll
>     sal_uInt16          mnCode;         // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT)
>     sal_Bool            mbHorz;         // Horizontal
>     sal_Bool            mbDeltaIsPixel; // delta value is a pixel value (on mac)
>@@ -204,9 +203,9 @@ struct SalExtTextInputEvent
>     UniString       maText;         // Text
>     const sal_uInt16*   mpTextAttr;     // Text-Attribute
>     sal_uLong           mnCursorPos;    // Cursor-Position
>-    sal_uLong           mnDeltaStart;   // Start-Position der letzten Aenderung
>+    sal_uLong           mnDeltaStart;   // Start-Position of last change
>     sal_uInt8            mnCursorFlags;  // SAL_EXTTEXTINPUT_CURSOR_xxx
>-    sal_Bool            mbOnlyCursor;   // sal_True: Nur Cursor-Position wurde geaendert
>+    sal_Bool            mbOnlyCursor;   // sal_True: Only Cursor-Position was modified
> };
> 
> #endif // __cplusplus
>@@ -227,7 +226,7 @@ struct SalExtTextInputPosEvent
> // INPUTCONTEXTCHANGE
> struct SalInputContextChangeEvent
> {
>-    LanguageType    meLanguage;     // Neue Sprache
>+    LanguageType    meLanguage;     // new language
> };
> 
> #endif // __cplusplus
>@@ -319,8 +318,7 @@ struct SalFrameState
> // - SalInputContext -
> // -------------------
> 
>-// Muessen mit den Defines in inputctx.hxx uebereinstimmen, da diese
>-// nicht konvertiert werden
>+// Must match defines in inputctx.hxx, because they will not be converted
> #define SAL_INPUTCONTEXT_TEXT               ((sal_uLong)0x00000001)
> #define SAL_INPUTCONTEXT_EXTTEXTINPUT       ((sal_uLong)0x00000002)
> #define SAL_INPUTCONTEXT_EXTTEXTINPUT_ON    ((sal_uLong)0x00000004)
>diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
>index 0da401f..1adf787 100644
>--- a/vcl/inc/svdata.hxx
>+++ b/vcl/inc/svdata.hxx
>@@ -161,7 +161,7 @@ struct ImplSVAppData
>     sal_uInt16                  mnModalMode;                    // ModalMode Count
>     sal_uInt16                  mnModalDialog;                  // ModalDialog Count
>     sal_uInt16                  mnAccessCount;                  // AccessHdl Count
>-    sal_uInt16                  mnSysWinMode;                   // Modus, wann SystemWindows erzeugt werden sollen
>+    sal_uInt16                  mnSysWinMode;                   // Mode, when SystemWindows should be created
>     sal_uInt16                  mnLayout;                       // --- RTL-Flags --- currently not used, only for testing
>     short                   mnDialogScaleX;                 // Scale X-Positions and sizes in Dialogs
>     sal_Bool                    mbInAppMain;                    // is Application::Main() on stack
>@@ -209,7 +209,7 @@ struct ImplSVGDIData
>     long                    mnRealAppFontX;     // AppFont X-Numenator for 40/tel Width
>     long                    mnAppFontX;         // AppFont X-Numenator for 40/tel Width + DialogScaleX
>     long                    mnAppFontY;         // AppFont Y-Numenator for 80/tel Height
>-    sal_Bool                    mbFontSubChanged;   // sal_True: FontSubstitution wurde zwischen Begin/End geaendert
>+    sal_Bool                    mbFontSubChanged;   // sal_True: FontSubstitution was changed between Begin/End
>     utl::DefaultFontConfiguration* mpDefaultFontConfiguration;
>     utl::FontSubstConfiguration* mpFontSubstConfiguration;
>     bool                    mbNativeFontConfig; // true: do not override UI font
>@@ -232,7 +232,7 @@ struct ImplSVWinData
>     Window*                 mpLastDeacWin;      // Window, that need a deactivate (FloatingWindow-Handling)
>     DbgWindow*              mpDbgWin;           // debug window
>     FloatingWindow*         mpFirstFloat;       // First FloatingWindow in PopupMode
>-    Dialog*                 mpLastExecuteDlg;   // Erster Dialog, der sich in Execute befindet
>+    Dialog*                 mpLastExecuteDlg;   // First Dialog in Execute
>     Window*                 mpExtTextInputWin;  // Window, which is in ExtTextInput
>     Window*                 mpTrackWin;         // window, that is in tracking mode
>     AutoTimer*              mpTrackTimer;       // tracking timer
>@@ -240,7 +240,7 @@ struct ImplSVWinData
>     Window*                 mpAutoScrollWin;    // window, that is in AutoScrollMode mode
>     sal_uInt16                  mnTrackFlags;       // tracking flags
>     sal_uInt16                  mnAutoScrollFlags;  // auto scroll flags
>-    sal_Bool                    mbNoDeactivate;     // sal_True: keine Deactivate durchfuehren
>+    sal_Bool                    mbNoDeactivate;     // sal_True: do not Deactivate
>     sal_Bool                    mbNoSaveFocus;      // sal_True: menus must not save/restore focus
>     sal_Bool                    mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant
> };
>diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx
>index ee4f949..8323e40 100644
>--- a/vcl/inc/vcl/accel.hxx
>+++ b/vcl/inc/vcl/accel.hxx
>@@ -54,7 +54,7 @@ private:
>     Link            maDeactivateHdl;
>     Link            maSelectHdl;
> 
>-    // Werden vom AcceleratorManager gesetzt
>+    // Set by AcceleratorManager
>     KeyCode         maCurKeyCode;
>     sal_uInt16          mnCurId;
>     sal_uInt16          mnCurRepeat;
>diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
>index 95d8069..cb18930 100644
>--- a/vcl/inc/vcl/gdimtf.hxx
>+++ b/vcl/inc/vcl/gdimtf.hxx
>@@ -231,13 +231,13 @@ public:
>     sal_uLong       GetChecksum() const;
>     sal_uLong       GetSizeBytes() const;
> 
>-    // Methoden zum Lesen und Schreiben des neuen Formats;
>-    // die Read-Methode kann auch das alte Format lesen
>+    // Methods to read/write the new format,
>+    // Read-Method can also read old format
>     SvStream&       Read( SvStream& rIStm );
>     SvStream&       Write( SvStream& rOStm, GDIMetaFileWriteFlags = GDIMETAFILE_WRITE_DEFAULT );
> 
>-    // Stream-Operatoren schreiben das alte Format (noch)
>-    // und lesen sowohl das alte wie auch das neue Format
>+    // Stream-Operators still write the old format,
>+    // and read the old alike the new format
>     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile );
>     friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile );
> 
>diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
>index 6ed2c85..2083a04 100644
>--- a/vcl/inc/vcl/menu.hxx
>+++ b/vcl/inc/vcl/menu.hxx
>@@ -133,7 +133,7 @@ class VCL_DLLPUBLIC Menu : public Resource
>     friend struct ImplMenuDelData;
> private:
>     ImplMenuDelData*    mpFirstDel;
>-    MenuItemList*       pItemList;          // Liste mit den MenuItems
>+    MenuItemList*       pItemList;          // List of MenuItems
>     MenuLogo*           pLogo;
>     Menu*               pStartedFrom;
>     Window*             pWindow;
>@@ -158,10 +158,10 @@ private:
>     sal_uInt16              nImgOrChkPos;
>     sal_uInt16              nTextPos;
> 
>-    sal_Bool                bIsMenuBar  : 1,        // Handelt es sich um den MenuBar
>-                        bCanceled   : 1,        // Waehrend eines Callbacks abgebrochen
>+    sal_Bool                bIsMenuBar  : 1,        // Is a MenuBar
>+                        bCanceled   : 1,        // Canceled during Callback
>                         bInCallback : 1,        // In Activate/Deactivate
>-                        bKilled     : 1;        // Gekillt...
>+                        bKilled     : 1;        // Killed...
> 
>     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
>     mutable vcl::MenuLayoutData* mpLayoutData;
>diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
>index e4bd2cb..24b008a 100644
>--- a/vcl/inc/vcl/salbtype.hxx
>+++ b/vcl/inc/vcl/salbtype.hxx
>@@ -112,11 +112,10 @@ class VCL_DLLPUBLIC BitmapColor
> {
> private:
> 
>-// !!! Achtung:
>-// !!! da auf die Member dieser Klasse via memcpy
>-// !!! zugegriffen wird, darf diese Klasse weder
>-// !!! in der Groesse noch der Reihenfolge der
>-// !!! Member veraendert werden (KA 02.09.97)
>+// !!! Attention:
>+// !!! this class members are being accessed via memcpy.
>+// !!! this class size and order must not be modified! (KA 02.09.97)
>+
>     sal_uInt8               mcBlueOrIndex;
>     sal_uInt8               mcGreen;
>     sal_uInt8               mcRed;
>@@ -740,13 +739,13 @@ inline long ColorMask::ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_u
>     long    nRet;
>     sal_uLong   nLen = 0UL;
> 
>-    // bei welchen Bits faengt die Maske an
>+    // at which bits does the mask beginn
>     for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (sal_uLong) nShift ) ); nShift-- )
>     {}
> 
>     nRet = nShift;
> 
>-    // XXX Anzahl der gesetzten Bits ermitteln => nach rechts bis Null laufen
>+    // XXX determine amount of set bits => go right until Null is reached
>     while( ( nShift >= 0L ) && ( nMask & ( 1 << (sal_uLong) nShift ) ) )
>     {
>         nShift--;
>diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx
>index a5850db..adce37a 100644
>--- a/vcl/inc/vcl/seleng.hxx
>+++ b/vcl/inc/vcl/seleng.hxx
>@@ -58,14 +58,14 @@ public:
>     virtual void    CreateAnchor() = 0;  // Anker-Pos := Cursor-Pos
>     virtual void    DestroyAnchor() = 0;
> 
>-    // Cursor neu setzen, dabei die beim Anker beginnende
>-    // Selektion der neuen Cursor-Position anpassen. sal_True == Ok
>+    // Re-Set cursor while adjusting selection starting at anchor
>+    // sal_True == Ok
>     virtual sal_Bool    SetCursorAtPoint( const Point& rPointPixel,
>                                       sal_Bool bDontSelectAtCursor = sal_False ) = 0;
> 
>     virtual sal_Bool    IsSelectionAtPoint( const Point& rPointPixel ) = 0;
>     virtual void    DeselectAtPoint( const Point& rPointPixel ) = 0;
>-    // Anker loeschen & alles deselektieren
>+    // Delete anchor and deselect all
>     virtual void    DeselectAll() = 0;
> };
> 
>@@ -88,11 +88,11 @@ private:
>     FunctionSet*        pFunctionSet;
>     Window*             pWin;
>     Rectangle           aArea;
>-    Timer               aWTimer; // erzeugt kuenstliche Mouse-Moves
>+    Timer               aWTimer; // creates fake mouse-moves
>     MouseEvent          aLastMove;
>     SelectionMode       eSelMode;
>     sal_uLong               nUpdateInterval;
>-    // Stufigkeit fuer Mausbewegungen waehrend einer Selektion
>+    // sensitivity of mouse moves during selection
>     sal_uInt16              nMouseSensitivity;
>     sal_uInt16              nLockedMods;
>     sal_uInt16              nFlags;
>@@ -107,16 +107,15 @@ public:
>                                          sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL );
>                         ~SelectionEngine();
> 
>-    // sal_True: Event wurde von Selection-Engine verarbeitet.
>+    // sal_True: Event was processed by Selection-Engine
>     sal_Bool                SelMouseButtonDown( const MouseEvent& rMEvt );
>     sal_Bool                SelMouseButtonUp( const MouseEvent& rMEvt );
>     sal_Bool                SelMouseMove( const MouseEvent& rMEvt );
> 
>-    // Tastatur
>+    // Keyboard
>     void                CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 );
> 
>-    // wird benoetigt, um bei ausserhalb des Bereichs stehender
>-    // Maus ueber einen Timer Move-Events zu erzeugen
>+    // neccessary, to create Move-Event through Timer while mouse is outside the area
>     void                SetVisibleArea( const Rectangle rNewArea )
>                             { aArea = rNewArea; }
>     const Rectangle&    GetVisibleArea() const { return aArea; }
>diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
>index acea686..95bf152 100644
>--- a/vcl/inc/vcl/svapp.hxx
>+++ b/vcl/inc/vcl/svapp.hxx
>@@ -101,9 +101,9 @@ typedef long (*VCLEventHookProc)( NotifyEvent& rEvt, void* pData );
> // - ApplicationEvent -
> // --------------------
> 
>-// Erstmal wieder eingebaut, damit AppEvents auf dem MAC funktionieren
>+// Re-inserted for the meantime to have AppEvents work on MAC
> #ifdef UNX
>-// enum Doppelt in daemon.cxx unter unix Achtung !!!
>+// enum Duplicate in daemon.cxx on unix watch out !!!
> enum Service { SERVICE_OLE, SERVICE_APPEVENT, SERVICE_IPC };
> #endif
> 
>diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
>index 5d48ebb..f8fdcc9 100644
>--- a/vcl/inc/vcl/window.hxx
>+++ b/vcl/inc/vcl/window.hxx
>@@ -989,7 +989,7 @@ public:
>     const SystemEnvData*                      GetSystemData() const;
>     ::com::sun::star::uno::Any                GetSystemDataAny() const;
> 
>-    // API zum Setzen/Abfragen des Komponenteninterfaces
>+    // API to set/get the component interface
>     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate = sal_True );
>     virtual void                    SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace );
> 
>@@ -1035,11 +1035,11 @@ public:
>      */
>     void                RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect );
> 
>-    // Setzen und Abfragen fuer das Toolkit
>+    // Set/Get for Toolkit
>     VCLXWindow*             GetWindowPeer() const;
>     void                    SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow );
> 
>-    // Merken, ob vom Toolkit erzeugt
>+    // Remember if created by Toolkit
>     sal_Bool                    IsCreatedWithToolkit() const;
>     void                    SetCreatedWithToolkit( sal_Bool b );
> 
>diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
>index bc07017..78184e4 100644
>--- a/vcl/inc/win/saldata.hxx
>+++ b/vcl/inc/win/saldata.hxx
>@@ -125,13 +125,13 @@ public:
>     HBRUSH                  mhStockBrushAry[MAX_STOCKBRUSH];
>     sal_uInt16                  mnStockPenCount;        // count of static pens
>     sal_uInt16                  mnStockBrushCount;      // count of static brushes
>-    WPARAM                  mnSalObjWantKeyEvt;     // KeyEvent, welcher vom SalObj-Hook verarbeitet werden soll
>+    WPARAM                  mnSalObjWantKeyEvt;     // KeyEvent, which of SalObj-Hook should be processed.
>     BYTE                    mnCacheDCInUse;         // count of CacheDC in use
>     sal_Bool                    mbObjClassInit;         // is SALOBJECTCLASS initialised
>     sal_Bool                    mbInPalChange;          // is in WM_QUERYNEWPALETTE
>     DWORD                   mnAppThreadId;          // Id from Applikation-Thread
>     BOOL                mbScrSvrEnabled;        // ScreenSaver enabled
>-    int                     mnSageStatus;           // status of Sage-DLL (DISABLE_AGENT == nicht vorhanden)
>+    int                     mnSageStatus;           // status of Sage-DLL (DISABLE_AGENT == not existant)
>     SysAgt_Enable_PROC      mpSageEnableProc;       // funktion to deactivate the system agent
>     SalIcon*                mpFirstIcon;            // icon cache, points to first icon, NULL if none
>     TempFontItem*           mpTempFontItem;
>@@ -299,7 +299,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
> #define SAL_MSG_USEREVENT           (WM_USER+130)
> // wParam == 0; lParam == MousePosition relativ to upper left of screen
> #define SAL_MSG_MOUSELEAVE          (WM_USER+131)
>-// NULL-Message, soll nicht verarbeitet werden
>+// NULL-Message, should not be processed
> #define SAL_MSG_DUMMY               (WM_USER+132)
> // wParam == 0; lParam == 0
> #define SAL_MSG_POSTFOCUS           (WM_USER+133)
>diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
>index 7137de3..fc57cec 100644
>--- a/vcl/source/app/dbggui.cxx
>+++ b/vcl/source/app/dbggui.cxx
>@@ -1608,7 +1608,7 @@ long SolarMessageBoxExecutor::doIt()
> {
>     long nResult = RET_NO;
> 
>-    // Tracking beenden und Mouse freigeben, damit die Boxen nicht haengen
>+    // finish Tracking, release Mouse to prevent the boxes from pending
>     ImplSVData* pSVData = ImplGetSVData();
>     if ( pSVData->maWinData.mpTrackWin )
>         pSVData->maWinData.mpTrackWin->EndTracking( ENDTRACK_CANCEL );
>@@ -1789,7 +1789,7 @@ void DbgGUIStart()
>     if ( pData )
>     {
>         DbgDialog* pDialog = new DbgDialog;
>-        // Fuer den Debug-Dialog schalten wir Dialogtests aus
>+        // Disabling dialogtest for the Debug-Dialog.
>         sal_uLong nOldFlags = pData->nTestFlags;
>         pData->nTestFlags &= ~DBG_TEST_DIALOG;
>         if ( !pDialog->Execute() )
>diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
>index b968ca1..71dfdb6 100644
>--- a/vcl/source/app/help.cxx
>+++ b/vcl/source/app/help.cxx
>@@ -283,8 +283,7 @@ void Help::HideTip( sal_uLong nId )
>     HelpTextWindow* pHelpWin = (HelpTextWindow*)nId;
>     Window* pFrameWindow = pHelpWin->ImplGetFrameWindow();
>     pHelpWin->Hide();
>-    // Update ausloesen, damit ein Paint sofort ausgeloest wird, da
>-    // wir den Hintergrund nicht sichern
>+    // trigger update, so Paint is triggered immediately, since we do not save in the background
>     pFrameWindow->ImplUpdateAll();
>     delete pHelpWin;
>     ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks();
>@@ -384,10 +383,10 @@ void HelpTextWindow::SetHelpText( const String& rHelpText )
>             nDrawFlags |= TEXT_DRAW_MNEMONIC;
>         Rectangle aTextRect = GetTextRect( aTry1, maHelpText, nDrawFlags );
> 
>-        // Spaeter mal eine geeignete Breite ermitteln...
>+        // determine a appropriate width later
>         maTextRect = aTextRect;
> 
>-        // Sicherheitsabstand...
>+        // safety distance...
>         maTextRect.SetPos( Point( HELPTEXTMARGIN_BALLOON, HELPTEXTMARGIN_BALLOON ) );
>     }
> 
>@@ -461,7 +460,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode )
>     sal_uLong nTimeout = 0;
>     if ( nDelayMode != HELPDELAY_NONE )
>     {
>-        // Im ExtendedHelp-Fall die Hilfe schneller anzeigen
>+        // In the case of ExtendedHelp show Help quicker
>         if ( ImplGetSVData()->maHelpData.mbExtHelpMode )
>             nTimeout = 15;
>         else
>@@ -519,8 +518,7 @@ Size HelpTextWindow::CalcOutSize() const
> 
> void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ )
> {
>-    // Nur damit nicht von Window::RequestHelp() ein
>-    // ShowQuickHelp/ShowBalloonHelp am HelpTextWindow aufgerufen wird.
>+    // to prevent a ShowQuickHelp/ShowBalloonHelp at the HelpTextWindow being instantiated by Window::RequestHelp()
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
>index 9139f5c..fcb4716 100644
>--- a/vcl/source/window/brdwin.cxx
>+++ b/vcl/source/window/brdwin.cxx
>@@ -497,7 +497,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>                 pData->mnCloseState &= ~BUTTON_DRAW_PRESSED;
>                 DrawWindow( BORDERWINDOW_DRAW_CLOSE );
> 
>-                // Bei Abbruch kein Click-Handler rufen
>+                // In the case of cancelling, do not call Click-Handler
>                 if ( !rTEvt.IsTrackingCanceled() )
>                 {
>                     // dispatch to correct window type (why is Close() not virtual ??? )
>@@ -519,7 +519,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>                 pData->mnRollState &= ~BUTTON_DRAW_PRESSED;
>                 DrawWindow( BORDERWINDOW_DRAW_ROLL );
> 
>-                // Bei Abbruch kein Click-Handler rufen
>+                // In the case of cancelling, do not call Click-Handler
>                 if ( !rTEvt.IsTrackingCanceled() )
>                 {
>                     if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
>@@ -541,7 +541,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>                 pData->mnDockState &= ~BUTTON_DRAW_PRESSED;
>                 DrawWindow( BORDERWINDOW_DRAW_DOCK );
> 
>-                // Bei Abbruch kein Click-Handler rufen
>+                // In the case of cancelling, do not call Click-Handler
>                 if ( !rTEvt.IsTrackingCanceled() )
>                 {
>                     if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
>@@ -569,7 +569,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>                 pData->mnHideState &= ~BUTTON_DRAW_PRESSED;
>                 DrawWindow( BORDERWINDOW_DRAW_HIDE );
> 
>-                // Bei Abbruch kein Click-Handler rufen
>+                // In the case of cancelling, do not call Click-Handler
>                 if ( !rTEvt.IsTrackingCanceled() )
>                 {
>                     if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
>@@ -587,7 +587,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>                 pData->mnHelpState &= ~BUTTON_DRAW_PRESSED;
>                 DrawWindow( BORDERWINDOW_DRAW_HELP );
> 
>-                // Bei Abbruch kein Click-Handler rufen
>+                // In the case of cancelling, do not call Click-Handler
>                 if ( !rTEvt.IsTrackingCanceled() )
>                 {
>                 }
>@@ -600,7 +600,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>                 pData->mnPinState &= ~BUTTON_DRAW_PRESSED;
>                 DrawWindow( BORDERWINDOW_DRAW_PIN );
> 
>-                // Bei Abbruch kein Click-Handler rufen
>+                // In the case of cancelling, do not call Click-Handler
>                 if ( !rTEvt.IsTrackingCanceled() )
>                 {
>                     if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
>@@ -616,7 +616,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
>         {
>             if ( pData->mbDragFull )
>             {
>-                // Bei Abbruch alten Zustand wieder herstellen
>+                // In the case of cancelling, restore old state
>                 if ( rTEvt.IsTrackingCanceled() )
>                     pBorderWindow->SetPosSizePixel( Point( pData->mnTrackX, pData->mnTrackY ), Size( pData->mnTrackWidth, pData->mnTrackHeight ) );
>             }
>@@ -1007,7 +1007,7 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
> 
> long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const
> {
>-    // kein sichtbarer Title, dann auch keine Breite
>+    // no visible title -> no width
>     if ( !pData->mnTitleHeight )
>         return 0;
> 
>@@ -1195,8 +1195,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
>         if( ! mbNWFBorder )
>         {
>             sal_uInt16 nStyle = FRAME_DRAW_NODRAW;
>-            // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
>-            // ist, dann Border nach aussen
>+            // If Border was moved or BorderWindow is a Frame-Window, Border to the outside
>             if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder )
>                 nStyle |= FRAME_DRAW_DOUBLEOUT;
>             else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM )
>@@ -1388,8 +1387,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
>         else
>         {
>             sal_uInt16 nStyle = 0;
>-            // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
>-            // ist, dann Border nach aussen
>+            // If Border was moved or BorderWindow is a Frame-Window, Border to the outside
>             if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder )
>                 nStyle |= FRAME_DRAW_DOUBLEOUT;
>             else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM )
>@@ -1858,7 +1856,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
>                                  SystemParentData* pSystemParentData
>                                  )
> {
>-    // Alle WindowBits entfernen, die wir nicht haben wollen
>+    // Remove all WindowBits entfernen, that we do not want
>     WinBits nOrgStyle = nStyle;
>     WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW  | WB_NEEDSFOCUS | WB_POPUP);
>     if ( nTypeStyle & BORDERWINDOW_STYLE_APP )
>@@ -2002,8 +2000,8 @@ void ImplBorderWindow::Activate()
> 
> void ImplBorderWindow::Deactivate()
> {
>-    // Fenster die immer Active sind, nehmen wir von dieser Regel aus,
>-    // genauso, wenn ein Menu aktiv wird, ignorieren wir das Deactivate
>+    // Windows that are always active are excluded from the rule,
>+    // equally when a menu is activated, we ignore the Deactivate.
>     if ( GetActivateMode() && !ImplGetSVData()->maWinData.mbNoDeactivate )
>         SetDisplayActive( sal_False );
>     Window::Deactivate();
>@@ -2195,7 +2193,7 @@ void ImplBorderWindow::InvalidateBorder()
> {
>     if ( IsReallyVisible() )
>     {
>-        // Nur wenn wir einen Border haben, muessen wir auch invalidieren
>+        // We must only invalidate the Border if we have one
>         sal_Int32 nLeftBorder;
>         sal_Int32 nTopBorder;
>         sal_Int32 nRightBorder;
>@@ -2209,7 +2207,7 @@ void ImplBorderWindow::InvalidateBorder()
>             aWinRect.Top()    += nTopBorder;
>             aWinRect.Right()  -= nRightBorder;
>             aWinRect.Bottom() -= nBottomBorder;
>-            // kein Output-Bereich mehr, dann alles invalidieren
>+            // No more output area, invalidate everything
>             if ( (aWinRect.Right() < aWinRect.Left()) ||
>                  (aWinRect.Bottom() < aWinRect.Top()) )
>                 Invalidate( INVALIDATE_NOCHILDREN );
>diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
>index ce4d418..774a2aa 100644
>--- a/xmloff/source/draw/sdxmlexp.cxx
>+++ b/xmloff/source/draw/sdxmlexp.cxx
>@@ -279,7 +279,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
>         Size aPartArea = aTitleSize;
>         Size aSize;
> 
>-        // tatsaechliche Seitengroesse in das Handout-Rechteck skalieren
>+        // scale handout rectangle into actual page width 
>         double fH = (double) aPartArea.Width()  / aPageSize.Width();
>         double fV = (double) aPartArea.Height() / aPageSize.Height();
> 
>-- 
>1.7.4.1
>

Actions: View

Attachments on bug 39468: 58047 | 60146 | 62888 | 75570 | 75571 | 75723 | 78284 | 78285 | 128824 | 128825