From e5529e3a89df2b9bd5d76e3b8fbbfa17c4203d28 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 1 Dec 2020 10:22:09 +0000 Subject: cid#1470362 Uninitialized scalar field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8828b7e098c1af9411b15b449f425242f5e64635 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106959 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sfx2/source/sidebar/TabBar.cxx | 10 ---------- sfx2/source/sidebar/Theme.cxx | 22 ---------------------- 2 files changed, 32 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 6efe1133bda9..11567b228eb0 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -95,16 +95,6 @@ void TabBar::dispose() InterimItemWindow::dispose(); } -void TabBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) -{ - InterimItemWindow::Paint(rRenderContext, rUpdateArea); - - const sal_Int32 nHorizontalPadding(Theme::GetInteger(Theme::Int_TabMenuSeparatorPadding)); - rRenderContext.SetLineColor(Theme::GetColor(Theme::Color_TabMenuSeparator)); - rRenderContext.DrawLine(Point(nHorizontalPadding, mnMenuSeparatorY), - Point(GetSizePixel().Width() - nHorizontalPadding, mnMenuSeparatorY)); -} - sal_Int32 TabBar::GetDefaultWidth() { if (!gDefaultWidth) diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 063572b5c97e..bd64a87b7907 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -180,16 +180,6 @@ void Theme::UpdateTheme() maPropertyIdToNameMap[Color_TabBarBackground], Any(sal_Int32(aBaseBackgroundColor.GetRGBColor()))); - setPropertyValue( - maPropertyIdToNameMap[Int_TabMenuPadding], - Any(sal_Int32(3))); - setPropertyValue( - maPropertyIdToNameMap[Color_TabMenuSeparator], - Any(sal_Int32(aBorderColor.GetRGBColor()))); - setPropertyValue( - maPropertyIdToNameMap[Int_TabMenuSeparatorPadding], - Any(sal_Int32(3))); - setPropertyValue( maPropertyIdToNameMap[Color_DropDownBackground], Any(sal_Int32(aBaseBackgroundColor.GetRGBColor()))); @@ -512,9 +502,6 @@ void Theme::SetupPropertyMaps() maPropertyNameToIdMap["Color_PanelTitleFont"]=Color_PanelTitleFont; maPropertyIdToNameMap[Color_PanelTitleFont]="Color_PanelTitleFont"; - maPropertyNameToIdMap["Color_TabMenuSeparator"]=Color_TabMenuSeparator; - maPropertyIdToNameMap[Color_TabMenuSeparator]="Color_TabMenuSeparator"; - maPropertyNameToIdMap["Color_Highlight"]=Color_Highlight; maPropertyIdToNameMap[Color_Highlight]="Color_Highlight"; @@ -559,12 +546,6 @@ void Theme::SetupPropertyMaps() maPropertyNameToIdMap["Int_PanelTitleBarHeight"]=Int_PanelTitleBarHeight; maPropertyIdToNameMap[Int_PanelTitleBarHeight]="Int_PanelTitleBarHeight"; - maPropertyNameToIdMap["Int_TabMenuPadding"]=Int_TabMenuPadding; - maPropertyIdToNameMap[Int_TabMenuPadding]="Int_TabMenuPadding"; - - maPropertyNameToIdMap["Int_TabMenuSeparatorPadding"]=Int_TabMenuSeparatorPadding; - maPropertyIdToNameMap[Int_TabMenuSeparatorPadding]="Int_TabMenuSeparatorPadding"; - maPropertyNameToIdMap["Int_DeckLeftPadding"]=Int_DeckLeftPadding; maPropertyIdToNameMap[Int_DeckLeftPadding]="Int_DeckLeftPadding"; @@ -596,7 +577,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem) case Color_DeckTitleFont: case Color_PanelTitleFont: - case Color_TabMenuSeparator: case Color_Highlight: case Color_HighlightText: case Color_DeckBackground: @@ -613,8 +593,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem) case Int_DeckBorderSize: case Int_DeckSeparatorHeight: case Int_PanelTitleBarHeight: - case Int_TabMenuPadding: - case Int_TabMenuSeparatorPadding: case Int_DeckLeftPadding: case Int_DeckTopPadding: case Int_DeckRightPadding: -- cgit