diff options
Diffstat (limited to 'reportdesign/source')
5 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index e7f97aec9f83..378b8041cb04 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1278,7 +1278,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY); if ( xProp.is() ) { - static const OUStringLiteral sPropName = u"MediaType"; + static constexpr OUStringLiteral sPropName = u"MediaType"; OUString sOldMediaType; xProp->getPropertyValue(sPropName) >>= sOldMediaType; if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII != sOldMediaType ) diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index a60c59b20fa2..13e5dacb3c70 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -130,7 +130,7 @@ OUString OReportEngineJFree::getNewOutputName() if ( !m_xReport.is() || !m_xActiveConnection.is() ) throw lang::IllegalArgumentException(); - static const OUStringLiteral s_sMediaType = u"MediaType"; + static constexpr OUStringLiteral s_sMediaType = u"MediaType"; MimeConfigurationHelper aConfighelper(m_xContext); const OUString sMimeType = m_xReport->getMimeType(); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index ed93930bebb7..b461787b08ae 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -345,7 +345,7 @@ void ExportDocumentHandler::exportTableRows() const OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) ); const OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ; const OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) ); - static const OUStringLiteral s_sFloat = u"float"; + static constexpr OUStringLiteral s_sFloat = u"float"; SvXMLAttributeList* pCellAtt = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt; diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 72da191b0710..d9e761c2466c 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -340,7 +340,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) { - static const OUStringLiteral s_sDatabaseDataProvider = u"com.sun.star.chart2.data.DatabaseDataProvider"; + static constexpr OUStringLiteral s_sDatabaseDataProvider = u"com.sun.star.chart2.data.DatabaseDataProvider"; m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider ,m_xContext),uno::UNO_QUERY_THROW); m_xDatabaseDataProvider->setRowLimit(10); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index cf9ff3c7bc02..2fbbb37992d6 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -417,7 +417,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) aArgs[0] <<= beans::NamedValue("Storage",uno::makeAny(xStorage)); xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments("com.sun.star.document.ImportEmbeddedObjectResolver",aArgs) , uno::UNO_QUERY); - static const OUStringLiteral s_sOld = u"OldFormat"; + static constexpr OUStringLiteral s_sOld = u"OldFormat"; static comphelper::PropertyMapEntry const pMap[] = { { OUString("OldFormat") , 1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND, 0 }, @@ -436,8 +436,8 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) xProp->setPropertyValue("StreamRelPath", uno::makeAny(sHierarchicalDocumentName)); uno::Reference<XComponent> xModel = GetModel(); - static const OUStringLiteral s_sMeta = u"meta.xml"; - static const OUStringLiteral s_sStreamName = u"StreamName"; + static constexpr OUStringLiteral s_sMeta = u"meta.xml"; + static constexpr OUStringLiteral s_sStreamName = u"StreamName"; xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString(s_sMeta))); ErrCode nRet = ReadThroughComponent( xStorage ,xModel @@ -758,7 +758,7 @@ bool ORptFilter::isOldFormat() const uno::Reference<beans::XPropertySet> xProp = getImportInfo(); if ( xProp.is() ) { - static const OUStringLiteral s_sOld = u"OldFormat"; + static constexpr OUStringLiteral s_sOld = u"OldFormat"; if ( xProp->getPropertySetInfo()->hasPropertyByName(s_sOld)) { xProp->getPropertyValue(s_sOld) >>= bOldFormat; |