Kaydet (Commit) 34029d98 authored tarafından Katarina Behrens's avatar Katarina Behrens Kaydeden (comit) Thorsten Behrens

screenshots: dialog doesn't even have a help button

So drop helpID argument from its ctor (not to mention the fact that a
help text with ID .uno:TabBgColor doesn't exist either)

Change-Id: I0624f0474334cc799d67f7f292e11194de5195fa
üst cd2ecb3b
......@@ -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,
......
......@@ -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;
}
......
......@@ -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 );
}
......
......@@ -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,
......
......@@ -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;
......
......@@ -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);
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment