summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-05 20:25:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-08 18:01:27 +0100
commita31267be1bb42e8a5f80a3b660bbf969eeb5b647 (patch)
tree87cfce9b6570c2ec347c3727416eded53a7b01e4 /extensions
parentbde22bd6da4568e3a1fd35b5f822d6de06e477a4 (diff)
Fix isSalCallFunction so it also works on Windows
...where FunctionDecl::getReturnTypeSourceRange returns an invalid range because it fails to take AttributedTypeLoc (as caused by SAL_CALL -> __cdecl) into account. Change-Id: I7835dfca7b890ba1bfdb99adaad78a627b6e0e17 Reviewed-on: https://gerrit.libreoffice.org/45909 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/update/check/updatecheck.hxx2
-rw-r--r--extensions/source/update/check/updatehdl.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index 7a797136b692..e50fa3859b0c 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -61,7 +61,7 @@ class UpdateCheck :
virtual ~UpdateCheck() override;
public:
- SAL_CALL operator rtl::Reference< UpdateCheckConfigListener > ()
+ operator rtl::Reference< UpdateCheckConfigListener > ()
{ return static_cast< UpdateCheckConfigListener * > (this); }
void initialize(const css::uno::Sequence<css::beans::NamedValue>& rValues,
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index 519669ebfb48..6870c13e3c45 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -178,7 +178,7 @@ public:
bool showOverwriteWarning() const;
// Allows runtime exceptions to be thrown by const methods
- SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
+ operator css::uno::Reference< css::uno::XInterface > () const
{ return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); };
// XActionListener