[Libreoffice-commits] .: 3 commits - bin/get-bugzilla-attachments-by-mimetype connectivity/source oox/source sc/source sdext/source unusedcode.easy vcl/win

Caolán McNamara caolan at kemper.freedesktop.org
Tue Mar 20 13:36:32 PDT 2012


 bin/get-bugzilla-attachments-by-mimetype          |    7 ++-
 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 ++
 vcl/win/source/gdi/winlayout.cxx                  |    2 -
 12 files changed, 10 insertions(+), 138 deletions(-)

New commits:
commit 08fd513e715209a1295de2e65cbdb47108908826
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 20 20:35:23 2012 +0000

    callcatcher: update list

diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 81beb26..7ed9708 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> 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 3d6d923..2550003 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 f3e9549..6f481ec 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<connectivity::OSQLColumns> 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 8c8ed18..1328b03 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<connectivity::OSQLColumns> _xParamColumns);
-
             TYPEINFO();
         };
 
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 879509a..e8c56b3 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 9ec1a98..da426b6 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 0fca939..aa396eb 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 58755d7..2896712 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 d25358f..ee6490d 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<PresenterSprite>& rpSprite,
-        const Reference<rendering::XSpriteCanvas>& 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<PresenterSprite> mpSprite;
-    Reference<rendering::XSpriteCanvas> 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 58cf0ce..88c477c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -866,6 +866,7 @@ nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas:
 nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
 oox::core::PowerPointExport::WriteTextStyleLevel(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, 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<com::sun::star::uno::XComponentContext> const&)
 oox::ole::WordVbaProjectFilter_getSupportedServiceNames()
+oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
 oox::xls::BiffDetector_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::BiffInputStream&)
+oox::xls::BiffDrawingObjectContainer::append(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> 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<com::sun::star::uno::XComponentContext> const&)
 oox::xls::ExcelVbaProjectFilter_getSupportedServiceNames()
 oox::xls::OOXMLFormulaParser_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> 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&)
commit 144f554dfde4133e949decbc2b41d881853cf943
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 20 20:34:45 2012 +0000

    download some unusual image mimetypes by default

diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index bfff9e3..0b18060 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -207,10 +207,13 @@ mimetypes = [
     ('application/x-starwriter', 'sdw'),
     ('application/vnd.stardivision.writer', 'sdw5'),
     ('application/vnd.stardivision.writer-global', 'sgl5'),
+# unusual image mimetypes
+    ('image/cgm', 'cgm'),
+    ('image/x-targa', 'tga'),
 ]
 
 # disabled for now, this would download gigs of pngs/jpegs...
-image_mimetypes = [
+common_image_mimetypes = [
 # graphics
     ('image/svg+xml', 'svg'),
     ('image/x-MS-bmp', 'bmp'),
@@ -229,7 +232,6 @@ image_mimetypes = [
     ('image/x-cmu-raster', 'ras'),
     ('image/x-sgf', 'sgf'),
     ('image/x-svm', 'svm'),
-    ('image/x-targa', 'tga'),
     ('image/tiff', 'tiff'),
     ('image/x-wmf', 'wmf'),
     ('image/x-xbitmap', 'xbm'),
@@ -237,7 +239,6 @@ image_mimetypes = [
     ('image/gif', 'gif'),
     ('image/jpeg', 'jpeg'),
     ('image/png', 'png'),
-    ('image/cgm', 'cgm'),
 ]
 
 for (mimetype,extension) in mimetypes:
commit 01ee9406e9606b925ad246a813e05d799142dcfc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 20 14:35:29 2012 +0000

    add another bug id

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 1039526..02fa03c 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1862,7 +1862,7 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
             //glyph fallback can keep context as to what characters are the
             //inputs that caused a missing glyph in a given font.
             //
-            //See: fdo#46923/fdo#46750 for extra complexities
+            //See: fdo#46923/fdo#46896/fdo#46750 for extra complexities
             {
                 int dir = 1;
                 int out = rVI.mnMinCharPos;


More information about the Libreoffice-commits mailing list