Skip to content

C
core
Kaydet (Commit) d3086765 authored tarafından heiko tietze's avatar heiko tietze Kaydeden (comit) Heiko Tietze
Dosyalara gözat
Seçenekler

tdf#117455 - New drawing styles 

Clean-up of existing styles, some filled styles added

Change-Id: If15c3645d273b83c51deb5132acb20bddb89fa4d
Reviewed-on: https://gerrit.libreoffice.org/54188Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarRegina Henschel <rb.henschel@t-online.de>
Reviewed-by: 's avatarHeiko Tietze <tietze.heiko@gmail.com>
üst 912fd109
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 44 deletions
sd/inc/app.hrc
Dosyayı görüntüle @ d3086765
......@@ -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)
......
sd/inc/strings.hrc
Dosyayı görüntüle @ d3086765
......@@ -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" )
......
sd/source/core/drawdoc4.cxx
Dosyayı görüntüle @ d3086765
This diff is collapsed.
sd/source/core/stlpool.cxx
Dosyayı görüntüle @ d3086765
......@@ -953,21 +953,22 @@ void SdStyleSheetPool::UpdateStdNames()
switch( nHelpId )
{
case HID_STANDARD_STYLESHEET_NAME: pNameId = STR_STANDARD_STYLESHEET_NAME; break;
case HID_POOLSHEET_OBJWITHARROW: pNameId = STR_POOLSHEET_OBJWITHARROW; break;
case HID_POOLSHEET_OBJWITHSHADOW: pNameId = STR_POOLSHEET_OBJWITHSHADOW; break;
case HID_POOLSHEET_OBJWITHOUTFILL: pNameId = STR_POOLSHEET_OBJWITHOUTFILL; break;
case HID_POOLSHEET_OBJNOLINENOFILL: pNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
case HID_POOLSHEET_TEXT: pNameId = STR_POOLSHEET_TEXT; break;
case HID_POOLSHEET_TEXTBODY: pNameId = STR_POOLSHEET_TEXTBODY; break;
case HID_POOLSHEET_TEXTBODY_JUSTIFY:pNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;
case HID_POOLSHEET_TEXTBODY_INDENT: pNameId = STR_POOLSHEET_TEXTBODY_INDENT;break;
case HID_POOLSHEET_TITLE: pNameId = STR_POOLSHEET_TITLE; break;
case HID_POOLSHEET_TITLE1: pNameId = STR_POOLSHEET_TITLE1; break;
case HID_POOLSHEET_TITLE2: pNameId = STR_POOLSHEET_TITLE2; break;
case HID_POOLSHEET_HEADLINE: pNameId = STR_POOLSHEET_HEADLINE; break;
case HID_POOLSHEET_HEADLINE1: pNameId = STR_POOLSHEET_HEADLINE1; break;
case HID_POOLSHEET_HEADLINE2: pNameId = STR_POOLSHEET_HEADLINE2; break;
case HID_POOLSHEET_MEASURE: pNameId = STR_POOLSHEET_MEASURE; break;
case HID_POOLSHEET_FILLED: pNameId = STR_POOLSHEET_FILLED; break;
case HID_POOLSHEET_FILLED_BLUE: pNameId = STR_POOLSHEET_FILLED_BLUE; break;
case HID_POOLSHEET_FILLED_GREEN: pNameId = STR_POOLSHEET_FILLED_GREEN; break;
case HID_POOLSHEET_FILLED_RED: pNameId = STR_POOLSHEET_FILLED_RED; break;
case HID_POOLSHEET_FILLED_YELLOW: pNameId = STR_POOLSHEET_FILLED_YELLOW; break;
case HID_POOLSHEET_OUTLINE: pNameId = STR_POOLSHEET_OUTLINE; break;
case HID_POOLSHEET_OUTLINE_BLUE: pNameId = STR_POOLSHEET_OUTLINE_BLUE; break;
case HID_POOLSHEET_OUTLINE_GREEN: pNameId = STR_POOLSHEET_OUTLINE_GREEN; break;
case HID_POOLSHEET_OUTLINE_RED: pNameId = STR_POOLSHEET_OUTLINE_RED; break;
case HID_POOLSHEET_OUTLINE_YELLOW: pNameId = STR_POOLSHEET_OUTLINE_YELLOW; break;
case HID_PSEUDOSHEET_TITLE: pNameId = STR_PSEUDOSHEET_TITLE; break;
case HID_PSEUDOSHEET_SUBTITLE: pNameId = STR_PSEUDOSHEET_SUBTITLE; break;
......
sd/source/core/stlsheet.cxx
Dosyayı görüntüle @ d3086765
......@@ -604,20 +604,21 @@ void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
{ OUStringLiteral("backgroundobjects"),HID_PSEUDOSHEET_BACKGROUNDOBJECTS },
{ OUStringLiteral("notes"), HID_PSEUDOSHEET_NOTES },
{ OUStringLiteral("standard"), HID_STANDARD_STYLESHEET_NAME },
{ OUStringLiteral("objectwitharrow"), HID_POOLSHEET_OBJWITHARROW },
{ OUStringLiteral("objectwithshadow"), HID_POOLSHEET_OBJWITHSHADOW },
{ OUStringLiteral("objectwithoutfill"),HID_POOLSHEET_OBJWITHOUTFILL },
{ OUStringLiteral("text"), HID_POOLSHEET_TEXT },
{ OUStringLiteral("textbody"), HID_POOLSHEET_TEXTBODY },
{ OUStringLiteral("textbodyjustfied"), HID_POOLSHEET_TEXTBODY_JUSTIFY },
{ OUStringLiteral("textbodyindent"), HID_POOLSHEET_TEXTBODY_INDENT },
{ OUStringLiteral("title"), HID_POOLSHEET_TITLE },
{ OUStringLiteral("title1"), HID_POOLSHEET_TITLE1 },
{ OUStringLiteral("title2"), HID_POOLSHEET_TITLE2 },
{ OUStringLiteral("headline"), HID_POOLSHEET_HEADLINE },
{ OUStringLiteral("headline1"), HID_POOLSHEET_HEADLINE1 },
{ OUStringLiteral("headline2"), HID_POOLSHEET_HEADLINE2 },
{ OUStringLiteral("measure"), HID_POOLSHEET_MEASURE }
{ OUStringLiteral("measure"), HID_POOLSHEET_MEASURE },
{ OUStringLiteral("Filled"), HID_POOLSHEET_FILLED },
{ OUStringLiteral("Filled Blue"), HID_POOLSHEET_FILLED_BLUE },
{ OUStringLiteral("Filled Green"), HID_POOLSHEET_FILLED_GREEN },
{ OUStringLiteral("Filled Red"), HID_POOLSHEET_FILLED_RED },
{ OUStringLiteral("Filled Yellow"), HID_POOLSHEET_FILLED_YELLOW },
{ OUStringLiteral("Outlined"), HID_POOLSHEET_OUTLINE },
{ OUStringLiteral("Outlined Blue"), HID_POOLSHEET_OUTLINE_BLUE },
{ OUStringLiteral("Outlined Green"), HID_POOLSHEET_OUTLINE_GREEN },
{ OUStringLiteral("Outlined Red"), HID_POOLSHEET_OUTLINE_RED },
{ OUStringLiteral("Outlined Yellow"), HID_POOLSHEET_OUTLINE_YELLOW }
};
for (std::size_t i = 0; i != SAL_N_ELEMENTS(pApiNameMap); ++i)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment