diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
| commit | 4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch) | |
| tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/inc/unoaprms.hxx | |
| parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (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 2764d5adfcd646794593cda200fca9d4988d0d06
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
Notes:
split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/inc/unoaprms.hxx')
| -rw-r--r-- | sd/source/ui/inc/unoaprms.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 7640be9ed6ed..3dd8129a5a37 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.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 @@ -43,11 +43,11 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { - SdrObject* pObject; - BOOL bOldActive; - BOOL bNewActive; + SdrObject* pObject; + BOOL bOldActive; + BOOL bNewActive; BOOL bOldDimPrevious; - BOOL bNewDimPrevious; + BOOL bNewDimPrevious; BOOL bOldDimHide; BOOL bNewDimHide; BOOL bOldSoundOn; @@ -63,13 +63,13 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::AnimationEffect eOldTextEffect; ::com::sun::star::presentation::AnimationEffect eNewTextEffect; ::com::sun::star::presentation::AnimationSpeed eOldSpeed; - ::com::sun::star::presentation::AnimationSpeed eNewSpeed; + ::com::sun::star::presentation::AnimationSpeed eNewSpeed; ::com::sun::star::presentation::AnimationEffect eOldSecondEffect; ::com::sun::star::presentation::AnimationEffect eNewSecondEffect; ::com::sun::star::presentation::AnimationSpeed eOldSecondSpeed; ::com::sun::star::presentation::AnimationSpeed eNewSecondSpeed; Color aOldDimColor; - Color aNewDimColor; + Color aNewDimColor; Color aOldBlueScreen; Color aNewBlueScreen; String aOldSoundFile; @@ -84,8 +84,8 @@ class SdAnimationPrmsUndoAction : public SdUndoAction BOOL bNewInvisibleInPres; USHORT nOldVerb; USHORT nNewVerb; - ULONG nOldPresOrder; - ULONG nNewPresOrder; + ULONG nOldPresOrder; + ULONG nNewPresOrder; BOOL bInfoCreated; @@ -93,8 +93,8 @@ public: TYPEINFO(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, BOOL bCreated): - SdUndoAction (pTheDoc), - pObject (pObj), + SdUndoAction (pTheDoc), + pObject (pObj), bInfoCreated (bCreated) {} @@ -146,6 +146,6 @@ public: virtual void Redo(); }; -#endif // _SD_UNOAPRMS_HXX +#endif // _SD_UNOAPRMS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |