[Libreoffice-commits] core.git: 2 commits - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/sdr/contact/viewcontactofgraphic.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 0f976bdb7b7735b4364ae6f3a84a950ab07822bb
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Dec 5 16:49:04 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 5 20:09:47 2021 +0100

    cid#1494630 #3 rearrange to demo Logically dead code
    
    Change-Id: I263ce873a2a308a1a986fd09310b691d9c6525fa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126385
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx 
b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 4e1aa179b976..d2e21ed0d487 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -328,7 +328,7 @@ namespace sdr::contact
             if (bRota180)
             {
                 const sal_uInt16 nMirrorCase(bMirrored ? 3 : 4);
-                bHMirr = ((2 == nMirrorCase ) || (4 == nMirrorCase));
+                bHMirr = 4 == nMirrorCase;
 
                 // if bRota180 which is used for vertical mirroring, the 
graphic will already be rotated
                 // by 180 degrees. To correct, switch off VMirror and invert 
HMirroring.
@@ -338,8 +338,8 @@ namespace sdr::contact
             else
             {
                 const sal_uInt16 nMirrorCase(bMirrored ? 2 : 1);
-                bHMirr = ((2 == nMirrorCase ) || (4 == nMirrorCase));
-                bVMirr = ((3 == nMirrorCase ) || (4 == nMirrorCase));
+                bHMirr = 2 == nMirrorCase;
+                bVMirr = false;
             }
 
             if(bHMirr || bVMirr)
commit b8e36ff21c50985d56ec499211302586bc451891
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Dec 5 16:47:55 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 5 20:09:33 2021 +0100

    cid#1494630 #2 rearrange to demo Logically dead code
    
    Change-Id: Ie94429f2d8c8c05780c53b223b7d5bf20d63a522
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126384
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx 
b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index c22095e2c016..4e1aa179b976 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -327,9 +327,8 @@ namespace sdr::contact
             // accordingly. The created bitmapPrimitive WILL use the rotation, 
too.
             if (bRota180)
             {
-                const sal_uInt16 nMirrorCase(bRota180 ? (bMirrored ? 3 : 4) : 
(bMirrored ? 2 : 1));
+                const sal_uInt16 nMirrorCase(bMirrored ? 3 : 4);
                 bHMirr = ((2 == nMirrorCase ) || (4 == nMirrorCase));
-                bVMirr = ((3 == nMirrorCase ) || (4 == nMirrorCase));
 
                 // if bRota180 which is used for vertical mirroring, the 
graphic will already be rotated
                 // by 180 degrees. To correct, switch off VMirror and invert 
HMirroring.
@@ -338,7 +337,7 @@ namespace sdr::contact
             }
             else
             {
-                const sal_uInt16 nMirrorCase(bRota180 ? (bMirrored ? 3 : 4) : 
(bMirrored ? 2 : 1));
+                const sal_uInt16 nMirrorCase(bMirrored ? 2 : 1);
                 bHMirr = ((2 == nMirrorCase ) || (4 == nMirrorCase));
                 bVMirr = ((3 == nMirrorCase ) || (4 == nMirrorCase));
             }