[Libreoffice-commits] core.git: 4 commits - sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Nov 2 00:12:05 PST 2015
sw/inc/fmtcol.hxx | 10 -
sw/inc/frmfmt.hxx | 8
sw/inc/node.hxx | 8
sw/inc/viewopt.hxx | 294 ++++++++++++++++++------------------
sw/source/core/doc/fmtcol.cxx | 44 ++---
sw/source/core/docnode/node.cxx | 18 +-
sw/source/core/layout/atrfrm.cxx | 8
sw/source/uibase/config/viewopt.cxx | 140 ++++++++---------
8 files changed, 265 insertions(+), 265 deletions(-)
New commits:
commit a365734f439878a71fdcbec1cee354f495647825
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 2 09:10:53 2015 +0100
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
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 5d672f0..42fd3e5 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.
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 703622b..f7e22b4 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -71,21 +71,21 @@ static const char aPostItStr[] = " ";
bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
{
- return nCoreOptions == rOpt.nCoreOptions
- && nCore2Options == rOpt.nCore2Options
- && aSnapSize == rOpt.aSnapSize
+ return m_nCoreOptions == rOpt.m_nCoreOptions
+ && m_nCore2Options == rOpt.m_nCore2Options
+ && m_aSnapSize == rOpt.m_aSnapSize
&& mnViewLayoutColumns == rOpt.mnViewLayoutColumns
- && nDivisionX == rOpt.GetDivisionX()
- && nDivisionY == rOpt.GetDivisionY()
- && nPagePrevRow == rOpt.GetPagePrevRow()
- && nPagePrevCol == rOpt.GetPagePrevCol()
- && aRetoucheColor == rOpt.GetRetoucheColor()
+ && m_nDivisionX == rOpt.GetDivisionX()
+ && m_nDivisionY == rOpt.GetDivisionY()
+ && m_nPagePreviewRow == rOpt.GetPagePrevRow()
+ && m_nPagePreviewCol == rOpt.GetPagePrevCol()
+ && m_aRetouchColor == rOpt.GetRetoucheColor()
&& mbFormView == rOpt.IsFormView()
&& mbBrowseMode == rOpt.getBrowseMode()
&& mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode
&& mbHideWhitespaceMode == rOpt.mbHideWhitespaceMode
- && bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields
- && bIdle == rOpt.bIdle
+ && m_bShowPlaceHolderFields == rOpt.m_bShowPlaceHolderFields
+ && m_bIdle == rOpt.m_bIdle
#ifdef DBG_UTIL
// correspond to the statements in ui/config/cfgvw.src
&& m_bTest1 == rOpt.IsTest1()
@@ -153,29 +153,29 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b
}
SwViewOption::SwViewOption() :
- sSymbolFont( "symbol" ),
- aRetoucheColor( COL_TRANSPARENT ),
+ m_sSymbolFont( "symbol" ),
+ m_aRetouchColor( COL_TRANSPARENT ),
mnViewLayoutColumns( 0 ),
- nPagePrevRow( 1 ),
- nPagePrevCol( 2 ),
- nShdwCrsrFillMode( FILL_TAB ),
- bReadonly(false),
- bStarOneSetting(false),
- bIsPagePreview(false),
- bSelectionInReadonly(false),
+ m_nPagePreviewRow( 1 ),
+ m_nPagePreviewCol( 2 ),
+ m_nShadowCrsrFillMode( FILL_TAB ),
+ m_bReadonly(false),
+ m_bStarOneSetting(false),
+ m_bIsPagePreview(false),
+ m_bSelectionInReadonly(false),
mbFormView(false),
mbBrowseMode(false),
mbBookView(false),
mbViewLayoutBookMode(false),
mbHideWhitespaceMode(false),
- bShowPlaceHolderFields( true ),
- nZoom( 100 ),
- eZoom( SvxZoomType::PERCENT ),
- nTableDest(TBL_DEST_CELL)
+ m_bShowPlaceHolderFields( true ),
+ m_nZoom( 100 ),
+ m_eZoom( SvxZoomType::PERCENT ),
+ m_nTableDestination(TBL_DEST_CELL)
{
// Initialisation is a little simpler now
// all Bits to 0
- nCoreOptions =
+ m_nCoreOptions =
VIEWOPT_1_HARDBLANK |
VIEWOPT_1_SOFTHYPH |
VIEWOPT_1_REF |
@@ -186,24 +186,24 @@ SwViewOption::SwViewOption() :
VIEWOPT_1_PAGEBACK |
VIEWOPT_1_POSTITS;
- nCore2Options =
+ m_nCore2Options =
VIEWOPT_CORE2_BLACKFONT |
VIEWOPT_CORE2_HIDDENPARA;
- nUIOptions =
+ m_nUIOptions =
VIEWOPT_2_MODIFIED |
VIEWOPT_2_GRFKEEPZOOM |
VIEWOPT_2_ANY_RULER;
if (!utl::ConfigManager::IsAvoidConfig() && MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
- aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2"
+ m_aSnapSize.Width() = m_aSnapSize.Height() = 720; // 1/2"
else
- aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm
- nDivisionX = nDivisionY = 1;
+ m_aSnapSize.Width() = m_aSnapSize.Height() = 567; // 1 cm
+ m_nDivisionX = m_nDivisionY = 1;
- bSelectionInReadonly = !utl::ConfigManager::IsAvoidConfig() && SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
+ m_bSelectionInReadonly = !utl::ConfigManager::IsAvoidConfig() && SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
- bIdle = true;
+ m_bIdle = true;
#ifdef DBG_UTIL
// correspond to the statements in ui/config/cfgvw.src
@@ -216,33 +216,33 @@ SwViewOption::SwViewOption() :
SwViewOption::SwViewOption(const SwViewOption& rVOpt)
{
- bReadonly = false;
- bSelectionInReadonly = false;
+ m_bReadonly = false;
+ m_bSelectionInReadonly = false;
// #114856# Formular view
mbFormView = rVOpt.mbFormView;
- nZoom = rVOpt.nZoom ;
- aSnapSize = rVOpt.aSnapSize ;
+ m_nZoom = rVOpt.m_nZoom ;
+ m_aSnapSize = rVOpt.m_aSnapSize ;
mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ;
- nDivisionX = rVOpt.nDivisionX ;
- nDivisionY = rVOpt.nDivisionY ;
- nPagePrevRow = rVOpt.nPagePrevRow;
- nPagePrevCol = rVOpt.nPagePrevCol;
- bIsPagePreview = rVOpt.bIsPagePreview;
- eZoom = rVOpt.eZoom ;
- nTableDest = rVOpt.nTableDest ;
- nUIOptions = rVOpt.nUIOptions ;
- nCoreOptions = rVOpt.nCoreOptions ;
- nCore2Options = rVOpt.nCore2Options ;
- aRetoucheColor = rVOpt.GetRetoucheColor();
- sSymbolFont = rVOpt.sSymbolFont;
- nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
- bStarOneSetting = rVOpt.bStarOneSetting;
+ m_nDivisionX = rVOpt.m_nDivisionX ;
+ m_nDivisionY = rVOpt.m_nDivisionY ;
+ m_nPagePreviewRow = rVOpt.m_nPagePreviewRow;
+ m_nPagePreviewCol = rVOpt.m_nPagePreviewCol;
+ m_bIsPagePreview = rVOpt.m_bIsPagePreview;
+ m_eZoom = rVOpt.m_eZoom ;
+ m_nTableDestination = rVOpt.m_nTableDestination ;
+ m_nUIOptions = rVOpt.m_nUIOptions ;
+ m_nCoreOptions = rVOpt.m_nCoreOptions ;
+ m_nCore2Options = rVOpt.m_nCore2Options ;
+ m_aRetouchColor = rVOpt.GetRetoucheColor();
+ m_sSymbolFont = rVOpt.m_sSymbolFont;
+ m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode;
+ m_bStarOneSetting = rVOpt.m_bStarOneSetting;
mbBookView = rVOpt.mbBookView;
mbBrowseMode = rVOpt.mbBrowseMode;
mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
- bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
- bIdle = rVOpt.bIdle;
+ m_bShowPlaceHolderFields = rVOpt.m_bShowPlaceHolderFields;
+ m_bIdle = rVOpt.m_bIdle;
#ifdef DBG_UTIL
m_bTest1 = rVOpt.m_bTest1;
@@ -261,29 +261,29 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
{
// #114856# Formular view
mbFormView = rVOpt.mbFormView ;
- nZoom = rVOpt.nZoom ;
- aSnapSize = rVOpt.aSnapSize ;
+ m_nZoom = rVOpt.m_nZoom ;
+ m_aSnapSize = rVOpt.m_aSnapSize ;
mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ;
- nDivisionX = rVOpt.nDivisionX ;
- nDivisionY = rVOpt.nDivisionY ;
- nPagePrevRow = rVOpt.nPagePrevRow;
- nPagePrevCol = rVOpt.nPagePrevCol;
- bIsPagePreview = rVOpt.bIsPagePreview;
- eZoom = rVOpt.eZoom ;
- nTableDest = rVOpt.nTableDest ;
- nUIOptions = rVOpt.nUIOptions ;
- nCoreOptions = rVOpt.nCoreOptions;
- nCore2Options = rVOpt.nCore2Options;
- aRetoucheColor = rVOpt.GetRetoucheColor();
- sSymbolFont = rVOpt.sSymbolFont;
- nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
- bStarOneSetting = rVOpt.bStarOneSetting;
+ m_nDivisionX = rVOpt.m_nDivisionX ;
+ m_nDivisionY = rVOpt.m_nDivisionY ;
+ m_nPagePreviewRow = rVOpt.m_nPagePreviewRow;
+ m_nPagePreviewCol = rVOpt.m_nPagePreviewCol;
+ m_bIsPagePreview = rVOpt.m_bIsPagePreview;
+ m_eZoom = rVOpt.m_eZoom ;
+ m_nTableDestination = rVOpt.m_nTableDestination ;
+ m_nUIOptions = rVOpt.m_nUIOptions ;
+ m_nCoreOptions = rVOpt.m_nCoreOptions;
+ m_nCore2Options = rVOpt.m_nCore2Options;
+ m_aRetouchColor = rVOpt.GetRetoucheColor();
+ m_sSymbolFont = rVOpt.m_sSymbolFont;
+ m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode;
+ m_bStarOneSetting = rVOpt.m_bStarOneSetting;
mbBookView = rVOpt.mbBookView;
mbBrowseMode = rVOpt.mbBrowseMode;
mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
- bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
- bIdle = rVOpt.bIdle;
+ m_bShowPlaceHolderFields = rVOpt.m_bShowPlaceHolderFields;
+ m_bIdle = rVOpt.m_bIdle;
#ifdef DBG_UTIL
m_bTest1 = rVOpt.m_bTest1;
@@ -322,7 +322,7 @@ void SwViewOption::SetOnlineSpell(bool b)
if (comphelper::LibreOfficeKit::isActive())
return;
- b ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL);
+ b ? (m_nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( m_nCoreOptions &= ~VIEWOPT_1_ONLINESPELL);
}
AuthorCharAttr::AuthorCharAttr() :
commit d270705e7645eccaefbf452ad68276080204399f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 2 09:07:56 2015 +0100
sw: prefix members of SwCollCondition
Change-Id: Idf7956c2178093bcaba3ad1093b8d0a54e46aaca
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 618e3ba..57d29ea 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -176,12 +176,12 @@ enum Master_CollConditions
class SW_DLLPUBLIC SwCollCondition : public SwClient
{
- sal_uLong nCondition;
+ sal_uLong m_nCondition;
union
{
sal_uLong nSubCondition;
OUString* pFieldExpression;
- } aSubCondition;
+ } m_aSubCondition;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
@@ -203,10 +203,10 @@ public:
bool operator!=( const SwCollCondition& rCmp ) const
{ return ! (*this == rCmp); }
- sal_uLong GetCondition() const { return nCondition; }
- sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; }
+ sal_uLong GetCondition() const { return m_nCondition; }
+ sal_uLong GetSubCondition() const { return m_aSubCondition.nSubCondition; }
const OUString* GetFieldExpression() const
- { return aSubCondition.pFieldExpression; }
+ { return m_aSubCondition.pFieldExpression; }
void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
SwTextFormatColl* GetTextFormatColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); }
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index a3d3db0..80fc4ba 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -484,34 +484,34 @@ void SwTextFormatColls::dumpAsXml(xmlTextWriterPtr pWriter) const
SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
sal_uLong nSubCond )
- : SwClient( pColl ), nCondition( nMasterCond )
+ : SwClient( pColl ), m_nCondition( nMasterCond )
{
- aSubCondition.nSubCondition = nSubCond;
+ m_aSubCondition.nSubCondition = nSubCond;
}
SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
const OUString& rSubExp )
- : SwClient( pColl ), nCondition( nMasterCond )
+ : SwClient( pColl ), m_nCondition( nMasterCond )
{
- if( USRFLD_EXPRESSION & nCondition )
- aSubCondition.pFieldExpression = new OUString( rSubExp );
+ if( USRFLD_EXPRESSION & m_nCondition )
+ m_aSubCondition.pFieldExpression = new OUString( rSubExp );
else
- aSubCondition.nSubCondition = 0;
+ m_aSubCondition.nSubCondition = 0;
}
SwCollCondition::SwCollCondition( const SwCollCondition& rCopy )
- : SwClient( const_cast<SwModify*>(rCopy.GetRegisteredIn()) ), nCondition( rCopy.nCondition )
+ : SwClient( const_cast<SwModify*>(rCopy.GetRegisteredIn()) ), m_nCondition( rCopy.m_nCondition )
{
- if( USRFLD_EXPRESSION & rCopy.nCondition )
- aSubCondition.pFieldExpression = new OUString( *rCopy.GetFieldExpression() );
+ if( USRFLD_EXPRESSION & rCopy.m_nCondition )
+ m_aSubCondition.pFieldExpression = new OUString( *rCopy.GetFieldExpression() );
else
- aSubCondition.nSubCondition = rCopy.aSubCondition.nSubCondition;
+ m_aSubCondition.nSubCondition = rCopy.m_aSubCondition.nSubCondition;
}
SwCollCondition::~SwCollCondition()
{
- if( USRFLD_EXPRESSION & nCondition )
- delete aSubCondition.pFieldExpression;
+ if( USRFLD_EXPRESSION & m_nCondition )
+ delete m_aSubCondition.pFieldExpression;
}
void SwCollCondition::RegisterToFormat( SwFormat& rFormat )
@@ -522,14 +522,14 @@ void SwCollCondition::RegisterToFormat( SwFormat& rFormat )
bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
{
bool bRet = false;
- if( nCondition == rCmp.nCondition )
+ if( m_nCondition == rCmp.m_nCondition )
{
- if( USRFLD_EXPRESSION & nCondition )
+ if( USRFLD_EXPRESSION & m_nCondition )
{
// The SubCondition contains the expression for the UserField
- const OUString* pTmp = aSubCondition.pFieldExpression;
+ const OUString* pTmp = m_aSubCondition.pFieldExpression;
if( !pTmp )
- pTmp = rCmp.aSubCondition.pFieldExpression;
+ pTmp = rCmp.m_aSubCondition.pFieldExpression;
if( pTmp )
{
SwTextFormatColl* pColl = GetTextFormatColl();
@@ -543,8 +543,8 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
}
}
}
- else if( aSubCondition.nSubCondition ==
- rCmp.aSubCondition.nSubCondition )
+ else if( m_aSubCondition.nSubCondition ==
+ rCmp.m_aSubCondition.nSubCondition )
bRet = true;
}
return bRet;
@@ -552,10 +552,10 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
void SwCollCondition::SetCondition( sal_uLong nCond, sal_uLong nSubCond )
{
- if( USRFLD_EXPRESSION & nCondition )
- delete aSubCondition.pFieldExpression;
- nCondition = nCond;
- aSubCondition.nSubCondition = nSubCond;
+ if( USRFLD_EXPRESSION & m_nCondition )
+ delete m_aSubCondition.pFieldExpression;
+ m_nCondition = nCond;
+ m_aSubCondition.nSubCondition = nSubCond;
}
SwConditionTextFormatColl::~SwConditionTextFormatColl()
commit d77368387999918bb703e3ad974497c4422c2e50
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 2 09:06:35 2015 +0100
sw: prefix members of SwContentNode
Change-Id: Iecb7cd82d88bd1ee82f074e17319e5ce095e2690
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9a5b903..66a6250 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -354,7 +354,7 @@ class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public SwIndex
{
//FEATURE::CONDCOLL
- SwDepend* pCondColl;
+ SwDepend* m_pCondColl;
//FEATURE::CONDCOLL
mutable bool mbSetModifyAtAttr;
@@ -717,13 +717,13 @@ inline const SwDoc* SwNode::GetDoc() const
inline SwFormatColl* SwContentNode::GetCondFormatColl() const
{
- return pCondColl ? static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) : 0;
+ return m_pCondColl ? static_cast<SwFormatColl*>(m_pCondColl->GetRegisteredIn()) : 0;
}
inline SwFormatColl& SwContentNode::GetAnyFormatColl() const
{
- return pCondColl && pCondColl->GetRegisteredIn()
- ? *static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn())
+ return m_pCondColl && m_pCondColl->GetRegisteredIn()
+ ? *static_cast<SwFormatColl*>(m_pCondColl->GetRegisteredIn())
: *const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn()));
}
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 7d67454..1ecd44b 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -995,7 +995,7 @@ SwContentNode::SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType
SwFormatColl *pColl )
: SwModify( pColl ), // CrsrsShell, FrameFormat,
SwNode( rWhere, nNdType ),
- pCondColl( 0 ),
+ m_pCondColl( 0 ),
mbSetModifyAtAttr( false )
{
}
@@ -1006,7 +1006,7 @@ SwContentNode::~SwContentNode()
// Thus, we need to delete all Frames in the dependency list.
DelFrms(false);
- delete pCondColl;
+ delete m_pCondColl;
if ( mpAttrSet.get() && mbSetModifyAtAttr )
const_cast<SwAttrSet*>(static_cast<const SwAttrSet*>(mpAttrSet.get()))->SetModifyAtAttr( 0 );
@@ -1698,7 +1698,7 @@ const SfxPoolItem* SwContentNode::GetNoCondAttr( sal_uInt16 nWhich,
bool bInParents ) const
{
const SfxPoolItem* pFnd = 0;
- if( pCondColl && pCondColl->GetRegisteredIn() )
+ if( m_pCondColl && m_pCondColl->GetRegisteredIn() )
{
if( !GetpSwAttrSet() || ( SfxItemState::SET != GetpSwAttrSet()->GetItemState(
nWhich, false, &pFnd ) && bInParents ))
@@ -1782,15 +1782,15 @@ bool SwContentNode::CanJoinPrev( SwNodeIndex* pIdx ) const
//FEATURE::CONDCOLL
void SwContentNode::SetCondFormatColl( SwFormatColl* pColl )
{
- if( (!pColl && pCondColl) || ( pColl && !pCondColl ) ||
- ( pColl && pColl != pCondColl->GetRegisteredIn() ) )
+ if( (!pColl && m_pCondColl) || ( pColl && !m_pCondColl ) ||
+ ( pColl && pColl != m_pCondColl->GetRegisteredIn() ) )
{
SwFormatColl* pOldColl = GetCondFormatColl();
- delete pCondColl;
+ delete m_pCondColl;
if( pColl )
- pCondColl = new SwDepend( this, pColl );
+ m_pCondColl = new SwDepend( this, pColl );
else
- pCondColl = 0;
+ m_pCondColl = 0;
if( GetpSwAttrSet() )
{
@@ -1934,7 +1934,7 @@ void SwContentNode::ChkCondColl()
if( pCColl )
SetCondFormatColl( pCColl->GetTextFormatColl() );
- else if( pCondColl )
+ else if( m_pCondColl )
SetCondFormatColl( 0 );
}
}
commit e9c862e9f9ba3cc2eb09c146c8dfd2aaa5cf57bc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 2 09:05:43 2015 +0100
sw: prefix members of SwDrawFrameFormat
Change-Id: I0d00ca7727e0756030830cd732655b2a22b900d6
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index edbfc81..f1a75de 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -231,8 +231,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
{
friend class SwDoc;
- mutable const SdrObject * pSdrObjCached;
- mutable OUString sSdrObjCachedComment;
+ mutable const SdrObject * m_pSdrObjectCached;
+ mutable OUString m_sSdrObjectCachedComment;
SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) = delete;
SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) = delete;
@@ -247,7 +247,7 @@ protected:
SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
SwFrameFormat *pDrvdFrm )
: SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
- pSdrObjCached(NULL),
+ m_pSdrObjectCached(NULL),
meLayoutDir( SwFrameFormat::HORI_L2R ),
@@ -259,7 +259,7 @@ protected:
SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
SwFrameFormat *pDrvdFrm )
: SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
- pSdrObjCached(NULL),
+ m_pSdrObjectCached(NULL),
meLayoutDir( SwFrameFormat::HORI_L2R ),
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index f985b62..fea1265 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3358,18 +3358,18 @@ OUString SwDrawFrameFormat::GetDescription() const
if (pSdrObj)
{
- if (pSdrObj != pSdrObjCached)
+ if (pSdrObj != m_pSdrObjectCached)
{
SdrObject * pSdrObjCopy = pSdrObj->Clone();
SdrUndoNewObj * pSdrUndo = new SdrUndoNewObj(*pSdrObjCopy);
- sSdrObjCachedComment = pSdrUndo->GetComment();
+ m_sSdrObjectCachedComment = pSdrUndo->GetComment();
delete pSdrUndo;
- pSdrObjCached = pSdrObj;
+ m_pSdrObjectCached = pSdrObj;
}
- aResult = sSdrObjCachedComment;
+ aResult = m_sSdrObjectCachedComment;
}
else
aResult = SW_RESSTR(STR_GRAPHIC);
More information about the Libreoffice-commits
mailing list