[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Justin Luth]

 sw/source/uibase/shells/grfsh.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c31afc3624224b926069e87ad13c14f8cc9d63ce
Author: Justin Luth <justin_luth at sil.org>
Date:   Mon Feb 15 17:57:36 2016 +0300

    tdf#82012 - keep flip settings when compressing image
    
    Format - flip - Horizontal/Vertical setting was lost when compressing
    an image.
    
    Change-Id: Id39e7ce9a82174ac2248851107e398979fba56aa
    Reviewed-on: https://gerrit.libreoffice.org/22385
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 901d9c4..cbd82f1 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -151,8 +151,9 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                     convertTwipToMm100(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width()),
                     convertTwipToMm100(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Height()));
 
-                SfxItemSet aSet( rSh.GetAttrPool(), RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF );
+                SfxItemSet aSet( rSh.GetAttrPool(), RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF );
                 rSh.GetCurAttr( aSet );
+                SwMirrorGrf aMirror( static_cast<const SwMirrorGrf&>( aSet.Get(RES_GRFATR_MIRRORGRF)) );
                 SwCropGrf aCrop( static_cast<const SwCropGrf&>( aSet.Get(RES_GRFATR_CROPGRF)) );
 
                 Rectangle aCropRectangle(
@@ -179,6 +180,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                     rSh.ReRead(OUString(), OUString(), const_cast<const Graphic*>(&aCompressedGraphic));
 
                     rSh.SetAttrItem(aCrop);
+                    rSh.SetAttrItem(aMirror);
 
                     rSh.EndUndo(UNDO_END);
                     rSh.EndAllAction();