[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/vcl sc/source sd/source sw/source vcl/source

[Pranav Kant]

 include/vcl/window.hxx            |    2 +-
 sc/source/ui/unoobj/docuno.cxx    |    4 ++--
 sd/source/ui/unoidl/unomodel.cxx  |    4 ++--
 sw/source/uibase/uno/unotxdoc.cxx |    4 ++--
 vcl/source/window/window.cxx      |    6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 41db188ded84e1d3b5a56513663c4b8ad28d4f0f
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Feb 13 19:55:48 2018 +0530

    lok IME: VclEventId does not exist
    
    Change-Id: I7fc6cb50043eb9be6a9e53daac7edc8038dc04df
    Reviewed-on: https://gerrit.libreoffice.org/49661
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 243335885087..910ce0344045 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -886,7 +886,7 @@ public:
 
     void                                SetInputContext( const InputContext& rInputContext );
     const InputContext&                 GetInputContext() const;
-    void                                PostExtTextInputEvent(VclEventId nType, const OUString& rText);
+    void                                PostExtTextInputEvent(int nType, const OUString& rText);
     void                                EndExtTextInput();
     void                                SetCursorRect( const Rectangle* pRect = nullptr, long nExtTextInputWidth = 0 );
     const Rectangle*                    GetCursorRect() const;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index fafd3b466102..fc7c6407915c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -630,10 +630,10 @@ void ScModelObj::postExtTextInputEvent(int nType, const OUString& rText)
     switch (nType)
     {
     case LOK_EXT_TEXTINPUT:
-        pWindow->PostExtTextInputEvent(VclEventId::ExtTextInput, rText);
+        pWindow->PostExtTextInputEvent(VCLEVENT_WINDOW_EXTTEXTINPUT, rText);
         break;
     case LOK_EXT_TEXTINPUT_END:
-        pWindow->PostExtTextInputEvent(VclEventId::EndExtTextInput, "");
+        pWindow->PostExtTextInputEvent(VCLEVENT_WINDOW_ENDEXTTEXTINPUT, "");
         break;
     default:
         assert(false && "Unhandled External Text input event!");
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 296dddba6439..8d865516d032 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2533,10 +2533,10 @@ void SdXImpressDocument::postExtTextInputEvent(int nType, const OUString& rText)
     switch (nType)
     {
     case LOK_EXT_TEXTINPUT:
-        pWindow->PostExtTextInputEvent(VclEventId::ExtTextInput, rText);
+        pWindow->PostExtTextInputEvent(VCLEVENT_WINDOW_EXTTEXTINPUT, rText);
         break;
     case LOK_EXT_TEXTINPUT_END:
-        pWindow->PostExtTextInputEvent(VclEventId::EndExtTextInput, "");
+        pWindow->PostExtTextInputEvent(VCLEVENT_WINDOW_ENDEXTTEXTINPUT, "");
         break;
     default:
         assert(false && "Unhandled External Text input event!");
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 85a3ef5cab95..77393d59bdaa 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3511,10 +3511,10 @@ void SwXTextDocument::postExtTextInputEvent(int nType, const OUString& rText)
     switch (nType)
     {
     case LOK_EXT_TEXTINPUT:
-        pWindow->PostExtTextInputEvent(VclEventId::ExtTextInput, rText);
+        pWindow->PostExtTextInputEvent(VCLEVENT_WINDOW_EXTTEXTINPUT, rText);
         break;
     case LOK_EXT_TEXTINPUT_END:
-        pWindow->PostExtTextInputEvent(VclEventId::EndExtTextInput, "");
+        pWindow->PostExtTextInputEvent(VCLEVENT_WINDOW_ENDEXTTEXTINPUT, "");
         break;
     default:
         assert(false && "Unhandled External Text input event!");
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4e68e6ab00d9..6106198490e2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2103,17 +2103,17 @@ void Window::SetInputContext( const InputContext& rInputContext )
         ImplNewInputContext();
 }
 
-void Window::PostExtTextInputEvent(VclEventId nType, const OUString& rText)
+void Window::PostExtTextInputEvent(int nType, const OUString& rText)
 {
     switch (nType)
     {
-    case VclEventId::ExtTextInput:
+    case VCLEVENT_WINDOW_EXTTEXTINPUT:
     {
         SalExtTextInputEvent aEvent { rText, nullptr, rText.getLength(), 0 };
         ImplWindowFrameProc(this, SalEvent::ExtTextInput, &aEvent);
     }
     break;
-    case VclEventId::EndExtTextInput:
+    case VCLEVENT_WINDOW_ENDEXTTEXTINPUT:
         ImplWindowFrameProc(this, SalEvent::EndExtTextInput, nullptr);
         break;
     default: