diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-10 09:55:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-10 12:40:38 +0200 |
| commit | 166f81f38e78d85202c3880e4656759ff0d5fda1 (patch) | |
| tree | 8ec3d1a7c96bb5740450b5827dd4515248f0a3d2 /reportdesign/source | |
| parent | 509ed148fc37731e021840f4cd8900d7a9a9b716 (diff) | |
loplugin:ostr in reportdesign
Change-Id: I49d112d1a068ff265aa2242e62f53919f43fa15c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167436
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source')
46 files changed, 642 insertions, 642 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 48caee33e5ae..b7b3fb6c7716 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -202,7 +202,7 @@ void SAL_CALL OFixedLine::dispose() OUString OFixedLine::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OFixedLine"; + return u"com.sun.star.comp.report.OFixedLine"_ustr; } @@ -519,7 +519,7 @@ OUString SAL_CALL OFixedLine::getShapeType( ) ::osl::MutexGuard aGuard(m_aMutex); if ( m_aProps.aComponent.m_xShape.is() ) return m_aProps.aComponent.m_xShape->getShapeType(); - return "com.sun.star.drawing.ControlShape"; + return u"com.sun.star.drawing.ControlShape"_ustr; } OUString SAL_CALL OFixedLine::getHyperLinkURL() diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index b7ace0bce37d..8e7cb68995a8 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -90,7 +90,7 @@ void SAL_CALL OFixedText::dispose() OUString OFixedText::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OFixedText"; + return u"com.sun.star.comp.report.OFixedText"_ustr; } @@ -313,7 +313,7 @@ OUString SAL_CALL OFixedText::getShapeType( ) ::osl::MutexGuard aGuard(m_aMutex); if ( m_aProps.aComponent.m_xShape.is() ) return m_aProps.aComponent.m_xShape->getShapeType(); - return "com.sun.star.drawing.ControlShape"; + return u"com.sun.star.drawing.ControlShape"_ustr; } diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 04558f710ed9..e16e6687c650 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -54,7 +54,7 @@ void SAL_CALL OFormatCondition::dispose() OUString OFormatCondition::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OFormatCondition"; + return u"com.sun.star.comp.report.OFormatCondition"_ustr; } diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index ec8d1a2f42cd..4a168c4f3137 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -99,7 +99,7 @@ void SAL_CALL OFormattedField::dispose() OUString OFormattedField::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OFormattedField"; + return u"com.sun.star.comp.report.OFormattedField"_ustr; } @@ -110,7 +110,7 @@ OUString SAL_CALL OFormattedField::getImplementationName( ) uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( ) { - return { SERVICE_FORMATTEDFIELD, "com.sun.star.awt.UnoControlFormattedFieldModel" }; + return { SERVICE_FORMATTEDFIELD, u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr }; } uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames( ) @@ -246,7 +246,7 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm { uno::Reference< beans::XPropertySet> xProp(::dbtools::findDataSource(getParent()),uno::UNO_QUERY); if ( xProp.is() ) - m_xFormatsSupplier.set(xProp->getPropertyValue("NumberFormatsSupplier"),uno::UNO_QUERY); + m_xFormatsSupplier.set(xProp->getPropertyValue(u"NumberFormatsSupplier"_ustr),uno::UNO_QUERY); } } return m_xFormatsSupplier; @@ -351,7 +351,7 @@ OUString SAL_CALL OFormattedField::getShapeType( ) ::osl::MutexGuard aGuard(m_aMutex); if ( m_aProps.aComponent.m_xShape.is() ) return m_aProps.aComponent.m_xShape->getShapeType(); - return "com.sun.star.drawing.ControlShape"; + return u"com.sun.star.drawing.ControlShape"_ustr; } diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 55150a992bf3..24f0a24e925e 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -54,7 +54,7 @@ void SAL_CALL OFunction::dispose() OUString OFunction::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OFunction"; + return u"com.sun.star.comp.report.OFunction"_ustr; } diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index b78e433cb4ae..ab368dda5940 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -59,7 +59,7 @@ IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet) OUString SAL_CALL OGroup::getImplementationName( ) { - return "com.sun.star.comp.report.Group"; + return u"com.sun.star.comp.report.Group"_ustr; } uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static() diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index cea3acfdf333..a3ab26e86d73 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -163,7 +163,7 @@ void SAL_CALL OImageControl::dispose() OUString OImageControl::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OImageControl"; + return u"com.sun.star.comp.report.OImageControl"_ustr; } @@ -449,7 +449,7 @@ OUString SAL_CALL OImageControl::getShapeType( ) ::osl::MutexGuard aGuard(m_aMutex); if ( m_aProps.aComponent.m_xShape.is() ) return m_aProps.aComponent.m_xShape->getShapeType(); - return "com.sun.star.drawing.ControlShape"; + return u"com.sun.star.drawing.ControlShape"_ustr; } ::sal_Int16 SAL_CALL OImageControl::getScaleMode() diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 6adc5f81bb0e..eeaba1dd644d 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -186,15 +186,15 @@ static void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStor uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY); sal_Int32 nOpenMode = embed::ElementModes::READ; if ( xProp.is() ) - xProp->getPropertyValue("OpenMode") >>= nOpenMode; + xProp->getPropertyValue(u"OpenMode"_ustr) >>= nOpenMode; _rModel->SetReadOnly((nOpenMode & embed::ElementModes::WRITE) != embed::ElementModes::WRITE); } static void lcl_stripLoadArguments( utl::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs ) { - _rDescriptor.erase( "StatusIndicator" ); - _rDescriptor.erase( "InteractionHandler" ); - _rDescriptor.erase( "Model" ); + _rDescriptor.erase( u"StatusIndicator"_ustr ); + _rDescriptor.erase( u"InteractionHandler"_ustr ); + _rDescriptor.erase( u"Model"_ustr ); _rDescriptor >> _rArgs; } @@ -289,7 +289,7 @@ OStyle::OStyle() const sal_Int32 nMayBeVoid = beans::PropertyAttribute::MAYBEVOID; sal_Int32 i = 0; - registerPropertyNoMember( PROPERTY_NAME, ++i, nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString("Default")) ); + registerPropertyNoMember( PROPERTY_NAME, ++i, nBound, cppu::UnoType<OUString>::get(), css::uno::Any(u"Default"_ustr) ); registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::Any(COL_TRANSPARENT)); @@ -299,7 +299,7 @@ OStyle::OStyle() registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2())); registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0))); registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::Any(nMargin)); - registerPropertyNoMember("DisplayName", ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString())); + registerPropertyNoMember(u"DisplayName"_ustr, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString())); registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::Any(COL_TRANSPARENT)); registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString())); registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC, ++i,nBound, cppu::UnoType<style::GraphicLocation>::get(), css::uno::Any(style::GraphicLocation_NONE)); @@ -356,7 +356,7 @@ OStyle::OStyle() registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound, cppu::UnoType<sal_Int16>::get(), css::uno::Any(style::NumberingType::ARABIC)); registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL, ++i,nBound, cppu::UnoType<sal_Int16>::get(), css::uno::Any(sal_Int16(0))); registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound, cppu::UnoType<style::PageStyleLayout>::get(), css::uno::Any(style::PageStyleLayout_ALL)); - registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString("[From printer settings]"))); + registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(u"[From printer settings]"_ustr)); registerPropertyNoMember(SC_UNO_PAGE_RIGHTBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2())); registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0))); registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::cppu::UnoType<sal_Int32>::get(), css::uno::Any(nMargin)); @@ -368,10 +368,10 @@ OStyle::OStyle() registerPropertyNoMember(SC_UNO_PAGE_TOPBORDER, ++i,nBound, cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2())); registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0))); registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::cppu::UnoType<sal_Int32>::get(), css::uno::Any(nMargin)); - registerPropertyNoMember("UserDefinedAttributes", ++i,nBound, cppu::UnoType<container::XNameContainer>::get(), css::uno::Any(comphelper::NameContainer_createInstance(cppu::UnoType<xml::AttributeData>::get()))); + registerPropertyNoMember(u"UserDefinedAttributes"_ustr, ++i,nBound, cppu::UnoType<container::XNameContainer>::get(), css::uno::Any(comphelper::NameContainer_createInstance(cppu::UnoType<xml::AttributeData>::get()))); registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width, cppu::UnoType<sal_Int32>::get() ); - registerPropertyNoMember("PrinterName", ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString())); - registerPropertyNoMember("PrinterSetup", ++i,nBound,cppu::UnoType<uno::Sequence<sal_Int8>>::get(), css::uno::Any(uno::Sequence<sal_Int8>())); + registerPropertyNoMember(u"PrinterName"_ustr, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString())); + registerPropertyNoMember(u"PrinterSetup"_ustr, ++i,nBound,cppu::UnoType<uno::Sequence<sal_Int8>>::get(), css::uno::Any(uno::Sequence<sal_Int8>())); } @@ -589,9 +589,9 @@ void OReportDefinition::init() m_pImpl->m_pReportModel = std::make_shared<OReportModel>(this); m_pImpl->m_pReportModel->SetScaleUnit( MapUnit::Map100thMM ); SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin(); - rAdmin.NewLayer("front", RPT_LAYER_FRONT.get()); - rAdmin.NewLayer("back", RPT_LAYER_BACK.get()); - rAdmin.NewLayer("HiddenLayer", RPT_LAYER_HIDDEN.get()); + rAdmin.NewLayer(u"front"_ustr, RPT_LAYER_FRONT.get()); + rAdmin.NewLayer(u"back"_ustr, RPT_LAYER_BACK.get()); + rAdmin.NewLayer(u"HiddenLayer"_ustr, RPT_LAYER_HIDDEN.get()); m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex ); m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() ); @@ -604,9 +604,9 @@ void OReportDefinition::init() if ( xStorProps.is()) { OUString sMediaType; - xStorProps->getPropertyValue("MediaType") >>= sMediaType; + xStorProps->getPropertyValue(u"MediaType"_ustr) >>= sMediaType; if ( sMediaType.isEmpty() ) - xStorProps->setPropertyValue("MediaType",uno::Any(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)); + xStorProps->setPropertyValue(u"MediaType"_ustr,uno::Any(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)); } m_pImpl->m_pObjectContainer = std::make_shared<comphelper::EmbeddedObjectContainer>(m_pImpl->m_xStorage , getXWeak() ); } @@ -624,7 +624,7 @@ void SAL_CALL OReportDefinition::dispose() void SAL_CALL OReportDefinition::disposing() { - notifyEvent("OnUnload"); + notifyEvent(u"OnUnload"_ustr); uno::Reference< frame::XModel > xHoldAlive( this ); @@ -680,7 +680,7 @@ void SAL_CALL OReportDefinition::disposing() OUString OReportDefinition::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OReportDefinition"; + return u"com.sun.star.comp.report.OReportDefinition"_ustr; } OUString SAL_CALL OReportDefinition::getImplementationName( ) @@ -1131,11 +1131,11 @@ sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/, void OReportDefinition::fillArgs(utl::MediaDescriptor& _aDescriptor) { uno::Sequence<beans::PropertyValue> aComponentData; - aComponentData = _aDescriptor.getUnpackedValueOrDefault("ComponentData",aComponentData); + aComponentData = _aDescriptor.getUnpackedValueOrDefault(u"ComponentData"_ustr,aComponentData); if ( aComponentData.hasElements() && (!m_pImpl->m_xActiveConnection.is() || !m_pImpl->m_xNumberFormatsSupplier.is()) ) { ::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData ); - m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault("ActiveConnection",m_pImpl->m_xActiveConnection); + m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(u"ActiveConnection"_ustr,m_pImpl->m_xActiveConnection); m_pImpl->m_xNumberFormatsSupplier = dbtools::getNumberFormats(m_pImpl->m_xActiveConnection); } if ( !m_pImpl->m_xNumberFormatsSupplier.is() ) @@ -1144,7 +1144,7 @@ void OReportDefinition::fillArgs(utl::MediaDescriptor& _aDescriptor) } lcl_stripLoadArguments( _aDescriptor, m_pImpl->m_aArgs ); OUString sCaption; - sCaption = _aDescriptor.getUnpackedValueOrDefault("DocumentTitle",sCaption); + sCaption = _aDescriptor.getUnpackedValueOrDefault(u"DocumentTitle"_ustr,sCaption); setCaption(sCaption); } @@ -1233,7 +1233,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< utl::MediaDescriptor aDescriptor( _aMediaDescriptor ); fillArgs(aDescriptor); - aDescriptor.createItemIfMissing("Storage",uno::Any(_xStorageToLoadFrom)); + aDescriptor.createItemIfMissing(u"Storage"_ustr,uno::Any(_xStorageToLoadFrom)); uno::Sequence< uno::Any > aDelegatorArguments(_aMediaDescriptor.getLength()); uno::Any* pIter = aDelegatorArguments.getArray(); @@ -1253,7 +1253,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< rptui::OXUndoEnvironment::OUndoEnvLock aLock(rEnv); { uno::Reference< document::XFilter > xFilter( - m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.comp.report.OReportFilter",aDelegatorArguments,m_aProps->m_xContext), + m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(u"com.sun.star.comp.report.OReportFilter"_ustr,aDelegatorArguments,m_aProps->m_xContext), uno::UNO_QUERY_THROW ); uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW); @@ -1312,21 +1312,21 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS /** property map for export info set */ static comphelper::PropertyMapEntry const aExportInfoMap[] = { - { OUString("UsePrettyPrinting") , 0, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName") , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath") , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI") , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"UsePrettyPrinting"_ustr , 0, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamName"_ustr , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamRelPath"_ustr , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"BaseURI"_ustr , 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, }; uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) ); - xInfoSet->setPropertyValue("UsePrettyPrinting", uno::Any(officecfg::Office::Common::Save::Document::PrettyPrinting::get())); + xInfoSet->setPropertyValue(u"UsePrettyPrinting"_ustr, uno::Any(officecfg::Office::Common::Save::Document::PrettyPrinting::get())); if ( officecfg::Office::Common::Save::URL::FileSystem::get() ) { const OUString sVal( aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL, OUString()) ); - xInfoSet->setPropertyValue("BaseURI", uno::Any(sVal)); + xInfoSet->setPropertyValue(u"BaseURI"_ustr, uno::Any(sVal)); } - const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) ); - xInfoSet->setPropertyValue("StreamRelPath", uno::Any(sHierarchicalDocumentName)); + const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(u"HierarchicalDocumentName"_ustr,OUString()) ); + xInfoSet->setPropertyValue(u"StreamRelPath"_ustr, uno::Any(sHierarchicalDocumentName)); sal_Int32 nArgsLen = aDelegatorArguments.getLength(); @@ -1347,19 +1347,19 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference<XComponent> xCom(getXWeak(),uno::UNO_QUERY); // Try to write to settings.xml, meta.xml, and styles.xml; only really care about success of // write to content.xml (keeping logic of commit 94ccba3eebc83b58e74e18f0e028c6a995ce6aa6) - xInfoSet->setPropertyValue("StreamName", uno::Any(OUString("settings.xml"))); + xInfoSet->setPropertyValue(u"StreamName"_ustr, uno::Any(u"settings.xml"_ustr)); WriteThroughComponent(xCom, "settings.xml", "com.sun.star.comp.report.XMLSettingsExporter", aDelegatorArguments, aProps, _xStorageToSaveTo); - xInfoSet->setPropertyValue("StreamName", uno::Any(OUString("meta.xml"))); + xInfoSet->setPropertyValue(u"StreamName"_ustr, uno::Any(u"meta.xml"_ustr)); WriteThroughComponent(xCom, "meta.xml", "com.sun.star.comp.report.XMLMetaExporter", aDelegatorArguments, aProps, _xStorageToSaveTo); - xInfoSet->setPropertyValue("StreamName", uno::Any(OUString("styles.xml"))); + xInfoSet->setPropertyValue(u"StreamName"_ustr, uno::Any(u"styles.xml"_ustr)); WriteThroughComponent(xCom, "styles.xml", "com.sun.star.comp.report.XMLStylesExporter", aDelegatorArguments, aProps, _xStorageToSaveTo); - xInfoSet->setPropertyValue("StreamName", uno::Any(OUString("content.xml"))); + xInfoSet->setPropertyValue(u"StreamName"_ustr, uno::Any(u"content.xml"_ustr)); bool bOk = WriteThroughComponent(xCom, "content.xml", "com.sun.star.comp.report.ExportFilter", aDelegatorArguments, aProps, _xStorageToSaveTo); @@ -1375,7 +1375,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Sequence<sal_Int8> aSeq; aImage >>= aSeq; uno::Reference<io::XInputStream> xStream = new ::comphelper::SequenceInputStream( aSeq ); - m_pImpl->m_pObjectContainer->InsertGraphicStreamDirectly(xStream, "report", "image/png"); + m_pImpl->m_pObjectContainer->InsertGraphicStreamDirectly(xStream, u"report"_ustr, u"image/png"_ustr); } if (bOk) @@ -1478,10 +1478,10 @@ bool OReportDefinition::WriteThroughComponent( xSeek->seek(0); } - xStreamProp->setPropertyValue( "MediaType", uno::Any(OUString("text/xml")) ); + xStreamProp->setPropertyValue( u"MediaType"_ustr, uno::Any(u"text/xml"_ustr) ); // encrypt all streams - xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", + xStreamProp->setPropertyValue( u"UseCommonStoragePasswordEncryption"_ustr, uno::Any( true ) ); // set buffer and create outputstream @@ -1556,26 +1556,26 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue uno::Reference< io::XInputStream > xStream; OUString sURL; - if ( aArguments.has( "Stream" ) ) + if ( aArguments.has( u"Stream"_ustr ) ) { - aArguments.get_ensureType( "Stream", xStream ); - aArguments.remove( "Stream" ); + aArguments.get_ensureType( u"Stream"_ustr, xStream ); + aArguments.remove( u"Stream"_ustr ); } - else if ( aArguments.has( "InputStream" ) ) + else if ( aArguments.has( u"InputStream"_ustr ) ) { - aArguments.get_ensureType( "InputStream", xStream ); - aArguments.remove( "InputStream" ); + aArguments.get_ensureType( u"InputStream"_ustr, xStream ); + aArguments.remove( u"InputStream"_ustr ); } - if ( aArguments.has( "FileName" ) ) + if ( aArguments.has( u"FileName"_ustr ) ) { - aArguments.get_ensureType( "FileName", sURL ); - aArguments.remove( "FileName" ); + aArguments.get_ensureType( u"FileName"_ustr, sURL ); + aArguments.remove( u"FileName"_ustr ); } - else if ( aArguments.has( "URL" ) ) + else if ( aArguments.has( u"URL"_ustr ) ) { - aArguments.get_ensureType( "URL", sURL ); - aArguments.remove( "URL" ); + aArguments.get_ensureType( u"URL"_ustr, sURL ); + aArguments.remove( u"URL"_ustr ); } uno::Any aStorageSource; @@ -1585,7 +1585,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue aStorageSource <<= sURL; else throw lang::IllegalArgumentException( - "No input source (URL or InputStream) found.", + u"No input source (URL or InputStream) found."_ustr, // TODO: resource *this, 1 @@ -1600,10 +1600,10 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue embed::ElementModes::READ }; size_t nFirstOpenMode = 0; - if ( aArguments.has( "ReadOnly" ) ) + if ( aArguments.has( u"ReadOnly"_ustr ) ) { bool bReadOnly = false; - aArguments.get_ensureType( "ReadOnly", bReadOnly ); + aArguments.get_ensureType( u"ReadOnly"_ustr, bReadOnly ); nFirstOpenMode = bReadOnly ? 1 : 0; } const size_t nLastOpenMode = SAL_N_ELEMENTS( nOpenModes ) - 1; @@ -1621,7 +1621,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue { css::uno::Any anyEx = cppu::getCaughtException(); throw lang::WrappedTargetException( - "An error occurred while creating the document storage.", + u"An error occurred while creating the document storage."_ustr, // TODO: resource *this, anyEx @@ -1635,9 +1635,9 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue throw uno::RuntimeException(); } - if (!aArguments.has("DocumentBaseURL") && !sURL.isEmpty()) + if (!aArguments.has(u"DocumentBaseURL"_ustr) && !sURL.isEmpty()) { - aArguments.put("DocumentBaseURL", sURL); + aArguments.put(u"DocumentBaseURL"_ustr, sURL); } impl_loadFromStorage_nolck_throw( xDocumentStorage, aArguments.getPropertyValues() ); @@ -1672,7 +1672,7 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); embed::VisualRepresentation aResult; OUString sMimeType; - uno::Reference<io::XInputStream> xStream = m_pImpl->m_pObjectContainer->GetGraphicStream("report", &sMimeType); + uno::Reference<io::XInputStream> xStream = m_pImpl->m_pObjectContainer->GetGraphicStream(u"report"_ustr, &sMimeType); if ( xStream.is() ) { uno::Sequence<sal_Int8> aSeq; @@ -1747,7 +1747,7 @@ void SAL_CALL OReportDefinition::setModified( sal_Bool _bModified ) lang::EventObject aEvent(*this); aGuard.clear(); m_pImpl->m_aModifyListeners.notifyEach(&util::XModifyListener::modified,aEvent); - notifyEvent("OnModifyChanged"); + notifyEvent(u"OnModifyChanged"_ustr); } } @@ -2025,14 +2025,14 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co if ( aServiceSpecifier.startsWith( "com.sun.star.report." ) ) { if ( aServiceSpecifier == SERVICE_SHAPE ) - xShape.set(SvxUnoDrawMSFactory::createInstance("com.sun.star.drawing.CustomShape"),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance(u"com.sun.star.drawing.CustomShape"_ustr),uno::UNO_QUERY_THROW); else if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD || aServiceSpecifier == SERVICE_FIXEDTEXT || aServiceSpecifier == SERVICE_FIXEDLINE || aServiceSpecifier == SERVICE_IMAGECONTROL ) - xShape.set(SvxUnoDrawMSFactory::createInstance("com.sun.star.drawing.ControlShape"),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance(u"com.sun.star.drawing.ControlShape"_ustr),uno::UNO_QUERY_THROW); else - xShape.set(SvxUnoDrawMSFactory::createInstance("com.sun.star.drawing.OLE2Shape"),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance(u"com.sun.star.drawing.OLE2Shape"_ustr),uno::UNO_QUERY_THROW); } else if ( aServiceSpecifier.startsWith( "com.sun.star.form.component." ) ) { @@ -2044,7 +2044,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co ) { uno::Reference< style::XStyle> xStyle = new OStyle(); - xStyle->setName("Default"); + xStyle->setName(u"Default"_ustr); return xStyle; } else if ( aServiceSpecifier == "com.sun.star.document.Settings" ) @@ -2212,7 +2212,7 @@ OUString SAL_CALL OReportDefinition::getShapeType( ) ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); if ( m_aProps->m_xShape.is() ) return m_aProps->m_xShape->getShapeType(); - return "com.sun.star.drawing.OLE2Shape"; + return u"com.sun.star.drawing.OLE2Shape"_ustr; } typedef ::cppu::WeakImplHelper< container::XNameContainer, @@ -2368,18 +2368,18 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY); uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get()); - xStyles->insertByName("PageStyles",uno::Any(xPageStyles)); - uno::Reference< style::XStyle> xPageStyle(createInstance("com.sun.star.style.PageStyle"),uno::UNO_QUERY); + xStyles->insertByName(u"PageStyles"_ustr,uno::Any(xPageStyles)); + uno::Reference< style::XStyle> xPageStyle(createInstance(u"com.sun.star.style.PageStyle"_ustr),uno::UNO_QUERY); xPageStyles->insertByName(xPageStyle->getName(),uno::Any(xPageStyle)); uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get()); - xStyles->insertByName("FrameStyles",uno::Any(xFrameStyles)); - uno::Reference< style::XStyle> xFrameStyle(createInstance("com.sun.star.style.FrameStyle"),uno::UNO_QUERY); + xStyles->insertByName(u"FrameStyles"_ustr,uno::Any(xFrameStyles)); + uno::Reference< style::XStyle> xFrameStyle(createInstance(u"com.sun.star.style.FrameStyle"_ustr),uno::UNO_QUERY); xFrameStyles->insertByName(xFrameStyle->getName(),uno::Any(xFrameStyle)); uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get()); - xStyles->insertByName("graphics",uno::Any(xGraphicStyles)); - uno::Reference< style::XStyle> xGraphicStyle(createInstance("com.sun.star.style.GraphicStyle"),uno::UNO_QUERY); + xStyles->insertByName(u"graphics"_ustr,uno::Any(xGraphicStyles)); + uno::Reference< style::XStyle> xGraphicStyle(createInstance(u"com.sun.star.style.GraphicStyle"_ustr),uno::UNO_QUERY); xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::Any(xGraphicStyle)); } return m_pImpl->m_xStyles; @@ -2513,7 +2513,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel m_pImpl->m_xNumberedControllers = pHelper; pHelper->setOwner (uno::Reference< frame::XModel >(this)); - pHelper->setUntitledPrefix (" : "); + pHelper->setUntitledPrefix (u" : "_ustr); } return m_pImpl->m_xNumberedControllers; @@ -2649,7 +2649,7 @@ uno::Any SAL_CALL OReportDefinition::getTransferData( const datatransfer::DataFl uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransferDataFlavors( ) { - return { { "image/png", "PNG", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() } }; + return { { u"image/png"_ustr, u"PNG"_ustr, cppu::UnoType<uno::Sequence< sal_Int8 >>::get() } }; } sal_Bool SAL_CALL OReportDefinition::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 11686905272e..1d0ee4af1b40 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -74,7 +74,7 @@ void SAL_CALL OReportEngineJFree::dispose() OUString OReportEngineJFree::getImplementationName_Static( ) { - return "com.sun.star.comp.report.OReportEngineJFree"; + return u"com.sun.star.comp.report.OReportEngineJFree"_ustr; } @@ -85,7 +85,7 @@ OUString SAL_CALL OReportEngineJFree::getImplementationName( ) uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) { - uno::Sequence< OUString > aServices { "com.sun.star.report.ReportEngine" }; + uno::Sequence< OUString > aServices { u"com.sun.star.report.ReportEngine"_ustr }; return aServices; } @@ -153,7 +153,7 @@ OUString OReportEngineJFree::getNewOutputName() MimeConfigurationHelper aConfighelper(m_xContext); const OUString sMimeType = m_xReport->getMimeType(); std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetDefaultFilter( aConfighelper.GetDocServiceNameFromMediaType(sMimeType) ); - OUString sExt(".rpt"); + OUString sExt(u".rpt"_ustr); if ( pFilter ) sExt = ::comphelper::string::stripStart(pFilter->GetDefaultExtension(), '*'); @@ -200,13 +200,13 @@ OUString OReportEngineJFree::getNewOutputName() aUserOpts.GetLastName(); uno::Sequence< beans::NamedValue > aConvertedProperties{ - {"InputStorage", uno::Any(xTemp) }, - {"OutputStorage", uno::Any(xOut) }, + {u"InputStorage"_ustr, uno::Any(xTemp) }, + {u"OutputStorage"_ustr, uno::Any(xOut) }, {PROPERTY_REPORTDEFINITION, uno::Any(m_xReport) }, {PROPERTY_ACTIVECONNECTION, uno::Any(m_xActiveConnection) }, {PROPERTY_MAXROWS, uno::Any(m_nMaxRows) }, - {"Author", uno::Any(sAuthor) }, - {"Title", uno::Any(m_xReport->getCaption()) } + {u"Author"_ustr, uno::Any(sAuthor) }, + {u"Title"_ustr, uno::Any(m_xReport->getCaption()) } }; OUString sOutputName; @@ -258,7 +258,7 @@ uno::Reference< frame::XModel > OReportEngineJFree::createDocumentAlive( const u // if there is no frame given, find the right xFrameLoad = frame::Desktop::create(m_xContext); sal_Int32 const nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY_THROW)->findFrame("_blank",nFrameSearchFlag); + uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY_THROW)->findFrame(u"_blank"_ustr,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); } diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 3c0a18e91e53..45cdb8b35110 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -163,7 +163,7 @@ void SAL_CALL OSection::disposing() OUString SAL_CALL OSection::getImplementationName( ) { - return "com.sun.star.comp.report.Section"; + return u"com.sun.star.comp.report.Section"_ustr; } uno::Sequence< OUString> OSection::getSupportedServiceNames_Static() diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index aa8bdb6e4ce0..2bf7c45c5193 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -116,7 +116,7 @@ uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponent OUString OShape::getImplementationName_Static( ) { - return "com.sun.star.comp.report.Shape"; + return u"com.sun.star.comp.report.Shape"_ustr; } @@ -406,7 +406,7 @@ OUString SAL_CALL OShape::getShapeType( ) ::osl::MutexGuard aGuard(m_aMutex); if ( m_aProps.aComponent.m_xShape.is() ) return m_aProps.aComponent.m_xShape->getShapeType(); - return "com.sun.star.drawing.CustomShape"; + return u"com.sun.star.drawing.CustomShape"_ustr; } ::sal_Int32 SAL_CALL OShape::getZOrder() diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index b58b9f0a3cc9..ae3a277b823f 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -122,7 +122,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::CreateShape( SdrObject *pObj awt::Size aSz( aTmp.Width(), aTmp.Height() ); xObj->setVisualAreaSize( nAspect, aSz ); } - rtl::Reference<SvxOle2Shape> pShape = new SvxOle2Shape( pObj, "" /*TODO?*/ ); + rtl::Reference<SvxOle2Shape> pShape = new SvxOle2Shape( pObj, u""_ustr /*TODO?*/ ); xShape = pShape; pShape->setShapeKind(pObj->GetObjIdentifier()); } diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 0aad6b6f0895..ec72a62afcd0 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -154,38 +154,38 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aSer uno::Reference<report::XFormattedField> xProp = new OFormattedField(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape); xRet = xProp; if ( _rShape.is() ) - throw uno::Exception("no shape", nullptr); + throw uno::Exception(u"no shape"_ustr, nullptr); xProp->setPropertyValue( PROPERTY_FORMATSSUPPLIER, uno::Any(uno::Reference< util::XNumberFormatsSupplier >(m_pReportDefinition)) ); } else if ( aServiceSpecifier == SERVICE_FIXEDTEXT) { xRet = getXWeak(new OFixedText(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape)); if ( _rShape.is() ) - throw uno::Exception("no shape", nullptr); + throw uno::Exception(u"no shape"_ustr, nullptr); } else if ( aServiceSpecifier == SERVICE_FIXEDLINE) { xRet = getXWeak(new OFixedLine(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape,nOrientation)); if ( _rShape.is() ) - throw uno::Exception("no shape", nullptr); + throw uno::Exception(u"no shape"_ustr, nullptr); } else if ( aServiceSpecifier == SERVICE_IMAGECONTROL ) { xRet = getXWeak(new OImageControl(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape)); if ( _rShape.is() ) - throw uno::Exception("no shape", nullptr); + throw uno::Exception(u"no shape"_ustr, nullptr); } else if ( aServiceSpecifier == SERVICE_REPORTDEFINITION ) { xRet = getXWeak(new OReportDefinition(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape)); if ( _rShape.is() ) - throw uno::Exception("no shape", nullptr); + throw uno::Exception(u"no shape"_ustr, nullptr); } else if ( _rShape.is() ) { xRet = getXWeak(new OShape(m_pReportDefinition->getContext(),m_pReportDefinition,_rShape,aServiceSpecifier)); if ( _rShape.is() ) - throw uno::Exception("no shape", nullptr); + throw uno::Exception(u"no shape"_ustr, nullptr); } } return xRet; diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 55dd6034e928..c3dfa8cf86db 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -77,7 +77,7 @@ SdrObjKind OObjectBase::getObjectType(const uno::Reference< report::XReportCompo return SdrObjKind::ReportDesignImageControl; if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return SdrObjKind::ReportDesignFormattedField; - if ( xServiceInfo->supportsService("com.sun.star.drawing.OLE2Shape") ) + if ( xServiceInfo->supportsService(u"com.sun.star.drawing.OLE2Shape"_ustr) ) return SdrObjKind::OLE2; if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return SdrObjKind::CustomShape; @@ -99,7 +99,7 @@ rtl::Reference<SdrObject> OObjectBase::createObject( rtl::Reference<OUnoObject> pUnoObj = new OUnoObject( rTargetModel, _xComponent, - "com.sun.star.form.component.FixedText", + u"com.sun.star.form.component.FixedText"_ustr, SdrObjKind::ReportDesignFixedText); pNewObj = pUnoObj; @@ -112,14 +112,14 @@ rtl::Reference<SdrObject> OObjectBase::createObject( pNewObj = new OUnoObject( rTargetModel, _xComponent, - "com.sun.star.form.component.DatabaseImageControl", + u"com.sun.star.form.component.DatabaseImageControl"_ustr, SdrObjKind::ReportDesignImageControl); break; case SdrObjKind::ReportDesignFormattedField: pNewObj = new OUnoObject( rTargetModel, _xComponent, - "com.sun.star.form.component.FormattedField", + u"com.sun.star.form.component.FormattedField"_ustr, SdrObjKind::ReportDesignFormattedField); break; case SdrObjKind::ReportDesignHorizontalFixedLine: @@ -127,7 +127,7 @@ rtl::Reference<SdrObject> OObjectBase::createObject( pNewObj = new OUnoObject( rTargetModel, _xComponent, - "com.sun.star.awt.UnoControlFixedLineModel", + u"com.sun.star.awt.UnoControlFixedLineModel"_ustr, nType); break; case SdrObjKind::CustomShape: @@ -289,7 +289,7 @@ const TPropertyNamePair& getPropertyNameMap(SdrObjKind _nObjectId) { auto aNoConverter = std::make_shared<AnyConverter>(); TPropertyNamePair tmp; - tmp.emplace(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)); + tmp.emplace(u"FillColor"_ustr,TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)); tmp.emplace(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter)); return tmp; }(); @@ -563,12 +563,12 @@ static OUString ObjectTypeToServiceName(SdrObjKind _nObjectType) case SdrObjKind::ReportDesignSubReport: return SERVICE_REPORTDEFINITION; case SdrObjKind::OLE2: - return "com.sun.star.chart2.ChartDocument"; + return u"com.sun.star.chart2.ChartDocument"_ustr; default: break; } assert(false && "Unknown object id"); - return ""; + return u""_ustr; } OUnoObject::OUnoObject( SdrModel& rSdrModel, @@ -634,7 +634,7 @@ void OUnoObject::impl_initializeModel_nothrow() if ( xFormatted.is() ) { const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); - xModelProps->setPropertyValue( "TreatAsNumber", Any( false ) ); + xModelProps->setPropertyValue( u"TreatAsNumber"_ustr, Any( false ) ); xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN)); } } @@ -753,7 +753,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) { - OUString aDefaultName = "HERE WE HAVE TO INSERT OUR NAME!"; + OUString aDefaultName = u"HERE WE HAVE TO INSERT OUR NAME!"_ustr; if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) { aDefaultName = RID_STR_CLASS_FIXEDTEXT; @@ -1134,7 +1134,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod if( xReceiver.is() ) { uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY); - uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance("com.sun.star.chart2.data.DataProvider"),uno::UNO_QUERY); + uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(u"com.sun.star.chart2.data.DataProvider"_ustr),uno::UNO_QUERY); xReceiver->attachDataProvider( xDataProvider ); } } @@ -1158,7 +1158,7 @@ void OOle2Obj::initializeOle() { uno::Reference< beans::XPropertySet > xChartProps( xCompSupp->getComponent(), uno::UNO_QUERY ); if ( xChartProps.is() ) - xChartProps->setPropertyValue("NullDate", + xChartProps->setPropertyValue(u"NullDate"_ustr, uno::Any(util::DateTime(0,0,0,0,30,12,1899,false))); } } @@ -1186,10 +1186,10 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) rRptModel.GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) ); - aArgs.put( "HasCategories", uno::Any( true ) ); - aArgs.put( "FirstCellAsLabel", uno::Any( true ) ); - aArgs.put( "DataRowSource", uno::Any( chart::ChartDataRowSource_COLUMNS ) ); + aArgs.put( u"CellRangeRepresentation"_ustr, uno::Any( u"all"_ustr ) ); + aArgs.put( u"HasCategories"_ustr, uno::Any( true ) ); + aArgs.put( u"FirstCellAsLabel"_ustr, uno::Any( true ) ); + aArgs.put( u"DataRowSource"_ustr, uno::Any( chart::ChartDataRowSource_COLUMNS ) ); xReceiver->setArguments( aArgs.getPropertyValues() ); if( xChartModel.is() ) @@ -1199,7 +1199,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XReportDefinition>& _xReport) { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); - uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName("PageStyles"),uno::UNO_QUERY); + uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(u"PageStyles"_ustr),uno::UNO_QUERY); uno::Reference< style::XStyle> xReturn; const uno::Sequence< OUString> aSeq = xPageStyles->getElementNames(); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 3c97abc08dba..fdf3861af6c7 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -142,10 +142,10 @@ namespace rptui for ( sal_Int32 i=0; i<nCount; ++i ) { xColumn.set( _rxColumns->getByIndex( i ), UNO_QUERY_THROW ); - OSL_VERIFY( xColumn->getPropertyValue("Name") >>= aField.sName ); - OSL_VERIFY( xColumn->getPropertyValue("Type") >>= aField.nDataType ); - OSL_VERIFY( xColumn->getPropertyValue("Scale") >>= aField.nScale ); - OSL_VERIFY( xColumn->getPropertyValue("IsCurrency") >>= aField.bIsCurrency ); + OSL_VERIFY( xColumn->getPropertyValue(u"Name"_ustr) >>= aField.sName ); + OSL_VERIFY( xColumn->getPropertyValue(u"Type"_ustr) >>= aField.nDataType ); + OSL_VERIFY( xColumn->getPropertyValue(u"Scale"_ustr) >>= aField.nScale ); + OSL_VERIFY( xColumn->getPropertyValue(u"IsCurrency"_ustr) >>= aField.bIsCurrency ); _inout_rFields.push_back( aField ); } } diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 67ba9b489470..81e7f1289023 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -48,13 +48,13 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue { ::comphelper::SequenceAsHashMap aTemp(Descriptor); - OUString sTemp = aTemp.getUnpackedValueOrDefault("URL",OUString()); + OUString sTemp = aTemp.getUnpackedValueOrDefault(u"URL"_ustr,OUString()); if ( !sTemp.isEmpty() ) { INetURLObject aURL(sTemp); if ( aURL.GetFileExtension().equalsIgnoreAsciiCase("orp") ) - return "StarBaseReport"; + return u"StarBaseReport"_ustr; else { try @@ -63,9 +63,9 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue if ( xProp.is() ) { OUString sMediaType; - xProp->getPropertyValue("MediaType") >>= sMediaType; + xProp->getPropertyValue(u"MediaType"_ustr) >>= sMediaType; if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) - return "StarBaseReport"; + return u"StarBaseReport"_ustr; ::comphelper::disposeComponent(xProp); } } @@ -80,7 +80,7 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue // XServiceInfo OUString SAL_CALL ORptTypeDetection::getImplementationName() { - return "com.sun.star.comp.report.ORptTypeDetection"; + return u"com.sun.star.comp.report.ORptTypeDetection"_ustr; } @@ -93,7 +93,7 @@ sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName // XServiceInfo Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames() { - return { "com.sun.star.document.ExtendedTypeDetection" }; + return { u"com.sun.star.document.ExtendedTypeDetection"_ustr }; } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 3a83854e03fb..27f0406057c8 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -67,7 +67,7 @@ namespace rptxml css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptExport(context, - "com.sun.star.comp.report.XMLSettingsExporter", + u"com.sun.star.comp.report.XMLSettingsExporter"_ustr, SvXMLExportFlags::SETTINGS )); } @@ -80,7 +80,7 @@ namespace rptxml css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptExport(context, - "com.sun.star.comp.report.XMLContentExporter", + u"com.sun.star.comp.report.XMLContentExporter"_ustr, SvXMLExportFlags::CONTENT )); } @@ -93,7 +93,7 @@ namespace rptxml css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptExport(context, - "com.sun.star.comp.report.XMLStylesExporter", + u"com.sun.star.comp.report.XMLStylesExporter"_ustr, SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS )); } @@ -107,7 +107,7 @@ namespace rptxml css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptExport(context, - "com.sun.star.comp.report.XMLMetaExporter", + u"com.sun.star.comp.report.XMLMetaExporter"_ustr, SvXMLExportFlags::META )); } @@ -120,7 +120,7 @@ namespace rptxml css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptExport(context, - "com.sun.star.comp.report.XMLFullExporter", + u"com.sun.star.comp.report.XMLFullExporter"_ustr, SvXMLExportFlags::ALL)); } @@ -259,7 +259,7 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin const OUString& sFamily( GetXMLToken(XML_PARAGRAPH) ); GetAutoStylePool()->AddFamily( XmlStyleFamily::TEXT_PARAGRAPH, sFamily, - m_xParaPropMapper, "P" ); + m_xParaPropMapper, u"P"_ustr ); GetAutoStylePool()->AddFamily(XmlStyleFamily::TABLE_CELL, XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME, m_xCellStylesExportPropertySetMapper, XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX); @@ -276,7 +276,7 @@ reportdesign_ORptExport_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptExport(context, - "com.sun.star.comp.report.ExportFilter", + u"com.sun.star.comp.report.ExportFilter"_ustr, SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS)); } @@ -826,7 +826,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) if (!bIsStandard) { if ( nCellType == util::NumberFormat::TEXT ) - aHelper.SetNumberFormatAttributes("", u""); + aHelper.SetNumberFormatAttributes(u""_ustr, u""); else aHelper.SetNumberFormatAttributes(nFormatKey, 0.0, false); } @@ -1365,14 +1365,14 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { if ( sToken == s_sPageNumber ) { - AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, "current" ); + AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, u"current"_ustr ); SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, false, false); - Characters("1"); + Characters(u"1"_ustr); } else if ( sToken == u"PageCount()" ) { SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, false, false); - Characters("1"); + Characters(u"1"_ustr); } else { @@ -1420,7 +1420,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa if ( xShape.is() ) { ::std::unique_ptr<SvXMLElementExport> pSubDocument; - uno::Reference< frame::XModel> xModel(xShape->getPropertyValue("Model"),uno::UNO_QUERY); + uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(u"Model"_ustr),uno::UNO_QUERY); if ( xModel.is() ) // special handling for chart object { pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, false, false)); @@ -1485,7 +1485,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG { sFunction = "INT"; uno::Reference< XFunction> xCountFunction = xFunctions->createFunction(); - xCountFunction->setInitialFormula(beans::Optional< OUString>(true,OUString("rpt:0"))); + xCountFunction->setInitialFormula(beans::Optional< OUString>(true,u"rpt:0"_ustr)); OUString sCountName = sFunction + "_count_" + sExpression; xCountFunction->setName(sCountName); xCountFunction->setFormula( "rpt:[" + sCountName + "] + 1" ); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 9a9a4d33a280..c203af228670 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -43,7 +43,7 @@ static void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHa { if ( officecfg::Office::Common::Save::Document::PrettyPrinting::get() ) { - _xDelegatee->ignorableWhitespace(" "); + _xDelegatee->ignorableWhitespace(u" "_ustr); } } @@ -91,7 +91,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler) OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) { - return "com.sun.star.comp.report.ExportDocumentHandler"; + return u"com.sun.star.comp.report.ExportDocumentHandler"_ustr; } sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const OUString& ServiceName ) @@ -104,7 +104,7 @@ uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNam uno::Sequence< OUString > aSupported; if ( m_xServiceInfo.is() ) aSupported = m_xServiceInfo->getSupportedServiceNames(); - return ::comphelper::concatSequences(uno::Sequence< OUString > { "com.sun.star.report.ExportDocumentHandler" },aSupported); + return ::comphelper::concatSequences(uno::Sequence< OUString > { u"com.sun.star.report.ExportDocumentHandler"_ustr },aSupported); } // xml::sax::XDocumentHandler: @@ -154,7 +154,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const const OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS); m_xDelegatee->startElement(sTableCalc,nullptr); pList = new comphelper::AttributeList(); - pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),"1899-12-30"); + pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),u"1899-12-30"_ustr); const OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE); m_xDelegatee->startElement(sNullDate,pList); @@ -189,7 +189,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const { comphelper::AttributeList* pList = dynamic_cast<comphelper::AttributeList*>(xAttribs.get()); assert(pList && "can only succeed"); - pList->RemoveAttribute("table:cell-range-address"); + pList->RemoveAttribute(u"table:cell-range-address"_ustr); } else if ( _sName == "chart:categories" ) { @@ -275,16 +275,16 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > { std::unique_lock aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); - m_xDelegatee = aArgs.getUnpackedValueOrDefault("DocumentHandler",m_xDelegatee); - m_xModel = aArgs.getUnpackedValueOrDefault("Model",m_xModel); + m_xDelegatee = aArgs.getUnpackedValueOrDefault(u"DocumentHandler"_ustr,m_xDelegatee); + m_xModel = aArgs.getUnpackedValueOrDefault(u"Model"_ustr,m_xModel); OSL_ENSURE(m_xDelegatee.is(),"No document handler available!"); if ( !m_xDelegatee.is() || !m_xModel.is() ) - throw uno::Exception("no delegatee and no model", nullptr); + throw uno::Exception(u"no delegatee and no model"_ustr, nullptr); m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY_THROW); if ( !m_xDatabaseDataProvider->getActiveConnection().is() ) - throw uno::Exception("no active connection", nullptr); + throw uno::Exception(u"no active connection"_ustr, nullptr); uno::Reference< reflection::XProxyFactory > xProxyFactory = reflection::ProxyFactory::create( m_xContext ); m_xProxy = xProxyFactory->createProxy(m_xDelegatee); @@ -349,7 +349,7 @@ void ExportDocumentHandler::exportTableRows() static constexpr OUString s_sFloat = u"float"_ustr; rtl::Reference<comphelper::AttributeList> pCellAtt = new comphelper::AttributeList(); - pCellAtt->AddAttribute(sValueType, "string"); + pCellAtt->AddAttribute(sValueType, u"string"_ustr); bool bRemoveString = true; const sal_Int32 nCount = m_aColumns.getLength(); diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 83e638af140d..1ccac4c45cdd 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -89,7 +89,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) switch( _nControl ) { case ControlCharacter::LINE_BREAK: - m_pFixedContent->characters("\n"); + m_pFixedContent->characters(u"\n"_ustr); break; default: OSL_FAIL("Not supported control character"); diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 78f028b30715..4584210beffc 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -48,7 +48,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport _xComponent->setDataField(ORptFilter::convertFormula(aIter.toString())); break; case XML_ELEMENT(REPORT, XML_SELECT_PAGE): - _xComponent->setDataField("rpt:PageNumber()"); + _xComponent->setDataField(u"rpt:PageNumber()"_ustr); break; default: XMLOFF_WARN_UNKNOWN("reportdesign", aIter); @@ -57,7 +57,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport } if ( _bPageCount ) { - _xComponent->setDataField("rpt:PageCount()"); + _xComponent->setDataField(u"rpt:PageCount()"_ustr); } } catch(Exception&) diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index f1aa8ceb9f87..6ca44355f382 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -66,7 +66,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler) OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) { - return "com.sun.star.comp.report.ImportDocumentHandler"; + return u"com.sun.star.comp.report.ImportDocumentHandler"_ustr; } sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const OUString& ServiceName ) @@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNam uno::Sequence< OUString > aSupported; if ( m_xServiceInfo.is() ) aSupported = m_xServiceInfo->getSupportedServiceNames(); - return ::comphelper::concatSequences( uno::Sequence<OUString> { "com.sun.star.report.ImportDocumentHandler" }, aSupported); + return ::comphelper::concatSequences( uno::Sequence<OUString> { u"com.sun.star.report.ImportDocumentHandler"_ustr }, aSupported); } @@ -105,9 +105,9 @@ void SAL_CALL ImportDocumentHandler::endDocument() // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", OUString("all") ); - aArgs.put( "FirstCellAsLabel", uno::Any( true ) ); - aArgs.put( "DataRowSource", uno::Any( chart::ChartDataRowSource_COLUMNS ) ); + aArgs.put( u"CellRangeRepresentation"_ustr, u"all"_ustr ); + aArgs.put( u"FirstCellAsLabel"_ustr, uno::Any( true ) ); + aArgs.put( u"DataRowSource"_ustr, uno::Any( chart::ChartDataRowSource_COLUMNS ) ); bool bHasCategories = false; @@ -122,7 +122,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() uno::Reference< beans::XPropertySet > xSeqProp( rSequence->getValues(), uno::UNO_QUERY ); OUString aRole; if ( xSeqProp.is() - && ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) + && ( xSeqProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && aRole == "categories" ) { @@ -132,13 +132,13 @@ void SAL_CALL ImportDocumentHandler::endDocument() } } } - aArgs.put( "HasCategories", uno::Any( bHasCategories ) ); + aArgs.put( u"HasCategories"_ustr, uno::Any( bHasCategories ) ); uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( xDataProvider.is() ) { const uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions(); - aArgs.put( "ColumnDescriptions", uno::Any( aColumnNames ) ); + aArgs.put( u"ColumnDescriptions"_ustr, uno::Any( aColumnNames ) ); } xReceiver->attachDataProvider( m_xDatabaseDataProvider ); @@ -274,7 +274,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const rtl::Reference<comphelper::AttributeList> pList = new comphelper::AttributeList(); xNewAttribs = pList; pList->AppendAttributeList(_xAttrList); - pList->AddAttribute("table:cell-range-address","local-table.$A$1:.$Z$65536"); + pList->AddAttribute(u"table:cell-range-address"_ustr,u"local-table.$A$1:.$Z$65536"_ustr); } @@ -332,12 +332,12 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > { std::unique_lock aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); - m_xDocumentHandler = aArgs.getUnpackedValueOrDefault("DocumentHandler",m_xDocumentHandler); - m_xModel = aArgs.getUnpackedValueOrDefault("Model",m_xModel); + m_xDocumentHandler = aArgs.getUnpackedValueOrDefault(u"DocumentHandler"_ustr,m_xDocumentHandler); + m_xModel = aArgs.getUnpackedValueOrDefault(u"Model"_ustr,m_xModel); OSL_ENSURE(m_xDocumentHandler.is(), "No document handler available!"); if (!m_xDocumentHandler.is() || !m_xModel.is()) - throw uno::Exception("no delegatee and no model", nullptr); + throw uno::Exception(u"no delegatee and no model"_ustr, nullptr); m_xDelegatee.set(new SvXMLLegacyToFastDocHandler(dynamic_cast<SvXMLImport*>(m_xDocumentHandler.get()))); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index f873c1381d52..793f1dfe1098 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -296,11 +296,11 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext, O { GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_100TH); GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM); - GetNamespaceMap().Add( "_report", + GetNamespaceMap().Add( u"_report"_ustr, GetXMLToken(XML_N_RPT), XML_NAMESPACE_REPORT ); - GetNamespaceMap().Add( "__report", + GetNamespaceMap().Add( u"__report"_ustr, GetXMLToken(XML_N_RPT_OASIS), XML_NAMESPACE_REPORT ); @@ -320,7 +320,7 @@ reportdesign_OReportFilter_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new ORptFilter(context, - "com.sun.star.comp.report.OReportFilter", + u"com.sun.star.comp.report.OReportFilter"_ustr, SvXMLImportFlags::ALL )); } @@ -407,29 +407,29 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Sequence<uno::Any> aArgs{ uno::Any(xStorage) }; xGraphicStorageHandler.set( - xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.comp.Svx.GraphicImportHelper", aArgs, xContext), + xContext->getServiceManager()->createInstanceWithArgumentsAndContext(u"com.sun.star.comp.Svx.GraphicImportHelper"_ustr, aArgs, xContext), uno::UNO_QUERY); uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY); - aArgs.getArray()[0] <<= beans::NamedValue("Storage", uno::Any(xStorage)); - xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments("com.sun.star.document.ImportEmbeddedObjectResolver",aArgs) , uno::UNO_QUERY); + aArgs.getArray()[0] <<= beans::NamedValue(u"Storage"_ustr, uno::Any(xStorage)); + xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(u"com.sun.star.document.ImportEmbeddedObjectResolver"_ustr,aArgs) , uno::UNO_QUERY); static constexpr OUString s_sOld = u"OldFormat"_ustr; static comphelper::PropertyMapEntry const pMap[] = { - { OUString("OldFormat") , 1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND, 0 }, - { OUString("StreamName"), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("PrivateData"),0, cppu::UnoType<XInterface>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI"), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"OldFormat"_ustr , 1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND, 0 }, + { u"StreamName"_ustr, 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"PrivateData"_ustr,0, cppu::UnoType<XInterface>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"BaseURI"_ustr, 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamRelPath"_ustr, 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, }; utl::MediaDescriptor aDescriptor(rDescriptor); uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); const OUString sVal( aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL, OUString()) ); assert(!sVal.isEmpty()); // needed for relative URLs - xProp->setPropertyValue("BaseURI", uno::Any(sVal)); - const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) ); - xProp->setPropertyValue("StreamRelPath", uno::Any(sHierarchicalDocumentName)); + xProp->setPropertyValue(u"BaseURI"_ustr, uno::Any(sVal)); + const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(u"HierarchicalDocumentName"_ustr,OUString()) ); + xProp->setPropertyValue(u"StreamRelPath"_ustr, uno::Any(sHierarchicalDocumentName)); uno::Reference<XComponent> xModel = GetModel(); static constexpr OUString s_sMeta = u"meta.xml"_ustr; @@ -457,7 +457,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == ERRCODE_NONE ) { - xProp->setPropertyValue(s_sStreamName, uno::Any(OUString("settings.xml"))); + xProp->setPropertyValue(s_sStreamName, uno::Any(u"settings.xml"_ustr)); nRet = ReadThroughComponent( xStorage ,xModel ,"settings.xml" @@ -470,7 +470,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } if ( nRet == ERRCODE_NONE ) { - xProp->setPropertyValue(s_sStreamName, uno::Any(OUString("styles.xml"))); + xProp->setPropertyValue(s_sStreamName, uno::Any(u"styles.xml"_ustr)); nRet = ReadThroughComponent(xStorage ,xModel ,"styles.xml" @@ -483,7 +483,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == ERRCODE_NONE ) { - xProp->setPropertyValue(s_sStreamName, uno::Any(OUString("content.xml"))); + xProp->setPropertyValue(s_sStreamName, uno::Any(u"content.xml"_ustr)); nRet = ReadThroughComponent( xStorage ,xModel ,"content.xml" @@ -587,7 +587,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > RptXMLDocumentBodyCont const SvXMLStylesContext* pAutoStyles = rImport.GetAutoStyles(); if (pAutoStyles) { - XMLPropStyleContext* pAutoStyle = const_cast<XMLPropStyleContext*>(dynamic_cast<const XMLPropStyleContext *>(pAutoStyles->FindStyleChildContext(XmlStyleFamily::PAGE_MASTER, "pm1"))); + XMLPropStyleContext* pAutoStyle = const_cast<XMLPropStyleContext*>(dynamic_cast<const XMLPropStyleContext *>(pAutoStyles->FindStyleChildContext(XmlStyleFamily::PAGE_MASTER, u"pm1"_ustr))); if (pAutoStyle) { pAutoStyle->FillPropertySet(rImport.getReportDefinition()); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 67c5c2d1e3e2..50a5cf5a5963 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -60,12 +60,12 @@ IMPL_LINK(OAddFieldWindow, DragBeginHdl, bool&, rUnsetDragIcon, bool) } OAddFieldWindow::OAddFieldWindow(weld::Window* pParent, uno::Reference< beans::XPropertySet > xRowSet) - : GenericDialogController(pParent, "modules/dbreport/ui/floatingfield.ui", "FloatingField") + : GenericDialogController(pParent, u"modules/dbreport/ui/floatingfield.ui"_ustr, u"FloatingField"_ustr) , ::comphelper::OPropertyChangeListener(m_aMutex) , ::comphelper::OContainerListener(m_aMutex) , m_xRowSet(std::move(xRowSet)) - , m_xActions(m_xBuilder->weld_toolbar("toolbox")) - , m_xListBox(m_xBuilder->weld_tree_view("treeview")) + , m_xActions(m_xBuilder->weld_toolbar(u"toolbox"_ustr)) + , m_xListBox(m_xBuilder->weld_tree_view(u"treeview"_ustr)) , m_nCommandType(0) , m_bEscapeProcessing(false) { @@ -78,12 +78,12 @@ OAddFieldWindow::OAddFieldWindow(weld::Window* pParent, uno::Reference< beans::X m_xDialog->connect_container_focus_changed(LINK(this, OAddFieldWindow, FocusChangeHdl)); - m_xDialog->set_help_id(HID_RPT_FIELD_SEL_WIN); + m_xDialog->set_help_id(u"" HID_RPT_FIELD_SEL_WIN ""_ustr); m_xActions->connect_clicked(LINK(this, OAddFieldWindow, OnSortAction)); - m_xActions->set_item_active("up", true); + m_xActions->set_item_active(u"up"_ustr, true); m_xListBox->make_sorted(); - m_xActions->set_item_sensitive("insert", false); + m_xActions->set_item_sensitive(u"insert"_ustr, false); m_xListBox->connect_row_activated(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) ); m_xListBox->connect_changed(LINK( this, OAddFieldWindow, OnSelectHdl ) ); @@ -187,7 +187,7 @@ void OAddFieldWindow::Update() // ListBox loeschen m_xListBox->clear(); m_aListBoxData.clear(); - const OUString aIds[] = { "up", "down" }; + const OUString aIds[] = { u"up"_ustr, u"down"_ustr }; for (size_t j = 0; j< std::size(aIds); ++j) m_xActions->set_item_sensitive(aIds[j], false); @@ -309,7 +309,7 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl, weld::TreeView&, void ) { - m_xActions->set_item_sensitive("insert", m_xListBox->get_selected_index() != -1); + m_xActions->set_item_sensitive(u"insert"_ustr, m_xListBox->get_selected_index() != -1); } IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl, weld::TreeView&, bool ) @@ -326,7 +326,7 @@ IMPL_LINK(OAddFieldWindow, OnSortAction, const OUString&, rCurItem, void) return; } - const OUString aIds[] = { "up", "down" }; + const OUString aIds[] = { u"up"_ustr, u"down"_ustr }; if (rCurItem == "delete") { @@ -342,7 +342,7 @@ IMPL_LINK(OAddFieldWindow, OnSortAction, const OUString&, rCurItem, void) m_xActions->set_item_active(aIds[j], rCurItem == aIds[j]); m_xListBox->make_sorted(); - if (m_xActions->get_item_active("down")) + if (m_xActions->get_item_active(u"down"_ustr)) m_xListBox->set_sort_order(false); } diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 41173c93234c..3db43291ffec 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -77,12 +77,12 @@ namespace rptui ConditionalFormattingDialog::ConditionalFormattingDialog( weld::Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController) - : GenericDialogController(_pParent, "modules/dbreport/ui/condformatdialog.ui", "CondFormat") + : GenericDialogController(_pParent, u"modules/dbreport/ui/condformatdialog.ui"_ustr, u"CondFormat"_ustr) , m_rController(_rController) , m_xFormatConditions(_rxFormatConditions) , m_bConstructed(false) - , m_xScrollWindow(m_xBuilder->weld_scrolled_window("scrolledwindow")) - , m_xConditionPlayground(m_xBuilder->weld_box("condPlaygroundDrawingarea")) + , m_xScrollWindow(m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr)) + , m_xConditionPlayground(m_xBuilder->weld_box(u"condPlaygroundDrawingarea"_ustr)) { OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" ); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index c442e4ccfcd5..169d352862a5 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -45,7 +45,7 @@ ConditionField::ConditionField(Condition* pParent, std::unique_ptr<weld::Entry> , m_xSubEdit(std::move(xSubEdit)) , m_xFormula(std::move(xFormula)) { - m_xFormula->set_label("..."); + m_xFormula->set_label(u"..."_ustr); m_xFormula->connect_clicked( LINK( this, ConditionField, OnFormula ) ); } @@ -88,21 +88,21 @@ Condition::Condition(weld::Container* pParent, weld::Window* pDialog, ICondition , m_rAction(_rAction) , m_nCondIndex(0) , m_pDialog(pDialog) - , m_xBuilder(Application::CreateBuilder(pParent, "modules/dbreport/ui/conditionwin.ui")) - , m_xContainer(m_xBuilder->weld_container("ConditionWin")) - , m_xHeader(m_xBuilder->weld_label("headerLabel")) - , m_xConditionType(m_xBuilder->weld_combo_box("typeCombobox")) - , m_xOperationList(m_xBuilder->weld_combo_box("opCombobox")) - , m_xOperandGlue(m_xBuilder->weld_label("andLabel")) - , m_xActions(m_xBuilder->weld_toolbar("formatToolbox")) - , m_xPreview(new weld::CustomWeld(*m_xBuilder, "previewDrawingarea", m_aPreview)) - , m_xMoveUp(m_xBuilder->weld_button("upButton")) - , m_xMoveDown(m_xBuilder->weld_button("downButton")) - , m_xAddCondition(m_xBuilder->weld_button("addButton")) - , m_xRemoveCondition(m_xBuilder->weld_button("removeButton")) + , m_xBuilder(Application::CreateBuilder(pParent, u"modules/dbreport/ui/conditionwin.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"ConditionWin"_ustr)) + , m_xHeader(m_xBuilder->weld_label(u"headerLabel"_ustr)) + , m_xConditionType(m_xBuilder->weld_combo_box(u"typeCombobox"_ustr)) + , m_xOperationList(m_xBuilder->weld_combo_box(u"opCombobox"_ustr)) + , m_xOperandGlue(m_xBuilder->weld_label(u"andLabel"_ustr)) + , m_xActions(m_xBuilder->weld_toolbar(u"formatToolbox"_ustr)) + , m_xPreview(new weld::CustomWeld(*m_xBuilder, u"previewDrawingarea"_ustr, m_aPreview)) + , m_xMoveUp(m_xBuilder->weld_button(u"upButton"_ustr)) + , m_xMoveDown(m_xBuilder->weld_button(u"downButton"_ustr)) + , m_xAddCondition(m_xBuilder->weld_button(u"addButton"_ustr)) + , m_xRemoveCondition(m_xBuilder->weld_button(u"removeButton"_ustr)) { - m_xCondLHS.reset(new ConditionField(this, m_xBuilder->weld_entry("lhsEntry"), m_xBuilder->weld_button("lhsButton"))); - m_xCondRHS.reset(new ConditionField(this, m_xBuilder->weld_entry("rhsEntry"), m_xBuilder->weld_button("rhsButton"))); + m_xCondLHS.reset(new ConditionField(this, m_xBuilder->weld_entry(u"lhsEntry"_ustr), m_xBuilder->weld_button(u"lhsButton"_ustr))); + m_xCondRHS.reset(new ConditionField(this, m_xBuilder->weld_entry(u"rhsEntry"_ustr), m_xBuilder->weld_button(u"rhsButton"_ustr))); m_xCondLHS->grab_focus(); @@ -157,11 +157,11 @@ void Condition::SetBackgroundDropdownClick() m_aColorStatus, SID_BACKGROUND_COLOR, nullptr, - MenuOrToolMenuButton(m_xActions.get(), "background"), + MenuOrToolMenuButton(m_xActions.get(), u"background"_ustr), [this]{ return m_pDialog; }, m_aBackColorWrapper)); - m_xActions->set_item_popover("background", m_xBackColorFloat->getTopLevel()); + m_xActions->set_item_popover(u"background"_ustr, m_xBackColorFloat->getTopLevel()); } void Condition::SetForegroundDropdownClick() @@ -172,11 +172,11 @@ void Condition::SetForegroundDropdownClick() m_aColorStatus, SID_ATTR_CHAR_COLOR2, nullptr, - MenuOrToolMenuButton(m_xActions.get(), "foreground"), + MenuOrToolMenuButton(m_xActions.get(), u"foreground"_ustr), [this]{ return m_pDialog; }, m_aForeColorWrapper)); - m_xActions->set_item_popover("foreground", m_xForeColorFloat->getTopLevel()); + m_xActions->set_item_popover(u"foreground"_ustr, m_xForeColorFloat->getTopLevel()); } @@ -304,7 +304,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >& void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat >& _xReportControlFormat) { - OUString aItems[] = { "bold", "italic", "underline", "fontdialog" }; + OUString aItems[] = { u"bold"_ustr, u"italic"_ustr, u"underline"_ustr, u"fontdialog"_ustr }; OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!"); if ( !_xReportControlFormat.is() ) diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 2bbcc00ef3ca..f6b965aa9f0b 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -38,17 +38,17 @@ using namespace ::com::sun::star; ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, uno::Reference< report::XSection > _xHoldAlive, OReportController* _pController) - : GenericDialogController(_pParent, "modules/dbreport/ui/datetimedialog.ui", "DateTimeDialog") + : GenericDialogController(_pParent, u"modules/dbreport/ui/datetimedialog.ui"_ustr, u"DateTimeDialog"_ustr) , m_pController(_pController) , m_xHoldAlive(std::move(_xHoldAlive)) - , m_xDate(m_xBuilder->weld_check_button("date")) - , m_xFTDateFormat(m_xBuilder->weld_label("datelistbox_label")) - , m_xDateListBox(m_xBuilder->weld_combo_box("datelistbox")) - , m_xTime(m_xBuilder->weld_check_button("time")) - , m_xFTTimeFormat(m_xBuilder->weld_label("timelistbox_label")) - , m_xTimeListBox(m_xBuilder->weld_combo_box("timelistbox")) - , m_xPB_OK(m_xBuilder->weld_button("ok")) + , m_xDate(m_xBuilder->weld_check_button(u"date"_ustr)) + , m_xFTDateFormat(m_xBuilder->weld_label(u"datelistbox_label"_ustr)) + , m_xDateListBox(m_xBuilder->weld_combo_box(u"datelistbox"_ustr)) + , m_xTime(m_xBuilder->weld_check_button(u"time"_ustr)) + , m_xFTTimeFormat(m_xBuilder->weld_label(u"timelistbox_label"_ustr)) + , m_xTimeListBox(m_xBuilder->weld_combo_box(u"timelistbox"_ustr)) + , m_xPB_OK(m_xBuilder->weld_button(u"ok"_ustr)) { try { @@ -148,7 +148,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); OUString sFormat; - xFormSet->getPropertyValue("FormatString") >>= sFormat; + xFormSet->getPropertyValue(u"FormatString"_ustr) >>= sFormat; double nValue = 0; if ( _bTime ) diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 9cad568ec62a..ec1fc754549b 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -53,7 +53,7 @@ FormulaDialog::FormulaDialog(weld::Window* pParent ,m_xFormulaData(new FormEditData()) ,m_xRowSet(std::move(_xRowSet)) ,m_pEdit(nullptr) - ,m_sFormula("=") + ,m_sFormula(u"="_ustr) ,m_nStart(0) ,m_nEnd(1) ,mrStringPool(rStrPool) @@ -65,7 +65,7 @@ FormulaDialog::FormulaDialog(weld::Window* pParent else m_sFormula = _sFormula; } - m_xParser.set(_xServiceFactory->createInstance("org.libreoffice.report.pentaho.SOFormulaParser"),uno::UNO_QUERY); + m_xParser.set(_xServiceFactory->createInstance(u"org.libreoffice.report.pentaho.SOFormulaParser"_ustr),uno::UNO_QUERY); if ( m_xParser.is() ) m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper(); fill(); @@ -87,7 +87,7 @@ FormulaDialog::~FormulaDialog() { if ( m_xAddField ) { - SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN ); + SvtViewOptions aDlgOpt( EViewType::Window, u"" HID_RPT_FIELD_SEL_WIN ""_ustr ); aDlgOpt.SetWindowState(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::Pos | vcl::WindowDataMask::State | vcl::WindowDataMask::Minimized)); if (m_xAddField->getDialog()->get_visible()) @@ -210,7 +210,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_xAddField = std::make_shared<OAddFieldWindow>(m_xDialog.get(), m_xRowSet); m_xAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN ); + SvtViewOptions aDlgOpt( EViewType::Window, u"" HID_RPT_FIELD_SEL_WIN ""_ustr ); if ( aDlgOpt.Exists() ) { m_xAddField->getDialog()->set_window_state(aDlgOpt.GetWindowState()); diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 7b749c3f4b4a..68616b9b07ac 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -30,7 +30,7 @@ namespace rptui static SotClipboardFormatId s_nReportFormat = static_cast<SotClipboardFormatId>(-1); if ( static_cast<SotClipboardFormatId>(-1) == s_nReportFormat ) { - s_nReportFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\""); + s_nReportFormat = SotExchange::RegisterFormatName(u"application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\""_ustr); OSL_ENSURE(static_cast<SotClipboardFormatId>(-1) != s_nReportFormat, "Bad exchange id!"); } return s_nReportFormat; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 38697ca12861..9998c037ac1a 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -693,9 +693,9 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) ::tools::Rectangle aRect(rEvt.GetMousePosPixel(), Size(1, 1)); weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "modules/dbreport/ui/groupsortmenu.ui")); - std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu")); - xContextMenu->set_sensitive("delete", IsDeleteAllowed() && bEnable); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"modules/dbreport/ui/groupsortmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu(u"menu"_ustr)); + xContextMenu->set_sensitive(u"delete"_ustr, IsDeleteAllowed() && bEnable); if (!xContextMenu->popup_at_rect(pPopupParent, aRect).isEmpty()) { if( m_nDeleteEvent ) @@ -784,21 +784,21 @@ Size OFieldExpressionControl::GetOptimalSize() const OGroupsSortingDialog::OGroupsSortingDialog(weld::Window* pParent, bool bReadOnly, OReportController* pController) - : GenericDialogController(pParent, "modules/dbreport/ui/floatingsort.ui", "FloatingSort") + : GenericDialogController(pParent, u"modules/dbreport/ui/floatingsort.ui"_ustr, u"FloatingSort"_ustr) , OPropertyChangeListener(m_aMutex) , m_pController(pController) , m_xGroups(m_pController->getReportDefinition()->getGroups()) , m_bReadOnly(bReadOnly) - , m_xToolBox(m_xBuilder->weld_toolbar("toolbox")) - , m_xProperties(m_xBuilder->weld_widget("properties")) - , m_xOrderLst(m_xBuilder->weld_combo_box("sorting")) - , m_xHeaderLst(m_xBuilder->weld_combo_box("header")) - , m_xFooterLst(m_xBuilder->weld_combo_box("footer")) - , m_xGroupOnLst(m_xBuilder->weld_combo_box("group")) - , m_xGroupIntervalEd(m_xBuilder->weld_spin_button("interval")) - , m_xKeepTogetherLst(m_xBuilder->weld_combo_box("keep")) - , m_xHelpWindow(m_xBuilder->weld_label("helptext")) - , m_xBox(m_xBuilder->weld_container("box")) + , m_xToolBox(m_xBuilder->weld_toolbar(u"toolbox"_ustr)) + , m_xProperties(m_xBuilder->weld_widget(u"properties"_ustr)) + , m_xOrderLst(m_xBuilder->weld_combo_box(u"sorting"_ustr)) + , m_xHeaderLst(m_xBuilder->weld_combo_box(u"header"_ustr)) + , m_xFooterLst(m_xBuilder->weld_combo_box(u"footer"_ustr)) + , m_xGroupOnLst(m_xBuilder->weld_combo_box(u"group"_ustr)) + , m_xGroupIntervalEd(m_xBuilder->weld_spin_button(u"interval"_ustr)) + , m_xKeepTogetherLst(m_xBuilder->weld_combo_box(u"keep"_ustr)) + , m_xHelpWindow(m_xBuilder->weld_label(u"helptext"_ustr)) + , m_xBox(m_xBuilder->weld_container(u"box"_ustr)) , m_xTableCtrlParent(m_xBox->CreateChildFrame()) , m_xFieldExpression(VclPtr<OFieldExpressionControl>::Create(this, m_xTableCtrlParent)) { @@ -1149,30 +1149,30 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) if (bEnabled && _nRow > 0 ) { - m_xToolBox->set_item_sensitive("up", true); + m_xToolBox->set_item_sensitive(u"up"_ustr, true); } else { - m_xToolBox->set_item_sensitive("up", false); + m_xToolBox->set_item_sensitive(u"up"_ustr, false); } if (bEnabled && _nRow < (nRowCount - 1) ) { - m_xToolBox->set_item_sensitive("down", true); + m_xToolBox->set_item_sensitive(u"down"_ustr, true); } else { - m_xToolBox->set_item_sensitive("down", false); + m_xToolBox->set_item_sensitive(u"down"_ustr, false); } sal_Int32 nGroupPos = m_xFieldExpression->getGroupPosition(_nRow); if ( nGroupPos != NO_GROUP ) { bool bEnableDelete = nGroupCount > 0; - m_xToolBox->set_item_sensitive("delete", bEnableDelete); + m_xToolBox->set_item_sensitive(u"delete"_ustr, bEnableDelete); } else { - m_xToolBox->set_item_sensitive("delete", false); + m_xToolBox->set_item_sensitive(u"delete"_ustr, false); } } diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index db67e68a72d6..e0cc989c689a 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -272,10 +272,10 @@ IMPL_LINK(NavigatorTree, CommandHdl, const CommandEvent&, rEvt, bool) bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is()); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xTreeView.get(), "modules/dbreport/ui/navigatormenu.ui")); - std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xTreeView.get(), u"modules/dbreport/ui/navigatormenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu(u"menu"_ustr)); - const OUString aIds[] = { "sorting", "page", "report", "function", "properties", "delete" }; + const OUString aIds[] = { u"sorting"_ustr, u"page"_ustr, u"report"_ustr, u"function"_ustr, u"properties"_ustr, u"delete"_ustr }; for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i) { sal_uInt16 nSId = mapIdent(aIds[i]); @@ -782,9 +782,9 @@ void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource) } ONavigator::ONavigator(weld::Window* pParent, OReportController& rController) - : GenericDialogController(pParent, "modules/dbreport/ui/floatingnavigator.ui", "FloatingNavigator") + : GenericDialogController(pParent, u"modules/dbreport/ui/floatingnavigator.ui"_ustr, u"FloatingNavigator"_ustr) , m_xReport(rController.getReportDefinition()) - , m_xNavigatorTree(std::make_unique<NavigatorTree>(m_xBuilder->weld_tree_view("treeview"), rController)) + , m_xNavigatorTree(std::make_unique<NavigatorTree>(m_xBuilder->weld_tree_view(u"treeview"_ustr), rController)) { reportdesign::OReportVisitor aVisitor(m_xNavigatorTree.get()); aVisitor.start(m_xReport); diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 1e267fb1fb10..1b70dfe5b717 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -35,13 +35,13 @@ using namespace ::comphelper; OPageNumberDialog::OPageNumberDialog(weld::Window* pParent, uno::Reference< report::XReportDefinition > _xHoldAlive, OReportController* _pController) - : GenericDialogController(pParent, "modules/dbreport/ui/pagenumberdialog.ui", "PageNumberDialog") + : GenericDialogController(pParent, u"modules/dbreport/ui/pagenumberdialog.ui"_ustr, u"PageNumberDialog"_ustr) , m_pController(_pController) , m_xHoldAlive(std::move(_xHoldAlive)) - , m_xPageNofM(m_xBuilder->weld_radio_button("pagenofm")) - , m_xTopPage(m_xBuilder->weld_radio_button("toppage")) - , m_xAlignmentLst(m_xBuilder->weld_combo_box("alignment")) - , m_xShowNumberOnFirstPage(m_xBuilder->weld_check_button("shownumberonfirstpage")) + , m_xPageNofM(m_xBuilder->weld_radio_button(u"pagenofm"_ustr)) + , m_xTopPage(m_xBuilder->weld_radio_button(u"toppage"_ustr)) + , m_xAlignmentLst(m_xBuilder->weld_combo_box(u"alignment"_ustr)) + , m_xShowNumberOnFirstPage(m_xBuilder->weld_check_button(u"shownumberonfirstpage"_ustr)) { m_xShowNumberOnFirstPage->hide(); } diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 7e99ba19d4e5..451e47d88f1f 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -40,27 +40,27 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, c if (rDialog == "BackgroundDialog") { - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); + AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); } else if (rDialog == "PageDialog") { - AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), nullptr ); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); + AddTabPage(u"page"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), nullptr ); + AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); } else if (rDialog == "CharDialog") { - AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); - AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); - AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), nullptr ); - AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), nullptr ); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); - AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); + AddTabPage(u"font"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); + AddTabPage(u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); + AddTabPage(u"position"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), nullptr ); + AddTabPage(u"asianlayout"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), nullptr ); + AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); + AddTabPage(u"alignment"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); } else OSL_FAIL("Unknown page id"); if ( !SvtCJKOptions::IsDoubleLinesEnabled() ) - RemoveTabPage("asianlayout"); + RemoveTabPage(u"asianlayout"_ustr); } void ORptPageDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 163782602f57..b8c6a1c15fce 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -71,7 +71,7 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext OUString SAL_CALL DataProviderHandler::getImplementationName( ) { - return "com.sun.star.comp.report.DataProviderHandler"; + return u"com.sun.star.comp.report.DataProviderHandler"_ustr; } sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceName ) @@ -81,7 +81,7 @@ sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceN uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames( ) { - return { "com.sun.star.report.inspection.DataProviderHandler" }; + return { u"com.sun.star.report.inspection.DataProviderHandler"_ustr }; } // override WeakComponentImplHelperBase::disposing() @@ -125,7 +125,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface } } m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY); - m_xReportComponent.set( xNameCont->getByName("ReportComponent"), uno::UNO_QUERY ); + m_xReportComponent.set( xNameCont->getByName(u"ReportComponent"_ustr), uno::UNO_QUERY ); if ( m_xDataProvider.is() ) { auto aNoConverter = std::make_shared<AnyConverter>(); @@ -219,7 +219,7 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); if ( !xTitle.is() ) { - xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.chart2.Title",m_xContext),uno::UNO_QUERY); + xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.chart2.Title"_ustr,m_xContext),uno::UNO_QUERY); xTitled->setTitleObject(xTitle); } if ( xTitle.is() ) @@ -427,10 +427,10 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & Act bool bModified = xReport->isModified(); // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) ); - aArgs.put( "HasCategories", uno::Any( true ) ); - aArgs.put( "FirstCellAsLabel", uno::Any( true ) ); - aArgs.put( "DataRowSource", uno::Any( chart::ChartDataRowSource_COLUMNS ) ); + aArgs.put( u"CellRangeRepresentation"_ustr, uno::Any( u"all"_ustr ) ); + aArgs.put( u"HasCategories"_ustr, uno::Any( true ) ); + aArgs.put( u"FirstCellAsLabel"_ustr, uno::Any( true ) ); + aArgs.put( u"DataRowSource"_ustr, uno::Any( chart::ChartDataRowSource_COLUMNS ) ); uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xChartModel,uno::UNO_QUERY_THROW); xReceiver->setArguments( aArgs.getPropertyValues() ); if ( !bModified ) @@ -467,7 +467,7 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex { uno::Sequence<uno::Any> aSeq(comphelper::InitAnyPropertySequence( { - {"ParentWindow", m_xContext->getValueByName("DialogParentWindow")}, + {"ParentWindow", m_xContext->getValueByName(u"DialogParentWindow"_ustr)}, {"Detail", uno::Any(m_xDataProvider)}, {"Master", uno::Any(m_xReportComponent->getSection()->getReportDefinition())}, {"Explanation", uno::Any(RptResId(TranslateId(nullptr, RID_STR_EXPLANATION)))}, @@ -477,7 +477,7 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "org.openoffice.comp.form.ui.MasterDetailLinkDialog", aSeq, m_xContext), + u"org.openoffice.comp.form.ui.MasterDetailLinkDialog"_ustr, aSeq, m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); @@ -488,13 +488,13 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua { uno::Sequence<uno::Any> aSeq(comphelper::InitAnyPropertySequence( { - {"ParentWindow", m_xContext->getValueByName("DialogParentWindow")}, + {"ParentWindow", m_xContext->getValueByName(u"DialogParentWindow"_ustr)}, {"ChartModel", uno::Any(m_xChartModel)} })); uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.comp.chart2.ChartTypeDialog", aSeq, m_xContext), + u"com.sun.star.comp.chart2.ChartTypeDialog"_ustr, aSeq, m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 04404de5fdda..e7430f74dbf9 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -60,7 +60,7 @@ namespace rptui OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName( ) { - return "com.sun.star.comp.report.DefaultComponentInspectorModel"; + return u"com.sun.star.comp.report.DefaultComponentInspectorModel"_ustr; } sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const OUString& ServiceName ) @@ -70,17 +70,17 @@ namespace rptui Sequence< OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames( ) { - return { "com.sun.star.report.inspection.DefaultComponentInspectorModel" }; + return { u"com.sun.star.report.inspection.DefaultComponentInspectorModel"_ustr }; } Sequence< Any > SAL_CALL DefaultComponentInspectorModel::getHandlerFactories() { // service names for all our handlers return Sequence<Any> { - Any(OUString( "com.sun.star.report.inspection.ReportComponentHandler")), - Any(OUString( "com.sun.star.form.inspection.EditPropertyHandler")), - Any(OUString( "com.sun.star.report.inspection.DataProviderHandler")), - Any(OUString( "com.sun.star.report.inspection.GeometryHandler")) + Any(u"com.sun.star.report.inspection.ReportComponentHandler"_ustr), + Any(u"com.sun.star.form.inspection.EditPropertyHandler"_ustr), + Any(u"com.sun.star.report.inspection.DataProviderHandler"_ustr), + Any(u"com.sun.star.report.inspection.GeometryHandler"_ustr) }; } @@ -190,7 +190,7 @@ namespace rptui if ( !m_xComponent.is() ) try { - m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.form.inspection.DefaultFormComponentInspectorModel",m_xContext),UNO_QUERY_THROW); + m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.form.inspection.DefaultFormComponentInspectorModel"_ustr,m_xContext),UNO_QUERY_THROW); } catch(const Exception &) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 29fe406e53cb..9b7d1db223bd 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -219,7 +219,7 @@ GeometryHandler::~GeometryHandler() OUString SAL_CALL GeometryHandler::getImplementationName( ) { - return "com.sun.star.comp.report.GeometryHandler"; + return u"com.sun.star.comp.report.GeometryHandler"_ustr; } sal_Bool SAL_CALL GeometryHandler::supportsService( const OUString& ServiceName ) @@ -229,7 +229,7 @@ sal_Bool SAL_CALL GeometryHandler::supportsService( const OUString& ServiceName uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames( ) { - return { "com.sun.star.report.inspection.GeometryHandler" }; + return { u"com.sun.star.report.inspection.GeometryHandler"_ustr }; } // override WeakComponentImplHelperBase::disposing() @@ -280,7 +280,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this )); const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY ); - m_xReportComponent.set( xObjectAsContainer->getByName("ReportComponent"), uno::UNO_QUERY ); + m_xReportComponent.set( xObjectAsContainer->getByName(u"ReportComponent"_ustr), uno::UNO_QUERY ); static constexpr OUString sRowSet(u"RowSet"_ustr); if ( xObjectAsContainer->hasByName( sRowSet ) ) @@ -925,14 +925,14 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { case PROPERTY_ID_FORCENEWPAGE: case PROPERTY_ID_NEWROWORCOL: - aPropertyValue = getConstantValue(false,RID_STR_FORCENEWPAGE_CONST,_rControlValue,"com.sun.star.report.ForceNewPage",PropertyName); + aPropertyValue = getConstantValue(false,RID_STR_FORCENEWPAGE_CONST,_rControlValue,u"com.sun.star.report.ForceNewPage"_ustr,PropertyName); break; case PROPERTY_ID_GROUPKEEPTOGETHER: - aPropertyValue = getConstantValue(false,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,"com.sun.star.report.GroupKeepTogether",PropertyName); + aPropertyValue = getConstantValue(false,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,u"com.sun.star.report.GroupKeepTogether"_ustr,PropertyName); break; case PROPERTY_ID_PAGEHEADEROPTION: case PROPERTY_ID_PAGEFOOTEROPTION: - aPropertyValue = getConstantValue(false,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,"com.sun.star.report.ReportPrintOption",PropertyName); + aPropertyValue = getConstantValue(false,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,u"com.sun.star.report.ReportPrintOption"_ustr,PropertyName); break; case PROPERTY_ID_BACKCOLOR: case PROPERTY_ID_CONTROLBACKGROUND: @@ -946,7 +946,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) { - aPropertyValue = getConstantValue(false,RID_STR_KEEPTOGETHER_CONST,_rControlValue,"com.sun.star.report.KeepTogether",PropertyName); + aPropertyValue = getConstantValue(false,RID_STR_KEEPTOGETHER_CONST,_rControlValue,u"com.sun.star.report.KeepTogether"_ustr,PropertyName); break; } [[fallthrough]]; @@ -1118,19 +1118,19 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper break; case PROPERTY_ID_FORCENEWPAGE: case PROPERTY_ID_NEWROWORCOL: - aControlValue = getConstantValue(true,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,"com.sun.star.report.ForceNewPage",PropertyName); + aControlValue = getConstantValue(true,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,u"com.sun.star.report.ForceNewPage"_ustr,PropertyName); break; case PROPERTY_ID_GROUPKEEPTOGETHER: - aControlValue = getConstantValue(true,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,"com.sun.star.report.GroupKeepTogether",PropertyName); + aControlValue = getConstantValue(true,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,u"com.sun.star.report.GroupKeepTogether"_ustr,PropertyName); break; case PROPERTY_ID_PAGEHEADEROPTION: case PROPERTY_ID_PAGEFOOTEROPTION: - aControlValue = getConstantValue(true,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,"com.sun.star.report.ReportPrintOption",PropertyName); + aControlValue = getConstantValue(true,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,u"com.sun.star.report.ReportPrintOption"_ustr,PropertyName); break; case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) { - aControlValue = getConstantValue(true,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,"com.sun.star.report.KeepTogether",PropertyName); + aControlValue = getConstantValue(true,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,u"com.sun.star.report.KeepTogether"_ustr,PropertyName); break; } [[fallthrough]]; @@ -1275,7 +1275,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie ,PROPERTY_VISIBLE ,PROPERTY_PAGEHEADEROPTION ,PROPERTY_PAGEFOOTEROPTION - ,OUString("ControlLabel") + ,u"ControlLabel"_ustr ,PROPERTY_POSITIONX ,PROPERTY_POSITIONY ,PROPERTY_WIDTH @@ -1394,7 +1394,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; - const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName(u"DialogParentWindow"_ustr) ,uno::UNO_QUERY); const uno::Reference< report::XReportControlFormat> xReportControlFormat(m_xReportComponent,uno::UNO_QUERY); aGuard.clear(); @@ -1416,7 +1416,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr OUString sFormula; m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula; - const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName(u"DialogParentWindow"_ustr) ,uno::UNO_QUERY); uno::Reference< uno::XComponentContext > xContext = m_xContext; uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY); aGuard.clear(); @@ -1434,7 +1434,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; - const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName(u"DialogParentWindow"_ustr) ,uno::UNO_QUERY); const uno::Reference< report::XShape> xShape(m_xReportComponent,uno::UNO_QUERY); aGuard.clear(); @@ -1551,15 +1551,15 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, try { xFactory = m_xContext->getServiceManager(); - xInspectorWindow.set(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); - uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName("ActiveConnection") ,uno::UNO_QUERY); + xInspectorWindow.set(m_xContext->getValueByName(u"DialogParentWindow"_ustr) ,uno::UNO_QUERY); + uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName(u"ActiveConnection"_ustr) ,uno::UNO_QUERY); if ( !xCon.is() ) return false; uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY); if ( !m_xRowSet.is() ) { - m_xRowSet.set(xFactory->createInstanceWithContext("com.sun.star.sdb.RowSet",m_xContext),uno::UNO_QUERY); + m_xRowSet.set(xFactory->createInstanceWithContext(u"com.sun.star.sdb.RowSet"_ustr,m_xContext),uno::UNO_QUERY); xRowSetProp.set(m_xRowSet,uno::UNO_QUERY); xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::Any(xCon)); ::comphelper::copyProperties(m_xReportComponent,xRowSetProp); @@ -2024,7 +2024,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF _rFieldNames.realloc(0); try { - uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); + uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName(u"DialogParentWindow"_ustr) ,uno::UNO_QUERY); weld::WaitObject aWaitCursor(Application::GetFrameWeld(xInspectorWindow)); // get the form of the control we're inspecting @@ -2035,7 +2035,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF OUString sObjectName; OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName ); // when there is no command we don't need to ask for columns - uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName("ActiveConnection") ,uno::UNO_QUERY); + uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName(u"ActiveConnection"_ustr) ,uno::UNO_QUERY); if ( !sObjectName.isEmpty() && xCon.is() ) { sal_Int32 nObjectType = sdb::CommandType::COMMAND; diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index f2032df2b77a..e3eb0d454825 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -47,7 +47,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo OUString SAL_CALL ReportComponentHandler::getImplementationName( ) { - return "com.sun.star.comp.report.ReportComponentHandler"; + return u"com.sun.star.comp.report.ReportComponentHandler"_ustr; } sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& ServiceName ) @@ -57,7 +57,7 @@ sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& Servi uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames( ) { - return { "com.sun.star.report.inspection.ReportComponentHandler" }; + return { u"com.sun.star.report.inspection.ReportComponentHandler"_ustr }; } // override WeakComponentImplHelperBase::disposing() diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index e18820647fae..bfed5fb59d43 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -176,7 +176,7 @@ namespace rptui // initialization if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0, OUString(), "", PropUIFlags::NONE); + OPropertyInfoImpl aSearch(_rName, 0, OUString(), u""_ustr, PropUIFlags::NONE); const OPropertyInfoImpl* pPropInfo = ::std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index ab5f55cfec08..2d3851486816 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -440,11 +440,11 @@ namespace // create an AWT font awt::FontDescriptor aAwtFont; lcl_initAwtFont( _rOriginalControlFont, _rItemSet, aAwtFont,ITEMID_FONT,ITEMID_FONTHEIGHT,ITEMID_POSTURE, ITEMID_WEIGHT); - lcl_pushBack( _out_rProperties, "Font", uno::Any( aAwtFont ) ); + lcl_pushBack( _out_rProperties, u"Font"_ustr, uno::Any( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontAsian, _rItemSet, aAwtFont,ITEMID_FONT_ASIAN,ITEMID_FONTHEIGHT_ASIAN,ITEMID_POSTURE_ASIAN, ITEMID_WEIGHT_ASIAN); - lcl_pushBack( _out_rProperties, "FontAsian", uno::Any( aAwtFont ) ); + lcl_pushBack( _out_rProperties, u"FontAsian"_ustr, uno::Any( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontComplex, _rItemSet, aAwtFont,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_POSTURE_COMPLEX, ITEMID_WEIGHT_COMPLEX); - lcl_pushBack( _out_rProperties, "FontComplex", uno::Any( aAwtFont ) ); + lcl_pushBack( _out_rProperties, u"FontComplex"_ustr, uno::Any( aAwtFont ) ); // properties which cannot be represented in an AWT font need to be preserved directly if ( const SvxShadowedItem* pShadowedItem = _rItemSet.GetItemIfSet( ITEMID_SHADOWED) ) @@ -556,7 +556,7 @@ static ItemInfoPackage& getItemInfoPackageOpenCharDlg() ItemInfoArrayOpenCharDlg maItemInfos {{ // m_nWhich, m_pItem, m_nSlotID, m_nItemInfoFlags { XATTR_FILLSTYLE, new XFillStyleItem, 0, SFX_ITEMINFOFLAG_NONE }, - { XATTR_FILLCOLOR, new XFillColorItem("", COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_SUPPORT_SURROGATE }, + { XATTR_FILLCOLOR, new XFillColorItem(u""_ustr, COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_SUPPORT_SURROGATE }, { XATTR_FILLGRADIENT, new XFillGradientItem(basegfx::BGradient()), 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLHATCH, new XFillHatchItem(COL_DEFAULT_SHAPE_STROKE), 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBITMAP, nullptr, 0, SFX_ITEMINFOFLAG_NONE }, @@ -567,7 +567,7 @@ static ItemInfoPackage& getItemInfoPackageOpenCharDlg() { XATTR_FILLBMP_SIZEX, new XFillBmpSizeXItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_SIZEY, new XFillBmpSizeYItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLFLOATTRANSPARENCE, new XFillFloatTransparenceItem(basegfx::BGradient(), false), 0, SFX_ITEMINFOFLAG_NONE }, - { XATTR_SECONDARYFILLCOLOR, new XSecondaryFillColorItem("", COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_NONE }, + { XATTR_SECONDARYFILLCOLOR, new XSecondaryFillColorItem(u""_ustr, COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_SIZELOG, new XFillBmpSizeLogItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_TILEOFFSETX, new XFillBmpTileOffsetXItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_TILEOFFSETY, new XFillBmpTileOffsetYItem, 0, SFX_ITEMINFOFLAG_NONE }, @@ -663,7 +663,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep ITEMID_FONT, ITEMID_WEIGHT_COMPLEX >); - rtl::Reference<SfxItemPool> pPool(new SfxItemPool("ReportCharProperties")); + rtl::Reference<SfxItemPool> pPool(new SfxItemPool(u"ReportCharProperties"_ustr)); // not needed for font height pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why // here we have to use the callback to create all needed default entries. @@ -686,10 +686,10 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep lcl_CharPropertiesToItems( _rxReportControlFormat, aDescriptor ); { // want the dialog to be destroyed before our set - ORptPageDialog aDlg(Application::GetFrameWeld(_rxParentWindow), &aDescriptor, "CharDialog"); + ORptPageDialog aDlg(Application::GetFrameWeld(_rxParentWindow), &aDescriptor, u"CharDialog"_ustr); uno::Reference< report::XShape > xShape( _rxReportControlFormat, uno::UNO_QUERY ); if ( xShape.is() ) - aDlg.RemoveTabPage("background"); + aDlg.RemoveTabPage(u"background"_ustr); bSuccess = aDlg.run() == RET_OK; if ( bSuccess ) { @@ -753,21 +753,21 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat try { awt::FontDescriptor aAwtFont; - if ( aSettings.get( "Font" ) >>= aAwtFont ) + if ( aSettings.get( u"Font"_ustr ) >>= aAwtFont ) { OUString sTemp = aAwtFont.Name; aAwtFont.Name.clear(); // hack to _rxReportControlFormat->setFontDescriptor( aAwtFont ); _rxReportControlFormat->setCharFontName( sTemp ); } - if ( aSettings.get( "FontAsian" ) >>= aAwtFont ) + if ( aSettings.get( u"FontAsian"_ustr ) >>= aAwtFont ) { OUString sTemp = aAwtFont.Name; aAwtFont.Name.clear(); // hack to _rxReportControlFormat->setFontDescriptorAsian( aAwtFont ); _rxReportControlFormat->setCharFontNameAsian( sTemp ); } - if ( aSettings.get( "FontComplex" ) >>= aAwtFont ) + if ( aSettings.get( u"FontComplex"_ustr ) >>= aAwtFont ) { OUString sTemp = aAwtFont.Name; aAwtFont.Name.clear(); // hack to @@ -994,7 +994,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula xFactory = _xContext->getServiceManager(); xServiceFactory.set(xFactory,uno::UNO_QUERY); - uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY); + uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(u"org.libreoffice.report.pentaho.SOFunctionManager"_ustr,_xContext),uno::UNO_QUERY); if ( xMgr.is() ) { auto pFormulaManager = std::make_shared<FunctionManager>(xMgr); diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 98310881a099..8c44f1473635 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -45,7 +45,7 @@ namespace rptui OUString SAL_CALL OStatusbarController::getImplementationName() { - return "com.sun.star.report.comp.StatusbarController"; + return u"com.sun.star.report.comp.StatusbarController"_ustr; } sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) @@ -55,7 +55,7 @@ sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& Service Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() { - return { "com.sun.star.frame.StatusbarController" }; + return { u"com.sun.star.frame.StatusbarController"_ustr }; } IMPLEMENT_FORWARD_XINTERFACE2(OStatusbarController, ::svt::StatusbarController,OStatusbarController_BASE) diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index e75fc654dc36..19d94c56396d 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -94,7 +94,7 @@ ODesignView::ODesignView( vcl::Window* pParent, ,m_aGridSizeFine( 250, 250 ) // and a 0,25 cm subdivision for better visualisation ,m_bDeleted( false ) { - SetHelpId(UID_RPT_RPT_APP_VIEW); + SetHelpId(u"" UID_RPT_RPT_APP_VIEW ""_ustr); ImplInitSettings(); SetMapMode( MapMode( MapUnit::Map100thMM ) ); @@ -132,7 +132,7 @@ void ODesignView::dispose() } if ( m_xAddField ) { - SvtViewOptions aDlgOpt( EViewType::Window, UID_RPT_RPT_APP_VIEW ); + SvtViewOptions aDlgOpt( EViewType::Window, u"" UID_RPT_RPT_APP_VIEW ""_ustr ); aDlgOpt.SetWindowState(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::All)); if (m_xAddField->getDialog()->get_visible()) @@ -513,7 +513,7 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_xAddField = std::make_shared<OAddFieldWindow>(GetFrameWeld(), xSet); m_xAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( EViewType::Window, UID_RPT_RPT_APP_VIEW ); + SvtViewOptions aDlgOpt( EViewType::Window, u"" UID_RPT_RPT_APP_VIEW ""_ustr ); if ( aDlgOpt.Exists() ) m_xAddField->getDialog()->set_window_state(aDlgOpt.GetWindowState()); m_xAddField->Update(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 06c8e4ff25bf..c4a4fb8d4abb 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -239,12 +239,12 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, OUString SAL_CALL OReportController::getImplementationName() { - return "com.sun.star.report.comp.ReportDesign"; + return u"com.sun.star.report.comp.ReportDesign"_ustr; } Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames() { - return { "com.sun.star.sdb.ReportDesign" }; + return { u"com.sun.star.sdb.ReportDesign"_ustr }; } #define PROPERTY_ID_ZOOMVALUE 1 @@ -254,7 +254,7 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon :OReportController_BASE(xContext) ,OPropertyStateContainer(OGenericUnoController_Base::rBHelper) ,m_aSelectionListeners( getMutex() ) - ,m_sMode("normal") + ,m_sMode(u"normal"_ustr) ,m_nSplitPos(-1) ,m_nPageNum(-1) ,m_nSelectionCount(0) @@ -272,7 +272,7 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon { // new Observer m_pReportControllerObserver = new OXReportControllerObserver(*this); - registerProperty("ZoomValue", PROPERTY_ID_ZOOMVALUE, + registerProperty(u"ZoomValue"_ustr, PROPERTY_ID_ZOOMVALUE, beans::PropertyAttribute::BOUND | beans::PropertyAttribute::TRANSIENT, &m_nZoomValue, ::cppu::UnoType<sal_Int16>::get()); @@ -1641,7 +1641,7 @@ void OReportController::impl_initialize( const ::comphelper::NamedValueCollectio rArguments.get_ensureType( PROPERTY_REPORTNAME, m_sName ); if ( m_sName.isEmpty() ) - rArguments.get_ensureType( "DocumentTitle", m_sName ); + rArguments.get_ensureType( u"DocumentTitle"_ustr, m_sName ); try { @@ -1657,7 +1657,7 @@ void OReportController::impl_initialize( const ::comphelper::NamedValueCollectio clearUndoManager(); UndoSuppressor aSuppressUndo( getUndoManager() ); - setMode(::comphelper::NamedValueCollection::getOrDefault(getModel()->getArgs(), u"Mode", OUString("normal"))); + setMode(::comphelper::NamedValueCollection::getOrDefault(getModel()->getArgs(), u"Mode", u"normal"_ustr)); listen(true); setEditable( !m_aReportModel->IsReadOnly() ); @@ -1665,7 +1665,7 @@ void OReportController::impl_initialize( const ::comphelper::NamedValueCollectio m_xFormatter->attachNumberFormatsSupplier(Reference< XNumberFormatsSupplier>(m_xReportDefinition,uno::UNO_QUERY)); utl::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() ); - OUString sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()); + OUString sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(u"HierarchicalDocumentName"_ustr,OUString()); if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() ) { @@ -1700,7 +1700,7 @@ void OReportController::impl_initialize( const ::comphelper::NamedValueCollectio const OReportPage* pPage = dynamic_cast<OReportPage*>(m_aReportModel->GetPage(static_cast<sal_uInt16>(m_nPageNum))); if ( pPage ) { - executeUnChecked(SID_SELECT,{ comphelper::makePropertyValue("", pPage->getSection() ) }); + executeUnChecked(SID_SELECT,{ comphelper::makePropertyValue(u""_ustr, pPage->getSection() ) }); } } else @@ -1773,273 +1773,273 @@ void OReportController::describeSupportedFeatures() { DBSubComponentController::describeSupportedFeatures(); - implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION ); - - implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT ); - - implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER ); - implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW ); - - implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CharColorExt", SID_ATTR_CHAR_COLOR_EXT); - implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR); - implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN ); - implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionShrink", SID_SECTION_SHRINK, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionShrinkTop", SID_SECTION_SHRINK_TOP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionShrinkBottom", SID_SECTION_SHRINK_BOTTOM, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:DistributeSelection", SID_DISTRIBUTE_DLG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeHorzLeft", SID_DISTRIBUTE_HLEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeHorzCenter", SID_DISTRIBUTE_HCENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeHorzDistance", SID_DISTRIBUTE_HDISTANCE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeHorzRight", SID_DISTRIBUTE_HRIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeVertTop", SID_DISTRIBUTE_VTOP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeVertCenter", SID_DISTRIBUTE_VCENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeVertDistance", SID_DISTRIBUTE_VDISTANCE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:DistributeVertBottom", SID_DISTRIBUTE_VBOTTOM, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION ); - - implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SaveACopy", SID_SAVEACOPY, CommandGroup::DOCUMENT ); - - implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:TextDocument"_ustr, SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( u".uno:Spreadsheet"_ustr, SID_RPT_SPREADSHEET, CommandGroup::APPLICATION ); + + implDescribeSupportedFeature( u".uno:Redo"_ustr, SID_REDO, CommandGroup::EDIT ); + implDescribeSupportedFeature( u".uno:Undo"_ustr, SID_UNDO, CommandGroup::EDIT ); + implDescribeSupportedFeature( u".uno:SelectAll"_ustr, SID_SELECTALL, CommandGroup::EDIT ); + implDescribeSupportedFeature( u".uno:SelectAllInSection"_ustr, SID_SELECTALL_IN_SECTION, CommandGroup::EDIT ); + implDescribeSupportedFeature( u".uno:Delete"_ustr, SID_DELETE, CommandGroup::EDIT ); + implDescribeSupportedFeature( u".uno:SelectReport"_ustr, SID_SELECT_REPORT, CommandGroup::EDIT ); + implDescribeSupportedFeature( u".uno:ExecuteReport"_ustr, SID_EXECUTE_REPORT, CommandGroup::EDIT ); + + implDescribeSupportedFeature( u".uno:GridVisible"_ustr, SID_GRID_VISIBLE, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:GridUse"_ustr, SID_GRID_USE, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:HelplinesMove"_ustr, SID_HELPLINES_MOVE, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:ShowRuler"_ustr, SID_RULER, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:AddField"_ustr, SID_FM_ADD_FIELD, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:ReportNavigator"_ustr, SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:ControlProperties"_ustr, SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:DbSortingAndGrouping"_ustr, SID_SORTINGANDGROUPING, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:PageHeaderFooter"_ustr, SID_PAGEHEADERFOOTER, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:ReportHeaderFooter"_ustr, SID_REPORTHEADERFOOTER, CommandGroup::VIEW ); + implDescribeSupportedFeature( u".uno:ZoomSlider"_ustr, SID_ATTR_ZOOMSLIDER ); + implDescribeSupportedFeature( u".uno:Zoom"_ustr, SID_ATTR_ZOOM, CommandGroup::VIEW ); + + implDescribeSupportedFeature( u".uno:ConditionalFormatting"_ustr, SID_CONDITIONALFORMATTING, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:PageDialog"_ustr, SID_PAGEDIALOG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:ResetAttributes"_ustr, SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:Bold"_ustr, SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:Italic"_ustr, SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:Underline"_ustr, SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DBBackgroundColor"_ustr, SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:BackgroundColor"_ustr, SID_BACKGROUND_COLOR, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:CharColorExt"_ustr, SID_ATTR_CHAR_COLOR_EXT); + implDescribeSupportedFeature( u".uno:Color"_ustr, SID_ATTR_CHAR_COLOR); + implDescribeSupportedFeature( u".uno:FontColor"_ustr, SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:FontDialog"_ustr, SID_CHAR_DLG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:LeftPara"_ustr, SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:CenterPara"_ustr, SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:RightPara"_ustr, SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:JustifyPara"_ustr, SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:FontHeight"_ustr, SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:CharFontName"_ustr, SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:ArrangeMenu"_ustr, SID_ARRANGEMENU, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:BringToFront"_ustr, SID_FRAME_TO_TOP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:ObjectBackOne"_ustr, SID_FRAME_DOWN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:ObjectForwardOne"_ustr, SID_FRAME_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SendToBack"_ustr, SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SetObjectToForeground"_ustr, SID_OBJECT_HEAVEN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SetObjectToBackground"_ustr, SID_OBJECT_HELL, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:ObjectAlign"_ustr, SID_OBJECT_ALIGN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:ObjectAlignLeft"_ustr, SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:AlignCenter"_ustr, SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:ObjectAlignRight"_ustr, SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:AlignUp"_ustr, SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:AlignMiddle"_ustr, SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:AlignDown"_ustr, SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:SectionAlign"_ustr, SID_SECTION_ALIGN ); + implDescribeSupportedFeature( u".uno:SectionAlignLeft"_ustr, SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionAlignCenter"_ustr, SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionAlignRight"_ustr, SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionAlignTop"_ustr, SID_SECTION_ALIGN_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionAlignMiddle"_ustr, SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionAlignBottom"_ustr, SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionShrink"_ustr, SID_SECTION_SHRINK, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionShrinkTop"_ustr, SID_SECTION_SHRINK_TOP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SectionShrinkBottom"_ustr, SID_SECTION_SHRINK_BOTTOM, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:ObjectResize"_ustr, SID_OBJECT_RESIZING, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SmallestWidth"_ustr, SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:SmallestHeight"_ustr, SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:GreatestWidth"_ustr, SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:GreatestHeight"_ustr, SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:DistributeSelection"_ustr, SID_DISTRIBUTE_DLG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeHorzLeft"_ustr, SID_DISTRIBUTE_HLEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeHorzCenter"_ustr, SID_DISTRIBUTE_HCENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeHorzDistance"_ustr, SID_DISTRIBUTE_HDISTANCE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeHorzRight"_ustr, SID_DISTRIBUTE_HRIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeVertTop"_ustr, SID_DISTRIBUTE_VTOP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeVertCenter"_ustr, SID_DISTRIBUTE_VCENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeVertDistance"_ustr, SID_DISTRIBUTE_VDISTANCE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:DistributeVertBottom"_ustr, SID_DISTRIBUTE_VBOTTOM, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( u".uno:ExportTo"_ustr, SID_EXPORTDOC, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( u".uno:ExportToPDF"_ustr, SID_EXPORTDOCASPDF, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( u".uno:PrintPreview"_ustr, SID_PRINTPREVIEW, CommandGroup::APPLICATION ); + + implDescribeSupportedFeature( u".uno:NewDoc"_ustr, SID_NEWDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( u".uno:Save"_ustr, SID_SAVEDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( u".uno:SaveAs"_ustr, SID_SAVEASDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( u".uno:SaveACopy"_ustr, SID_SAVEACOPY, CommandGroup::DOCUMENT ); + + implDescribeSupportedFeature( u".uno:InsertPageNumberField"_ustr, SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:InsertDateTimeField"_ustr, SID_DATETIME, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:InsertObjectChart"_ustr, SID_INSERT_DIAGRAM, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:InsertGraphic"_ustr, SID_INSERT_GRAPHIC, CommandGroup::INSERT ); // controls - implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SelectObject"_ustr, SID_OBJECT_SELECT, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:Label"_ustr, SID_FM_FIXEDTEXT, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:Edit"_ustr, SID_FM_EDIT, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ImageControl"_ustr, SID_FM_IMAGECONTROL, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:HFixedLine"_ustr, SID_INSERT_HFIXEDLINE, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:VFixedLine"_ustr, SID_INSERT_VFIXEDLINE, CommandGroup::INSERT ); // shapes - implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes"_ustr, SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.rectangle"_ustr, SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.round-rectangle"_ustr,SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.quadrat"_ustr, SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.round-quadrat"_ustr, SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.circle"_ustr, SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.ellipse"_ustr, SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.circle-pie"_ustr, SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.isosceles-triangle"_ustr,SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.right-triangle"_ustr,SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.trapezoid"_ustr, SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.diamond"_ustr, SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.parallelogram"_ustr, SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.pentagon"_ustr, SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.hexagon"_ustr, SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.octagon"_ustr, SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.cross"_ustr, SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.ring"_ustr, SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.block-arc"_ustr, SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.can"_ustr, SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.cube"_ustr, SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.paper"_ustr, SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:BasicShapes.frame"_ustr, SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:SymbolShapes"_ustr, SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:SymbolShapes.smiley"_ustr , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.sun"_ustr , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.moon"_ustr , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.lightning"_ustr , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.heart"_ustr , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.flower"_ustr , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.cloud"_ustr , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.forbidden"_ustr , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.puzzle"_ustr , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.bracket-pair"_ustr ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.left-bracket"_ustr ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.right-bracket"_ustr,SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.brace-pair"_ustr , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.left-brace"_ustr , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.right-brace"_ustr , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.quad-bevel"_ustr , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.octagon-bevel"_ustr,SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:SymbolShapes.diamond-bevel"_ustr,SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:ArrowShapes.left-arrow"_ustr , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.right-arrow"_ustr , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-arrow"_ustr , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.down-arrow"_ustr , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.left-right-arrow"_ustr , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-down-arrow"_ustr , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-right-arrow"_ustr , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-right-down-arrow"_ustr , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.quad-arrow"_ustr , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.corner-right-arrow"_ustr , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.split-arrow"_ustr , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.striped-right-arrow"_ustr , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.notched-right-arrow"_ustr , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.pentagon-right"_ustr , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.chevron"_ustr , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.right-arrow-callout"_ustr , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.left-arrow-callout"_ustr , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-arrow-callout"_ustr , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.down-arrow-callout"_ustr , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.left-right-arrow-callout"_ustr,SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-down-arrow-callout"_ustr ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.up-right-arrow-callout"_ustr,SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.quad-arrow-callout"_ustr , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.circular-arrow"_ustr , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.split-round-arrow"_ustr , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:ArrowShapes.s-sharped-arrow"_ustr , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:StarShapes.bang"_ustr , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.star4"_ustr , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.star5"_ustr , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.star6"_ustr , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.star8"_ustr , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.star12"_ustr , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.star24"_ustr , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.concave-star6"_ustr , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.vertical-scroll"_ustr , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.horizontal-scroll"_ustr , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.signet"_ustr , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes.doorplate"_ustr , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-process"_ustr , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-alternate-process"_ustr , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-decision"_ustr , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-data"_ustr , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-predefined-process"_ustr , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-internal-storage"_ustr , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-document"_ustr , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-multidocument"_ustr , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-terminator"_ustr , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-preparation"_ustr , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-manual-input"_ustr , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-manual-operation"_ustr , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-connector"_ustr , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-off-page-connector"_ustr , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-card"_ustr , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-punched-tape"_ustr , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-summing-junction"_ustr , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-or"_ustr , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-collate"_ustr , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-sort"_ustr , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-extract"_ustr , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-merge"_ustr , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-stored-data"_ustr , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-delay"_ustr , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-sequential-access"_ustr , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-magnetic-disk"_ustr , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-direct-access-storage"_ustr,SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:FlowChartShapes.flowchart-display"_ustr , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:CalloutShapes.rectangular-callout"_ustr , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes.round-rectangular-callout"_ustr , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes.round-callout"_ustr , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes.cloud-callout"_ustr , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes.line-callout-1"_ustr , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes.line-callout-2"_ustr , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes.line-callout-3"_ustr , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:ArrowShapes"_ustr, SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT ); + + implDescribeSupportedFeature( u".uno:FlowChartShapes"_ustr, SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:CalloutShapes"_ustr, SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT ); + implDescribeSupportedFeature( u".uno:StarShapes"_ustr, SID_DRAWTBX_CS_STAR, CommandGroup::INSERT ); // keys - implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE); + implDescribeSupportedFeature( u".uno:Escape"_ustr, SID_ESCAPE); // internal one - implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER); - implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER); - implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE); - implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND); - implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR); - implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION); - implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE); - implDescribeSupportedFeature( ".uno:Select", SID_SELECT); - implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION); - implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK); - implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK); - implDescribeSupportedFeature( ".uno:TerminateInplaceActivation", SID_TERMINATE_INPLACEACTIVATION); - implDescribeSupportedFeature( ".uno:SelectAllLabels", SID_SELECT_ALL_LABELS); - implDescribeSupportedFeature( ".uno:SelectAllEdits", SID_SELECT_ALL_EDITS); - implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION); - implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION); - implDescribeSupportedFeature( ".uno:GetUndoStrings", SID_GETUNDOSTRINGS); - implDescribeSupportedFeature( ".uno:GetRedoStrings", SID_GETREDOSTRINGS); + implDescribeSupportedFeature( u".uno:RPT_RPTHEADER_UNDO"_ustr, SID_REPORTHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( u".uno:RPT_RPTFOOTER_UNDO"_ustr, SID_REPORTFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( u".uno:RPT_PGHEADER_UNDO"_ustr, SID_PAGEHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( u".uno:RPT_PGFOOTER_UNDO"_ustr, SID_PAGEFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( u".uno:SID_GROUPHEADER"_ustr, SID_GROUPHEADER); + implDescribeSupportedFeature( u".uno:SID_GROUPHEADER_WITHOUT_UNDO"_ustr, SID_GROUPHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( u".uno:SID_GROUPFOOTER"_ustr, SID_GROUPFOOTER); + implDescribeSupportedFeature( u".uno:SID_GROUPFOOTER_WITHOUT_UNDO"_ustr, SID_GROUPFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( u".uno:SID_GROUP_REMOVE"_ustr, SID_GROUP_REMOVE); + implDescribeSupportedFeature( u".uno:SID_GROUP_APPEND"_ustr, SID_GROUP_APPEND); + implDescribeSupportedFeature( u".uno:SID_ADD_CONTROL_PAIR"_ustr, SID_ADD_CONTROL_PAIR); + implDescribeSupportedFeature( u".uno:SplitPosition"_ustr, SID_SPLIT_POSITION); + implDescribeSupportedFeature( u".uno:LastPropertyBrowserPage"_ustr, SID_PROPERTYBROWSER_LAST_PAGE); + implDescribeSupportedFeature( u".uno:Select"_ustr, SID_SELECT); + implDescribeSupportedFeature( u".uno:InsertFunction"_ustr, SID_RPT_NEW_FUNCTION); + implDescribeSupportedFeature( u".uno:NextMark"_ustr, SID_NEXT_MARK); + implDescribeSupportedFeature( u".uno:PrevMark"_ustr, SID_PREV_MARK); + implDescribeSupportedFeature( u".uno:TerminateInplaceActivation"_ustr, SID_TERMINATE_INPLACEACTIVATION); + implDescribeSupportedFeature( u".uno:SelectAllLabels"_ustr, SID_SELECT_ALL_LABELS); + implDescribeSupportedFeature( u".uno:SelectAllEdits"_ustr, SID_SELECT_ALL_EDITS); + implDescribeSupportedFeature( u".uno:CollapseSection"_ustr, SID_COLLAPSE_SECTION); + implDescribeSupportedFeature( u".uno:ExpandSection"_ustr, SID_EXPAND_SECTION); + implDescribeSupportedFeature( u".uno:GetUndoStrings"_ustr, SID_GETUNDOSTRINGS); + implDescribeSupportedFeature( u".uno:GetRedoStrings"_ustr, SID_GETREDOSTRINGS); } void OReportController::impl_onModifyChanged() @@ -2334,7 +2334,7 @@ static ItemInfoPackage& getItemInfoPackageOpenPageDlg() { RPTUI_ID_END, new SfxUInt16Item(RPTUI_ID_END,PAPER_E), SID_PAPER_END, SFX_ITEMINFOFLAG_NONE }, { RPTUI_ID_BRUSH, new SvxBrushItem(RPTUI_ID_BRUSH), SID_ATTR_BRUSH, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLSTYLE, new XFillStyleItem, 0, SFX_ITEMINFOFLAG_NONE }, - { XATTR_FILLCOLOR, new XFillColorItem("", COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_SUPPORT_SURROGATE }, + { XATTR_FILLCOLOR, new XFillColorItem(u""_ustr, COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_SUPPORT_SURROGATE }, { XATTR_FILLGRADIENT, new XFillGradientItem(basegfx::BGradient()), 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLHATCH, new XFillHatchItem(XHatch(COL_DEFAULT_SHAPE_STROKE)), 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBITMAP, nullptr, 0, SFX_ITEMINFOFLAG_NONE }, @@ -2345,7 +2345,7 @@ static ItemInfoPackage& getItemInfoPackageOpenPageDlg() { XATTR_FILLBMP_SIZEX, new XFillBmpSizeXItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_SIZEY, new XFillBmpSizeYItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLFLOATTRANSPARENCE, new XFillFloatTransparenceItem(basegfx::BGradient(), false), 0, SFX_ITEMINFOFLAG_NONE }, - { XATTR_SECONDARYFILLCOLOR, new XSecondaryFillColorItem("", COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_NONE }, + { XATTR_SECONDARYFILLCOLOR, new XSecondaryFillColorItem(u""_ustr, COL_DEFAULT_SHAPE_FILLING), 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_SIZELOG, new XFillBmpSizeLogItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_TILEOFFSETX, new XFillBmpTileOffsetXItem, 0, SFX_ITEMINFOFLAG_NONE }, { XATTR_FILLBMP_TILEOFFSETY, new XFillBmpTileOffsetYItem, 0, SFX_ITEMINFOFLAG_NONE }, @@ -2399,7 +2399,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ // UNO->ItemSet MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); FieldUnit eUserMetric = MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH; - rtl::Reference<SfxItemPool> pPool(new SfxItemPool("ReportPageProperties")); + rtl::Reference<SfxItemPool> pPool(new SfxItemPool(u"ReportPageProperties"_ustr)); pPool->registerItemInfoPackage(getItemInfoPackageOpenPageDlg()); pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why @@ -2439,8 +2439,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ { // want the dialog to be destroyed before our set ORptPageDialog aDlg( getFrameWeld(), &aDescriptor,_xSection.is() - ? OUString("BackgroundDialog") - : OUString("PageDialog")); + ? u"BackgroundDialog"_ustr + : u"PageDialog"_ustr); if (aDlg.run() == RET_OK) { @@ -2711,7 +2711,7 @@ uno::Any SAL_CALL OReportController::getViewData() } ::comphelper::NamedValueCollection aViewData; - aViewData.put( "CommandProperties", aCommandProperties.getPropertyValues() ); + aViewData.put( u"CommandProperties"_ustr, aCommandProperties.getPropertyValues() ); if ( getDesignView() ) { @@ -2730,17 +2730,17 @@ uno::Any SAL_CALL OReportController::getViewData() ++i; } - aViewData.put( "CollapsedSections", aCollapsedSections ); + aViewData.put( u"CollapsedSections"_ustr, aCollapsedSections ); } OSectionWindow* pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow ) { - aViewData.put( "MarkedSection", static_cast<sal_Int32>(pSectionWindow->getReportSection().getPage()->GetPageNum()) ); + aViewData.put( u"MarkedSection"_ustr, static_cast<sal_Int32>(pSectionWindow->getReportSection().getPage()->GetPageNum()) ); } } - aViewData.put( "ZoomFactor", m_nZoomValue ); + aViewData.put( u"ZoomFactor"_ustr, m_nZoomValue ); return uno::Any( aViewData.getPropertyValues() ); } @@ -2752,15 +2752,15 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) { const ::comphelper::NamedValueCollection aViewData( i_data ); - m_aCollapsedSections = aViewData.getOrDefault( "CollapsedSections", m_aCollapsedSections ); - m_nPageNum = aViewData.getOrDefault( "MarkedSection", m_nPageNum ); - m_nZoomValue = aViewData.getOrDefault( "ZoomFactor", m_nZoomValue ); + m_aCollapsedSections = aViewData.getOrDefault( u"CollapsedSections"_ustr, m_aCollapsedSections ); + m_nPageNum = aViewData.getOrDefault( u"MarkedSection"_ustr, m_nPageNum ); + m_nZoomValue = aViewData.getOrDefault( u"ZoomFactor"_ustr, m_nZoomValue ); // TODO: setting those 3 members is not enough - in theory, restoreViewData can be called when the // view is fully alive, so we need to reflect those 3 values in the view. // (At the moment, the method is called only during construction phase) - ::comphelper::NamedValueCollection aCommandProperties( aViewData.get( "CommandProperties" ) ); + ::comphelper::NamedValueCollection aCommandProperties( aViewData.get( u"CommandProperties"_ustr ) ); const ::std::vector< OUString > aCommandNames( aCommandProperties.getNames() ); for ( const auto& rCommandName : aCommandNames ) @@ -2774,7 +2774,7 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) util::URL aCommand; aCommand.Complete = ".uno:" + rCommandName; - executeUnChecked( aCommand, { comphelper::makePropertyValue("Value", rCommandValue) } ); + executeUnChecked( aCommand, { comphelper::makePropertyValue(u"Value"_ustr, rCommandValue) } ); } else { @@ -2808,7 +2808,7 @@ Reference<XFrame> OReportController::getXFrame() m_xFrameLoader.set( frame::Desktop::create(m_xContext) ); } const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - Reference<XFrame> xFrame = m_xFrameLoader->findFrame("_blank",nFrameSearchFlag); + Reference<XFrame> xFrame = m_xFrameLoader->findFrame(u"_blank"_ustr,nFrameSearchFlag); return xFrame; } @@ -2937,7 +2937,7 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() try { uno::Reference< sdbc::XRowSet > xRowSet( - getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.sdb.RowSet", getORB()), + getORB()->getServiceManager()->createInstanceWithContext(u"com.sun.star.sdb.RowSet"_ustr, getORB()), uno::UNO_QUERY ); uno::Reference< beans::XPropertySet> xRowSetProp( xRowSet, uno::UNO_QUERY_THROW ); @@ -3303,7 +3303,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } svx::ODataAccessDescriptor aDescriptor(aValue); SequenceAsHashMap aMap(aValue); - uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault("Section",xCurrentSection); + uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(u"Section"_ustr,xCurrentSection); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); getDesignView()->setMarked(xSection, true); @@ -3315,7 +3315,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.X = nLeftMargin; // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down - sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault("DNDAction", sal_Int8(0)); + sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(u"DNDAction"_ustr, sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) @@ -3388,7 +3388,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); OUString sParamName; - OSL_VERIFY( xParamCol->getPropertyValue("Name") >>= sParamName ); + OSL_VERIFY( xParamCol->getPropertyValue(u"Name"_ustr) >>= sParamName ); if ( sParamName == sColumnName ) { xField = xParamCol; @@ -3968,7 +3968,7 @@ void OReportController::checkChartEnabled() try { ::utl::OConfigurationTreeRoot aConfiguration( - ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, "/org.openoffice.Office.ReportDesign" ) ); + ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, u"/org.openoffice.Office.ReportDesign"_ustr ) ); bool bChartEnabled = false; static constexpr OUString sPropertyName( u"UserData/Chart"_ustr ); @@ -4033,7 +4033,7 @@ OUString SAL_CALL OReportController::getMode( ) } css::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes( ) { - return uno::Sequence< OUString> { OUString("remote"), OUString("normal") }; + return uno::Sequence< OUString> { u"remote"_ustr, u"normal"_ustr }; } sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) { @@ -4196,7 +4196,7 @@ static ItemInfoPackage& getItemInfoPackageOpenZoomDlg() void OReportController::openZoomDialog() { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - rtl::Reference<SfxItemPool> pPool(new SfxItemPool("ZoomProperties")); + rtl::Reference<SfxItemPool> pPool(new SfxItemPool(u"ZoomProperties"_ustr)); pPool->registerItemInfoPackage(getItemInfoPackageOpenZoomDlg()); pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 646ab278629a..3a96cd636ae7 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -422,15 +422,15 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); uno::Reference<frame::XFrame> xFrame = rController.getFrame(); css::uno::Sequence<css::uno::Any> aArgs { - css::uno::Any(comphelper::makePropertyValue("Value", OUString("report"))), - css::uno::Any(comphelper::makePropertyValue("Frame", xFrame)), - css::uno::Any(comphelper::makePropertyValue("IsContextMenu", true)) + css::uno::Any(comphelper::makePropertyValue(u"Value"_ustr, u"report"_ustr)), + css::uno::Any(comphelper::makePropertyValue(u"Frame"_ustr, xFrame)), + css::uno::Any(comphelper::makePropertyValue(u"IsContextMenu"_ustr, true)) }; css::uno::Reference<css::uno::XComponentContext> xContext(rController.getORB()); css::uno::Reference<css::frame::XPopupMenuController> xMenuController( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.comp.framework.ResourceMenuController", aArgs, xContext), css::uno::UNO_QUERY); + u"com.sun.star.comp.framework.ResourceMenuController"_ustr, aArgs, xContext), css::uno::UNO_QUERY); if (!xMenuController.is()) return; diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index c56e9bb11d4f..44c3c4285e38 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -969,7 +969,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const tools::Recta { rtl::Reference<SdrObject> pNewObj = new SdrUnoObj( rView.getSdrModelFromSdrView(), - "com.sun.star.form.component.FixedText"); + u"com.sun.star.form.component.FixedText"_ustr); pNewObj->SetLogicRect(_aRect); pNewObj->Move(Size(0, aNewPos.Y())); diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 1f36563fe874..b15ac9a57cfb 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -39,7 +39,7 @@ SotClipboardFormatId OReportExchange::getDescriptorFormatId() static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\""); + s_nFormat = SotExchange::RegisterFormatName(u"application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\""_ustr); OSL_ENSURE(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OReportExchange::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index ac820a95a3c6..d529f4c4f3fb 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -50,24 +50,24 @@ IMPL_STATIC_LINK( { case SdrObjKind::ReportDesignFixedText: pNewObj = new OUnoObject(aParams.rSdrModel - ,"com.sun.star.form.component.FixedText" + ,u"com.sun.star.form.component.FixedText"_ustr ,SdrObjKind::ReportDesignFixedText); break; case SdrObjKind::ReportDesignImageControl: pNewObj = new OUnoObject(aParams.rSdrModel - ,"com.sun.star.form.component.DatabaseImageControl" + ,u"com.sun.star.form.component.DatabaseImageControl"_ustr ,SdrObjKind::ReportDesignImageControl); break; case SdrObjKind::ReportDesignFormattedField: pNewObj = new OUnoObject(aParams.rSdrModel - ,"com.sun.star.form.component.FormattedField" + ,u"com.sun.star.form.component.FormattedField"_ustr ,SdrObjKind::ReportDesignFormattedField); break; case SdrObjKind::ReportDesignVerticalFixedLine: case SdrObjKind::ReportDesignHorizontalFixedLine: { rtl::Reference<OUnoObject> pObj = new OUnoObject(aParams.rSdrModel - ,"com.sun.star.awt.UnoControlFixedLineModel" + ,u"com.sun.star.awt.UnoControlFixedLineModel"_ustr ,aParams.nObjIdentifier); pNewObj = pObj; if ( aParams.nObjIdentifier == SdrObjKind::ReportDesignHorizontalFixedLine ) diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index df04f39309e3..18ba6bede8a9 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -68,7 +68,7 @@ namespace { ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( - _rxContext, "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ) ); + _rxContext, u"/org.openoffice.Office.ReportDesign/PropertyBrowser/"_ustr ) ); bool bEnabled = false; OSL_VERIFY( aConfiguration.getNodeValue( "DirectHelp" ) >>= bEnabled ); @@ -104,7 +104,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare // create a frame wrapper for myself m_xMeAsFrame = Frame::create( m_xORB ); m_xMeAsFrame->initialize(VCLUnoHelper::GetInterface(m_xContentArea)); - m_xMeAsFrame->setName("report property browser"); // change name! + m_xMeAsFrame->setName(u"report property browser"_ustr); // change name! } catch (Exception&) { @@ -119,9 +119,9 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( "ContextDocument", Any( m_pDesignView->getController().getModel() )), - ::cppu::ContextEntry_Init( "DialogParentWindow", Any( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( "ActiveConnection", Any( m_pDesignView->getController().getConnection() ) ), + ::cppu::ContextEntry_Init( u"ContextDocument"_ustr, Any( m_pDesignView->getController().getModel() )), + ::cppu::ContextEntry_Init( u"DialogParentWindow"_ustr, Any( VCLUnoHelper::GetInterface ( this ) )), + ::cppu::ContextEntry_Init( u"ActiveConnection"_ustr, Any( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), @@ -183,9 +183,9 @@ void PropBrw::dispose() uno::Reference<container::XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const OUString pProps[] = { OUString( "ContextDocument" ) - , OUString( "DialogParentWindow" ) - , OUString( "ActiveConnection" )}; + const OUString pProps[] = { u"ContextDocument"_ustr + , u"DialogParentWindow"_ustr + , u"ActiveConnection"_ustr}; for (const auto & i : pProps) xName->removeByName(i); } @@ -325,7 +325,7 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac aName = RptResId(RID_STR_BRWTITLE_PROPERTIES); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); - Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY ); + Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(u"ReportComponent"_ustr), UNO_QUERY ); if ( xServiceInfo.is() ) { TranslateId pResId; @@ -394,9 +394,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen ,const uno::Reference< uno::XInterface>& _xReportComponent) { uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(cppu::UnoType<XInterface>::get()); - xNameCont->insertByName("FormComponent",uno::Any(_xFormComponent)); - xNameCont->insertByName("ReportComponent",uno::Any(_xReportComponent)); - xNameCont->insertByName("RowSet",uno::Any(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); + xNameCont->insertByName(u"FormComponent"_ustr,uno::Any(_xFormComponent)); + xNameCont->insertByName(u"ReportComponent"_ustr,uno::Any(_xReportComponent)); + xNameCont->insertByName(u"RowSet"_ustr,uno::Any(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont; } @@ -475,7 +475,7 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(cppu::UnoType<XInterface>::get() ); - xNameCont->insertByName("ReportComponent",uno::Any(xTemp)); + xNameCont->insertByName(u"ReportComponent"_ustr,uno::Any(xTemp)); xTemp = xNameCont; implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); |