diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 4ab2fe70d314..81436be45167 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -42,13 +42,6 @@ namespace o3tl
     template<> struct typed_flags<DrawSymbolFlags> : is_typed_flags<DrawSymbolFlags, 0x03> {};
 }
 
-// Flags for DrawHighlightFrame()
-enum class DrawHighlightFrameStyle
-{
-    In                  = 1,
-    Out                 = 2,
-};
-
 // Flags for DrawButton()
 enum class DrawButtonFlags
 {
@@ -82,8 +75,7 @@ public:
     void                DrawFrame( const tools::Rectangle& rRect,
                                    const Color& rLeftTopColor,
                                    const Color& rRightBottomColor );
-    void                DrawHighlightFrame( const tools::Rectangle& rRect,
-                                            DrawHighlightFrameStyle nStyle );
+    void                DrawHighlightFrame( const tools::Rectangle& rRect );
     tools::Rectangle           DrawFrame( const tools::Rectangle& rRect, DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE );
     tools::Rectangle           DrawButton( const tools::Rectangle& rRect, DrawButtonFlags nStyle );
     void                DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true );
diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx
index c8af17cf4ba5..bc44da43da98 100644
--- a/svx/inc/sxmsitm.hxx
+++ b/svx/inc/sxmsitm.hxx
@@ -28,8 +28,8 @@
 class SdrMeasureScaleItem final : public SdrScaleItem
 {
 public:
-    SdrMeasureScaleItem(SfxItemType eItemType = SfxItemType::SdrMeasureScaleItemType)
-        : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), eItemType)
+    SdrMeasureScaleItem()
+        : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1), SfxItemType::SdrMeasureScaleItemType)
     {
     }
     virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 2fb00f963a40..0f6f59385ddb 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -1848,7 +1848,7 @@ void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderConte
                                                 const tools::Rectangle& rRect)
 {
     DecorationView aDecoView(&rRenderContext);
-    aDecoView.DrawHighlightFrame(rRect, DrawHighlightFrameStyle::Out);
+    aDecoView.DrawHighlightFrame(rRect);
 }
 
 void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame(SvxIconChoiceCtrlEntry* pEntry)
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 2067a9e4ca4f..4b793b4610ef 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -821,8 +821,7 @@ void DecorationView::DrawFrame( const tools::Rectangle& rRect,
     mpOutDev->EnableMapMode( bOldMapMode );
 }
 
-void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect,
-                                         DrawHighlightFrameStyle nStyle )
+void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect )
 {
     const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings();
     Color aLightColor = rStyleSettings.GetLightColor();
@@ -859,9 +858,6 @@ void DecorationView::DrawHighlightFrame( const tools::Rectangle& rRect,
         }
     }
 
-    if ( nStyle == DrawHighlightFrameStyle::In )
-        std::swap( aLightColor, aShadowColor );
-
     DrawFrame( rRect, aLightColor, aShadowColor );
 }
 
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 6f9dc0ce72cb..c585946e217a 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -102,11 +102,10 @@ void SchXMLParagraphContext::characters( const OUString& rChars )
 }
 
 SchXMLTitleParaContext::SchXMLTitleParaContext( SvXMLImport& rImport,
-                                                std::vector<std::pair<OUString, OUString>>& rParaText,
-                                                OUString * pOutId /* = 0 */ ) :
+                                                std::vector<std::pair<OUString, OUString>>& rParaText) :
     SvXMLImportContext( rImport ),
     mrParaText( rParaText ),
-    mpId( pOutId )
+    mpId( nullptr )
 {
 }
 
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index ba2231bd5d24..4f344e5793f8 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -60,8 +60,7 @@ private:
 
 public:
     SchXMLTitleParaContext( SvXMLImport& rImport,
-                            std::vector<std::pair<OUString, OUString>>& rParaText,
-                            OUString * pOutId = nullptr );
+                            std::vector<std::pair<OUString, OUString>>& rParaText);
     virtual ~SchXMLTitleParaContext() override;
 
     virtual void SAL_CALL startFastElement(