INTEGRATION: CWS sab008 (1.4.36); FILE MERGED

2004/02/19 16:29:58 sw 1.4.36.1: #115035#

2 files changed, 15 insertions, 2 deletions

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFooterTextCursor.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFooterTextCursor.csv
index ab7df042d336..393c1285bf36 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFooterTextCursor.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFooterTextCursor.csv
@@ -135,7 +135,7 @@
 "ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"CharCombineIsOn#optional"
 "ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"CharCombinePrefix#optional"
 "ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"CharCombineSuffix#optional"
-"ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"CharEmphasize#optional"
+"ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"CharEmphasis#optional"
 "ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"CharRelief#optional"
 "ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"RubyText#optional"
 "ScHeaderFooterTextCursor";"com::sun::star::style::CharacterProperties";"RubyAdjust#optional"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index 8c1c111ecfd7..cf6e2dcd63e9 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -119,6 +119,14 @@
 "ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontPitchComplex"
 "ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharPostureComplex"
 "ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"IsActive#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"BorderColor#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"Protected#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"ShowBorder#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"PrintBorder#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"CopyBack#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"CopyStyles#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Scenario#optional";"CopyFormulas#optional"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"protect()"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"unprotect()"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"isProtected()"
@@ -138,6 +146,8 @@
 "ScTableSheetObj";"com::sun::star::sheet::XSheetCellRange";"getSpreadsheet()"
 "ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"IsVisible"
 "ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"PageStyle"
+"ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"TableLayout#optional"
+"ScTableSheetObj";"com::sun::star::sheet::Spreadsheet";"AutomaticPrintArea#optional"
 "ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getPrintAreas()"
 "ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"setPrintAreas()"
 "ScTableSheetObj";"com::sun::star::sheet::XPrintAreas";"getPrintTitleColumns()"
@@ -225,7 +235,7 @@
 "ScTableSheetObj";"com::sun::star::style::CharacterProperties";"CharCombineIsOn#optional"
 "ScTableSheetObj";"com::sun::star::style::CharacterProperties";"CharCombinePrefix#optional"
 "ScTableSheetObj";"com::sun::star::style::CharacterProperties";"CharCombineSuffix#optional"
-"ScTableSheetObj";"com::sun::star::style::CharacterProperties";"CharEmphasize#optional"
+"ScTableSheetObj";"com::sun::star::style::CharacterProperties";"CharEmphasis#optional"
 "ScTableSheetObj";"com::sun::star::style::CharacterProperties";"CharRelief#optional"
 "ScTableSheetObj";"com::sun::star::style::CharacterProperties";"RubyText#optional"
 "ScTableSheetObj";"com::sun::star::style::CharacterProperties";"RubyAdjust#optional"
@@ -254,6 +264,7 @@
 "ScTableSheetObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangeData";"getDataArray()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangeData";"setDataArray()"
+"ScTableSheetObj";"com::sun::star::sheet::XScenarioEnhanced#optional";"getRanges()"
 "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getData()"
 "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setData()"
 "ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getRowDescriptions()"
@@ -264,6 +275,8 @@
 "ScTableSheetObj";"com::sun::star::sheet::XCellSeries";"fillAuto()"
 "ScTableSheetObj";"com::sun::star::sheet::XDataPilotTablesSupplier";"getDataPilotTables()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()"
+"ScTableSheetObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()"
+"ScTableSheetObj";"com::sun::star::util::XModifyBroadcaster#optional";"removeModifyListener()"
 "ScTableSheetObj";"com::sun::star::util::XImportable";"createImportDescriptor()"
 "ScTableSheetObj";"com::sun::star::util::XImportable";"doImport()"
 "ScTableSheetObj";"com::sun::star::util::XSortable";"createSortDescriptor()"