Skip to content

C
core
Kaydet (Commit) 09486963 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

can drop SfxNoLayoutSingleTabDialog use here now 

Change-Id: I668b4f0b767d3a93a1407ae4ba7922235815a28b
üst 3d4753f5
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 25 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 09486963
...@@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ ...@@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \ cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/customizedialog \ cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \ cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/distributiondialog \
cui/uiconfig/ui/distributionpage \ cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \ cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \ cui/uiconfig/ui/formatcellsdialog \
......
cui/source/inc/dstribut.hxx
Dosyayı görüntüle @ 09486963
...@@ -56,15 +56,14 @@ public: ...@@ -56,15 +56,14 @@ public:
SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; } SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
}; };
class SvxDistributeDialog : public SfxNoLayoutSingleTabDialog class SvxDistributeDialog : public SfxSingleTabDialog
{ {
SvxDistributePage* mpPage; SvxDistributePage* mpPage;
public: public:
SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone); SvxDistributeVertical eVer = SvxDistributeVerticalNone);
~SvxDistributeDialog();
SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); } SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); }
SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); } SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); }
......
cui/source/tabpages/dstribut.cxx
Dosyayı görüntüle @ 09486963
...@@ -38,27 +38,15 @@ static sal_uInt16 pRanges[] = ...@@ -38,27 +38,15 @@ static sal_uInt16 pRanges[] =
|* |*
\************************************************************************/ \************************************************************************/
SvxDistributeDialog::SvxDistributeDialog( SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
Window* pParent, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer) SvxDistributeVertical eVer)
: SfxNoLayoutSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ), : SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog",
mpPage(0L) "cui/ui/distributiondialog.ui")
{ , mpPage(NULL)
mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer);
SetTabPage(mpPage);
SetText(mpPage->GetText());
}
/*************************************************************************
|*
|* Dtor
|*
\************************************************************************/
SvxDistributeDialog::~SvxDistributeDialog()
{ {
mpPage = new SvxDistributePage(get_content_area(), rInAttrs, eHor, eVer);
setTabPage(mpPage);
} }
/************************************************************************* /*************************************************************************
...@@ -97,12 +85,12 @@ SvxDistributePage::SvxDistributePage(Window* pWindow, ...@@ -97,12 +85,12 @@ SvxDistributePage::SvxDistributePage(Window* pWindow,
SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs, SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) SvxDistributeHorizontal eHor, SvxDistributeVertical eVer)
{ {
return(new SvxDistributePage(pWindow, rAttrs, eHor, eVer)); return new SvxDistributePage(pWindow, rAttrs, eHor, eVer);
} }
sal_uInt16* SvxDistributePage::GetRanges() sal_uInt16* SvxDistributePage::GetRanges()
{ {
return(pRanges); return pRanges;
} }
void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)
......
cui/uiconfig/ui/distributiondialog.ui 0 → 100644
Dosyayı görüntüle @ 09486963
<?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>
include/svx/dialogs.hrc
Dosyayı görüntüle @ 09486963
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
#define RID_SVXPAGE_HATCH (RID_SVX_START + 57) #define RID_SVXPAGE_HATCH (RID_SVX_START + 57)
#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) #define RID_SVXPAGE_BITMAP (RID_SVX_START + 58)
#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) #define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59)
#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236)
#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) #define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296)
......
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