diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 13:57:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-17 15:06:52 +0200 |
commit | 8914595d4623390e4bac9ebbdf0d5ae9ab69aa8a (patch) | |
tree | 2fe937925e9cde3e835119c57f12807bc1f419db /vcl/source | |
parent | d69795b9c9d2dac7b751c6fe8b4663c0c26a129b (diff) |
loplugin:unusedfields in vcl part1
Change-Id: I67d176003f39992cd0ff9271a7d6ce26d2cb6619
Reviewed-on: https://gerrit.libreoffice.org/38828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
26 files changed, 11 insertions, 113 deletions
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; } } |