Skip to content

C
core
Kaydet (Commit) a365734f authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

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
üst d270705e
Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 217 deletions
sw/inc/viewopt.hxx
Dosyayı görüntüle @ a365734f
...@@ -127,35 +127,35 @@ class SW_DLLPUBLIC SwViewOption ...@@ -127,35 +127,35 @@ class SW_DLLPUBLIC SwViewOption
protected: protected:
static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips
OUString sSymbolFont; // Symbolfont. OUString m_sSymbolFont; // Symbolfont.
sal_uInt32 nCoreOptions; // Bits for SwViewShell. sal_uInt32 m_nCoreOptions; // Bits for SwViewShell.
sal_uInt32 nCore2Options; // Bits for SwViewShell. sal_uInt32 m_nCore2Options; // Bits for SwViewShell.
sal_uInt32 nUIOptions; // UI-Bits sal_uInt32 m_nUIOptions; // UI-Bits
Color aRetoucheColor; // DefaultBackground for BrowseView Color m_aRetouchColor; // DefaultBackground for BrowseView
Size aSnapSize; // Describes horizontal and vertical snap. Size m_aSnapSize; // Describes horizontal and vertical snap.
sal_uInt16 mnViewLayoutColumns;// # columns for edit view sal_uInt16 mnViewLayoutColumns;// # columns for edit view
short nDivisionX; // Grid division. short m_nDivisionX; // Grid division.
short nDivisionY; short m_nDivisionY;
sal_uInt8 nPagePrevRow; // Page Preview Row/Columns. sal_uInt8 m_nPagePreviewRow; // Page Preview Row/Columns.
sal_uInt8 nPagePrevCol; // Page Preview Row/Columns. sal_uInt8 m_nPagePreviewCol; // Page Preview Row/Columns.
sal_uInt8 nShdwCrsrFillMode; // FillMode for ShadowCrsr. sal_uInt8 m_nShadowCrsrFillMode; // FillMode for ShadowCrsr.
bool bReadonly : 1; // Readonly-Doc. bool m_bReadonly : 1; // Readonly-Doc.
bool bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). bool m_bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents).
bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. bool m_bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings.
bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. bool m_bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents.
bool mbFormView : 1; bool mbFormView : 1;
bool mbBrowseMode : 1; bool mbBrowseMode : 1;
bool mbBookView : 1; // View mode for page preview. bool mbBookView : 1; // View mode for page preview.
bool mbViewLayoutBookMode : 1; // Book view mode for edit view. bool mbViewLayoutBookMode : 1; // Book view mode for edit view.
bool mbHideWhitespaceMode : 1; // Hide header, footer, and pagebreak. bool mbHideWhitespaceMode : 1; // Hide header, footer, and pagebreak.
bool bShowPlaceHolderFields : 1; // Only used in printing! bool m_bShowPlaceHolderFields : 1; // Only used in printing!
mutable bool bIdle; mutable bool m_bIdle;
// Scale // Scale
sal_uInt16 nZoom; // In percent. sal_uInt16 m_nZoom; // In percent.
SvxZoomType eZoom; // 'enum' for zoom. SvxZoomType m_eZoom; // 'enum' for zoom.
sal_uInt8 nTableDest; // Destination for table background. sal_uInt8 m_nTableDestination; // Destination for table background.
#ifdef DBG_UTIL #ifdef DBG_UTIL
// Corresponds to statements in ui/config/cfgvw.src. // Corresponds to statements in ui/config/cfgvw.src.
...@@ -180,192 +180,192 @@ public: ...@@ -180,192 +180,192 @@ public:
static sal_uInt16 GetPixelTwips() { return nPixelTwips; } 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& ); inline void SetUIOptions( const SwViewOption& );
// Options from nCoreOptions // Options from nCoreOptions
inline bool IsIdle() const inline bool IsIdle() const
{ return bIdle; } { return m_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 // 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 // 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. // just to call this function on otherwise const objects. Thus declaring it as const now.
inline void SetIdle( bool b ) const inline void SetIdle( bool b ) const
{ bIdle = b; } { m_bIdle = b; }
inline bool IsTab(bool bHard = false) const inline bool IsTab(bool bHard = false) const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) && { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_TAB) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); }
inline void SetTab( bool b ) { 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 inline bool IsBlank(bool bHard = false) const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_BLANK) && { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_BLANK) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); }
inline void SetBlank( bool b ) 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 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 ) 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 inline bool IsParagraph(bool bHard = false) const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_PARAGRAPH) && { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_PARAGRAPH) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); }
inline void SetParagraph( bool b ) 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 inline bool IsLineBreak(bool bHard = false) const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_LINEBREAK) && { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_LINEBREAK) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); }
inline void SetLineBreak( bool b ) 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 ) 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) 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 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 ) 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 ) 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 inline bool IsPostIts() const
{ return (nCoreOptions & VIEWOPT_1_POSTITS) != 0; } { return (m_nCoreOptions & VIEWOPT_1_POSTITS) != 0; }
inline void SetPostIts( bool b ) 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, static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect,
bool bIsScript ); bool bIsScript );
static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ); static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 );
inline bool IsShowHiddenChar(bool bHard = false) const inline bool IsShowHiddenChar(bool bHard = false) const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); } ((m_nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard); }
inline void SetShowHiddenChar( bool b ) 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 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 ) 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 inline bool IsGraphic() const
{ return (nCoreOptions & VIEWOPT_1_GRAPHIC) != 0; } { return (m_nCoreOptions & VIEWOPT_1_GRAPHIC) != 0; }
inline void SetGraphic( bool b ) 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 inline bool IsPageBack() const
{ return (nCoreOptions & VIEWOPT_1_PAGEBACK) != 0; } { return (m_nCoreOptions & VIEWOPT_1_PAGEBACK) != 0; }
inline void SetPageBack( bool b ) 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 inline bool IsTable() const
{ return (nCoreOptions & VIEWOPT_1_TABLE) != 0; } { return (m_nCoreOptions & VIEWOPT_1_TABLE) != 0; }
inline void SetTable( bool b ) 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 inline bool IsDraw() const
{ return (nCoreOptions & VIEWOPT_1_DRAW) != 0; } { return (m_nCoreOptions & VIEWOPT_1_DRAW) != 0; }
inline void SetDraw( bool b ) 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 inline bool IsControl() const
{ return (nCoreOptions & VIEWOPT_1_CONTROL) != 0; } { return (m_nCoreOptions & VIEWOPT_1_CONTROL) != 0; }
inline void SetControl( bool b ) 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 inline bool IsSnap() const
{ return (nCoreOptions & VIEWOPT_1_SNAP) != 0; } { return (m_nCoreOptions & VIEWOPT_1_SNAP) != 0; }
inline void SetSnap( bool b ) 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 void SetSnapSize( Size &rSz ){ m_aSnapSize = rSz; }
inline const Size &GetSnapSize() const { return aSnapSize; } inline const Size &GetSnapSize() const { return m_aSnapSize; }
inline bool IsGridVisible() const 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 ) 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 inline bool IsOnlineSpell() const
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) != 0; } { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_ONLINESPELL) != 0; }
void SetOnlineSpell( bool b ); void SetOnlineSpell( bool b );
inline bool IsViewMetaChars() const 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) 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 inline bool IsSynchronize() const
{ return (nCoreOptions & VIEWOPT_1_SYNCHRONIZE) != 0; } { return (m_nCoreOptions & VIEWOPT_1_SYNCHRONIZE) != 0; }
inline void SetSynchronize( bool b ) 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 inline bool IsCrossHair() const
{ return (nCoreOptions & VIEWOPT_1_CROSSHAIR) != 0; } { return (m_nCoreOptions & VIEWOPT_1_CROSSHAIR) != 0; }
inline void SetCrossHair( bool b ) 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 // Options from nCore2Options
inline bool IsBlackFont() const inline bool IsBlackFont() const
{return (nCore2Options & VIEWOPT_CORE2_BLACKFONT) != 0; } {return (m_nCore2Options & VIEWOPT_CORE2_BLACKFONT) != 0; }
inline void SetBlackFont(bool b) 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 inline bool IsShowHiddenPara() const
{return (nCore2Options & VIEWOPT_CORE2_HIDDENPARA) != 0; } {return (m_nCore2Options & VIEWOPT_CORE2_HIDDENPARA) != 0; }
inline void SetShowHiddenPara(bool b) 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 inline bool IsSmoothScroll() const
{return (nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL) != 0; } {return (m_nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL) != 0; }
inline void SetSmoothScroll(bool b) 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 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) 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 bool IsIgnoreProtectedArea() const
{ {
return (nCore2Options & VIEWOPT_CORE2_IGNORE_PROT) != 0; return (m_nCore2Options & VIEWOPT_CORE2_IGNORE_PROT) != 0;
} }
void SetIgnoreProtectedArea(bool bSet) 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 inline bool IsPDFExport() const
{return (nCore2Options & VIEWOPT_CORE2_PDF_EXPORT) != 0; } {return (m_nCore2Options & VIEWOPT_CORE2_PDF_EXPORT) != 0; }
inline void SetPDFExport(bool b) 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 inline bool IsPrinting() const
{return (nCore2Options & VIEWOPT_CORE2_PRINTING) != 0; } {return (m_nCore2Options & VIEWOPT_CORE2_PRINTING) != 0; }
inline void SetPrinting(bool b) 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 short GetDivisionX() const { return m_nDivisionX; }
inline void SetDivisionX( short n ){ nDivisionX = n; } inline void SetDivisionX( short n ){ m_nDivisionX = n; }
inline short GetDivisionY() const { return nDivisionY; } inline short GetDivisionY() const { return m_nDivisionY; }
inline void SetDivisionY( short n ){ nDivisionY = n; } inline void SetDivisionY( short n ){ m_nDivisionY = n; }
// Default margin left and above document: 284 twips == 5.0 mm. // Default margin left and above document: 284 twips == 5.0 mm.
static SAL_CONSTEXPR sal_uInt16 GetDefDocumentBorder() { return 284; } static SAL_CONSTEXPR sal_uInt16 GetDefDocumentBorder() { return 284; }
...@@ -377,15 +377,15 @@ public: ...@@ -377,15 +377,15 @@ public:
inline sal_uInt16 GetDocumentBorder() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefDocumentBorder(); } inline sal_uInt16 GetDocumentBorder() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefDocumentBorder(); }
inline sal_uInt16 GetGapBetweenPages() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefGapBetweenPages(); } inline sal_uInt16 GetGapBetweenPages() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefGapBetweenPages(); }
inline sal_uInt8 GetPagePrevRow() const { return nPagePrevRow; } inline sal_uInt8 GetPagePrevRow() const { return m_nPagePreviewRow; }
inline void SetPagePrevRow( sal_uInt8 n ) { nPagePrevRow = n; } inline void SetPagePrevRow( sal_uInt8 n ) { m_nPagePreviewRow = n; }
inline sal_uInt8 GetPagePrevCol() const { return nPagePrevCol; } inline sal_uInt8 GetPagePrevCol() const { return m_nPagePreviewCol; }
inline void SetPagePrevCol( sal_uInt8 n ) { nPagePrevCol = n; } inline void SetPagePrevCol( sal_uInt8 n ) { m_nPagePreviewCol = n; }
bool IsReadonly() const { return bReadonly; } bool IsReadonly() const { return m_bReadonly; }
void SetReadonly(bool bSet) { bReadonly = bSet; } void SetReadonly(bool bSet) { m_bReadonly = bSet; }
bool IsSelectionInReadonly() const {return bSelectionInReadonly;} bool IsSelectionInReadonly() const {return m_bSelectionInReadonly;}
void SetSelectionInReadonly(bool bSet) {bSelectionInReadonly = bSet;} void SetSelectionInReadonly(bool bSet) {m_bSelectionInReadonly = bSet;}
bool IsFormView() const { return mbFormView; } bool IsFormView() const { return mbFormView; }
void SetFormView( bool bSet ) { mbFormView = bSet; } void SetFormView( bool bSet ) { mbFormView = bSet; }
...@@ -423,8 +423,8 @@ public: ...@@ -423,8 +423,8 @@ public:
inline bool IsTest10() const { return m_bTest10; } inline bool IsTest10() const { return m_bTest10; }
#endif #endif
inline sal_uInt16 GetZoom() const { return nZoom; } inline sal_uInt16 GetZoom() const { return m_nZoom; }
inline void SetZoom( sal_uInt16 n ){ nZoom = n; } inline void SetZoom( sal_uInt16 n ){ m_nZoom = n; }
static void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ); static void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol );
static void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ); static void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect );
...@@ -440,7 +440,7 @@ public: ...@@ -440,7 +440,7 @@ public:
bool IsViewVScrollBar() const bool IsViewVScrollBar() const
{ {
#if HAVE_FEATURE_DESKTOP #if HAVE_FEATURE_DESKTOP
return (nUIOptions & VIEWOPT_2_VSCROLLBAR) != 0; return (m_nUIOptions & VIEWOPT_2_VSCROLLBAR) != 0;
#else #else
return false; return false;
#endif #endif
...@@ -448,112 +448,112 @@ public: ...@@ -448,112 +448,112 @@ public:
bool IsViewHScrollBar() const bool IsViewHScrollBar() const
{ {
#if HAVE_FEATURE_DESKTOP #if HAVE_FEATURE_DESKTOP
return (nUIOptions & VIEWOPT_2_HSCROLLBAR) != 0; return (m_nUIOptions & VIEWOPT_2_HSCROLLBAR) != 0;
#else #else
return false; return false;
#endif #endif
} }
bool IsKeepRatio() const bool IsKeepRatio() const
{ return (nUIOptions & VIEWOPT_2_KEEPASPECTRATIO) != 0; } { return (m_nUIOptions & VIEWOPT_2_KEEPASPECTRATIO) != 0; }
bool IsGrfKeepZoom() const bool IsGrfKeepZoom() const
{ return (nUIOptions & VIEWOPT_2_GRFKEEPZOOM) != 0; } { return (m_nUIOptions & VIEWOPT_2_GRFKEEPZOOM) != 0; }
bool IsShowContentTips() const bool IsShowContentTips() const
{ return (nUIOptions & VIEWOPT_2_CONTENT_TIPS) != 0; } { return (m_nUIOptions & VIEWOPT_2_CONTENT_TIPS) != 0; }
bool IsPrtFormat() const bool IsPrtFormat() const
{ return (nUIOptions & VIEWOPT_2_PRTFORMAT) != 0; } { return (m_nUIOptions & VIEWOPT_2_PRTFORMAT) != 0; }
bool IsShowScrollBarTips() const 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) 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) 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) 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) 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) 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) 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) 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 SetZoomType (SvxZoomType eZoom_){ m_eZoom = eZoom_; }
void SetTableDest( sal_uInt8 nNew ) { nTableDest = nNew; } void SetTableDest( sal_uInt8 nNew ) { m_nTableDestination = nNew; }
const OUString& GetSymbolFont() const {return sSymbolFont;} const OUString& GetSymbolFont() const {return m_sSymbolFont;}
void SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;} void SetSymbolFont(const OUString& sSet) {m_sSymbolFont = sSet;}
const Color& GetRetoucheColor() const { return aRetoucheColor;} const Color& GetRetoucheColor() const { return m_aRetouchColor;}
void SetRetoucheColor(const Color&r) { aRetoucheColor = r; } void SetRetoucheColor(const Color&r) { m_aRetouchColor = r; }
bool IsViewAnyRuler() const bool IsViewAnyRuler() const
{ {
#if HAVE_FEATURE_DESKTOP #if HAVE_FEATURE_DESKTOP
return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER); return 0 != (m_nUIOptions & VIEWOPT_2_ANY_RULER);
#else #else
return false; return false;
#endif #endif
} }
void SetViewAnyRuler(bool bSet) 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 bool IsViewHRuler(bool bDirect = false) const
{ {
#if HAVE_FEATURE_DESKTOP #if HAVE_FEATURE_DESKTOP
return bDirect return bDirect
? 0 != (nUIOptions & VIEWOPT_2_H_RULER) ? 0 != (m_nUIOptions & VIEWOPT_2_H_RULER)
: !bReadonly && (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|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 #else
(void) bDirect; (void) bDirect;
return false; return false;
#endif #endif
} }
void SetViewHRuler (bool b) 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 bool IsViewVRuler(bool bDirect = false) const
{ {
#if HAVE_FEATURE_DESKTOP #if HAVE_FEATURE_DESKTOP
return bDirect return bDirect
? 0 != (nUIOptions & VIEWOPT_2_V_RULER) ? 0 != (m_nUIOptions & VIEWOPT_2_V_RULER)
: !bReadonly && (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER)) == (VIEWOPT_2_ANY_RULER|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 #else
(void) bDirect; (void) bDirect;
return false; return false;
#endif #endif
} }
void SetViewVRuler (bool b) 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. // ShadowCursor, switch on/off, get/set color/mode.
bool IsShadowCursor() const bool IsShadowCursor() const
{ return (nUIOptions & VIEWOPT_2_SHADOWCRSR) != 0; } { return (m_nUIOptions & VIEWOPT_2_SHADOWCRSR) != 0; }
void SetShadowCursor(bool b) 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 //move vertical ruler to the right
bool IsVRulerRight() const bool IsVRulerRight() const
{ return (nUIOptions & VIEWOPT_2_V_RULER_RIGHT) != 0; } { return (m_nUIOptions & VIEWOPT_2_V_RULER_RIGHT) != 0; }
void SetVRulerRight(bool b) 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; } bool IsStarOneSetting() const {return m_bStarOneSetting; }
void SetStarOneSetting(bool bSet) {bStarOneSetting = bSet; } void SetStarOneSetting(bool bSet) {m_bStarOneSetting = bSet; }
bool IsPagePreview() const {return bIsPagePreview; } bool IsPagePreview() const {return m_bIsPagePreview; }
void SetPagePreview(bool bSet) { bIsPagePreview= bSet; } void SetPagePreview(bool bSet) { m_bIsPagePreview= bSet; }
sal_uInt8 GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } sal_uInt8 GetShdwCrsrFillMode() const { return m_nShadowCrsrFillMode; }
void SetShdwCrsrFillMode( sal_uInt8 nMode ) { nShdwCrsrFillMode = nMode; }; void SetShdwCrsrFillMode( sal_uInt8 nMode ) { m_nShadowCrsrFillMode = nMode; };
bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; } bool IsShowPlaceHolderFields() const { return m_bShowPlaceHolderFields; }
void SetShowPlaceHolderFields(bool bSet) { bShowPlaceHolderFields = bSet; } void SetShowPlaceHolderFields(bool bSet) { m_bShowPlaceHolderFields = bSet; }
static Color& GetDocColor(); static Color& GetDocColor();
static Color& GetDocBoundariesColor(); static Color& GetDocBoundariesColor();
...@@ -595,14 +595,14 @@ public: ...@@ -595,14 +595,14 @@ public:
inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const 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 ) inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
{ {
nUIOptions = rVOpt.nUIOptions; m_nUIOptions = rVOpt.m_nUIOptions;
nTableDest = rVOpt.nTableDest; m_nTableDestination = rVOpt.m_nTableDestination;
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode;
} }
// Helper function for checking HTML-capabilities. // Helper function for checking HTML-capabilities.
......
sw/source/uibase/config/viewopt.cxx
Dosyayı görüntüle @ a365734f
...@@ -71,21 +71,21 @@ static const char aPostItStr[] = " "; ...@@ -71,21 +71,21 @@ static const char aPostItStr[] = " ";
bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
{ {
return nCoreOptions == rOpt.nCoreOptions return m_nCoreOptions == rOpt.m_nCoreOptions
&& nCore2Options == rOpt.nCore2Options && m_nCore2Options == rOpt.m_nCore2Options
&& aSnapSize == rOpt.aSnapSize && m_aSnapSize == rOpt.m_aSnapSize
&& mnViewLayoutColumns == rOpt.mnViewLayoutColumns && mnViewLayoutColumns == rOpt.mnViewLayoutColumns
&& nDivisionX == rOpt.GetDivisionX() && m_nDivisionX == rOpt.GetDivisionX()
&& nDivisionY == rOpt.GetDivisionY() && m_nDivisionY == rOpt.GetDivisionY()
&& nPagePrevRow == rOpt.GetPagePrevRow() && m_nPagePreviewRow == rOpt.GetPagePrevRow()
&& nPagePrevCol == rOpt.GetPagePrevCol() && m_nPagePreviewCol == rOpt.GetPagePrevCol()
&& aRetoucheColor == rOpt.GetRetoucheColor() && m_aRetouchColor == rOpt.GetRetoucheColor()
&& mbFormView == rOpt.IsFormView() && mbFormView == rOpt.IsFormView()
&& mbBrowseMode == rOpt.getBrowseMode() && mbBrowseMode == rOpt.getBrowseMode()
&& mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode && mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode
&& mbHideWhitespaceMode == rOpt.mbHideWhitespaceMode && mbHideWhitespaceMode == rOpt.mbHideWhitespaceMode
&& bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields && m_bShowPlaceHolderFields == rOpt.m_bShowPlaceHolderFields
&& bIdle == rOpt.bIdle && m_bIdle == rOpt.m_bIdle
#ifdef DBG_UTIL #ifdef DBG_UTIL
// correspond to the statements in ui/config/cfgvw.src // correspond to the statements in ui/config/cfgvw.src
&& m_bTest1 == rOpt.IsTest1() && m_bTest1 == rOpt.IsTest1()
...@@ -153,29 +153,29 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b ...@@ -153,29 +153,29 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b
} }
SwViewOption::SwViewOption() : SwViewOption::SwViewOption() :
sSymbolFont( "symbol" ), m_sSymbolFont( "symbol" ),
aRetoucheColor( COL_TRANSPARENT ), m_aRetouchColor( COL_TRANSPARENT ),
mnViewLayoutColumns( 0 ), mnViewLayoutColumns( 0 ),
nPagePrevRow( 1 ), m_nPagePreviewRow( 1 ),
nPagePrevCol( 2 ), m_nPagePreviewCol( 2 ),
nShdwCrsrFillMode( FILL_TAB ), m_nShadowCrsrFillMode( FILL_TAB ),
bReadonly(false), m_bReadonly(false),
bStarOneSetting(false), m_bStarOneSetting(false),
bIsPagePreview(false), m_bIsPagePreview(false),
bSelectionInReadonly(false), m_bSelectionInReadonly(false),
mbFormView(false), mbFormView(false),
mbBrowseMode(false), mbBrowseMode(false),
mbBookView(false), mbBookView(false),
mbViewLayoutBookMode(false), mbViewLayoutBookMode(false),
mbHideWhitespaceMode(false), mbHideWhitespaceMode(false),
bShowPlaceHolderFields( true ), m_bShowPlaceHolderFields( true ),
nZoom( 100 ), m_nZoom( 100 ),
eZoom( SvxZoomType::PERCENT ), m_eZoom( SvxZoomType::PERCENT ),
nTableDest(TBL_DEST_CELL) m_nTableDestination(TBL_DEST_CELL)
{ {
// Initialisation is a little simpler now // Initialisation is a little simpler now
// all Bits to 0 // all Bits to 0
nCoreOptions = m_nCoreOptions =
VIEWOPT_1_HARDBLANK | VIEWOPT_1_HARDBLANK |
VIEWOPT_1_SOFTHYPH | VIEWOPT_1_SOFTHYPH |
VIEWOPT_1_REF | VIEWOPT_1_REF |
...@@ -186,24 +186,24 @@ SwViewOption::SwViewOption() : ...@@ -186,24 +186,24 @@ SwViewOption::SwViewOption() :
VIEWOPT_1_PAGEBACK | VIEWOPT_1_PAGEBACK |
VIEWOPT_1_POSTITS; VIEWOPT_1_POSTITS;
nCore2Options = m_nCore2Options =
VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_BLACKFONT |
VIEWOPT_CORE2_HIDDENPARA; VIEWOPT_CORE2_HIDDENPARA;
nUIOptions = m_nUIOptions =
VIEWOPT_2_MODIFIED | VIEWOPT_2_MODIFIED |
VIEWOPT_2_GRFKEEPZOOM | VIEWOPT_2_GRFKEEPZOOM |
VIEWOPT_2_ANY_RULER; VIEWOPT_2_ANY_RULER;
if (!utl::ConfigManager::IsAvoidConfig() && MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()) 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 else
aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm m_aSnapSize.Width() = m_aSnapSize.Height() = 567; // 1 cm
nDivisionX = nDivisionY = 1; 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 #ifdef DBG_UTIL
// correspond to the statements in ui/config/cfgvw.src // correspond to the statements in ui/config/cfgvw.src
...@@ -216,33 +216,33 @@ SwViewOption::SwViewOption() : ...@@ -216,33 +216,33 @@ SwViewOption::SwViewOption() :
SwViewOption::SwViewOption(const SwViewOption& rVOpt) SwViewOption::SwViewOption(const SwViewOption& rVOpt)
{ {
bReadonly = false; m_bReadonly = false;
bSelectionInReadonly = false; m_bSelectionInReadonly = false;
// #114856# Formular view // #114856# Formular view
mbFormView = rVOpt.mbFormView; mbFormView = rVOpt.mbFormView;
nZoom = rVOpt.nZoom ; m_nZoom = rVOpt.m_nZoom ;
aSnapSize = rVOpt.aSnapSize ; m_aSnapSize = rVOpt.m_aSnapSize ;
mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ; mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ;
nDivisionX = rVOpt.nDivisionX ; m_nDivisionX = rVOpt.m_nDivisionX ;
nDivisionY = rVOpt.nDivisionY ; m_nDivisionY = rVOpt.m_nDivisionY ;
nPagePrevRow = rVOpt.nPagePrevRow; m_nPagePreviewRow = rVOpt.m_nPagePreviewRow;
nPagePrevCol = rVOpt.nPagePrevCol; m_nPagePreviewCol = rVOpt.m_nPagePreviewCol;
bIsPagePreview = rVOpt.bIsPagePreview; m_bIsPagePreview = rVOpt.m_bIsPagePreview;
eZoom = rVOpt.eZoom ; m_eZoom = rVOpt.m_eZoom ;
nTableDest = rVOpt.nTableDest ; m_nTableDestination = rVOpt.m_nTableDestination ;
nUIOptions = rVOpt.nUIOptions ; m_nUIOptions = rVOpt.m_nUIOptions ;
nCoreOptions = rVOpt.nCoreOptions ; m_nCoreOptions = rVOpt.m_nCoreOptions ;
nCore2Options = rVOpt.nCore2Options ; m_nCore2Options = rVOpt.m_nCore2Options ;
aRetoucheColor = rVOpt.GetRetoucheColor(); m_aRetouchColor = rVOpt.GetRetoucheColor();
sSymbolFont = rVOpt.sSymbolFont; m_sSymbolFont = rVOpt.m_sSymbolFont;
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode;
bStarOneSetting = rVOpt.bStarOneSetting; m_bStarOneSetting = rVOpt.m_bStarOneSetting;
mbBookView = rVOpt.mbBookView; mbBookView = rVOpt.mbBookView;
mbBrowseMode = rVOpt.mbBrowseMode; mbBrowseMode = rVOpt.mbBrowseMode;
mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode; mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; m_bShowPlaceHolderFields = rVOpt.m_bShowPlaceHolderFields;
bIdle = rVOpt.bIdle; m_bIdle = rVOpt.m_bIdle;
#ifdef DBG_UTIL #ifdef DBG_UTIL
m_bTest1 = rVOpt.m_bTest1; m_bTest1 = rVOpt.m_bTest1;
...@@ -261,29 +261,29 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) ...@@ -261,29 +261,29 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
{ {
// #114856# Formular view // #114856# Formular view
mbFormView = rVOpt.mbFormView ; mbFormView = rVOpt.mbFormView ;
nZoom = rVOpt.nZoom ; m_nZoom = rVOpt.m_nZoom ;
aSnapSize = rVOpt.aSnapSize ; m_aSnapSize = rVOpt.m_aSnapSize ;
mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ; mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ;
nDivisionX = rVOpt.nDivisionX ; m_nDivisionX = rVOpt.m_nDivisionX ;
nDivisionY = rVOpt.nDivisionY ; m_nDivisionY = rVOpt.m_nDivisionY ;
nPagePrevRow = rVOpt.nPagePrevRow; m_nPagePreviewRow = rVOpt.m_nPagePreviewRow;
nPagePrevCol = rVOpt.nPagePrevCol; m_nPagePreviewCol = rVOpt.m_nPagePreviewCol;
bIsPagePreview = rVOpt.bIsPagePreview; m_bIsPagePreview = rVOpt.m_bIsPagePreview;
eZoom = rVOpt.eZoom ; m_eZoom = rVOpt.m_eZoom ;
nTableDest = rVOpt.nTableDest ; m_nTableDestination = rVOpt.m_nTableDestination ;
nUIOptions = rVOpt.nUIOptions ; m_nUIOptions = rVOpt.m_nUIOptions ;
nCoreOptions = rVOpt.nCoreOptions; m_nCoreOptions = rVOpt.m_nCoreOptions;
nCore2Options = rVOpt.nCore2Options; m_nCore2Options = rVOpt.m_nCore2Options;
aRetoucheColor = rVOpt.GetRetoucheColor(); m_aRetouchColor = rVOpt.GetRetoucheColor();
sSymbolFont = rVOpt.sSymbolFont; m_sSymbolFont = rVOpt.m_sSymbolFont;
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode;
bStarOneSetting = rVOpt.bStarOneSetting; m_bStarOneSetting = rVOpt.m_bStarOneSetting;
mbBookView = rVOpt.mbBookView; mbBookView = rVOpt.mbBookView;
mbBrowseMode = rVOpt.mbBrowseMode; mbBrowseMode = rVOpt.mbBrowseMode;
mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode; mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; m_bShowPlaceHolderFields = rVOpt.m_bShowPlaceHolderFields;
bIdle = rVOpt.bIdle; m_bIdle = rVOpt.m_bIdle;
#ifdef DBG_UTIL #ifdef DBG_UTIL
m_bTest1 = rVOpt.m_bTest1; m_bTest1 = rVOpt.m_bTest1;
...@@ -322,7 +322,7 @@ void SwViewOption::SetOnlineSpell(bool b) ...@@ -322,7 +322,7 @@ void SwViewOption::SetOnlineSpell(bool b)
if (comphelper::LibreOfficeKit::isActive()) if (comphelper::LibreOfficeKit::isActive())
return; return;
b ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); b ? (m_nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( m_nCoreOptions &= ~VIEWOPT_1_ONLINESPELL);
} }
AuthorCharAttr::AuthorCharAttr() : AuthorCharAttr::AuthorCharAttr() :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment