chart2/source/model/filter/XMLFilter.cxx | 4 comphelper/source/misc/storagehelper.cxx | 52 +++++----- dbaccess/source/core/dataaccess/databasedocument.cxx | 2 dbaccess/source/filter/xml/dbloader2.cxx | 2 embeddedobj/source/commonembedding/xfactory.cxx | 4 embeddedobj/source/general/xcreator.cxx | 4 extensions/source/activex/so_activex.cxx | 52 +++++----- filter/source/storagefilterdetect/filterdetect.cxx | 52 +++++----- include/comphelper/documentconstants.hxx | 62 ++++++------ package/source/manifest/ManifestExport.cxx | 32 +++--- reportdesign/source/core/api/ReportDefinition.cxx | 10 - reportdesign/source/filter/xml/dbloader2.cxx | 2 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2 reportdesign/source/ui/report/ReportController.cxx | 8 - sd/source/ui/dlg/TemplateScanner.cxx | 6 - sot/source/base/exchange.cxx | 48 ++++----- sw/qa/extras/odfexport/odfexport.cxx | 6 - 17 files changed, 174 insertions(+), 174 deletions(-)
New commits: commit a255b04d8dbc11278e7a8b59a2639b38b4a8a744 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Sep 20 20:37:22 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Sep 20 19:35:12 2025 +0200 Shorten some names ending with _ASCII Whatever that was intended to mean: if that meant that the constants were encoded that way, these are UTF-16 already; is that meant that they only contained characters in that range, that is unimportant. Change-Id: I5463f1fca0d552a93d3c9d487ed9912c9e1a989e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191240 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index f68081330347..6abb74024504 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -703,7 +703,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes } OUString XMLFilter::getMediaType(bool _bOasis) { - return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII : MIMETYPE_VND_SUN_XML_CHART_ASCII; + return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART; } OUString SAL_CALL XMLFilter::getImplementationName() @@ -734,7 +734,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > } OUString XMLReportFilterHelper::getMediaType(bool ) { - return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII; + return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART; } } // namespace chart diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 1948b66ba65e..b0b55e9a45f7 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -247,37 +247,37 @@ sal_Int32 OStorageHelper::GetXStorageFormat( // TODO/LATER: the filter configuration could be used to detect it later, or better a special service if ( - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_DRAW_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_CALC_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_CHART_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_MATH_ASCII ) + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_WEB ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_GLOBAL) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_DRAW ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_IMPRESS ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_CALC ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_CHART ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_MATH ) ) { nResult = SOFFICE_FILEFORMAT_60; } else if ( - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII ) + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE ) ) { nResult = SOFFICE_FILEFORMAT_8; diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 8be42a59112e..b1e561c0d789 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1649,7 +1649,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r aDelegatorArguments.getArray()[nArgsLen++] <<= xInfoSet; Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW ); - xProp->setPropertyValue( INFO_MEDIATYPE, Any( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) ); + xProp->setPropertyValue( INFO_MEDIATYPE, Any( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) ); OUString aVersion; SvtSaveOptions::ODFSaneDefaultVersion const nDefVersion = diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 9bf4f01a2c6b..e855d9101822 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -130,7 +130,7 @@ OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::Prope { OUString sMediaType; xStorageProperties->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType; - if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII || sMediaType == MIMETYPE_VND_SUN_XML_BASE_ASCII ) + if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE || sMediaType == MIMETYPE_VND_SUN_XML_BASE ) { if ( bStreamFromDescr && !sURL.startsWith( "private:stream" ) ) { diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 84ac5955b4c1..3b5765a91cec 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -94,8 +94,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Sequence< beans::NamedValue > aObject = m_aConfigHelper.GetObjectPropsByMediaType( aMediaType ); // If the sequence is empty, fall back to the FileFormatVersion=6200 filter, Base only has that. - if (!aObject.hasElements() && aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) - aObject = m_aConfigHelper.GetObjectPropsByMediaType(MIMETYPE_VND_SUN_XML_BASE_ASCII); + if (!aObject.hasElements() && aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE) + aObject = m_aConfigHelper.GetObjectPropsByMediaType(MIMETYPE_VND_SUN_XML_BASE); if ( !aObject.hasElements() ) throw io::IOException(); // unexpected mimetype of the storage diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index c6de2487766d..b08e159ca02a 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -163,8 +163,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta aEmbedFactory = m_aConfigHelper.GetFactoryNameByMediaType( aMediaType ); // If no factory is found, fall back to the FileFormatVersion=6200 filter, Base only has that. - if (aEmbedFactory.isEmpty() && aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) - aEmbedFactory = m_aConfigHelper.GetFactoryNameByMediaType(MIMETYPE_VND_SUN_XML_BASE_ASCII); + if (aEmbedFactory.isEmpty() && aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE) + aEmbedFactory = m_aConfigHelper.GetFactoryNameByMediaType(MIMETYPE_VND_SUN_XML_BASE); } if ( !aEmbedFactory.isEmpty() diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index dadd8ae7eebd..ec6c28c8e07e 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -170,32 +170,32 @@ const sal_Unicode* const aMimeType[] = { u"application/vnd.stardivision.writer", u"application/vnd.stardivision.math", - MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII.getStr(), - - MIMETYPE_VND_SUN_XML_WRITER_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_CALC_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_IMPRESS_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_DRAW_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII.getStr(), - MIMETYPE_VND_SUN_XML_MATH_ASCII.getStr(), - - MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII.getStr(), - - MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII.getStr(), - MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII.getStr() }; + MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE.getStr(), + MIMETYPE_VND_SUN_XML_CALC_TEMPLATE.getStr(), + MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE.getStr(), + MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE.getStr(), + + MIMETYPE_VND_SUN_XML_WRITER.getStr(), + MIMETYPE_VND_SUN_XML_CALC.getStr(), + MIMETYPE_VND_SUN_XML_IMPRESS.getStr(), + MIMETYPE_VND_SUN_XML_DRAW.getStr(), + MIMETYPE_VND_SUN_XML_WRITER_GLOBAL.getStr(), + MIMETYPE_VND_SUN_XML_MATH.getStr(), + + MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE.getStr(), + + MIMETYPE_OASIS_OPENDOCUMENT_TEXT.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_DRAWING.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET.getStr(), + MIMETYPE_OASIS_OPENDOCUMENT_FORMULA.getStr() }; const int nForModes[] = { 16, 1, 2, 4, 4, 8, 16, 32, diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx index fb7e3ab324fe..cc4c8950d35f 100644 --- a/filter/source/storagefilterdetect/filterdetect.cxx +++ b/filter/source/storagefilterdetect/filterdetect.cxx @@ -43,34 +43,34 @@ namespace { OUString getInternalFromMediaType(std::u16string_view aMediaType) { // OpenDocument types - if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) return u"writer8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) return u"writer8_template"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) return u"writerweb8_writer_template"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) return u"writerglobal8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII ) return u"writerglobal8_template"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) return u"draw8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) return u"draw8_template"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) return u"impress8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ) return u"impress8_template"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) return u"calc8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) return u"calc8_template"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) return u"chart8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) return u"math8"_ustr; - else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) return u"StarBaseReportChart"_ustr; + if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT ) return u"writer8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE ) return u"writer8_template"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB ) return u"writerweb8_writer_template"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL ) return u"writerglobal8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE ) return u"writerglobal8_template"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING ) return u"draw8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE ) return u"draw8_template"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION ) return u"impress8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE ) return u"impress8_template"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET ) return u"calc8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE ) return u"calc8_template"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART ) return u"chart8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA ) return u"math8"_ustr; + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART ) return u"StarBaseReportChart"_ustr; // OOo legacy types - else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_ASCII ) return u"writer_StarOffice_XML_Writer"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII ) return u"writer_StarOffice_XML_Writer_Template"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) return u"writer_web_StarOffice_XML_Writer_Web_Template"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ) return u"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_ASCII ) return u"draw_StarOffice_XML_Draw"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII ) return u"draw_StarOffice_XML_Draw_Template"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) return u"impress_StarOffice_XML_Impress"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII ) return u"impress_StarOffice_XML_Impress_Template"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_ASCII ) return u"calc_StarOffice_XML_Calc"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII ) return u"calc_StarOffice_XML_Calc_Template"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_CHART_ASCII ) return u"chart_StarOffice_XML_Chart"_ustr; - else if ( aMediaType == MIMETYPE_VND_SUN_XML_MATH_ASCII ) return u"math_StarOffice_XML_Math"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER ) return u"writer_StarOffice_XML_Writer"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE ) return u"writer_StarOffice_XML_Writer_Template"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_WEB ) return u"writer_web_StarOffice_XML_Writer_Web_Template"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_GLOBAL ) return u"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW ) return u"draw_StarOffice_XML_Draw"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE ) return u"draw_StarOffice_XML_Draw_Template"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS ) return u"impress_StarOffice_XML_Impress"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE ) return u"impress_StarOffice_XML_Impress_Template"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC ) return u"calc_StarOffice_XML_Calc"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_TEMPLATE ) return u"calc_StarOffice_XML_Calc_Template"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_CHART ) return u"chart_StarOffice_XML_Chart"_ustr; + else if ( aMediaType == MIMETYPE_VND_SUN_XML_MATH ) return u"math_StarOffice_XML_Math"_ustr; // Unknown type return OUString(); diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx index 4461d7cbe2de..0a80f5c2eb7b 100644 --- a/include/comphelper/documentconstants.hxx +++ b/include/comphelper/documentconstants.hxx @@ -23,43 +23,43 @@ #include <rtl/ustring.hxx> // formats of SO6/7 -inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_ASCII = u"application/vnd.sun.xml.writer"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII = u"application/vnd.sun.xml.writer.web"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII = u"application/vnd.sun.xml.writer.global"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_DRAW_ASCII = u"application/vnd.sun.xml.draw"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_IMPRESS_ASCII = u"application/vnd.sun.xml.impress"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_CALC_ASCII = u"application/vnd.sun.xml.calc"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_CHART_ASCII = u"application/vnd.sun.xml.chart"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_MATH_ASCII = u"application/vnd.sun.xml.math"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_BASE_ASCII = u"application/vnd.sun.xml.base"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER = u"application/vnd.sun.xml.writer"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_WEB = u"application/vnd.sun.xml.writer.web"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_GLOBAL = u"application/vnd.sun.xml.writer.global"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_DRAW = u"application/vnd.sun.xml.draw"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_IMPRESS = u"application/vnd.sun.xml.impress"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_CALC = u"application/vnd.sun.xml.calc"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_CHART = u"application/vnd.sun.xml.chart"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_MATH = u"application/vnd.sun.xml.math"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_BASE = u"application/vnd.sun.xml.base"_ustr; // template formats of SO6/7 -inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII = u"application/vnd.sun.xml.writer.template"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII = u"application/vnd.sun.xml.draw.template"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII = u"application/vnd.sun.xml.impress.template"_ustr; -inline constexpr OUString MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII = u"application/vnd.sun.xml.calc.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE = u"application/vnd.sun.xml.writer.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE = u"application/vnd.sun.xml.draw.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE = u"application/vnd.sun.xml.impress.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_CALC_TEMPLATE = u"application/vnd.sun.xml.calc.template"_ustr; // formats of SO8 -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII = u"application/vnd.oasis.opendocument.text"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII = u"application/vnd.oasis.opendocument.text-web"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII = u"application/vnd.oasis.opendocument.text-master"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII = u"application/vnd.oasis.opendocument.graphics"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII = u"application/vnd.oasis.opendocument.presentation"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII = u"application/vnd.oasis.opendocument.spreadsheet"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII = u"application/vnd.oasis.opendocument.chart"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII = u"application/vnd.oasis.opendocument.formula"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII = u"application/vnd.oasis.opendocument.base"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII = u"application/vnd.sun.xml.report"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII = u"application/vnd.sun.xml.report.chart"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT = u"application/vnd.oasis.opendocument.text"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB = u"application/vnd.oasis.opendocument.text-web"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL = u"application/vnd.oasis.opendocument.text-master"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DRAWING = u"application/vnd.oasis.opendocument.graphics"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION = u"application/vnd.oasis.opendocument.presentation"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET = u"application/vnd.oasis.opendocument.spreadsheet"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_CHART = u"application/vnd.oasis.opendocument.chart"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_FORMULA = u"application/vnd.oasis.opendocument.formula"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DATABASE = u"application/vnd.oasis.opendocument.base"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_REPORT = u"application/vnd.sun.xml.report"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART = u"application/vnd.sun.xml.report.chart"_ustr; // template formats of SO8 -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.text-template"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.text-master-template"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.graphics-template"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.presentation-template"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.spreadsheet-template"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.chart-template"_ustr; -inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.formula-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE = u"application/vnd.oasis.opendocument.text-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE = u"application/vnd.oasis.opendocument.text-master-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE = u"application/vnd.oasis.opendocument.graphics-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE = u"application/vnd.oasis.opendocument.presentation-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE = u"application/vnd.oasis.opendocument.spreadsheet-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE = u"application/vnd.oasis.opendocument.chart-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE = u"application/vnd.oasis.opendocument.formula-template"_ustr; // ODF versions diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 7593bb035206..85dbf6ebb132 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -138,22 +138,22 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con bool bStoreStartKeyGeneration = false; if ( !aDocMediaType.isEmpty() ) { - if ( aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII - || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII ) + if ( aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE ) { // oasis format diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index a492cf5598f7..5e5de10606b0 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -516,7 +516,7 @@ struct OReportDefinitionImpl ,m_aModifyListeners(_aMutex) ,m_aLegacyEventListeners(_aMutex) ,m_aDocEventListeners(_aMutex) - ,m_sMimeType(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII) + ,m_sMimeType(MIMETYPE_OASIS_OPENDOCUMENT_TEXT) ,m_sIdentifier(SERVICE_REPORTDEFINITION) // default visual area is 8 x 7 cm ,m_aVisualAreaSize( 8000, 7000 ) @@ -609,7 +609,7 @@ void OReportDefinition::init() OUString sMediaType; xStorProps->getPropertyValue(u"MediaType"_ustr) >>= sMediaType; if ( sMediaType.isEmpty() ) - xStorProps->setPropertyValue(u"MediaType"_ustr,uno::Any(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)); + xStorProps->setPropertyValue(u"MediaType"_ustr,uno::Any(MIMETYPE_OASIS_OPENDOCUMENT_REPORT)); } m_pImpl->m_pObjectContainer = std::make_shared<comphelper::EmbeddedObjectContainer>(m_pImpl->m_xStorage , getXWeak() ); } @@ -1301,8 +1301,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS static constexpr OUString sPropName = u"MediaType"_ustr; OUString sOldMediaType; xProp->getPropertyValue(sPropName) >>= sOldMediaType; - if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII != sOldMediaType ) - xProp->setPropertyValue( sPropName, uno::Any(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII) ); + if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT != sOldMediaType ) + xProp->setPropertyValue( sPropName, uno::Any(MIMETYPE_OASIS_OPENDOCUMENT_REPORT) ); } /** property map for export info set */ @@ -1899,7 +1899,7 @@ void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes( ) { - return { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII }; + return { MIMETYPE_OASIS_OPENDOCUMENT_TEXT, MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET }; } // css::XUnoTunnel diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 81e7f1289023..257449461610 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -64,7 +64,7 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue { OUString sMediaType; xProp->getPropertyValue(u"MediaType"_ustr) >>= sMediaType; - if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) + if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT ) return u"StarBaseReport"_ustr; ::comphelper::disposeComponent(xProp); } diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 81140bd7e161..166601b24574 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -147,7 +147,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const if ( !bEscapeProcessing ) pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE )); - pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII); + pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART); m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),pList); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 8c06ff929ce2..2172790bf587 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -374,11 +374,11 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const { case SID_RPT_TEXTDOCUMENT: aReturn.bEnabled = isEditable(); - aReturn.bChecked = (m_xReportDefinition.is() && m_xReportDefinition->getMimeType() == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII); + aReturn.bChecked = (m_xReportDefinition.is() && m_xReportDefinition->getMimeType() == MIMETYPE_OASIS_OPENDOCUMENT_TEXT); break; case SID_RPT_SPREADSHEET: aReturn.bEnabled = isEditable(); - aReturn.bChecked = (m_xReportDefinition.is() && m_xReportDefinition->getMimeType() == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII); + aReturn.bChecked = (m_xReportDefinition.is() && m_xReportDefinition->getMimeType() == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET); break; case SID_REPORTHEADER_WITHOUT_UNDO: case SID_REPORTFOOTER_WITHOUT_UNDO: @@ -978,11 +978,11 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { case SID_RPT_TEXTDOCUMENT: if ( m_xReportDefinition.is() ) - m_xReportDefinition->setMimeType( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ); + m_xReportDefinition->setMimeType( MIMETYPE_OASIS_OPENDOCUMENT_TEXT ); break; case SID_RPT_SPREADSHEET: if (m_xReportDefinition.is() ) - m_xReportDefinition->setMimeType( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ); + m_xReportDefinition->setMimeType( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET ); break; case SID_REPORTHEADER_WITHOUT_UNDO: case SID_REPORTFOOTER_WITHOUT_UNDO: diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index d8c1528d769c..74f07b1e15fb 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -171,10 +171,10 @@ TemplateScanner::State TemplateScanner::ScanEntry() // first if necessary). // These strings are used to find impress templates in the tree of // template files. Should probably be determined dynamically. - if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII) - || (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII) + if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE) + || (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION) || (sContentType == "application/vnd.stardivision.impress") - || (sContentType == MIMETYPE_VND_SUN_XML_IMPRESS_ASCII) + || (sContentType == MIMETYPE_VND_SUN_XML_IMPRESS) // The following id comes from the bugdoc in #i2764#. || (sContentType == "Impress 2.0")) { diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 0c291760c369..c8de5f17b777 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -161,14 +161,14 @@ const DataFlavorRepresentation* FormatArray_Impl() /*104 UNIFORMRESOURCELOCATOR*/ { u"application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocatorW\""_ustr, "UniformResourceLocator", &cppu::UnoType<OUString>::get() }, /*105 STARCHARTDOCUMENT_50*/ { u"application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\""_ustr, "StarChartDocument 5.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*106 GRAPHOBJ*/ { u"application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\""_ustr, "Graphic Object", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*107 STARWRITER_60*/ { MIMETYPE_VND_SUN_XML_WRITER_ASCII, "Writer 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*108 STARWRITERWEB_60*/ { MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII, "Writer/Web 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*109 STARWRITERGLOB_60*/ { MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII, "Writer/Global 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*110 STARWDRAW_60*/ { MIMETYPE_VND_SUN_XML_DRAW_ASCII, "Draw 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*111 STARIMPRESS_60*/ { MIMETYPE_VND_SUN_XML_IMPRESS_ASCII, "Impress 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*112 STARCALC_60*/ { MIMETYPE_VND_SUN_XML_CALC_ASCII, "Calc 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*113 STARCHART_60*/ { MIMETYPE_VND_SUN_XML_CHART_ASCII, "Chart 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*114 STARMATH_60*/ { MIMETYPE_VND_SUN_XML_MATH_ASCII, "Math 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*107 STARWRITER_60*/ { MIMETYPE_VND_SUN_XML_WRITER, "Writer 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*108 STARWRITERWEB_60*/ { MIMETYPE_VND_SUN_XML_WRITER_WEB, "Writer/Web 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*109 STARWRITERGLOB_60*/ { MIMETYPE_VND_SUN_XML_WRITER_GLOBAL, "Writer/Global 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*110 STARWDRAW_60*/ { MIMETYPE_VND_SUN_XML_DRAW, "Draw 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*111 STARIMPRESS_60*/ { MIMETYPE_VND_SUN_XML_IMPRESS, "Impress 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*112 STARCALC_60*/ { MIMETYPE_VND_SUN_XML_CALC, "Calc 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*113 STARCHART_60*/ { MIMETYPE_VND_SUN_XML_CHART, "Chart 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*114 STARMATH_60*/ { MIMETYPE_VND_SUN_XML_MATH, "Math 6.0", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*115 WMF*/ { u"application/x-openoffice-wmf;windows_formatname=\"Image WMF\""_ustr, "Windows MetaFile", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*116 DBACCESS_QUERY*/ { u"application/x-openoffice-dbaccess-query;windows_formatname=\"Data source Query Object\""_ustr, "Data source Query Object", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*117 DBACCESS_TABLE*/ { u"application/x-openoffice-dbaccess-table;windows_formatname=\"Data source Table\""_ustr, "Data source Table", &cppu::UnoType<Sequence<sal_Int8>>::get() }, @@ -178,25 +178,25 @@ const DataFlavorRepresentation* FormatArray_Impl() /*121 BIFF_8*/ { u"application/x-openoffice-biff-8;windows_formatname=\"Biff8\""_ustr, "Biff8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*122 BMP*/ { u"image/bmp"_ustr, "Windows Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*123 HTML_NO_COMMENT */ { u"application/x-openoffice-html-no-comment;windows_formatname=\"HTML Format\""_ustr, "HTML (no comment)", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*124 STARWRITER_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII, "Writer 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*125 STARWRITERWEB_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII, "Writer/Web 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*126 STARWRITERGLOB_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII, "Writer/Global 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*127 STARWDRAW_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII, "Draw 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*128 STARIMPRESS_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII, "Impress 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*129 STARCALC_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII, "Calc 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*130 STARCHART_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII, "Chart 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*131 STARMATH_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII, "Math 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*124 STARWRITER_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT, "Writer 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*125 STARWRITERWEB_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB, "Writer/Web 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*126 STARWRITERGLOB_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL, "Writer/Global 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*127 STARWDRAW_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DRAWING, "Draw 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*128 STARIMPRESS_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION, "Impress 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*129 STARCALC_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET, "Calc 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*130 STARCHART_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART, "Chart 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*131 STARMATH_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA, "Math 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*132 XFORMS */ { u"application/x-openoffice-xforms;windows_formatname=\"??? Format\""_ustr, "???", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*133 STARWRITER_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII, "Writer 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*134 STARWDRAW_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII, "Draw 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*135 STARIMPRESS_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII, "Impress 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*136 STARCALC_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII, "Calc 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*137 STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*138 STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*139 STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*133 STARWRITER_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE, "Writer 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*134 STARWDRAW_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE, "Draw 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*135 STARIMPRESS_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE, "Impress 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*136 STARCALC_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE, "Calc 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*137 STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE, "Chart 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*138 STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE, "Math 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*139 STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE, "StarBase 8", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*140 HC_GDIMETAFILE*/ { u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\""_ustr, "High Contrast GDIMetaFile", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*141 PNG*/ { u"image/png"_ustr, "PNG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, - /*142 STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*142 STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*143 MATHML*/ { u"application/mathml+xml"_ustr, "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() }, /*144 JPEG*/ { u"image/jpeg"_ustr, "JPEG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*145 RICHTEXT*/ { u"text/richtext"_ustr, "Richtext Format", &cppu::UnoType<Sequence<sal_Int8>>::get() }, diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 2d176ca6406f..cca5ad70ec7e 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -968,7 +968,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134987) uno::Reference< beans::XPropertySet > xStorProps(xStorage, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT(xStorProps->getPropertyValue(u"MediaType"_ustr) >>= aMediaType); - CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII)); + CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA)); } // checking second object (chart) { @@ -982,7 +982,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134987) uno::Reference< beans::XPropertySet > xStorProps(xStorage, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT(xStorProps->getPropertyValue(u"MediaType"_ustr) >>= aMediaType); - CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII)); + CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART)); } // checking third object (chart) { @@ -996,7 +996,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134987) uno::Reference< beans::XPropertySet > xStorProps(xStorage, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT(xStorProps->getPropertyValue(u"MediaType"_ustr) >>= aMediaType); - CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII)); + CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART)); } }
