[Libreoffice-commits] core.git: 2 commits - extras/source include/svx svx/inc svx/source sw/inc

[Kovács László Zoltán (via logerrit)]

 extras/source/palettes/material.soc |   52 ++--
 include/svx/strings.hrc |   25 +
 svx/inc/strings.hxx |   26 +-
 svx/source/unodraw/unoprov.cxx  |   48 +
 sw/inc/IDocumentDeviceAccess.hxx|3 --
 5 files changed, 124 insertions(+), 30 deletions(-)

New commits:
commit 16006492d6b1e26fdb13176b9a5ed74e4048218b
Author: Kovács László Zoltán 
AuthorDate: Tue Aug 13 15:46:56 2019 +0200
Commit: László Németh 
CommitDate: Wed Aug 21 15:02:43 2019 +0200

tdf#105000 Make Material palette entries localizable

Change-Id: I8e208ed6b807e43ce53c5604ccb5d544c28189e5
Reviewed-on: https://gerrit.libreoffice.org/77419
Reviewed-by: Gabor Kelemen 
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/extras/source/palettes/material.soc 
b/extras/source/palettes/material.soc
index e06d4a7cadd5..c5f8823f2e8b 100644
--- a/extras/source/palettes/material.soc
+++ b/extras/source/palettes/material.soc
@@ -3,19 +3,19 @@
 
 http://openoffice.org/2000/office"; 
xmlns:style="http://openoffice.org/2000/style"; 
xmlns:text="http://openoffice.org/2000/text"; 
xmlns:table="http://openoffice.org/2000/table"; 
xmlns:draw="http://openoffice.org/2000/drawing"; 
xmlns:fo="http://www.w3.org/1999/XSL/Format"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="http://openoffice.org/2000/meta"; 
xmlns:number="http://openoffice.org/2000/datastyle"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:chart="http://openoffice.org/2000/chart"; 
xmlns:dr3d="http://openoffice.org/2000/dr3d"; 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="http://openoffice.org/2000/form"; 
xmlns:script="http://openoffice.org/2000/script";>
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -255,17 +255,17 @@
   
   
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 6690d18a2b48..3f762edf5e3b 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -619,6 +619,31 @@
 #define RID_SVXSTR_COLOR_SPRINGGREEN
NC_("RID_SVXSTR_COLOR_SPRINGGREEN", "Spring Green")
 #define RID_SVXSTR_COLOR_CHARTREUSEGREEN
NC_("RID_SVXSTR_COLOR_CHARTREUSEGREEN", "Chartreuse Green")
 #define RID_SVXSTR_COLOR_ROSE   
NC_("RID_SVXSTR_COLOR_ROSE", "Rose")
+//Elements of the Material color palette
+#define RID_SVXSTR_COLOR_MATERIAL_GRAY_A
NC_("RID_SVXSTR_COLOR_MATERIAL_GRAY_A", "Gray A")
+#define RID_SVXSTR_COLOR_MATERIAL_YELLOW_A  
NC_("RID_SVXSTR_COLOR_MATERIAL_YELLOW_A", "Yellow A")
+#define RID_SVXSTR_COLOR_MATERIAL_AMBER_A   
NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER_A", "Amber A")
+#define RID_SVXSTR_COLOR_MATERIAL_AMBER 
NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER", "Amber")
+#define RID_SVXSTR_COLOR_MATERIAL_ORANGE_A  
NC_("RID_SVXSTR_COLOR_MATERIAL_ORANGE_A", "Orange A")
+#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A 
NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A", "Deep Orange A")
+#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE   
NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE", "Deep Orange")
+#define RID_SVXSTR_COLOR_MATERIAL_RED_A 
NC_("RID_SVXSTR_COLOR_MATERIAL_RED_A", "Red A")
+#define RID_SVXSTR_COLOR_MATERIAL_PINK_A
NC_("RID_SVXSTR_COLOR_MATERIAL_PINK_A", "Pink A")
+#define RID_SVXSTR_COLOR_MATERIAL_PURPLE_A  
NC_("RID_SVXSTR_COLOR_MATERIAL_PURPLE_A", "Purple A")
+#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A 
NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A", "Deep Purple A")
+#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE   
NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE", "Deep Purple")
+#define RID_SVXSTR_COLOR_MATERIAL_INDIGO_A  
NC_("RID_SVXSTR_COLOR_MATERIAL_INDIGO_A", "Indigo A")
+#define RID_SVXSTR_COLOR_MATERIAL_BLUE_A
NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_A", "Blue A")
+#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A  
NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A", "Light Blue A")
+#define RID_SVXSTR_COLOR_MATERIAL_CYAN_A
NC_("RID_SVXSTR_COLOR_MATERIAL_CYAN_A", "Cyan A")
+#define RID_SVXSTR_COLOR_MATERIAL_TEAL_A
NC_("RID_SVXSTR_COLOR_MATERIAL_TEAL_A", "Teal A")
+#define RID_SVXSTR_COLOR_MATERIAL_GREEN_A   
NC_("RID_SVXSTR_COLOR_MATERIAL_GREEN_A", "Green A")
+#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A 
NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A", "Light Green A")
+#define RID_SVXSTR_COLOR_MATERIAL_LIME_A
NC_("RID_SVXSTR_COLOR_MATERIAL_LIME_A", "Lime A")
+#d

[Libreoffice-commits] core.git: sc/source

[Kovács László Zoltán (via logerrit)]

 sc/source/ui/condformat/colorformat.cxx|2 +-
 sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f28da80ae695fe84c15991afc564b523614d1ee
Author: Kovács László Zoltán 
AuthorDate: Wed Aug 7 16:30:51 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Aug 8 10:23:50 2019 +0200

tdf#125288 Databar dialog's entry color was changed to RYB Blue

Change-Id: I9ac6df07078d60bf439babc46384fa96267fb4cd
Reviewed-on: https://gerrit.libreoffice.org/77119
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index e82e23f2d46a..a5935d48e863 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -130,7 +130,7 @@ void ScDataBarSettingsDlg::Init()
 {
 mxLbNeg->SelectEntry(COL_LIGHTRED);
 mxLbAxisCol->SelectEntry(COL_BLACK);
-mxLbPos->SelectEntry(COL_LIGHTBLUE);
+mxLbPos->SelectEntry(0x2a6099);
 mxBtnOk->connect_clicked( LINK( this, ScDataBarSettingsDlg, OkBtnHdl ) );
 
 mxLbTypeMin->connect_changed( LINK( this, ScDataBarSettingsDlg, 
TypeSelectHdl ) );
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 89588a107412..a43a82846d8b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1104,7 +1104,7 @@ void ScDataBarFrmtEntry::Init()
 mpDataBarData->mpLowerLimit.reset(new ScColorScaleEntry());
 mpDataBarData->mpLowerLimit->SetType(COLORSCALE_AUTO);
 mpDataBarData->mpUpperLimit->SetType(COLORSCALE_AUTO);
-mpDataBarData->maPositiveColor = COL_LIGHTBLUE;
+mpDataBarData->maPositiveColor = 0x2a6099;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits