diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-12 17:12:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 19:22:21 +0200 |
| commit | eaf0c263eb1a72a58d2a67cc0506ab022d7c4be4 (patch) | |
| tree | 4c732e95b560235e83c6de4b5b96260b638fa88d /sfx2 | |
| parent | 921ae49cd7e332d7e1ad702efe2198b2780cc829 (diff) | |
loplugin:staticconstfield improvements
And fix
ScXMLCachedRowAttrAccess::Cache
which was never setting its mnTab field, and hence would never
be hit.
And fix oox::xls::CellBlockBuffer, which was never setting mnCurrRow.
Change-Id: I2c46aa050b9ebe3c2dc2e52579555f97945dd61c
Reviewed-on: https://gerrit.libreoffice.org/61772
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 01f20ba9734b..aac778b6f29e 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -135,7 +135,7 @@ class WaitWindow_Impl : public WorkWindow { tools::Rectangle maRect; OUString maText; - const DrawTextFlags mnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine; + static constexpr DrawTextFlags gnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine; public: WaitWindow_Impl(); @@ -2283,7 +2283,7 @@ WaitWindow_Impl::WaitWindow_Impl() : WorkWindow(nullptr, WB_BORDER | WB_3DLOOK) { tools::Rectangle aRect = tools::Rectangle(0, 0, 300, 30000); maText = SfxResId(RID_CNT_STR_WAITING); - maRect = GetTextRect(aRect, maText, mnTextStyle); + maRect = GetTextRect(aRect, maText, gnTextStyle); aRect = maRect; aRect.AdjustRight(2 * X_OFFSET ); aRect.AdjustBottom(2 * Y_OFFSET ); @@ -2310,7 +2310,7 @@ void WaitWindow_Impl::dispose() void WaitWindow_Impl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { - rRenderContext.DrawText(maRect, maText, mnTextStyle); + rRenderContext.DrawText(maRect, maText, gnTextStyle); } void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, |