diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2021-12-06 08:14:53 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2021-12-06 09:29:53 +0100 |
commit | f72bb33e78ac9eb7d9f21b61bd89b186547993dd (patch) | |
tree | 0077bbf6501bef254e075a670da268f05841dd30 | |
parent | f989406acd1726606def5ea0e19bd2399116ae83 (diff) |
sw: prefix members of SwAnchorMarker, SwEditWin, SwShadowCursor and ...
... SwSrcEditWindow::ChangesListener
See tdf#94879 for motivation.
Change-Id: Idd3aba48ca7329b6df2e52fff73eca360aa76be5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126399
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
-rw-r--r-- | sw/source/uibase/docvw/edtdd.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 142 | ||||
-rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/inc/edtwin.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/inc/shdwcrsr.hxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/utlui/shdwcrsr.cxx | 48 |
6 files changed, 113 insertions, 113 deletions
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index c1641717ca40..0f67dcf70dc9 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -125,8 +125,8 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) ReleaseMouse(); g_bFrameDrag = false; g_bExecuteDrag = true; - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); m_aMovePos = aDocPos; StartExecuteDrag(); if( bDelSelect ) diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index f6acd7d6360c..b82614551640 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -168,10 +168,10 @@ bool g_bFlushCharBuffer = false; bool g_bDDINetAttr = false; static SdrHdlKind g_eSdrMoveHdl = SdrHdlKind::User; -QuickHelpData* SwEditWin::m_pQuickHlpData = nullptr; +QuickHelpData* SwEditWin::s_pQuickHlpData = nullptr; -tools::Long SwEditWin::m_nDDStartPosY = 0; -tools::Long SwEditWin::m_nDDStartPosX = 0; +tools::Long SwEditWin::s_nDDStartPosY = 0; +tools::Long SwEditWin::s_nDDStartPosX = 0; static SfxShell* lcl_GetTextShellFromDispatcher( SwView const & rView ); @@ -201,35 +201,35 @@ static bool lcl_goIntoTextBox(SwEditWin& rEditWin, SwWrtShell& rSh) class SwAnchorMarker { - SdrHdl* pHdl; - Point aHdlPos; - Point aLastPos; - bool bTopRightHandle; + SdrHdl* m_pHdl; + Point m_aHdlPos; + Point m_aLastPos; + bool m_bTopRightHandle; public: explicit SwAnchorMarker( SdrHdl* pH ) - : pHdl( pH ) - , aHdlPos( pH->GetPos() ) - , aLastPos( pH->GetPos() ) - , bTopRightHandle( pH->GetKind() == SdrHdlKind::Anchor_TR ) + : m_pHdl( pH ) + , m_aHdlPos( pH->GetPos() ) + , m_aLastPos( pH->GetPos() ) + , m_bTopRightHandle( pH->GetKind() == SdrHdlKind::Anchor_TR ) {} - const Point& GetLastPos() const { return aLastPos; } - void SetLastPos( const Point& rNew ) { aLastPos = rNew; } - void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); } - const Point& GetHdlPos() const { return aHdlPos; } - SdrHdl* GetHdl() const { return pHdl; } + const Point& GetLastPos() const { return m_aLastPos; } + void SetLastPos( const Point& rNew ) { m_aLastPos = rNew; } + void SetPos( const Point& rNew ) { m_pHdl->SetPos( rNew ); } + const Point& GetHdlPos() const { return m_aHdlPos; } + SdrHdl* GetHdl() const { return m_pHdl; } void ChgHdl( SdrHdl* pNew ) { - pHdl = pNew; - if ( pHdl ) + m_pHdl = pNew; + if ( m_pHdl ) { - bTopRightHandle = (pHdl->GetKind() == SdrHdlKind::Anchor_TR); + m_bTopRightHandle = (m_pHdl->GetKind() == SdrHdlKind::Anchor_TR); } } Point GetPosForHitTest( const OutputDevice& rOut ) { - Point aHitTestPos( pHdl->GetPos() ); + Point aHitTestPos( m_pHdl->GetPos() ); aHitTestPos = rOut.LogicToPixel( aHitTestPos ); - if ( bTopRightHandle ) + if ( m_bTopRightHandle ) { aHitTestPos += Point( -1, 1 ); } @@ -1404,10 +1404,10 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) m_eBufferLanguage = eNewLanguage; QuickHelpData aTmpQHD; - if( m_pQuickHlpData->m_bIsDisplayed ) + if( s_pQuickHlpData->m_bIsDisplayed ) { - aTmpQHD.Move( *m_pQuickHlpData ); - m_pQuickHlpData->Stop( rSh ); + aTmpQHD.Move( *s_pQuickHlpData ); + s_pQuickHlpData->Stop( rSh ); } // OS:the DrawView also needs a readonly-Flag as well @@ -1426,8 +1426,8 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) bool bFlushBuffer = false; bool bNormalChar = false; - bool bAppendSpace = m_pQuickHlpData->m_bAppendSpace; - m_pQuickHlpData->m_bAppendSpace = false; + bool bAppendSpace = s_pQuickHlpData->m_bAppendSpace; + s_pQuickHlpData->m_bAppendSpace = false; if ( getenv("SW_DEBUG") && rKEvt.GetKeyCode().GetCode() == KEY_F12 ) { @@ -2594,14 +2594,14 @@ KEYINPUT_CHECKTABLE_INSDEL: SwGlossaryHdl* pGlosHdl = GetView().GetGlosHdl(); pGlosHdl->SetCurGroup(sGroup, true); pGlosHdl->InsertGlossary( sShrtNm); - m_pQuickHlpData->m_bAppendSpace = true; + s_pQuickHlpData->m_bAppendSpace = true; } } else { sFnd = sFnd.copy(aTmpQHD.CurLen()); rSh.Insert( sFnd ); - m_pQuickHlpData->m_bAppendSpace = !pACorr || + s_pQuickHlpData->m_bAppendSpace = !pACorr || pACorr->GetSwFlags().bAutoCmpltAppendBlank; } rSh.EndUndo( SwUndoId::END ); @@ -2609,8 +2609,8 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case SwKeyState::NextPrevGlossary: - m_pQuickHlpData->Move( aTmpQHD ); - m_pQuickHlpData->Start(rSh, false); + s_pQuickHlpData->Move( aTmpQHD ); + s_pQuickHlpData->Start(rSh, false); break; case SwKeyState::EditFormula: @@ -2935,9 +2935,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) bool bCallBase = true; - if( m_pQuickHlpData->m_bIsDisplayed ) - m_pQuickHlpData->Stop( rSh ); - m_pQuickHlpData->m_bAppendSpace = false; + if( s_pQuickHlpData->m_bIsDisplayed ) + s_pQuickHlpData->Stop( rSh ); + s_pQuickHlpData->m_bAppendSpace = false; if( rSh.FinishOLEObj() ) return; // end InPlace and the click doesn't count anymore @@ -3104,8 +3104,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) if (!bHitHandle) { StartDDTimer(); - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); } g_bFrameDrag = true; } @@ -3144,8 +3144,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) if (1 == nNumberOfClicks) { UpdatePointer(aDocPos, aMEvt.GetModifier()); - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); // hit a URL in DrawText object? if (bExecHyperlinks && pSdrView) @@ -3473,8 +3473,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { if ( rSh.SelectObj( aDocPos, SW_ADD_SELECT | SW_ENTER_GROUP ) ) { rSh.EnterSelFrameMode( &aDocPos ); - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); g_bFrameDrag = true; return; } @@ -3516,8 +3516,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { if ( rSh.SelectObj( aDocPos, SW_ENTER_GROUP ) ) { rSh.EnterSelFrameMode( &aDocPos ); - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); g_bFrameDrag = true; return; } @@ -3584,8 +3584,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { if ( rSh.SelectObj( aDocPos ) ) { rSh.EnterSelFrameMode( &aDocPos ); - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); g_bFrameDrag = true; return; } @@ -3597,8 +3597,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) rSh.IsInsideSelectedObj( aDocPos ) ) { rSh.EnterSelFrameMode( &aDocPos ); - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); g_bFrameDrag = true; return; } @@ -3988,7 +3988,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) // a MB-Move is called immediately. if( g_bDDTimerStarted ) { - Point aDD( SwEditWin::m_nDDStartPosX, SwEditWin::m_nDDStartPosY ); + Point aDD( SwEditWin::s_nDDStartPosX, SwEditWin::s_nDDStartPosY ); aDD = LogicToPixel( aDD ); tools::Rectangle aRect( aDD.X()-3, aDD.Y()-3, aDD.X()+3, aDD.Y()+3 ); if ( !aRect.Contains( aPixPt ) ) @@ -5187,8 +5187,8 @@ void SwEditWin::dispose() { m_pShadCursor.reset(); - if( m_pQuickHlpData->m_bIsDisplayed && m_rView.GetWrtShellPtr() ) - m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); + if( s_pQuickHlpData->m_bIsDisplayed && m_rView.GetWrtShellPtr() ) + s_pQuickHlpData->Stop( m_rView.GetWrtShell() ); g_bExecuteDrag = false; m_pApplyTempl.reset(); @@ -5253,8 +5253,8 @@ bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos) rSh.LeaveSelFrameMode(); else { - SwEditWin::m_nDDStartPosY = aDocPos.Y(); - SwEditWin::m_nDDStartPosX = aDocPos.X(); + SwEditWin::s_nDDStartPosY = aDocPos.Y(); + SwEditWin::s_nDDStartPosX = aDocPos.X(); g_bFrameDrag = true; } if( bUnLockView ) @@ -5289,8 +5289,8 @@ void SwEditWin::LoseFocus() if (m_rView.GetWrtShellPtr()) m_rView.GetWrtShell().InvalidateAccessibleFocus(); Window::LoseFocus(); - if( m_pQuickHlpData && m_pQuickHlpData->m_bIsDisplayed ) - m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); + if( s_pQuickHlpData && s_pQuickHlpData->m_bIsDisplayed ) + s_pQuickHlpData->Stop( m_rView.GetWrtShell() ); } void SwEditWin::Command( const CommandEvent& rCEvt ) @@ -5495,8 +5495,8 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.IsCursorReadonly(); if (!bIsDocReadOnly && !rSh.HasReadonlySel()) { - if( m_pQuickHlpData->m_bIsDisplayed ) - m_pQuickHlpData->Stop( rSh ); + if( s_pQuickHlpData->m_bIsDisplayed ) + s_pQuickHlpData->Stop( rSh ); if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() ) { @@ -5941,19 +5941,19 @@ IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler, Timer *, void) void SwEditWin::InitStaticData() { - m_pQuickHlpData = new QuickHelpData(); + s_pQuickHlpData = new QuickHelpData(); } void SwEditWin::FinitStaticData() { - delete m_pQuickHlpData; + delete s_pQuickHlpData; } /* i#3370 - remove quick help to prevent saving * of autocorrection suggestions */ void SwEditWin::StopQuickHelp() { - if( HasFocus() && m_pQuickHlpData && m_pQuickHlpData->m_bIsDisplayed ) - m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); + if( HasFocus() && s_pQuickHlpData && s_pQuickHlpData->m_bIsDisplayed ) + s_pQuickHlpData->Stop( m_rView.GetWrtShell() ); } IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl, Timer *, void) @@ -6266,18 +6266,18 @@ void QuickHelpData::SortAndFilter(const OUString &rOrigWord) // last suggestion would replace only 4 characters to the left of cursor. bool SwEditWin::ShowAutoText(const std::vector<OUString>& rChunkCandidates) { - m_pQuickHlpData->ClearContent(); + s_pQuickHlpData->ClearContent(); if (!rChunkCandidates.empty()) { SwGlossaryList* pList = ::GetGlossaryList(); - pList->HasLongName(rChunkCandidates, m_pQuickHlpData->m_aHelpStrings); + pList->HasLongName(rChunkCandidates, s_pQuickHlpData->m_aHelpStrings); } - if (!m_pQuickHlpData->m_aHelpStrings.empty()) + if (!s_pQuickHlpData->m_aHelpStrings.empty()) { - m_pQuickHlpData->Start(m_rView.GetWrtShell(), true); + s_pQuickHlpData->Start(m_rView.GetWrtShell(), true); } - return !m_pQuickHlpData->m_aHelpStrings.empty(); + return !s_pQuickHlpData->m_aHelpStrings.empty(); } void SwEditWin::ShowAutoCorrectQuickHelp( @@ -6286,22 +6286,22 @@ void SwEditWin::ShowAutoCorrectQuickHelp( if (rWord.isEmpty()) return; SwWrtShell& rSh = m_rView.GetWrtShell(); - m_pQuickHlpData->ClearContent(); + s_pQuickHlpData->ClearContent(); - if( m_pQuickHlpData->m_aHelpStrings.empty() && + if( s_pQuickHlpData->m_aHelpStrings.empty() && rACorr.GetSwFlags().bAutoCompleteWords ) { - m_pQuickHlpData->m_bIsAutoText = false; - m_pQuickHlpData->m_bIsTip = rACorr.GetSwFlags().bAutoCmpltShowAsTip; + s_pQuickHlpData->m_bIsAutoText = false; + s_pQuickHlpData->m_bIsTip = rACorr.GetSwFlags().bAutoCmpltShowAsTip; // Get the necessary data to show help text. - m_pQuickHlpData->FillStrArr( rSh, rWord ); + s_pQuickHlpData->FillStrArr( rSh, rWord ); } - if( !m_pQuickHlpData->m_aHelpStrings.empty() ) + if( !s_pQuickHlpData->m_aHelpStrings.empty() ) { - m_pQuickHlpData->SortAndFilter(rWord); - m_pQuickHlpData->Start(rSh, true); + s_pQuickHlpData->SortAndFilter(rWord); + s_pQuickHlpData->Start(rSh, true); } } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index a7ce5f7916a3..116879f91e46 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -210,25 +210,25 @@ class SwSrcEditWindow::ChangesListener: public cppu::WeakImplHelper< css::beans::XPropertiesChangeListener > { public: - explicit ChangesListener(SwSrcEditWindow & editor): editor_(editor) {} + explicit ChangesListener(SwSrcEditWindow & editor): m_Editor(editor) {} private: virtual ~ChangesListener() override {} virtual void SAL_CALL disposing(css::lang::EventObject const &) override { - osl::MutexGuard g(editor_.mutex_); - editor_.m_xNotifier.clear(); + osl::MutexGuard g(m_Editor.mutex_); + m_Editor.m_xNotifier.clear(); } virtual void SAL_CALL propertiesChange( css::uno::Sequence< css::beans::PropertyChangeEvent > const &) override { SolarMutexGuard g; - editor_.SetFont(); + m_Editor.SetFont(); } - SwSrcEditWindow & editor_; + SwSrcEditWindow & m_Editor; }; SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ) : diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 06fbee57f0e3..0db0e6d2b35a 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -58,10 +58,10 @@ enum class SdrHitKind; class SW_DLLPUBLIC SwEditWin final : public vcl::Window, public DropTargetHelper, public DragSourceHelper { - static QuickHelpData* m_pQuickHlpData; + static QuickHelpData* s_pQuickHlpData; - static tools::Long m_nDDStartPosX; - static tools::Long m_nDDStartPosY; + static tools::Long s_nDDStartPosX; + static tools::Long s_nDDStartPosY; Color m_aWaterCanTextColor; // text color; for the watering can Color m_aWaterCanTextBackColor; // text background; for the watering can @@ -246,8 +246,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - static tools::Long GetDDStartPosX() { return m_nDDStartPosX; } - static tools::Long GetDDStartPosY() { return m_nDDStartPosY; } + static tools::Long GetDDStartPosX() { return s_nDDStartPosX; } + static tools::Long GetDDStartPosY() { return s_nDDStartPosY; } static void InitStaticData(); static void FinitStaticData(); diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 9c516f47405e..bf7fec99ae30 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -27,18 +27,18 @@ class SwShadowCursor { - VclPtr<vcl::Window> pWin; - Color aCol; - Point aOldPt; - tools::Long nOldHeight; - sal_uInt16 nOldMode; + VclPtr<vcl::Window> m_pWin; + Color m_aCol; + Point m_aOldPt; + tools::Long m_nOldHeight; + sal_uInt16 m_nOldMode; void DrawTri( const Point& rPt, tools::Long nHeight, bool bLeft ); void DrawCursor( const Point& rPt, tools::Long nHeight, sal_uInt16 nMode ); public: SwShadowCursor( vcl::Window& rWin, const Color& rCol ) - : pWin( &rWin ), aCol( rCol ), nOldHeight(0), nOldMode( USHRT_MAX ) {} + : m_pWin( &rWin ), m_aCol( rCol ), m_nOldHeight(0), m_nOldMode( USHRT_MAX ) {} ~SwShadowCursor(); void SetPos( const Point& rPt, tools::Long nHeight, sal_uInt16 nMode ); diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx index cd208e5b3a08..4fea57d090d4 100644 --- a/sw/source/uibase/utlui/shdwcrsr.cxx +++ b/sw/source/uibase/utlui/shdwcrsr.cxx @@ -24,23 +24,23 @@ using namespace ::com::sun::star; SwShadowCursor::~SwShadowCursor() { - if( USHRT_MAX != nOldMode ) - DrawCursor( aOldPt, nOldHeight, nOldMode ); + if( USHRT_MAX != m_nOldMode ) + DrawCursor( m_aOldPt, m_nOldHeight, m_nOldMode ); } void SwShadowCursor::SetPos( const Point& rPt, tools::Long nHeight, sal_uInt16 nMode ) { - Point aPt( pWin->LogicToPixel( rPt )); - nHeight = pWin->LogicToPixel( Size( 0, nHeight )).Height(); - if( aOldPt != aPt || nOldHeight != nHeight || nOldMode != nMode ) + Point aPt( m_pWin->LogicToPixel( rPt )); + nHeight = m_pWin->LogicToPixel( Size( 0, nHeight )).Height(); + if( m_aOldPt != aPt || m_nOldHeight != nHeight || m_nOldMode != nMode ) { - if( USHRT_MAX != nOldMode ) - DrawCursor( aOldPt, nOldHeight, nOldMode ); + if( USHRT_MAX != m_nOldMode ) + DrawCursor( m_aOldPt, m_nOldHeight, m_nOldMode ); DrawCursor( aPt, nHeight, nMode ); - nOldMode = nMode; - nOldHeight = nHeight; - aOldPt = aPt; + m_nOldMode = nMode; + m_nOldHeight = nHeight; + m_aOldPt = aPt; } } @@ -57,7 +57,7 @@ void SwShadowCursor::DrawTri( const Point& rPt, tools::Long nHeight, bool bLeft tools::Long nDiff = bLeft ? -1 : 1; while( aPt1.Y() <= aPt2.Y() ) { - pWin->GetOutDev()->DrawLine( aPt1, aPt2 ); + m_pWin->GetOutDev()->DrawLine( aPt1, aPt2 ); aPt1.AdjustY( 1 ); aPt2.AdjustY( -1 ); aPt2.setX( aPt1.AdjustX(nDiff ) ); @@ -68,15 +68,15 @@ void SwShadowCursor::DrawCursor( const Point& rPt, tools::Long nHeight, sal_uInt { nHeight = (((nHeight / 4)+1) * 4) + 1; - pWin->GetOutDev()->Push(); + m_pWin->GetOutDev()->Push(); - pWin->SetMapMode(MapMode(MapUnit::MapPixel)); - pWin->GetOutDev()->SetRasterOp( RasterOp::Xor ); + m_pWin->SetMapMode(MapMode(MapUnit::MapPixel)); + m_pWin->GetOutDev()->SetRasterOp( RasterOp::Xor ); - pWin->GetOutDev()->SetLineColor( Color( ColorTransparency, sal_uInt32(aCol) ^ sal_uInt32(COL_WHITE) ) ); + m_pWin->GetOutDev()->SetLineColor( Color( ColorTransparency, sal_uInt32(m_aCol) ^ sal_uInt32(COL_WHITE) ) ); // 1. The Line: - pWin->GetOutDev()->DrawLine( Point( rPt.X(), rPt.Y() + 1), + m_pWin->GetOutDev()->DrawLine( Point( rPt.X(), rPt.Y() + 1), Point( rPt.X(), rPt.Y() - 2 + nHeight )); // 2. The Triangle @@ -85,34 +85,34 @@ void SwShadowCursor::DrawCursor( const Point& rPt, tools::Long nHeight, sal_uInt if( text::HoriOrientation::RIGHT == nMode || text::HoriOrientation::CENTER == nMode ) // Arrow to the left DrawTri( rPt, nHeight, true ); - pWin->GetOutDev()->Pop(); + m_pWin->GetOutDev()->Pop(); } void SwShadowCursor::Paint() { - if( USHRT_MAX != nOldMode ) - DrawCursor( aOldPt, nOldHeight, nOldMode ); + if( USHRT_MAX != m_nOldMode ) + DrawCursor( m_aOldPt, m_nOldHeight, m_nOldMode ); } tools::Rectangle SwShadowCursor::GetRect() const { - tools::Long nH = nOldHeight; - Point aPt( aOldPt ); + tools::Long nH = m_nOldHeight; + Point aPt( m_aOldPt ); nH = (((nH / 4)+1) * 4) + 1; tools::Long nWidth = nH / 4 + 3 + 1; Size aSz( nWidth, nH ); - if( text::HoriOrientation::RIGHT == nOldMode ) + if( text::HoriOrientation::RIGHT == m_nOldMode ) aPt.AdjustX( -(aSz.Width()) ); - else if( text::HoriOrientation::CENTER == nOldMode ) + else if( text::HoriOrientation::CENTER == m_nOldMode ) { aPt.AdjustX( -(aSz.Width()) ); aSz.setWidth( aSz.Width() * 2 ); } - return pWin->PixelToLogic( tools::Rectangle( aPt, aSz ) ); + return m_pWin->PixelToLogic( tools::Rectangle( aPt, aSz ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |