[Libreoffice-commits] core.git: 4 commits - framework/source reportdesign/source sc/qa scripting/source sc/source
Noel Grandin
noel at peralex.com
Sun Nov 10 22:36:41 PST 2013
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/dispatch/oxt_handler.cxx | 2
framework/source/dispatch/windowcommanddispatch.cxx | 4
framework/source/helper/titlebarupdate.cxx | 16 +--
framework/source/jobs/jobdata.cxx | 14 +--
framework/source/recording/dispatchrecorder.cxx | 3
framework/source/services/autorecovery.cxx | 23 ++---
framework/source/services/dispatchhelper.cxx | 2
framework/source/services/license.cxx | 2
framework/source/services/sessionlistener.cxx | 6 -
framework/source/services/substitutepathvars.cxx | 8 -
framework/source/services/urltransformer.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 5 -
reportdesign/source/core/api/FormattedField.cxx | 4
reportdesign/source/core/api/ReportDefinition.cxx | 16 +--
reportdesign/source/core/api/ReportEngineJFree.cxx | 12 +-
reportdesign/source/core/sdr/RptObject.cxx | 4
reportdesign/source/filter/xml/dbloader2.cxx | 2
reportdesign/source/filter/xml/xmlExport.cxx | 48 +++++------
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2
reportdesign/source/ui/dlg/Formula.cxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 18 ++--
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 20 ++--
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2
reportdesign/source/ui/misc/statusbarcontroller.cxx | 2
reportdesign/source/ui/misc/toolboxcontroller.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 24 ++---
reportdesign/source/ui/report/ReportSection.cxx | 6 -
reportdesign/source/ui/report/dlgedfunc.cxx | 2
sc/qa/unit/helper/qahelper.cxx | 2
sc/source/core/data/dptabsrc.cxx | 22 ++---
sc/source/core/data/funcdesc.cxx | 24 ++---
sc/source/core/tool/cellform.cxx | 18 ++--
sc/source/core/tool/formulaopt.cxx | 14 +--
sc/source/filter/excel/xltoolbar.cxx | 6 -
sc/source/filter/xml/xmlcvali.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 46 +++++-----
sc/source/filter/xml/xmlstyle.cxx | 6 -
sc/source/filter/xml/xmlwrap.cxx | 8 -
sc/source/ui/Accessibility/AccessibleCell.cxx | 3
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 6 -
sc/source/ui/Accessibility/AccessibleDocument.cxx | 3
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 3
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 3
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 3
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 3
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 5 -
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 3
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 3
sc/source/ui/docshell/docsh.cxx | 10 +-
sc/source/ui/docshell/docsh4.cxx | 4
sc/source/ui/drawfunc/fuins2.cxx | 4
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 6 -
sc/source/ui/unoobj/docuno.cxx | 12 +-
sc/source/ui/unoobj/pageuno.cxx | 3
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbaassistant.cxx | 2
sc/source/ui/vba/vbaaxes.cxx | 2
sc/source/ui/vba/vbaaxis.cxx | 2
sc/source/ui/vba/vbaaxistitle.cxx | 2
sc/source/ui/vba/vbaborders.cxx | 4
sc/source/ui/vba/vbacharacters.cxx | 2
sc/source/ui/vba/vbachart.cxx | 2
sc/source/ui/vba/vbachartobject.cxx | 2
sc/source/ui/vba/vbachartobjects.cxx | 2
sc/source/ui/vba/vbacharttitle.cxx | 2
sc/source/ui/vba/vbacomment.cxx | 2
sc/source/ui/vba/vbacomments.cxx | 2
sc/source/ui/vba/vbadialog.cxx | 2
sc/source/ui/vba/vbadialogs.cxx | 2
sc/source/ui/vba/vbafont.cxx | 2
sc/source/ui/vba/vbaformat.cxx | 2
sc/source/ui/vba/vbaformatcondition.cxx | 2
sc/source/ui/vba/vbaformatconditions.cxx | 2
sc/source/ui/vba/vbaglobals.cxx | 4
sc/source/ui/vba/vbainterior.cxx | 2
sc/source/ui/vba/vbamenu.cxx | 2
sc/source/ui/vba/vbamenubar.cxx | 2
sc/source/ui/vba/vbamenubars.cxx | 2
sc/source/ui/vba/vbamenuitem.cxx | 2
sc/source/ui/vba/vbamenuitems.cxx | 2
sc/source/ui/vba/vbamenus.cxx | 2
sc/source/ui/vba/vbaoleobject.cxx | 2
sc/source/ui/vba/vbaoleobjects.cxx | 2
sc/source/ui/vba/vbaoutline.cxx | 2
sc/source/ui/vba/vbapagebreak.cxx | 6 -
sc/source/ui/vba/vbapagebreaks.cxx | 4
sc/source/ui/vba/vbapivotcache.cxx | 2
sc/source/ui/vba/vbapivottable.cxx | 2
sc/source/ui/vba/vbapivottables.cxx | 2
sc/source/ui/vba/vbastyle.cxx | 2
sc/source/ui/vba/vbastyles.cxx | 2
sc/source/ui/vba/vbatextframe.cxx | 2
sc/source/ui/vba/vbavalidation.cxx | 2
sc/source/ui/vba/vbawindow.cxx | 2
sc/source/ui/vba/vbawindows.cxx | 2
sc/source/ui/vba/vbaworkbook.cxx | 4
sc/source/ui/vba/vbaworkbooks.cxx | 10 +-
sc/source/ui/vba/vbaworksheet.cxx | 4
sc/source/ui/vba/vbaworksheets.cxx | 2
sc/source/ui/vba/vbawsfunction.cxx | 2
sc/source/ui/view/cellsh1.cxx | 2
sc/source/ui/view/formatsh.cxx | 6 -
sc/source/ui/view/prevwsh.cxx | 2
scripting/source/basprov/basmethnode.cxx | 10 +-
scripting/source/dlgprov/dlgprov.cxx | 8 -
scripting/source/provider/ActiveMSPList.cxx | 6 -
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2
scripting/source/stringresource/stringresource.cxx | 8 -
scripting/source/vbaevents/eventhelper.cxx | 7 -
112 files changed, 316 insertions(+), 330 deletions(-)
New commits:
commit c4a593b6b1732def0a21f455c0ca50f82a9bc40d
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 4 11:42:58 2013 +0200
remove unnecessary use of OUString constructor in FRAMEWORK module
Change-Id: Icbed4f318043a166ed78fe0c49a53f87ebf7201d
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index ebbd9c9..7cdfc59 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -120,7 +120,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
else
{
aInfo.lURLPattern.realloc(1);
- aInfo.lURLPattern[0] = OUString("*");
+ aInfo.lURLPattern[0] = "*";
}
// SAFE {
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 4fd8ffb..3f020db 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -192,7 +192,7 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyV
// I think we can the following ones:
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
- sTypeName = OUString("oxt_OpenOffice_Extension");
+ sTypeName = "oxt_OpenOffice_Extension";
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index e35f522..44a381c 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -129,11 +129,11 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
switch (nCommand)
{
case SHOWDIALOG_ID_PREFERENCES :
- sCommand = OUString(".uno:OptionsTreeDialog");
+ sCommand = ".uno:OptionsTreeDialog";
break;
case SHOWDIALOG_ID_ABOUT :
- sCommand = OUString(".uno:About");
+ sCommand = ".uno:About";
break;
default :
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 3370de4..e9badc6 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -159,31 +159,31 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
aModuleId == "com.sun.star.text.GlobalDocument" ||
aModuleId == "com.sun.star.text.WebDocument" ||
aModuleId == "com.sun.star.xforms.XMLFormDocument" )
- sDesktopName = OUString("Writer");
+ sDesktopName = "Writer";
else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
- sDesktopName = OUString("Calc");
+ sDesktopName = "Calc";
else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
- sDesktopName = OUString("Impress");
+ sDesktopName = "Impress";
else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
- sDesktopName = OUString("Draw");
+ sDesktopName = "Draw";
else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
- sDesktopName = OUString("Math");
+ sDesktopName = "Math";
else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" ||
aModuleId == "com.sun.star.sdb.OfficeDatabaseDocument" ||
aModuleId == "com.sun.star.sdb.RelationDesign" ||
aModuleId == "com.sun.star.sdb.QueryDesign" ||
aModuleId == "com.sun.star.sdb.TableDesign" ||
aModuleId == "com.sun.star.sdb.DataSourceBrowser" )
- sDesktopName = OUString("Base");
+ sDesktopName = "Base";
else
- sDesktopName = OUString("Startcenter");
+ sDesktopName = "Startcenter";
#if defined(WNT)
// We use a hardcoded product name matching the registry keys so applications can be associated with file types
sApplicationID = "TheDocumentFoundation.LibreOffice.";
sApplicationID += sDesktopName;
#else
sApplicationID = utl::ConfigManager::getProductName().toAsciiLowerCase();
- sApplicationID += OUString(sal_Unicode('-'));
+ sApplicationID += "-";
sApplicationID += sDesktopName.toAsciiLowerCase();
#endif
#endif
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 6c5c905..3fb1b95 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -401,15 +401,15 @@ OUString JobData::getEnvironmentDescriptor() const
switch(m_eEnvironment)
{
case E_EXECUTION :
- sDescriptor = OUString("EXECUTOR");
+ sDescriptor = "EXECUTOR";
break;
case E_DISPATCH :
- sDescriptor = OUString("DISPATCH");
+ sDescriptor = "DISPATCH";
break;
case E_DOCUMENTEVENT :
- sDescriptor = OUString("DOCUMENTEVENT");
+ sDescriptor = "DOCUMENTEVENT";
break;
default:
break;
@@ -712,10 +712,10 @@ void JobData::impl_reset()
WriteGuard aWriteLock(m_aLock);
m_eMode = E_UNKNOWN_MODE;
m_eEnvironment = E_UNKNOWN_ENVIRONMENT;
- m_sAlias = OUString();
- m_sService = OUString();
- m_sContext = OUString();
- m_sEvent = OUString();
+ m_sAlias = "";
+ m_sService = "";
+ m_sContext = "";
+ m_sEvent = "";
m_lArguments = css::uno::Sequence< css::beans::NamedValue >();
aWriteLock.unlock();
/* } SAFE */
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 8409d4c..c2f9d96 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -316,8 +316,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL,
OUStringBuffer aArgumentBuffer(1000);
OUString sArrayName;
// this value is used to name the arrays of aArgumentBuffer
- sArrayName = OUString("args");
- sArrayName += OUString::number(m_nRecordingID);
+ sArrayName = "args" + OUString::number(m_nRecordingID);
aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n");
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 78b7df6..d628c1c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -370,7 +370,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy)
//-----------------------------------------------
void DispatchParams::forget()
{
- m_sSavePath = OUString();
+ m_sSavePath = "";
m_nWorkingEntryID = -1;
m_xProgress.clear();
m_xHoldRefForAsyncOpAlive.clear();
@@ -1047,7 +1047,7 @@ void AutoRecovery::implts_readConfig()
continue;
AutoRecovery::TDocumentInfo aInfo;
- aInfo.NewTempURL = OUString();
+ aInfo.NewTempURL = "";
aInfo.Document = css::uno::Reference< css::frame::XModel >();
xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL ;
xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL ;
@@ -1140,16 +1140,15 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
css::uno::Sequence< OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< OUString >());
if (lExtensions.getLength())
{
- rInfo.Extension = OUString(".");
- rInfo.Extension += lExtensions[0];
+ rInfo.Extension = lExtensions[0];
}
else
- rInfo.Extension = OUString(".unknown");
+ rInfo.Extension = ".unknown";
}
catch(const css::uno::Exception&)
{
- rInfo.DefaultFilter = OUString();
- rInfo.Extension = OUString();
+ rInfo.DefaultFilter = "";
+ rInfo.Extension = "";
}
}
@@ -1900,8 +1899,8 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr
OUString sRemoveURL1 = rInfo.OldTempURL;
OUString sRemoveURL2 = rInfo.NewTempURL;
- rInfo.OldTempURL = OUString();
- rInfo.NewTempURL = OUString();
+ rInfo.OldTempURL = "";
+ rInfo.NewTempURL = "";
::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString());
@@ -2394,7 +2393,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
else
{
// safe the state about error ...
- rInfo.NewTempURL = OUString();
+ rInfo.NewTempURL = "";
rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE;
rInfo.DocumentState |= AutoRecovery::E_HANDLED;
rInfo.DocumentState |= AutoRecovery::E_INCOMPLETE;
@@ -2407,8 +2406,8 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
// Ignore any error here. We have a new temp file, which is up to date.
// The only thing is: we fill the disk with temp files, if we cant remove old ones :-)
OUString sRemoveFile = rInfo.OldTempURL;
- rInfo.OldTempURL = rInfo.NewTempURL;
- rInfo.NewTempURL = OUString();
+ rInfo.OldTempURL = rInfo.NewTempURL;
+ rInfo.NewTempURL = "";
implts_flushConfigItem(rInfo);
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 7da823d..f3aeaf6 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -120,7 +120,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
sal_Int32 nLength = lArguments.getLength();
aArguments.realloc( nLength + 1 );
- aArguments[ nLength ].Name = OUString("SynchronMode");
+ aArguments[ nLength ].Name = "SynchronMode";
aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
css::uno::Any aResult;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index b0ee908..e26591c 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -236,7 +236,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
Reference< XMultiServiceFactory > theConfigProvider = theDefaultProvider::get( m_xContext );
Sequence< Any > theArgs(1);
NamedValue v;
- v.Name = OUString("NodePath");
+ v.Name = "NodePath";
v.Value <<= OUString("org.openoffice.Setup/Office");
theArgs[0] <<= v;
Reference< XPropertySet > pset = Reference< XPropertySet >(
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index d85ba14..bb8be51 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -116,7 +116,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext );
css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext );
URL aURL;
- aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionSave");
+ aURL.Complete = "vnd.sun.star.autorecovery:/doSessionSave";
xURLTransformer->parseStrict(aURL);
// in case of asynchronous call the notification will trigger saveDone()
@@ -148,7 +148,7 @@ void SessionListener::QuitSessionQuietly()
css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext );
css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext );
URL aURL;
- aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionQuietQuit");
+ aURL.Complete = "vnd.sun.star.autorecovery:/doSessionQuietQuit";
xURLTransformer->parseStrict(aURL);
Sequence< PropertyValue > args(1);
@@ -229,7 +229,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext );
URL aURL;
- aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionRestore");
+ aURL.Complete = "vnd.sun.star.autorecovery:/doSessionRestore";
css::uno::Reference< XURLTransformer > xURLTransformer(URLTransformer::create(m_xContext));
xURLTransformer->parseStrict(aURL);
Sequence< PropertyValue > args;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 9352003..d114a4c 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -240,7 +240,7 @@ SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyL
// Enable notification mechanism
// We need it to get information about changes outside these class on our configuration branch
Sequence< OUString > aNotifySeq( 1 );
- aNotifySeq[0] = OUString( "SharePoints" );
+ aNotifySeq[0] = "SharePoints";
EnableNotification( aNotifySeq, sal_True );
}
@@ -347,7 +347,7 @@ const OUString& SubstitutePathVariables_Impl::GetDNSDomainName()
if ( nIndex >= 0 && aTemp.getLength() > nIndex+1 )
m_aDNSDomain = aTemp.copy( nIndex+1 ).toAsciiLowerCase();
else
- m_aDNSDomain = OUString();
+ m_aDNSDomain = "";
m_bDNSDomainRetrieved = sal_True;
}
@@ -524,7 +524,7 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration(
aEnvUsePropNameTemplate += m_aLevelSep;
for ( sal_Int32 nProperty = 0; nProperty < aEnvironmentVariable.getLength(); nProperty++ )
- aEnvUsedPropertySeq[nProperty] = OUString( aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty] );
+ aEnvUsedPropertySeq[nProperty] = aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty];
Sequence< Any > aEnvUsedValueSeq;
aEnvUsedValueSeq = GetProperties( aEnvUsedPropertySeq );
@@ -1113,7 +1113,7 @@ throw ( NoSuchElementException, RuntimeException )
void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
{
- aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = OUString("$BRAND_BASE_DIR");
+ aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = "$BRAND_BASE_DIR";
rtl::Bootstrap::expandMacros(
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 13e42d9..b9c27a8 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -311,7 +311,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL
if ( !bWithPassword && !aTestURL.Password.isEmpty() )
{
// Exchange password text with other placeholder string
- aTestURL.Password = OUString("<******>");
+ aTestURL.Password = "<******>";
assemble( aTestURL );
}
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 2bf2029..e039276 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -207,7 +207,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
}
// We have to map commands which uses special characters like '/',':','?','\','<'.'>','|'
- OUString aExt = OUString(".png");
+ OUString aExt = ".png";
m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
m_aImageNameVector.resize( aCmdImageSeq.getLength() );
@@ -571,8 +571,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
pList->pImageItemList->push_back( pItem );
}
- pList->aURL = OUString("Bitmaps/");
- pList->aURL += OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]);
+ pList->aURL = "Bitmaps/" + OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]);
uno::Reference< XTransactedObject > xTransaction;
uno::Reference< XOutputStream > xOutputStream;
commit 62f27a5e7bd7e66d11b8f6c9c047ecdd73199401
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 4 11:37:16 2013 +0200
remove unnecessary use of OUString constructor in REPORTDESIGN module
Change-Id: I5790d7e0c15ac837865597da6ab8a165a5291813
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 670413a..4e3dff2 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 fe36234..d88832f 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 0c82b18..a00b9ab 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 dbb11c1..4615cc1 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 c650309..c30a9fe 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 3d8fbbc..475c489 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 d2db12f..7f10693 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 fca9c32..418557e 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 00ae00f..0d37c49 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 3cf5ad1..ef9ecfd 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 50fe32a..ca32010 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 10f3141..d50cbb1 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 295e787..fde28ac 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 85e186c..f4c5512 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 627be80..e0dd8c8 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 ef35d1c..721c9db 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 430478a..04856f7 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 65a1bee..637e1b0 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);
commit f12f51316a2cb230138ec6dcdc7295e18b6fce28
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 4 11:22:26 2013 +0200
remove unnecessary use of OUString constructor in SC module
Change-Id: I2d40c589eb3b5c99300f36cd705c32cf824b2a98
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index b212846..905abef 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -258,7 +258,7 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument* pDoc, sal_Int32 nFormat)
CPPUNIT_ASSERT_EQUAL_MESSAGE("'Excel Built-in Date' style should be aligned centre horizontally", SVX_HOR_JUSTIFY_CENTER, eHorJustify);
// check date format ( should be just month e.g. 29 )
sResult =pDoc->GetString( 1,1,3 );
- sExpected = OUString("29");
+ sExpected = "29";
CPPUNIT_ASSERT_EQUAL_MESSAGE("'Excel Built-in Date' style should just display month", sExpected, sResult );
// check actual align applied to cell, should be the same as
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index d3fb4e7..b8bcfaa 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 21bb859..c8c0b24 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 fdeb7f8..434043f 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 16ad17f..79d84a6 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 5dcd7dc..b4b354d 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 2d634ae..bc55a0b 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 5454438..cb0b63d 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 ab0ef15..7d6c5a2 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 97bdb0d..fb3d4b1 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 72c6191..199ec69 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 71932dc..7db34ef 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 f525455..6d3b7f8 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 e69201f..ee68b61 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 3d7b46f..3a777c4 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 9aee5b9..6f6cf3b 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 6ae7159..291b539 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 7064092..f67081b 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 118cc36..42b14f4 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 2dddb06..c06ea60 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 b8f3579..490358a 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 b4b80d6..375b59d 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 1ab6671..9db9ac9 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 7570526..229b9c4 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 8123f45..328af86 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 c4d485d..dec73c9 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 eb3c9eb..0bce7ec 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 8796fa0..d3cd1e3 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 e8d006e..f04b688 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 242d877..67b39bc 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 9c1993c..4715d8e 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 1e2a223..15e695a 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 ca9d9ce..b73818b 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 700ecc2..1da5bc6 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 f08764f..1458b0b 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 578b5a2..2494edb 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 a07722c..d0def76 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 6f801d3..6951517 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 1a678af..8495298 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 a5c59fd..c921cfd 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 6c3982b..b6bba0b 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 2921716..1f8ddc8 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" );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list