summaryrefslogtreecommitdiff
path: root/vcl/inc
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/inc
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/inc')
-rw-r--r--vcl/inc/brdwin.hxx1
-rw-r--r--vcl/inc/fontmanager.hxx2
-rw-r--r--vcl/inc/generic/glyphcache.hxx14
-rw-r--r--vcl/inc/outdev.h2
-rw-r--r--vcl/inc/salmenu.hxx2
-rw-r--r--vcl/inc/salwtype.hxx9
-rw-r--r--vcl/inc/sft.hxx5
-rw-r--r--vcl/inc/svdata.hxx5
8 files changed, 2 insertions, 38 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 1a844e07f144..430ae04e1988 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -198,7 +198,6 @@ struct ImplBorderFrameData
long mnNoTitleTop;
long mnBorderSize;
long mnTitleHeight;
- long mnTitleOff;
sal_uInt16 mnHitTest;
DrawButtonFlags mnPinState;
DrawButtonFlags mnCloseState;
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index 83f3cc662a4a..79891f95ccd5 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -246,7 +246,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
fontID m_nNextFontID;
std::unordered_map< fontID, PrintFont* > m_aFonts;
std::unordered_map< int, FontFamily > m_aFamilyTypes;
- std::list< OUString > m_aPrinterDrivers;
std::list< OString > m_aFontDirectories;
std::list< int > m_aPrivateFontDirectories;
utl::MultiAtomProvider* m_pAtoms;
@@ -319,7 +318,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
static bool addFontconfigDir(const OString& rDirectory);
std::set<OString> m_aPreviousLangSupportRequests;
- std::vector<OString> m_aCurrentRequests;
Timer m_aFontInstallerTimer;
#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index eb708d6f8756..722e6b1b9d33 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -125,18 +125,6 @@ private:
Size maSize;
};
-// the glyph specific data needed by a GlyphCachePeer is usually trivial,
-// not attaching it to the corresponding GlyphData would be overkill;
-// this is currently only used by the headless (aka svp) plugin, where meInfo is
-// basebmp::Format and mpData is SvpGcpHelper*
-struct ExtGlyphData
-{
- basebmp::Format meInfo;
- SvpGcpHelper* mpData;
-
- ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(nullptr) {}
-};
-
class GlyphData
{
public:
@@ -234,8 +222,6 @@ private:
long mnCos;
long mnSin;
- bool mbCollectedZW;
-
int mnWidth;
int mnPrioEmbedded;
int mnPrioAntiAlias;
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 06959c81f2c5..d48fa994b4f7 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -84,8 +84,6 @@ protected:
struct ImplFontSubstEntry
{
- OUString maName;
- OUString maReplaceName;
OUString maSearchName;
OUString maSearchReplaceName;
AddFontSubstituteFlags mnFlags;
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index aaea364f30b2..287e19e8e796 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -36,7 +36,7 @@ struct SalItemParams
MenuItemType eType; // MenuItem-Type
MenuItemBits nBits; // MenuItem-Bits
Menu* pMenu; // Pointer to Menu
- OUString aText; // Menu-Text
+ OUString aText; // Menu-Text
Image aImage; // Image
};
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 222c8c85a54a..da5126c43d38 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -53,7 +53,7 @@ enum class InputContextFlags;
#define SALEVENT_FONTCHANGED ((sal_uInt16)18)
#define SALEVENT_WHEELMOUSE ((sal_uInt16)21)
#define SALEVENT_USEREVENT ((sal_uInt16)22)
-#define SALEVENT_MOUSEACTIVATE ((sal_uInt16)23)
+// unused
#define SALEVENT_EXTTEXTINPUT ((sal_uInt16)24)
#define SALEVENT_ENDEXTTEXTINPUT ((sal_uInt16)25)
#define SALEVENT_EXTTEXTINPUTPOS ((sal_uInt16)26)
@@ -161,13 +161,6 @@ struct SalWheelMouseEvent
{}
};
-// MOUSEACTIVATE
-struct SalMouseActivateEvent
-{
- long mnX; // X-Position (Pixel, TopLeft-Output)
- long mnY; // Y-Position (Pixel, TopLeft-Output)
-};
-
// EXTTEXTINPUT
struct SalExtTextInputEvent
{
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index ec8c6a0c92d4..e383c030835a 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -62,11 +62,6 @@ namespace vcl
typedef sal_Int32 F16Dot16; /**< fixed: 16.16 */
/*@}*/
- typedef struct {
- sal_uInt16 s;
- sal_uInt16 d;
- } sal_uInt16pair;
-
/** Return value of OpenTTFont() and CreateT3FromTTGlyphs() */
enum SFErrCodes {
SF_OK, /**< no error */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index dc5c37a22665..b93a0361b67e 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -122,7 +122,6 @@ struct ImplSVAppData
OUString* mpAppName; // Application name
OUString* mpAppFileName; // Abs. Application FileName
OUString* mpDisplayName; // Application Display Name
- OUString* mpFontPath; // Additional Fontpath
Help* mpHelp; // Application help
PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute)
ImplIdleMgr* mpIdleMgr; // Idle-Manager
@@ -133,7 +132,6 @@ struct ImplSVAppData
sal_uInt16 mnDispatchLevel; // DispatchLevel
sal_uInt16 mnModalMode; // ModalMode Count
sal_uInt16 mnModalDialog; // ModalDialog Count
- sal_uInt16 mnAccessCount; // AccessHdl Count
SystemWindowFlags mnSysWinMode; // Mode, when SystemWindows should be created
short mnDialogScaleX; // Scale X-Positions and sizes in Dialogs
bool mbInAppMain; // is Application::Main() on stack
@@ -230,7 +228,6 @@ struct ImplSVCtrlData
sal_uInt16 mnRadioStyle; // Radio-Style for ImageList-Update
sal_uLong mnLastCheckFColor; // Letzte FaceColor fuer CheckImage
sal_uLong mnLastCheckWColor; // Letzte WindowColor fuer CheckImage
- sal_uLong mnLastCheckWTextColor; // Letzte WindowTextColor fuer CheckImage
sal_uLong mnLastCheckLColor; // Letzte LightColor fuer CheckImage
sal_uLong mnLastRadioFColor; // Letzte FaceColor fuer RadioImage
sal_uLong mnLastRadioWColor; // Letzte WindowColor fuer RadioImage
@@ -325,8 +322,6 @@ struct ImplSVData
Application* mpApp; // pApp
VclPtr<WorkWindow> mpDefaultWin; // Default-Window
bool mbDeInit; // Is VCL deinitializing
- sal_uLong mnThreadCount; // is VCL MultiThread enabled
- ImplConfigData* mpFirstConfigData; // pointer to the first config block
ImplSchedulerData* mpFirstSchedulerData; // list of all running tasks
SalTimer* mpSalTimer; // interface to sal event loop/timers
SalI18NImeStatus* mpImeStatus; // interface to ime status window