diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-05-13 12:16:35 +0200 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-05-16 18:48:54 +0200 |
| commit | d30867653af6fa59a9221a2430c064a9ea903cc1 (patch) | |
| tree | 2ec42953a6516eceec4c46bfda935d044da269ac /sd/inc | |
| parent | 912fd109a3857b3a6dae02f65fd4b508ed9c8a11 (diff) | |
tdf#117455 - New drawing styles
Clean-up of existing styles, some filled styles added
Change-Id: If15c3645d273b83c51deb5132acb20bddb89fa4d
Reviewed-on: https://gerrit.libreoffice.org/54188
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/app.hrc | 30 | ||||
| -rw-r--r-- | sd/inc/strings.hrc | 27 |
2 files changed, 32 insertions, 25 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 8571af94c10c..eb5940c042db 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -24,20 +24,23 @@ // Helper IDs for templates #define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) -#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71) -#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72) +#define HID_POOLSHEET_TEXT (HID_SD_START + 71) +#define HID_POOLSHEET_TITLE (HID_SD_START + 72) #define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73) -#define HID_POOLSHEET_TEXT (HID_SD_START + 74) -#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75) -#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76) -#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77) -#define HID_POOLSHEET_TITLE (HID_SD_START + 78) -#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79) -#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80) -#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81) -#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82) -#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83) -#define HID_POOLSHEET_MEASURE (HID_SD_START + 84) +#define HID_POOLSHEET_OBJNOLINENOFILL (HID_SD_START + 74) +#define HID_POOLSHEET_HEADLINE (HID_SD_START + 75) +#define HID_POOLSHEET_MEASURE (HID_SD_START + 76) +#define HID_POOLSHEET_FILLED (HID_SD_START + 77) +#define HID_POOLSHEET_FILLED_BLUE (HID_SD_START + 78) +#define HID_POOLSHEET_FILLED_GREEN (HID_SD_START + 79) +#define HID_POOLSHEET_FILLED_RED (HID_SD_START + 80) +#define HID_POOLSHEET_FILLED_YELLOW (HID_SD_START + 81) +#define HID_POOLSHEET_OUTLINE (HID_SD_START + 82) +#define HID_POOLSHEET_OUTLINE_BLUE (HID_SD_START + 83) +#define HID_POOLSHEET_OUTLINE_GREEN (HID_SD_START + 84) +#define HID_POOLSHEET_OUTLINE_RED (HID_SD_START + 102) +#define HID_POOLSHEET_OUTLINE_YELLOW (HID_SD_START + 103) + #define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85) #define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86) #define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87) @@ -53,7 +56,6 @@ #define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) #define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) #define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) -#define HID_POOLSHEET_OBJNOLINENOFILL (HID_SD_START + 102) #define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) #define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 67eef104a6de..c076da9895a4 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -312,21 +312,26 @@ #define STR_LAYOUT_DEFAULT_TITLE_NAME NC_("STR_LAYOUT_DEFAULT_TITLE_NAME", "Title" ) #define STR_STANDARD_STYLESHEET_NAME NC_("STR_STANDARD_STYLESHEET_NAME", "Default" ) #define STR_UNDO_MOVEPAGES NC_("STR_UNDO_MOVEPAGES", "Move slides" ) + #define STR_POOLSHEET_MEASURE NC_("STR_POOLSHEET_MEASURE", "Dimension Line" ) -#define STR_POOLSHEET_OBJNOLINENOFILL NC_("STR_POOLSHEET_OBJNOLINENOFILL", "Object with no fill and no line" ) -#define STR_POOLSHEET_OBJWITHARROW NC_("STR_POOLSHEET_OBJWITHARROW", "Object with arrow" ) -#define STR_POOLSHEET_OBJWITHSHADOW NC_("STR_POOLSHEET_OBJWITHSHADOW", "Object with shadow" ) -#define STR_POOLSHEET_OBJWITHOUTFILL NC_("STR_POOLSHEET_OBJWITHOUTFILL", "Object without fill" ) #define STR_POOLSHEET_TEXT NC_("STR_POOLSHEET_TEXT", "Text" ) -#define STR_POOLSHEET_TEXTBODY NC_("STR_POOLSHEET_TEXTBODY", "Text body" ) -#define STR_POOLSHEET_TEXTBODY_JUSTIFY NC_("STR_POOLSHEET_TEXTBODY_JUSTIFY", "Text body justified" ) -#define STR_POOLSHEET_TEXTBODY_INDENT NC_("STR_POOLSHEET_TEXTBODY_INDENT", "First line indent" ) #define STR_POOLSHEET_TITLE NC_("STR_POOLSHEET_TITLE", "Title" ) -#define STR_POOLSHEET_TITLE1 NC_("STR_POOLSHEET_TITLE1", "Title1" ) -#define STR_POOLSHEET_TITLE2 NC_("STR_POOLSHEET_TITLE2", "Title2" ) #define STR_POOLSHEET_HEADLINE NC_("STR_POOLSHEET_HEADLINE", "Heading" ) -#define STR_POOLSHEET_HEADLINE1 NC_("STR_POOLSHEET_HEADLINE1", "Heading1" ) -#define STR_POOLSHEET_HEADLINE2 NC_("STR_POOLSHEET_HEADLINE2", "Heading2" ) +#define STR_POOLSHEET_OBJWITHOUTFILL NC_("STR_POOLSHEET_OBJWITHOUTFILL", "Object without fill" ) +#define STR_POOLSHEET_OBJNOLINENOFILL NC_("STR_POOLSHEET_OBJNOLINENOFILL", "Object with no fill and no line" ) + +#define STR_POOLSHEET_FILLED NC_("STR_POOLSHEET_FILLED", "Filled" ) +#define STR_POOLSHEET_FILLED_BLUE NC_("STR_POOLSHEET_FILLED_BLUE", "Filled Blue" ) +#define STR_POOLSHEET_FILLED_GREEN NC_("STR_POOLSHEET_FILLED_GREEN", "Filled Green" ) +#define STR_POOLSHEET_FILLED_YELLOW NC_("STR_POOLSHEET_FILLED_YELLOW", "Filled Yellow" ) +#define STR_POOLSHEET_FILLED_RED NC_("STR_POOLSHEET_FILLED_RED", "Filled Red" ) + +#define STR_POOLSHEET_OUTLINE NC_("STR_POOLSHEET_OUTLINE", "Outlined" ) +#define STR_POOLSHEET_OUTLINE_BLUE NC_("STR_POOLSHEET_OUTLINE_BLUE", "Outlined Blue" ) +#define STR_POOLSHEET_OUTLINE_GREEN NC_("STR_POOLSHEET_OUTLINE_GREEN", "Outlined Green" ) +#define STR_POOLSHEET_OUTLINE_YELLOW NC_("STR_POOLSHEET_OUTLINE_YELLOW", "Outlined Yellow" ) +#define STR_POOLSHEET_OUTLINE_RED NC_("STR_POOLSHEET_OUTLINE_RED", "Outlined Red" ) + #define STR_PSEUDOSHEET_TITLE NC_("STR_PSEUDOSHEET_TITLE", "Title" ) #define STR_PSEUDOSHEET_SUBTITLE NC_("STR_PSEUDOSHEET_SUBTITLE", "Subtitle") #define STR_PSEUDOSHEET_OUTLINE NC_("STR_PSEUDOSHEET_OUTLINE", "Outline" ) |