[Libreoffice-commits] .: 2 commits - boost/boost.4713.warnings.patch sot/inc sot/source ucb/source unusedcode.easy xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 20 04:13:29 PDT 2012
boost/boost.4713.warnings.patch | 119 +++++++++-
sot/inc/sot/storage.hxx | 1
sot/source/sdstor/stgcache.cxx | 5
sot/source/sdstor/stgcache.hxx | 1
sot/source/sdstor/ucbstorage.cxx | 54 ----
ucb/source/ucp/cmis/cmis_content.cxx | 9
ucb/source/ucp/cmis/cmis_content.hxx | 2
unusedcode.easy | 9
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 6
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 23 -
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 11
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 1
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 10
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 1
16 files changed, 128 insertions(+), 128 deletions(-)
New commits:
commit b972e05976e50c94e700800bbc78b54186c3b9f5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 20 10:16:48 2012 +0100
more shadow warnings at highest debugging levels
Change-Id: Iad5dd52961be6ef82836ccb5e9c12ab6bb3c034d
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index 6564c9b..d1224f6 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -906,7 +906,7 @@
if( !allow_null )
{
BOOST_PTR_CONTAINER_THROW_EXCEPTION( 0 == x && "null not allowed",
---- misc/boost_1_44_0/boost/pool/object_pool.hpp.orig 2011-07-14 16:08:31.672964851 +0100
+--- misc/boost_1_44_0/boost/pool/object_pool.hpp 2011-07-14 16:08:31.672964851 +0100
+++ misc/build/boost_1_44_0/boost/pool/object_pool.hpp 2011-07-14 16:09:20.851594534 +0100
@@ -53,8 +53,8 @@
@@ -957,3 +957,120 @@
typedef boost::date_time::all_date_names_put<greg_facet_config, wchar_t> facet_def;
return std::locale(loc, new facet_def(w_short_month_names,
w_long_month_names,
+--- misc/boost_1_44_0/boost/date_time/time_facet.hpp 2012-08-20 09:12:51.552094137 +0100
++++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp 2012-08-20 09:10:07.884255317 +0100
+@@ -439,31 +439,31 @@
+ a_time_dur.get_rep().as_special());
+ }
+
+- string_type format(m_time_duration_format);
++ string_type lcl_format(m_time_duration_format);
+ if (a_time_dur.is_negative()) {
+ // replace %- with minus sign. Should we use the numpunct facet?
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ duration_sign_negative_only,
+ negative_sign);
+ // remove all the %+ in the string with '-'
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ duration_sign_always,
+ negative_sign);
+ }
+ else { //duration is positive
+ // remove all the %- combos from the string
+- boost::algorithm::erase_all(format, duration_sign_negative_only);
++ boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
+ // remove all the %+ in the string with '+'
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ duration_sign_always,
+ positive_sign);
+ }
+
+ // %T and %R have to be replaced here since they are not standard
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ boost::as_literal(formats_type::full_24_hour_time_format),
+ boost::as_literal(formats_type::full_24_hour_time_expanded_format));
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ boost::as_literal(formats_type::short_24_hour_time_format),
+ boost::as_literal(formats_type::short_24_hour_time_expanded_format));
+
+@@ -476,22 +476,22 @@
+ * here ourself.
+ */
+ string_type hours_str;
+- if (format.find(unrestricted_hours_format) != string_type::npos) {
++ if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
+ hours_str = hours_as_string(a_time_dur);
+- boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
++ boost::algorithm::replace_all(lcl_format, unrestricted_hours_format, hours_str);
+ }
+ // We still have to process restricted hours format specifier. In order to
+ // support parseability of durations in ISO format (%H%M%S), we'll have to
+ // restrict the stringified hours length to 2 characters.
+- if (format.find(hours_format) != string_type::npos) {
++ if (lcl_format.find(hours_format) != string_type::npos) {
+ if (hours_str.empty())
+ hours_str = hours_as_string(a_time_dur);
+ BOOST_ASSERT(hours_str.length() <= 2);
+- boost::algorithm::replace_all(format, hours_format, hours_str);
++ boost::algorithm::replace_all(lcl_format, hours_format, hours_str);
+ }
+
+ string_type frac_str;
+- if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
++ if (lcl_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
+ // replace %s with %S.nnn
+ frac_str =
+ fractional_seconds_as_string(a_time_dur, false);
+@@ -500,21 +500,21 @@
+ string_type replace_string(seconds_format);
+ replace_string += sep;
+ replace_string += frac_str;
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ seconds_with_fractional_seconds_format,
+ replace_string);
+ }
+- if (format.find(fractional_seconds_format) != string_type::npos) {
++ if (lcl_format.find(fractional_seconds_format) != string_type::npos) {
+ // replace %f with nnnnnnn
+ if (!frac_str.size()) {
+ frac_str = fractional_seconds_as_string(a_time_dur, false);
+ }
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ fractional_seconds_format,
+ frac_str);
+ }
+
+- if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
++ if (lcl_format.find(fractional_seconds_or_none_format) != string_type::npos) {
+ // replace %F with nnnnnnn or nothing if fs == 0
+ frac_str =
+ fractional_seconds_as_string(a_time_dur, true);
+@@ -523,18 +523,18 @@
+ string_type replace_string;
+ replace_string += sep;
+ replace_string += frac_str;
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ fractional_seconds_or_none_format,
+ replace_string);
+ }
+ else {
+- boost::algorithm::erase_all(format,
++ boost::algorithm::erase_all(lcl_format,
+ fractional_seconds_or_none_format);
+ }
+ }
+
+ return this->do_put_tm(a_next, a_ios, a_fill,
+- to_tm(a_time_dur), format);
++ to_tm(a_time_dur), lcl_format);
+ }
+
+ OutItrT put(OutItrT next, std::ios_base& a_ios,
commit 350b031df03a2753fecc649f528e9c2f3b6d4233
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 18 11:33:50 2012 +0100
callcatcher: remove some of the slightly trickier unused methods
Change-Id: Ief164c980f3a92316e1f47cb50bdf243155b6dd9
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 7f97566..33fb030 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -212,7 +212,6 @@ public:
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
sal_Bool IsOLEStorage() const;
static sal_Bool IsOLEStorage( const String & rFileName );
static sal_Bool IsOLEStorage( SvStream* pStream );
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 403dabe..cf6f8cb 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -544,9 +544,4 @@ sal_Int32 StgCache::Page2Pos( sal_Int32 nPage )
return( nPage * nPageSize ) + nPageSize;
}
-sal_Int32 StgCache::Pos2Page( sal_Int32 nPos )
-{
- return ( ( nPos + nPageSize - 1 ) / nPageSize ) * nPageSize - 1;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index cad4e7e..517e27a 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -50,7 +50,6 @@ protected:
sal_Bool bMyStream; // sal_True: delete stream in dtor
sal_Bool bFile; // sal_True: file stream
sal_Int32 Page2Pos( sal_Int32 ); // page address --> file position
- sal_Int32 Pos2Page( sal_Int32 ); // file position --> page address
public:
StgCache();
~StgCache();
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 86f17ed..46fb25e 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3380,58 +3380,4 @@ sal_Bool UCBStorage::GetProperty( const String& rName, ::com::sun::star::uno::An
return sal_False;
}
-sal_Bool UCBStorage::GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- UCBStorageElement_Impl *pEle = FindElement_Impl( rEleName );
- if ( !pEle )
- return sal_False;
-
- if ( !pEle->m_bIsFolder )
- {
- if ( !pEle->m_xStream.Is() )
- pImp->OpenStream( pEle, pImp->m_nMode, pImp->m_bDirect );
- if ( pEle->m_xStream->m_nError )
- {
- pEle->m_xStream.Clear();
- return sal_False;
- }
-
- try
- {
- if ( pEle->m_xStream->m_pContent )
- {
- rValue = pEle->m_xStream->m_pContent->getPropertyValue( rName );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
- }
- else
- {
- if ( !pEle->m_xStorage.Is() )
- pImp->OpenStorage( pEle, pImp->m_nMode, pImp->m_bDirect );
- if ( pEle->m_xStorage->m_nError )
- {
- pEle->m_xStorage.Clear();
- return sal_False;
- }
-
- try
- {
- if ( pEle->m_xStorage->GetContent() )
- {
- rValue = pEle->m_xStorage->m_pContent->getPropertyValue( rName );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
- }
-
- return sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 8404203..5d198d9 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -761,15 +761,6 @@ namespace cmis
return sal_True;
}
- sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifier >& /*xNewId*/ )
- {
- sal_Bool bRet = sal_False;
- SAL_INFO( "cmisucp", "TODO - Content::exchangeIdentity()" );
- // TODO Implement me
-
- return bRet;
- }
-
uno::Sequence< beans::Property > Content::getProperties(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
{
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 0c24b6a..2b5c6b2 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -125,8 +125,6 @@ private:
sal_Bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
- sal_Bool exchangeIdentity(const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xNewId);
-
void resetAuthProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
public:
diff --git a/unusedcode.easy b/unusedcode.easy
index bc55f29..984dff6 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3,14 +3,11 @@ AlphaMask::Scale(double const&, double const&, unsigned long)
AlphaMask::ScaleCropRotate(double const&, double const&, Rectangle const&, long, Color const&, unsigned long)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
PopupMenu::SetSelectedEntry(unsigned short)
-SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-StgCache::Pos2Page(int)
SvtSlideSorterBarOptions::AddListenerLink(Link const&)
SvtSlideSorterBarOptions::RemoveListenerLink(Link const&)
TextEngine::GetLeftMargin() const
@@ -21,15 +18,13 @@ ThumbnailView::SetColCount(unsigned short)
ThumbnailView::SetLineCount(unsigned short)
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
-UCBStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
X11SalGraphics::Clip(int&, int&, unsigned int&, unsigned int&, int&, int&) const
-X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
-binfilter::Dictionary::~Dictionary()
+basctl::ModulWindow::SetLineNumberDisplay(bool)
binfilter::ImpSvtData::~ImpSvtData()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize()
@@ -45,7 +40,6 @@ binfilter::ScMyDelAction::~ScMyDelAction()
binfilter::ScMyMoveAction::~ScMyMoveAction()
binfilter::ScMySharedData::~ScMySharedData()
binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SdrViewUserMarker::SdrViewUserMarker(binfilter::SdrPaintView*)
binfilter::ShellResource::~ShellResource()
binfilter::SoDll::~SoDll()
binfilter::String::Search(unsigned short const*, unsigned short) const
@@ -75,7 +69,6 @@ cairocanvas::CanvasHelper::getPalette()
cairocanvas::SpriteDeviceHelper::getSurface()
cairocanvas::TextLayout::draw(_cairo*)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
-cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index 0b15808..1e291f2 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -133,12 +133,6 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno:
}
//Helper method
-void SanExtensionImpl :: setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) {
- m_critical = critical ;
- m_xExtnId = extnId ;
- m_xExtnValue = extnValue ;
-}
-
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 ) {
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
index 4ab8aaa..2ee767c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
@@ -64,8 +64,6 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1<
virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ) ;
//Helper method
- void setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) ;
-
void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ;
} ;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index c6cab0e..e3de5fb 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -184,23 +184,18 @@ namespace {
}
::rtl::OString SanExtensionImpl :: removeOIDFromString( const ::rtl::OString &oidString)
- {
- ::rtl::OString objID;
- ::rtl::OString oid("OID.");
- if (oidString.match(oid))
- objID = oidString.copy(oid.getLength());
- else
- objID = oidString;
- return objID;
+{
+ ::rtl::OString objID;
+ ::rtl::OString oid("OID.");
+ if (oidString.match(oid))
+ objID = oidString.copy(oid.getLength());
+ else
+ objID = oidString;
+ return objID;
- }
-//Helper method
-void SanExtensionImpl :: setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) {
- m_critical = critical ;
- m_xExtnId = extnId ;
- m_xExtnValue = extnValue ;
}
+//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 ) {
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index b83c675..84f7f09 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -57,8 +57,6 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1<
virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ) ;
//Helper method
- void setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) ;
-
void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ;
} ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 5213627..7f56603 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -240,17 +240,6 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl :: getUnoTunnelId() {
return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq();
}
-/* XUnoTunnel extension */
-SecurityEnvironment_NssImpl* SecurityEnvironment_NssImpl :: getImplementation( const Reference< XInterface > xObj ) {
- Reference< XUnoTunnel > xUT( xObj , UNO_QUERY ) ;
- if( xUT.is() ) {
- return reinterpret_cast<SecurityEnvironment_NssImpl*>(
- sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( getUnoTunnelId() ))) ;
- } else
- return NULL ;
-}
-
-
::rtl::OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
{
rtl::OUString result;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 513decb..75fa7fc 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -117,7 +117,6 @@ private :
throw (::com::sun::star::uno::RuntimeException);
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
- static SecurityEnvironment_NssImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xObj ) ;
//Native mehtods
virtual CERTCertDBHandle* getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 1b02955..c78aec7 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -321,16 +321,6 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() {
return theX509Certificate_NssImplUnoTunnelId::get().getSeq();
}
-/* XUnoTunnel extension */
-X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Reference< XInterface > xObj ) {
- Reference< XUnoTunnel > xUT( xObj , UNO_QUERY ) ;
- if( xUT.is() ) {
- return reinterpret_cast<X509Certificate_NssImpl*>(
- sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( getUnoTunnelId() )));
- } else
- return NULL ;
-}
-
::rtl::OUString getAlgorithmDescription(SECAlgorithmID *aid)
{
SECOidTag tag;
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index ac70616..01ae74e 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -83,7 +83,6 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2<
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException);
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
- static X509Certificate_NssImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xObj ) ;
//Helper methods
void setCert( CERTCertificate* cert ) ;
More information about the Libreoffice-commits
mailing list