summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx9
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.hxx3
-rw-r--r--unoxml/source/dom/documentbuilder.cxx10
-rw-r--r--unoxml/source/dom/documentbuilder.hxx6
-rw-r--r--unoxml/source/dom/documenttype.cxx4
-rw-r--r--unoxml/source/dom/entitiesmap.cxx3
-rw-r--r--unoxml/source/dom/entitiesmap.hxx5
-rw-r--r--unoxml/source/dom/notationsmap.cxx4
-rw-r--r--unoxml/source/dom/notationsmap.hxx5
-rw-r--r--unoxml/source/rdf/CBlankNode.cxx12
-rw-r--r--unoxml/source/rdf/CLiteral.cxx12
-rw-r--r--unoxml/source/rdf/CURI.cxx12
12 files changed, 31 insertions, 54 deletions
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 87827e7ce216..e9f6259807aa 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1041,10 +1041,9 @@ static bool _UCBOpenContentSync(
return ( bAborted || bException );
}
-UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler )
+UcbLockBytes::UcbLockBytes()
: m_aExpireDate( DateTime::EMPTY )
, m_xInputStream (nullptr)
- , m_xHandler( pHandler )
, m_nError( ERRCODE_NONE )
, m_bTerminated (false)
, m_bDontClose( false )
@@ -1375,7 +1374,7 @@ UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStrea
if( !xInputStream.is() )
return nullptr;
- UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
+ UcbLockBytesRef xLockBytes = new UcbLockBytes;
xLockBytes->setDontClose_Impl();
xLockBytes->setInputStream_Impl( xInputStream );
xLockBytes->terminate_Impl();
@@ -1387,7 +1386,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre
if( !xStream.is() )
return nullptr;
- UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
+ UcbLockBytesRef xLockBytes = new UcbLockBytes;
xLockBytes->setDontClose_Impl();
xLockBytes->setStream_Impl( xStream );
xLockBytes->terminate_Impl();
@@ -1400,7 +1399,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
if( !xContent.is() )
return nullptr;
- UcbLockBytesRef xLockBytes = new UcbLockBytes( pHandler );
+ UcbLockBytesRef xLockBytes = new UcbLockBytes;
xLockBytes->SetSynchronMode( !pHandler );
Reference< XActiveDataControl > xSink;
if ( eOpenMode & StreamMode::WRITE )
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index b16a51260d2a..b97151f42648 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -87,7 +87,6 @@ class UcbLockBytes : public virtual SvLockBytes
css::uno::Reference < css::io::XInputStream > m_xInputStream;
css::uno::Reference < css::io::XOutputStream > m_xOutputStream;
css::uno::Reference < css::io::XSeekable > m_xSeekable;
- tools::SvRef<UcbLockBytesHandler> m_xHandler;
ErrCode m_nError;
@@ -95,7 +94,7 @@ class UcbLockBytes : public virtual SvLockBytes
bool m_bDontClose;
bool m_bStreamValid;
- UcbLockBytes( UcbLockBytesHandler* pHandler );
+ UcbLockBytes();
protected:
virtual ~UcbLockBytes();
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index b48344cf4130..eafab7e2bf9f 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -87,10 +87,8 @@ namespace DOM
};
- CDocumentBuilder::CDocumentBuilder(
- Reference< XMultiServiceFactory > const& xFactory)
- : m_xFactory(xFactory)
- , m_xEntityResolver(new CDefaultEntityResolver())
+ CDocumentBuilder::CDocumentBuilder()
+ : m_xEntityResolver(new CDefaultEntityResolver())
{
// init libxml. libxml will protect itself against multiple
// initializations so there is no problem here if this gets
@@ -98,9 +96,9 @@ namespace DOM
xmlInitParser();
}
- Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< XMultiServiceFactory >& rSMgr)
+ Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< XMultiServiceFactory >& )
{
- return static_cast< XDocumentBuilder* >(new CDocumentBuilder(rSMgr));
+ return static_cast< XDocumentBuilder* >(new CDocumentBuilder);
}
const char* CDocumentBuilder::aImplementationName = "com.sun.star.comp.xml.dom.DocumentBuilder";
diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx
index 441b5dd58eb2..045a19ef455e 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -51,17 +51,13 @@ namespace DOM
{
private:
::osl::Mutex m_Mutex;
- css::uno::Reference< css::lang::XMultiServiceFactory > const
- m_xFactory;
css::uno::Reference< css::xml::sax::XEntityResolver > m_xEntityResolver;
css::uno::Reference< css::xml::sax::XErrorHandler > m_xErrorHandler;
public:
// ctor
- explicit CDocumentBuilder(
- css::uno::Reference< css::lang::XMultiServiceFactory > const&
- xFactory);
+ explicit CDocumentBuilder();
// static helpers for service info and component management
static const char* aImplementationName;
diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx
index af63d89d79cb..ddc32016dbe6 100644
--- a/unoxml/source/dom/documenttype.cxx
+++ b/unoxml/source/dom/documenttype.cxx
@@ -52,7 +52,7 @@ namespace DOM
css::uno::Reference< XNamedNodeMap > aMap;
if (m_aDtdPtr != nullptr)
{
- aMap.set(new CEntitiesMap(this));
+ aMap.set(new CEntitiesMap);
}
return aMap;
}
@@ -93,7 +93,7 @@ namespace DOM
css::uno::Reference< XNamedNodeMap > aMap;
if (m_aDtdPtr != nullptr)
{
- aMap.set(new CNotationsMap(this));
+ aMap.set(new CNotationsMap);
}
return aMap;
}
diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx
index 08dfb35fef2b..a281fa1b07ce 100644
--- a/unoxml/source/dom/entitiesmap.cxx
+++ b/unoxml/source/dom/entitiesmap.cxx
@@ -28,8 +28,7 @@ using namespace css::xml::dom;
namespace DOM
{
- CEntitiesMap::CEntitiesMap(::rtl::Reference<CDocumentType> const& pDocType)
- : m_pDocType(pDocType)
+ CEntitiesMap::CEntitiesMap()
{
}
diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx
index 1a3f1e387c77..b358ae6795a7 100644
--- a/unoxml/source/dom/entitiesmap.hxx
+++ b/unoxml/source/dom/entitiesmap.hxx
@@ -36,11 +36,8 @@ namespace DOM
class CEntitiesMap
: public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap >
{
- private:
- ::rtl::Reference<CDocumentType> const m_pDocType;
-
public:
- CEntitiesMap(::rtl::Reference<CDocumentType> const& pDocType);
+ CEntitiesMap();
/**
The number of nodes in this map.
diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx
index 6e84d07982f0..d2fc182cab8a 100644
--- a/unoxml/source/dom/notationsmap.cxx
+++ b/unoxml/source/dom/notationsmap.cxx
@@ -28,9 +28,7 @@ using namespace css::xml::dom;
namespace DOM
{
- CNotationsMap::CNotationsMap(
- ::rtl::Reference<CDocumentType> const& pDocType)
- : m_pDocType(pDocType)
+ CNotationsMap::CNotationsMap()
{
}
diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx
index d07277e1928f..a68452e44fd8 100644
--- a/unoxml/source/dom/notationsmap.hxx
+++ b/unoxml/source/dom/notationsmap.hxx
@@ -36,11 +36,8 @@ namespace DOM
class CNotationsMap
: public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap >
{
- private:
- ::rtl::Reference<CDocumentType> const m_pDocType;
-
public:
- CNotationsMap(::rtl::Reference<CDocumentType> const& pDocType);
+ CNotationsMap();
/**
The number of nodes in this map.
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 84b35ce5cc90..a299be2d880f 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -40,7 +40,7 @@ class CBlankNode:
private boost::noncopyable
{
public:
- explicit CBlankNode(css::uno::Reference< css::uno::XComponentContext > const & context);
+ CBlankNode();
virtual ~CBlankNode() {}
// css::lang::XServiceInfo:
@@ -55,13 +55,11 @@ public:
virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
private:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
OUString m_NodeID;
};
-CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const & context) :
- m_xContext(context), m_NodeID()
+CBlankNode::CBlankNode() :
+ m_NodeID()
{}
// com.sun.star.uno.XServiceInfo:
@@ -130,9 +128,9 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
}
css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
- const css::uno::Reference< css::uno::XComponentContext > & context)
+ const css::uno::Reference< css::uno::XComponentContext > & )
{
- return static_cast< ::cppu::OWeakObject * >(new CBlankNode(context));
+ return static_cast< ::cppu::OWeakObject * >(new CBlankNode);
}
} // closing component helper namespace
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 04dd0212322d..fa858767a0c7 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -42,7 +42,7 @@ class CLiteral:
private boost::noncopyable
{
public:
- explicit CLiteral(css::uno::Reference< css::uno::XComponentContext > const & context);
+ explicit CLiteral();
virtual ~CLiteral() {}
// css::lang::XServiceInfo:
@@ -62,15 +62,13 @@ public:
virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) override;
private:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
OUString m_Value;
OUString m_Language;
css::uno::Reference< css::rdf::XURI > m_xDatatype;
};
-CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & context) :
- m_xContext(context), m_Value(), m_Language(), m_xDatatype()
+CLiteral::CLiteral() :
+ m_Value(), m_Language(), m_xDatatype()
{}
// com.sun.star.uno.XServiceInfo:
@@ -193,9 +191,9 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
}
css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
- const css::uno::Reference< css::uno::XComponentContext > & context)
+ const css::uno::Reference< css::uno::XComponentContext > & )
{
- return static_cast< ::cppu::OWeakObject * >(new CLiteral(context));
+ return static_cast< ::cppu::OWeakObject * >(new CLiteral);
}
} // closing component helper namespace
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index c9b7f760450c..caf54d1930d3 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -41,7 +41,7 @@ class CURI:
private boost::noncopyable
{
public:
- explicit CURI(css::uno::Reference< css::uno::XComponentContext > const & context);
+ explicit CURI();
virtual ~CURI() {}
// css::lang::XServiceInfo:
@@ -63,14 +63,12 @@ private:
/// handle css.rdf.URIs
void SAL_CALL initFromConstant(const sal_Int16 i_Constant);
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
OUString m_Namespace;
OUString m_LocalName;
};
-CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) :
- m_xContext(context), m_Namespace(), m_LocalName()
+CURI::CURI() :
+ m_Namespace(), m_LocalName()
{}
// com.sun.star.uno.XServiceInfo:
@@ -820,9 +818,9 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
}
css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
- const css::uno::Reference< css::uno::XComponentContext > & context)
+ const css::uno::Reference< css::uno::XComponentContext > & )
{
- return static_cast< ::cppu::OWeakObject * >(new CURI(context));
+ return static_cast< ::cppu::OWeakObject * >(new CURI);
}
} // closing component helper namespace
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 21:21:15 +0000