[Libreoffice-commits] .: sfx2/source
Muthu Subramanian
sumuthu at kemper.freedesktop.org
Thu Mar 10 08:44:34 PST 2011
sfx2/source/inc/appdata.hxx | 8 -
sfx2/source/inc/helpid.hrc | 4
sfx2/source/inc/mnucfga.hxx | 2
sfx2/source/inc/objshimp.hxx | 14 +--
sfx2/source/inc/openflag.hxx | 11 +-
sfx2/source/inc/sfxlocal.hrc | 2
sfx2/source/inc/sfxtypes.hxx | 4
sfx2/source/inc/statcach.hxx | 18 ++--
sfx2/source/inc/templdgi.hxx | 12 +-
sfx2/source/inc/virtmenu.hxx | 2
sfx2/source/inc/workwin.hxx | 31 +++----
sfx2/source/menu/mnuitem.cxx | 21 ++---
sfx2/source/menu/mnumgr.cxx | 6 -
sfx2/source/menu/objmnctl.cxx | 23 ++---
sfx2/source/menu/thessubmenu.cxx | 14 +--
sfx2/source/menu/thessubmenu.hxx | 2
sfx2/source/menu/virtmenu.cxx | 95 +++++++++++------------
sfx2/source/statbar/stbitem.cxx | 157 ++++++++++++++++++---------------------
sfx2/source/toolbox/tbxitem.cxx | 70 ++++++++---------
19 files changed, 242 insertions(+), 254 deletions(-)
New commits:
commit 6573fcd0bd3372872811b41b2012440490c8f455
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Thu Mar 10 19:03:25 2011 +0530
Translations (4).
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 8df0e41..c31e745 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -151,14 +151,14 @@ public:
SfxViewFrame* pViewFrame;
SfxSlotPool* pSlotPool;
SfxResourceManager* pResMgr;
- SfxDispatcher* pAppDispat; // Dispatcher falls kein Doc
+ SfxDispatcher* pAppDispat; // Dispatcher if no document
SfxInterface** pInterfaces;
- USHORT nDocNo; // Laufende Doc-Nummer (AutoName)
+ USHORT nDocNo; // current Doc-Number (AutoName)
USHORT nInterfaces;
- BOOL bDispatcherLocked:1; // nichts ausf"uhren
- BOOL bDowning:1; // TRUE ab Exit und danach
+ BOOL bDispatcherLocked:1; // do nothing
+ BOOL bDowning:1; // TRUE on Exit and afterwards
BOOL bInQuit : 1;
BOOL bInvalidateOnUnlock : 1;
BOOL bODFVersionWarningLater : 1;
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index b1c39a2..bdc7da7 100755
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -357,10 +357,10 @@
#define ACT_SFX_HID_END HID_SECURITYTAB_PROTECTION
-// "Uberlaufpr"ufung --------------------------------------------------------
+// Overflow test --------------------------------------------------------
#if ACT_SFX_HID_END > HID_SFX_END
-#error Resource-Ueberlauf in #line, #file
+#error Resource overflow in #line, #file
#endif
#define HID_HELP_ONHELP 68245
diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx
index 5d80683..963b95f 100644
--- a/sfx2/source/inc/mnucfga.hxx
+++ b/sfx2/source/inc/mnucfga.hxx
@@ -39,7 +39,7 @@ struct SfxMenuCfgItem
{
USHORT nId; // id of the binding or 0 if none
String aTitle; // title of the item
- String aHelpText; // Hilfetext
+ String aHelpText;
String aCommand;
SfxMenuCfgItemArr* pPopup; // pointer to a popup menu (if any)
};
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index c7c1bc9..7d2278c 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -78,18 +78,18 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
sal_uInt16 nVisualDocumentNumber;
sal_Int16 nDocumentSignatureState;
sal_Int16 nScriptingSignatureState;
- sal_Bool bInList:1, // ob per First/Next erreichbar
- bClosing:1, // sal_True w"aehrend Close(), um Benachrichtigungs-Rekursionen zu verhindern
+ sal_Bool bInList:1, // if reachable by First/Next
+ bClosing:1, // sal_True while Close(), to prevent recurrences Notification
bIsSaving:1,
bPasswd:1,
bIsTmp:1,
bIsNamedVisible:1,
bIsTemplate:1,
- bIsAbortingImport:1, // Importvorgang soll abgebrochen werden.
- bImportDone : 1, //Import schon fertig? Fuer AutoReload von Docs.
+ bIsAbortingImport:1, // Import operation should be canceled.
+ bImportDone : 1, // Import finished already? For auto reload of Docs.
bInPrepareClose : 1,
bPreparedForClose : 1,
- bWaitingForPicklist : 1,// Muss noch in die Pickliste
+ bWaitingForPicklist : 1, // Must go into pick list
bForbidReload : 1,
bBasicInitialized :1,
bIsPrintJobCancelable :1, // Stampit disable/enable cancel button for print jobs ... default = true = enable!
@@ -112,8 +112,8 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
IndexBitSet aBitSet;
sal_uInt32 lErr;
- sal_uInt16 nEventId; // falls vor Activate noch ein
- // Open/Create gesendet werden mu/s
+ sal_uInt16 nEventId; // If Open/Create as to be sent
+ // before Activate
AutoReloadTimer_Impl *pReloadTimer;
MarkData_Impl* pMarkData;
sal_uInt16 nLoadedFlags;
diff --git a/sfx2/source/inc/openflag.hxx b/sfx2/source/inc/openflag.hxx
index 70a5d7c..0d59f5b 100644
--- a/sfx2/source/inc/openflag.hxx
+++ b/sfx2/source/inc/openflag.hxx
@@ -28,14 +28,13 @@
#ifndef _SFX_OPENFLAG_HXX
#define _SFX_OPENFLAG_HXX
-// Datei zum Bearbeiten "offnen, anschliessend funktioniert nur noch
-// die dritte Variante (Lesen einer Kopie)
+// Open file for editing, then only the third option (reading a copy) works
#define SFX_STREAM_READWRITE (STREAM_READWRITE | STREAM_SHARE_DENYWRITE)
-// Ich arbeite roh auf dem Original, keine Kopie
-// -> Datei kann anschliessend nicht zum Bearbeiten ge"offnet werden
+// I work on the original, not a copy
+// -> file then can not be opened for editing
#define SFX_STREAM_READONLY (STREAM_READ | STREAM_SHARE_DENYWRITE) // + !bDirect
-// Jemand anders bearbeitet das File, es wird eine Kopie erstellt
-// -> Datei kann anschliessend zum Bearbeiten ge"offnet werden
+// Someone else is editing the file, a copy it created
+// -> the file can then be opened for editing
#define SFX_STREAM_READONLY_MAKECOPY (STREAM_READ | STREAM_SHARE_DENYNONE)
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 313c7c2..c9da3c4 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -25,7 +25,7 @@
*
************************************************************************/
//============================================================================
-// Lokale Resourcen
+// Local Resources
//
// (C) 1996 - 2000 Star Division GmbH, Hamburg, Germany
//----------------------------------------------------------------------------
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index b139653..9ef1dc8 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -61,8 +61,8 @@ class Timer;
//------------------------------------------------------------------------
-// Macro fuer den Call-Profiler unter WinNT
-// mit S_CAP kann eine Messung gestarted, mit E_CAP wieder gestoppt werden
+// Macro for the Call-Profiler under WinNT
+// with S_CAP a measurement can be started, and stopped with E_CAP
#if defined( WNT ) && defined( PROFILE )
extern "C" {
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 955c805..c308151 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -81,17 +81,17 @@ friend class BindDispatch_Impl;
sal_uInt16 nId; // Slot-Id
SfxControllerItem* pInternalController;
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch;
- SfxControllerItem* pController; // Ptr auf 1. gebundenen Controller (untereinander verkettet)
- SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> Nicht auf Stack
- SfxPoolItem* pLastItem; // zuletzt verschicktes Item, nie -1
- SfxItemState eLastState; // zuletzt verschickter State
- sal_Bool bCtrlDirty:1; // Controller aktualisiert?
- sal_Bool bSlotDirty:1; // Funktion gfs. vorhanden, muss aktualisiert werden
- sal_Bool bItemVisible:1;// item visibility
- sal_Bool bItemDirty; // G"ultigkeit von pLastItem
+ SfxControllerItem* pController; // Pointer to first bound Controller (interlinked with each other)
+ SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> not on Stack
+ SfxPoolItem* pLastItem; // Last sent Item, never -1
+ SfxItemState eLastState; // Last sent State
+ sal_Bool bCtrlDirty:1; // Update Controller?
+ sal_Bool bSlotDirty:1; // Present Funktion, must be updated
+ sal_Bool bItemVisible:1; // item visibility
+ sal_Bool bItemDirty; // Validity of pLastItem
private:
- SfxStateCache( const SfxStateCache& rOrig ); // n.i.
+ SfxStateCache( const SfxStateCache& rOrig ); // inward
void SetState_Impl( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
public:
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 295dd2d..40706ea 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -161,9 +161,9 @@ protected:
ListBox aFilterLb;
Size aSize;
- USHORT nActFamily; // Id in der ToolBox = Position - 1
+ USHORT nActFamily; // Id in the ToolBox = Position - 1
USHORT nActFilter; // FilterIdx
- USHORT nAppFilter; // Filter, den die Applikation gesetzt hat (fuer automatisch)
+ USHORT nAppFilter; // Filter, which has set the application (for automatic)
BOOL bDontUpdate :1,
bIsWater :1,
@@ -174,7 +174,7 @@ protected:
bCanDel :1,
bCanNew :1,
bWaterDisabled :1,
- bNewByExampleDisabled :1,
+ bNewByExampleDisab§led :1,
bUpdateByExampleDisabled:1,
bTreeDrag :1,
bHierarchical :1,
@@ -223,8 +223,8 @@ protected:
void Update_Impl();
void UpdateFamily_Impl();
- // In welchem FamilyState muss ich nachsehen, um die Info der i-ten
- // Family in der pStyleFamilies zu bekommen.
+ // In which FamilyState do I have to look , in order to get the
+ // information of the ith Family in the pStyleFamilies.
USHORT StyleNrToInfoOffset( USHORT i );
USHORT InfoOffsetToStyleNr( USHORT i );
@@ -269,7 +269,7 @@ public:
// normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus
virtual PopupMenu* CreateContextMenu( void );
- // Rechnet von den SFX_STYLE_FAMILY Ids auf 1-5 um
+ // converts from SFX_STYLE_FAMILY Ids to 1-5
static USHORT SfxFamilyIdToNId( SfxStyleFamily nFamily );
void SetAutomaticFilter();
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 6fedf28..5a8e840 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -54,7 +54,7 @@ private:
PopupMenu* pWindowMenu;
PopupMenu* pPickMenu;
PopupMenu* pAddonsMenu;
- Timer* pAutoDeactivate; // Hack fuer QAP-Bug
+ Timer* pAutoDeactivate; // Hack for QAP-Bug
USHORT nVisibleItems;
USHORT nId;
USHORT nCount;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 88e2ca8..78d5b82 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -55,12 +55,12 @@ class SfxSplitWindow;
class SfxWorkWindow;
//====================================================================
-// Dieser struct h"alt alle relevanten Informationen "uber Toolboxen bereit.
+// This struct makes all relevant Informationen available of Toolboxes
struct SfxObjectBar_Impl
{
- USHORT nId; // Resource - und ConfigId der Toolbox
- USHORT nMode; // spezielle Sichtbarkeitsflags
+ USHORT nId; // Resource - and ConfigId of Toolbox
+ USHORT nMode; // special visibility flags
USHORT nPos;
USHORT nIndex;
sal_Bool bDestroy;
@@ -76,7 +76,8 @@ struct SfxObjectBar_Impl
};
//------------------------------------------------------------------------------
-// Dieser struct h"alt alle relevanten Informationen "uber die Statuszeile bereit.
+// This struct makes all relevant Informationen available of the status bar
+
struct SfxStatBar_Impl
{
USHORT nId;
@@ -93,9 +94,9 @@ struct SfxStatBar_Impl
//------------------------------------------------------------------------------
#define CHILD_NOT_VISIBLE 0
-#define CHILD_ACTIVE 1 // nicht durch HidePopups ausgeschaltet
-#define CHILD_NOT_HIDDEN 2 // nicht durch HideChildWindow ausgeschaltet
-#define CHILD_FITS_IN 4 // nicht zu gro\s f"ur OutputSize des parent
+#define CHILD_ACTIVE 1 // not disabled through HidePopups
+#define CHILD_NOT_HIDDEN 2 // not disabled through HideChildWindow
+#define CHILD_FITS_IN 4 // not too large for output size of the parent
#define CHILD_VISIBLE (CHILD_NOT_HIDDEN | CHILD_ACTIVE | CHILD_FITS_IN)
#define CHILD_ISVISIBLE (CHILD_NOT_HIDDEN | CHILD_ACTIVE)
@@ -131,13 +132,13 @@ class SfxChildWinController_Impl : public SfxControllerItem
struct SfxChildWin_Impl
{
- USHORT nSaveId; // die ChildWindow-Id
- USHORT nInterfaceId; // der aktuelle Context
- USHORT nId; // aktuelle Id
+ USHORT nSaveId; // the ChildWindow-Id
+ USHORT nInterfaceId; // the current context
+ USHORT nId; // current Id
SfxChildWindow* pWin;
BOOL bCreate;
SfxChildWinInfo aInfo;
- SfxChild_Impl* pCli; // != 0 bei direkten Children
+ SfxChild_Impl* pCli; // != 0 at direct Children
USHORT nVisibility;
BOOL bEnable;
BOOL bDisabled;
@@ -307,7 +308,7 @@ public:
{ return pParent; }
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > CreateDispatch( const String& );
- // Methoden f"ur alle Child-Fenster
+ // Methods for all Child windows
void DataChanged_Impl( const DataChangedEvent& rDCEvt );
void ReleaseChild_Impl( Window& rWindow );
SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, BOOL bCanGetFocus=FALSE );
@@ -328,7 +329,7 @@ public:
void SetFullScreen_Impl( BOOL bSet ) { bIsFullScreen = bSet; }
BOOL IsFullScreen_Impl() const { return bIsFullScreen; }
- // Methoden f"ur Objectbars
+ // Methods for Objectbars
virtual void UpdateObjectBars_Impl();
void ResetObjectBars_Impl();
void SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
@@ -344,7 +345,7 @@ public:
USHORT HasNextObjectBar_Impl( USHORT nPos, String* pStr=0 );
void SetObjectBarCustomizeMode_Impl( BOOL );
- // Methoden f"ur ChildWindows
+ // Methods for ChildWindows
void UpdateChildWindows_Impl();
void ResetChildWindows_Impl();
void SetChildWindowVisible_Impl( sal_uInt32, BOOL, USHORT );
@@ -366,7 +367,7 @@ public:
virtual BOOL ActivateNextChild_Impl( BOOL bForward = TRUE );
bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
- // Methoden f"ur StatusBar
+ // Methods for StatusBar
void SetTempStatusBar_Impl( BOOL bSet );
void ResetStatusBar_Impl();
void SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& );
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 13ec119..207278a 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -176,7 +176,7 @@ void SfxMenuControl::Bind(
//--------------------------------------------------------------------
-// ctor for explicit registration
+// Constructor for explicit registration
SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
: pOwnMenu(0),
@@ -188,6 +188,7 @@ SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
//--------------------------------------------------------------------
+// Constructor for array
SfxMenuControl::SfxMenuControl():
pOwnMenu(0),
pSubMenu(0),
@@ -206,10 +207,10 @@ SfxMenuControl::SfxMenuControl(USHORT nSlotId, SfxBindings& rBindings):
{
DBG_MEMTEST();
- // Dieser Ctor soll es erm"oglichen, w"ahrend der Konstruktion schon
- // auf die Bindings zur"uckgreifen zu k"onnen, aber gebunden wird
- // wie immer erst sp"ater. Anwendung z.B. wenn im ctor der abgeleiteten
- // Klasse z.B. ein StatusForwarder erzeugt werden soll.
+ // This constructor should make it possible already during the design
+ // to fall back to the bindings, but can as always be bound later.
+ // The usefullness of this is for example if a StatusForwarder should
+ // be created in the constructor of a derived class.
UnBind();
}
@@ -247,7 +248,7 @@ void SfxMenuControl::StateChanged
bool bIsObjMenu =
GetId() >= SID_OBJECTMENU0 && GetId() < SID_OBJECTMENU_LAST;
- // enabled/disabled-Flag pauschal korrigieren
+ // Fix inclusion of enabled/disabled-Flag
#ifdef UNIX
if (nSID == SID_PASTE)
@@ -260,7 +261,7 @@ void SfxMenuControl::StateChanged
if ( eState != SFX_ITEM_AVAILABLE )
{
- // checken nur bei nicht-Object-Menus
+ // check only for non-Object Menus
if ( !bIsObjMenu )
pOwnMenu->CheckItem( GetId(), FALSE );
@@ -274,7 +275,7 @@ void SfxMenuControl::StateChanged
bool bCheck = false;
if ( pState->ISA(SfxBoolItem) )
{
- // BoolItem fuer checken
+ // BoolItem for check
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxBoolItem not allowed for SID_OBJECTMENUx" );
bCheck = ((const SfxBoolItem*)pState)->GetValue();
@@ -282,14 +283,14 @@ void SfxMenuControl::StateChanged
else if ( pState->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pState)->HasBoolValue() )
{
- // EnumItem wie Bool behandeln
+ // Treat EnumItem as Bool
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxEnumItem not allowed for SID_OBJECTMENUx" );
bCheck = ((SfxEnumItemInterface *)pState)->GetBoolValue();
}
else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) )
{
- // MenuText aus SfxStringItem holen
+ // Get MenuText from SfxStringItem
String aStr( ((const SfxStringItem*)pState)->GetValue() );
if ( aStr.CompareToAscii("($1)",4) == COMPARE_EQUAL )
{
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 9db9f96..7900192 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -160,13 +160,11 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
if ( !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU) )
continue;
- // neue Id vergeben
USHORT nId = SID_VERB_START + nr++;
- DBG_ASSERT(nId <= SID_VERB_END, "Zuviele Verben!");
+ DBG_ASSERT(nId <= SID_VERB_END, "Too many verbs!");
if ( nId > SID_VERB_END )
break;
- // einf"ugen
pMenu->InsertItem( nId, aVerbs[n].VerbName );
pMenu->SetHelpId( nId, (ULONG) nId );
}
@@ -363,7 +361,7 @@ void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
SfxVirtualMenu *pOldVirtMenu=0;
if ( pMenu )
{
- // Es wird umkonfiguriert
+ // It is reconfigured
pOldVirtMenu = pMenu;
pBindings->ENTERREGISTRATIONS();
}
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index 71417ac..be34e70 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -49,8 +49,8 @@ using namespace com::sun::star;
//--------------------------------------------------------------------
/*
- Ctor; setzt Select-Handler am Menu und traegt Menu
- in seinen Parent ein.
+ Constructor; sets the Select-Handler for the Menu and inserts it into
+ its Parent.
*/
SfxObjectVerbsControl::SfxObjectVerbsControl(USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings)
@@ -66,7 +66,7 @@ SfxObjectVerbsControl::SfxObjectVerbsControl(USHORT nSlotId, Menu &rMenu, SfxBin
//--------------------------------------------------------------------
/*
- Fuellt das Menu mit den aktuellen Verben aus der ViewShell.
+ Make up a menu with the current view of the verbs from ViewShell.
*/
void SfxObjectVerbsControl::FillMenu()
@@ -90,7 +90,7 @@ void SfxObjectVerbsControl::FillMenu()
if ( !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU) )
continue;
- DBG_ASSERT(nSlotId <= SID_VERB_END, "Zuviele Verben!");
+ DBG_ASSERT(nSlotId <= SID_VERB_END, "Too many Verbs!");
if (nSlotId > SID_VERB_END)
break;
@@ -105,11 +105,10 @@ void SfxObjectVerbsControl::FillMenu()
//--------------------------------------------------------------------
/*
- Statusbenachrichtigung;
- fuellt gfs. das Menu mit den aktuellen Verben aus der ViewShell.
- der DocumentShell.
- Ist die Funktionalit"at disabled, wird der entsprechende
- Menueeintrag im Parentmenu disabled, andernfalls wird er enabled.
+ Status notification:
+ Fill the menu with the current verbs from the ViewShell of the
+ the DocumentShell. If the functionality is disabled, the corresponding
+ menu entry in Parent menu is disabled, otherwise it is enabled.
*/
void SfxObjectVerbsControl::StateChanged(
@@ -125,8 +124,8 @@ void SfxObjectVerbsControl::StateChanged(
//--------------------------------------------------------------------
/*
- Select-Handler des Menus;
- das selektierte Verb mit ausgef"uhrt,
+ Select-Handler for Menus;
+ run the selected Verb,
*/
IMPL_LINK_INLINE_START( SfxObjectVerbsControl, MenuSelect, Menu *, pSelMenu )
@@ -141,7 +140,7 @@ IMPL_LINK_INLINE_END( SfxObjectVerbsControl, MenuSelect, Menu *, pSelMenu )
//--------------------------------------------------------------------
/*
- Dtor; gibt das Menu frei.
+ Destructor; releases the Menu.
*/
SfxObjectVerbsControl::~SfxObjectVerbsControl()
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 5c2a165..e01286f 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -94,8 +94,8 @@ String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText )
/*
- Ctor; setzt Select-Handler am Menu und traegt Menu
- in seinen Parent ein.
+ Constructor; sets the Select-Handler for the Menu and inserts it into
+ its Parent.
*/
SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings )
: SfxMenuControl( nSlotId, rBindings ),
@@ -116,9 +116,9 @@ SfxThesSubMenuControl::~SfxThesSubMenuControl()
/*
- Statusbenachrichtigung;
- Ist die Funktionalit"at disabled, wird der entsprechende
- Menueeintrag im Parentmenu disabled, andernfalls wird er enabled.
+ Status notification:
+ If the functionality is disabled, the corresponding
+ menu entry in Parentmenu is disabled, otherwise it is enabled.
*/
void SfxThesSubMenuControl::StateChanged(
USHORT /*nSID*/,
@@ -130,8 +130,8 @@ void SfxThesSubMenuControl::StateChanged(
/*
- Select-Handler des Menus;
- das selektierte Verb mit ausgef"uhrt,
+ Select-Handler for Menus;
+ run the selected Verb,
*/
IMPL_LINK_INLINE_START( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
{
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index bc9ee8a..430a18a 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -75,7 +75,7 @@ class SfxThesSubMenuHelper
private:
- // don't use copy c-tor and assignment operator
+ // don't use copy constructor and assignment operator
SfxThesSubMenuHelper( const SfxThesSubMenuHelper & );
SfxThesSubMenuHelper & operator = ( const SfxThesSubMenuHelper & );
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index bd417dd..7a5ced8 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -155,9 +155,9 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr
//=========================================================================
-/* Diese Hilfsfunktion pr"uft, ob eine Slot-Id im aktuellen Applikations-
- Status sichtbar ist oder nicht. Dabei bezieht sich der Applikations-Status
- darauf, ob die Applikation OLE-Server ist oder nicht.
+/* This helper function checks whether a Slot-id in the current application
+ status is visible or not. This relates to the application status to see
+ if the OLE server application exist or not.
*/
BOOL IsItemHidden_Impl( USHORT nItemId, int bOleServer, int bMac )
@@ -257,10 +257,9 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
//--------------------------------------------------------------------
-/* Der Destruktor der Klasse SfxVirtualMenu gib die gebundenen Items frei
- und klinkt das zugeh"orige StarView-PopupMenu aus seinem Parent aus.
- Falls es sich um das Pickmenu oder das MDI-Menu handelt, wird es
- dort abgemeldet.
+/* The destructor of the class SfxVirtualMenu releases bounded items and
+ the associated StarView-PopupMenu is released from its parent.
+ If it is related to the Pickmenu or the MDI-menu, it is unregistered here.
*/
SfxVirtualMenu::~SfxVirtualMenu()
@@ -292,10 +291,10 @@ SfxVirtualMenu::~SfxVirtualMenu()
delete pAppCtrl;
pBindings = 0;
- // Alle Menues, die von SV erzeugt wurden, werden auch dort wieder
- // gel"oscht (also die beim Laden aus der Resource erzeugten).
- // Das Top-Level-Menu wird nie von SV gel"oscht, da die Allocierung
- // im SFX erfolgt
+ // All the menus, which were created by SV, will also be there deleted
+ // again (i.e. created by loading them from the resource)
+ // The top-level menu is never deleted by SV, since the allocation
+ // in done in the SFX
if ( !bResCtor || !pParent)
{
if ( pParent )
@@ -362,9 +361,9 @@ void SfxVirtualMenu::CreateFromSVMenu()
// get and store the number of items
nCount = pSVMenu->GetItemCount();
- // Achtung: nur zu diesem Zeitpunkt ist garantiert, da\s nCount und
- // der ItemCount des SV-Menues "ubereinstimmen; sp"ater kann das SvMenue
- // auch mehr Eintr"age haben (Pickliste!)
+ // Note: only this time it is guaranteed that nCount and the ItemCount
+ // the SV-menus match; later on the SvMenu can have more entries
+ // (Pick list!)
if (nCount)
pItems = new SfxMenuControl[nCount];
@@ -401,9 +400,8 @@ void SfxVirtualMenu::CreateFromSVMenu()
if ( pMnuCtrl )
{
- // Das Popup war offensichtlich kein "echtes"; solche werden
- // niemals aus der Resource geladen und m"ussen daher explizit
- // gel"oscht werden
+ // The pop was obviously not "real" and such are never loaded
+ // from the resource and need thus to be explicitly deleted.
if ( pSVMenu->GetPopupMenu( nSlotId ) == pPopup )
pSVMenu->SetPopupMenu( nSlotId, NULL );
delete pPopup;
@@ -427,7 +425,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
pSVMenu->SetHelpId( nSlotId, 0L );
pMnuCtrl = pItems+nPos;
- // normalerweise jetzt erst im Activate-Handler
+ // Normally only now in Activate-Handler
if ( bOLE )
{
pMnuCtrl->Bind( this, nSlotId,
@@ -551,10 +549,10 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
DBG_MEMTEST();
DBG_CHKTHIS(SfxVirtualMenu, 0);
- // eigenes StarView-Menu
+ // own StarView-Menu
if ( pMenu == pSVMenu )
{
- // AutoDeactivate ist jetzt nicht mehr n"otig
+ // AutoDeactivate is not necessary anymore
if ( pAutoDeactivate )
pAutoDeactivate->Stop();
}
@@ -737,14 +735,14 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
{
- // Selber suchen, da SV mit 'USHORT nSID = pSVMenu->GetCurItemId();' immer
- // 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
- // CurItem des Parent-Menus zu tun hat.
+ // Search , as SV with 'USHORT nSID = pSVMenu->GetCurItemId();' always
+ // returns 0. It is like this, since the Event-Forwarding has nothing to do
+ // with the Parent-Menus CurItem.
sal_uInt32 nAddonsPopupPrefixLen = ADDONSPOPUPMENU_URL_PREFIX.getLength();
for ( USHORT nPos = 0; nPos < nCount; ++nPos )
{
- // angesprochenes Sub-Menu gefunden?
+ // found the Sub-Menu in question?
bool bFound = false;
USHORT nSID = pSVMenu->GetItemId(nPos);
SfxMenuControl &rCtrl = pItems[nPos];
@@ -753,11 +751,11 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
if ( bFound )
{
- // Nur ein gebundener Menu-Controller hat schon seine Id!
+ // Only a binded Menu-Controller as already an Id!
if ( !rCtrl.GetId() )
{
bIsAddonPopupMenu = FALSE;
- DBG_ASSERT( !pSubMenu, "Popup schon vorhanden!");
+ DBG_ASSERT( !pSubMenu, "Popup already exists!");
// Check if the popup is an Add-On popup menu
// Either the popup menu has a special ID or a special command URL prefix!
@@ -768,31 +766,32 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
( aCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
bIsAddonPopupMenu = TRUE;
- // VirtualMenu f"ur Sub-Menu erzeugen
+ // Create VirtualMenu for Sub-Menu
BOOL bRes = bResCtor;
pSubMenu = new SfxVirtualMenu( nSID, this,
*pMenu, FALSE, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
- DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
+ DBG_OUTF( ("New VirtualMenu %lx created", pSubMenu) );
rCtrl.Bind( this, nSID, *pSubMenu, pSVMenu->GetItemText(nSID), *pBindings );
- // Activate weiterleiten
+ // Forward Activate
pSubMenu->Bind_Impl( pMenu );
pSubMenu->Activate( pMenu );
}
}
- // rekursiv weitersuchen (SV Activate nur am Menu selbst und Top-Menu)
+ // continue searching recursively (SV Activate only the menu itself
+ // and Top-Menu)
if ( !bFound && pSubMenu )
bFound = pSubMenu->Bind_Impl( pMenu );
- // gefunden, dann abbrechen
+ // If found, break
if ( bFound )
return TRUE;
}
- // nicht in diesem Untermenu gefunden
+ // Not found in this submenu
return FALSE;
}
@@ -838,7 +837,7 @@ void SfxVirtualMenu::UnbindControllers()
{
SfxMenuControl* pCtrl = rCtrlArr[nPos];
if ( pCtrl->IsBound() )
- // UnoController sind nicht gebunden!
+ // UnoController is not binded!
pCtrl->UnBind();
}
@@ -895,8 +894,8 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
DBG_CHKTHIS(SfxVirtualMenu, 0);
DBG_OUTF( ("SfxVirtualMenu %lx activated %lx, own %lx", this, pMenu, pSVMenu));
- // MI: wozu war der noch gut?
- // MBA: scheint ein alter QAP-Hack gewesen zu sein ( in rev.1.41 eingecheckt ! )
+ // MI: for what was it still good for?
+ // MBA: seemes to be an old QAP-Hack( checked-in in rev.1.41 ! )
if ( pMenu )
{
@@ -909,10 +908,10 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
pMenu->SetMenuFlags( nFlag );
}
- // eigenes StarView-Menu
+ // Own StarView-Menu
if ( pMenu == pSVMenu )
{
- // doppelt-Activate verhindern
+ // Prevent Double Activate
if ( bIsActive )
return TRUE;
@@ -995,7 +994,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
pAddonsMenu = pSVMenu->GetPopupMenu( SID_ADDONLIST );
}
- // f"ur konstistenten Status sorgen
+ // Provides consistency to the Status
if ( bControllersUnBound )
BindControllers();
@@ -1010,22 +1009,22 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
pBindings->Update( SID_IMAGE_ORIENTATION );
- // bis zum Deactivate die Statusupdates unterdr"ucken
+ // Supress the Status updates until Deactivate
pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = TRUE;
if ( pAutoDeactivate ) // QAP-Hack
pAutoDeactivate->Start();
- // erledigt
return TRUE;
}
else
{
- // VirtualMenu fuer SubMenu finden und ggf. an VirtualMenu binden
+ // Find the VirtualMenu for the SubMenu and if possible, bind a
+ // VirtualMenu
bool bRet = Bind_Impl( pMenu );
#ifdef DBG_UTIL
if ( !bRet)
- DBG_WARNING( "W1: Virtual menu konnte nicht erzeugt werden!" );
+ DBG_WARNING( "W1: Virtual menu could not be created!" );
#endif
return bRet;
}
@@ -1042,8 +1041,8 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
if ( pAutoDeactivate )
pAutoDeactivate->Stop();
- // Bis auf die Menubar k"onnen alle Controller unbinded werden, wenn
- // das Menue deaktiviert ( = zugeklappt ) wird
+ // All controllers can be unbinded all the way up to the Menubar,
+ // when the menu is disabled (= closed)
if ( pParent )
UnbindControllers();
pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
@@ -1218,7 +1217,7 @@ void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
//--------------------------------------------------------------------
-// Erzwingt die Initialisierung, die sonst nur im Activate kommt
+// Forces the initialization, which is otherwise only happens in Activate
void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
{
@@ -1228,17 +1227,17 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
USHORT nSID = pSVMenu->GetItemId(nPos);
PopupMenu *pMenu = pSVMenu->GetPopupMenu( nSID );
- DBG_ASSERT( pMenu, "Hier gibt es kein Popup!");
+ DBG_ASSERT( pMenu, "No popup exist here!");
SfxMenuControl &rCtrl = pItems[nPos];
if ( !rCtrl.GetId() )
{
- // VirtualMenu f"ur Sub-Menu erzeugen
+ // Generate VirtualMenu for Sub-Menu
BOOL bRes = bResCtor;
SfxVirtualMenu *pSubMenu =
new SfxVirtualMenu(nSID, this, *pMenu, FALSE, *pBindings, bOLE, bRes);
- DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
+ DBG_OUTF( ("New VirtualMenu %lx created", pSubMenu) );
rCtrl.Bind( this, nSID, *pSubMenu, pSVMenu->GetItemText(nSID), *pBindings );
}
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 1a5dbd9..90a7a28 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -139,24 +139,26 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
SfxStatusBarControl::SfxStatusBarControl
(
- USHORT nSlotID, /* Slot-Id, mit der diese Instanz
- verbunden wird. Wurde bei der
- Registrierung eine Slot-Id != 0
- angegeben, ist dies immer die dort
- angegebene. */
+ USHORT nSlotID, /* Slot-Id which is connected to this
+ instance. If a Slot-Id is set to != 0 at
+ registration it will always be set there.
+ */
+
+
USHORT nCtrlID, /* ID of this controller in the status bar */
- StatusBar& rBar /* Referenz auf die StatusBar, f"ur die
- dieses Control erzeugt wurde. */
+ StatusBar& rBar /* Reference to the StatusBar,for which
+ this Control was created. */
)
-/* [Beschreibung]
- Konstruktor der Klasse SfxStatusBarControl. Die Subclasses werden
- bei Bedarf per Factory vom SFx erzeugt.
+/* [Description]
+
+ Constructor of the SfxStatusBarControl Class. The Subclasses are
+ created at the Factory if necessary.
- Instanzen dieser Basisklasse werden f"ur alle StatusBar-Felder
- erzeugt, f"ur die keine speziellen registriert wurden.
+ Instances of this base class are created for all StatusBar-fields
+ for which no specific ones have been registered.
*/
: svt::StatusbarController(),
@@ -170,10 +172,10 @@ SfxStatusBarControl::SfxStatusBarControl
SfxStatusBarControl::~SfxStatusBarControl()
-/* [Beschreibung]
+/* [Description]
- Destruktor der Klasse SfxStatusBarControl. Die Instanzen dieser
- Klasse und deren Subklassen werden vom SFx zerst"ort.
+ Destructor of the SfxStatusBarControl Class. The Class and its Subclasses
+ are destroyed by SFx.
*/
{}
@@ -433,20 +435,20 @@ void SfxStatusBarControl::StateChanged
(
USHORT nSID,
SfxItemState eState,
- const SfxPoolItem* pState /* Zeiger auf ein SfxPoolItem, welches nur
- innerhalb dieses Methodenaufrufs g"ultig
- ist. Es kann ein 0-Pointer, ein Pointer
- auf ein SfxVoidItem oder auf den Typ, f"ur
- den die Subclass von SfxStatusBarControl
- registriert ist vorkommen. */
+ const SfxPoolItem* pState /* Pointer to SfxPoolItem, is only valid
+ withih this Method call. This can be a
+ Null-Pointer, a Pointer to SfxVoidItem
+ or of this Type found registered by the
+ Subclass of SfxStatusBarControl.
+ */
)
-/* [Beschreibung]
+/* [Description]
- Die Basisimplementation versteht Items vom Type SfxStringItem, bei
- denen der Text in das Status-Zeilen-Feld eingetragen wird und
- SfxVoidItem, bei denen das Feld geleert wird. Die Basisimplementierng
- sollte in "uberladenen Methoden nicht gerufen werden.
+ The base implementation includes items of type SfxStringItem
+ where the text is entered in the status row field and
+ SfxVoidItem, where the field is emptied. The base implementation
+ should not be called in overloaded methods.
*/
{
@@ -468,25 +470,23 @@ void SfxStatusBarControl::StateChanged
BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode ist eine Weiterleitung des Events
- MouseButtonDown() der StatusBar, falls die Maus-Position innerhalb
- des Bereichs des betreffenden Items ist, oder die Maus von diesem
- Control mit <SfxStatusBarControl::CaptureMouse()> gecaptured wurde.
+ This virtual method forwards the Event MouseButtonDown() of the
+ StatusBar if the mouse position is within the range of the items,
+ or if the mouse was captured by <SfxStatusBarControl::CaptureMouse()>
- Die Defaultimplementierung ist leer und gibt FALSE zur"uck.
+ The default implementation is empty and returns FALSE.
-
- [Rueckgabewert]
+ [Return value]
BOOL TRUE
- das Event wurde bearbeitet und soll nicht an
- die StatusBar weitergeleitet werden
+ The event has been processed and is not intended to
+ be forwarded to StatusBar
FALSE
- das Event wurde nicht bearbeitet und soll an
- die StatusBar weitergeleitet werden
+ The event was not processed and is to be
+ be forwarded to StatusBar
*/
{
@@ -497,25 +497,23 @@ BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
-/* [Beschreibung]
-
- Diese virtuelle Methode ist eine Weiterleitung des Events
- MouseMove() der StatusBar, falls die Maus-Position innerhalb
- des Bereichs des betreffenden Items ist, oder die Maus von diesem
- Control mit <SfxStatusBarControl::CaptureMouse()> gecaptured wurde.
+/* [Description]
- Die Defaultimplementierung ist leer und gibt FALSE zur"uck.
+ This virtual method forwards the Event MouseMove() of the
+ StatusBar if the mouse position is within the range of the items,
+ or if the mouse was captured by <SfxStatusBarControl::CaptureMouse()>
+ The default implementation is empty and returns FALSE.
- [Rueckgabewert]
+ [Return value]
BOOL TRUE
- das Event wurde bearbeitet und soll nicht an
- die StatusBar weitergeleitet werden
+ The event has been processed and is not intended to
+ be forwarded to StatusBar
FALSE
- das Event wurde nicht bearbeitet und soll an
- die StatusBar weitergeleitet werden
+ The event was not processed and is to be
+ be forwarded to StatusBar
*/
{
@@ -526,25 +524,23 @@ BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
-/* [Beschreibung]
-
- Diese virtuelle Methode ist eine Weiterleitung des Events
- MouseButtonUp() der StatusBar, falls die Maus-Position innerhalb
- des Bereichs des betreffenden Items ist, oder die Maus von diesem
- Control mit <SfxStatusBarControl::CaptureMouse()> gecaptured wurde.
+/* [Description]
- Die Defaultimplementierung ist leer und gibt FALSE zur"uck.
+ This virtual method forwards the Event MouseButtonUp() of the
+ StatusBar if the mouse position is within the range of the items,
+ or if the mouse was captured by <SfxStatusBarControl::CaptureMouse()>
+ The default implementation is empty and returns FALSE.
- [Rueckgabewert]
+ [Return value]
BOOL TRUE
- das Event wurde bearbeitet und soll nicht an
- die StatusBar weitergeleitet werden
+ The event has been processed and is not intended to
+ be forwarded to StatusBar
FALSE
- das Event wurde nicht bearbeitet und soll an
- die StatusBar weitergeleitet werden
+ The event was not processed and is to be
+ be forwarded to StatusBar
*/
{
@@ -555,12 +551,12 @@ BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
void SfxStatusBarControl::Command( const CommandEvent& )
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode wird gerufen, wenn f"ur dieses SfxStatusBarControl
- ein CommandEvent f"ur erkannt wurde.
+ This virtual method is called when a CommandEvent is recived by
+ SfxStatusBarControl.
- Die Defaultimplementierung ist leer.
+ The default implementation is empty.
*/
{
@@ -570,12 +566,12 @@ void SfxStatusBarControl::Command( const CommandEvent& )
void SfxStatusBarControl::Click()
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode wird gerufen, wenn der Anwender mit der Maus
- in das zu diesem Control geh"orige Feld der Statuszeile klickt.
+ This virtual method is called when the user clicks on the
+ field in the status row that belongs to this control.
- Die Defaultimplementierung ist leer.
+ The default implementation is empty.
*/
{
@@ -585,10 +581,10 @@ void SfxStatusBarControl::Click()
void SfxStatusBarControl::DoubleClick()
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode wird gerufen, wenn der Anwender mit der Maus
- in das zu diesem Control geh"orige Feld der Statuszeile doppel-klickt.
+ This virtual method is called when the user double-clicks on the
+ field in the status row that belongs to this control.
*/
{
@@ -600,18 +596,17 @@ void SfxStatusBarControl::DoubleClick()
void SfxStatusBarControl::Paint
(
- const UserDrawEvent& /* Referenz auf einen UserDrawEvent */
+ const UserDrawEvent& /* Reference to an UserDrawEvent */
)
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode wird gerufen, falls das betreffende Feld
- mit SIB_USERDRAW gekennzeichnet ist, um den Inhalt zu zeichnen.
- Die Ausgabe mu"s auf dem in durch rUDEvt.GetDevice() erh"altlichen
- OutputDevice innerhalb des durch rUDEvt.GetRect() angegebenenen
- Rechtecks erfolgen.
+ This virtual method is called to paint the contents if the field
+ at hand is marked with SIB_USERDRAW. The output must be obtained
+ within the Rectangle of rUDEvt.GetRect() by the OutputDevice
+ given by rUDEvt.GetDevice().
- Die Defaultimplementierung ist leer.
+ The default implementation is empty.
*/
{
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f4dab73..4ccc2e6 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -399,33 +399,31 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbx
SfxItemState SfxToolBoxControl::GetItemState(
const SfxPoolItem* pState )
-/* [Beschreibung]
+/* [Description]
- Statische Methode zum Ermitteln des Status des SfxPoolItem-Pointers,
- in der Methode <SfxControllerItem::StateChanged(const SfxPoolItem*)>
- zu verwenden.
+ Static method for determining the status of the SfxPoolItem-pointer,
+ used in the method <SfxControllerItem::StateChanged(const SfxPoolItem*)>.
- [R"uckgabewert]
+ [Return value]
SfxItemState SFX_ITEM_UNKNOWN
- Enabled, aber keine weitere Statusinformation
- verf"ugbar. Typisch f"ur <Slot>s, die allenfalls
- zeitweise disabled sind, aber ihre Darstellung sonst
- nicht "andern.
+ Enabled, however no further status information is available.
+ Typical for <Slot>s, which are temporarily disabled a
+ anyway but other than that do not change their appearance.
SFX_ITEM_DISABLED
- Disabled und keine weiter Statusinformation
- verf"ugbar. Alle anderen ggf. angezeigten Werte sollten
- auf den Default zur"uckgesetzt werden.
+ Disabled, no further status information is available.
+ All other displayed values should be reset to the default
+ if possible.
SFX_ITEM_DONTCARE
- Enabled aber es waren nur uneindeutige Werte
- verf"ugbar (also keine, die abgefragt werden k"onnen).
+ Enabled but there were only ambiguous values available
+ (i.e. none that could be queried).
SFX_ITEM_AVAILABLE
- Enabled und mit verf"ugbarem Wert, der von 'pState'
- erfragbar ist. Der Typ ist dabei im gesamten
- Programm eindeutig und durch den Slot festgelegt.
+ Enabled and with available values which can be queried
+ through'pState'. The type is thus by the Slot clearly
+ defined in the entire Program.
*/
{
@@ -964,7 +962,7 @@ void SfxToolBoxControl::StateChanged
if ( GetId() >= SID_OBJECTMENU0 && GetId() <= SID_OBJECTMENU_LAST )
return;
- // enabled/disabled-Flag pauschal korrigieren
+ // enabled/disabled-Flag correcting the lump sum
pImpl->pBox->EnableItem( GetId(), eState != SFX_ITEM_DISABLED );
USHORT nItemBits = pImpl->pBox->GetItemBits( GetId() );
@@ -976,7 +974,7 @@ void SfxToolBoxControl::StateChanged
{
if ( pState->ISA(SfxBoolItem) )
{
- // BoolItem fuer checken
+ // BoolItem for checking
if ( ((const SfxBoolItem*)pState)->GetValue() )
eTri = STATE_CHECK;
nItemBits |= TIB_CHECKABLE;
@@ -984,7 +982,7 @@ void SfxToolBoxControl::StateChanged
else if ( pState->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pState)->HasBoolValue())
{
- // EnumItem wie Bool behandeln
+ // EnumItem is handled as Bool
if ( ((const SfxEnumItemInterface *)pState)->GetBoolValue() )
eTri = STATE_CHECK;
nItemBits |= TIB_CHECKABLE;
@@ -1390,7 +1388,7 @@ void SfxPopupWindow::PopupModeEnd()
if ( IsVisible() )
{
- // wurde abgerissen
+ // was teared-off
DeleteFloatingWindow();
m_bFloating = TRUE;
}
@@ -1417,7 +1415,7 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
FloatingWindow::MouseMove( rMEvt );
else
{
- // MouseMove-Event an die Children forwarden
+ // Forward MouseMove-Event to Children
::Point aPos = rMEvt.GetPosPixel();
::Point aScrPos = OutputToScreenPixel( aPos );
USHORT i = 0;
@@ -1451,14 +1449,14 @@ void SfxPopupWindow::EndCascading()
SfxPopupWindow* SfxPopupWindow::Clone() const
-/* [Beschreibung]
+/* [Description]
- Diese Methode mu\s "uberladen werden, um dieses Popup auch im
- Presentations-Modus anzuzeigen. Sie wird gerufen, wenn ein Show()
- sinnlos w"are, da der Parent nicht das Presentations-Window ist.
- Beim neu erzeugen wird automatisch das neue Top-Window verwendet, so
- da\s der Parent das Presentations-Window ist und das neue Popup somit
- sichtbar ist.
+ This method must be overloaded to show this Popup also in the
+ Presentation-mode. It is called when a Show() would be meaningless
+ since the parent is no presentation window.
+ When create a new window the bew Top-Window will be used automatically,
+ so that the Parent becomes the presentation window and and that the new
+ Popup therefore becomes visible.
*/
{
@@ -1471,16 +1469,14 @@ void SfxPopupWindow::StateChanged(
USHORT /*nSID*/,
SfxItemState eState,
const SfxPoolItem* /*pState*/ )
-/* [Bescheibung]
+/* [Description]
- Siehe auch <SfxControllerItem::StateChanged()>. Au\serdem wird
- bei eState==SFX_ITEM_DISABLED das Popup gehided und in allen anderen
- F"allen, falls es floating ist, wieder angezeigt. Daher mu\s die
- Basisklasse i.d.R. gerufen werden.
-
- Es findet wegen des Parents eine Sonderbehandlung f"ur den
- Presentationsmodus statt.
+ See also <SfxControllerItem::StateChanged()>. In addition the Popup
+ will become hidden when eState==SFX_ITEM_DISABLED and in all other
+ cases it will be shown again if it is floating. In general this requires
+ to call the Base class.
+ Due to the parent the presentation mode is handled in a special way.
*/
{
More information about the Libreoffice-commits
mailing list