sw/source/uibase/inc/basesh.hxx | 6 +++---
sw/source/uibase/inc/conrect.hxx | 4 ++--
sw/source/uibase/ribbar/conrect.cxx | 14 +++++++-------
sw/source/uibase/ribbar/workctrl.cxx | 24 ++++++++++++------------
sw/source/uibase/shells/basesh.cxx | 4 ++--
5 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 3914ca68e05d31eec4df03db50a4c0c258d2704b
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 10 11:55:30 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 10 14:01:25 2022 +0100
sw: prefix members of ConstRectangle, SwBaseShell, ...
... SwJumpToSpecificBox_Impl and SwZoomBox_Impl
See tdf#94879 for motivation.
Change-Id: I5daf3f0a2c0c712a554aa32a6a219acb07d64a32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128201
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 2f7402f27870..8937f817cbb8 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwBaseShell: public SfxShell
SwView &m_rView;
// DragMode
- static FlyMode eFrameMode;
+ static FlyMode s_eFrameMode;
// Bug 75078 - if in GetState the async call of GetGraphic returns
// synch, the set the state directly into the itemset
@@ -110,8 +110,8 @@ public:
void ExecField(SfxRequest const & rReq);
static void SetFrameMode( FlyMode eMode, SwWrtShell *pShell ); // with
update!
- static void SetFrameMode_( FlyMode eMode ) { eFrameMode = eMode; }
- static FlyMode GetFrameMode() { return eFrameMode; }
+ static void SetFrameMode_( FlyMode eMode ) { s_eFrameMode = eMode; }
+ static FlyMode GetFrameMode() { return s_eFrameMode; }
// duplicate rOrig and rOrig's multi-selection Ring so the first element
of the returned
// vector can be used equivalently to rOrig to affect the same selections
diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx
index cc8d62ef7235..bc290f8e84ea 100644
--- a/sw/source/uibase/inc/conrect.hxx
+++ b/sw/source/uibase/inc/conrect.hxx
@@ -25,8 +25,8 @@
// draw rectangle
class ConstRectangle final : public SwDrawBase
{
- bool bMarquee;
- bool bCapVertical;
+ bool m_bMarquee;
+ bool m_bCapVertical;
bool mbVertical;
diff --git a/sw/source/uibase/ribbar/conrect.cxx
b/sw/source/uibase/ribbar/conrect.cxx
index 589db379e660..837d5c3074d1 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -38,8 +38,8 @@
ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
SwView* pSwView )
: SwDrawBase( pWrtShell, pEditWin, pSwView )
- , bMarquee(false)
- , bCapVertical(false)
+ , m_bMarquee(false)
+ , m_bCapVertical(false)
, mbVertical(false)
{
}
@@ -86,7 +86,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
switch( m_pWin->GetSdrDrawMode() )
{
case SdrObjKind::Text:
- if( bMarquee )
+ if( m_bMarquee )
{
m_pSh->ChgAnchor(RndStdIds::FLY_AS_CHAR);
@@ -136,7 +136,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
case SdrObjKind::Caption:
{
SdrCaptionObj* pCaptObj = dynamic_cast<SdrCaptionObj*>(pObj);
- if( bCapVertical && pCaptObj )
+ if( m_bCapVertical && pCaptObj )
{
pCaptObj->ForceOutlinerParaObject();
OutlinerParaObject* pOPO = pCaptObj->GetOutlinerParaObject();
@@ -153,7 +153,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
void ConstRectangle::Activate(const sal_uInt16 nSlotId)
{
- bMarquee = bCapVertical = false;
+ m_bMarquee = m_bCapVertical = false;
mbVertical = false;
switch (nSlotId)
@@ -183,7 +183,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
break;
case SID_DRAW_TEXT_MARQUEE:
- bMarquee = true;
+ m_bMarquee = true;
m_pWin->SetSdrDrawMode(SdrObjKind::Text);
break;
@@ -197,7 +197,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
break;
case SID_DRAW_CAPTION_VERTICAL:
- bCapVertical = true;
+ m_bCapVertical = true;
[[fallthrough]];
case SID_DRAW_CAPTION:
m_pWin->SetSdrDrawMode(SdrObjKind::Caption);
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index 08f034bda388..50d0b4a2ce67 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -308,8 +308,8 @@ namespace {
class SwZoomBox_Impl final : public InterimItemWindow
{
std::unique_ptr<weld::ComboBox> m_xWidget;
- sal_uInt16 nSlotId;
- bool bRelease;
+ sal_uInt16 m_nSlotId;
+ bool m_bRelease;
DECL_LINK(SelectHdl, weld::ComboBox&, void);
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
@@ -350,8 +350,8 @@ public:
SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot)
: InterimItemWindow(pParent, "modules/swriter/ui/zoombox.ui", "ZoomBox")
, m_xWidget(m_xBuilder->weld_combo_box("zoom"))
- , nSlotId(nSlot)
- , bRelease(true)
+ , m_nSlotId(nSlot)
+ , m_bRelease(true)
{
InitControlBase(m_xWidget.get());
@@ -394,7 +394,7 @@ IMPL_LINK_NOARG(SwZoomBox_Impl, ActivateHdl,
weld::ComboBox&, bool)
void SwZoomBox_Impl::Select()
{
- if( FN_PREVIEW_ZOOM == nSlotId )
+ if( FN_PREVIEW_ZOOM == m_nSlotId )
{
bool bNonNumeric = true;
@@ -443,7 +443,7 @@ IMPL_LINK(SwZoomBox_Impl, KeyInputHdl, const KeyEvent&,
rKEvt, bool)
switch (nCode)
{
case KEY_TAB:
- bRelease = false;
+ m_bRelease = false;
Select();
break;
@@ -465,9 +465,9 @@ IMPL_LINK_NOARG(SwZoomBox_Impl, FocusOutHdl, weld::Widget&,
void)
void SwZoomBox_Impl::ReleaseFocus()
{
- if ( !bRelease )
+ if ( !m_bRelease )
{
- bRelease = true;
+ m_bRelease = true;
return;
}
SfxViewShell* pCurSh = SfxViewShell::Current();
@@ -523,7 +523,7 @@ class SwJumpToSpecificBox_Impl final : public
InterimItemWindow
{
std::unique_ptr<weld::Entry> m_xWidget;
- sal_uInt16 nSlotId;
+ sal_uInt16 m_nSlotId;
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
DECL_LINK(SelectHdl, weld::Entry&, bool);
@@ -550,7 +550,7 @@ IMPL_LINK(SwJumpToSpecificBox_Impl, KeyInputHdl, const
KeyEvent&, rKEvt, bool)
SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent,
sal_uInt16 nSlot)
: InterimItemWindow(pParent, "modules/swriter/ui/jumpposbox.ui",
"JumpPosBox")
, m_xWidget(m_xBuilder->weld_entry("jumppos"))
- , nSlotId(nSlot)
+ , m_nSlotId(nSlot)
{
InitControlBase(m_xWidget.get());
@@ -563,10 +563,10 @@
SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uIn
IMPL_LINK_NOARG(SwJumpToSpecificBox_Impl, SelectHdl, weld::Entry&, bool)
{
OUString sEntry(m_xWidget->get_text());
- SfxUInt16Item aPageNum(nSlotId);
+ SfxUInt16Item aPageNum(m_nSlotId);
aPageNum.SetValue(o3tl::narrowing<sal_uInt16>(sEntry.toInt32()));
SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
- pCurrentShell->GetDispatcher()->ExecuteList(nSlotId,
SfxCallMode::ASYNCHRON,
+ pCurrentShell->GetDispatcher()->ExecuteList(m_nSlotId,
SfxCallMode::ASYNCHRON,
{ &aPageNum });
return true;
}
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 5b4911ff70ad..194af1799ba9 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -104,7 +104,7 @@
#include <ndtxt.hxx>
#include <UndoManager.hxx>
-FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
+FlyMode SwBaseShell::s_eFrameMode = FLY_DRAG_END;
// These variables keep the state of Gallery (slot SID_GALLERY_BG_BRUSH)
// detected by GetGalleryState() for the subsequent ExecuteGallery() call.
@@ -2127,7 +2127,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
void SwBaseShell::SetFrameMode(FlyMode eMode, SwWrtShell *pSh )
{
- eFrameMode = eMode;
+ s_eFrameMode = eMode;
SfxBindings &rBnd = pSh->GetView().GetViewFrame()->GetBindings();
if( eMode == FLY_DRAG || pSh->IsFrameSelected() || pSh->IsObjSelected() )
