[Libreoffice-commits] .: sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jan 12 04:14:34 PST 2013
sw/UI_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/table/tabledlg.cxx | 445 +++++++++++------------
sw/source/ui/table/tabledlg.hrc | 24 -
sw/source/ui/table/tabledlg.src | 207 ----------
sw/source/ui/table/tablepg.hxx | 46 +-
sw/uiconfig/swriter/ui/tableproperties.ui | 441 -----------------------
sw/uiconfig/swriter/ui/tabletextflowpage.ui | 532 ++++++++++++++++++++++++++++
8 files changed, 775 insertions(+), 922 deletions(-)
New commits:
commit 4a478876e2ce355072c0865f0008807f9d9a796a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 11 20:42:23 2013 +0000
split out table textflow page and adapt code
Change-Id: Icc32df960b7a1d794ce5342daa594344d9279477
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 95d6564..cac0a2a 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
+ sw/uiconfig/swriter/ui/tabletextflowpage \
sw/uiconfig/swriter/ui/titlepage \
sw/uiconfig/swriter/ui/wordcount \
))
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8cef3ce..ec0dce0 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -170,7 +170,6 @@
#define HID_STD_FONT "SW_HID_STD_FONT"
#define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_FRM_ADD "SW_HID_FRM_ADD"
-#define HID_TABLE_TEXTFLOW "SW_HID_TABLE_TEXTFLOW"
#define HID_OPTTABLE_PAGE "SW_HID_OPTTABLE_PAGE"
#define HID_FLD_DB "SW_HID_FLD_DB"
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a41c76b..939b132 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1295,65 +1295,60 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
}
}
-SwTextFlowPage::SwTextFlowPage( Window* pParent,
- const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SW_RES( TP_TABLE_TEXTFLOW ), rSet ),
- aFlowFL (this, SW_RES(FL_FLOW )),
- aPgBrkCB (this, SW_RES(CB_PAGEBREAK )),
- aPgBrkRB (this, SW_RES(RB_BREAKPAGE )),
- aColBrkRB (this, SW_RES(RB_BREAKCOLUMN )),
- aPgBrkBeforeRB (this, SW_RES(RB_PAGEBREAKBEFORE)),
- aPgBrkAfterRB (this, SW_RES(RB_PAGEBREAKAFTER )),
- aPageCollCB (this, SW_RES(CB_PAGECOLL )),
- aPageCollLB (this, SW_RES(LB_PAGECOLL )),
- aPageNoFT (this, SW_RES(FT_PAGENUM )),
- aPageNoNF (this, SW_RES(NF_PAGENUM )),
- aSplitCB (this, SW_RES(CB_SPLIT )),
- aSplitRowCB (this, SW_RES(CB_SPLIT_ROW )),
- aKeepCB (this, SW_RES(CB_KEEP )),
- aHeadLineCB (this, SW_RES(CB_HEADLINE )),
- aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER )),
- aRepeatHeaderBeforeFT (this),
- aRepeatHeaderNF (this, SW_RES(NF_REPEAT_HEADER )),
- aRepeatHeaderAfterFT (this),
- aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT),
- aTextDirectionFT(this, SW_RES(FT_TEXTORIENTATION )),
- aTextDirectionLB(this, SW_RES(LB_TEXTORIENTATION )),
-
- aVertOrientFL (this, SW_RES(FL_VERT_ORIENT )),
- aVertOrientFT(this, SW_RES(FT_VERTORIENT )),
- aVertOrientLB(this, SW_RES(LB_VERTORIENT )),
-
- pShell(0),
-
- bPageBreak(sal_True),
- bHtmlMode(sal_False)
+SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "TableTextFlowPage",
+ "modules/swriter/ui/tabletextflowpage.ui", rSet)
+ , pShell(0)
+ , bPageBreak(true)
+ , bHtmlMode(false)
{
- FreeResource();
+ get(m_pPgBrkCB, "break");
+
+ get(m_pPgBrkRB, "page");
+ get(m_pColBrkRB, "column");
+
+ get(m_pPgBrkBeforeRB, "before");
+ get(m_pPgBrkAfterRB, "after");
+
+ get(m_pPageCollCB, "pagestyle");
+ get(m_pPageCollLB, "pagestylelb");
+ get(m_pPageNoFT, "pagenoft");
+ get(m_pPageNoNF, "pagenonf");
+
+ get(m_pSplitCB, "split");
+ get(m_pSplitRowCB, "splitrow");
+ get(m_pKeepCB, "keep");
+ get(m_pHeadLineCB, "headline");
- aPgBrkRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
- aColBrkRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
- aPgBrkBeforeRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
- aPgBrkAfterRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
- aPageCollLB.SetAccessibleRelationLabeledBy(&aPageCollCB);
- aPageCollLB.SetAccessibleName(aPageCollCB.GetText());
+ get(m_pRepeatHeaderCombo, "repeatheader");
+ get(m_pRepeatHeaderNF, "repeatheadernf");
- aPgBrkCB.SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl));
- aPgBrkBeforeRB.SetClickHdl(
+ get(m_pTextDirectionLB, "textdirection");
+ get(m_pVertOrientLB, "vertorient");
+
+ m_pPgBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
+ m_pColBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
+ m_pPgBrkBeforeRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
+ m_pPgBrkAfterRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
+ m_pPageCollLB->SetAccessibleRelationLabeledBy(m_pPageCollCB);
+ m_pPageCollLB->SetAccessibleName(m_pPageCollCB->GetText());
+
+ m_pPgBrkCB->SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl));
+ m_pPgBrkBeforeRB->SetClickHdl(
LINK( this, SwTextFlowPage, PageBreakPosHdl_Impl ) );
- aPgBrkAfterRB.SetClickHdl(
+ m_pPgBrkAfterRB->SetClickHdl(
LINK( this, SwTextFlowPage, PageBreakPosHdl_Impl ) );
- aPageCollCB.SetClickHdl(
+ m_pPageCollCB->SetClickHdl(
LINK( this, SwTextFlowPage, ApplyCollClickHdl_Impl ) );
- aColBrkRB.SetClickHdl(
+ m_pColBrkRB->SetClickHdl(
LINK( this, SwTextFlowPage, PageBreakTypeHdl_Impl ) );
- aPgBrkRB.SetClickHdl(
+ m_pPgBrkRB->SetClickHdl(
LINK( this, SwTextFlowPage, PageBreakTypeHdl_Impl ) );
- aSplitCB.SetClickHdl(
+ m_pSplitCB->SetClickHdl(
LINK( this, SwTextFlowPage, SplitHdl_Impl));
- aSplitRowCB.SetClickHdl(
+ m_pSplitRowCB->SetClickHdl(
LINK( this, SwTextFlowPage, SplitRowHdl_Impl));
- aHeadLineCB.SetClickHdl( LINK( this, SwTextFlowPage, HeadLineCBClickHdl ) );
+ m_pHeadLineCB->SetClickHdl( LINK( this, SwTextFlowPage, HeadLineCBClickHdl ) );
#ifndef SW_FILEFORMAT_40
const SfxPoolItem *pItem;
@@ -1361,13 +1356,11 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent,
&& ((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
#endif
{
- aKeepCB.Hide();
- aSplitCB.Hide();
- aSplitRowCB.Hide();
+ m_pKeepCB->Hide();
+ m_pSplitCB->Hide();
+ m_pSplitRowCB->Hide();
}
- aRepeatHeaderCombo.Arrange( aRepeatHeaderFT );
-
HeadLineCBClickHdl();
}
@@ -1386,45 +1379,45 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
sal_Bool bModified = sal_False;
// Repeat Heading
- if(aHeadLineCB.IsChecked() != aHeadLineCB.GetSavedValue() ||
- String::CreateFromInt32( static_cast< sal_Int32 >(aRepeatHeaderNF.GetValue()) ) != aRepeatHeaderNF.GetSavedValue() )
+ if(m_pHeadLineCB->IsChecked() != m_pHeadLineCB->GetSavedValue() ||
+ String::CreateFromInt32( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() )
{
bModified |= 0 != rSet.Put(
- SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, aHeadLineCB.IsChecked()? sal_uInt16(aRepeatHeaderNF.GetValue()) : 0 ));
+ SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 ));
}
- if(aKeepCB.IsChecked() != aKeepCB.GetSavedValue())
- bModified |= 0 != rSet.Put( SvxFmtKeepItem( aKeepCB.IsChecked(), RES_KEEP));
+ if(m_pKeepCB->IsChecked() != m_pKeepCB->GetSavedValue())
+ bModified |= 0 != rSet.Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP));
- if(aSplitCB.IsChecked() != aSplitCB.GetSavedValue())
- bModified |= 0 != rSet.Put( SwFmtLayoutSplit( aSplitCB.IsChecked()));
+ if(m_pSplitCB->IsChecked() != m_pSplitCB->GetSavedValue())
+ bModified |= 0 != rSet.Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked()));
- if(aSplitRowCB.IsChecked() != aSplitRowCB.GetSavedValue())
- bModified |= 0 != rSet.Put( SwFmtRowSplit( aSplitRowCB.IsChecked()));
+ if(m_pSplitRowCB->IsChecked() != m_pSplitRowCB->GetSavedValue())
+ bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked()));
const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK );
const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( rSet, RES_PAGEDESC );
- sal_Bool bState = aPageCollCB.IsChecked();
+ sal_Bool bState = m_pPageCollCB->IsChecked();
// If we have a page style, then there's no break
sal_Bool bPageItemPut = sal_False;
- if ( bState != aPageCollCB.GetSavedValue() ||
+ if ( bState != m_pPageCollCB->GetSavedValue() ||
( bState &&
- aPageCollLB.GetSelectEntryPos() != aPageCollLB.GetSavedValue() )
- || (aPageNoNF.IsEnabled() && aPageNoNF.IsValueModified()) )
+ m_pPageCollLB->GetSelectEntryPos() != m_pPageCollLB->GetSavedValue() )
+ || (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()) )
{
String sPage;
if ( bState )
{
- sPage = aPageCollLB.GetSelectEntry();
+ sPage = m_pPageCollLB->GetSelectEntry();
}
- sal_uInt16 nPgNum = static_cast< sal_uInt16 >(aPageNoNF.GetValue());
+ sal_uInt16 nPgNum = static_cast< sal_uInt16 >(m_pPageNoNF->GetValue());
if ( !pDesc || !pDesc->GetPageDesc() ||
( pDesc->GetPageDesc() && ((pDesc->GetPageDesc()->GetName() != sPage) ||
- !comphelper::string::equals(aPageNoNF.GetSavedValue(), nPgNum))))
+ !comphelper::string::equals(m_pPageNoNF->GetSavedValue(), nPgNum))))
{
SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, sal_True ) );
aFmt.SetNumOffset(bState ? nPgNum : 0);
@@ -1432,21 +1425,21 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
bPageItemPut = bState;
}
}
- sal_Bool bIsChecked = aPgBrkCB.IsChecked();
+ sal_Bool bIsChecked = m_pPgBrkCB->IsChecked();
if ( !bPageItemPut &&
- ( bState != aPageCollCB.GetSavedValue() ||
- bIsChecked != aPgBrkCB.GetSavedValue() ||
- aPgBrkBeforeRB.IsChecked() != aPgBrkBeforeRB.GetSavedValue() ||
- aPgBrkRB.IsChecked() != aPgBrkRB.GetSavedValue() ))
+ ( bState != m_pPageCollCB->GetSavedValue() ||
+ bIsChecked != m_pPgBrkCB->GetSavedValue() ||
+ m_pPgBrkBeforeRB->IsChecked() != m_pPgBrkBeforeRB->GetSavedValue() ||
+ m_pPgBrkRB->IsChecked() != m_pPgBrkRB->GetSavedValue() ))
{
SvxFmtBreakItem aBreak(
(const SvxFmtBreakItem&)GetItemSet().Get( RES_BREAK ) );
if(bIsChecked)
{
- sal_Bool bBefore = aPgBrkBeforeRB.IsChecked();
+ sal_Bool bBefore = m_pPgBrkBeforeRB->IsChecked();
- if ( aPgBrkRB.IsChecked() )
+ if ( m_pPgBrkRB->IsChecked() )
{
if ( bBefore )
aBreak.SetValue( SVX_BREAK_PAGE_BEFORE );
@@ -1472,18 +1465,18 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
}
}
- if(aTextDirectionLB.GetSelectEntryPos() != aTextDirectionLB.GetSavedValue())
+ if(m_pTextDirectionLB->GetSelectEntryPos() != m_pTextDirectionLB->GetSavedValue())
{
bModified |= 0 != rSet.Put(
SvxFrameDirectionItem(
- (SvxFrameDirection)(sal_uLong)aTextDirectionLB.GetEntryData(aTextDirectionLB.GetSelectEntryPos())
+ (SvxFrameDirection)(sal_uLong)m_pTextDirectionLB->GetEntryData(m_pTextDirectionLB->GetSelectEntryPos())
, FN_TABLE_BOX_TEXTORIENTATION));
}
- if(aVertOrientLB.GetSelectEntryPos() != aVertOrientLB.GetSavedValue())
+ if(m_pVertOrientLB->GetSelectEntryPos() != m_pVertOrientLB->GetSavedValue())
{
sal_uInt16 nOrient = USHRT_MAX;
- switch(aVertOrientLB.GetSelectEntryPos())
+ switch(m_pVertOrientLB->GetSelectEntryPos())
{
case 0 : nOrient = text::VertOrientation::NONE; break;
case 1 : nOrient = text::VertOrientation::CENTER; break;
@@ -1511,37 +1504,37 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
for( i = 0; i < nCount; ++i)
{
const SwPageDesc &rPageDesc = pShell->GetPageDesc(i);
- aPageCollLB.InsertEntry(rPageDesc.GetName());
+ m_pPageCollLB->InsertEntry(rPageDesc.GetName());
}
String aFmtName;
for(i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i)
- if( LISTBOX_ENTRY_NOTFOUND == aPageCollLB.GetEntryPos(
+ if( LISTBOX_ENTRY_NOTFOUND == m_pPageCollLB->GetEntryPos(
aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ) ))
- aPageCollLB.InsertEntry( aFmtName );
+ m_pPageCollLB->InsertEntry( aFmtName );
if(SFX_ITEM_SET == rSet.GetItemState( RES_KEEP, sal_False, &pItem ))
{
- aKeepCB.Check( ((const SvxFmtKeepItem*)pItem)->GetValue() );
- aKeepCB.SaveValue();
+ m_pKeepCB->Check( ((const SvxFmtKeepItem*)pItem)->GetValue() );
+ m_pKeepCB->SaveValue();
}
if(SFX_ITEM_SET == rSet.GetItemState( RES_LAYOUT_SPLIT, sal_False, &pItem ))
{
- aSplitCB.Check( ((const SwFmtLayoutSplit*)pItem)->GetValue() );
+ m_pSplitCB->Check( ((const SwFmtLayoutSplit*)pItem)->GetValue() );
}
else
- aSplitCB.Check();
+ m_pSplitCB->Check();
- aSplitCB.SaveValue();
- SplitHdl_Impl(&aSplitCB);
+ m_pSplitCB->SaveValue();
+ SplitHdl_Impl(m_pSplitCB);
if(SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pItem ))
{
- aSplitRowCB.Check( ((const SwFmtRowSplit*)pItem)->GetValue() );
+ m_pSplitRowCB->Check( ((const SwFmtRowSplit*)pItem)->GetValue() );
}
else
- aSplitRowCB.SetState(STATE_DONTKNOW);
- aSplitRowCB.SaveValue();
+ m_pSplitRowCB->SetState(STATE_DONTKNOW);
+ m_pSplitRowCB->SaveValue();
if(bPageBreak)
{
@@ -1549,32 +1542,32 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
{
String sPageDesc;
const SwPageDesc* pDesc = ((const SwFmtPageDesc*)pItem)->GetPageDesc();
- aPageNoNF.SetValue(((const SwFmtPageDesc*)pItem)->GetNumOffset());
+ m_pPageNoNF->SetValue(((const SwFmtPageDesc*)pItem)->GetNumOffset());
if(pDesc)
sPageDesc = pDesc->GetName();
if ( sPageDesc.Len() &&
- aPageCollLB.GetEntryPos( sPageDesc ) != LISTBOX_ENTRY_NOTFOUND )
+ m_pPageCollLB->GetEntryPos( sPageDesc ) != LISTBOX_ENTRY_NOTFOUND )
{
- aPageCollLB.SelectEntry( sPageDesc );
- aPageCollCB.Check();
-
- aPgBrkCB.Enable();
- aPgBrkRB.Enable();
- aColBrkRB.Enable();
- aPgBrkBeforeRB.Enable();
- aPgBrkAfterRB.Enable();
- aPageCollCB.Enable();
- aPgBrkCB.Check();
-
- aPgBrkCB.Check( sal_True );
- aColBrkRB.Check( sal_False );
- aPgBrkBeforeRB.Check( sal_True );
- aPgBrkAfterRB.Check( sal_False );
+ m_pPageCollLB->SelectEntry( sPageDesc );
+ m_pPageCollCB->Check();
+
+ m_pPgBrkCB->Enable();
+ m_pPgBrkRB->Enable();
+ m_pColBrkRB->Enable();
+ m_pPgBrkBeforeRB->Enable();
+ m_pPgBrkAfterRB->Enable();
+ m_pPageCollCB->Enable();
+ m_pPgBrkCB->Check();
+
+ m_pPgBrkCB->Check( sal_True );
+ m_pColBrkRB->Check( sal_False );
+ m_pPgBrkBeforeRB->Check( sal_True );
+ m_pPgBrkAfterRB->Check( sal_False );
}
else
{
- aPageCollLB.SetNoSelection();
- aPageCollCB.Check(sal_False);
+ m_pPageCollLB->SetNoSelection();
+ m_pPageCollCB->Check(sal_False);
}
}
@@ -1585,74 +1578,74 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
if ( eBreak != SVX_BREAK_NONE )
{
- aPgBrkCB.Check();
- aPageCollCB.Enable(sal_False);
- aPageCollLB.Enable(sal_False);
- aPageNoFT.Enable(sal_False);
- aPageNoNF.Enable(sal_False);
+ m_pPgBrkCB->Check();
+ m_pPageCollCB->Enable(sal_False);
+ m_pPageCollLB->Enable(sal_False);
+ m_pPageNoFT->Enable(sal_False);
+ m_pPageNoNF->Enable(sal_False);
}
switch ( eBreak )
{
case SVX_BREAK_PAGE_BEFORE:
- aPgBrkRB.Check( sal_True );
- aColBrkRB.Check( sal_False );
- aPgBrkBeforeRB.Check( sal_True );
- aPgBrkAfterRB.Check( sal_False );
+ m_pPgBrkRB->Check( sal_True );
+ m_pColBrkRB->Check( sal_False );
+ m_pPgBrkBeforeRB->Check( sal_True );
+ m_pPgBrkAfterRB->Check( sal_False );
break;
case SVX_BREAK_PAGE_AFTER:
- aPgBrkRB.Check( sal_True );
- aColBrkRB.Check( sal_False );
- aPgBrkBeforeRB.Check( sal_False );
- aPgBrkAfterRB.Check( sal_True );
+ m_pPgBrkRB->Check( sal_True );
+ m_pColBrkRB->Check( sal_False );
+ m_pPgBrkBeforeRB->Check( sal_False );
+ m_pPgBrkAfterRB->Check( sal_True );
break;
case SVX_BREAK_COLUMN_BEFORE:
- aPgBrkRB.Check( sal_False );
- aColBrkRB.Check( sal_True );
- aPgBrkBeforeRB.Check( sal_True );
- aPgBrkAfterRB.Check( sal_False );
+ m_pPgBrkRB->Check( sal_False );
+ m_pColBrkRB->Check( sal_True );
+ m_pPgBrkBeforeRB->Check( sal_True );
+ m_pPgBrkAfterRB->Check( sal_False );
break;
case SVX_BREAK_COLUMN_AFTER:
- aPgBrkRB.Check( sal_False );
- aColBrkRB.Check( sal_True );
- aPgBrkBeforeRB.Check( sal_False );
- aPgBrkAfterRB.Check( sal_True );
+ m_pPgBrkRB->Check( sal_False );
+ m_pColBrkRB->Check( sal_True );
+ m_pPgBrkBeforeRB->Check( sal_False );
+ m_pPgBrkAfterRB->Check( sal_True );
break;
default:; //prevent warning
}
}
- if ( aPgBrkBeforeRB.IsChecked() )
- PageBreakPosHdl_Impl( &aPgBrkBeforeRB );
- else if ( aPgBrkAfterRB.IsChecked() )
- PageBreakPosHdl_Impl( &aPgBrkAfterRB );
- PageBreakHdl_Impl( &aPgBrkCB );
+ if ( m_pPgBrkBeforeRB->IsChecked() )
+ PageBreakPosHdl_Impl(m_pPgBrkBeforeRB);
+ else if ( m_pPgBrkAfterRB->IsChecked() )
+ PageBreakPosHdl_Impl(m_pPgBrkAfterRB);
+ PageBreakHdl_Impl( m_pPgBrkCB );
}
}
else
{
- aPgBrkRB.Enable(sal_False);
- aColBrkRB.Enable(sal_False);
- aPgBrkBeforeRB.Enable(sal_False);
- aPgBrkAfterRB.Enable(sal_False);
- aKeepCB .Enable(sal_False);
- aSplitCB.Enable(sal_False);
- aPgBrkCB.Enable(sal_False);
- aPageCollCB.Enable(sal_False);
- aPageCollLB.Enable(sal_False);
+ m_pPgBrkRB->Enable(sal_False);
+ m_pColBrkRB->Enable(sal_False);
+ m_pPgBrkBeforeRB->Enable(sal_False);
+ m_pPgBrkAfterRB->Enable(sal_False);
+ m_pKeepCB->Enable(sal_False);
+ m_pSplitCB->Enable(sal_False);
+ m_pPgBrkCB->Enable(sal_False);
+ m_pPageCollCB->Enable(sal_False);
+ m_pPageCollLB->Enable(sal_False);
}
if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem ))
{
sal_uInt16 nRep = ((const SfxUInt16Item*)pItem)->GetValue();
- aHeadLineCB.Check( nRep > 0 );
- aHeadLineCB.SaveValue();
- aRepeatHeaderNF.SetValue( nRep );
- aRepeatHeaderNF.SaveValue();
+ m_pHeadLineCB->Check( nRep > 0 );
+ m_pHeadLineCB->SaveValue();
+ m_pRepeatHeaderNF->SetValue( nRep );
+ m_pRepeatHeaderNF->SaveValue();
}
if ( rSet.GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SFX_ITEM_AVAILABLE )
{
sal_uLong nDirection = ((const SvxFrameDirectionItem&)rSet.Get(FN_TABLE_BOX_TEXTORIENTATION)).GetValue();
- aTextDirectionLB.SelectEntryPos(aTextDirectionLB.GetEntryPos( (const void*)nDirection ));
+ m_pTextDirectionLB->SelectEntryPos(m_pTextDirectionLB->GetEntryPos( (const void*)nDirection ));
}
if ( rSet.GetItemState(FN_TABLE_SET_VERT_ALIGN) > SFX_ITEM_AVAILABLE )
@@ -1665,19 +1658,19 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
case text::VertOrientation::CENTER: nPos = 1; break;
case text::VertOrientation::BOTTOM: nPos = 2; break;
}
- aVertOrientLB.SelectEntryPos(nPos);
+ m_pVertOrientLB->SelectEntryPos(nPos);
}
- aPageCollCB.SaveValue();
- aPageCollLB.SaveValue();
- aPgBrkCB.SaveValue();
- aPgBrkRB.SaveValue();
- aColBrkRB.SaveValue();
- aPgBrkBeforeRB.SaveValue();
- aPgBrkAfterRB.SaveValue();
- aPageNoNF.SaveValue();
- aTextDirectionLB.SaveValue();
- aVertOrientLB.SaveValue();
+ m_pPageCollCB->SaveValue();
+ m_pPageCollLB->SaveValue();
+ m_pPgBrkCB->SaveValue();
+ m_pPgBrkRB->SaveValue();
+ m_pColBrkRB->SaveValue();
+ m_pPgBrkBeforeRB->SaveValue();
+ m_pPgBrkAfterRB->SaveValue();
+ m_pPageNoNF->SaveValue();
+ m_pTextDirectionLB->SaveValue();
+ m_pVertOrientLB->SaveValue();
HeadLineCBClickHdl();
}
@@ -1688,45 +1681,45 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh)
bHtmlMode = 0 != (::GetHtmlMode(pShell->GetView().GetDocShell()) & HTMLMODE_ON);
if(bHtmlMode)
{
- aPageNoNF.Enable(sal_False);
- aPageNoFT.Enable(sal_False);
+ m_pPageNoNF->Enable(sal_False);
+ m_pPageNoFT->Enable(sal_False);
}
}
IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl)
{
- if( aPgBrkCB.IsChecked() )
+ if( m_pPgBrkCB->IsChecked() )
{
- aPgBrkRB. Enable();
- aColBrkRB. Enable();
- aPgBrkBeforeRB. Enable();
- aPgBrkAfterRB. Enable();
+ m_pPgBrkRB-> Enable();
+ m_pColBrkRB-> Enable();
+ m_pPgBrkBeforeRB-> Enable();
+ m_pPgBrkAfterRB-> Enable();
- if ( aPgBrkRB.IsChecked() && aPgBrkBeforeRB.IsChecked() )
+ if ( m_pPgBrkRB->IsChecked() && m_pPgBrkBeforeRB->IsChecked() )
{
- aPageCollCB.Enable();
+ m_pPageCollCB->Enable();
- sal_Bool bEnable = aPageCollCB.IsChecked() &&
- aPageCollLB.GetEntryCount();
- aPageCollLB.Enable(bEnable);
+ sal_Bool bEnable = m_pPageCollCB->IsChecked() &&
+ m_pPageCollLB->GetEntryCount();
+ m_pPageCollLB->Enable(bEnable);
if(!bHtmlMode)
{
- aPageNoFT.Enable(bEnable);
- aPageNoNF.Enable(bEnable);
+ m_pPageNoFT->Enable(bEnable);
+ m_pPageNoNF->Enable(bEnable);
}
}
}
else
{
- aPageCollCB.Check( sal_False );
- aPageCollCB.Enable(sal_False);
- aPageCollLB.Enable(sal_False);
- aPageNoFT.Enable(sal_False);
- aPageNoNF.Enable(sal_False);
- aPgBrkRB. Enable(sal_False);
- aColBrkRB. Enable(sal_False);
- aPgBrkBeforeRB. Enable(sal_False);
- aPgBrkAfterRB. Enable(sal_False);
+ m_pPageCollCB->Check( sal_False );
+ m_pPageCollCB->Enable(sal_False);
+ m_pPageCollLB->Enable(sal_False);
+ m_pPageNoFT->Enable(sal_False);
+ m_pPageNoNF->Enable(sal_False);
+ m_pPgBrkRB-> Enable(sal_False);
+ m_pColBrkRB-> Enable(sal_False);
+ m_pPgBrkBeforeRB-> Enable(sal_False);
+ m_pPgBrkAfterRB-> Enable(sal_False);
}
return 0;
}
@@ -1734,50 +1727,50 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl)
IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl)
{
sal_Bool bEnable = sal_False;
- if ( aPageCollCB.IsChecked() &&
- aPageCollLB.GetEntryCount() )
+ if ( m_pPageCollCB->IsChecked() &&
+ m_pPageCollLB->GetEntryCount() )
{
bEnable = sal_True;
- aPageCollLB.SelectEntryPos( 0 );
+ m_pPageCollLB->SelectEntryPos( 0 );
}
else
{
- aPageCollLB.SetNoSelection();
+ m_pPageCollLB->SetNoSelection();
}
- aPageCollLB.Enable(bEnable);
+ m_pPageCollLB->Enable(bEnable);
if(!bHtmlMode)
{
- aPageNoFT.Enable(bEnable);
- aPageNoNF.Enable(bEnable);
+ m_pPageNoFT->Enable(bEnable);
+ m_pPageNoNF->Enable(bEnable);
}
return 0;
}
IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
{
- if ( aPgBrkCB.IsChecked() )
+ if ( m_pPgBrkCB->IsChecked() )
{
- if ( pBtn == &aPgBrkBeforeRB && aPgBrkRB.IsChecked() )
+ if ( pBtn == m_pPgBrkBeforeRB && m_pPgBrkRB->IsChecked() )
{
- aPageCollCB.Enable();
+ m_pPageCollCB->Enable();
- sal_Bool bEnable = aPageCollCB.IsChecked() &&
- aPageCollLB.GetEntryCount();
+ sal_Bool bEnable = m_pPageCollCB->IsChecked() &&
+ m_pPageCollLB->GetEntryCount();
- aPageCollLB.Enable(bEnable);
+ m_pPageCollLB->Enable(bEnable);
if(!bHtmlMode)
{
- aPageNoFT.Enable(bEnable);
- aPageNoNF.Enable(bEnable);
+ m_pPageNoFT->Enable(bEnable);
+ m_pPageNoNF->Enable(bEnable);
}
}
- else if ( pBtn == &aPgBrkAfterRB )
+ else if (pBtn == m_pPgBrkAfterRB)
{
- aPageCollCB .Check( sal_False );
- aPageCollCB .Enable(sal_False);
- aPageCollLB .Enable(sal_False);
- aPageNoFT .Enable(sal_False);
- aPageNoNF .Enable(sal_False);
+ m_pPageCollCB->Check( sal_False );
+ m_pPageCollCB->Enable(sal_False);
+ m_pPageCollLB->Enable(sal_False);
+ m_pPageNoFT->Enable(sal_False);
+ m_pPageNoNF->Enable(sal_False);
}
}
return 0;
@@ -1785,22 +1778,22 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn )
{
- if ( pBtn == &aColBrkRB || aPgBrkAfterRB.IsChecked() )
+ if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() )
{
- aPageCollCB .Check(sal_False);
- aPageCollCB .Enable(sal_False);
- aPageCollLB .Enable(sal_False);
- aPageNoFT .Enable(sal_False);
- aPageNoNF .Enable(sal_False);
+ m_pPageCollCB->Check(sal_False);
+ m_pPageCollCB->Enable(sal_False);
+ m_pPageCollLB->Enable(sal_False);
+ m_pPageNoFT->Enable(sal_False);
+ m_pPageNoNF->Enable(sal_False);
}
- else if ( aPgBrkBeforeRB.IsChecked() )
- PageBreakPosHdl_Impl( &aPgBrkBeforeRB );
+ else if ( m_pPgBrkBeforeRB->IsChecked() )
+ PageBreakPosHdl_Impl(m_pPgBrkBeforeRB);
return 0;
}
IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox )
{
- aSplitRowCB.Enable(pBox->IsChecked());
+ m_pSplitRowCB->Enable(pBox->IsChecked());
return 0;
}
@@ -1812,7 +1805,7 @@ IMPL_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox )
IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl)
{
- aRepeatHeaderCombo.Enable(aHeadLineCB.IsChecked());
+ m_pRepeatHeaderCombo->Enable(m_pHeadLineCB->IsChecked());
return 0;
}
@@ -1820,15 +1813,15 @@ IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl)
void SwTextFlowPage::DisablePageBreak()
{
bPageBreak = sal_False;
- aPgBrkCB .Disable();
- aPgBrkRB .Disable();
- aColBrkRB .Disable();
- aPgBrkBeforeRB .Disable();
- aPgBrkAfterRB .Disable();
- aPageCollCB .Disable();
- aPageCollLB .Disable();
- aPageNoFT .Disable();
- aPageNoNF .Disable();
+ m_pPgBrkCB->Disable();
+ m_pPgBrkRB->Disable();
+ m_pColBrkRB->Disable();
+ m_pPgBrkBeforeRB->Disable();
+ m_pPgBrkAfterRB->Disable();
+ m_pPageCollCB->Disable();
+ m_pPageCollLB->Disable();
+ m_pPageNoFT->Disable();
+ m_pPageNoNF->Disable();
}
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index bc12180..603ac1e 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -38,9 +38,6 @@
#define FT_WIDTH 25
#define FT_POS 32
#define CB_HEADLINE 40
-#define FT_REPEAT_HEADER 40
-#define NF_REPEAT_HEADER 40
-#define WIN_REPEAT_HEADER 40
#define FL_PROPERTIES 42
#define FT_TEXTORIENTATION 43
#define LB_TEXTORIENTATION 44
@@ -73,23 +70,4 @@
#define FT_SPACE 125
#define ED_SPACE 126
-#define FL_FLOW 130
-#define CB_PAGEBREAK 131
-#define RB_BREAKPAGE 132
-#define RB_BREAKCOLUMN 133
-#define RB_PAGEBREAKBEFORE 134
-#define RB_PAGEBREAKAFTER 135
-#define CB_PAGECOLL 136
-#define LB_PAGECOLL 137
-#define FT_PAGENUM 138
-#define NF_PAGENUM 139
-#define CB_KEEP 144
-#define CB_SPLIT 145
-#define CB_SPLIT_ROW 146
-
-#define FL_VERT_ORIENT 140
-#define RB_FROM_LEFT 144
-
-#define FT_VERTORIENT 150
-#define LB_VERTORIENT 151
-
+#define RB_FROM_LEFT 127
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 3338caf..04a789c 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -552,213 +552,6 @@ TabPage TP_TABLE_COLUMN
Text [ en-US ] = "Column width" ;
};
};
-/**************************************************************************/
-/* */
-/* Textfluss */
-/* */
-/**************************************************************************/
-TabPage TP_TABLE_TEXTFLOW
-{
- HelpId = HID_TABLE_TEXTFLOW ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- TEXT_TEXTFLOW
- Hide = TRUE;
- FixedLine FL_FLOW
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- TEXT_TEXTFLOW
- };
- CheckBox CB_PAGEBREAK
- {
- HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK";
- // Disable = TRUE;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "~Break" ;
- TabStop = TRUE ;
- Group = TRUE ;
- };
- RadioButton RB_BREAKPAGE
- {
- HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE";
- Pos = MAP_APPFONT ( 105 , 14 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Page" ;
- Group = TRUE ;
- Check = TRUE ;
- };
- RadioButton RB_BREAKCOLUMN
- {
- HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN";
- // Disable = TRUE;
- Pos = MAP_APPFONT ( 178 , 14 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Col~umn" ;
- };
- RadioButton RB_PAGEBREAKBEFORE
- {
- HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE";
- // Disable = TRUE;
- Pos = MAP_APPFONT ( 105 , 28 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Be~fore" ;
- Group = TRUE ;
- Check = TRUE ;
- };
- RadioButton RB_PAGEBREAKAFTER
- {
- HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER";
- // Disable = TRUE;
- Pos = MAP_APPFONT ( 178 , 28 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~After" ;
- };
- CheckBox CB_PAGECOLL
- {
- HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL";
- // Disable = TRUE;
- Pos = MAP_APPFONT ( 12 , 44 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- Text [ en-US ] = "With Page St~yle" ;
- TabStop = TRUE ;
- Group = TRUE ;
- };
- ListBox LB_PAGECOLL
- {
- HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL";
- Pos = MAP_APPFONT ( 105 , 42 ) ;
- Size = MAP_APPFONT ( 61 , 50 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_PAGENUM
- {
- Pos = MAP_APPFONT ( 171 , 44 ) ;
- Size = MAP_APPFONT ( 47 , 10 ) ;
- Text [ en-US ] = "Page ~number" ;
- };
- NumericField NF_PAGENUM
- {
- HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 222 , 42 ) ;
- Size = MAP_APPFONT ( 26 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 9999 ;
- Value = 0 ;
- First = 0 ;
- Last = 9999 ;
- };
- CheckBox CB_SPLIT
- {
- HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT";
- Pos = MAP_APPFONT ( 12 , 58 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Allow ~table to split across pages and columns" ;
- };
- TriStateBox CB_SPLIT_ROW
- {
- HelpID = "sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW";
- Pos = MAP_APPFONT ( 21 , 71 ) ;
- Size = MAP_APPFONT ( 227 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Allow row to break a~cross pages and columns" ;
- };
- CheckBox CB_KEEP
- {
- HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP";
- Pos = MAP_APPFONT ( 12 , 85 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- Text [ en-US ] = "~Keep with next paragraph" ;
- TabStop = TRUE ;
- };
- CheckBox CB_HEADLINE
- {
- HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE";
- Pos = MAP_APPFONT ( 12 , 99 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "R~epeat heading" ;
- };
- FixedText FT_REPEAT_HEADER
- {
- Pos = MAP_APPFONT ( 31 , 114 ) ;
- Size = MAP_APPFONT ( 95 , 10 ) ;
- Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
- };
- NumericField NF_REPEAT_HEADER
- {
- HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 131 , 113 ) ;
- Size = MAP_APPFONT ( 28 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 1000 ;
- First = 1 ;
- };
- Window WIN_REPEAT_HEADER
- {
- Pos = MAP_APPFONT ( 21 , 113 ) ;
- Size = MAP_APPFONT ( 2 , 1 ) ;
- };
- FixedText FT_TEXTORIENTATION
- {
- Pos = MAP_APPFONT ( 12 , 132 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Text ~orientation" ;
- };
- ListBox LB_TEXTORIENTATION
- {
- HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTORIENTATION";
- Pos = MAP_APPFONT ( 85 , 130 ) ;
- Size = MAP_APPFONT ( 163 , 50 ) ;
- DropDown = TRUE;
- Border = TRUE;
- StringList [ en-US ] =
- {
- < "Horizontal" ; 0; > ;
- < "Vertical" ; 2; > ;
- < "Use superordinate object settings" ; 4; > ;
- };
- };
- FixedLine FL_VERT_ORIENT
- {
- Pos = MAP_APPFONT ( 6 , 149 ) ;
- Size = MAP_APPFONT ( 251 , 8 ) ;
- Text [ en-US ] = "Alignment" ;
- };
-
- FixedText FT_VERTORIENT
- {
- Pos = MAP_APPFONT ( 12 , 164 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Vertical alignment" ;
- };
- ListBox LB_VERTORIENT
- {
- HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT";
- Pos = MAP_APPFONT ( 85 , 162 ) ;
- Size = MAP_APPFONT ( 61 , 50 ) ;
- DropDown = TRUE;
- Border = TRUE;
- StringList [ en-US ] =
- {
- < "Top" ; 0; > ;
- < "Centered" ; 1; > ;
- < "Bottom" ; 2; > ;
- };
- };
-};
InfoBox MSG_WRONG_TABLENAME
{
Message [ en-US ] = "The name of the table must not contain spaces." ;
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 9258b93..4e28ce6 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -158,31 +158,27 @@ public:
class SwTextFlowPage : public SfxTabPage
{
- FixedLine aFlowFL;
- CheckBox aPgBrkCB;
- RadioButton aPgBrkRB;
- RadioButton aColBrkRB;
- RadioButton aPgBrkBeforeRB;
- RadioButton aPgBrkAfterRB;
- CheckBox aPageCollCB;
- ListBox aPageCollLB;
- FixedText aPageNoFT;
- NumericField aPageNoNF;
- CheckBox aSplitCB;
- TriStateBox aSplitRowCB;
- CheckBox aKeepCB;
- CheckBox aHeadLineCB;
- FixedText aRepeatHeaderFT; // "dummy" to build before and after FT
- FixedText aRepeatHeaderBeforeFT;
- NumericField aRepeatHeaderNF;
- FixedText aRepeatHeaderAfterFT;
- TextControlCombo aRepeatHeaderCombo;
- FixedText aTextDirectionFT;
- ListBox aTextDirectionLB;
-
- FixedLine aVertOrientFL;
- FixedText aVertOrientFT;
- ListBox aVertOrientLB;
+ CheckBox* m_pPgBrkCB;
+
+ RadioButton* m_pPgBrkRB;
+ RadioButton* m_pColBrkRB;
+
+ RadioButton* m_pPgBrkBeforeRB;
+ RadioButton* m_pPgBrkAfterRB;
+
+ CheckBox* m_pPageCollCB;
+ ListBox* m_pPageCollLB;
+ FixedText* m_pPageNoFT;
+ NumericField* m_pPageNoNF;
+ CheckBox* m_pSplitCB;
+ TriStateBox* m_pSplitRowCB;
+ CheckBox* m_pKeepCB;
+ CheckBox* m_pHeadLineCB;
+ NumericField* m_pRepeatHeaderNF;
+ VclContainer* m_pRepeatHeaderCombo;
+ ListBox* m_pTextDirectionLB;
+
+ ListBox* m_pVertOrientLB;
SwWrtShell* pShell;
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index c638397..6cd5e95 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -27,446 +27,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid18">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <child>
- <object class="GtkFrame" id="frame8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkGrid" id="grid20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton5">
- <property name="label" translatable="yes">Break</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton1">
- <property name="label" translatable="yes">Page</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton2">
- <property name="label" translatable="yes">Column</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton3">
- <property name="label" translatable="yes">Before </property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton4">
- <property name="label" translatable="yes">After</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton6">
- <property name="label" translatable="yes">With Page Style</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton13">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton14">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton7">
- <property name="label" translatable="yes">Allow table to split across pages and columns</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton8">
- <property name="label" translatable="yes">Allow row to break across pages and columns</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin_left">20</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton9">
- <property name="label" translatable="yes">Keep with next paragraph</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton10">
- <property name="label" translatable="yes">Repeat heading</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">The first </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label39">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">rows</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton15">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="label40">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Text orientation</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Text Flow</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid24">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label41">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Vertical alignment</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">Top</item>
- <item translatable="yes">Centered</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Alignment</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="label34">
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
new file mode 100644
index 0000000..e899a86
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkGrid" id="TableTextFlowPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">5</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkCheckButton" id="break">
+ <property name="label" translatable="yes">_Break</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="page">
+ <property name="label" translatable="yes">_Page</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">column</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="column">
+ <property name="label" translatable="yes">Col_umn</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">page</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="before">
+ <property name="label" translatable="yes">Be_fore</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">after</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="after">
+ <property name="label" translatable="yes">_After</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkCheckButton" id="pagestyle">
+ <property name="label" translatable="yes">With Page St_yle</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pagenoft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Page _number</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pagenonf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="pagestylelb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="split">
+ <property name="label" translatable="yes">Allow _table to split across pages and columns</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="splitrow">
+ <property name="label" translatable="yes">Allow row to break a_cross pages and columns</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">18</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="keep">
+ <property name="label" translatable="yes">_Keep with next paragraph</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Text _orientation</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="textdirection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkCheckButton" id="headline">
+ <property name="label" translatable="yes">R_epeat heading</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="repeatheader">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">The first </property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label39">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">rows</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="repeatheadernf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Text Flow</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Vertical alignment</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="vertorient">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Alignment</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Horizontal</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Vertical</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Use superordinate object settings</col>
+ <col id="1">4</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Top</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Centered</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Bottom</col>
+ <col id="1">2</col>
+ </row>
+ </data>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list