diff options
18 files changed, 9 insertions, 36 deletions
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 9b5f780e8a66..5db4fbe0d518 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -184,7 +184,7 @@ namespace dbtools clearConnection(); - if ( isPropertyListening() ) + if ( m_bPropertyListening ) stopPropertyListening( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ) ); } diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index d1b6baf56411..133c543510cc 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -298,7 +298,7 @@ const css::sdbc::SQLException* SQLExceptionIteratorHelper::next() { 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 ) return pReturn; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 6c5f2ccd43c2..4ace9f0ba354 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -336,7 +336,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu break; 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 // #i77635# - 2007-07-23 / frank.schoenheit@sun.com pSubQueryParameterColumns = aSubQueryIterator.getParameters(); @@ -1540,12 +1540,6 @@ void OSQLParseTreeIterator::traverseOnePredicate( } -void OSQLParseTreeIterator::traverseSome( TraversalParts _nIncludeMask ) -{ - impl_traverse( _nIncludeMask ); -} - - void OSQLParseTreeIterator::traverseAll() { impl_traverse( TraversalParts::All ); diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx index 5b3004eb36db..315dfc5cc967 100644 --- a/drawinglayer/source/attribute/sdrallattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx @@ -51,7 +51,7 @@ namespace drawinglayer { return(getLine() == rCandidate.getLine() && getFill() == rCandidate.getFill() - && getLineStartEnd() == rCandidate.getLineStartEnd() + && maLineStartEnd == rCandidate.maLineStartEnd && getShadow() == rCandidate.getShadow() && getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient()); } diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 8e9beba05218..620ecdfe1a11 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -115,7 +115,7 @@ namespace drawinglayer const MediaPrimitive2D& rCompare = static_cast<const MediaPrimitive2D&>(rPrimitive); return (getTransform() == rCompare.getTransform() - && getURL() == rCompare.getURL() + && maURL == rCompare.maURL && getBackgroundColor() == rCompare.getBackgroundColor() && getDiscreteBorder() == rCompare.getDiscreteBorder()); } diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index 43ae92607d0a..37f4b4041cab 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -308,7 +308,7 @@ namespace drawinglayer if(getBuffered3DDecomposition().empty()) { const Primitive3DContainer aNewSequence(impCreate3DDecomposition()); - const_cast< HatchTexturePrimitive3D* >(this)->setBuffered3DDecomposition(aNewSequence); + const_cast< HatchTexturePrimitive3D* >(this)->maBuffered3DDecomposition = aNewSequence; } return getBuffered3DDecomposition(); diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 2db0aa891823..e17f7c03309d 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -784,7 +784,7 @@ namespace drawinglayer if(getLast3DDecomposition().empty()) { const Primitive3DContainer aNewSequence(impCreate3DDecomposition(rViewInformation)); - const_cast< PolygonTubePrimitive3D* >(this)->setLast3DDecomposition(aNewSequence); + const_cast< PolygonTubePrimitive3D* >(this)->maLast3DDecomposition = aNewSequence; } return getLast3DDecomposition(); diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx index 2321437f9ecf..0be1142af357 100644 --- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx +++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx @@ -47,7 +47,7 @@ namespace drawinglayer void CutFindProcessor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) { - if(getAnyHit() && maResult.size()) + if(mbAnyHit && maResult.size()) { // stop processing as soon as a hit was recognized return; diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index 867770e9d6c7..25c6f54e917f 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx @@ -272,7 +272,7 @@ namespace drawinglayer aCandidate += maLightNormal * fCut; // transform to view, use 2d coordinates - aCandidate *= getEyeToView(); + aCandidate *= maEyeToView; aRetval.append(basegfx::B2DPoint(aCandidate.getX(), aCandidate.getY())); } diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index bca2af8983db..7940a2ccb50e 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -77,7 +77,6 @@ namespace dbtools void startPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxProps ); void stopPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxEventSource ); - bool isPropertyListening() const { return m_bPropertyListening; } }; diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 9de0e93ea475..6141ea1decd1 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -175,11 +175,6 @@ public: /** 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 - traveled. In opposite to the second <member>current</member>, this version allows typed access to the respective SQLException. diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 7d69003bc162..456300421062 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -208,15 +208,6 @@ namespace connectivity */ 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. const OSQLTables& getTables() const; diff --git a/include/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx index b68f0a303e40..b75b006e14fe 100644 --- a/include/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx @@ -61,7 +61,6 @@ namespace drawinglayer // data read access const SdrLineAttribute& getLine() const { return maLine; } const SdrFillAttribute& getFill() const { return maFill; } - const SdrLineStartEndAttribute& getLineStartEnd() const { return maLineStartEnd; } const SdrShadowAttribute& getShadow() const { return maShadow; } const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; } }; diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index c09b4479c128..95b89b687d5c 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -73,7 +73,6 @@ namespace drawinglayer /// data read access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const OUString& getURL() const { return maURL; } const basegfx::BColor& getBackgroundColor() const { return maBackgroundColor; } sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; } diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index c5003c6d6563..6203b58f3407 100644 --- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -52,7 +52,6 @@ namespace drawinglayer /// local access methods to maBufferedDecomposition const Primitive3DContainer& getBuffered3DDecomposition() const { return maBuffered3DDecomposition; } - void setBuffered3DDecomposition(const Primitive3DContainer& rNew) { maBuffered3DDecomposition = rNew; } public: /// constructor diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 6360541bea80..76429400ee16 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -63,7 +63,6 @@ namespace drawinglayer implementations for buffering the last decomposition. */ const Primitive3DContainer& getLast3DDecomposition() const { return maLast3DDecomposition; } - void setLast3DDecomposition(const Primitive3DContainer& rNew) { maLast3DDecomposition = rNew; } /// local decomposition. Primitive3DContainer impCreate3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index eb4e222a7f8d..eb5d946608d4 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -65,7 +65,6 @@ namespace drawinglayer /// data read access const ::std::vector< basegfx::B3DPoint >& getCutPoints() const { return maResult; } - bool getAnyHit() const { return mbAnyHit; } }; } // end of namespace processor3d } // end of namespace drawinglayer diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 0a6d65ad79c5..cf813f7b383e 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -98,7 +98,6 @@ namespace drawinglayer const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const; const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } const basegfx::B3DHomMatrix& getWorldToEye() const { return maWorldToEye; } - const basegfx::B3DHomMatrix& getEyeToView() const { return maEyeToView; } }; } // end of namespace processor3d } // end of namespace drawinglayer |