summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-24 08:50:39 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-11-24 08:17:55 +0000
commitdd351dd728687cffe432ce0ec9367ceb80e097fb (patch)
treec397740bd7b6fdb890657687001d6af244ec11a3 /vcl/source
parent145a9954116b14a417fd403a13536883dbd5c96e (diff)
loplugin:unusedfields in vcl/
and remove the unused SALEVENT_MOUSEACTIVATE stuff Change-Id: Ieb85872eca68621c6a7be47ff5dbea12f7690507 Reviewed-on: https://gerrit.libreoffice.org/20140 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/app/svapp.cxx52
-rw-r--r--vcl/source/filter/FilterConfigCache.hxx4
-rw-r--r--vcl/source/filter/wmf/winmtf.hxx3
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx1
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx1
-rw-r--r--vcl/source/outdev/font.cxx4
-rw-r--r--vcl/source/window/btndlg.cxx1
-rw-r--r--vcl/source/window/menuitemlist.hxx1
-rw-r--r--vcl/source/window/winproc.cxx3
9 files changed, 27 insertions, 43 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e8cb62f865b5..f2df4673598a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -84,12 +84,11 @@ using namespace ::com::sun::star::uno;
class ImplReservedKey
{
public:
- ImplReservedKey( vcl::KeyCode aKeyCode, sal_uInt16 nResId ) :
- mKeyCode(aKeyCode), mnResId( nResId)
+ ImplReservedKey( vcl::KeyCode aKeyCode ) :
+ mKeyCode(aKeyCode)
{}
vcl::KeyCode mKeyCode;
- sal_uInt16 mnResId;
};
typedef std::pair<ImplReservedKey*, size_t> ReservedKeys;
@@ -101,31 +100,31 @@ namespace
{
static ImplReservedKey ImplReservedKeys[] =
{
- ImplReservedKey(vcl::KeyCode(KEY_F1,0), SV_SHORTCUT_HELP),
- ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_SHIFT), SV_SHORTCUT_ACTIVEHELP),
- ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_MOD1), SV_SHORTCUT_CONTEXTHELP),
- ImplReservedKey(vcl::KeyCode(KEY_F2,KEY_SHIFT), SV_SHORTCUT_CONTEXTHELP),
- ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1), SV_SHORTCUT_DOCKUNDOCK),
- ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK),
- ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1|KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK),
- ImplReservedKey(vcl::KeyCode(KEY_F6,0), SV_SHORTCUT_NEXTSUBWINDOW),
- ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1), SV_SHORTCUT_TODOCUMENT),
- ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_SHIFT), SV_SHORTCUT_PREVSUBWINDOW),
- ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT), SV_SHORTCUT_SPLITTER),
- ImplReservedKey(vcl::KeyCode(KEY_F10,0), SV_SHORTCUT_MENUBAR)
+ ImplReservedKey(vcl::KeyCode(KEY_F1,0) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_SHIFT) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_MOD1) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F2,KEY_SHIFT) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD2) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1|KEY_MOD2) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F6,0) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_SHIFT) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT) ),
+ ImplReservedKey(vcl::KeyCode(KEY_F10,0) )
#ifdef UNX
,
- ImplReservedKey(vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1), 0),
- ImplReservedKey(vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1), 0)
+ ImplReservedKey(vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1)),
+ ImplReservedKey(vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1))
#endif
};
static ReservedKeys aKeys
@@ -148,7 +147,6 @@ extern "C" {
struct ImplHotKey
{
ImplHotKey* mpNext;
- void* mpUserData;
vcl::KeyCode maKeyCode;
};
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 71661f2bbfc2..8c52991e4636 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -36,16 +36,12 @@ class FilterConfigCache
OUString sType;
css::uno::Sequence< OUString > lExtensionList;
OUString sUIName;
- OUString sDocumentService;
- OUString sFilterService;
- OUString sTemplateName;
OUString sExternalFilterName;
OUString sMediaType;
OUString sFilterType;
sal_Int32 nFlags;
- sal_Int32 nFileFormatVersion;
// user data
OUString sFilterName;
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index af179ba3d844..087c3f2d5db1 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -449,8 +449,7 @@ struct SaveStruct
WinMtfClipPath aClipPath;
XForm aXForm;
- bool bRecordPath;
- bool bFillStyleSelected;
+ bool bFillStyleSelected;
};
typedef std::shared_ptr<SaveStruct> SaveStructPtr;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 13906b435b01..cea5b53bfe71 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1741,7 +1741,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
m_aMapMode( MAP_POINT, Point(), Fraction( 1L, pointToPixel(1) ), Fraction( 1L, pointToPixel(1) ) ),
m_nCurrentStructElement( 0 ),
m_bEmitStructure( true ),
- m_bNewMCID( false ),
m_nNextFID( 1 ),
m_nInheritedPageWidth( 595 ), // default A4
m_nInheritedPageHeight( 842 ), // default A4
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 3d7bf48b334e..77b0d4700981 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -632,7 +632,6 @@ private:
/* emit strucure marks currently (aka. NonStructElement or not)
*/
bool m_bEmitStructure;
- bool m_bNewMCID;
/* role map of struct tree root */
std::unordered_map< OString, OString, OStringHash >
m_aRoleMap;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 8f443ce5a252..558ff3b5eb55 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -711,9 +711,7 @@ void ImplDirectFontSubstitution::AddFontSubstitute( const OUString& rFontName,
ImplFontSubstEntry::ImplFontSubstEntry( const OUString& rFontName,
const OUString& rSubstFontName, AddFontSubstituteFlags nSubstFlags )
-: maName( rFontName )
-, maReplaceName( rSubstFontName )
-, mnFlags( nSubstFlags )
+: mnFlags( nSubstFlags )
{
maSearchName = GetEnglishSearchFontName( rFontName );
maSearchReplaceName = GetEnglishSearchFontName( rSubstFontName );
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 6ad603ab1a76..59c0638546ba 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -29,7 +29,6 @@ struct ImplBtnDlgItem
{
sal_uInt16 mnId;
bool mbOwnButton;
- bool mbDummyAlign;
long mnSepSize;
VclPtr<PushButton> mpPushButton;
};
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 3f7f8d2d6166..afc0bdc602ac 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -54,7 +54,6 @@ struct MenuItemData
long nItemImageAngle;
Size aSz; // only temporarily valid
OUString aAccessibleName; // accessible name
- OUString aAccessibleDescription; // accessible description
SalMenuItem* pSalMenuItem; // access to native menu
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ef4cb769e18e..6e9f5bb0c76a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2437,9 +2437,6 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
bRet = ImplHandleSalMouseButtonUp( pWindow, &aSalMouseEvent );
}
break;
- case SALEVENT_MOUSEACTIVATE:
- bRet = false;
- break;
case SALEVENT_KEYINPUT:
{
SalKeyEvent const * pKeyEvt = static_cast<SalKeyEvent const *>(pEvent);