[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - xmlscript/source
Vasily Melenchuk
vasily.melenchuk at cib.de
Tue Apr 12 08:48:17 UTC 2016
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 1 +
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1 +
2 files changed, 2 insertions(+)
New commits:
commit be632ebd5cc2019c732798ec9f21bab235347644
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/23934
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index cfa7509..7e1b96c 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 7ca5ed4..e216f6c 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 );
More information about the Libreoffice-commits
mailing list