mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can drop SfxNoLayoutSingleTabDialog use here now

Browse Source 
Change-Id: I668b4f0b767d3a93a1407ae4ba7922235815a28b
This commit is contained in:
Caolán McNamara 2014-01-08 09:22:59 +00:00
parent 3d4753f551
commit 094869634d
5 changed files with 94 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cui/UIConfig_cui.mk
View File

@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/distributiondialog \
cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \

3
cui/source/inc/dstribut.hxx
View File

@ -56,7 +56,7 @@ public:
SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
};
class SvxDistributeDialog : public SfxNoLayoutSingleTabDialog
class SvxDistributeDialog : public SfxSingleTabDialog
{
SvxDistributePage* mpPage;
@ -64,7 +64,6 @@ public:
SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
~SvxDistributeDialog();
SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); }
SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); }

30
cui/source/tabpages/dstribut.cxx
View File

@ -38,27 +38,15 @@ static sal_uInt16 pRanges[] =
|*
\************************************************************************/
SvxDistributeDialog::SvxDistributeDialog(
Window* pParent,
const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
: SfxNoLayoutSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
mpPage(0L)
{
mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer);
SetTabPage(mpPage);
SetText(mpPage->GetText());
}
/*************************************************************************
|*
|* Dtor
|*
\************************************************************************/
SvxDistributeDialog::~SvxDistributeDialog()
: SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog",
"cui/ui/distributiondialog.ui")
, mpPage(NULL)
{
mpPage = new SvxDistributePage(get_content_area(), rInAttrs, eHor, eVer);
setTabPage(mpPage);
}
/*************************************************************************
@ -97,12 +85,12 @@ SvxDistributePage::SvxDistributePage(Window* pWindow,
SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer)
{
return(new SvxDistributePage(pWindow, rAttrs, eHor, eVer));
return new SvxDistributePage(pWindow, rAttrs, eHor, eVer);
}
sal_uInt16* SvxDistributePage::GetRanges()
{
return(pRanges);
return pRanges;
}
void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)

82
cui/uiconfig/ui/distributiondialog.ui Normal file
View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Wed Jan 8 09:29:54 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="DistributionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Distribution</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<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>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<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>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<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_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>

1
include/svx/dialogs.hrc
View File

@ -87,7 +87,6 @@
#define RID_SVXPAGE_HATCH (RID_SVX_START + 57)
#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58)
#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59)
#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236)
#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296)