[Libreoffice-commits] core.git: filter/source include/vcl vcl/headless vcl/inc vcl/opengl vcl/osx vcl/source vcl/unx
Noel Grandin
noel.grandin at collabora.co.uk
Sat Jun 17 13:07:20 UTC 2017
filter/source/pdf/pdfexport.cxx | 2 -
include/vcl/accel.hxx | 1
include/vcl/dockwin.hxx | 1
include/vcl/edit.hxx | 1
include/vcl/field.hxx | 1
include/vcl/filter/pdfdocument.hxx | 7 ------
include/vcl/graphicfilter.hxx | 5 ----
include/vcl/layout.hxx | 8 -------
include/vcl/outdev.hxx | 1
include/vcl/pdfextoutdevdata.hxx | 6 -----
include/vcl/ppdparser.hxx | 3 --
include/vcl/print.hxx | 2 -
include/vcl/salnativewidgets.hxx | 6 ++---
include/vcl/scrbar.hxx | 1
include/vcl/slider.hxx | 1
include/vcl/spinfld.hxx | 1
include/vcl/sysdata.hxx | 35 ++++++-------------------------
include/vcl/syswin.hxx | 1
include/vcl/textdata.hxx | 1
include/vcl/threadex.hxx | 9 ++-----
include/vcl/toolbox.hxx | 2 -
vcl/headless/svpframe.cxx | 1
vcl/inc/accmgr.hxx | 2 -
vcl/opengl/x11/gdiimpl.cxx | 1
vcl/osx/salobj.cxx | 1
vcl/source/control/edit.cxx | 3 --
vcl/source/control/field.cxx | 7 ------
vcl/source/control/scrbar.cxx | 7 ------
vcl/source/control/slider.cxx | 11 ---------
vcl/source/control/spinfld.cxx | 2 -
vcl/source/edit/textdata.cxx | 1
vcl/source/edit/textview.cxx | 1
vcl/source/filter/graphicfilter.cxx | 6 -----
vcl/source/filter/graphicfilter2.cxx | 8 +------
vcl/source/filter/ipdf/pdfdocument.cxx | 6 -----
vcl/source/gdi/pdfextoutdevdata.cxx | 10 --------
vcl/source/gdi/print.cxx | 9 -------
vcl/source/gdi/print3.cxx | 8 -------
vcl/source/helper/threadex.cxx | 5 +---
vcl/source/opengl/OpenGLContext.cxx | 1
vcl/source/outdev/font.cxx | 1
vcl/source/outdev/outdev.cxx | 1
vcl/source/outdev/text.cxx | 1
vcl/source/window/accel.cxx | 2 -
vcl/source/window/accmgr.cxx | 6 -----
vcl/source/window/dockmgr.cxx | 2 -
vcl/source/window/layout.cxx | 8 +++----
vcl/source/window/syswin.cxx | 3 --
vcl/source/window/toolbox.cxx | 11 ---------
vcl/source/window/toolbox2.cxx | 2 -
vcl/source/window/winproc.cxx | 2 -
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx | 3 --
vcl/unx/generic/gdi/salgdi.cxx | 5 ----
vcl/unx/generic/printer/ppdparser.cxx | 13 -----------
vcl/unx/generic/window/salframe.cxx | 4 ---
vcl/unx/generic/window/salobj.cxx | 8 -------
vcl/unx/gtk/gtkobject.cxx | 4 ---
vcl/unx/gtk/gtksalframe.cxx | 4 ---
vcl/unx/gtk3/gtk3gtkframe.cxx | 3 --
vcl/unx/gtk3/gtk3gtkobject.cxx | 3 --
60 files changed, 26 insertions(+), 245 deletions(-)
New commits:
commit 8914595d4623390e4bac9ebbdf0d5ae9ab69aa8a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 15 13:57:36 2017 +0200
loplugin:unusedfields in vcl part1
Change-Id: I67d176003f39992cd0ff9271a7d6ce26d2cb6619
Reviewed-on: https://gerrit.libreoffice.org/38828
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 1132009ae1e7..146566b9e97f 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -802,13 +802,11 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
pPDFExtOutDevData->SetIsExportNotes( mbExportNotes );
pPDFExtOutDevData->SetIsExportTaggedPDF( mbUseTaggedPDF );
pPDFExtOutDevData->SetIsExportTransitionEffects( mbUseTransitionEffects );
- pPDFExtOutDevData->SetFormsFormat( mnFormsFormat );
pPDFExtOutDevData->SetIsExportFormFields( mbExportFormFields );
pPDFExtOutDevData->SetIsExportBookmarks( mbExportBookmarks );
pPDFExtOutDevData->SetIsExportHiddenSlides( mbExportHiddenSlides );
pPDFExtOutDevData->SetIsLosslessCompression( mbUseLosslessCompression );
pPDFExtOutDevData->SetCompressionQuality( mnQuality );
- pPDFExtOutDevData->SetMaxImageResolution( mnMaxImageResolution );
pPDFExtOutDevData->SetIsReduceImageResolution( mbReduceImageResolution );
pPDFExtOutDevData->SetIsExportNamedDestinations( mbExportBmkToDest );
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index 573fa8920afc..27b3363f838e 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -40,7 +40,6 @@ private:
// Will be set by AcceleratorManager
vcl::KeyCode maCurKeyCode;
sal_uInt16 mnCurId;
- sal_uInt16 mnCurRepeat;
bool* mpDel;
SAL_DLLPRIVATE void ImplInit();
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index d4622a07ff7b..a3e60b7f433f 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -101,7 +101,6 @@ private:
bool mbDockCanceled:1,
mbDocking:1,
mbLastFloatMode:1,
- mbStartFloat:1,
mbRollUp:1,
mbDockBtn:1,
mbHideBtn:1,
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index fd84f1d3d7cd..caf94fbee1fe 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -89,7 +89,6 @@ private:
mbInsertMode:1,
mbClickedInSelection:1,
mbIsSubEdit:1,
- mbInMBDown:1,
mbActivePopup:1;
Link<Edit&,void> maModifyHdl;
Link<Edit&,void> maUpdateDataHdl;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 7fca5c290205..9a0b32d435fd 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -165,7 +165,6 @@ protected:
sal_Int64 mnLastValue;
sal_Int64 mnMin;
sal_Int64 mnMax;
- sal_uInt16 mnType;
bool mbWrapOnLimits;
// the members below are used in all derivatives of NumericFormatter
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 9297ef4a9e5e..6c5510ff3483 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -114,8 +114,6 @@ public:
/// Array object: a list.
class VCL_DLLPUBLIC PDFArrayElement : public PDFElement
{
- /// Location after the '[' token.
- sal_uInt64 m_nOffset = 0;
std::vector<PDFElement*> m_aElements;
/// The object that contains this array.
PDFObjectElement* m_pObject;
@@ -244,11 +242,6 @@ struct XRefEntry
* stored.
*/
sal_uInt64 m_nOffset;
- /**
- * Non-compressed: The generation number of the object.
- * Compressed: The index of this object within the object stream.
- */
- sal_uInt64 m_nGenerationNumber;
/// Are changed as part of an incremental update?.
bool m_bDirty;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 01b6e07f58d0..fa112d71066c 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -144,7 +144,6 @@ class VCL_DLLPUBLIC GraphicDescriptor final
sal_uInt16 nBitsPerPixel;
sal_uInt16 nPlanes;
GraphicFileFormat nFormat;
- bool bCompressed;
bool bOwnStream;
void ImpConstruct();
@@ -221,10 +220,9 @@ public:
/** Information about errors during the GraphicFilter operation. */
struct FilterErrorEx
{
- sal_uLong nFilterError;
sal_uLong nStreamError;
- FilterErrorEx() : nFilterError( 0UL ), nStreamError( 0UL ) {}
+ FilterErrorEx() : nStreamError( 0UL ) {}
};
/** Class to import and export graphic formats. */
@@ -320,7 +318,6 @@ private:
FilterErrorEx* pErrorEx;
bool bUseConfig;
- long nExpGraphHint;
};
#endif // INCLUDED_VCL_GRAPHICFILTER_HXX
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 753d86f8039d..8e9b0e02e381 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -420,10 +420,6 @@ public:
, m_nLeftPadding(0)
, m_nRightPadding(0)
, m_nTopPadding(0)
- , m_fXAlign(0.0)
- , m_fXScale(1.0)
- , m_fYAlign(0.0)
- , m_fYScale(1.0)
{
}
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
@@ -435,10 +431,6 @@ private:
sal_Int32 m_nLeftPadding;
sal_Int32 m_nRightPadding;
sal_Int32 m_nTopPadding;
- float m_fXAlign;
- float m_fXScale;
- float m_fYAlign;
- float m_fYScale;
};
class VCL_DLLPUBLIC VclExpander : public VclBin
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b4fb7f019081..64798b85fc1b 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -379,7 +379,6 @@ private:
Color maTextColor;
Color maTextLineColor;
Color maOverlineColor;
- TextAlign meTextAlign;
RasterOp meRasterOp;
Wallpaper maBackground;
std::unique_ptr<AllSettings> mxSettings;
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index ed4a574d033e..4701360ea948 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -84,10 +84,8 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData
bool mbExportBookmarks;
bool mbExportHiddenSlides;
bool mbExportNDests; //i56629
- sal_Int32 mnFormsFormat;
sal_Int32 mnPage;
sal_Int32 mnCompressionQuality;
- sal_Int32 mnMaxImageResolution;
css::lang::Locale maDocLocale;
PageSyncData* mpPageSyncData;
@@ -120,8 +118,6 @@ public:
bool GetIsExportFormFields() const { return mbExportFormFields;}
void SetIsExportFormFields( const bool bExportFormFields );
- void SetFormsFormat( const sal_Int32 nFormsFormat );
-
bool GetIsExportBookmarks() const { return mbExportBookmarks;}
void SetIsExportBookmarks( const bool bExportBookmarks );
@@ -140,8 +136,6 @@ public:
void SetCompressionQuality( const sal_Int32 nQuality );
- void SetMaxImageResolution( const sal_Int32 nQuality );
-
bool GetIsReduceImageResolution() const { return mbReduceImageResolution;}
void SetIsReduceImageResolution( const bool bReduceImageResolution );
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 134bb9bf49fa..b693dc41ff94 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -73,12 +73,10 @@ class VCL_DLLPUBLIC PPDKey
OUString m_aGroup;
public:
- enum UIType { PickOne, PickMany, Boolean };
enum class SetupType { ExitServer, Prolog, DocumentSetup, PageSetup, JCLSetup, AnySetup };
private:
bool m_bUIOption;
- UIType m_eUIType;
int m_nOrderDependency;
SetupType m_eSetupType;
@@ -169,7 +167,6 @@ private:
const PPDValue* m_pDefaultResolution;
const PPDKey* m_pResolutions;
// duplex commands
- const PPDValue* m_pDefaultDuplexType;
const PPDKey* m_pDuplexTypes;
// fonts
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 240bc7333b79..90faa219190b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -194,8 +194,6 @@ private:
Point maPageOffset;
Size maPaperSize;
sal_uLong mnError;
- sal_uInt16 mnCurPage;
- sal_uInt16 mnCurPrintPage;
sal_uInt16 mnPageQueueSize;
sal_uInt16 mnCopyCount;
bool mbDefPrinter;
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 98cbc1953f5f..46ffc48f799b 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -413,7 +413,7 @@ public:
virtual ToolbarValue* clone() const override;
tools::Rectangle maGripRect;
bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea
- // adjacent to the menubar
+ // adjacent to the menubar, only used on Windows
};
/* MenubarValue:
@@ -460,8 +460,8 @@ public:
virtual ~PushButtonValue() override;
virtual PushButtonValue* clone() const override;
- bool mbBevelButton:1;
- bool mbSingleLine:1;
+ bool mbBevelButton:1; // only used on OSX
+ bool mbSingleLine:1; // only used on OSX
};
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 73d4cc69ddf7..fdacb3ed1059 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -60,7 +60,6 @@ private:
long mnLineSize;
long mnPageSize;
long mnDelta;
- sal_uInt16 mnDragDraw;
sal_uInt16 mnStateFlags;
ScrollType meScrollType;
bool mbCalcSize;
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 996fc136b125..f4536b4c9af6 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -45,7 +45,6 @@ private:
long mnThumbPos;
long mnLineSize;
long mnPageSize;
- long mnDelta;
sal_uInt16 mnStateFlags;
ScrollType meScrollType;
bool mbCalcSize;
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index ea829e388fb4..6e3a2c35811b 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -93,7 +93,6 @@ private:
mbSpin:1,
mbInitialUp:1,
mbInitialDown:1,
- mbNoSelect:1,
mbUpperIn:1,
mbLowerIn:1,
mbInDropDown:1;
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index bb2ddf8b510a..18c4376c40a0 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -69,13 +69,9 @@ struct SystemEnvData
void* pWidget; // the corresponding widget
void* pVisual; // the visual in use
int nScreen; // the current screen of the window
- int nDepth; // depth of said visual
- long aColormap; // the colormap being used
- void* pAppContext; // the application context in use
// note: this is a "long" in Xlib *but* in the protocol it's only 32-bit
// however, the GTK3 vclplug wants to store pointers in here!
sal_IntPtr aShellWindow; // the window of the frame's shell
- void* pShellWidget; // the frame's shell widget
const char* pToolkit; // the toolkit in use (gtk2 vs gtk3)
#endif
@@ -95,11 +91,7 @@ struct SystemEnvData
, pWidget(nullptr)
, pVisual(nullptr)
, nScreen(0)
- , nDepth(0)
- , aColormap(0)
- , pAppContext(nullptr)
, aShellWindow(0)
- , pShellWidget(nullptr)
, pToolkit(nullptr)
#endif
{
@@ -146,12 +138,7 @@ struct SystemGraphicsData
#elif defined( IOS )
CGContextRef rCGContext; // CoreGraphics graphic context
#elif defined( UNX )
- void* pDisplay; // the relevant display connection
long hDrawable; // a drawable
- void* pVisual; // the visual in use
- int nScreen; // the current screen of the drawable
- int nDepth; // depth of said visual
- long aColormap; // the colormap being used
void* pXRenderFormat; // render format for drawable
#endif
SystemGraphicsData()
@@ -166,12 +153,7 @@ struct SystemGraphicsData
#elif defined( IOS )
, rCGContext( NULL )
#elif defined( UNX )
- , pDisplay( nullptr )
, hDrawable( 0 )
- , pVisual( nullptr )
- , nScreen( 0 )
- , nDepth( 0 )
- , aColormap( 0 )
, pXRenderFormat( nullptr )
#endif
{ }
@@ -179,7 +161,6 @@ struct SystemGraphicsData
struct SystemWindowData
{
- unsigned long nSize; // size in bytes of this structure
#if defined(_WIN32) // meaningless on Windows
#elif defined( MACOSX )
bool bOpenGL; // create a OpenGL providing NSView
@@ -205,7 +186,6 @@ struct SystemGlyphData
struct SystemFontData
{
- unsigned long nSize; // size in bytes of this structure
#if defined( UNX )
void* nFontId; // native font id
int nFontFlags; // native font flags
@@ -216,15 +196,15 @@ struct SystemFontData
bool bVerticalCharacterType; // Is the font using vertical character type
SystemFontData()
- : nSize( sizeof( SystemFontData ) )
+ :
#if defined( UNX )
- , nFontId( nullptr )
- , nFontFlags( 0 )
+ nFontId( nullptr ),
+ nFontFlags( 0 ),
#endif
- , bFakeBold( false )
- , bFakeItalic( false )
- , bAntialias( true )
- , bVerticalCharacterType( false )
+ bFakeBold( false ),
+ bFakeItalic( false ),
+ bAntialias( true ),
+ bVerticalCharacterType( false )
{
}
};
@@ -235,7 +215,6 @@ typedef std::vector<SystemGlyphData> SystemGlyphDataVector;
struct SystemTextLayoutData
{
- unsigned long nSize; // size in bytes of this structure
SystemGlyphDataVector rGlyphData; // glyph data
int orientation; // Text orientation
};
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 65e040172615..57624b659c58 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -157,7 +157,6 @@ private:
Size maRollUpOutSize;
Size maMinOutSize;
bool mbRollUp;
- bool mbRollFunc;
bool mbDockBtn;
bool mbHideBtn;
bool mbSysChild;
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 0ce7955e59f8..2e595fb8995e 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -130,7 +130,6 @@ struct TEIMEInfos
std::unique_ptr<ExtTextInputAttr[]> pAttribs;
TextPaM aPos;
sal_Int32 nLen;
- bool bCursor;
bool bWasCursorOverwrite;
TEIMEInfos(const TextPaM& rPos, const OUString& rOldTextAfterStartPos);
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 6330a71bcc28..954593e6604e 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -35,7 +35,6 @@ namespace vcl
{
osl::Condition m_aStart;
osl::Condition m_aFinish;
- long m_nReturn;
bool m_bTimeout;
DECL_DLLPRIVATE_LINK( worker, void*, void );
@@ -44,7 +43,7 @@ namespace vcl
SolarThreadExecutor();
virtual ~SolarThreadExecutor();
- virtual long doIt() = 0;
+ virtual void doIt() = 0;
void execute();
};
@@ -71,7 +70,7 @@ private:
explicit GenericSolarThreadExecutor( FuncT const& func )
: m_exc(), m_func(func), m_result() {}
- virtual long doIt() override
+ virtual void doIt() override
{
try {
m_result.reset( m_func() );
@@ -80,7 +79,6 @@ private:
// only UNO exceptions can be dispatched:
m_exc = ::cppu::getCaughtException();
}
- return 0;
}
css::uno::Any m_exc;
@@ -101,7 +99,7 @@ private:
explicit GenericSolarThreadExecutor( FuncT const& func )
: m_exc(), m_func(func) {}
- virtual long doIt() override
+ virtual void doIt() override
{
try {
m_func();
@@ -110,7 +108,6 @@ private:
// only UNO exceptions can be dispatched:
m_exc = ::cppu::getCaughtException();
}
- return 0;
}
css::uno::Any m_exc;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 828027d79cee..a171b6fcc584 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -132,7 +132,6 @@ private:
ImplToolItems::size_type mnVisLines; // number of visible lines (for scrolling)
ImplToolItems::size_type mnFloatLines; // number of lines during floating mode
ImplToolItems::size_type mnDockLines;
- sal_uInt16 mnMouseClicks;
sal_uInt16 mnMouseModifier;
bool mbDrag:1,
mbSelection:1,
@@ -147,7 +146,6 @@ private:
mbLastFloatMode:1,
mbCustomize:1,
mbDragging:1,
- mbIsShift:1,
mbIsKeyEvent:1,
mbChangingHighlight:1,
mbImagesMirrored:1;
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 6f6cd6171c90..9a086c0b3d6a 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -61,7 +61,6 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
// Nothing
#else
m_aSystemChildData.pSalFrame = this;
- m_aSystemChildData.nDepth = 24;
#endif
if( m_pParent )
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index aafe9c83160c..b2b469eb6826 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -48,7 +48,7 @@ public:
void EndSequence();
void FlushAccel() { EndSequence(); }
- bool IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat );
+ bool IsAccelKey( const vcl::KeyCode& rKeyCode );
};
#endif // INCLUDED_VCL_INC_ACCMGR_HXX
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index bbf7b811d8c7..bc5c854c51e3 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -248,7 +248,6 @@ SystemWindowData X11OpenGLContext::generateWinData(vcl::Window* pParent, bool /*
OpenGLZone aZone;
SystemWindowData aWinData;
- aWinData.nSize = sizeof(aWinData);
aWinData.pVisual = nullptr;
const SystemEnvData* sysData(pParent->GetSystemData());
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 9e6e746d5b35..b9170f706c38 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -288,7 +288,6 @@ SystemWindowData AquaOpenGLContext::generateWinData(vcl::Window* /*pParent*/, bo
SystemWindowData aWinData;
aWinData.bOpenGL = true;
aWinData.bLegacy = bRequestLegacyContext;
- aWinData.nSize = sizeof(aWinData);
return aWinData;
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e31582511652..b1cad70899be 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -284,7 +284,6 @@ void Edit::ImplInitEditData()
mbClickedInSelection = false;
mbActivePopup = false;
mbIsSubEdit = false;
- mbInMBDown = false;
mpDDInfo = nullptr;
mpIMEInfos = nullptr;
mcEchoChar = 0;
@@ -1357,9 +1356,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
StartTracking( StartTrackingFlags::ScrollRepeat );
}
- mbInMBDown = true; // then do not select all in GetFocus
GrabFocus();
- mbInMBDown = false;
}
void Edit::MouseButtonUp( const MouseEvent& rMEvt )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 14b68c355385..e20d32ce3550 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -44,10 +44,6 @@ using namespace ::comphelper;
namespace
{
-#define FORMAT_NUMERIC 1
-#define FORMAT_METRIC 2
-#define FORMAT_CURRENCY 3
-
sal_Int64 ImplPower10( sal_uInt16 n )
{
sal_uInt16 i;
@@ -494,7 +490,6 @@ void NumericFormatter::ImplInit()
// a "large" value substantially smaller than SAL_MAX_INT64, to avoid
// overflow in computations using this "dummy" value
mnDecimalDigits = 2;
- mnType = FORMAT_NUMERIC;
mbThousandSep = true;
mbShowTrailingZeros = true;
mbWrapOnLimits = false;
@@ -1328,7 +1323,6 @@ inline void MetricFormatter::ImplInit()
{
mnBaseValue = 0;
meUnit = MetricField::GetDefaultUnit();
- mnType = FORMAT_METRIC;
}
MetricFormatter::MetricFormatter()
@@ -1826,7 +1820,6 @@ bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString& rO
CurrencyFormatter::CurrencyFormatter()
{
- mnType = FORMAT_CURRENCY;
}
CurrencyFormatter::~CurrencyFormatter()
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 95ab867d4844..5f84ff2c4022 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -82,7 +82,6 @@ void ScrollBar::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnLineSize = 1;
mnPageSize = 1;
mnDelta = 0;
- mnDragDraw = 0;
mnStateFlags = 0;
meScrollType = ScrollType::DontKnow;
mbCalcSize = true;
@@ -879,7 +878,6 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
{
nTrackFlags = StartTrackingFlags::ButtonRepeat;
meScrollType = ScrollType::LineUp;
- mnDragDraw = SCRBAR_DRAW_BTN1;
}
}
else if ( HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown,
@@ -891,7 +889,6 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
{
nTrackFlags = StartTrackingFlags::ButtonRepeat;
meScrollType = ScrollType::LineDown;
- mnDragDraw = SCRBAR_DRAW_BTN2;
}
}
else
@@ -919,7 +916,6 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
{
nTrackFlags = StartTrackingFlags::NONE;
meScrollType = ScrollType::Drag;
- mnDragDraw = SCRBAR_DRAW_THUMB;
// calculate mouse offset
if (bWarp && (!bThumbHit || !bPrimaryWarping))
@@ -955,12 +951,10 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
maPage1Rect.IsInside( rMousePos ) )
{
meScrollType = ScrollType::PageUp;
- mnDragDraw = SCRBAR_DRAW_PAGE1;
}
else
{
meScrollType = ScrollType::PageDown;
- mnDragDraw = SCRBAR_DRAW_PAGE2;
}
}
}
@@ -993,7 +987,6 @@ void ScrollBar::Tracking( const TrackingEvent& rTEvt )
SCRBAR_STATE_THUMB_DOWN);
if ( nOldStateFlags != mnStateFlags )
Invalidate();
- mnDragDraw = 0;
// Restore the old ThumbPosition when canceled
if ( rTEvt.IsTrackingCanceled() )
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 3bf88f210cd9..1bbf92750f25 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -53,7 +53,6 @@ void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnThumbPos = 0;
mnLineSize = 1;
mnPageSize = 1;
- mnDelta = 0;
mnStateFlags = 0;
meScrollType = ScrollType::DontKnow;
mbCalcSize = true;
@@ -489,11 +488,9 @@ long Slider::ImplSlide( long nNewPos, bool bCallEndSlide )
long nDelta = mnThumbPos-nOldPos;
if ( nDelta )
{
- mnDelta = nDelta;
Slide();
if ( bCallEndSlide )
EndSlide();
- mnDelta = 0;
}
return nDelta;
}
@@ -697,9 +694,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
// on cancel, reset the previous Thumb position
if ( rTEvt.IsTrackingCanceled() )
{
- long nOldPos = mnThumbPos;
SetThumbPos( mnStartPos );
- mnDelta = mnThumbPos-nOldPos;
Slide();
}
@@ -711,15 +706,11 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
if ( !mbFullDrag && (mnStartPos != mnThumbPos) )
{
- mnDelta = mnThumbPos-mnStartPos;
Slide();
- mnDelta = 0;
}
}
- mnDelta = mnThumbPos-mnStartPos;
EndSlide();
- mnDelta = 0;
meScrollType = ScrollType::DontKnow;
}
else
@@ -752,9 +743,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
ImplUpdateLinkedField();
if ( mbFullDrag && (nOldPos != mnThumbPos) )
{
- mnDelta = mnThumbPos-nOldPos;
Slide();
- mnDelta = 0;
}
}
}
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 96b8ffce552d..88e20bbfe09c 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -297,7 +297,6 @@ void SpinField::ImplInitSpinFieldData()
mbLowerIn = false;
mbInitialUp = false;
mbInitialDown = false;
- mbNoSelect = false;
mbInDropDown = false;
}
@@ -379,7 +378,6 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt )
{
if (!HasFocus() && (!mpEdit || !mpEdit->HasFocus()))
{
- mbNoSelect = true;
GrabFocus();
}
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index f3a65d5275e0..9561370aaed9 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -325,7 +325,6 @@ TEIMEInfos::TEIMEInfos( const TextPaM& rPos, const OUString& rOldTextAfterStartP
{
aPos = rPos;
nLen = 0;
- bCursor = true;
pAttribs = nullptr;
bWasCursorOverwrite = false;
}
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index c6cb9618e4cf..544a44ad09f6 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -905,7 +905,6 @@ void TextView::Command( const CommandEvent& rCEvt )
if ( pData->GetTextAttr() )
{
mpImpl->mpTextEngine->mpIMEInfos->CopyAttribs( pData->GetTextAttr(), pData->GetText().getLength() );
- mpImpl->mpTextEngine->mpIMEInfos->bCursor = pData->IsCursorVisible();
}
else
{
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index e148287038f7..0314d3d8ac34 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1100,7 +1100,6 @@ namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; }
GraphicFilter::GraphicFilter( bool bConfig )
: pErrorEx(nullptr)
, bUseConfig(bConfig)
- , nExpGraphHint(0)
{
ImplInit();
}
@@ -1159,7 +1158,6 @@ void GraphicFilter::ImplInit()
sal_uLong GraphicFilter::ImplSetError( sal_uLong nError, const SvStream* pStm )
{
- pErrorEx->nFilterError = nError;
pErrorEx->nStreamError = pStm ? pStm->GetError() : ERRCODE_NONE;
return nError;
}
@@ -1978,7 +1976,6 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r
sal_uInt16 nFormatCount = GetExportFormatCount();
ResetLastError();
- nExpGraphHint = 0;
if( nFormat == GRFILTER_FORMAT_DONTKNOW )
{
@@ -2108,7 +2105,6 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r
bool bExportedGrayJPEG = false;
if( !ExportJPEG( rOStm, aGraphic, pFilterData, &bExportedGrayJPEG ) )
nStatus = ERRCODE_GRFILTER_FORMATERROR;
- nExpGraphHint = bExportedGrayJPEG ? GRFILTER_OUTHINT_GREY : 0;
if( rOStm.GetError() )
nStatus = ERRCODE_GRFILTER_IOERROR;
@@ -2279,7 +2275,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r
void GraphicFilter::ResetLastError()
{
- pErrorEx->nFilterError = pErrorEx->nStreamError = 0UL;
+ pErrorEx->nStreamError = 0UL;
}
const Link<ConvertData&,bool> GraphicFilter::GetFilterCallback() const
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 0a7d5034e463..121d9690a861 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -98,7 +98,6 @@ void GraphicDescriptor::ImpConstruct()
nFormat = GraphicFileFormat::NOT;
nBitsPerPixel = 0;
nPlanes = 0;
- bCompressed = false;
}
bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, bool bExtendedInfo )
@@ -149,7 +148,7 @@ bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, bool bExtendedInfo )
// Compression
rStm.ReadUInt32( nTemp32 );
- bCompressed = ( ( nCompression = nTemp32 ) > 0 );
+ nCompression = nTemp32;
// logical width
rStm.SeekRel( 4 );
@@ -461,7 +460,6 @@ bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, bool bExtendedInfo )
// compression
rStm.ReadUChar( cByte );
- bCompressed = ( cByte > 0 );
bRet = (cByte==0 || cByte ==1);
if (bRet)
@@ -549,7 +547,6 @@ bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, bool bExtendedInfo )
// Planes always 1;
// compression always
nPlanes = 1;
- bCompressed = true;
sal_uInt32 nLen32 = 0;
nTemp32 = 0;
@@ -718,8 +715,7 @@ bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, bool bExtendedInfo )
if ( nTemp16 == 259 )
{
rStm.SeekRel( 6 );
- rStm.ReadUInt16( nTemp16 );
- bCompressed = ( nTemp16 > 1 );
+ rStm.ReadUInt16( nTemp16 ); // compression
rStm.SeekRel( 2 );
}
else
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx
index 105800974532..e2ef15cafa98 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -125,7 +125,6 @@ public:
XRefEntry::XRefEntry()
: m_eType(XRefEntryType::NOT_COMPRESSED),
m_nOffset(0),
- m_nGenerationNumber(0),
m_bDirty(false)
{
}
@@ -308,7 +307,6 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot
sal_uInt32 nAnnotsId = pAnnotsObject->GetObjectValue();
m_aXRef[nAnnotsId].m_eType = XRefEntryType::NOT_COMPRESSED;
m_aXRef[nAnnotsId].m_nOffset = m_aEditBuffer.Tell();
- m_aXRef[nAnnotsId].m_nGenerationNumber = 0;
m_aXRef[nAnnotsId].m_bDirty = true;
m_aEditBuffer.WriteUInt32AsString(nAnnotsId);
m_aEditBuffer.WriteCharPtr(" 0 obj\n[");
@@ -431,7 +429,6 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p
sal_uInt32 nAcroFormId = pAcroFormObject->GetObjectValue();
m_aXRef[nAcroFormId].m_eType = XRefEntryType::NOT_COMPRESSED;
m_aXRef[nAcroFormId].m_nOffset = m_aEditBuffer.Tell();
- m_aXRef[nAcroFormId].m_nGenerationNumber = 0;
m_aXRef[nAcroFormId].m_bDirty = true;
m_aEditBuffer.WriteUInt32AsString(nAcroFormId);
m_aEditBuffer.WriteCharPtr(" 0 obj\n");
@@ -1629,7 +1626,6 @@ void PDFDocument::ReadXRefStream(SvStream& rStream)
break;
}
aEntry.m_nOffset = nStreamOffset;
- aEntry.m_nGenerationNumber = nGenerationNumber;
m_aXRef[nIndex] = aEntry;
}
}
@@ -1703,7 +1699,6 @@ void PDFDocument::ReadXRef(SvStream& rStream)
{
XRefEntry aEntry;
aEntry.m_nOffset = aOffset.GetValue();
- aEntry.m_nGenerationNumber = aGenerationNumber.GetValue();
// Initially only the first entry is dirty.
if (nIndex == 0)
aEntry.m_bDirty = true;
@@ -3025,7 +3020,6 @@ bool PDFArrayElement::Read(SvStream& rStream)
SAL_WARN("vcl.filter", "PDFArrayElement::Read: unexpected character: " << ch);
return false;
}
- m_nOffset = rStream.Tell();
SAL_INFO("vcl.filter", "PDFArrayElement::Read: '['");
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index ccc242061fa4..67061939df3d 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -509,10 +509,8 @@ PDFExtOutDevData::PDFExtOutDevData( const OutputDevice& rOutDev ) :
mbExportBookmarks ( false ),
mbExportHiddenSlides ( false ),
mbExportNDests ( false ),
- mnFormsFormat ( 0 ),
mnPage ( -1 ),
mnCompressionQuality ( 90 ),
- mnMaxImageResolution ( 300 ),
mpPageSyncData ( nullptr ),
mpGlobalSyncData ( new GlobalSyncData() )
{
@@ -546,10 +544,6 @@ void PDFExtOutDevData::SetCompressionQuality( const sal_Int32 nQuality )
{
mnCompressionQuality = nQuality;
}
-void PDFExtOutDevData::SetMaxImageResolution( const sal_Int32 nMaxImageResolution )
-{
- mnMaxImageResolution = nMaxImageResolution;
-}
void PDFExtOutDevData::SetIsReduceImageResolution( const bool bReduceImageResolution )
{
mbReduceImageResolution = bReduceImageResolution;
@@ -574,10 +568,6 @@ void PDFExtOutDevData::SetIsExportFormFields( const bool bExportFomtFields )
{
mbExportFormFields = bExportFomtFields;
}
-void PDFExtOutDevData::SetFormsFormat( const sal_Int32 nFormsFormat )
-{
- mnFormsFormat = nFormsFormat;
-}
void PDFExtOutDevData::SetIsExportBookmarks( const bool bExportBookmarks )
{
mbExportBookmarks = bExportBookmarks;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 09f7ff9b6d88..cb53eb66a005 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -483,8 +483,6 @@ void Printer::ImplInitData()
meOutDevType = OUTDEV_PRINTER;
mbDefPrinter = false;
mnError = ERRCODE_NONE;
- mnCurPage = 0;
- mnCurPrintPage = 0;
mnPageQueueSize = 0;
mnCopyCount = 1;
mbCollateCopy = false;
@@ -1642,10 +1640,7 @@ bool Printer::EndJob()
{
ReleaseGraphics();
- mnCurPage = 0;
-
mbPrinting = false;
- mnCurPrintPage = 0;
maJobName.clear();
mbDevOutput = false;
@@ -1678,11 +1673,7 @@ void Printer::ImplStartPage()
// PrintJob not aborted ???
if ( IsJobActive() )
- {
mbInPrintPage = true;
- mnCurPage++;
- mnCurPrintPage++;
- }
}
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 1adca043062c..a8dc7c504b86 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -591,8 +591,6 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer
mpPrinterOptions->ReadFromConfig( mbPrintFile );
maJobName = i_rJobName;
- mnCurPage = 1;
- mnCurPrintPage = 1;
mbPrinting = true;
if( GetCapabilities( PrinterCapType::UsePullModel ) )
{
@@ -615,8 +613,6 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer
if ( !mnError )
mnError = PRINTER_GENERALERROR;
pSVData->mpDefInst->DestroyPrinter( mpPrinter );
- mnCurPage = 0;
- mnCurPrintPage = 0;
mbPrinting = false;
mpPrinter = nullptr;
mbJobActive = false;
@@ -709,8 +705,6 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer
if ( mpPrinter )
{
maJobName = i_rJobName;
- mnCurPage = 1;
- mnCurPrintPage = 1;
mbPrinting = true;
}
else
@@ -730,8 +724,6 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer
: css::view::PrintableState_JOB_FAILED );
if( mpPrinter )
pSVData->mpDefInst->DestroyPrinter( mpPrinter );
- mnCurPage = 0;
- mnCurPrintPage = 0;
mbPrinting = false;
mpPrinter = nullptr;
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index 7bc04082ab71..6e3f7f4808f8 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.cxx
@@ -25,7 +25,6 @@ using namespace vcl;
SolarThreadExecutor::SolarThreadExecutor()
:m_aStart()
,m_aFinish()
- ,m_nReturn( 0 )
,m_bTimeout( false )
{
}
@@ -39,7 +38,7 @@ IMPL_LINK_NOARG(SolarThreadExecutor, worker, void*, void)
if ( !m_bTimeout )
{
m_aStart.set();
- m_nReturn = doIt();
+ doIt();
m_aFinish.set();
}
}
@@ -49,7 +48,7 @@ void SolarThreadExecutor::execute()
if( ::osl::Thread::getCurrentIdentifier() == Application::GetMainThreadIdentifier() )
{
m_aStart.set();
- m_nReturn = doIt();
+ doIt();
m_aFinish.set();
}
else
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 541491100bf5..760c20c7b1bc 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -429,7 +429,6 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* /*pParent*/, bool /
{
SystemWindowData aWinData;
memset(&aWinData, 0, sizeof(aWinData));
- aWinData.nSize = sizeof(aWinData);
return aWinData;
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index f8438335062b..9bcb8c26022f 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -271,7 +271,6 @@ bool OutputDevice::GetFontCapabilities( vcl::FontCapabilities& rFontCapabilities
SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const
{
SystemFontData aSysFontData;
- aSysFontData.nSize = sizeof(aSysFontData);
if (!mpGraphics)
(void) AcquireGraphics();
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index a235f1a7e957..8244f0b338f1 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -93,7 +93,6 @@ OutputDevice::OutputDevice() :
mbOutputClipped = false;
maTextColor = Color( COL_BLACK );
maOverlineColor = Color( COL_TRANSPARENT );
- meTextAlign = maFont.GetAlignment();
meRasterOp = RasterOp::OverPaint;
mnAntialiasing = AntialiasingFlags::NONE;
meTextLanguage = LANGUAGE_SYSTEM; // TODO: get default from configuration?
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 150fd828887d..00ae6906275b 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2335,7 +2335,6 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
}
SystemTextLayoutData aSysLayoutData;
- aSysLayoutData.nSize = sizeof(aSysLayoutData);
aSysLayoutData.rGlyphData.reserve( 256 );
aSysLayoutData.orientation = 0;
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 28c9844a5ffb..a345681635c9 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -124,7 +124,6 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
void Accelerator::ImplInit()
{
mnCurId = 0;
- mnCurRepeat = 0;
mpDel = nullptr;
}
@@ -295,7 +294,6 @@ Accelerator& Accelerator::operator=( const Accelerator& rAccel )
// assign new data
maCurKeyCode = vcl::KeyCode();
mnCurId = 0;
- mnCurRepeat = 0;
// delete and copy tables
ImplDeleteData();
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index bf209354191c..2959f75f81dc 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -95,7 +95,7 @@ void ImplAccelManager::EndSequence()
mpSequenceList = nullptr;
}
-bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat )
+bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode )
{
Accelerator* pAccel;
@@ -147,7 +147,6 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
bool bDel = false;
pAccel->maCurKeyCode = rKeyCode;
pAccel->mnCurId = pEntry->mnId;
- pAccel->mnCurRepeat = nRepeat;
pAccel->mpDel = &bDel;
pAccel->Select();
@@ -156,7 +155,6 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
{
pAccel->maCurKeyCode = vcl::KeyCode();
pAccel->mnCurId = 0;
- pAccel->mnCurRepeat = 0;
pAccel->mpDel = nullptr;
}
@@ -217,7 +215,6 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
bool bDel = false;
pAccel->maCurKeyCode = rKeyCode;
pAccel->mnCurId = pEntry->mnId;
- pAccel->mnCurRepeat = nRepeat;
pAccel->mpDel = &bDel;
pAccel->Select();
@@ -226,7 +223,6 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRep
{
pAccel->maCurKeyCode = vcl::KeyCode();
pAccel->mnCurId = 0;
- pAccel->mnCurRepeat = 0;
pAccel->mpDel = nullptr;
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 12654bf6c0db..1ee6bdc309a3 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -661,7 +661,6 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow )
, mbDockCanceled(false)
, mbDocking(false)
, mbLastFloatMode(false)
- , mbStartFloat(false)
, mbRollUp(false)
, mbDockBtn(false)
, mbHideBtn(false)
@@ -692,7 +691,6 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
maMouseStart = maMouseOff;
mbDocking = true;
mbLastFloatMode = IsFloatingMode();
- mbStartFloat = mbLastFloatMode;
// calculate FloatingBorder
VclPtr<FloatingWindow> pWin;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 010ee2a5c2f6..c6a7615c4be5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1657,13 +1657,13 @@ bool VclAlignment::set_property(const OString &rKey, const OUString &rValue)
else if (rKey == "top-padding")
m_nTopPadding = rValue.toInt32();
else if (rKey == "xalign")
- m_fXAlign = rValue.toFloat();
+ ;
else if (rKey == "xscale")
- m_fXScale = rValue.toFloat();
+ ;
else if (rKey == "yalign")
- m_fYAlign = rValue.toFloat();
+ ;
else if (rKey == "yscale")
- m_fYScale = rValue.toFloat();
+ ;
else
return VclBin::set_property(rKey, rValue);
return true;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index beca12f4fdc4..f1f59c8de02d 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -66,7 +66,6 @@ SystemWindow::ImplData::ImplData()
SystemWindow::SystemWindow(WindowType nType)
: Window(nType)
, mbRollUp(false)
- , mbRollFunc(false)
, mbDockBtn(false)
, mbHideBtn(false)
, mbSysChild(false)
@@ -371,7 +370,6 @@ void SystemWindow::RollUp()
if ( !mbRollUp )
{
maOrgSize = GetOutputSizePixel();
- mbRollFunc = true;
Size aSize = maRollUpOutSize;
if ( !aSize.Width() )
aSize.Width() = GetOutputSizePixel().Width();
@@ -380,7 +378,6 @@ void SystemWindow::RollUp()
static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetRollUp( true, aSize );
else
SetOutputSizePixel( aSize );
- mbRollFunc = false;
}
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 7b0b4af23a65..11b32886232a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1130,7 +1130,6 @@ void ToolBox::ImplInitToolBoxData()
mnVisLines = 1;
mnFloatLines = 0;
mnDockLines = 0;
- mnMouseClicks = 0;
mnMouseModifier = 0;
mbDrag = false;
mbSelection = false;
@@ -1145,7 +1144,6 @@ void ToolBox::ImplInitToolBoxData()
mbLastFloatMode = false;
mbCustomize = false;
mbDragging = false;
- mbIsShift = false;
mbIsKeyEvent = false;
mbChangingHighlight = false;
mbImagesMirrored = false;
@@ -2433,7 +2431,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl, Timer *, void)
mnCurPos = ITEM_NOTFOUND;
mnCurItemId = 0;
mnDownItemId = 0;
- mnMouseClicks = 0;
mnMouseModifier = 0;
mnHighItemId = 0;
}
@@ -3155,10 +3152,7 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
// set mouse data if in selection mode, as then
// the MouseButtonDown handler cannot be called
if ( mbSelection )
- {
- mnMouseClicks = rMEvt.GetClicks();
mnMouseModifier = rMEvt.GetModifier();
- }
Deactivate();
@@ -3230,7 +3224,6 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
mnCurPos = ITEM_NOTFOUND;
mnCurItemId = 0;
mnDownItemId = 0;
- mnMouseClicks = 0;
mnMouseModifier = 0;
return true;
}
@@ -3501,7 +3494,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
mnCurPos = i;
mnCurItemId = it->mnId;
mnDownItemId = mnCurItemId;
- mnMouseClicks = rMEvt.GetClicks();
mnMouseModifier = rMEvt.GetModifier();
if ( it->mnBits & ToolBoxItemBits::REPEAT )
nTrackFlags |= StartTrackingFlags::ButtonRepeat;
@@ -3551,7 +3543,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
mnCurPos = ITEM_NOTFOUND;
mnCurItemId = 0;
mnDownItemId = 0;
- mnMouseClicks = 0;
mnMouseModifier = 0;
mnHighItemId = 0;
}
@@ -4665,7 +4656,6 @@ bool ToolBox::ImplOpenItem( vcl::KeyCode aKeyCode )
mnCurPos = GetItemPos( mnCurItemId );
mnLastFocusItemId = mnCurItemId; // save item id for possible later focus restore
mnMouseModifier = aKeyCode.GetModifier();
- mbIsShift = true;
mbIsKeyEvent = true;
Activate();
@@ -4673,7 +4663,6 @@ bool ToolBox::ImplOpenItem( vcl::KeyCode aKeyCode )
mpData->maDropdownClickHdl.Call( this );
mbIsKeyEvent = false;
- mbIsShift = false;
mnMouseModifier = 0;
}
else
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index aa16ad3c9c1e..bee4f41adada 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1138,7 +1138,6 @@ void ToolBox::EndSelection()
mnCurPos = ITEM_NOTFOUND;
mnCurItemId = 0;
mnDownItemId = 0;
- mnMouseClicks = 0;
mnMouseModifier = 0;
}
@@ -1179,7 +1178,6 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown )
mnCurItemId = 0;
mnDownItemId = 0;
- mnMouseClicks = 0;
mnMouseModifier = 0;
}
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index fb43d1b95e67..ba0d133ec0a9 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -961,7 +961,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
// test for accel
if ( pSVData->maAppData.mpAccelMgr )
{
- if ( pSVData->maAppData.mpAccelMgr->IsAccelKey( aKeyCode, nRepeat ) )
+ if ( pSVData->maAppData.mpAccelMgr->IsAccelKey( aKeyCode ) )
return true;
}
}
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 4ee1eec061cc..803c02343958 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -65,10 +65,7 @@ namespace cairo
{}
X11SysData::X11SysData( const SystemGraphicsData& pSysDat ) :
- pDisplay(pSysDat.pDisplay),
hDrawable(pSysDat.hDrawable),
- pVisual(pSysDat.pVisual),
- nScreen(pSysDat.nScreen),
pRenderFormat(pSysDat.pXRenderFormat)
{}
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 4dab907e01d6..b231dfc8f478 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -490,12 +490,7 @@ SystemGraphicsData X11SalGraphics::GetGraphicsData() const
SystemGraphicsData aRes;
aRes.nSize = sizeof(aRes);
- aRes.pDisplay = GetXDisplay();
aRes.hDrawable = hDrawable_;
- aRes.pVisual = GetVisual().visual;
- aRes.nScreen = m_nXScreen.getXScreen();
- aRes.nDepth = GetBitCount();
- aRes.aColormap = GetColormap().GetXColormap();
aRes.pXRenderFormat = m_pXRenderFormat;
return aRes;
}
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 12c8a1480a85..0a427baf2592 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -596,7 +596,6 @@ PPDParser::PPDParser( const OUString& rFile ) :
m_pInputSlots( nullptr ),
m_pDefaultResolution( nullptr ),
m_pResolutions( nullptr ),
- m_pDefaultDuplexType( nullptr ),
m_pDuplexTypes( nullptr ),
m_pFontList( nullptr ),
m_pTranslator( new PPDTranslator() )
@@ -744,8 +743,6 @@ PPDParser::PPDParser( const OUString& rFile ) :
SAL_INFO_IF(!m_pDefaultInputSlot, "vcl.unx.print", "no DefaultInputSlot in " << m_aFile);
m_pDuplexTypes = getKey( OUString( "Duplex" ) );
- if( m_pDuplexTypes )
- m_pDefaultDuplexType = m_pDuplexTypes->getDefaultValue();
m_pFontList = getKey( OUString( "Font" ) );
if (m_pFontList == nullptr) {
@@ -1200,15 +1197,6 @@ void PPDParser::parseOpenUI(const OString& rLine, const OString& rPPDGroup)
pKey->m_bUIOption = true;
m_pTranslator->insertKey( pKey->getKey(), aTranslation );
- sal_Int32 nIndex = 0;
- OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) );
- if( aValue.equalsIgnoreAsciiCase("boolean"))
- pKey->m_eUIType = PPDKey::Boolean;
- else if (aValue.equalsIgnoreAsciiCase("pickmany"))
- pKey->m_eUIType = PPDKey::PickMany;
- else
- pKey->m_eUIType = PPDKey::PickOne;
-
pKey->m_aGroup = OStringToOUString(rPPDGroup, RTL_TEXTENCODING_MS_1252);
}
@@ -1479,7 +1467,6 @@ PPDKey::PPDKey( const OUString& rKey ) :
m_pDefaultValue( nullptr ),
m_bQueryValue( false ),
m_bUIOption( false ),
- m_eUIType( PickOne ),
m_nOrderDependency( 100 ),
m_eSetupType( SetupType::AnySetup )
{
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 1ea8598c55f5..24232b5800b8 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -987,11 +987,7 @@ const SystemEnvData* X11SalFrame::GetSystemData() const
pFrame->maSystemChildData.pWidget = nullptr;
pFrame->maSystemChildData.pVisual = GetDisplay()->GetVisual( m_nXScreen ).GetVisual();
pFrame->maSystemChildData.nScreen = m_nXScreen.getXScreen();
- pFrame->maSystemChildData.nDepth = GetDisplay()->GetVisual( m_nXScreen ).GetDepth();
- pFrame->maSystemChildData.aColormap = GetDisplay()->GetColormap( m_nXScreen ).GetXColormap();
- pFrame->maSystemChildData.pAppContext = nullptr;
pFrame->maSystemChildData.aShellWindow = pFrame->GetShellWindow();
- pFrame->maSystemChildData.pShellWidget = nullptr;
return &maSystemChildData;
}
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index b10e8f645201..333d8787c5f3 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -155,10 +155,6 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
pObjData->aWindow = pObject->maSecondary;
pObjData->pWidget = nullptr;
pObjData->pVisual = pVisual;
- pObjData->nDepth = nDepth;
- pObjData->aColormap = aVisID == pSalDisp->GetVisual( nXScreen ).GetVisualId() ?
- pSalDisp->GetColormap( nXScreen ).GetXColormap() : None;
- pObjData->pAppContext = nullptr;
XSync(pDisp, False);
if( GetGenericData()->ErrorTrapPop( false ) )
@@ -227,11 +223,7 @@ X11SalObject::X11SalObject()
maSystemChildData.pSalFrame = nullptr;
maSystemChildData.pWidget = nullptr;
maSystemChildData.pVisual = nullptr;
- maSystemChildData.nDepth = 0;
- maSystemChildData.aColormap = 0;
- maSystemChildData.pAppContext = nullptr;
maSystemChildData.aShellWindow = 0;
- maSystemChildData.pShellWidget = nullptr;
std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects();
rObjects.push_back( this );
diff --git a/vcl/unx/gtk/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx
index f7c14d08bb9f..42be736bcd25 100644
--- a/vcl/unx/gtk/gtkobject.cxx
+++ b/vcl/unx/gtk/gtkobject.cxx
@@ -54,15 +54,11 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericData());
m_aSystemData.pDisplay = pDisp->GetDisplay();
m_aSystemData.pVisual = pDisp->GetVisual(pParent->getXScreenNumber()).GetVisual();
- m_aSystemData.nDepth = pDisp->GetVisual(pParent->getXScreenNumber()).GetDepth();
- m_aSystemData.aColormap = pDisp->GetColormap(pParent->getXScreenNumber()).GetXColormap();
m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket));
m_aSystemData.aShellWindow = GDK_WINDOW_XWINDOW(widget_get_window(GTK_WIDGET(pParent->getWindow())));
m_aSystemData.pSalFrame = nullptr;
m_aSystemData.pWidget = m_pSocket;
m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen();
- m_aSystemData.pAppContext = nullptr;
- m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow());
m_aSystemData.pToolkit = "gtk2";
g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this );
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 95a8b8cbd7fd..b980749f2ad4 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -999,15 +999,11 @@ void GtkSalFrame::InitCommon()
GtkSalDisplay* pDisp = GetGtkSalData()->GetGtkDisplay();
m_aSystemData.pDisplay = pDisp->GetDisplay();
m_aSystemData.pVisual = pDisp->GetVisual( m_nXScreen ).GetVisual();
- m_aSystemData.nDepth = pDisp->GetVisual( m_nXScreen ).GetDepth();
- m_aSystemData.aColormap = pDisp->GetColormap( m_nXScreen ).GetXColormap();
m_aSystemData.aWindow = widget_get_xid(m_pWindow);
m_aSystemData.aShellWindow = m_aSystemData.aWindow;
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
m_aSystemData.nScreen = m_nXScreen.getXScreen();
- m_aSystemData.pAppContext = nullptr;
- m_aSystemData.pShellWidget = m_aSystemData.pWidget;
m_aSystemData.pToolkit = "gtk2";
m_bGraphics = false;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 54574dd1a38c..784c2a8d542f 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1116,12 +1116,9 @@ void GtkSalFrame::InitCommon()
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
m_aSystemData.nScreen = m_nXScreen.getXScreen();
- m_aSystemData.pAppContext = nullptr;
- m_aSystemData.pShellWidget = m_aSystemData.pWidget;
m_aSystemData.pToolkit = "gtk3";
GdkScreen* pScreen = gtk_window_get_screen(GTK_WINDOW(m_pWindow));
GdkVisual* pVisual = gdk_screen_get_system_visual(pScreen);
- m_aSystemData.nDepth = gdk_visual_get_depth(pVisual);
#if defined(GDK_WINDOWING_X11)
GdkDisplay *pDisplay = getGdkDisplay();
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index a03ec854f05c..23968852f793 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -53,12 +53,9 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
m_aSystemData.pSalFrame = nullptr;
m_aSystemData.pWidget = m_pSocket;
m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen();
- m_aSystemData.pAppContext = nullptr;
- m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow());
m_aSystemData.pToolkit = "gtk3";
GdkScreen* pScreen = gtk_window_get_screen(GTK_WINDOW(pParent->getWindow()));
GdkVisual* pVisual = gdk_screen_get_system_visual(pScreen);
- m_aSystemData.nDepth = gdk_visual_get_depth(pVisual);
#if defined(GDK_WINDOWING_X11)
GdkDisplay *pDisplay = GtkSalFrame::getGdkDisplay();
More information about the Libreoffice-commits
mailing list