Kaydet (Commit) a75cc634 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields

Change-Id: I42a55562747e6097c1193e285da67235f5364bea
Reviewed-on: https://gerrit.libreoffice.org/55610Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 7e1503b4
......@@ -1888,7 +1888,6 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
SvxConfigEntry const * selection, bool bCreateMenu )
: GenericDialogController(pParent, "cui/ui/movemenu.ui", "MoveMenuDialog")
, mpEntries(nullptr)
, bModified(false)
, m_xMenuBox(m_xBuilder->weld_widget("namebox"))
, m_xMenuNameEdit(m_xBuilder->weld_entry("menuname"))
, m_xMenuListBox(m_xBuilder->weld_tree_view("menulist"))
......@@ -2011,8 +2010,6 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, weld::Button&, rButton, void )
m_xMenuListBox->insert(nTargetEntry, sId, sEntry, "");
m_xMenuListBox->select(nTargetEntry);
bModified = true;
UpdateButtonStates();
}
......
......@@ -494,7 +494,6 @@ class SvxMainMenuOrganizerDialog : public weld::GenericDialogController
{
std::unique_ptr<SvxEntries> mpEntries;
OUString m_sNewMenuEntryId;
bool bModified;
std::unique_ptr<weld::Widget> m_xMenuBox;
std::unique_ptr<weld::Entry> m_xMenuNameEdit;
......
......@@ -426,7 +426,6 @@ private:
long mnUserItemWidth;
long mnUserItemHeight;
sal_uInt16 mnSelItemId;
sal_uInt16 mnHighItemId;
sal_uInt16 mnCols;
sal_uInt16 mnCurCol;
sal_uInt16 mnUserCols;
......@@ -439,7 +438,6 @@ private:
WinBits mnStyle;
Link<SvtValueSet*,void> maDoubleClickHdl;
Link<SvtValueSet*,void> maSelectHdl;
Link<SvtValueSet*,void> maHighlightHdl;
bool mbFormat : 1;
bool mbNoSelection : 1;
......
......@@ -184,7 +184,6 @@ protected:
sal_uInt16 nUndoLevel; // undo nesting
bool bMyPool:1; // to clean up pMyPool from 303a
bool mbUndoEnabled:1; // If false no undo is recorded or we are during the execution of an undo action
bool bExtColorTable:1; // For no own ColorTable
bool mbChanged:1;
bool bPagNumsDirty:1;
bool bMPgNumsDirty:1;
......
......@@ -66,7 +66,6 @@ SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent )
, mnId(0)
, meType(VALUESETITEM_NONE)
, mbVisible(true)
, mpData(nullptr)
, mxAcc()
{
}
......
......@@ -75,10 +75,8 @@ struct SvtValueSetItem
sal_uInt16 mnId;
sal_uInt8 meType;
bool mbVisible;
Image maImage;
Color maColor;
OUString maText;
void* mpData;
css::uno::Reference< css::accessibility::XAccessible > mxAcc;
explicit SvtValueSetItem( SvtValueSet& rParent );
......
......@@ -2294,7 +2294,6 @@ SvtValueSet::SvtValueSet()
mnUserItemHeight = 0;
mnFirstLine = 0;
mnSelItemId = 0;
mnHighItemId = 0;
mnCols = 0;
mnCurCol = 0;
mnUserCols = 0;
......@@ -2849,7 +2848,6 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId )
Any aNewAny;
ImplFireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny);
}
maHighlightHdl.Call(this);
}
void SvtValueSet::SetNoSelection()
......@@ -3365,28 +3363,17 @@ void SvtValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtV
}
else
{
Size aImageSize = pItem->maImage.GetSizePixel();
Size aRectSize = aRect.GetSize();
Point aPos(aRect.Left(), aRect.Top());
aPos.AdjustX((aRectSize.Width() - aImageSize.Width()) / 2 );
aPos.AdjustX(aRectSize.Width() / 2 );
if (pItem->meType != VALUESETITEM_IMAGE_AND_TEXT)
aPos.AdjustY((aRectSize.Height() - aImageSize.Height()) / 2 );
aPos.AdjustY(aRectSize.Height() / 2 );
DrawImageFlags nImageStyle = DrawImageFlags::NONE;
if (!IsEnabled())
nImageStyle |= DrawImageFlags::Disable;
if (aImageSize.Width() > aRectSize.Width() ||
aImageSize.Height() > aRectSize.Height())
{
maVirDev->SetClipRegion(vcl::Region(aRect));
maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle);
maVirDev->SetClipRegion();
}
else
maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle);
if (pItem->meType == VALUESETITEM_IMAGE_AND_TEXT)
{
maVirDev->SetFont(rRenderContext.GetFont());
......
......@@ -129,7 +129,6 @@ void SdrModel::ImpCtor(
pCurrentUndoGroup=nullptr;
nUndoLevel=0;
mbUndoEnabled=true;
bExtColorTable=false;
mbChanged = false;
bPagNumsDirty=false;
bMPgNumsDirty=false;
......
......@@ -27,7 +27,6 @@ class SwContentNode;
class SwBaseLink : public ::sfx2::SvBaseLink
{
SwContentNode* m_pContentNode;
bool m_bInSwapIn : 1; ///< Prevent recursion and notifications during SwapIn
bool m_bNoDataFlag : 1;
bool m_bIgnoreDataChanged : 1;
......@@ -35,7 +34,7 @@ public:
SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = nullptr )
: ::sfx2::SvBaseLink( nMode, nFormat ), m_pContentNode( pNode ),
m_bInSwapIn( false ), m_bNoDataFlag( false ), m_bIgnoreDataChanged( false )
m_bNoDataFlag( false ), m_bIgnoreDataChanged( false )
{}
virtual ~SwBaseLink() override;
......
......@@ -266,8 +266,6 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
{
m_bInSwapIn = true;
if( !GetObj() && ( bNativFormat || ( !IsSynchron() && bWaitForData ) ))
{
AddNextRef();
......@@ -308,7 +306,6 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
else
bRes = Update();
m_bInSwapIn = false;
return bRes;
}
......
......@@ -346,7 +346,6 @@ private:
sw::MergedPara const*const m_pMergedPara;
size_t m_CurrentExtent;
TextFrameIndex m_CurrentIndex;
TextFrameIndex m_CurrentNodeIndex;
SwWrongList const*const m_pWrongList;
public:
......
......@@ -670,7 +670,6 @@ WrongListIterator::WrongListIterator(SwTextFrame const& rFrame,
, m_pMergedPara(rFrame.GetMergedPara())
, m_CurrentExtent(0)
, m_CurrentIndex(0)
, m_CurrentNodeIndex(0)
, m_pWrongList(m_pMergedPara
? nullptr
: (rFrame.GetTextNodeFirst()->*pGetWrongList)())
......@@ -682,7 +681,6 @@ WrongListIterator::WrongListIterator(SwWrongList const& rWrongList)
, m_pMergedPara(nullptr)
, m_CurrentExtent(0)
, m_CurrentIndex(0)
, m_CurrentNodeIndex(0)
, m_pWrongList(&rWrongList)
{
}
......@@ -695,7 +693,6 @@ bool WrongListIterator::Check(TextFrameIndex & rStart, TextFrameIndex & rLen)
{ // rewind
m_CurrentExtent = 0;
m_CurrentIndex = TextFrameIndex(0);
m_CurrentNodeIndex = TextFrameIndex(0);
}
while (m_CurrentExtent < m_pMergedPara->extents.size())
{
......@@ -787,11 +784,6 @@ bool WrongListIterator::Check(TextFrameIndex & rStart, TextFrameIndex & rLen)
}
m_CurrentIndex += TextFrameIndex(rExtent.nEnd - rExtent.nStart);
++m_CurrentExtent;
if (m_CurrentExtent < m_pMergedPara->extents.size() &&
rExtent.pNode != m_pMergedPara->extents[m_CurrentExtent].pNode)
{
m_CurrentNodeIndex = m_CurrentIndex; // reset
}
}
return false;
}
......@@ -816,7 +808,6 @@ WrongListIterator::GetWrongElement(TextFrameIndex const nStart)
{ // rewind
m_CurrentExtent = 0;
m_CurrentIndex = TextFrameIndex(0);
m_CurrentNodeIndex = TextFrameIndex(0);
}
while (m_CurrentExtent < m_pMergedPara->extents.size())
{
......@@ -836,11 +827,6 @@ WrongListIterator::GetWrongElement(TextFrameIndex const nStart)
}
m_CurrentIndex += TextFrameIndex(rExtent.nEnd - rExtent.nStart);
++m_CurrentExtent;
if (m_CurrentExtent < m_pMergedPara->extents.size() &&
rExtent.pNode != m_pMergedPara->extents[m_CurrentExtent].pNode)
{
m_CurrentNodeIndex = m_CurrentIndex; // reset
}
}
return nullptr;
}
......
......@@ -1126,8 +1126,7 @@ PDFWriterImpl::PDFPage::PDFPage( PDFWriterImpl* pWriter, double nPageWidth, doub
m_nStreamLengthObject( 0 ),
m_nBeginStreamPos( 0 ),
m_eTransition( PDFWriter::PageTransition::Regular ),
m_nTransTime( 0 ),
m_nDuration( 0 )
m_nTransTime( 0 )
{
// object ref must be only ever updated in emit()
m_nPageObject = m_pWriter->createObject();
......@@ -1252,12 +1251,6 @@ bool PDFWriterImpl::PDFPage::emit(sal_Int32 nParentObject )
aLine.append( sal_Int32(m_pWriter->m_aStructParentTree.size()-1) );
aLine.append( "\n" );
}
if( m_nDuration > 0 )
{
aLine.append( "/Dur " );
aLine.append( static_cast<sal_Int32>(m_nDuration) );
aLine.append( "\n" );
}
if( m_eTransition != PDFWriter::PageTransition::Regular && m_nTransTime > 0 )
{
// transition duration
......
......@@ -146,7 +146,6 @@ public:
std::vector<sal_Int32> m_aMCIDParents;
PDFWriter::PageTransition m_eTransition;
sal_uInt32 m_nTransTime;
sal_uInt32 m_nDuration;
PDFPage( PDFWriterImpl* pWriter, double nPageWidth, double nPageHeight, PDFWriter::Orientation eOrientation );
~PDFPage();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment