summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx363
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.hxx4
-rw-r--r--unusedcode.easy7
-rw-r--r--xmloff/inc/SchXMLImport.hxx7
-rw-r--r--xmloff/inc/xmloff/SchXMLImportHelper.hxx4
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx64
6 files changed, 0 insertions, 449 deletions
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 9fb61fa25b06..645a3c69ec36 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -132,81 +132,6 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
return aSkipRanges;
}
-void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans::PropertyValue> aImportDescriptor)
-{
- sal_Int32 nProperties = aImportDescriptor.getLength();
- rtl::OUString sDatabaseName;
- rtl::OUString sConRes;
- rtl::OUString sSourceObject;
- sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
- bool bNative = false;
- for (sal_Int16 i = 0; i < nProperties; ++i)
- {
- if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_DBNAME)))
- aImportDescriptor[i].Value >>= sDatabaseName;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CONRES)))
- aImportDescriptor[i].Value >>= sConRes;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SRCOBJ)))
- aImportDescriptor[i].Value >>= sSourceObject;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SRCTYPE)))
- aImportDescriptor[i].Value >>= nSourceType;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISNATIVE)))
- bNative = ::cppu::any2bool(aImportDescriptor[i].Value);
- }
- switch (nSourceType)
- {
- case sheet::DataImportMode_NONE : break;
- case sheet::DataImportMode_QUERY :
- {
- if (sDatabaseName.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_QUERY_NAME, sSourceObject);
- SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, true, true);
- if (sConRes.getLength())
- {
- rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes );
- SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true);
- }
- rExport.CheckAttrList();
- }
- break;
- case sheet::DataImportMode_TABLE :
- {
- if (sDatabaseName.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_NAME, sSourceObject);
- SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true);
- if (sConRes.getLength())
- {
- rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes );
- SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true);
- }
- rExport.CheckAttrList();
- }
- break;
- case sheet::DataImportMode_SQL :
- {
- if (sDatabaseName.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, sSourceObject);
- if (!bNative)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TRUE);
- SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, true, true);
- if (sConRes.getLength())
- {
- rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes );
- SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true);
- }
- rExport.CheckAttrList();
- }
- break;
- default:
- {
- // added to avoid warnings
- }
- }
-}
-
rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const
{
switch (aFilterOperator)
@@ -283,294 +208,6 @@ void ScXMLExportDatabaseRanges::WriteCondition(const sheet::TableFilterField2& a
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true);
}
-void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <sheet::XSheetFilterDescriptor2>& xSheetFilterDescriptor, const rtl::OUString sDatabaseRangeName)
-{
- uno::Sequence< sheet::TableFilterField2 > aTableFilterFields( xSheetFilterDescriptor->getFilterFields2() );
- sal_Int32 nTableFilterFields = aTableFilterFields.getLength();
- if (nTableFilterFields > 0)
- {
- uno::Reference <beans::XPropertySet> xPropertySet (xSheetFilterDescriptor, uno::UNO_QUERY);
- if (xPropertySet.is())
- {
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)))))
- {
- table::CellAddress aOutputPosition;
- if (xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS))) >>= aOutputPosition)
- {
- rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
- }
- }
- ScDBCollection* pDBCollection = pDoc->GetDBCollection();
- ScDBData* pDBData = pDBCollection->getNamedDBs().findByName(sDatabaseRangeName);
- ScRange aAdvSource;
- if (pDBData->GetAdvancedQuerySource(aAdvSource))
- {
- rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromRange( sOUCellAddress, aAdvSource, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sOUCellAddress);
- }
-
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SKIPDUP)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_FALSE);
- SvXMLElementExport aElemF(rExport, XML_NAMESPACE_TABLE, XML_FILTER, true, true);
- rExport.CheckAttrList();
- bool bIsCaseSensitive = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE))));
- bool bUseRegularExpressions = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_USEREGEX))));
- bool bAnd = false;
- bool bOr = false;
- for (sal_Int32 i = 1; i < nTableFilterFields; ++i)
- {
- if (aTableFilterFields[i].Connection == sheet::FilterConnection_AND)
- bAnd = true;
- else
- bOr = true;
- }
- if (bOr && !bAnd)
- {
- SvXMLElementExport aElemOr(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true);
- for (sal_Int32 i = 0; i < nTableFilterFields; ++i)
- {
- WriteCondition(aTableFilterFields[i], bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- else if (bAnd && !bOr)
- {
- SvXMLElementExport aElemAnd(rExport, XML_NAMESPACE_TABLE, XML_FILTER_AND, true, true);
- for (sal_Int32 i = 0; i < nTableFilterFields; ++i)
- {
- WriteCondition(aTableFilterFields[i], bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- else if (nTableFilterFields == 1)
- {
- WriteCondition(aTableFilterFields[0], bIsCaseSensitive, bUseRegularExpressions);
- }
- else
- {
- SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true);
- sheet::TableFilterField2 aPrevFilterField = aTableFilterFields[0];
- sheet::FilterConnection aConnection = aTableFilterFields[1].Connection;
- bool bOpenAndElement;
- rtl::OUString aName = rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND));
- if (aConnection == sheet::FilterConnection_AND)
- {
- rExport.StartElement( aName, true);
- bOpenAndElement = true;
- }
- else
- bOpenAndElement = false;
- for (sal_Int32 i = 1; i < nTableFilterFields; ++i)
- {
- if (aConnection != aTableFilterFields[i].Connection)
- {
- aConnection = aTableFilterFields[i].Connection;
- if (aTableFilterFields[i].Connection == sheet::FilterConnection_AND)
- {
- rExport.StartElement( aName, true );
- bOpenAndElement = true;
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- aPrevFilterField = aTableFilterFields[i];
- if (i == nTableFilterFields - 1)
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- rExport.EndElement(aName, true);
- bOpenAndElement = false;
- }
- }
- else
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- aPrevFilterField = aTableFilterFields[i];
- if (bOpenAndElement)
- {
- rExport.EndElement(aName, true);
- bOpenAndElement = false;
- }
- if (i == nTableFilterFields - 1)
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- }
- else
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- aPrevFilterField = aTableFilterFields[i];
- if (i == nTableFilterFields - 1)
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- if(bOpenAndElement)
- rExport.EndElement(aName, true);
- }
- }
- }
-}
-
-void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::PropertyValue> aSortProperties)
-{
- uno::Sequence <table::TableSortField> aSortFields;
- bool bBindFormatsToContent (true);
- bool bCopyOutputData (false);
- bool bIsUserListEnabled (false);
- table::CellAddress aOutputPosition;
- sal_Int32 nUserListIndex = 0;
- sal_Int32 nProperties = aSortProperties.getLength();
- sal_Int32 i;
- for (i = 0; i < nProperties; ++i)
- {
- if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_BINDFMT) == 0)
- bBindFormatsToContent = ::cppu::any2bool(aSortProperties[i].Value);
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COPYOUT) == 0)
- bCopyOutputData = ::cppu::any2bool(aSortProperties[i].Value);
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0)
- bIsUserListEnabled = ::cppu::any2bool(aSortProperties[i].Value);
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_OUTPOS) == 0)
- aSortProperties[i].Value >>= aOutputPosition;
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_UINDEX) == 0)
- aSortProperties[i].Value >>= nUserListIndex;
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_SORTFLD) == 0)
- aSortProperties[i].Value >>= aSortFields;
- }
- sal_Int32 nSortFields = aSortFields.getLength();
- if (nSortFields > 0)
- {
- if (!bBindFormatsToContent)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_FALSE);
- if (bCopyOutputData)
- {
- rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
- }
-
- if (aSortFields[0].IsCaseSensitive)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
-#if OSL_DEBUG_LEVEL > 0
- bool bCaseSensitive(aSortFields[0].IsCaseSensitive);
- for (i = 1; i < nSortFields; ++i)
- {
- OSL_ENSURE(bCaseSensitive == (bool) aSortFields[i].IsCaseSensitive, "seems that it is now possible to have every field case sensitive");
- }
-#endif
- if (aSortFields[0].CollatorLocale.Language.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aSortFields[0].CollatorLocale.Language);
- if (aSortFields[0].CollatorLocale.Country.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aSortFields[0].CollatorLocale.Country);
- if (aSortFields[0].CollatorAlgorithm.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ALGORITHM, aSortFields[0].CollatorAlgorithm);
-#if OSL_DEBUG_LEVEL > 0
- rtl::OUString sLanguage(aSortFields[0].CollatorLocale.Language);
- rtl::OUString sCountry(aSortFields[0].CollatorLocale.Country);
- rtl::OUString sAlgorithm(aSortFields[0].CollatorAlgorithm);
- for (i = 1; i < nSortFields; ++i)
- {
- OSL_ENSURE(sLanguage == aSortFields[i].CollatorLocale.Language, "seems that it is now possible to have every field localized");
- OSL_ENSURE(sCountry == aSortFields[i].CollatorLocale.Country, "seems that it is now possible to have every field localized");
- OSL_ENSURE(sAlgorithm == aSortFields[i].CollatorAlgorithm, "seems that it is now possible to have every field localized");
- }
-#endif
- SvXMLElementExport aElemS(rExport, XML_NAMESPACE_TABLE, XML_SORT, true, true);
- rExport.CheckAttrList();
- for (i = 0; i < nSortFields; ++i)
- {
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(aSortFields[i].Field));
- if (!aSortFields[i].IsAscending)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING);
- if (!bIsUserListEnabled)
- {
- switch (aSortFields[i].FieldType)
- {
- case table::TableSortFieldType_ALPHANUMERIC :
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TEXT);
- break;
- case table::TableSortFieldType_AUTOMATIC :
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_AUTOMATIC);
- break;
- case table::TableSortFieldType_NUMERIC :
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_NUMBER);
- break;
- default:
- {
- // added to avoid warnings
- }
- }
- }
- else
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERLIST)) + rtl::OUString::valueOf(nUserListIndex));
- SvXMLElementExport aElemSb(rExport, XML_NAMESPACE_TABLE, XML_SORT_BY, true, true);
- rExport.CheckAttrList();
- }
- }
-}
-
-void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSubTotalDescriptor> xSubTotalDescriptor, const rtl::OUString sDatabaseRangeName)
-{
- uno::Reference <container::XIndexAccess> xIndexAccess (xSubTotalDescriptor, uno::UNO_QUERY);
- if (xIndexAccess.is())
- {
- sal_Int32 nSubTotalFields = xIndexAccess->getCount();
- if (nSubTotalFields > 0)
- {
- uno::Reference <beans::XPropertySet> xPropertySet (xSubTotalDescriptor, uno::UNO_QUERY);
- if (xPropertySet.is())
- {
- if (!::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_FALSE);
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_INSBRK)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TRUE);
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
- }
- SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, true, true);
- rExport.CheckAttrList();
- {
- ScDBCollection* pDBCollection = pDoc->GetDBCollection();
- ScDBData* pDBData = pDBCollection->getNamedDBs().findByName(sDatabaseRangeName);
- ScSubTotalParam aSubTotalParam;
- pDBData->GetSubTotalParam(aSubTotalParam);
- if (aSubTotalParam.bDoSort)
- {
- if (!aSubTotalParam.bAscending)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING);
- if (aSubTotalParam.bUserDef)
- {
- rtl::OUString sUserList(RTL_CONSTASCII_USTRINGPARAM(SC_USERLIST));
- sUserList += rtl::OUString::valueOf(aSubTotalParam.nUserIndex);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, sUserList);
- }
- SvXMLElementExport aElemSGs(rExport, XML_NAMESPACE_TABLE, XML_SORT_GROUPS, true, true);
- rExport.CheckAttrList();
- }
- }
- for (sal_Int32 i = 0; i < nSubTotalFields; ++i)
- {
- uno::Reference <sheet::XSubTotalField> xSubTotalField(xIndexAccess->getByIndex(i), uno::UNO_QUERY);
- if (xSubTotalField.is())
- {
- sal_Int32 nGroupColumn = xSubTotalField->getGroupColumn();
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nGroupColumn));
- SvXMLElementExport aElemSTR(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true);
- rExport.CheckAttrList();
- uno::Sequence <sheet::SubTotalColumn> aSubTotalColumns = xSubTotalField->getSubTotalColumns();
- sal_Int32 nSubTotalColumns = aSubTotalColumns.getLength();
- for (sal_Int32 j = 0; j < nSubTotalColumns; ++j)
- {
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(aSubTotalColumns[j].Column));
- rtl::OUString sFunction;
- ScXMLConverter::GetStringFromFunction( sFunction, aSubTotalColumns[j].Function );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction);
- SvXMLElementExport aElemSTF(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, true, true);
- rExport.CheckAttrList();
- }
- }
- }
- }
- }
-}
-
namespace {
class WriteDatabaseRange : public ::std::unary_function<ScDBData, void>
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index 92690d28247a..425cdf8fe80e 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -46,12 +46,8 @@ class ScXMLExportDatabaseRanges
ScXMLExport& rExport;
ScDocument* pDoc;
- void WriteImportDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aImportDescriptor);
rtl::OUString getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const;
void WriteCondition(const com::sun::star::sheet::TableFilterField2& aFilterField, bool bIsCaseSensitive, bool bUseRegularExpressions);
- void WriteFilterDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSheetFilterDescriptor2>& xSheetFilterDescriptor, const rtl::OUString sDatabaseRangeName);
- void WriteSortDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortProperties);
- void WriteSubTotalDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSubTotalDescriptor> xSubTotalDescriptor, const rtl::OUString sDatabaseRangeName);
public:
ScXMLExportDatabaseRanges(ScXMLExport& rExport);
~ScXMLExportDatabaseRanges();
diff --git a/unusedcode.easy b/unusedcode.easy
index f518828752ac..d1f026f85e48 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -474,16 +474,9 @@ ScVbaShapes::AddShape(rtl::OUString const&, rtl::OUString const&, int, int, int,
ScVbaWindows::ScVbaWindows(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
ScXMLExportDDELinks::CellsEqual(bool, bool, String const&, double const&, bool, bool, String const&, double const&) const
-ScXMLExportDatabaseRanges::WriteFilterDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSheetFilterDescriptor2> const&, rtl::OUString)
-ScXMLExportDatabaseRanges::WriteImportDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
-ScXMLExportDatabaseRanges::WriteSortDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
-ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor>, rtl::OUString)
ScaList::Insert(void*, unsigned int)
SchXMLExport::SetProgress(int)
SchXMLExportHelper_Impl::getCellAddress(int, int)
-SchXMLImport::SchXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel>, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver>&, unsigned char, unsigned char)
-SchXMLImportHelper::GetAutoStyleAttrTokenMap()
-SchXMLImportHelper::GetNewLabeledDataSequence()
SchXMLPositonAttributesHelper::getPosition() const
SchXMLPositonAttributesHelper::getSize() const
SchXMLSeriesHelper::getFirstCandleStickSeries(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&)
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 11b90ca5a34f..5ac793d944f3 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -177,13 +177,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_uInt16 nImportFlags = IMPORT_ALL );
- // #110680#
- SchXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel,
- com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver > &,
- sal_Bool bLoadDoc, sal_Bool bShowProgress );
-
virtual ~SchXMLImport() throw ();
// XServiceInfo ( : SvXMLExport )
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index ea4c459148ad..9c0ca34c4815 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -124,7 +124,6 @@ public:
const SvXMLTokenMap& GetChartAttrTokenMap();
const SvXMLTokenMap& GetPlotAreaAttrTokenMap();
- const SvXMLTokenMap& GetAutoStyleAttrTokenMap();
const SvXMLTokenMap& GetCellAttrTokenMap();
const SvXMLTokenMap& GetSeriesAttrTokenMap();
const SvXMLTokenMap& GetRegEquationAttrTokenMap();
@@ -156,9 +155,6 @@ public:
::com::sun::star::chart2::XDataSeries >& xSeries,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xDoc );
-
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence();
};
#endif // _XMLOFF_SCH_XMLIMPORTHELPER_HXX_
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 6643b8a7ace6..645a60be8b3f 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -367,23 +367,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
return *mpPlotAreaAttrTokenMap;
}
-const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap()
-{
- if( ! mpAutoStyleAttrTokenMap )
- {
- static SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] =
-{
- { XML_NAMESPACE_STYLE, XML_FAMILY, XML_TOK_AS_FAMILY },
- { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_AS_NAME },
- XML_TOKEN_MAP_END
-};
-
- mpAutoStyleAttrTokenMap = new SvXMLTokenMap( aAutoStyleAttrTokenMap );
- } // if( ! mpAutoStyleAttrTokenMap )
-
- return *mpAutoStyleAttrTokenMap;
-}
-
const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
{
if( ! mpCellAttrTokenMap )
@@ -575,16 +558,6 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
return xResult;
}
-// static
-Reference< chart2::data::XLabeledDataSequence > SchXMLImportHelper::GetNewLabeledDataSequence()
-{
- // @todo: remove this asap
- OSL_FAIL( "Do not call this method" );
- Reference< chart2::data::XLabeledDataSequence > xResult;
- // DO NOT USED -- DEPRECATED. Use SchXMLTools::GetNewLabeledDataSequence() instead
- return xResult;
-}
-
// ========================================
// #110680#
@@ -599,43 +572,6 @@ SchXMLImport::SchXMLImport(
mbIsGraphicLoadOnDemandSupported = false;
}
-// #110680#
-SchXMLImport::SchXMLImport(
- const Reference< lang::XMultiServiceFactory >& xServiceFactory,
- Reference< frame::XModel > xModel,
- Reference< document::XGraphicObjectResolver >& rGrfContainer,
- sal_Bool /*bLoadDoc*/, sal_Bool bShowProgress )
-: SvXMLImport( xServiceFactory, xModel, rGrfContainer )
-{
- GetNamespaceMap().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
- GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
-
- // get status indicator (if requested)
- if( bShowProgress )
- {
- Reference< frame::XController > xController( xModel->getCurrentController());
- if( xController.is())
- {
- Reference< frame::XFrame > xFrame( xController->getFrame());
- if( xFrame.is())
- {
- Reference< task::XStatusIndicatorSupplier > xFactory( xFrame, uno::UNO_QUERY );
- if( xFactory.is())
- {
- mxStatusIndicator = xFactory->getStatusIndicator();
- }
- }
- }
- }
-
- // add progress view
- if( mxStatusIndicator.is())
- {
- const OUString aText( RTL_CONSTASCII_USTRINGPARAM( "XML Import" ));
- mxStatusIndicator->start( aText, 100 ); // use percentage as values
- }
-}
-
SchXMLImport::~SchXMLImport() throw ()
{
// stop progress view
generated by cgit (git 2.34.1) at 2024-09-12 13:36:37 +0000