Change in core[master]: fdo#39446 - Bloat Removal. Removing uncallable code with cal...

Jean-Noël Rouvignac (via_Code_Review) gerrit at gerrit.libreoffice.org
Tue Jan 29 16:36:19 PST 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1921

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1921/1

fdo#39446 - Bloat Removal. Removing uncallable code with callcatcher

Removed several unused methods.

Could not remove ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() and ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) because it breaks compilation (they are implementing pure virtual methods).
Should Test::test1Table1Page() really be removed? (test class)

Change-Id: I98a761f66f28e3a82661c10a5fa1dc7e109fff2f
---
M editeng/inc/editeng/editobj.hxx
M editeng/source/editeng/editobj.cxx
M l10ntools/inc/po.hxx
M l10ntools/source/po.cxx
M sc/source/filter/excel/xepivot.cxx
M sc/source/filter/inc/drawingmanager.hxx
M sc/source/filter/inc/xepivot.hxx
M sc/source/filter/oox/drawingmanager.cxx
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/source/control/templateabstractview.cxx
M tools/inc/tools/line.hxx
M tools/source/generic/line.cxx
M unusedcode.easy
M vcl/inc/outfont.hxx
M vcl/inc/vcl/settings.hxx
M vcl/inc/vcl/svapp.hxx
M vcl/source/app/settings.cxx
M vcl/source/app/svapp.cxx
M vcl/source/gdi/outdev3.cxx
M writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
M writerfilter/source/resourcemodel/util.cxx
M writerfilter/source/rtftok/rtfsprm.cxx
M writerfilter/source/rtftok/rtfsprm.hxx
M xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
M xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
25 files changed, 2 insertions(+), 221 deletions(-)



diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 985b7c4..88aca76 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -95,14 +95,12 @@
     void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
 
     bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
-    bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
 
     bool IsFieldObject() const;
     const SvxFieldItem* GetField() const;
     bool HasField( sal_Int32 nType = com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
 
     const SfxItemSet& GetParaAttribs(size_t nPara) const;
-    void SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs);
 
     void GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const;
     void SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& eFamily);
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 5f400be..4d26047 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -240,19 +240,9 @@
     return mpImpl->GetParaAttribs(nPara);
 }
 
-void EditTextObject::SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs)
-{
-    mpImpl->SetParaAttribs(nPara, rAttribs);
-}
-
 bool EditTextObject::RemoveCharAttribs( sal_uInt16 nWhich )
 {
     return mpImpl->RemoveCharAttribs(nWhich);
-}
-
-bool EditTextObject::RemoveParaAttribs( sal_uInt16 nWhich )
-{
-    return mpImpl->RemoveParaAttribs(nWhich);
 }
 
 void EditTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index a84b5a0..f3f6d6d 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -89,7 +89,6 @@
     friend class PoOfstream;
     friend class PoIfstream;
 
-                    PoHeader();
                     PoHeader( const OString& rExtSrc );
                     PoHeader( std::ifstream& rOldPo );
                     ~PoHeader();
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 23506ad..90b7f79 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -631,13 +631,6 @@
     }
 }
 
-//Default Constructor
-PoHeader::PoHeader()
-    : m_pGenPo( 0 )
-    , m_bIsInitialized( false )
-{
-}
-
 //Template Constructor
 PoHeader::PoHeader( const OString& rExtSrc )
     : m_pGenPo( new GenPoEntry() )
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 7db3245..f6ba6ff 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -779,15 +779,6 @@
     return maFieldList.GetRecord( nFieldIdx ).get();
 }
 
