summaryrefslogtreecommitdiff
path: root/sw/source/ui/wrtsh
diff options
context:
space:
mode:
authorDaisuke Nishino <niboshi000@gmail.com>2011-11-27 15:55:22 +0900
committerStephan Bergmann <sbergman@redhat.com>2011-11-28 10:37:03 +0100
commitafb548ba6962c74ae99350bad0bd2c72c9ddd998 (patch)
tree744fc547ba617029deb91b6b8f793a2fadb19eeb /sw/source/ui/wrtsh
parent66b9a19d23fdad25db16d376ff74afc9e6f1a84e (diff)
Hide function pointers
Removed some redundant "this->", sbergman@redhat.com.
Diffstat (limited to 'sw/source/ui/wrtsh')
-rw-r--r--sw/source/ui/wrtsh/select.cxx10
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx3
2 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index bbc45711dbf1..6884e7de4431 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -421,9 +421,13 @@ void SwWrtShell::EndSelect()
if(bInSelect && !bExtMode)
{
bInSelect = sal_False;
- (this->*fnLeaveSelect)(0,sal_False);
- if(!bAddMode)
+ if (bAddMode)
{
+ AddLeaveSelect(0, sal_False);
+ }
+ else
+ {
+ SttLeaveSelect(0, sal_False);
fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
fnKillSel = &SwWrtShell::ResetSelect;
}
@@ -651,7 +655,6 @@ void SwWrtShell::EnterAddMode()
if(IsTableMode()) return;
if(bBlockMode)
LeaveBlockMode();
- fnLeaveSelect = &SwWrtShell::AddLeaveSelect;
fnKillSel = &SwWrtShell::Ignore;
fnSetCrsr = &SwWrtShell::SetCrsr;
bAddMode = sal_True;
@@ -666,7 +669,6 @@ void SwWrtShell::EnterAddMode()
void SwWrtShell::LeaveAddMode()
{
- fnLeaveSelect = &SwWrtShell::SttLeaveSelect;
fnKillSel = &SwWrtShell::ResetSelect;
fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
bAddMode = sal_False;
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 778d6228691c..9dcda67fd704 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -127,8 +127,7 @@ using namespace com::sun::star;
pCrsrStack(0), \
rView(rShell),\
aNavigationMgr(this), \
- bDestOnStack(sal_False), \
- fnLeaveSelect(&SwWrtShell::SttLeaveSelect)
+ bDestOnStack(sal_False)
#define BITFLD_INI_LIST \
bClearMark = \