diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
commit | 49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch) | |
tree | d432fa8e42251e69e95f7d56cca7fc1b03f18f2c /sd/inc/sdattr.hxx | |
parent | 315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:06 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 16:35:37 2011 +0200
Remove extra bracket to fix build
build breakage added by the previous commit
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Fri May 20 11:00:26 2011 +0300
Add sanity check before dereference, bnc#694119
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d53f1f6ee9f02d3d77c76910023986f7f346fc30
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 13:19:59 2011 +0100
Fix fdo#33947 crash in Impress after printing
Fixes lifetime issue with DrawViewShell - solved by not handing
one in to the print preview DocumentRenderer
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
sd/source/ui/view/DocumentRenderer.cxx | 2 +-
sd/source/ui/view/drawview.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: impress_libreoffice-3.3.3.1
split repo tag: impress_libreoffice-3.3.4.1
Diffstat (limited to 'sd/inc/sdattr.hxx')
-rw-r--r-- | sd/inc/sdattr.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 7f055caf633a..4f1ad34d5a20 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ //================================================================== -// Layer-Attribute +// Layer-Attribute //================================================================== class SdAttrLayerName : public SfxStringItem @@ -119,10 +119,10 @@ public: DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE ); DiaEffectItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return FADE_EFFECT_COUNT; } - ::com::sun::star::presentation::FadeEffect GetValue() const + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + USHORT GetValueCount() const { return FADE_EFFECT_COUNT; } + ::com::sun::star::presentation::FadeEffect GetValue() const { return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); } }; @@ -135,10 +135,10 @@ public: DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM ); DiaSpeedItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return FADE_SPEED_COUNT; } - FadeSpeed GetValue() const + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + USHORT GetValueCount() const { return FADE_SPEED_COUNT; } + FadeSpeed GetValue() const { return (FadeSpeed) SfxEnumItem::GetValue(); } }; @@ -151,10 +151,10 @@ public: DiaAutoItem( PresChange = PRESCHANGE_MANUAL ); DiaAutoItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return PRESCHANGE_COUNT; } - PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + USHORT GetValueCount() const { return PRESCHANGE_COUNT; } + PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } }; //------------------------------------------------------------------ @@ -166,7 +166,7 @@ public: DiaTimeItem( UINT32 nValue = 0L ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; }; #endif // _SDATTR_HXX |