-XclExpPCField* XclExpPivotCache::GetFieldAcc( const rtl::OUString& rFieldName )
-{
-    XclExpPCField* pField = 0;
-    for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos )
-        if( maFieldList.GetRecord( nPos )->GetFieldName() == rFieldName )
-            pField = maFieldList.GetRecord( nPos ).get();
-    return pField;
-}
-
 void XclExpPivotCache::AddFields( const ScDPObject& rDPObj )
 {
     AddStdFields( rDPObj );
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 9c85a2f..b60dcd3 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -99,7 +99,6 @@
 class BiffDrawingObjectBase : public WorksheetHelper
 {
 public:
-    explicit            BiffDrawingObjectBase( const WorksheetHelper& rHelper );
     virtual             ~BiffDrawingObjectBase();
 
     /** Sets whether this is an area object (then its width and height must be greater than 0). */
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 41965c2..080eab7 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -199,8 +199,6 @@
 private:
     /** Returns read/write access to a pivot cache field. */
     XclExpPCField*      GetFieldAcc( sal_uInt16 nFieldIdx );
-    /** Returns read/write access to a pivot cache field. */
-    XclExpPCField*      GetFieldAcc( const rtl::OUString& rFieldName );
 
     /** Adds all pivot cache fields. */
     void                AddFields( const ScDPObject& rDPObj );
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index fab5365..c27ca3c 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -217,22 +217,6 @@
 
 // ============================================================================
 
-BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) :
-    WorksheetHelper( rHelper ),
-    maAnchor( rHelper ),
-    mnObjId( BIFF_OBJ_INVALID_ID ),
-    mnObjType( BIFF_OBJTYPE_UNKNOWN ),
-    mbHidden( false ),
-    mbVisible( true ),
-    mbPrintable( true ),
-    mbAreaObj( false ),
-    mbSimpleMacro( true ),
-    mbProcessShape( true ),
-    mbInsertShape( true ),
-    mbCustomDff( false )
-{
-}
-
 BiffDrawingObjectBase::~BiffDrawingObjectBase()
 {
 }
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx
index a5fef71..90dba09 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -100,8 +100,6 @@
 
     void deselectOverlayItems ();
 
-    void deselectOverlayItem (const sal_uInt16 nItemId);
-
     void sortOverlayItems (const boost::function<bool (const ThumbnailViewItem*,
                                                        const ThumbnailViewItem*) > &func);
 
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 0679e63..737f087 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -163,11 +163,6 @@
     mpItemView->deselectItems();
 }
 
-void TemplateAbstractView::deselectOverlayItem(const sal_uInt16 nItemId)
-{
-    mpItemView->deselectItem(nItemId);
-}
-
 void TemplateAbstractView::sortOverlayItems(const boost::function<bool (const ThumbnailViewItem*,
                                                                         const ThumbnailViewItem*) > &func)
 {
diff --git a/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx
index fba5e21..e1b62ff 100644
--- a/tools/inc/tools/line.hxx
+++ b/tools/inc/tools/line.hxx
@@ -49,7 +49,6 @@
 
     sal_Bool        Intersection( const Line& rLine, double& rIntersectionX, double& rIntersectionY ) const;
     sal_Bool        Intersection( const Line& rLine, Point& rIntersection ) const;
-    sal_Bool        Intersection( const Rectangle& rRect, Line& rIntersection ) const;
 
     double          GetDistance( const double& rPtX, const double& rPtY ) const;
     double          GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); }
diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx
index 4c7e691..11bf510 100644
--- a/tools/source/generic/line.cxx
+++ b/tools/source/generic/line.cxx
@@ -98,63 +98,6 @@
     return bOk;
 }
 
