summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--icon-themes/breeze/sfx2/res/separator.pngbin149 -> 0 bytes
-rw-r--r--icon-themes/elementary/sfx2/res/separator.pngbin221 -> 0 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/separator.pngbin221 -> 0 bytes
-rw-r--r--include/sfx2/sidebar/Sidebar.hrc1
-rw-r--r--include/sfx2/sidebar/SidebarToolBox.hxx4
-rw-r--r--include/sfx2/sidebar/Theme.hxx2
-rw-r--r--sfx2/source/sidebar/Sidebar.src5
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx23
-rw-r--r--sfx2/source/sidebar/Theme.cxx15
9 files changed, 0 insertions, 50 deletions
diff --git a/icon-themes/breeze/sfx2/res/separator.png b/icon-themes/breeze/sfx2/res/separator.png
deleted file mode 100644
index 45852ef7ae46..000000000000
--- a/icon-themes/breeze/sfx2/res/separator.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/elementary/sfx2/res/separator.png b/icon-themes/elementary/sfx2/res/separator.png
deleted file mode 100644
index f94519bccc9f..000000000000
--- a/icon-themes/elementary/sfx2/res/separator.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/separator.png b/icon-themes/galaxy/sfx2/res/separator.png
deleted file mode 100644
index be133b90642e..000000000000
--- a/icon-themes/galaxy/sfx2/res/separator.png
+++ /dev/null
Binary files differ
diff --git a/include/sfx2/sidebar/Sidebar.hrc b/include/sfx2/sidebar/Sidebar.hrc
index e1ab27043c37..96597cfebfec 100644
--- a/include/sfx2/sidebar/Sidebar.hrc
+++ b/include/sfx2/sidebar/Sidebar.hrc
@@ -25,7 +25,6 @@
#define IMAGE_SIDEBAR_GRIP 5
#define IMAGE_SIDEBAR_MENU 7
#define IMAGE_SIDEBAR_DETAIL_DIALOG 9
-#define IMAGE_SIDEBAR_TOOLBOX_SEPARATOR 11
#define IMAGE_SIDEBAR_DECK_3D_LARGE 20
#define IMAGE_SIDEBAR_DECK_3D_SMALL 22
#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE 30
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 1e8915a7ba67..e9fae35d3122 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -50,8 +50,6 @@ public:
const Size& rRequestedSize = Size(),
sal_uInt16 nPos = TOOLBOX_APPEND) override;
- virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
-
virtual bool Notify (NotifyEvent& rEvent) override;
css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const sal_uInt16 nItemId) const;
@@ -64,8 +62,6 @@ public:
css::uno::Reference<css::frame::XToolbarController> GetFirstController();
private:
- Image maItemSeparator;
-
class ItemDescriptor
{
public:
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index a9da7f680f92..6cec99863326 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -70,7 +70,6 @@ public:
Image_Collapse,
Image_TabBarMenu,
Image_PanelMenu,
- Image_ToolBoxItemSeparator,
Image_Closer,
Image_CloseIndicator,
@@ -124,7 +123,6 @@ public:
__Int_Bool,
Bool_UseSystemColors,
- Bool_UseToolBoxItemSeparator,
Bool_IsHighContrastModeActive,
__Bool_Rect,
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index b9ff0c2821a9..232030747f76 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -45,11 +45,6 @@ Resource RID_SIDEBAR_RESOURCE
ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;};
};
- Image IMAGE_SIDEBAR_TOOLBOX_SEPARATOR
- {
- ImageBitmap = Bitmap { File = "separator.png" ;};
- };
-
Image IMAGE_SIDEBAR_DECK_3D_LARGE
{
ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;};
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 95acd31ab303..dfebb0e23645 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -54,7 +54,6 @@ namespace sfx2 { namespace sidebar {
SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow)
: ToolBox(pParentWindow, 0),
- maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)),
maControllers(),
mbAreHandlersRegistered(false)
{
@@ -118,28 +117,6 @@ void SidebarToolBox::InsertItem(const OUString& rCommand,
RegisterHandlers();
}
-void SidebarToolBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
-{
- ToolBox::Paint(rRenderContext, rRect);
-
- if (Theme::GetBoolean(Theme::Bool_UseToolBoxItemSeparator))
- {
- const sal_Int32 nSeparatorY((GetSizePixel().Height() - maItemSeparator.GetSizePixel().Height()) / 2);
- const sal_uInt16 nItemCount(GetItemCount());
- int nLastRight(-1);
- for (sal_uInt16 nIndex = 0; nIndex < nItemCount; ++nIndex)
- {
- const Rectangle aItemBoundingBox (GetItemPosRect(nIndex));
- if (nLastRight >= 0)
- {
- const int nSeparatorX((nLastRight + aItemBoundingBox.Left() - 1) / 2);
- rRenderContext.DrawImage(Point(nSeparatorX, nSeparatorY), maItemSeparator);
- }
- nLastRight = aItemBoundingBox.Right();
- }
- }
-}
-
bool SidebarToolBox::Notify (NotifyEvent& rEvent)
{
if (rEvent.GetType() == MouseNotifyEvent::KEYINPUT)
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index eedcf77622f9..241767b37c17 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -305,10 +305,6 @@ void Theme::UpdateTheme()
setPropertyValue(
maPropertyIdToNameMap[Image_CloseIndicator],
Any(OUString("private:graphicrepository/cmd/lc_decrementlevel.png")));
- setPropertyValue(
- maPropertyIdToNameMap[Image_ToolBoxItemSeparator],
- Any(
- OUString("private:graphicrepository/sfx2/res/separator.png")));
// ToolBox
@@ -332,10 +328,6 @@ void Theme::UpdateTheme()
setPropertyValue(
maPropertyIdToNameMap[Rect_ToolBoxBorder],
Any(awt::Rectangle(0,0,0,0)));
- setPropertyValue(
- maPropertyIdToNameMap[Bool_UseToolBoxItemSeparator],
- Any(true));
-
*/
// Gradient style
Color aGradientStop2 (aBaseBackgroundColor);
@@ -370,9 +362,6 @@ void Theme::UpdateTheme()
setPropertyValue(
maPropertyIdToNameMap[Rect_ToolBoxBorder],
Any(awt::Rectangle(1,1,1,1)));
- setPropertyValue(
- maPropertyIdToNameMap[Bool_UseToolBoxItemSeparator],
- Any(false));
}
catch(beans::UnknownPropertyException& rException)
{
@@ -686,7 +675,6 @@ void Theme::SetupPropertyMaps()
AddEntry(Image_Collapse);
AddEntry(Image_TabBarMenu);
AddEntry(Image_PanelMenu);
- AddEntry(Image_ToolBoxItemSeparator);
AddEntry(Image_Closer);
AddEntry(Image_CloseIndicator);
@@ -732,7 +720,6 @@ void Theme::SetupPropertyMaps()
AddEntry(Int_ButtonCornerRadius);
AddEntry(Bool_UseSystemColors);
- AddEntry(Bool_UseToolBoxItemSeparator);
AddEntry(Bool_IsHighContrastModeActive);
AddEntry(Rect_ToolBoxPadding);
@@ -752,7 +739,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem)
case Image_Collapse:
case Image_TabBarMenu:
case Image_PanelMenu:
- case Image_ToolBoxItemSeparator:
case Image_Closer:
case Image_CloseIndicator:
return PT_Image;
@@ -802,7 +788,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem)
return PT_Integer;
case Bool_UseSystemColors:
- case Bool_UseToolBoxItemSeparator:
case Bool_IsHighContrastModeActive:
return PT_Boolean;
generated by cgit (git 2.34.1) at 2025-01-06 10:27:57 +0000