diff options
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 3 | ||||
| -rw-r--r-- | sc/qa/unit/screenshots/screenshots.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabbgcolordlg.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshf.cxx | 3 |
7 files changed, 8 insertions, 15 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 76e4387bba56..545db4ebde20 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -447,8 +447,7 @@ public: virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color - const Color& rDefaultColor, //Currently selected Color - const OString& ) = 0; + const Color& rDefaultColor ) = 0; //Currently selected Color virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( bool bAscii = true, const ScImportOptions* pOptions = nullptr, diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx index b17afc90ef2a..ee12727e369f 100644 --- a/sc/qa/unit/screenshots/screenshots.cxx +++ b/sc/qa/unit/screenshots/screenshots.cxx @@ -216,7 +216,7 @@ VclAbstractDialog* ScScreenshotTest::createDialogByID( sal_uInt32 nID ) { pReturnDialog = pFact->CreateScTabBgColorDlg( pViewShell->GetDialogParent(), OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)), - OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)), Color(0xff00ff), ".uno:TabBgColor" ); + OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)), Color(0xff00ff) ); break; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index ae79ff70d088..b9388e254c69 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -878,10 +878,9 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, - const Color& rDefaultColor, - const OString& sHelpId) + const Color& rDefaultColor) { - VclPtr<ScTabBgColorDlg> pDlg = VclPtr<ScTabBgColorDlg>::Create( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, sHelpId ); + VclPtr<ScTabBgColorDlg> pDlg = VclPtr<ScTabBgColorDlg>::Create( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor ); return new AbstractScTabBgColorDlg_Impl( pDlg ); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 63e228b071fd..8083072b058e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -519,8 +519,7 @@ public: virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color - const Color& rDefaultColor, //Currently selected Color - const OString& sHelpId ) override; + const Color& rDefaultColor ) override; //Currently selected Color virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( bool bAscii = true, const ScImportOptions* pOptions = nullptr, diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index ae83b584060d..68e9b6dc8c83 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -31,8 +31,7 @@ public: ScTabBgColorDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, - const Color& rDefaultColor, - const OString& nHelpId ); + const Color& rDefaultColor ); virtual ~ScTabBgColorDlg(); virtual void dispose() override; diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index a8993d851bd1..f88ca418f68e 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -36,8 +36,7 @@ #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, - const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, - const OString& sHelpId) + const OUString& rTabBgColorNoColorText, const Color& rDefaultColor) : ModalDialog(pParent, "TabColorDialog", "modules/scalc/ui/tabcolordialog.ui") , m_aTabBgColor(rDefaultColor) , m_aTabBgColorNoColorText(rTabBgColorNoColorText) @@ -48,7 +47,6 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, m_pTabBgColorSet->SetColCount(SvxColorValueSet::getColumnCount()); get(m_pBtnOk, "ok"); - SetHelpId( sHelpId ); this->SetText( rTitle ); this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 91af95af42dc..d01ab664bd7d 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -740,8 +740,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) GetDialogParent(), OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)), OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)), - aTabBgColor, - ".uno:TabBgColor")); + aTabBgColor)); while ( !bDone && nRet == RET_OK ) { nRet = pDlg->Execute(); |