[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - xmlscript/source

[Vasily Melenchuk]

 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |    1 +
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit f2528ce7eebfd0b9e873c6350e40f1cb7cb1d0a9
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
Date:   Fri Apr 8 18:54:35 2016 +0100

    tdf#99172 support for vertical align import/export property for text boxes
    
    Change-Id: I1cf8d8d57a7245800e2b28b674301ebcb5470348
    Reviewed-on: https://gerrit.libreoffice.org/23927
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit bef802a7bf7acb8331a1d776db9bbcc3bf16220b)
    Reviewed-on: https://gerrit.libreoffice.org/23935
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 10d03ce..31a5063 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -556,6 +556,7 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles )
     readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
     readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" );
     readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+    readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
     readBoolAttr( "HardLineBreaks", XMLNS_DIALOGS_PREFIX ":hard-linebreaks" );
     readBoolAttr( "HScroll", XMLNS_DIALOGS_PREFIX ":hscroll" );
     readBoolAttr( "VScroll", XMLNS_DIALOGS_PREFIX ":vscroll" );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 315c08f..b233e29 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1088,6 +1088,7 @@ void TextFieldElement::endElement()
     ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
     ctx.importBooleanProperty("Tabstop", "tabstop", _xAttributes );
     ctx.importAlignProperty( "Align", "align", _xAttributes );
+    ctx.importVerticalAlignProperty( "VerticalAlign", "valign", _xAttributes );
     ctx.importBooleanProperty( "HardLineBreaks", "hard-linebreaks", _xAttributes );
     ctx.importBooleanProperty( "HScroll", "hscroll" ,_xAttributes );
     ctx.importBooleanProperty( "VScroll", "vscroll", _xAttributes );