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

loplugin:expandablemethodds in include/connectivity..drawinglayer

Change-Id: Ic58f86422ef8f1e2bb655157850e214fc3a1a9b4
Reviewed-on: https://gerrit.libreoffice.org/30136Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ef663010
...@@ -184,7 +184,7 @@ namespace dbtools ...@@ -184,7 +184,7 @@ namespace dbtools
clearConnection(); clearConnection();
if ( isPropertyListening() ) if ( m_bPropertyListening )
stopPropertyListening( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ) ); stopPropertyListening( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ) );
} }
......
...@@ -298,7 +298,7 @@ const css::sdbc::SQLException* SQLExceptionIteratorHelper::next() ...@@ -298,7 +298,7 @@ const css::sdbc::SQLException* SQLExceptionIteratorHelper::next()
{ {
OSL_ENSURE( hasMoreElements(), "SQLExceptionIteratorHelper::next : invalid call (please use hasMoreElements)!" ); OSL_ENSURE( hasMoreElements(), "SQLExceptionIteratorHelper::next : invalid call (please use hasMoreElements)!" );
const css::sdbc::SQLException* pReturn = current(); const css::sdbc::SQLException* pReturn = m_pCurrent;
if ( !m_pCurrent ) if ( !m_pCurrent )
return pReturn; return pReturn;
......
...@@ -336,7 +336,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu ...@@ -336,7 +336,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
break; break;
OSQLParseTreeIterator aSubQueryIterator( *this, m_rParser, pSubQueryNode.get() ); OSQLParseTreeIterator aSubQueryIterator( *this, m_rParser, pSubQueryNode.get() );
aSubQueryIterator.traverseSome( TraversalParts::Parameters | TraversalParts::SelectColumns ); aSubQueryIterator.impl_traverse( TraversalParts::Parameters | TraversalParts::SelectColumns );
// SelectColumns might also contain parameters // SelectColumns might also contain parameters
// #i77635# - 2007-07-23 / frank.schoenheit@sun.com // #i77635# - 2007-07-23 / frank.schoenheit@sun.com
pSubQueryParameterColumns = aSubQueryIterator.getParameters(); pSubQueryParameterColumns = aSubQueryIterator.getParameters();
...@@ -1540,12 +1540,6 @@ void OSQLParseTreeIterator::traverseOnePredicate( ...@@ -1540,12 +1540,6 @@ void OSQLParseTreeIterator::traverseOnePredicate(
} }
void OSQLParseTreeIterator::traverseSome( TraversalParts _nIncludeMask )
{
impl_traverse( _nIncludeMask );
}
void OSQLParseTreeIterator::traverseAll() void OSQLParseTreeIterator::traverseAll()
{ {
impl_traverse( TraversalParts::All ); impl_traverse( TraversalParts::All );
......
...@@ -51,7 +51,7 @@ namespace drawinglayer ...@@ -51,7 +51,7 @@ namespace drawinglayer
{ {
return(getLine() == rCandidate.getLine() return(getLine() == rCandidate.getLine()
&& getFill() == rCandidate.getFill() && getFill() == rCandidate.getFill()
&& getLineStartEnd() == rCandidate.getLineStartEnd() && maLineStartEnd == rCandidate.maLineStartEnd
&& getShadow() == rCandidate.getShadow() && getShadow() == rCandidate.getShadow()
&& getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient()); && getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient());
} }
......
...@@ -115,7 +115,7 @@ namespace drawinglayer ...@@ -115,7 +115,7 @@ namespace drawinglayer
const MediaPrimitive2D& rCompare = static_cast<const MediaPrimitive2D&>(rPrimitive); const MediaPrimitive2D& rCompare = static_cast<const MediaPrimitive2D&>(rPrimitive);
return (getTransform() == rCompare.getTransform() return (getTransform() == rCompare.getTransform()
&& getURL() == rCompare.getURL() && maURL == rCompare.maURL
&& getBackgroundColor() == rCompare.getBackgroundColor() && getBackgroundColor() == rCompare.getBackgroundColor()
&& getDiscreteBorder() == rCompare.getDiscreteBorder()); && getDiscreteBorder() == rCompare.getDiscreteBorder());
} }
......
...@@ -308,7 +308,7 @@ namespace drawinglayer ...@@ -308,7 +308,7 @@ namespace drawinglayer
if(getBuffered3DDecomposition().empty()) if(getBuffered3DDecomposition().empty())
{ {
const Primitive3DContainer aNewSequence(impCreate3DDecomposition()); const Primitive3DContainer aNewSequence(impCreate3DDecomposition());
const_cast< HatchTexturePrimitive3D* >(this)->setBuffered3DDecomposition(aNewSequence); const_cast< HatchTexturePrimitive3D* >(this)->maBuffered3DDecomposition = aNewSequence;
} }
return getBuffered3DDecomposition(); return getBuffered3DDecomposition();
......
...@@ -784,7 +784,7 @@ namespace drawinglayer ...@@ -784,7 +784,7 @@ namespace drawinglayer
if(getLast3DDecomposition().empty()) if(getLast3DDecomposition().empty())
{ {
const Primitive3DContainer aNewSequence(impCreate3DDecomposition(rViewInformation)); const Primitive3DContainer aNewSequence(impCreate3DDecomposition(rViewInformation));
const_cast< PolygonTubePrimitive3D* >(this)->setLast3DDecomposition(aNewSequence); const_cast< PolygonTubePrimitive3D* >(this)->maLast3DDecomposition = aNewSequence;
} }
return getLast3DDecomposition(); return getLast3DDecomposition();
......
...@@ -47,7 +47,7 @@ namespace drawinglayer ...@@ -47,7 +47,7 @@ namespace drawinglayer
void CutFindProcessor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) void CutFindProcessor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate)
{ {
if(getAnyHit() && maResult.size()) if(mbAnyHit && maResult.size())
{ {
// stop processing as soon as a hit was recognized // stop processing as soon as a hit was recognized
return; return;
......
...@@ -272,7 +272,7 @@ namespace drawinglayer ...@@ -272,7 +272,7 @@ namespace drawinglayer
aCandidate += maLightNormal * fCut; aCandidate += maLightNormal * fCut;
// transform to view, use 2d coordinates // transform to view, use 2d coordinates
aCandidate *= getEyeToView(); aCandidate *= maEyeToView;
aRetval.append(basegfx::B2DPoint(aCandidate.getX(), aCandidate.getY())); aRetval.append(basegfx::B2DPoint(aCandidate.getX(), aCandidate.getY()));
} }
......
...@@ -77,7 +77,6 @@ namespace dbtools ...@@ -77,7 +77,6 @@ namespace dbtools
void startPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxProps ); void startPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxProps );
void stopPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxEventSource ); void stopPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxEventSource );
bool isPropertyListening() const { return m_bPropertyListening; }
}; };
......
...@@ -173,11 +173,6 @@ public: ...@@ -173,11 +173,6 @@ public:
*/ */
bool hasMoreElements() const { return ( m_pCurrent != nullptr ); } bool hasMoreElements() const { return ( m_pCurrent != nullptr ); }
/** retrieves the current element in the chain, or <NULL/> if the chain has been completely
traveled.
*/
const css::sdbc::SQLException* current() const { return m_pCurrent; }
/** retrieves the current element in the chain, or <NULL/> if the chain has been completely /** retrieves the current element in the chain, or <NULL/> if the chain has been completely
traveled. traveled.
......
...@@ -208,15 +208,6 @@ namespace connectivity ...@@ -208,15 +208,6 @@ namespace connectivity
*/ */
void traverseAll(); void traverseAll();
/** traverses selected parts of the statement tree, and fills our data with
the information obtained during traversal
@param _nIncludeMask
set of TraversalParts bits, specifying which information is to be collected.
Note TraversalParts is currently not
*/
void traverseSome( TraversalParts _nIncludeMask );
// The TableRangeMap contains all tables associated with the range name found first. // The TableRangeMap contains all tables associated with the range name found first.
const OSQLTables& getTables() const; const OSQLTables& getTables() const;
......
...@@ -61,7 +61,6 @@ namespace drawinglayer ...@@ -61,7 +61,6 @@ namespace drawinglayer
// data read access // data read access
const SdrLineAttribute& getLine() const { return maLine; } const SdrLineAttribute& getLine() const { return maLine; }
const SdrFillAttribute& getFill() const { return maFill; } const SdrFillAttribute& getFill() const { return maFill; }
const SdrLineStartEndAttribute& getLineStartEnd() const { return maLineStartEnd; }
const SdrShadowAttribute& getShadow() const { return maShadow; } const SdrShadowAttribute& getShadow() const { return maShadow; }
const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; } const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; }
}; };
......
...@@ -73,7 +73,6 @@ namespace drawinglayer ...@@ -73,7 +73,6 @@ namespace drawinglayer
/// data read access /// data read access
const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
const OUString& getURL() const { return maURL; }
const basegfx::BColor& getBackgroundColor() const { return maBackgroundColor; } const basegfx::BColor& getBackgroundColor() const { return maBackgroundColor; }
sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; } sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; }
......
...@@ -52,7 +52,6 @@ namespace drawinglayer ...@@ -52,7 +52,6 @@ namespace drawinglayer
/// local access methods to maBufferedDecomposition /// local access methods to maBufferedDecomposition
const Primitive3DContainer& getBuffered3DDecomposition() const { return maBuffered3DDecomposition; } const Primitive3DContainer& getBuffered3DDecomposition() const { return maBuffered3DDecomposition; }
void setBuffered3DDecomposition(const Primitive3DContainer& rNew) { maBuffered3DDecomposition = rNew; }
public: public:
/// constructor /// constructor
......
...@@ -63,7 +63,6 @@ namespace drawinglayer ...@@ -63,7 +63,6 @@ namespace drawinglayer
implementations for buffering the last decomposition. implementations for buffering the last decomposition.
*/ */
const Primitive3DContainer& getLast3DDecomposition() const { return maLast3DDecomposition; } const Primitive3DContainer& getLast3DDecomposition() const { return maLast3DDecomposition; }
void setLast3DDecomposition(const Primitive3DContainer& rNew) { maLast3DDecomposition = rNew; }
/// local decomposition. /// local decomposition.
Primitive3DContainer impCreate3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; Primitive3DContainer impCreate3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const;
......
...@@ -65,7 +65,6 @@ namespace drawinglayer ...@@ -65,7 +65,6 @@ namespace drawinglayer
/// data read access /// data read access
const ::std::vector< basegfx::B3DPoint >& getCutPoints() const { return maResult; } const ::std::vector< basegfx::B3DPoint >& getCutPoints() const { return maResult; }
bool getAnyHit() const { return mbAnyHit; }
}; };
} // end of namespace processor3d } // end of namespace processor3d
} // end of namespace drawinglayer } // end of namespace drawinglayer
......
...@@ -98,7 +98,6 @@ namespace drawinglayer ...@@ -98,7 +98,6 @@ namespace drawinglayer
const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const; const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const;
const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
const basegfx::B3DHomMatrix& getWorldToEye() const { return maWorldToEye; } const basegfx::B3DHomMatrix& getWorldToEye() const { return maWorldToEye; }
const basegfx::B3DHomMatrix& getEyeToView() const { return maEyeToView; }
}; };
} // end of namespace processor3d } // end of namespace processor3d
} // end of namespace drawinglayer } // end of namespace drawinglayer
......
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