diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-02-18 11:47:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-19 13:06:15 +0000 |
| commit | 58e7439c396ba8d449e32db9afd8f3f71acc071b (patch) | |
| tree | 2e653aa69692b43bbae39ee40dc58d31bde41e40 /sw/inc/IDocumentContentOperations.hxx | |
| parent | 81a2fc786728205b0a869b38a95fc889662b08a6 (diff) | |
Resolves: #i124188# assure correct insertion of text attribute...
for as-character anchored drawing objects
Thx to Andre for his deep analysis.
(cherry picked from commit 28c0c081d07e5a49ccd238e7f4e882347ab3690c)
Conflicts:
sw/source/core/doc/doclay.cxx
sw/source/core/frmedt/fecopy.cxx
sw/source/filter/rtf/swparrtf.cxx
Change-Id: I73c4d3d6e3cd8e7079fe88b6baa5eaea52a89dd9
Diffstat (limited to 'sw/inc/IDocumentContentOperations.hxx')
| -rw-r--r-- | sw/inc/IDocumentContentOperations.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 7fd45f74febe..57684605854a 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -125,7 +125,7 @@ public: /** Insert a DrawObject. The object must be already registered in DrawModel. */ - virtual SwDrawFrmFmt* Insert(const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet* pFlyAttrSet, SwFrmFmt*) = 0; + virtual SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0; /** Insert OLE-objects. */ |