[PATCH] Removal rtl and string cleanup
LOH KOK HOE
huahsin68 at gmail.com
Mon Dec 31 05:47:54 PST 2012
Hi Joes,
I been watching this ::rtl:: cleanup patches has been submit for few
round, just curious to know, why is this done so? Sorry for asking this as
I have just join the community, I just would like to know things happening
around.
:o)
On Mon, Dec 31, 2012 at 10:53 AM, José Guilherme Vanz (via Code Review) <
gerrit at gerrit.libreoffice.org> wrote:
> Hi,
>
> I have submitted a patch for review:
>
> https://gerrit.libreoffice.org/1520
>
> To pull it, you can do:
>
> git pull ssh://gerrit.libreoffice.org:29418/corerefs/changes/20/1520/1
>
> Removal rtl and string cleanup
>
> This commit removes ::rtl:: prefixes and string cleanup in oox
>
> Change-Id: I434462635392c750e2359f9d656d5e1885f2a0dc
> Signed-off-by: Jose Guilherme Vanz <guilherme.sft at gmail.com>
> ---
> M oox/source/ppt/animationspersist.cxx
> M oox/source/ppt/animationtypes.cxx
> M oox/source/ppt/animationtypes.hxx
> M oox/source/ppt/animvariantcontext.cxx
> M oox/source/ppt/backgroundproperties.cxx
> M oox/source/ppt/commonbehaviorcontext.cxx
> M oox/source/ppt/commonbehaviorcontext.hxx
> M oox/source/ppt/commontimenodecontext.cxx
> M oox/source/ppt/customshowlistcontext.cxx
> M oox/source/ppt/dgmimport.cxx
> M oox/source/ppt/dgmlayout.cxx
> M oox/source/ppt/extdrawingfragmenthandler.cxx
> M oox/source/ppt/layoutfragmenthandler.cxx
> M oox/source/ppt/pptfilterhelpers.cxx
> M oox/source/ppt/pptfilterhelpers.hxx
> M oox/source/ppt/pptgraphicshapecontext.cxx
> M oox/source/ppt/pptimport.cxx
> M oox/source/ppt/pptshape.cxx
> M oox/source/ppt/pptshapecontext.cxx
> M oox/source/ppt/pptshapegroupcontext.cxx
> M oox/source/ppt/pptshapepropertiescontext.cxx
> M oox/source/ppt/presentationfragmenthandler.cxx
> M oox/source/ppt/slidefragmenthandler.cxx
> M oox/source/ppt/slidemastertextstylescontext.cxx
> M oox/source/ppt/slidepersist.cxx
> M oox/source/ppt/slidetimingcontext.cxx
> M oox/source/ppt/slidetransition.cxx
> M oox/source/ppt/slidetransitioncontext.cxx
> M oox/source/ppt/soundactioncontext.cxx
> M oox/source/ppt/timeanimvaluecontext.cxx
> M oox/source/ppt/timenode.cxx
> M oox/source/ppt/timenodelistcontext.cxx
> M oox/source/ppt/timetargetelementcontext.cxx
> 33 files changed, 39 insertions(+), 84 deletions(-)
>
>
>
> diff --git a/oox/source/ppt/animationspersist.cxx
> b/oox/source/ppt/animationspersist.cxx
> index bf2a53a..74a9208 100644
> --- a/oox/source/ppt/animationspersist.cxx
> +++ b/oox/source/ppt/animationspersist.cxx
> @@ -28,7 +28,6 @@
>
> #include "oox/drawingml/shape.hxx"
>
> -using rtl::OUString;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::presentation;
> using namespace ::com::sun::star::drawing;
> diff --git a/oox/source/ppt/animationtypes.cxx
> b/oox/source/ppt/animationtypes.cxx
> index a79b0d6..a6ba788 100644
> --- a/oox/source/ppt/animationtypes.cxx
> +++ b/oox/source/ppt/animationtypes.cxx
> @@ -31,7 +31,7 @@
> namespace oox { namespace ppt {
>
> // ST_TLTime
> -Any GetTime( const ::rtl::OUString & val )
> +Any GetTime( const OUString & val )
> {
> Any aDuration;
> if( val.compareToAscii( "indefinite" ) == 0 )
> @@ -47,7 +47,7 @@
>
>
> // ST_TLTimeAnimateValueTime
> -Any GetTimeAnimateValueTime( const ::rtl::OUString & val )
> +Any GetTimeAnimateValueTime( const OUString & val )
> {
> Any aPercent;
> if( val.compareToAscii( "indefinite" ) == 0 )
> diff --git a/oox/source/ppt/animationtypes.hxx
> b/oox/source/ppt/animationtypes.hxx
> index 7e0b358..ab26abe 100644
> --- a/oox/source/ppt/animationtypes.hxx
> +++ b/oox/source/ppt/animationtypes.hxx
> @@ -30,9 +30,9 @@
> namespace oox { namespace ppt {
>
> // ST_TLTime
> -::com::sun::star::uno::Any GetTime( const ::rtl::OUString & val );
> +::com::sun::star::uno::Any GetTime( const OUString & val );
> // ST_TLTimeAnimateValueTime
> -::com::sun::star::uno::Any GetTimeAnimateValueTime( const ::rtl::OUString
> & val );
> +::com::sun::star::uno::Any GetTimeAnimateValueTime( const OUString & val
> );
>
> } }
>
> diff --git a/oox/source/ppt/animvariantcontext.cxx
> b/oox/source/ppt/animvariantcontext.cxx
> index 8439d9d..51ff3a4 100644
> --- a/oox/source/ppt/animvariantcontext.cxx
> +++ b/oox/source/ppt/animvariantcontext.cxx
> @@ -32,7 +32,6 @@
> #include "oox/drawingml/colorchoicecontext.hxx"
> #include "pptfilterhelpers.hxx"
>
> -using ::rtl::OUString;
> using namespace ::oox::core;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> diff --git a/oox/source/ppt/backgroundproperties.cxx
> b/oox/source/ppt/backgroundproperties.cxx
> index f38545c..b28512d 100644
> --- a/oox/source/ppt/backgroundproperties.cxx
> +++ b/oox/source/ppt/backgroundproperties.cxx
> @@ -22,7 +22,6 @@
> #include "oox/drawingml/drawingmltypes.hxx"
> #include "oox/core/contexthandler2.hxx"
>
> -using ::rtl::OUString;
> using namespace ::oox::core;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> diff --git a/oox/source/ppt/commonbehaviorcontext.cxx
> b/oox/source/ppt/commonbehaviorcontext.cxx
> index e4e0b18..14c6c6b 100644
> --- a/oox/source/ppt/commonbehaviorcontext.cxx
> +++ b/oox/source/ppt/commonbehaviorcontext.cxx
> @@ -35,8 +35,6 @@
>
> #include <string.h>
>
> -using ::rtl::OUString;
> -using ::rtl::OUStringBuffer;
> using namespace ::oox::core;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> @@ -95,7 +93,7 @@
> if(msCurrentAttribute.compareToAscii(
> attrConv->mpMSName ) == 0 )
> {
> Attribute attr;
> - attr.name = ::rtl::OUString::intern(
> attrConv->mpAPIName,
> + attr.name = OUString::intern(
> attrConv->mpAPIName,
>
> strlen(attrConv->mpAPIName),
>
> RTL_TEXTENCODING_ASCII_US );
> attr.type = attrConv->meAttribute;
> diff --git a/oox/source/ppt/commonbehaviorcontext.hxx
> b/oox/source/ppt/commonbehaviorcontext.hxx
> index 43ca6f1..c99941d 100644
> --- a/oox/source/ppt/commonbehaviorcontext.hxx
> +++ b/oox/source/ppt/commonbehaviorcontext.hxx
> @@ -31,7 +31,7 @@
>
> struct Attribute
> {
> - ::rtl::OUString name;
> + OUString name;
> MS_AttributeNames type;
> };
>
> @@ -49,7 +49,7 @@
>
> virtual void onEndElement();
>
> - virtual void onCharacters( const ::rtl::OUString& aChars );
> + virtual void onCharacters( const OUString& aChars );
>
> virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32
> aElementToken, const AttributeList& rAttribs );
>
> @@ -57,7 +57,7 @@
> bool mbInAttrList;
> bool mbIsInAttrName;
> std::list< Attribute > maAttributes;
> - ::rtl::OUString msCurrentAttribute;
> + OUString msCurrentAttribute;
> };
>
>
> diff --git a/oox/source/ppt/commontimenodecontext.cxx
> b/oox/source/ppt/commontimenodecontext.cxx
> index dd2e863..4c5e154 100644
> --- a/oox/source/ppt/commontimenodecontext.cxx
> +++ b/oox/source/ppt/commontimenodecontext.cxx
> @@ -47,7 +47,6 @@
> using namespace ::com::sun::star::xml::sax;
>
>
> -using ::rtl::OUString;
> using ::com::sun::star::beans::NamedValue;
>
> namespace oox { namespace ppt {
> diff --git a/oox/source/ppt/customshowlistcontext.cxx
> b/oox/source/ppt/customshowlistcontext.cxx
> index c5684f1..eb7d255 100644
> --- a/oox/source/ppt/customshowlistcontext.cxx
> +++ b/oox/source/ppt/customshowlistcontext.cxx
> @@ -56,7 +56,7 @@
> switch( aElementToken )
> {
> case PPT_TOKEN( sld ) :
> - mrCustomShow.maSldLst.push_back( rAttribs.getString( R_TOKEN(
> id ), rtl::OUString() ) );
> + mrCustomShow.maSldLst.push_back( rAttribs.getString( R_TOKEN(
> id ), OUString() ) );
> return this;
> default:
> break;
> diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
> index edb571f..10d4e1d 100644
> --- a/oox/source/ppt/dgmimport.cxx
> +++ b/oox/source/ppt/dgmimport.cxx
> @@ -24,7 +24,6 @@
>
> #include <com/sun/star/drawing/XShape.hpp>
>
> -using ::rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
> index a2e753f..ace5574 100644
> --- a/oox/source/ppt/dgmlayout.cxx
> +++ b/oox/source/ppt/dgmlayout.cxx
> @@ -29,7 +29,6 @@
> #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
> #include <com/sun/star/container/XChild.hpp>
>
> -using ::rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx
> b/oox/source/ppt/extdrawingfragmenthandler.cxx
> index f065415..79b5776 100644
> --- a/oox/source/ppt/extdrawingfragmenthandler.cxx
> +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
> @@ -32,7 +32,6 @@
> using namespace ::oox::core;
> using namespace ::com::sun::star::xml::sax;
> using namespace ::com::sun::star::uno;
> -using ::rtl::OUString;
>
> namespace oox { namespace ppt {
>
> diff --git a/oox/source/ppt/layoutfragmenthandler.cxx
> b/oox/source/ppt/layoutfragmenthandler.cxx
> index 465edc9..d2e72e6 100644
> --- a/oox/source/ppt/layoutfragmenthandler.cxx
> +++ b/oox/source/ppt/layoutfragmenthandler.cxx
> @@ -27,7 +27,6 @@
> #include "oox/ppt/layoutfragmenthandler.hxx"
> #include "oox/drawingml/shapegroupcontext.hxx"
>
> -using rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::oox::core;
> using namespace ::oox::drawingml;
> diff --git a/oox/source/ppt/pptfilterhelpers.cxx
> b/oox/source/ppt/pptfilterhelpers.cxx
> index bd275ba..ca6ba36 100644
> --- a/oox/source/ppt/pptfilterhelpers.cxx
> +++ b/oox/source/ppt/pptfilterhelpers.cxx
> @@ -23,11 +23,6 @@
>
> #include "pptfilterhelpers.hxx"
>
> -
> -using rtl::OUString;
> -
> -#include "pptfilterhelpers.hxx"
> -
> namespace oox { namespace ppt {
>
> // BEGIN CUT&PASTE from sd pptanimations.hxx
> diff --git a/oox/source/ppt/pptfilterhelpers.hxx
> b/oox/source/ppt/pptfilterhelpers.hxx
> index ed2e4f6..3924b2d 100644
> --- a/oox/source/ppt/pptfilterhelpers.hxx
> +++ b/oox/source/ppt/pptfilterhelpers.hxx
> @@ -79,7 +79,7 @@
> sal_Int16 mnSubType;
> sal_Bool mbDirection; // true: default geometric direction
>
> - static const transition* find( const rtl::OUString& rName );
> + static const transition* find( const OUString& rName );
> static const sal_Char* find( const sal_Int16 mnType, const
> sal_Int16 mnSubType, const sal_Bool bDirection );
> };
> // END CUT&PASTE
> diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx
> b/oox/source/ppt/pptgraphicshapecontext.cxx
> index 71d7f97..e21b9a1 100644
> --- a/oox/source/ppt/pptgraphicshapecontext.cxx
> +++ b/oox/source/ppt/pptgraphicshapecontext.cxx
> @@ -36,7 +36,6 @@
> #include "oox/drawingml/textbodycontext.hxx"
> #include <oox/token/tokens.hxx>
>
> -using rtl::OUString;
> using namespace oox::core;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
> index a8e4d0e..0635526 100644
> --- a/oox/source/ppt/pptimport.cxx
> +++ b/oox/source/ppt/pptimport.cxx
> @@ -24,7 +24,6 @@
> #include "oox/helper/graphichelper.hxx"
> #include "oox/ole/vbaproject.hxx"
>
> -using ::rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
> index e42321e..6da39d3 100644
> --- a/oox/source/ppt/pptshape.cxx
> +++ b/oox/source/ppt/pptshape.cxx
> @@ -29,7 +29,6 @@
> #include <basegfx/matrix/b2dhommatrix.hxx>
> #include "oox/ppt/slidepersist.hxx"
>
> -using rtl::OUString;
> using namespace ::oox::core;
> using namespace ::oox::drawingml;
> using namespace ::com::sun::star;
> @@ -117,13 +116,13 @@
> const awt::Rectangle* pShapeRect,
> ::oox::drawingml::ShapeIdMap* pShapeMap )
> {
> - OSL_TRACE("add shape id: %s location: %s subtype: %d service: %s",
> rtl::OUStringToOString(msId, RTL_TEXTENCODING_UTF8 ).getStr(),
> meShapeLocation == Master ? "master" : meShapeLocation == Slide ? "slide" :
> meShapeLocation == Layout ? "layout" : "other", mnSubType,
> rtl::OUStringToOString(msServiceName, RTL_TEXTENCODING_UTF8 ).getStr());
> + OSL_TRACE("add shape id: %s location: %s subtype: %d service: %s",
> OUStringToOString(msId, RTL_TEXTENCODING_UTF8 ).getStr(), meShapeLocation
> == Master ? "master" : meShapeLocation == Slide ? "slide" : meShapeLocation
> == Layout ? "layout" : "other", mnSubType, OUStringToOString(msServiceName,
> RTL_TEXTENCODING_UTF8 ).getStr());
> // only placeholder from layout are being inserted
> if ( mnSubType && ( meShapeLocation == Master ) )
> return;
> try
> {
> - rtl::OUString sServiceName( msServiceName );
> + OUString sServiceName( msServiceName );
> if( !sServiceName.isEmpty() )
> {
> oox::drawingml::TextListStylePtr aMasterTextListStyle;
> @@ -133,7 +132,7 @@
> if ( sServiceName !=
> "com.sun.star.drawing.GraphicObjectShape" &&
> sServiceName != "com.sun.star.drawing.OLE2Shape" )
> {
> - const rtl::OUString sOutlinerShapeService(
> "com.sun.star.presentation.OutlinerShape" );
> + const OUString sOutlinerShapeService(
> "com.sun.star.presentation.OutlinerShape" );
> OSL_TRACE("has master: %p",
> rSlidePersist.getMasterPersist().get());
> switch( mnSubType )
> {
> @@ -147,7 +146,7 @@
> case XML_subTitle :
> {
> if ( ( meShapeLocation == Master ) || (
> meShapeLocation == Layout ) )
> - sServiceName = rtl::OUString();
> + sServiceName = OUString();
> else {
> sServiceName =
> "com.sun.star.presentation.SubtitleShape";
> aMasterTextListStyle =
> rSlidePersist.getMasterPersist().get() ?
> rSlidePersist.getMasterPersist()->getTitleTextStyle() :
> rSlidePersist.getTitleTextStyle();
> @@ -224,7 +223,7 @@
> }
> }
>
> - OSL_TRACE("shape service: %s",
> rtl::OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8 ).getStr());
> + OSL_TRACE("shape service: %s",
> OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8 ).getStr());
>
> if( mnSubType && getSubTypeIndex().has() && meShapeLocation
> == Layout ) {
> oox::drawingml::ShapePtr pPlaceholder =
> PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(),
> rSlidePersist.getShapes()->getChildren(), true );
> @@ -282,7 +281,7 @@
> }
> if( pPPTPlaceholder->mpPlaceholder.get() ) {
> OSL_TRACE("placeholder has parent placeholder: %s
> type: %s index: %d",
> - rtl::OUStringToOString(
> pPPTPlaceholder->mpPlaceholder->getId(), RTL_TEXTENCODING_UTF8 ).getStr(),
> + OUStringToOString(
> pPPTPlaceholder->mpPlaceholder->getId(), RTL_TEXTENCODING_UTF8 ).getStr(),
> lclDebugSubType(
> pPPTPlaceholder->mpPlaceholder->getSubType() ),
>
> pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().get() );
> OSL_TRACE("has textbody %d",
> pPPTPlaceholder->mpPlaceholder->getTextBody() != NULL );
> @@ -297,7 +296,7 @@
> } else if( !mpPlaceholder.get() ) {
> aMasterTextListStyle.reset();
> }
> - OSL_TRACE("placeholder id: %s", pPlaceholder.get() ?
> rtl::OUStringToOString(pPlaceholder->getId(), RTL_TEXTENCODING_UTF8
> ).getStr() : "not found");
> + OSL_TRACE("placeholder id: %s", pPlaceholder.get() ?
> OUStringToOString(pPlaceholder->getId(), RTL_TEXTENCODING_UTF8 ).getStr() :
> "not found");
> }
>
> if ( !sServiceName.isEmpty() )
> @@ -337,7 +336,7 @@
> {
> try
> {
> - rtl::OUString aTitleText;
> + OUString aTitleText;
> Reference< XTextRange > xText( xShape,
> UNO_QUERY_THROW );
> aTitleText = xText->getString();
> if ( !aTitleText.isEmpty() && (
> aTitleText.getLength() < 64 ) ) // just a magic value, but we don't want
> to set slide names which are too long
> diff --git a/oox/source/ppt/pptshapecontext.cxx
> b/oox/source/ppt/pptshapecontext.cxx
> index 82a7250..a42fe8d 100644
> --- a/oox/source/ppt/pptshapecontext.cxx
> +++ b/oox/source/ppt/pptshapecontext.cxx
> @@ -36,7 +36,6 @@
> #include "oox/drawingml/textbodycontext.hxx"
> #include "oox/drawingml/transform2dcontext.hxx"
>
> -using rtl::OUString;
> using namespace oox::core;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> @@ -191,7 +190,7 @@
> }
> if ( pPlaceholder.get() )
> {
> - OSL_TRACE("shape %s will get shape
> reference %s applied", rtl::OUStringToOString(mpShapePtr->getId(),
> RTL_TEXTENCODING_UTF8 ).getStr(),
> rtl::OUStringToOString(pPlaceholder->getId(), RTL_TEXTENCODING_UTF8
> ).getStr());
> + OSL_TRACE("shape %s will get shape
> reference %s applied", OUStringToOString(mpShapePtr->getId(),
> RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString(pPlaceholder->getId(),
> RTL_TEXTENCODING_UTF8 ).getStr());
> mpShapePtr->applyShapeReference(
> *pPlaceholder.get() );
> PPTShape* pPPTShape = dynamic_cast<
> PPTShape* >( pPlaceholder.get() );
> if ( pPPTShape )
> diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
> b/oox/source/ppt/pptshapegroupcontext.cxx
> index 9ade8fa..c77353c 100644
> --- a/oox/source/ppt/pptshapegroupcontext.cxx
> +++ b/oox/source/ppt/pptshapegroupcontext.cxx
> @@ -35,7 +35,6 @@
> #include "oox/drawingml/fillproperties.hxx"
> #include "extdrawingfragmenthandler.hxx"
>
> -using rtl::OUString;
> using namespace oox::core;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx
> b/oox/source/ppt/pptshapepropertiescontext.cxx
> index 2013386..f49f905 100644
> --- a/oox/source/ppt/pptshapepropertiescontext.cxx
> +++ b/oox/source/ppt/pptshapepropertiescontext.cxx
> @@ -33,7 +33,6 @@
> #include "oox/drawingml/customshapegeometry.hxx"
> #include "oox/drawingml/textbodycontext.hxx"
>
> -using rtl::OUString;
> using namespace oox::core;
> using namespace ::com::sun::star;
> using namespace ::com::sun::star::uno;
> diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
> b/oox/source/ppt/presentationfragmenthandler.cxx
> index c92cdad..196a470 100644
> --- a/oox/source/ppt/presentationfragmenthandler.cxx
> +++ b/oox/source/ppt/presentationfragmenthandler.cxx
> @@ -41,7 +41,6 @@
> #include "oox/ppt/layoutfragmenthandler.hxx"
> #include "oox/ppt/pptimport.hxx"
>
> -using rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::oox::core;
> using namespace ::oox::drawingml;
> @@ -89,7 +88,7 @@
> Reference< XPropertySetInfo > xPropSetInfo(
> xPropSet->getPropertySetInfo() );
> if ( xPropSetInfo->hasPropertyByName( sURL ) )
> {
> - rtl::OUString aURL;
> + OUString aURL;
> if ( xPropSet->getPropertyValue( sURL ) >>= aURL )
> {
> const OUString sSlide = CREATE_OUSTRING( "#Slide " );
> @@ -136,7 +135,7 @@
> // todo: localized progress bar text
> const Reference< task::XStatusIndicator >& rxStatusIndicator(
> getFilter().getStatusIndicator() );
> if ( rxStatusIndicator.is() )
> - rxStatusIndicator->start( rtl::OUString(), 10000 );
> + rxStatusIndicator->start( OUString(), 10000 );
>
> try
> {
> @@ -163,7 +162,7 @@
> OUString aSlideFragmentPath = getFragmentPathFromRelId(
> maSlidesVector[ nSlide ] );
> if( !aSlideFragmentPath.isEmpty() )
> {
> - rtl::OUString aMasterFragmentPath;
> + OUString aMasterFragmentPath;
> SlidePersistPtr pMasterPersistPtr;
> SlidePersistPtr pSlidePersistPtr( new SlidePersist(
> rFilter, sal_False, sal_False, xSlide,
> ShapePtr( new PPTShape( Slide,
> "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
> @@ -286,9 +285,9 @@
> }
> catch( uno::Exception& )
> {
> - OSL_FAIL(
> OString(rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(),
> "
> + OSL_FAIL(
> OString(OString("oox::ppt::PresentationFragmentHandler::EndDocument(), "
> "exception caught: ") +
> - rtl::OUStringToOString(
> + OUStringToOString(
> comphelper::anyToString( cppu::getCaughtException() ),
> RTL_TEXTENCODING_UTF8 )).getStr() );
>
> diff --git a/oox/source/ppt/slidefragmenthandler.cxx
> b/oox/source/ppt/slidefragmenthandler.cxx
> index a59f2e1..643fad2 100644
> --- a/oox/source/ppt/slidefragmenthandler.cxx
> +++ b/oox/source/ppt/slidefragmenthandler.cxx
> @@ -39,7 +39,6 @@
> #include "oox/ppt/pptimport.hxx"
>
>
> -using rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::oox::core;
> using namespace ::oox::drawingml;
> @@ -214,9 +213,9 @@
> }
> catch( uno::Exception& )
> {
> - OSL_FAIL(
> OString(rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), "
> + OSL_FAIL(
> OString(OString("oox::ppt::SlideFragmentHandler::EndElement(), "
> "exception caught: ") +
> - rtl::OUStringToOString(
> + OUStringToOString(
> comphelper::anyToString( cppu::getCaughtException() ),
> RTL_TEXTENCODING_UTF8 )).getStr() );
> }
> diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx
> b/oox/source/ppt/slidemastertextstylescontext.cxx
> index da25e95..71f6767 100644
> --- a/oox/source/ppt/slidemastertextstylescontext.cxx
> +++ b/oox/source/ppt/slidemastertextstylescontext.cxx
> @@ -21,7 +21,6 @@
> #include "oox/drawingml/textliststylecontext.hxx"
> #include "oox/ppt/slidemastertextstylescontext.hxx"
>
> -using rtl::OUString;
> using namespace ::oox::core;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::xml::sax;
> diff --git a/oox/source/ppt/slidepersist.cxx
> b/oox/source/ppt/slidepersist.cxx
> index 77a1601..aebf0f5 100644
> --- a/oox/source/ppt/slidepersist.cxx
> +++ b/oox/source/ppt/slidepersist.cxx
> @@ -208,13 +208,13 @@
> if ( aXNameAccess.is() && aXNamed.is() )
> {
> oox::drawingml::TextListStylePtr pTextListStylePtr;
> - rtl::OUString aStyle;
> - rtl::OUString aFamily;
> + OUString aStyle;
> + OUString aFamily;
>
> - const rtl::OUString sOutline(
> RTL_CONSTASCII_USTRINGPARAM( "outline1" ) );
> - const rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM(
> "title" ) );
> - const rtl::OUString sStandard(
> RTL_CONSTASCII_USTRINGPARAM( "standard" ) );
> - const rtl::OUString sSubtitle(
> RTL_CONSTASCII_USTRINGPARAM( "subtitle" ) );
> + const OUString sOutline( "outline1" );
> + const OUString sTitle( "title" );
> + const OUString sStandard( "standard" );
> + const OUString sSubtitle( "subtitle" );
>
> for( int i = 0; i < 4; i++ ) // todo: aggregation of
> bodystyle (subtitle)
> {
> @@ -245,7 +245,7 @@
> {
> pTextListStylePtr = maOtherTextStylePtr;
> aStyle = sStandard;
> - aFamily = rtl::OUString(
> RTL_CONSTASCII_USTRINGPARAM( "graphics" ) );
> + aFamily = OUString( "graphics" );
> break;
> }
> case 5 : // subtitle
> @@ -276,7 +276,7 @@
> {
> sal_Char pOutline[ 9 ] =
> "outline1";
> pOutline[ 7 ] =
> static_cast< sal_Char >( '0' + nLevel );
> - rtl::OUString
> sOutlineStyle( rtl::OUString::createFromAscii( pOutline ) );
> + OUString sOutlineStyle(
> OUString::createFromAscii( pOutline ) );
> if (
> xFamilies->hasByName( sOutlineStyle ) )
> {
> xFamilies->getByName(
> sOutlineStyle ) >>= aXStyle;
> @@ -313,7 +313,7 @@
> std::vector< oox::drawingml::ShapePtr >::iterator aChildIter(
> rChildren.begin() );
> while( aChildIter != rChildren.end() ) {
> PPTShape* pPPTShape = dynamic_cast< PPTShape* >(
> (*aChildIter++).get() );
> - OSL_TRACE("hide shape with id: %s",
> rtl::OUStringToOString(pPPTShape->getId(), RTL_TEXTENCODING_UTF8
> ).getStr());
> + OSL_TRACE("hide shape with id: %s",
> OUStringToOString(pPPTShape->getId(), RTL_TEXTENCODING_UTF8 ).getStr());
> pPPTShape->setHiddenMasterShape( true );
> }
> }
> diff --git a/oox/source/ppt/slidetimingcontext.cxx
> b/oox/source/ppt/slidetimingcontext.cxx
> index 2bcdc75..6fe48aa 100644
> --- a/oox/source/ppt/slidetimingcontext.cxx
> +++ b/oox/source/ppt/slidetimingcontext.cxx
> @@ -29,7 +29,6 @@
> #include "oox/ppt/timenodelistcontext.hxx"
> #include "buildlistcontext.hxx"
>
> -using rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::oox::core;
> using namespace ::oox::drawingml;
> diff --git a/oox/source/ppt/slidetransition.cxx
> b/oox/source/ppt/slidetransition.cxx
> index cd918b2..7f060c0 100644
> --- a/oox/source/ppt/slidetransition.cxx
> +++ b/oox/source/ppt/slidetransition.cxx
> @@ -31,7 +31,6 @@
> #include "oox/token/tokens.hxx"
> #include "pptfilterhelpers.hxx"
>
> -using rtl::OUString;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::beans;
> using namespace ::com::sun::star::animations;
> diff --git a/oox/source/ppt/slidetransitioncontext.cxx
> b/oox/source/ppt/slidetransitioncontext.cxx
> index 59ac599..5c56c98 100644
> --- a/oox/source/ppt/slidetransitioncontext.cxx
> +++ b/oox/source/ppt/slidetransitioncontext.cxx
> @@ -31,7 +31,6 @@
> #include "oox/drawingml/shapegroupcontext.hxx"
> #include "oox/helper/attributelist.hxx"
>
> -using rtl::OUString;
> using namespace ::com::sun::star;
> using namespace ::oox::core;
> using namespace ::oox::drawingml;
> diff --git a/oox/source/ppt/soundactioncontext.cxx
> b/oox/source/ppt/soundactioncontext.cxx
> index 2b353d7..b1f72b5 100644
> --- a/oox/source/ppt/soundactioncontext.cxx
> +++ b/oox/source/ppt/soundactioncontext.cxx
> @@ -26,7 +26,6 @@
> #include "oox/helper/propertymap.hxx"
> #include "oox/drawingml/embeddedwavaudiofile.hxx"
>
> -using rtl::OUString;
> using namespace ::oox::core;
> using namespace ::com::sun::star::xml::sax;
> using namespace ::com::sun::star::uno;
> @@ -63,17 +62,6 @@
> // try the builtIn version
> url = msSndName;
> }
> -#if 0 // OOo does not support embedded data yet
> - else if ( msEmbedded.getLength() != 0 )
> - {
> - RelationsRef xRel = getHandler()->getRelations();
> - url = xRel->getRelationById( msEmbedded )->msTarget;
> - }
> - else if ( msLink.getLength() != 0 )
> - {
> - url = msLink;
> - }
> -#endif
> if ( !url.isEmpty() )
> {
> maSlideProperties[ PROP_Sound ] <<= url;
> diff --git a/oox/source/ppt/timeanimvaluecontext.cxx
> b/oox/source/ppt/timeanimvaluecontext.cxx
> index bb59518..cfae1ce 100644
> --- a/oox/source/ppt/timeanimvaluecontext.cxx
> +++ b/oox/source/ppt/timeanimvaluecontext.cxx
> @@ -60,8 +60,8 @@
> {
> mbInValue = true;
> TimeAnimationValue val;
> - val.msFormula = rAttribs.getString( XML_fmla, rtl::OUString()
> );
> - val.msTime = rAttribs.getString( XML_tm, rtl::OUString() );
> + val.msFormula = rAttribs.getString( XML_fmla, OUString() );
> + val.msTime = rAttribs.getString( XML_tm, OUString() );
> maTavList.push_back( val );
> return this;
> }
> diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
> index 21ddf36..e02d3cf 100644
> --- a/oox/source/ppt/timenode.cxx
> +++ b/oox/source/ppt/timenode.cxx
> @@ -41,7 +41,6 @@
> #include "oox/helper/helper.hxx"
> #include "oox/core/xmlfilterbase.hxx"
>
> -using ::rtl::OUString;
> using namespace ::oox::core;
> using namespace ::com::sun::star::beans;
> using namespace ::com::sun::star::container;
> @@ -59,7 +58,6 @@
> switch( nNodeType )
> {
> case AnimationNodeType::PAR:
> -// sServiceName =
> CREATE_OUSTRING("com.sun.star.animations.IterateContainer");
> sServiceName =
> CREATE_OUSTRING("com.sun.star.animations.ParallelTimeContainer");
> break;
> case AnimationNodeType::SEQ:
> diff --git a/oox/source/ppt/timenodelistcontext.cxx
> b/oox/source/ppt/timenodelistcontext.cxx
> index 39ef150..fedcf46 100644
> --- a/oox/source/ppt/timenodelistcontext.cxx
> +++ b/oox/source/ppt/timenodelistcontext.cxx
> @@ -61,8 +61,6 @@
> using namespace ::com::sun::star::xml::sax;
> using ::com::sun::star::beans::NamedValue;
>
> -using ::rtl::OUString;
> -
> namespace oox { namespace ppt {
>
> struct AnimColor
> @@ -257,7 +255,7 @@
> switch( maType )
> {
> case XML_verb:
> - aParamValue.Name =
> OUString(RTL_CONSTASCII_USTRINGPARAM("Verb"));
> + aParamValue.Name = OUString("Verb");
> // TODO make sure msCommand has what we want
> aParamValue.Value <<= msCommand.toInt32();
> nCommand = EffectCommands::VERB;
> @@ -272,7 +270,7 @@
> {
> nCommand = EffectCommands::PLAY;
> }
> - else if( msCommand.compareToAscii(
> RTL_CONSTASCII_STRINGPARAM("playFrom") ) == 0 )
> + else if( msCommand.compareToAscii( "playFrom"
> ) == 0 )
> {
> const OUString aMediaTime(
> msCommand.copy( 9, msCommand.getLength() - 10 ) );
> rtl_math_ConversionStatus eStatus;
> diff --git a/oox/source/ppt/timetargetelementcontext.cxx
> b/oox/source/ppt/timetargetelementcontext.cxx
> index ed6fbab..388a88d 100644
> --- a/oox/source/ppt/timetargetelementcontext.cxx
> +++ b/oox/source/ppt/timetargetelementcontext.cxx
> @@ -32,8 +32,6 @@
> using namespace ::com::sun::star::xml::sax;
> using namespace ::oox::core;
>
> -using ::rtl::OUString;
> -
> namespace oox { namespace ppt {
>
>
>
> --
> To view, visit https://gerrit.libreoffice.org/1520
> To unsubscribe, visit https://gerrit.libreoffice.org/settings
>
> Gerrit-MessageType: newchange
> Gerrit-Change-Id: I434462635392c750e2359f9d656d5e1885f2a0dc
> Gerrit-PatchSet: 1
> Gerrit-Project: core
> Gerrit-Branch: master
> Gerrit-Owner: José Guilherme Vanz <guilherme.sft at gmail.com>
>
> _______________________________________________
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20121231/59960ca1/attachment-0001.html>
More information about the LibreOffice
mailing list