diff options
37 files changed, 21 insertions, 126 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 5524c260aa3b..c2149a9a3efa 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -602,7 +602,6 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) aBgdColor = pBgdAttr->GetColor(); sal_uInt16 nCol = GetItemId_Impl(*m_pBackgroundColorSet, aBgdColor); m_pBackgroundColorSet->SelectItem( nCol ); - m_pBackgroundColorSet->SaveValue(); m_pPreviewWin1->NotifyChange( aBgdColor ); } } @@ -1427,7 +1426,6 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, { m_pBackgroundColorSet->SelectItem( nCol ); } - m_pBackgroundColorSet->SaveValue(); m_pPreviewWin1->NotifyChange( aBgdColor ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 42e7c6e39231..45b14ec5d2ca 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -426,7 +426,6 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl() m_pLbLineType->SaveValue(); m_pLbLineColor->SaveValue(); m_pLbBackgroundColor->SaveValue(); - m_pHatchLB->SaveValue(); } IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 053d7dcc24c9..2f21d512781c 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -203,7 +203,6 @@ private: long nDataRowHeight; // height of a single data-row sal_uInt16 nTitleLines; // number of lines in title row sal_uLong nControlAreaWidth; // width of fixed area beneath hscroll - bool bThumbDragging; // handle thumb dragging bool bColumnCursor; // single columns and fields selectable bool bMultiSelection;// allow multiple selected rows bool bKeepHighlight; // don't hide selection on LoseFocus diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 4c190b73c157..e0c583e732a1 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -195,15 +195,12 @@ private: mbDrag:1, mbSelection:1, mbMultiSelection:1, - mbWeekSel:1, mbUnSel:1, mbMenuDown:1, mbSpinDown:1, mbPrevIn:1, mbNextIn:1, - mbDirect:1, mbTravelSelect:1, - mbScrollDateRange:1, mbSelLeft:1, mbAllSel:1, mbDropPos:1; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index b2179d4c5b65..7b7b68cc92d6 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -202,7 +202,6 @@ class SVT_DLLPUBLIC LineListBox : public ListBox Size aTxtSize; Color aColor; Color maPaintCol; - FieldUnit eUnit; FieldUnit eSourceUnit; SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, @@ -244,8 +243,6 @@ public: void SelectEntry( SvxBorderLineStyle nStyle, bool bSelect = true ); SvxBorderLineStyle GetSelectEntryStyle() const; - void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } void SetColor( const Color& rColor ); diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 4463bedd6116..df2be7551307 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -71,9 +71,8 @@ struct FileViewAsyncAction class SVT_DLLPUBLIC SvtFileView : public Control { private: - std::unique_ptr<SvtFileView_Impl> mpImpl; - bool bSortColumn; - css::uno::Sequence< OUString > mpBlackList; + std::unique_ptr<SvtFileView_Impl> mpImpl; + css::uno::Sequence< OUString > mpBlackList; DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar*, void ); DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index b63fd66fcaad..6f9ca865957f 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -197,7 +197,6 @@ private: bool mbEPS : 1; bool mbIsInSwapIn : 1; bool mbIsInSwapOut : 1; - bool mbAlpha : 1; void SVT_DLLPRIVATE ImplAssignGraphicData(); static void SVT_DLLPRIVATE ImplEnsureGraphicManager(); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 2867ebff6b94..ef06552f097d 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -241,19 +241,16 @@ private: Link<HeaderBar*,void> maDoubleClickHdl; Link<HeaderBar*,void> maCreateAccessibleHdl; - VCLXHeaderBar* m_pVCLXHeaderBar; - - css::uno::Reference< css::accessibility::XAccessible > - mxAccessible; + mxAccessible; using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const; - SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; + SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; using Window::ImplHitTest; - SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; + SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ); SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, const tools::Rectangle& rItemRect, const tools::Rectangle* pRect); diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 26a3d8aeda31..d2b6707c0a5f 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -41,7 +41,6 @@ friend class SvtURLBox_Impl; INetProtocol eSmartProtocol; bool bAutoCompleteMode : 1; bool bOnlyDirectories : 1; - bool bCtrlClick : 1; bool bHistoryDisabled : 1; bool bNoSelection : 1; bool bIsAutoCompleteEnabled : 1; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 44719ee41b98..93b851b88d7a 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -189,7 +189,6 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control friend class SvxIconChoiceCtrl_Impl; Link<SvtIconChoiceCtrl*,void> _aClickIconHdl; - KeyEvent* _pCurKeyEvent; std::unique_ptr<SvxIconChoiceCtrl_Impl> _pImpl; protected: diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 89a0d5aeedf1..8b070b15107a 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -149,7 +149,6 @@ private: bool bNewDoc : 1; // read new Doc? bool bIsInHeader : 1; // scan header section - bool bIsInBody : 1; // scan body section bool bReadListing : 1; // read listings bool bReadXMP : 1; // read XMP bool bReadPRE : 1; // read preformatted text @@ -180,7 +179,7 @@ protected: virtual ~HTMLParser() override; - void FinishHeader( bool bBody ) { bIsInHeader = false; bIsInBody = bBody; } + void FinishHeader() { bIsInHeader = false; } public: HTMLParser( SvStream& rIn, bool bReadNewDoc = true ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 292396feecf8..f1e1a3b6c4db 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -636,14 +636,11 @@ private: RulerDragSize mnDragSize; sal_uInt16 mnDragModifier; sal_uInt16 mnExtraStyle; - sal_uInt16 mnExtraClicks; - sal_uInt16 mnExtraModifier; long mnCharWidth; long mnLineHeight; RulerExtra meExtraType; RulerType meDragType; - MapUnit meSourceUnit; FieldUnit meUnit; Fraction maZoom; bool mbCalc; @@ -747,8 +744,6 @@ public: FieldUnit GetUnit() const { return meUnit; } void SetZoom( const Fraction& rNewZoom ); - void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } - void SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle = 0 ); bool StartDocDrag( const MouseEvent& rMEvt, diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 16106511a0b5..2e3b7da0245c 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -65,7 +65,6 @@ private: long nHeight; std::unique_ptr<SvLBoxButtonData_Impl> pImpl; bool bDataOk; - SvButtonState eState; std::vector<Image> aBmps; // indices s. constants BMP_ .... SVT_DLLPRIVATE void SetWidthAndHeight(); @@ -85,7 +84,7 @@ public: // as buttons are not derived from LinkHdl void CallLink(); - void StoreButtonState( SvTreeListEntry* pEntry, SvItemStateFlags nItemFlags ); + void StoreButtonState( SvTreeListEntry* pEntry ); static SvButtonState ConvertToButtonState( SvItemStateFlags nItemFlags ); SvTreeListEntry* GetActEntry() const; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index b555c07a4519..5c1df4059909 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -52,8 +52,6 @@ private: OUString aCurEntry; protected: - SvTreeListEntry* pViewParent; - static OUString GetToken( const OUString &sStr, sal_Int32 &nIndex ); virtual void SetTabs() override; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 26f78e6f69f9..811c13529b6c 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -321,7 +321,6 @@ private: bool mbFormat : 1; bool mbFirstFormat : 1; bool mbSizeFormat : 1; - bool mbInSwitching : 1; bool mbAutoEditMode : 1; bool mbEditCanceled : 1; bool mbDropPos : 1; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index e470be598bfd..3a5d64afe92e 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -211,7 +211,6 @@ private: long mnUserItemWidth; long mnUserItemHeight; sal_uInt16 mnSelItemId; - sal_uInt16 mnSavedItemId; sal_uInt16 mnHighItemId; sal_uInt16 mnCols; sal_uInt16 mnCurCol; @@ -347,7 +346,6 @@ public: { return GetItemPos( mnSelItemId ); } - void SaveValue() { mnSavedItemId = GetSelectItemId(); } bool IsItemSelected( sal_uInt16 nItemId ) const { return !mbNoSelection && (nItemId == mnSelItemId); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index dca3a8df523c..ad32c960603d 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -511,8 +511,6 @@ VclPtr<SvxRuler> DrawViewShell::CreateHRuler (::sd::Window* pWin) pRuler = VclPtr<Ruler>::Create(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); - pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit()); - // Metric ... sal_uInt16 nMetric = (sal_uInt16)GetDoc()->GetUIUnit(); @@ -543,7 +541,6 @@ VclPtr<SvxRuler> DrawViewShell::CreateVRuler(::sd::Window* pWin) pRuler = VclPtr<Ruler>::Create(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); - pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit()); // Metric same as HRuler, use document setting sal_uInt16 nMetric = (sal_uInt16)GetDoc()->GetUIUnit(); diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 501825344785..7bce837463b6 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -2142,10 +2142,9 @@ void BrowseBox::SetMode( BrowserMode nMode ) pVScroll.disposeAndClear(); - bThumbDragging = ( nMode & BrowserMode::THUMBDRAGGING ) == BrowserMode::THUMBDRAGGING; - bMultiSelection = ( nMode & BrowserMode::MULTISELECTION ) == BrowserMode::MULTISELECTION; - bColumnCursor = ( nMode & BrowserMode::COLUMNSELECTION ) == BrowserMode::COLUMNSELECTION; - bKeepHighlight = ( nMode & BrowserMode::KEEPHIGHLIGHT ) == BrowserMode::KEEPHIGHLIGHT; + bMultiSelection = bool( nMode & BrowserMode::MULTISELECTION ); + bColumnCursor = bool( nMode & BrowserMode::COLUMNSELECTION ); + bKeepHighlight = bool( nMode & BrowserMode::KEEPHIGHLIGHT ); bHideSelect = ((nMode & BrowserMode::HIDESELECT) == BrowserMode::HIDESELECT); // default: do not hide the cursor at all (untaken scrolling and such) diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 0052bfbab596..0e79b7d3cce2 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -320,9 +320,6 @@ protected: bool m_bRunningAsyncAction; bool m_bAsyncActionCancelled; - FileViewMode m_eViewMode; - - public: ::std::vector< SortingData_Impl* > maContent; @@ -971,7 +968,6 @@ SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits, mpImpl.reset( new SvtFileView_Impl( this, xCmdEnv, nFlags, bOnlyFolder ) ); mpImpl->mpView->ForbidEmptyText(); - bSortColumn = true; HeaderBar* pHeaderBar = mpImpl->mpView->GetHeaderBar(); pHeaderBar->SetSelectHdl( LINK( this, SvtFileView, HeaderSelect_Impl ) ); @@ -1448,7 +1444,6 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,m_eAsyncActionResult ( ::svt::EnumerationResult::ERROR ) ,m_bRunningAsyncAction ( false ) ,m_bAsyncActionCancelled ( false ) - ,m_eViewMode ( eDetailedList ) ,mpNameTrans ( nullptr ) ,mnSortColumn ( COLUMN_TITLE ) ,mbAscending ( true ) @@ -2163,7 +2158,6 @@ sal_uLong SvtFileView_Impl::GetEntryPos( const OUString& rURL ) void SvtFileView_Impl::SetViewMode( FileViewMode eMode ) { - m_eViewMode = eMode; switch ( eMode ) { case eDetailedList: diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index fc3ccafceaa1..8064b0ec4481 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -93,11 +93,8 @@ enum class IcnViewFieldType struct LocalFocus { - bool bOn; tools::Rectangle aRect; - Color aPenColor; - - LocalFocus() { bOn = false; } + Color aPenColor; }; @@ -189,9 +186,7 @@ class SvxIconChoiceCtrl_Impl bool bHighlightFramePressed; SvxIconChoiceCtrlEntry* pHead; // top left entry SvxIconChoiceCtrlEntry* pCursor; - SvxIconChoiceCtrlEntry* pPrevDropTarget; SvxIconChoiceCtrlEntry* pHdlEntry; - SvxIconChoiceCtrlEntry* pDDRefEntry; VclPtr<VirtualDevice> pDDDev; VclPtr<VirtualDevice> pDDBufDev; VclPtr<VirtualDevice> pDDTempDev; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index d2d34011fb42..560dc8946825 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -108,7 +108,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( pCurHighlightFrame = nullptr; pEdit = nullptr; pAnchor = nullptr; - pPrevDropTarget = nullptr; pHdlEntry = nullptr; pHead = nullptr; pCursor = nullptr; @@ -125,7 +124,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( nUserEventShowCursor = nullptr; nMaxVirtWidth = DEFAULT_MAX_VIRT_WIDTH; nMaxVirtHeight = DEFAULT_MAX_VIRT_HEIGHT; - pDDRefEntry = nullptr; pDDDev = nullptr; pDDBufDev = nullptr; pDDTempDev = nullptr; @@ -2720,7 +2718,6 @@ void SvxIconChoiceCtrl_Impl::ShowFocus ( tools::Rectangle& rRect ) else aPenColor.SetColor(COL_WHITE); - aFocus.bOn = true; aFocus.aPenColor = aPenColor; aFocus.aRect = rRect; } diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 7a7f6d29d7b0..4bc2175cc6c2 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -70,7 +70,6 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) // WB_CLIPCHILDREN on, as ScrollBars lie on the window! Control( pParent, nWinStyle | WB_CLIPCHILDREN ), - _pCurKeyEvent ( nullptr ), _pImpl ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ) { SetLineColor(); @@ -287,9 +286,7 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt ) bool bKeyUsed = DoKeyInput( rKEvt ); if ( !bKeyUsed ) { - _pCurKeyEvent = const_cast<KeyEvent*>(&rKEvt); Control::KeyInput( rKEvt ); - _pCurKeyEvent = nullptr; } } bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt ) @@ -297,9 +294,7 @@ bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt ) // under OS/2, we get key up/down even while editing if( _pImpl->IsEntryEditing() ) return true; - _pCurKeyEvent = const_cast<KeyEvent*>(&rKEvt); bool bHandled = _pImpl->KeyInput( rKEvt ); - _pCurKeyEvent = nullptr; return bHandled; } sal_Int32 SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index c3f23259f262..8e68c0c85db0 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -50,7 +50,7 @@ sal_Int32 SvImpLBox::s_nImageRefCount = 0; SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinStyle) : aHorSBar(VclPtr<ScrollBar>::Create(pLBView, WB_DRAG | WB_HSCROLL)) , aScrBarBox(VclPtr<ScrollBarBox>::Create(pLBView)) - , aFctSet(this, &aSelEng, pLBView) + , aFctSet(this, pLBView) , bAreChildrenTransient(true) , m_pStringSorter(nullptr) , aVerSBar(VclPtr<ScrollBar>::Create(pLBView, WB_DRAG | WB_VSCROLL)) @@ -86,7 +86,6 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS pAnchor = nullptr; nVisibleCount = 0; // number of rows of data in control nNodeBmpTabDistance = NODE_BMP_TABDIST_NOTVALID; - nYoffsNodeBmp = 0; nNodeBmpWidth = 0; bAsyncBeginDrag = false; @@ -1571,7 +1570,7 @@ void SvImpLBox::CollapsingEntry( SvTreeListEntry* pEntry ) void SvImpLBox::SetNodeBmpYOffset( const Image& rBmp ) { Size aSize; - nYoffsNodeBmp = pView->GetHeightOffset( rBmp, aSize ); + pView->GetHeightOffset( rBmp, aSize ); nNodeBmpWidth = aSize.Width(); } @@ -2590,11 +2589,9 @@ void SvImpLBox::SelectEntry( SvTreeListEntry* pEntry, bool bSelect ) pView->Select( pEntry, bSelect ); } -ImpLBSelEng::ImpLBSelEng( SvImpLBox* pImpl, SelectionEngine* pSEng, - SvTreeListBox* pV ) +ImpLBSelEng::ImpLBSelEng( SvImpLBox* pImpl, SvTreeListBox* pV ) { pImp = pImpl; - pSelEng = pSEng; pView = pV; } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index ae3e14481534..1bc77fe48b6d 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -42,7 +42,6 @@ void SvLBoxButtonData::InitData( bool _bRadioBtn, const Control* pCtrl ) aBmps.resize((int)SvBmp::STATICIMAGE+1); bDataOk = false; - eState = SvButtonState::Unchecked; pImpl->bDefaultImages = true; pImpl->bShowRadioButton = _bRadioBtn; @@ -99,10 +98,9 @@ void SvLBoxButtonData::SetWidthAndHeight() } -void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, SvItemStateFlags nItemFlags ) +void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry ) { pImpl->pEntry = pActEntry; - eState = ConvertToButtonState( nItemFlags ); } SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags ) @@ -279,7 +277,7 @@ bool SvLBoxButton::ClickHdl( SvTreeListEntry* pEntry ) SetStateUnchecked(); else SetStateChecked(); - pData->StoreButtonState( pEntry, nItemFlags ); + pData->StoreButtonState( pEntry ); pData->CallLink(); } return false; diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index e21a86435e37..ccf870e5dd58 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -92,7 +92,6 @@ SvTabListBox::SvTabListBox( vcl::Window* pParent, WinBits nBits ) { pTabList = nullptr; nTabCount = 0; - pViewParent = nullptr; SetHighlightRange(); // select full width } diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 4ed627ea5a21..f48bff13eb1c 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -164,15 +164,12 @@ void Calendar::ImplInit( WinBits nWinStyle ) mbDrag = false; mbSelection = false; mbMultiSelection = false; - mbWeekSel = false; mbUnSel = false; mbMenuDown = false; mbSpinDown = false; mbPrevIn = false; mbNextIn = false; - mbDirect = false; mbTravelSelect = false; - mbScrollDateRange = false; mbSelLeft = false; mbAllSel = false; mbDropPos = false; @@ -1144,9 +1141,7 @@ void Calendar::ImplScroll( bool bPrev ) } else aNewFirstMonth += aNewFirstMonth.GetDaysInMonth(); - mbDirect = true; SetFirstDate( aNewFirstMonth ); - mbDirect = false; } void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) @@ -1215,9 +1210,7 @@ void Calendar::ImplTracking( const Point& rPos, bool bRepeat ) if ( bRepeat && (mbPrevIn || mbNextIn) ) { - mbScrollDateRange = true; ImplScroll( mbPrevIn ); - mbScrollDateRange = false; } } else @@ -1295,9 +1288,7 @@ IMPL_LINK_NOARG( Calendar, ScrollHdl, Timer*, void ) bool bNextIn = (mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0; if( bNextIn || bPrevIn ) { - mbScrollDateRange = true; ImplScroll( bPrevIn ); - mbScrollDateRange = false; } } @@ -1320,9 +1311,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) if ( mbPrevIn || mbNextIn ) { mbSpinDown = true; - mbScrollDateRange = true; ImplScroll( mbPrevIn ); - mbScrollDateRange = false; // it should really read BUTTONREPEAT, therefore do not // change it to SCROLLREPEAT, check with TH, // why it could be different (71775) @@ -1343,10 +1332,6 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) } mbMultiSelection = (mnWinStyle & (WB_MULTISELECT | WB_RANGESELECT)) != 0; - if ( (nHitTest & CALENDAR_HITTEST_DAY) && mbMultiSelection ) - mbWeekSel = true; - else - mbWeekSel = false; ImplMouseSelect( aTempDate, nHitTest, false, rMEvt.IsShift(), rMEvt.IsMod1() ); } } @@ -1473,9 +1458,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) } } ImplCalendarSelectDateRange( mpSelectTable, aNewDate, maAnchorDate, true ); - mbDirect = true; SetCurDate( aNewDate ); - mbDirect = false; maAnchorDate = aOldAnchorDate; ImplUpdateSelection( pOldSel.get() ); } @@ -1486,9 +1469,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) SetNoSelection(); SelectDate( aNewDate ); } - mbDirect = true; SetCurDate( aNewDate ); - mbDirect = false; } mbTravelSelect = true; Select(); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 0291420b8a8d..a02890d5cfbe 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -484,7 +484,6 @@ void LineListBox::ImplInit() aTxtSize.Width() = GetTextWidth( " " ); aTxtSize.Height() = GetTextHeight(); pLineList = new ImpLineList; - eUnit = FUNIT_POINT; eSourceUnit = FUNIT_POINT; aVirDev->SetLineColor(); diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 37bd3683895b..6b77152ae4d3 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -73,7 +73,6 @@ void HeaderBar::ImplInit( WinBits nWinStyle ) mbOutDrag = false; mbItemMode = false; - m_pVCLXHeaderBar = nullptr; // StyleBits auswerten if ( nWinStyle & WB_DRAG ) mbDragable = true; @@ -1381,7 +1380,6 @@ css::uno::Reference< css::awt::XWindowPeer > HeaderBar::GetComponentInterface( b if ( !xPeer.is() && bCreate ) { css::awt::XWindowPeer* pPeer = new VCLXHeaderBar(this); - m_pVCLXHeaderBar = static_cast<VCLXHeaderBar*>(pPeer); SetComponentInterface(pPeer); return pPeer; } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 7fb25ece7334..94280239a044 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -818,7 +818,6 @@ SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaul eSmartProtocol( eSmart ), bAutoCompleteMode( false ), bOnlyDirectories( false ), - bCtrlClick( false ), bHistoryDisabled( false ), bNoSelection( false ), bIsAutoCompleteEnabled( true ) @@ -838,7 +837,6 @@ SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart eSmartProtocol( eSmart ), bAutoCompleteMode( false ), bOnlyDirectories( false ), - bCtrlClick( false ), bHistoryDisabled( false ), bNoSelection( false ), bIsAutoCompleteEnabled( true ) @@ -1007,7 +1005,6 @@ bool SvtURLBox::ProcessKey( const vcl::KeyCode& rKey ) Resize(); } - bCtrlClick = rKey.IsMod1(); bool bHandled = false; if ( GetOpenHdl().IsSet() ) { @@ -1020,8 +1017,6 @@ bool SvtURLBox::ProcessKey( const vcl::KeyCode& rKey ) GetSelectHdl().Call(*this); } - bCtrlClick = false; - ClearModifyFlag(); return bHandled; } diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index a931237f1d31..a6687938cf6c 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -236,8 +236,6 @@ void Ruler::ImplInit( WinBits nWinBits ) mnDragSize = RulerDragSize::Move; // Did size change at dragging mnDragModifier = 0; // Modifier key at dragging mnExtraStyle = 0; // Style of Extra field - mnExtraClicks = 0; // No. of clicks for Extra field - mnExtraModifier = 0; // Modifier key at click in extra field mnCharWidth = 371; mnLineHeight = 551; mbCalc = true; // Should recalculate page width @@ -256,7 +254,6 @@ void Ruler::ImplInit( WinBits nWinBits ) mnUnitIndex = RULER_UNIT_CM; meUnit = FUNIT_CM; maZoom = Fraction( 1, 1 ); - meSourceUnit = MapUnit::Map100thMM; // Recalculate border widths if ( nWinBits & WB_BORDER ) @@ -1971,11 +1968,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt ) if ( maExtraRect.IsInside( aMousePos ) ) { - mnExtraClicks = nMouseClicks; - mnExtraModifier = nMouseModifier; ExtraDown(); - mnExtraClicks = 0; - mnExtraModifier = 0; } else { diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 62be41f9eede..76f3edaa8cb1 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -546,7 +546,6 @@ void TabBar::ImplInit( WinBits nWinStyle ) mbFormat = true; mbFirstFormat = true; mbSizeFormat = true; - mbInSwitching = false; mbAutoEditMode = false; mbEditCanceled = false; mbDropPos = false; @@ -2472,7 +2471,6 @@ void TabBar::SwitchPage(const Point& rPos) { if (tools::Time::GetSystemTicks() > mnSwitchTime + 500) { - mbInSwitching = true; if (ImplDeactivatePage()) { SetCurPageId( mnSwitchId ); @@ -2480,7 +2478,6 @@ void TabBar::SwitchPage(const Point& rPos) ImplActivatePage(); ImplSelect(); } - mbInSwitching = false; } } } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index ee1ddad8ffd5..b336aeb36850 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -72,7 +72,6 @@ ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) : mnUserItemHeight = 0; mnFirstLine = 0; mnSelItemId = 0; - mnSavedItemId = 0; mnHighItemId = 0; mnCols = 0; mnCurCol = 0; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index b962a52e9608..0a1e4021e332 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -140,7 +140,6 @@ void GraphicObject::ImplAssignGraphicData() mnSizeBytes = maGraphic.GetSizeBytes(); meType = maGraphic.GetType(); mbTransparent = maGraphic.IsTransparent(); - mbAlpha = maGraphic.IsAlpha(); mbAnimated = maGraphic.IsAnimated(); mbEPS = maGraphic.IsEPS(); mnAnimationLoopCount = ( mbAnimated ? maGraphic.GetAnimationLoopCount() : 0 ); diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 929e714ed7a9..9b2fc7f51c99 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -44,12 +44,10 @@ namespace comphelper class ImpLBSelEng : public FunctionSet { SvImpLBox* pImp; - SelectionEngine* pSelEng; VclPtr<SvTreeListBox> pView; public: - ImpLBSelEng( SvImpLBox* pImp, SelectionEngine* pSelEng, - SvTreeListBox* pView ); + ImpLBSelEng( SvImpLBox* pImp, SvTreeListBox* pView ); virtual ~ImpLBSelEng() override; void BeginDrag() override; void CreateAnchor() override; @@ -126,11 +124,10 @@ private: Idle aAsyncBeginDragIdle; Point aAsyncBeginDragPos; - long nYoffsNodeBmp; long nNodeBmpWidth; long nMostRight; short nHorSBarHeight, nVerSBarWidth; - sal_uInt16 nCurTabPos; + sal_uInt16 nCurTabPos; bool bUpdateMode : 1; bool bAsyncBeginDrag : 1; diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 5f8ef05318c2..a1f34835330a 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -216,7 +216,6 @@ HTMLParser::HTMLParser( SvStream& rIn, bool bReadNewDoc ) : SvParser<HtmlTokenId>( rIn ), bNewDoc(bReadNewDoc), bIsInHeader(true), - bIsInBody(false), bReadListing(false), bReadXMP(false), bReadPRE(false), @@ -284,7 +283,6 @@ HtmlTokenId HTMLParser::FilterToken( HtmlTokenId nToken ) break; // don't pass case HtmlTokenId::HEAD_OFF: - bIsInBody = true; bIsInHeader = false; break; @@ -294,16 +292,14 @@ HtmlTokenId HTMLParser::FilterToken( HtmlTokenId nToken ) case HtmlTokenId::BODY_ON: bIsInHeader = false; - bIsInBody = true; break; case HtmlTokenId::FRAMESET_ON: bIsInHeader = false; - bIsInBody = false; break; case HtmlTokenId::BODY_OFF: - bIsInBody = bReadPRE = bReadListing = bReadXMP = false; + bReadPRE = bReadListing = bReadXMP = false; break; case HtmlTokenId::HTML_OFF: diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index a431b466f9b3..dbb4f7c26775 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -916,7 +916,7 @@ void SwHTMLParser::DocumentDetected() if( IsNewDoc() ) { if( IsInHeader() ) - FinishHeader( true ); + FinishHeader(); CallEndAction( true ); @@ -1991,7 +1991,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken ) case HtmlTokenId::NOFRAMES_ON: if( IsInHeader() ) - FinishHeader( true ); + FinishHeader(); bInsertUnknown = m_bKeepUnknown; break; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 809165a1ff45..84431a85e5e6 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -494,7 +494,6 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pLinePosDLB->SetSelectHdl(LINK(this, SwColumnPage, UpdateColMgrListBox)); // Separator line - m_pLineTypeDLB->SetUnit( FUNIT_POINT ); m_pLineTypeDLB->SetSourceUnit( FUNIT_TWIP ); // Fill the line styles listbox |