diff options
Diffstat (limited to 'reportdesign')
16 files changed, 50 insertions, 50 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index c4cf461c3281..6c923518e435 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -306,7 +306,7 @@ OStyle::OStyle() const sal_Int32 nZero = 0; const sal_Int16 n16Zero = 0; const sal_Int16 nNummeringType = style::NumberingType::ARABIC; - const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM("Default")); + const ::rtl::OUString sName("Default"); const ::rtl::OUString sEmpty; const table::BorderLine eBorderLine(0,0,0,0); const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0); @@ -380,7 +380,7 @@ OStyle::OStyle() registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); - const ::rtl::OUString sPaperTray(RTL_CONSTASCII_USTRINGPARAM("[From printer settings]")); + const ::rtl::OUString sPaperTray("[From printer settings]"); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); @@ -506,7 +506,7 @@ namespace { uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(m_xContext); uno::Reference<frame::XComponentLoader> xFrameLoad(xDesktop,uno::UNO_QUERY); - ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + ::rtl::OUString sTarget("_blank"); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = xDesktop->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set(xFrame,uno::UNO_QUERY); @@ -1466,7 +1466,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY); if ( xProp.is() ) { - static const ::rtl::OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + static const ::rtl::OUString sPropName("MediaType"); ::rtl::OUString sOldMediaType; xProp->getPropertyValue(sPropName) >>= sOldMediaType; if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT != sOldMediaType ) @@ -1583,8 +1583,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } if ( aImage.hasValue() ) { - ::rtl::OUString sObject1(RTL_CONSTASCII_USTRINGPARAM("report")); - ::rtl::OUString sPng(RTL_CONSTASCII_USTRINGPARAM("image/png")); + ::rtl::OUString sObject1("report"); + ::rtl::OUString sPng("image/png"); uno::Sequence<sal_Int8> aSeq; aImage >>= aSeq; @@ -1692,8 +1692,8 @@ sal_Bool OReportDefinition::WriteThroughComponent( xSeek->seek(0); } - ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType")); - ::rtl::OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") ); + ::rtl::OUString aPropName("MediaType"); + ::rtl::OUString aMime("text/xml"); uno::Any aAny; aAny <<= aMime; xStreamProp->setPropertyValue( aPropName, aAny ); @@ -1888,7 +1888,7 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); embed::VisualRepresentation aResult; - ::rtl::OUString sImageName(RTL_CONSTASCII_USTRINGPARAM("report")); + ::rtl::OUString sImageName("report"); ::rtl::OUString sMimeType; uno::Reference<io::XInputStream> xStream = m_pImpl->m_pObjectContainer->GetGraphicStream(sImageName,&sMimeType); if ( xStream.is() ) diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 4a31c6b44bb7..9a61db0f2439 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -166,7 +166,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task if ( !m_xReport.is() || !m_xActiveConnection.is() ) throw lang::IllegalArgumentException(); - static const ::rtl::OUString s_sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + static const ::rtl::OUString s_sMediaType("MediaType"); try { MimeConfigurationHelper aConfighelper(m_xContext); @@ -234,11 +234,11 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task ::rtl::OUStringBuffer sAuthor(aUserOpts.GetFirstName()); sAuthor.appendAscii(" "); sAuthor.append(aUserOpts.GetLastName()); - static const ::rtl::OUString s_sAuthor(RTL_CONSTASCII_USTRINGPARAM("Author")); + static const ::rtl::OUString s_sAuthor("Author"); aConvertedProperties[nPos].Name = s_sAuthor; aConvertedProperties[nPos++].Value <<= sAuthor.makeStringAndClear(); - static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")); + static const ::rtl::OUString s_sTitle("Title"); aConvertedProperties[nPos].Name = s_sTitle; aConvertedProperties[nPos++].Value <<= m_xReport->getCaption(); @@ -294,7 +294,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { // if there is no frame given, find the right xFrameLoad.set( frame::Desktop::create(m_xContext), uno::UNO_QUERY); - ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + ::rtl::OUString sTarget("_blank"); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY)->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 826ef1feebca..9d486b867ba0 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -78,7 +78,7 @@ namespace rptui // Okay, let's start with replacing all $$ in our pattern with the actual field data source ::rtl::OUString sMatchExpression( m_sPattern ); - const ::rtl::OUString sFieldDataPattern( RTL_CONSTASCII_USTRINGPARAM( "$$" ) ); + const ::rtl::OUString sFieldDataPattern( "$$" ); sal_Int32 nIndex( sMatchExpression.indexOf( sFieldDataPattern ) ); while ( nIndex != -1 ) { @@ -86,8 +86,8 @@ namespace rptui nIndex = sMatchExpression.indexOf( sFieldDataPattern, nIndex + _rFieldDataSource.getLength() ); } - const ::rtl::OUString sLHSPattern( RTL_CONSTASCII_USTRINGPARAM( "$1" ) ); - const ::rtl::OUString sRHSPattern( RTL_CONSTASCII_USTRINGPARAM( "$2" ) ); + const ::rtl::OUString sLHSPattern( "$1" ); + const ::rtl::OUString sRHSPattern( "$2" ); sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) ); sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) ); diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index f1431e4c8f8d..2c12edfb057e 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -35,7 +35,7 @@ namespace rptui //---------------------------------------------------------------- const ::rtl::OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { - static ::rtl::OUString s_sPrefix( RTL_CONSTASCII_USTRINGPARAM( "rpt:" ) ); + static ::rtl::OUString s_sPrefix( "rpt:" ); if ( _pTakeLengthOrNull ) *_pTakeLengthOrNull = s_sPrefix.getLength(); return s_sPrefix; @@ -44,7 +44,7 @@ namespace rptui //---------------------------------------------------------------- const ::rtl::OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { - static ::rtl::OUString s_sPrefix( RTL_CONSTASCII_USTRINGPARAM( "field:" ) ); + static ::rtl::OUString s_sPrefix( "field:" ); if ( _pTakeLengthOrNull ) *_pTakeLengthOrNull = s_sPrefix.getLength(); return s_sPrefix; diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 1f25cb715e88..2ecb91534735 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -224,7 +224,7 @@ namespace rptui return; ::rtl::OUString sDataField( _rxFormatted->getDataField() ); - const ::rtl::OUString sFieldPrefix( RTL_CONSTASCII_USTRINGPARAM( "field:[" ) ); + const ::rtl::OUString sFieldPrefix( "field:[" ); if ( sDataField.indexOf( sFieldPrefix ) != 0 ) // not bound to a table field // TODO: we might also do this kind of thing for functions and expressions ... diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 650b1c49cc46..18a6cb857b28 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -108,7 +108,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( ORptFilter& rImport = GetOwnImport(); const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName ); switch( nToken ) @@ -261,7 +261,7 @@ void OXMLCell::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); if ( !m_sText.isEmpty() ) { - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); m_sText += s_sStringConcat; } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 47327352352c..7a3c0e019bb9 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1423,7 +1423,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor ::rtl::OUString sFieldData = _xReportElement->getDataField(); static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); - static const ::rtl::OUString s_sReportPrefix(RTL_CONSTASCII_USTRINGPARAM("rpt:")); + static const ::rtl::OUString s_sReportPrefix("rpt:"); sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength()); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); if ( nPageNumberIndex != -1 ) @@ -1437,7 +1437,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { if ( sToken == s_sPageNumber ) { - static const ::rtl::OUString s_sCurrent(RTL_CONSTASCII_USTRINGPARAM("current")); + static const ::rtl::OUString s_sCurrent("current"); AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent ); SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, sal_False, sal_False); Characters(::rtl::OUString("1")); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 5762acc5d6e6..b32245c1931e 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -43,7 +43,7 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler > SvtSaveOptions aSaveOpt; if ( aSaveOpt.IsPrettyPrinting() ) { - static const ::rtl::OUString s_sWhitespaces(RTL_CONSTASCII_USTRINGPARAM(" ")); + static const ::rtl::OUString s_sWhitespaces(" "); _xDelegatee->ignorableWhitespace(s_sWhitespaces); } } @@ -283,7 +283,7 @@ void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) } else if ( m_bExportChar ) { - static const ::rtl::OUString s_sZero(RTL_CONSTASCII_USTRINGPARAM("0")); + static const ::rtl::OUString s_sZero("0"); m_xDelegatee->characters(s_sZero); } } @@ -371,16 +371,16 @@ void ExportDocumentHandler::exportTableRows() const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) ); - const static ::rtl::OUString s_sFieldPrefix(RTL_CONSTASCII_USTRINGPARAM("field:[")); - const static ::rtl::OUString s_sFieldPostfix(RTL_CONSTASCII_USTRINGPARAM("]")); + const static ::rtl::OUString s_sFieldPrefix("field:["); + const static ::rtl::OUString s_sFieldPostfix("]"); const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) ); const ::rtl::OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) ); const ::rtl::OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) ); const ::rtl::OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) ); const ::rtl::OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ; const ::rtl::OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) ); - const static ::rtl::OUString s_sString(RTL_CONSTASCII_USTRINGPARAM("string")); - const static ::rtl::OUString s_sFloat(RTL_CONSTASCII_USTRINGPARAM("float")); + const static ::rtl::OUString s_sString("string"); + const static ::rtl::OUString s_sFloat("float"); SvXMLAttributeList* pCellAtt = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 523d4f6f4319..a62125b682cf 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -138,7 +138,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( if ( pContext ) return pContext; - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference<XComponentContext> xContext = m_rImport.GetComponentContext(); @@ -218,7 +218,7 @@ void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); if ( !m_sPageText.isEmpty() ) { - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); m_sPageText += s_sStringConcat; } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 51ea7ebb5303..64ed6651078c 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -338,7 +338,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) { - const static ::rtl::OUString s_sDatabaseDataProvider(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DatabaseDataProvider")); + const static ::rtl::OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider"); m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider ,m_xContext),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b557e839af7f..4b5d6ea96f80 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -538,7 +538,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) aArgs[0] <<= beans::NamedValue(::rtl::OUString("Storage"),uno::makeAny(xStorage)); xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY); - static const ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); + static const ::rtl::OUString s_sOld("OldFormat"); static comphelper::PropertyMapEntry pMap[] = { { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, @@ -556,8 +556,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) xProp->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY); - static const ::rtl::OUString s_sMeta(RTL_CONSTASCII_USTRINGPARAM("meta.xml")); - static const rtl::OUString s_sStreamName(RTL_CONSTASCII_USTRINGPARAM("StreamName")); + static const ::rtl::OUString s_sMeta("meta.xml"); + static const rtl::OUString s_sStreamName("StreamName"); xProp->setPropertyValue(s_sStreamName, uno::makeAny(s_sMeta)); sal_Int32 nRet = ReadThroughComponent( xStorage ,xModel @@ -1080,7 +1080,7 @@ sal_Bool ORptFilter::isOldFormat() const uno::Reference<beans::XPropertySet> xProp = getImportInfo(); if ( xProp.is() ) { - const static ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); + const static ::rtl::OUString s_sOld("OldFormat"); if ( xProp->getPropertySetInfo()->hasPropertyByName(s_sOld)) { xProp->getPropertyValue(s_sOld) >>= bOldFormat; diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 9de12edf5fb6..6dad9740dcd4 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -136,11 +136,11 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent(RTL_CONSTASCII_USTRINGPARAM("FormComponent")); + const ::rtl::OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) { uno::Reference<beans::XPropertySet> xProp(xNameCont->getByName(sFormComponent),uno::UNO_QUERY); - const ::rtl::OUString sModel(RTL_CONSTASCII_USTRINGPARAM("Model")); + const ::rtl::OUString sModel("Model"); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sModel) ) { m_xChartModel.set(xProp->getPropertyValue(sModel),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index c06edad3aec6..6a3bdca05eee 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -139,7 +139,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin // ----------------------------------------------------------------------------- OUString lcl_getQuotedFunctionName(const OUString& _sFunction) { - OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("[")); + OUString sQuotedFunctionName("["); sQuotedFunctionName += _sFunction + OUString("]"); return sQuotedFunctionName; } @@ -347,7 +347,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY ); m_xReportComponent.set( xObjectAsContainer->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY ); - const OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + const OUString sRowSet("RowSet"); if ( xObjectAsContainer->hasByName( sRowSet ) ) { const uno::Any aRowSet( xObjectAsContainer->getByName(sRowSet) ); diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 8c9fdd892029..13f179165c81 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -115,10 +115,10 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent(RTL_CONSTASCII_USTRINGPARAM("FormComponent")); + const ::rtl::OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) xNameCont->getByName(sFormComponent) >>= m_xFormComponent; - const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + const ::rtl::OUString sRowSet("RowSet"); if ( xNameCont->hasByName(sRowSet) ) { uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c8b4a2c5aba9..3f6f77262ca4 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1788,7 +1788,7 @@ void OReportController::doOpenHelpAgent() { if (getFrame().is()) { - rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter")); + rtl::OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); openHelpAgent(suURL); } else @@ -2846,7 +2846,7 @@ Reference<XFrame> OReportController::getXFrame() m_xFrameLoader.set( frame::Desktop::create(m_xContext) ); } const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - const ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + const ::rtl::OUString sTarget("_blank"); Reference<XFrame> xFrame = m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag); return xFrame; } @@ -3969,7 +3969,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert if ( xSection.is() ) { - const ::rtl::OUString sKeyModifier(RTL_CONSTASCII_USTRINGPARAM("KeyModifier")); + const ::rtl::OUString sKeyModifier("KeyModifier"); const beans::PropertyValue* pIter = _aArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier))); @@ -3993,8 +3993,8 @@ void OReportController::checkChartEnabled() if ( !m_bChartEnabledAsked ) { m_bChartEnabledAsked = true; - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "UserData/Chart" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); + const ::rtl::OUString sPropertyName( "UserData/Chart" ); try { diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 73bfcd6aba6b..a804d872b292 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -72,8 +72,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "DirectHelp" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); + const ::rtl::OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -145,7 +145,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { - const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspector" ) ); + const ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError(pParent, sServiceName, sal_True); } else |