[Libreoffice-commits] core.git: filter/source

[Noel Grandin]

 filter/source/msfilter/eschesdo.cxx |   18 +++++++++---------
 filter/source/msfilter/eschesdo.hxx |    3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 63577383f1502ca2c859ec765d4280e8195a17d6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon May 29 08:47:51 2017 +0200

    no need for the ImplGetPropertyValue(sal_Unicode*) overload
    
    and no need to convert backwards and forwards between sal_Unicode* and
    OUString
    
    Change-Id: I417f5a59d58f80a41f877f8397bf2985dd08fa62
    Reviewed-on: https://gerrit.libreoffice.org/38125
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 2ad8980fed1d..c89469405c68 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -224,7 +224,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         }
         rObj.SetAngle( rObj.ImplGetInt32PropertyValue( OUString( "RotateAngle" ) ));
 
-        if( ( rObj.ImplGetPropertyValue( OUString( "IsFontwork" ) ) &&
+        if( ( rObj.ImplGetPropertyValue( "IsFontwork" ) &&
             ::cppu::any2bool( rObj.GetUsrAny() ) ) ||
             rObj.GetType() == "drawing.Measure" )
         {
@@ -328,7 +328,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         {
             CircleKind  eCircleKind = CircleKind_FULL;
             PolyStyle   ePolyKind = PolyStyle();
-            if ( rObj.ImplGetPropertyValue( OUString( "CircleKind" ) ) )
+            if ( rObj.ImplGetPropertyValue( "CircleKind" ) )
             {
                 eCircleKind = *o3tl::doAccess<CircleKind>(rObj.GetUsrAny());
                 switch ( eCircleKind )
@@ -363,10 +363,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             else
             {
                 sal_Int32 nStartAngle, nEndAngle;
-                if ( !rObj.ImplGetPropertyValue( OUString( "CircleStartAngle" ) ) )
+                if ( !rObj.ImplGetPropertyValue( "CircleStartAngle" ) )
                     break;
                 nStartAngle = *o3tl::doAccess<sal_Int32>(rObj.GetUsrAny());
-                if( !rObj.ImplGetPropertyValue( OUString( "CircleEndAngle" ) ) )
+                if( !rObj.ImplGetPropertyValue( "CircleEndAngle" ) )
                     break;
                 nEndAngle = *o3tl::doAccess<sal_Int32>(rObj.GetUsrAny());
 
@@ -614,7 +614,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                  'D' == rObj.GetType()[9] )   // drawing.3D
         {
             // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
-            if ( !rObj.ImplGetPropertyValue( OUString( "Bitmap" ) ) )
+            if ( !rObj.ImplGetPropertyValue( "Bitmap" ) )
                 break;
 
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -646,7 +646,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         aPropOpt.CreateShadowProperties( rObj.mXPropSet );
 
         if( SDRLAYER_NOTFOUND != mpEscherEx->GetHellLayerId() &&
-            rObj.ImplGetPropertyValue( OUString( "LayerID" ) ) &&
+            rObj.ImplGetPropertyValue( "LayerID" ) &&
             *o3tl::doAccess<sal_uInt16>(rObj.GetUsrAny()) == sal_uInt8(mpEscherEx->GetHellLayerId()) )
         {
             aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 );
@@ -1161,17 +1161,17 @@ void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
             SetRect(rEx.ImplMapPoint(aOldP), rEx.ImplMapSize(aOldS));
         }
 
-        if( ImplGetPropertyValue( OUString("IsPresentationObject")) )
+        if( ImplGetPropertyValue( "IsPresentationObject" ) )
             mbPresObj = ::cppu::any2bool( mAny );
 
-        if( mbPresObj && ImplGetPropertyValue( OUString("IsEmptyPresentationObject") ) )
+        if( mbPresObj && ImplGetPropertyValue( "IsEmptyPresentationObject" ) )
             mbEmptyPresObj = ::cppu::any2bool( mAny );
 
         mbValid = true;
     }
 }
 
-bool ImplEESdrObject::ImplGetPropertyValue( const sal_Unicode* rString )
+bool ImplEESdrObject::ImplGetPropertyValue( const OUString& rString )
 {
     bool bRetValue = false;
     if( mbValid )
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 4aa1ada7e02e..ea905c82f7c9 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -54,8 +54,7 @@ public:
     ImplEESdrObject( ImplEESdrWriter& rEx, const css::uno::Reference< css::drawing::XShape >& rShape );
     ~ImplEESdrObject();
 
-    bool ImplGetPropertyValue( const sal_Unicode* pString );
-    bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); }
+    bool ImplGetPropertyValue( const OUString& rString );
 
     sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr )
     { return ImplGetPropertyValue( pStr ) ? *o3tl::doAccess<sal_Int32>(mAny) : 0; }