[Libreoffice-commits] core.git: 2 commits - helpcontent2 sd/source sd/uiconfig
Caolán McNamara
caolanm at redhat.com
Fri Jul 12 02:01:43 PDT 2013
helpcontent2 | 2 +-
sd/source/ui/dlg/paragr.cxx | 8 ++++----
sd/source/ui/func/fuparagr.cxx | 1 -
sd/source/ui/inc/paragr.hxx | 4 ----
sd/uiconfig/sdraw/ui/paranumberingtab.ui | 16 ++++++----------
5 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 77826a484fc0eaceff4cfeacced0b8792743788c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 12 09:13:38 2013 +0100
remove unused ids
Change-Id: I6c25699ec598ff6d3191870859eebc83eacc7709
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index b55fcd5..9483210 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -163,19 +163,19 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr )
SvtCJKOptions aCJKOptions;
if( aCJKOptions.IsAsianTypographyEnabled() )
- m_nParaAsian = AddTabPage( "labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN);
+ AddTabPage( "labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN);
else
RemoveTabPage( "labelTP_PARA_ASIAN" );
- m_nParaAlign = AddTabPage( "labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH);
+ AddTabPage( "labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH);
static const sal_Bool bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL );
if( bShowParaNumbering )
- m_nParaNumPara = AddTabPage( "labelNUMBERING", SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges );
+ AddTabPage( "labelNUMBERING", SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges );
else
RemoveTabPage( "labelNUMBERING" );
- m_nParaTab = AddTabPage( "labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
+ AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
}
void SdParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 1f33834..e04e832 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -33,7 +33,6 @@
#include "ViewShell.hxx"
#include "drawdoc.hxx"
#include "sdabstdlg.hxx"
-//#include "paragr.hrc"
#include "sdattr.hrc"
namespace sd {
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 625d7e0..72d7ec6 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -29,10 +29,6 @@
class SdParagraphDlg : public SfxTabDialog
{
sal_uInt16 m_nParaStd;
- sal_uInt16 m_nParaNumPara;
- sal_uInt16 m_nParaAsian;
- sal_uInt16 m_nParaTab;
- sal_uInt16 m_nParaAlign;
private:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
index abfb5bc..b7ca96d 100644
--- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui
+++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
@@ -9,8 +9,7 @@
<object class="GtkFrame" id="DrawParaNumbering">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="margin_top">6</property>
+ <property name="border_width">6</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -18,13 +17,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
- <property name="left_padding">6</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_top">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
@@ -41,13 +38,14 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinbuttonNF_NEW_START">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment1</property>
@@ -63,10 +61,11 @@
<object class="GtkCheckButton" id="checkbuttonCB_NUMBER_NEW_START">
<property name="label" translatable="yes">S_tart with</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
- <property name="margin_left">17</property>
+ <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="inconsistent">True</property>
@@ -79,9 +78,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
commit 505c5c399d09609c3d4bfa3510e2c6f5e8cd5912
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 12 09:14:58 2013 +0100
Updated core
Project: help b6af35b3def2399a8dec491c50f7a946618261d0
diff --git a/helpcontent2 b/helpcontent2
index bbffb8d..b6af35b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bbffb8dbd5930c7b808fdd3887ffae4fe88ee6f0
+Subproject commit b6af35b3def2399a8dec491c50f7a946618261d0
More information about the Libreoffice-commits
mailing list