[Libreoffice-commits] core.git: sd/inc sd/source
heiko tietze
tietze.heiko at gmail.com
Wed May 16 16:49:18 UTC 2018
sd/inc/app.hrc | 30 ++--
sd/inc/strings.hrc | 27 ++-
sd/source/core/drawdoc4.cxx | 327 +++++++++++++++++++++++---------------------
sd/source/core/stlpool.cxx | 19 +-
sd/source/core/stlsheet.cxx | 21 +-
5 files changed, 226 insertions(+), 198 deletions(-)
New commits:
commit d30867653af6fa59a9221a2430c064a9ea903cc1
Author: heiko tietze <tietze.heiko at gmail.com>
Date: Sun May 13 12:16:35 2018 +0200
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 at libreoffice.org>
Reviewed-by: Regina Henschel <rb.henschel at t-online.de>
Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
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" )
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 6f6e7ada56ac..b886954196a2 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -66,6 +66,7 @@
#include <editeng/fontitem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/cmapitem.hxx>
+#include <editeng/memberids.h>
#include <svx/xbtmpit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xflgrit.hxx>
@@ -250,40 +251,6 @@ void SdDrawDocument::CreateLayoutTemplates()
SfxItemSet* pISet = nullptr;
- // Object with arrowhead
- aName = SdResId(STR_POOLSHEET_OBJWITHARROW);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
- pISet->Put(XLineColorItem(OUString(), COL_BLACK));
- pISet->Put(XLineWidthItem(150));
-
- ::basegfx::B2DPolygon aArrow;
- aArrow.append(::basegfx::B2DPoint(10.0, 0.0));
- aArrow.append(::basegfx::B2DPoint(0.0, 30.0));
- aArrow.append(::basegfx::B2DPoint(20.0, 30.0));
- aArrow.setClosed(true);
- pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
-
- pISet->Put(XLineStartWidthItem(700));
- pISet->Put(XLineEndWidthItem(300));
- pISet->Put(XLineStartCenterItem(true));
-
- // Object with Shadow
- aName = SdResId(STR_POOLSHEET_OBJWITHSHADOW);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(makeSdrShadowItem(true));
- pISet->Put(makeSdrShadowColorItem(COL_GRAY));
- pISet->Put(makeSdrShadowXDistItem(200)); // 3 mm shadow distance
- pISet->Put(makeSdrShadowYDistItem(200));
-
// Object without filling
aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL);
pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
@@ -295,7 +262,6 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineColorItem(OUString(), COL_BLACK));
// Object no fill no line
-
aName = SdResId(STR_POOLSHEET_OBJNOLINENOFILL);
pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
pSheet->SetParent(aStdName);
@@ -316,44 +282,6 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
- // Text body
- aName = SdResId(STR_POOLSHEET_TEXTBODY);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
- pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
-
- pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT)); // 16 pt
-
- // Text body, justified
- aName = SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
- pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
-
- pISet->Put(SvxAdjustItem(SvxAdjust::Block, EE_PARA_JUST ));
-
- // Text body, indented
- aName = SdResId(STR_POOLSHEET_TEXTBODY_INDENT);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
- pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
-
- SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
- aLRSpaceItem.SetTextFirstLineOfst(600); // Indentation of first line: 6mm; right: 0
- pISet->Put(aLRSpaceItem);
-
// Title
aName = SdResId(STR_POOLSHEET_TITLE);
@@ -367,54 +295,6 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT )); // 44 pt
- // Title1
- aName = SdResId(STR_POOLSHEET_TITLE1);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
- pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
- pISet->Put(XFillColorItem(OUString(), COL_CYAN));
-
- pISet->Put(makeSdrShadowItem(true));
- pISet->Put(makeSdrShadowColorItem(COL_GRAY));
- pISet->Put(makeSdrShadowXDistItem(200)); // 2 mm shadow distance
- pISet->Put(makeSdrShadowYDistItem(200));
-
- pISet->Put(SvxFontHeightItem(846, 100, EE_CHAR_FONTHEIGHT )); // 24 pt
-
- pISet->Put(SvxAdjustItem(SvxAdjust::Center, EE_PARA_JUST ));
-
- // Title2
-
- aName = SdResId(STR_POOLSHEET_TITLE2);
- pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE2 );
- pISet = &pSheet->GetItemSet();
-
- pISet->Put(XLineWidthItem(50));
-
- // Don't get color from the color table, because the color might have been
- // deleted or changed there
- pISet->Put(XFillColorItem(OUString(), Color(255, 204, 153))); // orange
-
- pISet->Put(makeSdrShadowItem(true));
- pISet->Put(makeSdrShadowColorItem(COL_GRAY));
- pISet->Put(makeSdrShadowXDistItem(200)); // 2 mm shadow distance
- pISet->Put(makeSdrShadowYDistItem(200));
-
- pISet->Put(SvxFontHeightItem(1270, 100, EE_CHAR_FONTHEIGHT )); // 36 pt
-
- SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE);
- pISet->Put( aLRSpItem ); // Indentation of first line: 0 mm; left and right: 2 mm
-
- pISet->Put(SvxULSpaceItem(100, 100, EE_PARA_ULSPACE )); // Paragraph margin above/below: 1 mm
-
- pISet->Put(SvxAdjustItem(SvxAdjust::Center, EE_PARA_JUST ));
-
// Headline
aName = SdResId(STR_POOLSHEET_HEADLINE);
@@ -430,60 +310,199 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxULSpaceItem(420, 210, EE_PARA_ULSPACE )); // Paragraph margin above: 4,2 mm,
// Paragraph margin below: 2,1 mm
-
- // Headline1
- aName = SdResId(STR_POOLSHEET_HEADLINE1);
+ // Measurements
+ aName = SdResId(STR_POOLSHEET_MEASURE);
pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
pISet = &pSheet->GetItemSet();
- pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
+ pISet->Put(XLineColorItem(OUString(), COL_BLACK));
- pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT ));
+ pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT )); // 12 pt
- pISet->Put(SvxFontHeightItem(635, 100, EE_CHAR_FONTHEIGHT )); // 18 pt
+ ::basegfx::B2DPolygon aArrow;
+ aArrow.append(::basegfx::B2DPoint(10.0, 0.0));
+ aArrow.append(::basegfx::B2DPoint(0.0, 30.0));
+ aArrow.append(::basegfx::B2DPoint(20.0, 30.0));
+ aArrow.setClosed(true);
- pISet->Put(SvxULSpaceItem(420, 210, EE_PARA_ULSPACE )); // Paragraph margin above: 4,2 mm,
- // Paragraph margin below: 2,1 mm
+ pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+ pISet->Put(XLineStartWidthItem(200));
+ pISet->Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+ pISet->Put(XLineEndWidthItem(200));
+ pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
+ pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
- // Headline2
- aName = SdResId(STR_POOLSHEET_HEADLINE2);
+ // Filled
+ OUString aFilledName(SdResId(STR_POOLSHEET_FILLED));
+ XFillGradientItem aFillGradient;
+ XGradient aGradient;
+ aGradient.SetGradientStyle( ::awt::GradientStyle_LINEAR );
+ aGradient.SetAngle( 300 );
+ aSvxFontItem.SetFamilyName("Noto Sans");
+
+ aName = aFilledName;
pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED );
+ pISet = &pSheet->GetItemSet();
+ pISet->Put( XFillStyleItem(drawing::FillStyle_SOLID) ); // filled solid
+ pISet->Put( XFillColorItem(OUString(), Color(0x00ffffff)) ); // white
+ pISet->Put( XLineColorItem(OUString(), COL_BLACK) ); // black
+ pISet->Put( aSvxFontItem ); // Noto Sans
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+
+ // Blue
+ aName =SdResId(STR_POOLSHEET_FILLED_BLUE);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aFilledName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_BLUE );
pISet = &pSheet->GetItemSet();
- pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
- pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
+ aGradient.SetStartColor( Color(0x00729fcf) ); // light blue 2
+ aGradient.SetEndColor( Color(0x00355269) ); // dark blue 2
+ aFillGradient.SetGradientValue(aGradient);
+ aFillGradient.SetName( aName );
+ pISet->Put( XFillStyleItem(drawing::FillStyle_GRADIENT) );
+ pISet->Put( aFillGradient );
+ pISet->Put( XLineStyleItem(drawing::LineStyle_NONE) );
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font color
+
+ // Green
+ aName =SdResId(STR_POOLSHEET_FILLED_GREEN);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aFilledName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_GREEN );
+ pISet = &pSheet->GetItemSet();
- pISet->Put(SvxPostureItem(ITALIC_NORMAL, EE_CHAR_ITALIC ));
- pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT));
+ aGradient.SetStartColor( Color(0x0077bc65) ); // light green 2
+ aGradient.SetEndColor( Color(0x00127622) ); // dark green 2
+ aFillGradient.SetGradientValue(aGradient);
+ aFillGradient.SetName( aName );
+ pISet->Put( XFillStyleItem(drawing::FillStyle_GRADIENT) );
+ pISet->Put( aFillGradient );
+ pISet->Put( XLineStyleItem(drawing::LineStyle_NONE) );
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font color
+
+ // Red
+ aName =SdResId(STR_POOLSHEET_FILLED_RED);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aFilledName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_RED );
+ pISet = &pSheet->GetItemSet();
- pISet->Put(SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT )); // 14 pt
+ aGradient.SetStartColor( Color(0x00ff6d6d) ); // light red 2
+ aGradient.SetEndColor( Color(0x00c9211e) ); // dark red 2
+ aFillGradient.SetGradientValue(aGradient);
+ aFillGradient.SetName( aName );
+ pISet->Put( XFillStyleItem(drawing::FillStyle_GRADIENT) );
+ pISet->Put( aFillGradient );
+ pISet->Put( XLineStyleItem(drawing::LineStyle_NONE) );
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font color
+
+ // Yellow
+ aName =SdResId(STR_POOLSHEET_FILLED_YELLOW);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aFilledName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_YELLOW );
+ pISet = &pSheet->GetItemSet();
- pISet->Put(SvxULSpaceItem(420, 210, EE_PARA_ULSPACE )); // Paragraph margin above: 4,2 mm,
- // Paragraph margin below: 2,1 mm
+ aGradient.SetStartColor( Color(0x00ffde59) ); // light gold 2
+ aGradient.SetEndColor( Color(0x00b47804) ); // dark gold 2
+ aFillGradient.SetGradientValue(aGradient);
+ aFillGradient.SetName( aName );
+ pISet->Put( XFillStyleItem(drawing::FillStyle_GRADIENT) );
+ pISet->Put( aFillGradient );
+ pISet->Put( XLineStyleItem(drawing::LineStyle_NONE) );
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font color
+
+ // Outlines
+ OUString aOutlineName(SdResId(STR_POOLSHEET_OUTLINE));
+
+ aName = aOutlineName;
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE );
+ pISet = &pSheet->GetItemSet();
+ pISet->Put( XLineWidthItem(81)); // 2.3 pt
+ pISet->Put( XFillStyleItem(drawing::FillStyle_NONE)); // clear
+ pISet->Put( XLineColorItem(OUString(), COL_BLACK)); // b/w
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+
+ // blue
+ aName =SdResId(STR_POOLSHEET_OUTLINE_BLUE);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aOutlineName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_BLUE );
+ pISet = &pSheet->GetItemSet();
- // Measurements
- aName = SdResId(STR_POOLSHEET_MEASURE);
+ pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID));
+ pISet->Put( XLineColorItem(OUString(), Color(0x00355269)) ); // dark blue 2
+ pISet->Put( XLineWidthItem(81)); // 2.3 pt
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(Color(0x00355269), EE_CHAR_COLOR )); // font color
+
+ // green
+ aName =SdResId(STR_POOLSHEET_OUTLINE_GREEN);
pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
- pSheet->SetParent(aStdName);
- pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
+ pSheet->SetParent(aOutlineName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_GREEN );
pISet = &pSheet->GetItemSet();
- pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
- pISet->Put(XLineColorItem(OUString(), COL_BLACK));
+ pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID));
+ pISet->Put( XLineColorItem(OUString(), Color(0x00127622)) ); // dark green 2
+ pISet->Put( XLineWidthItem(81)); // 2.3 pt
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(Color(0x00127622), EE_CHAR_COLOR )); // font color
- pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT )); // 12 pt
+ // red
+ aName =SdResId(STR_POOLSHEET_OUTLINE_RED);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aOutlineName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_RED );
+ pISet = &pSheet->GetItemSet();
- pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
- pISet->Put(XLineStartWidthItem(200));
- pISet->Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
- pISet->Put(XLineEndWidthItem(200));
- pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
- pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
+ pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID));
+ pISet->Put( XLineColorItem(OUString(), Color(0x00c9211e)) ); // dark red 2
+ pISet->Put( XLineWidthItem(81)); // 2.3 pt
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(Color(0x00c9211e), EE_CHAR_COLOR )); // font color
+
+ // yellow
+ aName =SdResId(STR_POOLSHEET_OUTLINE_YELLOW);
+ pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask));
+ pSheet->SetParent(aOutlineName);
+ pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_YELLOW );
+ pISet = &pSheet->GetItemSet();
+
+ pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID));
+ pISet->Put( XLineColorItem(OUString(), Color(0x00b47804)) ); // dark gold 2
+ pISet->Put( XLineWidthItem(81)); // 2.3 pt
+ pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt
+ pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold
+ pISet->Put( aSvxFontItem ); // font name
+ pISet->Put( SvxColorItem(Color(0x00b47804), EE_CHAR_COLOR )); // font color
// Generate presentation templates for default layout.
OUString aPrefix = SdResId(STR_LAYOUT_DEFAULT_NAME);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 8580b10f82ee..506cdb08a2f4 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -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;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 428f70b1c952..3327304a0d3d 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -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)
More information about the Libreoffice-commits
mailing list