ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Shorten some names ending with _ASCII

Browse Source 
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 <mike.kaganski@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Mike Kaganski
2025-09-20 19:35:12 +02:00
parent 24a54f699e
commit a255b04d8d
17 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/model/filter/XMLFilter.cxx
+2 -2
View File
@@ -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
comphelper/source/misc/storagehelper.cxx
+26 -26
View File
@@ -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;
dbaccess/source/core/dataaccess/databasedocument.cxx
+1 -1
View File
@@ -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 =
dbaccess/source/filter/xml/dbloader2.cxx
+1 -1
View File
@@ -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" ) )
{
embeddedobj/source/commonembedding/xfactory.cxx
+2 -2
View File
@@ -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
embeddedobj/source/general/xcreator.cxx
+2 -2
View File
@@ -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()
extensions/source/activex/so_activex.cxx
+23 -23
View File
@@ -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_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_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_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_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_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_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_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,
filter/source/storagefilterdetect/filterdetect.cxx
+26 -26
View File
@@ -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();
include/comphelper/documentconstants.hxx
+31 -31
View File
@@ -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
package/source/manifest/ManifestExport.cxx
+16 -16
View File
@@ -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
reportdesign/source/core/api/ReportDefinition.cxx
+5 -5
View File
@@ -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
reportdesign/source/filter/xml/dbloader2.cxx
+1 -1
View File
@@ -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);
}
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+1 -1
View File
@@ -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);
reportdesign/source/ui/report/ReportController.cxx
+4 -4
View File
@@ -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:
sd/source/ui/dlg/TemplateScanner.cxx
+3 -3
View File
@@ -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"))
{
sot/source/base/exchange.cxx
+24 -24
View File
@@ -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() },
sw/qa/extras/odfexport/odfexport.cxx
+3 -3
View File
@@ -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));
}
}