From ba0a57702cdef7a0389c06841711d7e3079d471c Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 29 Jun 2013 21:24:12 +0200 Subject: remove OUString wrap for string literals For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- sd/qa/unit/sdmodeltestbase.hxx | 2 +- sd/source/filter/eppt/epptso.cxx | 4 ++-- sd/source/filter/eppt/pptexsoundcollection.cxx | 2 +- sd/source/filter/eppt/pptx-stylesheet.cxx | 2 +- sd/source/ui/sidebar/PanelFactory.cxx | 2 +- sd/source/ui/view/ViewShellBase.cxx | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sd') diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index 853f089d0c26..9b48cd8495ff 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -66,7 +66,7 @@ public: // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called - m_xDrawComponent = getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Draw.PresentationDocument")); + m_xDrawComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.Draw.PresentationDocument"); CPPUNIT_ASSERT_MESSAGE("no impress component!", m_xDrawComponent.is()); } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 2f901f55ec9e..16552a8d3e5a 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2553,7 +2553,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // try to get the aspect when available ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW ); - xShapeProps->getPropertyValue( OUString( "Aspect" ) ) >>= nAspect; + xShapeProps->getPropertyValue("Aspect") >>= nAspect; } catch( ::com::sun::star::uno::Exception& ) {} @@ -3125,7 +3125,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // try to get the aspect when available ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW ); - xShapeProps->getPropertyValue( OUString( "Aspect" ) ) >>= nAspect; + xShapeProps->getPropertyValue("Aspect") >>= nAspect; } catch( ::com::sun::star::uno::Exception& ) {} diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index efa58fdbc02b..78f606e67c2c 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -38,7 +38,7 @@ ExSoundEntry::ExSoundEntry(const OUString& rString) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); sal_Int64 nVal = 0; - ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( OUString( "Size" ) ) ); + ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue("Size") ); nFileSize = (sal_uInt32)nVal; } catch( ::com::sun::star::uno::Exception& ) diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index d9fd8fd8f4c4..8e9e70498e8a 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -239,7 +239,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing { sal_Bool bFixedLineSpacing = sal_False; - uno::Any aAny = rXPropSet->getPropertyValue( OUString( "FontIndependentLineSpacing" ) ); + uno::Any aAny = rXPropSet->getPropertyValue("FontIndependentLineSpacing"); if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing ) { const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont ); diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index cba8657a6831..dbdd48b593bd 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -168,7 +168,7 @@ Reference SAL_CALL PanelFactory::createUIElement ( pBase = pController->GetViewShellBase(); } if (pBase == NULL) - throw RuntimeException(OUString("can not get ViewShellBase for frame"), NULL); + throw RuntimeException("can not get ViewShellBase for frame", NULL); // Get bindings from given arguments. const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 4c4d3bed98ca..66707c360d23 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1582,7 +1582,7 @@ void CurrentPageSetter::operator() (bool) // Switch to the page last edited by setting the CurrentPage // property. Reference xSet (mrBase.GetController(), UNO_QUERY_THROW); - xSet->setPropertyValue (OUString("CurrentPage"), aPage); + xSet->setPropertyValue ("CurrentPage", aPage); } catch (const RuntimeException&) { -- cgit