[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source chart2/qa chart2/source comphelper/source compilerplugins/clang configmgr/qa cppuhelper/source cui/source desktop/source embeddedobj/source eventattacher/source extensions/source filter/source forms/source framework/inc hwpfilter/source jvmfwk/source libreofficekit/qa oox/source pyuno/source reportdesign/source scaddins/source sc/qa scripting/source sdext/source sd/qa sd/source shell/source slideshow/source smoketest/smoketest.cxx sot/source starmath/source stoc/source svtools/source testtools/source toolkit/source ucb/source unotest/source unotools/source uui/source vbahelper/source vcl/source vcl/unx xmlhelp/source
Noel Grandin
noel at peralex.com
Wed Nov 4 04:11:12 PST 2015
avmedia/source/opengl/ogluno.cxx | 2
basctl/source/basicide/baside2.cxx | 4
basctl/source/basicide/baside3.cxx | 12 -
basic/source/classes/sbunoobj.cxx | 4
basic/source/runtime/comenumwrapper.cxx | 4
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/methods.cxx | 2
basic/source/uno/dlgcont.cxx | 8
basic/source/uno/namecont.cxx | 6
chart2/qa/extras/chart2export.cxx | 4
chart2/source/tools/ChartModelHelper.cxx | 2
chart2/source/tools/ErrorBar.cxx | 3
comphelper/source/container/embeddedobjectcontainer.cxx | 6
comphelper/source/misc/mimeconfighelper.cxx | 3
comphelper/source/misc/officeresourcebundle.cxx | 3
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 6
compilerplugins/clang/stringconstant.cxx | 43 +++++
configmgr/qa/unit/test.cxx | 19 --
cppuhelper/source/factory.cxx | 9 -
cui/source/customize/cfg.cxx | 13 -
cui/source/customize/selector.cxx | 6
cui/source/dialogs/hlmarkwn.cxx | 2
cui/source/dialogs/insdlg.cxx | 2
cui/source/options/optgdlg.cxx | 3
desktop/source/app/app.cxx | 34 +---
desktop/source/app/officeipcthread.cxx | 2
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 2
desktop/source/lib/init.cxx | 4
desktop/source/offacc/acceptor.cxx | 6
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 4
embeddedobj/source/commonembedding/persistence.cxx | 2
embeddedobj/source/general/docholder.cxx | 9 -
embeddedobj/source/general/intercept.cxx | 2
embeddedobj/source/msole/ownview.cxx | 2
eventattacher/source/eventattacher.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 6
extensions/source/bibliography/bibload.cxx | 2
extensions/source/dbpilots/controlwizard.cxx | 2
extensions/source/propctrlr/editpropertyhandler.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 8
filter/source/msfilter/eschesdo.cxx | 2
filter/source/pdf/pdfexport.cxx | 2
filter/source/placeware/exporter.cxx | 2
filter/source/t602/t602filter.cxx | 2
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 15 -
filter/source/xsltfilter/XSLTFilter.cxx | 2
forms/source/richtext/richtextmodel.cxx | 3
framework/inc/acceleratorconst.h | 2
hwpfilter/source/formula.cxx | 2
hwpfilter/source/hwpreader.cxx | 36 ++--
jvmfwk/source/fwkbase.cxx | 18 --
libreofficekit/qa/unit/tiledrendering.cxx | 2
oox/source/core/filterdetect.cxx | 2
oox/source/drawingml/shape.cxx | 12 -
oox/source/dump/dumperbase.cxx | 2
oox/source/export/chartexport.cxx | 82 +++-------
pyuno/source/loader/pyuno_loader.cxx | 4
reportdesign/source/core/api/ReportDefinition.cxx | 6
reportdesign/source/ui/report/propbrw.cxx | 9 -
sc/qa/unit/copy_paste_test.cxx | 6
scaddins/source/datefunc/datefunc.cxx | 3
scripting/source/basprov/basmethnode.cxx | 2
scripting/source/basprov/basprov.cxx | 2
scripting/source/dlgprov/dlgprov.cxx | 5
sd/qa/unit/export-tests.cxx | 8
sd/qa/unit/import-tests.cxx | 2
sd/source/core/EffectMigration.cxx | 2
sd/source/core/drawdoc4.cxx | 4
sd/source/filter/eppt/eppt.cxx | 4
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 12 -
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 4
sd/source/ui/slidesorter/controller/SlsListener.cxx | 12 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/tools/EventMultiplexer.cxx | 8
sd/source/ui/view/ViewShellImplementation.cxx | 2
sdext/source/presenter/PresenterPaneFactory.cxx | 2
sdext/source/presenter/PresenterSlidePreview.cxx | 6
sdext/source/presenter/PresenterSlideSorter.cxx | 2
shell/source/backends/desktopbe/desktopbackend.cxx | 4
shell/source/cmdmail/cmdmailentry.cxx | 6
shell/source/unix/exec/shellexec.cxx | 6
shell/source/unix/exec/shellexecentry.cxx | 6
slideshow/source/engine/animationnodes/basenode.cxx | 4
slideshow/source/engine/shapes/viewappletshape.cxx | 3
slideshow/source/engine/shapes/viewmediashape.cxx | 6
slideshow/source/engine/tools.cxx | 3
smoketest/smoketest.cxx | 4
sot/source/sdstor/storage.cxx | 5
starmath/source/document.cxx | 8
starmath/source/view.cxx | 2
stoc/source/corereflection/crefl.cxx | 4
stoc/source/javaloader/javaloader.cxx | 5
stoc/source/javavm/javavm.cxx | 14 -
stoc/source/security/access_controller.cxx | 2
stoc/source/servicemanager/servicemanager.cxx | 9 -
svtools/source/config/printoptions.cxx | 28 +--
svtools/source/contnr/fileview.cxx | 12 -
svtools/source/hatchwindow/documentcloser.cxx | 3
svtools/source/misc/embedhlp.cxx | 2
svtools/source/uno/genericunodialog.cxx | 2
testtools/source/bridgetest/bridgetest.cxx | 2
testtools/source/bridgetest/cppobj.cxx | 4
testtools/source/bridgetest/multi.cxx | 24 +-
toolkit/source/controls/controlmodelcontainerbase.cxx | 3
toolkit/source/helper/formpdfexport.cxx | 2
ucb/source/core/ucbstore.cxx | 36 +---
ucb/source/ucp/hierarchy/hierarchydata.cxx | 31 +--
ucb/source/ucp/package/pkgcontent.cxx | 29 +--
ucb/source/ucp/tdoc/tdoc_content.cxx | 2
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 3
ucb/source/ucp/tdoc/tdoc_storage.cxx | 3
unotest/source/cpp/bootstrapfixturebase.cxx | 2
unotest/source/cpp/macros_test.cxx | 2
unotools/source/config/bootstrap.cxx | 4
unotools/source/config/lingucfg.cxx | 12 -
uui/source/iahndl-filter.cxx | 2
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4
vcl/source/filter/graphicfilter.cxx | 4
vcl/source/gdi/print.cxx | 22 +-
vcl/source/gdi/print3.cxx | 6
vcl/source/window/abstdlg.cxx | 2
vcl/unx/gtk/gdi/gtkprintwrapper.cxx | 4
vcl/unx/gtk/window/gtksalframe.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 10 -
126 files changed, 406 insertions(+), 501 deletions(-)
New commits:
commit 59b072e22b0610abc7ffdbc75873ef5cbba58de7
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 4 08:29:36 2015 +0200
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
diff --git a/avmedia/source/opengl/ogluno.cxx b/avmedia/source/opengl/ogluno.cxx
index b393f8b..fc9f609 100644
--- a/avmedia/source/opengl/ogluno.cxx
+++ b/avmedia/source/opengl/ogluno.cxx
@@ -31,7 +31,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaogl_component_getFactory(
xFactory.set( ::cppu::createSingleFactory(
static_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- OUString("com.sun.star.comp.avmedia.Manager_OpenGL" ),
+ "com.sun.star.comp.avmedia.Manager_OpenGL",
create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) );
}
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 2aaf3b8..51b66d4 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -414,7 +414,7 @@ bool ModulWindow::LoadBasic()
xFP->setDisplayDirectory ( aCurPath );
xFP->appendFilter( "BASIC" , "*.bas" );
- xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) );
+ xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All );
xFP->setCurrentFilter( "BASIC" );
if( xFP->execute() == RET_OK )
@@ -465,7 +465,7 @@ bool ModulWindow::SaveBasicSource()
xFP->setDisplayDirectory ( aCurPath );
xFP->appendFilter( "BASIC", "*.bas" );
- xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) );
+ xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All );
xFP->setCurrentFilter( "BASIC" );
if( xFP->execute() == RET_OK )
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 83493ec..782dc1a 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -685,11 +685,11 @@ bool DialogWindow::SaveDialog()
if ( !aCurPath.isEmpty() )
xFP->setDisplayDirectory ( aCurPath );
- xFP->setDefaultName( OUString( GetName() ) );
+ xFP->setDefaultName( GetName() );
OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
- xFP->appendFilter( aDialogStr, OUString( "*.xdl" ) );
- xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) );
+ xFP->appendFilter( aDialogStr, "*.xdl" );
+ xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All );
xFP->setCurrentFilter( aDialogStr );
if( xFP->execute() == RET_OK )
@@ -933,8 +933,8 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script
xFP->setDisplayDirectory ( aCurPath );
OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
- xFP->appendFilter( aDialogStr, OUString( "*.xdl" ) );
- xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) );
+ xFP->appendFilter( aDialogStr, "*.xdl" );
+ xFP->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), FilterMask_All );
xFP->setCurrentFilter( aDialogStr );
if( xFP->execute() == RET_OK )
@@ -1283,7 +1283,7 @@ void DialogWindow::StoreData()
Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
- xLib->replaceByName( OUString( GetName() ), makeAny( xISP ) );
+ xLib->replaceByName( GetName(), makeAny( xISP ) );
}
}
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 3f64566..c6bb548 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -201,7 +201,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl()
if( xContext.is() )
{
xContext->getValueByName(
- OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) )
+ "/singletons/com.sun.star.reflection.theTypeDescriptionManager" )
>>= xAccess;
OSL_ENSURE( xAccess.is(), "### TypeDescriptionManager singleton not accessible!?" );
}
@@ -1726,7 +1726,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass)
if ( xInv.is() )
{
OUString sTypeName;
- xInv->getValue( OUString( "$GetTypeName" ) ) >>= sTypeName;
+ xInv->getValue( "$GetTypeName" ) >>= sTypeName;
if ( sTypeName.isEmpty() || sTypeName == "IDispatch" )
{
// can't check type, leave it pass
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
index 24e90d9..eefff5d 100644
--- a/basic/source/runtime/comenumwrapper.cxx
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -31,7 +31,7 @@ sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
if ( m_xInvocation.is() )
{
sal_Int32 nLength = 0;
- bResult = ( ( m_xInvocation->getValue( OUString("length" ) ) >>= nLength ) && nLength > m_nCurInd );
+ bResult = ( ( m_xInvocation->getValue( "length" ) >>= nLength ) && nLength > m_nCurInd );
}
}
catch(const uno::Exception& )
@@ -55,7 +55,7 @@ uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
aArgs[0] <<= m_nCurInd++;
- return m_xInvocation->invoke( OUString("item"),
+ return m_xInvocation->invoke( "item",
aArgs,
aNamedParamIndex,
aNamedParam );
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 7958051..e2b978b 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -293,7 +293,7 @@ bool hasUno()
{
Reference< XUniversalContentBroker > xManager = UniversalContentBroker::create(xContext);
- if ( !( xManager->queryContentProvider( OUString("file:///" ) ).is() ) )
+ if ( !( xManager->queryContentProvider( "file:///" ).is() ) )
{
// No UCB
bRetVal = false;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6c396ae..0a44213 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3884,7 +3884,7 @@ OUString getObjectTypeName( SbxVariable* pVar )
{
try
{
- xInv->getValue( OUString( "$GetTypeName" ) ) >>= sRet;
+ xInv->getValue( "$GetTypeName" ) >>= sRet;
}
catch(const Exception& )
{
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 9766d74..be8cd6a 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -384,7 +384,7 @@ Reference< css::resource::XStringResourcePersistence >
return xRet;
}
- xRet = resource::StringResourceWithStorage::create(mxContext, xLibraryStor, bReadOnly, aLocale, OUString(aResourceFileNameBase), aComment);
+ xRet = resource::StringResourceWithStorage::create(mxContext, xLibraryStor, bReadOnly, aLocale, aResourceFileNameBase, aComment);
}
else
{
@@ -392,7 +392,7 @@ Reference< css::resource::XStringResourcePersistence >
// TODO: Real handler?
Reference< task::XInteractionHandler > xDummyHandler;
- xRet = resource::StringResourceWithLocation::create(mxContext, aLocation, bReadOnly, aLocale, OUString(aResourceFileNameBase), aComment, xDummyHandler);
+ xRet = resource::StringResourceWithLocation::create(mxContext, aLocation, bReadOnly, aLocale, aResourceFileNameBase, aComment, xDummyHandler);
}
return xRet;
@@ -539,7 +539,7 @@ void SfxDialogLibrary::storeResourcesToURL( const OUString& URL,
if( m_xStringResourcePersistence.is() )
{
m_xStringResourcePersistence->storeToURL
- ( URL, OUString(aResourceFileNameBase), aComment, xHandler );
+ ( URL, aResourceFileNameBase, aComment, xHandler );
}
}
@@ -551,7 +551,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const css::uno::Reference< css::
if( m_xStringResourcePersistence.is() )
{
m_xStringResourcePersistence->storeToStorage
- ( xStorage, OUString(aResourceFileNameBase), aComment );
+ ( xStorage, aResourceFileNameBase, aComment );
}
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 6996ab1..30f551b 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3450,7 +3450,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript
try
{
Reference< XExtensionManager > xManager = ExtensionManager::get( m_xContext );
- m_aUserPackagesSeq = xManager->getDeployedExtensions(OUString("user"),
+ m_aUserPackagesSeq = xManager->getDeployedExtensions("user",
Reference< task::XAbortChannel >(),
Reference< ucb::XCommandEnvironment >() );
}
@@ -3505,7 +3505,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
try
{
Reference< XExtensionManager > xSharedManager = ExtensionManager::get( m_xContext );
- m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions(OUString("shared"),
+ m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions("shared",
Reference< task::XAbortChannel >(),
Reference< ucb::XCommandEnvironment >() );
}
@@ -3559,7 +3559,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr
try
{
Reference< XExtensionManager > xManager = ExtensionManager::get( m_xContext );
- m_aBundledPackagesSeq = xManager->getDeployedExtensions(OUString("bundled"),
+ m_aBundledPackagesSeq = xManager->getDeployedExtensions("bundled",
Reference< task::XAbortChannel >(),
Reference< ucb::XCommandEnvironment >() );
}
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 819d255..6aaba78 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -590,7 +590,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
- xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag;
+ xTextDocumentPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
bool bEmbeddings = false;
const char* testEmbeddedFileNames[3] = {"word/embeddings/Microsoft_Excel_Worksheet3.xlsx",
@@ -1115,7 +1115,7 @@ void Chart2ExportTest::testEmbeddingsOleObjectGrabBag()
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
- xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag;
+ xTextDocumentPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
bool bEmbeddings = false;
const char* testEmbeddedFileNames[1] = {"word/embeddings/oleObject1.bin"};
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index 976cd4f..fc63b11 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -71,7 +71,7 @@ uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDa
{
::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
- xProp->getPropertyValue( OUString("DataRowSource") ) >>= aDataRowSource;
+ xProp->getPropertyValue( "DataRowSource" ) >>= aDataRowSource;
bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
}
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 1fb9a57..4f301e4 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -195,8 +195,7 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere
uno::Reference< chart2::data::XDataSequence > xSequence( aSequences[nI]->getValues());
uno::Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW );
OUString aRole;
- if( ( xSeqProp->getPropertyValue(
- OUString( "Role" )) >>= aRole ) &&
+ if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) &&
aRole.match( aRolePrefix ) && aRole.indexOf(aDirection) >= 0 )
{
return xSequence->getSourceRangeRepresentation();
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index fa86241..09e93dd 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -80,12 +80,12 @@ const uno::Reference < embed::XStorage >& EmbedImpl::GetReplacements()
try
{
mxImageStorage = mxStorage->openStorageElement(
- OUString("ObjectReplacements"), embed::ElementModes::READWRITE );
+ "ObjectReplacements", embed::ElementModes::READWRITE );
}
catch (const uno::Exception&)
{
mxImageStorage = mxStorage->openStorageElement(
- OUString("ObjectReplacements"), embed::ElementModes::READ );
+ "ObjectReplacements", embed::ElementModes::READ );
}
}
@@ -1282,7 +1282,7 @@ namespace {
try
{
uno::Reference< embed::XStorage > xPictures = xDocStor->openStorageElement(
- OUString( "Pictures" ),
+ "Pictures",
embed::ElementModes::READWRITE );
uno::Reference< io::XStream > xObjReplStr = xPictures->openStreamElement(
aStreamName,
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 6dc3e21..c927c7e 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -532,8 +532,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString&
OUString aEntryDocName;
if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
- && ( xObjectProps->getByName(
- OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
+ && ( xObjectProps->getByName( "ObjectDocumentServiceName" ) >>= aEntryDocName )
&& aEntryDocName == aDocName )
{
xObjectProps->getByName("ObjectFactory") >>= aResult;
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index daffd7c..c9c2811 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -155,8 +155,7 @@ namespace comphelper
Reference< XResourceBundleLoader > xLoader;
try
{
- Any aValue( m_xContext->getValueByName(
- OUString( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ) );
+ Any aValue( m_xContext->getValueByName( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) );
OSL_VERIFY( aValue >>= xLoader );
}
catch( const Exception& )
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 7ba751c..01d3efb 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -281,9 +281,7 @@ void OfficeInstallationDirectories::initDirs()
uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx);
- *m_pOfficeBrandDir =
- xExpander->expandMacros(
- OUString( "$BRAND_BASE_DIR" ) );
+ *m_pOfficeBrandDir = xExpander->expandMacros( "$BRAND_BASE_DIR" );
OSL_ENSURE( !m_pOfficeBrandDir->isEmpty(),
"Unable to obtain office brand installation directory!" );
@@ -292,7 +290,7 @@ void OfficeInstallationDirectories::initDirs()
*m_pUserDir =
xExpander->expandMacros(
- OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) );
+ "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" );
OSL_ENSURE( !m_pUserDir->isEmpty(),
"Unable to obtain office user data directory!" );
diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx
index f9b3f5a..79d7c61 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -11,6 +11,7 @@
#include <limits>
#include <stack>
#include <string>
+#include <iostream>
#include "compat.hxx"
#include "plugin.hxx"
@@ -104,6 +105,8 @@ private:
void handleOUStringCtor(
CallExpr const * expr, unsigned arg, std::string const & qname);
+ void handleOUStringCtor2(
+ CallExpr const * expr, unsigned arg, std::string const & qname);
std::stack<Expr const *> calls_;
};
@@ -546,6 +549,12 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
TreatEmpty::Error);
return true;
}
+ // For places where we are calling a method with a 'const OUString&' param
+ for (unsigned i=0; i < fdecl->getNumParams(); ++i)
+ {
+ if (fdecl->getParamDecl(i)->getType().getAsString() == "const ::rtl::OUString &")
+ handleOUStringCtor2(expr, i, qname);
+ }
return true;
}
@@ -1283,6 +1292,40 @@ void StringConstant::handleOUStringCtor(
<< qname << expr->getSourceRange();
}
+// For places where we are calling a method with an 'const OUString&' param
+//
+void StringConstant::handleOUStringCtor2(
+ CallExpr const * expr, unsigned arg, std::string const & qname)
+{
+ auto e0 = expr->getArg(arg)->IgnoreParenImpCasts();
+ auto e1 = dyn_cast<CXXFunctionalCastExpr>(e0);
+ if (e1 == nullptr) {
+ return;
+ }
+ e0 = e1->getSubExpr()->IgnoreParenImpCasts();
+ auto e2 = dyn_cast<CXXBindTemporaryExpr>(e0);
+ if (e2 == nullptr) {
+ return;
+ }
+ auto e3 = dyn_cast<CXXConstructExpr>(
+ e2->getSubExpr()->IgnoreParenImpCasts());
+ if (e3 == nullptr) {
+ return;
+ }
+ if (e3->getNumArgs() == 1)
+ {
+ std::string s = e3->getArg(0)->getType().getAsString();
+ if (s == "sal_Unicode" || s == "char")
+ return;
+ }
+ report(
+ DiagnosticsEngine::Warning,
+ ("in call of %0, replace OUString constructed from a string literal"
+ " directly with the string literal"),
+ e3->getExprLoc())
+ << qname << expr->getSourceRange();
+}
+
loplugin::Plugin::Registration< StringConstant > X("stringconstant", true);
}
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index b2a5a21..4195b7b 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -156,8 +156,7 @@ void RecursiveTest::test()
OUString("/org.openoffice.Office.UI.GenericCommands/UserInterface/Commands/"
".uno:WebHtml")),
css::uno::UNO_QUERY_THROW);
- properties_->addPropertyChangeListener(
- OUString("Label"), this);
+ properties_->addPropertyChangeListener("Label", this);
step();
CPPUNIT_ASSERT(count_ == 0);
css::uno::Reference< css::lang::XComponent >(
@@ -276,12 +275,9 @@ void Test::testSetSetMemberName()
"Commands")),
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNamed > member;
- access->getByName(
- OUString(".uno:FontworkGalleryFloater")) >>=
- member;
+ access->getByName(".uno:FontworkGalleryFloater") >>= member;
CPPUNIT_ASSERT(member.is());
- member->setName(
- OUString(".uno:FontworkShapeType"));
+ member->setName(".uno:FontworkShapeType");
css::uno::Reference< css::util::XChangesBatch >(
access, css::uno::UNO_QUERY_THROW)->commitChanges();
css::uno::Reference< css::lang::XComponent >(
@@ -347,12 +343,9 @@ void Test::testReadCommands()
css::uno::Reference< css::container::XNameAccess > child;
if (access->getByName(names[j]) >>= child) {
CPPUNIT_ASSERT(child.is());
- child->getByName(
- OUString("Label"));
- child->getByName(
- OUString("ContextLabel"));
- child->getByName(
- OUString("Properties"));
+ child->getByName("Label");
+ child->getByName("ContextLabel");
+ child->getByName("Properties");
}
}
}
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 0a1e125..d970f03 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -755,7 +755,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
OUString aLocation;
Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey(
- OUString("/UNO/ACTIVATOR") );
+ "/UNO/ACTIVATOR" );
if( xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
{
aActivatorUrl = xActivatorKey->getAsciiValue();
@@ -765,7 +765,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
aActivatorName = tmpActivator.getToken(0, ':', nIndex );
Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey(
- OUString("/UNO/LOCATION") );
+ "/UNO/LOCATION" );
if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
aLocation = xLocationKey->getAsciiValue();
}
@@ -774,7 +774,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
// old style"url"
// the location of the program code of the implementation
Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey(
- OUString("/UNO/URL") );
+ "/UNO/URL" );
// is the key of the right type ?
if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
{
@@ -819,8 +819,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
// not yet loaded
try
{
- Reference<XRegistryKey > xKey = xImplementationKey->openKey(
- OUString("UNO/SERVICES") );
+ Reference<XRegistryKey > xKey = xImplementationKey->openKey( "UNO/SERVICES" );
if (xKey.is())
{
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 3c8340b..623770e 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3478,8 +3478,7 @@ void ToolbarSaveInData::SetSystemStyle(
uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY );
if ( xPropSet.is() )
{
- uno::Any a = xPropSet->getPropertyValue(
- OUString( "LayoutManager" ) );
+ uno::Any a = xPropSet->getPropertyValue( "LayoutManager" );
a >>= xLayoutManager;
}
@@ -3990,7 +3989,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar )
if ( pToolbar->IsUserDefined() )
{
xProps->setPropertyValue(
- OUString(ITEM_DESCRIPTOR_UINAME ),
+ ITEM_DESCRIPTOR_UINAME,
uno::makeAny( OUString( pToolbar->GetName() ) ) );
}
@@ -4038,7 +4037,7 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar )
xPropertySet( xSettings, uno::UNO_QUERY );
xPropertySet->setPropertyValue(
- OUString(ITEM_DESCRIPTOR_UINAME ),
+ ITEM_DESCRIPTOR_UINAME,
uno::makeAny( pToolbar->GetName() ) );
try
@@ -5046,8 +5045,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
uno::Reference< beans::XPropertySet > props =
m_xGraphProvider->queryGraphicDescriptor( aMediaProps );
- uno::Any a = props->getPropertyValue(
- OUString("SizePixel") );
+ uno::Any a = props->getPropertyValue( "SizePixel" );
a >>= aSize;
if (0 == aSize.Width || 0 == aSize.Height)
return false;
@@ -5223,8 +5221,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
uno::Reference< beans::XPropertySet > props =
m_xGraphProvider->queryGraphicDescriptor( aMediaProps );
- uno::Any a = props->getPropertyValue(
- OUString("SizePixel") );
+ uno::Any a = props->getPropertyValue("SizePixel");
xGraphic = m_xGraphProvider->queryGraphic( aMediaProps );
if ( xGraphic.is() )
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 173a9ec..115dcab 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -759,14 +759,12 @@ void SvxConfigGroupListBox::GroupSelected()
continue;
}
- Any value = xPropSet->getPropertyValue(
- OUString("URI"));
+ Any value = xPropSet->getPropertyValue("URI");
value >>= uri;
try
{
- value = xPropSet->getPropertyValue(
- OUString("Description"));
+ value = xPropSet->getPropertyValue("Description");
value >>= description;
}
catch (Exception &) {
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 247cea9..06a8ba2 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -350,7 +350,7 @@ bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
uno::Sequence< beans::PropertyValue > aArg(1);
aArg.getArray()[0].Name = "Hidden";
aArg.getArray()[0].Value <<= true;
- xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg );
+ xComp = xLoader->loadComponentFromURL( aURL, "_blank", 0, aArg );
}
catch( const io::IOException& )
{
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 6c8a7b5..bade98c 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -117,7 +117,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void)
{
xFilePicker->appendFilter(
OUString(),
- OUString( "*.*" )
+ "*.*"
);
}
catch( const IllegalArgumentException& )
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 52c58ba..e4811b9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -600,8 +600,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const
if( !xNameReplace.is() )
return;
- xNameReplace->replaceByName( OUString("ForceSafeServiceImpl"),
- makeAny(!_bEnabled) );
+ xNameReplace->replaceByName( "ForceSafeServiceImpl", makeAny(!_bEnabled) );
Reference< XChangesBatch > xChangesBatch(
mxForceFlagNameAccess, UNO_QUERY );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 036caaa..3f42273 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -660,13 +660,13 @@ bool Desktop::QueryExit()
Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW);
- xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(true) );
+ xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(true) );
bool bExit = xDesktop->terminate();
if ( !bExit )
{
- xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(false) );
+ xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(false) );
}
else if (!Application::IsEventTestingModeEnabled())
{
@@ -1941,8 +1941,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
{
try
{
- Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/swriter"),
- OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+ Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/swriter",
+ "_blank", 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const css::uno::Exception& )
@@ -1953,8 +1953,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
{
try
{
- Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/scalc"),
- OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+ Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/scalc",
+ "_blank", 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const css::uno::Exception& )
@@ -1965,8 +1965,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
{
try
{
- Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/sdraw"),
- OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+ Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/sdraw",
+ "_blank", 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const css::uno::Exception& )
@@ -1977,8 +1977,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
{
try
{
- Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/simpress"),
- OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+ Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/simpress",
+ "_blank", 0, args ), UNO_QUERY_THROW );
xDoc->close( sal_False );
}
catch ( const css::uno::Exception& )
@@ -2099,9 +2099,7 @@ void Desktop::PreloadConfigurationData()
css::frame::thePopupMenuControllerFactory::get( xContext );
try
{
- (void)xPopupMenuControllerFactory->hasController(
- OUString( ".uno:CharFontName" ),
- OUString() );
+ (void)xPopupMenuControllerFactory->hasController( ".uno:CharFontName", OUString() );
}
catch ( const css::uno::Exception& )
{
@@ -2207,7 +2205,7 @@ void Desktop::OpenClients()
OUString aDefault( "0" );
OUString aPreloadData;
- aPerfTuneIniFile.getFrom( OUString( "QuickstartPreloadConfiguration" ), aPreloadData, aDefault );
+ aPerfTuneIniFile.getFrom( "QuickstartPreloadConfiguration", aPreloadData, aDefault );
if ( aPreloadData == "1" )
{
if ( rArgs.IsWriter() ||
@@ -2526,7 +2524,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
{
// no visible task that could be activated found
Reference< css::awt::XWindow > xContainerWindow;
- Reference< XFrame > xBackingFrame = xDesktop->findFrame(OUString( "_blank" ), 0);
+ Reference< XFrame > xBackingFrame = xDesktop->findFrame( "_blank", 0);
if (xBackingFrame.is())
xContainerWindow = xBackingFrame->getContainerWindow();
if (xContainerWindow.is())
@@ -2696,7 +2694,7 @@ void Desktop::OpenSplashScreen()
UNO_QUERY);
if(m_rSplashScreen.is())
- m_rSplashScreen->start(OUString("SplashScreen"), 100);
+ m_rSplashScreen->start("SplashScreen", 100);
}
}
@@ -2732,7 +2730,7 @@ void Desktop::DoFirstRunInitializations()
try
{
Reference< XJobExecutor > xExecutor = theJobExecutor::get( ::comphelper::getProcessComponentContext() );
- xExecutor->trigger( OUString("onFirstRunInitialization") );
+ xExecutor->trigger( "onFirstRunInitialization" );
}
catch(const css::uno::Exception&)
{
@@ -2752,7 +2750,7 @@ void Desktop::ShowBackingComponent(Desktop * progress)
{
progress->SetSplashScreenProgress(60);
}
- Reference< XFrame > xBackingFrame = xDesktop->findFrame(OUString( "_blank" ), 0);
+ Reference< XFrame > xBackingFrame = xDesktop->findFrame( "_blank", 0);
Reference< css::awt::XWindow > xContainerWindow;
if (xBackingFrame.is())
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 45d30f5..103355a 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -512,7 +512,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
OUString aDefault( "0" );
OUString aPreloadData;
- aPerfTuneIniFile.getFrom( OUString( "FastPipeCommunication" ), aPreloadData, aDefault );
+ aPerfTuneIniFile.getFrom( "FastPipeCommunication", aPreloadData, aDefault );
OUString aUserInstallPathHashCode;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index cd34cd4..85fbabb 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -35,7 +35,7 @@
#include "dp_update.hxx"
#define USER_PACKAGE_MANAGER OUString("user")
-#define SHARED_PACKAGE_MANAGER OUString("shared")
+#define SHARED_PACKAGE_MANAGER "shared"
using namespace ::com::sun::star;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b81a6f8..bcc215b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -436,7 +436,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
uno::Reference<lang::XComponent> xComponent;
xComponent = xComponentLoader->loadComponentFromURL(
- aURL, OUString("_blank"), 0,
+ aURL, "_blank", 0,
aFilterOptions);
if (!xComponent.is())
@@ -1464,7 +1464,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback, pLib);
if (pUserProfilePath)
- rtl::Bootstrap::set(OUString("UserInstallation"), OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8));
+ rtl::Bootstrap::set("UserInstallation", OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8));
OUString aAppPath;
if (pAppPath)
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 2320851..5d43c9b 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -249,10 +249,8 @@ Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
UNO_QUERY );
if ( rNamingService.is() )
{
- rNamingService->registerObject(
- OUString("StarOffice.ServiceManager" ), m_rContext->getServiceManager() );
- rNamingService->registerObject(
- OUString("StarOffice.ComponentContext" ), m_rContext );
+ rNamingService->registerObject( "StarOffice.ServiceManager", m_rContext->getServiceManager() );
+ rNamingService->registerObject( "StarOffice.ComponentContext", m_rContext );
rInstance = rNamingService;
}
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index eac18d4..5b51a53 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -441,9 +441,7 @@ Reference<XComponentContext> getUNO(
{
// do not create any user data (for the root user) in --shared mode:
if (shared) {
- rtl::Bootstrap::set(
- OUString("CFG_CacheUrl"),
- OUString());
+ rtl::Bootstrap::set("CFG_CacheUrl", OUString());
}
// hold lock during process runtime:
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 5d1d7e2..576cbcf 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -604,7 +604,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
aArgs[3].Name = "HierarchicalDocumentName";
aArgs[3].Value <<= aHierarchName;
- xStorable->storeToURL( OUString( "private:stream" ), aArgs );
+ xStorable->storeToURL( "private:stream", aArgs );
try
{
xTempOut->closeOutput();
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6c8f7b0..6015075 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -532,7 +532,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
if( xUIConfigManager.is())
{
xResult = xUIConfigManager->getSettings(
- OUString( "private:resource/menubar/menubar" ),
+ "private:resource/menubar/menubar",
sal_False );
}
}
@@ -554,7 +554,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
xModConfSupplier->getUIConfigurationManager( aModuleIdent ),
uno::UNO_QUERY_THROW );
xResult = xModUIConfMan->getSettings(
- OUString( "private:resource/menubar/menubar" ),
+ "private:resource/menubar/menubar",
sal_False );
}
}
@@ -652,8 +652,7 @@ bool DocumentHolder::MergeMenus_Impl( const uno::Reference< css::frame::XLayoutM
try
{
uno::Reference< css::ui::XUIElementSettings > xUISettings(
- xContLM->getElement(
- OUString( "private:resource/menubar/menubar" ) ),
+ xContLM->getElement( "private:resource/menubar/menubar" ),
uno::UNO_QUERY_THROW );
uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True );
if ( !xContMenu.is() )
@@ -981,7 +980,7 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
sUrl = "private:object";
xComponentLoader->loadComponentFromURL( sUrl,
- OUString( "_self" ),
+ "_self",
0,
aArgs.getPropertyValues() );
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 732cac6..1a0c7f2 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -113,7 +113,7 @@ Interceptor::dispatch(
}
uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
- URL, OUString( "_self" ), 0 );
+ URL, "_self", 0 );
if ( xDispatch.is() )
xDispatch->dispatch( URL, aNewArgs );
}
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index b880d22..53e2d0b 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -133,7 +133,7 @@ bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL(
aFileURL,
- OUString( "_blank" ),
+ "_blank",
0,
aArgs ),
uno::UNO_QUERY );
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index f39b128..5d1ee22 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -899,7 +899,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory(
{
Reference< XSingleServiceFactory > xFactory( createOneInstanceFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
- OUString( IMPLNAME ),
+ IMPLNAME,
::comp_EventAttacher::EventAttacherImpl_CreateInstance,
::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static() ) );
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 9f72100..da41d10 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -146,7 +146,7 @@ namespace abp
if (xNewDataSource.is())
{
xNewDataSource->setPropertyValue(
- OUString( "URL" ),
+ "URL",
makeAny( OUString::createFromAscii( _pInitialAsciiURL ) )
);
}
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 15219b9..1a7c264 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -77,7 +77,7 @@ namespace abp
try
{
// check whether Evolution is available
- Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:evolution:local")) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL("sdbc:address:evolution:local") );
if ( xDriver.is() )
bHaveEvolution = true;
}
@@ -88,7 +88,7 @@ namespace abp
// check whether KDE address book is available
try
{
- Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:kab")) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL("sdbc:address:kab") );
if ( xDriver.is() )
bHaveKab = true;
}
@@ -99,7 +99,7 @@ namespace abp
try
{
// check whether Mac OS X address book is available
- Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:macab")) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL("sdbc:address:macab") );
if ( xDriver.is() )
bHaveMacab = true;
}
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 78aa2a4..8717542 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -322,7 +322,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt
}
if ( xLayoutManager.is() )
- xLayoutManager->createElement( OUString( "private:resource/menubar/menubar" ));
+ xLayoutManager->createElement( "private:resource/menubar/menubar" );
}
BibDataManager* BibliographyLoader::GetDataManager()const
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 18a56c1..f758757 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -654,7 +654,7 @@ namespace dbp
{
OUString sControlLabel(_pSettings->sControlLabel);
m_aContext.xObjectModel->setPropertyValue(
- OUString("Label"),
+ "Label",
makeAny(sControlLabel)
);
}
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 1126cb4..65e9bbf 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -282,7 +282,7 @@ namespace pcr
_rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE );
_rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE );
- _rxInspectorUI->showCategory( OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT );
+ _rxInspectorUI->showCategory( "Data", nTextType != TEXTTYPE_RICHTEXT );
}
break;
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 4aff1ef..333fee9 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -247,8 +247,8 @@ namespace pcr
aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing();
Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL(
- OUString( ".component:DB/QueryDesign" ),
- OUString( "_self" ),
+ ".component:DB/QueryDesign",
+ "_self",
FrameSearchFlag::TASKS | FrameSearchFlag::CREATE,
aArgs
);
@@ -295,7 +295,7 @@ namespace pcr
Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext);
Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW );
- xFrame = xDesktop->findFrame( OUString( "_blank" ), FrameSearchFlag::CREATE );
+ xFrame = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE );
OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" );
xDesktopFramesCollection->remove( xFrame );
}
@@ -332,7 +332,7 @@ namespace pcr
Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) );
Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW );
- Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, OUString( "_top" ), FrameSearchFlag::SELF ) );
+ Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, "_top", FrameSearchFlag::SELF ) );
OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" );
if ( xDispatch.is() )
{
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index a453cac..8388e52 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -1096,7 +1096,7 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape
if(mXPropSet.is())
{
- const Any aAny = mXPropSet->getPropertyValue(OUString("Transformation"));
+ const Any aAny = mXPropSet->getPropertyValue("Transformation");
if(aAny.hasValue())
{
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index f9ba4cb..0e82712 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -900,7 +900,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
sal_Int32 nTotalPageCount = aRangeEnum.size();
if ( bSecondPassForImpressNotes )
nTotalPageCount *= 2;
- mxStatusIndicator->start( OUString( ResId( PDF_PROGRESS_BAR, *pResMgr ) ), nTotalPageCount );
+ mxStatusIndicator->start( ResId( PDF_PROGRESS_BAR, *pResMgr ), nTotalPageCount );
}
}
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index 0ac63a4..de4d562 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -301,7 +301,7 @@ bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOut
if(xStatusIndicator.is())
{
- xStatusIndicator->start(OUString( "PlaceWare:" ),xDrawPages->getCount());
+ xStatusIndicator->start( "PlaceWare:", xDrawPages->getCount());
}
Reference< XDrawPage > xDrawPage;
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index c689a2c..79ce867 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -522,7 +522,7 @@ void T602ImportFilter::inschrdef(unsigned char ch)
pst.waspar = false;
if (mxHandler.is())
- mxHandler->characters(OUString(xch));
+ mxHandler->characters(xch);
}
void T602ImportFilter::wrtfnt()
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index f0eb7e4..4290eaa 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -77,7 +77,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
if (xStatusIndicator.is()){
- xStatusIndicator->start(OUString( "Loading :" ),nProgressRange);
+ xStatusIndicator->start( "Loading :",nProgressRange);
}
OUString sXMLImportService ( udImport );
@@ -102,8 +102,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue(
- OUString( "BaseURI" ), makeAny( aBaseURI ));
+ xInfoSet->setPropertyValue( "BaseURI", makeAny( aBaseURI ));
aAnys[0] <<= xInfoSet;
@@ -199,7 +198,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property
utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
if (xStatusIndicator.is())
- xStatusIndicator->start(OUString( "Saving :" ),nProgressRange);
+ xStatusIndicator->start( "Saving :",nProgressRange);
// Set up converter bridge.
Reference< css::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY);
@@ -258,13 +257,11 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property
Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue(
- OUString( "UsePrettyPrinting" ), makeAny( bPrettyPrint ));
+ xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint ));
xInfoSet->setPropertyValue(
- OUString( "ExportTextNumberElement" ),
+ "ExportTextNumberElement",
makeAny( bExportTextNumberElementForListItems ));
- xInfoSet->setPropertyValue(
- OUString( "BaseURI" ), makeAny( aBaseURI ));
+ xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI ));
aAnys[1] <<= xInfoSet;
Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 403debb..dc478ce 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -255,7 +255,7 @@ namespace XSLT
css::uno::Reference<XStringSubstitution>
subs(css::util::PathSubstitution::create(m_xContext));
- OUString aWorkingDir(subs->getSubstituteVariableValue(OUString( "$(progurl)")));
+ OUString aWorkingDir(subs->getSubstituteVariableValue( "$(progurl)" ));
INetURLObject aObj(aWorkingDir);
aObj.setFinalSlash();
bool bWasAbsolute;
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 5d1aecc..21a9f7f 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -401,8 +401,7 @@ namespace frm
{
// forward to our aggregate, so the EditEngine knows about it
if ( m_xAggregateSet.is() )
- m_xAggregateSet->setPropertyValue(
- OUString( "WritingMode" ), _rValue );
+ m_xAggregateSet->setPropertyValue( "WritingMode", _rValue );
}
break;
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index b918a53..f4ac1b1 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -12,7 +12,7 @@
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
+ * License, Version 2.0 (the "License"; you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index 6478811..f5b0d98 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -36,7 +36,7 @@ extern std::list<Node*> nodelist;
#define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(false)
#define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(false)
#define rchars(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(false)
-#define runistr(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x)); } while(false)
+#define runistr(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(false)
#define reucstr(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(OUString(x,y, RTL_TEXTENCODING_EUC_KR)); } while(false)
#define padd(x,y,z) pList->addAttribute(x,y,z)
#else
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 13bd651..ae0e900 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -40,7 +40,7 @@
#endif
// To be shorten source code by realking
-#define hconv(x) OUString(hstr2ucsstr(x).c_str())
+#define hconv(x) hstr2ucsstr(x).c_str()
#define ascii(x) OUString::createFromAscii(x)
#define rstartEl(x,y) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startElement(x,y); } while(false)
#define rendEl(x) do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(false)
@@ -2700,7 +2700,7 @@ char *HwpReader::getPStyleName(int index, char *_buf)
void HwpReader::makeChars(hchar_string & rStr)
{
- rchars(OUString(rStr.c_str()));
+ rchars(rStr.c_str());
rStr.clear();
}
@@ -3132,31 +3132,31 @@ void HwpReader::makeFieldCode(hchar_string & rStr, FieldCode *hbox)
padd("text:description", sXML_CDATA, hconv(field));
rstartEl( "text:placeholder", rList);
pList->clear();
- rchars( OUString(rStr.c_str()));
+ rchars( rStr.c_str() );
rendEl( "text:placeholder" );
}
/* Document Summary */
else if( hbox->type[0] == 3 && hbox->type[1] == 0 )
{
- if (hconv(hbox->str3) == "title")
+ if (OUString(hconv(hbox->str3)) == "title")
{
rstartEl( "text:title", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:title" );
}
- else if (hconv(hbox->str3) == "subject")
+ else if (OUString(hconv(hbox->str3)) == "subject")
{
rstartEl( "text:subject", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:subject" );
}
- else if (hconv(hbox->str3) == "author")
+ else if (OUString(hconv(hbox->str3)) == "author")
{
rstartEl( "text:author-name", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:author-name" );
}
- else if (hconv(hbox->str3) == "keywords")
+ else if (OUString(hconv(hbox->str3)) == "keywords")
{
rstartEl( "text:keywords", rList );
rchars( hconv(hbox->str2) );
@@ -3166,61 +3166,61 @@ void HwpReader::makeFieldCode(hchar_string & rStr, FieldCode *hbox)
/* Personal Information */
else if( hbox->type[0] == 3 && hbox->type[1] == 1 )
{
- if (hconv(hbox->str3) == "User")
+ if (OUString(hconv(hbox->str3)) == "User")
{
rstartEl( "text:sender-lastname", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-lastname" );
}
- else if (hconv(hbox->str3) == "Company")
+ else if (OUString(hconv(hbox->str3)) == "Company")
{
rstartEl( "text:sender-company", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-company" );
}
- else if (hconv(hbox->str3) == "Position")
+ else if (OUString(hconv(hbox->str3)) == "Position")
{
rstartEl( "text:sender-title", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-title" );
}
- else if (hconv(hbox->str3) == "Division")
+ else if (OUString(hconv(hbox->str3)) == "Division")
{
rstartEl( "text:sender-position", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-position" );
}
- else if (hconv(hbox->str3) == "Fax")
+ else if (OUString(hconv(hbox->str3)) == "Fax")
{
rstartEl( "text:sender-fax", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-fax" );
}
- else if (hconv(hbox->str3) == "Pager")
+ else if (OUString(hconv(hbox->str3)) == "Pager")
{
rstartEl( "text:phone-private", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:phone-private" );
}
- else if (hconv(hbox->str3) == "E-mail")
+ else if (OUString(hconv(hbox->str3)) == "E-mail")
{
rstartEl( "text:sender-email", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-email" );
}
- else if (hconv(hbox->str3) == "Zipcode(office)")
+ else if (OUString(hconv(hbox->str3)) == "Zipcode(office)")
{
rstartEl( "text:sender-postal-code", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-postal-code" );
}
- else if (hconv(hbox->str3) == "Phone(office)")
+ else if (OUString(hconv(hbox->str3)) == "Phone(office)")
{
rstartEl( "text:sender-phone-work", rList );
rchars( hconv(hbox->str2) );
rendEl( "text:sender-phone-work" );
}
- else if (hconv(hbox->str3) == "Address(office)")
+ else if (OUString(hconv(hbox->str3)) == "Address(office)")
{
rstartEl( "text:sender-street", rList );
rchars( hconv(hbox->str2) );
@@ -4767,7 +4767,7 @@ void HwpReader::makeMailMerge(MailMerge * hbox)
void HwpReader::makeOutline(Outline * hbox)
{
if( hbox->kind == 1 )
- rchars(OUString(hbox->GetUnicode().c_str()));
+ rchars( hbox->GetUnicode().c_str() );
}
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 0a7e414..8292fab 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -263,9 +263,7 @@ OString BootParams::getClasspath()
{
OString sClassPath;
OUString sCP;
- if (Bootstrap::get()->getFrom(
- OUString(UNO_JAVA_JFW_CLASSPATH),
- sCP))
+ if (Bootstrap::get()->getFrom( UNO_JAVA_JFW_CLASSPATH, sCP ))
{
sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding());
SAL_INFO(
@@ -275,9 +273,7 @@ OString BootParams::getClasspath()
}
OUString sEnvCP;
- if (Bootstrap::get()->getFrom(
- OUString(UNO_JAVA_JFW_ENV_CLASSPATH),
- sEnvCP))
+ if (Bootstrap::get()->getFrom( UNO_JAVA_JFW_ENV_CLASSPATH, sEnvCP ))
{
char * pCp = getenv("CLASSPATH");
if (pCp)
@@ -336,10 +332,8 @@ OUString BootParams::getJREHome()
{
OUString sJRE;
OUString sEnvJRE;
- bool bJRE = Bootstrap::get()->getFrom(
- OUString(UNO_JAVA_JFW_JREHOME) ,sJRE);
- bool bEnvJRE = Bootstrap::get()->getFrom(
- OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE);
+ bool bJRE = Bootstrap::get()->getFrom(UNO_JAVA_JFW_JREHOME, sJRE);
+ bool bEnvJRE = Bootstrap::get()->getFrom(UNO_JAVA_JFW_ENV_JREHOME, sEnvJRE);
if (bJRE && bEnvJRE)
{
@@ -394,9 +388,7 @@ OUString BootParams::getJREHome()
OUString BootParams::getClasspathUrls()
{
OUString sParams;
- Bootstrap::get()->getFrom(
- OUString(UNO_JAVA_JFW_CLASSPATH_URLS),
- sParams);
+ Bootstrap::get()->getFrom( UNO_JAVA_JFW_CLASSPATH_URLS, sParams);
SAL_INFO(
"jfw.level2",
"Using bootstrap parameter " UNO_JAVA_JFW_CLASSPATH_URLS " = "
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index d176c3b..c2e1425 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -83,7 +83,7 @@ void TiledRenderingTest::runAllTests()
OUString aWorkdirRootPath = OUString::createFromAscii(pWorkdirRoot);
OUString aWorkdirRootURL = getFileURLFromSystemPath(aWorkdirRootPath);
OUString sUserInstallURL = aWorkdirRootURL + "/unittest";
- rtl::Bootstrap::set(OUString("UserInstallation"), sUserInstallURL);
+ rtl::Bootstrap::set("UserInstallation", sUserInstallURL);
std::unique_ptr< Office > pOffice( lok_cpp_init(
m_sLOPath.c_str() ) );
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 9c22264..13f195d 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -154,7 +154,7 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs )
{
// use '/' to representent the root of the zip package ( and provide a 'file' scheme to
// keep the XUriReference implementation happy )
- Reference< XUriReference > xBase = xFactory->parse( OUString("file:///") );
+ Reference< XUriReference > xBase = xFactory->parse( "file:///" );
Reference< XUriReference > xPart = xFactory->parse( rAttribs.getString( XML_Target, OUString() ) );
Reference< XUriReference > xAbs = xFactory->makeAbsolute( xBase, xPart, sal_True, RelativeUriExcessParentSegments_RETAIN );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d530701..93b78a8 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1124,8 +1124,8 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase )
} else
xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) );
- xSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) );
- xSet->setPropertyValue( OUString( "SizeProtect" ), Any( sal_True ) );
+ xSet->setPropertyValue( "MoveProtect", Any( sal_True ) );
+ xSet->setPropertyValue( "SizeProtect", Any( sal_True ) );
// Replace existing shapes with a new Graphic Object rendered
// from them
@@ -1203,10 +1203,10 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
Reference < lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW );
xShape = Reference < XShape > ( xServiceFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), UNO_QUERY_THROW );
Reference < XPropertySet > xPropSet( xShape, UNO_QUERY_THROW );
- xPropSet->setPropertyValue( OUString( "Graphic" ), Any( xGraphic ) );
- xPropSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) );
- xPropSet->setPropertyValue( OUString( "SizeProtect" ), Any( sal_True ) );
- xPropSet->setPropertyValue( OUString( "Name" ), Any( OUString( "RenderedShapes" ) ) );
+ xPropSet->setPropertyValue( "Graphic", Any( xGraphic ) );
+ xPropSet->setPropertyValue( "MoveProtect", Any( sal_True ) );
+ xPropSet->setPropertyValue( "SizeProtect", Any( sal_True ) );
+ xPropSet->setPropertyValue( "Name", Any( OUString( "RenderedShapes" ) ) );
}
catch( const Exception& e )
{
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 6783598..0c297a2 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1510,7 +1510,7 @@ void Output::newLine()
void Output::emptyLine( size_t nCount )
{
for( size_t nIdx = 0; nIdx < nCount; ++nIdx )
- mxStrm->writeString( OUString( '\n' ) );
+ mxStrm->writeString( OUString('\n') );
}
void Output::incIndent()
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index ecf16b7..f823c27 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -144,8 +144,7 @@ public:
OUString aRole;
return ( xProp.is() &&
- (xProp->getPropertyValue(
- OUString( "Role" ) ) >>= aRole ) &&
+ (xProp->getPropertyValue( "Role" ) >>= aRole ) &&
m_aRole.equals( aRole ));
}
@@ -707,8 +706,7 @@ void ChartExport::_ExportContent()
Reference< lang::XServiceInfo > xServ( xChartDoc, uno::UNO_QUERY );
if( xServ.is())
{
- if( xServ->supportsService(
- OUString("com.sun.star.chart.ChartTableAddressSupplier")))
+ if( xServ->supportsService("com.sun.star.chart.ChartTableAddressSupplier"))
{
Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY );
if( xProp.is())
@@ -717,8 +715,7 @@ void ChartExport::_ExportContent()
try
{
OUString sChartAddress;
- aAny = xProp->getPropertyValue(
- OUString("ChartRangeAddress"));
+ aAny = xProp->getPropertyValue("ChartRangeAddress");
aAny >>= msChartAddress;
//maExportHelper.SetChartRangeAddress( sChartAddress );
@@ -795,8 +792,7 @@ void ChartExport::exportExternalData( Reference< css::chart::XChartDocument > xC
{
try
{
- Any aAny( xDocPropSet->getPropertyValue(
- OUString( "ExternalData" )));
+ Any aAny( xDocPropSet->getPropertyValue( "ExternalData" ));
aAny >>= externalDataPath;
}
catch( beans::UnknownPropertyException & )
@@ -849,14 +845,11 @@ void ChartExport::exportChart( Reference< css::chart::XChartDocument > xChartDoc
try
{
bool bHasSubTitle = false;
- Any aAny( xDocPropSet->getPropertyValue(
- OUString( "HasMainTitle" )));
+ Any aAny( xDocPropSet->getPropertyValue("HasMainTitle"));
aAny >>= bHasMainTitle;
- aAny = xDocPropSet->getPropertyValue(
- OUString( "HasSubTitle" ));
+ aAny = xDocPropSet->getPropertyValue("HasSubTitle");
aAny >>= bHasSubTitle;
- aAny = xDocPropSet->getPropertyValue(
- OUString( "HasLegend" ));
+ aAny = xDocPropSet->getPropertyValue("HasLegend");
aAny >>= bHasLegend;
}
catch( beans::UnknownPropertyException & )
@@ -976,8 +969,7 @@ void ChartExport::exportLegend( Reference< css::chart::XChartDocument > xChartDo
css::chart::ChartLegendPosition aLegendPos = css::chart::ChartLegendPosition_NONE;
try
{
- Any aAny( xProp->getPropertyValue(
- OUString( "Alignment" )));
+ Any aAny( xProp->getPropertyValue( "Alignment" ));
aAny >>= aLegendPos;
}
catch( beans::UnknownPropertyException & )
@@ -2424,16 +2416,13 @@ void ChartExport::InitPlotArea( )
Reference<lang::XServiceInfo> xServiceInfo (mxDiagram, uno::UNO_QUERY);
if (xServiceInfo.is())
{
- if (xServiceInfo->supportsService(
- OUString("com.sun.star.chart.ChartAxisZSupplier")))
+ if (xServiceInfo->supportsService("com.sun.star.chart.ChartAxisZSupplier"))
{
- xDiagramProperties->getPropertyValue(
- OUString("HasZAxis")) >>= mbHasZAxis;
+ xDiagramProperties->getPropertyValue("HasZAxis") >>= mbHasZAxis;
}
}
- xDiagramProperties->getPropertyValue(
- OUString ("Dim3D")) >>= mbIs3DChart;
+ xDiagramProperties->getPropertyValue("Dim3D") >>= mbIs3DChart;
Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY );
if( mbHasCategoryLabels && mxNewDiagram.is())
@@ -2487,30 +2476,19 @@ void ChartExport::exportAxis(const AxisIdPair& rAxisIdPair)
Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY);
- xDiagramProperties->getPropertyValue(
- OUString ("HasXAxisTitle")) >>= bHasXAxisTitle;
- xDiagramProperties->getPropertyValue(
- OUString ("HasYAxisTitle")) >>= bHasYAxisTitle;
- xDiagramProperties->getPropertyValue(
- OUString ("HasZAxisTitle")) >>= bHasZAxisTitle;
- xDiagramProperties->getPropertyValue(
- OUString ("HasSecondaryXAxisTitle")) >>= bHasSecondaryXAxisTitle;
- xDiagramProperties->getPropertyValue(
- OUString ("HasSecondaryYAxisTitle")) >>= bHasSecondaryYAxisTitle;
-
- xDiagramProperties->getPropertyValue(
- OUString ("HasXAxisGrid")) >>= bHasXAxisMajorGrid;
- xDiagramProperties->getPropertyValue(
- OUString ("HasYAxisGrid")) >>= bHasYAxisMajorGrid;
- xDiagramProperties->getPropertyValue(
- OUString ("HasZAxisGrid")) >>= bHasZAxisMajorGrid;
-
- xDiagramProperties->getPropertyValue(
- OUString ("HasXAxisHelpGrid")) >>= bHasXAxisMinorGrid;
- xDiagramProperties->getPropertyValue(
- OUString ("HasYAxisHelpGrid")) >>= bHasYAxisMinorGrid;
- xDiagramProperties->getPropertyValue(
- OUString ("HasZAxisHelpGrid")) >>= bHasZAxisMinorGrid;
+ xDiagramProperties->getPropertyValue("HasXAxisTitle") >>= bHasXAxisTitle;
+ xDiagramProperties->getPropertyValue("HasYAxisTitle") >>= bHasYAxisTitle;
+ xDiagramProperties->getPropertyValue("HasZAxisTitle") >>= bHasZAxisTitle;
+ xDiagramProperties->getPropertyValue("HasSecondaryXAxisTitle") >>= bHasSecondaryXAxisTitle;
+ xDiagramProperties->getPropertyValue("HasSecondaryYAxisTitle") >>= bHasSecondaryYAxisTitle;
+
+ xDiagramProperties->getPropertyValue("HasXAxisGrid") >>= bHasXAxisMajorGrid;
+ xDiagramProperties->getPropertyValue("HasYAxisGrid") >>= bHasYAxisMajorGrid;
+ xDiagramProperties->getPropertyValue("HasZAxisGrid") >>= bHasZAxisMajorGrid;
+
+ xDiagramProperties->getPropertyValue("HasXAxisHelpGrid") >>= bHasXAxisMinorGrid;
+ xDiagramProperties->getPropertyValue("HasYAxisHelpGrid") >>= bHasYAxisMinorGrid;
+ xDiagramProperties->getPropertyValue("HasZAxisHelpGrid") >>= bHasZAxisMinorGrid;
Reference< XPropertySet > xAxisProp;
Reference< drawing::XShape > xAxisTitle;
@@ -2691,8 +2669,7 @@ void ChartExport::_exportAxis(
bool bVisible = true;
if( xAxisProp.is() )
{
- xAxisProp->getPropertyValue(
- OUString ("Visible")) >>= bVisible;
+ xAxisProp->getPropertyValue("Visible") >>= bVisible;
}
// only export each axis only once non-deleted
@@ -3160,11 +3137,9 @@ void ChartExport::exportDataPoints(
Sequence< sal_Int32 > aDataPointSeq;
if( xSeriesProperties.is())
{
- Any aAny = xSeriesProperties->getPropertyValue(
- OUString( "AttributedDataPoints" ));
+ Any aAny = xSeriesProperties->getPropertyValue( "AttributedDataPoints" );
aAny >>= aDataPointSeq;
- xSeriesProperties->getPropertyValue(
- OUString( "VaryColorsByPoint" )) >>= bVaryColorsByPoint;
+ xSeriesProperties->getPropertyValue( "VaryColorsByPoint" ) >>= bVaryColorsByPoint;
}
const sal_Int32 * pPoints = aDataPointSeq.getConstArray();
@@ -3597,8 +3572,7 @@ Reference< chart2::data::XDataSequence> getLabeledSequence(
uno::Reference< chart2::data::XDataSequence > xSequence( aSequences[nI]->getValues());
uno::Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW );
OUString aRole;
- if( ( xSeqProp->getPropertyValue(
- OUString( "Role" )) >>= aRole ) &&
+ if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) &&
aRole.match( aRolePrefix ) && aRole.indexOf(aDirection) >= 0 )
{
return xSequence;
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 822465d..f56cf04 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -188,8 +188,8 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
rtl::Bootstrap bootstrap(path);
// look for pythonhome
- bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONHOME"), pythonHome );
- bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONPATH" ) , pythonPath );
+ bootstrap.getFrom( "PYUNO_LOADER_PYTHONHOME", pythonHome );
+ bootstrap.getFrom( "PYUNO_LOADER_PYTHONPATH", pythonPath );
// pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console
// sadly, there is no api for setting the pythonpath, we have to use the environment variable
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 0b67219..9fde244 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2420,17 +2420,17 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam
uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY);
uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get());
- xStyles->insertByName(OUString("PageStyles"),uno::makeAny(xPageStyles));
+ xStyles->insertByName("PageStyles",uno::makeAny(xPageStyles));
uno::Reference< style::XStyle> xPageStyle(createInstance("com.sun.star.style.PageStyle"),uno::UNO_QUERY);
xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle));
uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get());
- xStyles->insertByName(OUString("FrameStyles"),uno::makeAny(xFrameStyles));
+ xStyles->insertByName("FrameStyles",uno::makeAny(xFrameStyles));
uno::Reference< style::XStyle> xFrameStyle(createInstance("com.sun.star.style.FrameStyle"),uno::UNO_QUERY);
xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle));
uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(cppu::UnoType<style::XStyle>::get());
- xStyles->insertByName(OUString("graphics"),uno::makeAny(xGraphicStyles));
+ xStyles->insertByName("graphics",uno::makeAny(xGraphicStyles));
uno::Reference< style::XStyle> xGraphicStyle(createInstance("com.sun.star.style.GraphicStyle"),uno::UNO_QUERY);
xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle));
}
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 76e66e8..84727cd 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -417,10 +417,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen
,const uno::Reference< uno::XInterface>& _xReportComponent)
{
uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(cppu::UnoType<XInterface>::get());
- xNameCont->insertByName(OUString("FormComponent"),uno::makeAny(_xFormComponent));
- xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(_xReportComponent));
- xNameCont->insertByName(OUString("RowSet")
- ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet())));
+ xNameCont->insertByName("FormComponent",uno::makeAny(_xFormComponent));
+ xNameCont->insertByName("ReportComponent",uno::makeAny(_xReportComponent));
+ xNameCont->insertByName("RowSet",uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet())));
return xNameCont.get();
}
@@ -532,7 +531,7 @@ void PropBrw::Update( OSectionView* pNewView )
uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection());
m_xLastSection = xTemp;
uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(cppu::UnoType<XInterface>::get() );
- xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(xTemp));
+ xNameCont->insertByName("ReportComponent",uno::makeAny(xTemp));
xTemp = xNameCont;
implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) );
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 9d933a3..195e3ce 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -49,7 +49,7 @@ void ScCopyPasteTest::testCopyPasteXLS()
CPPUNIT_ASSERT( xDesktop.is() );
// create a frame
- Reference< frame::XFrame > xTargetFrame = xDesktop->findFrame( OUString("_blank"), 0 );
+ Reference< frame::XFrame > xTargetFrame = xDesktop->findFrame( "_blank", 0 );
CPPUNIT_ASSERT( xTargetFrame.is() );
// 1. Open the document
@@ -98,8 +98,8 @@ void ScCopyPasteTest::testCopyPasteXLS()
args[0].Value <<= sal_True;
uno::Reference< lang::XComponent > xComponent = xDesktop->loadComponentFromURL(
- OUString("private:factory/scalc"),
- OUString("_blank"),
+ "private:factory/scalc",
+ "_blank",
0,
args );
CPPUNIT_ASSERT( xComponent.is() );
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 96b4d46..e53b017 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -517,8 +517,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions )
{
try
{
- uno::Any aAny = xOptions->getPropertyValue(
- OUString( "NullDate" ) );
+ uno::Any aAny = xOptions->getPropertyValue( "NullDate" );
util::Date aDate;
if ( aAny >>= aDate )
return DateToDays( aDate.Day, aDate.Month, aDate.Year );
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 51ff569..9bfa752 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -269,7 +269,7 @@ namespace basprov
aArgs[3].Value <<= OUString("Module");
aArgs[4].Name = "Line";
aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 );
- xHelper->executeDispatch( xProv, OUString(".uno:BasicIDEAppear"), OUString(), 0, aArgs );
+ xHelper->executeDispatch( xProv, ".uno:BasicIDEAppear", OUString(), 0, aArgs );
}
}
}
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index ad70df0..594d7de 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -309,7 +309,7 @@ namespace basprov
OUString aDescription = sfUri->getName();
- OUString aLocation = sfUri->getParameter( OUString("location") );
+ OUString aLocation = sfUri->getParameter( "location" );
sal_Int32 nIndex = 0;
// In some strange circumstances the Library name can have an
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 1107fc7..1d51a3a 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -112,7 +112,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW );
// TODO: Ctor
Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext
- ( OUString("com.sun.star.resource.StringResourceWithLocation"),
+ ( "com.sun.star.resource.StringResourceWithLocation",
i_xContext ), UNO_QUERY );
if( xStringResourceManager.is() )
{
@@ -325,8 +325,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
if ( nIndex != -1 )
sDlgName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex );
- OUString sLocation = sfUri->getParameter(
- OUString("location") );
+ OUString sLocation = sfUri->getParameter( "location" );
// get dialog library container
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 96ef809..2fcec93 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -190,12 +190,12 @@ void SdExportTest::testN821567()
xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xPropSet( xPage, uno::UNO_QUERY );
- uno::Any aAny = xPropSet->getPropertyValue( OUString("Background") );
+ uno::Any aAny = xPropSet->getPropertyValue( "Background" );
if(aAny.hasValue())
{
uno::Reference< beans::XPropertySet > aXBackgroundPropSet;
aAny >>= aXBackgroundPropSet;
- aAny = aXBackgroundPropSet->getPropertyValue( OUString("FillBitmapName"));
+ aAny = aXBackgroundPropSet->getPropertyValue( "FillBitmapName" );
aAny >>= bgImage;
}
CPPUNIT_ASSERT_MESSAGE("Slide Background is not exported properly", !bgImage.isEmpty());
@@ -594,7 +594,7 @@ void SdExportTest::testFdo83751()
uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY );
uno::Reference<beans::XPropertySet> xUDProps( xProps->getUserDefinedProperties(), uno::UNO_QUERY );
OUString propValue;
- xUDProps->getPropertyValue(OUString("Testing")) >>= propValue;
+ xUDProps->getPropertyValue("Testing") >>= propValue;
CPPUNIT_ASSERT_EQUAL(OUString("Document"), propValue);
xDocShRef->DoClose();
}
@@ -1117,7 +1117,7 @@ void SdExportTest::testTdf91378()
uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY );
uno::Reference<beans::XPropertySet> xUDProps( xProps->getUserDefinedProperties(), uno::UNO_QUERY );
OUString propValue;
- xUDProps->getPropertyValue(OUString("Testing")) >>= propValue;
+ xUDProps->getPropertyValue("Testing") >>= propValue;
CPPUNIT_ASSERT(propValue.isEmpty());
xDocShRef = saveAndReload( xDocShRef, PPTX );
}
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index e05cf4d..9376286 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -646,7 +646,7 @@ void SdImportTest::testFdo71075()
CPPUNIT_ASSERT_MESSAGE( "failed to load shape", xShape.is() );
uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
- aAny = xPropSet->getPropertyValue( OUString("Model") );
+ aAny = xPropSet->getPropertyValue( "Model" );
CPPUNIT_ASSERT_MESSAGE( "failed to load shape", aAny.hasValue() );
uno::Reference< chart::XChartDocument > xChartDoc;
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 2912b66..668aef1 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1346,7 +1346,7 @@ void createVisibilityOnOffNode(Reference< XTimeContainer >& rxParentContainer, S
xAnimate->setTarget(aAny);
// set AttributeName
- xAnimate->setAttributeName(OUString("Visibility"));
+ xAnimate->setAttributeName("Visibility");
// set attribute value
aAny <<= bVisible;
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index aa76a39..830d451 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -511,11 +511,11 @@ static void implCreateTableTemplate( const Reference< XNameContainer >& xTableFa
{
if( xTableFamily.is() ) try
{
- if( !xTableFamily->hasByName( OUString( rName ) ) )
+ if( !xTableFamily->hasByName( rName ) )
{
Reference< XSingleServiceFactory > xFactory( xTableFamily, UNO_QUERY_THROW );
Reference< XNameReplace > xDefaultTableStyle( xFactory->createInstance(), UNO_QUERY_THROW );
- xTableFamily->insertByName( OUString( rName ), Any( xDefaultTableStyle ) );
+ xTableFamily->insertByName( rName, Any( xDefaultTableStyle ) );
xDefaultTableStyle->replaceByName( "body", rBody );
xDefaultTableStyle->replaceByName( "odd-rows" , rBanding );
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 575d9f3..3679ca1 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -110,7 +110,7 @@ void PPTWriter::exportPPTPre( const std::vector< css::beans::PropertyValue >& rM
{
mbStatusIndicator = true;
mnStatMaxValue = ( mnPages + mnMasterPages ) * 5;
- mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) );
+ mXStatusIndicator->start( "PowerPoint Export", mnStatMaxValue + ( mnStatMaxValue >> 3 ) );
}
SvGlobalName aGName( 0x64818d10L, 0x4f9b, 0x11cf, 0x86, 0xea, 0x00, 0xaa, 0x00, 0xb9, 0x29, 0xe8 );
@@ -145,7 +145,7 @@ void PPTWriter::exportPPTPost( )
if ( mbStatusIndicator )
{
- mXStatusIndicator->setText( OUString( "PowerPoint Export" ) );
+ mXStatusIndicator->setText( "PowerPoint Export" );
sal_uInt32 nValue = mnStatMaxValue + ( mnStatMaxValue >> 3 );
if ( nValue > mnLatestStatValue )
{
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index b349a43..a99caae 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -145,9 +145,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
::awt::Size aPageSize;
xSlideProps->getPropertyValue(
- OUString("Width")) >>= aPageSize.Width;
+ "Width") >>= aPageSize.Width;
xSlideProps->getPropertyValue(
- OUString("Height")) >>= aPageSize.Height;
+ "Height") >>= aPageSize.Height;
::awt::Point aPicPos;
@@ -188,9 +188,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
::awt::Size aPageSize;
xSlideProps->getPropertyValue(
- OUString("Width")) >>= aPageSize.Width;
+ "Width") >>= aPageSize.Width;
xSlideProps->getPropertyValue(
- OUString("Height")) >>= aPageSize.Height;
+ "Height") >>= aPageSize.Height;
// grab the left one
void* pD1 = pImagesLst->GetEntryData(i);
@@ -293,9 +293,9 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
::awt::Size aPageSize;
xSlideProps->getPropertyValue(
- OUString("Width")) >>= aPageSize.Width;
+ "Width") >>= aPageSize.Width;
xSlideProps->getPropertyValue(
- OUString("Height")) >>= aPageSize.Height;
+ "Height") >>= aPageSize.Height;
// grab the upper left one
void* pD1 = pImagesLst->GetEntryData(i);
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index b167ab2..79b34a4 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -211,9 +211,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript
{
Any aPage;
aPage <<= rpDescriptor->GetPage()->getUnoPage();
- xSet->setPropertyValue (
- OUString("CurrentPage"),
- aPage);
+ xSet->setPropertyValue( "CurrentPage", aPage );
}
}
catch (const Exception&)
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 6628f31..c69c49a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -212,7 +212,7 @@ void Listener::ConnectToController()
{
try
{
- xSet->addPropertyChangeListener(OUString("CurrentPage"), this);
+ xSet->addPropertyChangeListener("CurrentPage", this);
}
catch (beans::UnknownPropertyException&)
{
@@ -220,7 +220,7 @@ void Listener::ConnectToController()
}
try
{
- xSet->addPropertyChangeListener(OUString("IsMasterPageMode"), this);
+ xSet->addPropertyChangeListener("IsMasterPageMode", this);
}
catch (beans::UnknownPropertyException&)
{
@@ -252,12 +252,8 @@ void Listener::DisconnectFromController()
// Remove the property listener.
if (xSet.is())
{
- xSet->removePropertyChangeListener (
- OUString("CurrentPage"),
- this);
- xSet->removePropertyChangeListener (
- OUString("IsMasterPageMode"),
- this);
+ xSet->removePropertyChangeListener( "CurrentPage", this );
+ xSet->removePropertyChangeListener( "IsMasterPageMode", this);
}
// Remove the dispose listener.
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 14fcf10..c544e70 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -181,7 +181,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
// First make sure that the sidebar is visible
pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
::sfx2::sidebar::Sidebar::ShowPanel(
- OUString("SdSlideTransitionPanel"),
+ "SdSlideTransitionPanel",
pShell->GetViewFrame()->GetFrame().GetFrameInterface());
rRequest.Ignore ();
break;
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index d3c32d6..5f1a09a 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -208,7 +208,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
// First make sure that the sidebar is visible
GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
::sfx2::sidebar::Sidebar::ShowPanel(
- OUString("SdTableDesignPanel"),
+ "SdTableDesignPanel",
GetViewFrame()->GetFrame().GetFrameInterface());
}
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index f218a21..2552f2b 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -381,7 +381,7 @@ void EventMultiplexer::Implementation::ConnectToController()
{
try
{
- xSet->addPropertyChangeListener(OUString(aCurrentPagePropertyName), this);
+ xSet->addPropertyChangeListener(aCurrentPagePropertyName, this);
}
catch (const beans::UnknownPropertyException&)
{
@@ -390,7 +390,7 @@ void EventMultiplexer::Implementation::ConnectToController()
try
{
- xSet->addPropertyChangeListener(OUString(aEditModePropertyName), this);
+ xSet->addPropertyChangeListener(aEditModePropertyName, this);
}
catch (const beans::UnknownPropertyException&)
{
@@ -425,7 +425,7 @@ void EventMultiplexer::Implementation::DisconnectFromController()
{
try
{
- xSet->removePropertyChangeListener(OUString(aCurrentPagePropertyName), this);
+ xSet->removePropertyChangeListener(aCurrentPagePropertyName, this);
}
catch (const beans::UnknownPropertyException&)
{
@@ -434,7 +434,7 @@ void EventMultiplexer::Implementation::DisconnectFromController()
try
{
- xSet->removePropertyChangeListener(OUString(aEditModePropertyName), this);
+ xSet->removePropertyChangeListener(aEditModePropertyName, this);
}
catch (const beans::UnknownPropertyException&)
{
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 4393899..4df152a 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -122,7 +122,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
// First make sure that the sidebar is visible
mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
sfx2::sidebar::Sidebar::ShowPanel(
- OUString("SdLayoutsPanel"),
+ "SdLayoutsPanel",
mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());
break;
}
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index ed8a376..c0d928b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -96,7 +96,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont
else
{
xCC->addResourceFactory(
- OUString("private:resource/pane/Presenter/*"),
+ "private:resource/pane/Presenter/*",
this);
}
}
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index d95c582..4a610d3 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -229,10 +229,8 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag
awt::Size aSlideSize;
try
{
- xPropertySet->getPropertyValue(
- OUString("Width")) >>= aSlideSize.Width;
- xPropertySet->getPropertyValue(
- OUString("Height")) >>= aSlideSize.Height;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list