From a365734f439878a71fdcbec1cee354f495647825 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 2 Nov 2015 09:10:53 +0100 Subject: sw: prefix members of SwViewOption Also rename nPagePrevRow/Col to nPagePreviewRow/Col, so that it's more clear that they are about the page preview row/col, not about some previous row/col. Change-Id: I5f1f47edde3dbe6bcce14a654398f8a0be2fa79f --- sw/inc/viewopt.hxx | 294 ++++++++++++++++++++++++++--------------------------- 1 file changed, 147 insertions(+), 147 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 5d672f098010..42fd3e5ca5b0 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -127,35 +127,35 @@ class SW_DLLPUBLIC SwViewOption protected: static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips - OUString sSymbolFont; // Symbolfont. - sal_uInt32 nCoreOptions; // Bits for SwViewShell. - sal_uInt32 nCore2Options; // Bits for SwViewShell. - sal_uInt32 nUIOptions; // UI-Bits - Color aRetoucheColor; // DefaultBackground for BrowseView - Size aSnapSize; // Describes horizontal and vertical snap. + OUString m_sSymbolFont; // Symbolfont. + sal_uInt32 m_nCoreOptions; // Bits for SwViewShell. + sal_uInt32 m_nCore2Options; // Bits for SwViewShell. + sal_uInt32 m_nUIOptions; // UI-Bits + Color m_aRetouchColor; // DefaultBackground for BrowseView + Size m_aSnapSize; // Describes horizontal and vertical snap. sal_uInt16 mnViewLayoutColumns;// # columns for edit view - short nDivisionX; // Grid division. - short nDivisionY; - sal_uInt8 nPagePrevRow; // Page Preview Row/Columns. - sal_uInt8 nPagePrevCol; // Page Preview Row/Columns. - sal_uInt8 nShdwCrsrFillMode; // FillMode for ShadowCrsr. - bool bReadonly : 1; // Readonly-Doc. - bool bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). - bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. - bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. + short m_nDivisionX; // Grid division. + short m_nDivisionY; + sal_uInt8 m_nPagePreviewRow; // Page Preview Row/Columns. + sal_uInt8 m_nPagePreviewCol; // Page Preview Row/Columns. + sal_uInt8 m_nShadowCrsrFillMode; // FillMode for ShadowCrsr. + bool m_bReadonly : 1; // Readonly-Doc. + bool m_bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). + bool m_bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. + bool m_bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. bool mbFormView : 1; bool mbBrowseMode : 1; bool mbBookView : 1; // View mode for page preview. bool mbViewLayoutBookMode : 1; // Book view mode for edit view. bool mbHideWhitespaceMode : 1; // Hide header, footer, and pagebreak. - bool bShowPlaceHolderFields : 1; // Only used in printing! - mutable bool bIdle; + bool m_bShowPlaceHolderFields : 1; // Only used in printing! + mutable bool m_bIdle; // Scale - sal_uInt16 nZoom; // In percent. - SvxZoomType eZoom; // 'enum' for zoom. + sal_uInt16 m_nZoom; // In percent. + SvxZoomType m_eZoom; // 'enum' for zoom. - sal_uInt8 nTableDest; // Destination for table background. + sal_uInt8 m_nTableDestination; // Destination for table background. #ifdef DBG_UTIL // Corresponds to statements in ui/config/cfgvw.src. @@ -180,192 +180,192 @@ public: static sal_uInt16 GetPixelTwips() { return nPixelTwips; } - inline sal_uInt32 GetCoreOptions() const {return nCoreOptions;} + inline sal_uInt32 GetCoreOptions() const {return m_nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); // Options from nCoreOptions inline bool IsIdle() const - { return bIdle; } + { return m_bIdle; } // 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. inline void SetIdle( bool b ) const - { bIdle = b; } + { m_bIdle = b; } inline bool IsTab(bool bHard = false) const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) && - ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_TAB) && + ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } inline void SetTab( bool b ) { - b ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); } + b ? (m_nCoreOptions |= VIEWOPT_1_TAB ) : ( m_nCoreOptions &= ~VIEWOPT_1_TAB); } inline bool IsBlank(bool bHard = false) const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_BLANK) && - ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_BLANK) && + ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } inline void SetBlank( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_BLANK ) : ( nCoreOptions &= ~VIEWOPT_1_BLANK); } + { b ? (m_nCoreOptions |= VIEWOPT_1_BLANK ) : ( m_nCoreOptions &= ~VIEWOPT_1_BLANK); } inline bool IsHardBlank() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_HARDBLANK) != 0; } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_HARDBLANK) != 0; } inline void SetHardBlank( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_HARDBLANK ) : ( nCoreOptions &= ~VIEWOPT_1_HARDBLANK); } + { b ? (m_nCoreOptions |= VIEWOPT_1_HARDBLANK ) : ( m_nCoreOptions &= ~VIEWOPT_1_HARDBLANK); } inline bool IsParagraph(bool bHard = false) const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_PARAGRAPH) && - ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_PARAGRAPH) && + ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } inline void SetParagraph( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_PARAGRAPH ) : ( nCoreOptions &= ~VIEWOPT_1_PARAGRAPH); } + { b ? (m_nCoreOptions |= VIEWOPT_1_PARAGRAPH ) : ( m_nCoreOptions &= ~VIEWOPT_1_PARAGRAPH); } inline bool IsLineBreak(bool bHard = false) const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_LINEBREAK) && - ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_LINEBREAK) && + ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } inline void SetLineBreak( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_LINEBREAK); } + { b ? (m_nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( m_nCoreOptions &= ~VIEWOPT_1_LINEBREAK); } inline void SetPageBreak( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_PAGEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBREAK); } + { b ? (m_nCoreOptions |= VIEWOPT_1_PAGEBREAK ) : ( m_nCoreOptions &= ~VIEWOPT_1_PAGEBREAK); } inline void SetColumnBreak( bool b) - { b ? (nCoreOptions |= VIEWOPT_1_COLUMNBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_COLUMNBREAK); } + { b ? (m_nCoreOptions |= VIEWOPT_1_COLUMNBREAK ) : ( m_nCoreOptions &= ~VIEWOPT_1_COLUMNBREAK); } inline bool IsSoftHyph() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_SOFTHYPH) != 0; } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_SOFTHYPH) != 0; } inline void SetSoftHyph( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } + { b ? (m_nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( m_nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } - inline bool IsFieldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; } + inline bool IsFieldName() const { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_FLDNAME) != 0; } inline void SetFieldName( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); } + { b ? (m_nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( m_nCoreOptions &= ~VIEWOPT_1_FLDNAME); } inline bool IsPostIts() const - { return (nCoreOptions & VIEWOPT_1_POSTITS) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_POSTITS) != 0; } inline void SetPostIts( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); } + { b ? (m_nCoreOptions |= VIEWOPT_1_POSTITS ) : ( m_nCoreOptions &= ~VIEWOPT_1_POSTITS); } static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ); static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ); inline bool IsShowHiddenChar(bool bHard = false) const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && - ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && + ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } inline void SetShowHiddenChar( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } + { b ? (m_nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( m_nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } inline bool IsShowHiddenField() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) != 0; } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_FLD_HIDDEN) != 0; } inline void SetShowHiddenField( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_FLD_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_FLD_HIDDEN); } + { b ? (m_nCoreOptions |= VIEWOPT_1_FLD_HIDDEN ) : ( m_nCoreOptions &= ~VIEWOPT_1_FLD_HIDDEN); } inline bool IsGraphic() const - { return (nCoreOptions & VIEWOPT_1_GRAPHIC) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_GRAPHIC) != 0; } inline void SetGraphic( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_GRAPHIC ) : ( nCoreOptions &= ~VIEWOPT_1_GRAPHIC); } + { b ? (m_nCoreOptions |= VIEWOPT_1_GRAPHIC ) : ( m_nCoreOptions &= ~VIEWOPT_1_GRAPHIC); } inline bool IsPageBack() const - { return (nCoreOptions & VIEWOPT_1_PAGEBACK) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_PAGEBACK) != 0; } inline void SetPageBack( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); } + { b ? (m_nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( m_nCoreOptions &= ~VIEWOPT_1_PAGEBACK); } inline bool IsTable() const - { return (nCoreOptions & VIEWOPT_1_TABLE) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_TABLE) != 0; } inline void SetTable( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_TABLE ) : ( nCoreOptions &= ~VIEWOPT_1_TABLE); } + { b ? (m_nCoreOptions |= VIEWOPT_1_TABLE ) : ( m_nCoreOptions &= ~VIEWOPT_1_TABLE); } inline bool IsDraw() const - { return (nCoreOptions & VIEWOPT_1_DRAW) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_DRAW) != 0; } inline void SetDraw( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_DRAW ) : ( nCoreOptions &= ~VIEWOPT_1_DRAW); } + { b ? (m_nCoreOptions |= VIEWOPT_1_DRAW ) : ( m_nCoreOptions &= ~VIEWOPT_1_DRAW); } inline bool IsControl() const - { return (nCoreOptions & VIEWOPT_1_CONTROL) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_CONTROL) != 0; } inline void SetControl( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_CONTROL ) : ( nCoreOptions &= ~VIEWOPT_1_CONTROL); } + { b ? (m_nCoreOptions |= VIEWOPT_1_CONTROL ) : ( m_nCoreOptions &= ~VIEWOPT_1_CONTROL); } inline bool IsSnap() const - { return (nCoreOptions & VIEWOPT_1_SNAP) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_SNAP) != 0; } inline void SetSnap( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_SNAP ) : ( nCoreOptions &= ~VIEWOPT_1_SNAP); } + { b ? (m_nCoreOptions |= VIEWOPT_1_SNAP ) : ( m_nCoreOptions &= ~VIEWOPT_1_SNAP); } - inline void SetSnapSize( Size &rSz ){ aSnapSize = rSz; } - inline const Size &GetSnapSize() const { return aSnapSize; } + inline void SetSnapSize( Size &rSz ){ m_aSnapSize = rSz; } + inline const Size &GetSnapSize() const { return m_aSnapSize; } inline bool IsGridVisible() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_GRIDVISIBLE) != 0; } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_GRIDVISIBLE) != 0; } inline void SetGridVisible( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_GRIDVISIBLE ) : ( nCoreOptions &= ~VIEWOPT_1_GRIDVISIBLE); } + { b ? (m_nCoreOptions |= VIEWOPT_1_GRIDVISIBLE ) : ( m_nCoreOptions &= ~VIEWOPT_1_GRIDVISIBLE); } inline bool IsOnlineSpell() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) != 0; } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_ONLINESPELL) != 0; } void SetOnlineSpell( bool b ); inline bool IsViewMetaChars() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) != 0; } + { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS) != 0; } inline void SetViewMetaChars( bool b) - { b ? (nCoreOptions |= VIEWOPT_1_VIEWMETACHARS ) : ( nCoreOptions &= ~VIEWOPT_1_VIEWMETACHARS); } + { b ? (m_nCoreOptions |= VIEWOPT_1_VIEWMETACHARS ) : ( m_nCoreOptions &= ~VIEWOPT_1_VIEWMETACHARS); } inline bool IsSynchronize() const - { return (nCoreOptions & VIEWOPT_1_SYNCHRONIZE) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_SYNCHRONIZE) != 0; } inline void SetSynchronize( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_SYNCHRONIZE ) : ( nCoreOptions &= ~VIEWOPT_1_SYNCHRONIZE); } + { b ? (m_nCoreOptions |= VIEWOPT_1_SYNCHRONIZE ) : ( m_nCoreOptions &= ~VIEWOPT_1_SYNCHRONIZE); } inline bool IsCrossHair() const - { return (nCoreOptions & VIEWOPT_1_CROSSHAIR) != 0; } + { return (m_nCoreOptions & VIEWOPT_1_CROSSHAIR) != 0; } inline void SetCrossHair( bool b ) - { b ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } + { b ? (m_nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( m_nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } // Options from nCore2Options inline bool IsBlackFont() const - {return (nCore2Options & VIEWOPT_CORE2_BLACKFONT) != 0; } + {return (m_nCore2Options & VIEWOPT_CORE2_BLACKFONT) != 0; } inline void SetBlackFont(bool b) - { b ? (nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);} + { b ? (m_nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (m_nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);} inline bool IsShowHiddenPara() const - {return (nCore2Options & VIEWOPT_CORE2_HIDDENPARA) != 0; } + {return (m_nCore2Options & VIEWOPT_CORE2_HIDDENPARA) != 0; } inline void SetShowHiddenPara(bool b) - { b ? (nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);} + { b ? (m_nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (m_nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);} inline bool IsSmoothScroll() const - {return (nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL) != 0; } + {return (m_nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL) != 0; } inline void SetSmoothScroll(bool b) - { b ? (nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);} + { b ? (m_nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (m_nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);} inline bool IsCursorInProtectedArea() const - {return (nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT) != 0; } + {return (m_nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT) != 0; } inline void SetCursorInProtectedArea(bool b) - { b ? (nCore2Options |= VIEWOPT_CORE2_CRSR_IN_PROT) : (nCore2Options &= ~VIEWOPT_CORE2_CRSR_IN_PROT);} + { b ? (m_nCore2Options |= VIEWOPT_CORE2_CRSR_IN_PROT) : (m_nCore2Options &= ~VIEWOPT_CORE2_CRSR_IN_PROT);} bool IsIgnoreProtectedArea() const { - return (nCore2Options & VIEWOPT_CORE2_IGNORE_PROT) != 0; + return (m_nCore2Options & VIEWOPT_CORE2_IGNORE_PROT) != 0; } void SetIgnoreProtectedArea(bool bSet) { - bSet ? (nCore2Options |= VIEWOPT_CORE2_IGNORE_PROT) : (nCore2Options &= ~VIEWOPT_CORE2_IGNORE_PROT); + bSet ? (m_nCore2Options |= VIEWOPT_CORE2_IGNORE_PROT) : (m_nCore2Options &= ~VIEWOPT_CORE2_IGNORE_PROT); } inline bool IsPDFExport() const - {return (nCore2Options & VIEWOPT_CORE2_PDF_EXPORT) != 0; } + {return (m_nCore2Options & VIEWOPT_CORE2_PDF_EXPORT) != 0; } inline void SetPDFExport(bool b) - { b ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);} + { b ? (m_nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (m_nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);} inline bool IsPrinting() const - {return (nCore2Options & VIEWOPT_CORE2_PRINTING) != 0; } + {return (m_nCore2Options & VIEWOPT_CORE2_PRINTING) != 0; } inline void SetPrinting(bool b) - { b ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);} + { b ? (m_nCore2Options |= VIEWOPT_CORE2_PRINTING) : (m_nCore2Options &= ~VIEWOPT_CORE2_PRINTING);} - inline short GetDivisionX() const { return nDivisionX; } - inline void SetDivisionX( short n ){ nDivisionX = n; } - inline short GetDivisionY() const { return nDivisionY; } - inline void SetDivisionY( short n ){ nDivisionY = n; } + inline short GetDivisionX() const { return m_nDivisionX; } + inline void SetDivisionX( short n ){ m_nDivisionX = n; } + inline short GetDivisionY() const { return m_nDivisionY; } + inline void SetDivisionY( short n ){ m_nDivisionY = n; } // Default margin left and above document: 284 twips == 5.0 mm. static SAL_CONSTEXPR sal_uInt16 GetDefDocumentBorder() { return 284; } @@ -377,15 +377,15 @@ public: inline sal_uInt16 GetDocumentBorder() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefDocumentBorder(); } inline sal_uInt16 GetGapBetweenPages() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefGapBetweenPages(); } - inline sal_uInt8 GetPagePrevRow() const { return nPagePrevRow; } - inline void SetPagePrevRow( sal_uInt8 n ) { nPagePrevRow = n; } - inline sal_uInt8 GetPagePrevCol() const { return nPagePrevCol; } - inline void SetPagePrevCol( sal_uInt8 n ) { nPagePrevCol = n; } - bool IsReadonly() const { return bReadonly; } - void SetReadonly(bool bSet) { bReadonly = bSet; } + inline sal_uInt8 GetPagePrevRow() const { return m_nPagePreviewRow; } + inline void SetPagePrevRow( sal_uInt8 n ) { m_nPagePreviewRow = n; } + inline sal_uInt8 GetPagePrevCol() const { return m_nPagePreviewCol; } + inline void SetPagePrevCol( sal_uInt8 n ) { m_nPagePreviewCol = n; } + bool IsReadonly() const { return m_bReadonly; } + void SetReadonly(bool bSet) { m_bReadonly = bSet; } - bool IsSelectionInReadonly() const {return bSelectionInReadonly;} - void SetSelectionInReadonly(bool bSet) {bSelectionInReadonly = bSet;} + bool IsSelectionInReadonly() const {return m_bSelectionInReadonly;} + void SetSelectionInReadonly(bool bSet) {m_bSelectionInReadonly = bSet;} bool IsFormView() const { return mbFormView; } void SetFormView( bool bSet ) { mbFormView = bSet; } @@ -423,8 +423,8 @@ public: inline bool IsTest10() const { return m_bTest10; } #endif - inline sal_uInt16 GetZoom() const { return nZoom; } - inline void SetZoom( sal_uInt16 n ){ nZoom = n; } + inline sal_uInt16 GetZoom() const { return m_nZoom; } + inline void SetZoom( sal_uInt16 n ){ m_nZoom = n; } static void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ); static void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ); @@ -440,7 +440,7 @@ public: bool IsViewVScrollBar() const { #if HAVE_FEATURE_DESKTOP - return (nUIOptions & VIEWOPT_2_VSCROLLBAR) != 0; + return (m_nUIOptions & VIEWOPT_2_VSCROLLBAR) != 0; #else return false; #endif @@ -448,112 +448,112 @@ public: bool IsViewHScrollBar() const { #if HAVE_FEATURE_DESKTOP - return (nUIOptions & VIEWOPT_2_HSCROLLBAR) != 0; + return (m_nUIOptions & VIEWOPT_2_HSCROLLBAR) != 0; #else return false; #endif } bool IsKeepRatio() const - { return (nUIOptions & VIEWOPT_2_KEEPASPECTRATIO) != 0; } + { return (m_nUIOptions & VIEWOPT_2_KEEPASPECTRATIO) != 0; } bool IsGrfKeepZoom() const - { return (nUIOptions & VIEWOPT_2_GRFKEEPZOOM) != 0; } + { return (m_nUIOptions & VIEWOPT_2_GRFKEEPZOOM) != 0; } bool IsShowContentTips() const - { return (nUIOptions & VIEWOPT_2_CONTENT_TIPS) != 0; } + { return (m_nUIOptions & VIEWOPT_2_CONTENT_TIPS) != 0; } bool IsPrtFormat() const - { return (nUIOptions & VIEWOPT_2_PRTFORMAT) != 0; } + { return (m_nUIOptions & VIEWOPT_2_PRTFORMAT) != 0; } bool IsShowScrollBarTips() const - { return (nUIOptions & VIEWOPT_2_SCROLLBAR_TIPS) != 0; } + { return (m_nUIOptions & VIEWOPT_2_SCROLLBAR_TIPS) != 0; } - SvxZoomType GetZoomType() const { return eZoom; } + SvxZoomType GetZoomType() const { return m_eZoom; } - sal_uInt8 GetTableDest() const { return nTableDest; } + sal_uInt8 GetTableDest() const { return m_nTableDestination; } void SetViewVScrollBar(bool b) - { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); } + { b ? (m_nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( m_nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); } void SetViewHScrollBar(bool b) - { b ? (nUIOptions |= VIEWOPT_2_HSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_HSCROLLBAR); } + { b ? (m_nUIOptions |= VIEWOPT_2_HSCROLLBAR ) : ( m_nUIOptions &= ~VIEWOPT_2_HSCROLLBAR); } void SetKeepRatio (bool b) - { b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); } + { b ? (m_nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( m_nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); } void SetGrfKeepZoom (bool b) - { b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); } + { b ? (m_nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( m_nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); } void SetShowContentTips( bool b) - { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); } + { b ? (m_nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (m_nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); } void SetPrtFormat( bool b) - { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } + { b ? (m_nUIOptions |= VIEWOPT_2_PRTFORMAT) : (m_nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } void SetShowScrollBarTips( bool b) - { b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); } + { b ? (m_nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (m_nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); } - void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } - void SetTableDest( sal_uInt8 nNew ) { nTableDest = nNew; } + void SetZoomType (SvxZoomType eZoom_){ m_eZoom = eZoom_; } + void SetTableDest( sal_uInt8 nNew ) { m_nTableDestination = nNew; } - const OUString& GetSymbolFont() const {return sSymbolFont;} - void SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;} + const OUString& GetSymbolFont() const {return m_sSymbolFont;} + void SetSymbolFont(const OUString& sSet) {m_sSymbolFont = sSet;} - const Color& GetRetoucheColor() const { return aRetoucheColor;} - void SetRetoucheColor(const Color&r) { aRetoucheColor = r; } + const Color& GetRetoucheColor() const { return m_aRetouchColor;} + void SetRetoucheColor(const Color&r) { m_aRetouchColor = r; } bool IsViewAnyRuler() const { #if HAVE_FEATURE_DESKTOP - return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER); + return 0 != (m_nUIOptions & VIEWOPT_2_ANY_RULER); #else return false; #endif } void SetViewAnyRuler(bool bSet) - { bSet ? (nUIOptions |= VIEWOPT_2_ANY_RULER) : (nUIOptions &= ~VIEWOPT_2_ANY_RULER);} + { bSet ? (m_nUIOptions |= VIEWOPT_2_ANY_RULER) : (m_nUIOptions &= ~VIEWOPT_2_ANY_RULER);} bool IsViewHRuler(bool bDirect = false) const { #if HAVE_FEATURE_DESKTOP return bDirect - ? 0 != (nUIOptions & VIEWOPT_2_H_RULER) - : !bReadonly && (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER); + ? 0 != (m_nUIOptions & VIEWOPT_2_H_RULER) + : !m_bReadonly && (m_nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER); #else (void) bDirect; return false; #endif } void SetViewHRuler (bool b) - { b ? (nUIOptions |= VIEWOPT_2_H_RULER ) : ( nUIOptions &= ~VIEWOPT_2_H_RULER);} + { b ? (m_nUIOptions |= VIEWOPT_2_H_RULER ) : ( m_nUIOptions &= ~VIEWOPT_2_H_RULER);} bool IsViewVRuler(bool bDirect = false) const { #if HAVE_FEATURE_DESKTOP return bDirect - ? 0 != (nUIOptions & VIEWOPT_2_V_RULER) - : !bReadonly && (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER); + ? 0 != (m_nUIOptions & VIEWOPT_2_V_RULER) + : !m_bReadonly && (m_nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER); #else (void) bDirect; return false; #endif } void SetViewVRuler (bool b) - { b ? (nUIOptions |= VIEWOPT_2_V_RULER ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER);} + { b ? (m_nUIOptions |= VIEWOPT_2_V_RULER ) : ( m_nUIOptions &= ~VIEWOPT_2_V_RULER);} // ShadowCursor, switch on/off, get/set color/mode. bool IsShadowCursor() const - { return (nUIOptions & VIEWOPT_2_SHADOWCRSR) != 0; } + { return (m_nUIOptions & VIEWOPT_2_SHADOWCRSR) != 0; } void SetShadowCursor(bool b) - { b ? (nUIOptions |= VIEWOPT_2_SHADOWCRSR ) : ( nUIOptions &= ~VIEWOPT_2_SHADOWCRSR); } + { b ? (m_nUIOptions |= VIEWOPT_2_SHADOWCRSR ) : ( m_nUIOptions &= ~VIEWOPT_2_SHADOWCRSR); } //move vertical ruler to the right bool IsVRulerRight() const - { return (nUIOptions & VIEWOPT_2_V_RULER_RIGHT) != 0; } + { return (m_nUIOptions & VIEWOPT_2_V_RULER_RIGHT) != 0; } void SetVRulerRight(bool b) - { b ? (nUIOptions |= VIEWOPT_2_V_RULER_RIGHT ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER_RIGHT); } + { b ? (m_nUIOptions |= VIEWOPT_2_V_RULER_RIGHT ) : ( m_nUIOptions &= ~VIEWOPT_2_V_RULER_RIGHT); } - bool IsStarOneSetting() const {return bStarOneSetting; } - void SetStarOneSetting(bool bSet) {bStarOneSetting = bSet; } + bool IsStarOneSetting() const {return m_bStarOneSetting; } + void SetStarOneSetting(bool bSet) {m_bStarOneSetting = bSet; } - bool IsPagePreview() const {return bIsPagePreview; } - void SetPagePreview(bool bSet) { bIsPagePreview= bSet; } + bool IsPagePreview() const {return m_bIsPagePreview; } + void SetPagePreview(bool bSet) { m_bIsPagePreview= bSet; } - sal_uInt8 GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } - void SetShdwCrsrFillMode( sal_uInt8 nMode ) { nShdwCrsrFillMode = nMode; }; + sal_uInt8 GetShdwCrsrFillMode() const { return m_nShadowCrsrFillMode; } + void SetShdwCrsrFillMode( sal_uInt8 nMode ) { m_nShadowCrsrFillMode = nMode; }; - bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; } - void SetShowPlaceHolderFields(bool bSet) { bShowPlaceHolderFields = bSet; } + bool IsShowPlaceHolderFields() const { return m_bShowPlaceHolderFields; } + void SetShowPlaceHolderFields(bool bSet) { m_bShowPlaceHolderFields = bSet; } static Color& GetDocColor(); static Color& GetDocBoundariesColor(); @@ -595,14 +595,14 @@ public: inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const { - return IsEqualFlags( rOpt ) && nZoom == rOpt.GetZoom(); + return IsEqualFlags( rOpt ) && m_nZoom == rOpt.GetZoom(); } inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) { - nUIOptions = rVOpt.nUIOptions; - nTableDest = rVOpt.nTableDest; - nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; + m_nUIOptions = rVOpt.m_nUIOptions; + m_nTableDestination = rVOpt.m_nTableDestination; + m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode; } // Helper function for checking HTML-capabilities. -- cgit