Kaydet (Commit) 109717c9 authored tarafından Michael Stahl's avatar Michael Stahl

sw: prefix members of SwEditShell

Change-Id: I8a06e0660767f23518952e22cca1b56c16d0bbd1
üst 3e7431f5
......@@ -137,9 +137,9 @@ typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
{
static SvxSwAutoFmtFlags* pAutoFmtFlags;
static SvxSwAutoFmtFlags* s_pAutoFmtFlags;
/// For the private methods DelRange and those of AutoCorrect.
friend class SwAutoFormat;
......@@ -952,7 +952,7 @@ inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
/// Class for automated call of Start- and EndAction().
class SwActContext {
SwEditShell *pSh;
SwEditShell & m_rShell;
public:
SwActContext(SwEditShell *pShell);
~SwActContext();
......@@ -960,7 +960,7 @@ public:
/// Class for automated call of Start- and EndCrsrMove().
class SwMvContext {
SwEditShell *pSh;
SwEditShell & m_rShell;
public:
SwMvContext(SwEditShell *pShell);
~SwMvContext();
......
......@@ -763,7 +763,7 @@ void _FinitCore()
delete SwSelPaintRects::s_pMapMode;
delete SwFntObj::pPixMap;
delete SwEditShell::pAutoFmtFlags;
delete SwEditShell::s_pAutoFmtFlags;
#if OSL_DEBUG_LEVEL > 0
// free defaults to prevent assertions
......
......@@ -81,7 +81,7 @@ const int cnPosEnDash = 2, cnPosEmDash = 4;
const sal_Unicode cStarSymbolEnDash = 0x2013;
const sal_Unicode cStarSymbolEmDash = 0x2014;
SvxSwAutoFmtFlags* SwEditShell::pAutoFmtFlags = 0;
SvxSwAutoFmtFlags* SwEditShell::s_pAutoFmtFlags = nullptr;
// Number of num-/bullet-paragraph templates. MAXLEVEL will soon be raised
// to x, but not the number of templates. (Artifact from <= 4.0)
......@@ -2606,10 +2606,10 @@ void SwEditShell::AutoFmtBySplitNode()
SvxSwAutoFmtFlags* SwEditShell::GetAutoFmtFlags()
{
if (!pAutoFmtFlags)
pAutoFmtFlags = new SvxSwAutoFmtFlags;
if (!s_pAutoFmtFlags)
s_pAutoFmtFlags = new SvxSwAutoFmtFlags;
return pAutoFmtFlags;
return s_pAutoFmtFlags;
}
void SwEditShell::SetAutoFmtFlags(SvxSwAutoFmtFlags * pFlags)
......
......@@ -148,25 +148,25 @@ bool SwEditShell::HasOtherCnt() const
// access control functions for file name handling
SwActContext::SwActContext(SwEditShell *pShell)
: pSh(pShell)
: m_rShell(*pShell)
{
pSh->StartAction();
m_rShell.StartAction();
}
SwActContext::~SwActContext()
{
pSh->EndAction();
m_rShell.EndAction();
}
SwMvContext::SwMvContext(SwEditShell *pShell)
: pSh(pShell)
: m_rShell(*pShell)
{
pSh->SttCrsrMove();
m_rShell.SttCrsrMove();
}
SwMvContext::~SwMvContext()
{
pSh->EndCrsrMove();
m_rShell.EndCrsrMove();
}
SwFrmFmt *SwEditShell::GetTableFmt() // fastest test on a table
......
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