sw/inc/printdata.hxx | 198 ++++++++++++-------------
sw/inc/prtopt.hxx | 2
sw/source/core/inc/UndoDelete.hxx | 42 ++---
sw/source/core/text/porlay.cxx | 10 -
sw/source/core/text/porlay.hxx | 132 ++++++++---------
sw/source/core/undo/undel.cxx | 284 ++++++++++++++++++-------------------
sw/source/core/view/printdata.cxx | 32 ++--
sw/source/core/view/vprint.cxx | 16 +-
sw/source/ui/config/optpage.cxx | 86 +++++------
sw/source/ui/dialog/uiregionsw.cxx | 204 +++++++++++++-------------
sw/source/uibase/config/prtopt.cxx | 84 +++++-----
sw/source/uibase/inc/cfgitems.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 50 +++---
sw/source/uibase/uno/unotxdoc.cxx | 4
14 files changed, 573 insertions(+), 573 deletions(-)
New commits:
commit f23d092cc08176f470c4d3d9cd3eb1bcf6f2a487
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Nov 14 09:07:13 2015 +0100
sw: prefix members of SwLineLayout
Change-Id: If6ced6d33dbb9c82c75aa05a9f7b018926c0ffb0
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index ae62a55..b1ca592 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -124,11 +124,11 @@ static bool lcl_HasStrongLTR ( const OUString& rText,
sal_Int32 nStart, sal_Int
SwLineLayout::~SwLineLayout()
{
Truncate();
- delete pNext;
+ delete m_pNext;
if( pBlink )
pBlink->Delete( this );
- delete pLLSpaceAdd;
- delete pKanaComp;
+ delete m_pLLSpaceAdd;
+ delete m_pKanaComp;
}
SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
@@ -220,7 +220,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
void SwLineLayout::InitSpaceAdd()
{
- if ( !pLLSpaceAdd )
+ if ( !m_pLLSpaceAdd )
CreateSpaceAdd();
else
SetLLSpaceAdd( 0, 0 );
@@ -228,7 +228,7 @@ void SwLineLayout::InitSpaceAdd()
void SwLineLayout::CreateSpaceAdd( const long nInit )
{
- pLLSpaceAdd = new std::vector<long>;
+ m_pLLSpaceAdd = new std::vector<long>;
SetLLSpaceAdd( nInit, 0 );
}
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 2e090cc..868087d 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -77,25 +77,25 @@ public:
class SwLineLayout : public SwTextPortion
{
private:
- SwLineLayout *pNext; // The next Line
- std::vector<long>* pLLSpaceAdd; // Used for justified alignment
- std::deque<sal_uInt16>* pKanaComp; // Used for Kana compression
- sal_uInt16 nRealHeight; // The height resulting from line
spacing and register
- bool bFormatAdj : 1;
- bool bDummy : 1;
- bool bFntChg : 1;
- bool bEndHyph : 1;
- bool bMidHyph : 1;
- bool bTab : 1;
- bool bFly : 1;
- bool bRest : 1;
- bool bBlinking : 1;
- bool bClipping : 1; // Clipping needed for exact line height
- bool bContent : 1; // Text for line numbering
- bool bRedline : 1; // The Redlining
- bool bForcedLeftMargin : 1; // Left adjustment moved by the Fly
- bool bHanging : 1; // Contains a hanging portion in the margin
- bool bUnderscore : 1;
+ SwLineLayout *m_pNext; // The next Line
+ std::vector<long>* m_pLLSpaceAdd; // Used for justified alignment
+ std::deque<sal_uInt16>* m_pKanaComp; // Used for Kana compression
+ sal_uInt16 m_nRealHeight; // The height resulting from
line spacing and register
+ bool m_bFormatAdj : 1;
+ bool m_bDummy : 1;
+ bool m_bFntChg : 1;
+ bool m_bEndHyph : 1;
+ bool m_bMidHyph : 1;
+ bool m_bTab : 1;
+ bool m_bFly : 1;
+ bool m_bRest : 1;
+ bool m_bBlinking : 1;
+ bool m_bClipping : 1; // Clipping needed for exact line height
+ bool m_bContent : 1; // Text for line numbering
+ bool m_bRedline : 1; // The Redlining
+ bool m_bForcedLeftMargin : 1; // Left adjustment moved by the Fly
+ bool m_bHanging : 1; // Contains a hanging portion in the margin
+ bool m_bUnderscore : 1;
SwTwips _GetHangingMargin() const;
@@ -107,49 +107,49 @@ public:
// Flags
inline void ResetFlags();
- inline void SetFormatAdj( const bool bNew ) { bFormatAdj = bNew; }
- inline bool IsFormatAdj() const { return bFormatAdj; }
- inline void SetEndHyph( const bool bNew ) { bEndHyph = bNew; }
- inline bool IsEndHyph() const { return bEndHyph; }
- inline void SetMidHyph( const bool bNew ) { bMidHyph = bNew; }
- inline bool IsMidHyph() const { return bMidHyph; }
- inline void SetFly( const bool bNew ) { bFly = bNew; }
- inline bool IsFly() const { return bFly; }
- inline void SetRest( const bool bNew ) { bRest = bNew; }
- inline bool IsRest() const { return bRest; }
- inline void SetBlinking( const bool bNew = true ) { bBlinking = bNew; }
- inline bool IsBlinking() const { return bBlinking; }
- inline void SetContent( const bool bNew = true ) { bContent = bNew; }
- inline bool HasContent() const { return bContent; }
- inline void SetRedline( const bool bNew = true ) { bRedline = bNew; }
- inline bool HasRedline() const { return bRedline; }
- inline void SetForcedLeftMargin( const bool bNew = true ) {
bForcedLeftMargin = bNew; }
- inline bool HasForcedLeftMargin() const { return bForcedLeftMargin; }
- inline void SetHanging( const bool bNew = true ) { bHanging = bNew; }
- inline void SetUnderscore( const bool bNew = true ) { bUnderscore = bNew; }
- inline bool HasUnderscore() const { return bUnderscore; }
+ inline void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; }
+ inline bool IsFormatAdj() const { return m_bFormatAdj; }
+ inline void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; }
+ inline bool IsEndHyph() const { return m_bEndHyph; }
+ inline void SetMidHyph( const bool bNew ) { m_bMidHyph = bNew; }
+ inline bool IsMidHyph() const { return m_bMidHyph; }
+ inline void SetFly( const bool bNew ) { m_bFly = bNew; }
+ inline bool IsFly() const { return m_bFly; }
+ inline void SetRest( const bool bNew ) { m_bRest = bNew; }
+ inline bool IsRest() const { return m_bRest; }
+ inline void SetBlinking( const bool bNew = true ) { m_bBlinking = bNew; }
+ inline bool IsBlinking() const { return m_bBlinking; }
+ inline void SetContent( const bool bNew = true ) { m_bContent = bNew; }
+ inline bool HasContent() const { return m_bContent; }
+ inline void SetRedline( const bool bNew = true ) { m_bRedline = bNew; }
+ inline bool HasRedline() const { return m_bRedline; }
+ inline void SetForcedLeftMargin( const bool bNew = true ) {
m_bForcedLeftMargin = bNew; }
+ inline bool HasForcedLeftMargin() const { return m_bForcedLeftMargin; }
+ inline void SetHanging( const bool bNew = true ) { m_bHanging = bNew; }
+ inline void SetUnderscore( const bool bNew = true ) { m_bUnderscore =
bNew; }
+ inline bool HasUnderscore() const { return m_bUnderscore; }
// Respecting empty dummy lines
- inline void SetDummy( const bool bNew ) { bDummy = bNew; }
- inline bool IsDummy() const { return bDummy; }
+ inline void SetDummy( const bool bNew ) { m_bDummy = bNew; }
+ inline bool IsDummy() const { return m_bDummy; }
- inline void SetClipping( const bool bNew ) { bClipping = bNew; }
- inline bool IsClipping() const { return bClipping; }
+ inline void SetClipping( const bool bNew ) { m_bClipping = bNew; }
+ inline bool IsClipping() const { return m_bClipping; }
inline SwLineLayout();
virtual ~SwLineLayout();
- inline SwLineLayout *GetNext() { return pNext; }
- inline const SwLineLayout *GetNext() const { return pNext; }
- inline void SetNext( SwLineLayout *pNew ) { pNext = pNew; }
+ inline SwLineLayout *GetNext() { return m_pNext; }
+ inline const SwLineLayout *GetNext() const { return m_pNext; }
+ inline void SetNext( SwLineLayout *pNew ) { m_pNext = pNew; }
void Init( SwLinePortion *pNextPortion = nullptr);
// Collects the data for the line
void CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf );
- inline void SetRealHeight( sal_uInt16 nNew ) { nRealHeight = nNew; }
- inline sal_uInt16 GetRealHeight() const { return nRealHeight; }
+ inline void SetRealHeight( sal_uInt16 nNew ) { m_nRealHeight = nNew; }
+ inline sal_uInt16 GetRealHeight() const { return m_nRealHeight; }
// Creates the glue chain for short lines
SwMarginPortion *CalcLeftMargin();
@@ -161,27 +161,27 @@ public:
virtual bool Format( SwTextFormatInfo &rInf ) override;
// Stuff for justified alignment
- inline bool IsSpaceAdd() { return pLLSpaceAdd != nullptr; }
+ inline bool IsSpaceAdd() { return m_pLLSpaceAdd != nullptr; }
void InitSpaceAdd(); // Creates pLLSpaceAdd if necessary
void CreateSpaceAdd( const long nInit = 0 );
- inline void FinishSpaceAdd() { delete pLLSpaceAdd; pLLSpaceAdd = nullptr; }
- inline sal_uInt16 GetLLSpaceAddCount() const { return
sal::static_int_cast< sal_uInt16 >(pLLSpaceAdd->size()); }
+ inline void FinishSpaceAdd() { delete m_pLLSpaceAdd; m_pLLSpaceAdd =
nullptr; }
+ inline sal_uInt16 GetLLSpaceAddCount() const { return
sal::static_int_cast< sal_uInt16 >(m_pLLSpaceAdd->size()); }
inline void SetLLSpaceAdd( long nNew, sal_uInt16 nIdx )
{
if ( nIdx == GetLLSpaceAddCount() )
- pLLSpaceAdd->push_back( nNew );
+ m_pLLSpaceAdd->push_back( nNew );
else
- (*pLLSpaceAdd)[ nIdx ] = nNew;
+ (*m_pLLSpaceAdd)[ nIdx ] = nNew;
}
- inline long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*pLLSpaceAdd)[ nIdx
]; }
- inline void RemoveFirstLLSpaceAdd() { pLLSpaceAdd->erase(
pLLSpaceAdd->begin() ); }
- inline std::vector<long>* GetpLLSpaceAdd() const { return pLLSpaceAdd; }
+ inline long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*m_pLLSpaceAdd)[
nIdx ]; }
+ inline void RemoveFirstLLSpaceAdd() { m_pLLSpaceAdd->erase(
m_pLLSpaceAdd->begin() ); }
+ inline std::vector<long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd; }
// Stuff for Kana compression
- inline void SetKanaComp( std::deque<sal_uInt16>* pNew ){ pKanaComp = pNew;
}
- inline void FinishKanaComp() { delete pKanaComp; pKanaComp = nullptr; }
- inline std::deque<sal_uInt16>* GetpKanaComp() const { return pKanaComp; }
- inline std::deque<sal_uInt16>& GetKanaComp() { return *pKanaComp; }
+ inline void SetKanaComp( std::deque<sal_uInt16>* pNew ){ m_pKanaComp =
pNew; }
+ inline void FinishKanaComp() { delete m_pKanaComp; m_pKanaComp = nullptr; }
+ inline std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; }
+ inline std::deque<sal_uInt16>& GetKanaComp() { return *m_pKanaComp; }
/** determine ascent and descent for positioning of as-character anchored
object
@@ -318,14 +318,14 @@ public:
inline void SwLineLayout::ResetFlags()
{
- bFormatAdj = bDummy = bFntChg = bTab = bEndHyph = bMidHyph = bFly
- = bRest = bBlinking = bClipping = bContent = bRedline
- = bForcedLeftMargin = bHanging = false;
+ m_bFormatAdj = m_bDummy = m_bFntChg = m_bTab = m_bEndHyph = m_bMidHyph =
m_bFly
+ = m_bRest = m_bBlinking = m_bClipping = m_bContent = m_bRedline
+ = m_bForcedLeftMargin = m_bHanging = false;
}
inline SwLineLayout::SwLineLayout()
- : pNext( nullptr ), pLLSpaceAdd( nullptr ), pKanaComp( nullptr ),
nRealHeight( 0 ),
- bUnderscore( false )
+ : m_pNext( nullptr ), m_pLLSpaceAdd( nullptr ), m_pKanaComp( nullptr ),
m_nRealHeight( 0 ),
+ m_bUnderscore( false )
{
ResetFlags();
SetWhichPor( POR_LAY );
commit 97355c222b51bc69adccf149f95744e5d33de788
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Nov 14 09:06:13 2015 +0100
sw: prefix members of SwPrintData
Change-Id: I3e6e18a0bc224ba6d201b476d77e82571ef2ee69
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index adac3de..5271089 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -61,49 +61,49 @@ class SwPrintData
public:
- bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl,
bPrintPageBackground,
- bPrintBlackFont,
+ bool m_bPrintGraphic, m_bPrintTable, m_bPrintDraw, m_bPrintControl,
m_bPrintPageBackground,
+ m_bPrintBlackFont,
//#i81434# - printing of hidden text
- bPrintHiddenText, bPrintTextPlaceholder,
- bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
- bPrintProspectRTL,
- bPrintSingleJobs, bPaperFromSetup,
+ m_bPrintHiddenText, m_bPrintTextPlaceholder,
+ m_bPrintLeftPages, m_bPrintRightPages, m_bPrintReverse,
m_bPrintProspect,
+ m_bPrintProspectRTL,
+ m_bPrintSingleJobs, m_bPaperFromSetup,
/// Print empty pages
- bPrintEmptyPages,
+ m_bPrintEmptyPages,
/// #i56195# no field update while printing mail merge documents
- bUpdateFieldsInPrinting,
- bModified;
+ m_bUpdateFieldsInPrinting,
+ m_bModified;
- SwPostItMode nPrintPostIts;
- OUString sFaxName;
+ SwPostItMode m_nPrintPostIts;
+ OUString m_sFaxName;
SwPrintData()
{
m_pPrintUIOptions = nullptr;
m_pRenderData = nullptr;
- bPrintGraphic =
- bPrintTable =
- bPrintDraw =
- bPrintControl =
- bPrintLeftPages =
- bPrintRightPages =
- bPrintPageBackground =
- bPrintEmptyPages =
- bUpdateFieldsInPrinting = true;
-
- bPaperFromSetup =
- bPrintReverse =
- bPrintProspect =
- bPrintProspectRTL =
- bPrintSingleJobs =
- bModified =
- bPrintBlackFont =
- bPrintHiddenText =
- bPrintTextPlaceholder = false;
-
- nPrintPostIts = SwPostItMode::NONE;
+ m_bPrintGraphic =
+ m_bPrintTable =
+ m_bPrintDraw =
+ m_bPrintControl =
+ m_bPrintLeftPages =
+ m_bPrintRightPages =
+ m_bPrintPageBackground =
+ m_bPrintEmptyPages =
+ m_bUpdateFieldsInPrinting = true;
+
+ m_bPaperFromSetup =
+ m_bPrintReverse =
+ m_bPrintProspect =
+ m_bPrintProspectRTL =
+ m_bPrintSingleJobs =
+ m_bModified =
+ m_bPrintBlackFont =
+ m_bPrintHiddenText =
+ m_bPrintTextPlaceholder = false;
+
+ m_nPrintPostIts = SwPostItMode::NONE;
}
virtual ~SwPrintData() {}
@@ -111,25 +111,25 @@ public:
bool operator==(const SwPrintData& rData)const
{
return
- bPrintGraphic == rData.bPrintGraphic &&
- bPrintTable == rData.bPrintTable &&
- bPrintDraw == rData.bPrintDraw &&
- bPrintControl == rData.bPrintControl &&
- bPrintPageBackground== rData.bPrintPageBackground &&
- bPrintBlackFont == rData.bPrintBlackFont &&
- bPrintLeftPages == rData.bPrintLeftPages &&
- bPrintRightPages == rData.bPrintRightPages &&
- bPrintReverse == rData.bPrintReverse &&
- bPrintProspect == rData.bPrintProspect &&
- bPrintProspectRTL == rData.bPrintProspectRTL &&
- bPrintSingleJobs == rData.bPrintSingleJobs &&
- bPaperFromSetup == rData.bPaperFromSetup &&
- bPrintEmptyPages == rData.bPrintEmptyPages &&
- bUpdateFieldsInPrinting == rData.bUpdateFieldsInPrinting &&
- nPrintPostIts == rData.nPrintPostIts &&
- sFaxName == rData.sFaxName &&
- bPrintHiddenText == rData.bPrintHiddenText &&
- bPrintTextPlaceholder == rData.bPrintTextPlaceholder;
+ m_bPrintGraphic == rData.m_bPrintGraphic &&
+ m_bPrintTable == rData.m_bPrintTable &&
+ m_bPrintDraw == rData.m_bPrintDraw &&
+ m_bPrintControl == rData.m_bPrintControl &&
+ m_bPrintPageBackground== rData.m_bPrintPageBackground &&
+ m_bPrintBlackFont == rData.m_bPrintBlackFont &&
+ m_bPrintLeftPages == rData.m_bPrintLeftPages &&
+ m_bPrintRightPages == rData.m_bPrintRightPages &&
+ m_bPrintReverse == rData.m_bPrintReverse &&
+ m_bPrintProspect == rData.m_bPrintProspect &&
+ m_bPrintProspectRTL == rData.m_bPrintProspectRTL &&
+ m_bPrintSingleJobs == rData.m_bPrintSingleJobs &&
+ m_bPaperFromSetup == rData.m_bPaperFromSetup &&
+ m_bPrintEmptyPages == rData.m_bPrintEmptyPages &&
+ m_bUpdateFieldsInPrinting == rData.m_bUpdateFieldsInPrinting &&
+ m_nPrintPostIts == rData.m_nPrintPostIts &&
+ m_sFaxName == rData.m_sFaxName &&
+ m_bPrintHiddenText == rData.m_bPrintHiddenText &&
+ m_bPrintTextPlaceholder == rData.m_bPrintTextPlaceholder;
}
/** Note: in the context where this class is used the pointers should
always be valid
@@ -138,45 +138,45 @@ public:
void SetPrintUIOptions( const SwPrintUIOptions *pOpt ) {
m_pPrintUIOptions = pOpt; }
void SetRenderData( const SwRenderData *pData ) {
m_pRenderData = pData; }
- bool IsPrintGraphic() const { return bPrintGraphic; }
- bool IsPrintTable() const { return bPrintTable; }
- bool IsPrintDraw() const { return bPrintDraw; }
- bool IsPrintControl() const { return bPrintControl; }
- bool IsPrintLeftPage() const { return bPrintLeftPages; }
- bool IsPrintRightPage() const { return bPrintRightPages; }
- bool IsPrintReverse() const { return bPrintReverse; }
- bool IsPaperFromSetup() const { return bPaperFromSetup; }
- bool IsPrintEmptyPages() const { return bPrintEmptyPages; }
- bool IsPrintProspect() const { return bPrintProspect; }
- bool IsPrintProspectRTL() const { return bPrintProspectRTL; }
- bool IsPrintPageBackground() const { return bPrintPageBackground; }
- bool IsPrintBlackFont() const { return bPrintBlackFont; }
- bool IsPrintSingleJobs() const { return bPrintSingleJobs; }
- SwPostItMode GetPrintPostIts() const { return nPrintPostIts; }
- const OUString GetFaxName() const { return sFaxName; }
- bool IsPrintHiddenText() const { return bPrintHiddenText; }
- bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; }
-
- void SetPrintGraphic( bool b ) { doSetModified();
bPrintGraphic = b; }
- void SetPrintTable( bool b ) { doSetModified(); bPrintTable
= b; }
- void SetPrintDraw( bool b ) { doSetModified(); bPrintDraw
= b; }
- void SetPrintControl( bool b ) { doSetModified();
bPrintControl = b; }
- void SetPrintLeftPage( bool b ) { doSetModified();
bPrintLeftPages = b; }
- void SetPrintRightPage( bool b ) { doSetModified();
bPrintRightPages = b; }
- void SetPrintReverse( bool b ) { doSetModified();
bPrintReverse = b; }
- void SetPaperFromSetup( bool b ) { doSetModified();
bPaperFromSetup = b; }
- void SetPrintEmptyPages( bool b ) { doSetModified();
bPrintEmptyPages = b; }
- void SetPrintPostIts( SwPostItMode n ) { doSetModified();
nPrintPostIts = n; }
- void SetPrintProspect( bool b ) { doSetModified();
bPrintProspect = b; }
- void SetPrintProspect_RTL( bool b ) { doSetModified();
bPrintProspectRTL = b; }
- void SetPrintPageBackground( bool b ) { doSetModified();
bPrintPageBackground = b; }
- void SetPrintBlackFont( bool b ) { doSetModified();
bPrintBlackFont = b; }
- void SetPrintSingleJobs( bool b ) { doSetModified();
bPrintSingleJobs = b; }
- void SetFaxName( const OUString& rSet ) { sFaxName = rSet; }
- void SetPrintHiddenText( bool b ) { doSetModified();
bPrintHiddenText = b; }
- void SetPrintTextPlaceholder( bool b ) { doSetModified();
bPrintTextPlaceholder = b; }
-
- virtual void doSetModified () { bModified = true;}
+ bool IsPrintGraphic() const { return m_bPrintGraphic; }
+ bool IsPrintTable() const { return m_bPrintTable; }
+ bool IsPrintDraw() const { return m_bPrintDraw; }
+ bool IsPrintControl() const { return m_bPrintControl; }
+ bool IsPrintLeftPage() const { return m_bPrintLeftPages; }
+ bool IsPrintRightPage() const { return m_bPrintRightPages; }
+ bool IsPrintReverse() const { return m_bPrintReverse; }
+ bool IsPaperFromSetup() const { return m_bPaperFromSetup; }
+ bool IsPrintEmptyPages() const { return m_bPrintEmptyPages; }
+ bool IsPrintProspect() const { return m_bPrintProspect; }
+ bool IsPrintProspectRTL() const { return m_bPrintProspectRTL; }
+ bool IsPrintPageBackground() const { return m_bPrintPageBackground; }
+ bool IsPrintBlackFont() const { return m_bPrintBlackFont; }
+ bool IsPrintSingleJobs() const { return m_bPrintSingleJobs; }
+ SwPostItMode GetPrintPostIts() const { return m_nPrintPostIts; }
+ const OUString GetFaxName() const { return m_sFaxName; }
+ bool IsPrintHiddenText() const { return m_bPrintHiddenText; }
+ bool IsPrintTextPlaceholder() const { return m_bPrintTextPlaceholder; }
+
+ void SetPrintGraphic( bool b ) { doSetModified();
m_bPrintGraphic = b; }
+ void SetPrintTable( bool b ) { doSetModified();
m_bPrintTable = b; }
+ void SetPrintDraw( bool b ) { doSetModified();
m_bPrintDraw = b; }
+ void SetPrintControl( bool b ) { doSetModified();
m_bPrintControl = b; }
+ void SetPrintLeftPage( bool b ) { doSetModified();
m_bPrintLeftPages = b; }
+ void SetPrintRightPage( bool b ) { doSetModified();
m_bPrintRightPages = b; }
+ void SetPrintReverse( bool b ) { doSetModified();
m_bPrintReverse = b; }
+ void SetPaperFromSetup( bool b ) { doSetModified();
m_bPaperFromSetup = b; }
+ void SetPrintEmptyPages( bool b ) { doSetModified();
m_bPrintEmptyPages = b; }
+ void SetPrintPostIts( SwPostItMode n ) { doSetModified();
m_nPrintPostIts = n; }
+ void SetPrintProspect( bool b ) { doSetModified();
m_bPrintProspect = b; }
+ void SetPrintProspect_RTL( bool b ) { doSetModified();
m_bPrintProspectRTL = b; }
+ void SetPrintPageBackground( bool b ) { doSetModified();
m_bPrintPageBackground = b; }
+ void SetPrintBlackFont( bool b ) { doSetModified();
m_bPrintBlackFont = b; }
+ void SetPrintSingleJobs( bool b ) { doSetModified();
m_bPrintSingleJobs = b; }
+ void SetFaxName( const OUString& rSet ) { m_sFaxName = rSet; }
+ void SetPrintHiddenText( bool b ) { doSetModified();
m_bPrintHiddenText = b; }
+ void SetPrintTextPlaceholder( bool b ) { doSetModified();
m_bPrintTextPlaceholder = b; }
+
+ virtual void doSetModified () { m_bModified = true;}
};
class SwPrintUIOptions : public vcl::PrinterOptionsHelper
@@ -190,15 +190,15 @@ public:
bool processPropertiesAndCheckFormat( const css::uno::Sequence<
css::beans::PropertyValue >& i_rNewProp );
- bool IsPrintFormControls() const { return getBoolValue(
"PrintControls", m_rDefaultPrintData.bPrintControl ); }
- bool IsPrintPageBackground() const { return getBoolValue(
"PrintPageBackground", m_rDefaultPrintData.bPrintPageBackground ); }
- bool IsPrintProspect() const { return getBoolValue(
"PrintProspect", m_rDefaultPrintData.bPrintProspect ); }
- bool IsPrintProspectRTL() const { return getIntValue(
"PrintProspectRTL", m_rDefaultPrintData.bPrintProspectRTL ? 1 : 0 ) != 0; }
- bool IsPrintTextPlaceholders() const { return getBoolValue(
"PrintTextPlaceholder", m_rDefaultPrintData.bPrintTextPlaceholder ); }
- bool IsPrintHiddenText() const { return getBoolValue(
"PrintHiddenText", m_rDefaultPrintData.bPrintHiddenText ); }
- bool IsPrintWithBlackTextColor() const { return getBoolValue(
"PrintBlackFonts", m_rDefaultPrintData.bPrintBlackFont ); }
- SwPostItMode GetPrintPostItsType() const { return static_cast<
SwPostItMode >(getIntValue( "PrintAnnotationMode",
static_cast<sal_uInt16>(m_rDefaultPrintData.nPrintPostIts) )); }
- bool IsPaperFromSetup() const { return getBoolValue(
"PrintPaperFromSetup", m_rDefaultPrintData.bPaperFromSetup ); }
+ bool IsPrintFormControls() const { return getBoolValue(
"PrintControls", m_rDefaultPrintData.m_bPrintControl ); }
+ bool IsPrintPageBackground() const { return getBoolValue(
"PrintPageBackground", m_rDefaultPrintData.m_bPrintPageBackground ); }
+ bool IsPrintProspect() const { return getBoolValue(
"PrintProspect", m_rDefaultPrintData.m_bPrintProspect ); }
+ bool IsPrintProspectRTL() const { return getIntValue(
"PrintProspectRTL", m_rDefaultPrintData.m_bPrintProspectRTL ? 1 : 0 ) !=
0; }
+ bool IsPrintTextPlaceholders() const { return getBoolValue(
"PrintTextPlaceholder", m_rDefaultPrintData.m_bPrintTextPlaceholder ); }
+ bool IsPrintHiddenText() const { return getBoolValue(
"PrintHiddenText", m_rDefaultPrintData.m_bPrintHiddenText ); }
+ bool IsPrintWithBlackTextColor() const { return getBoolValue(
"PrintBlackFonts", m_rDefaultPrintData.m_bPrintBlackFont ); }
+ SwPostItMode GetPrintPostItsType() const { return static_cast<
SwPostItMode >(getIntValue( "PrintAnnotationMode",
static_cast<sal_uInt16>(m_rDefaultPrintData.m_nPrintPostIts) )); }
+ bool IsPaperFromSetup() const { return getBoolValue(
"PrintPaperFromSetup", m_rDefaultPrintData.m_bPaperFromSetup ); }
bool IsPrintLeftPages() const;
bool IsPrintRightPages() const;
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 52c83b3..0e4004b 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -36,7 +36,7 @@ public:
virtual ~SwPrintOptions();
virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames
) override;
- virtual void doSetModified( ) override { bModified = true;
SetModified();}
+ virtual void doSetModified( ) override { m_bModified = true;
SetModified();}
SwPrintOptions& operator=(const SwPrintData& rData)
{
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index cabd06f..9d0ab63 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -124,25 +124,25 @@ void SwRenderData::MakeSwPrtOptions(
::sw::InitPrintOptionsFromApplication(rOptions, bWeb);
// get print options to use from provided properties
- rOptions.bPrintGraphic = pOpt->IsPrintGraphics();
- rOptions.bPrintTable = true; // for now it was decided that
tables should always be printed
- rOptions.bPrintDraw = pOpt->IsPrintDrawings();
- rOptions.bPrintControl = pOpt->IsPrintFormControls();
- rOptions.bPrintLeftPages = pOpt->IsPrintLeftPages();
- rOptions.bPrintRightPages = pOpt->IsPrintRightPages();
- rOptions.bPrintPageBackground = pOpt->IsPrintPageBackground();
- rOptions.bPrintEmptyPages = pOpt->IsPrintEmptyPages( bIsPDFExport );
+ rOptions.m_bPrintGraphic = pOpt->IsPrintGraphics();
+ rOptions.m_bPrintTable = true; // for now it was decided that
tables should always be printed
+ rOptions.m_bPrintDraw = pOpt->IsPrintDrawings();
+ rOptions.m_bPrintControl = pOpt->IsPrintFormControls();
+ rOptions.m_bPrintLeftPages = pOpt->IsPrintLeftPages();
+ rOptions.m_bPrintRightPages = pOpt->IsPrintRightPages();
+ rOptions.m_bPrintPageBackground = pOpt->IsPrintPageBackground();
+ rOptions.m_bPrintEmptyPages = pOpt->IsPrintEmptyPages( bIsPDFExport
);
// bUpdateFieldsInPrinting <-- not set here; mail merge only
- rOptions.bPaperFromSetup = pOpt->IsPaperFromSetup();
- rOptions.bPrintReverse = false; /*handled by print dialog now*/
- rOptions.bPrintProspect = pOpt->IsPrintProspect();
- rOptions.bPrintProspectRTL = pOpt->IsPrintProspectRTL();
+ rOptions.m_bPaperFromSetup = pOpt->IsPaperFromSetup();
+ rOptions.m_bPrintReverse = false; /*handled by print dialog now*/
+ rOptions.m_bPrintProspect = pOpt->IsPrintProspect();
+ rOptions.m_bPrintProspectRTL = pOpt->IsPrintProspectRTL();
// bPrintSingleJobs <-- not set here; mail merge and or
configuration
// bModified <-- not set here; mail merge only
- rOptions.bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
- rOptions.bPrintHiddenText = pOpt->IsPrintHiddenText();
- rOptions.bPrintTextPlaceholder = pOpt->IsPrintTextPlaceholders();
- rOptions.nPrintPostIts = pOpt->GetPrintPostItsType();
+ rOptions.m_bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
+ rOptions.m_bPrintHiddenText = pOpt->IsPrintHiddenText();
+ rOptions.m_bPrintTextPlaceholder = pOpt->IsPrintTextPlaceholders();
+ rOptions.m_nPrintPostIts = pOpt->GetPrintPostItsType();
//! needs to be set after MakeOptions since the assignment operation in
that
//! function will destroy the pointers
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index f42c0de..4c0b4fd 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -682,12 +682,12 @@ SwDrawViewSave::~SwDrawViewSave()
// OD 09.01.2003 #i6467# - method also called for page preview
void SwViewShell::PrepareForPrint( const SwPrintData &rOptions )
{
- mpOpt->SetGraphic ( rOptions.bPrintGraphic );
- mpOpt->SetTable ( rOptions.bPrintTable );
- mpOpt->SetDraw ( rOptions.bPrintDraw );
- mpOpt->SetControl ( rOptions.bPrintControl );
- mpOpt->SetPageBack ( rOptions.bPrintPageBackground );
- mpOpt->SetBlackFont( rOptions.bPrintBlackFont );
+ mpOpt->SetGraphic ( rOptions.m_bPrintGraphic );
+ mpOpt->SetTable ( rOptions.m_bPrintTable );
+ mpOpt->SetDraw ( rOptions.m_bPrintDraw );
+ mpOpt->SetControl ( rOptions.m_bPrintControl );
+ mpOpt->SetPageBack ( rOptions.m_bPrintPageBackground );
+ mpOpt->SetBlackFont( rOptions.m_bPrintBlackFont );
if ( HasDrawView() )
{
@@ -695,11 +695,11 @@ void SwViewShell::PrepareForPrint( const SwPrintData
&rOptions )
// OD 09.01.2003 #i6467# - consider, if view shell belongs to page
preview
if ( !IsPreview() )
{
- pDrawView->SetLayerPrintable( "Controls", rOptions.bPrintControl );
+ pDrawView->SetLayerPrintable( "Controls", rOptions.m_bPrintControl
);
}
else
{
- pDrawView->SetLayerVisible( "Controls", rOptions.bPrintControl );
+ pDrawView->SetLayerVisible( "Controls", rOptions.m_bPrintControl );
}
}
}
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5ba7605..34a6ec1 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -408,37 +408,37 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet*
rCoreSet )
if ( bAttrModified )
{
SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
- aAddPrinterAttr.bPrintGraphic = m_pGrfCB->IsChecked();
- aAddPrinterAttr.bPrintTable = true; // always enabled since CWS
printerpullgpages /*aTabCB.IsChecked();*/
- aAddPrinterAttr.bPrintDraw = m_pGrfCB->IsChecked(); // UI merged
with m_pGrfCB in CWS printerpullgpages
- aAddPrinterAttr.bPrintControl = m_pCtrlFieldCB->IsChecked();
- aAddPrinterAttr.bPrintPageBackground = m_pBackgroundCB->IsChecked();
- aAddPrinterAttr.bPrintBlackFont = m_pBlackFontCB->IsChecked();
- aAddPrinterAttr.bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
- aAddPrinterAttr.bPrintTextPlaceholder =
m_pPrintTextPlaceholderCB->IsChecked();
-
- aAddPrinterAttr.bPrintLeftPages = m_pLeftPageCB->IsChecked();
- aAddPrinterAttr.bPrintRightPages = m_pRightPageCB->IsChecked();
- aAddPrinterAttr.bPrintReverse = false; // handled by vcl itself
since CWS printerpullpages /*aReverseCB.IsChecked()*/;
- aAddPrinterAttr.bPrintProspect = m_pProspectCB->IsChecked();
- aAddPrinterAttr.bPrintProspectRTL = m_pProspectCB_RTL->IsChecked();
- aAddPrinterAttr.bPaperFromSetup = m_pPaperFromSetupCB->IsChecked();
- aAddPrinterAttr.bPrintEmptyPages =
m_pPrintEmptyPagesCB->IsChecked();
- aAddPrinterAttr.bPrintSingleJobs = true; // handled by vcl in new
print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
-
- if (m_pNoRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ aAddPrinterAttr.m_bPrintGraphic = m_pGrfCB->IsChecked();
+ aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS
printerpullgpages /*aTabCB.IsChecked();*/
+ aAddPrinterAttr.m_bPrintDraw = m_pGrfCB->IsChecked(); // UI
merged with m_pGrfCB in CWS printerpullgpages
+ aAddPrinterAttr.m_bPrintControl = m_pCtrlFieldCB->IsChecked();
+ aAddPrinterAttr.m_bPrintPageBackground = m_pBackgroundCB->IsChecked();
+ aAddPrinterAttr.m_bPrintBlackFont = m_pBlackFontCB->IsChecked();
+ aAddPrinterAttr.m_bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
+ aAddPrinterAttr.m_bPrintTextPlaceholder =
m_pPrintTextPlaceholderCB->IsChecked();
+
+ aAddPrinterAttr.m_bPrintLeftPages = m_pLeftPageCB->IsChecked();
+ aAddPrinterAttr.m_bPrintRightPages = m_pRightPageCB->IsChecked();
+ aAddPrinterAttr.m_bPrintReverse = false; // handled by vcl
itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
+ aAddPrinterAttr.m_bPrintProspect = m_pProspectCB->IsChecked();
+ aAddPrinterAttr.m_bPrintProspectRTL = m_pProspectCB_RTL->IsChecked();
+ aAddPrinterAttr.m_bPaperFromSetup =
m_pPaperFromSetupCB->IsChecked();
+ aAddPrinterAttr.m_bPrintEmptyPages =
m_pPrintEmptyPagesCB->IsChecked();
+ aAddPrinterAttr.m_bPrintSingleJobs = true; // handled by vcl in new
print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
+
+ if (m_pNoRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::NONE;
- if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::Only;
- if (m_pEndRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pEndRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::EndDoc;
- if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::EndPage;
- if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::InMargins;
const OUString sFax = m_pFaxLB->GetSelectEntry();
- aAddPrinterAttr.sFaxName = sNone == sFax ? aEmptyOUStr : sFax;
+ aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax;
rCoreSet->Put(aAddPrinterAttr);
}
return bAttrModified;
@@ -452,25 +452,25 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* )
if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , false,
reinterpret_cast<const
SfxPoolItem**>(&pAddPrinterAttr) ))
{
- m_pGrfCB->Check(pAddPrinterAttr->bPrintGraphic ||
pAddPrinterAttr->bPrintDraw);
- m_pCtrlFieldCB->Check( pAddPrinterAttr->bPrintControl);
- m_pBackgroundCB->Check( pAddPrinterAttr->bPrintPageBackground);
- m_pBlackFontCB->Check( pAddPrinterAttr->bPrintBlackFont);
- m_pPrintHiddenTextCB->Check( pAddPrinterAttr->bPrintHiddenText);
-
m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->bPrintTextPlaceholder);
- m_pLeftPageCB->Check( pAddPrinterAttr->bPrintLeftPages);
- m_pRightPageCB->Check( pAddPrinterAttr->bPrintRightPages);
- m_pPaperFromSetupCB->Check(pAddPrinterAttr->bPaperFromSetup);
- m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->bPrintEmptyPages);
- m_pProspectCB->Check( pAddPrinterAttr->bPrintProspect);
- m_pProspectCB_RTL->Check( pAddPrinterAttr->bPrintProspectRTL);
-
- m_pNoRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::NONE ) ;
- m_pOnlyRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::Only
) ;
- m_pEndRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::EndDoc
) ;
- m_pEndPageRB->Check (pAddPrinterAttr->nPrintPostIts==
SwPostItMode::EndPage ) ;
- m_pInMarginsRB->Check (pAddPrinterAttr->nPrintPostIts==
SwPostItMode::InMargins ) ;
- m_pFaxLB->SelectEntry( pAddPrinterAttr->sFaxName );
+ m_pGrfCB->Check(pAddPrinterAttr->m_bPrintGraphic ||
pAddPrinterAttr->m_bPrintDraw);
+ m_pCtrlFieldCB->Check( pAddPrinterAttr->m_bPrintControl);
+ m_pBackgroundCB->Check( pAddPrinterAttr->m_bPrintPageBackground);
+ m_pBlackFontCB->Check( pAddPrinterAttr->m_bPrintBlackFont);
+ m_pPrintHiddenTextCB->Check( pAddPrinterAttr->m_bPrintHiddenText);
+
m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->m_bPrintTextPlaceholder);
+ m_pLeftPageCB->Check( pAddPrinterAttr->m_bPrintLeftPages);
+ m_pRightPageCB->Check( pAddPrinterAttr->m_bPrintRightPages);
+ m_pPaperFromSetupCB->Check(pAddPrinterAttr->m_bPaperFromSetup);
+ m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->m_bPrintEmptyPages);
+ m_pProspectCB->Check( pAddPrinterAttr->m_bPrintProspect);
+ m_pProspectCB_RTL->Check( pAddPrinterAttr->m_bPrintProspectRTL);
+
+ m_pNoRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE
) ;
+ m_pOnlyRB->Check (pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::Only ) ;
+ m_pEndRB->Check (pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::EndDoc ) ;
+ m_pEndPageRB->Check (pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::EndPage ) ;
+ m_pInMarginsRB->Check (pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::InMargins ) ;
+ m_pFaxLB->SelectEntry( pAddPrinterAttr->m_sFaxName );
}
if (m_pProspectCB->IsChecked())
{
diff --git a/sw/source/uibase/config/prtopt.cxx
b/sw/source/uibase/config/prtopt.cxx
index f182ca2..bb0af27 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -67,11 +67,11 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree),
bIsWeb(bWeb)
{
- bPrintPageBackground = !bWeb;
- bPrintBlackFont = bWeb;
- bPrintTextPlaceholder = bPrintHiddenText = false;
+ m_bPrintPageBackground = !bWeb;
+ m_bPrintBlackFont = bWeb;
+ m_bPrintTextPlaceholder = m_bPrintHiddenText = false;
if (bWeb)
- bPrintEmptyPages = false;
+ m_bPrintEmptyPages = false;
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
@@ -85,30 +85,30 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
{
switch(nProp)
{
- case 0: bPrintGraphic = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 1: bPrintTable = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
- case 2: bPrintControl = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 3: bPrintPageBackground= *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 4: bPrintBlackFont = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 0: m_bPrintGraphic = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 1: m_bPrintTable = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 2: m_bPrintControl = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 3: m_bPrintPageBackground= *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 4: m_bPrintBlackFont = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
case 5:
{
sal_Int32 nTmp = 0;
pValues[nProp] >>= nTmp;
- nPrintPostIts = static_cast<SwPostItMode>(nTmp);
+ m_nPrintPostIts = static_cast<SwPostItMode>(nTmp);
}
break;
- case 6: bPrintReverse = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 7: bPrintProspect = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 8: bPrintProspectRTL = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 9: bPrintSingleJobs = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 10: pValues[nProp] >>= sFaxName; break;
- case 11: bPaperFromSetup = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 12: bPrintDraw = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 13: bPrintLeftPages = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
- case 14: bPrintRightPages = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
- case 15: bPrintEmptyPages = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
- case 16: bPrintTextPlaceholder = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
- case 17: bPrintHiddenText = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
+ case 6: m_bPrintReverse = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 7: m_bPrintProspect = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 8: m_bPrintProspectRTL = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 9: m_bPrintSingleJobs = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 10: pValues[nProp] >>= m_sFaxName; break;
+ case 11: m_bPaperFromSetup = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 12: m_bPrintDraw = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 13: m_bPrintLeftPages = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 14: m_bPrintRightPages = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 15: m_bPrintEmptyPages = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 16: m_bPrintTextPlaceholder = *static_cast<sal_Bool
const *>(pValues[nProp].getValue()); break;
+ case 17: m_bPrintHiddenText = *static_cast<sal_Bool const
*>(pValues[nProp].getValue()); break;
}
}
}
@@ -118,7 +118,7 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
// In the UI. (File/Print dialog and Tools/Options/.../Print)
// And since print graphics is the only available in Writer and WrtierWeb
...
- bPrintDraw = bPrintGraphic;
+ m_bPrintDraw = m_bPrintGraphic;
}
SwPrintOptions::~SwPrintOptions()
@@ -138,31 +138,31 @@ void SwPrintOptions::ImplCommit()
{
switch(nProp)
{
- case 0: pValues[nProp] <<= bPrintGraphic; break;
- case 1: pValues[nProp] <<= bPrintTable; break;
- case 2: pValues[nProp] <<= bPrintControl; break;
- case 3: pValues[nProp] <<= bPrintPageBackground; break;
- case 4: pValues[nProp] <<= bPrintBlackFont; break;
- case 5: pValues[nProp] <<= (sal_Int32)nPrintPostIts ;
break;
- case 6: pValues[nProp] <<= bPrintReverse; break;
- case 7: pValues[nProp] <<= bPrintProspect; break;
- case 8: pValues[nProp] <<= bPrintProspectRTL; break;
- case 9: pValues[nProp] <<= bPrintSingleJobs; break;
- case 10: pValues[nProp] <<= sFaxName; break;
- case 11: pValues[nProp] <<= bPaperFromSetup; break;
- case 12: pValues[nProp] <<= bPrintDraw; break;
- case 13: pValues[nProp] <<= bPrintLeftPages; break;
- case 14: pValues[nProp] <<= bPrintRightPages; break;
- case 15: pValues[nProp] <<= bPrintEmptyPages; break;
- case 16: pValues[nProp] <<= bPrintTextPlaceholder; break;
- case 17: pValues[nProp] <<= bPrintHiddenText; break;
+ case 0: pValues[nProp] <<= m_bPrintGraphic; break;
+ case 1: pValues[nProp] <<= m_bPrintTable; break;
+ case 2: pValues[nProp] <<= m_bPrintControl; break;
+ case 3: pValues[nProp] <<= m_bPrintPageBackground; break;
+ case 4: pValues[nProp] <<= m_bPrintBlackFont; break;
+ case 5: pValues[nProp] <<= (sal_Int32)m_nPrintPostIts ;
break;
+ case 6: pValues[nProp] <<= m_bPrintReverse; break;
+ case 7: pValues[nProp] <<= m_bPrintProspect; break;
+ case 8: pValues[nProp] <<= m_bPrintProspectRTL; break;
+ case 9: pValues[nProp] <<= m_bPrintSingleJobs; break;
+ case 10: pValues[nProp] <<= m_sFaxName; break;
+ case 11: pValues[nProp] <<= m_bPaperFromSetup; break;
+ case 12: pValues[nProp] <<= m_bPrintDraw; break;
+ case 13: pValues[nProp] <<= m_bPrintLeftPages; break;
+ case 14: pValues[nProp] <<= m_bPrintRightPages; break;
+ case 15: pValues[nProp] <<= m_bPrintEmptyPages; break;
+ case 16: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
+ case 17: pValues[nProp] <<= m_bPrintHiddenText; break;
}
}
// currently there is just one checkbox for print drawings and print
graphics
// In the UI. (File/Print dialog and Tools/Options/.../Print)
// And since print graphics is the only available in Writer and WrtierWeb
...
- bPrintDraw = bPrintGraphic;
+ m_bPrintDraw = m_bPrintGraphic;
PutProperties(aNames, aValues);
}
diff --git a/sw/source/uibase/inc/cfgitems.hxx
b/sw/source/uibase/inc/cfgitems.hxx
index 5092848..2677f98 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -118,7 +118,7 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
- const OUString &GetFax() const { return sFaxName; }
+ const OUString &GetFax() const { return m_sFaxName; }
};
// Item for settings dialog, ShadowCursorPage
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 104a5d2..094e374 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -4266,7 +4266,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData
const*const pPrtOptions)
aRenderViewOptions.SetLineBreak( false ); // breaks (type 1)
aRenderViewOptions.SetPageBreak( false ); // breaks (type 2)
aRenderViewOptions.SetColumnBreak( false ); // breaks (type 3)
- bool bVal = pPrtOptions && pPrtOptions->bPrintHiddenText;
+ bool bVal = pPrtOptions && pPrtOptions->m_bPrintHiddenText;
if (bContainsHiddenChars)
aRenderViewOptions.SetShowHiddenChar( bVal ); // hidden text
if (bContainsHiddenFields)
@@ -4277,7 +4277,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData
const*const pPrtOptions)
if (bContainsPlaceHolders)
{
// should always be printed in PDF export!
- bVal = !pPrtOptions || pPrtOptions->bPrintTextPlaceholder;
+ bVal = !pPrtOptions || pPrtOptions->m_bPrintTextPlaceholder;
aRenderViewOptions.SetShowPlaceHolderFields( bVal );
}
commit 441412a0bc33bd9c6fe6a19a901213e113104a14
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Nov 14 09:05:15 2015 +0100
sw: prefix members of SwSectionFootnoteEndTabPage
Change-Id: I785b50d6f09db79d3184a19c01e71ef26c11b1d1
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index a185fbd..35a7b60 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1817,39 +1817,39 @@
SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage( vcl::Window *pParent,
: SfxTabPage( pParent, "FootnotesEndnotesTabPage",
"modules/swriter/ui/footnotesendnotestabpage.ui", &rAttrSet )
{
- get(pFootnoteNtAtTextEndCB,"ftnntattextend");
+ get(m_pFootnoteNtAtTextEndCB,"ftnntattextend");
- get(pFootnoteNtNumCB,"ftnntnum");
- get(pFootnoteOffsetLbl,"ftnoffset_label");
- get(pFootnoteOffsetField,"ftnoffset");
+ get(m_pFootnoteNtNumCB,"ftnntnum");
+ get(m_pFootnoteOffsetLbl,"ftnoffset_label");
+ get(m_pFootnoteOffsetField,"ftnoffset");
- get(pFootnoteNtNumFormatCB,"ftnntnumfmt");
- get(pFootnotePrefixFT,"ftnprefix_label");
- get(pFootnotePrefixED,"ftnprefix");
- get(pFootnoteNumViewBox,"ftnnumviewbox");
- get(pFootnoteSuffixFT,"ftnsuffix_label");
- get(pFootnoteSuffixED,"ftnsuffix");
+ get(m_pFootnoteNtNumFormatCB,"ftnntnumfmt");
+ get(m_pFootnotePrefixFT,"ftnprefix_label");
+ get(m_pFootnotePrefixED,"ftnprefix");
+ get(m_pFootnoteNumViewBox,"ftnnumviewbox");
+ get(m_pFootnoteSuffixFT,"ftnsuffix_label");
+ get(m_pFootnoteSuffixED,"ftnsuffix");
- get(pEndNtAtTextEndCB,"endntattextend");
+ get(m_pEndNtAtTextEndCB,"endntattextend");
- get(pEndNtNumCB,"endntnum");
- get(pEndOffsetLbl,"endoffset_label");
- get(pEndOffsetField,"endoffset");
+ get(m_pEndNtNumCB,"endntnum");
+ get(m_pEndOffsetLbl,"endoffset_label");
+ get(m_pEndOffsetField,"endoffset");
- get(pEndNtNumFormatCB,"endntnumfmt");
- get(pEndPrefixFT,"endprefix_label");
- get(pEndPrefixED,"endprefix");
- get(pEndNumViewBox,"endnumviewbox");
- get(pEndSuffixFT,"endsuffix_label");
- get(pEndSuffixED,"endsuffix");
+ get(m_pEndNtNumFormatCB,"endntnumfmt");
+ get(m_pEndPrefixFT,"endprefix_label");
+ get(m_pEndPrefixED,"endprefix");
+ get(m_pEndNumViewBox,"endnumviewbox");
+ get(m_pEndSuffixFT,"endsuffix_label");
+ get(m_pEndSuffixED,"endsuffix");
Link<Button*,void> aLk( LINK( this, SwSectionFootnoteEndTabPage,
FootEndHdl));
- pFootnoteNtAtTextEndCB->SetClickHdl( aLk );
- pFootnoteNtNumCB->SetClickHdl( aLk );
- pEndNtAtTextEndCB->SetClickHdl( aLk );
- pEndNtNumCB->SetClickHdl( aLk );
- pFootnoteNtNumFormatCB->SetClickHdl( aLk );
- pEndNtNumFormatCB->SetClickHdl( aLk );
+ m_pFootnoteNtAtTextEndCB->SetClickHdl( aLk );
+ m_pFootnoteNtNumCB->SetClickHdl( aLk );
+ m_pEndNtAtTextEndCB->SetClickHdl( aLk );
+ m_pEndNtNumCB->SetClickHdl( aLk );
+ m_pFootnoteNtNumFormatCB->SetClickHdl( aLk );
+ m_pEndNtNumFormatCB->SetClickHdl( aLk );
}
SwSectionFootnoteEndTabPage::~SwSectionFootnoteEndTabPage()
@@ -1859,34 +1859,34 @@
SwSectionFootnoteEndTabPage::~SwSectionFootnoteEndTabPage()
void SwSectionFootnoteEndTabPage::dispose()
{
- pFootnoteNtAtTextEndCB.clear();
- pFootnoteNtNumCB.clear();
- pFootnoteOffsetLbl.clear();
- pFootnoteOffsetField.clear();
- pFootnoteNtNumFormatCB.clear();
- pFootnotePrefixFT.clear();
- pFootnotePrefixED.clear();
- pFootnoteNumViewBox.clear();
- pFootnoteSuffixFT.clear();
- pFootnoteSuffixED.clear();
- pEndNtAtTextEndCB.clear();
- pEndNtNumCB.clear();
- pEndOffsetLbl.clear();
- pEndOffsetField.clear();
- pEndNtNumFormatCB.clear();
- pEndPrefixFT.clear();
- pEndPrefixED.clear();
- pEndNumViewBox.clear();
- pEndSuffixFT.clear();
- pEndSuffixED.clear();
+ m_pFootnoteNtAtTextEndCB.clear();
+ m_pFootnoteNtNumCB.clear();
+ m_pFootnoteOffsetLbl.clear();
+ m_pFootnoteOffsetField.clear();
+ m_pFootnoteNtNumFormatCB.clear();
+ m_pFootnotePrefixFT.clear();
+ m_pFootnotePrefixED.clear();
+ m_pFootnoteNumViewBox.clear();
+ m_pFootnoteSuffixFT.clear();
+ m_pFootnoteSuffixED.clear();
+ m_pEndNtAtTextEndCB.clear();
+ m_pEndNtNumCB.clear();
+ m_pEndOffsetLbl.clear();
+ m_pEndOffsetField.clear();
+ m_pEndNtNumFormatCB.clear();
+ m_pEndPrefixFT.clear();
+ m_pEndPrefixED.clear();
+ m_pEndNumViewBox.clear();
+ m_pEndSuffixFT.clear();
+ m_pEndSuffixED.clear();
SfxTabPage::dispose();
}
bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet )
{
- SwFormatFootnoteAtTextEnd aFootnote( pFootnoteNtAtTextEndCB->IsChecked()
- ? ( pFootnoteNtNumCB->IsChecked()
- ? ( pFootnoteNtNumFormatCB->IsChecked()
+ SwFormatFootnoteAtTextEnd aFootnote( m_pFootnoteNtAtTextEndCB->IsChecked()
+ ? ( m_pFootnoteNtNumCB->IsChecked()
+ ? ( m_pFootnoteNtNumFormatCB->IsChecked()
? FTNEND_ATTXTEND_OWNNUMANDFMT
: FTNEND_ATTXTEND_OWNNUMSEQ )
: FTNEND_ATTXTEND )
@@ -1895,19 +1895,19 @@ bool SwSectionFootnoteEndTabPage::FillItemSet(
SfxItemSet* rSet )
switch( aFootnote.GetValue() )
{
case FTNEND_ATTXTEND_OWNNUMANDFMT:
- aFootnote.SetNumType( pFootnoteNumViewBox->GetSelectedNumberingType()
);
- aFootnote.SetPrefix( pFootnotePrefixED->GetText().replaceAll("\\t",
"\t") ); // fdo#65666
- aFootnote.SetSuffix( pFootnoteSuffixED->GetText().replaceAll("\\t",
"\t") );
+ aFootnote.SetNumType(
m_pFootnoteNumViewBox->GetSelectedNumberingType() );
+ aFootnote.SetPrefix( m_pFootnotePrefixED->GetText().replaceAll("\\t",
"\t") ); // fdo#65666
+ aFootnote.SetSuffix( m_pFootnoteSuffixED->GetText().replaceAll("\\t",
"\t") );
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- aFootnote.SetOffset( static_cast< sal_uInt16 >(
pFootnoteOffsetField->GetValue()-1 ) );
+ aFootnote.SetOffset( static_cast< sal_uInt16 >(
m_pFootnoteOffsetField->GetValue()-1 ) );
// no break;
}
- SwFormatEndAtTextEnd aEnd( pEndNtAtTextEndCB->IsChecked()
- ? ( pEndNtNumCB->IsChecked()
- ? ( pEndNtNumFormatCB->IsChecked()
+ SwFormatEndAtTextEnd aEnd( m_pEndNtAtTextEndCB->IsChecked()
+ ? ( m_pEndNtNumCB->IsChecked()
+ ? ( m_pEndNtNumFormatCB->IsChecked()
? FTNEND_ATTXTEND_OWNNUMANDFMT
: FTNEND_ATTXTEND_OWNNUMSEQ )
: FTNEND_ATTXTEND )
@@ -1916,13 +1916,13 @@ bool SwSectionFootnoteEndTabPage::FillItemSet(
SfxItemSet* rSet )
switch( aEnd.GetValue() )
{
case FTNEND_ATTXTEND_OWNNUMANDFMT:
- aEnd.SetNumType( pEndNumViewBox->GetSelectedNumberingType() );
- aEnd.SetPrefix( pEndPrefixED->GetText().replaceAll("\\t", "\t") );
- aEnd.SetSuffix( pEndSuffixED->GetText().replaceAll("\\t", "\t") );
+ aEnd.SetNumType( m_pEndNumViewBox->GetSelectedNumberingType() );
+ aEnd.SetPrefix( m_pEndPrefixED->GetText().replaceAll("\\t", "\t") );
+ aEnd.SetSuffix( m_pEndSuffixED->GetText().replaceAll("\\t", "\t") );
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- aEnd.SetOffset( static_cast< sal_uInt16 >(
pEndOffsetField->GetValue()-1 ) );
+ aEnd.SetOffset( static_cast< sal_uInt16 >(
m_pEndOffsetField->GetValue()-1 ) );
// no break;
}
@@ -1944,29 +1944,29 @@ void SwSectionFootnoteEndTabPage::ResetState( bool
bFootnote,
if( bFootnote )
{
- pNtAtTextEndCB = pFootnoteNtAtTextEndCB;
- pNtNumCB = pFootnoteNtNumCB;
- pNtNumFormatCB = pFootnoteNtNumFormatCB;
- pPrefixFT = pFootnotePrefixFT;
- pPrefixED = pFootnotePrefixED;
- pSuffixFT = pFootnoteSuffixFT;
- pSuffixED = pFootnoteSuffixED;
- pNumViewBox = pFootnoteNumViewBox;
- pOffsetText = pFootnoteOffsetLbl;
- pOffsetField = pFootnoteOffsetField;
+ pNtAtTextEndCB = m_pFootnoteNtAtTextEndCB;
+ pNtNumCB = m_pFootnoteNtNumCB;
+ pNtNumFormatCB = m_pFootnoteNtNumFormatCB;
+ pPrefixFT = m_pFootnotePrefixFT;
+ pPrefixED = m_pFootnotePrefixED;
+ pSuffixFT = m_pFootnoteSuffixFT;
+ pSuffixED = m_pFootnoteSuffixED;
+ pNumViewBox = m_pFootnoteNumViewBox;
+ pOffsetText = m_pFootnoteOffsetLbl;
+ pOffsetField = m_pFootnoteOffsetField;
}
else
{
- pNtAtTextEndCB = pEndNtAtTextEndCB;
- pNtNumCB = pEndNtNumCB;
- pNtNumFormatCB = pEndNtNumFormatCB;
- pPrefixFT = pEndPrefixFT;
- pPrefixED = pEndPrefixED;
- pSuffixFT = pEndSuffixFT;
- pSuffixED = pEndSuffixED;
- pNumViewBox = pEndNumViewBox;
- pOffsetText = pEndOffsetLbl;
- pOffsetField = pEndOffsetField;
+ pNtAtTextEndCB = m_pEndNtAtTextEndCB;
+ pNtNumCB = m_pEndNtNumCB;
+ pNtNumFormatCB = m_pEndNtNumFormatCB;
+ pPrefixFT = m_pEndPrefixFT;
+ pPrefixED = m_pEndPrefixED;
+ pSuffixFT = m_pEndSuffixFT;
+ pSuffixED = m_pEndSuffixED;
+ pNumViewBox = m_pEndNumViewBox;
+ pOffsetText = m_pEndOffsetLbl;
+ pOffsetField = m_pEndOffsetField;
}
const sal_uInt16 eState = rAttr.GetValue();
@@ -2028,8 +2028,8 @@ VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create(
vcl::Window* pParent,
IMPL_LINK_TYPED( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void
)
{
- bool bFoot = pFootnoteNtAtTextEndCB == pBox || pFootnoteNtNumCB == pBox ||
- pFootnoteNtNumFormatCB == pBox ;
+ bool bFoot = m_pFootnoteNtAtTextEndCB == pBox || m_pFootnoteNtNumCB ==
pBox ||
+ m_pFootnoteNtNumFormatCB == pBox ;
CheckBox *pNumBox, *pNumFormatBox, *pEndBox;
SwNumberingTypeListBox* pNumViewBox;
@@ -2040,29 +2040,29 @@ IMPL_LINK_TYPED( SwSectionFootnoteEndTabPage,
FootEndHdl, Button *, pBox, void )
if( bFoot )
{
- pEndBox = pFootnoteNtAtTextEndCB;
- pNumBox = pFootnoteNtNumCB;
- pNumFormatBox = pFootnoteNtNumFormatCB;
- pNumViewBox = pFootnoteNumViewBox;
- pOffsetText = pFootnoteOffsetLbl;
- pOffsetField = pFootnoteOffsetField;
- pPrefixFT = pFootnotePrefixFT;
- pSuffixFT = pFootnoteSuffixFT;
- pPrefixED = pFootnotePrefixED;
- pSuffixED = pFootnoteSuffixED;
+ pEndBox = m_pFootnoteNtAtTextEndCB;
+ pNumBox = m_pFootnoteNtNumCB;
+ pNumFormatBox = m_pFootnoteNtNumFormatCB;
+ pNumViewBox = m_pFootnoteNumViewBox;
+ pOffsetText = m_pFootnoteOffsetLbl;
+ pOffsetField = m_pFootnoteOffsetField;
+ pPrefixFT = m_pFootnotePrefixFT;
+ pSuffixFT = m_pFootnoteSuffixFT;
+ pPrefixED = m_pFootnotePrefixED;
+ pSuffixED = m_pFootnoteSuffixED;
}
else
{
- pEndBox = pEndNtAtTextEndCB;
- pNumBox = pEndNtNumCB;
- pNumFormatBox = pEndNtNumFormatCB;
- pNumViewBox = pEndNumViewBox;
- pOffsetText = pEndOffsetLbl;
- pOffsetField = pEndOffsetField;
- pPrefixFT = pEndPrefixFT;
- pSuffixFT = pEndSuffixFT;
- pPrefixED = pEndPrefixED;
- pSuffixED = pEndSuffixED;
+ pEndBox = m_pEndNtAtTextEndCB;
+ pNumBox = m_pEndNtNumCB;
+ pNumFormatBox = m_pEndNtNumFormatCB;
+ pNumViewBox = m_pEndNumViewBox;
+ pOffsetText = m_pEndOffsetLbl;
+ pOffsetField = m_pEndOffsetField;
+ pPrefixFT = m_pEndPrefixFT;
+ pSuffixFT = m_pEndSuffixFT;
+ pPrefixED = m_pEndPrefixED;
+ pSuffixED = m_pEndSuffixED;
}
bool bEnableAtEnd = TRISTATE_TRUE == pEndBox->GetState();
diff --git a/sw/source/uibase/inc/regionsw.hxx
b/sw/source/uibase/inc/regionsw.hxx
index fa4453d..53da375 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -196,31 +196,31 @@ public:
class SwSectionFootnoteEndTabPage : public SfxTabPage
{
- VclPtr<CheckBox> pFootnoteNtAtTextEndCB;
-
- VclPtr<CheckBox> pFootnoteNtNumCB;
- VclPtr<FixedText> pFootnoteOffsetLbl;
- VclPtr<NumericField> pFootnoteOffsetField;
-
- VclPtr<CheckBox> pFootnoteNtNumFormatCB;
- VclPtr<FixedText> pFootnotePrefixFT;
- VclPtr<Edit> pFootnotePrefixED;
- VclPtr<SwNumberingTypeListBox> pFootnoteNumViewBox;
- VclPtr<FixedText> pFootnoteSuffixFT;
- VclPtr<Edit> pFootnoteSuffixED;
-
- VclPtr<CheckBox> pEndNtAtTextEndCB;
-
- VclPtr<CheckBox> pEndNtNumCB;
- VclPtr<FixedText> pEndOffsetLbl;
- VclPtr<NumericField> pEndOffsetField;
-
- VclPtr<CheckBox> pEndNtNumFormatCB;
- VclPtr<FixedText> pEndPrefixFT;
- VclPtr<Edit> pEndPrefixED;
- VclPtr<SwNumberingTypeListBox> pEndNumViewBox;
- VclPtr<FixedText> pEndSuffixFT;
- VclPtr<Edit> pEndSuffixED;
+ VclPtr<CheckBox> m_pFootnoteNtAtTextEndCB;
+
+ VclPtr<CheckBox> m_pFootnoteNtNumCB;
+ VclPtr<FixedText> m_pFootnoteOffsetLbl;
+ VclPtr<NumericField> m_pFootnoteOffsetField;
+
+ VclPtr<CheckBox> m_pFootnoteNtNumFormatCB;
+ VclPtr<FixedText> m_pFootnotePrefixFT;
+ VclPtr<Edit> m_pFootnotePrefixED;
+ VclPtr<SwNumberingTypeListBox> m_pFootnoteNumViewBox;
+ VclPtr<FixedText> m_pFootnoteSuffixFT;
+ VclPtr<Edit> m_pFootnoteSuffixED;
+
+ VclPtr<CheckBox> m_pEndNtAtTextEndCB;
+
+ VclPtr<CheckBox> m_pEndNtNumCB;
+ VclPtr<FixedText> m_pEndOffsetLbl;
+ VclPtr<NumericField> m_pEndOffsetField;
+
+ VclPtr<CheckBox> m_pEndNtNumFormatCB;
+ VclPtr<FixedText> m_pEndPrefixFT;
+ VclPtr<Edit> m_pEndPrefixED;
+ VclPtr<SwNumberingTypeListBox> m_pEndNumViewBox;
+ VclPtr<FixedText> m_pEndSuffixFT;
+ VclPtr<Edit> m_pEndSuffixED;
DECL_LINK_TYPED( FootEndHdl, Button*, void );
void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& );
commit 412d3a8f46bcd3db1953497cec23b5d60317fd1a
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Nov 14 09:04:34 2015 +0100
sw: prefix members of SwUndoDelete
Change-Id: I9a31850ac3524b8f2fae6513f4d378f8616eb30d
diff --git a/sw/source/core/inc/UndoDelete.hxx
b/sw/source/core/inc/UndoDelete.hxx
index dd67242..92513a2 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -36,29 +36,29 @@ class SwUndoDelete
, private SwUndRng
, private SwUndoSaveContent
{
- SwNodeIndex* pMvStt; // Position of Nodes in UndoNodes-Array
- OUString *pSttStr, *pEndStr;
- SwRedlineData* pRedlData;
- SwRedlineSaveDatas* pRedlSaveData;
+ SwNodeIndex* m_pMvStt; // Position of Nodes in UndoNodes-Array
+ OUString *m_pSttStr, *m_pEndStr;
+ SwRedlineData* m_pRedlData;
+ SwRedlineSaveDatas* m_pRedlSaveData;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
- OUString sTableName;
+ OUString m_sTableName;
- sal_uLong nNode;
- sal_uLong nNdDiff; // difference of Nodes before/after Delete
- sal_uLong nSectDiff; // diff. of Nodes before/after Move w/
SectionNodes
- sal_uLong nReplaceDummy; // diff. to a temporary dummy object
- sal_uInt16 nSetPos;
+ sal_uLong m_nNode;
+ sal_uLong m_nNdDiff; // difference of Nodes before/after Delete
+ sal_uLong m_nSectDiff; // diff. of Nodes before/after Move w/
SectionNodes
+ sal_uLong m_nReplaceDummy; // diff. to a temporary dummy object
+ sal_uInt16 m_nSetPos;
- bool bGroup : 1; // TRUE: is already Grouped; see CanGrouping()
- bool bBackSp : 1; // TRUE: if Grouped and preceding content deleted
- bool bJoinNext: 1; // TRUE: if range is selected forwards
- bool bTableDelLastNd : 1; // TRUE: TextNode following Table
inserted/deleted
- bool bDelFullPara : 1; // TRUE: entire Nodes were deleted
- bool bResetPgDesc : 1; // TRUE: reset PgDsc on following node
- bool bResetPgBrk : 1; // TRUE: reset PgBreak on following node
- bool bFromTableCopy : 1; // TRUE: called by SwUndoTableCpyTable
+ bool m_bGroup : 1; // TRUE: is already Grouped; see CanGrouping()
+ bool m_bBackSp : 1; // TRUE: if Grouped and preceding content
deleted
+ bool m_bJoinNext: 1; // TRUE: if range is selected forwards
+ bool m_bTableDelLastNd : 1; // TRUE: TextNode following Table
inserted/deleted
+ bool m_bDelFullPara : 1; // TRUE: entire Nodes were deleted
+ bool m_bResetPgDesc : 1; // TRUE: reset PgDsc on following node
+ bool m_bResetPgBrk : 1; // TRUE: reset PgBreak on following node
+ bool m_bFromTableCopy : 1; // TRUE: called by SwUndoTableCpyTable
bool SaveContent( const SwPosition* pStt, const SwPosition* pEnd,
SwTextNode* pSttTextNd, SwTextNode* pEndTextNd );
@@ -88,16 +88,16 @@ public:
bool CanGrouping( SwDoc*, const SwPaM& );
- void SetTableDelLastNd() { bTableDelLastNd = true; }
+ void SetTableDelLastNd() { m_bTableDelLastNd = true; }
// for PageDesc/PageBreak Attributes of a table
void SetPgBrkFlags( bool bPageBreak, bool bPageDesc )
- { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
+ { m_bResetPgDesc = bPageDesc; m_bResetPgBrk = bPageBreak; }
void SetTableName(const OUString & rName);
// SwUndoTableCpyTable needs this information:
- bool IsDelFullPara() const { return bDelFullPara; }
+ bool IsDelFullPara() const { return m_bDelFullPara; }
DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
};
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index ab19ecc..e68ce6d 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -99,25 +99,25 @@ SwUndoDelete::SwUndoDelete(
bool bCalledByTableCpy )
: SwUndo(UNDO_DELETE),
SwUndRng( rPam ),
- pMvStt( nullptr ),
- pSttStr(nullptr),
- pEndStr(nullptr),
- pRedlData(nullptr),
- pRedlSaveData(nullptr),
- nNode(0),
- nNdDiff(0),
- nSectDiff(0),
- nReplaceDummy(0),
- nSetPos(0),
- bGroup( false ),
- bBackSp( false ),
- bJoinNext( false ),
- bTableDelLastNd( false ),
+ m_pMvStt( nullptr ),
+ m_pSttStr(nullptr),
+ m_pEndStr(nullptr),
+ m_pRedlData(nullptr),
+ m_pRedlSaveData(nullptr),
+ m_nNode(0),
+ m_nNdDiff(0),
+ m_nSectDiff(0),
+ m_nReplaceDummy(0),
+ m_nSetPos(0),
+ m_bGroup( false ),
+ m_bBackSp( false ),
+ m_bJoinNext( false ),
+ m_bTableDelLastNd( false ),
// bFullPara is set e.g. if an empty paragraph before a table is deleted
- bDelFullPara( bFullPara ),
- bResetPgDesc( false ),
- bResetPgBrk( false ),
- bFromTableCopy( bCalledByTableCpy )
+ m_bDelFullPara( bFullPara ),
+ m_bResetPgDesc( false ),
+ m_bResetPgBrk( false ),
+ m_bFromTableCopy( bCalledByTableCpy )
{
bCacheComment = false;
@@ -126,9 +126,9 @@ SwUndoDelete::SwUndoDelete(
if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() &&
!pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
{
- pRedlSaveData = new SwRedlineSaveDatas;
- if( !FillSaveData( rPam, *pRedlSaveData ))
- delete pRedlSaveData, pRedlSaveData = nullptr;
+ m_pRedlSaveData = new SwRedlineSaveDatas;
+ if( !FillSaveData( rPam, *m_pRedlSaveData ))
+ delete m_pRedlSaveData, m_pRedlSaveData = nullptr;
}
if( !pHistory )
@@ -141,7 +141,7 @@ SwUndoDelete::SwUndoDelete(
: rPam.GetPoint();
// Step 1. deletion/record of content indices
- if( bDelFullPara )
+ if( m_bDelFullPara )
{
OSL_ENSURE( rPam.HasMark(), "PaM ohne Mark" );
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
@@ -161,13 +161,13 @@ SwUndoDelete::SwUndoDelete(
}
}
- nSetPos = pHistory ? pHistory->Count() : 0;
+ m_nSetPos = pHistory ? pHistory->Count() : 0;
// Is already anything deleted?
- nNdDiff = nSttNode - pStt->nNode.GetIndex();
+ m_nNdDiff = nSttNode - pStt->nNode.GetIndex();
- bJoinNext = !bFullPara && pEnd == rPam.GetPoint();
- bBackSp = !bFullPara && !bJoinNext;
+ m_bJoinNext = !bFullPara && pEnd == rPam.GetPoint();
+ m_bBackSp = !bFullPara && !m_bJoinNext;
SwTextNode *pSttTextNd = nullptr, *pEndTextNd = nullptr;
if( !bFullPara )
@@ -179,7 +179,7 @@ SwUndoDelete::SwUndoDelete(
}
bool bMoveNds = *pStt != *pEnd // any area still existent?
- && ( SaveContent( pStt, pEnd, pSttTextNd, pEndTextNd ) ||
bFromTableCopy );
+ && ( SaveContent( pStt, pEnd, pSttTextNd, pEndTextNd ) ||
m_bFromTableCopy );
if( pSttTextNd && pEndTextNd && pSttTextNd != pEndTextNd )
{
@@ -187,7 +187,7 @@ SwUndoDelete::SwUndoDelete(
pHistory->Add( pSttTextNd->GetTextColl(),pStt->nNode.GetIndex(),
ND_TEXTNODE );
pHistory->Add( pEndTextNd->GetTextColl(),pEnd->nNode.GetIndex(),
ND_TEXTNODE );
- if( !bJoinNext ) // Selection from bottom to top
+ if( !m_bJoinNext ) // Selection from bottom to top
{
// When using JoinPrev() all AUTO-PageBreak's will be copied
// correctly. To restore them with UNDO, Auto-PageBreak of the
@@ -223,18 +223,18 @@ SwUndoDelete::SwUndoDelete(
{
SwNodes& rNds = pDoc->GetUndoManager().GetUndoNodes();
SwNodes& rDocNds = pDoc->GetNodes();
- SwNodeRange aRg( rDocNds, nSttNode - nNdDiff,
- rDocNds, nEndNode - nNdDiff );
+ SwNodeRange aRg( rDocNds, nSttNode - m_nNdDiff,
+ rDocNds, nEndNode - m_nNdDiff );
if( !bFullPara && !pEndTextNd &&
&aRg.aEnd.GetNode() != &pDoc->GetNodes().GetEndOfContent() )
{
SwNode* pNode = aRg.aEnd.GetNode().StartOfSectionNode();
- if( pNode->GetIndex() >= nSttNode - nNdDiff )
+ if( pNode->GetIndex() >= nSttNode - m_nNdDiff )
++aRg.aEnd; // Deletion of a complete table
}
SwNode* pTmpNd;
// Step 2: Expand selection if necessary
- if( bJoinNext || bFullPara )
+ if( m_bJoinNext || bFullPara )
{
// If all content of a section will be moved into Undo, the section
// itself should be moved completely.
@@ -243,8 +243,8 @@ SwUndoDelete::SwUndoDelete(
pTmpNd->StartOfSectionNode()->IsSectionNode() &&
pTmpNd->StartOfSectionNode()->GetIndex() >=
aRg.aStart.GetIndex() ) )
++aRg.aEnd;
- nReplaceDummy = aRg.aEnd.GetIndex() + nNdDiff - nEndNode;
- if( nReplaceDummy )
+ m_nReplaceDummy = aRg.aEnd.GetIndex() + m_nNdDiff - nEndNode;
+ if( m_nReplaceDummy )
{ // The selection has been expanded, because
++aRg.aEnd;
if( pEndTextNd )
@@ -252,7 +252,7 @@ SwUndoDelete::SwUndoDelete(
// The end text node has to leave the (expanded) selection
// The dummy is needed because _MoveNodes deletes empty
// sections
- ++nReplaceDummy;
+ ++m_nReplaceDummy;
SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 );
SwPosition aSplitPos( *pEndTextNd );
::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
@@ -261,10 +261,10 @@ SwUndoDelete::SwUndoDelete(
--aRg.aEnd;
}
else
- nReplaceDummy = 0;
+ m_nReplaceDummy = 0;
}
}
- if( bBackSp || bFullPara )
+ if( m_bBackSp || bFullPara )
{
// See above, the selection has to be expanded if there are "nearly
// empty" sections and a replacement dummy has to be set if needed.
@@ -274,8 +274,8 @@ SwUndoDelete::SwUndoDelete(
--aRg.aStart;
if( pSttTextNd )
{
- nReplaceDummy = nSttNode - nNdDiff - aRg.aStart.GetIndex();
- if( nReplaceDummy )
+ m_nReplaceDummy = nSttNode - m_nNdDiff - aRg.aStart.GetIndex();
+ if( m_nReplaceDummy )
{
SwNodeRange aMvRg( *pSttTextNd, 0, *pSttTextNd, 1 );
SwPosition aSplitPos( *pSttTextNd );
@@ -287,7 +287,7 @@ SwUndoDelete::SwUndoDelete(
}
}
- if( bFromTableCopy )
+ if( m_bFromTableCopy )
{
if( !pEndTextNd )
{
@@ -301,22 +301,22 @@ SwUndoDelete::SwUndoDelete(
++aRg.aStart;
// Step 3: Moving into UndoArray...
- nNode = rNds.GetEndOfContent().GetIndex();
+ m_nNode = rNds.GetEndOfContent().GetIndex();
rDocNds._MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() ));
- pMvStt = new SwNodeIndex( rNds, nNode );
+ m_pMvStt = new SwNodeIndex( rNds, m_nNode );
// remember difference!
- nNode = rNds.GetEndOfContent().GetIndex() - nNode;
+ m_nNode = rNds.GetEndOfContent().GetIndex() - m_nNode;
if( pSttTextNd && pEndTextNd )
{
//Step 4: Moving around sections
- nSectDiff = aRg.aEnd.GetIndex() - aRg.aStart.GetIndex();
+ m_nSectDiff = aRg.aEnd.GetIndex() - aRg.aStart.GetIndex();
// nSect is the number of sections which starts(ends) between start
// and end node of the selection. The "loser" paragraph has to be
// moved into the section(s) of the "winner" paragraph
- if( nSectDiff )
+ if( m_nSectDiff )
{
- if( bJoinNext )
+ if( m_bJoinNext )
{
SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 );
rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart );
@@ -328,26 +328,26 @@ SwUndoDelete::SwUndoDelete(
}
}
}
- if( nSectDiff || nReplaceDummy )
+ if( m_nSectDiff || m_nReplaceDummy )
lcl_MakeAutoFrms( *pDoc->GetSpzFrameFormats(),
- bJoinNext ? pEndTextNd->GetIndex() : pSttTextNd->GetIndex() );
+ m_bJoinNext ? pEndTextNd->GetIndex() : pSttTextNd->GetIndex()
);
}
else
- nNode = 0; // moved no node -> no difference at the end
+ m_nNode = 0; // moved no node -> no difference at the end
// Are there any Nodes that got deleted before that (FootNotes
// have ContentNodes)?
if( !pSttTextNd && !pEndTextNd )
{
- nNdDiff = nSttNode - rPam.GetPoint()->nNode.GetIndex() - (bFullPara ?
0 : 1);
+ m_nNdDiff = nSttNode - rPam.GetPoint()->nNode.GetIndex() - (bFullPara
? 0 : 1);
rPam.Move( fnMoveForward, fnGoNode );
}
else
{
- nNdDiff = nSttNode;
- if( nSectDiff && bBackSp )
- nNdDiff += nSectDiff;
- nNdDiff -= rPam.GetPoint()->nNode.GetIndex();
+ m_nNdDiff = nSttNode;
+ if( m_nSectDiff && m_bBackSp )
+ m_nNdDiff += m_nSectDiff;
+ m_nNdDiff -= rPam.GetPoint()->nNode.GetIndex();
}
if( !rPam.GetNode().IsContentNode() )
@@ -382,13 +382,13 @@ bool SwUndoDelete::SaveContent( const SwPosition* pStt,
const SwPosition* pEnd,
// delete now also the text (all attribute changes are added to
// UNDO history)
- pSttStr = new OUString( pSttTextNd->GetText().copy(nSttContent, nLen));
+ m_pSttStr = new OUString( pSttTextNd->GetText().copy(nSttContent,
nLen));
pSttTextNd->EraseText( pStt->nContent, nLen );
if( pSttTextNd->GetpSwpHints() )
pSttTextNd->GetpSwpHints()->DeRegister();
// METADATA: store
- bool emptied( !pSttStr->isEmpty() && !pSttTextNd->Len() );
+ bool emptied( !m_pSttStr->isEmpty() && !pSttTextNd->Len() );
if (!bOneNode || emptied) // merging may overwrite xmlids...
{
m_pMetadataUndoStart = (emptied)
@@ -417,14 +417,14 @@ bool SwUndoDelete::SaveContent( const SwPosition* pStt,
const SwPosition* pEnd,
// delete now also the text (all attribute changes are added to
// UNDO history)
- pEndStr = new OUString( pEndTextNd->GetText().copy( 0,
+ m_pEndStr = new OUString( pEndTextNd->GetText().copy( 0,
pEnd->nContent.GetIndex() ));
pEndTextNd->EraseText( aEndIdx, pEnd->nContent.GetIndex() );
if( pEndTextNd->GetpSwpHints() )
pEndTextNd->GetpSwpHints()->DeRegister();
// METADATA: store
- bool emptied = !pEndStr->isEmpty() && !pEndTextNd->Len();
+ bool emptied = !m_pEndStr->isEmpty() && !pEndTextNd->Len();
m_pMetadataUndoEnd = (emptied)
? pEndTextNd->CreateUndoForDelete()
@@ -441,11 +441,11 @@ bool SwUndoDelete::SaveContent( const SwPosition* pStt,
const SwPosition* pEnd,
bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
{
// Is Undo greater than one Node (that is Start and EndString)?
- if( !pSttStr || pSttStr->isEmpty() || pEndStr )
+ if( !m_pSttStr || m_pSttStr->isEmpty() || m_pEndStr )
return false;
// only the deletion of single char's can be condensed
- if( nSttNode != nEndNode || ( !bGroup && nSttContent+1 != nEndContent ))
+ if( nSttNode != nEndNode || ( !m_bGroup && nSttContent+1 != nEndContent ))
return false;
const SwPosition *pStt = rDelPam.Start(),
@@ -462,13 +462,13 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM&
rDelPam )
// be constructed differently!
if( pEnd->nContent == nSttContent )
{
- if( bGroup && !bBackSp ) return false;
- bBackSp = true;
+ if( m_bGroup && !m_bBackSp ) return false;
+ m_bBackSp = true;
}
else if( pStt->nContent == nSttContent )
{
- if( bGroup && bBackSp ) return false;
- bBackSp = false;
+ if( m_bGroup && m_bBackSp ) return false;
+ m_bBackSp = false;
}
else
return false;
@@ -477,21 +477,21 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM&
rDelPam )
SwTextNode * pDelTextNd = pStt->nNode.GetNode().GetTextNode();
if( !pDelTextNd ) return false;
- sal_Int32 nUChrPos = bBackSp ? 0 : pSttStr->getLength()-1;
+ sal_Int32 nUChrPos = m_bBackSp ? 0 : m_pSttStr->getLength()-1;
sal_Unicode cDelChar = pDelTextNd->GetText()[ pStt->nContent.GetIndex() ];
CharClass& rCC = GetAppCharClass();
if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) ||
rCC.isLetterNumeric( OUString( cDelChar ), 0 ) !=
- rCC.isLetterNumeric( *pSttStr, nUChrPos ) )
+ rCC.isLetterNumeric( *m_pSttStr, nUChrPos ) )
return false;
{
SwRedlineSaveDatas aTmpSav;
const bool bSaved = FillSaveData( rDelPam, aTmpSav, false );
- bool bOk = ( !pRedlSaveData && !bSaved ) ||
- ( pRedlSaveData && bSaved &&
- SwUndo::CanRedlineGroup( *pRedlSaveData, aTmpSav, bBackSp ));
+ bool bOk = ( !m_pRedlSaveData && !bSaved ) ||
+ ( m_pRedlSaveData && bSaved &&
+ SwUndo::CanRedlineGroup( *m_pRedlSaveData, aTmpSav, m_bBackSp
));
// aTmpSav.DeleteAndDestroyAll();
if( !bOk )
return false;
@@ -500,32 +500,32 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM&
rDelPam )
}
// Both 'deletes' can be consolidated, so 'move' the related character
- if( bBackSp )
+ if( m_bBackSp )
nSttContent--; // BackSpace: add char to array!
else
{
nEndContent++; // Delete: attach char at the end
nUChrPos++;
}
- (*pSttStr) = pSttStr->replaceAt( nUChrPos, 0, OUString(cDelChar) );
+ (*m_pSttStr) = m_pSttStr->replaceAt( nUChrPos, 0, OUString(cDelChar) );
pDelTextNd->EraseText( pStt->nContent, 1 );
- bGroup = true;
+ m_bGroup = true;
return true;
}
SwUndoDelete::~SwUndoDelete()
{
- delete pSttStr;
- delete pEndStr;
- if( pMvStt ) // Delete also the selection from UndoNodes array
+ delete m_pSttStr;
+ delete m_pEndStr;
+ if( m_pMvStt ) // Delete also the selection from UndoNodes array
{
// Insert saves content in IconSection
- pMvStt->GetNode().GetNodes().Delete( *pMvStt, nNode );
- delete pMvStt;
+ m_pMvStt->GetNode().GetNodes().Delete( *m_pMvStt, m_nNode );
+ delete m_pMvStt;
}
- delete pRedlData;
- delete pRedlSaveData;
+ delete m_pRedlData;
+ delete m_pRedlSaveData;
}
static SwRewriter lcl_RewriterFromHistory(SwHistory & rHistory)
@@ -661,14 +661,14 @@ SwRewriter SwUndoDelete::GetRewriter() const
{
SwRewriter aResult;
- if (nNode != 0)
+ if (m_nNode != 0)
{
- if (!sTableName.isEmpty())
+ if (!m_sTableName.isEmpty())
{
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_START_QUOTE));
- aRewriter.AddRule(UndoArg2, sTableName);
+ aRewriter.AddRule(UndoArg2, m_sTableName);
aRewriter.AddRule(UndoArg3, SW_RESSTR(STR_END_QUOTE));
OUString sTmp = aRewriter.Apply(SW_RES(STR_TABLE_NAME));
@@ -681,18 +681,18 @@ SwRewriter SwUndoDelete::GetRewriter() const
{
OUString aStr;
- if (pSttStr != nullptr && pEndStr != nullptr && pSttStr->isEmpty() &&
- pEndStr->isEmpty())
+ if (m_pSttStr != nullptr && m_pEndStr != nullptr &&
m_pSttStr->isEmpty() &&
+ m_pEndStr->isEmpty())
{
aStr = SW_RESSTR(STR_PARAGRAPH_UNDO);
}
else
{
OUString * pStr = nullptr;
- if (pSttStr != nullptr)
- pStr = pSttStr;
- else if (pEndStr != nullptr)
- pStr = pEndStr;
+ if (m_pSttStr != nullptr)
+ pStr = m_pSttStr;
+ else if (m_pEndStr != nullptr)
+ pStr = m_pEndStr;
if (pStr != nullptr)
{
@@ -747,17 +747,17 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
{
SwDoc& rDoc = rContext.GetDoc();
- sal_uLong nCalcStt = nSttNode - nNdDiff;
+ sal_uLong nCalcStt = nSttNode - m_nNdDiff;
- if( nSectDiff && bBackSp )
- nCalcStt += nSectDiff;
+ if( m_nSectDiff && m_bBackSp )
+ nCalcStt += m_nSectDiff;
SwNodeIndex aIdx(rDoc.GetNodes(), nCalcStt);
SwNode* pInsNd = &aIdx.GetNode();
{ // code block so that SwPosition is detached when deleting a Node
SwPosition aPos( aIdx );
- if( !bDelFullPara )
+ if( !m_bDelFullPara )
{
if( pInsNd->IsTableNode() )
{
@@ -771,16 +771,16 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
{
if( pInsNd->IsContentNode() )
aPos.nContent.Assign( static_cast<SwContentNode*>(pInsNd),
nSttContent );
- if( !bTableDelLastNd )
+ if( !m_bTableDelLastNd )
pInsNd = nullptr; // do not delete Node!
}
}
else
pInsNd = nullptr; // do not delete Node!
- bool bNodeMove = 0 != nNode;
+ bool bNodeMove = 0 != m_nNode;
- if( pEndStr )
+ if( m_pEndStr )
{
// discard attributes since they all saved!
SwTextNode* pTextNd = aPos.nNode.GetNode().GetTextNode();
@@ -791,7 +791,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
if( pTextNd && pTextNd->GetpSwpHints() )
pTextNd->ClearSwpHintsArr( true );
- if( pSttStr && !bFromTableCopy )
+ if( m_pSttStr && !m_bFromTableCopy )
{
sal_uLong nOldIdx = aPos.nNode.GetIndex();
rDoc.getIDocumentContentOperations().SplitNode( aPos, false );
@@ -799,21 +799,21 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
// paragraph, but the pHistory of the fly frame formats relies
// on anchoring at the start of the selection
// => selection backwards needs a correction.
- if( bBackSp )
+ if( m_bBackSp )
lcl_ReAnchorAtContentFlyFrames(*rDoc.GetSpzFrameFormats(),
aPos, nOldIdx);
pTextNd = aPos.nNode.GetNode().GetTextNode();
}
if( pTextNd )
{
- OUString const ins( pTextNd->InsertText(*pEndStr,
aPos.nContent,
+ OUString const ins( pTextNd->InsertText(*m_pEndStr,
aPos.nContent,
SwInsertFlags::NOHINTEXPAND) );
- assert(ins.getLength() == pEndStr->getLength()); // must
succeed
+ assert(ins.getLength() == m_pEndStr->getLength()); // must
succeed
(void) ins;
// METADATA: restore
pTextNd->RestoreMetadata(m_pMetadataUndoEnd);
}
}
- else if( pSttStr && bNodeMove )
+ else if( m_pSttStr && bNodeMove )
{
SwTextNode * pNd = aPos.nNode.GetNode().GetTextNode();
if( pNd )
@@ -822,7 +822,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
{
sal_uLong nOldIdx = aPos.nNode.GetIndex();
rDoc.getIDocumentContentOperations().SplitNode( aPos,
false );
- if( bBackSp )
+ if( m_bBackSp )
lcl_ReAnchorAtContentFlyFrames(*rDoc.GetSpzFrameFormats(), aPos, nOldIdx);
}
else
@@ -830,24 +830,24 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
}
}
SwNode* pMovedNode = nullptr;
- if( nSectDiff )
+ if( m_nSectDiff )
{
sal_uLong nMoveIndex = aPos.nNode.GetIndex();
int nDiff = 0;
- if( bJoinNext )
+ if( m_bJoinNext )
{
- nMoveIndex += nSectDiff + 1;
+ nMoveIndex += m_nSectDiff + 1;
pMovedNode = &aPos.nNode.GetNode();
}
else
{
- nMoveIndex -= nSectDiff + 1;
+ nMoveIndex -= m_nSectDiff + 1;
++nDiff;
}
SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex);
SwNodeRange aRg( aPos.nNode, 0 - nDiff, aPos.nNode, 1 - nDiff );
--aPos.nNode;
- if( !bJoinNext )
+ if( !m_bJoinNext )
pMovedNode = &aPos.nNode.GetNode();
rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx);
++aPos.nNode;
@@ -855,22 +855,22 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
if( bNodeMove )
{
- SwNodeRange aRange( *pMvStt, 0, *pMvStt, nNode );
+ SwNodeRange aRange( *m_pMvStt, 0, *m_pMvStt, m_nNode );
SwNodeIndex aCopyIndex( aPos.nNode, -1 );
rDoc.GetUndoManager().GetUndoNodes()._Copy( aRange, aPos.nNode );
- if( nReplaceDummy )
+ if( m_nReplaceDummy )
{
sal_uLong nMoveIndex;
- if( bJoinNext )
+ if( m_bJoinNext )
{
- nMoveIndex = nEndNode - nNdDiff;
- aPos.nNode = nMoveIndex + nReplaceDummy;
+ nMoveIndex = nEndNode - m_nNdDiff;
+ aPos.nNode = nMoveIndex + m_nReplaceDummy;
}
else
{
aPos = SwPosition( aCopyIndex );
- nMoveIndex = aPos.nNode.GetIndex() + nReplaceDummy + 1;
+ nMoveIndex = aPos.nNode.GetIndex() + m_nReplaceDummy + 1;
}
SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex);
SwNodeRange aRg( aPos.nNode, 0, aPos.nNode, 1 );
@@ -883,15 +883,15 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
if( pMovedNode )
lcl_MakeAutoFrms(*rDoc.GetSpzFrameFormats(),
pMovedNode->GetIndex());
- if( pSttStr )
+ if( m_pSttStr )
{
- aPos.nNode = nSttNode - nNdDiff + ( bJoinNext ? 0 : nReplaceDummy
);
+ aPos.nNode = nSttNode - m_nNdDiff + ( m_bJoinNext ? 0 :
m_nReplaceDummy );
SwTextNode * pTextNd = aPos.nNode.GetNode().GetTextNode();
// If more than a single Node got deleted, also all "Node"
// attributes were saved
if (pTextNd != nullptr)
{
- if( pTextNd->HasSwAttrSet() && bNodeMove && !pEndStr )
+ if( pTextNd->HasSwAttrSet() && bNodeMove && !m_pEndStr )
pTextNd->ResetAllAttr();
if( pTextNd->GetpSwpHints() )
@@ -900,9 +900,9 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
// SectionNode mode and selection from top to bottom:
// -> in StartNode is still the rest of the Join => delete
aPos.nContent.Assign( pTextNd, nSttContent );
- OUString const ins( pTextNd->InsertText(*pSttStr,
aPos.nContent,
+ OUString const ins( pTextNd->InsertText(*m_pSttStr,
aPos.nContent,
SwInsertFlags::NOHINTEXPAND) );
- assert(ins.getLength() == pSttStr->getLength()); // must
succeed
+ assert(ins.getLength() == m_pSttStr->getLength()); // must
succeed
(void) ins;
// METADATA: restore
pTextNd->RestoreMetadata(m_pMetadataUndoStart);
@@ -911,15 +911,15 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
if( pHistory )
{
- pHistory->TmpRollback(&rDoc, nSetPos, false);
- if( nSetPos ) // there were Footnodes/FlyFrames
+ pHistory->TmpRollback(&rDoc, m_nSetPos, false);
+ if( m_nSetPos ) // there were Footnodes/FlyFrames
{
// are there others than these ones?
- if( nSetPos < pHistory->Count() )
+ if( m_nSetPos < pHistory->Count() )
{
// if so save the attributes of the others
SwHistory aHstr;
- aHstr.Move( 0, pHistory, nSetPos );
+ aHstr.Move( 0, pHistory, m_nSetPos );
pHistory->Rollback(&rDoc);
pHistory->Move( 0, &aHstr );
}
@@ -931,10 +931,10 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
}
}
- if( bResetPgDesc || bResetPgBrk )
+ if( m_bResetPgDesc || m_bResetPgBrk )
{
- sal_uInt16 nStt = static_cast<sal_uInt16>( bResetPgDesc ?
RES_PAGEDESC : RES_BREAK );
- sal_uInt16 nEnd = static_cast<sal_uInt16>( bResetPgBrk ? RES_BREAK
: RES_PAGEDESC );
+ sal_uInt16 nStt = static_cast<sal_uInt16>( m_bResetPgDesc ?
RES_PAGEDESC : RES_BREAK );
+ sal_uInt16 nEnd = static_cast<sal_uInt16>( m_bResetPgBrk ?
RES_BREAK : RES_PAGEDESC );
SwNode* pNode = rDoc.GetNodes()[ nEndNode + 1 ];
if( pNode->IsContentNode() )
@@ -946,8 +946,8 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
// delete the temporarily added Node
if( pInsNd )
rDoc.GetNodes().Delete( aIdx );
- if( pRedlSaveData )
- SetSaveData(rDoc, *pRedlSaveData);
+ if( m_pRedlSaveData )
+ SetSaveData(rDoc, *m_pRedlSaveData);
AddUndoRedoPaM(rContext, true);
}
@@ -957,24 +957,24 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext &
rContext)
SwPaM & rPam = AddUndoRedoPaM(rContext);
SwDoc& rDoc = *rPam.GetDoc();
- if( pRedlSaveData )
+ if( m_pRedlSaveData )
{
- const bool bSuccess = FillSaveData(rPam, *pRedlSaveData);
+ const bool bSuccess = FillSaveData(rPam, *m_pRedlSaveData);
OSL_ENSURE(bSuccess,
"SwUndoDelete::Redo: used to have redline data, but now none?");
if (!bSuccess)
{
- delete pRedlSaveData, pRedlSaveData = nullptr;
+ delete m_pRedlSaveData, m_pRedlSaveData = nullptr;
}
}
- if( !bDelFullPara )
+ if( !m_bDelFullPara )
{
SwUndRng aTmpRng( rPam );
RemoveIdxFromRange( rPam, false );
aTmpRng.SetPaM( rPam );
- if( !bJoinNext ) // then restore selection from bottom to top
+ if( !m_bJoinNext ) // then restore selection from bottom to
top
rPam.Exchange();
}
@@ -984,7 +984,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext &
rContext)
SwHistory aHstr;
aHstr.Move( 0, pHistory );
- if( bDelFullPara )
+ if( m_bDelFullPara )
{
OSL_ENSURE( rPam.HasMark(), "PaM without Mark" );
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
@@ -994,13 +994,13 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext &
rContext)
}
else
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
- nSetPos = pHistory ? pHistory->Count() : 0;
+ m_nSetPos = pHistory ? pHistory->Count() : 0;
- pHistory->Move( nSetPos, &aHstr );
+ pHistory->Move( m_nSetPos, &aHstr );
}
else
{
- if( bDelFullPara )
+ if( m_bDelFullPara )
{
OSL_ENSURE( rPam.HasMark(), "PaM without Mark" );
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
@@ -1010,18 +1010,18 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext &
rContext)
}
else
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
- nSetPos = pHistory ? pHistory->Count() : 0;
+ m_nSetPos = pHistory ? pHistory->Count() : 0;
}
- if( !pSttStr && !pEndStr )
+ if( !m_pSttStr && !m_pEndStr )
{
- SwNodeIndex aSttIdx = ( bDelFullPara || bJoinNext )
+ SwNodeIndex aSttIdx = ( m_bDelFullPara || m_bJoinNext )
? rPam.GetMark()->nNode
: rPam.GetPoint()->nNode;
SwTableNode* pTableNd = aSttIdx.GetNode().GetTableNode();
if( pTableNd )
{
- if( bTableDelLastNd )
+ if( m_bTableDelLastNd )
{
// than add again a Node at the end
const SwNodeIndex aTmpIdx( *pTableNd->EndOfSectionNode(), 1 );
@@ -1062,7 +1062,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext &
rContext)
rDoc.GetNodes().Delete( aSttIdx, nEndNode - nSttNode );
}
- else if( bDelFullPara )
+ else if( m_bDelFullPara )
{
// The Pam was incremented by one at Point (== end) to provide space
// for UNDO. This now needs to be reverted!
@@ -1090,7 +1090,7 @@ void SwUndoDelete::RepeatImpl(::sw::RepeatContext &
rContext)
rPam.SetMark();
rPam.Move( fnMoveForward, fnGoContent );
}
- if( bDelFullPara )
+ if( m_bDelFullPara )
rDoc.getIDocumentContentOperations().DelFullPara( rPam );
else
rDoc.getIDocumentContentOperations().DeleteAndJoin( rPam );
@@ -1099,7 +1099,7 @@ void SwUndoDelete::RepeatImpl(::sw::RepeatContext &
rContext)
void SwUndoDelete::SetTableName(const OUString & rName)
{
- sTableName = rName;
+ m_sTableName = rName;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
