diff options
| author | Albert Thuswaldner <albert.thuswaldner@gmail.com> | 2012-08-17 00:55:18 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-08-17 19:05:50 +0000 |
| commit | 2c5dcafb8c0b335ccb4282d38fa01e767c1d48da (patch) | |
| tree | ed719621e941bc422e854341a8126938de5dd25c /sc | |
| parent | a11f9bdf4726e3bdb98390389ed1c2ca0f946686 (diff) | |
Translation of comments from german in sc/source/ui/inc/
Change-Id: Ia6e490196575a06fff9a607e087aef078da64587
Reviewed-on: https://gerrit.libreoffice.org/424
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sc')
59 files changed, 326 insertions, 428 deletions
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index d023054a7ee0..657fb6f79af5 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -107,7 +107,7 @@ public: typedef long LExpNum; -//@ Expand-Entrys nicht eindeutig, daher gestrichen +//@ Expand entrys are ambiguous and therefore removed //DECLARE_TABLE( ScChgTrackExps, LExpNum) //================================================================== diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index cfdc78b2aa8c..7aa3207c5eb7 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -56,20 +56,20 @@ class ScFormulaReferenceHelper IAnyRefDialog* m_pDlg; ::std::auto_ptr<ScFormulaCell> pRefCell; ::std::auto_ptr<ScCompiler> pRefComp; - formula::RefEdit* pRefEdit; // aktives Eingabefeld - formula::RefButton* pRefBtn; // Button dazu + formula::RefEdit* pRefEdit; // active input field + formula::RefButton* pRefBtn; // associated button Window* m_pWindow; SfxBindings* m_pBindings; ::std::auto_ptr<Accelerator> - pAccel; // fuer Enter/Escape - sal_Bool* pHiddenMarks; // Merkfeld fuer versteckte Controls + pAccel; // for Enter/Escape + sal_Bool* pHiddenMarks; // Mark field for hidden Controls SCTAB nRefTab; // used for ShowReference - String sOldDialogText; // Originaltitel des Dialogfensters - Size aOldDialogSize; // Originalgroesse Dialogfenster - Point aOldEditPos; // Originalposition des Eingabefeldes - Size aOldEditSize; // Originalgroesse des Eingabefeldes - Point aOldButtonPos; // Originalpositiuon des Buttons + String sOldDialogText; // Original title of the dialog window + Size aOldDialogSize; // Original size of the dialog window + Point aOldEditPos; // Original position of the input field + Size aOldEditSize; // Original size of the input field + Point aOldButtonPos; // Original position of the button sal_Bool bEnableColorRef; sal_Bool bHighLightRef; diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc index 931fcbebf8b2..4c3675679c7d 100644 --- a/sc/source/ui/inc/attrdlg.hrc +++ b/sc/source/ui/inc/attrdlg.hrc @@ -28,7 +28,7 @@ #define TP_ASIAN 8 //================================================ -// Zellschutz-TabPage: +// Protected cell TabPage: #define BTN_PROTECTED 1 #define BTN_HIDE_FORMULAR 2 diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index c77d468fdaa6..18a80a1a2e5b 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -40,7 +40,7 @@ protected: virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); private: - DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages + DECL_LINK( OkHandler, void* ); // for closing by double clicking in TabPages }; #endif // SC_ATTRDLG_HXX diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index fd44c0d4eac7..c0451d673d85 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -52,25 +52,21 @@ class ScAreaLink; const sal_uLong SC_CONTENT_NOCHILD = ~0UL; -// -// TreeListBox fuer Inhalte -// - class ScContentTree : public SvTreeListBox { ScNavigatorDlg* pParentWindow; ImageList aEntryImages; SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT]; - sal_uInt16 nRootType; // als Root eingestellt - String aManualDoc; // im Navigator umgeschaltet (Title) - sal_Bool bHiddenDoc; // verstecktes aktiv? - String aHiddenName; // URL zum Laden - String aHiddenTitle; // fuer Anzeige - ScDocument* pHiddenDocument; // temporaer + sal_uInt16 nRootType; // set as Root + String aManualDoc; // Switched in Navigator (Title) + sal_Bool bHiddenDoc; // Hidden active? + String aHiddenName; // URL to load + String aHiddenTitle; // for display + ScDocument* pHiddenDocument; // temporary - sal_uInt16 pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge + sal_uInt16 pPosList[SC_CONTENT_COUNT]; // for the sequence - static sal_Bool bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird + static sal_Bool bIsInDrag; // static, if the Navigator is deleted in ExecuteDrag ScDocShell* GetManualOrCurrent(); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index aef7207106ee..6e1a23042c6c 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -56,7 +56,7 @@ public: ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); virtual ~ScDBFunc(); - // nur UISort wiederholt bei Bedarf die Teilergebnisse + // only UISort repeat the partial results if necessary void UISort( const ScSortParam& rSortParam, sal_Bool bRecord = sal_True ); @@ -77,7 +77,7 @@ public: void GotoDBArea( const ::rtl::OUString& rDBName ); - // DB-Bereich vom Cursor + // DB range from Cursor ScDBData* GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP); ScDBData* GetAnonymousDBData(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index a5bd150be1f2..72aea8ba4331 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -85,8 +85,8 @@ private: sal_Bool bSaved; - const String aStrAdd; // "Hinzufuegen" - const String aStrModify; // "Aendern" + const String aStrAdd; + const String aStrModify; const String aStrInvalid; String aStrSource; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index aa87507ffdc7..6b0f926403be 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -85,7 +85,7 @@ typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; //enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF }; - // Extra-Flags fuer Repaint + // Extra flags for Repaint #define SC_PF_LINES 1 #define SC_PF_TESTMERGE 2 #define SC_PF_WHOLEROWS 4 @@ -105,7 +105,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener bool bHeaderOn; bool bFooterOn; - bool bIsInplace:1; // wird von der View gesetzt + bool bIsInplace:1; // Is set by the View bool bIsEmpty:1; bool bIsInUndo:1; bool bDocumentModifiedPending:1; @@ -328,8 +328,8 @@ public: void CancelAutoDBRange(); // called when dialog is cancelled virtual void ReconnectDdeLink(SfxObjectShell& rServer); - void UpdateLinks(); // Link-Eintraege aktuallisieren - sal_Bool ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren) + void UpdateLinks(); + sal_Bool ReloadTabLinks(); void SetFormulaOptions(const ScFormulaOptions& rOpt ); virtual void CheckConfigOptions(); @@ -434,7 +434,7 @@ public: void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); - // passwword protection for Calc (derived from SfxObjectShell) + // password protection for Calc (derived from SfxObjectShell) // see also: FID_CHG_RECORD, SID_CHG_PROTECT virtual bool IsChangeRecording() const; virtual bool HasChangeRecordProtection() const; @@ -451,13 +451,13 @@ SO2_DECL_REF(ScDocShell) SO2_IMPL_REF(ScDocShell) -// Vor Modifizierungen des Dokuments anlegen und danach zerstoeren. -// Merkt sich im Ctor AutoCalcShellDisabled und IdleDisabled, schaltet sie ab -// und stellt sie im Dtor wieder her, AutoCalcShellDisabled ggbf. auch vor -// einem ScDocShell SetDocumentModified. -// SetDocumentModified hierdran aufrufen statt an der ScDocShell. -// Im Dtor wird wenn ScDocShell bDocumentModifiedPending gesetzt ist und -// bAutoCalcShellDisabled nicht gesetzt ist ein SetDocumentModified gerufen. +/** Create before modifications of the document and then destroy. + If noted in the ctor AutoCalcShellDisabled and IdleDisabled, + switches them off and restores the dtor AutoCalcShellDisabled + also before a ScDocShell SetDocumentModified. + Call SetDocumentModified after instead of the ScDocShell. + In the dtor, if ScDocShell bDocumentModifiedPending is set and + bAutoCalcShellDisabled is not set, then SetDocumentModified is called. */ class SC_DLLPUBLIC ScDocShellModificator { ScDocShell& rDocShell; diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 386078f18d1c..ee61c02ba328 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -26,7 +26,7 @@ #include "shellids.hxx" -sal_uInt16 ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId() +sal_uInt16 ScGetFontWorkId(); // instead of SvxFontWorkChildWindow::GetChildWindowId() class ScViewData; class TransferableDataHelper; @@ -66,7 +66,7 @@ public: void GetFormTextState(SfxItemSet& rSet); private: - void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte + void ExecuteGlobal( SfxRequest &rReq ); // called by Execute for all objects void GetGlobalClipState( SfxItemSet& rSet ); void ExecutePasteContents( SfxRequest &rReq ); sal_Bool IsNoteEdit(); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 9da65a944ed6..43ba45e4aa86 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -41,12 +41,7 @@ #include "privsplt.hxx" #include "funcdesc.hxx" -/************************************************************************* -|* -|* Ableitung vom SfxChildWindow als "Behaelter" fuer Controller -|* -\************************************************************************/ - +/** Derivation of SfxChildWindow as "containers" for Controller */ class ScFunctionChildWindow : public SfxChildWindow { public: @@ -56,12 +51,6 @@ class ScFunctionChildWindow : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(ScFunctionChildWindow); }; -/************************************************************************* -|* -|* ScFuncDockWin -|* -\************************************************************************/ - class ScFunctionDockWin : public SfxDockingWindow, public SfxListener { diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index 6936eba4c0e7..9efba78678e3 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -19,7 +19,7 @@ // -> RID_SCDLG_SPEC_FILTER // -> RID_SCDLG_PIVOTFILTER -// allgemein +// General #define BTN_OK 1 #define BTN_CANCEL 1 @@ -64,7 +64,7 @@ #define LB_SCROLL 41 #define LB_OP4 42 -// Spezialfilter +// Special filter #define FT_CRITERIA_AREA 50 #define LB_CRITERIA_AREA 51 diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index 232d5c0e1b79..6f6dc2f11f62 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -31,12 +31,7 @@ #include "fuconstr.hxx" -/************************************************************************* -|* -|* Rechteck zeichnen -|* -\************************************************************************/ - +/** Draw rectangle */ class FuConstArc : public FuConstruct { public: @@ -50,8 +45,8 @@ class FuConstArc : public FuConstruct virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 6fb89242cbc0..94a5583a002c 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -48,8 +48,8 @@ public: virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ); diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index 0104388ac03a..898a05e76ee7 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -31,12 +31,7 @@ #include "fuconstr.hxx" -/************************************************************************* -|* -|* Basisklasse fuer alle Funktionen -|* -\************************************************************************/ - +/** Base class for all functions */ class FuConstPolygon : public FuConstruct { Point aLastPos; @@ -52,8 +47,8 @@ class FuConstPolygon : public FuConstruct virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 5c0cf72735c7..d3febe796d63 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -31,12 +31,7 @@ #include "fuconstr.hxx" -/************************************************************************* -|* -|* Rechteck zeichnen -|* -\************************************************************************/ - +/** Draw rectangle */ class FuConstRectangle : public FuConstruct { public: @@ -50,8 +45,8 @@ class FuConstRectangle : public FuConstruct virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 12c17e5b3fb7..2f4c0d5dd290 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -27,13 +27,7 @@ #define MIN_FREEHAND_DISTANCE 10 - -/************************************************************************* -|* -|* Rechteck zeichnen -|* -\************************************************************************/ - +/** Draw rectangle */ class FuConstruct : public FuDraw { public: @@ -50,8 +44,8 @@ class FuConstruct : public FuDraw sal_Bool SimpleMouseButtonUp(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); }; diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index efb19ccf39e7..58e600765a5e 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -32,12 +32,7 @@ #include "fuconstr.hxx" -/************************************************************************* -|* -|* Control zeichnen -|* -\************************************************************************/ - +/** Draw Control */ class FuConstUnoControl : public FuConstruct { protected: @@ -55,8 +50,8 @@ public: virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 8dbd426a7f67..6610a5752857 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -32,12 +32,7 @@ #include "fupoor.hxx" #include <vcl/pointr.hxx> -/************************************************************************* -|* -|* Basisklasse fuer alle Drawmodul-spezifischen Funktionen -|* -\************************************************************************/ - +/** Base class for all Drawmodule specific functions */ class FuDraw : public FuPoor { protected: diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index dcf48a7f9886..6aeedea85e7b 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -30,8 +30,8 @@ class FuInsertGraphic : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); }; /************************************************************************/ @@ -43,8 +43,8 @@ class FuInsertOLE : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertOLE(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); }; /************************************************************************/ @@ -56,8 +56,8 @@ class FuInsertChart : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertChart(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); }; /************************************************************************/ @@ -69,8 +69,8 @@ class FuInsertMedia : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); }; #endif // _SD_FUINSERT_HXX diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index 47cef3f81266..4cd472949814 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -24,12 +24,7 @@ #include "rangelst.hxx" // ScRangeListRef -/************************************************************************* -|* -|* Funktion zum Aufziehen eines Rechtecks -|* -\************************************************************************/ - +/** Function for drawing a rectangle */ class FuMarkRect : public FuPoor { protected: diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index cb713b1fb850..ee0061860195 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -42,17 +42,12 @@ class Dialog; // Create default drawing objects via keyboard class SdrObject; -// Return-Werte fuer Command +// Return values for command #define SC_CMD_NONE 0 #define SC_CMD_USED 1 #define SC_CMD_IGNORE 2 -/************************************************************************* -|* -|* Basisklasse fuer alle Funktionen -|* -\************************************************************************/ - +/** Base class for all functions */ class FuPoor { protected: @@ -64,15 +59,15 @@ protected: SfxRequest aSfxRequest; Dialog* pDialog; - Timer aScrollTimer; // fuer Autoscrolling + Timer aScrollTimer; // for Autoscrolling DECL_LINK( ScrollHdl, void * ); void ForceScroll(const Point& aPixPos); - Timer aDragTimer; // fuer Drag&Drop + Timer aDragTimer; // for Drag&Drop DECL_LINK( DragTimerHdl, void * ); DECL_LINK( DragHdl, void * ); sal_Bool bIsInDragMode; - Point aMDPos; // Position von MouseButtonDown + Point aMDPos; // Position of MouseButtonDown // member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) @@ -94,7 +89,7 @@ public: virtual void DoCopy(); virtual void DoPaste(); - // Mouse- & Key-Events; Returnwert=TRUE: Event wurde bearbeitet + // Mouse- & Key-Events; return value=TRUE: Event was processed virtual sal_Bool KeyInput(const KeyEvent& rKEvt); virtual sal_Bool MouseMove(const MouseEvent&) { return false; } @@ -106,8 +101,8 @@ public: virtual sal_uInt8 Command(const CommandEvent& rCEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); void SetWindow(Window* pWin) { pWindow = pWin; } diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 0ed6f874347a..b1715e7972bf 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -24,13 +24,7 @@ class SdrPageView; - -/************************************************************************* -|* -|* Basisklasse fuer alle Funktionen -|* -\************************************************************************/ - +/** Base class for all functions */ class FuSelection : public FuDraw { public: @@ -45,8 +39,8 @@ public: virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual sal_uInt8 Command(const CommandEvent& rCEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); void ActivateNoteHandles(SdrObject* pObj); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index f3150424ba50..594c2d96912f 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -35,15 +35,12 @@ class SdrObject; class SdrTextObj; class SdrOutliner; -/************************************************************************* -|* -|* Basisklasse fuer Textfunktionen -|* -\************************************************************************/ + + +/** Base class for Text functions */ class FuText : public FuConstruct { protected: -// sal_uInt16 nOldObjectBar; SdrTextObj* pTextObj; public: @@ -57,8 +54,8 @@ public: virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); + virtual void Deactivate(); virtual void ForcePointer(const MouseEvent* pMEvt); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 63cbbe1a96e9..fdd7b2e689a0 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -87,7 +87,7 @@ namespace sdr { namespace overlay { class OverlayObjectList; }} class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHelper { - // ScFilterListBox wird immer fuer Auswahlliste benutzt + // ScFilterListBox is always used for selection list friend class ScFilterListBox; private: @@ -146,7 +146,7 @@ private: SCsCOL nRFAddX; SCsROW nRFAddY; - sal_uInt16 nPagebreakMouse; // Pagebreak-Modus Drag + sal_uInt16 nPagebreakMouse; // Page break mode, Drag SCCOLROW nPagebreakBreak; SCCOLROW nPagebreakPrev; ScRange aPagebreakSource; @@ -178,9 +178,9 @@ private: Rectangle aInvertRect; - bool bEEMouse:1; // Edit-Engine hat Maus - bool bDPMouse:1; // DataPilot-D&D (neue Pivottabellen) - bool bRFMouse:1; // RangeFinder-Drag + bool bEEMouse:1; // Edit Engine has mouse + bool bDPMouse:1; // DataPilot D&D (new Pivot table) + bool bRFMouse:1; // RangeFinder drag bool bRFSize:1; bool bPagebreakDrawn:1; bool bDragRect:1; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 6d2bb6c199c3..bb1791c6390e 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -33,7 +33,7 @@ #define HDR_SIZE_OPTIMUM 0xFFFF - // Groesse des Sliders + // Size of the sliders #define HDR_SLIDERSIZE 2 class ScHeaderControl : public Window @@ -45,7 +45,7 @@ private: sal_Bool bBoldSet; sal_uInt16 nFlags; - sal_Bool bVertical; // Vertikal = Zeilenheader + sal_Bool bVertical; // Vertical = Row header long nWidth; long nSmallWidth; @@ -57,7 +57,7 @@ private: SCCOLROW nMarkEnd; sal_Bool bMarkRange; - sal_Bool bDragging; // Groessen aendern + sal_Bool bDragging; // Change size SCCOLROW nDragNo; long nDragStart; long nDragPos; @@ -75,7 +75,7 @@ private: void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor ); protected: - // von Window ueberladen + // Overloaded by Window virtual void Paint( const Rectangle& rRect ); @@ -86,10 +86,10 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - // neue Methoden + // new methods - virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling) - virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel) + virtual SCCOLROW GetPos() = 0; // current position (Scrolling) + virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // width / height (Pixel) virtual String GetEntryText( SCCOLROW nEntryNo ) = 0; virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index df7e6e976d18..6bad36293396 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -65,21 +65,21 @@ class SC_DLLPUBLIC ScImportExport sal_uLong nSizeLimit; sal_Unicode cSep; // Separator sal_Unicode cStr; // String Delimiter - bool bFormulas; // Formeln im Text? + bool bFormulas; // Formula in Text? bool bIncludeFiltered; // include filtered rows? (default true) - bool bAll; // keine Selektion - bool bSingle; // Einfachselektion - bool bUndo; // Mit Undo? + bool bAll; // no selection + bool bSingle; // Single selection + bool bUndo; // with Undo? bool bOverflowRow; // too many rows bool bOverflowCol; // too many columns bool bOverflowCell; // too much data for a cell bool mbApi; ScExportTextOptions mExportTextOptions; - ScAsciiOptions* pExtOptions; // erweiterte Optionen + ScAsciiOptions* pExtOptions; // extended options - bool StartPaste(); // Protect-Check, Undo einrichten - void EndPaste(); // Undo/Redo-Aktionen, Repaint + bool StartPaste(); // Protect check, set up Undo + void EndPaste(); // Undo/Redo actions, Repaint bool Doc2Text( SvStream& ); bool Text2Doc( SvStream& ); bool Doc2Sylk( SvStream& ); @@ -88,13 +88,13 @@ class SC_DLLPUBLIC ScImportExport bool Doc2RTF( SvStream& ); bool Doc2Dif( SvStream& ); bool Dif2Doc( SvStream& ); - bool ExtText2Doc( SvStream& ); // mit pExtOptions + bool ExtText2Doc( SvStream& ); // with pExtOptions bool RTF2Doc( SvStream&, const String& rBaseURL ); bool HTML2Doc( SvStream&, const String& rBaseURL ); public: - ScImportExport( ScDocument* ); // Gesamtdokument - ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe + ScImportExport( ScDocument* ); // the whole document + ScImportExport( ScDocument*, const String& ); // Range/cell input ScImportExport( ScDocument*, const ScAddress& ); ScImportExport( ScDocument*, const ScRange& ); ~ScImportExport(); @@ -131,7 +131,7 @@ public: bool IsIncludeFiltered() const { return bIncludeFiltered; } void SetIncludeFiltered( bool b ) { bIncludeFiltered = b; } - void SetSizeLimit( sal_uLong nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii + void SetSizeLimit( sal_uLong nNew ) { nSizeLimit = nNew; } // for the moment only for Ascii void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } const String& GetStreamPath() const { return aStreamPath; } diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index cf8cc77d9199..402a2da16771 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -65,9 +65,9 @@ class ScInputHandler : boost::noncopyable private: ScInputWindow* pInputWin; - ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle - EditView* pTableView; // aktive EditView dazu - EditView* pTopView; // EditView in der Eingabezeile + ScEditEngineDefaulter* pEngine; // edited data in the sheet + EditView* pTableView; // associated active EditView + EditView* pTopView; // EditView in dthe input row ScTypedCaseStrSet* pColumnData; ScTypedCaseStrSet* pFormulaData; @@ -84,16 +84,16 @@ private: rtl::OUString aCurrentText; - rtl::OUString aFormText; // fuer Funktions-Autopilot - xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot + rtl::OUString aFormText; // for autopilot function + xub_StrLen nFormSelStart; // Selection for autopilot function xub_StrLen nFormSelEnd; sal_uInt16 nAutoPar; // autom.parentheses than can be overwritten ScAddress aCursorPos; ScInputMode eMode; - bool bUseTab:1; // Blaettern moeglich - bool bTextValid:1; // Text noch nicht in Edit-Engine + bool bUseTab:1; // Scrolling possible + bool bTextValid:1; // Text is not in edit engine bool bModified:1; bool bSelIsRef:1; bool bFormulaMode:1; @@ -110,7 +110,7 @@ private: sal_uLong nValidation; SvxCellHorJustify eAttrAdjust; - Fraction aScaleX; // fuer Ref-MapMode + Fraction aScaleX; // for ref MapMode Fraction aScaleY; ScTabViewShell* pRefViewSh; @@ -124,7 +124,7 @@ private: ScRangeFindList* pRangeFindList; - static bool bAutoComplete; // aus App-Optionen + static bool bAutoComplete; // from app options static bool bOptLoaded; #ifdef _INPUTHDL_CXX @@ -212,7 +212,7 @@ public: void HideTip(); void HideTipBelow(); void ShowTipCursor(); - void ShowTip( const String& rText ); // am Cursor + void ShowTip( const String& rText ); // at Cursor void ShowTipBelow( const String& rText ); void SetRefScale( const Fraction& rX, const Fraction& rY ); @@ -238,7 +238,7 @@ public: void UpdateRange( sal_uInt16 nIndex, const ScRange& rNew ); - // Kommunikation mit Funktionsautopilot + // Communication with the autopilot function void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); void InputReplaceSelection ( const rtl::OUString& rStr ); @@ -261,7 +261,7 @@ public: Size GetTextSize(); // in 1/100mm - // eigentlich private, fuer SID_INPUT_SUM public + // actually private, public for SID_INPUT_SUM void InitRangeFinder( const String& rFormula ); static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; } diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 2d3edc42b133..0efc497f323b 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -79,7 +79,7 @@ public: sal_Bool IsInputActive(); virtual EditView* GetEditView(); - // fuer FunktionsAutopiloten + // for function autopilots virtual void MakeDialogEditView(); virtual void StartEditEngine(); @@ -123,7 +123,7 @@ protected: String aString; Font aTextFont; - ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt + ScEditEngineDefaulter* pEditEngine; // only created when needed EditView* pEditView; AccTextDataVector maAccTextDatas; // #i105267# text datas may be cloned, remember all copies sal_Bool bIsRTL; @@ -140,7 +140,7 @@ private: //======================================================================== -class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige +class ScPosWnd : public ComboBox, public SfxListener // Display position { private: String aPosStr; @@ -153,7 +153,7 @@ public: ScPosWnd( Window* pParent ); virtual ~ScPosWnd(); - void SetPos( const String& rPosStr ); // angezeigter Text + void SetPos( const String& rPosStr ); // Displayed Text void SetFormulaMode( sal_Bool bSet ); protected: @@ -248,7 +248,7 @@ private: }; -class ScInputWindow : public ToolBox // Parent-Toolbox +class ScInputWindow : public ToolBox // Parent toolbox { public: ScInputWindow( Window* pParent, SfxBindings* pBind ); @@ -276,7 +276,7 @@ public: void PosGrabFocus(); - // Fuer FunktionsAutopiloten + // For function autopilots void MakeDialogEditView(); void StopEditEngine( sal_Bool bAll ); diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 2d2a3ec18355..971d7adef71a 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -57,7 +57,7 @@ public: ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); ~ScInsertTableDlg(); - virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen + virtual short Execute(); // overloaded to set parent dialog sal_Bool GetTablesFromFile() { return aBtnFromFile.IsChecked(); } sal_Bool GetTablesAsLink() { return aBtnLink.IsChecked(); } @@ -95,7 +95,7 @@ private: SfxObjectShellRef aDocShTablesRef; bool bMustClose; - sal_uInt16 nSelTabIndex; // fuer GetFirstTable() / GetNextTable() + sal_uInt16 nSelTabIndex; // for GetFirstTable() / GetNextTable() String aStrCurSelTable; SCTAB nTableCount; diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index a55ec9b049fe..2d423ecee764 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -27,7 +27,7 @@ // -> RID_SCDLG_FILLSERIES // -> RID_SCDLG_AUTOFORMAT -// allgemein +// General #define BTN_OK 100 #define BTN_CANCEL 102 #define BTN_HELP 103 @@ -38,7 +38,7 @@ #define FL_FRAME 112 #define STR_BTN_CLOSE 200 -// Zellen loeschen/einfuegen Dialog +// Insert/Delete Cell Dialog #define BTN_CELLSUP 10 #define BTN_CELLSDOWN 11 #define BTN_CELLSRIGHT 12 @@ -48,7 +48,7 @@ #define BTN_INSROWS 16 #define BTN_INSCOLS 17 -// Inhalte loeschen/einfuegen Dialog +// Insert/Delete Contents Dialog #define BTN_DELALL 10 #define BTN_DELSTRINGS 11 #define BTN_DELNUMBERS 12 @@ -88,7 +88,7 @@ #define CTRL_TABLE 63 #define FL_DIV 64 -// Tabelle einfuegen/loeschen +// Insert/Delete Sheet #define FT_DEST 1 #define LB_DEST 2 #define FT_INSERT 3 @@ -106,18 +106,18 @@ #define STR_TABNAME_WARN_EMPTY 16 #define STR_TABNAME_WARN_INVALID 17 -// Eingabe eines Strings +// String input #define ED_INPUT 10 -// Eingabe einer Metrik +// Metrics input #define ED_VALUE 1 #define BTN_DEFVAL 1 -// Auswahl aus einer (String-)ListBox +// Selection from a (String-)ListBox #define FL_ENTRYLIST 10 #define LB_ENTRYLIST 11 -// Reihen fuellen +// Row fillers #define FL_DIRECTION 1 #define BTN_LEFT 2 #define BTN_RIGHT 3 @@ -141,7 +141,7 @@ #define FT_START_VALUE 51 #define ED_START_VALUES 52 -// Autoformat +// Auto format #define LB_FORMAT 1 #define FL_FORMAT 9 #define WND_PREVIEW 19 @@ -158,7 +158,7 @@ #define STR_DEL_TITLE 102 #define STR_DEL_MSG 103 #define STR_RENAME_TITLE 104 - // Autoformat-Preview: + // Auto format Preview: #define STR_JAN 121 #define STR_FEB 122 #define STR_MAR 123 @@ -167,7 +167,7 @@ #define STR_SOUTH 126 #define STR_SUM 127 -// Gruppierung setzen/aufheben: +// Set/Reset Grouping: #define BTN_GROUP_COLS 1 #define BTN_GROUP_ROWS 3 #define STR_GROUP 1 diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index d46aefbc1b76..c7f9fdc7b19f 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -43,10 +43,6 @@ #include <svx/fntctrl.hxx> #include <svx/strarray.hxx> -/*----------------------------------------------------------------------- - Beschreibung: Redlining-Optionen - -----------------------------------------------------------------------*/ - class ScRedlineOptionsTabPage : public SfxTabPage { FixedText aContentFT; diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 344992123973..1b8d8f5ce3c9 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -144,51 +144,50 @@ private: OutputDevice* mpRefDevice; // printer if used for preview OutputDevice* pFmtDevice; // reference for text formatting ScTableInfo& mrTabInfo; - RowInfo* pRowInfo; // Info-Block - SCSIZE nArrCount; // belegte Zeilen im Info-Block - ScDocument* mpDoc; // Dokument - SCTAB nTab; // Tabelle - long nScrX; // Ausgabe Startpos. (Pixel) + RowInfo* pRowInfo; // Info block + SCSIZE nArrCount; // occupied lines in info block + ScDocument* mpDoc; // Document + SCTAB nTab; // sheet + long nScrX; // Output Startpos. (Pixel) long nScrY; - long nScrW; // Ausgabe Groesse (Pixel) + long nScrW; // Output size (Pixel) long nScrH; long nMirrorW; // Visible output width for mirroring (default: nScrW) - SCCOL nX1; // Start-/Endkoordinaten - SCROW nY1; // ( incl. versteckte ) + SCCOL nX1; // Start-/End coordinates + SCROW nY1; // ( incl. hidden ) SCCOL nX2; SCROW nY2; - SCCOL nVisX1; // Start-/Endkoordinaten - SCROW nVisY1; // ( sichtbarer Bereich ) + SCCOL nVisX1; // Start-/End coordinates + SCROW nVisY1; // ( visable range ) SCCOL nVisX2; SCROW nVisY2; - ScOutputType eType; // Bildschirm/Drucker ... + ScOutputType eType; // Screen/Printer ... double mnPPTX; // Pixel per Twips double mnPPTY; -// sal_uInt16 nZoom; // Zoom-Faktor (Prozent) - fuer GetFont Fraction aZoomX; Fraction aZoomY; - SdrObject* pEditObj; // beim Painten auslassen + SdrObject* pEditObj; // Omit when painting - ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins + ScTabViewShell* pViewShell; // for connect from visible plug-ins // #114135# FmFormView* pDrawView; // SdrView to paint to - sal_Bool bEditMode; // InPlace editierte Zelle - nicht ausgeben + sal_Bool bEditMode; // InPlace edited cell - do not output SCCOL nEditCol; SCROW nEditRow; - bool bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!) + bool bMetaFile; // Output to metafile (not pixels!) bool bSingleGrid; // beim Gitter bChanged auswerten - bool bPagebreakMode; // Seitenumbruch-Vorschau - bool bSolidBackground; // weiss statt transparent + bool bPagebreakMode; // Page break preview + bool bSolidBackground; // white instead of transparant bool mbUseStyleColor; bool mbForceAutoColor; - sal_Bool mbSyntaxMode; // Syntax-Highlighting + sal_Bool mbSyntaxMode; // Syntax highlighting Color* pValueColor; Color* pTextColor; Color* pFormulaColor; @@ -197,13 +196,13 @@ private: bool mbShowNullValues; bool mbShowFormulas; - bool bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen + bool bShowSpellErrors; // Show spelling errors in EditObjects bool bMarkClipped; bool bSnapPixel; - bool bAnyRotated; // intern - bool bAnyClipped; // intern + bool bAnyRotated; // internal + bool bAnyClipped; // internal bool bTabProtected; sal_uInt8 nTabTextDirection; // EEHorizontalTextDirection values bool bLayoutRTL; @@ -301,7 +300,7 @@ public: void DrawEdit(sal_Bool bPixelToLogic); void FindRotated(); - void DrawRotated(sal_Bool bPixelToLogic); // logisch + void DrawRotated(sal_Bool bPixelToLogic); // logical void DrawClear(); @@ -310,11 +309,11 @@ public: void PostPrintDrawingLayer(const Point& rMMOffset); // #i74768# need offset for FormLayer void PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset); - // nur Bildschirm: + // only screen: void DrawingSingle(const sal_uInt16 nLayer); void DrawSelectiveObjects(const sal_uInt16 nLayer); - sal_Bool SetChangedClip(); // sal_False = nix + sal_Bool SetChangedClip(); // sal_False = not PolyPolygon GetChangedArea(); void FindChanged(); diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx index a9344190e952..8179733dba08 100644 --- a/sc/source/ui/inc/parawin.hxx +++ b/sc/source/ui/inc/parawin.hxx @@ -140,7 +140,7 @@ public: void SetArgument(sal_uInt16 no, const String& aString); void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); - void SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen + void SetEdFocus(sal_uInt16 nEditLine); // Visable edit lines sal_uInt16 GetSliderPos(); void SetSliderPos(sal_uInt16 nSliderPos); diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx index 319f6cebca6a..6ffad34cb09f 100644 --- a/sc/source/ui/inc/pntlock.hxx +++ b/sc/source/ui/inc/pntlock.hxx @@ -50,7 +50,7 @@ public: { return bDoc ? nDocLevel : nLevel; } sal_Bool GetModified() const { return bModified; } - // fuer Wiederherstellen nach Reset + /** for recovery after reset */ void SetLevel(sal_uInt16 nNew, sal_Bool bDoc) { if (bDoc) nDocLevel = nNew; else nLevel = nNew; } }; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 6482c05f9222..28f379b7519e 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -43,34 +43,34 @@ class ScPreview : public Window { private: ScMarkData::MarkedTabsType maSelectedTabs; - // eingestellt: - long nPageNo; // Seite im Dokument - sal_uInt16 nZoom; // eingestellter Zoom - Point aOffset; // positiv + // set: + long nPageNo; // Pages in document + sal_uInt16 nZoom; // set Zoom + Point aOffset; // positive - // berechnet: + // calculated: SCTAB nTabCount; - SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig? + SCTAB nTabsTested; // for how many sheets is nPages valid? std::vector<long> nPages; std::vector<long> nFirstAttr; - SCTAB nTab; // Tabelle - long nTabPage; // Seite von Tabelle - long nTabStart; // erste Seite der Tabelle (wirklich) - long nDisplayStart; // dito, relativ zum Anfang der Zaehlung + SCTAB nTab; // Sheet + long nTabPage; // Page of sheet + long nTabStart; // First (real) page of the sheet + long nDisplayStart; // same as above, relative to the start of counting Date aDate; Time aTime; long nTotalPages; - Size aPageSize; // fuer GetOptimalZoom + Size aPageSize; // for GetOptimalZoom ScPrintState aState; ScPreviewLocationData* pLocationData; // stores table layout for accessibility API FmFormView* pDrawView; - // intern: + // internal: ScDocShell* pDocShell; ScPreviewShell* pViewShell; bool bInGetState:1; - bool bValid:1; // folgende Werte gueltig + bool bValid:1; // the following values true bool bStateValid:1; bool bLocationValid:1; bool bInPaint:1; @@ -130,7 +130,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - SC_DLLPUBLIC void DataChanged(bool bNewTime = false); // statt Invalidate rufen + SC_DLLPUBLIC void DataChanged(bool bNewTime = false); // Instead of calling Invalidate void DoInvalidate(); void SetXOffset( long nX ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 1da34f3e3c03..323d05ae63e9 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -53,7 +53,7 @@ class ScPreviewShell: public SfxViewShell ScDocShell* pDocShell; SystemWindow* mpFrameWindow; - ScPreview* pPreview; // Ausgabe-Fenster + ScPreview* pPreview; // Output window ScrollBar* pHorScroll; ScrollBar* pVerScroll; Window* pCorner; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index b44fa2a40620..27670aa9777c 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -59,16 +59,16 @@ class FmFormView; #define PRINT_HEADER_FONTHEIGHT 200 - // Einstellungen fuer Kopf-/Fusszeilen + // Settings for headers/footers struct ScPrintHFParam { sal_Bool bEnable; sal_Bool bDynamic; sal_Bool bShared; - long nHeight; // insgesamt (Hoehe+Abstand+Rahmen) - long nManHeight; // eingestellte Groesse (Min. bei dynamisch) - sal_uInt16 nDistance; - sal_uInt16 nLeft; // Raender + long nHeight; // in total (height + distance + frames) + long nManHeight; // set size (min when dynamic) + sal_uInt16 nDistance; + sal_uInt16 nLeft; // edges sal_uInt16 nRight; const ScPageHFItem* pLeft; const ScPageHFItem* pRight; @@ -78,7 +78,7 @@ struct ScPrintHFParam }; -struct ScPrintState // Variablen aus ScPrintFunc retten +struct ScPrintState // Save Variables from ScPrintFunc { SCTAB nPrintTab; SCCOL nStartCol; @@ -101,7 +101,7 @@ private: SCROW nEndRow; size_t nPagesX; sal_Bool* pHidden; - //! Anzahl wirklich sichtbarer cachen??? + //! Cache Number of really visible? public: ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; } @@ -132,25 +132,25 @@ private: OutputDevice* pDev; FmFormView* pDrawView; - MapMode aOldPrinterMode; // MapMode vor dem Aufruf + MapMode aOldPrinterMode; // MapMode befor the call - Point aSrcOffset; // Papier-1/100 mm - Point aOffset; // mit Faktor aus Seitenformat skaliert - sal_uInt16 nManualZoom; // Zoom in Preview (Prozent) - sal_Bool bClearWin; // Ausgabe vorher loeschen + Point aSrcOffset; // Paper-1/100 mm + Point aOffset; // scaled by a factor of page size + sal_uInt16 nManualZoom; // Zoom in Preview (percent) + sal_Bool bClearWin; // Clear output before sal_Bool bUseStyleColor; sal_Bool bIsRender; SCTAB nPrintTab; - long nPageStart; // Offset fuer erste Seite - long nDocPages; // Seiten im Dokument + long nPageStart; // Offset for the first page + long nDocPages; // Number of Pages in Document - const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt + const ScRange* pUserArea; // Selection, if set in dialog - const SfxItemSet* pParamSet; // eingestellte Vorlage - sal_Bool bState; // aus State-struct erzeugt + const SfxItemSet* pParamSet; // Selected template + sal_Bool bState; // created from State-struct - // Parameter aus Vorlage: + // Parameter from template: sal_uInt16 nLeftMargin; sal_uInt16 nTopMargin; sal_uInt16 nRightMargin; @@ -161,7 +161,7 @@ private: sal_Bool bSourceRangeValid; sal_uInt16 nPageUsage; - Size aPageSize; // Drucker-Twips + Size aPageSize; // Printer Twips const SvxBoxItem* pBorderItem; const SvxBrushItem* pBackgroundItem; const SvxShadowItem* pShadowItem; @@ -172,16 +172,16 @@ private: ScPageTableParam aTableParam; ScPageAreaParam aAreaParam; - // berechnete Werte: + // Calculated values: sal_uInt16 nZoom; sal_Bool bPrintCurrentTable; sal_Bool bMultiArea; long nTabPages; long nTotalPages; - Rectangle aPageRect; // Dokument-Twips + Rectangle aPageRect; // Document Twips - MapMode aLogicMode; // in DoPrint gesetzt + MapMode aLogicMode; // Set in DoPrint MapMode aOffsetMode; MapMode aTwipMode; double nScaleX; @@ -197,7 +197,7 @@ private: SCCOL nEndCol; SCROW nEndRow; - SCCOL* pPageEndX; // Seitenaufteilung + SCCOL* pPageEndX; // page layout SCROW* pPageEndY; ScPageRowEntry* pPageRows; size_t nPagesX; @@ -209,9 +209,9 @@ private: ScHeaderFieldData aFieldData; - std::vector<ScAddress> aNotePosList; // Reihenfolge der Notizen + std::vector<ScAddress> aNotePosList; // The order of notes - ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc. + ScPageBreakData* pPageData; // for recording the breaks etc. public: ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab, @@ -250,19 +250,19 @@ public: sal_Bool UpdatePages(); - void ApplyPrintSettings(); // aus DoPrint() schon gerufen + void ApplyPrintSettings(); // Already called from DoPrint() long DoPrint( const MultiSelection& rPageRanges, long nStartPage, long nDisplayStart, bool bDoPrint, ScPreviewLocationData* pLocationData ); - // Werte abfragen - sofort + // Query values - immediately Size GetPageSize() const { return aPageSize; } Size GetDataSize() const; void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ); long GetFirstPageNo() const { return aTableParam.nFirstPageNo; } - // letzte Werte abfragen - nach DoPrint !!! + // Query last value - after DoPrint!! double GetScaleX() const { return nScaleX; } double GetScaleY() const { return nScaleY; } @@ -304,8 +304,8 @@ private: sal_Bool IsLeft( long nPageNo ); sal_Bool IsMirror( long nPageNo ); - void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine - void MakeTableString(); // setzt aTableStr + void ReplaceFields( long nPageNo ); // changes Text in pEditEngine + void MakeTableString(); // sets aTableStr void PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 4b20f573757f..ba40483f5297 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -45,22 +45,21 @@ /*==========================================================================*\ - Eine Instanz der Klasse ScPivotLayoutDlg ist ein (semi-)modaler - Dialog, in dem mit der Maus Felder mit Spaltenueberschriften den - drei Pivot-Kategorien "Spalte", "Zeile" und "Daten" zugeordnet - werden koennen. - - Der Dialog erhaelt in der Struktur LabelData Informationen ueber - diese Ueberschriften (Name, Art (Zahl/String) und Funktionsmaske). - Weiterhin werden drei PivotFeld-Arrays uebergeben, mit denen die - drei Kategorie-Fenster initialisiert werden. Ein Kategorie-Fenster - wird durch eine Instanz der Klasse FieldWindow dargestellt. Ein - solches Fenster ist fuer die Darstellung der Datenstrukturen am - Schirm zustaendig. Es meldet Mausaktionen an den Dialog weiter und - bietet entsprechende Methoden zur Veraenderung der Darstellung. - Der Dialog sorgt fuer den Abgleich der interenen Datenstrukturen mit - der Bildschirmdarstellung. Ein weiteres FieldWindow (Select) bietet - alle Tabellenueberschriften zur Auswahl an, ist also "read-only". + An instance of the class ScPivotLayoutDlg is a (semi-)modal dialog + that can be associated to the mouse fields with column headings of + the three pivot categories "column", "row" and "data". + + The dialog receives information about these headers (name, + type (number/string) and function mask) in the label data structure + Furthermore, three pivot field arrays are passed on, with which the three + category windows are initialized. A window class is represented by an + instance of class FieldWindow. Such a window is responsible for the + representation of data structures on the screen. It reports on mouse + actions in the dialogue and provides appropriate methods for + changing the representation. The dialogue provides the adjustment of the + internal data structures with respect to the representation on the screen. + Another FieldWindow(Select) provides all table headers for selection, + is thus "read only". \*==========================================================================*/ @@ -168,7 +167,7 @@ private: Rectangle aRectData; Rectangle aRectSelect; - ScDPLabelDataVec aLabelDataArr; // (nCol, Feldname, Zahl/Text) + ScDPLabelDataVec aLabelDataArr; // (nCol, Field name, Number/Text) ScDPFieldType eLastActiveType; /// Type of last active area. size_t nOffset; /// Offset of first field in TYPE_SELECT area. diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 0c8ea64c4e0c..ed5d0354cb00 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -52,7 +52,7 @@ public: }; -class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur) +class ScViewFunctionSet : public FunctionSet // View (Gridwin / keyboard) { private: ScViewData* pViewData; @@ -90,7 +90,7 @@ public: // --------------------------------------------------------------------------- -class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe +class ScHeaderFunctionSet : public FunctionSet // Column / row headers { private: ScViewData* pViewData; diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc index 6cb0a9e3adde..861b99d44391 100644 --- a/sc/source/ui/inc/submenu.hrc +++ b/sc/source/ui/inc/submenu.hrc @@ -16,7 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// IDs fuer Untermenues #define SUBMENU_OBJARRANGE 23 #define SUBMENU_ANCHOR 24 #define SUBMENU_OBJMIRROR 33 diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc index edd521d9ddeb..17ff042a706f 100644 --- a/sc/source/ui/inc/subtdlg.hrc +++ b/sc/source/ui/inc/subtdlg.hrc @@ -25,7 +25,7 @@ #define PAGE_GROUP3 4 #define PAGE_OPTIONS 5 -// Gruppen TabPages +// Groups TabPages #define FT_GROUP 10 #define LB_GROUP 11 #define FT_COLUMNS 12 @@ -33,7 +33,7 @@ #define LB_FUNCTIONS 14 #define FT_FUNCTIONS 15 -// Optionen TabPage +// Options TabPage #define FL_GROUP 20 #define BTN_PAGEBREAK 21 #define BTN_CASE 22 diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 4a6c3d6cc9be..622cb92e7640 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -55,10 +55,10 @@ private: TriStateBox aBtnHidePrint; FixedInfo aTxtHint2; - // aktueller Status: - sal_Bool bTriEnabled; // wenn vorher Dont-Care - sal_Bool bDontCare; // alles auf TriState - sal_Bool bProtect; // einzelne Einstellungen ueber TriState sichern + // current status: + sal_Bool bTriEnabled; // if before - DontCare + sal_Bool bDontCare; // all in TriState + sal_Bool bProtect; // secure individual settings for TriState sal_Bool bHideForm; sal_Bool bHideCell; sal_Bool bHidePrint; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 02a36f9f9c8a..6d7548126479 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -67,7 +67,7 @@ namespace chart2 { namespace data { #define SC_FORCEMODE_NONE 0xff // --------------------------------------------------------------------------- -// Hilfs - Fenster +// Help - Window class ScCornerButton : public Window { @@ -95,8 +95,8 @@ class ScTabView : boost::noncopyable private: enum BlockMode { None = 0, Normal = 1, Own = 2 }; - Window* pFrameWin; // als erstes !!! - ScViewData aViewData; // muss ganz vorne stehen ! + Window* pFrameWin; // First !!! + ScViewData aViewData; // must be at the front ! ScViewSelectionEngine* pSelEngine; ScViewFunctionSet aFunctionSet; @@ -108,7 +108,7 @@ private: ScDrawView* pDrawView; - Size aFrameSize; // wie bei DoResize uebergeben + Size aFrameSize; // passed on as for DoResize Point aBorderPos; FuPoor* pDrawActual; @@ -123,8 +123,8 @@ private: ScTabSplitter* pVSplitter; ScTabControl* pTabControl; ScrollBar aVScrollTop; - ScrollBar aVScrollBottom; // anfangs sichtbar - ScrollBar aHScrollLeft; // anfangs sichtbar + ScrollBar aVScrollBottom; // initially visible + ScrollBar aHScrollLeft; // initially visible ScrollBar aHScrollRight; ScCornerButton aCornerButton; ScCornerButton aTopButton; @@ -132,7 +132,7 @@ private: boost::scoped_ptr<ScHintWindow> mpInputHintWindow; // popup window for data validation - ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus + ScPageBreakData* pPageBreakData; std::vector<ScHighlightEntry> maHighlightRanges; ScDocument* pBrushDocument; // cell formats for format paint brush @@ -146,7 +146,7 @@ private: long nPrevDragPos; - BlockMode meBlockMode; // Block markieren + BlockMode meBlockMode; // Marks block SCCOL nBlockStartX; SCCOL nBlockStartXOrig; @@ -169,12 +169,12 @@ private: bool bInActivatePart:1; bool bInZoomUpdate:1; bool bMoveIsShift:1; - bool bDrawSelMode:1; // nur Zeichenobjekte selektieren ? + bool bDrawSelMode:1; // Only select draw objects ? bool bLockPaintBrush:1; // keep for more than one use? - bool bDragging:1; // fuer Scrollbars - bool bBlockNeg:1; // wird Markierung aufgehoben? - bool bBlockCols:1; // werden ganze Spalten markiert? - bool bBlockRows:1; // werden ganze Zeilen markiert? + bool bDragging:1; // for scroll bars + bool bBlockNeg:1; // is no longer highlighted? + bool bBlockCols:1; // are whole columns selected? + bool bBlockRows:1; // are whole rows selected? void Init(); @@ -372,11 +372,11 @@ public: bool HasPageFieldDataAtCursor() const; void StartDataSelect(); - // MoveCursorAbs - absolut - // MoveCursorRel - einzelne Zellen - // MoveCursorPage - Bildschirmseite - // MoveCursorArea - Datenblock - // MoveCursorEnd - links oben / benutzter Bereich + // MoveCursorAbs - absolute + // MoveCursorRel - single cells + // MoveCursorPage - screen + // MoveCursorArea - Data block + // MoveCursorEnd - top left / user range SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bool bShift, bool bControl, @@ -391,7 +391,7 @@ public: bool bShift, bool bKeepSel = false ); void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, bool bShift ); - void MoveCursorEnter( bool bShift ); // Shift fuer Richtung (kein Markieren) + void MoveCursorEnter( bool bShift ); // Shift for direction (select nothing) bool MoveCursorKeyInput( const KeyEvent& rKeyEvent ); @@ -409,7 +409,7 @@ public: void ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars = true ); void ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars = true ); - SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives + SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // active bool ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ); @@ -464,7 +464,7 @@ public: void UpdateEditView(); - // Bloecke + // Blocks void SelectAll( bool bContinue = false ); void SelectAllTables(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 21ab63a4ac69..36bdab18c955 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -131,7 +131,7 @@ private: FmFormShell* pFormShell; - ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile + ScInputHandler* pInputHandler; // for OLE input cell ::editeng::SvxBorderLine* pCurFrameLine; @@ -164,15 +164,15 @@ private: sal_Bool bFormShellAtTop; // does the FormShell need to be on top? - sal_Bool bDontSwitch; // EditShell nicht abschalten - sal_Bool bInFormatDialog; // fuer GetSelectionText + sal_Bool bDontSwitch; // Don't turn off EditShell + sal_Bool bInFormatDialog; // for GetSelectionText sal_Bool bPrintSelected; // for result of SvxPrtQryBox - sal_Bool bReadOnly; // um Status-Aenderungen zu erkennen + sal_Bool bReadOnly; // to detect status changes SbxObject* pScSbxObject; - sal_Bool bChartAreaValid; // wenn Chart aufgezogen wird + sal_Bool bChartAreaValid; // if chart is drawn String aEditChartName; ScRangeListRef aChartSource; Rectangle aChartPos; @@ -245,11 +245,8 @@ public: SFX_DECL_VIEWFACTORY(ScTabViewShell); - // -> Clone-Methode fuer Factory - - // aus einer allgemeinen Shell konstruieren und - // soviel wie moeglich uebernehmen (SliderPos etc.): - + /** -> Clone Method for Factory + Created from a general shell and inherit as much as possible */ ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ); diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 53fd09e084d7..8fb746a2b71d 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -27,7 +27,6 @@ #include <svx/zoomslideritem.hxx> -//class ScZoomSliderControl define class ScZoomSliderControl: public SfxToolBoxControl { public: @@ -39,9 +38,6 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== -// class ScZoomSliderWnd define--------------------------------------- -//======================================================================== class ScZoomSliderWnd: public Window { private: diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index bad7daaac731..0d997c898a83 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -24,10 +24,6 @@ class SfxObjectShell; -// -// Zeichen-Tab-Dialog -// - class ScCharDlg : public SfxTabDialog { private: @@ -42,10 +38,6 @@ public: ~ScCharDlg() {} }; -// -// Absatz-Tab-Dialog -// - class ScParagraphDlg : public SfxTabDialog { private: diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index da0931f2e2c1..5e75d86244d1 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -37,7 +37,7 @@ #include <vcl/timer.hxx> #include <vcl/virdev.hxx> #include "scdllapi.h" -#include "scitems.hxx" // wegen enum SvxNumType +#include "scitems.hxx" // due to enum SvxNumType #include "popmenu.hxx" #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/weakref.hxx> diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 0e937b4e49ab..4ca36086fafd 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -44,7 +44,6 @@ class ScDocument; struct ScSubTotalParam; //======================================================================== -// Gruppenseiten: Basisklasse class ScTpSubTotalGroup : public SfxTabPage { @@ -141,7 +140,6 @@ public: }; //======================================================================== -// Optionen: class ScTpSubTotalOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 0ba8e3d45757..1b52ffc67314 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -35,7 +35,6 @@ #include <svtools/svmedit.hxx> //======================================================================== -// Benutzerdefinierte Listen: class ScUserList; class ScDocument; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 8e915d19250c..6b8ef8611b82 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -37,12 +37,10 @@ #include <svx/strarray.hxx> //======================================================================== -// View-Optionen: class ScViewOptions; //======================================================================== -// TabPage Inhalte class ScTpContentOptions : public SfxTabPage { @@ -110,7 +108,7 @@ public: }; //======================================================================== -// TabPage Layout + class ScDocument; class ScTpLayoutOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 6158a49b2d53..69ec245eb447 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -147,7 +147,7 @@ public: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer den Sortierdialog: +// Parameter item for the sort dialog: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem { @@ -175,7 +175,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer den Filterdialog: class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { @@ -207,7 +206,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer den Zwischenergebnisdialog: class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { @@ -235,7 +233,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer die Benutzerlisten-TabPage: class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { @@ -257,7 +254,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer die Konsolidieren-Dialog class ScConsolidateItem : public SfxPoolItem { @@ -279,7 +275,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer den Pivot-Dialog class ScPivotItem : public SfxPoolItem { @@ -305,7 +300,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer den Solver-Dialog class ScSolveItem : public SfxPoolItem { @@ -327,7 +321,6 @@ private: }; //---------------------------------------------------------------------------- -// Parameter-Item fuer den Mehrfachoperationen-Dialog class ScTabOpItem : public SfxPoolItem { diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 43717e1e4910..2521d2e9afd3 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -282,12 +282,12 @@ public: private: ScRange aRange; ScMarkData aMarkData; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - SdrUndoAction* pDrawUndo; // geloeschte Objekte + ScDocument* pUndoDoc; // Block mark and deleted data + SdrUndoAction* pDrawUndo; // Deleted objects sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; sal_uInt16 nFlags; - sal_Bool bMulti; // Mehrfachselektion + sal_Bool bMulti; // Multi selection void DoChange( const sal_Bool bUndo ); void SetChangeTrack(); @@ -316,13 +316,13 @@ public: private: ScRange aRange; ScMarkData aMarkData; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + ScDocument* pUndoDoc; // Block mark and deleted data sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; sal_uInt16 nFlags; sal_uInt16 nFunction; SCTAB nSrcTab; - sal_Bool bMulti; // Mehrfachselektion + sal_Bool bMulti; // Multi selection sal_Bool bSkipEmpty; sal_Bool bAsLink; @@ -461,7 +461,7 @@ public: private: ScCellMergeOption maOption; bool mbMergeContents; // Merge contents in Redo(). - ScDocument* mpUndoDoc; // wenn Daten zusammengefasst + ScDocument* mpUndoDoc; // when data is merged SdrUndoAction* mpDrawUndo; void DoChange( bool bUndo ) const; @@ -486,7 +486,7 @@ public: virtual rtl::OUString GetComment() const; private: - ScDocument* pUndoDoc; // geloeschte Daten + ScDocument* pUndoDoc; // deleted data ScMarkData aMarkData; sal_Bool bSize; sal_uInt16 nFormatNo; @@ -514,8 +514,8 @@ public: private: ScAddress aCursorPos; ScMarkData aMarkData; - String aUndoStr; // Daten bei Einfachmarkierung - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + String aUndoStr; // Data at single selection + ScDocument* pUndoDoc; // Block mark and deleted data SvxSearchItem* pSearchItem; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -548,7 +548,7 @@ public: private: ScRange aRange; - ScDocument* pUndoDoc; // geloeschte Daten + ScDocument* pUndoDoc; // Deleted data ScRefAddress theFormulaCell; ScRefAddress theFormulaEnd; ScRefAddress theRowCell; @@ -579,9 +579,9 @@ public: private: ScMarkData aMarkData; ScAddress aCursorPos; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + ScDocument* pUndoDoc; // Block mark and deleted data ScAddress aNewCursorPos; - ScDocument* pRedoDoc; // Blockmarkierung und neue Daten + ScDocument* pRedoDoc; // Block mark and new data sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; ScConversionParam maConvParam; /// Conversion type and parameters. @@ -803,7 +803,7 @@ private: }; -class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen? +class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo? { public: TYPEINFO(); diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 0b870c6481e2..29aeb6ff36ac 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -111,7 +111,7 @@ private: SCCOL nCol; SCROW nRow; SCTAB nTab; - SCTAB nCount; // markierte Tabellen + SCTAB nCount; // Marked sheet void DoChange() const; void SetChangeTrack(); @@ -192,8 +192,8 @@ private: SCCOL nCol; SCROW nRow; SCTAB nTab; - sal_Bool bColumn; // Spalten- oder Zeilenumbruch - sal_Bool bInsert; // Einfuegen oder Loeschen + sal_Bool bColumn; // Column or row break + sal_Bool bInsert; // Insert or Delete void DoChange( sal_Bool bInsert ) const; }; @@ -244,8 +244,8 @@ private: SCCOL nCol; SCROW nRow; SCTAB nTab; - String aUndoStr; // Daten bei StringZelle - EditTextObject* pUndoTObject; // bei EditZelle + String aUndoStr; // Data at String cell + EditTextObject* pUndoTObject; // at Edit cell String aRedoStr; EditTextObject* pRedoTObject; sal_uLong nEndChangeAction; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 6966dd37d9e7..989988f7d22d 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -232,8 +232,8 @@ public: private: SCTAB nTab; - ScSubTotalParam aParam; // Original uebergebener Parameter - SCROW nNewEndRow; // Ergebnis-Groesse + ScSubTotalParam aParam; // The original passed parameter + SCROW nNewEndRow; // Size of result ScDocument* pUndoDoc; ScOutlineTable* pUndoTable; // ScDBData* pUndoDBData; @@ -264,7 +264,7 @@ private: ScSortParam aSortParam; sal_Bool bRepeatQuery; ScDocument* pUndoDoc; - ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich + ScDBCollection* pUndoDB; // due to source and target range sal_Bool bDestArea; ScRange aDestRange; }; @@ -292,7 +292,7 @@ private: SCTAB nTab; ScQueryParam aQueryParam; ScDocument* pUndoDoc; - ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich + ScDBCollection* pUndoDB; // due to source and target range ScRange aOldDest; ScRange aAdvSource; sal_Bool bIsAdvanced; diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 61200daed6e7..c2d55194e988 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -112,7 +112,7 @@ private: }; -class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle +class ScUndoDeleteTab: public ScMoveUndo { public: TYPEINFO(); @@ -315,7 +315,7 @@ class ScUndoRemoveLink : public ScSimpleUndo { public: TYPEINFO(); - ScUndoRemoveLink( // vor dem Loeschen aufrufen! + ScUndoRemoveLink( // Call before delete! ScDocShell* pShell, const String& rDoc ); virtual ~ScUndoRemoveLink(); diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx index 0232ddc2ec17..05137e9c9066 100644 --- a/sc/source/ui/inc/undoutil.hxx +++ b/sc/source/ui/inc/undoutil.hxx @@ -33,7 +33,7 @@ class ScDocument; class ScUndoUtil { public: - // Block markieren (unsichtbar, muss repainted werden) + /** Mark Block (invisible - has to be repainted) */ static void MarkSimpleBlock( ScDocShell* pDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ ); @@ -43,12 +43,11 @@ public: static void MarkSimpleBlock( ScDocShell* pDocShell, const ScRange& rRange ); - // Bereich +1 painten static void PaintMore( ScDocShell* pDocShell, const ScRange& rRange ); - // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich) - // legt neu an, wenn nicht gefunden + /** Search for Data base range in Document ("untitled" or by region) + create new if not found */ static ScDBData* GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); }; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index e567e4c67967..ccc9a459b414 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -57,10 +57,10 @@ inline ScVSplitPos WhichV( ScSplitPos ePos ); inline ScSplitPos Which( ScHSplitPos eHPos ); inline ScSplitPos Which( ScVSplitPos eVPos ); -// Bildschirmverhalten bei Cursorbewegungen: +/** Screen behavior related to cursor movements */ enum ScFollowMode { SC_FOLLOW_NONE, SC_FOLLOW_LINE, SC_FOLLOW_FIX, SC_FOLLOW_JUMP }; -// Mausmodi um Bereiche zu selektieren +/** Mouse mode to select areas */ enum ScRefType { SC_REFTYPE_NONE, SC_REFTYPE_REF, SC_REFTYPE_FILL, SC_REFTYPE_EMBED_LT, SC_REFTYPE_EMBED_RB }; @@ -115,7 +115,7 @@ class ScMarkData; //-------------------------------------------------------------------------- -class ScViewDataTable // Daten pro Tabelle +class ScViewDataTable // per-sheet data { friend class ScViewData; private: @@ -129,7 +129,7 @@ private: long nTPosY[2]; long nMPosX[2]; // MapMode - Offset (1/100 mm) long nMPosY[2]; - long nPixPosX[2]; // Offset in Pixeln + long nPixPosX[2]; // Offset in Pixels long nPixPosY[2]; long nHSplitPos; long nVSplitPos; @@ -138,7 +138,7 @@ private: ScSplitMode eVSplitMode; ScSplitPos eWhichActive; - SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren + SCCOL nFixPosX; // Cell position of the splitter when freeze pane SCROW nFixPosY; SCCOL nCurX; @@ -148,9 +148,8 @@ private: SCCOL nPosX[2]; SCROW nPosY[2]; - bool bShowGrid; // per-sheet show grid-lines option. - bool mbOldCursorValid; // "virtuelle" Cursorpos. bei zusammengefassten - + bool bShowGrid; // per sheet show grid lines option. + bool mbOldCursorValid; // "virtual" Cursor position when combined ScViewDataTable(); void WriteUserDataSequence( @@ -169,22 +168,22 @@ public: class SC_DLLPUBLIC ScViewData { private: - double nPPTX, nPPTY; // Scaling-Faktoren + double nPPTX, nPPTY; // Scaling factors ::std::vector<ScViewDataTable*> maTabData; boost::scoped_ptr<ScMarkData> mpMarkData; - ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle + ScViewDataTable* pThisTab; // Data of the displayed sheet ScDocShell* pDocShell; ScDocument* pDoc; ScDBFunc* pView; ScTabViewShell* pViewShell; - EditView* pEditView[4]; // gehoert dem Fenster + EditView* pEditView[4]; // Belongs to the window ScViewOptions* pOptions; EditView* pSpellingView; long nEditMargin; - Size aScenButSize; // Groesse eines Szenario-Buttons + Size aScenButSize; Size aScrSize; MapMode aLogicMode; // skalierter 1/100mm-MapMode @@ -197,35 +196,35 @@ private: ScRefType eRefType; - SCTAB nTabNo; // angezeigte Tabelle - SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht + SCTAB nTabNo; // displayed sheet + SCTAB nRefTabNo; // sheet which contains RefInput SCCOL nRefStartX; SCROW nRefStartY; SCTAB nRefStartZ; SCCOL nRefEndX; SCROW nRefEndY; SCTAB nRefEndZ; - SCCOL nFillStartX; // Fill-Cursor + SCCOL nFillStartX; // Fill Cursor SCROW nFillStartY; SCCOL nFillEndX; SCROW nFillEndY; - SCCOL nEditCol; // Position dazu + SCCOL nEditCol; // Related position SCROW nEditRow; SCCOL nEditStartCol; - SCCOL nEditEndCol; // Ende der Edit-View + SCCOL nEditEndCol; // End of Edit View SCROW nEditEndRow; - SCCOL nTabStartCol; // fuer Enter nach Tab - ScRange aDelRange; // fuer AutoFill-Loeschen + SCCOL nTabStartCol; // for Enter after Tab + ScRange aDelRange; // for delete AutoFill ScPasteFlags nPasteFlags; ScSplitPos eEditActivePart; // the part that was active when edit mode was started - sal_uInt8 nFillMode; // Modus - bool bEditActive[4]; // aktiv? - bool bActive:1; // aktives Fenster ? - bool bIsRefMode:1; // Referenzeingabe - bool bDelMarkValid:1; // nur gueltig bei SC_REFTYPE_FILL - bool bPagebreak:1; // Seitenumbruch-Vorschaumodus + sal_uInt8 nFillMode; + bool bEditActive[4]; // Active? + bool bActive:1; // Active Window ? + bool bIsRefMode:1; // Reference input + bool bDelMarkValid:1; // Only valid at SC_REFTYPE_FILL + bool bPagebreak:1; // Page break preview mode bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, void*); @@ -257,10 +256,10 @@ public: ScMarkData& GetMarkData(); const ScMarkData& GetMarkData() const; - Window* GetDialogParent(); // von tabvwsh weitergeleitet - Window* GetActiveWin(); // von View - ScDrawView* GetScDrawView(); // von View - sal_Bool IsMinimized(); // von View + Window* GetDialogParent(); // forwarded from tabvwsh + Window* GetActiveWin(); // from View + ScDrawView* GetScDrawView(); // from View + sal_Bool IsMinimized(); // from View void UpdateInputHandler( sal_Bool bForce = false, sal_Bool bStopEditing = sal_True ); @@ -366,7 +365,7 @@ public: sal_Bool IsFillMode() { return nFillMode == SC_FILL_FILL; } sal_uInt8 GetFillMode() { return nFillMode; } - // TRUE: Zelle ist zusammengefasst + // TRUE: Cell is merged sal_Bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ); sal_Bool GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, @@ -455,9 +454,9 @@ public: SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeY = SC_SIZE_NONE ) const; SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, sal_uInt16 nScrSizeX = SC_SIZE_NONE ) const; - SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen + SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // Completely visible cell SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; - SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite + SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Cells on the preceding page SCROW PrevCellsY( ScVSplitPos eWhichY ) const; sal_Bool IsOle(); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index eece3daa535b..b7a7172dd851 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -68,7 +68,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class class ScViewFunc : public ScTabView { private: - ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung + ScAddress aFormatSource; // for automatic extension of formatting ScRange aFormatArea; sal_Bool bFormatValid; @@ -96,7 +96,7 @@ public: void EnterMatrix( const String& rString, ::formula::FormulaGrammar::Grammar eGram ); void EnterBlock( const String& rString, const EditTextObject* pData ); - void EnterDataAtCursor( const String& rString ); //! nicht benutzt ? + void EnterDataAtCursor( const String& rString ); //! Not used? SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, sal_Bool bIncludeObjects = false ); SC_DLLPUBLIC sal_Bool CopyToClip( ScDocument* pClipDoc = NULL, sal_Bool bCut = false, sal_Bool bApi = false, @@ -330,14 +330,13 @@ public: void ForgetFormatArea() { bFormatValid = false; } sal_Bool SelectionEditable( bool* pOnlyNotBecauseOfMatrix = NULL ); - // Amelia Wang SC_DLLPUBLIC void DataFormPutData( SCROW nCurrentRow , SCROW nStartRow , SCCOL nStartCol , SCROW nEndRow , SCCOL nEndCol , boost::ptr_vector<boost::nullable<Edit> >& aEdits, sal_uInt16 aColLength ); - // interne Hilfsfunktionen + // Internal helper functions protected: void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, const ::editeng::SvxBorderLine* pDestLine, diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx index 87d8f8089e66..45cb947bc32d 100644 --- a/sc/source/ui/inc/viewutil.hxx +++ b/sc/source/ui/inc/viewutil.hxx @@ -50,7 +50,7 @@ enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS }; // --------------------------------------------------------------------------- -class SC_DLLPUBLIC ScViewUtil // static Methoden +class SC_DLLPUBLIC ScViewUtil { public: static sal_Bool ExecuteCharMap( const SvxFontItem& rOldFont, |