diff options
author | Martin Kepplinger <martinkepplinger@eml.cc> | 2011-04-21 21:52:58 +0200 |
---|---|---|
committer | Martin Kepplinger <martinkepplinger@eml.cc> | 2011-04-21 21:54:00 +0200 |
commit | 5c4746f37f0ea657cca9e2cb8f745ebcbdcb83bb (patch) | |
tree | df38b3b5c42d0ec322667069f22acf632c0f8c2e /sw | |
parent | 43401d5f5531961fbe70df0f0912bf9cda961b4b (diff) |
Translate german code comments
Translate german code comments to english!
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/inc/srcview.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/swcont.hxx | 12 | ||||
-rw-r--r-- | sw/source/ui/inc/swdtflvr.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/swlbox.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/swuiidxmrk.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/tabledlg.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/tmpdlg.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/toxmgr.hxx | 10 | ||||
-rw-r--r-- | sw/source/ui/inc/uiitems.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/uinums.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/inc/uitool.hxx | 16 | ||||
-rw-r--r-- | sw/source/ui/inc/utlui.hrc | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/view.hxx | 77 | ||||
-rw-r--r-- | sw/source/ui/inc/workctrl.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/inc/wrap.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 152 |
16 files changed, 146 insertions, 155 deletions
diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 42fd797c9e74..faa770fc1ac5 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -49,7 +49,7 @@ class SwSrcView: public SfxViewShell rtl_TextEncoding eLoadEncoding; void Init(); - // fuer Readonly-Umschaltung + // for read-only switching virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index 0472ed3bc470..9ae0856ea8d5 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -33,7 +33,7 @@ class SwContentType; -//Reihenfolge und Anzahl mit ResIds abgleichen!! +// synchronize order and number with ResIds!! #define CONTENT_TYPE_OUTLINE 0 #define CONTENT_TYPE_TABLE 1 #define CONTENT_TYPE_FRAME 2 @@ -49,17 +49,17 @@ class SwContentType; #define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1 -// Typen fuer das Globaldokument +// types for global document #define GLOBAL_CONTENT_REGION 100 #define GLOBAL_CONTENT_INDEX 101 #define GLOBAL_CONTENT_TEXT 102 #define GLOBAL_CONTENT_MAX 3 -// Strings fuer Kontextmenue +// strings for context menus #define CONTEXT_COUNT 12 #define GLOBAL_CONTEXT_COUNT 14 -// Modi fuer Drag 'n Drop +// modes for Drag 'n Drop #define REGION_MODE_NONE 0 #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 @@ -94,12 +94,12 @@ public: const String& GetName() const {return sContentName;} int operator==(const SwContent& /*rCont*/) const { - //gleich sind sie nie, sonst fallen sie aus dem Array + // they're never equal, otherwise they'd fall out of the array return sal_False; } int operator<(const SwContent& rCont) const { - //zuerst nach Position dann nach Name sortieren + // at first sort by position and then by name return nYPosition != rCont.nYPosition ? nYPosition < rCont.nYPosition : sContentName < rCont.sContentName;; diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index de826236705c..3caa280b522a 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -58,7 +58,7 @@ namespace nsTransferBufferType const sal_uInt16 TRNSFR_DDELINK = 0x0010; const sal_uInt16 TRNSFR_OLE = 0x0020; const sal_uInt16 TRNSFR_INETFLD = 0x0040; - const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern! + const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too! } #define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor @@ -77,7 +77,7 @@ class SwTransferable : public TransferableHelper const ViewShell *pCreatorView; SwDocFac *pClpDocFac; Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; - INetBookmark *pBkmk; // URL und Beschreibung! + INetBookmark *pBkmk; // URL and description! ImageMap *pImageMap; INetImage *pTargetURL; diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 7b8a958006b5..9788146dde63 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -41,7 +41,7 @@ class Window; SV_DECL_PTRARR_DEL(SwEntryLst, SwBoxEntry*, 10, 10) /*-------------------------------------------------------------------- - Beschreibung: SwBoxEntry + Description: SwBoxEntry --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwBoxEntry { @@ -62,7 +62,7 @@ public: }; /*-------------------------------------------------------------------- - Beschreibung: fuer ComboBoxen + Description: for combo boxes --------------------------------------------------------------------*/ typedef sal_uInt16 SwComboBoxStyle; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 098010ad7134..5a673c5c304d 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -52,7 +52,7 @@ class SwWrtShell; class SwTOXMgr; class SwTOXMark; /*-------------------------------------------------------------------- - Beschreibung: Markierung fuer Verzeichniseintrag einfuegen + Description: insert mark for index entry --------------------------------------------------------------------*/ class SwIndexMarkFloatDlg; class SwIndexMarkModalDlg; diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index 572637109aa6..677ab6c951f2 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -39,7 +39,7 @@ class SwTabCols; struct TColumn; /*------------------------------------------------------- - Tabellendialog + table dialog --------------------------------------------------------- */ class SwTableTabDlg : public SfxTabDialog { diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index 479e54da06c1..966ec13be1e5 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.hxx @@ -34,7 +34,7 @@ class SfxItemSet; class SwWrtShell; /*-------------------------------------------------------------------- - Beschreibung: Der Tabdialog Traeger der TabPages + Description: the tab dialog carrier of TabPages --------------------------------------------------------------------*/ class SwTemplateDlg: public SfxStyleDialog { diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index d80bcf05b577..87eb6100a21f 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -37,7 +37,7 @@ class SwWrtShell; class SwForm; /*-------------------------------------------------------------------- - Beschreibung: Manager fuer Verzeichnisfunktionalitaet + Description: manager for directory functionality --------------------------------------------------------------------*/ //one single method will be sufficient to insert AND upate indexes class SW_DLLPUBLIC SwTOXDescription @@ -281,7 +281,7 @@ public: explicit SwTOXMgr(SwWrtShell* pShell); // - // Methoden fuer Verzeichnismarkierungen + // methods for directory marks // void InsertTOXMark(const SwTOXMarkDescription& rDesc); @@ -292,7 +292,7 @@ public: void NextTOXMark(sal_Bool bSame=sal_False); void PrevTOXMark(sal_Bool bSame=sal_False); - // Aktuelle TOXmarks holen + // get current TOXmarks sal_uInt16 GetTOXMarks(); sal_uInt16 GetTOXMarkCount(); SwTOXMark* GetTOXMark(sal_uInt16 nId); @@ -300,7 +300,7 @@ public: void SetCurTOXMark(sal_uInt16 nId); // - // Methoden fuer Verzeichnisse + // methods for directories // sal_Bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); @@ -310,7 +310,7 @@ public: }; /*-------------------------------------------------------------------- - Beschreibung: Inlines + Description: inlines --------------------------------------------------------------------*/ inline sal_uInt16 SwTOXMgr::GetTOXMarkCount() { return aCurMarks.Count(); } diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index f33a2b01418b..d575593053e6 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -37,7 +37,7 @@ class SwNumRule; class IntlWrapper; /*-------------------------------------------------------------------- - Beschreibung: Container fuer FootNote + Description: container for FootNote --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwPageFtnInfoItem : public SfxPoolItem { diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index b748eafe4a04..5f2f87009da6 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -44,8 +44,8 @@ SV_DECL_PTRARR_DEL( _SwNumFmtsAttrs, SfxPoolItemPtr, 5,0 ) class SW_DLLPUBLIC SwNumRulesWithName { String aName; - // die Formate der NumRule muessen! unabhaengig von einem Document sein - // (Sie sollen immer vorhanden sein!) + // the NumRule's formats _have_ to be independent of a document + // (They should always be there!) class SW_DLLPRIVATE _SwNumFmtGlobal { SwNumFmt aFmt; @@ -87,7 +87,7 @@ public: class SwBaseNumRules { public: - enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms + enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms protected: SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; String sFileName; diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index 374c00780300..e5199bf5bbf2 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -46,28 +46,28 @@ class SwTabCols; class DateTime; class SfxViewFrame; -// Umschalten einer Metric +// switch a metric SW_DLLPUBLIC void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit); -// BoxInfoAttribut fuellen +// fill BoxInfoAttribut SW_DLLPUBLIC void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh); // SfxItemSets <-> PageDesc void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ); void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet); -// Auffuellen der Tabs mit DefaultTabs +// fill tabs with default tabs SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs); -// DefaultTabs loeschen aus dem TabStopArray +// erase DefaultTabs from TabStopArray //void EraseDefTabs(SvxTabStopItem& rTabs); -// Abstand zwischen dem 1. und zweitem Element ermitteln +// determine space between 1st and 2nd element SW_DLLPUBLIC sal_uInt16 GetTabDist(const SvxTabStopItem& rTabs); -// erfrage ob im Set eine Sfx-PageDesc-Kombination vorliegt -// und setze diesen im Set und loesche die Transport Items -// (PageBreak & PageModel) aus dem Set +// determine whether a Sfx-PageDesc combination exists in the set +// and set this in the set and delete the transport items +// (PageBreak & PageModel) from the set void SwToSfxPageDescAttr( SfxItemSet& rSet ); void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ); diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index 41655ce860c0..517ac26514a9 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -42,7 +42,7 @@ #define STR_HYPERCTRL_SEL (RC_UTLUI_BEGIN + 5) #define STR_HYPERCTRL_HYP (RC_UTLUI_BEGIN + 6) -// Namene der Inhaltstypen (RC_UTLUI_BEGIN + 7) +// names of content types (RC_UTLUI_BEGIN + 7) #define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8) #define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST #define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index d91b22d0fdae..c4e6146096a7 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -134,7 +134,7 @@ enum ShellModes }; /*-------------------------------------------------------------------- - Beschreibung: Anwendung einer Vorlage + Description: apply a template --------------------------------------------------------------------*/ struct SwApplyTemplate { @@ -163,11 +163,11 @@ struct SwApplyTemplate }; /*-------------------------------------------------------------------- - Beschreibung: Sicht auf ein Dokument + Description: view of a document --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwView: public SfxViewShell { - //Messehack (MA,MBA) + // exhibition hack (MA,MBA) friend void lcl_SelectShellForDrop( SwView &rView ); friend class TestTemplateItem; @@ -176,7 +176,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell friend class SwView_Impl; friend class SwClipboardChangeListener; - //suchen & ersetzen + // search & replace static SvxSearchDialog *pSrchDlg; static SvxSearchItem *pSrchItem; @@ -184,8 +184,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static sal_uInt16 nWebInsertCtrlState; static sal_uInt16 nInsertObjectCtrlState; static sal_uInt16 nInsertFieldCtrlState; - static sal_uInt16 nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi) - static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte Merker + static sal_uInt16 nMoveType; // for buttons below the scrollbar (viewmdi) + static sal_Int32 nActMark; // current jump mark for unknown mark static sal_Bool bExtra; static sal_Bool bFound; @@ -196,37 +196,34 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SvxHtmlOptions aHTMLOpt; - Timer aTimer; //Fuer verzoegerte ChgLnks waehrend - //einer Aktion - String aPageStr; //Statusanzeige, aktuelle Seite + Timer aTimer; // for delayed ChgLnks during an action + String aPageStr; // status view, current page String sSwViewData, //and the new cursor position if the user double click in the PagePreView sNewCrsrPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 nNewPage; - Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus - //aus dem Dokument heraus. + Point aTabColFromDocPos; // moving table colmns out of the document SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# - Size aDocSz; // aktuelle Dokumentgroesse - Rectangle aVisArea; // sichtbarer Bereich + Size aDocSz; // current document size + Rectangle aVisArea; // visible region SwEditWin *pEditWin; SwWrtShell *pWrtShell; - SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher + SfxShell *pShell; // current SubShell at the dispatcher FmFormShell *pFormShell; // DB-FormShell - SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic + SwView_Impl *pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *pHScrollbar, // MDI Bedienelemente + SwScrollbar *pHScrollbar, // MDI control elements *pVScrollbar; - Window *pScrollFill; // Dummy-Window zum Fuellen der rechten - // unteren Ecke, wenn beide Scrollbars - // aktiv sind + Window *pScrollFill; // dummy window for filling the lower right edge + // when both scrollbars are active SvxRuler *pHRuler, *pVRuler; @@ -236,7 +233,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell *pPageDownBtn; SwNaviImageButton *pNaviBtn; - SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine + SwGlossaryHdl *pGlosHdl; // handle text block SwDrawBase *pDrawActual; const SwFrmFmt *pLastTableFormat; @@ -254,7 +251,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell sal_uInt16 nPageCnt; - // Aktueller Drawmode + // current draw mode sal_uInt16 nDrawSfxId; String sDrawCustom; //some drawing types are marked with strings! sal_uInt16 nFormSfxId; @@ -288,8 +285,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bMakeSelectionVisible : 1 // transport the bookmark selection ; - // Methoden fuers Suchen - // Suchkontext setzen + // methods for searching + // set search context SW_DLLPRIVATE sal_Bool SearchAndWrap(sal_Bool bApi = sal_False); SW_DLLPRIVATE sal_Bool SearchAll(sal_uInt16* pFound = 0); SW_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions ); @@ -299,7 +296,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE sal_Bool IsTextTool() const; - // Bedienelemente verwalten anlegen + // create control elements SW_DLLPRIVATE void CreateBtns(); SW_DLLPRIVATE DECL_LINK( BtnPage, Button * ); @@ -320,7 +317,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE sal_Bool GetPageScrollUpOffset(SwTwips& rOff) const; SW_DLLPRIVATE sal_Bool GetPageScrollDownOffset(SwTwips& rOff) const; - // Scrollbar Movements + // scrollbar movements SW_DLLPRIVATE long PageUp(); SW_DLLPRIVATE long PageDown(); SW_DLLPRIVATE long PageUpCrsr(sal_Bool bSelect); @@ -337,7 +334,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void CreatePageButtons(sal_Bool bShow); - // Linguistik-Funktionen + // linguistics functions SW_DLLPRIVATE void HyphenateDocument(); SW_DLLPRIVATE sal_Bool IsDrawTextHyphenate(); SW_DLLPRIVATE void HyphenateDrawText(); @@ -356,16 +353,16 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE void SpellKontext(sal_Bool bOn = sal_True) { bCenterCrsr = bOn; bAllwaysShowSel = bOn; } - // Methoden fuers Printing + // methods for printing SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); - // fuer Readonly-Umschaltung + // for readonly switching SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); SW_DLLPRIVATE void _CheckReadonlyState(); SW_DLLPRIVATE void _CheckReadonlySelection(); - // Methode fuer PageDesc drehen + // method for rotating PageDesc SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR); SW_DLLPRIVATE void _SetZoom( const Size &rEditSz, @@ -389,7 +386,7 @@ protected: int GetSelectionType() const { return nSelectionType; } void SetSelectionType(int nSet) { nSelectionType = nSet;} - // fuer die SwWebView + // for SwWebView void SetShell( SfxShell* pS ) { pShell = pS; } void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; } @@ -444,7 +441,7 @@ public: bool IsValidSelectionForThesaurus() const; String GetThesaurusLookUpText( bool bSelection ) const; - // Shell sofort wechseln -> fuer GetSelectionObject + // immediately switch shell -> for GetSelectionObject void StopShellTimer(); inline SwWrtShell& GetWrtShell () const { return *pWrtShell; } @@ -457,7 +454,7 @@ public: void ScannerEventHdl( const ::com::sun::star::lang::EventObject& rEventObject ); #endif - //Handler fuer Textbausteine an die Textshell rausreichen, gfs. anlegen + // hand the handler for text blocks to the shell; create if applicable SwGlossaryHdl* GetGlosHdl(); inline const Rectangle& GetVisArea() const { return aVisArea; } @@ -509,7 +506,7 @@ public: sal_Bool HandleWheelCommands( const CommandEvent& ); - // Rahmen einfuegen + // insert frames void InsFrmMode(sal_uInt16 nCols); void SetZoom( SvxZoomType eZoomType, short nFactor = 100, sal_Bool bViewOnly = sal_False); @@ -563,7 +560,7 @@ public: void StateStatusLine(SfxItemSet&); - // Funktionen fuer Drawing + // functions for drawing void SetDrawFuncPtr(SwDrawBase* pFuncPtr); inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const { return pDrawActual; } void GetDrawState(SfxItemSet &rSet); @@ -573,7 +570,7 @@ public: inline sal_Bool IsDrawSelMode() { return bDrawSelMode; } void SetSelDrawSlot(); inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; } - void NoRotate(); // Rotate-Mode abschalten + void NoRotate(); // turn off rotate mode sal_Bool EnterDrawTextMode(const Point& aDocPos); void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();} sal_Bool IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); } @@ -587,30 +584,30 @@ public: void StateTabWin(SfxItemSet&); - // Attribute haben sich geaendert + // attributes have changed DECL_LINK( AttrChangedNotify, SwWrtShell * ); // form control has been activated DECL_LINK( FormControlActivated, FmFormShell* ); - // Links bearbeiten + // edit links void EditLinkDlg(); void AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId = 0); void InsertCaption(const InsCaptionOpt *pOpt); - // Async Aufruf durch Core + // Async call by Core void UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); String GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); - // Shell rausreichen + // hand over Shell SfxShell *GetCurShell() { return pShell; } SwDocShell *GetDocShell(); inline const SwDocShell *GetDocShell() const; inline FmFormShell *GetFormShell() { return pFormShell; } inline const FmFormShell *GetFormShell() const { return pFormShell; } - //damit in DToren der SubShells ggf. pShell zurueckgesetzt werden kann + // so that in the SubShells' DTors pShell can be reset if applicable void ResetSubShell() { pShell = 0; } virtual void WriteUserData(String &, sal_Bool bBrowse = sal_False ); diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 805f7382babc..2e8588c23c15 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -36,8 +36,8 @@ class PopupMenu; class SwView; -// doppelter Eintrag! hrc und hxx -// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun +// double entry! hrc and hxx +// these Ids say what the buttons below the scrollbar are doing #define NID_START 20000 #define NID_NEXT 20000 #define NID_PREV 20001 @@ -186,7 +186,7 @@ class SwNaviImageButton : public ImageButton }; //---------------------------------------------------------------------------- -// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen +// ImageButtons have to set the HelpText themselves if needed //---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 94e5e7f9be3f..34913202199b 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -56,7 +56,7 @@ public: /*-------------------------------------------------------------------- - Beschreibung: Umlauf-TabPage + Description: circulation TabPage --------------------------------------------------------------------*/ class SwWrapTabPage: public SfxTabPage diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 5579fe5ec94a..ff4f61eaa413 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -70,17 +70,17 @@ namespace com { namespace sun { namespace star { namespace util { typedef sal_Int32 SelectionType; namespace nsSelectionType { - const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001 - const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002 - const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 - const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform - const SelectionType SEL_NUM = 0x000040; // NumListe - const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle - const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert - const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...) - const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode - const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren - const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms + const SelectionType SEL_TXT = CNT_TXT; // text, never frames too 0x0001 + const SelectionType SEL_GRF = CNT_GRF; // graphic 0x0002 + const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010 + const SelectionType SEL_FRM = 0x000020; // frame, no content type + const SelectionType SEL_NUM = 0x000040; // NumList + const SelectionType SEL_TBL = 0x000080; // cursor is in table + const SelectionType SEL_TBL_CELLS = 0x000100; // table cells are selected + const SelectionType SEL_DRW = 0x000200; // drawing objects (rectangle, circle...) + const SelectionType SEL_DRW_TXT = 0x000400; // draw-textobjects in edit mode + const SelectionType SEL_BEZ = 0x000800; // edit ornament objects + const SelectionType SEL_DRW_FORM = 0x001000; // drawing objects: DB-Forms const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients. const SelectionType SEL_MEDIA = 0x004000; // Media object const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape @@ -115,11 +115,10 @@ public: SELECTFUNC fnEndDrag; SELECTFUNC fnKillSel; - // Alle Selektionen aufheben + // reset all selections long ResetSelect( const Point *, sal_Bool ); - //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down - //zurueck, falls ein Stack aufgebaut ist + // resets the cursorstack after movement with PageUp/-Down if a stack is built up inline void ResetCursorStack(); SelectionType GetSelectionType() const; @@ -131,7 +130,7 @@ public: void EndSelect(); sal_Bool IsInSelect() const { return bInSelect; } void SetInSelect(sal_Bool bSel = sal_True) { bInSelect = bSel; } - // Liegt eine Text- oder Rahmenselektion vor? + // is there a text- or frameselection? sal_Bool HasSelection() const { return SwCrsrShell::HasSelection() || IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); } sal_Bool Pop( sal_Bool bOldCrsr = sal_True ); @@ -162,31 +161,30 @@ public: void EnterSelFrmMode(const Point *pStartDrag = 0); void LeaveSelFrmMode(); sal_Bool IsSelFrmMode() const { return bLayoutMode; } - // Selektion von Rahmen aufheben + // reset selection of frames void UnSelectFrm(); void Invalidate(); - // Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar + // select table cells for editing of formulas in the ribbonbar inline void SelTblCells( const Link &rLink, sal_Bool bMark = sal_True ); inline void EndSelTblCells(); - //Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird - //in der Regel in MB-Up gerufen. + // leave per word or per line selection mode. Is usually called in MB-Up. sal_Bool IsExtSel() const { return bSelWrd || bSelLn; } - // erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist - // Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen. + // query whether the active fnDrag pointer is set to BeginDrag + // is needed for MouseMove to work around bugs 55592/55931 inline sal_Bool Is_FnDragEQBeginDrag() const; - //Basisabfragen + // base requests sal_Bool IsInWrd() { return IsInWord(); } sal_Bool IsSttWrd() { return IsStartWord(); } sal_Bool IsEndWrd(); sal_Bool IsSttOfPara() const { return IsSttPara(); } sal_Bool IsEndOfPara() const { return IsEndPara(); } - //Word bzw. Satz selektieren. + // select word / sentense sal_Bool SelNearestWrd(); sal_Bool SelWrd (const Point * = 0, sal_Bool bProp=sal_False ); // #i32329# Enhanced selection @@ -195,7 +193,7 @@ public: // <-- long SelAll(); - //Basiscursortravelling + // basecursortravelling typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool SimpleMove( FNSimpleMove, sal_Bool bSelect ); @@ -242,7 +240,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 ); - // Spaltenweise Spruenge + // per column jumps sal_Bool StartOfColumn ( sal_Bool bSelect = sal_False ); sal_Bool EndOfColumn ( sal_Bool bSelect = sal_False ); sal_Bool StartOfNextColumn ( sal_Bool bSelect = sal_False ); @@ -250,18 +248,18 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool StartOfPrevColumn ( sal_Bool bSelect = sal_False ); sal_Bool EndOfPrevColumn ( sal_Bool bSelect = sal_False ); - // setze den Cursor auf die Seite "nPage" an den Anfang - // zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx - // werden hier alle bestehenden Selektionen vor dem Setzen des - // Cursors aufgehoben + // set the cursor to page "nPage" at the beginning + // additionally to a identically named implementation in crsrsh.hxx + // here all existing selections are being reset before setting the + // cursor sal_Bool GotoPage( sal_uInt16 nPage, sal_Bool bRecord ); - //setzen des Cursors; merken der alten Position fuer Zurueckblaettern. + // setting the cursor; remember the old position for turning back DECL_LINK( ExecFlyMac, void * ); sal_Bool PageCrsr(SwTwips lOffset, sal_Bool bSelect); - // Felder Update + // update fields void UpdateInputFlds( SwInputFieldList* pLst = 0, sal_Bool bOnlyInSel = sal_False ); void NoEdit(sal_Bool bHideCrsr = sal_True); @@ -274,14 +272,13 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // change current data base and notify void ChgDBData(const SwDBData& SwDBData); - // Loeschen + // delete long DelToEndOfLine(); long DelToStartOfLine(); long DelLine(); long DelLeft(); - // loescht auch Rahmen bzw. setzt den Cursor in den Rahmen, - // wenn bDelFrm == sal_False ist + // also deletes the frame or sets the cursor in the frame when bDelFrm == sal_False long DelRight(); long DelToEndOfPara(); long DelToStartOfPara(); @@ -290,10 +287,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); long DelNxtWord(); long DelPrvWord(); - // Prueft, ob eine Wortselektion vorliegt. - // Gemaess den Regeln fuer intelligentes Cut / Paste - // werden umgebende Spaces rausgeschnitten. - // Liefert Art der Wortselektion zurueck (siehe enum) + // checks whether a word selection exists. + // According to the rules for intelligent Cut / Paste + // surrounding spaces are cut out. + // returns type of word selection (see enum) enum word { NO_WORD = 0, WORD_SPACE_BEFORE = 1, @@ -302,10 +299,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); }; int IntelligentCut(int nSelectionType, sal_Bool bCut = sal_True); - // Editieren + // edit void Insert(SwField &); void Insert(const String &); - // Graphic + // graphic void Insert( const String &rPath, const String &rFilter, const Graphic &, SwFlyFrmAttrMgr * = 0, sal_Bool bRule = sal_False ); @@ -318,11 +315,11 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True ); sal_Bool CanInsert(); - // Verzeichnisse + // indexes void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); sal_Bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - // Numerierung und Bullets + // numbering and bullets /** Turns on numbering or bullets. @@ -335,14 +332,14 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void BulletOn(); //OLE - void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 fuer Clipboard + void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard const svt::EmbeddedObjectRef&, - SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen. + SvGlobalName *pName = 0, // != 0 create object accordingly sal_Bool bActivate = sal_True, - sal_uInt16 nSlotId = 0); // SlotId fuer Dialog + sal_uInt16 nSlotId = 0); // SlotId for dialog sal_Bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); - void LaunchOLEObj( long nVerb = 0 ); // Server starten + void LaunchOLEObj( long nVerb = 0 ); // start server sal_Bool IsOLEObj() const { return GetCntType() == CNT_OLE;} virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, @@ -351,12 +348,12 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, const SwRect &rFrm ); - // Vorlagen und Formate + // styles and formats - // enum gibt an, was geschehen soll, wenn das Style nicht gefunden wurde - enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen - GETSTYLE_CREATESOME, // falls auf PoolId mapt anlegen - GETSTYLE_CREATEANY }; // ggfs Standard returnen + // enum tells when should happen when the style was not found + enum GetStyle { GETSTYLE_NOCREATE, // create none + GETSTYLE_CREATESOME, // if on PoolId create mapt + GETSTYLE_CREATEANY }; // return standard if applicable SwTxtFmtColl* GetParaStyle(const String &rCollName, GetStyle eCreate = GETSTYLE_NOCREATE); @@ -368,7 +365,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); String GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const; - // Aktuelle Vorlage anhand der geltenden Attribute aendern + // change current style using the attributes in effect void QuickUpdateStyle(); enum DoType { UNDO, REDO, REPEAT }; @@ -378,7 +375,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); String GetRepeatString() const; sal_uInt16 GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; - //Suchen oder Ersetzen + // search and replace sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt, sal_Bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnde, @@ -399,23 +396,23 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar = ' ' ); - // Aktion vor Cursorbewegung - // Hebt gfs. Selektionen auf, triggert Timer und GCAttr() + // action ahead of cursor movement + // resets selection if applicable, triggers timer and GCAttr() void MoveCrsr( sal_Bool bWithSelect = sal_False ); - // Eingabefelder updaten + // update input fields sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0); // update DropDown fields sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, ByteString* pWindowState = 0); - //"Handler" fuer Anederungen an der DrawView - fuer Controls. + //"Handler" for changes at DrawView - for controls. virtual void DrawSelChanged( ); - // springe zum Bookmark und setze die "Selections-Flags" wieder richtig + // jump to bookmark and set the "selctions-flags" correctly again sal_Bool GotoMark( const ::sw::mark::IMark* const pMark ); sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart ); sal_Bool GotoMark( const ::rtl::OUString& rName ); - sal_Bool GoNextBookmark(); // sal_True, wenn's noch eine gab + sal_Bool GoNextBookmark(); // sal_True when there still was one sal_Bool GoPrevBookmark(); bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark); @@ -426,46 +423,44 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // on graphics sal_Bool SelectNextPrevHyperlink( sal_Bool bNext = sal_True ); - // Zugehoerige SwView ermitteln + // determine corresponding SwView const SwView& GetView() const { return rView; } SwView& GetView() { return rView; } - //Weil es sonst keiner macht, gibt es hier eine ExecMacro() + // Because nobody else is doing it, here is a ExecMacro() void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 ); - // rufe ins dunkle Basic/JavaScript + // call into the dark Basic/JavaScript sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, sal_Bool bCheckPtr = sal_False, SbxArray* pArgs = 0, const Link* pCallBack = 0 ); - // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem. - // Fuehre die vor definierten Aktionen aus. + // a click at the given field. the cursor is on it. + // execute the predefined actions. void ClickToField( const SwField& rFld ); void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER ); sal_Bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER ); inline sal_Bool IsInClickToEdit() const ; - // fall ein URL-Button selektiert ist, dessen URL returnen, ansonsten - // einen LeerString + // if a URL-Button is selected, return its URL; otherwise an empty string sal_Bool GetURLFromButton( String& rURL, String& rDescr ) const; void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - // die Core erzeugt eine Selektion, das SttSelect muss gerufen werden + // Core creates a selection, SttSelect has to be called virtual void NewCoreSelection(); virtual void ApplyViewOptions( const SwViewOption &rOpt ); - // autom. Update von Vorlagen + // automatic update of styles void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet); void AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet); - // Link fuers einfuegen von Bereichen uebers Drag&Drop/Clipboard + // link for inserting ranges via Drag&Drop/Clipboard DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); - //ctoren, der erstere ist eine Art kontrollierter copy ctor fuer weitere - //Sichten auf ein Dokument + // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, const SwViewOption *pViewOpt = 0); @@ -515,7 +510,7 @@ private: {} } *pModeStack; - // Cursor bei PageUp / -Down mitnehmen + // carry cursor along when PageUp / -Down enum PageMove { MV_NO, @@ -554,7 +549,7 @@ private: SW_DLLPRIVATE sal_Bool PushCrsr(SwTwips lOffset, sal_Bool bSelect); SW_DLLPRIVATE sal_Bool PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False); - // ENDE Cursor bei PageUp / -Down mitnehmen + // take END cursor along when PageUp / -Down SW_DLLPRIVATE sal_Bool _SttWrd(); SW_DLLPRIVATE sal_Bool _EndWrd(); SW_DLLPRIVATE sal_Bool _NxtWrd(); @@ -568,7 +563,7 @@ private: sal_Bool _FwdPara(); SW_DLLPRIVATE sal_Bool _BwdPara(); - // Selektionen + // selections sal_Bool bIns :1; sal_Bool bInSelect :1; sal_Bool bExtMode :1; @@ -580,7 +575,7 @@ private: sal_Bool bSelWrd :1; sal_Bool bSelLn :1; sal_Bool bIsInClickToEdit:1; - sal_Bool bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen + sal_Bool bClearMark :1; // don't delete selection for ChartAutoPilot sal_Bool mbRetainSelection :1; // Do not remove selections Point aStart; @@ -588,7 +583,7 @@ private: SELECTFUNC fnLeaveSelect; - //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down zurueck. + // resets the cursor stack after movement by PageUp/-Down SW_DLLPRIVATE void _ResetCursorStack(); SW_DLLPRIVATE void SttDragDrop(Timer *); @@ -606,13 +601,12 @@ private: SW_DLLPRIVATE long ExtSelWrd(const Point *, sal_Bool bProp=sal_False ); SW_DLLPRIVATE long ExtSelLn(const Point *, sal_Bool bProp=sal_False ); - //Verschieben von Text aus Drag and Drop; Point ist - //Destination fuer alle Selektionen. + // move text from Drag and Drop; Point is destination for all selections. SW_DLLPRIVATE long MoveText(const Point *, sal_Bool bProp=sal_False ); SW_DLLPRIVATE long BeginFrmDrag(const Point *, sal_Bool bProp=sal_False ); - //nach SSize/Move eines Frames Update; Point ist Destination. + // after SSize/Move of a frame update; Point is destination. SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False ); SW_DLLPRIVATE long SttLeaveSelect(const Point *, sal_Bool bProp=sal_False ); |