From 4c4ccdf724dedebce23cc9abd7b74bee43f184d7 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <22shubh22@gmail.com>
Date: Sat, 9 Mar 2019 06:10:58 +0530
Subject: 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>
---
 xmlscript/dtd/dialog.dtd                           | 14 +++++++++++++-
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |  1 -
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |  1 -
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'xmlscript')

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 );
-- 
cgit