[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 28 13:36:45 UTC 2018
sc/inc/scabstdlg.hxx | 7
sc/source/ui/attrdlg/scdlgfact.cxx | 22 --
sc/source/ui/attrdlg/scdlgfact.hxx | 7
sc/source/ui/docshell/docsh4.cxx | 3
sc/source/ui/inc/styledlg.hxx | 21 --
sc/source/ui/inc/tphf.hxx | 2
sc/source/ui/pagedlg/tphf.cxx | 2
sc/source/ui/styleui/styledlg.cxx | 154 ++++++-----------
sc/source/ui/view/formatsh.cxx | 25 --
sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 201 +++++++++++++++++++++-
sc/uiconfig/scalc/ui/paratemplatedialog.ui | 259 ++++++++++++++++++++++++++---
11 files changed, 513 insertions(+), 190 deletions(-)
New commits:
commit b2e7956c6ce350eeaa1e4ea79909afd8480ee242
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 27 16:25:51 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 28 15:36:15 2018 +0200
weld ScStyleDlg
Change-Id: I67e6a6cd1f0b018012c3a373c856494c4fc02979
Reviewed-on: https://gerrit.libreoffice.org/61048
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index b7910d594243..2c0c80c8ee2f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -523,10 +523,9 @@ public:
const OUString& rPageStyle,
sal_uInt16 nResId ) = 0;
- virtual VclPtr<SfxAbstractTabDialog> CreateScStyleDlg( vcl::Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- sal_uInt16 nRscId,
- int nId) = 0;
+ virtual VclPtr<SfxAbstractTabDialog> CreateScStyleDlg(weld::Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ bool bPage /*true : page, false: para*/) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateScSubTotalDlg( vcl::Window* pParent,
const SfxItemSet* pArgSet ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 662b78b09c1a..a23634a41d7d 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1014,25 +1014,11 @@ VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vc
return pDlg ? VclPtr<ScAbstractTabDialog_Impl>::Create( pDlg ) : nullptr;
}
-VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- sal_uInt16 nRscId,
- int nId)
+VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScStyleDlg(weld::Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ bool bPage)
{
- VclPtr<SfxTabDialog> pDlg;
- switch ( nId )
- {
- case RID_SCDLG_STYLES_PAGE :
- case RID_SCDLG_STYLES_PAR :
- pDlg = VclPtr<ScStyleDlg>::Create( pParent, rStyleBase, nRscId );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return VclPtr<ScAbstractTabDialog_Impl>::Create( pDlg );
- return nullptr;
+ return VclPtr<ScAbstractTabController_Impl>::Create(o3tl::make_unique<ScStyleDlg>(pParent, rStyleBase, bPage));
}
VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3ffc5bc6b367..797d6deaf794 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -671,10 +671,9 @@ public:
const OUString& rPageStyle,
sal_uInt16 nResId ) override;
- virtual VclPtr<SfxAbstractTabDialog> CreateScStyleDlg( vcl::Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- sal_uInt16 nRscId,
- int nId) override;
+ virtual VclPtr<SfxAbstractTabDialog> CreateScStyleDlg(weld::Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ bool bPage) override;
virtual VclPtr<SfxAbstractTabDialog> CreateScSubTotalDlg( vcl::Window* pParent,
const SfxItemSet* pArgSet ) override;
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 155b6794eea6..1fab2b481f6f 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1693,7 +1693,8 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScStyleDlg( GetActiveDialogParent(), *pStyleSheet, RID_SCDLG_STYLES_PAGE, RID_SCDLG_STYLES_PAGE ));
+ vcl::Window* pParent = GetActiveDialogParent();
+ ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScStyleDlg(pParent ? pParent->GetFrameWeld() : nullptr, *pStyleSheet, true));
if ( pDlg->Execute() == RET_OK )
{
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index 67f477df3596..2d3aa4241b17 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -24,26 +24,19 @@
class SfxStyleSheetBase;
-class ScStyleDlg : public SfxStyleDialog
+class ScStyleDlg : public SfxStyleDialogController
{
public:
- ScStyleDlg( vcl::Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- sal_uInt16 nRscId );
+ ScStyleDlg(weld::Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ bool bPage);
protected:
- virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override;
- virtual void RefreshInputSet() override;
+ virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+ virtual void RefreshInputSet() override;
private:
- sal_uInt16 nDlgRsc;
-
- sal_uInt16 m_nNumberId;
- sal_uInt16 m_nFontId;
- sal_uInt16 m_nBackgroundId;
- sal_uInt16 m_nPageId;
- sal_uInt16 m_nHeaderId;
- sal_uInt16 m_nFooterId;
+ bool m_bPage;
};
#endif // INCLUDED_SC_SOURCE_UI_INC_STYLEDLG_HXX
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index f5e5723aa1ba..0aa107f4cf31 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -48,7 +48,7 @@ private:
SfxItemSet aDataSet;
OUString aStrPageStyle;
SvxPageUsage nPageUsage;
- VclPtr<ScStyleDlg> pStyleDlg;
+ ScStyleDlg* pStyleDlg;
std::unique_ptr<weld::Button> m_xBtnEdit;
DECL_LINK(BtnHdl, weld::Button&, void);
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 83eb605dc458..e638b64c44e2 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -81,7 +81,7 @@ ScHFPage::~ScHFPage()
void ScHFPage::dispose()
{
- pStyleDlg.clear();
+ pStyleDlg = nullptr;
SvxHFPage::dispose();
}
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 74bdd7c91632..2315186b75c7 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -38,91 +38,75 @@
#include <svl/aeitem.hxx>
#include <svx/flagsdef.hxx>
-ScStyleDlg::ScStyleDlg( vcl::Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- sal_uInt16 nRscId )
-
- : SfxStyleDialog ( pParent,
- nRscId == RID_SCDLG_STYLES_PAR ?
- OUString("ParaTemplateDialog") :
- OUString("PageTemplateDialog"),
- nRscId == RID_SCDLG_STYLES_PAR ?
- OUString("modules/scalc/ui/paratemplatedialog.ui") :
- OUString("modules/scalc/ui/pagetemplatedialog.ui"),
+ScStyleDlg::ScStyleDlg(weld::Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ bool bPage)
+ : SfxStyleDialogController(pParent,
+ bPage ?
+ OUString("modules/scalc/ui/pagetemplatedialog.ui") :
+ OUString("modules/scalc/ui/paratemplatedialog.ui"),
+ bPage ?
+ OString("PageTemplateDialog") :
+ OString("ParaTemplateDialog"),
rStyleBase )
- , nDlgRsc ( nRscId )
- , m_nNumberId(0)
- , m_nFontId(0)
- , m_nBackgroundId(0)
- , m_nPageId(0)
- , m_nHeaderId(0)
- , m_nFooterId(0)
+ , m_bPage(bPage)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- switch ( nRscId )
+ if (m_bPage) // page styles
{
- case RID_SCDLG_STYLES_PAR: // cell format styles
- {
- SvtCJKOptions aCJKOptions;
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageRangesFunc fail!");
- m_nNumberId = AddTabPage("numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ));
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");
- m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ));
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!");
- AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ));
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE( pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageRangesFunc fail!");
- AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ));
- if ( aCJKOptions.IsAsianTypographyEnabled() )
- {
- OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");
- AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN));
- }
- else
- RemoveTabPage("asiantypo");
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
- AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ));
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
- m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
- AddTabPage("protection", &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges);
- }
- break;
-
- case RID_SCDLG_STYLES_PAGE: // page styles
- {
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
- m_nPageId = AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
- AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
- m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
- m_nHeaderId = AddTabPage("header", &ScHeaderPage::Create, &ScHeaderPage::GetRanges );
- m_nFooterId = AddTabPage("footer", &ScFooterPage::Create, &ScFooterPage::GetRanges );
- AddTabPage("sheet", &ScTablePage::Create, &ScTablePage::GetRanges );
- }
- break;
-
- default:
- OSL_FAIL( "Family not supported" );
+ AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) );
+ AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
+ AddTabPage("header", &ScHeaderPage::Create, &ScHeaderPage::GetRanges );
+ AddTabPage("footer", &ScFooterPage::Create, &ScFooterPage::GetRanges );
+ AddTabPage("sheet", &ScTablePage::Create, &ScTablePage::GetRanges );
+ }
+ else // cell format styles
+ {
+ SvtCJKOptions aCJKOptions;
+ AddTabPage("numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ));
+ AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ));
+ AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ));
+ AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ));
+ if ( aCJKOptions.IsAsianTypographyEnabled() )
+ {
+ AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN));
+ }
+ else
+ RemoveTabPage("asiantypo");
+ AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ));
+ AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+ AddTabPage("protection", &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges);
}
}
-void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
+void ScStyleDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
{
- if ( nDlgRsc == RID_SCDLG_STYLES_PAR )
+ if (m_bPage)
+ {
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+ if (rPageId == "page")
+ {
+ aSet.Put (SfxAllEnumItem(sal_uInt16(SID_ENUM_PAGE_MODE), SVX_PAGE_MODE_CENTER));
+ rTabPage.PageCreated(aSet);
+ }
+ else if (rPageId == "header" || rPageId == "footer")
+ {
+ static_cast<ScHFPage&>(rTabPage).SetStyleDlg( this );
+ static_cast<ScHFPage&>(rTabPage).SetPageStyle( GetStyleSheet().GetName() );
+ static_cast<ScHFPage&>(rTabPage).DisableDeleteQueryBox();
+ }
+ else if (rPageId == "background")
+ {
+ aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR)));
+ rTabPage.PageCreated(aSet);
+ }
+ }
+ else
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (nPageId == m_nNumberId)
+ if (rPageId == "numbers")
{
const SfxPoolItem* pInfoItem
= pDocSh->GetItem( SID_ATTR_NUMBERFORMAT_INFO );
@@ -132,7 +116,7 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
aSet.Put (SvxNumberInfoItem( static_cast<const SvxNumberInfoItem&>(*pInfoItem) ) );
rTabPage.PageCreated(aSet);
}
- else if (nPageId == m_nFontId)
+ else if (rPageId == "font")
{
const SfxPoolItem* pInfoItem
= pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
@@ -143,26 +127,6 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
rTabPage.PageCreated(aSet);
}
}
- else if ( nDlgRsc == RID_SCDLG_STYLES_PAGE )
- {
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (nPageId == m_nPageId)
- {
- aSet.Put (SfxAllEnumItem(sal_uInt16(SID_ENUM_PAGE_MODE), SVX_PAGE_MODE_CENTER));
- rTabPage.PageCreated(aSet);
- }
- else if (nPageId == m_nHeaderId || nPageId == m_nFooterId)
- {
- static_cast<ScHFPage&>(rTabPage).SetStyleDlg( this );
- static_cast<ScHFPage&>(rTabPage).SetPageStyle( GetStyleSheet().GetName() );
- static_cast<ScHFPage&>(rTabPage).DisableDeleteQueryBox();
- }
- else if (nPageId == m_nBackgroundId)
- {
- aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR)));
- rTabPage.PageCreated(aSet);
- }
- }
}
void ScStyleDlg::RefreshInputSet()
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 9213b39042d8..7c54228e83ef 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -781,7 +781,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
SfxStyleFamily eFam = pStyleSheet->GetFamily();
ScopedVclPtr<SfxAbstractTabDialog> pDlg;
- sal_uInt16 nRsc = 0;
+ bool bPage = false;
// Store old Items from the style
SfxItemSet aOldSet = pStyleSheet->GetItemSet();
@@ -790,7 +790,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
switch ( eFam )
{
case SfxStyleFamily::Page:
- nRsc = RID_SCDLG_STYLES_PAGE;
+ bPage = true;
break;
case SfxStyleFamily::Para:
@@ -823,7 +823,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
ScTabViewShell::MakeNumberInfoItem(&rDoc, GetViewData()));
pDocSh->PutItem( *pNumberInfoItem );
- nRsc = RID_SCDLG_STYLES_PAR;
+ bPage = false;
// Definitely a SvxBoxInfoItem with Table = sal_False in set:
// (If there is no item, the dialogue will also delete the
@@ -840,28 +840,11 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
break;
}
- // If GetDefDialogParent is a dialog, it must be used
- // (style catalog)
-
- vcl::Window* pParent = Application::GetDefDialogParent();
- if ( !pParent || !pParent->IsDialog() )
- {
- // GetDefDialogParent dynamically finds the
- // topmost parent of the focus window, so IsDialog above is FALSE
- // even if called from the style catalog.
- // -> Use NULL if a modal dialog is open, to enable the Dialog's
- // default parent handling.
- if ( Application::IsInModalMode() )
- pParent = nullptr;
- else
- pParent = pTabViewShell->GetDialogParent();
- }
-
pTabViewShell->SetInFormatDialog(true);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- pDlg.disposeAndReset(pFact->CreateScStyleDlg( pParent, *pStyleSheet, nRsc, nRsc ));
+ pDlg.disposeAndReset(pFact->CreateScStyleDlg(rReq.GetFrameWeld(), *pStyleSheet, bPage));
short nResult = pDlg->Execute();
pTabViewShell->SetInFormatDialog(false);
diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
index e3c8f154559c..104a2315d7a1 100644
--- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="PageTemplateDialog">
@@ -7,7 +7,13 @@
<property name="border_width">6</property>
<property name="title" translatable="yes" context="pagetemplatedialog|PageTemplateDialog">Page Style</property>
<property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -18,12 +24,10 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -34,10 +38,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -48,8 +54,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -59,12 +65,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -74,6 +79,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -90,6 +96,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="scrollable">True</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
@@ -97,6 +104,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -116,6 +147,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -139,6 +194,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">2</property>
@@ -162,6 +241,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">3</property>
@@ -185,6 +288,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">4</property>
@@ -208,6 +335,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">5</property>
@@ -231,6 +382,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">6</property>
@@ -257,10 +432,10 @@
</object>
</child>
<action-widgets>
+ <action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
index 8e537b9dac42..5cfa922baebb 100644
--- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="ParaTemplateDialog">
@@ -7,7 +7,13 @@
<property name="border_width">6</property>
<property name="title" translatable="yes" context="paratemplatedialog|ParaTemplateDialog">Cell Style</property>
<property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -18,14 +24,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="standard">
+ <property name="label" translatable="yes" context="paratemplatedialog|standard">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -34,8 +38,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -48,10 +52,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -59,12 +65,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -77,17 +82,18 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="standard">
- <property name="label" translatable="yes" context="paratemplatedialog|standard">_Standard</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -104,6 +110,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="scrollable">True</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
@@ -111,6 +118,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -130,6 +161,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -153,6 +208,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">2</property>
@@ -176,6 +255,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">3</property>
@@ -199,6 +302,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">4</property>
@@ -222,6 +349,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">5</property>
@@ -245,6 +396,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">6</property>
@@ -268,6 +443,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">7</property>
@@ -291,6 +490,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">8</property>
@@ -317,11 +540,11 @@
</object>
</child>
<action-widgets>
+ <action-widget response="0">standard</action-widget>
+ <action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="0">reset</action-widget>
- <action-widget response="0">standard</action-widget>
</action-widgets>
</object>
</interface>
More information about the Libreoffice-commits
mailing list