cui/source/tabpages/themepage.cxx | 4 -
sw/inc/view.hxx | 4 -
sw/source/uibase/inc/SwXFilterOptions.hxx | 8 +--
sw/source/uibase/inc/condedit.hxx | 10 ++--
sw/source/uibase/inc/unomod.hxx | 12 ++---
sw/source/uibase/uiview/viewmdi.cxx | 38 +++++++--------
sw/source/uibase/uiview/viewstat.cxx | 2
sw/source/uibase/uno/SwXFilterOptions.cxx | 22 ++++-----
sw/source/uibase/uno/unomod.cxx | 72 +++++++++++++++---------------
sw/source/uibase/utlui/condedit.cxx | 4 -
10 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit 2f0c26dc83448a934af5383f9f6b7a607c334744
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Feb 14 08:23:54 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 14 09:48:55 2022 +0100
sw: prefix members of ConditionEdit, SwView, SwXFilterOptions and ...
... SwXViewSettings
See tdf#94879 for motivation.
Change-Id: I68f647d13edf156cfc471a54f247ac686cd6cd06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129893
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/cui/source/tabpages/themepage.cxx
b/cui/source/tabpages/themepage.cxx
index b175ae8754c3..8d92376fc1d3 100644
--- a/cui/source/tabpages/themepage.cxx
+++ b/cui/source/tabpages/themepage.cxx
@@ -9,6 +9,8 @@
#include <sal/config.h>
+#include <themepage.hxx>
+
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/util/Color.hpp>
@@ -19,8 +21,6 @@
#include <svl/grabbagitem.hxx>
#include <svx/colorbox.hxx>
-#include <themepage.hxx>
-
using namespace com::sun::star;
const WhichRangesContainer
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a3070642aa16..422da7fe3ea6 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -163,8 +163,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
// search & replace
static SvxSearchItem *s_pSrchItem;
- static sal_uInt16 m_nMoveType; // for buttons below the scrollbar
(viewmdi)
- static sal_Int32 m_nActMark; // current jump mark for unknown mark
+ static sal_uInt16 s_nMoveType; // for buttons below the scrollbar
(viewmdi)
+ static sal_Int32 s_nActMark; // current jump mark for unknown mark
static bool s_bExtra;
static bool s_bFound;
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx
b/sw/source/uibase/inc/SwXFilterOptions.hxx
index ce1f991465ba..2ca1aabe68ce 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -38,11 +38,11 @@ class SwXFilterOptions final : public
::cppu::WeakImplHelper<
css::lang::XInitialization,
css::lang::XServiceInfo >
{
- OUString sFilterOptions;
+ OUString m_sFilterOptions;
- css::uno::Reference< css::io::XInputStream > xInputStream;
- css::uno::Reference< css::lang::XComponent > xModel;
- css::uno::Reference< css::awt::XWindow > xDialogParent;
+ css::uno::Reference< css::io::XInputStream > m_xInputStream;
+ css::uno::Reference< css::lang::XComponent > m_xModel;
+ css::uno::Reference< css::awt::XWindow > m_xDialogParent;
public:
SwXFilterOptions();
diff --git a/sw/source/uibase/inc/condedit.hxx
b/sw/source/uibase/inc/condedit.hxx
index 0b8e31473a43..ec11b8872939 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC ConditionEdit
{
std::unique_ptr<weld::Entry> m_xControl;
ConditionEditDropTarget m_aDropTargetHelper;
- bool bBrackets, bEnableDrop;
+ bool m_bBrackets, m_bEnableDrop;
public:
ConditionEdit(std::unique_ptr<weld::Entry> xControl);
@@ -64,10 +64,10 @@ public:
OString get_buildable_name() const { return
m_xControl->get_buildable_name(); }
void set_buildable_name(const OString& rId) {
m_xControl->set_buildable_name(rId); }
- void ShowBrackets(bool bShow) { bBrackets = bShow; }
- bool GetBrackets() const { return bBrackets; }
- void SetDropEnable(bool bFlag) { bEnableDrop = bFlag; }
- bool GetDropEnable() const { return bEnableDrop; }
+ void ShowBrackets(bool bShow) { m_bBrackets = bShow; }
+ bool GetBrackets() const { return m_bBrackets; }
+ void SetDropEnable(bool bFlag) { m_bEnableDrop = bFlag; }
+ bool GetDropEnable() const { return m_bEnableDrop; }
};
#endif
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 1a11b5a40762..7b4032947c5c 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -100,14 +100,14 @@ class SwXViewSettings final : public
comphelper::ChainablePropertySet
{
friend class SwXDocumentSettings;
- SwView* pView;
+ SwView* m_pView;
std::unique_ptr<SwViewOption> mpViewOption;
const SwViewOption* mpConstViewOption;
- bool bObjectValid:1, mbApplyZoom;
+ bool m_bObjectValid:1, mbApplyZoom;
- FieldUnit eHRulerUnit;
+ FieldUnit m_eHRulerUnit;
bool mbApplyHRulerMetric;
- FieldUnit eVRulerUnit;
+ FieldUnit m_eVRulerUnit;
bool mbApplyVRulerMetric;
virtual void _preSetValues () override;
@@ -128,8 +128,8 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- bool IsValid() const {return bObjectValid;}
- void Invalidate() {bObjectValid = false;}
+ bool IsValid() const {return m_bObjectValid;}
+ void Invalidate() {m_bObjectValid = false;}
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewmdi.cxx
b/sw/source/uibase/uiview/viewmdi.cxx
index 8d986a6d056d..b85c05eb1af8 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -49,8 +49,8 @@
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
-sal_uInt16 SwView::m_nMoveType = NID_PGE;
-sal_Int32 SwView::m_nActMark = 0;
+sal_uInt16 SwView::s_nMoveType = NID_PGE;
+sal_Int32 SwView::s_nActMark = 0;
using namespace ::com::sun::star::uno;
@@ -327,22 +327,22 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
return;
const bool bNext = *pbNext;
SwWrtShell& rSh = GetWrtShell();
- if ( NID_SRCH_REP != m_nMoveType)
+ if ( NID_SRCH_REP != s_nMoveType)
{
if ( rSh.GetDrawView()->IsTextEdit() )
rSh.EndTextEdit();
if ( IsDrawMode() )
LeaveDrawCreate();
}
- if ( NID_POSTIT != m_nMoveType && m_pPostItMgr )
+ if ( NID_POSTIT != s_nMoveType && m_pPostItMgr )
{
sw::annotation::SwAnnotationWin* pActiveSidebarWin =
m_pPostItMgr->GetActiveSidebarWin();
if (pActiveSidebarWin)
pActiveSidebarWin->SwitchToFieldPos();
}
- if (NID_RECENCY != m_nMoveType && NID_PGE != m_nMoveType && NID_SRCH_REP
!= m_nMoveType)
+ if (NID_RECENCY != s_nMoveType && NID_PGE != s_nMoveType && NID_SRCH_REP
!= s_nMoveType)
rSh.addCurrentPosition();
- switch( m_nMoveType )
+ switch( s_nMoveType )
{
case NID_PGE:
{
@@ -378,9 +378,9 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
case NID_OLE:
{
GotoObjFlags eType = GotoObjFlags::FlyFrame;
- if(m_nMoveType == NID_GRF)
+ if(s_nMoveType == NID_GRF)
eType = GotoObjFlags::FlyGrf;
- else if(m_nMoveType == NID_OLE)
+ else if(s_nMoveType == NID_OLE)
eType = GotoObjFlags::FlyOLE;
bool bSuccess = bNext ?
rSh.GotoNextFly(eType) :
@@ -399,7 +399,7 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
case NID_DRW:
{
bool bSuccess = rSh.GotoObj(bNext,
- m_nMoveType == NID_DRW ?
+ s_nMoveType == NID_DRW ?
GotoObjFlags::DrawSimple :
GotoObjFlags::DrawControl);
if(bSuccess)
@@ -503,23 +503,23 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
if(bNext)
{
- m_nActMark++;
- if (m_nActMark >= MAX_MARKS || m_nActMark >=
static_cast<sal_Int32>(vNavMarkNames.size()))
+ s_nActMark++;
+ if (s_nActMark >= MAX_MARKS || s_nActMark >=
static_cast<sal_Int32>(vNavMarkNames.size()))
{
- m_nActMark = 0;
+ s_nActMark = 0;
SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::ReminderEndWrapped );
}
}
else
{
- m_nActMark--;
- if (m_nActMark < 0 || m_nActMark >=
static_cast<sal_Int32>(vNavMarkNames.size()))
+ s_nActMark--;
+ if (s_nActMark < 0 || s_nActMark >=
static_cast<sal_Int32>(vNavMarkNames.size()))
{
- m_nActMark = vNavMarkNames.size()-1;
+ s_nActMark = vNavMarkNames.size()-1;
SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::ReminderStartWrapped );
}
}
- rSh.GotoMark(vNavMarkNames[m_nActMark]);
+ rSh.GotoMark(vNavMarkNames[s_nActMark]);
}
else
SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::NavElementNotFound );
@@ -690,17 +690,17 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler, void )
sal_uInt16 SwView::GetMoveType()
{
- return m_nMoveType;
+ return s_nMoveType;
}
void SwView::SetMoveType(sal_uInt16 nSet)
{
- m_nMoveType = nSet;
+ s_nMoveType = nSet;
}
void SwView::SetActMark(sal_Int32 nSet)
{
- m_nActMark = nSet;
+ s_nActMark = nSet;
}
void SwView::ShowHScrollbar(bool bShow)
diff --git a/sw/source/uibase/uiview/viewstat.cxx
b/sw/source/uibase/uiview/viewstat.cxx
index e7ab14f6c3f8..f262df107ccb 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -104,7 +104,7 @@ void SwView::GetState(SfxItemSet &rSet)
case FN_SCROLL_PREV:
case FN_SCROLL_NEXT:
{
- if (m_nMoveType == NID_RECENCY)
+ if (s_nMoveType == NID_RECENCY)
{
if (!m_pWrtShell->GetNavigationMgr().forwardEnabled())
rSet.DisableItem(FN_SCROLL_NEXT);
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx
b/sw/source/uibase/uno/SwXFilterOptions.cxx
index a522c9b04b2c..4e3cd86585f4 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -49,7 +49,7 @@ SwXFilterOptions::~SwXFilterOptions()
uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues()
{
return comphelper::InitPropertySequence({
- { FILTER_OPTIONS_NAME, uno::Any(sFilterOptions) }
+ { FILTER_OPTIONS_NAME, uno::Any(m_sFilterOptions) }
});
}
@@ -60,9 +60,9 @@ void SwXFilterOptions::setPropertyValues( const
uno::Sequence<beans::PropertyV
OUString aPropName = rProp.Name;
if ( aPropName == FILTER_OPTIONS_NAME )
- rProp.Value >>= sFilterOptions;
+ rProp.Value >>= m_sFilterOptions;
else if ( aPropName == "InputStream" )
- rProp.Value >>= xInputStream;
+ rProp.Value >>= m_xInputStream;
}
}
@@ -75,23 +75,23 @@ sal_Int16 SwXFilterOptions::execute()
sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
std::unique_ptr<SvStream> pInStream;
- if ( xInputStream.is() )
- pInStream = utl::UcbStreamHelper::CreateStream( xInputStream );
+ if ( m_xInputStream.is() )
+ pInStream = utl::UcbStreamHelper::CreateStream( m_xInputStream );
SwDocShell* pDocShell = nullptr;
- if (auto pXDoc = comphelper::getFromUnoTunnel<SwXTextDocument>(xModel);
pXDoc)
+ if (auto pXDoc = comphelper::getFromUnoTunnel<SwXTextDocument>(m_xModel);
pXDoc)
pDocShell = pXDoc->GetDocShell();
if(pDocShell)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractSwAsciiFilterDlg>
pAsciiDlg(pFact->CreateSwAsciiFilterDlg(Application::GetFrameWeld(xDialogParent),
*pDocShell,
+ ScopedVclPtr<AbstractSwAsciiFilterDlg>
pAsciiDlg(pFact->CreateSwAsciiFilterDlg(Application::GetFrameWeld(m_xDialogParent),
*pDocShell,
pInStream.get()));
if(RET_OK == pAsciiDlg->Execute())
{
SwAsciiOptions aOptions;
pAsciiDlg->FillOptions( aOptions );
- aOptions.WriteUserData(sFilterOptions);
+ aOptions.WriteUserData(m_sFilterOptions);
nRet = ui::dialogs::ExecutableDialogResults::OK;
}
}
@@ -101,19 +101,19 @@ sal_Int16 SwXFilterOptions::execute()
void SwXFilterOptions::setTargetDocument( const uno::Reference< XComponent
>& xDoc )
{
- xModel = xDoc;
+ m_xModel = xDoc;
}
void SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >&
xDoc )
{
- xModel = xDoc;
+ m_xModel = xDoc;
}
void SAL_CALL SwXFilterOptions::initialize(const uno::Sequence<uno::Any>&
rArguments)
{
::comphelper::NamedValueCollection aProperties(rArguments);
if (aProperties.has("ParentWindow"))
- aProperties.get("ParentWindow") >>= xDialogParent;
+ aProperties.get("ParentWindow") >>= m_xDialogParent;
}
OUString SwXFilterOptions::getImplementationName()
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 72916926c2c5..9f5d27972418 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -521,17 +521,17 @@ Sequence< OUString >
SwXPrintSettings::getSupportedServiceNames()
SwXViewSettings::SwXViewSettings(SwView* pVw)
: ChainablePropertySet( lcl_createViewSettingsInfo().get(),
&Application::GetSolarMutex() )
- , pView(pVw)
+ , m_pView(pVw)
, mpConstViewOption(nullptr)
- , bObjectValid(true)
+ , m_bObjectValid(true)
, mbApplyZoom(false)
- , eHRulerUnit(FieldUnit::CM)
+ , m_eHRulerUnit(FieldUnit::CM)
, mbApplyHRulerMetric(false)
- , eVRulerUnit(FieldUnit::CM)
+ , m_eVRulerUnit(FieldUnit::CM)
, mbApplyVRulerMetric(false)
{
// This property only exists if we have a view (ie, not at the module )
- if ( !pView )
+ if ( !m_pView )
mxInfo->remove ( "HelpURL" );
}
@@ -545,18 +545,18 @@ SwXViewSettings::~SwXViewSettings()
void SwXViewSettings::_preSetValues ()
{
const SwViewOption* pVOpt = nullptr;
- if(pView)
+ if(m_pView)
{
if(!IsValid())
return;
- pVOpt = pView->GetWrtShell().GetViewOptions();
+ pVOpt = m_pView->GetWrtShell().GetViewOptions();
}
else
pVOpt = SW_MOD()->GetViewOption(false);
mpViewOption.reset( new SwViewOption (*pVOpt) );
mbApplyZoom = false;
- if(pView)
+ if(m_pView)
mpViewOption->SetStarOneSetting(true);
}
@@ -680,34 +680,34 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
break;
case HANDLE_VIEWSET_ONLINE_LAYOUT :
{
- if ( pView )
+ if ( m_pView )
{
bool bVal = *o3tl::doAccess<bool>(rValue);
- SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions());
+ SwViewOption aOpt(*m_pView->GetWrtShell().GetViewOptions());
if (!bVal != !aOpt.getBrowseMode())
{
aOpt.setBrowseMode( bVal );
- pView->GetWrtShell().ApplyViewOptions( aOpt );
+ m_pView->GetWrtShell().ApplyViewOptions( aOpt );
// must be set in mpViewOption as this will overwrite
settings in _post!
if(mpViewOption)
mpViewOption->setBrowseMode(bVal);
- pView->GetDocShell()->ToggleLayoutMode(pView);
+ m_pView->GetDocShell()->ToggleLayoutMode(m_pView);
}
}
}
break;
case HANDLE_VIEWSET_HIDE_WHITESPACE:
{
- if ( pView )
+ if ( m_pView )
{
bool bVal = *o3tl::doAccess<bool>(rValue);
- SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions());
+ SwViewOption aOpt(*m_pView->GetWrtShell().GetViewOptions());
if (!bVal != !aOpt.IsHideWhitespaceMode())
{
aOpt.SetHideWhitespaceMode( bVal );
- pView->GetWrtShell().ApplyViewOptions( aOpt );
+ m_pView->GetWrtShell().ApplyViewOptions( aOpt );
// must be set in mpViewOption as this will overwrite
settings in _post!
if(mpViewOption)
@@ -718,7 +718,7 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
break;
case HANDLE_VIEWSET_HELP_URL:
{
- if ( !pView )
+ if ( !m_pView )
throw UnknownPropertyException();
OUString sHelpURL;
@@ -729,7 +729,7 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
if ( aHID.GetProtocol() != INetProtocol::Hid )
throw IllegalArgumentException ();
- pView->GetEditWin().SetHelpId( OUStringToOString(
aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
+ m_pView->GetEditWin().SetHelpId( OUStringToOString(
aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
}
break;
case HANDLE_VIEWSET_HORI_RULER_METRIC:
@@ -746,12 +746,12 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
case FieldUnit::INCH:
if( rInfo.mnHandle == HANDLE_VIEWSET_HORI_RULER_METRIC )
{
- eHRulerUnit = static_cast<FieldUnit>(nUnit);
+ m_eHRulerUnit = static_cast<FieldUnit>(nUnit);
mbApplyHRulerMetric = true;
}
else
{
- eVRulerUnit = static_cast<FieldUnit>(nUnit);
+ m_eVRulerUnit = static_cast<FieldUnit>(nUnit);
mbApplyVRulerMetric = true;
}
break;
@@ -767,26 +767,26 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
void SwXViewSettings::_postSetValues()
{
- if( pView )
+ if( m_pView )
{
if(mbApplyZoom )
- pView->SetZoom( mpViewOption->GetZoomType(),
+ m_pView->SetZoom( mpViewOption->GetZoomType(),
mpViewOption->GetZoom(), true );
if(mbApplyHRulerMetric)
- pView->ChangeTabMetric(eHRulerUnit);
+ m_pView->ChangeTabMetric(m_eHRulerUnit);
if(mbApplyVRulerMetric)
- pView->ChangeVRulerMetric(eVRulerUnit);
+ m_pView->ChangeVRulerMetric(m_eVRulerUnit);
}
else
{
if(mbApplyHRulerMetric)
- SW_MOD()->ApplyRulerMetric( eHRulerUnit, true, false );
+ SW_MOD()->ApplyRulerMetric( m_eHRulerUnit, true, false );
if(mbApplyVRulerMetric)
- SW_MOD()->ApplyRulerMetric( eVRulerUnit, false, false );
+ SW_MOD()->ApplyRulerMetric( m_eVRulerUnit, false, false );
}
- SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ?
SvViewOpt::DestViewOnly
+ SW_MOD()->ApplyUsrPref( *mpViewOption, m_pView, m_pView ?
SvViewOpt::DestViewOnly
: SvViewOpt::DestText );
mpViewOption.reset();
@@ -794,11 +794,11 @@ void SwXViewSettings::_postSetValues()
void SwXViewSettings::_preGetValues ()
{
- if(pView)
+ if(m_pView)
{
if(!IsValid())
return;
- mpConstViewOption = pView->GetWrtShell().GetViewOptions();
+ mpConstViewOption = m_pView->GetWrtShell().GetViewOptions();
}
else
mpConstViewOption = SW_MOD()->GetViewOption(false);
@@ -894,26 +894,26 @@ void SwXViewSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo, u
}
break;
case HANDLE_VIEWSET_ONLINE_LAYOUT:
- if(pView)
- bBoolVal =
pView->GetWrtShell().GetViewOptions()->getBrowseMode();
+ if(m_pView)
+ bBoolVal =
m_pView->GetWrtShell().GetViewOptions()->getBrowseMode();
break;
case HANDLE_VIEWSET_HELP_URL :
{
- if ( !pView )
+ if ( !m_pView )
throw UnknownPropertyException();
bBool = false;
- SwEditWin &rEditWin = pView->GetEditWin();
+ SwEditWin &rEditWin = m_pView->GetEditWin();
OUString sHelpURL = INET_HID_SCHEME + OUString::fromUtf8(
rEditWin.GetHelpId() );
rValue <<= sHelpURL;
}
break;
case HANDLE_VIEWSET_HORI_RULER_METRIC:
{
- if ( pView )
+ if ( m_pView )
{
FieldUnit eUnit;
- pView->GetHRulerMetric( eUnit );
+ m_pView->GetHRulerMetric( eUnit );
rValue <<= static_cast<sal_Int32>(eUnit);
}
else
@@ -926,10 +926,10 @@ void SwXViewSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo, u
break;
case HANDLE_VIEWSET_VERT_RULER_METRIC:
{
- if ( pView )
+ if ( m_pView )
{
FieldUnit eUnit;
- pView->GetVRulerMetric( eUnit );
+ m_pView->GetVRulerMetric( eUnit );
rValue <<= static_cast<sal_Int32>(eUnit);
}
else
diff --git a/sw/source/uibase/utlui/condedit.cxx
b/sw/source/uibase/utlui/condedit.cxx
index df50c63ace7d..1303ddfc752b 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -26,8 +26,8 @@ using namespace ::com::sun::star::uno;
ConditionEdit::ConditionEdit(std::unique_ptr<weld::Entry> xControl)
: m_xControl(std::move(xControl))
, m_aDropTargetHelper(*this)
- , bBrackets(true)
- , bEnableDrop(true)
+ , m_bBrackets(true)
+ , m_bEnableDrop(true)
{
}
