diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-29 13:16:50 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-29 13:16:50 +0000 |
commit | 415c814d372a10f3e1c0452d9815595f8da06499 (patch) | |
tree | dfc19927be8dc0f160290dbcbf90d75b1c058d02 /xmlscript/source | |
parent | 9edcb954269282c8432fb10876384d1f114c07a7 (diff) |
#i10000# #i84056# The toolkit dialogs can not be shown
Diffstat (limited to 'xmlscript/source')
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 14 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 22 |
2 files changed, 4 insertions, 32 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 1e032faccd11..9489df66e75d 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmldlg_expmodels.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: ihi $ $Date: 2007-11-27 11:49:38 $ + * last change: $Author: ihi $ $Date: 2007-11-29 14:16:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -121,8 +121,6 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles ) OUSTR(XMLNS_DIALOGS_PREFIX ":grab-focus") ); readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) ); - readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) ); // State @@ -185,8 +183,6 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) ); readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) ); - readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) ); sal_Bool bTriState = sal_False; if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TriState") ) ) >>= bTriState) && bTriState) @@ -397,8 +393,6 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles ) OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) ); readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) ); - readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) ); sal_Int16 nState = 0; if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState) @@ -452,8 +446,6 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles ) addSubElement( title ); } - readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) ); readEvents(); } //__________________________________________________________________________________________________ @@ -1014,8 +1006,6 @@ void ElementDescriptor::readFixedLineModel( StyleBag * all_styles ) OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) ); readOrientationAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) ); - readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) ); readEvents(); } //__________________________________________________________________________________________________ diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 2079274e97ff..13a831a9d365 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmldlg_impmodels.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: ihi $ $Date: 2007-11-27 11:49:58 $ + * last change: $Author: ihi $ $Date: 2007-11-29 14:16:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -225,9 +225,6 @@ void FixedLineElement::endElement() ctx.importOrientationProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ), OUString( RTL_CONSTASCII_USTRINGPARAM("align") ), _xAttributes ); - ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("nolabel") ), - _xAttributes ); ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) @@ -1262,9 +1259,6 @@ void TitledBoxElement::endElement() makeAny( _label ) ); } - ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("nolabel") ), - _xAttributes ); ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) @@ -1316,9 +1310,6 @@ void TitledBoxElement::endElement() ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ), xAttributes ); - ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("nolabel") ), - xAttributes ); sal_Int16 nVal = 0; sal_Bool bChecked = sal_False; @@ -1447,9 +1438,6 @@ void RadioGroupElement::endElement() ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ), xAttributes ); - ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("nolabel") ), - xAttributes ); sal_Int16 nVal = 0; sal_Bool bChecked = sal_False; if (getBoolAttr( &bChecked, @@ -1791,9 +1779,6 @@ void CheckBoxElement::endElement() ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ), _xAttributes ); - ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("nolabel") ), - _xAttributes ); sal_Bool bTriState = sal_False; @@ -1910,9 +1895,6 @@ void ButtonElement::endElement() ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ), _xAttributes ); - ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("nolabel") ), - _xAttributes ); // State sal_Bool bChecked = sal_False; if (getBoolAttr( |