mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedfields

Browse Source 
Change-Id: Iffbb4e7107a0b1ae35c879c193a9ec209addf453
Reviewed-on: https://gerrit.libreoffice.org/64144
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-11-27 10:22:37 +02:00
parent 6db4b97ee1
commit ae25d5d3a3
20 changed files with 35 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbaccess/source/ui/dlg/dlgsize.cxx
View File

@@ -30,20 +30,20 @@ DlgSize::DlgSize(weld::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nA
: GenericDialogController(pParent, bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"), : GenericDialogController(pParent, bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"),
bRow ? OString("RowHeightDialog") : OString("ColWidthDialog")) bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"))
, m_nPrevValue(nVal) , m_nPrevValue(nVal)
, m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH)
, m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM)) , m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM))
, m_xCB_STANDARD(m_xBuilder->weld_check_button("automatic")) , m_xCB_STANDARD(m_xBuilder->weld_check_button("automatic"))
{ {
sal_Int32 nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH);
if ( _nAlternativeStandard > 0 ) if ( _nAlternativeStandard > 0 )
m_nStandard = _nAlternativeStandard; nStandard = _nAlternativeStandard;
m_xCB_STANDARD->connect_toggled(LINK(this,DlgSize,CbClickHdl)); m_xCB_STANDARD->connect_toggled(LINK(this,DlgSize,CbClickHdl));
bool bDefault = -1 == nVal; bool bDefault = -1 == nVal;
m_xCB_STANDARD->set_active(bDefault); m_xCB_STANDARD->set_active(bDefault);
if (bDefault) if (bDefault)
{ {
SetValue(m_nStandard); SetValue(nStandard);
m_nPrevValue = m_nStandard; m_nPrevValue = nStandard;
} }
CbClickHdl(*m_xCB_STANDARD); CbClickHdl(*m_xCB_STANDARD);
} }

2
dbaccess/source/ui/inc/dlgsize.hxx
View File

