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

loplugin:unusedfields

Change-Id: Ifb2c9a2d1d7dcc0ed3e8458c1a13933ccababd4c
Reviewed-on: https://gerrit.libreoffice.org/68939
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 313744d4
...@@ -389,14 +389,12 @@ public: ...@@ -389,14 +389,12 @@ public:
protected: protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper; DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
mutable Any m_aDefaultValue;
}; };
WrappedLineStyleProperty::WrappedLineStyleProperty( WrappedLineStyleProperty::WrappedLineStyleProperty(
DataSeriesPointWrapper* pDataSeriesPointWrapper ) DataSeriesPointWrapper* pDataSeriesPointWrapper )
: WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper ) : WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper ) , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
, m_aDefaultValue(uno::Any(drawing::LineStyle_SOLID))
{ {
} }
......
...@@ -81,7 +81,6 @@ struct OptionsNode ...@@ -81,7 +81,6 @@ struct OptionsNode
{ {
OUString m_sId; OUString m_sId;
OUString m_sLabel; OUString m_sLabel;
OUString m_sPageURL;
bool m_bAllModules; bool m_bAllModules;
std::vector< std::unique_ptr<OptionsLeaf> > m_aLeaves; std::vector< std::unique_ptr<OptionsLeaf> > m_aLeaves;
std::vector< std::vector< std::unique_ptr<OptionsLeaf> > > std::vector< std::vector< std::unique_ptr<OptionsLeaf> > >
...@@ -89,11 +88,9 @@ struct OptionsNode ...@@ -89,11 +88,9 @@ struct OptionsNode
OptionsNode( const OUString& rId, OptionsNode( const OUString& rId,
const OUString& rLabel, const OUString& rLabel,
const OUString& rPageURL,
bool bAllModules ) : bool bAllModules ) :
m_sId( rId ), m_sId( rId ),
m_sLabel( rLabel ), m_sLabel( rLabel ),
m_sPageURL( rPageURL ),
m_bAllModules( bAllModules ) {} m_bAllModules( bAllModules ) {}
}; };
......
...@@ -1859,7 +1859,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( ...@@ -1859,7 +1859,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
OUString sTemp = getGroupName( sLabel, !rExtensionId.isEmpty() ); OUString sTemp = getGroupName( sLabel, !rExtensionId.isEmpty() );
if ( !sTemp.isEmpty() ) if ( !sTemp.isEmpty() )
sLabel = sTemp; sLabel = sTemp;
std::unique_ptr<OptionsNode> pNode(new OptionsNode(sNodeId, sLabel, sPageURL, bAllModules)); std::unique_ptr<OptionsNode> pNode(new OptionsNode(sNodeId, sLabel, bAllModules));
if ( rExtensionId.isEmpty() && !isNodeActive( pNode.get(), pModule ) ) if ( rExtensionId.isEmpty() && !isNodeActive( pNode.get(), pModule ) )
{ {
......
...@@ -487,14 +487,10 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, ...@@ -487,14 +487,10 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport,
eSearchType(utl::SearchParam::SearchType::Normal), eSearchType(utl::SearchParam::SearchType::Normal),
nFilterFieldCount(0), nFilterFieldCount(0),
bSkipDuplicates(false), bSkipDuplicates(false),
bCopyOutputData(false),
bIsCaseSensitive(false), bIsCaseSensitive(false),
bConnectionOr(true), bConnectionOr(true),
bNextConnectionOr(true), bNextConnectionOr(true)
bConditionSourceRange(false)
{ {
ScDocument* pDoc(GetScImport().GetDocument());
if ( rAttrList.is() ) if ( rAttrList.is() )
{ {
for (auto &aIter : *rAttrList) for (auto &aIter : *rAttrList)
...@@ -503,20 +499,12 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, ...@@ -503,20 +499,12 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport,
{ {
case XML_ELEMENT( TABLE, XML_TARGET_RANGE_ADDRESS ): case XML_ELEMENT( TABLE, XML_TARGET_RANGE_ADDRESS ):
{ {
ScRange aScRange; // not supported
sal_Int32 nOffset(0);
if (ScRangeStringConverter::GetRangeFromString( aScRange, aIter.toString(), pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
aOutputPosition = aScRange.aStart;
bCopyOutputData = true;
}
} }
break; break;
case XML_ELEMENT( TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS ): case XML_ELEMENT( TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS ):
{ {
sal_Int32 nOffset(0); // not supported
if(ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, aIter.toString(), pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
bConditionSourceRange = true;
} }
break; break;
case XML_ELEMENT( TABLE, XML_CONDITION_SOURCE ): case XML_ELEMENT( TABLE, XML_CONDITION_SOURCE ):
......
...@@ -154,16 +154,12 @@ class ScXMLDPFilterContext : public ScXMLImportContext ...@@ -154,16 +154,12 @@ class ScXMLDPFilterContext : public ScXMLImportContext
ScXMLDataPilotTableContext* pDataPilotTable; ScXMLDataPilotTableContext* pDataPilotTable;
ScQueryParam aFilterFields; ScQueryParam aFilterFields;
ScAddress aOutputPosition;
ScRange aConditionSourceRangeAddress;
utl::SearchParam::SearchType eSearchType; utl::SearchParam::SearchType eSearchType;
sal_uInt8 nFilterFieldCount; sal_uInt8 nFilterFieldCount;
bool bSkipDuplicates:1; bool bSkipDuplicates:1;
bool bCopyOutputData:1;
bool bIsCaseSensitive:1; bool bIsCaseSensitive:1;
bool bConnectionOr:1; bool bConnectionOr:1;
bool bNextConnectionOr:1; bool bNextConnectionOr:1;
bool bConditionSourceRange:1;
::std::stack<bool> aConnectionOrStack; ::std::stack<bool> aConnectionOrStack;
public: public:
......
...@@ -374,8 +374,6 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) ...@@ -374,8 +374,6 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( )
mTranslationOffset.Height = aOutputOffset.Y(); mTranslationOffset.Height = aOutputOffset.Y();
mTranslationOffset.Width = aOutputOffset.X(); mTranslationOffset.Width = aOutputOffset.X();
maPresentationArea = ::tools::Rectangle( aOutputOffset, aOutputSize );
// scale presentation into available window rect (minus 10%); center in the window // scale presentation into available window rect (minus 10%); center in the window
const basegfx::B2DHomMatrix aMatrix(basegfx::utils::createScaleTranslateB2DHomMatrix( const basegfx::B2DHomMatrix aMatrix(basegfx::utils::createScaleTranslateB2DHomMatrix(
aOutputSize.Width(), aOutputSize.Height(), aOutputOffset.X(), aOutputOffset.Y())); aOutputSize.Width(), aOutputSize.Height(), aOutputOffset.X(), aOutputOffset.Y()));
......
...@@ -216,7 +216,6 @@ private: ...@@ -216,7 +216,6 @@ private:
mpMouseMotionListeners; mpMouseMotionListeners;
SdDrawDocument* const mpDoc; SdDrawDocument* const mpDoc;
bool mbIsMouseMotionListener; bool mbIsMouseMotionListener;
::tools::Rectangle maPresentationArea;
AnimationMode const meAnimationMode; AnimationMode const meAnimationMode;
bool mbFirstPaint; bool mbFirstPaint;
bool const mbFullScreen; bool const mbFullScreen;
......
...@@ -50,7 +50,7 @@ using namespace ::com::sun::star::task; ...@@ -50,7 +50,7 @@ using namespace ::com::sun::star::task;
struct SfxProgress_Impl struct SfxProgress_Impl
{ {
Reference < XStatusIndicator > xStatusInd; Reference < XStatusIndicator > xStatusInd;
OUString aText, aStateText; OUString aText;
sal_uIntPtr nMax; sal_uIntPtr nMax;
clock_t nCreate; clock_t nCreate;
bool bWaitMode; bool bWaitMode;
......
...@@ -433,8 +433,6 @@ void AssignmentPersistentData::ImplCommit() ...@@ -433,8 +433,6 @@ void AssignmentPersistentData::ImplCommit()
m_xTransientDataSource; m_xTransientDataSource;
/// current scroll pos in the field list /// current scroll pos in the field list
sal_Int32 nFieldScrollPos; sal_Int32 nFieldScrollPos;
/// the index within m_pFields of the last visible list box. This is redundant, it could be extracted from other members
sal_Int32 nLastVisibleListIndex;
/// indicates that we've an odd field number. This member is for efficiency only, it's redundant. /// indicates that we've an odd field number. This member is for efficiency only, it's redundant.
bool bOddFieldNumber : 1; bool bOddFieldNumber : 1;
/// indicates that we're working with the real persistent configuration /// indicates that we're working with the real persistent configuration
...@@ -454,7 +452,6 @@ void AssignmentPersistentData::ImplCommit() ...@@ -454,7 +452,6 @@ void AssignmentPersistentData::ImplCommit()
:pFieldLabels{{nullptr}} :pFieldLabels{{nullptr}}
,pFields{{nullptr}} ,pFields{{nullptr}}
,nFieldScrollPos(0) ,nFieldScrollPos(0)
,nLastVisibleListIndex(0)
,bOddFieldNumber(false) ,bOddFieldNumber(false)
,bWorkingPersistent( true ) ,bWorkingPersistent( true )
,pConfigData( new AssignmentPersistentData ) ,pConfigData( new AssignmentPersistentData )
...@@ -467,7 +464,6 @@ void AssignmentPersistentData::ImplCommit() ...@@ -467,7 +464,6 @@ void AssignmentPersistentData::ImplCommit()
,pFields{{nullptr}} ,pFields{{nullptr}}
,m_xTransientDataSource( _rxTransientDS ) ,m_xTransientDataSource( _rxTransientDS )
,nFieldScrollPos(0) ,nFieldScrollPos(0)
,nLastVisibleListIndex(0)
,bOddFieldNumber(false) ,bOddFieldNumber(false)
,bWorkingPersistent( false ) ,bWorkingPersistent( false )
,pConfigData( new AssigmentTransientData( _rDataSourceName, _rTableName, _rFields ) ) ,pConfigData( new AssigmentTransientData( _rDataSourceName, _rTableName, _rFields ) )
...@@ -954,7 +950,6 @@ void AssignmentPersistentData::ImplCommit() ...@@ -954,7 +950,6 @@ void AssignmentPersistentData::ImplCommit()
auto pLeftAssignment = m_pImpl->aFieldAssignments.cbegin() + 2 * _nPos; auto pLeftAssignment = m_pImpl->aFieldAssignments.cbegin() + 2 * _nPos;
auto pRightAssignment = pLeftAssignment + 1; auto pRightAssignment = pLeftAssignment + 1;
m_pImpl->nLastVisibleListIndex = -1;
// loop // loop
for (sal_Int32 i=0; i<FIELD_PAIRS_VISIBLE; ++i) for (sal_Int32 i=0; i<FIELD_PAIRS_VISIBLE; ++i)
{ {
...@@ -986,11 +981,6 @@ void AssignmentPersistentData::ImplCommit() ...@@ -986,11 +981,6 @@ void AssignmentPersistentData::ImplCommit()
implSelectField(pLeftListControl->get(), *pLeftAssignment); implSelectField(pLeftListControl->get(), *pLeftAssignment);
implSelectField(pRightListControl->get(), *pRightAssignment); implSelectField(pRightListControl->get(), *pRightAssignment);
// the index of the last visible list box
++m_pImpl->nLastVisibleListIndex; // the left hand side box is always visible
if (!bHideRightColumn)
++m_pImpl->nLastVisibleListIndex;
// increment ... // increment ...
if ( i < FIELD_PAIRS_VISIBLE - 1 ) if ( i < FIELD_PAIRS_VISIBLE - 1 )
{ // (not in the very last round, here the +=2 could result in an invalid { // (not in the very last round, here the +=2 could result in an invalid
......
...@@ -1533,7 +1533,6 @@ public: ...@@ -1533,7 +1533,6 @@ public:
OUString m_sPrimaryKeyReading; OUString m_sPrimaryKeyReading;
OUString m_sSecondaryKeyReading; OUString m_sSecondaryKeyReading;
OUString m_sUserIndexName; OUString m_sUserIndexName;
OUString m_sCitaitonText;
Impl(SwXDocumentIndexMark& rThis, Impl(SwXDocumentIndexMark& rThis,
SwDoc* const pDoc, SwDoc* const pDoc,
...@@ -2205,13 +2204,7 @@ SwXDocumentIndexMark::setPropertyValue( ...@@ -2205,13 +2204,7 @@ SwXDocumentIndexMark::setPropertyValue(
m_pImpl->m_bMainEntry = lcl_AnyToBool(rValue); m_pImpl->m_bMainEntry = lcl_AnyToBool(rValue);
break; break;
case PROPERTY_MAP_INDEX_OBJECTS: case PROPERTY_MAP_INDEX_OBJECTS:
{ // unsupported
uno::Sequence<css::beans::PropertyValue> aValues(1);
css::beans::PropertyValue propertyVal;
rValue >>= aValues;
propertyVal = aValues[0];
m_pImpl->m_sCitaitonText = lcl_AnyToString(propertyVal.Value);
}
break; break;
} }
} }
......
...@@ -379,7 +379,6 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext ...@@ -379,7 +379,6 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext
OUString m_aStyleName; OUString m_aStyleName;
OUString m_sFormula; OUString m_sFormula;
OUString m_sSaveParaDefault; OUString m_sSaveParaDefault;
OUString mXmlId;
OUString m_StringValue; OUString m_StringValue;
SvXMLImportContextRef const m_xMyTable; SvXMLImportContextRef const m_xMyTable;
...@@ -452,9 +451,6 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( ...@@ -452,9 +451,6 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
GetSwImport().GetTableCellAttrTokenMap(); GetSwImport().GetTableCellAttrTokenMap();
switch( rTokenMap.Get( nPrefix, aLocalName ) ) switch( rTokenMap.Get( nPrefix, aLocalName ) )
{ {
case XML_TOK_TABLE_XMLID:
mXmlId = rValue;
break;
case XML_TOK_TABLE_STYLE_NAME: case XML_TOK_TABLE_STYLE_NAME:
m_aStyleName = rValue; m_aStyleName = rValue;
GetImport().GetTextImport()->SetCellParaStyleDefault(rValue); GetImport().GetTextImport()->SetCellParaStyleDefault(rValue);
......
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