vcl/inc/brdwin.hxx | 2 --
vcl/inc/listbox.hxx | 3 ---
vcl/inc/opengl/x11/X11DeviceInfo.hxx | 1 -
vcl/inc/opengl/x11/salvd.hxx | 1 -
vcl/inc/saldatabasic.hxx | 1 -
vcl/inc/sallayout.hxx | 1 -
vcl/inc/salwtype.hxx | 2 --
vcl/inc/sft.hxx | 11 -----------
vcl/inc/svdata.hxx | 5 -----
vcl/inc/unx/fc_fontoptions.hxx | 11 -----------
vcl/inc/unx/fontmanager.hxx | 9 +--------
vcl/inc/unx/gtk/gtkframe.hxx | 1 -
vcl/opengl/x11/X11DeviceInfo.cxx | 4 ----
vcl/opengl/x11/salvd.cxx | 15 +--------------
vcl/osx/salframeview.mm | 1 -
vcl/osx/salinst.cxx | 1 -
vcl/source/control/imp_listbox.cxx | 17 +----------------
vcl/source/fontsubset/sft.cxx | 22 ----------------------
vcl/source/gdi/sallayout.cxx | 2 --
vcl/source/opengl/OpenGLContext.cxx | 6 ------
vcl/source/window/brdwin.cxx | 3 ---
vcl/source/window/debugevent.cxx | 6 ------
vcl/source/window/menuitemlist.cxx | 4 ----
vcl/unx/generic/app/saldata.cxx | 1 -
vcl/unx/generic/fontmanager/fontconfig.cxx | 26 --------------------------
vcl/unx/generic/fontmanager/fontmanager.cxx | 8 --------
vcl/unx/generic/gdi/cairotextrender.cxx | 2 --
vcl/unx/generic/plugadapt/salplug.cxx | 2 --
vcl/unx/generic/window/salframe.cxx | 2 --
vcl/unx/gtk/gtksalframe.cxx | 6 +-----
vcl/unx/gtk/salnativewidgets-gtk.cxx | 2 --
vcl/unx/gtk3/gtk3gtkframe.cxx | 6 +-----
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 1 -
vcl/win/window/salframe.cxx | 8 --------
34 files changed, 5 insertions(+), 188 deletions(-)
New commits:
commit 561a02ec72cf963d7cd59cfb9a183c1032f0861b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Thu Jun 15 15:28:46 2017 +0200
loplugin:unusedfields in vcl part3
Change-Id: I5a6319ba1667af6e9b7b92c22f858188c28c4c61
Reviewed-on: https://gerrit.libreoffice.org/38835
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index ab9c965202a9..247432954d4f 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -89,7 +89,6 @@ private:
long mnMinHeight;
long mnMaxWidth;
long mnMaxHeight;
- long mnRollHeight;
long mnOrgMenuHeight;
BorderWindowTitleType mnTitleType;
WindowBorderStyle mnBorderStyle;
@@ -205,7 +204,6 @@ struct ImplBorderFrameData
DrawButtonFlags mnHideState;
DrawButtonFlags mnHelpState;
BorderWindowTitleType mnTitleType;
- bool mbFloatWindow;
bool mbDragFull;
bool mbTitleClipped;
};
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index d2a096e4f322..2b52e43ff83e 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -200,7 +200,6 @@ private:
bool mbMulti : 1; ///< MultiListBox
bool mbStackMode : 1; ///< StackSelection
bool mbSimpleMode : 1; ///< SimpleMode for MultiListBox
- bool mbImgsDiffSz : 1; ///< Images have different sizes
bool mbTravelSelect : 1; ///< TravelSelect
bool mbTrackingSelect : 1; ///< Selected at a MouseMove
bool mbSelectionChanged : 1; ///< Do not call Select() too often ...
@@ -518,7 +517,6 @@ private:
Link<UserDrawEvent*, void> maUserDrawHdl;
bool mbUserDrawEnabled : 1;
- bool mbInUserDraw : 1;
bool mbEdgeBlending : 1;
void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false);
@@ -563,7 +561,6 @@ public:
class ImplBtn : public PushButton
{
private:
- bool mbDown;
Link<void*,void> maMBDownHdl;
public:
diff --git a/vcl/inc/opengl/x11/X11DeviceInfo.hxx
b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
index a44c7e3180a2..58cb0c1bf4d9 100644
--- a/vcl/inc/opengl/x11/X11DeviceInfo.hxx
+++ b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
@@ -24,7 +24,6 @@ private:
bool mbIsIntel;
bool mbIsOldSwrast;
bool mbIsLlvmpipe;
- bool mbHasTextureFromPixmap;
OString maVendor;
OString maRenderer;
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index 8828db95b5ce..12f0ede73992 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -30,7 +30,6 @@ class X11OpenGLSalVirtualDevice : public SalVirtualDevice
SalX11Screen mnXScreen;
int mnWidth;
int mnHeight;
- sal_uInt16 mnDepth;
public:
X11OpenGLSalVirtualDevice( SalGraphics *pGraphics,
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 087edd6cd360..48af524fb683 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -40,7 +40,6 @@ class VCL_PLUGIN_PUBLIC SalData
public:
SalInstance* m_pInstance; // pointer to instance
#ifndef IOS
- oslModule m_pPlugin; // plugin library handle
psp::PrinterInfoManager* m_pPIManager;
#endif
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index c90f029f7d70..08cb9085b6e5 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -201,7 +201,6 @@ private:
protected:
int mnMinCharPos;
int mnEndCharPos;
- SalLayoutFlags mnLayoutFlags;
int mnUnitsPerPixel;
int mnOrientation;
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 12ed894b67f3..e07a980754d0 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -100,7 +100,6 @@ struct SalMouseEvent
// KEYINPUT and KEYUP
struct SalKeyEvent
{
- sal_uInt64 mnTime; // Time in ms, when event is created
sal_uInt16 mnCode; // SV-KeyCode (KEY_xxx | KEY_SHIFT |
KEY_MOD1 | KEY_MOD2)
sal_uInt16 mnCharCode; // SV-CharCode
sal_uInt16 mnRepeat; // Repeat-Count (KeyInputs-1)
@@ -121,7 +120,6 @@ struct SalMenuEvent
struct SalKeyModEvent
{
bool mbDown; // Whether the change occurred on a key
down event
- sal_uInt64 mnTime; // Time in ms, when event is created
sal_uInt16 mnCode; // SV-Modifiercode
(KEY_SHIFT|KEY_MOD1|KEY_MOD2)
ModKeyFlags mnModKeyCode; // extended Modifier
(MODKEY_LEFT,MODKEY_RIGHT,MODKEY_PRESS,MODKEY_RELEASE)
};
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 1ab62e56040d..dc51b9673f90 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -175,19 +175,12 @@ namespace vcl
int descender; /**< typographic descent.
*/
int linegap; /**< typographic line gap.\ Negative values
are treated as
zero in Win 3.1, System 6 and System 7.
*/
- int vascent; /**< typographic ascent for vertical writing
mode */
- int vdescent; /**< typographic descent for vertical
writing mode */
int typoAscender; /**< OS/2 portable typographic ascender
*/
int typoDescender; /**< OS/2 portable typographic descender
*/
int typoLineGap; /**< OS/2 portable typographic line gap
*/
int winAscent; /**< ascender metric for Windows
*/
int winDescent; /**< descender metric for Windows
*/
bool symbolEncoded; /**< true: MS symbol encoded */
- int rangeFlag; /**< if set to 1 Unicode Range flags are
applicable */
- sal_uInt32 ur1; /**< bits 0 - 31 of Unicode Range flags
*/
- sal_uInt32 ur2; /**< bits 32 - 63 of Unicode Range flags
*/
- sal_uInt32 ur3; /**< bits 64 - 95 of Unicode Range flags
*/
- sal_uInt32 ur4; /**< bits 96 - 127 of Unicode Range flags
*/
sal_uInt8 panose[10]; /**< PANOSE classification number
*/
sal_uInt32 typeFlags; /**< type flags (copyright bits +
PS-OpenType flag) */
sal_uInt16 fsSelection; /**< OS/2 fsSelection */
@@ -472,8 +465,6 @@ namespace vcl
/*- private definitions */
struct TrueTypeFont {
- sal_uInt32 tag;
-
char *fname;
sal_Int32 fsize;
sal_uInt8 *ptr;
@@ -495,10 +486,8 @@ namespace vcl
sal_uInt32 (*mapper)(const sal_uInt8 *, sal_uInt32, sal_uInt32); /*
character to glyphID translation function */
const sal_uInt8 **tables; /* array of
pointers to raw subtables in SFNT file */
sal_uInt32 *tlens; /* array of table
lengths */
- int kerntype; /* Defined in the
KernType enum */
sal_uInt32 nkern; /* number of kern
subtables */
const sal_uInt8** kerntables; /* array of
pointers to kern subtables */
- void *pGSubstitution; /* info provided by
GSUB for UseGSUB() */
};
/* indexes into TrueTypeFont::tables[] and TrueTypeFont::tlens[] */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index bc87e6887f1d..088dc5c0e0cc 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -179,7 +179,6 @@ struct ImplSVGDIData
VclPtr<OutputDevice> mpLastPrnGraphics; // Last
OutputDevice with a InfoPrinter Graphics
VclPtr<VirtualDevice> mpFirstVirDev; // First
VirtualDevice
VclPtr<VirtualDevice> mpLastVirDev; // Last
VirtualDevice
- OpenGLContext* mpFirstContext = nullptr; // First
OpenGLContext
OpenGLContext* mpLastContext = nullptr; // Last
OpenGLContext
VclPtr<Printer> mpFirstPrinter; // First Printer
VclPtr<Printer> mpLastPrinter; // Last Printer
@@ -191,7 +190,6 @@ struct ImplSVGDIData
long mnAppFontX = 0; // AppFont
X-Numenator for 40/tel Width
long mnAppFontY = 0; // AppFont
Y-Numenator for 80/tel Height
bool mbFontSubChanged = false; // true:
FontSubstitution was changed between Begin/End
- bool mbNativeFontConfig = false; // true: do not
override UI font
};
struct ImplSVWinData
@@ -285,9 +283,6 @@ struct ImplSVNWFData
bool mbProgressNeedsErase = false; // set true for
platforms that should draw the
// window
background before drawing the native
// progress bar
- bool mbCheckBoxNeedsErase = false; // set true for
platforms that should draw the
- // window
background before drawing the native
- // checkbox
bool mbCanDrawWidgetAnySize = false; // set to true
currently on gtk
/// entire drop down listbox resembles a button, no textarea/button parts
(as currently on Windows)
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index 019482322fcb..109120f9f69a 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -31,18 +31,7 @@ typedef struct _FcPattern FcPattern;
class FontConfigFontOptions
{
public:
- FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps
should be used
- FontAntiAlias meAntiAlias; // whether the font should be
antialiased
- FontAutoHint meAutoHint; // whether the font should be
autohinted
- FontHinting meHinting; // whether the font should be hinted
- FontHintStyle meHintStyle; // type of font hinting to be used
-
FontConfigFontOptions(FcPattern* pPattern) :
- meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
- meAntiAlias(ANTIALIAS_DONTKNOW),
- meAutoHint(FontAutoHint::DontKnow),
- meHinting(FontHinting::DontKnow),
- meHintStyle(FontHintStyle::Slight),
mpPattern(pPattern) {}
~FontConfigFontOptions();
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 34cec8f45e38..b4af653960f0 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -75,7 +75,6 @@ struct FastPrintFontInfo
FontWeight m_eWeight;
FontPitch m_ePitch;
rtl_TextEncoding m_aEncoding;
- bool m_bSubsettable;
FastPrintFontInfo()
: m_nID(0)
@@ -85,7 +84,6 @@ struct FastPrintFontInfo
, m_eWeight(WEIGHT_DONTKNOW)
, m_ePitch(PITCH_DONTKNOW)
, m_aEncoding(RTL_TEXTENCODING_DONTKNOW)
- , m_bSubsettable(false)
{}
};
@@ -93,15 +91,11 @@ struct PrintFontInfo : public FastPrintFontInfo
{
int m_nAscend;
int m_nDescend;
- int m_nLeading;
- int m_nWidth;
PrintFontInfo() :
FastPrintFontInfo(),
m_nAscend( 0 ),
- m_nDescend( 0 ),
- m_nLeading( 0 ),
- m_nWidth( 0 )
+ m_nDescend( 0 )
{}
};
@@ -149,7 +143,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
int m_nDirectory; // atom containing system
dependent path
OString m_aFontFile; // relative to directory
int m_nCollectionEntry; // 0 for regular fonts, 0 to ...
for fonts stemming from collections
- unsigned int m_nTypeFlags; // copyright bits and
PS-OpenType flag
explicit PrintFont();
};
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index e5b89619efbc..ac9e7e783cbd 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -292,7 +292,6 @@ class GtkSalFrame : public SalFrame
guint keyval,
guint16 hardware_keycode,
guint8 group,
- guint32 time,
sal_Unicode aOrigCode,
bool bDown,
bool bSendRelease
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 8cd5cbb906b9..8b15809ea107 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -109,7 +109,6 @@ X11OpenGLDeviceInfo::X11OpenGLDeviceInfo():
mbIsIntel(false),
mbIsOldSwrast(false),
mbIsLlvmpipe(false),
- mbHasTextureFromPixmap(false),
mnGLMajorVersion(0),
mnMajorVersion(0),
mnMinorVersion(0),
@@ -206,9 +205,6 @@ void X11OpenGLDeviceInfo::GetData()
}
}
- if (textureFromPixmap != "TRUE")
- mbHasTextureFromPixmap = true;
-
// only useful for Linux kernel version check for FGLRX driver.
// assumes X client == X server, which is sad.
struct utsname unameobj;
diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index 17edbf6cce22..f06e9c3a43a5 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -34,7 +34,7 @@ void X11SalGraphics::Init( X11OpenGLSalVirtualDevice *pDevice
)
X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics,
long &nDX, long &nDY,
- DeviceFormat eFormat,
+ DeviceFormat /*eFormat*/,
const SystemGraphicsData
*pData,
X11SalGraphics*
pNewGraphics) :
mpGraphics(pNewGraphics),
@@ -43,23 +43,10 @@ X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice(
SalGraphics* pGraphics,
{
assert(mpGraphics);
- sal_uInt16 nBitCount;
- switch (eFormat)
- {
- case DeviceFormat::BITMASK:
- nBitCount = 1;
- break;
- default:
- nBitCount = pGraphics->GetBitCount();
- break;
-
- }
-
// TODO Check where a VirtualDevice is created from SystemGraphicsData
assert( pData == nullptr ); (void)pData;
mpDisplay = vcl_sal::getSalDisplay(GetGenericData());
- mnDepth = nBitCount;
mnXScreen = pGraphics ?
static_cast<X11SalGraphics*>(pGraphics)->GetScreenNumber() :
vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen();
mnWidth = nDX;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 50cd5bc4e722..eb2ea1500a96 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1516,7 +1516,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
if( AquaSalFrame::isAlive( mpFrame ) )
{
SalKeyEvent aEvent;
- aEvent.mnTime = mpFrame->mnLastEventTime;
aEvent.mnCode = nKeyCode | ImplGetModifierMask( nMod );
aEvent.mnCharCode = aChar;
aEvent.mnRepeat = FALSE;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index d17e06e96169..5234325d7edc 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -335,7 +335,6 @@ SalInstance* CreateSalInstance()
ImplGetSVData()->maNWFData.mbNoActiveTabTextRaise = true;
ImplGetSVData()->maNWFData.mbCenteredTabs = true;
ImplGetSVData()->maNWFData.mbProgressNeedsErase = true;
- ImplGetSVData()->maNWFData.mbCheckBoxNeedsErase = true;
ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset = 10;
return pInst;
diff --git a/vcl/source/control/imp_listbox.cxx
b/vcl/source/control/imp_listbox.cxx
index b1fa98c7e82b..56593d372e7c 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -469,7 +469,6 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent,
WinBits nWinStyle )
mnSelectModifier = 0;
mnUserDrawEntry = LISTBOX_ENTRY_NOTFOUND;
mbTrack = false;
- mbImgsDiffSz = false;
mbTravelSelect = false;
mbTrackingSelect = false;
mbSelectionChanged = false;
@@ -576,7 +575,6 @@ void ImplListBoxWindow::Clear()
mnMaxImgHeight = 0;
mnTop = 0;
mnLeft = 0;
- mbImgsDiffSz = false;
ImplClearLayoutData();
mnCurrentPos = LISTBOX_ENTRY_NOTFOUND;
@@ -652,11 +650,6 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics(
ImplEntryType& rEntry )
aMetrics.nImgWidth = (sal_uInt16) CalcZoom( aImgSz.Width() );
aMetrics.nImgHeight = (sal_uInt16) CalcZoom( aImgSz.Height() );
- if( mnMaxImgWidth && ( aMetrics.nImgWidth != mnMaxImgWidth ) )
- mbImgsDiffSz = true;
- else if ( mnMaxImgHeight && ( aMetrics.nImgHeight != mnMaxImgHeight ) )
- mbImgsDiffSz = true;
-
if( aMetrics.nImgWidth > mnMaxImgWidth )
mnMaxImgWidth = aMetrics.nImgWidth;
if( aMetrics.nImgHeight > mnMaxImgHeight )
@@ -2569,7 +2562,6 @@ ImplWin::ImplWin( vcl::Window* pParent, WinBits nWinStyle
) :
ImplGetWindowImpl()->mbUseNativeFocus =
ImplGetSVData()->maNWFData.mbNoFocusRects;
- mbInUserDraw = false;
mbUserDrawEnabled = false;
mbEdgeBlending = false;
mnItemPos = LISTBOX_ENTRY_NOTFOUND;
@@ -2720,10 +2712,8 @@ void ImplWin::ImplDraw(vcl::RenderContext&
rRenderContext, bool bLayout)
if ( IsUserDrawEnabled() )
{
- mbInUserDraw = true;
UserDrawEvent aUDEvt(this, &rRenderContext, maFocusRect, mnItemPos, 0);
maUserDrawHdl.Call( &aUDEvt );
- mbInUserDraw = false;
}
else
{
@@ -2884,19 +2874,14 @@ void ImplWin::ShowFocus(const tools::Rectangle& rRect)
}
ImplBtn::ImplBtn( vcl::Window* pParent, WinBits nWinStyle ) :
- PushButton( pParent, nWinStyle ),
- mbDown ( false )
+ PushButton( pParent, nWinStyle )
{
}
void ImplBtn::MouseButtonDown( const MouseEvent& )
{
- //PushButton::MouseButtonDown( rMEvt );
if( IsEnabled() )
- {
maMBDownHdl.Call(this);
- mbDown = true;
- }
}
ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) :
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index db0caf4f6649..20620ea19f1f 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -103,9 +103,6 @@ typedef struct {
sal_uInt32 *offs; /* array of nGlyphs offsets */
} GlyphOffsets;
-/* private tags */
-static const sal_uInt32 TTFontClassTag = 0x74746663; /* 'ttfc' */
-
static const sal_uInt32 T_true = 0x74727565; /* 'true' */
static const sal_uInt32 T_ttcf = 0x74746366; /* 'ttcf' */
static const sal_uInt32 T_otto = 0x4f54544f; /* 'OTTO' */
@@ -1350,7 +1347,6 @@ static void GetKern(TrueTypeFont *ttf)
if (GetUInt16(table, 0) == 0) { /*
Traditional Microsoft style table with sal_uInt16 version and nTables fields */
ttf->nkern = GetUInt16(table, 2);
- ttf->kerntype = KT_MICROSOFT;
ptr = table + 4;
const sal_uInt32 remaining_table_size = nTableSize-4;
@@ -1382,7 +1378,6 @@ static void GetKern(TrueTypeFont *ttf)
if (GetUInt32(table, 0) == 0x00010000) { /* MacOS
style kern tables: fixed32 version and sal_uInt32 nTables fields */
ttf->nkern = GetUInt32(table, 4);
- ttf->kerntype = KT_APPLE_NEW;
ptr = table + 8;
const sal_uInt32 remaining_table_size = nTableSize-8;
@@ -1413,7 +1408,6 @@ static void GetKern(TrueTypeFont *ttf)
}
badtable:
- ttf->kerntype = KT_NONE;
ttf->kerntables = nullptr;
}
@@ -1439,12 +1433,10 @@ static void allocTrueTypeFont( TrueTypeFont** ttf )
*ttf = static_cast<TrueTypeFont*>(calloc(1,sizeof(TrueTypeFont)));
if( *ttf != nullptr )
{
- (*ttf)->tag = 0;
(*ttf)->fname = nullptr;
(*ttf)->fsize = -1;
(*ttf)->ptr = nullptr;
(*ttf)->nglyphs = 0xFFFFFFFF;
- (*ttf)->pGSubstitution = nullptr;
}
}
@@ -1553,9 +1545,6 @@ static int doOpenTTFont( sal_uInt32 facenum,
TrueTypeFont* t )
return SF_TTFORMAT;
}
- /* magic number */
- t->tag = TTFontClassTag;
-
t->ntables = GetUInt16(t->ptr + tdoffset, 4);
if( t->ntables >= 128 )
return SF_TTFORMAT;
@@ -2460,13 +2449,6 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf,
TTGlobalFontInfo *info)
if( info->winDescent > 5*UPEm )
info->winDescent = XUnits(UPEm, GetInt16(table, 76));
}
- if (ttf->cmapType == CMAP_MS_Unicode) {
- info->rangeFlag = 1;
- info->ur1 = GetUInt32(table, 42);
- info->ur2 = GetUInt32(table, 46);
- info->ur3 = GetUInt32(table, 50);
- info->ur4 = GetUInt32(table, 54);
- }
memcpy(info->panose, table + 32, 10);
info->typeFlags = GetUInt16( table, 8 );
if( getTable(ttf, O_CFF) )
@@ -2494,10 +2476,6 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf,
TTGlobalFontInfo *info)
}
table = getTable(ttf, O_vhea);
- if (table) {
- info->vascent = XUnits(UPEm, GetInt16(table, 4));
- info->vdescent = XUnits(UPEm, GetInt16(table, 6));
- }
}
GlyphData *GetTTRawGlyphData(TrueTypeFont *ttf, sal_uInt32 glyphID)
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 30907d8a62ad..11849a8e3e16 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -542,7 +542,6 @@ bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int*
nEndRunPos, bool* bRTL )
SalLayout::SalLayout()
: mnMinCharPos( -1 ),
mnEndCharPos( -1 ),
- mnLayoutFlags( SalLayoutFlags::NONE ),
mnUnitsPerPixel( 1 ),
mnOrientation( 0 ),
maDrawOffset( 0, 0 )
@@ -555,7 +554,6 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
mnMinCharPos = rArgs.mnMinCharPos;
mnEndCharPos = rArgs.mnEndCharPos;
- mnLayoutFlags = rArgs.mnFlags;
mnOrientation = rArgs.mnOrientation;
}
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 760c20c7b1bc..1354f3764880 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -73,8 +73,6 @@ OpenGLContext::OpenGLContext():
pSVData->maGDIData.mpLastContext->mpNextContext = this;
mpPrevContext = pSVData->maGDIData.mpLastContext;
}
- else
- pSVData->maGDIData.mpFirstContext = this;
pSVData->maGDIData.mpLastContext = this;
// FIXME: better hope we call 'makeCurrent' soon to preserve
@@ -93,8 +91,6 @@ OpenGLContext::~OpenGLContext()
ImplSVData* pSVData = ImplGetSVData();
if( mpPrevContext )
mpPrevContext->mpNextContext = mpNextContext;
- else
- pSVData->maGDIData.mpFirstContext = mpNextContext;
if( mpNextContext )
mpNextContext->mpPrevContext = mpPrevContext;
else
@@ -543,8 +539,6 @@ void OpenGLContext::registerAsCurrent()
{
if( mpPrevContext )
mpPrevContext->mpNextContext = mpNextContext;
- else
- pSVData->maGDIData.mpFirstContext = mpNextContext;
mpNextContext->mpPrevContext = mpPrevContext;
mpPrevContext = pSVData->maGDIData.mpLastContext;
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 5a7bd774d4ca..4c22740b0b72 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1294,7 +1294,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev,
long nWidth, long nHeigh
pData->mnHeight = nHeight;
pData->mnTitleType = pBorderWindow->mnTitleType;
- pData->mbFloatWindow = pBorderWindow->mbFloatWindow;
if ( !(pBorderWindow->GetStyle() & (WB_MOVEABLE | WB_POPUP)) ||
(pData->mnTitleType == BorderWindowTitleType::NONE) )
pData->mnBorderSize = 0;
@@ -1628,7 +1627,6 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent,
mnMinHeight = 0;
mnMaxWidth = SHRT_MAX;
mnMaxHeight = SHRT_MAX;
- mnRollHeight = 0;
mnOrgMenuHeight = 0;
mbRollUp = false;
mbMenuHide = false;
@@ -1951,7 +1949,6 @@ void ImplBorderWindow::SetBorderStyle( WindowBorderStyle
nStyle )
void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize )
{
mbRollUp = bRollUp;
- mnRollHeight = rSize.Height();
UpdateView( false, rSize );
}
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 4810fc5ca759..2b83f4f92f03 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -115,12 +115,6 @@ void DebugEventInjector::InjectMenuEvent()
static void InitKeyEvent( SalKeyEvent &rKeyEvent )
{
- double nRand = getRandom();
- if (nRand < 0.001)
- rKeyEvent.mnTime = getRandom() * SAL_MAX_UINT64;
- else
- rKeyEvent.mnTime = tools::Time::GetSystemTicks();
-
if (getRandom() < 0.01)
rKeyEvent.mnRepeat = getRandom() * 20;
else
diff --git a/vcl/source/window/menuitemlist.cxx
b/vcl/source/window/menuitemlist.cxx
index 95cf7a07875f..b03ef0e89c56 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -69,8 +69,6 @@ MenuItemData* MenuItemList::Insert(
SalItemParams aSalMIData;
aSalMIData.nId = nId;
- aSalMIData.eType = eType;
- aSalMIData.nBits = nBits;
aSalMIData.pMenu = pMenu;
aSalMIData.aText = rStr;
@@ -101,8 +99,6 @@ void MenuItemList::InsertSeparator(const OString &rIdent,
size_t nPos)
SalItemParams aSalMIData;
aSalMIData.nId = 0;
- aSalMIData.eType = MenuItemType::SEPARATOR;
- aSalMIData.nBits = MenuItemBits::NONE;
aSalMIData.pMenu = nullptr;
aSalMIData.aText.clear();
aSalMIData.aImage = Image();
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 740ab2636852..4a5e7e1a76de 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -248,7 +248,6 @@ X11SalData::X11SalData( SalGenericDataType t, SalInstance
*pInstance )
: SalGenericData( t, pInstance )
{
pXLib_ = nullptr;
- m_pPlugin = nullptr;
m_aOrigXIOErrorHandler = XSetIOErrorHandler ( XIOErrorHdl );
PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 18eea3f44722..db32f2874919 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1160,7 +1160,6 @@ FontConfigFontOptions*
PrintFontManager::getFontOptions(const FastPrintFontInfo&
addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth,
rInfo.m_ePitch);
FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
- FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
int hintstyle = FC_HINT_FULL;
FcConfigSubstitute(pConfig, pPattern, FcMatchPattern);
@@ -1172,35 +1171,10 @@ FontConfigFontOptions*
PrintFontManager::getFontOptions(const FastPrintFontInfo&
FcPattern* pResult = FcFontSetMatch( pConfig, &pFontSet, 1, pPattern,
&eResult );
if( pResult )
{
- FcResult eEmbeddedBitmap = FcPatternGetBool(pResult,
- FC_EMBEDDED_BITMAP, 0, &embitmap);
- FcResult eAntialias = FcPatternGetBool(pResult,
- FC_ANTIALIAS, 0, &antialias);
- FcResult eAutoHint = FcPatternGetBool(pResult,
- FC_AUTOHINT, 0, &autohint);
- FcResult eHinting = FcPatternGetBool(pResult,
- FC_HINTING, 0, &hinting);
(void) FcPatternGetInteger(pResult,
FC_HINT_STYLE, 0, &hintstyle);
pOptions = new FontConfigFontOptions(pResult);
-
- if( eEmbeddedBitmap == FcResultMatch )
- pOptions->meEmbeddedBitmap = embitmap ? EMBEDDEDBITMAP_TRUE :
EMBEDDEDBITMAP_FALSE;
- if( eAntialias == FcResultMatch )
- pOptions->meAntiAlias = antialias ? ANTIALIAS_TRUE :
ANTIALIAS_FALSE;
- if( eAutoHint == FcResultMatch )
- pOptions->meAutoHint = autohint ? FontAutoHint::Yes :
FontAutoHint::No;
- if( eHinting == FcResultMatch )
- pOptions->meHinting = hinting ? FontHinting::Yes : FontHinting::No;
- switch (hintstyle)
- {
- case FC_HINT_NONE: pOptions->meHintStyle = FontHintStyle::NONE;
break;
- case FC_HINT_SLIGHT: pOptions->meHintStyle =
FontHintStyle::Slight; break;
- case FC_HINT_MEDIUM: pOptions->meHintStyle =
FontHintStyle::Medium; break;
- default: // fall through
- case FC_HINT_FULL: pOptions->meHintStyle = FontHintStyle::Full;
break;
- }
}
// cleanup
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index b1df96613a53..10ae47012b8f 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -107,7 +107,6 @@ PrintFontManager::PrintFont::PrintFont()
, m_nYMax(0)
, m_nDirectory(0)
, m_nCollectionEntry(0)
-, m_nTypeFlags(TYPEFLAG_INVALID)
{
}
@@ -689,9 +688,6 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont )
const
pFont->m_nXMax = aInfo.xMax;
pFont->m_nYMax = aInfo.yMax;
- // get type flags
- pFont->m_nTypeFlags = (unsigned int)aInfo.typeFlags;
-
CloseTTFont( pTTFont );
bSuccess = true;
}
@@ -794,8 +790,6 @@ void PrintFontManager::fillPrintFontInfo(PrintFont* pFont,
FastPrintFontInfo& rI
rInfo.m_ePitch = pFont->m_ePitch;
rInfo.m_aEncoding = pFont->m_aEncoding;
- rInfo.m_bSubsettable = true;
-
rInfo.m_aAliases.clear();
for (auto const& aAlias : pFont->m_aAliases)
rInfo.m_aAliases.push_back(aAlias);
@@ -812,8 +806,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont,
PrintFontInfo& rInfo
rInfo.m_nAscend = pFont->m_nAscend;
rInfo.m_nDescend = pFont->m_nDescend;
- rInfo.m_nLeading = pFont->m_nLeading;
- rInfo.m_nWidth = pFont->m_aGlobalMetricX.width <
pFont->m_aGlobalMetricY.width ? pFont->m_aGlobalMetricY.width :
pFont->m_aGlobalMetricX.width;
}
bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo )
const
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
index c1b4ff193679..5d8174d61cdc 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -403,8 +403,6 @@ void CairoTextRender::GetDevFontList(
PhysicalFontCollection* pFontCollection )
// register platform specific font substitutions if available
SalGenericInstance::RegisterFontSubstitutors( pFontCollection );
-
- ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
}
void FontConfigFontOptions::cairo_font_options_substitute(FcPattern* pPattern)
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 09462023320a..71061742a7d7 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -105,7 +105,6 @@ static SalInstance* tryInstance( const OUString&
rModuleBase, bool bForce = fals
pCloseModule = nullptr;
}
#endif
- GetSalData()->m_pPlugin = aMod;
}
else
osl_unloadModule( aMod );
@@ -317,7 +316,6 @@ const OUString& SalGetDesktopEnvironment()
SalData::SalData() :
m_pInstance(nullptr),
- m_pPlugin(nullptr),
m_pPIManager(nullptr)
{
}
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 0988307119c3..46d642f98a64 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3157,7 +3157,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
}
aModEvt.mnCode = nModCode;
- aModEvt.mnTime = pEvent->time;
int nRet = CallCallback( SalEvent::KeyModChange, &aModEvt );
@@ -3279,7 +3278,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
{
aKeyEvt.mnCode = nKeyCode | nModCode;
aKeyEvt.mnRepeat = 0;
- aKeyEvt.mnTime = pEvent->time;
aKeyEvt.mnCharCode = pString[ 0 ];
if( KeyRelease == pEvent->type )
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 42b4754da6bf..ed8b82234530 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -366,7 +366,6 @@ void GtkSalFrame::doKeyCallback( guint state,
guint keyval,
guint16 hardware_keycode,
guint8 group,
- guint32 time,
sal_Unicode aOrigCode,
bool bDown,
bool bSendRelease
@@ -374,7 +373,6 @@ void GtkSalFrame::doKeyCallback( guint state,
{
SalKeyEvent aEvent;
- aEvent.mnTime = time;
aEvent.mnCharCode = aOrigCode;
aEvent.mnRepeat = 0;
@@ -3136,7 +3134,6 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey*
pEvent, gpointer frame
SalKeyModEvent aModEvt;
aModEvt.mbDown = pEvent->type == GDK_KEY_PRESS;
- aModEvt.mnTime = pEvent->time;
aModEvt.mnCode = nModCode;
if( pEvent->type == GDK_KEY_RELEASE )
@@ -3160,7 +3157,6 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey*
pEvent, gpointer frame
pEvent->keyval,
pEvent->hardware_keycode,
pEvent->group,
- pEvent->time,
sal_Unicode(gdk_keyval_to_unicode(
pEvent->keyval )),
(pEvent->type == GDK_KEY_PRESS),
false );
@@ -3583,7 +3579,7 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* pContext, gchar* pTex
if( checkSingleKeyCommitHack( rKP.keyval, aOrigCode ) )
{
- pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval,
rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
+ pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval,
rKP.hardware_keycode, rKP.group, aOrigCode, true, true );
bSingleCommit = true;
}
}
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 219d173a335b..ebe9112b480e 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -526,8 +526,6 @@ void GtkData::initNWF()
pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
pSVData->maNWFData.mnMenuSeparatorBorderX = separator_padding;
- pSVData->maNWFData.mbCheckBoxNeedsErase = true;
-
if( SalGetDesktopEnvironment() == "KDE" )
{
// #i97196# ensure a widget exists and the style engine was loaded
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 25b3570d32e6..d59d07ef085d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -373,7 +373,6 @@ void GtkSalFrame::doKeyCallback( guint state,
guint keyval,
guint16 hardware_keycode,
guint8 group,
- guint32 time,
sal_Unicode aOrigCode,
bool bDown,
bool bSendRelease
@@ -381,7 +380,6 @@ void GtkSalFrame::doKeyCallback( guint state,
{
SalKeyEvent aEvent;
- aEvent.mnTime = time;
aEvent.mnCharCode = aOrigCode;
aEvent.mnRepeat = 0;
@@ -3143,7 +3141,6 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
SalKeyModEvent aModEvt;
aModEvt.mbDown = pEvent->type == GDK_KEY_PRESS;
- aModEvt.mnTime = pEvent->time;
aModEvt.mnCode = nModCode;
if( pEvent->type == GDK_KEY_RELEASE )
@@ -3167,7 +3164,6 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
pEvent->keyval,
pEvent->hardware_keycode,
pEvent->group,
- pEvent->time,
sal_Unicode(gdk_keyval_to_unicode(
pEvent->keyval )),
(pEvent->type == GDK_KEY_PRESS),
false );
@@ -3881,7 +3877,7 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* /*pContext*/, gchar*
if( checkSingleKeyCommitHack( rKP.keyval, aOrigCode ) )
{
- pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval,
rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
+ pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval,
rKP.hardware_keycode, rKP.group, aOrigCode, true, true );
bSingleCommit = true;
}
}
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 6d0edca0c829..4f447dd25958 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -3322,7 +3322,6 @@ void GtkData::initNWF()
{
ImplSVData* pSVData = ImplGetSVData();
pSVData->maNWFData.mbFlatMenu = true;
- pSVData->maNWFData.mbCheckBoxNeedsErase = true;
pSVData->maNWFData.mbDockingAreaAvoidTBFrames = true;
pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
pSVData->maNWFData.mbDDListBoxNoTextArea = true;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index e972e9bc5684..06a7ce307bd2 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -3420,7 +3420,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
else
aKeyEvt.mnCode = 0;
- aKeyEvt.mnTime = GetMessageTime();
aKeyEvt.mnCode |= nModCode;
aKeyEvt.mnCharCode = ImplGetCharCode( pFrame, wParam );
aKeyEvt.mnRepeat = nRepeat;
@@ -3442,7 +3441,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
SalKeyEvent aKeyEvt;
aKeyEvt.mnCode = nModCode; // Or should it be 0? - as this is
always a character returned
- aKeyEvt.mnTime = GetMessageTime();
aKeyEvt.mnRepeat = 0;
if( wParam >= Uni_SupplementaryPlanesStart )
@@ -3473,7 +3471,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
{
SalKeyModEvent aModEvt;
aModEvt.mbDown = false; // auto-accelerator feature not supported
here.
- aModEvt.mnTime = GetMessageTime();
aModEvt.mnCode = nModCode;
aModEvt.mnModKeyCode = ModKeyFlags::NONE; // no command events
will be sent if this member is 0
@@ -3577,7 +3574,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
else
nEvent = SalEvent::KeyInput;
- aKeyEvt.mnTime = GetMessageTime();
aKeyEvt.mnCode |= nModCode;
aKeyEvt.mnRepeat = nRepeat;
@@ -3648,7 +3644,6 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg,
else
nEvent = SalEvent::KeyInput;
- aKeyEvt.mnTime = GetMessageTime();
aKeyEvt.mnCode |= nModCode;
aKeyEvt.mnRepeat = nRepeat;
long nRet = pFrame->CallCallback( nEvent, &aKeyEvt );
@@ -3681,7 +3676,6 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM
wParam, LPARAM lParam )
// assemble KeyEvent
SalKeyEvent aKeyEvt;
- aKeyEvt.mnTime = GetMessageTime();
if ( (cKeyCode >= 48) && (cKeyCode <= 57) )
aKeyEvt.mnCode = KEY_0+(cKeyCode-48);
else if ( (cKeyCode >= 65) && (cKeyCode <= 90) )
@@ -4835,7 +4829,6 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM
wParam, LPARAM lParam )
return 1;
SalKeyEvent aKeyEvt;
- aKeyEvt.mnTime = GetMessageTime();
aKeyEvt.mnCode = KEY_MENU;
aKeyEvt.mnCharCode = 0;
aKeyEvt.mnRepeat = 0;
@@ -4866,7 +4859,6 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM
wParam, LPARAM lParam )
nModCode |= KEY_MOD2;
SalKeyEvent aKeyEvt;
- aKeyEvt.mnTime = GetMessageTime();
if ( (cKeyCode >= 48) && (cKeyCode <= 57) )
aKeyEvt.mnCode = KEY_0+(cKeyCode-48);
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
