summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-09 10:11:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-03-09 12:41:09 +0000
commit5a308b1239a09417507b0d05090ff2d3418d5133 (patch)
tree990fa9015a4107e4916691eb4dee80fa5713e96b /oox
parentc1a227600d0b16df283162d24f1a31f5c9cee474 (diff)
V801: Decreased performance
Change-Id: Iba139ede7bd72e23c0b7a28a8a4ff38ea816725a
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/xmlfilterbase.cxx10
-rw-r--r--oox/source/docprop/docprophandler.cxx6
-rw-r--r--oox/source/docprop/docprophandler.hxx2
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.cxx8
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.hxx4
-rw-r--r--oox/source/ppt/extdrawingfragmenthandler.cxx4
-rw-r--r--oox/source/ppt/extdrawingfragmenthandler.hxx2
-rw-r--r--oox/source/ppt/pptgraphicshapecontext.cxx4
-rw-r--r--oox/source/ppt/pptshapecontext.cxx4
-rw-r--r--oox/source/ppt/pptshapegroupcontext.cxx4
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx16
11 files changed, 32 insertions, 32 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index aeb013f7f547..bf839313dbdc 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -460,7 +460,7 @@ TextFieldStack& XmlFilterBase::getTextFieldStack() const
namespace {
-OUString lclAddRelation( const Reference< XRelationshipAccess > xRelations, sal_Int32 nId, const OUString& rType, const OUString& rTarget, bool bExternal )
+OUString lclAddRelation( const Reference< XRelationshipAccess >& rRelations, sal_Int32 nId, const OUString& rType, const OUString& rTarget, bool bExternal )
{
OUString sId = OUStringBuffer().appendAscii( "rId" ).append( nId ).makeStringAndClear();
@@ -474,7 +474,7 @@ OUString lclAddRelation( const Reference< XRelationshipAccess > xRelations, sal_
aEntry[2].First = "TargetMode";
aEntry[2].Second = "External";
}
- xRelations->insertRelationshipByID( sId, aEntry, sal_True );
+ rRelations->insertRelationshipByID( sId, aEntry, sal_True );
return sId;
}
@@ -490,17 +490,17 @@ OUString XmlFilterBase::addRelation( const OUString& rType, const OUString& rTar
return OUString();
}
-OUString XmlFilterBase::addRelation( const Reference< XOutputStream > xOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal )
+OUString XmlFilterBase::addRelation( const Reference< XOutputStream >& rOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal )
{
sal_Int32 nId = 0;
- PropertySet aPropSet( xOutputStream );
+ PropertySet aPropSet( rOutputStream );
if( aPropSet.is() )
aPropSet.getProperty( nId, PROP_RelId );
else
nId = mnRelId++;
- Reference< XRelationshipAccess > xRelations( xOutputStream, UNO_QUERY );
+ Reference< XRelationshipAccess > xRelations( rOutputStream, UNO_QUERY );
if( xRelations.is() )
return lclAddRelation( xRelations, nId, rType, rTarget, bExternal );
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 428ecd58fd6e..4d04f50f86b7 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -38,15 +38,15 @@ namespace oox {
namespace docprop {
OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext,
- const uno::Reference< document::XDocumentProperties > xDocProp )
+ const uno::Reference< document::XDocumentProperties >& rDocProp )
: m_xContext( xContext )
- , m_xDocProp( xDocProp )
+ , m_xDocProp( rDocProp )
, m_nState( 0 )
, m_nBlock( 0 )
, m_nType( 0 )
, m_nInBlock( 0 )
{
- if ( !xContext.is() || !xDocProp.is() )
+ if ( !xContext.is() || !rDocProp.is() )
throw uno::RuntimeException();
}
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index e73a474ecdc3..2813dcbc9314 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -53,7 +53,7 @@ class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xm
OUString m_aCustomPropertyName;
public:
- explicit OOXMLDocPropHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xDocProp );
+ explicit OOXMLDocPropHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rDocProp );
virtual ~OOXMLDocPropHandler();
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index f1c3cb7cddf5..9105e9e6d61c 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -32,10 +32,10 @@ namespace oox { namespace drawingml {
DiagramDataFragmentHandler::DiagramDataFragmentHandler( XmlFilterBase& rFilter,
const OUString& rFragmentPath,
- const DiagramDataPtr pDataPtr )
+ const DiagramDataPtr& rDataPtr )
throw( )
: FragmentHandler2( rFilter, rFragmentPath )
- , mpDataPtr( pDataPtr )
+ , mpDataPtr( rDataPtr )
{
}
@@ -67,10 +67,10 @@ DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement,
DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilter,
const OUString& rFragmentPath,
- const DiagramLayoutPtr pDataPtr )
+ const DiagramLayoutPtr& rDataPtr )
throw( )
: FragmentHandler2( rFilter, rFragmentPath )
- , mpDataPtr( pDataPtr )
+ , mpDataPtr( rDataPtr )
{
}
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index c5e8e4be2bcd..d8822403d634 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
- DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr pDataPtr ) throw();
+ DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw();
virtual ~DiagramDataFragmentHandler() throw();
virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -42,7 +42,7 @@ private:
class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
- DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr pDataPtr ) throw();
+ DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw();
virtual ~DiagramLayoutFragmentHandler() throw();
virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index d2b892fc40d2..d7a77acaad68 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -17,14 +17,14 @@ namespace oox { namespace ppt {
ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter,
const OUString& rFragmentPath,
- const oox::ppt::SlidePersistPtr pSlidePersistPtr,
+ const oox::ppt::SlidePersistPtr& rSlidePersistPtr,
const oox::ppt::ShapeLocation eShapeLocation,
oox::drawingml::ShapePtr pMasterShapePtr,
oox::drawingml::ShapePtr pGroupShapePtr,
oox::drawingml::ShapePtr pShapePtr)
throw( )
: FragmentHandler2( rFilter, rFragmentPath ),
- mpSlidePersistPtr (pSlidePersistPtr ),
+ mpSlidePersistPtr (rSlidePersistPtr ),
meShapeLocation( eShapeLocation ),
mpMasterShapePtr( pMasterShapePtr ),
mpGroupShapePtr( pGroupShapePtr ),
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 3512ca9d5345..fdfdc0cedc03 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -22,7 +22,7 @@ class ExtDrawingFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
ExtDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath,
- const oox::ppt::SlidePersistPtr pSlidePersistPtr,
+ const oox::ppt::SlidePersistPtr& rSlidePersistPtr,
const oox::ppt::ShapeLocation eShapeLocation,
oox::drawingml::ShapePtr pMasterShapePtr,
oox::drawingml::ShapePtr pGroupShapePtr,
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index c31cc55b1455..36f5d76976f6 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace ppt {
// CT_Shape
-PPTGraphicShapeContext::PPTGraphicShapeContext( ContextHandler2Helper& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr )
+PPTGraphicShapeContext::PPTGraphicShapeContext( ContextHandler2Helper& rParent, const SlidePersistPtr& rSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr )
: oox::drawingml::GraphicShapeContext( rParent, pMasterShapePtr, pShapePtr )
-, mpSlidePersistPtr( pSlidePersistPtr )
+, mpSlidePersistPtr( rSlidePersistPtr )
{
}
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index e5e0fce1c634..935fdec3be60 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace ppt {
// CT_Shape
-PPTShapeContext::PPTShapeContext( ContextHandler2Helper& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr )
+PPTShapeContext::PPTShapeContext( ContextHandler2Helper& rParent, const SlidePersistPtr& rSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr )
: oox::drawingml::ShapeContext( rParent, pMasterShapePtr, pShapePtr )
-, mpSlidePersistPtr( pSlidePersistPtr )
+, mpSlidePersistPtr( rSlidePersistPtr )
{
}
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 975906d797f6..05044caa23b0 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -49,12 +49,12 @@ namespace oox { namespace ppt {
PPTShapeGroupContext::PPTShapeGroupContext(
ContextHandler2Helper& rParent,
- const oox::ppt::SlidePersistPtr pSlidePersistPtr,
+ const oox::ppt::SlidePersistPtr& rSlidePersistPtr,
const ShapeLocation eShapeLocation,
oox::drawingml::ShapePtr pMasterShapePtr,
oox::drawingml::ShapePtr pGroupShapePtr )
: ShapeGroupContext( rParent, pMasterShapePtr, pGroupShapePtr )
-, mpSlidePersistPtr( pSlidePersistPtr )
+, mpSlidePersistPtr( rSlidePersistPtr )
, meShapeLocation( eShapeLocation )
, pGraphicShape( (PPTShape *)NULL )
{
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 541e2a178cbb..1d06a5b7093e 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -460,10 +460,10 @@ void PresentationFragmentHandler::finalizeImport()
}
bool PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlideFragmentHandler,
- const SlidePersistPtr pSlidePersistPtr )
+ const SlidePersistPtr& rSlidePersistPtr )
{
- Reference< drawing::XDrawPage > xSlide( pSlidePersistPtr->getPage() );
- SlidePersistPtr pMasterPersistPtr( pSlidePersistPtr->getMasterPersist() );
+ Reference< drawing::XDrawPage > xSlide( rSlidePersistPtr->getPage() );
+ SlidePersistPtr pMasterPersistPtr( rSlidePersistPtr->getMasterPersist() );
if ( pMasterPersistPtr.get() )
{
// Setting "Layout" property adds extra title and outliner preset shapes to the master slide
@@ -491,16 +491,16 @@ bool PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide
Reference< XPropertySet > xPropertySet( xSlide, UNO_QUERY );
if ( xPropertySet.is() )
{
- awt::Size& rPageSize( pSlidePersistPtr->isNotesPage() ? maNotesSize : maSlideSize );
+ awt::Size& rPageSize( rSlidePersistPtr->isNotesPage() ? maNotesSize : maSlideSize );
xPropertySet->setPropertyValue( "Width", Any( rPageSize.Width ) );
xPropertySet->setPropertyValue( "Height", Any( rPageSize.Height ) );
- oox::ppt::HeaderFooter aHeaderFooter( pSlidePersistPtr->getHeaderFooter() );
- if ( !pSlidePersistPtr->isMasterPage() )
+ oox::ppt::HeaderFooter aHeaderFooter( rSlidePersistPtr->getHeaderFooter() );
+ if ( !rSlidePersistPtr->isMasterPage() )
aHeaderFooter.mbSlideNumber = aHeaderFooter.mbHeader = aHeaderFooter.mbFooter = aHeaderFooter.mbDateTime = false;
try
{
- if ( pSlidePersistPtr->isNotesPage() )
+ if ( rSlidePersistPtr->isNotesPage() )
xPropertySet->setPropertyValue( "IsHeaderVisible", Any( aHeaderFooter.mbHeader ) );
xPropertySet->setPropertyValue( "IsFooterVisible", Any( aHeaderFooter.mbFooter ) );
xPropertySet->setPropertyValue( "IsDateTimeVisible", Any( aHeaderFooter.mbDateTime ) );
@@ -510,7 +510,7 @@ bool PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide
{
}
}
- pSlidePersistPtr->setPath( rxSlideFragmentHandler->getFragmentPath() );
+ rSlidePersistPtr->setPath( rxSlideFragmentHandler->getFragmentPath() );
return getFilter().importFragment( rxSlideFragmentHandler );
}