summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-23 13:13:28 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-24 10:51:45 +0000
commit920d4463f6e59b815852c173e2974ffc7b4bb284 (patch)
treeac56efa2d79ad622f261e8664a57afa7c7ea0e49 /include/vcl
parent2b7109a12ab772bf53766d6e06b422c8e687d482 (diff)
loplugin:singlevalfields in vcl(part1)
Change-Id: I0031199937cc95793951a070c4b3d8910933e69f Reviewed-on: https://gerrit.libreoffice.org/26595 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/accel.hxx1
-rw-r--r--include/vcl/animate.hxx1
-rw-r--r--include/vcl/button.hxx1
-rw-r--r--include/vcl/dockwin.hxx19
-rw-r--r--include/vcl/edit.hxx4
-rw-r--r--include/vcl/event.hxx1
-rw-r--r--include/vcl/field.hxx10
-rw-r--r--include/vcl/fixed.hxx1
-rw-r--r--include/vcl/graph.hxx5
-rw-r--r--include/vcl/graphicfilter.hxx1
-rw-r--r--include/vcl/morebtn.hxx1
-rw-r--r--include/vcl/outdev.hxx1
-rw-r--r--include/vcl/pdfwriter.hxx24
-rw-r--r--include/vcl/print.hxx4
-rw-r--r--include/vcl/salbtype.hxx12
-rw-r--r--include/vcl/scrbar.hxx1
-rw-r--r--include/vcl/slider.hxx1
-rw-r--r--include/vcl/splitwin.hxx3
-rw-r--r--include/vcl/tabctrl.hxx1
-rw-r--r--include/vcl/texteng.hxx1
20 files changed, 20 insertions, 73 deletions
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index 0e453ec3933b..7db25e4ce4ea 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -43,7 +43,6 @@ private:
vcl::KeyCode maCurKeyCode;
sal_uInt16 mnCurId;
sal_uInt16 mnCurRepeat;
- bool mbIsCancel;
bool* mpDel;
SAL_DLLPRIVATE void ImplInit();
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 3c67aa6c7886..a2a0fee6b79f 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -181,7 +181,6 @@ private:
size_t mnPos;
bool mbIsInAnimation;
bool mbLoopTerminated;
- bool mbIsWaiting;
SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout );
DECL_DLLPRIVATE_LINK_TYPED( ImplTimeoutHdl, Timer*, void );
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 1bd740c2c2f7..4ed263c5b564 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -119,7 +119,6 @@ protected:
TriState meSaveValue;
PushButtonDropdownStyle mnDDStyle;
bool mbPressed;
- bool mbInUserDraw;
bool mbIsActive;
SAL_DLLPRIVATE void ImplInitPushButtonData();
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 789ee9cba7db..31cceaa6439c 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -32,11 +32,9 @@ struct DockingData
Point maMousePos; // in
Rectangle maTrackRect; // in/out
bool mbFloating; // out
- bool mbLivemode; // in
- bool mbInteractive; // in
DockingData( const Point& rPt, const Rectangle& rRect, bool b) :
- maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ), mbLivemode( false ), mbInteractive( true )
+ maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b )
{};
};
@@ -101,8 +99,6 @@ private:
sal_Int32 mnDockBottom;
WinBits mnFloatBits;
bool mbDockCanceled:1,
- mbFloatPrevented:1,
- mbDockable:1,
mbDocking:1,
mbLastFloatMode:1,
mbStartFloat:1,
@@ -152,7 +148,6 @@ public:
void SetMaxOutputSizePixel( const Size& rSize );
bool IsDocking() const { return mbDocking; }
- bool IsDockable() const { return mbDockable; }
bool IsDockingCanceled() const { return mbDockCanceled; }
void SetFloatingMode( bool bFloatMode );
@@ -225,21 +220,18 @@ private:
long mnTrackY;
long mnTrackWidth;
long mnTrackHeight;
- sal_Int32 mnDockLeft;
- sal_Int32 mnDockTop;
- sal_Int32 mnDockRight;
- sal_Int32 mnDockBottom;
+ sal_Int32 mnDockLeft;
+ sal_Int32 mnDockTop;
+ sal_Int32 mnDockRight;
+ sal_Int32 mnDockBottom;
WinBits mnFloatBits;
Idle maLayoutIdle;
bool mbDockCanceled:1,
- mbDockPrevented:1,
- mbFloatPrevented:1,
mbDockable:1,
mbDocking:1,
mbDragFull:1,
mbLastFloatMode:1,
mbStartFloat:1,
- mbTrackDock:1,
mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
@@ -313,7 +305,6 @@ public:
bool IsDocking() const { return mbDocking; }
bool IsDockable() const { return mbDockable; }
bool IsDockingCanceled() const { return mbDockCanceled; }
- bool IsDockingPrevented() const { return mbDockPrevented; }
void SetFloatingMode( bool bFloatMode );
bool IsFloatingMode() const;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 4c9424c4c549..aecb918efc77 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -62,8 +62,6 @@ public:
virtual ~TextFilter();
};
-enum class AutocompleteAction { KeyInput, TabForward, TabBackward };
-
class Timer;
class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient
@@ -84,7 +82,6 @@ private:
sal_Int32 mnMaxTextLen;
sal_Int32 mnWidthInChars;
sal_Int32 mnMaxWidthChars;
- AutocompleteAction meAutocompleteAction;
sal_Unicode mcEchoChar;
bool mbModified:1,
mbInternModified:1,
@@ -249,7 +246,6 @@ public:
void SetAutocompleteHdl( const Link<Edit&,void>& rLink ) { maAutocompleteHdl = rLink; }
const Link<Edit&,void>& GetAutocompleteHdl() const { return maAutocompleteHdl; }
- AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; }
virtual Size CalcMinimumSize() const;
virtual Size CalcMinimumSizeForText(const OUString &rString) const;
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index bfe2f39dffd3..a7c9b44bc4a3 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -362,7 +362,6 @@ private:
VclPtr<vcl::Window> mpWindow;
void* mpData;
MouseNotifyEvent mnEventType;
- long mnRetValue;
public:
NotifyEvent( MouseNotifyEvent nEventType,
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index d97e40a9cce3..d07624e8a92c 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -95,9 +95,8 @@ private:
OString m_aEditMask;
OUString maFieldString;
OUString maLiteralMask;
- sal_uInt16 mnFormatFlags;
bool mbSameMask;
- bool mbInPattKeyInput;
+ bool mbInPattKeyInput;
protected:
PatternFormatter();
@@ -116,8 +115,6 @@ public:
const OString& GetEditMask() const { return m_aEditMask; }
const OUString& GetLiteralMask() const { return maLiteralMask; }
- sal_uInt16 GetFormatFlags() const { return mnFormatFlags; }
-
void SetString( const OUString& rStr );
OUString GetString() const;
};
@@ -133,9 +130,8 @@ protected:
sal_Int64 mnLastValue;
sal_Int64 mnMin;
sal_Int64 mnMax;
- sal_Int64 mnCorrectedValue;
- sal_uInt16 mnType;
- sal_uInt16 mnDecimalDigits;
+ sal_uInt16 mnType;
+ sal_uInt16 mnDecimalDigits;
bool mbThousandSep;
bool mbShowTrailingZeros;
bool mbWrapOnLimits;
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index ccedac4832b9..cabe13dcad7a 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -152,7 +152,6 @@ class VCL_DLLPUBLIC FixedImage : public Control
{
private:
Image maImage;
- bool mbInUserDraw;
private:
using Control::ImplInitSettings;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 10efa5af31fc..cffafa7660de 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -82,7 +82,6 @@ private:
bool mbUnlimitedSize : 1; // default is false
bool mbAntiAliase : 1; // default is false
bool mbSnapHorVerLines : 1; // default is false
- bool mbScaleHighQuality : 1; // default is false
public:
GraphicConversionParameters(
@@ -93,8 +92,7 @@ public:
: maSizePixel(rSizePixel),
mbUnlimitedSize(bUnlimitedSize),
mbAntiAliase(bAntiAliase),
- mbSnapHorVerLines(bSnapHorVerLines),
- mbScaleHighQuality(false)
+ mbSnapHorVerLines(bSnapHorVerLines)
{
}
@@ -103,7 +101,6 @@ public:
bool getUnlimitedSize() const { return mbUnlimitedSize; }
bool getAntiAliase() const { return mbAntiAliase; }
bool getSnapHorVerLines() const { return mbSnapHorVerLines; }
- bool getScaleHighQuality() const { return mbScaleHighQuality; }
};
class VCL_DLLPUBLIC Graphic : public SvDataCopyStream
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 4f32b17c4948..0a2f8d5cf628 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -240,7 +240,6 @@ protected:
OUString aFilterPath;
FilterConfigCache* pConfig;
FilterErrorEx* pErrorEx;
- bool bAbort;
bool bUseConfig;
long nExpGraphHint;
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 3da26df19225..f37f3093509d 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -32,7 +32,6 @@ class VCL_DLLPUBLIC MoreButton : public PushButton
{
private:
ImplMoreButtonData* mpMBData;
- sal_uLong mnDelta;
MapUnit meUnit;
bool mbState;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 4eab9dec6b80..ff331a5a6913 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -397,7 +397,6 @@ private:
/// bitfield
mutable bool mbMap : 1;
- mutable bool mbMapIsDefault : 1;
mutable bool mbClipRegion : 1;
mutable bool mbBackground : 1;
mutable bool mbOutput : 1;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 085210a31545..5e503e3a56dc 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -341,12 +341,10 @@ public:
struct CheckBoxWidget : public AnyWidget
{
bool Checked;
- bool ButtonIsLeft;
CheckBoxWidget()
: AnyWidget( vcl::PDFWriter::CheckBox ),
- Checked( false ),
- ButtonIsLeft( true )
+ Checked( false )
{}
virtual AnyWidget* Clone() const override
@@ -359,14 +357,12 @@ public:
{
bool Selected;
sal_Int32 RadioGroup;
- bool ButtonIsLeft;
OUString OnValue; // the value of the radio button if it is selected
RadioButtonWidget()
: AnyWidget( vcl::PDFWriter::RadioButton ),
Selected( false ),
- RadioGroup( 0 ),
- ButtonIsLeft( true )
+ RadioGroup( 0 )
{}
virtual AnyWidget* Clone() const override
@@ -431,13 +427,11 @@ public:
// note: PDF only supports dropdown comboboxes
struct ComboBoxWidget : public AnyWidget
{
- bool Sort;
std::vector<OUString> Entries;
// set the current value in AnyWidget::Text
ComboBoxWidget()
- : AnyWidget( vcl::PDFWriter::ComboBox ),
- Sort( false )
+ : AnyWidget( vcl::PDFWriter::ComboBox )
{}
virtual AnyWidget* Clone() const override
@@ -448,14 +442,8 @@ public:
struct SignatureWidget: public AnyWidget
{
- // Use Sig prefix for members to avoid conflict with
- // the Location member of the AnyWidget which specifies the coordinates
- // of the signature
- bool SigHidden;
-
SignatureWidget()
- : AnyWidget( vcl::PDFWriter::Signature ),
- SigHidden( true )
+ : AnyWidget( vcl::PDFWriter::Signature )
{}
virtual AnyWidget* Clone() const override
@@ -506,7 +494,6 @@ The following structure describes the permissions used in PDF security
struct PDFEncryptionProperties
{
- bool Security128bit; // true to select 128 bit encryption, false for 40 bit
//for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20.
bool CanPrintTheDocument;
bool CanModifyTheContent;
@@ -531,7 +518,6 @@ The following structure describes the permissions used in PDF security
//permission default set for 128 bit, accessibility only
PDFEncryptionProperties() :
- Security128bit ( true ),
CanPrintTheDocument ( false ),
CanModifyTheContent ( false ),
CanCopyOrExtract ( false ),
@@ -589,7 +575,6 @@ The following structure describes the permissions used in PDF security
*/
PDFWriter::ExportDataFormat SubmitFormat;
bool AllowDuplicateFieldNames;
- bool FieldsUseSystemFonts;
/* the following data members are used to customize the PDF viewer
preferences
*/
@@ -640,7 +625,6 @@ The following structure describes the permissions used in PDF security
Tagged( false ),
SubmitFormat( PDFWriter::FDF ),
AllowDuplicateFieldNames( false ),
- FieldsUseSystemFonts( true ),
PDFDocumentMode( PDFWriter::ModeDefault ),
PDFDocumentAction( PDFWriter::ActionDefault ),
Zoom( 100 ),
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 4481b755bab7..d4e9dfe5e4fb 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -205,7 +205,6 @@ private:
bool mbPrintFile;
bool mbInPrintPage;
bool mbNewJobSetup;
- bool mbIsQueuePrinter;
SAL_DLLPRIVATE void ImplInitData();
SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
@@ -407,7 +406,6 @@ public:
// all metrics in 100th mm
int nRows;
int nColumns;
- int nRepeat;
Size aPaperSize;
long nLeftMargin;
long nTopMargin;
@@ -419,7 +417,7 @@ public:
NupOrderType nOrder;
MultiPageSetup()
- : nRows( 1 ), nColumns( 1 ), nRepeat( 1 ), aPaperSize( 21000, 29700 )
+ : nRows( 1 ), nColumns( 1 ), aPaperSize( 21000, 29700 )
, nLeftMargin( 0 ), nTopMargin( 0 )
, nRightMargin( 0 ), nBottomMargin( 0 )
, nHorizontalSpacing( 0 ), nVerticalSpacing( 0 )
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index b7137704888a..d86b715bcfee 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -224,7 +224,6 @@ class VCL_DLLPUBLIC ColorMask
ColorMaskElement maR;
ColorMaskElement maG;
ColorMaskElement maB;
- sal_uInt32 mnAlphaChannel;
public:
@@ -234,7 +233,6 @@ public:
: maR(rRedMask)
, maG(rGreenMask)
, maB(rBlueMask)
- , mnAlphaChannel(0)
{
}
@@ -610,7 +608,7 @@ inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, const sal_uInt8* pP
inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const
{
- *pPixel = (sal_uInt8) COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, mnAlphaChannel );
+ *pPixel = (sal_uInt8) COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
}
inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const
@@ -622,7 +620,7 @@ inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8
inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, sal_uInt8* pPixel ) const
{
- const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, mnAlphaChannel );
+ const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
pPixel[ 0 ] = (sal_uInt8)(nVal >> 8U);
pPixel[ 1 ] = (sal_uInt8) nVal;
@@ -637,7 +635,7 @@ inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, const sal_uInt8
inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, sal_uInt8* pPixel ) const
{
- const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, mnAlphaChannel );
+ const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
pPixel[ 0 ] = (sal_uInt8) nVal;
pPixel[ 1 ] = (sal_uInt8)(nVal >> 8U);
@@ -651,7 +649,7 @@ inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, const sal_uInt8* p
inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const
{
- const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, mnAlphaChannel );
+ const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
pPixel[ 0 ] = (sal_uInt8) nVal;
pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL );
pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL );
@@ -676,7 +674,7 @@ inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8&
inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const
{
- const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, mnAlphaChannel );
+ const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
pPixel[ 0 ] = (sal_uInt8) nVal;
pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL );
pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL );
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 81e4d508adf9..951fb874e0cc 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -57,7 +57,6 @@ private:
sal_uInt16 mnDragDraw;
sal_uInt16 mnStateFlags;
ScrollType meScrollType;
- ScrollType meDDScrollType;
bool mbCalcSize;
bool mbFullDrag;
Link<ScrollBar*,void> maScrollHdl;
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index cb0d226542b9..4f035b1c1571 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -46,7 +46,6 @@ private:
long mnLineSize;
long mnPageSize;
long mnDelta;
- sal_uInt16 mnDragDraw;
sal_uInt16 mnStateFlags;
ScrollType meScrollType;
bool mbCalcSize;
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index fc9b23e4adce..3319dc70b7ba 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -83,8 +83,7 @@ private:
mbAutoHidePressed:1,
mbFadeInPressed:1,
mbFadeOutPressed:1,
- mbFadeNoButtonMode:1,
- mbNoAlign:1;
+ mbFadeNoButtonMode:1;
Link<SplitWindow*,void> maSplitHdl;
using Window::ImplInit;
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 75976628c3ce..4b3e0e83d7fd 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -49,7 +49,6 @@ private:
ImplTabCtrlData* mpTabCtrlData;
long mnLastWidth;
long mnLastHeight;
- long mnBtnSize;
long mnMaxPageWidth;
sal_uInt16 mnActPageId;
sal_uInt16 mnCurPageId;
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index fc2f173446bc..5f2fda1a701f 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -113,7 +113,6 @@ private:
vcl::Font maFont;
Color maTextColor;
- sal_uInt16 mnFixCharWidth100;
sal_Int32 mnMaxTextLen;
long mnMaxTextWidth;