diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-20 17:35:32 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-20 22:19:36 +0100 |
| commit | 0235bb8ea237daec5f85e241ad5677a649363571 (patch) | |
| tree | 392f021f55b57b51ca20e191bd1ecd4962b2ec16 /sw | |
| parent | expand and remove macro UNO_NMSPC (diff) | |
| download | core-0235bb8ea237daec5f85e241ad5677a649363571.tar.gz core-0235bb8ea237daec5f85e241ad5677a649363571.zip | |
expand and remove macro CLIP_NMSPC
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/swunodef.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/uivwimp.hxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/uiview/uivwimp.cxx | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx index 01942f51b0e2..3ef1d5ce2c88 100644 --- a/sw/inc/swunodef.hxx +++ b/sw/inc/swunodef.hxx @@ -28,8 +28,6 @@ #ifndef _SWUNODEF_HXX #define _SWUNODEF_HXX -#define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard - #define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType > #endif diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index cf712f88dfac..d65053f885b6 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -72,7 +72,7 @@ public: // --------------------------- Clipboard EventListener ------------------ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< - CLIP_NMSPC::XClipboardListener > + ::com::sun::star::datatransfer::clipboard::XClipboardListener > { SwView* pView; @@ -81,7 +81,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< throw ( com::sun::star::uno::RuntimeException ); // XClipboardListener - virtual void SAL_CALL changedContents( const CLIP_NMSPC::ClipboardEvent& rEventObject ) + virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject ) throw ( com::sun::star::uno::RuntimeException ); public: diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index e8787b2cb1c9..a9b6b08bf025 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -281,7 +281,7 @@ void SAL_CALL SwClipboardChangeListener::disposing( const EventObject& /*rEventO { } -void SAL_CALL SwClipboardChangeListener::changedContents( const CLIP_NMSPC::ClipboardEvent& rEventObject ) +void SAL_CALL SwClipboardChangeListener::changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject ) throw ( RuntimeException ) { |