[Libreoffice-commits] core.git: 2 commits - sfx2/inc sw/source
Jan Holesovsky
kendy at collabora.com
Mon Nov 16 00:07:11 PST 2015
sfx2/inc/pch/precompiled_sfx.hxx | 2 +-
sw/source/core/crsr/findtxt.cxx | 2 +-
sw/source/uibase/docvw/edtdd.cxx | 2 +-
sw/source/uibase/docvw/edtwin.cxx | 22 +++++++++++-----------
sw/source/uibase/inc/wrtsh.hxx | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit c74d1812363ecf2105595bd8ef22ec49c9ac6e98
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Nov 16 09:06:23 2015 +0100
pch: CommandInfoProvider.hxx was renamed.
Change-Id: I871ef2c50d393183dbca891efc1394455bf3acc6
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 5c34a1f..6c8c658 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -503,7 +503,7 @@
#include <sfx2/sfxresid.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/sidebar/Accessible.hxx>
-#include <sfx2/sidebar/CommandInfoProvider.hxx>
+#include <svtools/commandinfoprovider.hxx>
#include <sfx2/sidebar/Context.hxx>
#include <sfx2/sidebar/ControllerFactory.hxx>
#include <sfx2/sidebar/Deck.hxx>
commit c81106f5cef9792174960d2e4366937acf6a40d8
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Nov 13 10:46:32 2015 +0100
Rename SetCursor -> CallSetCursor to avoid future name clash.
Change-Id: I0e0e2351f1bcccee8157c00ab22c35dcf2007ec5
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 7981954..9bd8ca1 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -331,7 +331,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
pSdrView->SdrEndTextEdit();
const Point aPoint(pSdrView->GetAllMarkedRect().TopLeft());
pSdrView->UnmarkAll();
- pWrtShell->SetCursor(&aPoint, true);
+ pWrtShell->CallSetCursor(&aPoint, true);
pWrtShell->Edit();
bEndedTextEdit = true;
}
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 0ab6174..1a44f86 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -62,7 +62,7 @@ void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt)
m_aTimer.Stop();
g_bDDTimerStarted = false;
if(!pSh->IsSelFrmMode())
- pSh->SetCursor(&rPt, false);
+ pSh->CallSetCursor(&rPt, false);
m_aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
}
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 59c11be..f3b0fe3 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -635,7 +635,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void)
rSh.SelectTableRowCol( *m_pRowColumnSelectionStart, &aPos, m_bIsRowDrag );
}
else
- rSh.SetCursor( &aModPt, false );
+ rSh.CallSetCursor( &aModPt, false );
// It can be that a "jump" over a table cannot be accomplished like
// that. So we jump over the table by Up/Down here.
@@ -2738,7 +2738,7 @@ void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
// only temporary generate move context because otherwise
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
- nTmpSetCrsr = rSh.SetCursor(&rDocPos, bOnlyText);
+ nTmpSetCrsr = rSh.CallSetCursor(&rDocPos, bOnlyText);
g_bValidCrsrPos = !(CRSR_POSCHG & nTmpSetCrsr);
}
@@ -3248,7 +3248,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
// move cursor here so that it is not drawn in the
// frame first; ShowCrsr() happens in LeaveSelFrmMode()
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPos, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
rSh.LeaveSelFrmMode();
m_rView.AttrChangedNotify( &rSh );
bCallBase = false;
@@ -3638,7 +3638,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if (!bEditableField)
{
- rSh.SetCursor(&aDocPos, bOnlyText);
+ rSh.CallSetCursor(&aDocPos, bOnlyText);
// Unfortunately the cursor may be on field
// position or on position after field depending on which
// half of the field was clicked on.
@@ -4119,7 +4119,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
{
rSh.Drag( &aDocPt, false );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPt, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPt, false));
EnterArea();
}
}
@@ -4230,7 +4230,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( rSh.IsBlockMode() && !rMEvt.IsSynthetic() )
{
rSh.Drag( &aDocPt, false );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPt, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPt, false));
EnterArea();
}
break;
@@ -4381,7 +4381,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
else
{
const Point aDocPos( PixelToLogic( m_aStartPos ) );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPos, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
rSh.Edit();
}
@@ -4529,7 +4529,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
const Point aDocPos( PixelToLogic( m_aStartPos ) );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPos, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
}
g_bNoInterrupt = bTmpNoInterrupt;
@@ -4598,7 +4598,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
const Point aDocPos( PixelToLogic( m_aStartPos ) );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPos, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
}
else
{
@@ -5739,7 +5739,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
{
// move cursor here so that it is not drawn in the
// frame at first; ShowCrsr() happens in LeaveSelFrmMode()
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPos, false));
+ g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
rSh.LeaveSelFrmMode();
m_rView.LeaveDrawCreate();
m_rView.AttrChangedNotify( &rSh );
@@ -5785,7 +5785,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
{ // create only temporary move context because otherwise
// the query against the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
- rSh.SetCursor(&aDocPos, false);
+ rSh.CallSetCursor(&aDocPos, false);
bRet = true;
}
}
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 4fef61f..8ab49ef 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -103,7 +103,7 @@ public:
using SwEditShell::Insert;
- long SetCursor (const Point* pPt, bool bProp) { return (this->*m_fnSetCrsr)(pPt, bProp); }
+ long CallSetCursor(const Point* pPt, bool bProp) { return (this->*m_fnSetCrsr)(pPt, bProp); }
long Drag (const Point* pPt, bool bProp) { return (this->*m_fnDrag)(pPt, bProp); }
long EndDrag (const Point* pPt, bool bProp) { return (this->*m_fnEndDrag)(pPt, bProp); }
long KillSelection(const Point* pPt, bool bProp) { return (this->*m_fnKillSel)(pPt, bProp); }
More information about the Libreoffice-commits
mailing list