From 08fd513e715209a1295de2e65cbdb47108908826 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 20 Mar 2012 20:35:23 +0000 Subject: callcatcher: update list --- connectivity/source/drivers/evoab2/NStatement.cxx | 16 ---------- connectivity/source/drivers/evoab2/NStatement.hxx | 1 - connectivity/source/drivers/file/FDriver.cxx | 24 -------------- connectivity/source/inc/file/fcode.hxx | 2 -- oox/source/export/chartexport.cxx | 14 -------- sc/source/filter/oox/biffhelper.cxx | 39 ----------------------- sdext/source/presenter/PresenterSprite.cxx | 7 ---- sdext/source/presenter/PresenterSprite.hxx | 1 - sdext/source/presenter/PresenterWindowManager.cxx | 30 ----------------- unusedcode.easy | 5 +++ 10 files changed, 5 insertions(+), 134 deletions(-) diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 81beb26c5c3c..7ed97080370d 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -163,22 +163,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException) } // ------------------------------------------------------------------------- -void OCommonStatement::clearMyResultSet () throw (SQLException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); - - try - { - Reference xCloseable; - if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) ) - xCloseable->close(); - } - catch( const DisposedException& ) { } - - m_xResultSet = Reference< XResultSet >(); -} - EBookQuery * OCommonStatement::createTrue() { // Not the world's most efficient unconditional true but ... diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 3d6d9231b8f3..255000366c5a 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -190,7 +190,6 @@ namespace connectivity virtual ~OCommonStatement(); protected: - void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); void parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData ); EBookQuery *whereAnalysis( const OSQLParseNode* parseTree ); void orderByAnalysis( const OSQLParseNode* _pOrderByClause, SortDescriptor& _out_rSort ); diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index f3e9549288be..6f481ec0e7c0 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -246,31 +246,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const } return getDataDefinitionByConnection(connect(url,info)); } -// ----------------------------------------------------------------------------- -void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::rtl::Reference rParameterColumns) -{ - // den alten namen beibehalten - - OSL_ENSURE(getRowPos() < rParameterColumns->get().size(),"Invalid index for orderkey values!"); - - Reference< XPropertySet> xColumn = (rParameterColumns->get())[getRowPos()]; - - try - { - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); - xColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT),rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))); - } - catch(const Exception&) - { - } - m_eDBType = ::comphelper::getINT32(rColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); -} // ----------------------------------------------------------------------------- OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xColumn) : OOperandRow(_nPos,::comphelper::getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 8c8ed188433e..1328b03801d9 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -131,8 +131,6 @@ namespace connectivity { public: OOperandParam(connectivity::OSQLParseNode* pNode, sal_Int32 _nPos); - void describe(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, ::rtl::Reference _xParamColumns); - TYPEINFO(); }; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 879509a6b76c..e8c56b3d30f0 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -341,20 +341,6 @@ bool lcl_isSeriesAttachedToFirstAxis( return bResult; } -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< chart2::XChartDocument > & xDoc ) -{ - OUString aResult = rRange; - - if( !xDoc.is() ) - return aResult; - Reference< chart2::data::XRangeXMLConversion > xConversion( - xDoc->getDataProvider(), uno::UNO_QUERY ); - if( xConversion.is()) - aResult = xConversion->convertRangeToXML( rRange ); - OSL_TRACE("lcl_ConvertRange, the originla formula is %s, the new formula is %s ", rtl::OUStringToOString( rRange, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aResult, RTL_TEXTENCODING_UTF8 ).getStr()); - return aResult; -} - typedef ::std::pair< OUString, OUString > tLabelAndValueRange; OUString lcl_flattenStringSequence( const Sequence< OUString > & rSequence ) diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 9ec1a9864a57..da426b606ad8 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -69,45 +69,6 @@ union DecodedDouble inline explicit DecodedDouble( double fValue ) : mfValue( fValue ) {} }; -bool lclCalcRkFromDouble( sal_Int32& ornRkValue, const DecodedDouble& rDecDbl ) -{ - // double - if( (rDecDbl.maStruct.w32_parts.lsw == 0) && ((rDecDbl.maStruct.w32_parts.msw & 0x3) == 0) ) - { - ornRkValue = static_cast< sal_Int32 >( rDecDbl.maStruct.w32_parts.msw ); - return true; - } - - // integer - double fInt = 0.0; - double fFrac = modf( rDecDbl.mfValue, &fInt ); - if( (fFrac == 0.0) && (-536870912.0 <= fInt) && (fInt <= 536870911.0) ) // 2^29 - { - ornRkValue = static_cast< sal_Int32 >( fInt ); - ornRkValue <<= 2; - ornRkValue |= BIFF_RK_INTFLAG; - return true; - } - - return false; -} - -bool lclCalcRkFromDouble( sal_Int32& ornRkValue, double fValue ) -{ - DecodedDouble aDecDbl( fValue ); - if( lclCalcRkFromDouble( ornRkValue, aDecDbl ) ) - return true; - - aDecDbl.mfValue *= 100.0; - if( lclCalcRkFromDouble( ornRkValue, aDecDbl ) ) - { - ornRkValue |= BIFF_RK_100FLAG; - return true; - } - - return false; -} - // ---------------------------------------------------------------------------- void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm, sal_Int32 nBytes, BiffType eBiff ) diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index 0fca939b0f34..aa396eb14a76 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -126,13 +126,6 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation) ); } -void PresenterSprite::SetAlpha (const double nAlpha) -{ - mnAlpha = nAlpha; - if (mxSprite.is()) - mxSprite->setAlpha(mnAlpha); -} - void PresenterSprite::Update (void) { if (mxSpriteFactory.is()) diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index 58755d7a8e44..2896712820c7 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -65,7 +65,6 @@ public: void Resize (const css::geometry::RealSize2D& rSize); void MoveTo (const css::geometry::RealPoint2D& rLocation); - void SetAlpha (const double nAlpha); void Update (void); diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index d25358f8a1a2..ee6490df89ed 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -1189,36 +1189,6 @@ void PresenterWindowManager::ThrowIfDisposed (void) const } } -namespace { - -//===== ModeChangeAnimation =================================================== - -class ModeChangeAnimation : public PresenterAnimation -{ -public: - ModeChangeAnimation ( - const ::boost::shared_ptr& rpSprite, - const Reference& rxCanvas) - : PresenterAnimation (0, 1000, 20), - mpSprite(rpSprite), - mxCanvas(rxCanvas) - { - } - - virtual void Run (const double nProgress, const sal_uInt64 nCurrentTime) - { - (void)nCurrentTime; - mpSprite->SetAlpha(1.0 - nProgress); - mxCanvas->updateScreen(sal_False); - } - -private: - ::boost::shared_ptr mpSprite; - Reference mxCanvas; -}; - -} // end of anonymous namespace - } } // end of namespace ::sdext::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 58cf0ce25882..88c477c7248b 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -866,6 +866,7 @@ nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges::ConnectedComponents const&) ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&) oox::core::PowerPointExport::WriteTextStyleLevel(boost::shared_ptr, int, int) +oox::drawingml::TextParagraphProperties::dump() const oox::dump::Config::requestEncryptionData(comphelper::IDocPasswordVerifier&) oox::dump::ConfigItemBase::readConfigLine(oox::TextInputStream&) const oox::dump::DffStreamObject::construct(oox::dump::ObjectBase const&, oox::dump::BinaryInputStreamRef const&, rtl::OUString const&) @@ -912,7 +913,10 @@ oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const oox::formulaimport::XmlStream::skipElement(int) oox::ole::WordVbaProjectFilter_createInstance(com::sun::star::uno::Reference const&) oox::ole::WordVbaProjectFilter_getSupportedServiceNames() +oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector, std::allocator > >&) oox::xls::BiffDetector_createInstance(com::sun::star::uno::Reference const&) +oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::BiffInputStream&) +oox::xls::BiffDrawingObjectContainer::append(boost::shared_ptr const&) oox::xls::BiffInputStream::resetRecord(bool, unsigned short) oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long) oox::xls::BiffOutputStream::sizeBase() const @@ -930,6 +934,7 @@ oox::xls::ExcelBiffFilter_getSupportedServiceNames() oox::xls::ExcelVbaProjectFilter_createInstance(com::sun::star::uno::Reference const&) oox::xls::ExcelVbaProjectFilter_getSupportedServiceNames() oox::xls::OOXMLFormulaParser_createInstance(com::sun::star::uno::Reference const&) +oox::xls::prv::BiffOutputRecordBuffer::BiffOutputRecordBuffer(oox::BinaryOutputStream&, unsigned short) psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&) -- cgit