[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - xmlscript/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 140aa19158eb62957cb5baa520c181de0aa9a0f9
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Aug 7 22:04:26 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 11 16:30:46 2022 +0200

    Related tdf#114790: add align and vertalign to datefield im/export
    
    Change-Id: I2661e0c372fbb3c364ac338f23ebbd5b1a448ff0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137936
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit 7b204ecb49563544ee9c811dbcbee998062bf511)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137831
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 01328f68050b..823df0e9ac1b 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -709,6 +709,8 @@ void ElementDescriptor::readDateFieldModel( StyleBag * 
all_styles )
 
     // collect elements
     readDefaults();
+    readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+    readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
     readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
     readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" );
     readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX 
":hide-inactive-selection" );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 4c7f9642f06e..bea460715789 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -691,6 +691,8 @@ void DateFieldElement::endElement()
     }
 
     ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
+    ctx.importAlignProperty( "Align", "align", _xAttributes );
+    ctx.importVerticalAlignProperty( "VerticalAlign", "valign", _xAttributes );
     ctx.importBooleanProperty( "Tabstop", "tabstop", _xAttributes );
     ctx.importBooleanProperty( "ReadOnly", "readonly", _xAttributes );
     ctx.importBooleanProperty( "StrictFormat", "strict-format", _xAttributes );