diff options
Diffstat (limited to 'sc')
22 files changed, 6 insertions, 38 deletions
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index b659b47716c8..dc723e7e2091 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -105,7 +105,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet; ScMenuFloatingWindow* mpWindow; - OUString maName; size_t mnMenuPos; bool mbEnabled; }; diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 865a7834de83..81abb7269ae7 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -40,13 +40,11 @@ public: private: XclFunctionProvider maFuncProv; /// Excel function data provider. - const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. }; XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), - maFuncProv( rRoot ), - meBiff( rRoot.GetBiff() ) + maFuncProv( rRoot ) { } diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index c2b23270f307..75bf3245deb8 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -130,8 +130,6 @@ private: XclImpSupbookTabList maSupbTabList; /// All sheet names of the document. XclImpExtNameList maExtNameList; /// All external names of the document. OUString maXclUrl; /// URL of the external document (Excel mode). - OUString maFilterName; /// Detected filer name. - OUString maFilterOpt; /// Detected filer options. XclSupbookType meType; /// Type of the supbook record. sal_uInt16 mnSBTab; /// Current Excel sheet index from SUPBOOK for XCT/CRN records. }; diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 7c5868f9f6fa..6ea03c9467bb 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -134,9 +134,6 @@ protected: private: ShapeAnchor maAnchor; /// Position of the drawing object. - OUString maObjName; /// Name of the object. - OUString maMacroName; /// Name of an attached macro. - OUString maHyperlink; /// On-click hyperlink URL. sal_uInt16 mnObjId; /// The object identifier (unique per drawing). sal_uInt16 mnObjType; /// The object type from OBJ record. bool mbHidden; /// True = object is hidden. diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 69f018f83b9f..619d4376e7a8 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -373,7 +373,6 @@ private: typedef ::std::unique_ptr< BiffSheetDrawing > BiffSheetDrawingPtr; const OUString maSheetCellRanges; /// Service name for a SheetCellRanges object. - const OUString maUrlTextField; /// Service name for a URL text field. const CellAddress& mrMaxApiPos; /// Reference to maximum Calc cell address from address converter. CellRangeAddress maUsedArea; /// Used area of the sheet, and sheet index of the sheet. ColumnModel maDefColModel; /// Default column formatting. @@ -409,7 +408,6 @@ private: WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), maSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ), - maUrlTextField( "com.sun.star.text.TextField.URL" ), mrMaxApiPos( rHelper.getAddressConverter().getMaxApiAddress() ), maUsedArea( nSheet, SAL_MAX_INT32, SAL_MAX_INT32, -1, -1 ), maSheetData( *this ), diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 6157f86d89c3..be0c9e9587d9 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -25,8 +25,6 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - OUString sPrintRanges; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index 0aa168eb9f45..c7d378d7f128 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -44,7 +44,6 @@ ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem( const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : ScAccessibleContextBase(rxParent, AccessibleRole::MENU_ITEM), mpWindow(pWin), - maName(rName), mnMenuPos(nMenuPos), mbEnabled(true) { diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 77ae5247a2d1..17493333b5fb 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -155,7 +155,6 @@ ScDPNumGroupDlg::ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& mpRbManEnd ( get<RadioButton> ("manual_end") ), mpEdEnd ( get<ScDoubleField>( "edit_end") ), mpEdBy ( get<ScDoubleField> ("edit_by") ), - mpBtnOk ( get<OKButton> ("ok" ) ), maStartHelper ( mpRbAutoStart, mpRbManStart, mpEdStart ), maEndHelper ( mpRbAutoEnd, mpRbManEnd, mpEdEnd ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index c5032bb9aa17..30823d41ecc7 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -45,7 +45,6 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS "modules/scalc/ui/pivotfilterdialog.ui" ) , - aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), aStrNone ( SC_RESSTR(SCSTR_NONE) ), aStrEmpty ( SC_RESSTR(SCSTR_FILTER_EMPTY) ), aStrNotEmpty ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ), diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 93f1c4dcd370..048e55227e48 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -101,7 +101,6 @@ private: ScViewData* pViewData; ScDocument* pDoc; ScRangeName aLocalRangeName; - Selection theCurSel; SvxTPFilter* pTPFilter; SvxTPView* pTPView; SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 5317ada395bb..3066f41a610c 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -104,7 +104,6 @@ private: RadioButton* mpRbManEnd; ScDoubleField* mpEdEnd; ScDoubleField* mpEdBy; - OKButton* mpBtnOk; ScDPNumGroupEditHelper maStartHelper; ScDPNumGroupEditHelper maEndHelper; }; diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index aae5648253f0..da876f253939 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -25,8 +25,6 @@ /** Base class for all functions */ class FuConstPolygon : public FuConstruct { - Point aLastPos; - public: FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index dc07789af6f0..0b0039dd9ca6 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -63,7 +63,6 @@ private: ScViewData* pViewData; ScDocument* pDoc; ScRangeName aLocalRangeName; - Selection theCurSel; ScRangeList aRangeList; ScChangeViewSettings aChangeViewSet; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 7032928fe4c0..55b3fa8625c2 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -62,7 +62,6 @@ private: CheckBox* m_pBtnRegExp; CheckBox* m_pBtnUnique; FixedText* m_pFtDbArea; - const OUString aStrUndefined; const OUString aStrNone; const OUString aStrEmpty; const OUString aStrNotEmpty; diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index c8ad3276b271..b0460bb2bbbe 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -48,7 +48,6 @@ private: OUString aStrTitle; OUString aStrLabel; OUString aStrClose; - OUString aStrDelTitle; OUString aStrDelMsg; OUString aStrRename; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 5a03ca5b279b..a78a9e13ed5a 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -30,7 +30,6 @@ #include "anyrefdg.hxx" #include "dbdata.hxx" -class ScViewData; class ScDocument; class ScSimpleRefDlg: public ScAnyRefDlg @@ -48,8 +47,6 @@ private: OKButton* m_pBtnOk; CancelButton* m_pBtnCancel; - ScDocument* pDoc; - ScRange theCurArea; bool bCloseFlag; bool bAutoReOpen; @@ -67,8 +64,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, - ScViewData* ptrViewData ); + ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent); virtual ~ScSimpleRefDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 86d46e3c9240..40dcca180920 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -55,7 +55,6 @@ private: OKButton* m_pBtnOk; Color m_aTabBgColor; const OUString m_aTabBgColorNoColorText; - OString m_sHelpId; void FillColorValueSets_Impl(); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index f622954d24ca..8734356c4dc3 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -60,7 +60,6 @@ ScAutoFormatDlg::ScAutoFormatDlg(vcl::Window* pParent, , aStrTitle(ScResId(STR_ADD_AUTOFORMAT_TITLE)) , aStrLabel(ScResId(STR_ADD_AUTOFORMAT_LABEL)) , aStrClose(ScResId(STR_BTN_AUTOFORMAT_CLOSE)) - , aStrDelTitle(ScResId(STR_DEL_AUTOFORMAT_TITLE)) , aStrDelMsg(ScResId(STR_DEL_AUTOFORMAT_MSG)) , aStrRename(ScResId(STR_RENAME_AUTOFORMAT_TITLE)) , pFormat(pAutoFormat) diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 6736f55a31c8..a150b8646c66 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -34,12 +34,10 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, - ScViewData* ptrViewData) +ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent) : ScAnyRefDlg(pB, pCW, pParent, "SimpleRefDialog", "modules/scalc/ui/simplerefdialog.ui") , - pDoc ( ptrViewData->GetDocument() ), bAutoReOpen ( true ), bCloseOnButtonUp( false ), bSingleCell ( false ), diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index aaf122f6ebbb..44e8503ac125 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -43,7 +43,6 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, : ModalDialog(pParent, "TabColorDialog", "modules/scalc/ui/tabcolordialog.ui") , m_aTabBgColor(rDefaultColor) , m_aTabBgColorNoColorText(rTabBgColorNoColorText) - , m_sHelpId(sHelpId) { get(m_pTabBgColorSet, "colorset"); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index cb052fbb7e92..98a3f74cdd32 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -82,9 +82,8 @@ getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe class WorkBookEnumImpl : public EnumerationHelperImpl { - uno::Any m_aApplication; public: - WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} + WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { @@ -111,7 +110,7 @@ ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException) // safer to create an enumeration based on this objects state // rather than one effectively based of the desktop component uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); - return new WorkBookEnumImpl( mxParent, mxContext, xEnumerationAccess->createEnumeration(), Application() ); + return new WorkBookEnumImpl( mxParent, mxContext, xEnumerationAccess->createEnumeration() ); } uno::Any diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 04abff508635..2285768fca73 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -440,7 +440,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( ScViewData& rViewData = GetViewData(); rViewData.SetRefTabNo( rViewData.GetTabNo() ); - pResult = new ScSimpleRefDlg( pB, pCW, pParent, &rViewData ); + pResult = new ScSimpleRefDlg( pB, pCW, pParent ); } break; |