summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2016-04-08 18:54:35 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-04-26 19:37:02 +0000
commitf2528ce7eebfd0b9e873c6350e40f1cb7cb1d0a9 (patch)
tree44b47ebf0fe4dad8fb3b6b607ee5317c829e267c
parent2aa8be5936cab3fa2a0d895b414cd0dc9dc3f319 (diff)
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@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit bef802a7bf7acb8331a1d776db9bbcc3bf16220b) Reviewed-on: https://gerrit.libreoffice.org/23935 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx1
2 files changed, 2 insertions, 0 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 10d03ce7378a..31a506352c63 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 315c08f288ad..b233e29a1181 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 );