diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 15:39:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 15:39:04 +0000 |
| commit | 73fbf7d4b6eb59690902aa15e2a93b9eef2cf986 (patch) | |
| tree | 2570559e247a63e61c96df5ce2d7c0391686689b /sw/source/ui/inc/wrtsh.hxx | |
| parent | 3a4145e067affa466708670868dd4d7a112ea66c (diff) | |
INTEGRATION: CWS chart2mst3 (1.36.132); FILE MERGED
2006/11/22 13:22:22 tl 1.36.132.2: #i71246# positioning of the new chart wizard to not hide the already inserted chart
2006/11/10 13:47:55 tl 1.36.132.1: #i71245#, #i69313#; old chart removed, fixed incorrectly shown default chart
Diffstat (limited to 'sw/source/ui/inc/wrtsh.hxx')
| -rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index ee86bcf276..ae67b9c9db 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -4,9 +4,9 @@ * * $RCSfile: wrtsh.hxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2006-07-26 15:50:43 $ + * last change: $Author: vg $ $Date: 2007-05-22 16:39:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -324,7 +324,7 @@ typedef FASTBOOL (SwWrtShell:: *FNSimpleMove)(); USHORT nSlotId = 0, // SlotId fuer Dialog SfxRequest* pReq = 0 ); - BOOL InsertOleObject( const svt::EmbeddedObjectRef& xObj ); + SwFlyFrmFmt* InsertOleObject( const svt::EmbeddedObjectRef& xObj ); void LaunchOLEObj( long nVerb = 0 ); // Server starten BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;} virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, @@ -332,7 +332,6 @@ typedef FASTBOOL (SwWrtShell:: *FNSimpleMove)(); const SwRect *pFlyFrmRect = 0 ); virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, const SwRect &rFrm ); - DECL_LINK( ChartSelectionHdl, ChartSelectionInfo * ); // Vorlagen und Formate |