122707: Show a frame around toolbars in sidebar panels.

sfx2/source/sidebar/Theme.cxx

@@ -424,28 +424,32 @@ void Theme::UpdateTheme (void)
         */
 
         // Gradient style
+        Color aGradientStop2 (aBaseBackgroundColor);
+        aGradientStop2.IncreaseLuminance(17);
+        Color aToolBoxBorderColor (aBaseBackgroundColor);
+        aToolBoxBorderColor.DecreaseLuminance(12);
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBackground],
             Any(Tools::VclToAwtGradient(Gradient(
                         GRADIENT_LINEAR,
-                        Color(0xf2f2f2),
-                        Color(0xfefefe)
+                        aBaseBackgroundColor.GetRGBColor(),
+                        aGradientStop2.GetRGBColor()
                         ))));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
             mbIsHighContrastMode
                 ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(sal_uInt32(0xf2f2f2))));
+                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
             mbIsHighContrastMode
                 ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(sal_uInt32(0xf2f2f2))));
+                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
             mbIsHighContrastMode
                 ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(sal_uInt32(0xf2f2f2))));
+                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
         setPropertyValue(
             maPropertyIdToNameMap[Rect_ToolBoxPadding],
             Any(awt::Rectangle(2,2,2,2)));

svx/source/sidebar/text/TextPropertyPanel.hrc

@@ -45,7 +45,7 @@
 #define X0                      SECTIONPAGE_MARGIN_HORIZONTAL
 #define X1                      SECTIONPAGE_MARGIN_HORIZONTAL + 1 + TOOLBOX_ITEM_WIDTH * 2  + 4
 #define X2                      (PROPERTYPAGE_WIDTH - (FONTSIZE_WIDTH))
-#define X3                      (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 2)
+#define X3                      (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 3)
 
 #define FIRST_LINE_Y            SECTIONPAGE_MARGIN_VERTICAL_TOP
 #define SECOND_LINE_Y           FIRST_LINE_Y + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL  + 1