summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-06 09:37:03 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-06 09:37:03 +0100
commitdd4c24081865751dee1a74fbee8d4612096a0b2c (patch)
treebcc0da9886b1fbcc26f9da0d0690a82d04fba6f9 /sdext
parentc50ab3b3b21a7091a6ceb9c553ba9cd3ff0aaf47 (diff)
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I7efbeda973c2cfa2472eec5b3d309e8e22aa5d9b
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/informationdialog.cxx8
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx4
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx4
-rw-r--r--sdext/source/minimizer/unodialog.cxx16
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx4
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx8
6 files changed, 22 insertions, 22 deletions
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index d50d20b0eb1a..9b4b2bcc9551 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -298,13 +298,13 @@ void InformationDialog::InitDialog()
css::uno::Reference< css::awt::XItemListener > xItemListener;
InsertImage( *this,
- OUString( "aboutimage" ),
- OUString( "private:standardimage/query" ),
+ "aboutimage",
+ "private:standardimage/query",
5, 5, 25, 25, false );
- InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, true, 0 );
+ InsertFixedText( *this, "fixedtext", aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, true, 0 );
if ( !maSaveAsURL.isEmpty() )
InsertCheckBox( *this, "OpenNewDocument", xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
- InsertButton( *this, OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK );
+ InsertButton( *this, "button", mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK );
bool bOpenNewDocument = mrbOpenNewDocument;
setControlProperty( "OpenNewDocument", "State", Any( (sal_Int16)bOpenNewDocument ) );
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index a21141163fb8..76d102edba14 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -105,7 +105,7 @@ void OptimizerDialog::InitRoadmap()
Sequence< OUString > aNames( pNames, nCount );
Sequence< Any > aValues( pValues, nCount );
- mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel" ),
+ mxRoadmapControlModel = insertControlModel( "com.sun.star.awt.UnoControlRoadmapModel",
"rdmNavi", aNames, aValues );
Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW );
@@ -543,7 +543,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
aLocation = aLocation.copy( 0, nIndex );
// adding .mini
- aLocation = aLocation.concat( OUString(".mini") );
+ aLocation = aLocation.concat( ".mini" );
aFileOpenDialog.setDefaultName( aLocation );
}
}
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 087f6d48360f..8977a7096e3c 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -83,7 +83,7 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
Sequence< OUString > aNames( pNames, nCount );
Sequence< Any > aValues( pValues, nCount );
- rOptimizerDialog.insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedLineModel" ),
+ rOptimizerDialog.insertControlModel( "com.sun.star.awt.UnoControlFixedLineModel",
rControlName, aNames, aValues );
return rControlName;
}
@@ -860,7 +860,7 @@ void OptimizerDialog::InitPage4()
Sequence< OUString > aNames( pNames, nCount );
Sequence< Any > aValues( pValues, nCount );
- Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlProgressBarModel" ),
+ Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( "com.sun.star.awt.UnoControlProgressBarModel",
"Progress", aNames, aValues ), UNO_QUERY );
}
Reference< XTextListener > xTextListener;
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 3ea8b3dd07be..0c0f99946e66 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -145,7 +145,7 @@ Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference<
Reference< XButton > xButton;
try
{
- Reference< XInterface > xButtonModel( insertControlModel( OUString( "com.sun.star.awt.UnoControlButtonModel" ),
+ Reference< XInterface > xButtonModel( insertControlModel( "com.sun.star.awt.UnoControlButtonModel",
rName, rPropertyNames, rPropertyValues ) );
Reference< XPropertySet > xPropertySet( xButtonModel, UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
@@ -171,7 +171,7 @@ Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const
Reference< XFixedText > xFixedText;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedTextModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlFixedTextModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xFixedText.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
@@ -189,7 +189,7 @@ Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const S
Reference< XCheckBox > xCheckBox;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlCheckBoxModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlCheckBoxModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xCheckBox.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
@@ -207,7 +207,7 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co
Reference< XControl > xControl;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFormattedFieldModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlFormattedFieldModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
@@ -225,7 +225,7 @@ Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const S
Reference< XComboBox > xControl;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlComboBoxModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlComboBoxModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
@@ -243,7 +243,7 @@ Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, c
Reference< XRadioButton > xControl;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlRadioButtonModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlRadioButtonModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
@@ -261,7 +261,7 @@ Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Seq
Reference< XListBox > xControl;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlListBoxModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlListBoxModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
@@ -279,7 +279,7 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque
Reference< XControl > xControl;
try
{
- Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlImageControlModel" ),
+ Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlImageControlModel",
rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW );
xPropertySet->setPropertyValue("Name", Any( rName ) );
xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW );
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 96310cfabcd6..aa7e6ac1bc3d 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -528,7 +528,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize )
if( m_xStatusIndicator.is() )
{
if( nNextPageNr == 1 )
- startIndicator( OUString( " " ) );
+ startIndicator( " " );
m_xStatusIndicator->setValue( nNextPageNr );
}
m_pCurPage = ElementFactory::createPageElement(m_pDocument.get(), nNextPageNr);
@@ -550,7 +550,7 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter,
ElementTreeVisitorSharedPtr optimizingVisitor(
rVisitorFactory.createOptimizingVisitor(*this));
// FIXME: localization
- startIndicator( OUString( " " ) );
+ startIndicator( " " );
m_pDocument->visitedBy( *optimizingVisitor, std::list<Element*>::const_iterator());
#if OSL_DEBUG_LEVEL > 1
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index bbf7ad0e1782..5b6359ab4476 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -508,7 +508,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
PresenterConfigurationAccess::READ_ONLY);
bool bStartAlways (false);
if (aConfiguration.GetConfigurationNode(
- OUString("Presenter/StartAlways")) >>= bStartAlways)
+ "Presenter/StartAlways") >>= bStartAlways)
{
if (bStartAlways)
return GetPresenterScreenFromScreen(nScreenNumber);
@@ -661,7 +661,7 @@ void PresenterScreen::SetupConfiguration (
ProcessViewDescriptions(aConfiguration);
OUString sLayoutName ("DefaultLayout");
aConfiguration.GetConfigurationNode(
- OUString("Presenter/CurrentLayout")) >>= sLayoutName;
+ "Presenter/CurrentLayout") >>= sLayoutName;
ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId);
}
catch (const RuntimeException&)
@@ -686,7 +686,7 @@ void PresenterScreen::ProcessLayout (
OUString sParentLayout;
PresenterConfigurationAccess::GetConfigurationNode(
xLayoutNode,
- OUString("ParentLayout")) >>= sParentLayout;
+ "ParentLayout") >>= sParentLayout;
if (!sParentLayout.isEmpty())
{
// Prevent infinite recursion.
@@ -698,7 +698,7 @@ void PresenterScreen::ProcessLayout (
Reference<container::XNameAccess> xList (
PresenterConfigurationAccess::GetConfigurationNode(
xLayoutNode,
- OUString("Layout")),
+ "Layout"),
UNO_QUERY_THROW);
::std::vector<OUString> aProperties (6);