[Libreoffice-commits] core.git: basctl/source filter/source include/vcl sfx2/source svtools/source toolkit/source vcl/source
Noel Grandin
noel at peralex.com
Fri Jun 24 10:52:14 UTC 2016
basctl/source/basicide/bastypes.cxx | 2
filter/source/pdf/pdfexport.cxx | 9 --
include/vcl/accel.hxx | 1
include/vcl/animate.hxx | 1
include/vcl/button.hxx | 1
include/vcl/dockwin.hxx | 19 +---
include/vcl/edit.hxx | 4 -
include/vcl/event.hxx | 1
include/vcl/field.hxx | 10 --
include/vcl/fixed.hxx | 1
include/vcl/graph.hxx | 5 -
include/vcl/graphicfilter.hxx | 1
include/vcl/morebtn.hxx | 1
include/vcl/outdev.hxx | 1
include/vcl/pdfwriter.hxx | 24 +-----
include/vcl/print.hxx | 4 -
include/vcl/salbtype.hxx | 12 +--
include/vcl/scrbar.hxx | 1
include/vcl/slider.hxx | 1
include/vcl/splitwin.hxx | 3
include/vcl/tabctrl.hxx | 1
include/vcl/texteng.hxx | 1
sfx2/source/dialog/dockwin.cxx | 2
svtools/source/control/autocmpledit.cxx | 3
svtools/source/control/inettbc.cxx | 3
toolkit/source/awt/vclxwindow.cxx | 8 +-
toolkit/source/helper/formpdfexport.cxx | 2
vcl/source/control/button.cxx | 1
vcl/source/control/combobox.cxx | 16 ----
vcl/source/control/edit.cxx | 30 -------
vcl/source/control/field.cxx | 3
vcl/source/control/field2.cxx | 15 +--
vcl/source/control/fixed.cxx | 1
vcl/source/control/morebtn.cxx | 3
vcl/source/control/scrbar.cxx | 1
vcl/source/control/slider.cxx | 1
vcl/source/control/tabctrl.cxx | 1
vcl/source/edit/texteng.cxx | 21 +----
vcl/source/filter/graphicfilter.cxx | 9 --
vcl/source/gdi/animate.cxx | 7 -
vcl/source/gdi/impgraph.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 103 +++++--------------------
vcl/source/gdi/pdfwriter_impl2.cxx | 102 ++++++++++---------------
vcl/source/gdi/print.cxx | 1
vcl/source/gdi/print3.cxx | 4 -
vcl/source/outdev/outdev.cxx | 1
vcl/source/window/accel.cxx | 2
vcl/source/window/accmgr.cxx | 1
vcl/source/window/dockmgr.cxx | 9 --
vcl/source/window/dockwin.cxx | 5 -
vcl/source/window/event.cxx | 1
vcl/source/window/printdlg.cxx | 1
vcl/source/window/splitwin.cxx | 127 +++++++++++++-------------------
vcl/source/window/toolbox.cxx | 2
54 files changed, 166 insertions(+), 426 deletions(-)
New commits:
commit 920d4463f6e59b815852c173e2974ffc7b4bb284
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 23 13:13:28 2016 +0200
loplugin:singlevalfields in vcl(part1)
Change-Id: I0031199937cc95793951a070c4b3d8910933e69f
Reviewed-on: https://gerrit.libreoffice.org/26595
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 88c1e9d..be7e136 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -334,7 +334,7 @@ void DockingWindow::Hide ()
bool DockingWindow::Docking( const Point& rPos, Rectangle& rRect )
{
- if (!IsDockingPrevented() && aDockingRect.IsInside(rPos))
+ if (aDockingRect.IsInside(rPos))
{
rRect.SetSize(aDockingRect.GetSize());
return false; // dock
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 469e20f..c98b072 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -651,13 +651,6 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
// check if PDF/A, which does not allow encryption
if( aContext.Version != vcl::PDFWriter::PDF_A_1 )
{
- // set values needed in encryption
- // set encryption level, fixed, but here it can set by the UI if needed.
- // true is 128 bit, false 40
- // note that in 40 bit mode the UI needs reworking, since the current UI is meaningfull only for
- // 128bit security mode
- aContext.Encryption.Security128bit = true;
-
// set check for permission change password
// if not enabled and no permission password, force permissions to default as if PDF where without encryption
if( mbRestrictPermissions && (xEnc.is() || !aPermissionPassword.isEmpty()) )
@@ -711,7 +704,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
aContext.Encryption.CanCopyOrExtract = mbCanCopyOrExtract;
aContext.Encryption.CanExtractForAccessibility = mbCanExtractForAccessibility;
if( mbEncrypt && ! xEnc.is() )
- xEnc = vcl::PDFWriter::InitEncryption( aPermissionPassword, aOpenPassword, aContext.Encryption.Security128bit );
+ xEnc = vcl::PDFWriter::InitEncryption( aPermissionPassword, aOpenPassword, true/*bSecurity128bit*/ );
if( mbEncrypt && !aPermissionPassword.isEmpty() && ! aPreparedPermissionPassword.getLength() )
aPreparedPermissionPassword = comphelper::OStorageHelper::CreatePackageEncryptionData( aPermissionPassword );
}
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index 0e453ec..7db25e4 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 3c67aa6..a2a0fee 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 1bd740c..4ed263c 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 789ee9c..31cceaa 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 4c9424c..aecb918 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 bfe2f39..a7c9b44 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 d97e40a..d07624e 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 ccedac4..cabe13d 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 10efa5a..cffafa7 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 4f32b17..0a2f8d5 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 3da26df..f37f309 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 4eab9de..ff331a5 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 085210a..5e503e3 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 4481b75..d4e9dfe 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 b713770..d86b715 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 81e4d50..951fb87 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 cb0d226..4f035b1 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 fc9b23e..3319dc7 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 7597662..4b3e0e8 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 fc2f173..5f2fda1 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;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 25c72d8..5afb353 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -659,7 +659,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
bool bFloatMode = false;
- if ( GetOuterRect().IsInside( rPos ) && !IsDockingPrevented() )
+ if ( GetOuterRect().IsInside( rPos ) )
{
// Mouse within OuterRect: calculate Alignment and Rectangle
SfxChildAlignment eAlign = CalcAlignment(rPos, rRect);
diff --git a/svtools/source/control/autocmpledit.cxx b/svtools/source/control/autocmpledit.cxx
index af03e27..0ebcac4 100644
--- a/svtools/source/control/autocmpledit.cxx
+++ b/svtools/source/control/autocmpledit.cxx
@@ -30,9 +30,6 @@ void AutocompleteEdit::ClearEntries()
IMPL_LINK_NOARG_TYPED(AutocompleteEdit, AutoCompleteHdl_Impl, Edit&, void)
{
- if( GetAutocompleteAction() != AutocompleteAction::KeyInput )
- return;
-
if( Application::AnyInput( VclInputFlags::KEYBOARD ) )
return;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 962cc54..542731b 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1101,8 +1101,7 @@ bool SvtURLBox::PreNotify( NotifyEvent& rNEvt )
IMPL_LINK_NOARG_TYPED(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void)
{
- if ( GetSubEdit()->GetAutocompleteAction() == AutocompleteAction::KeyInput )
- TryAutoComplete();
+ TryAutoComplete();
}
bool SvtURLBox::Notify( NotifyEvent &rEvt )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 7bda5c0..ee51e0c 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -747,8 +747,8 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
aEvent.TrackingRectangle = AWTRectangle( pData->maTrackRect );
aEvent.MousePos.X = pData->maMousePos.X();
aEvent.MousePos.Y = pData->maMousePos.Y();
- aEvent.bLiveMode = pData->mbLivemode;
- aEvent.bInteractive = pData->mbInteractive;
+ aEvent.bLiveMode = false;
+ aEvent.bInteractive = true;
mpImpl->getDockableWindowListeners().notifyEach( &XDockableWindowListener::startDocking, aEvent );
}
@@ -768,8 +768,8 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
aEvent.TrackingRectangle = AWTRectangle( pData->maTrackRect );
aEvent.MousePos.X = pData->maMousePos.X();
aEvent.MousePos.Y = pData->maMousePos.Y();
- aEvent.bLiveMode = pData->mbLivemode;
- aEvent.bInteractive = pData->mbInteractive;
+ aEvent.bLiveMode = false;
+ aEvent.bInteractive = true;
Reference< XDockableWindowListener > xFirstListener;
::comphelper::OInterfaceIteratorHelper2 aIter( mpImpl->getDockableWindowListeners() );
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index b3a9f0a..7ea9de7 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -590,8 +590,6 @@ namespace toolkitform
// entries
getStringItemVector( xModelProps, pComboWidget->Entries );
- // same reasoning as above
- pComboWidget->Sort = false;
}
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 3c53cbb..b9d2432 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -644,7 +644,6 @@ void PushButton::ImplInitPushButtonData()
mnDDStyle = PushButtonDropdownStyle::NONE;
mbIsActive = false;
mbPressed = false;
- mbInUserDraw = false;
}
namespace
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index f8f4b7d..64adacc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -342,13 +342,7 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void
IMPL_LINK_TYPED(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void)
{
Selection aSel = rEdit.GetSelection();
- AutocompleteAction eAction = rEdit.GetAutocompleteAction();
- /* If there is no current selection do not auto complete on
- Tab/Shift-Tab since then we would not cycle to the next field.
- */
- if ( aSel.Len() ||
- ((eAction != AutocompleteAction::TabForward) && (eAction != AutocompleteAction::TabBackward)) )
{
OUString aFullText = rEdit.GetText();
OUString aStartText = aFullText.copy( 0, (sal_Int32)aSel.Max() );
@@ -358,16 +352,6 @@ IMPL_LINK_TYPED(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void)
nStart = 0;
bool bForward = true;
- if ( eAction == AutocompleteAction::TabForward )
- nStart++;
- else if ( eAction == AutocompleteAction::TabBackward )
- {
- bForward = false;
- if (nStart)
- nStart = nStart - 1;
- else if (m_pImplLB->GetEntryList()->GetEntryCount())
- nStart = m_pImplLB->GetEntryList()->GetEntryCount()-1;
- }
sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
if (!m_isMatchCase)
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f1bb069..0e267cd 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -296,7 +296,6 @@ void Edit::ImplInitEditData()
mnMaxTextLen = EDIT_NOLIMIT;
mnWidthInChars = -1;
mnMaxWidthChars = -1;
- meAutocompleteAction = AutocompleteAction::KeyInput;
mbModified = false;
mbInternModified = false;
mbReadOnly = false;
@@ -1642,7 +1641,6 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
{
if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) )
{
- meAutocompleteAction = AutocompleteAction::KeyInput;
maAutocompleteHdl.Call(*this);
}
}
@@ -1704,32 +1702,6 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
}
break;
- /* #i101255# disable autocomplete tab forward/backward
- users expect tab/shift-tab to move the focus to other controls
- not suddenly to cycle the autocompletion
- case KEY_TAB:
- {
- if ( !mbReadOnly && !autocompleteSignal.empty() &&
- maSelection.Min() && (maSelection.Min() == maText.Len()) &&
- !rKEvt.GetKeyCode().IsMod1() && !rKEvt.GetKeyCode().IsMod2() )
- {
- // Kein Autocomplete wenn alles Selektiert oder Edit leer, weil dann
- // keine vernuenftige Tab-Steuerung!
- if ( rKEvt.GetKeyCode().IsShift() )
- meAutocompleteAction = AutocompleteAction::TabBackward;
- else
- meAutocompleteAction = AutocompleteAction::TabForward;
-
- autocompleteSignal( this );
-
- // Wurde nichts veraendert, dann TAB fuer DialogControl
- if ( GetSelection().Len() )
- bDone = true;
- }
- }
- break;
- */
-
default:
{
if ( IsCharInput( rKEvt ) )
@@ -1742,7 +1714,6 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
{
if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) )
{
- meAutocompleteAction = AutocompleteAction::KeyInput;
maAutocompleteHdl.Call(*this);
}
}
@@ -2100,7 +2071,6 @@ void Edit::Command( const CommandEvent& rCEvt )
{
if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) )
{
- meAutocompleteAction = AutocompleteAction::KeyInput;
maAutocompleteHdl.Call(*this);
}
}
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 3b2c020..03debfb 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -505,7 +505,6 @@ void NumericFormatter::ImplInit()
mnLastValue = 0;
mnMin = 0;
mnMax = SAL_MAX_INT64;
- mnCorrectedValue = 0;
mnDecimalDigits = 2;
mnType = FORMAT_NUMERIC;
mbThousandSep = true;
@@ -1596,7 +1595,7 @@ void MetricFormatter::Reformat()
sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const
{
// convert to requested units
- return MetricField::ConvertValue( mnCorrectedValue, mnBaseValue, GetDecimalDigits(),
+ return MetricField::ConvertValue( 0/*nCorrectedValue*/, mnBaseValue, GetDecimalDigits(),
meUnit, eOutUnit );
}
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 1f17e75..7f0e9a8 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -767,7 +767,6 @@ void PatternFormatter::ImplSetMask(const OString& rEditMask, const OUString& rLi
PatternFormatter::PatternFormatter()
{
- mnFormatFlags = 0;
mbSameMask = true;
mbInPattKeyInput = false;
}
@@ -798,14 +797,14 @@ OUString PatternFormatter::GetString() const
if ( !GetField() )
return OUString();
else
- return ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, mnFormatFlags );
+ return ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, 0/*nFormatFlags*/ );
}
void PatternFormatter::Reformat()
{
if ( GetField() )
{
- ImplSetText( ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, mnFormatFlags ) );
+ ImplSetText( ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, 0/*nFormatFlags*/ ) );
if ( !mbSameMask && IsStrictFormat() && !GetField()->IsReadOnly() )
GetField()->SetInsertMode( false );
}
@@ -829,7 +828,7 @@ bool PatternField::PreNotify( NotifyEvent& rNEvt )
if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplPatternProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetEditMask(), GetLiteralMask(),
- IsStrictFormat(), GetFormatFlags(),
+ IsStrictFormat(), 0/*nFormatFlags*/,
ImplIsSameMask(), ImplGetInPattKeyInput() ) )
return true;
}
@@ -855,7 +854,7 @@ void PatternField::Modify()
if ( !ImplGetInPattKeyInput() )
{
if ( IsStrictFormat() )
- ImplPatternProcessStrictModify( GetField(), GetEditMask(), GetLiteralMask(), GetFormatFlags(), ImplIsSameMask() );
+ ImplPatternProcessStrictModify( GetField(), GetEditMask(), GetLiteralMask(), 0/*nFormatFlags*/, ImplIsSameMask() );
else
MarkToBeReformatted( true );
}
@@ -881,7 +880,7 @@ bool PatternBox::PreNotify( NotifyEvent& rNEvt )
if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplPatternProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetEditMask(), GetLiteralMask(),
- IsStrictFormat(), GetFormatFlags(),
+ IsStrictFormat(), 0/*nFormatFlags*/,
ImplIsSameMask(), ImplGetInPattKeyInput() ) )
return true;
}
@@ -907,7 +906,7 @@ void PatternBox::Modify()
if ( !ImplGetInPattKeyInput() )
{
if ( IsStrictFormat() )
- ImplPatternProcessStrictModify( GetField(), GetEditMask(), GetLiteralMask(), GetFormatFlags(), ImplIsSameMask() );
+ ImplPatternProcessStrictModify( GetField(), GetEditMask(), GetLiteralMask(), 0/*nFormatFlags*/, ImplIsSameMask() );
else
MarkToBeReformatted( true );
}
@@ -922,7 +921,7 @@ void PatternBox::ReformatAll()
const sal_Int32 nEntryCount = GetEntryCount();
for ( sal_Int32 i=0; i < nEntryCount; ++i )
{
- aStr = ImplPatternReformat( GetEntry( i ), GetEditMask(), GetLiteralMask(), GetFormatFlags() );
+ aStr = ImplPatternReformat( GetEntry( i ), GetEditMask(), GetLiteralMask(), 0/*nFormatFlags*/ );
RemoveEntryAt(i);
InsertEntry( aStr, i );
}
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 98532d8..36860e4 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -842,7 +842,6 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
void FixedImage::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
- mbInUserDraw = false;
Control::ImplInit( pParent, nStyle, nullptr );
ApplySettings(*this);
}
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 2c529d6..03b9e48 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -32,7 +32,6 @@ struct ImplMoreButtonData
void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
mpMBData = new ImplMoreButtonData;
- mnDelta = 0;
meUnit = MAP_PIXEL;
mbState = false;
@@ -92,7 +91,7 @@ void MoreButton::Click()
{
vcl::Window* pParent = GetParent();
Size aSize( pParent->GetSizePixel() );
- long nDeltaPixel = LogicToPixel( Size( 0, mnDelta ), meUnit ).Height();
+ long nDeltaPixel = LogicToPixel( Size( 0, 0 ), meUnit ).Height();
// Change status
mbState = !mbState;
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index f1af390..b4abe08 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -90,7 +90,6 @@ void ScrollBar::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnDragDraw = 0;
mnStateFlags = 0;
meScrollType = SCROLL_DONTKNOW;
- meDDScrollType = SCROLL_DONTKNOW;
mbCalcSize = true;
mbFullDrag = false;
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 6048d70..96e3106 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -55,7 +55,6 @@ void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnLineSize = 1;
mnPageSize = 1;
mnDelta = 0;
- mnDragDraw = 0;
mnStateFlags = 0;
meScrollType = SCROLL_DONTKNOW;
mbCalcSize = true;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 5fb6ddf..491a2a0 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -88,7 +88,6 @@ void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnLastWidth = 0;
mnLastHeight = 0;
- mnBtnSize = 0;
mnMaxPageWidth = 0;
mnActPageId = 0;
mnCurPageId = 0;
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index eaba916..8f77654 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -72,7 +72,6 @@ TextEngine::TextEngine()
, mpIMEInfos {nullptr}
, mpLocaleDataWrapper {nullptr}
, maTextColor {COL_BLACK}
- , mnFixCharWidth100 {0}
, mnMaxTextLen {0}
, mnMaxTextWidth {0}
, mnCharHeight {0}
@@ -199,7 +198,6 @@ void TextEngine::SetFont( const vcl::Font& rFont )
if ( !mnDefTab )
mnDefTab = 1;
mnCharHeight = mpRefDev->GetTextHeight();
- mnFixCharWidth100 = 0;
FormatFullDoc();
UpdateViews();
@@ -1206,20 +1204,11 @@ long TextEngine::CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_I
SAL_WARN_IF( nTabPos != -1 && nTabPos < (nPortionStart+nLen), "vcl", "CalcTextWidth: Tab!" );
#endif
- long nWidth;
- if ( mnFixCharWidth100 )
- {
- nWidth = static_cast<long>(nLen)*mnFixCharWidth100/100;
- }
- else
- {
- vcl::Font aFont;
- SeekCursor( nPara, nPortionStart+1, aFont, nullptr );
- mpRefDev->SetFont( aFont );
- TextNode* pNode = mpDoc->GetNodes()[ nPara ];
- nWidth = mpRefDev->GetTextWidth( pNode->GetText(), nPortionStart, nLen );
-
- }
+ vcl::Font aFont;
+ SeekCursor( nPara, nPortionStart+1, aFont, nullptr );
+ mpRefDev->SetFont( aFont );
+ TextNode* pNode = mpDoc->GetNodes()[ nPara ];
+ long nWidth = mpRefDev->GetTextWidth( pNode->GetText(), nPortionStart, nLen );
return nWidth;
}
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 36c05eb..38e72dc 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1163,7 +1163,6 @@ void GraphicFilter::ImplInit()
}
pErrorEx = new FilterErrorEx;
- bAbort = false;
}
sal_uLong GraphicFilter::ImplSetError( sal_uLong nError, const SvStream* pStm )
@@ -1392,7 +1391,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
else
nStreamBegin = rIStream.Tell();
- bAbort = false;
nStatus = ImpTestOrFindFormat( rPath, rIStream, nFormat );
// if pending, return GRFILTER_OK in order to request more bytes
if( rIStream.GetError() == ERRCODE_IO_PENDING )
@@ -1786,9 +1784,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
// Set error code or try to set native buffer
if( nStatus != GRFILTER_OK )
{
- if( bAbort )
- nStatus = GRFILTER_ABORT;
-
ImplSetError( nStatus, &rIStream );
rIStream.Seek( nStreamBegin );
rGraphic.Clear();
@@ -1880,7 +1875,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
#ifndef DISABLE_DYNLOADING
OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true));
#endif
- bAbort = false;
sal_uInt16 nStatus = GRFILTER_OK;
GraphicType eType;
Graphic aGraphic( rGraphic );
@@ -2150,9 +2144,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
}
if( nStatus != GRFILTER_OK )
{
- if( bAbort )
- nStatus = GRFILTER_ABORT;
-
ImplSetError( nStatus, &rOStm );
}
return nStatus;
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 2f4fabf..225d1f7 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -66,8 +66,7 @@ Animation::Animation() :
mnLoops ( 0 ),
mnPos ( 0 ),
mbIsInAnimation ( false ),
- mbLoopTerminated ( false ),
- mbIsWaiting ( false )
+ mbLoopTerminated ( false )
{
maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) );
}
@@ -78,8 +77,7 @@ Animation::Animation( const Animation& rAnimation ) :
mnLoopCount ( rAnimation.mnLoopCount ),
mnPos ( rAnimation.mnPos ),
mbIsInAnimation ( false ),
- mbLoopTerminated ( rAnimation.mbLoopTerminated ),
- mbIsWaiting ( rAnimation.mbIsWaiting )
+ mbLoopTerminated ( rAnimation.mbLoopTerminated )
{
for(const AnimationBitmap* i : rAnimation.maList)
@@ -114,7 +112,6 @@ Animation& Animation::operator=( const Animation& rAnimation )
mnLoopCount = rAnimation.mnLoopCount;
mnPos = rAnimation.mnPos;
mbLoopTerminated = rAnimation.mbLoopTerminated;
- mbIsWaiting = rAnimation.mbIsWaiting;
mnLoops = mbLoopTerminated ? 0 : mnLoopCount;
return *this;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 371350b..8c66d1a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -573,7 +573,7 @@ BitmapEx ImpGraphic::ImplGetBitmapEx(const GraphicConversionParameters& rParamet
{
aRetBmpEx.Scale(
rParameters.getSizePixel(),
- rParameters.getScaleHighQuality() ? BmpScaleFlag::Interpolate : BmpScaleFlag::Fast);
+ BmpScaleFlag::Fast);
}
}
else if( ( meType != GraphicType::Default ) && ImplIsSupportedGraphic() )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index f29e8d1..15d764f 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4842,25 +4842,20 @@ void PDFWriterImpl::createDefaultEditAppearance( PDFWidget& rEdit, const PDFWrit
// prepare font to use, draw field border
Font aFont = drawFieldBorder( rEdit, rWidget, rSettings );
- sal_Int32 nBest = m_aContext.FieldsUseSystemFonts ? getSystemFont( aFont ): getBestBuiltinFont( aFont );
+ sal_Int32 nBest = getSystemFont( aFont );
// prepare DA string
OStringBuffer aDA( 32 );
appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetFieldTextColor() ), aDA );
aDA.append( ' ' );
- if( m_aContext.FieldsUseSystemFonts )
- {
- aDA.append( "/F" );
- aDA.append( nBest );
-
- OStringBuffer aDR( 32 );
- aDR.append( "/Font " );
- aDR.append( getFontDictObject() );
- aDR.append( " 0 R" );
- rEdit.m_aDRDict = aDR.makeStringAndClear();
- }
- else
- aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
+ aDA.append( "/F" );
+ aDA.append( nBest );
+
+ OStringBuffer aDR( 32 );
+ aDR.append( "/Font " );
+ aDR.append( getFontDictObject() );
+ aDR.append( " 0 R" );
+ rEdit.m_aDRDict = aDR.makeStringAndClear();
aDA.append( ' ' );
m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32( aFont.GetFontHeight() ), aDA );
aDA.append( " Tf" );
@@ -4894,7 +4889,7 @@ void PDFWriterImpl::createDefaultListBoxAppearance( PDFWidget& rBox, const PDFWr
// prepare font to use, draw field border
Font aFont = drawFieldBorder( rBox, rWidget, rSettings );
- sal_Int32 nBest = m_aContext.FieldsUseSystemFonts ? getSystemFont( aFont ): getBestBuiltinFont( aFont );
+ sal_Int32 nBest = getSystemFont( aFont );
beginRedirect( pListBoxStream, rBox.m_aRect );
OStringBuffer aAppearance( 64 );
@@ -4917,19 +4912,14 @@ void PDFWriterImpl::createDefaultListBoxAppearance( PDFWidget& rBox, const PDFWr
// prepare DA string
appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetFieldTextColor() ), aDA );
aDA.append( ' ' );
- if( m_aContext.FieldsUseSystemFonts )
- {
- aDA.append( "/F" );
- aDA.append( nBest );
-
- OStringBuffer aDR( 32 );
- aDR.append( "/Font " );
- aDR.append( getFontDictObject() );
- aDR.append( " 0 R" );
- rBox.m_aDRDict = aDR.makeStringAndClear();
- }
- else
- aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
+ aDA.append( "/F" );
+ aDA.append( nBest );
+
+ OStringBuffer aDR( 32 );
+ aDR.append( "/Font " );
+ aDR.append( getFontDictObject() );
+ aDR.append( " 0 R" );
+ rBox.m_aDRDict = aDR.makeStringAndClear();
aDA.append( ' ' );
m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32( aFont.GetFontHeight() ), aDA );
aDA.append( " Tf" );
@@ -4960,7 +4950,6 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
nDelta = 1;
Rectangle aCheckRect, aTextRect;
- if( rWidget.ButtonIsLeft )
{
aCheckRect.Left() = rBox.m_aRect.Left() + nDelta;
aCheckRect.Top() = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
@@ -4980,26 +4969,6 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
aTextRect.Right() = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
aTextRect.Bottom() = rBox.m_aRect.Bottom();
}
- else
- {
- aCheckRect.Left() = rBox.m_aRect.Right() - nDelta - aFontSize.Height();
- aCheckRect.Top() = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
- aCheckRect.Right() = aCheckRect.Left() + aFontSize.Height();
- aCheckRect.Bottom() = aCheckRect.Top() + aFontSize.Height();
-
- // #i74206# handle small controls without text area
- while( aCheckRect.GetWidth() > rBox.m_aRect.GetWidth() && aCheckRect.GetWidth() > nDelta )
- {
- aCheckRect.Left() += nDelta;
- aCheckRect.Top() += nDelta/2;
- aCheckRect.Bottom() -= nDelta - (nDelta/2);
- }
-
- aTextRect.Left() = rBox.m_aRect.Left();
- aTextRect.Top() = rBox.m_aRect.Top();
- aTextRect.Right() = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
- aTextRect.Bottom() = rBox.m_aRect.Bottom();
- }
setLineColor( Color( COL_BLACK ) );
setFillColor( Color( COL_TRANSPARENT ) );
OStringBuffer aLW( 32 );
@@ -5085,7 +5054,6 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
nDelta = 1;
Rectangle aCheckRect, aTextRect;
- if( rWidget.ButtonIsLeft )
{
aCheckRect.Left() = rBox.m_aRect.Left() + nDelta;
aCheckRect.Top() = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
@@ -5105,26 +5073,6 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
aTextRect.Right() = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
aTextRect.Bottom() = rBox.m_aRect.Bottom();
}
- else
- {
- aCheckRect.Left() = rBox.m_aRect.Right() - nDelta - aFontSize.Height();
- aCheckRect.Top() = rBox.m_aRect.Top() + (rBox.m_aRect.GetHeight()-aFontSize.Height())/2;
- aCheckRect.Right() = aCheckRect.Left() + aFontSize.Height();
- aCheckRect.Bottom() = aCheckRect.Top() + aFontSize.Height();
-
- // #i74206# handle small controls without text area
- while( aCheckRect.GetWidth() > rBox.m_aRect.GetWidth() && aCheckRect.GetWidth() > nDelta )
- {
- aCheckRect.Left() += nDelta;
- aCheckRect.Top() += nDelta/2;
- aCheckRect.Bottom() -= nDelta - (nDelta/2);
- }
-
- aTextRect.Left() = rBox.m_aRect.Left();
- aTextRect.Top() = rBox.m_aRect.Top();
- aTextRect.Right() = aTextRect.Left() + rBox.m_aRect.GetWidth() - aCheckRect.GetWidth()-6*nDelta;
- aTextRect.Bottom() = rBox.m_aRect.Bottom();
- }
setLineColor( Color( COL_BLACK ) );
setFillColor( Color( COL_TRANSPARENT ) );
OStringBuffer aLW( 32 );
@@ -7961,10 +7909,7 @@ bool PDFWriterImpl::emitTrailer()
aLineS.append( " 0 obj\n"
"<</Filter/Standard/V " );
// check the version
- if( m_aContext.Encryption.Security128bit )
- aLineS.append( "2/Length 128/R 3" );
- else
- aLineS.append( "1/R 2" );
+ aLineS.append( "2/Length 128/R 3" );
// emit the owner password, must not be encrypted
aLineS.append( "/O(" );
@@ -13320,8 +13265,6 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
rNewWidget.m_aValue = rBox.Text;
rNewWidget.m_aListEntries = rBox.Entries;
rNewWidget.m_nFlags |= 0x00060000; // combo and edit flag
- if( rBox.Sort )
- rNewWidget.m_nFlags |= 0x00080000;
PDFWriter::ListBoxWidget aLBox;
aLBox.Name = rBox.Name;
@@ -13336,7 +13279,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
aLBox.TextFont = rBox.TextFont;
aLBox.TextColor = rBox.TextColor;
aLBox.DropDown = true;
- aLBox.Sort = rBox.Sort;
+ aLBox.Sort = false;
aLBox.MultiSelect = false;
aLBox.Entries = rBox.Entries;
@@ -13365,11 +13308,9 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
#if !defined(ANDROID) && !defined(IOS)
else if( rControl.getType() == PDFWriter::Signature)
{
- const PDFWriter::SignatureWidget& rSig = static_cast<const PDFWriter::SignatureWidget&>(rControl);
- sigHidden = rSig.SigHidden;
+ sigHidden = true;
- if ( sigHidden )
- rNewWidget.m_aRect = Rectangle(0, 0, 0, 0);
+ rNewWidget.m_aRect = Rectangle(0, 0, 0, 0);
m_nSignatureObject = createObject();
rNewWidget.m_aValue = OUString::number( m_nSignatureObject );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 694c698..d714f5d8 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1277,7 +1277,7 @@ sal_Int32 PDFWriterImpl::computeAccessPermissions( const vcl::PDFWriter::PDFEncr
- for 40 bit security the unused bit must be set to 1, since they are not used
- for 128 bit security the same bit must be preset to 0 and set later if needed
according to the table 3.15, pdf v 1.4 */
- sal_Int32 nAccessPermissions = ( i_rProperties.Security128bit ) ? 0xfffff0c0 : 0xffffffc0 ;
+ sal_Int32 nAccessPermissions = 0xfffff0c0;
/* check permissions for 40 bit security case */
nAccessPermissions |= ( i_rProperties.CanPrintTheDocument ) ? 1 << 2 : 0;
@@ -1287,16 +1287,13 @@ sal_Int32 PDFWriterImpl::computeAccessPermissions( const vcl::PDFWriter::PDFEncr
o_rKeyLength = SECUR_40BIT_KEY;
o_rRC4KeyLength = SECUR_40BIT_KEY+5; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 5
- if( i_rProperties.Security128bit )
- {
- o_rKeyLength = SECUR_128BIT_KEY;
- o_rRC4KeyLength = 16; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 16, thus maximum
- // permitted value is 16
- nAccessPermissions |= ( i_rProperties.CanFillInteractive ) ? 1 << 8 : 0;
- nAccessPermissions |= ( i_rProperties.CanExtractForAccessibility ) ? 1 << 9 : 0;
- nAccessPermissions |= ( i_rProperties.CanAssemble ) ? 1 << 10 : 0;
- nAccessPermissions |= ( i_rProperties.CanPrintFull ) ? 1 << 11 : 0;
- }
+ o_rKeyLength = SECUR_128BIT_KEY;
+ o_rRC4KeyLength = 16; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 16, thus maximum
+ // permitted value is 16
+ nAccessPermissions |= ( i_rProperties.CanFillInteractive ) ? 1 << 8 : 0;
+ nAccessPermissions |= ( i_rProperties.CanExtractForAccessibility ) ? 1 << 9 : 0;
+ nAccessPermissions |= ( i_rProperties.CanAssemble ) ? 1 << 10 : 0;
+ nAccessPermissions |= ( i_rProperties.CanPrintFull ) ? 1 << 11 : 0;
return nAccessPermissions;
}
@@ -1368,18 +1365,15 @@ bool PDFWriterImpl::computeEncryptionKey( EncHashTransporter* i_pTransporter, vc
rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
//step 6, only if 128 bit
- if( io_rProperties.Security128bit )
+ for( sal_Int32 i = 0; i < 50; i++ )
{
- for( sal_Int32 i = 0; i < 50; i++ )
+ nError = rtl_digest_updateMD5( aDigest, &nMD5Sum, sizeof( nMD5Sum ) );
+ if( nError != rtl_Digest_E_None )
{
- nError = rtl_digest_updateMD5( aDigest, &nMD5Sum, sizeof( nMD5Sum ) );
- if( nError != rtl_Digest_E_None )
- {
- bSuccess = false;
- break;
- }
- rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+ bSuccess = false;
+ break;
}
+ rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
}
}
else
@@ -1514,52 +1508,38 @@ bool PDFWriterImpl::computeUDictionaryValue( EncHashTransporter* i_pTransporter,
for( sal_Int32 i = i_nKeyLength, y = 0; y < 5 ; y++ )
io_rProperties.EncryptionKey[i++] = 0;
- if( !io_rProperties.Security128bit )
+ //or 3.5, for 128 bit security
+ //step6, initialize the last 16 bytes of the encrypted user password to 0
+ for(sal_uInt32 i = MD5_DIGEST_SIZE; i < sal_uInt32(io_rProperties.UValue.size()); i++)
+ io_rProperties.UValue[i] = 0;
+ //steps 2 and 3
+ if (rtl_digest_updateMD5( aDigest, s_nPadString, sizeof( s_nPadString ) ) != rtl_Digest_E_None
+ || rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) ) != rtl_Digest_E_None)
{
- //3.4
- //step 2 and 3
- rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
- &io_rProperties.EncryptionKey[0], 5 , // key and key length
- nullptr, 0 ); //destination data area
- // encrypt the user password using the key set above, save for later use
- rtl_cipher_encodeARCFOUR( aCipher, s_nPadString, sizeof( s_nPadString ), // the data to be encrypted
- &io_rProperties.UValue[0], sal_Int32(io_rProperties.UValue.size()) ); //encrypted data, stored in class data member
+ bSuccess = false;
}
- else
+
+ sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+ rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
+ //Step 4
+ rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+ &io_rProperties.EncryptionKey[0], SECUR_128BIT_KEY, nullptr, 0 ); //destination data area
+ rtl_cipher_encodeARCFOUR( aCipher, nMD5Sum, sizeof( nMD5Sum ), // the data to be encrypted
+ &io_rProperties.UValue[0], sizeof( nMD5Sum ) ); //encrypted data, stored in class data member
+ //step 5
+ sal_uInt32 i, y;
+ sal_uInt8 nLocalKey[SECUR_128BIT_KEY];
+
+ for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
{
- //or 3.5, for 128 bit security
- //step6, initialize the last 16 bytes of the encrypted user password to 0
- for(sal_uInt32 i = MD5_DIGEST_SIZE; i < sal_uInt32(io_rProperties.UValue.size()); i++)
- io_rProperties.UValue[i] = 0;
- //steps 2 and 3
- if (rtl_digest_updateMD5( aDigest, s_nPadString, sizeof( s_nPadString ) ) != rtl_Digest_E_None
- || rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) ) != rtl_Digest_E_None)
- {
- bSuccess = false;
- }
+ for( y = 0; y < sizeof( nLocalKey ) ; y++ )
+ nLocalKey[y] = (sal_uInt8)( io_rProperties.EncryptionKey[y] ^ i );
- sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
- rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
- //Step 4
rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
- &io_rProperties.EncryptionKey[0], SECUR_128BIT_KEY, nullptr, 0 ); //destination data area
- rtl_cipher_encodeARCFOUR( aCipher, nMD5Sum, sizeof( nMD5Sum ), // the data to be encrypted
- &io_rProperties.UValue[0], sizeof( nMD5Sum ) ); //encrypted data, stored in class data member
- //step 5
- sal_uInt32 i, y;
- sal_uInt8 nLocalKey[SECUR_128BIT_KEY];
-
- for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
- {
- for( y = 0; y < sizeof( nLocalKey ) ; y++ )
- nLocalKey[y] = (sal_uInt8)( io_rProperties.EncryptionKey[y] ^ i );
-
- rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
- nLocalKey, SECUR_128BIT_KEY, // key and key length
- nullptr, 0 ); //destination data area, on init can be NULL
- rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.UValue[0], SECUR_128BIT_KEY, // the data to be encrypted
- &io_rProperties.UValue[0], SECUR_128BIT_KEY ); // encrypted data, can be the same as the input, encrypt "in place"
- }
+ nLocalKey, SECUR_128BIT_KEY, // key and key length
+ nullptr, 0 ); //destination data area, on init can be NULL
+ rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.UValue[0], SECUR_128BIT_KEY, // the data to be encrypted
+ &io_rProperties.UValue[0], SECUR_128BIT_KEY ); // encrypted data, can be the same as the input, encrypt "in place"
}
}
else
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 23dd0f2..23c9368 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -507,7 +507,6 @@ void Printer::ImplInitData()
mpInfoPrinter = nullptr;
mpPrinter = nullptr;
mpDisplayDev = nullptr;
- mbIsQueuePrinter = false;
mpPrinterOptions = new PrinterOptions;
// Add printer to the list
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 7b244ca..3bc2fcc 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1128,7 +1128,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
for( int nSubPage = 0; nSubPage < nSubPages; nSubPage++ )
{
// map current sub page to real page
- int nPage = (i_nFilteredPage * nSubPages + nSubPage) / rMPS.nRepeat;
+ int nPage = i_nFilteredPage * nSubPages + nSubPage;
if( nSubPage == nSubPages-1 ||
nPage == nDocPages-1 )
{
@@ -1198,7 +1198,7 @@ int PrinterController::getFilteredPageCount()
int nDiv = mpImplData->maMultiPage.nRows * mpImplData->maMultiPage.nColumns;
if( nDiv < 1 )
nDiv = 1;
- return (getPageCountProtected() * mpImplData->maMultiPage.nRepeat + (nDiv-1)) / nDiv;
+ return (getPageCountProtected() + (nDiv-1)) / nDiv;
}
DrawModeFlags PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut )
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index e8bd5f43..b1bd83a 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -85,7 +85,6 @@ OutputDevice::OutputDevice() :
meOutDevType = OUTDEV_DONTKNOW;
meOutDevViewType = OUTDEV_VIEWTYPE_DONTKNOW;
mbMap = false;
- mbMapIsDefault = true;
mbClipRegion = false;
mbBackground = false;
mbOutput = true;
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 57c1da2..d2a33b0 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -127,7 +127,6 @@ void Accelerator::ImplInit()
{
mnCurId = 0;
mnCurRepeat = 0;
- mbIsCancel = false;
mpDel = nullptr;
}
@@ -304,7 +303,6 @@ Accelerator& Accelerator::operator=( const Accelerator& rAccel )
maCurKeyCode = vcl::KeyCode();
mnCurId = 0;
mnCurRepeat = 0;
- mbIsCancel = false;
// delete and copy tables
ImplDeleteData();
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 3b45dc7..56a5634 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -88,7 +88,6 @@ void ImplAccelManager::EndSequence()
for (Accelerator* pTempAccel : *mpSequenceList)
{
- pTempAccel->mbIsCancel = false;
pTempAccel->mpDel = nullptr;
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 107450a..c81c1b0 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -186,8 +186,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockingHdl, void*, void)
}
}
- if( mpDockWin->IsDockable() &&
- mpDockWin->GetWindow()->IsVisible() &&
+ if( mpDockWin->GetWindow()->IsVisible() &&
(tools::Time::GetSystemTicks() - mnLastTicks > 500) &&
( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) &&
!(aState.mnState & KEY_MOD1) && // i43499 CTRL disables docking now
@@ -799,8 +798,6 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow )
, mnDockBottom(0)
, mnFloatBits(WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | (pWindow->GetStyle() & DOCKWIN_FLOATSTYLES))
, mbDockCanceled(false)
- , mbFloatPrevented(false)
- , mbDockable(true)
, mbDocking(false)
, mbLastFloatMode(false)
, mbStartFloat(false)
@@ -828,9 +825,6 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
{
- if ( !mbDockable )
- return false;
-
if( !mbStartDockingEnabled )
return false;
@@ -926,7 +920,6 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
bool bFloatMode = Docking( aPos, aTrackRect );
- mbFloatPrevented = false;
if ( mbLastFloatMode != bFloatMode )
{
if ( bFloatMode )
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 2368446..3442d32 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -318,14 +318,11 @@ void DockingWindow::ImplInitDockingWindowData()
mnDockBottom = 0;
mnFloatBits = 0;
mbDockCanceled = false;
- mbDockPrevented = false;
- mbFloatPrevented = false;
mbDockable = false;
mbDocking = false;
mbDragFull = false;
mbLastFloatMode = false;
mbStartFloat = false;
- mbTrackDock = false;
mbPinned = false;
mbRollUp = false;
mbDockBtn = false;
@@ -532,8 +529,6 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
if ( mbDragFull )
StartDocking();
bool bFloatMode = Docking( aFramePos, aTrackRect );
- mbDockPrevented = false;
- mbFloatPrevented = false;
if ( mbLastFloatMode != bFloatMode )
{
if ( bFloatMode )
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 050b079..ddb5a91 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -653,7 +653,6 @@ NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow,
mpWindow = pWindow;
mpData = const_cast<void*>(pEvent);
mnEventType = nEventType;
- mnRetValue = 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index f62c910..9699a17 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1481,7 +1481,6 @@ void PrintDialog::updateNup()
PrinterController::MultiPageSetup aMPS;
aMPS.nRows = nRows;
aMPS.nColumns = nCols;
- aMPS.nRepeat = 1;
aMPS.nLeftMargin =
aMPS.nTopMargin =
aMPS.nRightMargin =
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 8986f99..71a0be4 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -237,57 +237,47 @@ void SplitWindow::ImplDrawBorder(vcl::RenderContext& rRenderContext)
long nDX = mnDX;
long nDY = mnDY;
- if (mbNoAlign)
+ switch (meAlign)
{
- DecorationView aDecoView(&rRenderContext);
- Point aTmpPoint;
- Rectangle aRect(aTmpPoint, Size(nDX, nDY));
- aDecoView.DrawFrame(aRect, DrawFrameStyle::DoubleIn);
- }
- else
- {
- switch (meAlign)
- {
- case WindowAlign::Bottom:
- rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
- rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
- rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
+ case WindowAlign::Bottom:
+ rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+ rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
+ rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
- rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
- rRenderContext.DrawLine(Point(0, 1), Point(nDX - 1, 1));
- rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
- break;
- case WindowAlign::Top:
- rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
- rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
- rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
+ rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
+ rRenderContext.DrawLine(Point(0, 1), Point(nDX - 1, 1));
+ rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
+ break;
+ case WindowAlign::Top:
+ rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+ rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
+ rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
- rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
- rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
- rRenderContext.DrawLine(Point(0, 1), Point(nDX - 1, 1));
- break;
- case WindowAlign::Left:
- rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
- rRenderContext.DrawLine(Point(nDX - 2, 0), Point(nDX - 2, nDY - 2));
- rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
- rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 2, nDY - 2));
-
- rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
- rRenderContext.DrawLine(Point(nDX - 1, 0), Point(nDX - 1, nDY - 1));
- rRenderContext.DrawLine(Point(0, 1), Point(nDX - 3, 1));
- rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 2, nDY - 1));
- break;
- default:
- rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
- rRenderContext.DrawLine(Point(0, 0), Point( 0, nDY - 2));
- rRenderContext.DrawLine(Point(0, 0), Point( nDX - 1, 0));
- rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
+ rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
+ rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
+ rRenderContext.DrawLine(Point(0, 1), Point(nDX - 1, 1));
+ break;
+ case WindowAlign::Left:
+ rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+ rRenderContext.DrawLine(Point(nDX - 2, 0), Point(nDX - 2, nDY - 2));
+ rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
+ rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 2, nDY - 2));
+
+ rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
+ rRenderContext.DrawLine(Point(nDX - 1, 0), Point(nDX - 1, nDY - 1));
+ rRenderContext.DrawLine(Point(0, 1), Point(nDX - 3, 1));
+ rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 2, nDY - 1));
+ break;
+ default:
+ rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+ rRenderContext.DrawLine(Point(0, 0), Point( 0, nDY - 2));
+ rRenderContext.DrawLine(Point(0, 0), Point( nDX - 1, 0));
+ rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
- rRenderContext.SetLineColor( rStyleSettings.GetLightColor());
- rRenderContext.DrawLine(Point(1, 1), Point(1, nDY - 3));
- rRenderContext.DrawLine(Point(1, 1), Point(nDX - 1, 1));
- rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
- }
+ rRenderContext.SetLineColor( rStyleSettings.GetLightColor());
+ rRenderContext.DrawLine(Point(1, 1), Point(1, nDY - 3));
+ rRenderContext.DrawLine(Point(1, 1), Point(nDX - 1, 1));
+ rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
}
}
@@ -1339,7 +1329,6 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
mbFadeInPressed = false;
mbFadeOutPressed = false;
mbFadeNoButtonMode = false;
- mbNoAlign = false;
if ( nStyle & WB_NOSPLITDRAW )
{
@@ -1349,7 +1338,7 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
if ( nStyle & WB_BORDER )
{
- ImplCalcBorder( meAlign, mbNoAlign, mnLeftBorder, mnTopBorder,
+ ImplCalcBorder( meAlign, false/*bNoAlign*/, mnLeftBorder, mnTopBorder,
mnRightBorder, mnBottomBorder );
}
else
@@ -3168,37 +3157,29 @@ sal_uInt16 SplitWindow::GetItemCount( sal_uInt16 nSetId ) const
void SplitWindow::ImplNewAlign()
{
- if ( mbNoAlign )
+ switch ( meAlign )
{
+ case WindowAlign::Top:
+ mbHorz = true;
+ mbBottomRight = false;
+ break;
+ case WindowAlign::Bottom:
+ mbHorz = true;
+ mbBottomRight = true;
+ break;
+ case WindowAlign::Left:
mbHorz = false;
mbBottomRight = false;
- }
- else
- {
- switch ( meAlign )
- {
- case WindowAlign::Top:
- mbHorz = true;
- mbBottomRight = false;
- break;
- case WindowAlign::Bottom:
- mbHorz = true;
- mbBottomRight = true;
- break;
- case WindowAlign::Left:
- mbHorz = false;
- mbBottomRight = false;
- break;
- case WindowAlign::Right:
- mbHorz = false;
- mbBottomRight = true;
- break;
- }
+ break;
+ case WindowAlign::Right:
+ mbHorz = false;
+ mbBottomRight = true;
+ break;
}
if ( mnWinStyle & WB_BORDER )
{
- ImplCalcBorder( meAlign, mbNoAlign, mnLeftBorder, mnTopBorder,
+ ImplCalcBorder( meAlign, false/*bNoAlign*/, mnLeftBorder, mnTopBorder,
mnRightBorder, mnBottomBorder );
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 55a0a2f..c5f07b5 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4631,7 +4631,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
}
Rectangle aIntersection = maOutDockRect.GetIntersection( aDockingRect );
- if ( !aIntersection.IsEmpty() && !IsDockingPrevented() )
+ if ( !aIntersection.IsEmpty() )
{
Rectangle aInRect = maInDockRect;
Size aDockSize;
More information about the Libreoffice-commits
mailing list