diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:13:07 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:13:07 +0200 |
commit | 95920b4502a03d2d51a68626c1a562486326a38d (patch) | |
tree | 2bcd68bd250df21dd16a9c8277a78e49a313eea2 /drawinglayer/source/attribute/sdrobjectattribute3d.cxx | |
parent | 185575042240290a791eb23e3508aafa34c5a065 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 8ae8ec3b786ca9c5bfdde8c737cc76e0178e2a65 (HEAD, tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 4772261c09d3d79d1ab8126e060d272c0de156f0
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Tue Jan 18 10:43:05 2011 +0100
calc65: #i116371# fix backgrounds for polypolygons in metafile
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
(cherry picked from commit cb7d7138b943042f11eec3211d7a913c9b85908c)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Radek Doulik <rodo@novell.com>
.../source/processor2d/vclmetafileprocessor2d.cxx | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
commit 4cf8bcde1cfa948b3415ec4775671b53e290aeae
Author: Andras Timar <timar@fsf.hu>
Date: Sun Jan 16 21:08:02 2011 +0100
Sun Microsystems -> The Document Foundation in desktop file fdo#31191
sysui/desktop/menus/startcenter.desktop | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 57746f255004ef42fc87c3ad3d30a4cb47a0111b
Author: Petr Mladek <pmladek@suse.cz>
Date: Thu Jan 13 21:13:19 2011 +0100
unopkg crasher on SLED11-SP1 (bnc#655912)
activateExtension call broke memory if dp_misc::getIdentifier and xNewExtension
were called inline; the problem was visible only with gcc-4.3.4 and did not
appear with older or newer gcc versions
valgrind got happy and unopkg stopped crashing after the values were passed via
the extra variables
it looks like a miscompilation; IMHO, it does not make sense to report it
because it does not happen with last gcc version
this code is not critical for the performance, so the workaround with
extra variables is fine; they might even be optimized out by the compiler
Signed off by Michael, Noel, Tor
.../deployment/manager/dp_extensionmanager.cxx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
commit 6196104011a42b17239da44fca374d3e0ba60cfd
Author: Michael Meeks <michael.meeks@novell.com>
Date: Fri Jan 14 13:59:23 2011 +0000
fix FMR crasher bug#33099, approved by Fridrich, David & Petr.
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
xmlhelp/source/cxxhelp/provider/databases.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 66586a94e673256024e3c5c7dd8d70bedd1694f0
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Fri Jan 14 12:23:56 2011 +0200
Be slightly more paranoid defensive
(cherry picked from commit f8bfab1f464d0f26accb6d28b31b4749306bbfda)
Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
desktop/win32/source/setup/setup.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit a8aa27383ae8570b8cd73376b54f114bd74afac6
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Thu Jan 13 23:49:18 2011 +0200
Fix buffer size problem that broke MSI installer localization
(cherry picked from commit 5b7719a49fd57a9f446201fabc02bf1787dbbeee)
Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
desktop/win32/source/setup/setup.cpp | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
commit d7b0664fa0966efc77dc2f6a93d3e68adbff00aa
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: libs-core_libreoffice-3.3.0.4
Diffstat (limited to 'drawinglayer/source/attribute/sdrobjectattribute3d.cxx')
-rw-r--r-- | drawinglayer/source/attribute/sdrobjectattribute3d.cxx | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx index 92cf886e0c35..068937643489 100644 --- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx @@ -50,25 +50,25 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // 3D object attribute definitions - ::com::sun::star::drawing::NormalsKind maNormalsKind; // normals type (0..2) - ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionX; // texture projection type X (0..2) - ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionY; // texture projection type Y (0..2) - ::com::sun::star::drawing::TextureKind2 maTextureKind; // texture kind (see uno API) - ::com::sun::star::drawing::TextureMode maTextureMode; // texture kind (see uno API) - MaterialAttribute3D maMaterial; // object, specular and emissive colors, SpecularIntensity + ::com::sun::star::drawing::NormalsKind maNormalsKind; // normals type (0..2) + ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionX; // texture projection type X (0..2) + ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionY; // texture projection type Y (0..2) + ::com::sun::star::drawing::TextureKind2 maTextureKind; // texture kind (see uno API) + ::com::sun::star::drawing::TextureMode maTextureMode; // texture kind (see uno API) + MaterialAttribute3D maMaterial; // object, specular and emissive colors, SpecularIntensity // bitfield - unsigned mbNormalsInvert : 1; // invert normals - unsigned mbDoubleSided : 1; // surfaces are double sided - unsigned mbShadow3D : 1; // display shadow in 3D (if on), params for that are at scene - unsigned mbTextureFilter : 1; // filter texture to make more smooth - unsigned mbReducedLineGeometry : 1; // use reduced line geometry (object specific) + unsigned mbNormalsInvert : 1; // invert normals + unsigned mbDoubleSided : 1; // surfaces are double sided + unsigned mbShadow3D : 1; // display shadow in 3D (if on), params for that are at scene + unsigned mbTextureFilter : 1; // filter texture to make more smooth + unsigned mbReducedLineGeometry : 1; // use reduced line geometry (object specific) ImpSdr3DObjectAttribute( - ::com::sun::star::drawing::NormalsKind aNormalsKind, + ::com::sun::star::drawing::NormalsKind aNormalsKind, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY, ::com::sun::star::drawing::TextureKind2 aTextureKind, @@ -79,7 +79,7 @@ namespace drawinglayer bool bShadow3D, bool bTextureFilter, bool bReducedLineGeometry) - : mnRefCount(0), + : mnRefCount(0), maNormalsKind(aNormalsKind), maTextureProjectionX(aTextureProjectionX), maTextureProjectionY(aTextureProjectionY), @@ -121,7 +121,7 @@ namespace drawinglayer && getTextureFilter() == rCandidate.getTextureFilter() && getReducedLineGeometry() == rCandidate.getReducedLineGeometry()); } - + static ImpSdr3DObjectAttribute* get_global_default() { static ImpSdr3DObjectAttribute* pDefault = 0; @@ -150,7 +150,7 @@ namespace drawinglayer }; Sdr3DObjectAttribute::Sdr3DObjectAttribute( - ::com::sun::star::drawing::NormalsKind aNormalsKind, + ::com::sun::star::drawing::NormalsKind aNormalsKind, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY, ::com::sun::star::drawing::TextureKind2 aTextureKind, @@ -161,20 +161,20 @@ namespace drawinglayer bool bShadow3D, bool bTextureFilter, bool bReducedLineGeometry) - : mpSdr3DObjectAttribute(new ImpSdr3DObjectAttribute( + : mpSdr3DObjectAttribute(new ImpSdr3DObjectAttribute( aNormalsKind, aTextureProjectionX, aTextureProjectionY, aTextureKind, aTextureMode, rMaterial, bNormalsInvert, bDoubleSided, bShadow3D, bTextureFilter, bReducedLineGeometry)) { } Sdr3DObjectAttribute::Sdr3DObjectAttribute() - : mpSdr3DObjectAttribute(ImpSdr3DObjectAttribute::get_global_default()) + : mpSdr3DObjectAttribute(ImpSdr3DObjectAttribute::get_global_default()) { mpSdr3DObjectAttribute->mnRefCount++; } Sdr3DObjectAttribute::Sdr3DObjectAttribute(const Sdr3DObjectAttribute& rCandidate) - : mpSdr3DObjectAttribute(rCandidate.mpSdr3DObjectAttribute) + : mpSdr3DObjectAttribute(rCandidate.mpSdr3DObjectAttribute) { mpSdr3DObjectAttribute->mnRefCount++; } @@ -208,7 +208,7 @@ namespace drawinglayer { delete mpSdr3DObjectAttribute; } - + mpSdr3DObjectAttribute = rCandidate.mpSdr3DObjectAttribute; mpSdr3DObjectAttribute->mnRefCount++; } @@ -231,59 +231,59 @@ namespace drawinglayer return (*rCandidate.mpSdr3DObjectAttribute == *mpSdr3DObjectAttribute); } - ::com::sun::star::drawing::NormalsKind Sdr3DObjectAttribute::getNormalsKind() const - { - return mpSdr3DObjectAttribute->getNormalsKind(); + ::com::sun::star::drawing::NormalsKind Sdr3DObjectAttribute::getNormalsKind() const + { + return mpSdr3DObjectAttribute->getNormalsKind(); } - ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionX() const - { - return mpSdr3DObjectAttribute->getTextureProjectionX(); + ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionX() const + { + return mpSdr3DObjectAttribute->getTextureProjectionX(); } - ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionY() const - { - return mpSdr3DObjectAttribute->getTextureProjectionY(); + ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionY() const + { + return mpSdr3DObjectAttribute->getTextureProjectionY(); } - ::com::sun::star::drawing::TextureKind2 Sdr3DObjectAttribute::getTextureKind() const - { - return mpSdr3DObjectAttribute->getTextureKind(); + ::com::sun::star::drawing::TextureKind2 Sdr3DObjectAttribute::getTextureKind() const + { + return mpSdr3DObjectAttribute->getTextureKind(); } - ::com::sun::star::drawing::TextureMode Sdr3DObjectAttribute::getTextureMode() const - { - return mpSdr3DObjectAttribute->getTextureMode(); + ::com::sun::star::drawing::TextureMode Sdr3DObjectAttribute::getTextureMode() const + { + return mpSdr3DObjectAttribute->getTextureMode(); } - const MaterialAttribute3D& Sdr3DObjectAttribute::getMaterial() const - { - return mpSdr3DObjectAttribute->getMaterial(); + const MaterialAttribute3D& Sdr3DObjectAttribute::getMaterial() const + { + return mpSdr3DObjectAttribute->getMaterial(); } - bool Sdr3DObjectAttribute::getNormalsInvert() const - { - return mpSdr3DObjectAttribute->getNormalsInvert(); + bool Sdr3DObjectAttribute::getNormalsInvert() const + { + return mpSdr3DObjectAttribute->getNormalsInvert(); } - bool Sdr3DObjectAttribute::getDoubleSided() const - { - return mpSdr3DObjectAttribute->getDoubleSided(); + bool Sdr3DObjectAttribute::getDoubleSided() const + { + return mpSdr3DObjectAttribute->getDoubleSided(); } - bool Sdr3DObjectAttribute::getShadow3D() const - { - return mpSdr3DObjectAttribute->getShadow3D(); + bool Sdr3DObjectAttribute::getShadow3D() const + { + return mpSdr3DObjectAttribute->getShadow3D(); } - bool Sdr3DObjectAttribute::getTextureFilter() const - { - return mpSdr3DObjectAttribute->getTextureFilter(); + bool Sdr3DObjectAttribute::getTextureFilter() const + { + return mpSdr3DObjectAttribute->getTextureFilter(); } - bool Sdr3DObjectAttribute::getReducedLineGeometry() const - { - return mpSdr3DObjectAttribute->getReducedLineGeometry(); + bool Sdr3DObjectAttribute::getReducedLineGeometry() const + { + return mpSdr3DObjectAttribute->getReducedLineGeometry(); } } // end of namespace attribute |