[Libreoffice-commits] .: sfx2/inc

Muthu Subramanian sumuthu at kemper.freedesktop.org
Mon Mar 21 08:51:20 PDT 2011


 sfx2/inc/sfx2/app.hxx     |    2 -
 sfx2/inc/sfx2/module.hxx  |    4 +-
 sfx2/inc/sfx2/prnmon.hxx  |    2 -
 sfx2/inc/sfx2/sfx.hrc     |    8 ++---
 sfx2/inc/sfx2/sfxdefs.hxx |    6 +--
 sfx2/inc/sfx2/shell.hxx   |   71 ++++++++++++++++++++++------------------------
 6 files changed, 45 insertions(+), 48 deletions(-)

New commits:
commit 4e81ce572f16622fbd8a56f45c0a59b343a09c5c
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date:   Mon Mar 21 21:11:26 2011 +0530

    German comments translations.

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 61cc666..750bbee 100755
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -126,7 +126,7 @@ public:
 };
 
 //TODO/CLEANUP
-//wird anscheinend nur in SfxPickList/SfxFrameLoader benutzt
+//is apparently used only in SfxPickList/SfxFrameLoader
 DECL_OBJHINT( SfxStringHint, String );
 
 /*
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 2ccfc00..bef647e 100755
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 #ifndef _SFXMODULE_HXX
-#define _SFXMODULE_HXX	// intern
-#define _SFXMOD_HXX		// extern
+#define _SFXMODULE_HXX	// internal
+#define _SFXMOD_HXX		// external
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 5281cca..334a35f 100755
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -42,7 +42,7 @@ struct SfxPrintProgress_Impl;
 
 // ------------------------------------------------------------------------
 
-#define PAGE_MAX    9999        //max. Anzahl der Seiten die gedruckt werden
+#define PAGE_MAX    9999    // max. Number of pages to be printed
 
 // ------------------------------------------------------------------------
 
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index c2ed24e..ce9d8fb 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -69,7 +69,7 @@
 #define EVENT_SGA_START             EVENT_OBJ3_START
 #define EVENT_SVX_START             EVENT_OBJ4_START
 
-// Achtung: die folgenden sind gleichzeitig SID_ON_...
+// Warning: the following are simultaneously SID_ON_ ...
 #define SFX_EVENT_STARTAPP          (EVENT_SFX_START)
 #define SFX_EVENT_CLOSEAPP          (EVENT_SFX_START + 1)
 #define SFX_EVENT_CREATEDOC         (EVENT_SFX_START + 2)
@@ -111,7 +111,7 @@
 #define SFX_EVENT_TITLECHANGED		(EVENT_SFX_START + 30)
 #define SFX_EVENT_MODECHANGED		(EVENT_SFX_START + 31)
 
-// Events f"ur Controls etc.
+// Events for Controls etc.
 #define SFX_EVENT_MOUSEOVER_OBJECT     ( EVENT_SFX_START + 100 )
 #define SFX_EVENT_MOUSECLICK_OBJECT    ( EVENT_SFX_START + 101 )
 #define SFX_EVENT_MOUSEOUT_OBJECT      ( EVENT_SFX_START + 102 )
@@ -165,7 +165,7 @@
 #define SFX_OBJECTBAR_NAVIGATION		12
 #define SFX_OBJECTBAR_MAX				13
 
-// temp. wg. Kompatibilitaet
+// temporary due to compatibility
 
 #define SFX_OBJECTBAR_IDE				2
 #define SFX_OBJECTBAR_FRAME 			3
@@ -230,7 +230,7 @@
 #define	STR_STYLE_FILTER_USED				(RID_SFX_START+10)
 #define	STR_STYLE_FILTER_USERDEF			(RID_SFX_START+11)
 #define	STR_STYLE_FILTER_ALL				(RID_SFX_START+12)
-// +13 schon benutzt!
+// +13 already used!
 #define STR_STYLE_FILTER_HIERARCHICAL    	(RID_SFX_START+1200)
 
 #define STR_NONAME							(RID_SFX_START+100)
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index dbd91d4..728eb23 100755
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.hxx
@@ -29,9 +29,9 @@
 #ifndef _SFXDEFS_HXX
 #define _SFXDEFS_HXX
 
-#define MESSAGEFILE_SDM_EXT	"sdm"	// Extension des neuen Formats
-#define MESSAGEFILE_EXT		"smd"	// Extension der Single-Mail/News-Files
-#define MESSAGETEMPFILE_EXT	"sd~"	// Extension f"ur Mail/News-TempFiles
+#define MESSAGEFILE_SDM_EXT "sdm"   // Extension for the new Formats
+#define MESSAGEFILE_EXT     "smd"   // Extension for Single-Mail/News-Files
+#define MESSAGETEMPFILE_EXT "sd~"   // Extension for Mail/News-TempFiles
 
 #define SfxFilterFlags sal_uLong
 #define PRODUCT_VERSION		"5.0"
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index aff1544..04d4aac 100755
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -80,11 +80,10 @@ namespace svl
 
 enum SfxInterfaceId
 
-/*	[Beschreibung]
+/*  [Description]
 
-    Id f"ur die <SfxInterface>s, damit wird "uber ein Array an der
-    <SfxApplication> ein quasi-statischer Zugriff auf die Interfaces
-    erlaubt.
+    Id for <SfxInterface>s, gives a quasi-static access to the interface
+    through an array to <SfxApplication>.
 */
 
 {
@@ -131,7 +130,7 @@ enum SfxInterfaceId
     SFX_INTERFACE_SBA_END   		=  399,
     SFX_INTERFACE_IDE_START   		=  400,
     SFX_INTERFACE_IDE_END   		=  409,
-    //-falls die noch einer braucht
+    //-if one is still needed
     SFX_INTERFACE_APP				=  SFX_INTERFACE_SW_START,
     SFX_INTERFACE_LIB				=  450
 };
