diff options
Diffstat (limited to 'sw')
50 files changed, 46 insertions, 128 deletions
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 90807ba82c86..df697fe49309 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -276,7 +276,6 @@ class SwXAutoStyles : css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles; css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles; css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles; - css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoNotxtStyles; virtual ~SwXAutoStyles(); public: diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 87386bbd193a..cd6135a05df4 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -171,7 +171,6 @@ private: 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 SfxViewFrame* m_pHiddenViewFrame; @@ -506,11 +505,10 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper > { css::uno::Reference< css::container::XNameAccess > xRealAccess; - const SfxItemPropertySet* pPropSet; - const OUString sLinkSuffix; - const OUString sLinkDisplayName; - css::uno::Reference< css::text::XTextDocument > xDoc; - SwXTextDocument* pxDoc; + const SfxItemPropertySet* pPropSet; + const OUString sLinkSuffix; + const OUString sLinkDisplayName; + SwXTextDocument* pxDoc; public: SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess, diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index bfb7b3d4bcd6..e9dcca02605b 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -166,7 +166,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* m_pSrchList; static SearchAttrItemList* m_pReplList; - SvxHtmlOptions m_aHTMLOpt; Timer m_aTimer; // for delayed ChgLnks during an action OUString m_sSwViewData, //and the new cursor position if the user double click in the PagePreview @@ -204,9 +203,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell m_pVRuler; VclPtr<ImageButton> m_pTogglePageBtn; - VclPtr<SwHlpImageButton> m_pPageUpBtn, - m_pPageDownBtn; - SwGlossaryHdl *m_pGlosHdl; // handle text block SwDrawBase *m_pDrawActual; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 8b9e72426f1c..3931230dbb9e 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -92,9 +92,6 @@ class SwXTextPortion : public cppu::WeakImplHelper { private: - class Impl; - ::sw::UnoImplPtr<Impl> m_pImpl; - const SfxItemPropertySet * m_pPropSet; const css::uno::Reference< css::text::XText > m_xParentText; diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 0c176c7fa275..5823d6e8a945 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -51,17 +51,6 @@ using namespace ::com::sun::star; -class SwXTextPortion::Impl -{ -private: - ::osl::Mutex m_Mutex; // just for OInterfaceContainerHelper - -public: - ::cppu::OInterfaceContainerHelper m_EventListeners; - - Impl() : m_EventListeners(m_Mutex) { } -}; - void SwXTextPortion::init(const SwUnoCursor* pPortionCursor) { m_pUnoCursor = pPortionCursor->GetDoc()->CreateUnoCursor(*pPortionCursor->GetPoint()); @@ -76,8 +65,7 @@ SwXTextPortion::SwXTextPortion( const SwUnoCursor* pPortionCursor, uno::Reference< text::XText > const& rParent, SwTextPortionType eType) - : m_pImpl(new Impl) - , m_pPropSet(aSwMapProvider.GetPropertySet( + : m_pPropSet(aSwMapProvider.GetPropertySet( (PORTION_REDLINE_START == eType || PORTION_REDLINE_END == eType) ? PROPERTY_MAP_REDLINE_PORTION @@ -95,8 +83,7 @@ SwXTextPortion::SwXTextPortion( const SwUnoCursor* pPortionCursor, uno::Reference< text::XText > const& rParent, SwFrameFormat& rFormat ) - : m_pImpl(new Impl) - , m_pPropSet(aSwMapProvider.GetPropertySet( + : m_pPropSet(aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXTPORTION_EXTENSIONS)) , m_xParentText(rParent) , m_FrameDepend(this, &rFormat) @@ -112,8 +99,7 @@ SwXTextPortion::SwXTextPortion( SwTextRuby const& rAttr, uno::Reference< text::XText > const& xParent, bool bIsEnd ) - : m_pImpl(new Impl) - , m_pPropSet(aSwMapProvider.GetPropertySet( + : m_pPropSet(aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXTPORTION_EXTENSIONS)) , m_xParentText(xParent) , m_pRubyText ( bIsEnd ? nullptr : new uno::Any ) diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 1319bdca55cf..2f8a1e615869 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -54,7 +54,6 @@ class SwXMLExport : public SvXMLExport SvXMLItemMapEntriesRef xTableItemMap; SvXMLItemMapEntriesRef xTableRowItemMap; SvXMLItemMapEntriesRef xTableCellItemMap; - rtl::Reference < XMLPropertySetMapper > xParaPropMapper; bool bBlock : 1; // export text block? bool bShowProgress : 1; diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index fd8caf41c041..c64af05879d5 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -67,7 +67,6 @@ class SwXMLImport: public SvXMLImport SvXMLItemMapEntriesRef m_xTableColItemMap; SvXMLItemMapEntriesRef m_xTableRowItemMap; SvXMLItemMapEntriesRef m_xTableCellItemMap; - tools::SvRef<SotStorage> m_xPackage; css::uno::Reference< css::container::XNameContainer > m_xLateInitSettings; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 14f74b82c0fa..61a1d8d38f0b 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star; SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet) - , m_aTextFilter(" .<>") , pTableData(nullptr) , nSaveWidth(0) , nMinTableWidth(MINLAY) 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 diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index a4eca985305c..45d704d8d801 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -61,11 +61,6 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::task; using namespace ::com::sun::star::beans; -struct SwConnectionData -{ - Reference<XConnection> xConnection; -}; - class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > { Reference< XDatabaseContext > m_xDatabaseContext; diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index b576da35dde1..6e2d1fd3d4ed 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -87,10 +87,9 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem Reference< XDataSource> m_xSource; SharedConnection m_xConnection; Reference< XColumnsSupplier> m_xColumnsSupplier; - Reference< XStatement> m_xStatement; Reference< XResultSet> m_xResultSet; SwDBData m_aDBData; - OUString m_sFilter; + OUString m_sFilter; sal_Int32 m_nResultSetCursorPos; ::std::vector<DBAddressDataAssignment> m_aAddressDataAssignments; diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 7e9617c574c3..407d12a4406e 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -92,7 +92,6 @@ class SwCaptionDialog : public SvxStandardDialog bool bOrderNumberingFirst; //#i61007# order of captions css::uno::Reference< css::container::XNameAccess > xNameAccess; - css::uno::Reference< css::container::XNamed > xNamed; DECL_LINK_TYPED(SelectHdl, ComboBox&, void); DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void); diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index c2d3b6236fac..2fc8aadf5286 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -31,9 +31,6 @@ class SwWrtShell; class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox { ImageList aImageList; - Image aDBBMP; - Image aTableBMP; - Image aQueryBMP; OUString sDefDBName; bool bInitialized; diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 832dfd360adf..71ed0882e44c 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -114,7 +114,6 @@ private: SAL_DLLPRIVATE sal_uInt16 GetCurrLanguage() const; - css::uno::Reference<css::container::XNameAccess> xDBContext; css::uno::Reference<css::text::XNumberingTypeInfo> xNumberingInfo; SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> GetNumberingInfo()const; diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 258c39693237..8d4e167260d3 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -29,7 +29,6 @@ class SwView; class SwHyphWrapper : public SvxSpellWrapper { private: SwView* pView; - css::uno::Reference< css::linguistic2::XHyphenator > xHyph; sal_uInt16 nPageCount; // page count for progress view sal_uInt16 nPageStart; // 1st checked page bool bInSelection : 1; // separating selected text diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 35cb5ef488fe..df7045b9aec5 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -179,8 +179,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell VclPtr<SwScrollbar> pVScrollbar; bool mbHScrollbarEnabled : 1; bool mbVScrollbarEnabled : 1; - VclPtr<ImageButton> pPageUpBtn; - VclPtr<ImageButton> pPageDownBtn; // dummy window for filling the lower right edge when both scrollbars are active VclPtr<vcl::Window> pScrollFill; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 5044e077f049..3055d5b2188d 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -94,7 +94,6 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg Image m_aFormated; Image m_aTableChgd; Image m_aFormatCollSet; - Image m_aAutoFormat; DECL_DLLPRIVATE_LINK_TYPED( AcceptHdl, SvxTPView*, void ); DECL_DLLPRIVATE_LINK_TYPED( AcceptAllHdl, SvxTPView*, void ); diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 4b8b238a7a02..b5f5c46743d2 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -57,7 +57,6 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper { friend class SwView_Impl; SfxObjectShellLock m_aDocShellRef; - TransferableDataHelper m_aOleData; TransferableObjectDescriptor m_aObjDesc; tools::SvRef<sfx2::SvBaseLink> m_xDdeLink; diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index aee0bcfd5ff9..1959cff900d3 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -47,7 +47,6 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, bool bStart, bool bOther, bool bSelect ) : SvxSpellWrapper( &pVw->GetEditWin(), rxHyph, bStart, bOther ), pView( pVw ), - xHyph( rxHyph ), nPageCount( 0 ), nPageStart( 0 ), bInSelection( bSelect ), diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 556be6dcff23..66ff7a538359 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -165,8 +165,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer m_aDeleted (SW_RES(IMG_REDLINE_DELETED)), m_aFormated (SW_RES(IMG_REDLINE_FORMATED)), m_aTableChgd (SW_RES(IMG_REDLINE_TABLECHG)), - m_aFormatCollSet (SW_RES(IMG_REDLINE_FMTCOLLSET)), - m_aAutoFormat (SW_RES(IMG_REDLINE_AUTOFMT)) + m_aFormatCollSet (SW_RES(IMG_REDLINE_FMTCOLLSET)) { m_aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index e420a5e4192a..1a1763419917 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -446,13 +446,11 @@ class SwZoomBox_Impl : public ComboBox { sal_uInt16 nSlotId; bool bRelease; - uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; public: SwZoomBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ); + sal_uInt16 nSlot ); virtual ~SwZoomBox_Impl(); protected: @@ -465,12 +463,10 @@ protected: SwZoomBox_Impl::SwZoomBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ): + sal_uInt16 nSlot ): ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)), nSlotId(nSlot), - bRelease(true), - m_xDispatchProvider( rDispatchProvider ) + bRelease(true) { EnableAutocomplete( false ); sal_uInt16 aZoomValues[] = @@ -608,20 +604,18 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, VclPtr<vcl::Window> SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) { - VclPtrInstance<SwZoomBox_Impl> pRet( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); + VclPtrInstance<SwZoomBox_Impl> pRet( pParent, GetSlotId() ); return pRet.get(); } class SwJumpToSpecificBox_Impl : public NumericField { sal_uInt16 nSlotId; - uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; public: SwJumpToSpecificBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ); + sal_uInt16 nSlot ); virtual ~SwJumpToSpecificBox_Impl(); protected: @@ -631,11 +625,9 @@ protected: SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ): + sal_uInt16 nSlot ): NumericField( pParent, SW_RES(RID_JUMP_TO_SPEC_PAGE)), - nSlotId(nSlot), - m_xDispatchProvider( rDispatchProvider ) + nSlotId(nSlot) {} SwJumpToSpecificBox_Impl::~SwJumpToSpecificBox_Impl() @@ -671,7 +663,7 @@ SwJumpToSpecificPageControl::~SwJumpToSpecificPageControl() VclPtr<vcl::Window> SwJumpToSpecificPageControl::CreateItemWindow( vcl::Window *pParent ) { - VclPtrInstance<SwJumpToSpecificBox_Impl> pRet( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); + VclPtrInstance<SwJumpToSpecificBox_Impl> pRet( pParent, GetSlotId() ); return pRet.get(); } diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index d832099a4b45..75d1e76a5a38 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -38,9 +38,8 @@ struct TColumn class SwFormatTablePage : public SfxTabPage { VclPtr<Edit> m_pNameED; - TextFilter m_aTextFilter; VclPtr<FixedText> m_pWidthFT; - PercentField m_aWidthMF; + PercentField m_aWidthMF; VclPtr<CheckBox> m_pRelWidthCB; VclPtr<RadioButton> m_pFullBtn; diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index df09645674c5..09bdde21294e 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -235,7 +235,6 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel ) : MasterPropertySet ( lcl_createSettingsInfo (), &Application::GetSolarMutex () ) -, mxModel ( pModel ) , mpModel ( pModel ) , mpDocSh ( nullptr ) , mpDoc ( nullptr ) diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index 131991312fec..888714148fa9 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -38,7 +38,6 @@ class SwXDocumentSettings : public cppu::OWeakObject { protected: - css::uno::Reference< css::text::XTextDocument > mxModel; SwXTextDocument* mpModel; SwDocShell* mpDocSh; SwDoc* mpDoc; diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index 5cb62a9db2aa..da6f74cf3a8c 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -45,11 +45,11 @@ uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( } uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) + const uno::Reference< lang::XMultiServiceFactory > & ) throw (css::uno::Exception) { SolarMutexGuard aGuard; - return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule( rSMgr )), uno::UNO_QUERY ); + return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule), uno::UNO_QUERY ); } // XNotifyingDispatch diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 5d11b2892d1d..58316b1835d7 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -50,12 +50,8 @@ namespace com class SwUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo > { - css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory; - public: - explicit SwUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - {} + SwUnoModule() {} // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 83f7dc1fd8a4..1aea89385902 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3807,7 +3807,6 @@ SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sLinkSuffix(sSuffix), sLinkDisplayName(rLinkDisplayName), - xDoc(&rxDoc), pxDoc(&rxDoc) { } |