diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-04 14:33:37 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-04 16:08:07 +0100 |
commit | a2f85c062aafb3fd9dfb1c6c6e87e1e73e7545a3 (patch) | |
tree | 282f68919f0fbc79e9fec63e83540ecc2fbaf970 /sw/inc | |
parent | 7ffd38fc54dda2d2c84eab19c40efcbac7fb0bff (diff) |
tdf#130362 sw: fix anchoring of inline math objects
Regression from a7528cd6f17ea5c5b29e7d607e54c62de0d9e7db (sw: insert
image: set anchor to at-char by default, 2019-11-18), that defaulted to
at-char anchoring for charts and images.
What was not considered is that math objects had a previous as-char
default (not to-para), and that is supposed to be unchanged.
Change-Id: I2a91af6425035b48a0e47ad9b10939945855cd16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87976
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IDocumentContentOperations.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 6ba51df9f740..b6857c346a33 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -180,7 +180,7 @@ public: */ virtual SwFlyFrameFormat* InsertEmbObject( const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, - const SfxItemSet* pFlyAttrSet) = 0; + SfxItemSet* pFlyAttrSet) = 0; virtual SwFlyFrameFormat* InsertOLE( const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 46f6be2294b0..87319659505a 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -626,7 +626,7 @@ public: bool GetPageNumber( long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&, - const SfxItemSet* pFlyAttrSet ); + SfxItemSet* pFlyAttrSet ); bool FinishOLEObj(); ///< Shutdown server. void GetTableAttr( SfxItemSet & ) const; |