diff options
Diffstat (limited to 'sw/source/ui/vba')
24 files changed, 25 insertions, 46 deletions
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 538492195d6b..31e110b75649 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -93,7 +93,7 @@ SwVbaAutoTextEntry::getServiceNames() return aServiceNames; } -SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess ) +SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ) { } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index abffe439738a..d7151141c502 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -49,9 +49,6 @@ typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntr class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE { -private: - css::uno::Reference< css::container::XIndexAccess > mxAutoTextEntryAccess; - public: SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException); virtual ~SwVbaAutoTextEntries() {} diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 7f217834480d..abf85dc85617 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -35,7 +35,6 @@ class SwVbaBookmarks : public SwVbaBookmarks_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XBookmarksSupplier > mxBookmarksSupplier; - css::uno::Reference< css::text::XText > mxText; private: void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index e1c8ed18bddd..85f3793715f6 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -46,7 +46,6 @@ class SwVbaBorder : public SwVbaBorder_Base private: uno::Reference< beans::XPropertySet > m_xProps; sal_Int32 m_LineType; - VbaPalette m_Palette; bool setBorderLine( table::BorderLine& rBorderLine ) { table::TableBorder aTableBorder; @@ -150,7 +149,7 @@ protected: return aServiceNames; } public: - SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} + SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType ) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ) {} uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override { @@ -264,7 +263,7 @@ public: if ( nIndex >= 0 && nIndex < getCount() ) { uno::Reference< beans::XPropertySet > xProps( m_xRange, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ], m_Palette )) ); + return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ] )) ); } throw lang::IndexOutOfBoundsException(); } diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index ca2369ef88f5..214392114efe 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -56,14 +56,14 @@ public: } }; -SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableColumns( xTableColumns ) +SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ) { mnStartColumnIndex = 0; SwVbaTableHelper aTableHelper( mxTextTable ); mnEndColumnIndex = aTableHelper.getTabColumnsMaxCount( ) - 1; } -SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableColumns( xTableColumns ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol ) +SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol ) { if( mnEndColumnIndex < mnStartColumnIndex ) throw uno::RuntimeException(); diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index 1b236ed4e918..60297dc36d6d 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -32,7 +32,6 @@ class SwVbaColumns : public SwVbaColumns_BASE { private: css::uno::Reference< css::text::XTextTable > mxTextTable; - css::uno::Reference< css::table::XTableColumns > mxTableColumns; sal_Int32 mnStartColumnIndex; sal_Int32 mnEndColumnIndex; diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index c1990a74b2f3..f61b82c24904 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -255,7 +255,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException, std::exceptio uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); OUString sTemplateUrl = xDocProps->getTemplateURL(); - xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateUrl ); + xTemplate = new SwVbaTemplate( this, mxContext, sTemplateUrl ); return uno::makeAny( xTemplate ); } diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index c7fe27b75ef6..9ccf945ae00c 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -663,15 +663,13 @@ class BuiltInPropertiesImpl : public PropertiesImpl_BASE { protected: - uno::Reference< XHelperInterface > m_xParent; - uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< frame::XModel > m_xModel; DocProps mDocProps; DocPropsByName mNamedDocProps; public: - BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ) + BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xModel( xModel ) { BuiltInIndexHelper builtIns( m_xModel ); for ( sal_Int32 index = word::WdBuiltInProperty::wdPropertyTitle; index <= word::WdBuiltInProperty::wdPropertyCharsWSpaces; ++index ) @@ -733,7 +731,7 @@ protected: } }; -SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel ) +SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ) { } diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index a16beddbfc87..78322b0fa5c2 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -27,8 +27,6 @@ typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BA class SwVbaBuiltinDocumentProperties : public SwVbaDocumentproperties_BASE { -protected: - css::uno::Reference< css::frame::XModel > m_xModel; public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 38243c4d9870..c1bd01a8f8a2 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -33,7 +33,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ), mxTextDocument( rDocument ) +SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ) { mxTextField.set( xTextField, uno::UNO_QUERY_THROW ); } @@ -223,7 +223,7 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare { uno::Reference< text::XTextField > xTextField( aSource, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextDocument, xTextField ) ); + uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextField ) ); return uno::makeAny( xField ); } @@ -341,7 +341,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, uno::Reference< text::XTextRange > xTextRange = rVbaRange.getXTextRange(); uno::Reference< text::XText > xText = xTextRange->getText(); xText->insertTextContent( xTextRange, xTextField, true ); - return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) ); + return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) ); } uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString& _text ) diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 5e9abd0fa8d5..2d447446f4ec 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -29,10 +29,9 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XField > SwVbaField_BA class SwVbaField : public SwVbaField_BASE { - css::uno::Reference< css::text::XTextDocument > mxTextDocument; css::uno::Reference< css::text::XTextField > mxTextField; public: - SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); + SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) override; // XHelperInterface diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 30456464e414..8198f4858126 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -75,7 +75,7 @@ public: } }; -SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ), mxModel( xModel ) +SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ) { } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 79c05f509b4a..bbdc9bd944c5 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -29,9 +29,6 @@ typedef CollTestImplHelper< ooo::vba::word::XPanes > SwVbaPanes_BASE; class SwVbaPanes : public SwVbaPanes_BASE { -private: - css::uno::Reference< css::frame::XModel > mxModel; - public: SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); virtual ~SwVbaPanes() {} diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 1a02736caa1c..eb53c2c6c2af 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -36,7 +36,7 @@ static const sal_Int16 PERCENT100 = 100; static const sal_Int16 PERCENT150 = 150; static const sal_Int16 PERCENT200 = 200; -SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mxParaProps( rParaProps ) +SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxParaProps( rParaProps ) { } diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index 75a56658808a..f0d4c54ea6cc 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -29,7 +29,6 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XParagraphFormat > SwV class SwVbaParagraphFormat : public SwVbaParagraphFormat_BASE { private: - css::uno::Reference< css::text::XTextDocument > mxTextDocument; css::uno::Reference< css::beans::XPropertySet > mxParaProps; private: @@ -42,7 +41,7 @@ private: static sal_Int32 getMSWordAlignment( sal_Int32 _alignment ); public: - SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps ); + SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::beans::XPropertySet >& rParaProps ); virtual ~SwVbaParagraphFormat(); // Attributes diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index ae76f189ef27..88ea787016c5 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -247,7 +247,7 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException, std::exception ) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); - return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, mxTextDocument, xParaProps ) ); + return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, xParaProps ) ); } void SAL_CALL diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index 0c41aa3c1c90..ef79f134ba60 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -38,7 +38,6 @@ class SwVbaSelection : public SwVbaSelection_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XTextViewCursor > mxTextViewCursor; - css::uno::Reference< ooo::vba::word::XRange > mxRange; private: void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::script::BasicErrorException, css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 329aaf68bfc6..a9718a4fba39 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -129,7 +129,7 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat if( word::WdStyleType::wdStyleTypeParagraph == getType() ) { uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); - return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, xTextDocument, mxStyleProps ) ); + return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, mxStyleProps ) ); } else { diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index d460358418da..a5340e3c656b 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -161,11 +161,10 @@ class StyleCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc container::XEnumerationAccess > { private: - uno::Reference< frame::XModel > mxModel; uno::Reference< container::XNameAccess > mxParaStyles; uno::Any cachePos; public: - explicit StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) : mxModel( _xModel ) + explicit StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) { // we only concern about the Paragraph styles uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW); diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index 8979ebc1e299..c0c57afddf24 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< beans::XPropertySet >& xParaProps ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext ), mxParaProps( xParaProps ) +SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext ) { } diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 9c5f5c4db04a..aaad749f91b2 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -26,11 +26,8 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTabStop > SwVbaTabSto class SwVbaTabStop : public SwVbaTabStop_BASE { -private: - css::uno::Reference< css::beans::XPropertySet > mxParaProps; - public: - SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ); + SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ) throw ( css::uno::RuntimeException ); virtual ~SwVbaTabStop(); // XHelperInterface diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 6a9007494e78..c7bcf25a247e 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -89,7 +89,7 @@ public: if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); - return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext, mxParaProps ) ) ); + return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext ) ) ); } virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { @@ -222,7 +222,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co else lcl_setTabStops( mxParaProps, aNewTabs ); - return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, mxContext, mxParaProps ) ); + return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, mxContext ) ); } void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index e428a3a78f95..a663db5c03ca 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -45,8 +45,8 @@ static OUString lcl_CheckGroupName( const OUString& rGroupName ) return comphelper::string::strip(sRet, ' '); } -SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) - : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) +SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFullUrl ) + : SwVbaTemplate_BASE( rParent, rContext ), msFullUrl( rFullUrl ) { } diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index f5637675406b..e2b7fc0b9a39 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -27,11 +27,10 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTemplate > SwVbaTempl class SwVbaTemplate : public SwVbaTemplate_BASE { private: - css::uno::Reference< css::frame::XModel > mxModel; OUString msFullUrl; public: SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const OUString& ); + const OUString& ); virtual ~SwVbaTemplate(); // XTemplate |