@@ -27,7 +27,7 @@ namespace dbaui
class DlgSize final : public weld::GenericDialogController class DlgSize final : public weld::GenericDialogController
{ {
private: private:
sal_Int32 m_nPrevValue, m_nStandard; sal_Int32 m_nPrevValue;
void SetValue( sal_Int32 nVal ); void SetValue( sal_Int32 nVal );
DECL_LINK(CbClickHdl, weld::ToggleButton&, void); DECL_LINK(CbClickHdl, weld::ToggleButton&, void);

3
editeng/source/rtf/svxrtf.cxx
View File

@@ -315,7 +315,7 @@ void SvxRTFParser::ReadStyleTable()
break; break;
case RTF_SBASEDON: pStyle->nBasedOn = sal_uInt16(nTokenValue); break; case RTF_SBASEDON: pStyle->nBasedOn = sal_uInt16(nTokenValue); break;
case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break; case RTF_SNEXT: break;
case RTF_OUTLINELEVEL: case RTF_OUTLINELEVEL:
case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break; case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break;
case RTF_S: nStyleNo = static_cast<short>(nTokenValue); case RTF_S: nStyleNo = static_cast<short>(nTokenValue);
@@ -925,7 +925,6 @@ SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRa
{ {
nOutlineNo = sal_uInt8(-1); // not set nOutlineNo = sal_uInt8(-1); // not set
nBasedOn = 0; nBasedOn = 0;
nNext = 0;
} }

2
include/editeng/svxrtf.hxx
View File

@@ -95,7 +95,7 @@ struct SvxRTFStyleType
{ {
SfxItemSet aAttrSet; // the attributes of Style (+ derivate!) SfxItemSet aAttrSet; // the attributes of Style (+ derivate!)
OUString sName; OUString sName;
sal_uInt16 nBasedOn, nNext; sal_uInt16 nBasedOn;
sal_uInt8 nOutlineNo; sal_uInt8 nOutlineNo;
SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange ); SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange );

4
include/svtools/editbrowsebox.hxx
View File

@@ -478,8 +478,8 @@ namespace svt
// and the asynchronous event the focus has changed, we won't grab it for ourself. // and the asynchronous event the focus has changed, we won't grab it for ourself.
long nPaintRow; // row being painted long nPaintRow; // row being painted
long nEditRow, nOldEditRow; long nEditRow;
sal_uInt16 nEditCol, nOldEditCol; sal_uInt16 nEditCol;
bool bHasFocus : 1; bool bHasFocus : 1;
mutable bool bPaintStatus : 1; // paint a status (image) in the handle column mutable bool bPaintStatus : 1; // paint a status (image) in the handle column

6
sc/source/filter/xml/xmlimprt.hxx
View File

@@ -171,12 +171,6 @@ class XMLShapeImportHelper;
class ScXMLChangeTrackingImportHelper; class ScXMLChangeTrackingImportHelper;
class SolarMutexGuard; class SolarMutexGuard;
struct tScMyCellRange
{
sal_Int32 StartColumn, EndColumn;
sal_Int32 StartRow, EndRow;
};
struct ScMyNamedExpression struct ScMyNamedExpression
{ {
OUString sName; OUString sName;

1
sc/source/filter/xml/xmltransformationi.cxx
View File

@@ -423,6 +423,7 @@ ScXMLColumnNumberContext::ScXMLColumnNumberContext(
, maType(sc::NUMBER_TRANSFORM_TYPE::ROUND) , maType(sc::NUMBER_TRANSFORM_TYPE::ROUND)
, maPrecision(0) , maPrecision(0)
{ {
OUString aType;
if (rAttrList.is()) if (rAttrList.is())
{ {
for (auto& aIter : *rAttrList) for (auto& aIter : *rAttrList)

1
sc/source/filter/xml/xmltransformationi.hxx
View File

@@ -119,7 +119,6 @@ public:
class ScXMLColumnNumberContext : public ScXMLImportContext class ScXMLColumnNumberContext : public ScXMLImportContext
{ {
OUString aType;
sc::NUMBER_TRANSFORM_TYPE maType; sc::NUMBER_TRANSFORM_TYPE maType;
int maPrecision; int maPrecision;
std::set<SCCOL> maColumns; std::set<SCCOL> maColumns;

6
sfx2/source/view/sfxbasecontroller.cxx
View File

@@ -107,12 +107,6 @@ using ::com::sun::star::frame::XTitle;
using ::com::sun::star::ui::XSidebarProvider; using ::com::sun::star::ui::XSidebarProvider;
struct GroupIDToCommandGroup
{
SfxGroupId const nGroupID;
sal_Int16 const nCommandGroup;
};
typedef std::unordered_map< SfxGroupId, sal_Int16 > GroupHashMap; typedef std::unordered_map< SfxGroupId, sal_Int16 > GroupHashMap;
sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID ) sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID )

11
svtools/source/brwbox/editbrowsebox.cxx
View File

@@ -126,9 +126,7 @@ namespace svt
,m_pFocusWhileRequest(nullptr) ,m_pFocusWhileRequest(nullptr)
,nPaintRow(-1) ,nPaintRow(-1)
,nEditRow(-1) ,nEditRow(-1)
,nOldEditRow(-1)
,nEditCol(0) ,nEditCol(0)
,nOldEditCol(0)
,bHasFocus(false) ,bHasFocus(false)
,bPaintStatus(true) ,bPaintStatus(true)
,bActiveBeforeTracking( false ) ,bActiveBeforeTracking( false )
@@ -167,8 +165,8 @@ namespace svt
void EditBrowseBox::RemoveRows() void EditBrowseBox::RemoveRows()
{ {
BrowseBox::Clear(); BrowseBox::Clear();
nOldEditRow = nEditRow = nPaintRow = -1; nEditRow = nPaintRow = -1;
nEditCol = nOldEditCol = 0; nEditCol = 0;
} }
@@ -1019,9 +1017,6 @@ return;
if (bUpdate) if (bUpdate)
Update(); Update();
nOldEditCol = nEditCol;
nOldEditRow = nEditRow;
// release the controller (asynchronously) // release the controller (asynchronously)
if (nEndEvent) if (nEndEvent)
Application::RemoveUserEvent(nEndEvent); Application::RemoveUserEvent(nEndEvent);
@@ -1046,8 +1041,6 @@ return;
nEndEvent = nullptr; nEndEvent = nullptr;
aOldController = CellControllerRef(); aOldController = CellControllerRef();
nOldEditRow = -1;
nOldEditCol = 0;
} }

3
ucb/source/ucp/file/bc.cxx
View File

@@ -264,9 +264,8 @@ BaseContent::createCommandIdentifier()
void SAL_CALL void SAL_CALL
BaseContent::abort( sal_Int32 CommandId ) BaseContent::abort( sal_Int32 /*CommandId*/ )
{ {
m_pMyShell->abort( CommandId );
} }

9
ucb/source/ucp/file/filinsreq.cxx
View File

@@ -45,17 +45,16 @@ XInteractionRequestImpl::XInteractionRequestImpl(
TaskManager *pShell,sal_Int32 CommandId) TaskManager *pShell,sal_Int32 CommandId)
: p1( new XInteractionSupplyNameImpl ), : p1( new XInteractionSupplyNameImpl ),
p2( new XInteractionAbortImpl ), p2( new XInteractionAbortImpl ),
m_nErrorCode(0),
m_nMinorError(0),
m_xOrigin(xOrigin) m_xOrigin(xOrigin)
{ {
sal_Int32 nErrorCode(0), nMinorError(0);
if( pShell ) if( pShell )
pShell->retrieveError(CommandId,m_nErrorCode,m_nMinorError); pShell->retrieveError(CommandId,nErrorCode,nMinorError);
std::vector<uno::Reference<task::XInteractionContinuation>> continuations{ std::vector<uno::Reference<task::XInteractionContinuation>> continuations{
Reference<XInteractionContinuation>(p1), Reference<XInteractionContinuation>(p1),
Reference<XInteractionContinuation>(p2) }; Reference<XInteractionContinuation>(p2) };
Any aAny; Any aAny;
if(m_nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) if(nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR)
{ {
NameClashException excep; NameClashException excep;
excep.Name = aClashingName; excep.Name = aClashingName;
@@ -64,7 +63,7 @@ XInteractionRequestImpl::XInteractionRequestImpl(
excep.Message = "folder exists and overwrite forbidden"; excep.Message = "folder exists and overwrite forbidden";
aAny <<= excep; aAny <<= excep;
} }
else if(m_nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) else if(nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR)
{ {
InteractiveAugmentedIOException excep; InteractiveAugmentedIOException excep;
excep.Code = IOErrorCode_INVALID_CHARACTER; excep.Code = IOErrorCode_INVALID_CHARACTER;

1
ucb/source/ucp/file/filinsreq.hxx
View File

@@ -131,7 +131,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
XInteractionSupplyNameImpl* const p1; XInteractionSupplyNameImpl* const p1;
XInteractionAbortImpl* const p2; XInteractionAbortImpl* const p2;
sal_Int32 m_nErrorCode,m_nMinorError;
css::uno::Reference<css::task::XInteractionRequest> m_xRequest; css::uno::Reference<css::task::XInteractionRequest> m_xRequest;

15
ucb/source/ucp/file/filtask.cxx
View File

@@ -415,21 +415,6 @@ TaskManager::endTask( sal_Int32 CommandId,
} }
void
TaskManager::abort( sal_Int32 CommandId )
{
if( CommandId )
{
osl::MutexGuard aGuard( m_aMutex );
TaskMap::iterator it = m_aTaskMap.find( CommandId );
if( it == m_aTaskMap.end() )
return;
else
it->second.abort();
}
}
void TaskManager::clearError( sal_Int32 CommandId ) void TaskManager::clearError( sal_Int32 CommandId )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );

11
ucb/source/ucp/file/filtask.hxx
View File

@@ -88,7 +88,7 @@ namespace fileaccess
{ {
private: private:
bool m_bAbort,m_bHandled; bool m_bHandled;
sal_Int32 m_nErrorCode,m_nMinorCode; sal_Int32 m_nErrorCode,m_nMinorCode;
css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler; css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler;
css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment; css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment;
@@ -98,19 +98,13 @@ namespace fileaccess
explicit TaskHandling( explicit TaskHandling(
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv )
: m_bAbort( false ), : m_bHandled( false ),
m_bHandled( false ),
m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nErrorCode( TASKHANDLER_NO_ERROR ),
m_nMinorCode( TASKHANDLER_NO_ERROR ), m_nMinorCode( TASKHANDLER_NO_ERROR ),
m_xCommandEnvironment( xCommandEnv ) m_xCommandEnvironment( xCommandEnv )
{ {
} }
void abort()
{
m_bAbort = true;
}
void setHandled() void setHandled()
{ {
m_bHandled = true; m_bHandled = true;
@@ -253,7 +247,6 @@ namespace fileaccess
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ); const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv );
sal_Int32 getCommandId(); sal_Int32 getCommandId();
void abort( sal_Int32 CommandId );
/** /**

6
vcl/source/bitmap/BitmapScaleSuperFilter.cxx
View File

@@ -51,8 +51,7 @@ void generateMap(long nW, long nDstW, bool bHMirr, long* pMapIX, long* pMapFX)
struct ScaleContext { struct ScaleContext {
BitmapReadAccess * const mpSrc; BitmapReadAccess * const mpSrc;
BitmapWriteAccess *mpDest; BitmapWriteAccess *mpDest;
long mnSrcW, mnDestW; long mnDestW;
long mnSrcH, mnDestH;
bool mbHMirr, mbVMirr; bool mbHMirr, mbVMirr;
std::unique_ptr<long[]> mpMapIX; std::unique_ptr<long[]> mpMapIX;
std::unique_ptr<long[]> mpMapIY; std::unique_ptr<long[]> mpMapIY;
@@ -64,8 +63,7 @@ struct ScaleContext {
long nSrcH, long nDestH, long nSrcH, long nDestH,
bool bHMirr, bool bVMirr) bool bHMirr, bool bVMirr)
: mpSrc( pSrc ), mpDest( pDest ) : mpSrc( pSrc ), mpDest( pDest )
, mnSrcW( nSrcW ), mnDestW( nDestW ) , mnDestW( nDestW )
, mnSrcH( nSrcH ), mnDestH( nDestH )
, mbHMirr( bHMirr ), mbVMirr( bVMirr ) , mbHMirr( bHMirr ), mbVMirr( bVMirr )
, mpMapIX( new long[ nDestW ] ) , mpMapIX( new long[ nDestW ] )
, mpMapIY( new long[ nDestH ] ) , mpMapIY( new long[ nDestH ] )

18
vcl/unx/generic/dtrans/bmp.cxx
View File

@@ -360,11 +360,8 @@ PixmapHolder::PixmapHolder( Display* pDisplay )
, m_aPixmap(None) , m_aPixmap(None)
, m_aBitmap(None) , m_aBitmap(None)
, m_nRedShift(0) , m_nRedShift(0)
, m_nRedShift2(0)
, m_nGreenShift(0) , m_nGreenShift(0)
, m_nGreenShift2(0)
, m_nBlueShift(0) , m_nBlueShift(0)
, m_nBlueShift2(0)
, m_nBlueShift2Mask(0) , m_nBlueShift2Mask(0)
, m_nRedShift2Mask(0) , m_nRedShift2Mask(0)
, m_nGreenShift2Mask(0) , m_nGreenShift2Mask(0)
@@ -400,14 +397,17 @@ PixmapHolder::PixmapHolder( Display* pDisplay )
#endif #endif
if( m_aInfo.c_class == TrueColor ) if( m_aInfo.c_class == TrueColor )
{ {
int nRedShift2(0);
int nGreenShift2(0);
int nBlueShift2(0);
int nRedSig, nGreenSig, nBlueSig; int nRedSig, nGreenSig, nBlueSig;
getShift( m_aInfo.red_mask, m_nRedShift, nRedSig, m_nRedShift2 ); getShift( m_aInfo.red_mask, m_nRedShift, nRedSig, nRedShift2 );
getShift( m_aInfo.green_mask, m_nGreenShift, nGreenSig, m_nGreenShift2 ); getShift( m_aInfo.green_mask, m_nGreenShift, nGreenSig, nGreenShift2 );
getShift( m_aInfo.blue_mask, m_nBlueShift, nBlueSig, m_nBlueShift2 ); getShift( m_aInfo.blue_mask, m_nBlueShift, nBlueSig, nBlueShift2 );
m_nBlueShift2Mask = m_nBlueShift2 ? ~static_cast<unsigned long>((1<<m_nBlueShift2)-1) : ~0L; m_nBlueShift2Mask = nBlueShift2 ? ~static_cast<unsigned long>((1<<nBlueShift2)-1) : ~0L;
m_nGreenShift2Mask = m_nGreenShift2 ? ~static_cast<unsigned long>((1<<m_nGreenShift2)-1) : ~0L; m_nGreenShift2Mask = nGreenShift2 ? ~static_cast<unsigned long>((1<<nGreenShift2)-1) : ~0L;
m_nRedShift2Mask = m_nRedShift2 ? ~static_cast<unsigned long>((1<<m_nRedShift2)-1) : ~0L; m_nRedShift2Mask = nRedShift2 ? ~static_cast<unsigned long>((1<<nRedShift2)-1) : ~0L;
} }
} }

6
vcl/unx/generic/dtrans/bmp.hxx
View File

@@ -44,9 +44,9 @@ class PixmapHolder
Pixmap m_aBitmap; Pixmap m_aBitmap;
XVisualInfo m_aInfo; XVisualInfo m_aInfo;
int m_nRedShift, m_nRedShift2; int m_nRedShift;
int m_nGreenShift, m_nGreenShift2; int m_nGreenShift;
int m_nBlueShift, m_nBlueShift2; int m_nBlueShift;
unsigned long m_nBlueShift2Mask, m_nRedShift2Mask, m_nGreenShift2Mask; unsigned long m_nBlueShift2Mask, m_nRedShift2Mask, m_nGreenShift2Mask;
// these expect data pointers to bitmapinfo header // these expect data pointers to bitmapinfo header

3
writerfilter/source/ooxml/Handler.cxx
View File

@@ -238,7 +238,7 @@ void OOXMLHeaderHandler::sprm(Sprm & /*sprm*/)
class OOXMLBreakHandler class OOXMLBreakHandler
*/ */
OOXMLBreakHandler::OOXMLBreakHandler(Stream &rStream) OOXMLBreakHandler::OOXMLBreakHandler(Stream &rStream)
: mnType(0), mnClear(0), : mnType(0),
mrStream(rStream) mrStream(rStream)
{ {
} }
@@ -270,7 +270,6 @@ void OOXMLBreakHandler::attribute(Id name, Value & val)
mnType = val.getInt(); mnType = val.getInt();
break; break;
case NS_ooxml::LN_CT_Br_clear: case NS_ooxml::LN_CT_Br_clear:
mnClear = val.getInt();
break; break;
default: default:
break; break;

2
writerfilter/source/ooxml/Handler.hxx
View File

@@ -108,7 +108,7 @@ public:
class OOXMLBreakHandler : public Properties class OOXMLBreakHandler : public Properties
{ {
sal_Int32 mnType, mnClear; sal_Int32 mnType;
Stream & mrStream; Stream & mrStream;
public: public:
explicit OOXMLBreakHandler(Stream & rStream); explicit OOXMLBreakHandler(Stream & rStream);