incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1162610 - in /incubator/ooo/trunk/main: binfilter/bf_sfx2/source/doc/ binfilter/bf_starmath/source/ binfilter/bf_svtools/source/misc/ chart2/source/view/main/ slideshow/source/engine/shapes/ svtools/source/misc/ unotools/inc/unotools/
Date Sun, 28 Aug 2011 23:34:31 GMT
Author: mst
Date: Sun Aug 28 23:34:30 2011
New Revision: 1162610

URL: http://svn.apache.org/viewvc?rev=1162610&view=rev
Log:
unotools: OOutputStreamWrapper:

 remove invocation of DECLARE_UNO3_AGG_DEFAULTS
 (symbols are somehow not exported with GCC 4.6, and it seems to be
 unnecessary)

Modified:
    incubator/ooo/trunk/main/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
    incubator/ooo/trunk/main/binfilter/bf_starmath/source/starmath_mathml.cxx
    incubator/ooo/trunk/main/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
    incubator/ooo/trunk/main/chart2/source/view/main/ChartView.cxx
    incubator/ooo/trunk/main/slideshow/source/engine/shapes/shapeimporter.cxx
    incubator/ooo/trunk/main/svtools/source/misc/imageresourceaccess.cxx
    incubator/ooo/trunk/main/unotools/inc/unotools/streamwrap.hxx

Modified: incubator/ooo/trunk/main/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx (original)
+++ incubator/ooo/trunk/main/binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx Sun Aug 28 23:34:30
2011
@@ -51,6 +51,7 @@
 #include <legacysmgr/legacy_binfilters_smgr.hxx>
 #endif
 
+#include <cppuhelper/typeprovider.hxx>
 #include <tools/errcode.hxx>
 #include <bf_so3/svstor.hxx>
 #include <bf_svtools/cntwids.hrc>

Modified: incubator/ooo/trunk/main/binfilter/bf_starmath/source/starmath_mathml.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_starmath/source/starmath_mathml.cxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_starmath/source/starmath_mathml.cxx (original)
+++ incubator/ooo/trunk/main/binfilter/bf_starmath/source/starmath_mathml.cxx Sun Aug 28 23:34:30
2011
@@ -36,6 +36,8 @@
 into one string, xml parser hands them to us line by line rather than all in
 one go*/
 
+#include <rtl/uuid.h>
+
 #ifndef _TOOLS_DEBUG_H
 #include <tools/debug.hxx>
 #endif

Modified: incubator/ooo/trunk/main/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
(original)
+++ incubator/ooo/trunk/main/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
Sun Aug 28 23:34:30 2011
@@ -66,7 +66,6 @@ namespace binfilter
 //........................................................................
 
     using namespace ::utl;
-    using namespace ::comphelper;
     using namespace ::com::sun::star::io;
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;

Modified: incubator/ooo/trunk/main/chart2/source/view/main/ChartView.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/chart2/source/view/main/ChartView.cxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/chart2/source/view/main/ChartView.cxx (original)
+++ incubator/ooo/trunk/main/chart2/source/view/main/ChartView.cxx Sun Aug 28 23:34:30 2011
@@ -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>

Modified: incubator/ooo/trunk/main/slideshow/source/engine/shapes/shapeimporter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/slideshow/source/engine/shapes/shapeimporter.cxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/slideshow/source/engine/shapes/shapeimporter.cxx (original)
+++ incubator/ooo/trunk/main/slideshow/source/engine/shapes/shapeimporter.cxx Sun Aug 28 23:34:30
2011
@@ -68,7 +68,6 @@
 #include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
-using namespace ::comphelper;
 
 namespace slideshow {
 namespace internal {

Modified: incubator/ooo/trunk/main/svtools/source/misc/imageresourceaccess.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/misc/imageresourceaccess.cxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/misc/imageresourceaccess.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/misc/imageresourceaccess.cxx Sun Aug 28 23:34:30
2011
@@ -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;

Modified: incubator/ooo/trunk/main/unotools/inc/unotools/streamwrap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unotools/inc/unotools/streamwrap.hxx?rev=1162610&r1=1162609&r2=1162610&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unotools/inc/unotools/streamwrap.hxx (original)
+++ incubator/ooo/trunk/main/unotools/inc/unotools/streamwrap.hxx Sun Aug 28 23:34:30 2011
@@ -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);



Mime
View raw message