[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - libreofficekit/qa sd/source

[Miklos Vajna]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |    3 +++
 sd/source/ui/unoidl/unomodel.cxx                    |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 138082310c0681a402251d9055955de74458b903
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 16 12:06:43 2015 +0100

    gtktiledviewer: map css::awt::Key::ESCAPE
    
    Change-Id: Ib034244b39b185877be5791c2a86018d1b57f7e3

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index a12303d..c2fc02b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -151,6 +151,9 @@ static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* pEvent, gpointer /*pD
     case GDK_Return:
         nCode = com::sun::star::awt::Key::RETURN;
         break;
+    case GDK_Escape:
+        nCode = com::sun::star::awt::Key::ESCAPE;
+        break;
     default:
         if (pEvent->keyval >= GDK_F1 && pEvent->keyval <= GDK_F26)
             nCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_F1);
commit bce7fa31edb90a7fe0f8af58745e37b83abd97a8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 16 12:02:09 2015 +0100

    SdXImpressDocument::initializeForTiledRendering: missing guard
    
    Change-Id: Idc006b63157daea880ba1eeac3832617a0992d48

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 431e4c6..b935089 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2349,6 +2349,7 @@ Size SdXImpressDocument::getDocumentSize()
 
 void SdXImpressDocument::initializeForTiledRendering()
 {
+    SolarMutexGuard aGuard;
     // tiled rendering works only when we are in the 'Normal' view, switch to that
     mpDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
 }