summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/animate.hxx4
-rw-r--r--include/vcl/bitmap.hxx3
-rw-r--r--include/vcl/builder.hxx6
-rw-r--r--include/vcl/dockwin.hxx2
-rw-r--r--include/vcl/graph.h4
-rw-r--r--include/vcl/menubtn.hxx1
-rw-r--r--include/vcl/opengl/OpenGLContext.hxx4
-rw-r--r--include/vcl/pdfwriter.hxx4
-rw-r--r--include/vcl/sysdata.hxx8
-rw-r--r--include/vcl/texteng.hxx1
-rw-r--r--include/vcl/threadex.hxx3
-rw-r--r--vcl/source/gdi/animate.cxx1
-rw-r--r--vcl/source/gdi/bitmap4.cxx6
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx2
15 files changed, 9 insertions, 42 deletions
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index b690bea60c13..52e81fbb5b29 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -95,15 +95,11 @@ struct AInfo
{
Bitmap aLastSaveBitmap;
Bitmap aBackBitmap;
- Rectangle aClipRect;
- Size aLastSaveSize;
- Point aLastSavePoint;
Point aStartOrg;
Size aStartSize;
VclPtr<OutputDevice> pOutDev;
void* pViewData;
long nExtraData;
- bool bWithSize;
bool bPause;
AInfo();
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 6e5f5d883768..23587e5ff89a 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -165,7 +165,8 @@ public:
BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ),
- mnSepiaPercent( nSepiaPercent ) {}
+ mnSepiaPercent( nSepiaPercent )
+ { assert(nSepiaPercent>=0 && nSepiaPercent<=100); }
BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd )
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 485bbe8375cb..074200abea69 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -260,13 +260,9 @@ private:
struct SizeGroup
{
- OString m_sID;
std::vector<OString> m_aWidgets;
stringmap m_aProperties;
- SizeGroup(const OString &rId)
- : m_sID(rId)
- {
- }
+ SizeGroup() {}
};
typedef std::map< VclPtr<vcl::Window>, stringmap> AtkMap;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index cf44a66b1a36..aab80136501e 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -107,10 +107,8 @@ private:
mbFloatPrevented:1,
mbDockable:1,
mbDocking:1,
- mbDragFull:1,
mbLastFloatMode:1,
mbStartFloat:1,
- mbTrackDock:1,
mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
diff --git a/include/vcl/graph.h b/include/vcl/graph.h
index f41274735126..ec196d08205a 100644
--- a/include/vcl/graph.h
+++ b/include/vcl/graph.h
@@ -39,11 +39,9 @@ protected:
OUString maUpperName;
ReaderData* mpReaderData;
- bool mbIsReading;
GraphicReader() :
- mpReaderData( NULL ),
- mbIsReading( sal_False ) {}
+ mpReaderData( NULL ) {}
public:
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index ce97a9e92e9f..d7dead7049c9 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -35,7 +35,6 @@ class VCL_DLLPUBLIC MenuButton : public PushButton
private:
friend class VclBuilder;
- Rectangle maFocusRect;
Timer* mpMenuTimer;
PopupMenu* mpOwnMenu;
PopupMenu* mpMenu;
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index fb09bd586b85..36efe03e5059 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -78,7 +78,6 @@ struct GLWindow
Display* dpy;
int screen;
Window win;
- Pixmap pix;
#if defined( GLX_EXT_texture_from_pixmap )
GLXFBConfig fbc;
#endif
@@ -88,7 +87,6 @@ struct GLWindow
bool HasGLXExtension( const char* name ) const;
const char* GLXExtensions;
#endif
- unsigned int bpp;
unsigned int Width;
unsigned int Height;
const GLubyte* GLExtensions;
@@ -108,7 +106,6 @@ struct GLWindow
dpy(nullptr),
screen(0),
win(0),
- pix(0),
#if defined( GLX_EXT_texture_from_pixmap )
fbc(nullptr),
#endif
@@ -116,7 +113,6 @@ struct GLWindow
ctx(nullptr),
GLXExtensions(nullptr),
#endif
- bpp(0),
Width(0),
Height(0),
GLExtensions(nullptr),
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index c10f1cc3622e..d3d0fdb2d7a1 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -451,10 +451,6 @@ public:
// Use Sig prefix for members to avoid conflict with
// the Location member of the AnyWidget which specifies the coordinates
// of the signature
-
- OUString SigLocation;
- OUString SigReason;
- OUString SigContactInfo;
bool SigHidden;
SignatureWidget()
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 5ae9947ea5e4..81ad3db41ea1 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -122,14 +122,8 @@ struct SystemMenuData
{
#if defined( WNT )
HMENU hMenu; // the menu handle of the menu bar
-#elif defined( MACOSX )
- // Nothing
-#elif defined( ANDROID )
- // Nothing
-#elif defined( IOS )
+#else
// Nothing
-#elif defined( UNX )
- long aMenu; // ???
#endif
};
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 3def95a603f2..c268b7e6ce49 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -109,7 +109,6 @@ private:
css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
Rectangle maInvalidRect;
- Range maInvalidRange;
LocaleDataWrapper* mpLocaleDataWrapper;
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 8e3fa53231e6..2bb011beb84a 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -139,8 +139,7 @@ private:
struct data_holder {
T m_value;
T * const m_ptr;
- sal_Int32 m_refCount;
- data_holder( T * p ) : m_value(*p), m_ptr(p), m_refCount(1) {}
+ data_holder( T * p ) : m_value(*p), m_ptr(p) {}
~data_holder() { *m_ptr = m_value; }
};
data_holder * const m_holder;
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 911e0ca0a051..d6d9ea1071c7 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -802,7 +802,6 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
AInfo::AInfo() : pOutDev( nullptr ),
pViewData( nullptr ),
nExtraData( 0L ),
- bWithSize( false ),
bPause( false ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 3d56db313825..2b5723cc1af7 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -678,16 +678,14 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam )
if( pReadAcc )
{
long nSepiaPercent = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SEPIA ) ?
- pFilterParam->mcSolarGreyThreshold : 10;
+ pFilterParam->mnSepiaPercent : 10;
const long nSepia = 10000 - 100 * SAL_BOUND( nSepiaPercent, 0, 100 );
BitmapPalette aSepiaPal( 256 );
- DBG_ASSERT( nSepiaPercent <= 100, "Bitmap::ImplSepia(): sepia value out of range; defaulting to 100%" );
-
for( sal_uInt16 i = 0; i < 256; i++ )
{
BitmapColor& rCol = aSepiaPal[ i ];
- const sal_uInt8 cSepiaValue = (sal_uInt8) ( ( nSepia * i ) / 10000 );
+ const sal_uInt8 cSepiaValue = (sal_uInt8) ( nSepia * i / 10000 );
rCol.SetRed( (sal_uInt8) i );
rCol.SetGreen( cSepiaValue );
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 11efd79cc089..2ee7ab9dc1ac 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2572,7 +2572,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID)
{
- m_pParserState->m_aSizeGroups.push_back(SizeGroup(rID));
+ m_pParserState->m_aSizeGroups.push_back(SizeGroup());
SizeGroup &rSizeGroup = m_pParserState->m_aSizeGroups.back();
int nLevel = 1;
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 20950c6f23e6..305878e74a53 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -811,10 +811,8 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow )
, mbFloatPrevented(false)
, mbDockable(true)
, mbDocking(false)
- , mbDragFull(false)
, mbLastFloatMode(false)
, mbStartFloat(false)
- , mbTrackDock(false)
, mbPinned(false)
, mbRollUp(false)
, mbDockBtn(false)
generated by cgit (git 2.34.1) at 2025-01-16 20:50:36 +0000