diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 3 | ||||
-rw-r--r-- | sw/inc/globdoc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swbaslnk.hxx | 2 | ||||
-rw-r--r-- | sw/inc/wdocsh.hxx | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 9b917728bc53..7461487771f0 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -242,7 +242,7 @@ public: virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE; virtual void FillClass( SvGlobalName * pClassName, - sal_uInt32 * pClipFormat, + SotClipboardFormatId * pClipFormat, OUString * pAppName, OUString * pLongUserName, OUString * pUserName, diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index dc8edfd3153c..03aca2b9712c 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -29,6 +29,7 @@ #include <flyenum.hxx> #include <svx/svdtypes.hxx> +#include <sot/formats.hxx> #include <rtl/ustring.hxx> #include <svtools/embedhlp.hxx> #include <o3tl/typed_flags_set.hxx> @@ -520,7 +521,7 @@ public: /** Get selected DrawObj as graphics (MetaFile/Bitmap). Return value indicates if it was converted. */ - bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const; + bool GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const; void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 ); bool Paste( const Graphic &rGrf, const OUString& rURL ); diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx index 4aee52bb303f..d2a7452aeb85 100644 --- a/sw/inc/globdoc.hxx +++ b/sw/inc/globdoc.hxx @@ -32,7 +32,7 @@ public: virtual ~SwGlobalDocShell(); virtual void FillClass( SvGlobalName * pClassName, - sal_uInt32 * pClipFormat, + SotClipboardFormatId * pClipFormat, OUString * pAppName, OUString * pLongUserName, OUString * pUserName, diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index f32b7b4f0478..ecb83af8b5b9 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -42,7 +42,7 @@ protected: public: TYPEINFO_OVERRIDE(); - SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 ) + SwBaseLink( sal_uInt16 nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 ) : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ), bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ), m_pReReadThread(0) diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index f142de2cb17b..f365f935784b 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -42,7 +42,7 @@ public: virtual ~SwWebDocShell(); virtual void FillClass( SvGlobalName * pClassName, - sal_uInt32 * pClipFormat, + SotClipboardFormatId * pClipFormat, OUString * pAppName, OUString * pLongUserName, OUString * pUserName, |