[Libreoffice-commits] .: 4 commits - dbaccess/source svtools/uiconfig sw/inc sw/source sw/uiconfig sw/UI_swriter.mk vcl/generic vcl/source vcl/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jan 12 12:58:25 PST 2013
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
svtools/uiconfig/ui/graphicexport.ui | 37 --
sw/UI_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/inc/prcntfld.hxx | 2
sw/source/ui/table/tabledlg.cxx | 201 +++++-----
sw/source/ui/table/tabledlg.hrc | 21 -
sw/source/ui/table/tabledlg.src | 239 ------------
sw/source/ui/table/tablepg.hxx | 37 --
sw/uiconfig/swriter/ui/tablecolumnpage.ui | 387 +++++++++++++++++++++
sw/uiconfig/swriter/ui/tableproperties.ui | 344 ------------------
vcl/generic/fontmanager/fontsubst.cxx | 12
vcl/source/window/builder.cxx | 2
vcl/uiconfig/ui/printdialog.ui | 1
14 files changed, 510 insertions(+), 777 deletions(-)
New commits:
commit d28ccfbcdd459d21f8791cd7a61a52a12d3adbbc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 12 20:57:48 2013 +0000
fix compile with higher debug levels
Change-Id: I95c932f94c4124ef40c67f7f270be05dfafd8f65
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index d56b51b..e49f1af 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -182,7 +182,7 @@ namespace dbaui
case SQL_NODE_NAME:
{
- rString += "SQL_NAME:" + "\"" + _pNode->getTokenValue() + "\"";
+ rString += "SQL_NAME:\"" + _pNode->getTokenValue() + "\"";
break;}
case SQL_NODE_STRING:
commit c681b22963bcfb1a34e143add9d10f81f1e35151
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 12 16:06:44 2013 +0000
split out table columns page and adapt code
Change-Id: I37fc7936357676dff135e85db17040324d2f3534
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index cac0a2a..e33a4df 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/tablecolumnpage \
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 ec0dce0..298c2fa 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -158,7 +158,6 @@
#define HID_GRF_EXT "SW_HID_GRF_EXT"
#define HID_FOOTNOTE_PAGE "SW_HID_FOOTNOTE_PAGE"
#define HID_FORMAT_TABLE "SW_HID_FORMAT_TABLE"
-#define HID_TABLE_COLUMN "SW_HID_TABLE_COLUMN"
#define HID_LAB_LAB "SW_HID_LAB_LAB"
#define HID_LAB_PRT "SW_HID_LAB_PRT"
#define HID_ENV_PRT "SW_HID_ENV_PRT"
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx
index b13a0e2..ed5cfca 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/ui/inc/prcntfld.hxx
@@ -47,6 +47,7 @@ public:
PercentFieldWrap();
void set(MetricField *pField);
const MetricField* get() const { return m_pField; }
+ MetricField* get() { return m_pField; }
void SetUpHdl(const Link& rLink) { m_pField->SetUpHdl(rLink); }
void SetDownHdl(const Link& rLink) { m_pField->SetDownHdl(rLink); }
void SetLoseFocusHdl(const Link& rLink) { m_pField->SetLoseFocusHdl(rLink); }
@@ -56,6 +57,7 @@ public:
void SetAccessibleName(const OUString& rName) { m_pField->SetAccessibleName(rName); }
void SetText(const OUString& rStr) { m_pField->SetText(rStr); }
void SaveValue() { m_pField->SaveValue(); }
+ void ClearModifyFlag() { m_pField->ClearModifyFlag(); }
OUString GetSavedValue() const { return m_pField->GetSavedValue(); }
OUString GetText() const { return m_pField->GetText(); }
void SetMetricFieldMin(sal_Int64 nNewMin) { m_pField->SetMin(nNewMin); }
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 939b132..9dbfeee 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -724,57 +724,39 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
/*------------------------------------------------------------------------
Beschreibung: Seite Spaltenkonfiguration
------------------------------------------------------------------------*/
-SwTableColumnPage::SwTableColumnPage( Window* pParent,
- const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SW_RES( TP_TABLE_COLUMN ), rSet ),
- aModifyTableCB(this, SW_RES(CB_MOD_TBL)),
- aProportionalCB(this, SW_RES(CB_PROP)),
- aSpaceFT(this, SW_RES(FT_SPACE)),
- aSpaceED(this, SW_RES(ED_SPACE)),
-
- aColFL(this, SW_RES(COL_FL_LAYOUT)),
- aUpBtn(this, SW_RES(COL_BTN_UP)),
- aFT1(this, SW_RES(COL_FT_1)),
- aMF1(this, SW_RES(COL_MF_1)),
- aFT2(this, SW_RES(COL_FT_2)),
- aMF2(this, SW_RES(COL_MF_2)),
- aFT3(this, SW_RES(COL_FT_3)),
- aMF3(this, SW_RES(COL_MF_3)),
- aFT4(this, SW_RES(COL_FT_4)),
- aMF4(this, SW_RES(COL_MF_4)),
- aFT5(this, SW_RES(COL_FT_5)),
- aMF5(this, SW_RES(COL_MF_5)),
- aFT6(this, SW_RES(COL_FT_6)),
- aMF6(this, SW_RES(COL_MF_6)),
- aDownBtn(this, SW_RES(COL_BTN_DOWN)),
-
- nTableWidth(0),
- nMinWidth( MINLAY ),
- nNoOfCols( 0 ),
- nNoOfVisibleCols( 0 ),
- bModified(sal_False),
- bModifyTbl(sal_False),
- bPercentMode(sal_False)
+SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "TableColumnPage",
+ "modules/swriter/ui/tablecolumnpage.ui", rSet)
+ , nTableWidth(0)
+ , nMinWidth(MINLAY)
+ , nNoOfCols(0)
+ , nNoOfVisibleCols(0)
+ , bModified(false)
+ , bModifyTbl(false)
+ , bPercentMode(false)
{
- FreeResource();
- SetExchangeSupport();
-
- aDownBtn.SetAccessibleRelationMemberOf(&aColFL);
- aUpBtn.SetAccessibleRelationMemberOf(&aColFL);
+ get(m_pModifyTableCB, "adaptwidth");
+ get(m_pProportionalCB, "adaptcolumns");
+ get(m_pSpaceFT, "spaceft");
+ get(m_pSpaceED, "space-nospin");
+ get(m_pUpBtn, "next");
+ get(m_pDownBtn, "back");
+
+ m_aFieldArr[0].set(get<MetricField>("width1"));
+ m_aFieldArr[1].set(get<MetricField>("width2"));
+ m_aFieldArr[2].set(get<MetricField>("width3"));
+ m_aFieldArr[3].set(get<MetricField>("width4"));
+ m_aFieldArr[4].set(get<MetricField>("width5"));
+ m_aFieldArr[5].set(get<MetricField>("width6"));
+
+ m_pTextArr[0] = get<FixedText>("1");
+ m_pTextArr[1] = get<FixedText>("2");
+ m_pTextArr[2] = get<FixedText>("3");
+ m_pTextArr[3] = get<FixedText>("4");
+ m_pTextArr[4] = get<FixedText>("5");
+ m_pTextArr[5] = get<FixedText>("6");
- pFieldArr[0] = &aMF1;
- pFieldArr[1] = &aMF2;
- pFieldArr[2] = &aMF3;
- pFieldArr[3] = &aMF4;
- pFieldArr[4] = &aMF5;
- pFieldArr[5] = &aMF6;
-
- pTextArr[0] = &aFT1;
- pTextArr[1] = &aFT2;
- pTextArr[2] = &aFT3;
- pTextArr[3] = &aFT4;
- pTextArr[4] = &aFT5;
- pTextArr[5] = &aFT6;
+ SetExchangeSupport();
const SfxPoolItem* pItem;
Init((SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, sal_False,&pItem )
@@ -816,25 +798,25 @@ void SwTableColumnPage::Reset( const SfxItemSet& )
if( pTblData->GetColumns()[i].nWidth < nMinWidth )
nMinWidth = pTblData->GetColumns()[i].nWidth;
}
- sal_Int64 nMinTwips = pFieldArr[0]->NormalizePercent( nMinWidth );
- sal_Int64 nMaxTwips = pFieldArr[0]->NormalizePercent( nTableWidth );
+ sal_Int64 nMinTwips = m_aFieldArr[0].NormalizePercent( nMinWidth );
+ sal_Int64 nMaxTwips = m_aFieldArr[0].NormalizePercent( nTableWidth );
for( i = 0; (i < MET_FIELDS) && (i < nNoOfVisibleCols); i++ )
{
- pFieldArr[i]->SetPrcntValue( pFieldArr[i]->NormalizePercent(
+ m_aFieldArr[i].SetPrcntValue( m_aFieldArr[i].NormalizePercent(
GetVisibleWidth(i) ), FUNIT_TWIP );
- pFieldArr[i]->SetMin( nMinTwips , FUNIT_TWIP );
- pFieldArr[i]->SetMax( nMaxTwips , FUNIT_TWIP );
- pFieldArr[i]->Enable();
- pTextArr[i]->Enable();
+ m_aFieldArr[i].SetMin( nMinTwips , FUNIT_TWIP );
+ m_aFieldArr[i].SetMax( nMaxTwips , FUNIT_TWIP );
+ m_aFieldArr[i].Enable();
+ m_pTextArr[i]->Enable();
}
if( nNoOfVisibleCols > MET_FIELDS )
- aUpBtn.Enable();
+ m_pUpBtn->Enable();
i = nNoOfVisibleCols;
while( i < MET_FIELDS )
{
- pFieldArr[i]->SetText( aEmptyStr );
- pTextArr[i]->Hide();
+ m_aFieldArr[i].SetText( aEmptyStr );
+ m_pTextArr[i]->Disable();
i++;
}
}
@@ -852,28 +834,27 @@ void SwTableColumnPage::Init(sal_Bool bWeb)
for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
{
aValueTbl[i] = i;
- SetMetric(*pFieldArr[i], aMetric);
- pFieldArr[i]->SetUpHdl( aLkUp );
- pFieldArr[i]->SetDownHdl( aLkDown );
- pFieldArr[i]->SetLoseFocusHdl( aLkLF );
-
+ m_aFieldArr[i].SetMetric(aMetric);
+ m_aFieldArr[i].SetUpHdl( aLkUp );
+ m_aFieldArr[i].SetDownHdl( aLkDown );
+ m_aFieldArr[i].SetLoseFocusHdl( aLkLF );
}
- SetMetric(aSpaceED, aMetric);
+ SetMetric(*m_pSpaceED, aMetric);
Link aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
- aUpBtn.SetClickHdl( aLk );
- aDownBtn.SetClickHdl( aLk );
+ m_pUpBtn->SetClickHdl( aLk );
+ m_pDownBtn->SetClickHdl( aLk );
aLk = LINK( this, SwTableColumnPage, ModeHdl );
- aModifyTableCB .SetClickHdl( aLk );
- aProportionalCB.SetClickHdl( aLk );
+ m_pModifyTableCB->SetClickHdl( aLk );
+ m_pProportionalCB->SetClickHdl( aLk );
};
IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
{
//Anzeigefenster verschieben
- if(pBox == (CheckBox *)&aDownBtn)
+ if(pBox == (CheckBox *)m_pDownBtn)
{
if(aValueTbl[0] > 0)
{
@@ -881,7 +862,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
aValueTbl[i] -= 1;
}
}
- if(pBox == (CheckBox *)&aUpBtn)
+ if (pBox == (CheckBox *)m_pUpBtn)
{
if( aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 )
{
@@ -894,59 +875,59 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
String sEntry = rtl::OUString('~');
String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 );
sEntry += sIndex;
- pTextArr[i]->SetText( sEntry );
+ m_pTextArr[i]->SetText( sEntry );
//added by menghu for SODC_5143,12/12/2006
String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex );
- pFieldArr[i]->SetAccessibleName( sColumnWidth );
+ m_aFieldArr[i].SetAccessibleName( sColumnWidth );
}
- aDownBtn.Enable(aValueTbl[0] > 0);
- aUpBtn.Enable(aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
+ m_pDownBtn->Enable(aValueTbl[0] > 0);
+ m_pUpBtn->Enable(aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
UpdateCols(0);
return 0;
};
-IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
{
bModified = sal_True;
ModifyHdl( pEdit );
return 0;
};
-IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
-IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
{
bModified = sal_True;
ModifyHdl( pEdit );
return 0;
};
-IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, MetricField*, pEdit )
-IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
{
- if(pEdit->IsModified())
+ if (pEdit->IsModified())
{
bModified = sal_True;
ModifyHdl( pEdit );
}
return 0;
};
-IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
{
sal_Bool bCheck = pBox->IsChecked();
- if(pBox == &aProportionalCB)
+ if (pBox == m_pProportionalCB)
{
if(bCheck)
- aModifyTableCB.Check();
- aModifyTableCB.Enable(!bCheck && bModifyTbl);
+ m_pModifyTableCB->Check();
+ m_pModifyTableCB->Enable(!bCheck && bModifyTbl);
}
return 0;
};
@@ -956,9 +937,9 @@ sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& )
{
for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
{
- if(pFieldArr[i]->HasFocus())
+ if (m_aFieldArr[i].HasFocus())
{
- LoseFocusHdl(pFieldArr[i]);
+ LoseFocusHdl(m_aFieldArr[i].get());
break;
}
}
@@ -971,16 +952,22 @@ sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& )
};
-void SwTableColumnPage::ModifyHdl( PercentField* pEdit )
+void SwTableColumnPage::ModifyHdl( MetricField* pField )
{
+ PercentFieldWrap *pEdit = NULL;
sal_uInt16 nAktPos;
sal_uInt16 i;
for( i = 0; i < MET_FIELDS; i++)
- if(pEdit == pFieldArr[i])
+ {
+ if (pField == m_aFieldArr[i].get())
+ {
+ pEdit = &m_aFieldArr[i];
break;
+ }
+ }
- if (MET_FIELDS <= i)
+ if (MET_FIELDS <= i || !pEdit)
{
OSL_ENSURE(false, "cannot happen.");
return;
@@ -1004,8 +991,8 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
}
SwTwips nDiff = nSum - nTableWidth;
- sal_Bool bModifyTable = aModifyTableCB.IsChecked();
- sal_Bool bProp = aProportionalCB.IsChecked();
+ sal_Bool bModifyTable = m_pModifyTableCB->IsChecked();
+ sal_Bool bProp = m_pProportionalCB->IsChecked();
if(!bModifyTable && !bProp )
{
@@ -1097,25 +1084,23 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
}
if(!bPercentMode)
- aSpaceED.SetValue(aSpaceED.Normalize( pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
+ m_pSpaceED->SetValue(m_pSpaceED->Normalize( pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
for( i = 0; ( i < nNoOfVisibleCols ) && ( i < MET_FIELDS ); i++)
{
- pFieldArr[i]->SetPrcntValue(pFieldArr[i]->NormalizePercent(
+ m_aFieldArr[i].SetPrcntValue(m_aFieldArr[i].NormalizePercent(
GetVisibleWidth(aValueTbl[i]) ), FUNIT_TWIP);
- pFieldArr[i]->ClearModifyFlag();
+ m_aFieldArr[i].ClearModifyFlag();
}
-
}
-
void SwTableColumnPage::ActivatePage( const SfxItemSet& )
{
bPercentMode = pTblData->GetWidthPercent() != 0;
for( sal_uInt16 i = 0; (i < MET_FIELDS) && (i < nNoOfVisibleCols); i++ )
{
- pFieldArr[i]->SetRefValue(pTblData->GetWidth());
- pFieldArr[i]->ShowPercent( bPercentMode );
+ m_aFieldArr[i].SetRefValue(pTblData->GetWidth());
+ m_aFieldArr[i].ShowPercent( bPercentMode );
}
sal_uInt16 nTblAlign = pTblData->GetAlign();
@@ -1134,20 +1119,20 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& )
bModifyTbl = sal_False;
if(bPercentMode)
{
- aModifyTableCB .Check(sal_False);
- aProportionalCB .Check(sal_False);
+ m_pModifyTableCB->Check(sal_False);
+ m_pProportionalCB->Check(sal_False);
}
else if( !bModifyTbl )
{
- aProportionalCB.Check(sal_False);
- aModifyTableCB.Check(sal_False);
+ m_pProportionalCB->Check(sal_False);
+ m_pModifyTableCB->Check(sal_False);
}
- aSpaceFT.Enable(!bPercentMode);
- aSpaceED.Enable(!bPercentMode);
- aModifyTableCB.Enable( !bPercentMode && bModifyTbl );
- aProportionalCB.Enable(!bPercentMode && bModifyTbl );
+ m_pSpaceFT->Enable(!bPercentMode);
+ m_pSpaceED->Enable(!bPercentMode);
+ m_pModifyTableCB->Enable( !bPercentMode && bModifyTbl );
+ m_pProportionalCB->Enable(!bPercentMode && bModifyTbl );
- aSpaceED.SetValue(aSpaceED.Normalize(
+ m_pSpaceED->SetValue(m_pSpaceED->Normalize(
pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
}
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index 603ac1e..f801bba 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -37,7 +37,6 @@
#define FL_DIST 24
#define FT_WIDTH 25
#define FT_POS 32
-#define CB_HEADLINE 40
#define FL_PROPERTIES 42
#define FT_TEXTORIENTATION 43
#define LB_TEXTORIENTATION 44
@@ -49,25 +48,5 @@
#define FT_NAME 104
#define FL_OPTIONS 105
#define FL_NAME 106
-#define COL_FT_1 107
-#define COL_MF_1 108
-#define COL_FT_2 109
-#define COL_MF_2 110
-#define COL_FT_3 111
-#define COL_MF_3 112
-#define COL_FT_4 113
-#define COL_MF_4 114
-#define COL_FT_5 115
-#define COL_MF_5 116
-#define COL_FT_6 117
-#define COL_MF_6 118
-#define COL_FL_LAYOUT 119
-#define COL_BTN_UP 120
-#define COL_BTN_DOWN 121
-#define CB_MOD_TBL 122
-#define CB_PROP 123
-
-#define FT_SPACE 125
-#define ED_SPACE 126
#define RB_FROM_LEFT 127
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 04a789c..79140b6 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -313,245 +313,6 @@ TabPage TP_FORMAT_TABLE
};
};
-TabPage TP_TABLE_COLUMN
-{
- HelpID = HID_TABLE_COLUMN ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE;
- CheckBox CB_MOD_TBL
- {
- HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL";
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 180 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Adapt table ~width" ;
- };
- CheckBox CB_PROP
- {
- HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_PROP";
- Pos = MAP_APPFONT ( 6 , 20 ) ;
- Size = MAP_APPFONT ( 180 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Ad~just columns proportionally" ;
- };
- FixedText FT_SPACE
- {
- Pos = MAP_APPFONT ( 6 , 36 ) ;
- Size = MAP_APPFONT ( 85 , 8 ) ;
- Text [ en-US ] = "Remaining space" ;
- };
- MetricField ED_SPACE
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:ED_SPACE";
- ReadOnly = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 95 , 34 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Minimum = 0 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- ImageButton COL_BTN_DOWN
- {
- HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN";
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 12 , 65 ) ;
- Size = MAP_APPFONT ( 10 , 10 ) ;
- TabStop = TRUE ;
- SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
- };
- ImageButton COL_BTN_UP
- {
- HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP";
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 234 , 65 ) ;
- Size = MAP_APPFONT ( 10 , 10 ) ;
- TabStop = TRUE ;
- SYMBOL = IMAGEBUTTON_ARROW_RIGHT ;
- };
- FixedText COL_FT_1
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 30 , 65 ) ;
- Size = MAP_APPFONT ( 9 , 8 ) ;
- Text = "~1" ;
- Left = TRUE ;
- Center = TRUE ;
- Right = TRUE ;
- };
- MetricField COL_MF_1
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_1";
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 13 , 81 ) ;
- Size = MAP_APPFONT ( 36 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- FixedText COL_FT_2
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 68 , 65 ) ;
- Size = MAP_APPFONT ( 9 , 8 ) ;
- Text = "~2" ;
- Left = TRUE ;
- Right = TRUE ;
- };
- MetricField COL_MF_2
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_2";
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 52 , 81 ) ;
- Size = MAP_APPFONT ( 36 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- FixedText COL_FT_3
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 107 , 65 ) ;
- Size = MAP_APPFONT ( 9 , 8 ) ;
- Text = "~3" ;
- Left = TRUE ;
- Right = TRUE ;
- };
- MetricField COL_MF_3
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_3";
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 91 , 81 ) ;
- Size = MAP_APPFONT ( 36 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- FixedText COL_FT_4
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 146 , 65 ) ;
- Size = MAP_APPFONT ( 9 , 8 ) ;
- Text = "~4" ;
- Left = TRUE ;
- Right = TRUE ;
- };
- MetricField COL_MF_4
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_4";
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 130 , 81 ) ;
- Size = MAP_APPFONT ( 36 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- FixedText COL_FT_5
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 185 , 65 ) ;
- Size = MAP_APPFONT ( 9 , 8 ) ;
- Text = "~5" ;
- Left = TRUE ;
- Right = TRUE ;
- };
- MetricField COL_MF_5
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_5";
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 169 , 81 ) ;
- Size = MAP_APPFONT ( 36 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- FixedText COL_FT_6
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 204 , 65 ) ;
- Size = MAP_APPFONT ( 9 , 8 ) ;
- Text = "~6" ;
- Left = TRUE ;
- Right = TRUE ;
- };
- MetricField COL_MF_6
- {
- HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_6";
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 208 , 81 ) ;
- Size = MAP_APPFONT ( 36 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 5600 ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 5600 ;
- SpinSize = 10 ;
- };
- FixedLine COL_FL_LAYOUT
- {
- Pos = MAP_APPFONT ( 6 , 50 ) ;
- Size = MAP_APPFONT ( 240 , 8 ) ;
- Text [ en-US ] = "Column width" ;
- };
-};
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 4e28ce6..3515bce 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -97,29 +97,16 @@ public:
class SwTableColumnPage : public SfxTabPage
{
- CheckBox aModifyTableCB;
- CheckBox aProportionalCB;
- FixedText aSpaceFT;
- MetricField aSpaceED;
- FixedLine aColFL;
- ImageButton aUpBtn;
- FixedText aFT1;
- PercentField aMF1;
- FixedText aFT2;
- PercentField aMF2;
- FixedText aFT3;
- PercentField aMF3;
- FixedText aFT4;
- PercentField aMF4;
- FixedText aFT5;
- PercentField aMF5;
- FixedText aFT6;
- PercentField aMF6;
- ImageButton aDownBtn;
+ CheckBox* m_pModifyTableCB;
+ CheckBox* m_pProportionalCB;
+ FixedText* m_pSpaceFT;
+ MetricField* m_pSpaceED;
+ PushButton* m_pUpBtn;
+ PushButton* m_pDownBtn;
SwTableRep* pTblData;
- PercentField* pFieldArr[MET_FIELDS];
- FixedText* pTextArr[MET_FIELDS];
+ PercentFieldWrap m_aFieldArr[MET_FIELDS];
+ FixedText* m_pTextArr[MET_FIELDS];
SwTwips nTableWidth;
SwTwips nMinWidth;
sal_uInt16 nNoOfCols;
@@ -132,10 +119,10 @@ class SwTableColumnPage : public SfxTabPage
void Init(sal_Bool bWeb);
DECL_LINK( AutoClickHdl, CheckBox * );
- void ModifyHdl( PercentField* pEdit );
- DECL_LINK( UpHdl, PercentField * );
- DECL_LINK( DownHdl, PercentField * );
- DECL_LINK( LoseFocusHdl, PercentField * );
+ void ModifyHdl( MetricField* pEdit );
+ DECL_LINK( UpHdl, MetricField * );
+ DECL_LINK( DownHdl, MetricField * );
+ DECL_LINK( LoseFocusHdl, MetricField * );
DECL_LINK( ModeHdl, CheckBox * );
void UpdateCols( sal_uInt16 nAktPos );
SwTwips GetVisibleWidth(sal_uInt16 nPos);
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
new file mode 100644
index 0000000..9288bc1
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">0.01</property>
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkGrid" id="TableColumnPage">
+ <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="GtkCheckButton" id="adaptwidth">
+ <property name="label" translatable="yes">Adapt table _width</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="GtkCheckButton" id="adaptcolumns">
+ <property name="label" translatable="yes">Ad_just columns proportionally</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">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="spaceft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Remaining space </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="space-nospin:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</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">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame7">
+ <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="alignment7">
+ <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="grid17">
+ <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">12</property>
+ <child>
+ <object class="GtkSpinButton" id="width2:0.0cm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</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>
+ <object class="GtkSpinButton" id="width3:0.00cm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width4:0.00cm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width5:0.00cm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width6:0.00cm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="6">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">_6</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">_1</property>
+ <property name="use_underline">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="GtkLabel" id="2">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">_2</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="GtkLabel" id="3">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">_3</property>
+ <property name="use_underline">True</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="GtkLabel" id="5">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">_5</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="4">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">_4</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width1:0.00cm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="back">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">start</property>
+ <property name="image">image7</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="GtkButton" id="next">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="image">image8</property>
+ </object>
+ <packing>
+ <property name="left_attach">7</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="label26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Column width</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </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>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index 6cd5e95..f359904 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -41,349 +41,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton3">
- <property name="label" translatable="yes">Adapt table width</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="GtkCheckButton" id="checkbutton4">
- <property name="label" translatable="yes">Adjust columns proportionally</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">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Remaining space </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="GtkEntry" id="entry1">
- <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">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame7">
- <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="alignment7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">4</property>
- <child>
- <object class="GtkGrid" id="grid16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">60</property>
- <child>
- <object class="GtkArrow" id="arrow1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">left</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="GtkArrow" id="arrow2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">7</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">1</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </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="label29">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">2</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </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="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">3</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </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="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">4</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">5</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">5</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">6</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">6</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">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid17">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">4</property>
- <child>
- <object class="GtkSpinButton" id="spinbutton7">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</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="spinbutton8">
- <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="GtkSpinButton" id="spinbutton9">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</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="spinbutton10">
- <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>
- <child>
- <object class="GtkSpinButton" id="spinbutton11">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton12">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">5</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>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Column width</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </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>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
+ <placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="label25">
commit 90455e84916afcf8fbb287140036ba7f024b84bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 12 17:25:01 2013 +0000
default spinbuttons to left align
Change-Id: Idccab2fcf985ede4f07897131e9cae3499030b0f
diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui
index 4350cce..c994fc9 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -37,11 +37,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -53,13 +51,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -71,11 +67,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -161,6 +155,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="xalign">1</property>
<property name="adjustment">adjustment3</property>
<property name="digits">2</property>
</object>
@@ -176,6 +171,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">2</property>
@@ -192,6 +188,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment3</property>
</object>
@@ -336,6 +333,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
</object>
@@ -403,6 +401,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
</object>
@@ -490,11 +489,9 @@
<child>
<object class="GtkCheckButton" id="rlecb">
<property name="label" translatable="yes">RLE Encoding</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -532,11 +529,9 @@
<child>
<object class="GtkCheckButton" id="interlacedcb">
<property name="label" translatable="yes">Interlaced</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -574,11 +569,9 @@
<child>
<object class="GtkCheckButton" id="savetransparencycb">
<property name="label" translatable="yes">Save transparency</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -620,11 +613,9 @@
<child>
<object class="GtkRadioButton" id="binarycb">
<property name="label" translatable="yes">Binary</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">textcb</property>
@@ -639,11 +630,9 @@
<child>
<object class="GtkRadioButton" id="textcb">
<property name="label" translatable="yes">Text</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -698,11 +687,9 @@
<child>
<object class="GtkCheckButton" id="tiffpreviewcb">
<property name="label" translatable="yes">Image Preview (TIFF)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -717,11 +704,9 @@
<child>
<object class="GtkCheckButton" id="epsipreviewcb">
<property name="label" translatable="yes">Interchange (EPSI)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -772,11 +757,9 @@
<child>
<object class="GtkRadioButton" id="color1rb">
<property name="label" translatable="yes">Color</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">color2rb</property>
@@ -791,11 +774,9 @@
<child>
<object class="GtkRadioButton" id="color2rb">
<property name="label" translatable="yes">Grayscale</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -848,11 +829,9 @@
<child>
<object class="GtkRadioButton" id="level1rb">
<property name="label" translatable="yes">Level 1</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">level2rb</property>
@@ -867,11 +846,9 @@
<child>
<object class="GtkRadioButton" id="level2rb">
<property name="label" translatable="yes">Level 2</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0.059999998658895493</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -924,11 +901,9 @@
<child>
<object class="GtkRadioButton" id="compresslzw">
<property name="label" translatable="yes">LZW encoding</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">compressnone</property>
@@ -943,11 +918,9 @@
<child>
<object class="GtkRadioButton" id="compressnone">
<property name="label" translatable="yes">None</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7b78fac..08f2115 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -884,7 +884,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
FieldUnit eUnit = detectMetricUnit(sUnit);
- WinBits nBits = WB_RIGHT|WB_BORDER|WB_3DLOOK;
+ WinBits nBits = WB_LEFT|WB_BORDER|WB_3DLOOK;
if (!id.endsWith("-nospin"))
nBits |= WB_SPIN;
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 4cdc1c2..ae1f41f 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -119,6 +119,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
commit 35dac7a55eeccb9e2362c0a542e011d76b17a32f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 12 16:06:03 2013 +0000
these members are private now, use accessors
Change-Id: I397a6e5c8585cbc37ec8f28ab6b05914976e163f
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index a026ee9..73d1d3a 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -199,13 +199,13 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ",
- aOrigName.getStr(), rFontSelData.meWeight, rFontSelData.meItalic,
- rFontSelData.mePitch, rFontSelData.meWidthType );
+ aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
+ rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
if( !bHaveSubstitute )
printf( "no substitute available\n" );
else
printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(),
- aOut.meWeight, aOut.meItalic, aOut.mePitch, aOut.meWidthType );
+ aOut.GetWeight(), aOut.GetSlant(), aOut.GetPitch(), aOut.GetWidthType() );
#endif
if( bHaveSubstitute )
@@ -250,13 +250,13 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont
const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->",
- aOrigName.getStr(), rFontSelData.meWeight, rFontSelData.meItalic,
- rFontSelData.mePitch, rFontSelData.meWidthType );
+ aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
+ rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
if( !bHaveSubstitute )
printf( "no substitute available\n" );
else
printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(),
- aOut.meWeight, aOut.meItalic, aOut.mePitch, aOut.meWidthType );
+ aOut.GetWeight(), aOut.GetSlant(), aOut.GetPitch(), aOut.GetWidthType() );
#endif
if( bHaveSubstitute )
More information about the Libreoffice-commits
mailing list