diff options
author | Armin Le Grand <alg@apache.org> | 2011-12-19 15:41:21 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2011-12-19 15:41:21 +0000 |
commit | e2e16715893229b5d0ad2da6c8e84464e0c43a2e (patch) | |
tree | 79d1c632784b3de16fc82c1dfc27c1796a9ef451 /sw/inc | |
parent | ea4f454ed956e08be47783b3bddd7789f905e350 (diff) |
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement to trunk, first version of Svg stable and done
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/cmdid.h | 2 | ||||
-rw-r--r-- | sw/inc/ndgrf.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unoprnms.hxx | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 9ec153757f35..f11f2116bc48 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -910,6 +910,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 116) +#define FN_UNO_REPLACEMENT_GRAPHIC_U_R_L (FN_EXTRA2 + 117) + /*-------------------------------------------------------------------- Bereich: Hilfe --------------------------------------------------------------------*/ diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 0211ea79848a..e6a0cd5d544f 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -46,6 +46,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode friend class SwNodes; GraphicObject aGrfObj; + GraphicObject* mpReplacementGraphic; ::sfx2::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt Size nGrfSize; // String aStrmName; // SW3: Name des Storage-Streams fuer Embedded @@ -146,6 +147,7 @@ public: const Graphic& GetGrf() const { return aGrfObj.GetGraphic(); } const GraphicObject& GetGrfObj() const { return aGrfObj; } GraphicObject& GetGrfObj() { return aGrfObj; } + const GraphicObject* GetReplacementGrfObj() const; virtual SwCntntNode *SplitCntntNode( const SwPosition & ); diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 802635083104..12a2eb930bb1 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -803,7 +803,10 @@ enum SwPropNameIds /* 0738 */ UNO_NAME_META, // #i91565# /* 0739 */ UNO_NAME_NESTED_TEXT_CONTENT, // #i109601# /* 0740 */ UNO_NAME_EMBEDDED_OBJECT, -/* 0741 */ SW_PROPNAME_END + +/* 0741 */ UNO_NAME_REPLACEMENT_GRAPHIC_URL, + +/* 0742 */ SW_PROPNAME_END }; |