summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-12-06 11:37:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-12-07 07:38:24 +0100
commit38187ec15b6cbaedcadcbd8f3bcb632a5c6be88f (patch)
treeac3de03a8c2944371ce43443750f6eeb8d318046 /sd
parent60714a814847f6d10f00aa6809a3896a48741e0b (diff)
loplugin:singlevalfields extend to all static vars
Change-Id: Ic238bb5291539fd1b7e98cb4afc9b25f37e7d528 Reviewed-on: https://gerrit.libreoffice.org/64710 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx5
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx3
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx2
4 files changed, 4 insertions, 8 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 760699f2f981..50358ef51b90 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -155,10 +155,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent()
sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole()
{
ThrowIfDisposed();
- //set Role = Shape
- //static sal_Int16 nRole = AccessibleRole::LIST_ITEM;
- static sal_Int16 nRole = AccessibleRole::SHAPE;
- return nRole;
+ return AccessibleRole::SHAPE;
}
OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription()
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 1448b6b9cc6e..4d363de2eca7 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -253,8 +253,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent()
sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole()
{
ThrowIfDisposed();
- static sal_Int16 nRole = AccessibleRole::DOCUMENT;
- return nRole;
+ return AccessibleRole::DOCUMENT;
}
OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription()
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 6abcb1716fda..7ff7958af385 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -763,7 +763,7 @@ void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, SdrTextObj con
if (bDotted)
{
std::vector<double> aPattern;
- static double fFactor(1.0);
+ static const double fFactor(1.0);
aPattern.push_back(3.0 * fFactor);
aPattern.push_back(1.0 * fFactor);
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 5938c80428d8..392c709c5890 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -368,7 +368,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected
// use a text size factor to get more reliable text sizes from the text layouter
// (and from vcl), tipp from HDU
- static sal_uInt32 nTextSizeFactor(100);
+ static const sal_uInt32 nTextSizeFactor(100);
// use a factor to get more linear text size calculations
aScaledVclFont.SetFontHeight( 500 * nTextSizeFactor );