summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--oox/source/core/contexthandler2.cxx2
-rw-r--r--oox/source/core/recordparser.cxx5
-rw-r--r--oox/source/core/xmlfilterbase.cxx10
-rw-r--r--oox/source/export/drawingml.cxx2
-rw-r--r--oox/source/ppt/backgroundproperties.cxx2
-rw-r--r--package/source/zipapi/ZipFile.cxx6
-rw-r--r--package/source/zipapi/blowfishcontext.cxx2
-rw-r--r--package/source/zipapi/sha1context.cxx2
-rw-r--r--package/source/zippackage/ZipPackage.cxx2
9 files changed, 15 insertions, 18 deletions
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index b7924cc9fa4a..8ce9784b99ef 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -92,7 +92,7 @@ Reference< XFastContextHandler > ContextHandler2Helper::implCreateChildContext(
// #i76091# process collected characters (calls onCharacters() if needed)
processCollectedChars();
ContextHandlerRef xContext = onCreateContext( nElement, AttributeList( rxAttribs ) );
- return Reference< XFastContextHandler >( xContext.get() );
+ return xContext;
}
void ContextHandler2Helper::implStartElement( sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 6d9d7b4e6004..d6f35facaf65 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -131,7 +131,7 @@ ContextHandlerRef ContextStack::getCurrentContext() const
{
if( !maStack.empty() )
return maStack.back().second;
- return mxHandler.get();
+ return mxHandler;
}
void ContextStack::pushContext( const RecordInfo& rRecInfo, const ContextHandlerRef& rxContext )
@@ -241,8 +241,7 @@ void RecordParser::parseStream( const RecordInputSource& rInputSource )
throw SAXException();
// start the document
- Reference< XLocator > xLocator( mxLocator.get() );
- mxHandler->setDocumentLocator( xLocator );
+ mxHandler->setDocumentLocator( mxLocator );
mxHandler->startDocument();
// parse the stream
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index fd425f3940ba..bb63873f5540 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -374,8 +374,7 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
}
// get the XFastDocumentHandler interface from the fragment handler
- Reference< XFastDocumentHandler > xDocHandler( rxHandler.get() );
- if( !xDocHandler.is() )
+ if( !rxHandler.is() )
return false;
// try to import XML stream
@@ -403,7 +402,7 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
// own try/catch block for showing parser failure assertion with fragment path
if( xInStrm.is() ) try
{
- rParser.setDocumentHandler(xDocHandler);
+ rParser.setDocumentHandler(rxHandler);
rParser.parseStream(xInStrm, aFragmentPath);
return true;
}
@@ -456,14 +455,13 @@ Reference<XDocument> XmlFilterBase::importFragment( const OUString& aFragmentPat
bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& rxHandler,
const Reference< XFastSAXSerializable >& rxSerializer )
{
- Reference< XFastDocumentHandler > xDocHandler( rxHandler.get() );
- if( !xDocHandler.is() )
+ if( !rxHandler.is() )
return false;
// try to import XML stream
try
{
- rxSerializer->fastSerialize( xDocHandler,
+ rxSerializer->fastSerialize( rxHandler,
mxImpl->maFastParser.getTokenHandler(),
Sequence< StringPair >(),
NamespaceIds::get() );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 86c57f86acc1..a6316cee1278 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -5016,7 +5016,7 @@ void DrawingML::WriteFromTo(const uno::Reference<css::drawing::XShape>& rXShape,
awt::Point aTopLeft = rXShape->getPosition();
awt::Size aSize = rXShape->getSize();
- SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rXShape.get());
+ SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rXShape);
if (pObj)
{
Degree100 nRotation = pObj->GetRotateAngle();
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index 2ffde9e5e038..9fe25661205d 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -42,7 +42,7 @@ BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2 const
return this;
}
- return ::oox::drawingml::FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrFillProperties ).get();
+ return ::oox::drawingml::FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrFillProperties );
}
}
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 2a76c7b750ed..6ee7bdc0d43d 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -647,15 +647,15 @@ uno::Reference< XInputStream > ZipFile::createStreamForZipEntry(
m_xContext, aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode);
if (!bUseBufferedStream)
- return xSrcStream.get();
+ return xSrcStream;
uno::Reference<io::XInputStream> xBufStream;
static const sal_Int32 nThreadingThreshold = 10000;
if( xSrcStream->available() > nThreadingThreshold )
- xBufStream = new XBufferedThreadedStream(xSrcStream.get(), xSrcStream->getSize());
+ xBufStream = new XBufferedThreadedStream(xSrcStream, xSrcStream->getSize());
else
- xBufStream = new XBufferedStream(xSrcStream.get());
+ xBufStream = new XBufferedStream(xSrcStream);
return xBufStream;
}
diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx
index 37e614581e36..506c6267aa28 100644
--- a/package/source/zipapi/blowfishcontext.cxx
+++ b/package/source/zipapi/blowfishcontext.cxx
@@ -48,7 +48,7 @@ uno::Reference< xml::crypto::XCipherContext > BlowfishCFB8CipherContext::Create(
xResult->m_bEncrypt = bEncrypt;
- return uno::Reference< xml::crypto::XCipherContext >( xResult.get() );
+ return xResult;
}
BlowfishCFB8CipherContext::~BlowfishCFB8CipherContext()
diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx
index af3123e2dbd0..c036041a2d76 100644
--- a/package/source/zipapi/sha1context.cxx
+++ b/package/source/zipapi/sha1context.cxx
@@ -36,7 +36,7 @@ uno::Reference<xml::crypto::XDigestContext> StarOfficeSHA1DigestContext::Create(
if ( !xResult->m_pDigest )
throw uno::RuntimeException("Can not create cipher!" );
- return uno::Reference< xml::crypto::XDigestContext >( xResult.get() );
+ return xResult;
}
StarOfficeSHA1DigestContext::~StarOfficeSHA1DigestContext()
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index c65e63c5cf43..c91947992047 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -813,7 +813,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
if (aName == "/")
// root directory.
- return makeAny ( uno::Reference < XUnoTunnel > ( m_xRootFolder.get() ) );
+ return makeAny ( uno::Reference < XUnoTunnel > ( m_xRootFolder ) );
nStreamIndex = aName.lastIndexOf ( '/' );
bool bFolder = nStreamIndex == nIndex-1; // last character is '/'.
generated by cgit (git 2.34.1) at 2025-02-05 06:47:15 +0000