sc/source/ui/inc/notemark.hxx | 2 +-
sc/source/ui/view/notemark.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2f7c589e6f26b8af8872c594249cb83bc1a98bba
Author: Eike Rathke <er...@redhat.com>
Date: Thu Dec 7 12:54:31 2017 +0100
aDrawView -> pDrawView
Change-Id: I2e0a3157ae00a248c3a92d6bb8ab1ed61b72b1a9
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index 967b8d4962e4..e42233e7558d 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -46,7 +46,7 @@ private:
bool bByKeyboard;
tools::Rectangle aRect;
- ScDrawView* aDrawView;
+ ScDrawView* pDrawView;
SdrModel* pModel;
ScCaptionPtr mxObject;
bool bVisible;
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index e76941626af3..5189426378e1 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -37,7 +37,7 @@
ScNoteMarker::ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight,
vcl::Window* pBottom, vcl::Window* pDiagonal,
ScDocument* pD, const ScAddress& aPos, const
OUString& rUser,
- const MapMode& rMap, bool bLeftEdge, bool bForce,
bool bKeyboard, ScDrawView *pDrawView) :
+ const MapMode& rMap, bool bLeftEdge, bool bForce,
bool bKeyboard, ScDrawView *pDrawViewP) :
pWindow( pWin ),
pRightWin( pRight ),
pBottomWin( pBottom ),
@@ -48,7 +48,7 @@ ScNoteMarker::ScNoteMarker( vcl::Window* pWin, vcl::Window*
pRight, vcl::Window*
aMapMode( rMap ),
bLeft( bLeftEdge ),
bByKeyboard( bKeyboard ),
- aDrawView ( pDrawView ),
+ pDrawView ( pDrawViewP ),
pModel( nullptr ),
bVisible( false )
{
@@ -101,7 +101,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl, Timer *, void)
mxObject = ScNoteUtil::CreateTempCaption( *pDoc, aDocPos, *pPage,
aUserText, aVisRect, bLeft );
if( mxObject )
{
- aDrawView->SyncForGrid(mxObject.get());
+ pDrawView->SyncForGrid(mxObject.get());
aRect = mxObject->GetCurrentBoundRect();
// Need to include grid offset: GetCurrentBoundRect is
removing it
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
