diff options
| -rw-r--r-- | sw/inc/unosett.hxx | 8 | ||||
| -rw-r--r-- | sw/inc/usrfld.hxx | 12 | ||||
| -rw-r--r-- | sw/inc/viewopt.hxx | 92 | ||||
| -rw-r--r-- | sw/inc/viewsh.hxx | 200 | ||||
| -rw-r--r-- | sw/inc/viscrs.hxx | 37 |
5 files changed, 167 insertions, 182 deletions
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 055732148f87..b22783062589 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -47,9 +47,7 @@ class SwDoc; class SwFmtCol; class SwDocShell; class SwNumRule; -/****************************************************************************** - * - ******************************************************************************/ + class SwXFootnoteProperties : public cppu::WeakAggImplHelper2 < ::com::sun::star::beans::XPropertySet, @@ -156,8 +154,8 @@ class SwXNumberingRules : public cppu::WeakAggImplHelper5 String sNewCharStyleNames[MAXLEVEL]; String sNewBulletFontNames[MAXLEVEL]; String sCreatedNumRuleName; //connects to a numbering in SwDoc - SwDoc* pDoc; // wird nur fuers anmelden gebraucht - SwDocShell* pDocShell; //nur, wenn als ChapterNumbering verwendet + SwDoc* pDoc; // Only needed for registration. + SwDocShell* pDocShell; // Only if used as chapter numbering. SwNumRule* pNumRule; const SfxItemPropertySet* m_pPropertySet; sal_Bool bOwnNumRuleCreated; diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 49e7368a4d79..8276c63d3b0d 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -35,9 +35,6 @@ class SfxPoolItem; class SwCalc; class SwDoc; -/*-------------------------------------------------------------------- - Beschreibung: Benutzerfelder - --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType { @@ -62,7 +59,7 @@ public: inline sal_Bool IsValid() const; inline void ChgValid( sal_Bool bNew ); - double GetValue(SwCalc& rCalc); // Member nValue neu berrechnen + double GetValue(SwCalc& rCalc); // Recalculate member nValue. inline double GetValue() const; inline void SetValue(const double nVal); @@ -100,9 +97,6 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub) EnableFormat(!(nSub & nsSwGetSetExpType::GSE_STRING)); } -/*-------------------------------------------------------------------- - Beschreibung: Benutzerfelder - --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwUserField : public SwValueField { @@ -122,10 +116,10 @@ public: virtual String GetFieldName() const; - // Name kann nicht geaendert werden + // Name cannot be changed. virtual const String& GetPar1() const; - // Inhalt + // Content. virtual String GetPar2() const; virtual void SetPar2(const String& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 7da7da2f9c43..0dc92411d3a1 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -96,12 +96,13 @@ namespace svtools{ class ColorConfig;} #define VIEWOPT_2_SHADOWCRSR 0x01000000L #define VIEWOPT_2_V_RULER_RIGHT 0x02000000L -//Tabellenhintergrund + +// Table background. #define TBL_DEST_CELL 0 #define TBL_DEST_ROW 1 #define TBL_DEST_TBL 2 -//Appearance flags +// Appearance flags. #define VIEWOPT_DOC_BOUNDARIES 0x0001 #define VIEWOPT_OBJECT_BOUNDARIES 0x0002 #define VIEWOPT_TABLE_BOUNDARIES 0x0004 @@ -112,7 +113,7 @@ namespace svtools{ class ColorConfig;} #define VIEWOPT_SECTION_BOUNDARIES 0x0080 #define VIEWOPT_SHADOW 0x0100 -// Implementierung in core/text/txtpaint.cxx +// Implementation in core/text/txtpaint.cxx. extern void SyncVout( const OutputDevice *pOut ); class SwViewOption @@ -136,59 +137,59 @@ class SwViewOption static Color aScriptIndicatorColor; static Color aShadowColor; - static sal_Int32 nAppearanceFlags; // + static sal_Int32 nAppearanceFlags; protected: static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips - String sSymbolFont; // Symbolzeichensatz - sal_uInt32 nCoreOptions; // Bits fuer die ViewShell - sal_uInt32 nCore2Options; // Bits fuer die ViewShell + String sSymbolFont; // Symbolfont. + sal_uInt32 nCoreOptions; // Bits for ViewShell. + sal_uInt32 nCore2Options; // Bits for ViewShell. sal_uInt32 nUIOptions; // UI-Bits - Color aRetoucheColor; // DefaultBackground fuer BrowseView - Size aSnapSize; // Beschreibt hori. wie vert. Snap + Color aRetoucheColor; // DefaultBackground for BrowseView + Size aSnapSize; // Describes horizontal and vertical snap. sal_uInt16 mnViewLayoutColumns;// # columns for edit view - short nDivisionX; // Rasterunterteilung + short nDivisionX; // Grid division. short nDivisionY; - sal_uInt8 nPagePrevRow; // Page Preview Row/Columns - sal_uInt8 nPagePrevCol; // Page Preview Row/Columns - sal_uInt8 nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr - sal_Bool bReadonly : 1; // Readonly-Doc - sal_Bool bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents) - sal_Bool bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings - sal_Bool bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents + sal_uInt8 nPagePrevRow; // Page Preview Row/Columns. + sal_uInt8 nPagePrevCol; // Page Preview Row/Columns. + sal_uInt8 nShdwCrsrFillMode; // FillMode for ShadowCrsr. + sal_Bool bReadonly : 1; // Readonly-Doc. + sal_Bool bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). + sal_Bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. + sal_Bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. sal_Bool mbFormView : 1; - sal_Bool mbBrowseMode : 1; //swmod 080130 - sal_Bool mbBookView : 1; // view mode for page preview - sal_Bool mbViewLayoutBookMode : 1; // book view mode for edit view - sal_Bool bShowPlaceHolderFields : 1; //only used in printing! + sal_Bool mbBrowseMode : 1; // swmod 080130. + sal_Bool mbBookView : 1; // View mode for page preview. + sal_Bool mbViewLayoutBookMode : 1; // Book view mode for edit view. + sal_Bool bShowPlaceHolderFields : 1; // Only used in printing! mutable bool bIdle; - // Maszstab - sal_uInt16 nZoom; // Angaben in Prozent - SvxZoomType eZoom; // 'enum' fuer Zoom + // Scale + sal_uInt16 nZoom; // In percent. + SvxZoomType eZoom; // 'enum' for zoom. - sal_uInt8 nTblDest; // Ziel fuer Tabellenhintergrund + sal_uInt8 nTblDest; // Destination for table background. #if OSL_DEBUG_LEVEL > 1 - // korrespondieren zu den Angaben in ui/config/cfgvw.src - sal_Bool bTest1 :1; // Test-Flag "Layout not loading" - sal_Bool bTest2 :1; // Test-Flag "WYSIWYG++" - sal_Bool bTest3 :1; // Test-Flag "" - sal_Bool bTest4 :1; // Test-Flag "WYSIWYG debug" - sal_Bool bTest5 :1; // Test-Flag "No idle format" - sal_Bool bTest6 :1; // Test-Flag "No screen adj" - sal_Bool bTest7 :1; // Test-Flag "win format" - sal_Bool bTest8 :1; // Test-Flag "" + // Corresponds to statements in ui/config/cfgvw.src. + sal_Bool bTest1 :1; // Test-flag "Layout not loading" + sal_Bool bTest2 :1; // Test-flag "WYSIWYG++" + sal_Bool bTest3 :1; // Test-flag "" + sal_Bool bTest4 :1; // Test-flag "WYSIWYG debug" + sal_Bool bTest5 :1; // Test-flag "No idle format" + sal_Bool bTest6 :1; // Test-flag "No screen adj" + sal_Bool bTest7 :1; // Test-flag "win format" + sal_Bool bTest8 :1; // Test-flag "" static sal_Bool bTest9; // Test-Flag "DrawingLayerNotLoading" sal_Bool bTest10 :1; // Test-Flag "Format by Input" #endif public: SwViewOption(); // CTOR - SwViewOption(const SwViewOption&); // - ~SwViewOption(); // + SwViewOption(const SwViewOption&); + ~SwViewOption(); - void Init( Window *pWin ); // Initialisierung der statischen Daten + void Init( Window *pWin ); // Initializing of static data. sal_uInt16 GetPixelTwips() const { return nPixelTwips; } @@ -196,13 +197,13 @@ public: inline void SetUIOptions( const SwViewOption& ); /*--------------------------------------------------------------------------- - Optionen aus nCoreOptions + Options from nCoreOptions ----------------------------------------------------------------------------*/ inline sal_Bool IsIdle() const { return bIdle; } - // logically this is a const function since it does not modify the viewoptions + // Logically this is a const function since it does not modify the viewoptions // but only effects idle formatting. Of course that member is already implement // in the wrong place here... Also currently there are many const modifying casts in the code // just to call this function on otherwise const objects. Thus declaring it as const now. @@ -348,7 +349,7 @@ public: { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } /*--------------------------------------------------------------------------- - Optionen aus nCore2Options + Options from nCore2Options ----------------------------------------------------------------------------*/ inline sal_Bool IsBlackFont() const {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? sal_True : sal_False;} @@ -417,7 +418,7 @@ public: void SetViewLayoutColumns( sal_uInt16 nNew ) { mnViewLayoutColumns = nNew; } #if OSL_DEBUG_LEVEL > 1 - // korrespondieren zu den Angaben in ui/config/cfgvw.src + // Correspond to statements in ui/config/cfgvw.src. inline sal_Bool IsTest1() const { return bTest1; } inline void SetTest1( sal_Bool b ) { bTest1 = b; } inline sal_Bool IsTest2() const { return bTest2; } @@ -447,14 +448,15 @@ public: void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ) const; SwViewOption& operator=( const SwViewOption &rOpt ); - // Vergleichsmethoden + + // Compare methods. sal_Bool IsEqualFlags ( const SwViewOption &rOpt ) const; inline sal_Bool operator == ( const SwViewOption &rOpt ) const; inline sal_Bool operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } /*--------------------------------------------------------------------------- - Optionen aus nUIOptions + Options from nUIOptions ----------------------------------------------------------------------------*/ sal_Bool IsViewVScrollBar() const @@ -526,7 +528,7 @@ public: void SetViewVRuler (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER);} - // ShadowCursor ein schalten/abfragen/Farbe setzen/Modus setzen + // ShadowCursor, switch on/off, get/set color/mode. sal_Bool IsShadowCursor() const { return nUIOptions & VIEWOPT_2_SHADOWCRSR ? sal_True : sal_False; } void SetShadowCursor(sal_Bool b) @@ -601,7 +603,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) } -// Hilfsfunktion zur Ermittlung der HTML-Faehigkeiten +// Helper function for checking HTML-capabilities. SW_DLLPUBLIC sal_uInt16 GetHtmlMode(const SwDocShell*); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 3c546d9ede4f..c37577e66ef1 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -36,7 +36,7 @@ #include <swtypes.hxx> #include <ring.hxx> #include <swrect.hxx> -#include <boost/shared_ptr.hpp>// swmod 080115 +#include <boost/shared_ptr.hpp> // swmod 080115 #include <vcl/mapmod.hxx> #include <vcl/print.hxx> @@ -92,9 +92,8 @@ namespace vcl } -// define fuer Flags, die im CTOR oder den darunter liegenden Schichten -// benoetigt werden. -// Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt +// Define for flags needed in ctor or layers below. +// Currently the PreView flag is needed for DrawPage. #define VSHELLFLAG_ISPREVIEW ((long)0x1) #define VSHELLFLAG_SHARELAYOUT ((long)0x2)//swmod 080125 flag typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr; @@ -108,29 +107,28 @@ class SW_DLLPUBLIC ViewShell : public Ring friend class SwViewImp; friend class SwLayIdle; - // for setting visible area for page preview paint + // For setting visible area for page preview paint. friend class SwPagePreviewLayout; - //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert - //werden kann. + + // Set SwVisArea in order to enable clean formatting before printing. friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False ); static BitmapEx* pReplaceBmp; // replaced display of still loaded images static BitmapEx* pErrorBmp; // error display of missed images - static sal_Bool bLstAct; // sal_True wenn Das EndAction der letzten Shell - // laeuft; also die EndActions der - // anderen Shells auf das Dokument - // abgearbeitet sind. + static sal_Bool bLstAct; // sal_True if EndAction of last Shell + // i.e. if the EndActions of the other + // Shells on the document are through. - Point aPrtOffst; //Ofst fuer den Printer, - //nicht bedruckbarer Rand. - Size aBrowseBorder; //Rand fuer Framedokumente + Point aPrtOffst; // Ofst for Printer, + // non-printable margin. + Size aBrowseBorder; // Border for frame documents. SwRect aInvalidRect; SfxViewShell *pSfxViewShell; - SwViewImp *pImp; //Core-Interna der ViewShell. - //Der Pointer ist niemals 0. + SwViewImp *pImp; // Core-internals of ViewShell. + // The pointer is never 0. Window *pWin; // = 0 during printing or pdf export OutputDevice *pOut; // Window, Printer, VirtDev, ... @@ -144,23 +142,22 @@ class SW_DLLPUBLIC ViewShell : public Ring SwAccessibilityOptions* pAccOptions; - sal_Bool bDocSizeChgd :1; //Fuer DocChgNotify(): Neue DocGroesse bei - //EndAction an das DocMDI melden. - sal_Bool bPaintWorks :1; //Normal Painten wenn sal_True, - //Paint merken wenn sal_False - sal_Bool bPaintInProgress :1; //Kein zweifaches Paint durchlassen. - sal_Bool bViewLocked :1; //Lockt den sichtbaren Bereich, - //MakeVisible laeuft dann in's leere. - sal_Bool bInEndAction :1; //Fiese unstaende vermeiden, siehe viewsh.cxx - sal_Bool bPreView :1; //Ist sal_True wenns eine PreView-ViewShell ist. - sal_Bool bFrameView :1; //sal_True wenn es ein (HTML-)Frame ist. - sal_Bool bEnableSmooth :1; //Disable des SmoothScroll z.B. fuer - //Drag der Scrollbars. - sal_Bool bEndActionByVirDev:1; //Paints aus der EndAction immer ueber virtuelles - - //Device (etwa beim Browsen) - - // boolean, indicating that class in in constructor + sal_Bool bDocSizeChgd :1; // For DocChgNotify(): Announce new DocSize + // at EndAction to DocMDI. + sal_Bool bPaintWorks :1; // Normal Painting if sal_True, + // remember Paint if sal_False. + sal_Bool bPaintInProgress :1; // Block any double paint. + sal_Bool bViewLocked :1; // Lock visible range; + // in this case MakeVisible is ineffectual. + sal_Bool bInEndAction :1; // Avoid problems, cf. viewsh.cxx. + sal_Bool bPreView :1; // If sal_True it is a PreView-ViewShell. + sal_Bool bFrameView :1; // If sal_True it is a (HTML-)Frame. + sal_Bool bEnableSmooth :1; // Disable SmoothScroll, e.g. for drag + // of scrollbars. + sal_Bool bEndActionByVirDev:1; // Paints from EndAction always via virtual device + // (e.g. when browsing). + + // boolean, indicating that class in in constructor. bool mbInConstructor:1; SdrPaintWindow* mpTargetPaintWindow; @@ -168,34 +165,34 @@ class SW_DLLPUBLIC ViewShell : public Ring SwRootFrmPtr pLayout; //swmod 080116 - //Initialisierung, wird von den verschiedenen Konstruktoren gerufen. + // Initialization; called by the diverse constructors. SW_DLLPRIVATE void Init( const SwViewOption *pNewOpt ); inline void ResetInvalidRect(); - SW_DLLPRIVATE void Reformat(); //Invalidert das ges. Layout (ApplyViewOption) + SW_DLLPRIVATE void Reformat(); // Invalidates complete Layout (ApplyViewOption). - SW_DLLPRIVATE void PaintDesktop( const SwRect & ); // sammeln der Werte fuers - // Malen der Wiese und rufen - // PaintDesktop gesplittet, dieser Teil wird auch von PreViewPage benutzt + SW_DLLPRIVATE void PaintDesktop( const SwRect & ); // Collect values for painting of desktop + // and calling. + // PaintDesktop split. This pars is also used by PreViewPage. SW_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion ); - SW_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & );//Direkt Paint oder lieber - //eine Aktion ausloesen. + SW_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather + // trigger an action. SW_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions ); SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt ); protected: - static ShellResource* pShellRes; // Resourcen fuer die Shell - static Window* pCareWindow; // diesem Fenster ausweichen + static ShellResource* pShellRes; // Resources for the Shell. + static Window* pCareWindow; // Avoid this window. - SwRect aVisArea; //Die moderne Ausfuerung der VisArea - SwDoc *pDoc; //Das Dokument, niemals 0 + SwRect aVisArea; // The modern version of VisArea. + SwDoc *pDoc; // The document; never 0. - sal_uInt16 nStartAction; //ist != 0 wenn mindestens eine ::com::sun::star::chaos::Action laeuft - sal_uInt16 nLockPaint; //ist != 0 wenn das Paint gelocked ist. + sal_uInt16 nStartAction; // != 0 if at least one ::com::sun::star::chaos::Action is active. + sal_uInt16 nLockPaint; // != 0 if Paint is locked. public: TYPEINFO(); @@ -205,10 +202,10 @@ public: const SwNodes& GetNodes() const; - //Nach Druckerwechsel, vom Doc + // After change of printer; by Doc. void InitPrt( OutputDevice *pOutDev ); - //Klammerung von zusammengehoerenden Aktionen. + // Bracketing of actions belonging together. inline void StartAction(); void ImplStartAction(); inline void EndAction( const sal_Bool bIdleEnd = sal_False ); @@ -220,8 +217,8 @@ public: void SetEndActionByVirDev( sal_Bool b ) { bEndActionByVirDev = b; } sal_Bool IsEndActionByVirDev() { return bEndActionByVirDev; } - // Per UNO wird am RootFrame fuer alle shells der ActionCount kurzfristig - // auf Null gesetzt und wieder restauriert + // The ActionCount for all Shells is temporarily set to zero and then + // restored at the RootFrame via UNO. void SetRestoreActions(sal_uInt16 nSet); sal_uInt16 GetRestoreActions() const; @@ -250,44 +247,43 @@ public: sal_Bool IsPaintInProgress() const { return bPaintInProgress; } bool IsDrawingLayerPaintInProgress() const { return 0 != mnPrePostPaintCount; } - //Benachrichtung, dass sich der sichtbare Bereich geaendert hat. - //VisArea wird neu gesetzt, anschliessend wird gescrollt. - //Das uebergebene Rect liegt auf Pixelgrenzen, - //um Pixelfehler beim Scrollen zu vermeiden. + // Notification that visible area has been changed. + // VisArea is reset, after that scrolling takes place. + // The passed rect is situated on pixel borders + // in order to avoid pixel errors when scrolling. virtual void VisPortChgd( const SwRect & ); sal_Bool SmoothScroll( long lXDiff, long lYDiff, const Rectangle* );//Browser void EnableSmooth( sal_Bool b ) { bEnableSmooth = b; } const SwRect& VisArea() const { return aVisArea; } - //Es wird, wenn notwendig, soweit gescrollt, dass das - //uebergebene Rect im sichtbaren Ausschnitt liegt. + + // If necessary scroll until passed Rect is situated in visible sector. void MakeVisible( const SwRect & ); - //Bei naechster Gelegenheit die neue Dokuemntgroesse an das UI weiterreichen. + // At nearest occasion pass new document size to UI. void SizeChgNotify(); - void UISizeNotify(); //Das weiterreichen der aktuellen groesse. + void UISizeNotify(); // Passing of current size. Point GetPagePos( sal_uInt16 nPageNum ) const; - sal_uInt16 GetNumPages(); //Anzahl der aktuellen Seiten Layout erfragen. + sal_uInt16 GetNumPages(); // Ask count of current pages from layout. sal_Bool IsDummyPage( sal_uInt16 nPageNum ) const; // An empty page? - //Invalidierung der ersten Sichtbaren Seite fuer alle Shells im Ring. + // Invalidate first visible page for all Shells in ring. void SetFirstVisPageInvalid(); - SwRootFrm *GetLayout() const;//swmod 080116 - sal_Bool IsNewLayout() const; //Wurde das Layout geladen oder neu - //erzeugt? + SwRootFrm *GetLayout() const;// swmod 080116 + sal_Bool IsNewLayout() const; // Has Layout been loaded or created? - Size GetDocSize() const;// erfrage die Groesse des Dokuments + Size GetDocSize() const; // Get document size. - void CalcLayout(); //Durchformatierung des Layouts erzwingen. + void CalcLayout(); // Force complete formatting of layout. sal_uInt16 GetPageCount() const; const Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const; - inline SwDoc *GetDoc() const { return pDoc; } //niemals 0. + inline SwDoc *GetDoc() const { return pDoc; } //Never 0. /** Provides access to the document setting interface */ @@ -352,65 +348,63 @@ public: static inline sal_Bool IsLstEndAction() { return ViewShell::bLstAct; } - //Andern alle PageDescriptoren + // Change of all page descriptors. void ChgAllPageOrientation( sal_uInt16 eOri ); void ChgAllPageSize( Size &rSz ); - // printing of one page. + // Printing of one page. // bIsPDFExport == true is: do PDF Export (no printing!) sal_Bool PrintOrPDFExport( OutputDevice *pOutDev, SwPrintData const& rPrintData, sal_Int32 nRenderer /* offset in vector of pages to print */ ); - // printing of one brochure page + // Printing of one brochure page. void PrintProspect( OutputDevice *pOutDev, const SwPrintData &rPrintData, sal_Int32 nRenderer /* offset in vector of page pairs for prospect printing */ ); - // printing for OLE 2.0 + // Printing for OLE 2.0. static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ); - /// fill temporary doc with selected text for Print or PDF export + // Fill temporary doc with selected text for Print or PDF export. SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); - //Wird intern fuer die Shell gerufen die Druckt. Formatiert die Seiten. + // Called internally for Shell. Formats pages. void CalcPagesForPrint( sal_uInt16 nMax ); - //All about fields. + // All about fields. void UpdateFlds(sal_Bool bCloseDB = sal_False); sal_Bool IsAnyFieldInDoc() const; - // update all charts, for that exists any table + // Update all charts, for that exists any table. void UpdateAllCharts(); sal_Bool HasCharts() const; - // // DOCUMENT COMPATIBILITY FLAGS START - // - // Sollen Absatzabstaende addiert oder maximiert werden? + // Add or maximize paragraph spacing? void SetParaSpaceMax( bool bNew ); - // Sollen Absatzabstaende addiert oder maximiert werden? + // Add or maximize paragraph spacing? void SetParaSpaceMaxAtPages( bool bNew ); - // compatible behaviour of tabs + // Compatible behaviour of tabs. void SetTabCompat( bool bNew ); - // font metric attribute "External Leading" should be considered + // Font metric attribute "External Leading" should be considered. void SetAddExtLeading( bool bNew ); - // formatting by virtual device or printer + // Formatting by virtual device or printer. void SetUseVirDev( bool nNew ); - // adding paragraph and table spacing at bottom - // of table cells + // Adding paragraph and table spacing at bottom + // of table cells. void SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells ); - // former formatting of text lines with - // proportional line spacing or not + // Former formatting of text lines with + // proportional line spacing or not. void SetUseFormerLineSpacing( bool _bUseFormerLineSpacing ); - // former object positioning + // Former object positioning. void SetUseFormerObjectPositioning( bool _bUseFormerObjPos ); void SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos ); @@ -419,20 +413,18 @@ public: void SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWithManualBreak ); - // // DOCUMENT COMPATIBILITY FLAGS END - // - //Ruft den Idle-Formatierer des Layouts + // Calls Idle-formatter of Layout. void LayoutIdle(); inline const SwViewOption *GetViewOptions() const { return pOpt; } virtual void ApplyViewOptions( const SwViewOption &rOpt ); void SetUIOptions( const SwViewOption &rOpt ); - void SetReadonlyOption(sal_Bool bSet); // Readonly-Bit d. ViewOptions setzen - void SetPDFExportOption(sal_Bool bSet); // set/reset PDF export mode - void SetPrtFormatOption(sal_Bool bSet); // PrtFormat-Bit d. ViewOptions setzen - void SetReadonlySelectionOption(sal_Bool bSet);//change the selection mode in readonly docs + void SetReadonlyOption(sal_Bool bSet); // Set readonly-bit of ViewOptions. + void SetPDFExportOption(sal_Bool bSet); // Set/reset PDF export mode. + void SetPrtFormatOption(sal_Bool bSet); // Set PrtFormat-Bit of ViewOptions. + void SetReadonlySelectionOption(sal_Bool bSet); // Change the selection mode in readonly docs. const SwAccessibilityOptions* GetAccessibilityOptions() const { return pAccOptions;} @@ -447,7 +439,7 @@ public: inline SfxViewShell *GetSfxViewShell() { return pSfxViewShell; } inline void SetSfxViewShell(SfxViewShell *pNew) { pSfxViewShell = pNew; } - // Selektion der Draw ::com::sun::star::script::Engine geaendert + // Selection of Draw ::com::sun::star::script::Engine has been changed. virtual void DrawSelChanged(); SwPagePreviewLayout* PagePreviewLayout(); @@ -473,18 +465,18 @@ public: void ImplUnlockPaint( sal_Bool bVirDev ); sal_Bool IsPaintLocked() const { return nLockPaint != 0; } - // Abfragen/Erzeugen DrawView + PageView + // Get/set DrawView and PageView. sal_Bool HasDrawView() const; void MakeDrawView(); - //DrawView darf u.U. am UI benutzt werden. + // DrawView may be used at UI. SdrView *GetDrawView(); const SdrView *GetDrawView() const { return ((ViewShell*)this)->GetDrawView(); } - //sorge dafuer, das auf jedenfall die MarkListe aktuell ist (Bug 57153) + // Take care that MarkList is up-to-date in any case (Bug 57153). SdrView *GetDrawViewWithValidMarkList(); - // erfrage den Attribut Pool + // Query attribute pool. inline const SfxItemPool& GetAttrPool() const; SfxItemPool& GetAttrPool(); @@ -494,10 +486,10 @@ public: void SetFrameView( const Size& rBrowseBorder ) { bFrameView = sal_True; aBrowseBorder = rBrowseBorder; } - //Nimmt die notwendigen Invalidierungen vor, - //wenn sich der BrowdseModus aendert, bBrowseChgd == sal_True - //oder, im BrowseModus, wenn sich die Groessenverhaeltnisse - //aendern (bBrowseChgd == sal_False) + // Makes the necessary invalidations: + // If BrowseMode has changed bBrowseChgd == sal_True + // or bBrowseChgd == sal_False in BrowseMode + // if proportions have changed. void CheckBrowseView( sal_Bool bBrowseChgd ); const Size& GetBrowseBorder() const; @@ -513,7 +505,7 @@ public: void ShowPreViewSelection( sal_uInt16 nSelPage ); void InvalidateAccessibleFocus(); - //apply Accessiblity options + // Apply Accessiblity options. void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); /** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs @@ -571,7 +563,7 @@ public: SwPostItMgr* GetPostItMgr(); }; -//---- class CurrShell verwaltet den globalen ShellPointer ------------------- +//---- class CurrShell manages global ShellPointer ------------------- class CurrShell { diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index e8e917b888ff..0a0a913de2c4 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -36,7 +36,7 @@ class SwCrsrShell; class SwShellCrsr; -// -------- Ab hier Klassen / Methoden fuer den nicht Text-Cursor ------ +// From here classes/methods for non-text cursor. class SwVisCrsr #ifdef SW_CRSR_TIMER @@ -77,7 +77,7 @@ public: }; -// ------ Ab hier Klassen / Methoden fuer die Selectionen ------- +// From here classes/methods for selections. namespace sdr { namespace overlay { class OverlayObject; }} @@ -122,11 +122,11 @@ public: class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects { - // Dokument-Positionen der Start/End-Charakter einer SSelection + // Document positions of start/end characters of a SSelection. Point aMkPt, aPtPt; - const SwPosition* pPt; // fuer Zuordung vom GetPoint() zum aPtPt + const SwPosition* pPt; // For assignment of GetPoint() to aPtPt. - virtual void FillRects(); // fuer Table- und normalen Crsr + virtual void FillRects(); // For Table- und normal cursors. using SwCursor::UpDown; @@ -137,8 +137,8 @@ public: SwShellCrsr( SwShellCrsr& ); virtual ~SwShellCrsr(); - void Show(); // Update und zeige alle Selektionen an - void Hide(); // verstecke alle Selektionen + void Show(); // Update and display all selections. + void Hide(); // Hide all selections. void Invalidate( const SwRect& rRect ); const Point& GetPtPos() const { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); } @@ -159,12 +159,12 @@ public: sal_Bool UpDown( sal_Bool bUp, sal_uInt16 nCnt = 1 ); - // sal_True: an die Position kann der Cursor gesetzt werden + // sal_True: Cursor can be set to this position. virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; #if OSL_DEBUG_LEVEL > 1 - // zum Testen des UNO-Crsr Verhaltens hier die Implementierung - // am sichtbaren Cursor + + // For testing of UNO-Crsr behavior here the implementation at visible cursor. virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | @@ -180,10 +180,9 @@ public: class SwShellTableCrsr : public virtual SwShellCrsr, public virtual SwTableCursor { - // die Selection hat die gleiche Reihenfolge wie die - // TabellenBoxen. D.h., wird aus dem einen Array an einer Position - // etwas geloescht, dann muss es auch im anderen erfolgen!! - + // The Selection has the same order as the table boxes, i.e. + // if something is deleted from the one array at a certain position + // it has to be deleted from the other one as well!! public: SwShellTableCrsr( const SwCrsrShell& rCrsrSh, const SwPosition& rPos ); @@ -192,9 +191,9 @@ public: const SwPosition &rPtPos, const Point& rPtPt ); virtual ~SwShellTableCrsr(); - virtual void FillRects(); // fuer Table- und normalen Crsr + virtual void FillRects(); // For table and normal cursor. - // Pruefe, ob sich der SPoint innerhalb der Tabellen-SSelection befindet + // Check if SPoint is within table SSelection. sal_Bool IsInside( const Point& rPt ) const; virtual void SetMark(); @@ -203,12 +202,12 @@ public: virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); - // sal_True: an die Position kann der Cursor gesetzt werden + // sal_True: Cursor can be set to this position. virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; #if OSL_DEBUG_LEVEL > 1 - // zum Testen des UNO-Crsr Verhaltens hier die Implementierung - // am sichtbaren Cursor + + // For testing of UNO-Crsr behavior here the implementation at visible cursor. virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | |