diff options
48 files changed, 52 insertions, 168 deletions
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index c6fda5eee71e..b2fe6eab0546 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -43,7 +43,7 @@ Manager::~Manager() uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) throw (uno::RuntimeException, std::exception) { - Player* pPlayer( new Player( mxMgr ) ); + Player* pPlayer( new Player ); uno::Reference< media::XPlayer > xRet( pPlayer ); const INetURLObject aURL( rURL ); diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index a8888fd8235e..5a0125279476 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -278,9 +278,8 @@ void MissingPluginInstallerThread::execute() { // - Player - -Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : +Player::Player() : GstPlayer_BASE( m_aMutex ), - mxMgr( rxMgr ), mpPlaybin( nullptr ), mbFakeVideo (false ), mnUnmutedVolume( 0 ), diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 52095b0210e5..3f95a88b9599 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -43,7 +43,7 @@ class Player : public ::cppu::BaseMutex, { public: - explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); + explicit Player(); virtual ~Player(); void preparePlaybin( const OUString& rURL, GstElement *pSink ); @@ -77,8 +77,6 @@ public: virtual void SAL_CALL disposing() override; protected: - css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; - OUString maURL; // Add elements and pipeline here diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 4549b3413f40..4a0470fa86ba 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -34,13 +34,11 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent - , const uno::Reference< frame::XModel >& xChartModel - , const uno::Reference< uno::XComponentContext >& xContext ) + , const uno::Reference< frame::XModel >& xChartModel ) : ModalDialog( pParent, "ChartTypeDialog", "modules/schart/ui/charttypedialog.ui") , m_pChartTypeTabPage(nullptr) , m_xChartModel(xChartModel) - , m_xCC( xContext ) { m_pChartTypeTabPage = VclPtr<ChartTypeTabPage>::Create( get_content_area(), diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index d6dec7ef7316..9646339e45ae 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -80,7 +80,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) } VclPtr<Dialog> ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { - return VclPtr<ChartTypeDialog>::Create( _pParent, m_xChartModel, m_aContext ); + return VclPtr<ChartTypeDialog>::Create( _pParent, m_xChartModel ); } uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception) { diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index b07f9251d4af..965e42c2e323 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -34,9 +34,7 @@ class ChartTypeDialog : public ModalDialog public: ChartTypeDialog( vcl::Window* pWindow , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel - , const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + ::com::sun::star::frame::XModel >& xChartModel ); virtual ~ChartTypeDialog(); virtual void dispose() override; @@ -45,8 +43,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; }; } //namespace chart diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index b78194326246..020541d667e4 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1380,7 +1380,7 @@ void ChartController::executeDispatch_ChartType() SolarMutexGuard aSolarGuard; //prepare and open dialog - ScopedVclPtrInstance< ChartTypeDialog > aDlg( m_pChartWindow, getModel(), m_xCC ); + ScopedVclPtrInstance< ChartTypeDialog > aDlg( m_pChartWindow, getModel() ); if( aDlg->Execute() == RET_OK ) { impl_adaptDataSeriesAutoResize(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 436669dfa80a..67b51a02c9b3 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -97,9 +97,6 @@ public: class SvInsertPlugInDialog : public InsertObjectDialog_Impl { private: - VclPtr<Edit> m_pEdFileurl; - VclPtr<VclMultiLineEdit> m_pEdPluginsOptions; - DECL_LINK_TYPED(BrowseHdl, Button*, void); public: diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx index 79f916944770..600ccf0d8dfa 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx @@ -33,15 +33,9 @@ namespace sdbtools using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::XComponentContext; - // DataSourceMetaData_Impl - struct DataSourceMetaData_Impl - { - }; - // DataSourceMetaData DataSourceMetaData::DataSourceMetaData( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection ) :ConnectionDependentComponent( _rContext ) - ,m_pImpl( new DataSourceMetaData_Impl ) { setWeakConnection( _rxConnection ); } diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index b7b675c232b1..6e6635065acb 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -34,14 +34,11 @@ namespace sdbtools // DataSourceMetaData typedef ::cppu::WeakImplHelper< css::sdb::tools::XDataSourceMetaData > DataSourceMetaData_Base; - struct DataSourceMetaData_Impl; /** default implementation for XDataSourceMetaData */ class DataSourceMetaData :public DataSourceMetaData_Base ,public ConnectionDependentComponent { - private: - ::std::unique_ptr< DataSourceMetaData_Impl > m_pImpl; public: /** constructs the instance diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 38631533ea54..24bf5e8d47b9 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -90,8 +90,6 @@ namespace dbaui PreviewMode m_ePreviewMode; css::uno::Reference < css::frame::XFrame2 > m_xFrame; - css::uno::Reference < css::io::XPersist > - m_xDocInfo; css::uno::Reference< css::awt::XWindow > m_xWindow; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index cc7d3bd4de3f..c0420c43e940 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -295,8 +295,7 @@ IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, EndReachedHdl, LicenseView&, void) LicenseDialog::LicenseDialog( Sequence<Any> const& args, - Reference<XComponentContext> const& xComponentContext) - : m_xComponentContext(xComponentContext) + Reference<XComponentContext> const& ) { comphelper::unwrapArgs( args, m_parent, m_sExtensionName, m_sLicenseText ); } diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 121153535635..f5646c99e932 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -31,7 +31,6 @@ namespace dp_gui { class LicenseDialog : public ::cppu::WeakImplHelper<css::ui::dialogs::XExecutableDialog> { - css::uno::Reference<css::uno::XComponentContext> const m_xComponentContext; css::uno::Reference<css::awt::XWindow> /* const */ m_parent; OUString m_sExtensionName; OUString /* const */ m_sLicenseText; diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx index 12f2ee6aa4fc..6b329e961a7c 100644 --- a/idlc/inc/idlc/astdeclaration.hxx +++ b/idlc/inc/idlc/astdeclaration.hxx @@ -119,7 +119,6 @@ protected: AstScope* m_pScope; NodeType m_nodeType; bool m_bImported; // imported ? - bool m_bIsAdded; // mark declaration as added in scope bool m_bInMainFile; // defined in main file bool m_bPublished; bool m_bPredefined; diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx index b9e11db7b6a2..fa889f96ab33 100644 --- a/idlc/source/astdeclaration.cxx +++ b/idlc/source/astdeclaration.cxx @@ -45,7 +45,6 @@ AstDeclaration::AstDeclaration(NodeType type, const OString& name, AstScope* pSc , m_pScope(pScope) , m_nodeType(type) , m_bImported(false) - , m_bIsAdded(false) , m_bInMainFile(false) , m_bPredefined(false) , m_lineNumber(0) diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 14e36b4841d8..301936bbb4c2 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -115,7 +115,6 @@ namespace avmedia MediaWindow(const MediaWindow&) = delete; MediaWindow& operator =( const MediaWindow& ) = delete; - css::uno::Reference< css::uno::XInterface > mxIFace; VclPtr<priv::MediaWindowImpl> mpImpl; }; } diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index 5906a26b62c3..8f28c6db3a76 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -211,7 +211,6 @@ private: LwpDocument* m_pDoc; bool m_bRegisteredAll; private: //file members - LwpVersionManager m_VerMgr; LwpObjectManager m_ObjMgr; LwpObjectID m_MarkerHead; LwpObjectID m_FootnoteMgr; diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx index 78f966b9f4f4..2b490c104498 100644 --- a/lotuswordpro/source/filter/lwpprtinfo.hxx +++ b/lotuswordpro/source/filter/lwpprtinfo.hxx @@ -72,15 +72,6 @@ class LwpPrinterInfo public: explicit LwpPrinterInfo(LwpObjectStream* pStrm); ~LwpPrinterInfo(){} -private: - LwpAtomHolder m_OutputFile; - LwpAtomHolder cSelectedDivisions; - - LwpAtomHolder m_Output; - LwpAtomHolder m_Name; - LwpAtomHolder m_Driver; - LwpAtomHolder m_Queue; - LwpAtomHolder m_SelectedPages; public: static void Read(LwpObjectStream* pStrm); diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx index ecd2d55be6e4..17d7180eb37b 100644 --- a/lotuswordpro/source/filter/lwptable.hxx +++ b/lotuswordpro/source/filter/lwptable.hxx @@ -127,9 +127,6 @@ public: virtual bool IsTable() override { return true;} LwpSuperTableLayout* GetSuperTableLayout(); protected: - LwpDLVListHeadTail m_RowCache; - LwpDLVListHeadTail m_ColumnCache; - LwpNotifyListPersistent m_CPTempVersionedNotifyList; LwpForkedNotifyList m_CPNotifyList; sal_uInt16 m_nRow, m_nColumn; diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx index 5d4d4fa02883..e2e9ddb83ad6 100644 --- a/lotuswordpro/source/filter/lwpuidoc.hxx +++ b/lotuswordpro/source/filter/lwpuidoc.hxx @@ -132,7 +132,6 @@ public: explicit LwpUIDocument(LwpObjectStream *pStrm); ~LwpUIDocument(); private: - LwpNamedProperties m_NamedProps; LwpAutoRunMacroOptions m_ARMacroOpts; LwpMergeOptions m_MergedOpts; LwpAtomHolder m_SheetFullPath; // full path for style sheet diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 4f7fad207d44..0fa262344d67 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -98,7 +98,6 @@ public: virtual void ToXml(IXFStream *pStrm) override; protected: - rtl::Reference<XFContentContainer> m_aContents; double m_fRotate; XFPoint m_aRotatePoint; double m_fScaleX; diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx index f73aaad500ba..b7812881c53c 100644 --- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx @@ -79,7 +79,6 @@ public: private: OUString m_strID; OUString m_strLabel; - rtl::Reference<XFContentContainer> m_aContents; }; inline XFEndNote::XFEndNote() diff --git a/lotuswordpro/source/filter/xfilter/xfheader.hxx b/lotuswordpro/source/filter/xfilter/xfheader.hxx index c9a14799cd20..31e917d9a134 100644 --- a/lotuswordpro/source/filter/xfilter/xfheader.hxx +++ b/lotuswordpro/source/filter/xfilter/xfheader.hxx @@ -80,8 +80,6 @@ public: XFContentContainer::ToXml(pStrm); pStrm->EndElement( "style:header" ); } -private: - rtl::Reference<XFContentContainer> m_aContents; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx index 232262e9bb9a..7aa68cedad52 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx @@ -87,7 +87,6 @@ private: OUString m_strSectionName; bool m_bProtected; bool m_bHiden; - XFColor m_aBackColor; OUString m_strSourceLink; }; diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index af44ed5be42a..9da925d4caf7 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -321,17 +321,6 @@ static const AutoFormatEntry spFilledSeries3dFills[] = AUTOFORMAT_END() }; -static const AutoFormatEntry spFilledSeriesEffects[] = -{ - // 1...8: no effect, same as Chart2 - AUTOFORMAT_COLOR( 9, 16, THEMED_STYLE_SUBTLE, XML_dk1 ), - AUTOFORMAT_COLOR( 17, 24, THEMED_STYLE_MODERATE, XML_dk1 ), - AUTOFORMAT_COLOR( 25, 32, THEMED_STYLE_INTENSE, XML_dk1 ), - // 33...40: no effect, same as Chart2 - AUTOFORMAT_COLOR( 41, 48, THEMED_STYLE_INTENSE, XML_dk1 ), - AUTOFORMAT_END() -}; - static const AutoFormatEntry spUpDownBarLines[] = { AUTOFORMAT_COLOR( 1, 16, THEMED_STYLE_SUBTLE, XML_tx1 ), @@ -386,17 +375,6 @@ static const AutoFormatEntry spDownBarFills[] = AUTOFORMAT_END() }; -static const AutoFormatEntry spUpDownBarEffects[] = -{ - // 1...8: no effect, same as Chart2 - AUTOFORMAT_COLOR( 9, 16, THEMED_STYLE_SUBTLE, XML_dk1 ), - AUTOFORMAT_COLOR( 17, 24, THEMED_STYLE_MODERATE, XML_dk1 ), - AUTOFORMAT_COLOR( 25, 32, THEMED_STYLE_INTENSE, XML_dk1 ), - // 33...40: no effect, same as Chart2 - AUTOFORMAT_COLOR( 41, 48, THEMED_STYLE_INTENSE, XML_dk1 ), - AUTOFORMAT_END() -}; - #undef AUTOFORMAT_COLOR #undef AUTOFORMAT_COLORMOD #undef AUTOFORMAT_ACCENTSMOD @@ -532,45 +510,44 @@ struct ObjectTypeFormatEntry const ShapePropertyInfo* mpPropInfo; /// Property info for the ShapePropertyMap class. const AutoFormatEntry* mpAutoLines; /// Automatic line formatting for all chart styles. const AutoFormatEntry* mpAutoFills; /// Automatic fill formatting for all chart styles. - const AutoFormatEntry* mpAutoEffects; /// Automatic effect formatting for all chart styles. const AutoTextEntry* mpAutoTexts; /// Automatic text attributes for all chart styles. bool mbIsFrame; /// True = object is a frame, false = object is a line. }; -#define TYPEFORMAT_FRAME( obj_type, prop_type, auto_texts, auto_lines, auto_fills, auto_effects ) \ - { obj_type, prop_type, auto_lines, auto_fills, auto_effects, auto_texts, true } +#define TYPEFORMAT_FRAME( obj_type, prop_type, auto_texts, auto_lines, auto_fills ) \ + { obj_type, prop_type, auto_lines, auto_fills, auto_texts, true } #define TYPEFORMAT_LINE( obj_type, prop_type, auto_texts, auto_lines ) \ - { obj_type, prop_type, auto_lines, nullptr, nullptr, auto_texts, false } + { obj_type, prop_type, auto_lines, nullptr, auto_texts, false } static const ObjectTypeFormatEntry spObjTypeFormatEntries[] = { - // object type property info auto text auto line auto fill auto effect - TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE, &saCommonPropInfo, nullptr, spNoFormats, spChartSpaceFill, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_CHARTTITLE, &saCommonPropInfo, spChartTitleTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_LEGEND, &saCommonPropInfo, spOtherTexts, spNoFormats, spNoFormats, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA2D, &saCommonPropInfo, nullptr, nullptr /* eq to Ch2 */, spPlotArea2dFills, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA3D, &saCommonPropInfo, nullptr, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_WALL, &saCommonPropInfo, nullptr, spWallFloorLines, spWallFloorFills, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_FLOOR, &saCommonPropInfo, nullptr, spWallFloorLines, spWallFloorFills, nullptr /* eq to Ch2 */ ), + // object type property info auto text auto line auto fill + TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE, &saCommonPropInfo, nullptr, spNoFormats, spChartSpaceFill ), + TYPEFORMAT_FRAME( OBJECTTYPE_CHARTTITLE, &saCommonPropInfo, spChartTitleTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */), + TYPEFORMAT_FRAME( OBJECTTYPE_LEGEND, &saCommonPropInfo, spOtherTexts, spNoFormats, spNoFormats ), + TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA2D, &saCommonPropInfo, nullptr, nullptr /* eq to Ch2 */, spPlotArea2dFills ), + TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA3D, &saCommonPropInfo, nullptr, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), + TYPEFORMAT_FRAME( OBJECTTYPE_WALL, &saCommonPropInfo, nullptr, spWallFloorLines, spWallFloorFills ), + TYPEFORMAT_FRAME( OBJECTTYPE_FLOOR, &saCommonPropInfo, nullptr, spWallFloorLines, spWallFloorFills ), TYPEFORMAT_LINE( OBJECTTYPE_AXIS, &saCommonPropInfo, spOtherTexts, spAxisLines ), - TYPEFORMAT_FRAME( OBJECTTYPE_AXISTITLE, &saCommonPropInfo, spAxisTitleTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), - TYPEFORMAT_FRAME( OBJECTTYPE_AXISUNIT, &saCommonPropInfo, spAxisTitleTexts, nullptr /* eq in Ch2 */, nullptr /* eq in Ch2 */, nullptr /* eq in Ch2 */ ), + TYPEFORMAT_FRAME( OBJECTTYPE_AXISTITLE, &saCommonPropInfo, spAxisTitleTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), + TYPEFORMAT_FRAME( OBJECTTYPE_AXISUNIT, &saCommonPropInfo, spAxisTitleTexts, nullptr /* eq in Ch2 */, nullptr /* eq in Ch2 */ ), TYPEFORMAT_LINE( OBJECTTYPE_MAJORGRIDLINE, &saCommonPropInfo, nullptr, spMajorGridLines ), TYPEFORMAT_LINE( OBJECTTYPE_MINORGRIDLINE, &saCommonPropInfo, nullptr, spMinorGridLines ), TYPEFORMAT_LINE( OBJECTTYPE_LINEARSERIES2D, &saLinearPropInfo, nullptr, spLinearSeriesLines ), - TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES2D, &saFilledPropInfo, nullptr, spFilledSeriesLines, spFilledSeries2dFills, spFilledSeriesEffects ), - TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES3D, &saFilledPropInfo, nullptr, spFilledSeriesLines, spFilledSeries3dFills, spFilledSeriesEffects ), - TYPEFORMAT_FRAME( OBJECTTYPE_DATALABEL, &saCommonPropInfo, spOtherTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), + TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES2D, &saFilledPropInfo, nullptr, spFilledSeriesLines, spFilledSeries2dFills ), + TYPEFORMAT_FRAME( OBJECTTYPE_FILLEDSERIES3D, &saFilledPropInfo, nullptr, spFilledSeriesLines, spFilledSeries3dFills ), + TYPEFORMAT_FRAME( OBJECTTYPE_DATALABEL, &saCommonPropInfo, spOtherTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), TYPEFORMAT_LINE( OBJECTTYPE_TRENDLINE, &saCommonPropInfo, nullptr, spOtherLines ), - TYPEFORMAT_FRAME( OBJECTTYPE_TRENDLINELABEL, &saCommonPropInfo, spOtherTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), + TYPEFORMAT_FRAME( OBJECTTYPE_TRENDLINELABEL, &saCommonPropInfo, spOtherTexts, nullptr /* eq to Ch2 */, nullptr /* eq to Ch2 */ ), TYPEFORMAT_LINE( OBJECTTYPE_ERRORBAR, &saCommonPropInfo, nullptr, spOtherLines ), TYPEFORMAT_LINE( OBJECTTYPE_SERLINE, &saCommonPropInfo, nullptr, spOtherLines ), TYPEFORMAT_LINE( OBJECTTYPE_LEADERLINE, &saCommonPropInfo, nullptr, spOtherLines ), TYPEFORMAT_LINE( OBJECTTYPE_DROPLINE, &saCommonPropInfo, nullptr, spOtherLines ), TYPEFORMAT_LINE( OBJECTTYPE_HILOLINE, &saLinearPropInfo, nullptr, spOtherLines ), - TYPEFORMAT_FRAME( OBJECTTYPE_UPBAR, &saCommonPropInfo, nullptr, spUpDownBarLines, spUpBarFills, spUpDownBarEffects ), - TYPEFORMAT_FRAME( OBJECTTYPE_DOWNBAR, &saCommonPropInfo, nullptr, spUpDownBarLines, spDownBarFills, spUpDownBarEffects ), + TYPEFORMAT_FRAME( OBJECTTYPE_UPBAR, &saCommonPropInfo, nullptr, spUpDownBarLines, spUpBarFills ), + TYPEFORMAT_FRAME( OBJECTTYPE_DOWNBAR, &saCommonPropInfo, nullptr, spUpDownBarLines, spDownBarFills ), TYPEFORMAT_LINE( OBJECTTYPE_DATATABLE, &saCommonPropInfo, spOtherTexts, spDataTableLines ) }; diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index f0ec8dbe0414..d49fcab233bc 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -62,7 +62,6 @@ protected: css::uno::Reference < css::io::XInputStream > xStream; css::uno::Reference < css::io::XSeekable > xSeek; const css::uno::Reference < css::uno::XComponentContext > m_xContext; - css::uno::Reference < css::ucb::XProgressHandler > xProgressHandler; bool bRecoveryMode; @@ -94,8 +93,7 @@ public: ZipFile( css::uno::Reference < css::io::XInputStream > &xInput, const css::uno::Reference < css::uno::XComponentContext > &rxContext, bool bInitialise, - bool bForceRecover, - css::uno::Reference < css::ucb::XProgressHandler > xProgress + bool bForceRecover ) throw(css::io::IOException, css::packages::zip::ZipException, css::uno::RuntimeException); diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 41d77fbbd317..236df7192364 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -86,14 +86,13 @@ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference } } -ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise, bool bForceRecovery, uno::Reference < XProgressHandler > xProgress ) +ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise, bool bForceRecovery) throw(IOException, ZipException, RuntimeException) : aGrabber(xInput) , aInflater( true ) , xStream(xInput) , xSeek(xInput, UNO_QUERY) , m_xContext ( rxContext ) -, xProgressHandler( xProgress ) , bRecoveryMode( bForceRecovery ) { if (bInitialise) diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index d19452d96a49..8107ae4e1998 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -741,7 +741,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) OUString message; try { - m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, true, m_bForceRecovery, xProgressHandler ); + m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, true, m_bForceRecovery ); getZipFileContents(); } catch ( IOException & e ) diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index 83102038f956..e17538f707f4 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -46,7 +46,6 @@ class ParserTest: public test::BootstrapFixture { InputSource maInput; uno::Reference< sax_fastparser::FastSaxParser > mxParser; - uno::Reference< XFastDocumentHandler > mxDocumentHandler; uno::Reference< DummyTokenHandler > mxTokenHandler; public: diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 9243250985f6..60c9f1c6e4f5 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -53,9 +53,6 @@ public: #endif CPPUNIT_TEST_SUITE_END(); - -private: - uno::Reference<uno::XInterface> m_xCalcComponent; }; #if !defined MACOSX diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index a29fd4c25838..b33c88b8cc12 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -42,7 +42,6 @@ private: ScDocument* pDoc; ScRange aBlock; SCROW nNonFiltered; // non-filtered rows - TransferableDataHelper aOleData; TransferableObjectDescriptor aObjDesc; SfxObjectShellRef aDocShellRef; SfxObjectShellRef aDrawPersistRef; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 7ad853a3fa19..378f5b7b710a 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -313,12 +313,10 @@ class SingleRangeIndexAccess : public ::cppu::WeakImplHelper< container::XIndexA container::XEnumerationAccess > { private: - uno::Reference< XHelperInterface > mxParent; uno::Reference< table::XCellRange > m_xRange; - uno::Reference< uno::XComponentContext > mxContext; public: - SingleRangeIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ):mxParent( xParent ), m_xRange( xRange ), mxContext( xContext ) {} + SingleRangeIndexAccess( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ) {} // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) override { return 1; } virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override @@ -327,10 +325,9 @@ public: throw lang::IndexOutOfBoundsException(); return uno::makeAny( m_xRange ); } - // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<table::XCellRange>::get(); } - - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return sal_True; } + // XElementAccess + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<table::XCellRange>::get(); } + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return sal_True; } // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( m_xRange ); } @@ -1422,7 +1419,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args, uno::Reference< container::XIndexAccess > xIndex; if ( mxRange.is() ) { - xIndex = new SingleRangeIndexAccess( mxParent, mxContext, mxRange ); + xIndex = new SingleRangeIndexAccess( mxRange ); } else if ( mxRanges.is() ) { @@ -1441,7 +1438,7 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const if ( !xRange.is() ) throw lang::IllegalArgumentException("range is not set ", uno::Reference< uno::XInterface >() , 1 ); - uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxParent, mxContext, xRange ) ); + uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( xRange ) ); m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); } diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index c7bcf25a247e..15b088fa3a57 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -69,11 +69,10 @@ class TabStopCollectionHelper : public ::cppu::WeakImplHelper< container::XIndex private: uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; - uno::Reference< beans::XPropertySet > mxParaProps; sal_Int32 mnTabStops; public: - TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxParaProps( xParaProps ) + TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ) { mnTabStops = lcl_getTabStops( xParaProps ).getLength(); } diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 80d39fed870d..00eee8f87ca4 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -313,7 +313,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) // Yep! return Reference< XPersistentPropertySet >( new PersistentPropertySet( - m_xContext, *this, key ) ); + *this, key ) ); } else if ( create ) { @@ -348,11 +348,6 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) { // Fill new item... -// // Set Values -// xNameReplace->replaceByName( -// OUString("Values"), -// makeAny( ... ) ); - // Insert new item. xContainer->insertByName( key, makeAny( xNameReplace ) ); @@ -361,7 +356,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) return Reference< XPersistentPropertySet >( new PersistentPropertySet( - m_xContext, *this, key ) ); + *this, key ) ); } } catch (const IllegalArgumentException&) @@ -1136,11 +1131,9 @@ struct PersistentPropertySet_Impl PersistentPropertySet::PersistentPropertySet( - const Reference< XComponentContext >& xContext, PropertySetRegistry& rCreator, const OUString& rKey ) -: m_xContext( xContext ), - m_pImpl( new PersistentPropertySet_Impl( rCreator, rKey ) ) +: m_pImpl( new PersistentPropertySet_Impl( rCreator, rKey ) ) { // register at creator. rCreator.add( this ); diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 40e4470d7907..6a35e67e48df 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -181,7 +181,6 @@ class PersistentPropertySet : public cppu::WeakImplHelper < css::beans::XPropertySetInfoChangeNotifier, css::beans::XPropertyAccess > { - css::uno::Reference< css::uno::XComponentContext > m_xContext; std::unique_ptr<PersistentPropertySet_Impl> m_pImpl; private: @@ -192,7 +191,6 @@ private: public: PersistentPropertySet( - const css::uno::Reference< css::uno::XComponentContext >& xContext, PropertySetRegistry& rCreator, const OUString& rKey ); virtual ~PersistentPropertySet(); diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index cc647a4ead19..38999de1b902 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -37,9 +37,8 @@ namespace gio typedef std::vector< ResultListEntry* > ResultList; -DataSupplier::DataSupplier( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, - const uno::Reference< ::gio::Content >& rContent, sal_Int32 nOpenMode ) - : mxContent(rContent), m_xSMgr(rxSMgr), mnOpenMode(nOpenMode), mbCountFinal(false) +DataSupplier::DataSupplier( const uno::Reference< ::gio::Content >& rContent, sal_Int32 nOpenMode ) + : mxContent(rContent), mnOpenMode(nOpenMode), mbCountFinal(false) { } diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index d359cc4ca12d..5f442f38ef4e 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -54,14 +54,12 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier { private: css::uno::Reference< ::gio::Content > mxContent; - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; sal_Int32 mnOpenMode; bool mbCountFinal; bool getData(); ResultList maResults; public: - DataSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr, - const css::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); + DataSupplier( const css::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; diff --git a/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx index cfc114866f01..eeb0c4ab5ab8 100644 --- a/ucb/source/ucp/gio/gio_resultset.cxx +++ b/ucb/source/ucp/gio/gio_resultset.cxx @@ -42,7 +42,7 @@ void DynamicResultSet::initStatic() { m_xResultSet1 = new ::ucbhelper::ResultSet( m_xContext, m_aCommand.Properties, - new DataSupplier( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), m_xContent, m_aCommand.Mode ), m_xEnv ); + new DataSupplier( m_xContent, m_aCommand.Mode ), m_xEnv ); } void DynamicResultSet::initDynamic() diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx index 4f8d1bccf42a..a40eab0a9ff6 100644 --- a/vcl/inc/cairotextrender.hxx +++ b/vcl/inc/cairotextrender.hxx @@ -72,7 +72,6 @@ class VCL_DLLPUBLIC CairoTextRender : public TextRenderImpl ServerFont* mpServerFont[ MAX_FALLBACK ]; SalColor mnTextColor; - CairoFontsCache m_aCairoFontsCache; bool bDisableGraphite_; diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 222c8c85a54a..5400dfb7a0f7 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -161,13 +161,6 @@ struct SalWheelMouseEvent {} }; -// MOUSEACTIVATE -struct SalMouseActivateEvent -{ - long mnX; // X-Position (Pixel, TopLeft-Output) - long mnY; // Y-Position (Pixel, TopLeft-Output) -}; - // EXTTEXTINPUT struct SalExtTextInputEvent { diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 184c7a9fb14a..62f301d40deb 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -382,8 +382,6 @@ public: mbNonHomogeneous:1, mbDoubleBufferingRequested:1; - vcl::RenderSettings maRenderSettings; - css::uno::Reference< css::uno::XInterface > mxDNDListenerContainer; }; diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx index edfa8acd391f..77822d667835 100644 --- a/vcl/source/filter/jpeg/JpegWriter.hxx +++ b/vcl/source/filter/jpeg/JpegWriter.hxx @@ -29,11 +29,10 @@ class JPEGWriter { SvStream& mrStream; - Bitmap maBitmap; BitmapReadAccess* mpReadAccess; sal_uInt8* mpBuffer; bool mbNative; - bool mbGreys; + bool mbGreys; sal_Int32 mnQuality; sal_Int32 maChromaSubsampling; diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index bb029b55ef43..989e0aa9efeb 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1244,7 +1244,7 @@ bool EnhWMFReader::ReadEnhWMF() Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) ); aBitmap.Crop( aCropRect ); } - aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ) ); + aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop ) ); } } } @@ -1305,7 +1305,7 @@ bool EnhWMFReader::ReadEnhWMF() Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) ); aBitmap.Crop( aCropRect ); } - aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ) ); + aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop ) ); } } } @@ -1372,7 +1372,7 @@ bool EnhWMFReader::ReadEnhWMF() Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) ); aBitmap.Crop( aCropRect ); } - aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ) ); + aBmpSaveList.push_back( new BSaveStruct( aBitmap, aRect, dwRop ) ); } } } diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 087c3f2d5db1..f8ae32e385bb 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -459,14 +459,12 @@ struct BSaveStruct Bitmap aBmp; Rectangle aOutRect; sal_uInt32 nWinRop; - WinMtfFillStyle aStyle; BSaveStruct(const Bitmap& rBmp, const Rectangle& rOutRect, - sal_uInt32 nRop, WinMtfFillStyle& rStyle) + sal_uInt32 nRop) : aBmp(rBmp) , aOutRect(rOutRect) , nWinRop(nRop) - , aStyle (rStyle) {} }; diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 64508ef7dbfa..a142f765020a 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -680,7 +680,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) aBmp.Crop( aCropRect ); } Rectangle aDestRect( aPoint, Size( nSxe, nSye ) ); - aBmpSaveList.push_back( new BSaveStruct( aBmp, aDestRect, nWinROP, pOut->GetFillStyle () ) ); + aBmpSaveList.push_back( new BSaveStruct( aBmp, aDestRect, nWinROP ) ); } } } @@ -730,7 +730,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) Rectangle aCropRect( Point( nSx, nSy ), Size( nSxe, nSye ) ); aBmp.Crop( aCropRect ); } - aBmpSaveList.push_back( new BSaveStruct( aBmp, aDestRect, nWinROP, pOut->GetFillStyle () ) ); + aBmpSaveList.push_back( new BSaveStruct( aBmp, aDestRect, nWinROP ) ); } } } diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index afc0bdc602ac..f4b9deb45073 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -106,8 +106,6 @@ private: typedef ::std::vector< MenuItemData* > MenuItemDataList_impl; MenuItemDataList_impl maItemList; - css::uno::Reference< css::i18n::XCharacterClassification > xCharClass; - public: MenuItemList() {} ~MenuItemList(); diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 313f8cd470bd..e9edae3a2f69 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -39,7 +39,6 @@ class ImplWheelWindow : public FloatingWindow private: ImageList maImgList; - Bitmap maWheelBmp; Point maLastMousePos; Point maCenter; Timer* mpTimer; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index fa5357226ffb..bb5f8b0ca49d 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -3192,13 +3192,7 @@ static long ImplHandleMouseActivateMsg( HWND hWnd ) if ( pFrame->mbFloatWin ) return TRUE; - SalMouseActivateEvent aMouseActivateEvt; - POINT aPt; - GetCursorPos( &aPt ); - ScreenToClient( hWnd, &aPt ); - aMouseActivateEvt.mnX = aPt.x; - aMouseActivateEvt.mnY = aPt.y; - return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt ); + return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, nullptr ); } static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) |