diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-04 11:37:16 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-11 08:36:07 +0200 |
commit | 62f27a5e7bd7e66d11b8f6c9c047ecdd73199401 (patch) | |
tree | 4249cbdbf19eea00f38ee941162775af8053eee6 | |
parent | f12f51316a2cb230138ec6dcdc7295e18b6fce28 (diff) |
remove unnecessary use of OUString constructor in REPORTDESIGN module
Change-Id: I5790d7e0c15ac837865597da6ab8a165a5291813
18 files changed, 85 insertions, 85 deletions
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 670413acab85..4e3dff2ed117 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -119,8 +119,8 @@ OUString SAL_CALL OFormattedField::getImplementationName( ) throw(uno::RuntimeE uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(2); - aServices.getArray()[0] = SERVICE_FORMATTEDFIELD; - aServices.getArray()[1] = OUString("com.sun.star.awt.UnoControlFormattedFieldModel"); + aServices[0] = SERVICE_FORMATTEDFIELD; + aServices[1] = "com.sun.star.awt.UnoControlFormattedFieldModel"; return aServices; } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index fe362340f98c..d88832fd36e2 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -505,13 +505,13 @@ namespace { uno::Sequence < beans::PropertyValue > aArgs( 3); sal_Int32 nLen = 0; - aArgs[nLen].Name = OUString("AsTemplate"); + aArgs[nLen].Name = "AsTemplate"; aArgs[nLen++].Value <<= sal_False; - aArgs[nLen].Name = OUString("ReadOnly"); + aArgs[nLen].Name = "ReadOnly"; aArgs[nLen++].Value <<= sal_True; - aArgs[nLen].Name = OUString("Hidden"); + aArgs[nLen].Name = "Hidden"; aArgs[nLen++].Value <<= sal_True; ::comphelper::MimeConfigurationHelper aHelper(m_xContext); @@ -1397,7 +1397,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< sal_Int32 nPos = aDelegatorArguments.getLength(); aDelegatorArguments.realloc(nPos+1); beans::PropertyValue aPropVal; - aPropVal.Name = OUString("Storage"); + aPropVal.Name = "Storage"; aPropVal.Value <<= _xStorageToLoadFrom; aDelegatorArguments[nPos] <<= aPropVal; @@ -1514,7 +1514,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = OUString("settings.xml"); + sWarnFile = "settings.xml"; } } } @@ -1530,7 +1530,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = OUString("meta.xml"); + sWarnFile = "meta.xml"; } } } @@ -1546,7 +1546,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = OUString("styles.xml"); + sWarnFile = "styles.xml"; } } } @@ -1560,7 +1560,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS aDelegatorArguments, aProps, _xStorageToSaveTo ) ) { bErr = sal_True; - sErrFile = OUString("content.xml"); + sErrFile = "content.xml"; } } diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 0c82b1884d2e..a00b9ab3b8d5 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -101,7 +101,7 @@ OUString SAL_CALL OReportEngineJFree::getImplementationName( ) throw(uno::Runti uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); - aServices.getArray()[0] = OUString("com.sun.star.report.ReportEngine"); + aServices[0] = "com.sun.star.report.ReportEngine"; return aServices; } @@ -188,9 +188,9 @@ OUString OReportEngineJFree::getNewOutputName() uno::Sequence< beans::NamedValue > aConvertedProperties(8); sal_Int32 nPos = 0; - aConvertedProperties[nPos].Name = OUString("InputStorage"); + aConvertedProperties[nPos].Name = "InputStorage"; aConvertedProperties[nPos++].Value <<= xTemp; - aConvertedProperties[nPos].Name = OUString("OutputStorage"); + aConvertedProperties[nPos].Name = "OutputStorage"; OUString sFileURL; OUString sName = m_xReport->getCaption(); @@ -302,15 +302,15 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 ); sal_Int32 nLen = 0; - aArgs[nLen].Name = OUString("AsTemplate"); + aArgs[nLen].Name = "AsTemplate"; aArgs[nLen++].Value <<= sal_False; - aArgs[nLen].Name = OUString("ReadOnly"); + aArgs[nLen].Name = "ReadOnly"; aArgs[nLen++].Value <<= sal_True; if ( _bHidden ) { - aArgs[nLen].Name = OUString("Hidden"); + aArgs[nLen].Name = "Hidden"; aArgs[nLen++].Value <<= sal_True; } diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index dbb11c138584..4615cc1b51f6 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -664,7 +664,7 @@ void OUnoObject::impl_initializeModel_nothrow() if ( xFormatted.is() ) { const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); - const OUString sTreatAsNumberProperty = OUString( "TreatAsNumber" ); + const OUString sTreatAsNumberProperty = "TreatAsNumber"; xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( sal_False ) ); xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN)); } @@ -836,7 +836,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) { sal_uInt16 nResId = 0; - OUString aDefaultName = OUString("HERE WE HAVE TO INSERT OUR NAME!"); + OUString aDefaultName = "HERE WE HAVE TO INSERT OUR NAME!"; if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) { nResId = RID_STR_CLASS_FIXEDTEXT; diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index c6503093cbeb..c30a9fe0830a 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -107,7 +107,7 @@ Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection"); + aSNS[0] = "com.sun.star.document.ExtendedTypeDetection"; return aSNS; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 3d8fbbc39de7..475c4897187c 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -85,7 +85,7 @@ namespace rptxml Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.document.ExportFilter"); + aSupported[0] = "com.sun.star.document.ExportFilter"; return aSupported; } //--------------------------------------------------------------------- @@ -102,7 +102,7 @@ namespace rptxml Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.document.ExportFilter"); + aSupported[0] = "com.sun.star.document.ExportFilter"; return aSupported; } @@ -121,7 +121,7 @@ namespace rptxml Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.document.ExportFilter"); + aSupported[0] = "com.sun.star.document.ExportFilter"; return aSupported; } @@ -139,7 +139,7 @@ namespace rptxml Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.document.ExportFilter"); + aSupported[0] = "com.sun.star.document.ExportFilter"; return aSupported; } @@ -157,7 +157,7 @@ namespace rptxml Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.document.ExportFilter"); + aSupported[0] = "com.sun.star.document.ExportFilter"; return aSupported; } @@ -324,7 +324,7 @@ OUString SAL_CALL ORptExport::getImplementationName( ) throw(uno::RuntimeExcept uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); - aServices.getArray()[0] = OUString("com.sun.star.document.ExportFilter"); + aServices.getArray()[0] = "com.sun.star.document.ExportFilter"; return aServices; } @@ -1021,7 +1021,7 @@ OUString ORptExport::convertFormula(const OUString& _sFormula) { OUString sFormula = _sFormula; if ( _sFormula.equalsAsciiL("rpt:",4) ) - sFormula = OUString(); + sFormula = ""; return sFormula; } // ----------------------------------------------------------------------------- @@ -1539,48 +1539,48 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG switch(nGroupOn) { case report::GroupOn::PREFIX_CHARACTERS: - sFunction = OUString("LEFT"); - sPrefix = OUString(";") + OUString::number(xGroup->getGroupInterval()); + sFunction = "LEFT"; + sPrefix = ";" + OUString::number(xGroup->getGroupInterval()); break; case report::GroupOn::YEAR: - sFunction = OUString("YEAR"); + sFunction = "YEAR"; break; case report::GroupOn::QUARTAL: - sFunction = OUString("INT((MONTH"); - sPostfix = OUString("-1)/3)+1"); - sFunctionName = OUString("QUARTAL_") + sExpression; + sFunction = "INT((MONTH"; + sPostfix = "-1)/3)+1"; + sFunctionName = "QUARTAL_" + sExpression; break; case report::GroupOn::MONTH: - sFunction = OUString("MONTH"); + sFunction = "MONTH"; break; case report::GroupOn::WEEK: - sFunction = OUString("WEEK"); + sFunction = "WEEK"; break; case report::GroupOn::DAY: - sFunction = OUString("DAY"); + sFunction = "DAY"; break; case report::GroupOn::HOUR: - sFunction = OUString("HOUR"); + sFunction = "HOUR"; break; case report::GroupOn::MINUTE: - sFunction = OUString("MINUTE"); + sFunction = "MINUTE"; break; case report::GroupOn::INTERVAL: { - sFunction = OUString("INT"); + sFunction = "INT"; uno::Reference< XFunction> xCountFunction = xFunctions->createFunction(); xCountFunction->setInitialFormula(beans::Optional< OUString>(sal_True,OUString("rpt:0"))); - OUString sCountName = sFunction + OUString("_count_") + sExpression; + OUString sCountName = sFunction + "_count_" + sExpression; xCountFunction->setName(sCountName); xCountFunction->setFormula(OUString("rpt:[") + sCountName + OUString("] + 1")); exportFunction(xCountFunction); sExpression = sCountName; // The reference to sCountName in the formula of sFunctionName refers to the *old* value // so we need to expand the the formula of sCountName - sPrefix = OUString(" + 1) / ") + OUString::number(xGroup->getGroupInterval()); - sFunctionName = sFunction + OUString("_") + sExpression; - sFunction = sFunction + OUString("("); - sInitialFormula = OUString("rpt:0"); + sPrefix = " + 1) / " + OUString::number(xGroup->getGroupInterval()); + sFunctionName = sFunction + "_" + sExpression; + sFunction = sFunction + "("; + sInitialFormula = "rpt:0"; } break; default: diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index d2db12f86f7e..7f106937abff 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -120,7 +120,7 @@ OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::Runt uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.report.ExportDocumentHandler"); + aSupported[0] = "com.sun.star.report.ExportDocumentHandler"; return aSupported; } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index fca9c328719c..418557e0f45e 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -91,7 +91,7 @@ OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::Runt uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.report.ImportDocumentHandler"); + aSupported[0] = "com.sun.star.report.ImportDocumentHandler"; return aSupported; } diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 00ae00f26b3e..0d37c49b74b2 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -225,7 +225,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) aDescriptor[ ::svx::daColumnName ] >>= sName; if ( !sName.isEmpty() ) { - sName = OUString("[") + sName + OUString("]"); + sName = "[" + sName + "]"; m_pEdit->SetText(sName); } } diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 3cf5ad170ff8..ef9ecfdfcbf7 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -95,7 +95,7 @@ OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::Runtim uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.report.inspection.DataProviderHandler"); + aSupported[0] = "com.sun.star.report.inspection.DataProviderHandler"; return aSupported; } @@ -489,23 +489,23 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex { uno::Sequence<uno::Any> aSeq(6); beans::PropertyValue aParam; - aParam.Name = OUString("ParentWindow"); + aParam.Name = "ParentWindow"; aParam.Value <<= m_xContext->getValueByName("DialogParentWindow"); aSeq[0] <<= aParam; - aParam.Name = OUString("Detail"); + aParam.Name = "Detail"; aParam.Value <<= m_xDataProvider; aSeq[1] <<= aParam; - aParam.Name = OUString("Master"); + aParam.Name = "Master"; aParam.Value <<= m_xReportComponent->getSection()->getReportDefinition(); aSeq[2] <<= aParam; - aParam.Name = OUString("Explanation"); + aParam.Name = "Explanation"; aParam.Value <<= OUString(ModuleRes(RID_STR_EXPLANATION)); aSeq[3] <<= aParam; - aParam.Name = OUString("DetailLabel"); + aParam.Name = "DetailLabel"; aParam.Value <<= OUString(ModuleRes(RID_STR_DETAILLABEL)); aSeq[4] <<= aParam; - aParam.Name = OUString("MasterLabel"); + aParam.Name = "MasterLabel"; aParam.Value <<= OUString(ModuleRes(RID_STR_MASTERLABEL)); aSeq[5] <<= aParam; @@ -522,10 +522,10 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua { uno::Sequence<uno::Any> aSeq(2); beans::PropertyValue aParam; - aParam.Name = OUString("ParentWindow"); + aParam.Name = "ParentWindow"; aParam.Value <<= m_xContext->getValueByName("DialogParentWindow"); aSeq[0] <<= aParam; - aParam.Name = OUString("ChartModel"); + aParam.Name = "ChartModel"; aParam.Value <<= m_xChartModel; aSeq[1] <<= aParam; diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 50fe32a6d9b3..ca32010961da 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -92,7 +92,7 @@ namespace rptui Sequence< OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel"); + aSupported[0] = "com.sun.star.report.inspection.DefaultComponentInspectorModel"; return aSupported; } diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 10f3141f81e8..d50cbb17a532 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -275,7 +275,7 @@ OUString GeometryHandler::getImplementationName_Static( ) throw(uno::RuntimeExc uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.report.inspection.GeometryHandler"); + aSupported[0] = "com.sun.star.report.inspection.GeometryHandler"; return aSupported; } @@ -319,7 +319,7 @@ void SAL_CALL GeometryHandler::removeEventListener(const uno::Reference< lang::X void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > & _rxInspectee ) throw (uno::RuntimeException, lang::NullPointerException) { ::osl::MutexGuard aGuard( m_aMutex ); - m_sScope = m_sDefaultFunction = OUString(); + m_sScope = m_sDefaultFunction = ""; m_bNewFunction = false; m_nDataFieldType = 0; m_xFunction.clear(); @@ -479,7 +479,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c OUString sDataField; aPropertyValue >>= sDataField; - m_sScope = m_sDefaultFunction = OUString(); + m_sScope = m_sDefaultFunction = ""; m_xFunction.clear(); const sal_uInt32 nOldDataFieldType = m_nDataFieldType; if ( !sDataField.isEmpty() ) @@ -500,7 +500,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c const OUString sOldFunctionName = m_sDefaultFunction; const OUString sOldScope = m_sScope; - m_sDefaultFunction = m_sScope = OUString(); + m_sDefaultFunction = m_sScope = ""; if ( m_nDataFieldType == COUNTER ) { @@ -525,7 +525,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c { if ( m_nDataFieldType == FUNCTION ) { - m_sDefaultFunction = OUString(); + m_sDefaultFunction = ""; if ( m_bNewFunction ) removeFunction(); m_xFunction.clear(); @@ -533,7 +533,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c beans::PropertyChangeEvent aEvent; aEvent.PropertyName = PROPERTY_SCOPE; aEvent.OldValue <<= m_sScope; - m_sScope = OUString(); + m_sScope = ""; aEvent.NewValue <<= m_sScope; aGuard.clear(); m_aPropertyListeners.notify( aEvent, &beans::XPropertyChangeListener::propertyChange ); @@ -553,7 +553,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c { const OUString sOldFunctionName = m_sDefaultFunction; const OUString sOldScope = m_sScope; - m_sScope = m_sDefaultFunction = OUString(); + m_sScope = m_sDefaultFunction = ""; m_xFunction.clear(); if ( nNewDataType == COUNTER ) impl_isCounterFunction_throw(sFunction,m_sScope); @@ -591,7 +591,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c break; case PROPERTY_ID_SCOPE: if ( !(Value >>= m_sScope) ) - m_sScope = OUString(); + m_sScope = ""; else { if ( m_bNewFunction ) @@ -1551,7 +1551,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati // ----------------------------------------------------------------------------- bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { - _out_rSelectedClause = OUString(); + _out_rSelectedClause = ""; bool bSuccess = false; ::dbtools::SQLExceptionInfo aErrorInfo; uno::Reference< awt::XWindow > xInspectorWindow; @@ -2192,7 +2192,7 @@ void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& const sal_uInt32 nOldDataFieldType = m_nDataFieldType; const OUString sOldFunctionName = m_sDefaultFunction; const OUString sOldScope = m_sScope; - m_sDefaultFunction = m_sScope = OUString(); + m_sDefaultFunction = m_sScope = ""; m_nDataFieldType = impl_getDataFieldType_throw(); if ( UNDEF_DATA == m_nDataFieldType ) m_nDataFieldType = nOldDataFieldType; diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 295e7870e545..fde28ac58e7f 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -76,7 +76,7 @@ OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::Run uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); - aSupported[0] = OUString("com.sun.star.report.inspection.ReportComponentHandler"); + aSupported[0] = "com.sun.star.report.inspection.ReportComponentHandler"; return aSupported; } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 85e186cc9956..f4c5512b98c5 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -53,7 +53,7 @@ OUString OStatusbarController::getImplementationName_Static() throw( RuntimeExce Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString> aSupported(1); - aSupported.getArray()[0] = OUString("com.sun.star.frame.StatusbarController"); + aSupported[0] = "com.sun.star.frame.StatusbarController"; return aSupported; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 627be80ba9ec..e0dd8c8ed262 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -70,7 +70,7 @@ OUString OToolboxController::getImplementationName_Static() throw( RuntimeExcept Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString> aSupported(1); - aSupported.getArray()[0] = OUString("com.sun.star.report.ReportToolboxController"); + aSupported[0] = "com.sun.star.report.ReportToolboxController"; return aSupported; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index ef35d1ca1b6c..721c9db6c207 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -263,7 +263,7 @@ OUString OReportController::getImplementationName_Static() throw( RuntimeExcepti Sequence< OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString> aSupported(1); - aSupported.getArray()[0] = OUString("com.sun.star.sdb.ReportDesign"); + aSupported[0] = "com.sun.star.sdb.ReportDesign"; return aSupported; } //------------------------------------------------------------------------- @@ -1363,22 +1363,22 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > switch(_nId) { case SID_DRAWTBX_CS_SYMBOL: - sType = OUString("smiley"); + sType = "smiley"; break; case SID_DRAWTBX_CS_ARROW: - sType = OUString("left-right-arrow"); + sType = "left-right-arrow"; break; case SID_DRAWTBX_CS_FLOWCHART: - sType = OUString("flowchart-internal-storage"); + sType = "flowchart-internal-storage"; break; case SID_DRAWTBX_CS_CALLOUT: - sType = OUString("round-rectangular-callout"); + sType = "round-rectangular-callout"; break; case SID_DRAWTBX_CS_STAR: - sType = OUString("star5"); + sType = "star5"; break; default: - sType = OUString("diamond"); + sType = "diamond"; } } else @@ -1742,7 +1742,7 @@ void OReportController::impl_initialize( ) if ( m_bShowProperties && m_nPageNum == -1 ) { - m_sLastActivePage = OUString("Data"); + m_sLastActivePage = "Data"; getDesignView()->setCurrentPage(m_sLastActivePage); uno::Sequence< beans::PropertyValue> aArgs; executeUnChecked(SID_SELECT_REPORT,aArgs); @@ -2795,10 +2795,10 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( if ( getView() ) { util::URL aCommand; - aCommand.Complete = OUString( ".uno:" ) + *commandName; + aCommand.Complete = ".uno:" + *commandName; Sequence< PropertyValue > aCommandArgs(1); - aCommandArgs[0].Name = OUString( "Value" ); + aCommandArgs[0].Name = "Value"; aCommandArgs[0].Value = rCommandValue; executeUnChecked( aCommand, aCommandArgs ); @@ -2886,7 +2886,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); - m_sLastActivePage = OUString("Data"); + m_sLastActivePage = "Data"; getDesignView()->setCurrentPage(m_sLastActivePage); nCommand = SID_SELECT_REPORT; } @@ -3146,7 +3146,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY); OUString sCustomShapeType = getDesignView()->GetInsertObjString(); if ( sCustomShapeType.isEmpty() ) - sCustomShapeType = OUString("diamond"); + sCustomShapeType = "diamond"; pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl); pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 430478aca1aa..04856f7f3be0 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -492,7 +492,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) if ( nId == SID_ATTR_CHAR_COLOR_BACKGROUND ) { aArgs.realloc(1); - aArgs[0].Name = OUString("Selection"); + aArgs[0].Name = "Selection"; aArgs[0].Value <<= m_xSection; } rController.executeChecked(nId,aArgs); @@ -833,10 +833,10 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); // give also the DND Action (Shift|Ctrl) Key to really say what we want - aCurrent[nLength].Name = OUString("DNDAction"); + aCurrent[nLength].Name = "DNDAction"; aCurrent[nLength++].Value <<= _rEvt.mnAction; - aCurrent[nLength].Name = OUString("Section"); + aCurrent[nLength].Name = "Section"; aCurrent[nLength++].Value <<= getSection(); pIter->Value <<= aCurrent; } diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 65a1bee796f7..637e1b0a3248 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -182,7 +182,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) if ( m_pParent->GetMode() != RPTUI_READONLY ) { uno::Sequence<beans::PropertyValue> aArgs(1); - aArgs[0].Name = OUString("ShowProperties"); + aArgs[0].Name = "ShowProperties"; aArgs[0].Value <<= sal_True; m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); |