diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-12-01 10:22:09 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-01 14:01:45 +0100 |
commit | e5529e3a89df2b9bd5d76e3b8fbbfa17c4203d28 (patch) | |
tree | 2073210203731e451315a6810b8ad54fa841d1c8 | |
parent | ad53629186343f8a111b4bee21721e8b446bd8a2 (diff) |
cid#1470362 Uninitialized scalar field
Change-Id: I8828b7e098c1af9411b15b449f425242f5e64635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106959
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | include/sfx2/sidebar/TabBar.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sidebar/Theme.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 22 |
4 files changed, 0 insertions, 37 deletions
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index e52202ac1bb0..1738df1e2bfe 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -69,7 +69,6 @@ public: virtual ~TabBar() override; virtual void dispose() override; - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override; virtual bool EventNotify (NotifyEvent& rEvent) override; @@ -120,7 +119,6 @@ private: typedef ::std::vector<std::unique_ptr<Item>> ItemContainer; ItemContainer maItems; const ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor; - sal_Int32 mnMenuSeparatorY; PopupMenuProvider maPopupMenuProvider; static void CreateTabItem(weld::Toolbar& rButton, const DeckDescriptor& rDeckDescriptor); diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 9b35ce7aa6dd..c59d71233b00 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -61,7 +61,6 @@ public: Color_DeckTitleFont, Color_PanelTitleFont, - Color_TabMenuSeparator, Color_Highlight, Color_HighlightText, Color_DeckBackground, @@ -79,8 +78,6 @@ public: Int_DeckBorderSize, Int_DeckSeparatorHeight, Int_PanelTitleBarHeight, - Int_TabMenuPadding, - Int_TabMenuSeparatorPadding, Int_DeckLeftPadding, Int_DeckTopPadding, Int_DeckRightPadding, 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 @@ -181,16 +181,6 @@ void Theme::UpdateTheme() 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: |