diff options
37 files changed, 15 insertions, 101 deletions
diff --git a/include/vcl/calendar.hxx b/include/vcl/calendar.hxx index fe4f7ea7c0eb..338392453aec 100644 --- a/include/vcl/calendar.hxx +++ b/include/vcl/calendar.hxx @@ -138,7 +138,6 @@ class VCL_DLLPUBLIC Calendar final : public Control Date maOldFirstDate; Date maCurDate; Date maOldCurDate; - Date maAnchorDate; Color maSelColor; Color maOtherColor; sal_Int32 mnDayCount; @@ -184,8 +183,7 @@ class VCL_DLLPUBLIC Calendar final : public Control VCL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); VCL_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); VCL_DLLPRIVATE void ImplUpdateSelection( IntDateSet* pOld ); - VCL_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, - bool bMove ); + VCL_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest ); VCL_DLLPRIVATE void ImplUpdate( bool bCalcNew = false ); using Window::ImplScroll; VCL_DLLPRIVATE void ImplScroll( bool bPrev ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 5d88e9de65f1..2cf7ea7324ed 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -85,7 +85,6 @@ private: Point maFloatPos; Point maDockPos; Point maMouseOff; - Point maMouseStart; Size maRollUpOutSize; Size maMinOutSize; Size maMaxOutSize; @@ -217,7 +216,6 @@ private: Point maFloatPos; Point maDockPos; Point maMouseOff; - Point maMouseStart; Size maRollUpOutSize; Size maMinOutSize; long mnTrackX; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index aeb31c85664c..75f8240520bc 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -89,7 +89,6 @@ class VCL_DLLPUBLIC PatternFormatter : public FormatterBase { private: OString m_aEditMask; - OUString maFieldString; OUString maLiteralMask; bool mbSameMask; bool mbInPattKeyInput; diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 7c9fc436acd1..34ccf2ab5dd4 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -91,7 +91,6 @@ public: void SetQuality(int); void IncreaseQualityBy(int); void DecreaseQualityBy(int); - void SetMapNames(OUString const &); // setting the color on the font is obsolete, the only remaining // valid use is for keeping backward compatibility with old MetaFiles diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index b6cb583604d5..83b2bdbe569f 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -93,13 +93,7 @@ public: static void ShowQuickHelp( vcl::Window* pParent, const tools::Rectangle& rScreenRect, const OUString& rHelpText, - const OUString& rLongHelpText, - QuickHelpFlags nStyle ); - static void ShowQuickHelp( vcl::Window* pParent, - const tools::Rectangle& rScreenRect, - const OUString& rHelpText, - QuickHelpFlags nStyle = QuickHelpFlags::NONE ) - { Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, OUString(), nStyle ); } + QuickHelpFlags nStyle = QuickHelpFlags::NONE ); static void HideBalloonAndQuickHelp(); diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 3dff9278362c..11f4329c8b9b 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -62,8 +62,6 @@ private: friend bool ImplLongCurrencyReformat( const OUString&, BigInt const &, BigInt const &, sal_uInt16, const LocaleDataWrapper&, OUString&, LongCurrencyFormatter const & ); SAL_DLLPRIVATE void ImpInit(); - BigInt mnFieldValue; - BigInt mnCorrectedValue; OUString maCurrencySymbol; sal_uInt16 mnDecimalDigits; bool mbThousandSep; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index f3fb3e7c8056..a82af83f155e 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -453,7 +453,6 @@ public: { sal_uInt16 nId; // Id of the button bool bHighlight; // highlight on/off - VclPtr<MenuBar> pMenuBar; // menubar the button belongs to }; // add an arbitrary button to the menubar (will appear next to closer) // passed link will be call with a MenuBarButtonCallbackArg on press diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 7ea91547232c..19ff9cd7cb76 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -67,7 +67,6 @@ class VCL_DLLPUBLIC PPDKey value_type m_aOrderedValues; const PPDValue* m_pDefaultValue; bool m_bQueryValue; - PPDValue m_aQueryValue; OUString m_aGroup; public: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index df9602dd4cd4..be077d8017f9 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -185,7 +185,6 @@ private: OUString maPrinterName; OUString maDriver; OUString maPrintFile; - OUString maJobName; JobSetup maJobSetup; Point maPageOffset; Size maPaperSize; diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 0d90027e8fb6..03d9a0eee00e 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -301,15 +301,13 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue ControlState mnButton1State; ControlState mnButton2State; ControlState mnThumbState; - ControlState mnPage1State; - ControlState mnPage2State; ScrollbarValue() : ImplControlValue( ControlType::Scrollbar, 0 ) { mnMin = 0; mnMax = 0; mnCur = 0; mnVisibleSize = 0; mnButton1State = ControlState::NONE; mnButton2State = ControlState::NONE; - mnThumbState = ControlState::NONE; mnPage1State = ControlState::NONE; mnPage2State = ControlState::NONE; + mnThumbState = ControlState::NONE; }; virtual ~ScrollbarValue() override; virtual ScrollbarValue* clone() const override; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index bcf294c87e46..1cd49adde204 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -79,7 +79,6 @@ class VCL_DLLPUBLIC VclMultiLineEdit : public Edit private: std::unique_ptr<ImpVclMEdit> pImpVclMEdit; - OUString aSaveValue; Link<Edit&,void> aModifyHdlLink; std::unique_ptr<Timer> pUpdateDataTimer; @@ -150,8 +149,6 @@ public: void SetRightToLeft( bool bRightToLeft ); - void SaveValue() { aSaveValue = GetText(); } - void SetModifyHdl( const Link<Edit&,void>& rLink ) override { aModifyHdlLink = rLink; } const Link<Edit&,void>& GetModifyHdl() const override { return aModifyHdlLink; } diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index a6e7ada2d02a..c0457b5184e8 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -443,7 +443,7 @@ void SmElementsControl::RequestHelp(const HelpEvent& rHEvt) Help::ShowBalloon(this, aHelpRect.Center(), aHelpRect, aStr); } else - Help::ShowQuickHelp(this, aHelpRect, aStr, aStr, QuickHelpFlags::CtrlText); + Help::ShowQuickHelp(this, aHelpRect, aStr, QuickHelpFlags::CtrlText); return; } diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 765dac0508e5..ee14b5a4eb39 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -33,7 +33,6 @@ private: tools::Rectangle maTextRect; // For wrapped text in QuickHelp OUString maHelpText; - OUString maStatusText; Timer maShowTimer; Timer maHideTimer; @@ -62,7 +61,6 @@ public: QuickHelpFlags GetStyle() const { return mnStyle; } // only remember: - void SetStatusText( const OUString& rStatusText ) { maStatusText = rStatusText; } void SetHelpArea( const tools::Rectangle& rRect ) { maHelpArea = rRect; } void ShowHelp( sal_uInt16 nDelayMode ); @@ -72,7 +70,7 @@ public: }; void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle, - const OUString& rHelpText, const OUString& rStatusText, + const OUString& rHelpText, const Point& rScreenPos, const tools::Rectangle& rHelpArea ); VCL_DLLPUBLIC void ImplDestroyHelpWindow( bool bUpdateHideTime ); void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle, diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index b9b8fb4654e4..1405d8da0c29 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -77,7 +77,6 @@ public: void SetQuality( int nQuality ) { mnQuality = nQuality; } void IncreaseQualityBy( int nQualityAmount ) { mnQuality += nQualityAmount; } void DecreaseQualityBy( int nQualityAmount ) { mnQuality -= nQualityAmount; } - void SetMapNames( OUString const & aMapNames ) { maMapNames = aMapNames; } bool operator==( const ImplFont& ) const; @@ -122,7 +121,6 @@ private: Color maFillColor; // compatibility, now on output device // Device dependent variables - OUString maMapNames; bool mbWordLine:1; // TODO: metric data, should be migrated to ImplFontMetric diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index a13714bf1910..52a9ab98dc47 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -389,7 +389,6 @@ private: bool mbEdgeBlending : 1; Link<ImplListBox*,void> maScrollHdl; // because it is needed by ImplListBoxWindow itself - css::uno::Reference< css::uno::XInterface > mxDNDListenerContainer; protected: virtual void GetFocus() override; @@ -499,7 +498,6 @@ public: /// pb: #106948# explicit mirroring for calc void EnableMirroring() { maLBWindow->EnableMirroring(); } - void SetDropTraget(const css::uno::Reference< css::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; } }; class ImplListBoxFloatingWindow : public FloatingWindow diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx index 2ef705a4cf05..95aebae3d1b8 100644 --- a/vcl/inc/printerinfomanager.hxx +++ b/vcl/inc/printerinfomanager.hxx @@ -92,10 +92,6 @@ protected: // details other config files that have this printer // in case of removal all have to be removed std::unordered_set< OUString > m_aAlternateFiles; - // group in m_aFile containing the printer - // this must be unique over all configuration files - // it usually should be the printer name - OString m_aGroup; // the corresponding info and job data PrinterInfo m_aInfo; }; diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 342f18d3ec85..4fab141bbca3 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -238,7 +238,6 @@ struct SalFrameState struct SalInputContext { rtl::Reference<LogicalFontInstance> mpFont; - LanguageType meLanguage; InputContextFlags mnOptions; }; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 08c1e5a66d77..cb666e718943 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -188,10 +188,8 @@ struct ImplSVGDIData VclPtr<OutputDevice> mpFirstPrnGraphics; // First OutputDevice with a InfoPrinter Graphics VclPtr<OutputDevice> mpLastPrnGraphics; // Last OutputDevice with a InfoPrinter Graphics VclPtr<VirtualDevice> mpFirstVirDev; // First VirtualDevice - VclPtr<VirtualDevice> mpLastVirDev; // Last VirtualDevice OpenGLContext* mpLastContext = nullptr; // Last OpenGLContext VclPtr<Printer> mpFirstPrinter; // First Printer - VclPtr<Printer> mpLastPrinter; // Last Printer std::unique_ptr<ImplPrnQueueList> mpPrinterQueueList; // List of all printer queue std::shared_ptr<PhysicalFontCollection> mxScreenFontList; // Screen-Font-List std::shared_ptr<ImplFontCache> mxScreenFontCache; // Screen-Font-Cache diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 8b49913d394f..ba24ef27ad0b 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -161,7 +161,7 @@ void Help::ShowBalloon( vcl::Window* pParent, const OUString& rHelpText ) { ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, QuickHelpFlags::NONE, - rHelpText, OUString(), rScreenPos, rRect ); + rHelpText, rScreenPos, rRect ); } void Help::EnableQuickHelp() @@ -182,12 +182,11 @@ bool Help::IsQuickHelpEnabled() void Help::ShowQuickHelp( vcl::Window* pParent, const tools::Rectangle& rScreenRect, const OUString& rHelpText, - const OUString& rLongHelpText, QuickHelpFlags nStyle ) { sal_uInt16 nHelpWinStyle = ( nStyle & QuickHelpFlags::TipStyleBalloon ) ? HELPWINSTYLE_BALLOON : HELPWINSTYLE_QUICK; ImplShowHelpWindow( pParent, nHelpWinStyle, nStyle, - rHelpText, rLongHelpText, + rHelpText, pParent->OutputToScreenPixel( pParent->GetPointerPosPixel() ), rScreenRect ); } @@ -486,7 +485,7 @@ OUString HelpTextWindow::GetText() const } void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle, - const OUString& rHelpText, const OUString& rStatusText, + const OUString& rHelpText, const Point& rScreenPos, const tools::Rectangle& rHelpArea ) { if (pParent->ImplGetFrame()->ShowTooltip(rHelpText, rHelpArea)) @@ -549,7 +548,6 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHe pHelpWin = VclPtr<HelpTextWindow>::Create( pParent, rHelpText, nHelpWinStyle, nStyle ); pSVData->maHelpData.mpHelpWin = pHelpWin; - pHelpWin->SetStatusText( rStatusText ); pHelpWin->SetHelpArea( rHelpArea ); // positioning diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 1c91dc01a721..7f23e366cc67 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -557,9 +557,7 @@ void DeInitVCL() pSVData->maGDIData.mpFirstPrnGraphics = nullptr; pSVData->maGDIData.mpLastPrnGraphics = nullptr; pSVData->maGDIData.mpFirstVirDev = nullptr; - pSVData->maGDIData.mpLastVirDev = nullptr; pSVData->maGDIData.mpFirstPrinter = nullptr; - pSVData->maGDIData.mpLastPrinter = nullptr; pSVData->maWinData.mpFirstFrame = nullptr; pSVData->maWinData.mpAppWin = nullptr; pSVData->maWinData.mpActiveApplicationFrame = nullptr; diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index 9bd1c17b31e1..526112f485ed 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -144,8 +144,7 @@ Calendar::Calendar( vcl::Window* pParent, WinBits nWinStyle ) : maFirstDate( 0, 0, 1900 ), maOldFirstDate( 0, 0, 1900 ), maCurDate( Date::SYSTEM ), - maOldCurDate( 0, 0, 1900 ), - maAnchorDate( maCurDate ) + maOldCurDate( 0, 0, 1900 ) { ImplInit( nWinStyle ); } @@ -817,8 +816,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld ) } } -void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, - bool bMove ) +void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest ) { std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable )); Date aOldDate = maCurDate; @@ -829,8 +827,6 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, if ( !(nHitTest & CALENDAR_HITTEST_DAY) ) aTempDate = maOldCurDate; - if ( !bMove ) - maAnchorDate = aTempDate; if ( aTempDate != maCurDate ) { maCurDate = aTempDate; @@ -955,7 +951,7 @@ void Calendar::ImplTracking( const Point& rPos, bool bRepeat ) } } else - ImplMouseSelect( aTempDate, nHitTest, true ); + ImplMouseSelect( aTempDate, nHitTest ); } void Calendar::ImplEndTracking( bool bCancel ) @@ -1055,7 +1051,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) StartTracking(); } - ImplMouseSelect( aTempDate, nHitTest, false ); + ImplMouseSelect( aTempDate, nHitTest ); } if (rMEvt.GetClicks() == 2) maActivateHdl.Call(this); @@ -1324,7 +1320,6 @@ void Calendar::SetCurDate( const Date& rNewDate ) bool bUpdate = IsVisible() && IsUpdateMode(); Date aOldDate = maCurDate; maCurDate = rNewDate; - maAnchorDate = maCurDate; ImplCalendarSelectDate( mpSelectTable.get(), aOldDate, false ); ImplCalendarSelectDate( mpSelectTable.get(), maCurDate, true ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 71029a830cb5..bb2ea4db56ee 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -791,7 +791,6 @@ void PatternFormatter::SetMask( const OString& rEditMask, void PatternFormatter::SetString( const OUString& rStr ) { - maFieldString = rStr; if ( GetField() ) { GetField()->SetText( rStr ); diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 52960a762d17..06d02ffaf433 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -154,7 +154,6 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) mpImplLB->Show(); mpImplLB->GetDropTarget()->addDropTargetListener(xDrop); - mpImplLB->SetDropTraget(xDrop); if ( mpFloatWin ) { diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 77453650d9a9..863e50ece96e 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -245,12 +245,10 @@ bool ImplLongCurrencyReformat( const OUString& rStr, BigInt const & nMin, BigInt void LongCurrencyFormatter::ImpInit() { - mnFieldValue = 0; mnLastValue = 0; mnMin = 0; mnMax = 0x7FFFFFFF; mnMax *= 0x7FFFFFFF; - mnCorrectedValue = 0; mnDecimalDigits = 0; mbThousandSep = true; SetDecimalDigits( 0 ); @@ -280,7 +278,6 @@ OUString const & LongCurrencyFormatter::GetCurrencySymbol() const void LongCurrencyFormatter::SetValue(const BigInt& rNewValue) { SetUserValue(rNewValue); - mnFieldValue = mnLastValue; SetEmptyFieldValueData( false ); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 7ff22a104b60..8c12b9f5ec2d 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -448,8 +448,6 @@ bool ScrollBar::ImplDrawNative(vcl::RenderContext& rRenderContext, sal_uInt16 nD scrValue.mnButton2State = ((mnStateFlags & SCRBAR_STATE_BTN2_DOWN) ? ControlState::PRESSED : ControlState::NONE) | ((!(mnStateFlags & SCRBAR_STATE_BTN2_DISABLE)) ? ControlState::ENABLED : ControlState::NONE); scrValue.mnThumbState = nState | ((mnStateFlags & SCRBAR_STATE_THUMB_DOWN) ? ControlState::PRESSED : ControlState::NONE); - scrValue.mnPage1State = nState | ((mnStateFlags & SCRBAR_STATE_PAGE1_DOWN) ? ControlState::PRESSED : ControlState::NONE); - scrValue.mnPage2State = nState | ((mnStateFlags & SCRBAR_STATE_PAGE2_DOWN) ? ControlState::PRESSED : ControlState::NONE); if (IsMouseOver()) { @@ -462,10 +460,6 @@ bool ScrollBar::ImplDrawNative(vcl::RenderContext& rRenderContext, sal_uInt16 nD scrValue.mnButton1State |= ControlState::ROLLOVER; else if (pRect == &maBtn2Rect) scrValue.mnButton2State |= ControlState::ROLLOVER; - else if (pRect == &maPage1Rect) - scrValue.mnPage1State |= ControlState::ROLLOVER; - else if (pRect == &maPage2Rect) - scrValue.mnPage2State |= ControlState::ROLLOVER; } } diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 68b8f3125ba8..c2bc28cf163e 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -702,8 +702,6 @@ void Font::SetQuality( int nQuality ) { mpImplFont->SetQuality( nQuality ); } void Font::IncreaseQualityBy( int nQualityAmount ) { mpImplFont->IncreaseQualityBy( nQualityAmount ); } void Font::DecreaseQualityBy( int nQualityAmount ) { mpImplFont->DecreaseQualityBy( nQualityAmount ); } -void Font::SetMapNames( OUString const & aMapNames ) { mpImplFont->SetMapNames(aMapNames); } - bool Font::IsOutline() const { return mpImplFont->mbOutline; } bool Font::IsShadow() const { return mpImplFont->mbShadow; } FontRelief Font::GetRelief() const { return mpImplFont->meRelief; } @@ -771,7 +769,6 @@ ImplFont::ImplFont( const ImplFont& rImplFont ) : mbTransparent( rImplFont.mbTransparent ), maColor( rImplFont.maColor ), maFillColor( rImplFont.maFillColor ), - maMapNames( rImplFont.maMapNames ), mbWordLine( rImplFont.mbWordLine ), mnOrientation( rImplFont.mnOrientation ), mnQuality( rImplFont.mnQuality ) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index a3211e71a5e4..ed6be53ecd87 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -470,8 +470,6 @@ void Printer::ImplInitData() mpPrev = nullptr; if ( mpNext ) mpNext->mpPrev = this; - else - pSVData->maGDIData.mpLastPrinter = this; pSVData->maGDIData.mpFirstPrinter = this; } @@ -936,8 +934,6 @@ void Printer::dispose() pSVData->maGDIData.mpFirstPrinter = mpNext; if ( mpNext ) mpNext->mpPrev = mpPrev; - else - pSVData->maGDIData.mpLastPrinter = mpPrev; mpPrev.clear(); mpNext.clear(); @@ -1566,7 +1562,6 @@ void Printer::EndJob() ReleaseGraphics(); mbPrinting = false; - maJobName.clear(); mbDevOutput = false; mpPrinter->EndJob(); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 35f034318e7a..96ebfc7197a9 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -602,7 +602,6 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer pPrintFile = &maPrintFile; mpPrinterOptions->ReadFromConfig( mbPrintFile ); - maJobName = i_rJobName; mbPrinting = true; if( GetCapabilities( PrinterCapType::UsePullModel ) ) { @@ -714,10 +713,7 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter ); if ( mpPrinter ) - { - maJobName = i_rJobName; mbPrinting = true; - } else bError = true; } diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 41c735c83766..4463ad1ac8b9 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -195,8 +195,6 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, mpPrev = nullptr; if ( mpNext ) mpNext->mpPrev = this; - else - pSVData->maGDIData.mpLastVirDev = this; pSVData->maGDIData.mpFirstVirDev = this; } @@ -248,8 +246,6 @@ void VirtualDevice::dispose() if( mpNext ) mpNext->mpPrev = mpPrev; - else - pSVData->maGDIData.mpLastVirDev = mpPrev; OutputDevice::dispose(); } diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index e43516f49c49..c3f7343bb823 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -62,7 +62,6 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const aFontMetric.SetAlignment( TextAlign::ALIGN_TOP ); aFontMetric.SetWidthType( rData.GetWidthType() ); aFontMetric.SetQuality( rData.GetQuality() ); - aFontMetric.SetMapNames( rData.GetMapNames() ); } return aFontMetric; @@ -234,7 +233,6 @@ FontMetric OutputDevice::GetFontMetric() const // get miscellaneous data aMetric.SetQuality( xFontMetric->GetQuality() ); - aMetric.SetMapNames( xFontMetric->GetMapNames() ); SAL_INFO("vcl.gdi.fontmetric", "OutputDevice::GetFontMetric:" << aMetric); diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index e66dfe241ca0..d1238c89c245 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -492,7 +492,6 @@ void ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) return; maMouseOff = rPos; - maMouseStart = maMouseOff; mbDocking = true; mbLastFloatMode = IsFloatingMode(); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 494c1500020f..7b5d2fdcaebe 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -228,7 +228,6 @@ void DockingWindow::ImplStartDocking( const Point& rPos ) return; maMouseOff = rPos; - maMouseStart = maMouseOff; mbDocking = true; mbLastFloatMode = IsFloatingMode(); mbStartFloat = mbLastFloatMode; diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 6607d44cc163..f479f7387515 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -235,7 +235,6 @@ IMPL_LINK_NOARG(MenuBarWindow, CloseHdl, ToolBox *, void) MenuBar::MenuBarButtonCallbackArg aArg; aArg.nId = it->first; aArg.bHighlight = (aCloseBtn->GetHighlightItemId() == it->first); - aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu.get()); it->second.m_aSelectLink.Call( aArg ); } } @@ -249,7 +248,6 @@ IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) MenuBar::MenuBarButtonCallbackArg aArg; aArg.nId = 0xffff; aArg.bHighlight = (rEvent.GetId() == VclEventId::ToolboxHighlight); - aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu.get()); if( rEvent.GetId() == VclEventId::ToolboxHighlight ) aArg.nId = aCloseBtn->GetHighlightItemId(); else if( rEvent.GetId() == VclEventId::ToolboxHighlightOff ) @@ -1245,7 +1243,6 @@ bool MenuBarWindow::HandleMenuButtonEvent( sal_uInt16 i_nButtonId ) MenuBar::MenuBarButtonCallbackArg aArg; aArg.nId = it->first; aArg.bHighlight = true; - aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu.get()); return it->second.m_aSelectLink.Call( aArg ); } return false; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index c324b3fd19c7..671814e2c646 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3864,17 +3864,17 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) // get text and display it OUString aStr = GetQuickHelpText( nItemId ); - const OUString& rHelpStr = GetHelpText( nItemId ); if (aStr.isEmpty()) aStr = MnemonicGenerator::EraseAllMnemonicChars( GetItemText( nItemId ) ); if ( rHEvt.GetMode() & HelpEventMode::BALLOON ) { + const OUString& rHelpStr = GetHelpText( nItemId ); if (!rHelpStr.isEmpty()) aStr = rHelpStr; Help::ShowBalloon( this, aHelpPos, aTempRect, aStr ); } else - Help::ShowQuickHelp( this, aTempRect, aStr, rHelpStr, QuickHelpFlags::CtrlText ); + Help::ShowQuickHelp( this, aTempRect, aStr, QuickHelpFlags::CtrlText ); return; } } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a1b393193ab0..2a3fa4199603 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1743,7 +1743,6 @@ void Window::ImplNewInputContext() if ( pFontInstance ) aNewContext.mpFont = pFontInstance; } - aNewContext.meLanguage = rFont.GetLanguage(); aNewContext.mnOptions = rInputContext.GetOptions(); pFocusWin->ImplGetFrame()->SetInputContext( &aNewContext ); } @@ -1858,10 +1857,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) if ( ImplGetParent() && !ImplIsOverlapWindow() ) aPos = OutputToScreenPixel(Point(0, 0)); tools::Rectangle aRect( aPos, GetSizePixel() ); - OUString aHelpText; - if ( !rStr.isEmpty() ) - aHelpText = GetHelpText(); - Help::ShowQuickHelp( this, aRect, rStr, aHelpText, QuickHelpFlags::CtrlText ); + Help::ShowQuickHelp( this, aRect, rStr, QuickHelpFlags::CtrlText ); } } else if (!mpWindowImpl->maHelpRequestHdl.IsSet() || mpWindowImpl->maHelpRequestHdl.Call(*this)) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 5922aab5f3ca..923d8612e7a1 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -1218,7 +1218,6 @@ void PPDParser::parse( ::std::vector< OString >& rLines ) // eventually update query and remove from option list if( bQuery && !pKey->m_bQueryValue ) { - pKey->m_aQueryValue = *pValue; pKey->m_bQueryValue = true; pKey->eraseValue( pValue->m_aOption ); } diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 095f4ca696c9..0d61ae9ef67d 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -186,7 +186,6 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait ) void PrinterInfoManager::initialize() { m_bUseIncludeFeature = false; - rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); m_aPrinters.clear(); m_aWatchFiles.clear(); OUString aDefaultPrinter; @@ -467,7 +466,6 @@ void PrinterInfoManager::initialize() // finally insert printer FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile ); - aPrinter.m_aGroup = aConfig.GetGroupName( nGroup ); std::unordered_map< OUString, Printer >::const_iterator find_it = m_aPrinters.find( aPrinterName ); if( find_it != m_aPrinters.end() ) @@ -538,7 +536,6 @@ void PrinterInfoManager::initialize() aPrinter.m_aInfo.m_aCommand = aCmd; aPrinter.m_aInfo.m_aComment = printQueue.m_aComment; aPrinter.m_aInfo.m_aLocation = printQueue.m_aLocation; - aPrinter.m_aGroup = OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent m_aPrinters[ aPrinterName ] = aPrinter; } |