loplugin:constantparam
Change-Id: I81c9647ec7166ba429f6f58e3bd86b3a5ee4848f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174302 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
parent
0210aac7f9
commit
6fdad72372
@ -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 );
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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 );
|
||||
}
|
||||
|
||||
|
@ -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 )
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -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(
|
||||
|
Loading…
x
Reference in New Issue
Block a user