-sal_Bool Line::Intersection( const Rectangle& rRect, Line& rIntersection ) const
-{
-    const sal_Bool  bStartInside = rRect.IsInside( maStart );
-    const sal_Bool  bEndInside = rRect.IsInside( maEnd );
-    sal_Bool        bRet = sal_True;
-
-    if( bStartInside && bEndInside )
-    {
-        // line completely inside rect
-        rIntersection.maStart = maStart;
-        rIntersection.maEnd = maEnd;
-    }
-    else
-    {
-        // calculate intersections
-        const Point aTL( rRect.TopLeft() ), aTR( rRect.TopRight() );
-        const Point aBR( rRect.BottomRight() ), aBL( rRect.BottomLeft() );
-        Point       aIntersect1, aIntersect2;
-        Point*      pCurIntersection = &aIntersect1;
-
-        if( Intersection( Line( aTL, aTR ), *pCurIntersection ) )
-            pCurIntersection = &aIntersect2;
-
-        if( Intersection( Line( aTR, aBR ), *pCurIntersection ) )
-            pCurIntersection = ( pCurIntersection == &aIntersect1 ) ? &aIntersect2 : NULL;
-
-        if( pCurIntersection && Intersection( Line( aBR, aBL ), *pCurIntersection ) )
-            pCurIntersection = ( pCurIntersection == &aIntersect1 ) ? &aIntersect2 : NULL;
-
-        if( pCurIntersection && Intersection( Line( aBL, aTL ), *pCurIntersection ) )
-            pCurIntersection = ( pCurIntersection == &aIntersect1 ) ? &aIntersect2 : NULL;
-
-        if( !pCurIntersection )
-        {
-            // two intersections
-            rIntersection.maStart = aIntersect1;
-            rIntersection.maEnd = aIntersect2;
-        }
-        else if( pCurIntersection == &aIntersect2 )
-        {
-            // one intersection
-            rIntersection.maStart = aIntersect1;
-
-            if( ( maStart != aIntersect1 ) && bStartInside )
-                rIntersection.maEnd = maStart;
-            else if( ( maEnd != aIntersect1 ) && bEndInside )
-                rIntersection.maEnd = maEnd;
-            else
-                rIntersection.maEnd = rIntersection.maStart;
-        }
-        else
-            bRet = sal_False;
-    }
-
-    return bRet;
-}
-
 double Line::GetDistance( const double& rPtX, const double& rPtY ) const
 {
     double fDist;
diff --git a/unusedcode.easy b/unusedcode.easy
index bbef784..a66539d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,21 +1,11 @@
-Application::GetDisplayScreenName(unsigned int)
-EditTextObject::RemoveParaAttribs(unsigned short)
-EditTextObject::SetParaAttribs(unsigned long, SfxItemSet const&)
-FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
-Line::Intersection(Rectangle const&, Line&) const
-PoHeader::PoHeader()
-SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
 ScFiltersTest::testColorScaleODS()
 ScFiltersTest::testColorScaleXLSX()
 ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
-StyleSettings::GetPersonaFooter() const
 SvxBrushItem::SetFillStyle(com::sun::star::drawing::FillStyle)
 SvxBrushItem::SetGradient(Gradient&)
-TemplateAbstractView::deselectOverlayItem(unsigned short)
 Test::test1Table1Page()
 TextEngine::GetLeftMargin() const
-XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
 apitest::XCellRangesQuery::testQueryFormulaCells()
 apitest::XDataPilotDescriptor::testGetHiddenFields()
 apitest::XDataPilotFieldGrouping::testCreateDateGroup()
@@ -43,9 +33,7 @@
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
 jfw_plugin::VendorBase::createInstance()
-oox::drawingml::TextListStyle::dump() const
-oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
-sc_apitest::main()
+oox::drawingml::TextListStyle::dump() const # Only used in debug mode
 sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
 sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
@@ -58,5 +46,3 @@
 unicode::isLower(unsigned short)
 unicode::isPrint(unsigned short)
 unicode::isUpper(unsigned short)
-writerfilter::logger(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
-writerfilter::rtftok::RTFSprms::swap(writerfilter::rtftok::RTFSprms&)
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 53ec909..1bf500d 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -191,8 +191,6 @@
 public:
                         FontSelectPattern( const Font&, const String& rSearchName,
                             const Size&, float fExactHeight );
-                        FontSelectPattern( const PhysicalFontFace&, const Size&,
-                            float fExactHeight, int nOrientation, bool bVertical );
 
 public: // TODO: change to private
     const PhysicalFontFace* mpFontData;         // a matching PhysicalFontFace object
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 9d99ad0..07caf91 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -867,7 +867,6 @@
                                         { CopyData(); mpData->maFrameStyle = rStyle; }
 
     const BitmapEx                  GetPersonaHeader() const;
-    const BitmapEx                  GetPersonaFooter() const;
 
     void                            SetStandardStyles();
 
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 76f87e2..8758797 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -298,7 +298,6 @@
     static unsigned int  GetDisplayBuiltInScreen();
     // Practically, this means - Get the screen we should run a presentation on.
     static unsigned int  GetDisplayExternalScreen();
-    SAL_DLLPRIVATE static rtl::OUString GetDisplayScreenName( unsigned int nScreen );
 
     static const LocaleDataWrapper& GetAppLocaleDataWrapper();
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index caedc9d..568a39f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -766,12 +766,6 @@
     return mpData->maPersonaHeaderBitmap;
 }
 
-const BitmapEx StyleSettings::GetPersonaFooter() const
-{
-    setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->maPersonaFooterBitmap );
-    return mpData->maPersonaFooterBitmap;
-}
-
 // -----------------------------------------------------------------------
 
 void StyleSettings::SetStandardStyles()
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b8d35a3..612da62 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1224,12 +1224,6 @@
     return pSys ? pSys->GetDisplayScreenCount() : 0;
 }
 
-rtl::OUString Application::GetDisplayScreenName( unsigned int nScreen )
-{
-    SalSystem* pSys = ImplGetSalSystem();
-    return pSys ? pSys->GetDisplayScreenName( nScreen ) : rtl::OUString();
-}
-
 bool Application::IsUnifiedDisplay()
 {
     SalSystem* pSys = ImplGetSalSystem();
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index fe3d652..c901459 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2174,14 +2174,6 @@
     // NOTE: no normalization for width/height/orientation
 }
 
