Kaydet (Commit) 91887a34 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwView

It has a number of static members, use m_ prefix only for non-static
members.

Change-Id: I312b1eaadd1a7d312d4679028446cf69362e4740
Reviewed-on: https://gerrit.libreoffice.org/72215Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
üst 4bde8e28
...@@ -149,17 +149,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell ...@@ -149,17 +149,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
friend class SwClipboardChangeListener; friend class SwClipboardChangeListener;
// search & replace // search & replace
static SvxSearchItem *m_pSrchItem; static SvxSearchItem *s_pSrchItem;
static sal_uInt16 m_nMoveType; // for buttons below the scrollbar (viewmdi) static sal_uInt16 m_nMoveType; // for buttons below the scrollbar (viewmdi)
static sal_Int32 m_nActMark; // current jump mark for unknown mark static sal_Int32 m_nActMark; // current jump mark for unknown mark
static bool m_bExtra; static bool s_bExtra;
static bool m_bFound; static bool s_bFound;
static bool m_bJustOpened; static bool s_bJustOpened;
static SearchAttrItemList* m_pSrchList; static SearchAttrItemList* s_pSearchList;
static SearchAttrItemList* m_pReplList; static SearchAttrItemList* s_pReplaceList;
Timer m_aTimer; // for delayed ChgLnks during an action Timer m_aTimer; // for delayed ChgLnks during an action
OUString m_sSwViewData, OUString m_sSwViewData,
...@@ -629,7 +629,7 @@ public: ...@@ -629,7 +629,7 @@ public:
SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override;
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
const SfxItemSet& rSet) override; const SfxItemSet& rSet) override;
static SvxSearchItem* GetSearchItem() { return m_pSrchItem; } static SvxSearchItem* GetSearchItem() { return s_pSrchItem; }
/// See SfxViewShell::getPart(). /// See SfxViewShell::getPart().
int getPart() const override; int getPart() const override;
/// See SfxViewShell::dumpAsXml(). /// See SfxViewShell::dumpAsXml().
......
...@@ -130,14 +130,14 @@ using namespace ::com::sun::star::scanner; ...@@ -130,14 +130,14 @@ using namespace ::com::sun::star::scanner;
bool bDocSzUpdated = true; bool bDocSzUpdated = true;
SvxSearchItem* SwView::m_pSrchItem = nullptr; SvxSearchItem* SwView::s_pSrchItem = nullptr;
bool SwView::m_bExtra = false; bool SwView::s_bExtra = false;
bool SwView::m_bFound = false; bool SwView::s_bFound = false;
bool SwView::m_bJustOpened = false; bool SwView::s_bJustOpened = false;
SearchAttrItemList* SwView::m_pSrchList = nullptr; SearchAttrItemList* SwView::s_pSearchList = nullptr;
SearchAttrItemList* SwView::m_pReplList = nullptr; SearchAttrItemList* SwView::s_pReplaceList = nullptr;
SfxDispatcher &SwView::GetDispatcher() SfxDispatcher &SwView::GetDispatcher()
{ {
......
...@@ -533,15 +533,15 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void ) ...@@ -533,15 +533,15 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
break; break;
case NID_SRCH_REP: case NID_SRCH_REP:
if(m_pSrchItem) if(s_pSrchItem)
{ {
bool bBackward = m_pSrchItem->GetBackward(); bool bBackward = s_pSrchItem->GetBackward();
if (rSh.HasSelection() && bNext != rSh.IsCursorPtAtEnd()) if (rSh.HasSelection() && bNext != rSh.IsCursorPtAtEnd())
rSh.SwapPam(); rSh.SwapPam();
m_pSrchItem->SetBackward(!bNext); s_pSrchItem->SetBackward(!bNext);
SfxRequest aReq(FN_REPEAT_SEARCH, SfxCallMode::SLOT, GetPool()); SfxRequest aReq(FN_REPEAT_SEARCH, SfxCallMode::SLOT, GetPool());
ExecSearch(aReq); ExecSearch(aReq);
m_pSrchItem->SetBackward(bBackward); s_pSrchItem->SetBackward(bBackward);
} }
break; break;
case NID_INDEX_ENTRY: case NID_INDEX_ENTRY:
......
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