CVS wrapper -- version: 1.101 cvs diff: Diffing . cvs diff: Diffing inc cvs diff: Diffing misc cvs diff: Diffing xml_helper cvs diff: Diffing xmldlg_imexp cvs diff: Diffing xmlflat_imexp cvs diff: Diffing xmllib_imexp cvs diff: Diffing xmlmod_imexp ? patch.diff Index: xmldlg_imexp/xmldlg_expmodels.cxx =================================================================== RCS file: /cvs/script/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx,v retrieving revision 1.33.8.1 diff -a -u -r1.33.8.1 xmldlg_expmodels.cxx --- xmldlg_imexp/xmldlg_expmodels.cxx 8 Nov 2007 10:48:24 -0000 1.33.8.1 +++ xmldlg_imexp/xmldlg_expmodels.cxx 28 Nov 2007 16:34:05 -0000 @@ -121,8 +121,6 @@ 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 @@ 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 @@ 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 @@ addSubElement( title ); } - readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ), - OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) ); readEvents(); } //__________________________________________________________________________________________________ @@ -1014,8 +1006,6 @@ 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(); } //__________________________________________________________________________________________________ Index: xmldlg_imexp/xmldlg_impmodels.cxx =================================================================== RCS file: /cvs/script/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx,v retrieving revision 1.39.8.1 diff -a -u -r1.39.8.1 xmldlg_impmodels.cxx --- xmldlg_imexp/xmldlg_impmodels.cxx 8 Nov 2007 10:48:24 -0000 1.39.8.1 +++ xmldlg_imexp/xmldlg_impmodels.cxx 28 Nov 2007 16:34:05 -0000 @@ -225,9 +225,6 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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(