Skip to content

C
core
Kaydet (Commit) 56709377 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

clang-analyzer-deadcode.DeadStores 

Change-Id: I7c19ce1bde1eb405fe64aba7504fc511c0ab646e
üst 13271f32
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
sdext/source/presenter/PresenterPaneBorderPainter.cxx
Dosyayı görüntüle @ 56709377
...@@ -86,7 +86,8 @@ namespace { ...@@ -86,7 +86,8 @@ namespace {
PresenterTheme::SharedFontDescriptor mpFont; PresenterTheme::SharedFontDescriptor mpFont;
sal_Int32 mnFontXOffset; sal_Int32 mnFontXOffset;
sal_Int32 mnFontYOffset; sal_Int32 mnFontYOffset;
enum Anchor { AnchorLeft, AnchorRight, AnchorCenter } meFontAnchor; enum class Anchor { Left, Right, Center };
Anchor meFontAnchor;
BorderSize maInnerBorderSize; BorderSize maInnerBorderSize;
BorderSize maOuterBorderSize; BorderSize maOuterBorderSize;
BorderSize maTotalBorderSize; BorderSize maTotalBorderSize;
...@@ -536,21 +537,20 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( ...@@ -536,21 +537,20 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
geometry::RealRectangle2D aBox (xLayout->queryTextBounds()); geometry::RealRectangle2D aBox (xLayout->queryTextBounds());
const double nTextHeight = aBox.Y2 - aBox.Y1; const double nTextHeight = aBox.Y2 - aBox.Y1;
const double nTextWidth = aBox.X1 + aBox.X2; const double nTextWidth = aBox.X1 + aBox.X2;
double nX = rInnerBox.X + (rInnerBox.Width - nTextWidth)/2;
const sal_Int32 nTitleBarHeight = rInnerBox.Y - rOuterBox.Y - 1; const sal_Int32 nTitleBarHeight = rInnerBox.Y - rOuterBox.Y - 1;
double nY = rOuterBox.Y + (nTitleBarHeight - nTextHeight) / 2 - aBox.Y1; double nY = rOuterBox.Y + (nTitleBarHeight - nTextHeight) / 2 - aBox.Y1;
if (nY >= rInnerBox.Y) if (nY >= rInnerBox.Y)
nY = rInnerBox.Y - 1; nY = rInnerBox.Y - 1;
double nX;
switch (rpStyle->meFontAnchor) switch (rpStyle->meFontAnchor)
{ {
default: case RendererPaneStyle::Anchor::Left:
case RendererPaneStyle::AnchorLeft:
nX = rInnerBox.X; nX = rInnerBox.X;
break; break;
case RendererPaneStyle::AnchorRight: case RendererPaneStyle::Anchor::Right:
nX = rInnerBox.X + rInnerBox.Width - nTextWidth; nX = rInnerBox.X + rInnerBox.Width - nTextWidth;
break; break;
case RendererPaneStyle::AnchorCenter: case RendererPaneStyle::Anchor::Center:
nX = rInnerBox.X + (rInnerBox.Width - nTextWidth)/2; nX = rInnerBox.X + (rInnerBox.Width - nTextWidth)/2;
break; break;
} }
...@@ -810,7 +810,7 @@ RendererPaneStyle::RendererPaneStyle ( ...@@ -810,7 +810,7 @@ RendererPaneStyle::RendererPaneStyle (
mpFont(), mpFont(),
mnFontXOffset(0), mnFontXOffset(0),
mnFontYOffset(0), mnFontYOffset(0),
meFontAnchor(AnchorCenter), meFontAnchor(Anchor::Center),
maInnerBorderSize(), maInnerBorderSize(),
maOuterBorderSize(), maOuterBorderSize(),
maTotalBorderSize() maTotalBorderSize()
...@@ -840,11 +840,11 @@ RendererPaneStyle::RendererPaneStyle ( ...@@ -840,11 +840,11 @@ RendererPaneStyle::RendererPaneStyle (
} }
if ( sAnchor == "Left" ) if ( sAnchor == "Left" )
meFontAnchor = AnchorLeft; meFontAnchor = Anchor::Left;
else if ( sAnchor == "Right" ) else if ( sAnchor == "Right" )
meFontAnchor = AnchorRight; meFontAnchor = Anchor::Right;
else else
meFontAnchor = AnchorCenter; meFontAnchor = Anchor::Center;
// Get border sizes. // Get border sizes.
try try
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment