diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-04 11:22:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-11 08:36:06 +0200 |
| commit | f12f51316a2cb230138ec6dcdc7295e18b6fce28 (patch) | |
| tree | 804d24d28af3c15026353fa780199e642c7d5cf1 /sc/source | |
| parent | 2ac50736e4a3d442a43d3f9d368be45c57ad9285 (diff) | |
remove unnecessary use of OUString constructor in SC module
Change-Id: I2d40c589eb3b5c99300f36cd705c32cf824b2a98
Diffstat (limited to 'sc/source')
74 files changed, 167 insertions, 177 deletions
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index d3fb4e7c1ec0..b8bcfaa9fc28 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1572,7 +1572,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co sal_Int32 nLength = aSeq.getLength(); if ( nLength == 0 ) { - aSelectedPage = OUString(); + aSelectedPage = ""; bHasSelectedPage = false; bDone = sal_True; } @@ -1862,13 +1862,13 @@ OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException) switch (nHier) { case SC_DAPI_HIERARCHY_FLAT: - aRet = OUString("flat"); + aRet = "flat"; break; //! name ??????? case SC_DAPI_HIERARCHY_QUARTER: - aRet = OUString("Quarter"); + aRet = "Quarter"; break; //! name ??????? case SC_DAPI_HIERARCHY_WEEK: - aRet = OUString("Week"); + aRet = "Week"; break; //! name ??????? default: OSL_FAIL( "ScDPHierarchy::getName: unexpected hierarchy" ); @@ -2156,16 +2156,16 @@ OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException) switch ( nLev ) { case SC_DAPI_LEVEL_YEAR: - aRet = OUString("Year"); + aRet = "Year"; break; case SC_DAPI_LEVEL_QUARTER: - aRet = OUString("Quarter"); + aRet = "Quarter"; break; case SC_DAPI_LEVEL_MONTH: - aRet = OUString("Month"); + aRet = "Month"; break; case SC_DAPI_LEVEL_DAY: - aRet = OUString("Day"); + aRet = "Day"; break; default: OSL_FAIL( "ScDPLevel::getName: unexpected level" ); @@ -2177,13 +2177,13 @@ OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException) switch ( nLev ) { case SC_DAPI_LEVEL_YEAR: - aRet = OUString("Year"); + aRet = "Year"; break; case SC_DAPI_LEVEL_WEEK: - aRet = OUString("Week"); + aRet = "Week"; break; case SC_DAPI_LEVEL_WEEKDAY: - aRet = OUString("Weekday"); + aRet = "Weekday"; break; default: OSL_FAIL( "ScDPLevel::getName: unexpected level" ); diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 21bb8596de8d..c8c0b24064f1 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -453,18 +453,18 @@ ScFunctionList::ScFunctionList() : sal_uInt16 nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions // Interpretation of AddIn list - OUString aDefArgNameValue = OUString("value"); - OUString aDefArgNameString = OUString("string"); - OUString aDefArgNameValues = OUString("values"); - OUString aDefArgNameStrings = OUString("strings"); - OUString aDefArgNameCells = OUString("cells"); - OUString aDefArgNameNone = OUString("none"); - OUString aDefArgDescValue = OUString("a value"); - OUString aDefArgDescString = OUString("a string"); - OUString aDefArgDescValues = OUString("array of values"); - OUString aDefArgDescStrings = OUString("array of strings"); - OUString aDefArgDescCells = OUString("range of cells"); - OUString aDefArgDescNone = OUString("none"); + OUString aDefArgNameValue = "value"; + OUString aDefArgNameString = "string"; + OUString aDefArgNameValues = "values"; + OUString aDefArgNameStrings = "strings"; + OUString aDefArgNameCells = "cells"; + OUString aDefArgNameNone = "none"; + OUString aDefArgDescValue = "a value"; + OUString aDefArgDescString = "a string"; + OUString aDefArgDescValues = "array of values"; + OUString aDefArgDescStrings = "array of strings"; + OUString aDefArgDescCells = "range of cells"; + OUString aDefArgDescNone = "none"; OUString aArgName, aArgDesc; const FuncCollection& rFuncColl = *ScGlobal::GetFuncCollection(); diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx index fdeb7f8b8bdb..434043f66ccc 100644 --- a/sc/source/core/tool/cellform.cxx +++ b/sc/source/core/tool/cellform.cxx @@ -58,7 +58,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString { double nValue = rCell.mfValue; if (!bNullVals && nValue == 0.0) - rString = OUString(); + rString = ""; else { if( eForceTextFmt == ftCheck ) @@ -96,7 +96,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString (!pFCell->GetDocument()->GetMacroInterpretLevel() || pFCell->IsRunning()) ) { - rString = OUString("..."); + rString = "..."; } else { @@ -105,12 +105,12 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString if (nErrCode != 0) rString = ScGlobal::GetErrorString(nErrCode); else if ( pFCell->IsEmptyDisplayedAsString() ) - rString = OUString(); + rString = ""; else if ( pFCell->IsValue() ) { double fValue = pFCell->GetValue(); if ( !bNullVals && fValue == 0.0 ) - rString = OUString(); + rString = ""; else if ( pFCell->IsHybridValueCell() ) rString = pFCell->GetString().getString(); else @@ -126,7 +126,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString } break; default: - rString = OUString(); + rString = ""; break; } } @@ -157,7 +157,7 @@ OUString ScCellFormat::GetString( case CELLTYPE_VALUE: { double nValue = rDoc.GetValue(rPos); - if (!bNullVals && nValue == 0.0) aString = OUString(); + if (!bNullVals && nValue == 0.0) aString = ""; else { if (eForceTextFmt == ftCheck) @@ -193,18 +193,18 @@ OUString ScCellFormat::GetString( (!pFCell->GetDocument()->GetMacroInterpretLevel() || pFCell->IsRunning())) { - aString = OUString("..."); + aString = "..."; } else { sal_uInt16 nErrCode = pFCell->GetErrCode(); if (nErrCode != 0) aString = ScGlobal::GetErrorString(nErrCode); - else if (pFCell->IsEmptyDisplayedAsString()) aString = OUString(); + else if (pFCell->IsEmptyDisplayedAsString()) aString = ""; else if (pFCell->IsValue()) { double fValue = pFCell->GetValue(); - if (!bNullVals && fValue == 0.0) aString = OUString(); + if (!bNullVals && fValue == 0.0) aString = ""; else if (pFCell->IsHybridValueCell()) aString = pFCell->GetString().getString(); else rFormatter.GetOutputString(fValue, nFormat, aString, ppColor, bUseStarFormat); } diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 16ad17f1ff32..79d84a63bcb2 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -67,9 +67,9 @@ void ScFormulaOptions::GetDefaultFormulaSeparators( OUString& rSepArg, OUString& rSepArrayCol, OUString& rSepArrayRow) { // Defaults to the old separator values. - rSepArg = OUString(";"); - rSepArrayCol = OUString(";"); - rSepArrayRow = OUString("|"); + rSepArg = ";"; + rSepArrayCol = ";"; + rSepArrayRow = "|"; const Locale& rLocale = *ScGlobal::GetLocale(); const OUString& rLang = rLocale.Language; @@ -108,12 +108,12 @@ void ScFormulaOptions::GetDefaultFormulaSeparators( // if the decimal and list separators are equal, set the // parameter separator to be ';', unless they are both // semicolon in which case don't change the decimal separator. - rSepArg = OUString(";"); + rSepArg = ";"; - rSepArrayCol = OUString(","); + rSepArrayCol = ","; if (cDecSep == sal_Unicode(',')) - rSepArrayCol = OUString("."); - rSepArrayRow = OUString(";"); + rSepArrayCol = "."; + rSepArrayRow = ";"; } const LocaleDataWrapper& ScFormulaOptions::GetLocaleDataWrapper() diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 5dcd7dcc21fb..b4b354d7d2c5 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -40,12 +40,12 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor() /* // mso command id to ooo command string // #FIXME and *HUNDREDS* of id's to added here - msoToOOcmd[ 0x20b ] = OUString(".uno:CloseDoc"); - msoToOOcmd[ 0x50 ] = OUString(".uno:Open"); + msoToOOcmd[ 0x20b ] = ".uno:CloseDoc"; + msoToOOcmd[ 0x50 ] = ".uno:Open"; // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = OUString(".uno:Print"); + tcidToOOcmd[ 0x9d9 ] = ".uno:Print"; */ } diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 2d634aea8a7f..bc55a0b508a0 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -471,7 +471,7 @@ void ScXMLContentValidationContext::SetErrorMessage(const OUString& sTitle, cons void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute) { - sErrorMessageType = OUString("macro"); + sErrorMessageType = "macro"; bDisplayError = bExecute; } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 54544381d40b..cb0b63dfb284 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -520,7 +520,7 @@ ScXMLExport::ScXMLExport( // This name is reserved for the external ref cache tables. This // should not conflict with user-defined styles since this name is // used for a table style which is not available in the UI. - sExternalRefTabStyleName = OUString("ta_extref"); + sExternalRefTabStyleName = "ta_extref"; GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName); sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); @@ -4721,7 +4721,7 @@ void ScXMLExport::WriteConsolidation() ScXMLConverter::GetStringFromFunction( sStrData, pCons->eFunction ); AddAttribute( XML_NAMESPACE_TABLE, XML_FUNCTION, sStrData ); - sStrData = OUString(); + sStrData = ""; for( sal_Int32 nIndex = 0; nIndex < pCons->nDataAreaCount; ++nIndex ) ScRangeStringConverter::GetStringFromArea( sStrData, *pCons->ppDataAreas[ nIndex ], pDoc, FormulaGrammar::CONV_OOO, true ); AddAttribute( XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, sStrData ); @@ -4768,39 +4768,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue> beans::PropertyValue* pChangeProps(aChangeProps.getArray()); if (pChangeProps) { - pChangeProps[SC_SHOW_CHANGES].Name = OUString("ShowChanges"); + pChangeProps[SC_SHOW_CHANGES].Name = "ShowChanges"; pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges(); - pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = OUString("ShowAcceptedChanges"); + pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = "ShowAcceptedChanges"; pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted(); - pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = OUString("ShowRejectedChanges"); + pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = "ShowRejectedChanges"; pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = OUString("ShowChangesByDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = "ShowChangesByDatetime"; pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = OUString("ShowChangesByDatetimeMode"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = "ShowChangesByDatetimeMode"; pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast<sal_Int16>(pViewSettings->GetTheDateMode()); util::DateTime aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = OUString("ShowChangesByDatetimeFirstDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = "ShowChangesByDatetimeFirstDatetime"; pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = OUString("ShowChangesByDatetimeSecondDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = "ShowChangesByDatetimeSecondDatetime"; pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = OUString("ShowChangesByAuthor"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = "ShowChangesByAuthor"; pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = OUString("ShowChangesByAuthorName"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = "ShowChangesByAuthorName"; pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= OUString (pViewSettings->GetTheAuthorToShow()); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = OUString("ShowChangesByComment"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = "ShowChangesByComment"; pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = OUString("ShowChangesByCommentText"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = "ShowChangesByCommentText"; pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= OUString (pViewSettings->GetTheComment()); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = OUString("ShowChangesByRanges"); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = "ShowChangesByRanges"; pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); OUString sRangeList; ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = OUString("ShowChangesByRangesList"); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = "ShowChangesByRangesList"; pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList; - pProps[nChangePos].Name = OUString("TrackedChangesViewSettings"); + pProps[nChangePos].Name = "TrackedChangesViewSettings"; pProps[nChangePos].Value <<= aChangeProps; } } @@ -4823,13 +4823,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { Rectangle aRect(pEmbeddedObj->GetVisArea()); sal_uInt16 i(0); - pProps[i].Name = OUString("VisibleAreaTop"); + pProps[i].Name = "VisibleAreaTop"; pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY()); - pProps[++i].Name = OUString("VisibleAreaLeft"); + pProps[++i].Name = "VisibleAreaLeft"; pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX()); - pProps[++i].Name = OUString("VisibleAreaWidth"); + pProps[++i].Name = "VisibleAreaWidth"; pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth()); - pProps[++i].Name = OUString("VisibleAreaHeight"); + pProps[++i].Name = "VisibleAreaHeight"; pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight()); } } @@ -4884,19 +4884,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps.realloc(nCount + nPropsToAdd); if (!aTrackedChangesKey.isEmpty()) { - rProps[nCount].Name = OUString("TrackedChangesProtectionKey"); + rProps[nCount].Name = "TrackedChangesProtectionKey"; rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear(); ++nCount; } if( bVBACompat ) { - rProps[nCount].Name = OUString("VBACompatibilityMode"); + rProps[nCount].Name = "VBACompatibilityMode"; rProps[nCount].Value <<= bVBACompat; ++nCount; } if( xCodeNameAccess.is() ) { - rProps[nCount].Name = OUString("ScriptConfiguration"); + rProps[nCount].Name = "ScriptConfiguration"; rProps[nCount].Value <<= xCodeNameAccess; ++nCount; } diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index ab0ef1525fc5..7d6c5a208695 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -734,9 +734,9 @@ void ScXMLAutoStylePoolP::exportStyleContent( aOperator == sheet::ConditionOperator_NOT_BETWEEN) { if (aOperator == sheet::ConditionOperator_BETWEEN) - sCondition = OUString("cell-content-is-between("); + sCondition = "cell-content-is-between("; else - sCondition = OUString("cell-content-is-not-between("); + sCondition = "cell-content-is-not-between("; sCondition += xSheetCondition->getFormula1(); sCondition += ","; sCondition += xSheetCondition->getFormula2(); @@ -744,7 +744,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( } else { - sCondition = OUString("cell-content()"); + sCondition = "cell-content()"; switch (aOperator) { case sheet::ConditionOperator_LESS: diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 97bdb0d8238a..fb3d4b13dd62 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -399,11 +399,11 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) aName = pDocHierarchItem->GetValue(); } else - aName = OUString( "dummyObjectName" ); + aName = "dummyObjectName"; if( !aName.isEmpty() ) { - sPropName = OUString("StreamRelPath"); + sPropName = "StreamRelPath"; xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -777,7 +777,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); uno::Sequence<beans::PropertyValue> aDescriptor(1); beans::PropertyValue* pProps = aDescriptor.getArray(); - pProps[0].Name = OUString( "FileName" ); + pProps[0].Name = "FileName"; pProps[0].Value <<= sFileName; /** property map for export info set */ @@ -835,7 +835,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if( !aName.isEmpty() ) { - sPropName = OUString("StreamRelPath"); + sPropName = "StreamRelPath"; xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 72c61917dc49..199ec69295d7 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -279,9 +279,8 @@ uno::Sequence< OUString> SAL_CALL uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.sheet.AccessibleCell"); + aSequence[nOldSize] = "com.sun.star.sheet.AccessibleCell"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 71932dcd2978..7db34ef6f9ec 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -494,8 +494,8 @@ uno::Sequence< OUString> SAL_CALL OUString* pServiceNames = aServiceNames.getArray(); if (pServiceNames) { - pServiceNames[0] = OUString("com.sun.star.accessibility.Accessible"); - pServiceNames[1] = OUString("com.sun.star.accessibility.AccessibleContext"); + pServiceNames[0] = "com.sun.star.accessibility.Accessible"; + pServiceNames[1] = "com.sun.star.accessibility.AccessibleContext"; } return aServiceNames; @@ -552,7 +552,7 @@ void ScAccessibleContextBase::ChangeName() aEvent.Source = uno::Reference< XAccessibleContext >(const_cast<ScAccessibleContextBase*>(this)); aEvent.OldValue <<= msName; - msName = OUString(); // reset the name so it will be hold again + msName = ""; // reset the name so it will be hold again getAccessibleName(); // create the new name aEvent.NewValue <<= msName; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f525455283db..6d3b7f8c1957 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1822,9 +1822,8 @@ uno::Sequence< OUString> SAL_CALL uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); + aSequence[nOldSize] = "com.sun.star.AccessibleSpreadsheetDocumentView"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index e69201f9ae9c..ee68b61d5db5 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1603,9 +1603,8 @@ uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedS uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetPageView"); + aSequence[nOldSize] = "com.sun.star.AccessibleSpreadsheetPageView"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 3d7b46f0c05d..3a777c46e697 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -327,9 +327,8 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.text.AccessibleHeaderFooterView"); + aSequence[nOldSize] = "com.sun.star.text.AccessibleHeaderFooterView"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 9aee5b9a94fd..6f6cf3b519a6 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -195,9 +195,8 @@ uno::Sequence< OUString> SAL_CALL uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); + aSequence[nOldSize] = "com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 6ae7159bcbb1..291b53998551 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -191,9 +191,8 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNam uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); + aSequence[nOldSize] = "com.sun.star.table.AccessibleCellView"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 70640923cdf1..f67081bc8773 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -302,9 +302,8 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServ uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); + aSequence[nOldSize] = "com.sun.star.table.AccessibleCellView"; return aSequence; } @@ -401,7 +400,7 @@ OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(un { //! name for corner cell? -// sName = OUString("Column/Row Header"); +// sName = "Column/Row Header"; } else { diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 118cc3641f69..42b14f46cb70 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -577,9 +577,8 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNa uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.table.AccessibleTableView"); + aSequence[nOldSize] = "com.sun.star.table.AccessibleTableView"; return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 2dddb0627fdd..c06ea6077c8b 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -808,9 +808,8 @@ uno::Sequence< OUString> SAL_CALL uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheet"); + aSequence[nOldSize] = "com.sun.star.AccessibleSpreadsheet"; return aSequence; } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index b8f35791707d..490358a5b602 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -198,7 +198,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, { *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8; - *pFullTypeName = OUString("calc8"); + *pFullTypeName = "calc8"; *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME).toString(); } else @@ -832,14 +832,14 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW ); // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); - aValues[0].Name = OUString( "FilterName"); + aValues[0].Name = "FilterName"; aValues[0].Value <<= OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aValues.realloc( 2 ); - aValues[1].Name = OUString("Password"); + aValues[1].Name = "Password"; aValues[1].Value <<= pPasswordItem->GetValue(); } @@ -1908,7 +1908,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt switch ( eType ) { case CELLTYPE_NONE: - aString = OUString(); + aString = ""; bString = false; break; case CELLTYPE_FORMULA : @@ -1992,7 +1992,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt break; default: OSL_FAIL( "ScDocShell::AsciiSave: unknown CellType" ); - aString = OUString(); + aString = ""; bString = false; } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index b4b80d6618ea..375b59dc4e08 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2345,7 +2345,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() SC_MOD()->SetInSharedDocLoading( true ); uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Sequence < beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "Hidden" ); + aArgs[0].Name = "Hidden"; aArgs[0].Value <<= sal_True; if ( GetMedium() ) @@ -2354,7 +2354,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aArgs.realloc( 2 ); - aArgs[1].Name = OUString("Password"); + aArgs[1].Name = "Password"; aArgs[1].Value <<= pPasswordItem->GetValue(); } } diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 1ab6671c7198..9db9ac9312ba 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -668,10 +668,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = OUString("ParentWindow"); + aParam1.Name = "ParentWindow"; aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = OUString("ChartModel"); + aParam2.Name = "ChartModel"; aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 7570526a6805..229b9c40bcb9 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -154,7 +154,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox ) IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG ) { OUString aFormat; - OUString sBreak = OUString(","); + OUString sBreak = ","; bool bThousand = mpBtnThousand->IsEnabled() && mpBtnThousand->IsChecked(); bool bNegRed = mpBtnNegRed->IsEnabled() @@ -304,7 +304,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( }*/ sal_uInt16 aLen = aCode.getLength(); OUString* sFormat = new OUString[4]; - OUString sTmpStr = OUString(); + OUString sTmpStr = ""; sal_uInt16 nCount = 0; sal_uInt16 nStrCount = 0; while( nCount < aLen ) @@ -313,7 +313,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( if(cChar == sal_Unicode(',')) { sFormat[nStrCount] = sTmpStr; - sTmpStr = OUString(); + sTmpStr = ""; nStrCount++; } else diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 8123f4593b0b..328af86ab1f5 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -238,7 +238,7 @@ ScPrintUIOptions::ScPrintUIOptions() m_aUIProperties.realloc(nNumProps); // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx].Name = "OptionsUIFile"; m_aUIProperties[nIdx++].Value <<= OUString("modules/scalc/ui/printeroptions.ui"); // create Section for spreadsheet (results in an extra tab page in dialog) @@ -265,13 +265,13 @@ ScPrintUIOptions::ScPrintUIOptions() // create a choice for the content to create uno::Sequence< OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); aChoices[0] = aStrings.GetString( 3 ); - aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0"; aWidgetIds[0] = "printallsheets"; aChoices[1] = aStrings.GetString( 4 ); - aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"; aWidgetIds[1] = "printselectedsheets"; aChoices[2] = aStrings.GetString( 5 ); - aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2"; aWidgetIds[2] = "printselectedcells"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, "PrintContent", @@ -289,10 +289,10 @@ ScPrintUIOptions::ScPrintUIOptions() aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); aChoices[0] = aStrings.GetString( 7 ); - aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); + aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0"; aWidgetIds[0] = "printallpages"; aChoices[1] = aStrings.GetString( 8 ); - aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); + aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1"; aWidgetIds[1] = "printpages"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index c4d485d81ff1..dec73c931c0b 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -59,8 +59,7 @@ uno::Sequence<OUString> SAL_CALL ScPageObj::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence<OUString> aRet(1); - OUString* pArray = aRet.getArray(); - pArray[0] = OUString("com.sun.star.sheet.SpreadsheetDrawPage"); + aRet[0] = "com.sun.star.sheet.SpreadsheetDrawPage"; return aRet; } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index eb3c9eb13ec8..0bce7eccdcd1 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1387,7 +1387,7 @@ ScVbaApplication::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Application" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Application"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 8796fa04a853..d3cd1e399ab2 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -113,7 +113,7 @@ ScVbaAssistant::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.Assistant" ); + aServiceNames[ 0 ] = "ooo.vba.Assistant"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index e8d006e66c89..f04b6885826e 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -187,7 +187,7 @@ ScVbaAxes::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axes" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Axes"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 242d877213e8..67b39bc802e8 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -651,7 +651,7 @@ ScVbaAxis::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axis" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Axis"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 9c1993c62131..4715d8e8e409 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -39,7 +39,7 @@ ScVbaAxisTitle::getServiceNames() { uno::Sequence< OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.AxisTitle" ); + aServiceNames[ 0 ] = "ooo.vba.excel.AxisTitle"; for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 1e2a223bd90e..15e695a99dd0 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -154,7 +154,7 @@ protected: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Border" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Border"; } return aServiceNames; } @@ -559,7 +559,7 @@ ScVbaBorders::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Borders" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Borders"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index ca9d9ce3315b..b73818b9516b 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -120,7 +120,7 @@ ScVbaCharacters::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Characters" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Characters"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 700ecc20a7b2..1da5bc67e8f8 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -1065,7 +1065,7 @@ ScVbaChart::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Chart"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index f08764f439f3..1458b0bd81e7 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -140,7 +140,7 @@ ScVbaChartObject::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.ChartObject" ); + aServiceNames[ 0 ] = "ooo.vba.excel.ChartObject"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 578b5a26cf1b..2494edbb9bbc 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -178,7 +178,7 @@ ScVbaChartObjects::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.excel.ChartObjects"); + sNames[0] = "ooo.vba.excel.ChartObjects"; } return sNames; } diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index a07722c86f1b..d0def76e4f4d 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -39,7 +39,7 @@ ScVbaChartTitle::getServiceNames() { uno::Sequence< OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Chart"; for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 6f801d3dd757..6951517e3c4c 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -225,7 +225,7 @@ ScVbaComment::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.ScVbaComment" ); + aServiceNames[ 0 ] = "ooo.vba.excel.ScVbaComment"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 1a678afb68e7..8495298e8103 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -101,7 +101,7 @@ ScVbaComments::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.excel.Comments"); + sNames[0] = "ooo.vba.excel.Comments"; } return sNames; } diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index a5c59fd27d8b..c921cfd0ad64 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -75,7 +75,7 @@ ScVbaDialog::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialog" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Dialog"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 6c3982b4ff2e..b6bba0b78765 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -50,7 +50,7 @@ ScVbaDialogs::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialogs" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Dialogs"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 292171658082..1f8ddc8e86a1 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -486,7 +486,7 @@ ScVbaFont::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Font" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Font"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index abe63a30ccb7..2f3685e12363 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -785,7 +785,7 @@ ScVbaFormat<Ifc1>::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Format" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Format"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 5ffec53ee5da..ff5af1b50057 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -161,7 +161,7 @@ ScVbaFormatCondition::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatCondition" ); + aServiceNames[ 0 ] = "ooo.vba.excel.FormatCondition"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 3824cf0e4e22..eb61eed6dc98 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -273,7 +273,7 @@ ScVbaFormatConditions::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatConditions" ); + aServiceNames[ 0 ] = "ooo.vba.excel.FormatConditions"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 94d42fcc777f..813eb1c851d2 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -49,7 +49,7 @@ ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Referen OSL_TRACE("ScVbaGlobals::ScVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = OUString("Application"); + aInitArgs[ 0 ].Name = "Application"; aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -284,7 +284,7 @@ ScVbaGlobals::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Globals" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Globals" ; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index a3404ebdd3da..a5cd9a9a6131 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -397,7 +397,7 @@ ScVbaInterior::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Interior" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Interior"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index 4049eb9cc6a1..f2d24b525e21 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -60,7 +60,7 @@ ScVbaMenu::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menu" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Menu"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 4b39ef11b5b0..065db3a227c8 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -42,7 +42,7 @@ ScVbaMenuBar::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBar" ); + aServiceNames[ 0 ] = "ooo.vba.excel.MenuBar"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 9ed7663143c3..fff62a12cae0 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -110,7 +110,7 @@ ScVbaMenuBars::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBars" ); + aServiceNames[ 0 ] = "ooo.vba.excel.MenuBars"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 87f60e605749..f70eb5e1707f 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -58,7 +58,7 @@ ScVbaMenuItem::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItem" ); + aServiceNames[ 0 ] = "ooo.vba.excel.MenuItem"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index fc7d486b538c..5cb13ea5074a 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -126,7 +126,7 @@ ScVbaMenuItems::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItems" ); + aServiceNames[ 0 ] = "ooo.vba.excel.MenuItems"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index d2370e6acf49..6fbe213ec82d 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -112,7 +112,7 @@ ScVbaMenus::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menus" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Menus"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index 0a93da53089e..75d66947919b 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -151,7 +151,7 @@ ScVbaOLEObject::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObject" ); + aServiceNames[ 0 ] = "ooo.vba.excel.OLEObject"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 968db0b1cc61..e1264c31c2f7 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -171,7 +171,7 @@ ScVbaOLEObjects::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObjects" ); + aServiceNames[ 0 ] = "ooo.vba.excel.OLEObjects"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 67ea4a6b9a94..fb47e3ed41be 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -50,7 +50,7 @@ ScVbaOutline::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Outline" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Outline"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 64ae5ce2254a..8a639878e7ed 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -100,7 +100,7 @@ ScVbaPageBreak<Ifc1>::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.PageBreak" ); + aServiceNames[ 0 ] = "ooo.vba.excel.PageBreak"; } return aServiceNames; } @@ -121,7 +121,7 @@ ScVbaHPageBreak::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreak" ); + aServiceNames[ 0 ] = "ooo.vba.excel.HPageBreak"; } return aServiceNames; } @@ -154,7 +154,7 @@ ScVbaVPageBreak::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreak" ); + aServiceNames[ 0 ] = "ooo.vba.excel.VPageBreak"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index a67a3b527135..6a7a522c87e3 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -248,7 +248,7 @@ ScVbaHPageBreaks::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreaks" ); + aServiceNames[ 0 ] = "ooo.vba.excel.HPageBreaks"; } return aServiceNames; } @@ -308,7 +308,7 @@ ScVbaVPageBreaks::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreaks" ); + aServiceNames[ 0 ] = "ooo.vba.excel.VPageBreaks"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index d03f2ebdef02..6c383da92c8c 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -45,7 +45,7 @@ ScVbaPivotCache::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotCache" ); + aServiceNames[ 0 ] = "ooo.vba.excel.PivotCache"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 14343b34b795..cd37f92e6ab5 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -48,7 +48,7 @@ ScVbaPivotTable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotTable" ); + aServiceNames[ 0 ] = "ooo.vba.excel.PivotTable"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index e013c1a8ad3b..511786e8028d 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -79,7 +79,7 @@ ScVbaPivotTables::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.excel.PivotTables"); + sNames[0] = "ooo.vba.excel.PivotTables"; } return sNames; } diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 82eaebaf717f..dd632a197f12 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -170,7 +170,7 @@ ScVbaStyle::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyle" ); + aServiceNames[ 0 ] = "ooo.vba.excel.XStyle"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 869490b58d27..ffd1891c5196 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -167,7 +167,7 @@ ScVbaStyles::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyles" ); + aServiceNames[ 0 ] = "ooo.vba.excel.XStyles"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 854594faafb9..be9718a5b3b8 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -53,7 +53,7 @@ ScVbaTextFrame::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.TextFrame" ); + aServiceNames[ 0 ] = "ooo.vba.excel.TextFrame"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index ee9e2f73ca20..4cc5f75a21c4 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -390,7 +390,7 @@ ScVbaValidation::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Validation" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Validation"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 1a0ec714b2c4..9aa8f2311b1a 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -903,7 +903,7 @@ ScVbaWindow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Window" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Window"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 5f4bf1098ffe..f50c0104f36d 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -238,7 +238,7 @@ ScVbaWindows::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.excel.Windows"); + sNames[0] = "ooo.vba.excel.Windows"; } return sNames; } diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 02bbc1491bce..60974d21ce60 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -300,7 +300,7 @@ ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeExcep osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > storeProps(1); - storeProps[0].Name = OUString( "FilterName" ); + storeProps[0].Name = "FilterName"; storeProps[0].Value <<= OUString( "MS Excel 97" ); xStor->storeToURL( aURL, storeProps ); } @@ -391,7 +391,7 @@ ScVbaWorkbook::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Workbook" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Workbook"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 907167adeff3..7625b11b71ef 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -268,7 +268,7 @@ ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) { uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); - aMediaDesc[ 0 ].Name = OUString("URL" ); + aMediaDesc[ 0 ].Name = "URL"; aMediaDesc[ 0 ].Value <<= rFileName; OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); return sType; @@ -304,7 +304,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ // 6 Custom character (see the Delimiter argument // no format means use the current delimiter sProps.realloc( 3 ); - sProps[ nIndex ].Name = OUString("FilterOptions" ); + sProps[ nIndex ].Name = "FilterOptions"; sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; static OUString sRestOfFormat(",34,0,1" ); @@ -343,11 +343,11 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ sFormat = OUString::number( nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; - sProps[ nIndex ].Name = OUString("FilterName"); + sProps[ nIndex ].Name = "FilterName"; sProps[ nIndex++ ].Value <<= OUString( "Text - txt - csv (StarCalc)" ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types - sProps[ nIndex ].Name = OUString("DocumentService"); + sProps[ nIndex ].Name = "DocumentService"; sProps[ nIndex ].Value <<= OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) @@ -374,7 +374,7 @@ ScVbaWorkbooks::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.excel.Workbooks"); + sNames[0] = "ooo.vba.excel.Workbooks"; } return sNames; } diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 078c9e98fd1a..290cb148e1ad 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -698,7 +698,7 @@ void ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException) { // #TODO# #FIXME# unused params above, can we do anything with those - OUString url = OUString( ".uno:SpellDialog"); + OUString url = ".uno:SpellDialog"; uno::Reference< frame::XModel > xModel( getModel() ); dispatchRequests(xModel,url); } @@ -1051,7 +1051,7 @@ ScVbaWorksheet::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.Worksheet" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Worksheet"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 5d19147f9f64..b8332af98a44 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -482,7 +482,7 @@ ScVbaWorksheets::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.excel.Worksheets"); + sNames[0] = "ooo.vba.excel.Worksheets"; } return sNames; } diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index ec5117323298..bf607e96e0bc 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -304,7 +304,7 @@ ScVbaWSFunction::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.excel.WorksheetFunction" ); + aServiceNames[ 0 ] = "ooo.vba.excel.WorksheetFunction"; } return aServiceNames; } diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 83901a69e971..cdecc4d3651a 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1667,7 +1667,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = OUString("ParentWindow"); + aParam.Name = "ParentWindow"; aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index ef453879d172..bb1440c930bd 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1134,7 +1134,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) OUString aCode = ((const SfxStringItem*)pItem)->GetValue(); sal_uInt16 aLen = aCode.getLength(); OUString* sFormat = new OUString[4]; - OUString sTmpStr = OUString(); + OUString sTmpStr = ""; sal_uInt16 nCount(0); sal_uInt16 nStrCount(0); @@ -1145,7 +1145,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) if(cChar == sal_Unicode(',')) { sFormat[nStrCount] = sTmpStr; - sTmpStr = OUString(); + sTmpStr = ""; nStrCount++; } else @@ -2451,7 +2451,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) pFormatter->GetFormatSpecialInfo(nNumberFormat,bThousand, bNegRed, nPrecision, nLeadZeroes); OUString aFormat; - static OUString sBreak = OUString(","); + static OUString sBreak = ","; const OUString sThousand = OUString::number(static_cast<sal_Int32>(bThousand)); const OUString sNegRed = OUString::number(static_cast<sal_Int32>(bNegRed)); const OUString sPrecision = OUString::number(nPrecision); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index b0a5a40d7f6e..77181cbd18fc 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -957,7 +957,7 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue pSeq[0].Value <<= sBuffer.makeStringAndClear(); pSeq[1].Name = OUString(SC_ZOOMVALUE); pSeq[1].Value <<= sal_Int32 (pPreview->GetZoom()); - pSeq[2].Name = OUString("PageNumber"); + pSeq[2].Name = "PageNumber"; pSeq[2].Value <<= pPreview->GetPageNo(); } } |