diff options
25 files changed, 12 insertions, 51 deletions
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 6f7241013c99..896a562415b8 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -41,9 +41,8 @@ using namespace com::sun::star::linguistic2; EditSpellWrapper::EditSpellWrapper( vcl::Window* _pWin, - Reference< XSpellChecker1 > &xChecker, bool bIsStart, bool bIsAllRight, EditView* pView ) : - SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight ) + SvxSpellWrapper( _pWin, bIsStart, bIsAllRight ) { SAL_WARN_IF( !pView, "editeng", "One view has to be abandoned!" ); // Keep IgnoreList, delete ReplaceList... diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 9fe8798a3caf..fb37d85aab69 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -54,8 +54,6 @@ protected: public: EditSpellWrapper( vcl::Window* pWin, - css::uno::Reference< - css::linguistic2::XSpellChecker1 > &xChecker, bool bIsStart, bool bIsAllRight, EditView* pView ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f6d5aeed014d..1f8bf5299876 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1499,7 +1499,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc ) bIsStart = true; EditSpellWrapper* pWrp = new EditSpellWrapper( Application::GetDefDialogParent(), - xSpeller, bIsStart, false, pEditView ); + bIsStart, false, pEditView ); pWrp->SpellDocument(); delete pWrp; diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 64a07c99e728..031d4050f78c 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -144,13 +144,11 @@ SvxSpellWrapper::~SvxSpellWrapper() --------------------------------------------------------------------*/ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, - Reference< XSpellChecker1 > &xSpellChecker, const bool bStart, const bool bIsAllRight, const bool bOther, const bool bRevAllow ) : pWin ( pWn ), - xSpell ( xSpellChecker ), - mpTextObj( nullptr), + mpTextObj ( nullptr), bOtherCntnt ( bOther ), bDialog ( false ), bHyphen ( false ), diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f9d14e830fd7..f4162984a2e3 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1882,9 +1882,8 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, } if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) ) { - uno::Reference< io::XInputStream > xIStrm = new utl::OSeekableInputStreamWrapper(*pDest ); uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() ); - PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind ); + PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, eAktPageKind ); css::uno::Reference< css::drawing::XShape > xShape; if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) ) pRet = GetSdrObjectFromXShape( xShape ); diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 3210fbaa385f..5f47f56eff38 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -155,7 +155,6 @@ namespace connectivity css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::i18n::XCharacterClassification> m_xCharClass; static css::uno::Reference< css::i18n::XLocaleData4> s_xLocaleData; - css::uno::Reference< css::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale); diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index bde5681f903a..8ca6a22676cc 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -53,8 +53,6 @@ private: css::uno::Reference< css::uno::XInterface > xLast; // result of last spelling/hyphenation attempt css::uno::Reference< - css::linguistic2::XSpellChecker1 > xSpell; - css::uno::Reference< css::linguistic2::XHyphenator > xHyph; SdrObject* mpTextObj; bool bOtherCntnt : 1; // set => Check special sections initially @@ -76,7 +74,6 @@ private: public: SvxSpellWrapper( vcl::Window* pWn, - css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpellChecker, const bool bStart = false, const bool bIsAllRight = false, const bool bOther = false, const bool bRevAllow = true ); SvxSpellWrapper( vcl::Window* pWn, diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index b6eb794f0a37..46fef225ead2 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1282,14 +1282,12 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage() override; PptPageKind ePageKind; const SdrPowerPointImport* mpPPTImporter; - css::uno::Reference< css::io::XInputStream > mxInStrm; public: - PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, css::uno::Reference< css::io::XInputStream >& rxInStrm, const css::uno::Reference< css::frame::XModel >& rxModel, PptPageKind ePKind ) : + PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, const css::uno::Reference< css::frame::XModel >& rxModel, PptPageKind ePKind ) : SvxMSConvertOCXControls ( rxModel ), ePageKind ( ePKind ), - mpPPTImporter ( pPPTImporter ), - mxInStrm ( rxInStrm ) + mpPPTImporter ( pPPTImporter ) {}; bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 7a14865e8544..3d4e2a273150 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -231,11 +231,9 @@ private: AxAlignedInputStream maInStrm; ///< The input stream to read from. ComplexPropVector maLargeProps; ///< Stores info for all used large properties. ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. - AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. - AxFontData maDummyFontData; ///< Dummy font for unsupported properties. StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties. - OUString maDummyString; ///< Dummy string for unsupported properties. - AxArrayString maDummyArrayString; ///< Dummy strings for unsupported ArrayString properties. + OUString maDummyString; ///< Dummy string for unsupported properties. + AxArrayString maDummyArrayString; ///< Dummy strings for unsupported ArrayString properties. sal_Int64 mnPropFlags; ///< Flags specifying existing properties. sal_Int64 mnNextProp; ///< Next property to read. sal_Int64 mnPropsEnd; ///< End position of simple/large properties. diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index d3c22c2f90f3..a0a34ff09368 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -144,7 +144,6 @@ private: AxAlignedOutputStream maOutStrm; ///< The input stream to read from. ComplexPropVector maLargeProps; ///< Stores info for all used large properties. ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. - AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. sal_Int16 mnBlockSize; sal_Int64 mnPropFlagsStart; ///< pos of Prop flags sal_Int64 mnPropFlags; ///< Flags specifying existing properties. diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx index caed737645d9..f6cda406ca41 100644 --- a/include/sfx2/printer.hxx +++ b/include/sfx2/printer.hxx @@ -34,7 +34,6 @@ struct SfxPrinter_Impl; class SFX2_DLLPUBLIC SfxPrinter : public Printer { private: - JobSetup aOrigJobSetup; SfxItemSet* pOptions; SfxPrinter_Impl* pImpl; bool bKnown; diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index aa13d4392049..c336d9f808f2 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -83,7 +83,6 @@ public: private: const OUString msId; - Image maIcon; sal_Int32 mnMinimalWidth; SharedPanelContainer maPanels; VclPtr<DeckTitleBar> mpTitleBar; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 1a8d7415c184..9d286ced863c 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -239,7 +239,6 @@ class SVT_DLLPUBLIC SvTreeListBox Link<SvTreeListBox*,void> aSelectHdl; Link<SvTreeListBox*,void> aDeselectHdl; - Accelerator aInpEditAcc; Image aPrevInsertedExpBmp; Image aPrevInsertedColBmp; Image aCurInsertedExpBmp; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 5fa3e216002c..f0cabcfc41a4 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -87,7 +87,6 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell class FormShellWaitObject { - VclPtr<vcl::Window> m_pWindow; public: FormShellWaitObject(const FmFormShell* _pShell); ~FormShellWaitObject(); diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx index 5cd78617b2c9..2ac3ad77ea7a 100644 --- a/include/svx/fntszctl.hxx +++ b/include/svx/fntszctl.hxx @@ -34,7 +34,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontSizeMenuControl : public SfxMenuContr private: FontSizeMenu* pMenu; Menu& rParent; - SfxStatusForwarder aFontNameForwarder; DECL_LINK_TYPED( MenuSelect, FontSizeMenu *, void ); diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index eda36c9d5528..ac354de4efb6 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -160,8 +160,6 @@ private: // multi-images std::unique_ptr<Image[]> mpIMGWidthIcon; - css::uno::Reference<css::frame::XFrame> mxFrame; - /// bitfield bool mbWidthValuable : 1; bool mbArrowSupported; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 4df52ef5dabf..5dd4f10832c3 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -819,9 +819,6 @@ typedef ::cppu::WeakAggImplHelper1< class SVX_DLLPUBLIC SvxCustomShape : public SvxShapeText, public SvxShape_UnoImplHelper1 { -private: - rtl::Reference< SvxDrawPage > mxPage; - protected: using SvxUnoTextRangeBase::setPropertyValue; using SvxUnoTextRangeBase::getPropertyValue; diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 8b8b88b2da3e..31b92959b7c5 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -238,8 +238,6 @@ private: bool mbAdjustingImagePosition; bool mbAdjustingGraphic; - css::uno::Reference< css::graphic::XGraphicObject > mxGrfObj; - protected: GraphicControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :UnoControlModel( rxContext ) diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx index c968178f1199..a3ef7b531acf 100644 --- a/include/unotools/collatorwrapper.hxx +++ b/include/unotools/collatorwrapper.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace uno { class UNOTOOLS_DLLPUBLIC CollatorWrapper { private: - css::uno::Reference< css::uno::XComponentContext > mxServiceFactory; css::uno::Reference< css::i18n::XCollator > mxInternationalCollator; public: diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 573c89e97292..e0d0ab3f2660 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -54,8 +54,6 @@ namespace utl m_xReplaceAccess; /// replacing child values css::uno::Reference< css::container::XNameContainer > m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object) - css::uno::Reference< css::uno::XInterface > - m_xDummy; bool m_bEscapeNames; /// escape names before accessing children ? OUString m_sCompletePath; diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index bd3ffdd06e9a..5adcb042a466 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -84,16 +84,12 @@ class VBAHELPER_DLLPUBLIC SimpleEnumerationBase : public EnumerationHelper_BASE { public: explicit SimpleEnumerationBase( - const css::uno::Reference< ov::XHelperInterface >& rxParent, - const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::container::XEnumeration >& rxEnumeration ) throw (css::uno::RuntimeException) : - mxParent( rxParent ), mxContext( rxContext ), mxEnumeration( rxEnumeration ) {} + mxEnumeration( rxEnumeration ) {} explicit SimpleEnumerationBase( - const css::uno::Reference< ov::XHelperInterface >& rxParent, - const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) : - mxParent( rxParent ), mxContext( rxContext ), mxEnumeration( new SimpleIndexAccessToEnumeration( rxIndexAccess ) ) {} + mxEnumeration( new SimpleIndexAccessToEnumeration( rxIndexAccess ) ) {} virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override { @@ -110,8 +106,6 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) = 0; protected: - css::uno::Reference< ov::XHelperInterface > mxParent; - css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::container::XEnumeration > mxEnumeration; }; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 026b85564087..cdb1463ad9d3 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -245,7 +245,7 @@ private: }; ScVbaObjectEnumeration::ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ) : - SimpleEnumerationBase( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), + SimpleEnumerationBase( rxContainer.get() ), mxContainer( rxContainer ) { } diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 1a09201bcc16..d3a713b99bce 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -41,7 +41,6 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow, const std::function<void()>& rCloserAction) : Window(pParentWindow, 0) , msId(rDeckDescriptor.msId) - , maIcon() , mnMinimalWidth(0) , maPanels() , mpTitleBar(VclPtr<DeckTitleBar>::Create(rDeckDescriptor.msTitle, this, rCloserAction)) diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 984391e91c40..d6a0c1d7eb59 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -165,8 +165,7 @@ SvxFontSizeMenuControl::SvxFontSizeMenuControl SfxMenuControl( _nId, rBindings ), pMenu ( new FontSizeMenu ), - rParent ( rMenu ), - aFontNameForwarder( SID_ATTR_CHAR_FONT, *this ) + rParent ( rMenu ) { rMenu.SetPopupMenu( _nId, pMenu ); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 9890d6211c2f..6de2dcb09c9d 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -178,7 +178,6 @@ LinePropertyPanelBase::LinePropertyPanelBase( maLineWidthPopup(this, ::boost::bind(&LinePropertyPanelBase::CreateLineWidthPopupControl, this, _1)), maIMGNone(SVX_RES(IMG_NONE_ICON)), mpIMGWidthIcon(), - mxFrame(rxFrame), mbWidthValuable(true), mbArrowSupported(true) { |