summaryrefslogtreecommitdiff
path: root/sw/source/core/doc/doc.cxx
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-05-15 10:16:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-03-16 10:18:02 +0000
commitbd55f05b332c1573bd410fd9e21ea7fcf977e1b0 (patch)
tree08f503f79525d95d88b36a9546b1e41cc00b1cfb /sw/source/core/doc/doc.cxx
parent409ba4cc0b55e3dc1d3a08c2fb543bc59c4c0da9 (diff)
Resolves: #i118780# Moved ObjectInfoPrimitive2D extractor to drawinglayer...
changed name to be the filename only, added code to SW to set Title and Desc Conflicts: drawinglayer/Library_drawinglayer.mk drawinglayer/Package_inc.mk svx/source/svdraw/svdograf.cxx sw/inc/ndgrf.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/notxtfrm.cxx sw/source/core/docnode/swbaslnk.cxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/rtf/rtffly.cxx Change-Id: Id433031958529498441574dafe2fbd5261371efc
Notes
Diffstat (limited to 'sw/source/core/doc/doc.cxx')
-rw-r--r--sw/source/core/doc/doc.cxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index c6a5c444c85f..670059091ebe 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1039,11 +1039,14 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg,
{
if( !pFrmFmt )
pFrmFmt = GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
- return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeGrfNode(
+ SwGrfNode* pSwGrfNode = GetNodes().MakeGrfNode(
SwNodeIndex( GetNodes().GetEndOfAutotext() ),
rGrfName, rFltName, pGraphic,
- mpDfltGrfFmtColl ),
+ mpDfltGrfFmtColl );
+ SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
pFlyAttrSet, pGrfAttrSet, pFrmFmt );
+ pSwGrfNode->onGraphicChanged();
+ return pSwFlyFrmFmt;
}
SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
@@ -1053,10 +1056,13 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
{
if( !pFrmFmt )
pFrmFmt = GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
- return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeGrfNode(
+ SwGrfNode* pSwGrfNode = GetNodes().MakeGrfNode(
SwNodeIndex( GetNodes().GetEndOfAutotext() ),
- rGrfObj, mpDfltGrfFmtColl ),
+ rGrfObj, mpDfltGrfFmtColl );
+ SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
pFlyAttrSet, pGrfAttrSet, pFrmFmt );
+ pSwGrfNode->onGraphicChanged();
+ return pSwFlyFrmFmt;
}
SwFlyFrmFmt* SwDoc::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,