compilerplugins/clang/unusedfields.only-used-in-constructor.results | 4 ++-
compilerplugins/clang/unusedfields.readonly.results | 4 +++
compilerplugins/clang/unusedfields.untouched.results | 2 +
compilerplugins/clang/unusedfields.writeonly.results | 4 ---
include/svx/fontlb.hxx | 4 ---
svx/source/dialog/fontlb.cxx | 12
+++-------
6 files changed, 13 insertions(+), 17 deletions(-)
New commits:
commit 487fc22690c274c824264602212c4549b9b07b15
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Oct 3 08:41:25 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 3 11:03:31 2018 +0200
loplugin:unusedfields
Change-Id: I3d2cdd80b542dbdbd29971ef837111191809f081
Reviewed-on: https://gerrit.libreoffice.org/61282
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 0edd134d5367..a4e4e5cc38b1 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -204,6 +204,8 @@ include/sfx2/msg.hxx:117
SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
include/sfx2/msg.hxx:119
SfxType0 nAttribs sal_uInt16
+include/svl/broadcast.hxx:85
+ SvtBroadcaster mbDisposing _Bool
include/svl/ondemand.hxx:58
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
include/svx/ClassificationDialog.hxx:59
@@ -584,7 +586,7 @@ vcl/inc/unx/i18n_ic.hxx:46
SalI18N_InputContext maSwitchIMCallback XIMCallback
vcl/inc/unx/i18n_ic.hxx:47
SalI18N_InputContext maDestroyCallback XIMCallback
-vcl/source/app/salvtables.cxx:1504
+vcl/source/app/salvtables.cxx:1514
SalInstanceEntry m_aTextFilter class SalInstanceEntry::WeldTextFilter
vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cDeviceName char [32]
diff --git a/compilerplugins/clang/unusedfields.readonly.results
b/compilerplugins/clang/unusedfields.readonly.results
index 45c7a8293aeb..ee94958699ed 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -332,6 +332,10 @@ include/svtools/ctrlbox.hxx:454
FontSizeBox nPtRelStep short
include/svtools/editsyntaxhighlighter.hxx:33
MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig
+include/svx/fontlb.hxx:33
+ SvLBoxFontString maFont vcl::Font
+include/svx/fontlb.hxx:34
+ SvLBoxFontString mbUseColor _Bool
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51
sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
include/svx/sdr/overlay/overlaymanager.hxx:73
diff --git a/compilerplugins/clang/unusedfields.untouched.results
b/compilerplugins/clang/unusedfields.untouched.results
index 6803ae25f894..64252d2b75ad 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -118,6 +118,8 @@ include/sfx2/msg.hxx:117
SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
include/sfx2/msg.hxx:119
SfxType0 nAttribs sal_uInt16
+include/svl/broadcast.hxx:85
+ SvtBroadcaster mbDisposing _Bool
include/svtools/ctrlbox.hxx:353
SvtLineListBox m_xLineSetWin std::unique_ptr<weld::CustomWeld>
include/svtools/genericunodialog.hxx:218
diff --git a/compilerplugins/clang/unusedfields.writeonly.results
b/compilerplugins/clang/unusedfields.writeonly.results
index 960d1d23f34c..c583def63b1e 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -146,8 +146,6 @@ cui/source/inc/cuihyperdlg.hxx:57
SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
cui/source/inc/cuihyperdlg.hxx:77
SvxHpLinkDlg maCtrl class SvxHlinkCtrl
-cui/source/inc/cuitabline.hxx:95
- SvxLineTabPage m_nNumMenuGalleryItems long
dbaccess/source/core/dataaccess/documentdefinition.cxx:287
dbaccess::LifetimeCoupler m_xClient Reference<class
com::sun::star::uno::XInterface>
desktop/qa/desktop_lib/test_desktop_lib.cxx:178
@@ -364,8 +362,6 @@ sc/source/filter/xml/xmlexternaltabi.hxx:112
ScXMLExternalRefCellContext mnCellType sal_Int16
sc/source/ui/inc/AccessibleText.hxx:194
ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
-sc/source/ui/inc/AccessibleText.hxx:266
- ScAccessibleCsvTextData maBoundBox tools::Rectangle
sc/source/ui/inc/datastream.hxx:108
sc::DataStream mnSettings sal_uInt32
sc/source/ui/inc/preview.hxx:47
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 13d0cf43721c..876c22fc32af 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -29,10 +29,6 @@
/** A list box string item which stores its text and font. */
class SAL_WARN_UNUSED SvLBoxFontString : public SvLBoxString
{
-private:
- vcl::Font maFont; /// The font used by this item.
- bool mbUseColor; /// true = use font color, false =
default listbox color.
-
public:
SvLBoxFontString();
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 3aacda90bec2..2df75372dffd 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -27,7 +27,6 @@
SvLBoxFontString::SvLBoxFontString()
: SvLBoxString()
- , mbUseColor(false)
{
}
@@ -44,13 +43,10 @@ void SvLBoxFontString::Paint(const Point& rPos,
SvTreeListBox& rDev, vcl::Render
const SvViewDataEntry* pView, const
SvTreeListEntry& rEntry)
{
rRenderContext.Push(PushFlags::FONT);
- vcl::Font aNewFont(maFont);
+ vcl::Font aNewFont;
bool bSel = pView->IsSelected();
- if (!mbUseColor || bSel) // selection always gets highlight color
- {
- const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
- aNewFont.SetColor(bSel ? rStyleSettings.GetHighlightTextColor() :
rStyleSettings.GetFieldTextColor());
- }
+ const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
+ aNewFont.SetColor(bSel ? rStyleSettings.GetHighlightTextColor() :
rStyleSettings.GetFieldTextColor());
rRenderContext.SetFont(aNewFont);
SvLBoxString::Paint(rPos, rDev, rRenderContext, pView, rEntry);
@@ -60,7 +56,7 @@ void SvLBoxFontString::Paint(const Point& rPos,
SvTreeListBox& rDev, vcl::Render
void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry*
pEntry, SvViewDataItem* pViewData )
{
vcl::Font aOldFont( pView->GetFont() );
- pView->Control::SetFont( maFont );
+ pView->Control::SetFont( vcl::Font() );
SvLBoxString::InitViewData( pView, pEntry, pViewData);
pView->Control::SetFont( aOldFont );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
