diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-27 12:52:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-27 12:48:50 +0000 |
| commit | e25669fcedcb7231254d3ba0e0224b2e3eb901d8 (patch) | |
| tree | 05ce242744c88d9efcd5b685720b2178008c2c8c /sw/inc | |
| parent | 96d03636a5f932151c7842ae34631258891fe807 (diff) | |
don't allocate uno::Reference on the heap
There is no point, since it's the size of a pointer anyway
(found by temporarily making the new operator in uno::Reference
deleted).
Change-Id: I62a8b957fef9184f65d705600acfdab4116dcb34
Reviewed-on: https://gerrit.libreoffice.org/19603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/unostyle.hxx | 10 | ||||
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 56 |
2 files changed, 33 insertions, 33 deletions
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 6ebc358a0b05..c83f40fd9a99 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -62,11 +62,11 @@ class SwXStyleFamilies : public cppu::WeakImplHelper { SwDocShell* m_pDocShell; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * m_pxCharStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * m_pxParaStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * m_pxFrameStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * m_pxPageStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * m_pxNumberingStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xCharStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xParaStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xFrameStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPageStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xNumberingStyles; protected: virtual ~SwXStyleFamilies(); public: diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index f34d0a9172a4..196f60d81286 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -143,34 +143,34 @@ private: bool bObjectValid; SwXDrawPage* pDrawPage; - css::uno::Reference< css::drawing::XDrawPage > * pxXDrawPage; - - css::uno::Reference< css::text::XText > xBodyText; - SwXBodyText* pBodyText; - css::uno::Reference< css::uno::XAggregation > xNumFormatAgg; - - css::uno::Reference< css::container::XIndexAccess > * pxXNumberingRules; - css::uno::Reference< css::container::XIndexAccess > * pxXFootnotes; - css::uno::Reference< css::beans::XPropertySet > * pxXFootnoteSettings; - css::uno::Reference< css::container::XIndexAccess > * pxXEndnotes; - css::uno::Reference< css::beans::XPropertySet > * pxXEndnoteSettings; - css::uno::Reference< css::container::XNameAccess > * pxXReferenceMarks; - css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes; - css::uno::Reference< css::container::XNameAccess > * pxXTextFieldMasters; - css::uno::Reference< css::container::XNameAccess > * pxXTextSections; - css::uno::Reference< css::container::XNameAccess > * pxXBookmarks; - css::uno::Reference< css::container::XNameAccess > * pxXTextTables; - css::uno::Reference< css::container::XNameAccess > * pxXTextFrames; - css::uno::Reference< css::container::XNameAccess > * pxXGraphicObjects; - css::uno::Reference< css::container::XNameAccess > * pxXEmbeddedObjects; - css::uno::Reference< css::container::XNameAccess > * pxXStyleFamilies; - mutable css::uno::Reference< css::style::XAutoStyles > * pxXAutoStyles; - css::uno::Reference< css::container::XIndexReplace > * pxXChapterNumbering; - css::uno::Reference< css::container::XIndexAccess > * pxXDocumentIndexes; - - css::uno::Reference< css::beans::XPropertySet > * pxXLineNumberingProperties; - css::uno::Reference< css::container::XNameAccess > * pxLinkTargetSupplier; - css::uno::Reference< css::container::XEnumerationAccess >* pxXRedlines; + css::uno::Reference< css::drawing::XDrawPage > mxXDrawPage; + + css::uno::Reference< css::text::XText > xBodyText; + SwXBodyText* pBodyText; + css::uno::Reference< css::uno::XAggregation > xNumFormatAgg; + + css::uno::Reference< css::container::XIndexAccess > mxXNumberingRules; + css::uno::Reference< css::container::XIndexAccess > mxXFootnotes; + css::uno::Reference< css::beans::XPropertySet > mxXFootnoteSettings; + css::uno::Reference< css::container::XIndexAccess > mxXEndnotes; + css::uno::Reference< css::beans::XPropertySet > mxXEndnoteSettings; + css::uno::Reference< css::container::XNameAccess > mxXReferenceMarks; + css::uno::Reference< css::container::XEnumerationAccess > mxXTextFieldTypes; + css::uno::Reference< css::container::XNameAccess > mxXTextFieldMasters; + css::uno::Reference< css::container::XNameAccess > mxXTextSections; + css::uno::Reference< css::container::XNameAccess > mxXBookmarks; + css::uno::Reference< css::container::XNameAccess > mxXTextTables; + css::uno::Reference< css::container::XNameAccess > mxXTextFrames; + css::uno::Reference< css::container::XNameAccess > mxXGraphicObjects; + css::uno::Reference< css::container::XNameAccess > mxXEmbeddedObjects; + css::uno::Reference< css::container::XNameAccess > mxXStyleFamilies; + mutable css::uno::Reference< css::style::XAutoStyles > mxXAutoStyles; + css::uno::Reference< css::container::XIndexReplace > mxXChapterNumbering; + css::uno::Reference< css::container::XIndexAccess > mxXDocumentIndexes; + + css::uno::Reference< css::beans::XPropertySet > mxXLineNumberingProperties; + css::uno::Reference< css::container::XNameAccess > mxLinkTargetSupplier; + css::uno::Reference< css::container::XEnumerationAccess > mxXRedlines; css::uno::Reference< css::container::XNameContainer> xXFormsContainer; //temporary frame to enable PDF export if no valid view is available |