[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sfx2 README sfx2/source

[Matthias Seidel (via logerrit)]

 README                                            |    2 +-
 default_images/sfx2/res/symphony/open_more_hc.png |binary
 sfx2/source/sidebar/Sidebar.src                   |    9 ++++++---
 sfx2/source/sidebar/Theme.cxx                     |    6 ++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 1546abf4013c61e38d14751e0445b5d3b3ce6d19
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Wed Jul 31 15:38:28 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Wed Jul 31 15:38:28 2019 +0000

    Updated download number to 275 million.

diff --git a/README b/README
index a35686a78ea6..d190ba495ede 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ Apache OpenOffice (AOO)
         FreeBSD
         OS/2
 
-    OpenOffice is used by millions of users worldwide and with more than 270 million
+    OpenOffice is used by millions of users worldwide and with more than 275 million
     downloads it is one of the most successful open source projects.
 
 Getting the latest sources via Subversion
commit 1eb57609d556201cac9fd44251f3dbe1a5668964
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Wed Jul 31 15:21:55 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Wed Jul 31 15:21:55 2019 +0000

    Added high contrast icon for sidebar menu

diff --git a/default_images/sfx2/res/symphony/open_more_hc.png b/default_images/sfx2/res/symphony/open_more_hc.png
new file mode 100644
index 000000000000..63c10cc68697
Binary files /dev/null and b/default_images/sfx2/res/symphony/open_more_hc.png differ
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index aa0c348b6882..f47a895550fe 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -19,6 +19,8 @@
  *
  *************************************************************/
 
+
+
 #include "Sidebar.hrc"
 
 Resource RID_SIDEBAR_RESOURCE
@@ -60,7 +62,7 @@ Resource RID_SIDEBAR_RESOURCE
 
     Image IMAGE_SIDEBAR_MENU_HC
     {
-        ImageBitmap = Bitmap { File = "menu_hc.png" ;};
+        ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;};
     };
 
     Image IMAGE_SIDEBAR_DETAIL_DIALOG
@@ -284,11 +286,11 @@ Resource RID_SIDEBAR_RESOURCE
 
     String STRING_CUSTOMIZATION
     {
-    Text [en-US] = "Customization";
+        Text [en-US] = "Customization";
     };
     String STRING_RESTORE
     {
-    Text [en-US] = "Restore Default";
+        Text [en-US] = "Restore Default";
     };
 };
 
@@ -307,3 +309,4 @@ String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
     Text [en-US] = "Panel: ";
 };
 
+// ********************************************************************** EOF
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index f9d51325e7b9..317a2a68b199 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -19,6 +19,8 @@
  *
  *************************************************************/
 
+
+
 #include "precompiled_sfx2.hxx"
 
 #include "sfx2/sidebar/Theme.hxx"
@@ -345,7 +347,7 @@ void Theme::UpdateTheme (void)
         setPropertyValue(
             maPropertyIdToNameMap[Paint_HorizontalBorder],
             Any(sal_Int32(aBorderColor.GetRGBColor())));
-        //                    mbIsHighContrastMode ? 0x00ff00 :  0xe4e4e4)));
+        //                    mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_VerticalBorder],
             Any(sal_Int32(aBorderColor.GetRGBColor())));
@@ -373,7 +375,7 @@ void Theme::UpdateTheme (void)
             maPropertyIdToNameMap[Image_TabBarMenu],
             Any(
                 mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/sfx2/res/menu_hc.png")
+                    ? A2S("private:graphicrepository/sfx2/res/symphony/open_more_hc.png")
                     : A2S("private:graphicrepository/sfx2/res/symphony/open_more.png")));
         setPropertyValue(
             maPropertyIdToNameMap[Image_PanelMenu],