diff options
| author | Michael Stahl <mst@apache.org> | 2011-08-28 22:34:30 +0000 |
|---|---|---|
| committer | Michael Stahl <mst@apache.org> | 2011-08-28 22:34:30 +0000 |
| commit | 332eac8bd99a1a1a838da2a8ec978bd4d71307c6 (patch) | |
| tree | 802f265f95fe5ec87b6be3cc95f9daaaeaa0d841 | |
| parent | 79fbe8110d9869c400775f6d81e413bacb6bdb9b (diff) | |
unotools: OOutputStreamWrapper:
remove invocation of DECLARE_UNO3_AGG_DEFAULTS
(symbols are somehow not exported with GCC 4.6, and it seems to be
unnecessary)
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/shapeimporter.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/misc/imageresourceaccess.cxx | 1 | ||||
| -rw-r--r-- | unotools/inc/unotools/streamwrap.hxx | 7 |
4 files changed, 1 insertions, 9 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index ee915ceac688..3c7ec8a36789 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -59,6 +59,7 @@ #include "DataSeriesHelper.hxx" #include "DateHelper.hxx" +#include <rtl/uuid.h> #include <comphelper/scopeguard.hxx> #include <boost/bind.hpp> #include <unotools/streamwrap.hxx> diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 317d50f352f9..b3dfc96cf8f6 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -68,7 +68,6 @@ #include <boost/scoped_ptr.hpp> using namespace com::sun::star; -using namespace ::comphelper; namespace slideshow { namespace internal { diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index a4fd7e372880..fdc7de892168 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -47,7 +47,6 @@ namespace svt //........................................................................ using namespace ::utl; - using namespace ::comphelper; using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/unotools/inc/unotools/streamwrap.hxx b/unotools/inc/unotools/streamwrap.hxx index d8544cc25f3e..0feb26b63ef7 100644 --- a/unotools/inc/unotools/streamwrap.hxx +++ b/unotools/inc/unotools/streamwrap.hxx @@ -36,7 +36,6 @@ #include <com/sun/star/io/XStream.hpp> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase1.hxx> -#include <comphelper/uno3.hxx> class SvStream; @@ -68,9 +67,6 @@ public: OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=sal_False); virtual ~OInputStreamWrapper(); -// UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_Base); - // stario::XInputStream virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); @@ -121,9 +117,6 @@ protected: public: OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { } -// UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper_Base); - // stario::XOutputStream virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); |