You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2011/08/29 01:34:31 UTC
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/
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);
Re: 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/
Posted by eric b <er...@free.fr>.
Answering to myself, looks like ArchLinux too switched for gcc-4.6.x.
Probably other distributions did.
--
qɔᴉɹə
Projet OOo4Kids : http://wiki.ooo4kids.org/index.php/Main_Page
L'association EducOOo : http://www.educoo.org
Blog : http://eric.bachard.org/news
Re: 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/
Posted by eric b <er...@free.fr>.
Hi Mathias,
Le 29 août 11 à 10:44, Mathias Bauer a écrit :
> Which distribution comes with gcc 4.6 as default?
The only one I'm aware is Debian armhf (experimental at the moment),
due to some asm optimisations for Neon and the FPU.
>
Regards,
Eric
--
qɔᴉɹə
Education Project:
http://wiki.services.openoffice.org/wiki/Education_Project
Projet OOo4Kids : http://wiki.ooo4kids.org/index.php/Main_Page
L'association EducOOo : http://www.educoo.org
Blog : http://eric.bachard.org/news
Re: 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/
Posted by Michael Stahl <ms...@openoffice.org>.
On 29.08.2011 10:44, Mathias Bauer wrote:
> On 29.08.2011 10:35, Michael Stahl wrote:
>
>>> Is it wise to fix the code for gcc 4.6 *now*? Every fix might introduce
>>> new bugs and gcc 4.6 is not the "standard" compiler nowadays (AFAIK).
>>
>> please note that i will have a difficult time contributing if i can't
>> build the code :)
>
> Which distribution comes with gcc 4.6 as default?
Fedora 15, for one.
Re: 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/
Posted by Eike Rathke <oo...@erack.de>.
Hi Mathias,
On Monday, 2011-08-29 10:44:56 +0200, Mathias Bauer wrote:
> Which distribution comes with gcc 4.6 as default?
Debian wheezy.
Eike
--
PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication.
Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD
Re: 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/
Posted by Mathias Bauer <Ma...@gmx.net>.
On 29.08.2011 10:35, Michael Stahl wrote:
>> Is it wise to fix the code for gcc 4.6 *now*? Every fix might introduce
>> new bugs and gcc 4.6 is not the "standard" compiler nowadays (AFAIK).
>
> please note that i will have a difficult time contributing if i can't
> build the code :)
Which distribution comes with gcc 4.6 as default?
Regards,
Mathias
Re: 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/
Posted by Michael Stahl <ms...@openoffice.org>.
On 29.08.2011 09:36, Mathias Bauer wrote:
> On 29.08.2011 02:36, Eike Rathke wrote:
>> Hi Michael,
>>
>> On Sunday, 2011-08-28 23:34:31 -0000, mst@apache.org wrote:
>>
>>> 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)
>>
>> The "somehow" may be related to the -fPIC vs -fpic I mentioned in an
>> earlier mail.
i vaguely remember having tried this many weeks ago, but it didn't seem
to help. perhaps i tried it on the wrong file...
presumably it should make a difference on x86_64.
>> Simply removing the DECLARE_UNO3_AGG_DEFAULTS(...) removes
>> forwarding of acquire() and release() calls to the baseclass, I don't
>> think that's correct. See comphelper/inc/comphelper/uno3.hxx
but OOutputStreamWrapper is derived from ::cppu::WeakImplHelper1, which
implements the acquire()/release() methods itself (public). so client
code should simply call these base class methods and the manual
forwarding done by the macro seems entirely superfluous to me. (there
are certainly already hundreds of classes that derive from
WeakImplHelper* but don't override acquire()/release().)
> Is it wise to fix the code for gcc 4.6 *now*? Every fix might introduce
> new bugs and gcc 4.6 is not the "standard" compiler nowadays (AFAIK).
please note that i will have a difficult time contributing if i can't
build the code :)
> Regards,
> Mathias
regards,
michael
Re: 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/
Posted by Mathias Bauer <Ma...@gmx.net>.
On 29.08.2011 10:29, Stephan Bergmann wrote:
> On Aug 29, 2011, at 9:36 AM, Mathias Bauer wrote:
>> On 29.08.2011 02:36, Eike Rathke wrote:
>>> Hi Michael,
>>>
>>> On Sunday, 2011-08-28 23:34:31 -0000, mst@apache.org wrote:
>>>
>>>> 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)
>>>
>>> The "somehow" may be related to the -fPIC vs -fpic I mentioned in an
>>> earlier mail. Simply removing the DECLARE_UNO3_AGG_DEFAULTS(...) removes
>>> forwarding of acquire() and release() calls to the baseclass, I don't
>>> think that's correct. See comphelper/inc/comphelper/uno3.hxx
>>
>> Is it wise to fix the code for gcc 4.6 *now*? Every fix might introduce new bugs and gcc 4.6 is not the "standard" compiler nowadays (AFAIK).
>
> I guess the best way to go about it would be to pick an environment where OOo's current OOO340 head is known to build fine and try building AOOo's trunk in that environment. Don't modify too many parameters at once… ;)
More or less that's my point, yes.
Regards,
Mathias
Re: 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/
Posted by Stephan Bergmann <st...@googlemail.com>.
On Aug 29, 2011, at 9:36 AM, Mathias Bauer wrote:
> On 29.08.2011 02:36, Eike Rathke wrote:
>> Hi Michael,
>>
>> On Sunday, 2011-08-28 23:34:31 -0000, mst@apache.org wrote:
>>
>>> 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)
>>
>> The "somehow" may be related to the -fPIC vs -fpic I mentioned in an
>> earlier mail. Simply removing the DECLARE_UNO3_AGG_DEFAULTS(...) removes
>> forwarding of acquire() and release() calls to the baseclass, I don't
>> think that's correct. See comphelper/inc/comphelper/uno3.hxx
>
> Is it wise to fix the code for gcc 4.6 *now*? Every fix might introduce new bugs and gcc 4.6 is not the "standard" compiler nowadays (AFAIK).
I guess the best way to go about it would be to pick an environment where OOo's current OOO340 head is known to build fine and try building AOOo's trunk in that environment. Don't modify too many parameters at once… ;)
-Stephan
Re: 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/
Posted by Mathias Bauer <Ma...@gmx.net>.
On 29.08.2011 02:36, Eike Rathke wrote:
> Hi Michael,
>
> On Sunday, 2011-08-28 23:34:31 -0000, mst@apache.org wrote:
>
>> 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)
>
> The "somehow" may be related to the -fPIC vs -fpic I mentioned in an
> earlier mail. Simply removing the DECLARE_UNO3_AGG_DEFAULTS(...) removes
> forwarding of acquire() and release() calls to the baseclass, I don't
> think that's correct. See comphelper/inc/comphelper/uno3.hxx
Is it wise to fix the code for gcc 4.6 *now*? Every fix might introduce
new bugs and gcc 4.6 is not the "standard" compiler nowadays (AFAIK).
Regards,
Mathias
Re: 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/
Posted by Eike Rathke <oo...@erack.de>.
Hi Michael,
On Sunday, 2011-08-28 23:34:31 -0000, mst@apache.org wrote:
> 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)
The "somehow" may be related to the -fPIC vs -fpic I mentioned in an
earlier mail. Simply removing the DECLARE_UNO3_AGG_DEFAULTS(...) removes
forwarding of acquire() and release() calls to the baseclass, I don't
think that's correct. See comphelper/inc/comphelper/uno3.hxx
Eike
--
PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication.
Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD