summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-30 16:38:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-31 08:56:20 +0000
commit1c3e84d8192218befebcddae2ed9842d081dc6c7 (patch)
treef4fc5cddd181d6d49bf55f74e6d3d107b8ae8d18 /sdext
parente1e6cdbb1e9ff37f0bb740a70045c66953bec50c (diff)
teach lolugin:stringconstant about calling constructors
so we can remove unnecessary calls to the OUString(literal) constructor when calling constructors like this: Foo(OUString("xxx"), 1) Change-Id: I1de60ef561437c86b27dc9cb095a5deb2e103b36 Reviewed-on: https://gerrit.libreoffice.org/33698 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx4
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx6
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx6
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx2
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx6
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx2
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx4
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx2
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx4
9 files changed, 18 insertions, 18 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index f460b87b5679..dd39419bd086 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -296,11 +296,11 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxContext );
Sequence< Any > aCreationArguments( 2 );
aCreationArguments[0] = makeAny( PropertyValue(
- OUString( "nodepath" ), 0,
+ "nodepath", 0,
makeAny( GetPathToConfigurationRoot() ),
PropertyState_DIRECT_VALUE ) );
aCreationArguments[1] = makeAny(beans::PropertyValue(
- OUString( "lazywrite" ), 0, makeAny( true ),
+ "lazywrite", 0, makeAny( true ),
PropertyState_DIRECT_VALUE ) );
OUString sAccessService;
if ( bReadOnly )
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 7c5221cc4922..b8ed17b82526 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -714,15 +714,15 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl()
uno::UNO_QUERY_THROW );
uno::Sequence<beans::PropertyValue> aSequence(3);
- aSequence[0] = beans::PropertyValue( OUString("URL"),
+ aSequence[0] = beans::PropertyValue( "URL",
0,
uno::makeAny(aFileName),
beans::PropertyState_DIRECT_VALUE );
- aSequence[1] = beans::PropertyValue( OUString("InputStream"),
+ aSequence[1] = beans::PropertyValue( "InputStream",
0,
uno::makeAny( xDataStream ),
beans::PropertyState_DIRECT_VALUE );
- aSequence[2] = beans::PropertyValue( OUString("InputSequence"),
+ aSequence[2] = beans::PropertyValue( "InputSequence",
0,
uno::makeAny(aDataSequence),
beans::PropertyState_DIRECT_VALUE );
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 1a1b206d99b1..8956b644bc1b 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -349,7 +349,7 @@ public:
OUString sName ("Presenter Console");
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode("Presenter/Accessibility/Console/String")
>>= sName;
@@ -379,7 +379,7 @@ public:
{
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode("Presenter/Accessibility/Preview/String")
>>= sName;
@@ -1684,7 +1684,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
{
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode("Presenter/Accessibility/Notes/String")
>>= sName;
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index e414ad0261af..2efcee7a8a0f 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -352,7 +352,7 @@ void PresenterHelpView::ReadHelpStrings()
mpTextContainer.reset(new TextContainer());
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xStrings (
aConfiguration.GetConfigurationNode("PresenterScreenSettings/HelpView/HelpStrings"),
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 53d5bcbd1b4f..1739468f360f 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -275,7 +275,7 @@ bool PresenterScreen::isPresenterScreenEnabled(const css::uno::Reference<css::un
bool dEnablePresenterScreen=true;
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString("/org.openoffice.Office.Impress/"),
+ "/org.openoffice.Office.Impress/",
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode("Misc/Start/EnablePresenterScreen")
>>= dEnablePresenterScreen;
@@ -482,7 +482,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
Reference<XComponentContext> xContext (mxContextWeak);
PresenterConfigurationAccess aConfiguration (
xContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
bool bStartAlways (false);
if (aConfiguration.GetConfigurationNode(
@@ -633,7 +633,7 @@ void PresenterScreen::SetupConfiguration (
{
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString("org.openoffice.Office.PresenterScreen"),
+ "org.openoffice.Office.PresenterScreen",
PresenterConfigurationAccess::READ_ONLY);
maViewDescriptors.clear();
ProcessViewDescriptions(aConfiguration);
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index c245a1978487..86ace6436269 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -1762,7 +1762,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
{
PresenterConfigurationAccess aConfiguration (
rxContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
Reference<container::XHierarchicalNameAccess> xBitmaps (
aConfiguration.GetConfigurationNode(
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 74ff11a83abe..881aa4e12e34 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -281,7 +281,7 @@ std::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme()
PresenterConfigurationAccess aConfiguration (
mxContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
return aReadContext.ReadTheme(aConfiguration, msThemeName);
@@ -369,7 +369,7 @@ std::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyl
std::shared_ptr<PresenterConfigurationAccess> pConfiguration (
new PresenterConfigurationAccess(
mxContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_WRITE));
// Get configuration node for the view style container of the current
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 97df29c8c03d..bbddbc7150ae 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -606,7 +606,7 @@ void PresenterToolBar::CreateControls (
// Expand the macro in the bitmap file names.
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
mpCurrentContainerPart.reset(new ElementContainerPart());
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 158049d9a24b..2e56f5bdc414 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -505,7 +505,7 @@ void PresenterWindowManager::RestoreViewMode()
sal_Int32 nMode (0);
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_ONLY);
aConfiguration.GetConfigurationNode("Presenter/InitialViewMode") >>= nMode;
switch (nMode)
@@ -531,7 +531,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
{
PresenterConfigurationAccess aConfiguration (
mxComponentContext,
- OUString("/org.openoffice.Office.PresenterScreen/"),
+ "/org.openoffice.Office.PresenterScreen/",
PresenterConfigurationAccess::READ_WRITE);
aConfiguration.GoToChild(OUString("Presenter"));
Any aValue;