[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sd/inc sd/source

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/unnecessaryparen.cxx |    2 +-
 compilerplugins/clang/unnecessaryparen.cxx      |    4 +++-
 sd/inc/CustomAnimationPreset.hxx                |    2 +-
 sd/source/core/CustomAnimationPreset.cxx        |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b2c3528cc400bd2c10e56bd9d49e3339013ae388
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Nov 30 11:44:26 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Nov 30 14:59:33 2019 +0100

    ...and take implicit const casts into account
    
    ...following up on 4f8a744c4fcf2c69462af19bd807fee32413158d "Make
    loplugin:unnecessaryparen treat member expressions consistently"
    
    Change-Id: I444d2995e88990c3c6fa2b912ef68032daf2cad9
    Reviewed-on: https://gerrit.libreoffice.org/84112
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx b/compilerplugins/clang/test/unnecessaryparen.cxx
index 88ed3650a09a..c33876ddae61 100644
--- a/compilerplugins/clang/test/unnecessaryparen.cxx
+++ b/compilerplugins/clang/test/unnecessaryparen.cxx
@@ -115,7 +115,7 @@ int main()
     (void)nBits;
 };
 
-struct B { operator bool(); };
+struct B { operator bool() const; };
 
 struct N { bool operator !(); };
 
diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx
index 79085d80027e..106f2d2b3352 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -120,7 +120,9 @@ public:
         // ImplicitCastExpr, so that VisitMemberExpr doesn't erroneously pick it up (and note that
         // CXXMemberCallExpr's getImplicitObjectArgument() skips past the underlying MemberExpr):
         if (auto const e1 = dyn_cast<CXXMemberCallExpr>(expr->getSubExpr())) {
-            if (auto const e2 = dyn_cast<ParenExpr>(e1->getImplicitObjectArgument())) {
+            if (auto const e2 = dyn_cast<ParenExpr>(
+                    e1->getImplicitObjectArgument()->IgnoreImpCasts()))
+            {
                 handled_.insert(e2);
             }
         }
commit 93161eed833913dfef9d9e125952ffd0ff66ac13
Author:     Mark Hung <marklh9 at gmail.com>
AuthorDate: Mon Nov 18 00:48:06 2019 +0800
Commit:     Mark Hung <marklh9 at gmail.com>
CommitDate: Sat Nov 30 14:59:22 2019 +0100

    sd: fix typo maEffectDiscriptorMap -> maEffectDescriptorMap;
    
    Change-Id: Ie0e8dc67969ca680e80c544f954d3bef9adbcb33
    Reviewed-on: https://gerrit.libreoffice.org/83078
    Tested-by: Jenkins
    Reviewed-by: Mark Hung <marklh9 at gmail.com>

diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index ad21b7a00d4a..220dedb9b0e3 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -118,7 +118,7 @@ private:
 
 private:
     css::uno::Reference< css::animations::XAnimationNode > mxRootNode;
-    EffectDescriptorMap maEffectDiscriptorMap;
+    EffectDescriptorMap maEffectDescriptorMap;
     UStringMap maEffectNameMap;
     UStringMap maPropertyNameMap;
 
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index e54c67d95b5c..ed20faf74b3b 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -320,7 +320,7 @@ void CustomAnimationPresets::importEffects()
                     {
                         pDescriptor.reset( new CustomAnimationPreset( pEffect ) );
                         pDescriptor->maLabel = getUINameForPresetId( pEffect->getPresetId() );
-                        maEffectDiscriptorMap[aPresetId] = pDescriptor;
+                        maEffectDescriptorMap[aPresetId] = pDescriptor;
                     }
 
                     ++aIter;
@@ -450,9 +450,9 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
 
 CustomAnimationPresetPtr CustomAnimationPresets::getEffectDescriptor( const OUString& rPresetId ) const
 {
-    EffectDescriptorMap::const_iterator aIter( maEffectDiscriptorMap.find( rPresetId ) );
+    EffectDescriptorMap::const_iterator aIter( maEffectDescriptorMap.find( rPresetId ) );
 
-    if( aIter != maEffectDiscriptorMap.end() )
+    if( aIter != maEffectDescriptorMap.end() )
     {
         return (*aIter).second;
     }