summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-20 15:59:42 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 12:16:17 +0200
commit9e61a951374a3f7705de67295e406e929c603a42 (patch)
tree1e7166ddbc847e796c41fb0c0527c5d74084a6b7 /svtools
parent95c348afa8f4f17c058c449ded75025175af0e4a (diff)
loplugin:unusedfields in svtools
Change-Id: Ic8f67d40825d9843fd57535bd61bef51b470a8be Reviewed-on: https://gerrit.libreoffice.org/39016 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx7
-rw-r--r--svtools/source/contnr/fileview.cxx6
-rw-r--r--svtools/source/contnr/imivctl.hxx7
-rw-r--r--svtools/source/contnr/imivctl1.cxx3
-rw-r--r--svtools/source/contnr/ivctrl.cxx5
-rw-r--r--svtools/source/contnr/svimpbox.cxx9
-rw-r--r--svtools/source/contnr/svlbitm.cxx6
-rw-r--r--svtools/source/contnr/svtabbx.cxx1
-rw-r--r--svtools/source/control/calendar.cxx19
-rw-r--r--svtools/source/control/ctrlbox.cxx1
-rw-r--r--svtools/source/control/headbar.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx5
-rw-r--r--svtools/source/control/ruler.cxx7
-rw-r--r--svtools/source/control/tabbar.cxx3
-rw-r--r--svtools/source/control/valueset.cxx1
-rw-r--r--svtools/source/graphic/grfmgr.cxx1
-rw-r--r--svtools/source/inc/svimpbox.hxx7
-rw-r--r--svtools/source/svhtml/parhtml.cxx6
18 files changed, 12 insertions, 84 deletions
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: