[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Tor Lillqvist (via logerrit)]

 sw/source/uibase/frmdlg/frmmgr.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit c261b3aae843e10ed169b6f08356386688d521d2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 17 19:01:44 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Oct 17 19:06:47 2019 +0200

    tdf#128021 Make "Anchor to character" the default for inserted images on iOS
    
    Apparently this matches Word on iOS, even if Word on Windows has it
    the other way?
    
    Change-Id: I9949585e1d4e70627d47056dd92abffea24f0b28
    Reviewed-on: https://gerrit.libreoffice.org/80986
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 184b4177fbb3..792bfa509522 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -87,7 +87,11 @@ SwFlyFrameAttrMgr::SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type nT
 
         if (nType == Frmmgr_Type::GRF || nType == Frmmgr_Type::OLE)
         {
+#ifndef IOS // tdf#128021
             m_aSet.Put(SwFormatAnchor(RndStdIds::FLY_AS_CHAR));
+#else
+            m_aSet.Put(SwFormatAnchor(RndStdIds::FLY_AT_CHAR));
+#endif
         }
     }
     else if ( nType == Frmmgr_Type::NONE )