summaryrefslogtreecommitdiff
path: root/sc/source/ui/Accessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /sc/source/ui/Accessibility
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff)
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and return types, but provide default template arguments that keep the generic, unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the Link class can be updated over time. All the related macros are duplicated with ..._TYPED counterparts, that additionally take the RetType (except for LINK_TYPED, which manages to infer the relevant types from the supplied Member). (It would have been attractive to change the "untyped" LinkStubs from taking a void* to a properly typed ArgType parameter, too, but that would cause -fsanitize=function to flag uses of "untyped" Link::Call.) Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'sc/source/ui/Accessibility')
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index c6ca6ad40564..a9add1cb7618 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -713,7 +713,7 @@ ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell,
ScAccessibleCellTextData::~ScAccessibleCellTextData()
{
if (pEditEngine)
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
if (mpEditViewForwarder)
@@ -972,7 +972,7 @@ ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
{
// If the object is cloned, do NOT set notify hdl.
if (mpEditEngine && !mbIsCloned)
- mpEditEngine->SetNotifyHdl(Link());
+ mpEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
if (mpEditViewForwarder)
@@ -1088,7 +1088,7 @@ ScAccessibleEditLineTextData::~ScAccessibleEditLineTextData()
// the NotifyHdl also has to be removed from the ScTextWnd's EditEngine
// (it's set in ScAccessibleEditLineTextData::GetTextForwarder, and mpEditEngine
// is reset there)
- pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link());
+ pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link<>());
}
}
@@ -1183,7 +1183,7 @@ void ScAccessibleEditLineTextData::ResetEditMode()
if (mbEditEngineCreated && mpEditEngine)
delete mpEditEngine;
else if (pTxtWnd && pTxtWnd->GetEditView() && pTxtWnd->GetEditView()->GetEditEngine())
- pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link());
+ pTxtWnd->GetEditView()->GetEditEngine()->SetNotifyHdl(Link<>());
mpEditEngine = NULL;
DELETEZ(mpForwarder);
@@ -1236,7 +1236,7 @@ ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell*
ScAccessiblePreviewCellTextData::~ScAccessiblePreviewCellTextData()
{
if (pEditEngine)
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
}
@@ -1314,7 +1314,7 @@ ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScP
ScAccessiblePreviewHeaderCellTextData::~ScAccessiblePreviewHeaderCellTextData()
{
if (pEditEngine)
- pEditEngine->SetNotifyHdl(Link());
+ pEditEngine->SetNotifyHdl(Link<>());
if (mpViewForwarder)
delete mpViewForwarder;
}
@@ -1432,7 +1432,7 @@ ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData()
if (mpDocSh)
mpDocSh->GetDocument().RemoveUnoObject(*this);
if (mpEditEngine)
- mpEditEngine->SetNotifyHdl(Link());
+ mpEditEngine->SetNotifyHdl(Link<>());
delete mpEditEngine;
delete mpForwarder;
}
@@ -1547,7 +1547,7 @@ ScAccessibleNoteTextData::~ScAccessibleNoteTextData()
if (mpDocSh)
mpDocSh->GetDocument().RemoveUnoObject(*this);
if (mpEditEngine)
- mpEditEngine->SetNotifyHdl(Link());
+ mpEditEngine->SetNotifyHdl(Link<>());
delete mpEditEngine;
delete mpForwarder;
}