diff options
| author | Shubham Goyal <22shubh22@gmail.com> | 2019-03-09 06:10:58 +0530 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-03-11 15:51:16 +0100 |
| commit | 4c4ccdf724dedebce23cc9abd7b74bee43f184d7 (patch) | |
| tree | d21b1de3b1b6f125117d690627c50cc10d9941a6 /xmlscript | |
| parent | 50d91e7294700ea38fc4933b0636a19d4684eede (diff) | |
i#119731 Hyperlink Control on dialog Editor
Change-Id: I34132931eba103aec5f9622be9c3bf2dd4de237d
Reviewed-on: https://gerrit.libreoffice.org/69001
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'xmlscript')
| -rw-r--r-- | xmlscript/dtd/dialog.dtd | 14 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 1 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd index 364517311405..1b7e6355631f 100644 --- a/xmlscript/dtd/dialog.dtd +++ b/xmlscript/dtd/dialog.dtd @@ -60,7 +60,8 @@ dlg:fixedline| dlg:progressmeter| dlg:scrollbar| - dlg:table + dlg:table| + dlg:linklabel )"> <!ELEMENT dlg:window (dlg:styles*, (%event;)*, dlg:bulletinboard*)> @@ -223,6 +224,17 @@ dlg:tabstop %boolean; #IMPLIED > + +<!ELEMENT dlg:linklabel ((%event;)*)> +<!ATTLIST dlg:linklabel %default-attributes; + dlg:value CDATA #IMPLIED + dlg:url CDATA #IMPLIED + dlg:align (left|center|right) #IMPLIED + dlg:valign (top|center|bottom) #IMPLIED + dlg:multiline %boolean; #IMPLIED + dlg:tabstop %boolean; #IMPLIED + > + <!ELEMENT dlg:textfield ((%event;)*)> <!ATTLIST dlg:textfield %default-attributes; dlg:tabstop %boolean; #IMPLIED diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index e86038147a7f..48acefb63f14 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -524,7 +524,6 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles ) readDefaults(); readStringAttr( "Label",XMLNS_DIALOGS_PREFIX ":value" ); readStringAttr( "URL", XMLNS_DIALOGS_PREFIX ":url" ); - readStringAttr( "Description", XMLNS_DIALOGS_PREFIX ":description" ); readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 0a2a2f45b992..15463246a601 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -982,7 +982,6 @@ void FixedHyperLinkElement::endElement() ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes ); ctx.importStringProperty( "Label", "value", _xAttributes ); ctx.importStringProperty( "URL", "url", _xAttributes ); - ctx.importStringProperty( "Description", "description", _xAttributes ); ctx.importAlignProperty( "Align", "align" ,_xAttributes ); ctx.importVerticalAlignProperty( "VerticalAlign", "valign", _xAttributes ); |