@@ -146,20 +145,19 @@ typedef void (*SfxStateFunc)(SfxShell *, SfxItemSet &rSet);
 
 class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
 
-/*	[Beschreibung]
+/*  [Description]
 
-    Die Klasse SfxShell ist Basisklasse f"ur alle Schichten, die
-    Funktionalit"at Form von <Slot>s bereitstellen wollen.
-
-    Jede Instanz hat einen Verweis auf eine Interface-Beschreibung, der
-    mit <SfxShell::GetInterface()const> erh"altlich ist. Dieses Interface
-    stellt die Verbindung zu konkreten Methoden her und enth"alt einige
-    weitere beschreibende Daten f"ur Controller wie Menus und Toolboxen, aber
-    auch f"ur die diversen APIs. Der Hautpteil der Interface-Beschreibung
-    liegt in Form einer <Type-Library> vor, die mit dem <SVIDL-Compiler>
-    aus einem IDL-File generiert wird. F"ur jede SfxShell-Subclass ist ein
-    solches IDL-File zu schreiben.
+    The class SfxShell is the base class for all classes, which provide
+    the functionality of the form <Slot>s.
 
+    Each instance has a reference to an interface description, which is
+    obtainable through <SfxShell::GetInterface()const>. This interface
+    provides the connection to specific methods and contains some other
+    descriptive data for controllers like menus and toolboxes, but also
+    for the various APIs. The main part of the interface description is in
+    the form of a <Type-Library>, which is generated from an IDL-file by
+    the <SVIDL-Compiler>. For each SfxShell Subclass-File there is one
+    such IDL-file to write.
 */
 
 {
@@ -170,8 +168,8 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
     ::svl::IUndoManager*        pUndoMgr;
 
 private:
-                                SfxShell( const SfxShell & ); // n.i.
-    SfxShell&					operator = ( const SfxShell & ); // n.i.
+                                SfxShell( const SfxShell & ); // internal
+    SfxShell&                                   operator = ( const SfxShell & ); // internal
 
 protected:
                                 SfxShell();
@@ -269,15 +267,15 @@ public:
 //--------------------------------------------------------------------
 SfxItemPool& SfxShell::GetPool() const
 /*
-  [Beschreibung]
+    [Description]
 
-    Jede Subclass von SfxShell mu"s einen Pool referenzieren. Dieser
-    wird teilweise von SFx-eigenen Subklassen gesetzt (z.B. <SfxViewShell>),
-    mu"s aber insbesondere bei direkt von SfxShell abgeleiteten Klassen
-    und bei Ableitungen von SfxObjectShell selbst gesetzt werden.
+    Each Subclass of SfxShell must reference a pool. This is partly set by
+    SFx's own set of subclasses (eg <SfxViewShell>). In particular however
+    this must be set directly from one derived SfxShell class and ny
+    derivatives of SfxObjectShell.
 
-    Die Klasse SfxShell selbst hat noch keinen SfxItemPool, es wird
-    daher ein 0-Pointer zur"uckgeliefert.
+    The SfxShell class itself does not have any SfxItemPool, therfore a
+    null-pointer is returned.
 */
 
 {
@@ -287,17 +285,16 @@ SfxItemPool& SfxShell::GetPool() const
 //-------------------------------------------------------------------
 inline void SfxShell::SetPool
 (
-    SfxItemPool*	pNewPool	// Pointer auf den neuen Pool oder 0
+    SfxItemPool*        pNewPool        // Pointer to the new Pool or null
 )
 
-/*  [Beschreibung]
+/*  [Description]
 
-    Mit dieser Methode melden die Subklassen ihren speziellen <SfxItemPool>
-    an der SfxShell an. Jede SfxShell Instanz mu\s Zugriff auf einen
-    SfxItemPool haben. In der Regel ist dies der SfxItemPool der
-    SfxDocumentShell. Die SfxShell Subklasse "ubernimmt nicht die
-    Eigent"umerschaft "uber den "ubergebenen Pool. Bevor er gel"oscht
-    wirde, mu\s er mit SetPool(0) abgemeldet werden.
+    With this method, the subclasses register their special <SfxItemPool>
+    in the SfxShell. Each SfxShell instance must have access to a SfxItemPool.
+    Usually this is the SfxItemPool of the SfxDocumentShell. The SfxShell
+    subclass does not take ownership of the orphaned pool. Before it is
+    deleted it has to be deregisted with SetPool(0).
 */
 
 {
@@ -357,11 +354,11 @@ inline void SfxShell::SetPool
 
 #define SFX_POSITION_MASK				0x000F
 #define SFX_VISIBILITY_MASK 			0xFFF0
-#define SFX_VISIBILITY_UNVISIBLE		0x0000	// nie sichtbar
+#define SFX_VISIBILITY_UNVISIBLE        0x0000  // Never visible
 #define SFX_VISIBILITY_PLUGSERVER       0x0010
 #define SFX_VISIBILITY_PLUGCLIENT       0x0020
 #define SFX_VISIBILITY_VIEWER	        0x0040
-                                                // noch 1 sind frei!
+                                                // One is still free!
 #define SFX_VISIBILITY_RECORDING		0x0200
 #define SFX_VISIBILITY_READONLYDOC		0x0400
 #define SFX_VISIBILITY_DESKTOP    		0x0800
@@ -369,7 +366,7 @@ inline void SfxShell::SetPool
 #define SFX_VISIBILITY_FULLSCREEN		0x2000
 #define SFX_VISIBILITY_CLIENT			0x4000
 #define SFX_VISIBILITY_SERVER			0x8000
-#define SFX_VISIBILITY_NOCONTEXT		0xFFFF	// immer sichtbar
+#define SFX_VISIBILITY_NOCONTEXT        0xFFFF  // Always visable
 
 #define SFX_OBJECTBAR_REGISTRATION(nPos,rResId) \
         GetStaticInterface()->RegisterObjectBar( nPos, rResId )


More information about the Libreoffice-commits mailing list