lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 5 ++---
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 4 ++--
vcl/inc/osx/salframe.h | 3 ---
vcl/osx/salframe.cxx | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 5d1bc45e807dded3041eadeb5483ed67c0b028f0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Mar 15 15:13:16 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun Mar 17 16:40:11 2019 +0100
loplugin:typedefparam (macOS)
Change-Id: I50cacafa8bbd90fef15603f0bde3f653f78393ea
Reviewed-on: https://gerrit.libreoffice.org/69305
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 64fb8ac37f49..084b08c23d0f 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -32,7 +32,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceDisplayName.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/linguistic2/XSpellChecker.hpp>
#include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
@@ -90,8 +89,8 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
// XSpellChecker
- virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale&
rLocale, const PropertyValues& rProperties ) override;
- virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString&
rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
+ virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale&
rLocale, const css::uno::Sequence<PropertyValue>& rProperties ) override;
+ virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString&
rWord, const Locale& rLocale, const css::uno::Sequence<PropertyValue>&
rProperties ) override;
// XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference<
XLinguServiceEventListener >& rxLstnr ) override;
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 02b130e67c95..9eb7e65244d6 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -358,7 +358,7 @@ sal_Int16 MacSpellChecker::GetSpellFailure( const OUString
&rWord, const Locale
sal_Bool SAL_CALL
MacSpellChecker::isValid( const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence<PropertyValue>& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
@@ -464,7 +464,7 @@ Reference< XSpellAlternatives >
Reference< XSpellAlternatives > SAL_CALL
MacSpellChecker::spell( const OUString& rWord, const Locale& rLocale,
- const PropertyValues& rProperties )
+ const css::uno::Sequence<PropertyValue>& rProperties )
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index e7bb03008db6..2038cf99b33f 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -43,9 +43,6 @@ class AquaSalTimer;
class AquaSalInstance;
class AquaSalMenu;
-typedef struct SalFrame::SalPointerState SalPointerState;
-
-
class AquaSalFrame : public SalFrame
{
public:
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index f3f3dda1ec5f..3666f500b36f 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1422,7 +1422,7 @@ void AquaSalFrame::GetWorkArea( tools::Rectangle& rRect )
rRect.SetBottom( static_cast<long>(aRect.origin.y + aRect.size.height - 1)
);
}
-SalPointerState AquaSalFrame::GetPointerState()
+SalFrame::SalPointerState AquaSalFrame::GetPointerState()
{
OSX_SALDATA_RUNINMAIN_UNION( GetPointerState(), state )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
