INTEGRATION: CWS calcuno01 (1.4.24); FILE MERGED

2004/05/05 16:32:34 sw 1.4.24.1: i23114#

4 files changed, 14 insertions, 4 deletions

diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv
index 9cdc7f109eff..c1c4971593ac 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv
@@ -165,6 +165,9 @@
 "SvxShapePolyPolygonBezier";"com::sun::star::text::XTextRange";"getEnd()"
 "SvxShapePolyPolygonBezier";"com::sun::star::text::XTextRange";"getString()"
 "SvxShapePolyPolygonBezier";"com::sun::star::text::XTextRange";"setString()"
+"SvxShapePolyPolygonBezier";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"setPropertyValuesTolerant()"
+"SvxShapePolyPolygonBezier";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getPropertyValuesTolerant()"
+"SvxShapePolyPolygonBezier";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getDirectPropertyValuesTolerant()"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharFontName"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharFontStyleName"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharFontFamily"
@@ -195,7 +198,7 @@
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharCombineIsOn#optional"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharCombinePrefix#optional"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharCombineSuffix#optional"
-"SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharEmphasize#optional"
+"SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharEmphasis#optional"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharRelief#optional"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"RubyText#optional"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"RubyAdjust#optional"
@@ -214,6 +217,7 @@
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharUnderlineColor"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharUnderlineHasColor"
 "SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharStyleNames#optional"
+"SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterProperties";"CharHidden#optional"
 "SvxShapePolyPolygonBezier";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 "SvxShapePolyPolygonBezier";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
 "SvxShapePolyPolygonBezier";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextContent.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextContent.csv
index 62721a44de04..049b996bc663 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextContent.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextContent.csv
@@ -94,6 +94,9 @@
 "SvxUnoTextContent";"com::sun::star::table::XCellRange#optional";"getCellByPosition()"
 "SvxUnoTextContent";"com::sun::star::table::XCellRange#optional";"getCellRangeByPosition()"
 "SvxUnoTextContent";"com::sun::star::table::XCellRange#optional";"getCellRangeByName()"
+"SvxUnoTextContent";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"setPropertyValuesTolerant()"
+"SvxUnoTextContent";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getPropertyValuesTolerant()"
+"SvxUnoTextContent";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"getDirectPropertyValuesTolerant()"
 "SvxUnoTextContent";"com::sun::star::text::TextTable#optional";"BreakType"
 "SvxUnoTextContent";"com::sun::star::text::TextTable#optional";"LeftMargin"
 "SvxUnoTextContent";"com::sun::star::text::TextTable#optional";"RightMargin"
@@ -151,7 +154,7 @@
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharCombineIsOn#optional"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharCombinePrefix#optional"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharCombineSuffix#optional"
-"SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharEmphasize#optional"
+"SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharEmphasis#optional"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharRelief#optional"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"RubyText#optional"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"RubyAdjust#optional"
@@ -170,6 +173,7 @@
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharUnderlineColor"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharUnderlineHasColor"
 "SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharStyleNames#optional"
+"SvxUnoTextContent";"com::sun::star::style::CharacterProperties#optional";"CharHidden#optional"
 "SvxUnoTextContent";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 "SvxUnoTextContent";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
 "SvxUnoTextContent";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextCursor.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextCursor.csv
index 826f91c6f294..96e1ed0ff93a 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextCursor.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextCursor.csv
@@ -135,7 +135,7 @@
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharCombineIsOn#optional"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharCombinePrefix#optional"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharCombineSuffix#optional"
-"SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharEmphasize#optional"
+"SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharEmphasis#optional"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharRelief#optional"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"RubyText#optional"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"RubyAdjust#optional"
@@ -154,6 +154,7 @@
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharUnderlineColor"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharUnderlineHasColor"
 "SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharStyleNames#optional"
+"SvxUnoTextCursor";"com::sun::star::style::CharacterProperties";"CharHidden#optional"
 "SvxUnoTextCursor";"com::sun::star::document::XDocumentInsertable#optional";"insertDocumentFromURL()"
 "SvxUnoTextCursor";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 "SvxUnoTextCursor";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextRange.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextRange.csv
index 00f69b15699d..1fe9b3e53b3b 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextRange.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxUnoTextRange.csv
@@ -109,7 +109,7 @@
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharCombineIsOn#optional"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharCombinePrefix#optional"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharCombineSuffix#optional"
-"SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharEmphasize#optional"
+"SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharEmphasis#optional"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharRelief#optional"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"RubyText#optional"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"RubyAdjust#optional"
@@ -128,6 +128,7 @@
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharUnderlineColor"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharUnderlineHasColor"
 "SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharStyleNames#optional"
+"SvxUnoTextRange";"com::sun::star::style::CharacterProperties";"CharHidden#optional"
 "SvxUnoTextRange";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 "SvxUnoTextRange";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
 "SvxUnoTextRange";"com::sun::star::beans::XPropertySet";"getPropertyValue()"