[Libreoffice-commits] core.git: 2 commits - oox/source vcl/unx

[ekuiitr]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   21 +++++++++++++++++---
 vcl/unx/generic/dtrans/X11_selection.cxx            |    1 
 2 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 1f66bd9cbd961d1923c260b2d74249e363a0c217
Author: ekuiitr <jhaekansh80 at gmail.com>
Date:   Wed Jul 4 16:52:22 2018 +0530

    Support txAnchorVert parameter
    
    Specifies the y-axis anchoring of the text area in a shape according to:
    t(top), mid(middle, default), b(bottom).
    
    Change-Id: I98927f687334fd989ae43385de7dd91f8e2929b1
    Reviewed-on: https://gerrit.libreoffice.org/56939
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 72fc01a5fe9f..e0fd7d246c60 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -553,9 +553,24 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
                 break;
             }
 
-            // text centered vertically by default
-            pTextBody->getTextProperties().meVA = css::drawing::TextVerticalAdjust_CENTER;
-            pTextBody->getTextProperties().maPropertyMap.setProperty(PROP_TextVerticalAdjust, css::drawing::TextVerticalAdjust_CENTER);
+            const sal_Int32 atxAnchorVert = maMap.count(XML_txAnchorVert) ? maMap.find(XML_txAnchorVert)->second : XML_mid;
+
+            switch(atxAnchorVert)
+            {
+                case XML_t:
+                pTextBody->getTextProperties().meVA = css::drawing::TextVerticalAdjust_TOP;
+                break;
+                case XML_b:
+                pTextBody->getTextProperties().meVA = css::drawing::TextVerticalAdjust_BOTTOM;
+                break;
+                case XML_mid:
+                // text centered vertically by default
+                default:
+                pTextBody->getTextProperties().meVA = css::drawing::TextVerticalAdjust_CENTER;
+                break;
+            }
+
+            pTextBody->getTextProperties().maPropertyMap.setProperty(PROP_TextVerticalAdjust, pTextBody->getTextProperties().meVA);
 
             // normalize list level
             sal_Int32 nBaseLevel = pTextBody->getParagraphs().front()->getProperties().getLevel();
commit fb9c1c191e76755ffa6acb09d4f50533cb589d1b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Jul 10 12:32:56 2018 +0200

    tdf#118661 LibreOffice remains in background after closing it
    
    regression from
        commit d0f44d8ba7e87aa263008d3cfc4e68294d783162
        tdf#84323 - sal - add sane sleep interface: cleanup osl_waitThread
    
    Change-Id: I55c2fa6c8993cc6268b1c5d9331c665c401e8efe
    Reviewed-on: https://gerrit.libreoffice.org/57228
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 43f0d228002c..c2d8858d1c61 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -943,6 +943,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
             }
             else
             {
+                aGuard.clear();
                 osl::Thread::wait(std::chrono::milliseconds(100));
                 aGuard.reset();
             }