summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-11-18 13:50:32 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-11-20 10:48:26 +0100
commit2d06d4ccdf938d87b2adc2d95f280a0acefc5b69 (patch)
tree1b8fd38202e479e16bf65eb28fca35df2b7cb41a
parentdec31de5062ca3ddd3661ab25708c885c9544a80 (diff)
sw: insert image: set anchor to at-char by default
This changes the default set in commit 4f40bf6a79de6d60da0a5090cdfeda6242e889f0 (sw: insert image: set anchor to as-char by default, 2019-07-04), to have a better compromise, taking both Word defaults compatibility and usability into account. The problem is that users are used to just inserting an image and being able to drag it to its final location, which is broken with as-char anchoring. So default to at-char anchoring, this is still something that is fully interoperable to Word (unlike the old to-para anchoring), but allows the easier image move again. [ Testcase not backported, would depend on the original testcase from the above commit. ] (cherry picked from commit a7528cd6f17ea5c5b29e7d607e54c62de0d9e7db) Conflicts: sw/qa/extras/unowriter/unowriter.cxx sw/source/uibase/frmdlg/frmmgr.cxx Change-Id: Ibc61ae167fc9e5cc31b04c83e854556309e27fd4 Reviewed-on: https://gerrit.libreoffice.org/83263 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--sw/source/uibase/frmdlg/frmmgr.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 792bfa509522..6c79c8d4b0c9 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -87,11 +87,7 @@ 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 )