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/inc/glob.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/inc/glob.hxx')
| -rw-r--r-- | sd/inc/glob.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 77adcd8503eb..8264dca6382c 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.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 @@ -35,9 +35,9 @@ //------------------------------------------------------------------ -#define DIA_SLOW 0 -#define DIA_MEDIUM 1 -#define DIA_FAST 2 +#define DIA_SLOW 0 +#define DIA_MEDIUM 1 +#define DIA_FAST 2 #define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0 #define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1 @@ -51,21 +51,21 @@ #define SD_IF_SDGRAPHICDOCSHELL SFX_INTERFACE_SD_START + 10 #define SD_IF_SDGRAPHICVIEWSHELL SFX_INTERFACE_SD_START + 11 #define SD_IF_SDGRAPHICSTDOBJECTBAR SFX_INTERFACE_SD_START + 12 -#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13 +#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13 #define SD_IF_SDPRESVIEWSHELL SFX_INTERFACE_SD_START + 14 #define SD_IF_SDPREVIEWVIEWSHELL SFX_INTERFACE_SD_START + 15 #define SD_IF_SDVIEWSHELLBASE SFX_INTERFACE_SD_START + 16 -#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17 -#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18 +#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17 +#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18 #define SD_IF_SDSLIDESORTERVIEWSHELL SFX_INTERFACE_SD_START + 19 #define SD_IF_SDTASKPANEVIEWSHELL SFX_INTERFACE_SD_START + 20 #define SD_IF_SDMASTERPAGESSELECTOR SFX_INTERFACE_SD_START + 21 #define SD_IF_SDLAYOUTMENU SFX_INTERFACE_SD_START + 22 -#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23 +#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23 #define SD_IF_SDLEFTIMPRESSPANESHELL SFX_INTERFACE_SD_START + 24 #define SD_IF_SDLEFTDRAWPANESHELL SFX_INTERFACE_SD_START + 25 #define SD_IF_SDRIGHTPANESHELL SFX_INTERFACE_SD_START + 26 -#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27 +#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27 #define SD_IF_SDANNOTATIONSHELL SFX_INTERFACE_SD_START + 28 #define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29 #define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 @@ -78,19 +78,19 @@ const UINT32 SdUDInventor=UINT32('S')*0x00000001+ // Object-Ids fuer StarDraw UserData #define SD_ANIMATIONINFO_ID 1 -#define SD_IMAPINFO_ID 2 +#define SD_IMAPINFO_ID 2 // FamilyId der Praesentationsvorlagen -#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA -#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO -#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME -#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY +#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA +#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO +#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME +#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY // Trennzeichen zwischen Layoutname und Vorlagenname der Praesentationsvorlagen #define SD_LT_SEPARATOR "~LT~" // Optionsstream-Identifier -#define SD_OPTION_MORPHING "Morph" +#define SD_OPTION_MORPHING "Morph" #define SD_OPTION_VECTORIZE "Vectorize" //------------------------------------------------------------------ |