-FontSelectPattern::FontSelectPattern( const PhysicalFontFace& rFontData,
-    const Size& rSize, float fExactHeight, int nOrientation, bool bVertical )
-    : FontSelectPatternAttributes(rFontData, rSize, fExactHeight, nOrientation, bVertical)
-    , mpFontData( &rFontData )
-    , mpFontEntry( NULL )
-{
-}
-
 void FontSelectPattern::copyAttributes(const FontSelectPatternAttributes &rAttributes)
 {
     static_cast<FontSelectPatternAttributes&>(*this) = rAttributes;
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 06a66d9..886d2f6 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -398,8 +398,6 @@
 /**
    Creates handler for a stream.
 */
-    void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC logger(string prefix, string message);
-
     void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props);
     void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n);
     void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/,
diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx
index ecb338f..2966f85 100644
--- a/writerfilter/source/resourcemodel/util.cxx
+++ b/writerfilter/source/resourcemodel/util.cxx
@@ -50,12 +50,6 @@
 }
 
 
-void logger(string prefix, string message)
-{
-    logger_stream() << prefix <<  ":" << message << endl;
-    logger_stream().flush();
-}
-
 string xmlify(const string & str)
 {
     string result = "";
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index ed25daf..1c3c5a5 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -192,13 +192,6 @@
     return *this;
 }
 
-void RTFSprms::swap(RTFSprms& rOther)
-{
-    boost::intrusive_ptr<RTFSprmsImpl> pTmp = rOther.m_pSprms;
-    rOther.m_pSprms = m_pSprms;
-    m_pSprms = pTmp;
-}
-
 void RTFSprms::clear()
 {
     if (m_pSprms->m_nRefCount == 1)
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 58955c4..1ae83dc 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -71,7 +71,6 @@
             bool erase(Id nKeyword);
             /// Removes elements, which are already in the reference set.
             void deduplicate(RTFSprms& rReference);
-            void swap(RTFSprms& rOther);
             size_t size() const { return m_pSprms->size(); }
             bool empty() const { return m_pSprms->empty(); }
             Entry_t& back() { return m_pSprms->back(); }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index 1e291f2..1fa8172 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -132,30 +132,4 @@
     return m_Entries;
 }
 
-//Helper method
-void SanExtensionImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) {
-    unsigned int i ;
-    if( value != NULL && vlen != 0 ) {
-        Sequence< sal_Int8 > extnv( vlen ) ;
-        for( i = 0; i < vlen ; i ++ )
-            extnv[i] = *( value + i ) ;
-
-        m_xExtnValue = extnv ;
-    } else {
-        m_xExtnValue = Sequence<sal_Int8>();
-    }
-
-    if( id != NULL && idlen != 0 ) {
-        Sequence< sal_Int8 > extnId( idlen ) ;
-        for( i = 0; i < idlen ; i ++ )
-            extnId[i] = *( id + i ) ;
-
-        m_xExtnId = extnId ;
-    } else {
-        m_xExtnId =  Sequence<sal_Int8>();
-    }
-
-    m_critical = critical ;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index e3de5fb..b8fdae4 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * This file is part of the LibreOffice project.
+ * This file is part of the LibreOffice project.setCertExtn
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -193,32 +193,6 @@
         objID = oidString;
     return objID;
 
-}
-
-//Helper method
-void SanExtensionImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) {
-    unsigned int i ;
-    if( value != NULL && vlen != 0 ) {
-        Sequence< sal_Int8 > extnv( vlen ) ;
-        for( i = 0; i < vlen ; i ++ )
-            extnv[i] = *( value + i ) ;
-
-        m_xExtnValue = extnv ;
-    } else {
-        m_xExtnValue = Sequence<sal_Int8>();
-    }
-
-    if( id != NULL && idlen != 0 ) {
-        Sequence< sal_Int8 > extnId( idlen ) ;
-        for( i = 0; i < idlen ; i ++ )
-            extnId[i] = *( id + i ) ;
-
-        m_xExtnId = extnId ;
-    } else {
-        m_xExtnId =  Sequence<sal_Int8>();
-    }
-
-    m_critical = critical ;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

-- 
To view, visit https://gerrit.libreoffice.org/1921
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98a761f66f28e3a82661c10a5fa1dc7e109fff2f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jean-Noël Rouvignac <jn.rouvignac at gmail.com>


More information about the LibreOffice mailing list