[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
Olivier Hallot
olivier.hallot at edx.srv.br
Tue Aug 6 06:32:08 PDT 2013
cui/UIConfig_cui.mk | 1
cui/source/inc/cuitabline.hxx | 36 +-
cui/source/inc/helpid.hrc | 2
cui/source/tabpages/tabline.hrc | 23 -
cui/source/tabpages/tabline.src | 274 ---------------------
cui/source/tabpages/tplnedef.cxx | 434 +++++++++++++++-------------------
cui/uiconfig/ui/linestyletabpage.ui | 451 ++++++++++++++++++++++++++++++++++++
7 files changed, 666 insertions(+), 555 deletions(-)
New commits:
commit bd7596518edd1511a31c44b8fe63f856a5471282
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date: Mon Aug 5 12:33:41 2013 -0300
Convert line style tab page to widget UI
Change-Id: I38046e0e333dc548e5b30c15f11fec7be7f7a7be
Reviewed-on: https://gerrit.libreoffice.org/5285
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 7bf6e5d..b36425e 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
+ cui/uiconfig/ui/linestyletabpage \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
cui/uiconfig/ui/namedialog \
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 4388ddd..0a03598 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -239,27 +239,21 @@ class SvxLineDefTabPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
private:
- FixedLine aFlDefinition;
- FixedText aFTLinestyle;
- LineLB aLbLineStyles;
- FixedText aFtType;
- ListBox aLbType1;
- ListBox aLbType2;
- FixedText aFtNumber;
- NumericField aNumFldNumber1;
- NumericField aNumFldNumber2;
- FixedText aFtLength;
- MetricField aMtrLength1;
- MetricField aMtrLength2;
- FixedText aFtDistance;
- MetricField aMtrDistance;
- CheckBox aCbxSynchronize;
- PushButton aBtnAdd;
- PushButton aBtnModify;
- PushButton aBtnDelete;
- ImageButton aBtnLoad;
- ImageButton aBtnSave;
- SvxXLinePreview aCtlPreview;
+ LineLB* m_pLbLineStyles;
+ ListBox* m_pLbType1;
+ ListBox* m_pLbType2;
+ NumericField* m_pNumFldNumber1;
+ NumericField* m_pNumFldNumber2;
+ MetricField* m_pMtrLength1;
+ MetricField* m_pMtrLength2;
+ MetricField* m_pMtrDistance;
+ CheckBox* m_pCbxSynchronize;
+ PushButton* m_pBtnAdd;
+ PushButton* m_pBtnModify;
+ PushButton* m_pBtnDelete;
+ PushButton* m_pBtnLoad;
+ PushButton* m_pBtnSave;
+ SvxXLinePreview* m_pCtlPreview;
const SfxItemSet& rOutAttrs;
XDash aDash;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 1af46d5..66d0d12 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -243,8 +243,6 @@
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
-
-#define HID_LINE_DEF "CUI_HID_LINE_DEF"
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc
index ddee01a..b4b2ee9 100644
--- a/cui/source/tabpages/tabline.hrc
+++ b/cui/source/tabpages/tabline.hrc
@@ -25,28 +25,5 @@
#define STR_START_LENGTH 40
#define STR_END_LENGTH 41
-#define CBX_SYNCHRONIZE 1
-#define CTL_POSITION 2
-#define FT_POSITION 9
-#define CTL_PREVIEW 1
-#define FL_DEFINITION 1
-#define FT_NUMBER 3
-#define FT_DISTANCE 2
-#define FT_LENGTH 4
-#define LB_TYPE_1 3
-#define FT_TYPE 1
-#define LB_TYPE_2 1
-#define NUM_FLD_1 1
-#define NUM_FLD_2 2
-#define MTR_FLD_DISTANCE 1
-#define MTR_FLD_LENGTH_1 3
-#define MTR_FLD_LENGTH_2 4
-#define FT_LINESTYLE 10
-#define LB_LINESTYLES 2
-#define BTN_ADD 1
-#define BTN_MODIFY 2
-#define BTN_DELETE 3
-#define BTN_LOAD 5
-#define BTN_SAVE 6
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index 4b0b257..3f6ffd8 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -26,280 +26,6 @@
#define MASKCOLOR MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-// Defining LineStyles --------------------
-
-TabPage RID_SVXPAGE_LINE_DEF
-{
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- HelpId = HID_LINE_DEF ;
- Hide = TRUE ;
- Text [ en-US ] = "Define line styles" ;
-
- FixedLine FL_DEFINITION
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Properties" ;
- };
- FixedText FT_TYPE
- {
- Pos = MAP_APPFONT ( 12 , 34 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Type" ;
- };
- ListBox LB_TYPE_1
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 66 , 32 ) ;
- Size = MAP_APPFONT ( 43 , 49 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Dot" ; Default ; > ;
- < "Dash" ; Default ; > ;
- };
- };
- ListBox LB_TYPE_2
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 113 , 32 ) ;
- Size = MAP_APPFONT ( 43 , 49 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Dot" ; Default ; > ;
- < "Dash" ; Default ; > ;
- };
- };
- FixedText FT_NUMBER
- {
- Pos = MAP_APPFONT ( 12 , 50 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Number" ;
- };
- NumericField NUM_FLD_1
- {
- HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 66 , 48 ) ;
- Size = MAP_APPFONT ( 43 , 12 ) ;
- TabStop = TRUE ;
- Right = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 99 ;
- StrictFormat = TRUE ;
- Last = 99 ;
- SpinSize = 1 ;
- };
- NumericField NUM_FLD_2
- {
- HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 113 , 48 ) ;
- Size = MAP_APPFONT ( 43 , 12 ) ;
- TabStop = TRUE ;
- Right = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 99 ;
- StrictFormat = TRUE ;
- Last = 99 ;
- SpinSize = 1 ;
- };
- FixedText FT_LENGTH
- {
- Pos = MAP_APPFONT ( 12 , 66 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Length" ;
- };
- MetricField MTR_FLD_LENGTH_1
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 66 , 64 ) ;
- Size = MAP_APPFONT ( 43 , 12 ) ;
- TabStop = TRUE ;
- Right = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- First = 1 ;
- Maximum = 5000 ;
- Last = 5000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Value = 1 ;
- Unit = FUNIT_MM ;
- CustomUnitText = "%" ;
- SpinSize = 10 ;
- };
- MetricField MTR_FLD_LENGTH_2
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 113 , 64 ) ;
- Size = MAP_APPFONT ( 43 , 12 ) ;
- TabStop = TRUE ;
- Right = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- First = 1 ;
- Maximum = 5000 ;
- Last = 5000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Value = 1 ;
- Unit = FUNIT_MM ;
- CustomUnitText = "%" ;
- SpinSize = 10 ;
- };
- FixedText FT_DISTANCE
- {
- Pos = MAP_APPFONT ( 12 , 81 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Spacing" ;
- };
- MetricField MTR_FLD_DISTANCE
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 66 , 79 ) ;
- Size = MAP_APPFONT ( 43 , 12 ) ;
- TabStop = TRUE ;
- Right = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 5000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Value = 1 ;
- Unit = FUNIT_MM ;
- CustomUnitText = "%" ;
- Last = 5000 ;
- SpinSize = 10 ;
- };
- CheckBox CBX_SYNCHRONIZE
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE";
- Pos = MAP_APPFONT ( 12 , 95 ) ;
- Size = MAP_APPFONT ( 174 , 10 ) ;
- Text [ en-US ] = "~Fit to line width" ;
- TabStop = TRUE ;
- };
-
- // ----------------------------------------
-
- FixedText FT_LINESTYLE
- {
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "Line style" ;
- };
- ListBox LB_LINESTYLES
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 66 , 14 ) ;
- Size = MAP_APPFONT ( 120 , 80 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- };
- PushButton BTN_ADD
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD";
- Pos = MAP_APPFONT ( 198 , 14 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Add..." ;
- TabStop = TRUE ;
- };
- PushButton BTN_MODIFY
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY";
- Pos = MAP_APPFONT ( 198 , 34 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Modify..." ;
- TabStop = TRUE ;
- };
- PushButton BTN_DELETE
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE";
- Pos = MAP_APPFONT ( 198 , 54 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Delete..." ;
- TabStop = TRUE ;
- };
- ImageButton BTN_LOAD
- {
- HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD";
- Pos = MAP_APPFONT ( 198 , 74 ) ;
- Size = MAP_APPFONT ( 16 , 16 ) ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Load Line Styles" ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sc05501.bmp" ;
- };
- MASKCOLOR
- };
- };
- ImageButton BTN_SAVE
- {
- HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE";
- Pos = MAP_APPFONT ( 198 , 96 ) ;
- Size = MAP_APPFONT ( 16 , 16 ) ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Save Line Styles" ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sc05502.bmp" ;
- };
- MASKCOLOR
- };
- };
- Control CTL_PREVIEW
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 135 ) ;
- Size = MAP_APPFONT ( 248 , 40 ) ;
- };
-
- String STR_START_TYPE
- {
- Text [ en-US ] = "Start type" ;
- };
- String STR_END_TYPE
- {
- Text [ en-US ] = "End type" ;
- };
- String STR_START_NUM
- {
- Text [ en-US ] = "Start number" ;
- };
- String STR_END_NUM
- {
- Text [ en-US ] = "End number" ;
- };
- String STR_START_LENGTH
- {
- Text [ en-US ] = "Start length" ;
- };
- String STR_END_LENGTH
- {
- Text [ en-US ] = "End length" ;
- };
-};
-
// RID_SVXDLG_LINE ----------------------------------------------------------
TabDialog RID_SVXDLG_LINE
{
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 46ded4b..2010b59 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -52,30 +52,10 @@ SvxLineDefTabPage::SvxLineDefTabPage
const SfxItemSet& rInAttrs
) :
- SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_LINE_DEF ), rInAttrs ),
-
- aFlDefinition ( this, CUI_RES( FL_DEFINITION ) ),
- aFTLinestyle ( this, CUI_RES( FT_LINESTYLE ) ),
- aLbLineStyles ( this, CUI_RES( LB_LINESTYLES ) ),
- aFtType ( this, CUI_RES( FT_TYPE ) ),
- aLbType1 ( this, CUI_RES( LB_TYPE_1 ) ),
- aLbType2 ( this, CUI_RES( LB_TYPE_2 ) ),
- aFtNumber ( this, CUI_RES( FT_NUMBER ) ),
- aNumFldNumber1 ( this, CUI_RES( NUM_FLD_1 ) ),
- aNumFldNumber2 ( this, CUI_RES( NUM_FLD_2 ) ),
- aFtLength ( this, CUI_RES( FT_LENGTH ) ),
- aMtrLength1 ( this, CUI_RES( MTR_FLD_LENGTH_1 ) ),
- aMtrLength2 ( this, CUI_RES( MTR_FLD_LENGTH_2 ) ),
- aFtDistance ( this, CUI_RES( FT_DISTANCE ) ),
- aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
- aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
- aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
- aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
- aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
- aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
- aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
- aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
-
+ SfxTabPage( pParent
+ , "LineStylePage"
+ , "cui/ui/linestyletabpage.ui"
+ , rInAttrs ),
rOutAttrs ( rInAttrs ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
@@ -86,14 +66,22 @@ SvxLineDefTabPage::SvxLineDefTabPage
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() )
{
- aLbType1.SetAccessibleName(String(CUI_RES( STR_START_TYPE ) ) );
- aLbType2.SetAccessibleName(String(CUI_RES( STR_END_TYPE ) ) );
- aNumFldNumber1.SetAccessibleName(String(CUI_RES( STR_START_NUM ) ) );
- aNumFldNumber2.SetAccessibleName(String(CUI_RES( STR_END_NUM ) ) );
- aMtrLength1.SetAccessibleName(String(CUI_RES( STR_START_LENGTH ) ) );
- aMtrLength2.SetAccessibleName(String(CUI_RES( STR_END_LENGTH ) ) );
- FreeResource();
+ get(m_pLbLineStyles ,"LB_LINESTYLES");
+ get(m_pLbType1 ,"LB_TYPE_1");
+ get(m_pLbType2 ,"LB_TYPE_2");
+ get(m_pNumFldNumber1 ,"NUM_FLD_1");
+ get(m_pNumFldNumber2 ,"NUM_FLD_2");
+ get(m_pMtrLength1 ,"MTR_FLD_LENGTH_1");
+ get(m_pMtrLength2 ,"MTR_FLD_LENGTH_2");
+ get(m_pMtrDistance ,"MTR_FLD_DISTANCE");
+ get(m_pCbxSynchronize ,"CBX_SYNCHRONIZE");
+ get(m_pBtnAdd ,"BTN_ADD");
+ get(m_pBtnModify ,"BTN_MODIFY");
+ get(m_pBtnDelete ,"BTN_DELETE");
+ get(m_pBtnLoad ,"BTN_LOAD");
+ get(m_pBtnSave ,"BTN_SAVE");
+ get(m_pCtlPreview ,"CTL_PREVIEW");
// this page needs ExchangeSupport
SetExchangeSupport();
@@ -109,9 +97,9 @@ SvxLineDefTabPage::SvxLineDefTabPage
break;
default: ; //prevent warning
}
- SetFieldUnit( aMtrDistance, eFUnit );
- SetFieldUnit( aMtrLength1, eFUnit );
- SetFieldUnit( aMtrLength2, eFUnit );
+ SetFieldUnit( *m_pMtrDistance, eFUnit );
+ SetFieldUnit( *m_pMtrLength1, eFUnit );
+ SetFieldUnit( *m_pMtrLength2, eFUnit );
// determine PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
@@ -124,47 +112,35 @@ SvxLineDefTabPage::SvxLineDefTabPage
rXLSet.Put( aXColor );
// #i34740#
- aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
-
- aBtnAdd.SetClickHdl( LINK( this, SvxLineDefTabPage, ClickAddHdl_Impl ) );
- aBtnModify.SetClickHdl(
- LINK( this, SvxLineDefTabPage, ClickModifyHdl_Impl ) );
- aBtnDelete.SetClickHdl(
- LINK( this, SvxLineDefTabPage, ClickDeleteHdl_Impl ) );
- aBtnLoad.SetClickHdl( LINK( this, SvxLineDefTabPage, ClickLoadHdl_Impl ) );
- aBtnSave.SetClickHdl( LINK( this, SvxLineDefTabPage, ClickSaveHdl_Impl ) );
-
- aNumFldNumber1.SetModifyHdl(
- LINK( this, SvxLineDefTabPage, ChangeNumber1Hdl_Impl ) );
- aNumFldNumber2.SetModifyHdl(
- LINK( this, SvxLineDefTabPage, ChangeNumber2Hdl_Impl ) );
- aLbLineStyles.SetSelectHdl(
- LINK( this, SvxLineDefTabPage, SelectLinestyleHdl_Impl ) );
+ m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet());
+
+ m_pBtnAdd->SetClickHdl( LINK( this, SvxLineDefTabPage, ClickAddHdl_Impl ) );
+ m_pBtnModify->SetClickHdl( LINK( this, SvxLineDefTabPage, ClickModifyHdl_Impl ) );
+ m_pBtnDelete->SetClickHdl( LINK( this, SvxLineDefTabPage, ClickDeleteHdl_Impl ) );
+ m_pBtnLoad->SetClickHdl( LINK( this, SvxLineDefTabPage, ClickLoadHdl_Impl ) );
+ m_pBtnSave->SetClickHdl( LINK( this, SvxLineDefTabPage, ClickSaveHdl_Impl ) );
+
+ m_pNumFldNumber1->SetModifyHdl( LINK( this, SvxLineDefTabPage, ChangeNumber1Hdl_Impl ) );
+ m_pNumFldNumber2->SetModifyHdl( LINK( this, SvxLineDefTabPage, ChangeNumber2Hdl_Impl ) );
+ m_pLbLineStyles->SetSelectHdl( LINK( this, SvxLineDefTabPage, SelectLinestyleHdl_Impl ) );
// #i122042# switch off default adding of 'none' and 'solid' entries
// for this ListBox; we want to select only editable/dashed styles
- aLbLineStyles.setAddStandardFields(false);
+ m_pLbLineStyles->setAddStandardFields(false);
// absolute (in mm) or relative (in %)
- aCbxSynchronize.SetClickHdl(
- LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
+ m_pCbxSynchronize->SetClickHdl( LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
// preview must be updated when there's something changed
Link aLink = LINK( this, SvxLineDefTabPage, SelectTypeHdl_Impl );
- aLbType1.SetSelectHdl( aLink );
- aLbType2.SetSelectHdl( aLink );
+ m_pLbType1->SetSelectHdl( aLink );
+ m_pLbType2->SetSelectHdl( aLink );
aLink = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl );
- aMtrLength1.SetModifyHdl( aLink );
- aMtrLength2.SetModifyHdl( aLink );
- aMtrDistance.SetModifyHdl( aLink );
+ m_pMtrLength1->SetModifyHdl( aLink );
+ m_pMtrLength2->SetModifyHdl( aLink );
+ m_pMtrDistance->SetModifyHdl( aLink );
pDashList = NULL;
-
- aBtnAdd.SetAccessibleRelationMemberOf( &aFlDefinition );
- aBtnModify.SetAccessibleRelationMemberOf( &aFlDefinition );
- aBtnDelete.SetAccessibleRelationMemberOf( &aFlDefinition );
- aBtnLoad.SetAccessibleRelationMemberOf( &aFlDefinition );
- aBtnSave.SetAccessibleRelationMemberOf( &aFlDefinition );
}
@@ -173,7 +149,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
void SvxLineDefTabPage::Construct()
{
// Line style fill; do *not* add default fields here
- aLbLineStyles.Fill( pDashList );
+ m_pLbLineStyles->Fill( pDashList );
}
// -----------------------------------------------------------------------
@@ -188,15 +164,15 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
if( *pPageType == 1 &&
*pPosDashLb != LISTBOX_ENTRY_NOTFOUND )
{
- aLbLineStyles.SelectEntryPos( *pPosDashLb );
+ m_pLbLineStyles->SelectEntryPos( *pPosDashLb );
}
// so that a possibly existing line style is discarded
SelectLinestyleHdl_Impl( this );
// determining (and possibly cutting) the name
// and displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
- aString += ": ";
+// OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+// aString += ": ";
INetURLObject aURL( pDashList->GetPath() );
aURL.Append( pDashList->GetName() );
@@ -227,13 +203,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
// is here used to NOT lose changes
//XDashStyle eXDS;
- if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() ||
- aMtrLength1.GetText() != aMtrLength1.GetSavedValue() ||
- aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() ||
- aNumFldNumber2.GetText() != aNumFldNumber2.GetSavedValue() ||
- aMtrLength2.GetText() != aMtrLength2.GetSavedValue() ||
- aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
- aMtrDistance.GetText() != aMtrDistance.GetSavedValue() )
+ if( m_pNumFldNumber1->GetText() != m_pNumFldNumber1->GetSavedValue() ||
+ m_pMtrLength1->GetText() != m_pMtrLength1->GetSavedValue() ||
+ m_pLbType1->GetSelectEntryPos() != m_pLbType1->GetSavedValue() ||
+ m_pNumFldNumber2->GetText() != m_pNumFldNumber2->GetSavedValue() ||
+ m_pMtrLength2->GetText() != m_pMtrLength2->GetSavedValue() ||
+ m_pLbType2->GetSelectEntryPos() != m_pLbType2->GetSavedValue() ||
+ m_pMtrDistance->GetText() != m_pMtrDistance->GetSavedValue() )
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
@@ -242,10 +218,8 @@ void SvxLineDefTabPage::CheckChanges_Impl()
String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
- aMessDlg->SetButtonText( MESS_BTN_1,
- String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( MESS_BTN_2,
- String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
+ aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
+ aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
short nRet = aMessDlg->Execute();
@@ -271,7 +245,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
- sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbLineStyles->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
*pPosDashLb = nPos;
@@ -288,7 +262,7 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
{
FillDash_Impl();
- String aString( aLbLineStyles.GetSelectEntry() );
+ String aString( m_pLbLineStyles->GetSelectEntry() );
rAttrs.Put( XLineStyleItem( XLINE_DASH ) );
rAttrs.Put( XLineDashItem( aString, aDash ) );
}
@@ -308,7 +282,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs )
{
case XLINE_NONE:
case XLINE_SOLID:
- aLbLineStyles.SelectEntryPos( 0 );
+ m_pLbLineStyles->SelectEntryPos( 0 );
break;
case XLINE_DASH:
@@ -316,8 +290,8 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs )
const XLineDashItem& rDashItem = ( const XLineDashItem& ) rAttrs.Get( XATTR_LINEDASH );
aDash = rDashItem.GetDashValue();
- aLbLineStyles.SetNoSelection();
- aLbLineStyles.SelectEntry( rDashItem.GetName() );
+ m_pLbLineStyles->SetNoSelection();
+ m_pLbLineStyles->SelectEntry( rDashItem.GetName() );
}
break;
@@ -330,22 +304,21 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs )
// determine button state
if( pDashList->Count() )
{
- aBtnModify.Enable();
- aBtnDelete.Enable();
- aBtnSave.Enable();
+ m_pBtnModify->Enable();
+ m_pBtnDelete->Enable();
+ m_pBtnSave->Enable();
}
else
{
- aBtnModify.Disable();
- aBtnDelete.Disable();
- aBtnSave.Disable();
+ m_pBtnModify->Disable();
+ m_pBtnDelete->Disable();
+ m_pBtnSave->Disable();
}
}
// -----------------------------------------------------------------------
-SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow,
- const SfxItemSet& rOutAttrs )
+SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs )
{
return( new SvxLineDefTabPage( pWindow, rOutAttrs ) );
}
@@ -356,7 +329,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
{
if(pDashList->Count())
{
- int nTmp = aLbLineStyles.GetSelectEntryPos();
+ int nTmp = m_pLbLineStyles->GetSelectEntryPos();
if(LISTBOX_ENTRY_NOTFOUND == nTmp)
{
@@ -371,9 +344,9 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
rXLSet.Put( XLineDashItem( String(), aDash ) );
// #i34740#
- aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
+ m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet());
- aCtlPreview.Invalidate();
+ m_pCtlPreview->Invalidate();
// Is not set before, in order to take the new style
// only if there was an entry selected in the ListBox.
@@ -389,7 +362,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl)
{
FillDash_Impl();
- aCtlPreview.Invalidate();
+ m_pCtlPreview->Invalidate();
return( 0L );
}
@@ -399,15 +372,15 @@ IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl)
IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
{
- if( aNumFldNumber1.GetValue() == 0L )
+ if( m_pNumFldNumber1->GetValue() == 0L )
{
- aNumFldNumber2.SetMin( 1L );
- aNumFldNumber2.SetFirst( 1L );
+ m_pNumFldNumber2->SetMin( 1L );
+ m_pNumFldNumber2->SetFirst( 1L );
}
else
{
- aNumFldNumber2.SetMin( 0L );
- aNumFldNumber2.SetFirst( 0L );
+ m_pNumFldNumber2->SetMin( 0L );
+ m_pNumFldNumber2->SetFirst( 0L );
}
ChangePreviewHdl_Impl( this );
@@ -419,15 +392,15 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
{
- if( aNumFldNumber2.GetValue() == 0L )
+ if( m_pNumFldNumber2->GetValue() == 0L )
{
- aNumFldNumber1.SetMin( 1L );
- aNumFldNumber1.SetFirst( 1L );
+ m_pNumFldNumber1->SetMin( 1L );
+ m_pNumFldNumber1->SetFirst( 1L );
}
else
{
- aNumFldNumber1.SetMin( 0L );
- aNumFldNumber1.SetFirst( 0L );
+ m_pNumFldNumber1->SetMin( 0L );
+ m_pNumFldNumber1->SetFirst( 0L );
}
ChangePreviewHdl_Impl( this );
@@ -440,66 +413,67 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
{
- if( !aCbxSynchronize.IsChecked() && aMtrLength1.GetUnit() != eFUnit )
+ if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit )
{
long nTmp1, nTmp2, nTmp3;
// was changed with Control
if( p )
{
- nTmp1 = GetCoreValue( aMtrLength1, ePoolUnit ) * XOUT_WIDTH / 100;
- nTmp2 = GetCoreValue( aMtrLength2, ePoolUnit ) * XOUT_WIDTH / 100;
- nTmp3 = GetCoreValue( aMtrDistance, ePoolUnit ) * XOUT_WIDTH / 100;
+ nTmp1 = GetCoreValue( *m_pMtrLength1, ePoolUnit ) * XOUT_WIDTH / 100;
+ nTmp2 = GetCoreValue( *m_pMtrLength2, ePoolUnit ) * XOUT_WIDTH / 100;
+ nTmp3 = GetCoreValue( *m_pMtrDistance, ePoolUnit ) * XOUT_WIDTH / 100;
}
else
{
- nTmp1 = GetCoreValue( aMtrLength1, ePoolUnit );
- nTmp2 = GetCoreValue( aMtrLength2, ePoolUnit );
- nTmp3 = GetCoreValue( aMtrDistance, ePoolUnit );
+ nTmp1 = GetCoreValue( *m_pMtrLength1, ePoolUnit );
+ nTmp2 = GetCoreValue( *m_pMtrLength2, ePoolUnit );
+ nTmp3 = GetCoreValue( *m_pMtrDistance, ePoolUnit );
}
- aMtrLength1.SetDecimalDigits( 2 );
- aMtrLength2.SetDecimalDigits( 2 );
- aMtrDistance.SetDecimalDigits( 2 );
+ m_pMtrLength1->SetDecimalDigits( 2 );
+ m_pMtrLength2->SetDecimalDigits( 2 );
+ m_pMtrDistance->SetDecimalDigits( 2 );
// adjust metric
- aMtrLength1.SetUnit( eFUnit );
- aMtrLength2.SetUnit( eFUnit );
- aMtrDistance.SetUnit( eFUnit );
+ m_pMtrLength1->SetUnit( eFUnit );
+ m_pMtrLength2->SetUnit( eFUnit );
+ m_pMtrDistance->SetUnit( eFUnit );
- SetMetricValue( aMtrLength1, nTmp1, ePoolUnit );
- SetMetricValue( aMtrLength2, nTmp2, ePoolUnit );
- SetMetricValue( aMtrDistance, nTmp3, ePoolUnit );
+ SetMetricValue( *m_pMtrLength1, nTmp1, ePoolUnit );
+ SetMetricValue( *m_pMtrLength2, nTmp2, ePoolUnit );
+ SetMetricValue( *m_pMtrDistance, nTmp3, ePoolUnit );
}
- else if( aCbxSynchronize.IsChecked() && aMtrLength1.GetUnit() != FUNIT_CUSTOM )
+ else if( m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != FUNIT_CUSTOM )
{
long nTmp1, nTmp2, nTmp3;
// was changed with Control
if( p )
{
- nTmp1 = GetCoreValue( aMtrLength1, ePoolUnit ) * 100 / XOUT_WIDTH;
- nTmp2 = GetCoreValue( aMtrLength2, ePoolUnit ) * 100 / XOUT_WIDTH;
- nTmp3 = GetCoreValue( aMtrDistance, ePoolUnit ) * 100 / XOUT_WIDTH;
+ nTmp1 = GetCoreValue( *m_pMtrLength1, ePoolUnit ) * 100 / XOUT_WIDTH;
+ nTmp2 = GetCoreValue( *m_pMtrLength2, ePoolUnit ) * 100 / XOUT_WIDTH;
+ nTmp3 = GetCoreValue( *m_pMtrDistance, ePoolUnit ) * 100 / XOUT_WIDTH;
}
else
{
- nTmp1 = GetCoreValue( aMtrLength1, ePoolUnit );
- nTmp2 = GetCoreValue( aMtrLength2, ePoolUnit );
- nTmp3 = GetCoreValue( aMtrDistance, ePoolUnit );
+ nTmp1 = GetCoreValue( *m_pMtrLength1, ePoolUnit );
+ nTmp2 = GetCoreValue( *m_pMtrLength2, ePoolUnit );
+ nTmp3 = GetCoreValue( *m_pMtrDistance, ePoolUnit );
}
- aMtrLength1.SetDecimalDigits( 0 );
- aMtrLength2.SetDecimalDigits( 0 );
- aMtrDistance.SetDecimalDigits( 0 );
+ m_pMtrLength1->SetDecimalDigits( 0 );
+ m_pMtrLength2->SetDecimalDigits( 0 );
+ m_pMtrDistance->SetDecimalDigits( 0 );
+
+ m_pMtrLength1->SetUnit( FUNIT_CUSTOM );
+ m_pMtrLength2->SetUnit( FUNIT_CUSTOM );
+ m_pMtrDistance->SetUnit( FUNIT_CUSTOM );
- aMtrLength1.SetUnit( FUNIT_CUSTOM );
- aMtrLength2.SetUnit( FUNIT_CUSTOM );
- aMtrDistance.SetUnit( FUNIT_CUSTOM );
+ SetMetricValue( *m_pMtrLength1, nTmp1, ePoolUnit );
+ SetMetricValue( *m_pMtrLength2, nTmp2, ePoolUnit );
+ SetMetricValue( *m_pMtrDistance, nTmp3, ePoolUnit );
- SetMetricValue( aMtrLength1, nTmp1, ePoolUnit );
- SetMetricValue( aMtrLength2, nTmp2, ePoolUnit );
- SetMetricValue( aMtrDistance, nTmp3, ePoolUnit );
}
SelectTypeHdl_Impl( NULL );
@@ -510,31 +484,31 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p )
{
- if ( p == &aLbType1 || !p )
+ if ( p == m_pLbType1 || !p )
{
- if ( aLbType1.GetSelectEntryPos() == 0 )
+ if ( m_pLbType1->GetSelectEntryPos() == 0 )
{
- aMtrLength1.Disable();
- aMtrLength1.SetText( String() );
+ m_pMtrLength1->Disable();
+ m_pMtrLength1->SetText( "" );
}
- else if ( !aMtrLength1.IsEnabled() )
+ else if ( !m_pMtrLength1->IsEnabled() )
{
- aMtrLength1.Enable();
- aMtrLength1.Reformat();
+ m_pMtrLength1->Enable();
+ m_pMtrLength1->Reformat();
}
}
- if ( p == &aLbType2 || !p )
+ if ( p == m_pLbType2 || !p )
{
- if ( aLbType2.GetSelectEntryPos() == 0 )
+ if ( m_pLbType2->GetSelectEntryPos() == 0 )
{
- aMtrLength2.Disable();
- aMtrLength2.SetText( String() );
+ m_pMtrLength2->Disable();
+ m_pMtrLength2->SetText( "" );
}
- else if ( !aMtrLength2.IsEnabled() )
+ else if ( !m_pMtrLength2->IsEnabled() )
{
- aMtrLength2.Enable();
- aMtrLength2.Reformat();
+ m_pMtrLength2->Enable();
+ m_pMtrLength2->Reformat();
}
}
ChangePreviewHdl_Impl( p );
@@ -559,7 +533,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
{
aName = aNewName;
aName += sal_Unicode(' ');
- aName += OUString::valueOf( j++ );
+ aName += OUString::number( j++ );
bDifferent = sal_True;
for ( long i = 0; i < nCount && bDifferent; i++ )
@@ -594,26 +568,26 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
long nDashCount = pDashList->Count();
pDashList->Insert( pEntry, nDashCount );
const Bitmap aBitmap = pDashList->GetUiBitmap( nDashCount );
- aLbLineStyles.Append( *pEntry, pDashList->GetUiBitmap( nDashCount ) );
+ m_pLbLineStyles->Append( *pEntry, pDashList->GetUiBitmap( nDashCount ) );
- aLbLineStyles.SelectEntryPos( aLbLineStyles.GetEntryCount() - 1 );
+ m_pLbLineStyles->SelectEntryPos( m_pLbLineStyles->GetEntryCount() - 1 );
*pnDashListState |= CT_MODIFIED;
*pPageType = 2;
// save values for changes recognition (-> method)
- aNumFldNumber1.SaveValue();
- aMtrLength1.SaveValue();
- aLbType1.SaveValue();
- aNumFldNumber2.SaveValue();
- aMtrLength2.SaveValue();
- aLbType2.SaveValue();
- aMtrDistance.SaveValue();
+ m_pNumFldNumber1->SaveValue();
+ m_pMtrLength1->SaveValue();
+ m_pLbType1->SaveValue();
+ m_pNumFldNumber2->SaveValue();
+ m_pMtrLength2->SaveValue();
+ m_pLbType2->SaveValue();
+ m_pMtrDistance->SaveValue();
}
else
{
- WarningBox aBox( GetParentDialog(), WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) );
+ WarningBox aBox( GetParentDialog(), WinBits( WB_OK ),OUString( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) );
aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aBox.Execute();
}
@@ -623,9 +597,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
// determine button state
if ( pDashList->Count() )
{
- aBtnModify.Enable();
- aBtnDelete.Enable();
- aBtnSave.Enable();
+ m_pBtnModify->Enable();
+ m_pBtnDelete->Enable();
+ m_pBtnSave->Enable();
}
return( 0L );
}
@@ -634,7 +608,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
{
- sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbLineStyles->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -672,26 +646,26 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
XDashEntry* pEntry = new XDashEntry( aDash, aName );
delete pDashList->Replace( pEntry, nPos );
- aLbLineStyles.Modify( *pEntry, nPos, pDashList->GetUiBitmap( nPos ) );
+ m_pLbLineStyles->Modify( *pEntry, nPos, pDashList->GetUiBitmap( nPos ) );
- aLbLineStyles.SelectEntryPos( nPos );
+ m_pLbLineStyles->SelectEntryPos( nPos );
*pnDashListState |= CT_MODIFIED;
*pPageType = 2;
// save values for changes recognition (-> method)
- aNumFldNumber1.SaveValue();
- aMtrLength1.SaveValue();
- aLbType1.SaveValue();
- aNumFldNumber2.SaveValue();
- aMtrLength2.SaveValue();
- aLbType2.SaveValue();
- aMtrDistance.SaveValue();
+ m_pNumFldNumber1->SaveValue();
+ m_pMtrLength1->SaveValue();
+ m_pLbType1->SaveValue();
+ m_pNumFldNumber2->SaveValue();
+ m_pMtrLength2->SaveValue();
+ m_pLbType2->SaveValue();
+ m_pMtrDistance->SaveValue();
}
else
{
- WarningBox aBox( GetParentDialog(), WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) );
+ WarningBox aBox( GetParentDialog(), WinBits( WB_OK ), OUString( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) );
aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aBox.Execute();
}
@@ -705,18 +679,17 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
{
- sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbLineStyles->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ),
- String( CUI_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
+ QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), OUString( CUI_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
if ( aQueryBox.Execute() == RET_YES )
{
delete pDashList->Remove( nPos );
- aLbLineStyles.RemoveEntry( nPos );
- aLbLineStyles.SelectEntryPos( 0 );
+ m_pLbLineStyles->RemoveEntry( nPos );
+ m_pLbLineStyles->SelectEntryPos( 0 );
SelectLinestyleHdl_Impl( this );
*pPageType = 0; // style should not be taken
@@ -730,9 +703,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
// determine button state
if ( !pDashList->Count() )
{
- aBtnModify.Disable();
- aBtnDelete.Disable();
- aBtnSave.Disable();
+ m_pBtnModify->Disable();
+ m_pBtnDelete->Disable();
+ m_pBtnSave->Disable();
}
return( 0L );
}
@@ -746,8 +719,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
if ( *pnDashListState & CT_MODIFIED )
{
- nReturn = WarningBox( GetParentDialog(), WinBits( WB_YES_NO_CANCEL ),
- String( ResId( RID_SVXSTR_WARN_TABLE_OVERWRITE, rMgr ) ) ).Execute();
+ nReturn = WarningBox( GetParentDialog(), WinBits( WB_YES_NO_CANCEL ), OUString( ResId( RID_SVXSTR_WARN_TABLE_OVERWRITE, rMgr ) ) ).Execute();
if ( nReturn == RET_YES )
pDashList->Save();
@@ -755,9 +727,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg(
- com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- 0 );
+ ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
String aStrFilterType( "*.sod" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
INetURLObject aFile( SvtPathOptions().GetPalettePath() );
@@ -771,8 +741,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
aPathURL.removeSegment();
aPathURL.removeFinalSlash();
- XDashListRef pDshLst = XPropertyList::CreatePropertyList(
- XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ) )->AsDashList();
+ XDashListRef pDshLst = XPropertyList::CreatePropertyList( XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ) )->AsDashList();
pDshLst->SetName( aURL.getName() );
if( pDshLst->Load() )
@@ -780,8 +749,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
pDashList = pDshLst;
( (SvxLineTabDialog*) GetParentDialog() )->SetNewDashList( pDashList );
- aLbLineStyles.Clear();
- aLbLineStyles.Fill( pDashList );
+ m_pLbLineStyles->Clear();
+ m_pLbLineStyles->Fill( pDashList );
Reset( rOutAttrs );
pDashList->SetName( aURL.getName() );
@@ -791,23 +760,22 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
}
else
//aIStream.Close();
- ErrorBox( GetParentDialog(), WinBits( WB_OK ),
- String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute();
+ ErrorBox( GetParentDialog(), WinBits( WB_OK ), OUString( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute();
}
}
// determine button state
if ( pDashList->Count() )
{
- aBtnModify.Enable();
- aBtnDelete.Enable();
- aBtnSave.Enable();
+ m_pBtnModify->Enable();
+ m_pBtnDelete->Enable();
+ m_pBtnSave->Enable();
}
else
{
- aBtnModify.Disable();
- aBtnDelete.Disable();
- aBtnSave.Disable();
+ m_pBtnModify->Disable();
+ m_pBtnDelete->Disable();
+ m_pBtnSave->Disable();
}
return( 0L );
}
@@ -816,8 +784,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
{
- ::sfx2::FileDialogHelper aDlg(
- com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
String aStrFilterType( "*.sod" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
@@ -851,8 +818,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
}
else
{
- ErrorBox( GetParentDialog(), WinBits( WB_OK ),
- String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ ErrorBox( GetParentDialog(), WinBits( WB_OK ), OUString( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
@@ -865,24 +831,22 @@ void SvxLineDefTabPage::FillDash_Impl()
{
XDashStyle eXDS;
- if( aCbxSynchronize.IsChecked() )
+ if( m_pCbxSynchronize->IsChecked() )
eXDS = XDASH_RECTRELATIVE;
else
eXDS = XDASH_RECT;
aDash.SetDashStyle( eXDS );
- aDash.SetDots( (sal_uInt8) aNumFldNumber1.GetValue() );
- aDash.SetDotLen( aLbType1.GetSelectEntryPos() == 0 ? 0 :
- GetCoreValue( aMtrLength1, ePoolUnit ) );
- aDash.SetDashes( (sal_uInt8) aNumFldNumber2.GetValue() );
- aDash.SetDashLen( aLbType2.GetSelectEntryPos() == 0 ? 0 :
- GetCoreValue( aMtrLength2, ePoolUnit ) );
- aDash.SetDistance( GetCoreValue( aMtrDistance, ePoolUnit ) );
+ aDash.SetDots( (sal_uInt8) m_pNumFldNumber1->GetValue() );
+ aDash.SetDotLen( m_pLbType1->GetSelectEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength1, ePoolUnit ) );
+ aDash.SetDashes( (sal_uInt8) m_pNumFldNumber2->GetValue() );
+ aDash.SetDashLen( m_pLbType2->GetSelectEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength2, ePoolUnit ) );
+ aDash.SetDistance( GetCoreValue( *m_pMtrDistance, ePoolUnit ) );
rXLSet.Put( XLineDashItem( String(), aDash ) );
// #i34740#
- aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
+ m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet());
}
//------------------------------------------------------------------------
@@ -891,28 +855,28 @@ void SvxLineDefTabPage::FillDialog_Impl()
{
XDashStyle eXDS = aDash.GetDashStyle(); // XDASH_RECT, XDASH_ROUND
if( eXDS == XDASH_RECTRELATIVE )
- aCbxSynchronize.Check();
+ m_pCbxSynchronize->Check();
else
- aCbxSynchronize.Check( sal_False );
+ m_pCbxSynchronize->Check( sal_False );
- aNumFldNumber1.SetValue( aDash.GetDots() );
- SetMetricValue( aMtrLength1, aDash.GetDotLen(), ePoolUnit );
- aLbType1.SelectEntryPos( aDash.GetDotLen() == 0 ? 0 : 1 );
- aNumFldNumber2.SetValue( aDash.GetDashes() );
- SetMetricValue( aMtrLength2, aDash.GetDashLen(), ePoolUnit );
- aLbType2.SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 );
- SetMetricValue( aMtrDistance, aDash.GetDistance(), ePoolUnit );
+ m_pNumFldNumber1->SetValue( aDash.GetDots() );
+ SetMetricValue( *m_pMtrLength1, aDash.GetDotLen(), ePoolUnit );
+ m_pLbType1->SelectEntryPos( aDash.GetDotLen() == 0 ? 0 : 1 );
+ m_pNumFldNumber2->SetValue( aDash.GetDashes() );
+ SetMetricValue( *m_pMtrLength2, aDash.GetDashLen(), ePoolUnit );
+ m_pLbType2->SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 );
+ SetMetricValue( *m_pMtrDistance, aDash.GetDistance(), ePoolUnit );
ChangeMetricHdl_Impl( NULL );
// save values for changes recognition (-> method)
- aNumFldNumber1.SaveValue();
- aMtrLength1.SaveValue();
- aLbType1.SaveValue();
- aNumFldNumber2.SaveValue();
- aMtrLength2.SaveValue();
- aLbType2.SaveValue();
- aMtrDistance.SaveValue();
+ m_pNumFldNumber1->SaveValue();
+ m_pMtrLength1->SaveValue();
+ m_pLbType1->SaveValue();
+ m_pNumFldNumber2->SaveValue();
+ m_pMtrLength2->SaveValue();
+ m_pLbType2->SaveValue();
+ m_pMtrDistance->SaveValue();
}
@@ -922,10 +886,10 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- sal_uInt16 nOldSelect = aLbLineStyles.GetSelectEntryPos();
- aLbLineStyles.Clear();
- aLbLineStyles.Fill( pDashList );
- aLbLineStyles.SelectEntryPos( nOldSelect );
+ sal_uInt16 nOldSelect = m_pLbLineStyles->GetSelectEntryPos();
+ m_pLbLineStyles->Clear();
+ m_pLbLineStyles->Fill( pDashList );
+ m_pLbLineStyles->SelectEntryPos( nOldSelect );
}
}
diff --git a/cui/uiconfig/ui/linestyletabpage.ui b/cui/uiconfig/ui/linestyletabpage.ui
new file mode 100644
index 0000000..12a2a8e
--- /dev/null
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkAdjustment" id="adjustmentDIST">
+ <property name="upper">5000</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentNUM">
+ <property name="upper">99</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/sc05501.png</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/sc05502.png</property>
+ </object>
+ <object class="GtkListStore" id="liststoreTYPE">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name guint1 -->
+ <column type="guint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Dots</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Dash</col>
+ <col id="1">0</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkFrame" id="LineStylePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <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="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_LINESTYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Line _style:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-LineLB" id="LB_LINESTYLES">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_TYPE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Type:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_TYPE_1</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="FT_NUMBER">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Number:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">NUM_FLD_1</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="GtkLabel" id="FT_LENGTH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Length:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_LENGTH_1:0cm</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="GtkLabel" id="FT_DISTANCE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Spacing:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_DISTANCE:0cm</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="CBX_SYNCHRONIZE">
+ <property name="label" translatable="yes">_Fit to line width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkComboBox" id="LB_TYPE_1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreTYPE</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="GtkComboBox" id="LB_TYPE_2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreTYPE</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="NUM_FLD_1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentNUM</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="GtkSpinButton" id="NUM_FLD_2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentNUM</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="MTR_FLD_LENGTH_1:0cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentDIST</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MTR_FLD_LENGTH_2:0cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentDIST</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MTR_FLD_DISTANCE:0cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentDIST</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="BTN_ADD">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BTN_MODIFY">
+ <property name="label" translatable="yes">_Modify</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BTN_DELETE">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BTN_LOAD">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Load Line Styles</property>
+ <property name="tooltip_text" translatable="yes">Load Line Styles</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="image">image1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BTN_SAVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Save Line Styles</property>
+ <property name="tooltip_text" translatable="yes">Save Line Styles</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="image">image2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Properties</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="FT_LINESTYLE"/>
+ <widget name="CBX_SYNCHRONIZE"/>
+ </widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list