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 --- slideshow/source/engine/shapes/backgroundshape.cxx | 4 ++-- slideshow/source/engine/shapes/shapeimporter.cxx | 2 +- slideshow/source/engine/slide/slideimpl.cxx | 4 ++-- slideshow/source/engine/slideshowimpl.cxx | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index b1c8395220ec..61568b498aab 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -153,8 +153,8 @@ namespace slideshow sal_Int32 nDocWidth=0; sal_Int32 nDocHeight=0; - xPropSet->getPropertyValue( OUString("Width") ) >>= nDocWidth; - xPropSet->getPropertyValue( OUString("Height") ) >>= nDocHeight; + xPropSet->getPropertyValue("Width") >>= nDocWidth; + xPropSet->getPropertyValue("Height") >>= nDocHeight; mpMtf = pMtf; maBounds = ::basegfx::B2DRectangle( 0,0,nDocWidth, nDocHeight ); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index b1317a51545c..6c958a0c406e 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -445,7 +445,7 @@ bool ShapeImporter::isSkip( OUString layerName; uno::Reference xPropLayerSet( xLayer, uno::UNO_QUERY ); - const uno::Any& a(xPropLayerSet->getPropertyValue(OUString("Name")) ); + const uno::Any& a(xPropLayerSet->getPropertyValue("Name") ); bool const bRet = (a >>= layerName); if(bRet) { diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 43b041126760..e061641f1844 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -1231,8 +1231,8 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; - xPropSet->getPropertyValue( OUString("Width") ) >>= nDocWidth; - xPropSet->getPropertyValue( OUString("Height") ) >>= nDocHeight; + xPropSet->getPropertyValue("Width") >>= nDocWidth; + xPropSet->getPropertyValue("Height") >>= nDocHeight; return basegfx::B2ISize( nDocWidth, nDocHeight ); } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 5ce6a9ba913f..a37cdbc3f0fb 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1450,13 +1450,13 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult uno::Any aPropLayer; aPropLayer <<= layerName; - xLayerPropSet->setPropertyValue(OUString("Name"), aPropLayer); + xLayerPropSet->setPropertyValue("Name", aPropLayer); aPropLayer <<= true; - xLayerPropSet->setPropertyValue(OUString("IsVisible"), aPropLayer); + xLayerPropSet->setPropertyValue("IsVisible", aPropLayer); aPropLayer <<= false; - xLayerPropSet->setPropertyValue(OUString("IsLocked"), aPropLayer); + xLayerPropSet->setPropertyValue("IsLocked", aPropLayer); PolygonMap::iterator aIter=maPolygons.begin(); @@ -1518,27 +1518,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult //Give the built PointSequenceSequence. uno::Any aParam; aParam <<= aRetval; - aXPropSet->setPropertyValue( OUString("PolyPolygon"), aParam ); + aXPropSet->setPropertyValue("PolyPolygon", aParam ); //LineStyle : SOLID by default uno::Any aAny; drawing::LineStyle eLS; eLS = drawing::LineStyle_SOLID; aAny <<= eLS; - aXPropSet->setPropertyValue( OUString("LineStyle"), aAny ); + aXPropSet->setPropertyValue("LineStyle", aAny ); //LineColor sal_uInt32 nLineColor; nLineColor = pPolyPoly->getRGBALineColor(); //Transform polygon color from RRGGBBAA to AARRGGBB aAny <<= RGBAColor2UnoColor(nLineColor); - aXPropSet->setPropertyValue( OUString("LineColor"), aAny ); + aXPropSet->setPropertyValue("LineColor", aAny ); //LineWidth double fLineWidth; fLineWidth = pPolyPoly->getStrokeWidth(); aAny <<= (sal_Int32)fLineWidth; - aXPropSet->setPropertyValue( OUString("LineWidth"), aAny ); + aXPropSet->setPropertyValue("LineWidth", aAny ); // make polygons special xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow); -- cgit