summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-17 14:54:44 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-18 05:48:29 +0000
commitfc18da9178c851b17e9ecc3777166ae3037d3e8a (patch)
treefce22834561af167f919a5d8a9d78fd54c1dc5ba
parent43b5ca69aa545cf93eded55258d92d651917815f (diff)
remove some double calls
found with git grep -P '\W(\w+)\s*\(\s*\W' Change-Id: Ia93f83193959c72dcc15c5c1bf54e805b43f14e5 Reviewed-on: https://gerrit.libreoffice.org/30934 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx14
-rw-r--r--stoc/test/testcorefl.cxx2
-rw-r--r--stoc/test/testintrosp.cxx4
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx2
4 files changed, 9 insertions, 13 deletions
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index b32ccf6d5b68..3d98f0e74c7a 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -292,7 +292,7 @@ Reference < XNameContainer >
Reference < XNameContainer > xStyles(SvXMLStylesContext::GetStylesContainer(nFamily));
if (!xStyles.is())
{
- OUString sName;
+ OUString sName;
switch( nFamily )
{
case XML_STYLE_FAMILY_TABLE_TABLE:
@@ -300,8 +300,7 @@ Reference < XNameContainer >
if( m_xTableStyles.is() )
xStyles.set(m_xTableStyles);
else
- sName =
- OUString( OUString( "TableStyles" ));
+ sName = "TableStyles";
}
break;
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -309,8 +308,7 @@ Reference < XNameContainer >
if( m_xCellStyles.is() )
xStyles.set(m_xCellStyles);
else
- sName =
- OUString( OUString( "CellStyles" ));
+ sName = "CellStyles";
}
break;
case XML_STYLE_FAMILY_TABLE_COLUMN:
@@ -318,8 +316,7 @@ Reference < XNameContainer >
if( m_xColumnStyles.is() )
xStyles.set(m_xColumnStyles);
else
- sName =
- OUString( OUString( "ColumnStyles" ));
+ sName = "ColumnStyles";
}
break;
case XML_STYLE_FAMILY_TABLE_ROW:
@@ -327,8 +324,7 @@ Reference < XNameContainer >
if( m_xRowStyles.is() )
xStyles.set(m_xRowStyles);
else
- sName =
- OUString( OUString( "RowStyles" ));
+ sName = "RowStyles";
}
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index e04519c2ba84..05df96424a28 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -271,7 +271,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
}
Any gulp;
- gulp <<= OUString(OUString("Test"));
+ gulp <<= OUString("Test");
Any blup;
blup <<= aStructC;
xRefl->forName("ModuleA.StructC")->getField(OUString("aString"))->set(blup, gulp);
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 49fac8c4d932..22df49ebc509 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -332,7 +332,7 @@ public:
virtual OUString SAL_CALL getFirstName()
throw(RuntimeException);
virtual OUString SAL_CALL getLastName() throw(RuntimeException)
- { return OUString( OUString("Meyer") ); }
+ { return OUString("Meyer"); }
virtual sal_Int16 SAL_CALL getAge() throw(RuntimeException)
{ return m_nMarkusAge; }
virtual sal_Int16 SAL_CALL getChildrenCount() throw(RuntimeException)
@@ -521,7 +521,7 @@ Any ImplIntroTest::getPropertyValue( const OUString& PropertyName )
OUString ImplIntroTest::getFirstName()
throw(RuntimeException)
{
- return OUString( OUString("Markus") );
+ return OUString("Markus");
}
void ImplIntroTest::writeln( const OUString& Text )
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 1c742f07efb2..c6359a108272 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -118,7 +118,7 @@ static void lcl_throwIndexOutOfBoundsException( )
aReturn <<= (sal_Int16) 2; // No Border
break;
case BASEPROPERTY_DEFAULTCONTROL:
- aReturn <<= OUString( OUString::createFromAscii( szServiceName_UnoControlRoadmap ) );
+ aReturn <<= OUString::createFromAscii( szServiceName_UnoControlRoadmap );
break;
default : aReturn = UnoControlRoadmapModel_Base::ImplGetDefaultValue( nPropId ); break;
}