[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - cui/source cui/uiconfig cui/UI_cui.mk sfx2/inc sfx2/source svx/inc svx/source vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 18 08:15:55 PDT 2012
cui/UI_cui.mk | 1
cui/source/inc/chardlg.hxx | 17 --
cui/source/tabpages/chardlg.cxx | 90 +++++---------
cui/source/tabpages/chardlg.hrc | 14 --
cui/source/tabpages/chardlg.src | 89 --------------
cui/uiconfig/ui/twolinespage.ui | 249 ++++++++++++++++++++++++++++++++++++++++
sfx2/inc/sfx2/basedlgs.hxx | 2
sfx2/inc/sfx2/tabdlg.hxx | 1
sfx2/source/dialog/tabdlg.cxx | 11 +
svx/inc/svx/fntctrl.hxx | 1
svx/source/dialog/fntctrl.cxx | 12 +
vcl/inc/vcl/tabpage.hxx | 2
vcl/source/window/tabpage.cxx | 7 +
13 files changed, 325 insertions(+), 171 deletions(-)
New commits:
commit 8c4e844dd14c29693daa143ce2c524c32e578725
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 18 16:14:49 2012 +0100
convert hard-coded layout of two-lines tabpage to .ui
Change-Id: I87da59af50420993303111dae0ec4456ae15cc20
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index a98e905..779eef4 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,cui))
$(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/10000 \
+ cui/uiconfig/ui/twolinespage \
))
# vim: set noet sw=4 ts=4:
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 3b3e66c..eeb6733 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -64,6 +64,8 @@ protected:
sal_Bool m_bPreviewBackgroundToCharacter;
SvxCharBasePage(Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&);
+ SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset);
+
virtual ~SvxCharBasePage();
void makeWidgets(Window *pParent, const ResId& rResId,
@@ -366,17 +368,10 @@ public:
class SvxCharTwoLinesPage : public SvxCharBasePage
{
private:
- VclVBox m_aBox;
- VclGrid m_aGrid;
-
- FixedLine m_aSwitchOnLine;
- CheckBox m_aTwoLinesBtn;
-
- FixedLine m_aEncloseLine;
- FixedText m_aStartBracketFT;
- ListBox m_aStartBracketLB;
- FixedText m_aEndBracketFT;
- ListBox m_aEndBracketLB;
+ CheckBox* m_pTwoLinesBtn;
+ VclContainer* m_pEnclosingFrame;
+ ListBox* m_pStartBracketLB;
+ ListBox* m_pEndBracketLB;
sal_uInt16 m_nStartBracketPosition;
sal_uInt16 m_nEndBracketPosition;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index c5fc178..1990efd 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -195,6 +195,12 @@ SvxCharBasePage::SvxCharBasePage( Window* pParent, const ResId& rResId, const Sf
{
}
+SvxCharBasePage::SvxCharBasePage( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset)
+ : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset )
+ , m_bPreviewBackgroundToCharacter( sal_False )
+{
+}
+
void SvxCharBasePage::makeWidgets(Window *pParent, const ResId& rResId,
sal_uInt16 nResIdPrewievWin, sal_uInt16 nResIdFontTypeFT)
{
@@ -3582,62 +3588,37 @@ void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet)
// class SvxCharTwoLinesPage ------------------------------------------------
SvxCharTwoLinesPage::SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rInSet)
- : SvxCharBasePage(pParent, CUI_RES(RID_SVXPAGE_CHAR_TWOLINES), rInSet)
- , m_aBox(this, false, 7)
- , m_aGrid(&m_aBox)
- , m_aSwitchOnLine(&m_aGrid, CUI_RES(FL_SWITCHON))
- , m_aTwoLinesBtn(&m_aGrid, CUI_RES(CB_TWOLINES))
- , m_aEncloseLine(&m_aGrid, CUI_RES(FL_ENCLOSE))
- , m_aStartBracketFT(&m_aGrid, CUI_RES(FT_STARTBRACKET))
- , m_aStartBracketLB(&m_aGrid, CUI_RES(ED_STARTBRACKET))
- , m_aEndBracketFT(&m_aGrid, CUI_RES(FT_ENDBRACKET))
- , m_aEndBracketLB(&m_aGrid, CUI_RES(ED_ENDBRACKET))
+ : SvxCharBasePage(pParent, "TwoLinesPage", "cui/ui/twolinespage.ui", rInSet)
, m_nStartBracketPosition( 0 )
, m_nEndBracketPosition( 0 )
{
- m_aBox.set_expand(true);
+ get(m_pTwoLinesBtn, "twolines");
+ get(m_pEnclosingFrame, "enclosing");
+ get(m_pStartBracketLB, "startbracket");
+ get(m_pEndBracketLB, "endbracket");
- m_aGrid.set_column_spacing(7);
- m_aGrid.set_row_spacing(2);
+ get(m_pPreviewWin, "preview");
- setGridAttach(m_aSwitchOnLine, 0, 0, 2);
- setGridAttach(m_aTwoLinesBtn, 0, 1);
- setGridAttach(m_aEncloseLine, 0, 2, 2);
- setGridAttach(m_aStartBracketFT, 0, 3);
- setGridAttach(m_aEndBracketFT, 1, 3);
- setGridAttach(m_aStartBracketLB, 0, 4);
- setGridAttach(m_aEndBracketLB, 1, 4);
-
- makeWidgets(&m_aBox, CUI_RES(RID_SVXPAGE_CHAR_TWOLINES), WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE);
- FreeResource();
Initialize();
}
SvxCharTwoLinesPage::~SvxCharTwoLinesPage()
{
- delete m_pPreviewWin, m_pPreviewWin = NULL;
- delete m_pFontTypeFT, m_pFontTypeFT = NULL;
+ m_pPreviewWin = NULL; //to-do, when all of these tab pages are converted to .ui this and the parent delete can go
}
// -----------------------------------------------------------------------
void SvxCharTwoLinesPage::Initialize()
{
- Size aSize = m_aStartBracketLB.GetSizePixel();
- aSize.Height() = m_aStartBracketLB.CalcSize( 1, 6 ).Height();
- m_aStartBracketLB.SetSizePixel( aSize );
- aSize = m_aEndBracketLB.GetSizePixel();
- aSize.Height() = m_aEndBracketLB.CalcSize( 1, 6 ).Height();
- m_aEndBracketLB.SetSizePixel( aSize );
-
- m_aTwoLinesBtn.Check( sal_False );
+ m_pTwoLinesBtn->Check( sal_False );
TwoLinesHdl_Impl( NULL );
- m_aTwoLinesBtn.SetClickHdl( LINK( this, SvxCharTwoLinesPage, TwoLinesHdl_Impl ) );
+ m_pTwoLinesBtn->SetClickHdl( LINK( this, SvxCharTwoLinesPage, TwoLinesHdl_Impl ) );
Link aLink = LINK( this, SvxCharTwoLinesPage, CharacterMapHdl_Impl );
- m_aStartBracketLB.SetSelectHdl( aLink );
- m_aEndBracketLB.SetSelectHdl( aLink );
+ m_pStartBracketLB->SetSelectHdl( aLink );
+ m_pEndBracketLB->SetSelectHdl( aLink );
SvxFont& rFont = GetPreviewFont();
SvxFont& rCJKFont = GetPreviewCJKFont();
@@ -3652,7 +3633,7 @@ void SvxCharTwoLinesPage::Initialize()
void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox )
{
- bool bStart = pBox == &m_aStartBracketLB;
+ bool bStart = pBox == m_pStartBracketLB;
//SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
//if(pFact)
{
@@ -3678,7 +3659,7 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox )
void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
{
sal_uInt16 nEntryPos = 0;
- ListBox* pBox = bStart ? &m_aStartBracketLB : &m_aEndBracketLB;
+ ListBox* pBox = bStart ? m_pStartBracketLB : m_pEndBracketLB;
if ( 0 == cBracket )
pBox->SelectEntryPos(0);
else
@@ -3715,11 +3696,8 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl)
{
- sal_Bool bChecked = m_aTwoLinesBtn.IsChecked();
- m_aStartBracketFT.Enable( bChecked );
- m_aStartBracketLB.Enable( bChecked );
- m_aEndBracketFT.Enable( bChecked );
- m_aEndBracketLB.Enable( bChecked );
+ sal_Bool bChecked = m_pTwoLinesBtn->IsChecked();
+ m_pEnclosingFrame->Enable( bChecked );
UpdatePreview_Impl();
return 0;
@@ -3734,7 +3712,7 @@ IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox*, pBox )
SelectCharacter( pBox );
else
{
- bool bStart = pBox == &m_aStartBracketLB;
+ bool bStart = pBox == m_pStartBracketLB;
if( bStart )
m_nStartBracketPosition = nPos;
else
@@ -3778,14 +3756,14 @@ sal_uInt16* SvxCharTwoLinesPage::GetRanges()
void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet )
{
- m_aTwoLinesBtn.Check( sal_False );
+ m_pTwoLinesBtn->Check( sal_False );
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
SfxItemState eState = rSet.GetItemState( nWhich );
if ( eState >= SFX_ITEM_DONTCARE )
{
const SvxTwoLinesItem& rItem = (SvxTwoLinesItem&)rSet.Get( nWhich );
- m_aTwoLinesBtn.Check( rItem.GetValue() );
+ m_pTwoLinesBtn->Check( rItem.GetValue() );
if ( rItem.GetValue() )
{
@@ -3806,11 +3784,11 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
sal_Bool bModified = sal_False, bChanged = sal_True;
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES );
- sal_Bool bOn = m_aTwoLinesBtn.IsChecked();
- sal_Unicode cStart = ( bOn && m_aStartBracketLB.GetSelectEntryPos() > 0 )
- ? m_aStartBracketLB.GetSelectEntry().GetChar(0) : 0;
- sal_Unicode cEnd = ( bOn && m_aEndBracketLB.GetSelectEntryPos() > 0 )
- ? m_aEndBracketLB.GetSelectEntry().GetChar(0) : 0;
+ sal_Bool bOn = m_pTwoLinesBtn->IsChecked();
+ sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
+ ? m_pStartBracketLB->GetSelectEntry().GetChar(0) : 0;
+ sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )
+ ? m_pEndBracketLB->GetSelectEntry().GetChar(0) : 0;
if ( pOld )
{
@@ -3833,12 +3811,12 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
void SvxCharTwoLinesPage::UpdatePreview_Impl()
{
- sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0
- ? m_aStartBracketLB.GetSelectEntry().GetChar(0) : 0;
- sal_Unicode cEnd = m_aEndBracketLB.GetSelectEntryPos() > 0
- ? m_aEndBracketLB.GetSelectEntry().GetChar(0) : 0;
+ sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0
+ ? m_pStartBracketLB->GetSelectEntry().GetChar(0) : 0;
+ sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0
+ ? m_pEndBracketLB->GetSelectEntry().GetChar(0) : 0;
m_pPreviewWin->SetBrackets(cStart, cEnd);
- m_pPreviewWin->SetTwoLines(m_aTwoLinesBtn.IsChecked());
+ m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked());
m_pPreviewWin->Invalidate();
}
// -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc
index 91a54e3..0108f75 100644
--- a/cui/source/tabpages/chardlg.hrc
+++ b/cui/source/tabpages/chardlg.hrc
@@ -147,20 +147,6 @@
#define WIN_POS_PREVIEW 331
#define FT_POS_FONTTYPE 332
-// TwoLinesPage -------------------------------------------------------------
-
-#define FL_SWITCHON 400
-#define CB_TWOLINES 401
-
-#define FL_ENCLOSE 410
-#define FT_STARTBRACKET 411
-#define ED_STARTBRACKET 412
-#define FT_ENDBRACKET 413
-#define ED_ENDBRACKET 414
-
-#define WIN_TWOLINES_PREVIEW 421
-#define FT_TWOLINES_FONTTYPE 422
-
#define FT_WEST_NAME_NOCJK 423
#define LB_WEST_NAME_NOCJK 424
#define FT_WEST_STYLE_NOCJK 425
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index b6673cc..dd882af 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -927,92 +927,3 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Hide = TRUE;
};
};
-
-TabPage RID_SVXPAGE_CHAR_TWOLINES
-{
- HelpId = HID_SVXPAGE_CHAR_TWOLINES ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_SWITCHON
- {
- Pos = MAP_APPFONT ( 6 , 3 );
- Size = MAP_APPFONT ( 248 , 8 );
- Text [ en-US ] = "Double-lined" ;
- };
- CheckBox CB_TWOLINES
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES";
- Pos = MAP_APPFONT ( 12 , 14 );
- Size = MAP_APPFONT ( 236 , 10 );
- Text [ en-US ] = "~Write in double lines" ;
- TabStop = TRUE;
- };
- FixedLine FL_ENCLOSE
- {
- Pos = MAP_APPFONT ( 6 , 30 );
- Size = MAP_APPFONT ( 248 , 8 );
- Text [ en-US ] = "Enclosing character" ;
- };
- FixedText FT_STARTBRACKET
- {
- Pos = MAP_APPFONT ( 12 , 41 );
- Size = MAP_APPFONT ( 90 , 8 );
- Text [ en-US ] = "I~nitial character" ;
- };
- ListBox ED_STARTBRACKET
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET";
- Pos = MAP_APPFONT ( 12 , 52 );
- Size = MAP_APPFONT ( 90 , 72 );
- TabStop = TRUE;
- Border = TRUE;
- StringList [ en-US ] =
- {
- < "(None)" ; CHRDLG_ENCLOSE_NONE ; > ;
- < "(" ; CHRDLG_ENCLOSE_ROUND ; > ;
- < "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
- < "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
- < "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < "Other Characters..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
- };
- };
- FixedText FT_ENDBRACKET
- {
- Pos = MAP_APPFONT ( 108 , 41 );
- Size = MAP_APPFONT ( 90 , 8 );
- Text [ en-US ] = "Final charact~er" ;
- };
- ListBox ED_ENDBRACKET
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET";
- Pos = MAP_APPFONT ( 108 , 52 );
- Size = MAP_APPFONT ( 90 , 72 );
- TabStop = TRUE;
- Border = TRUE;
- StringList [ en-US ] =
- {
- < "(None)" ; CHRDLG_ENCLOSE_NONE ; > ;
- < ")" ; CHRDLG_ENCLOSE_ROUND ; > ;
- < "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
- < ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
- < "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < "Other Characters..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
- };
- };
- Window WIN_TWOLINES_PREVIEW
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 149 ) ;
- Size = MAP_APPFONT ( 248 , 37 ) ;
- Text [ en-US ] = "Example" ;
- };
- FixedText FT_TWOLINES_FONTTYPE
- {
- Pos = MAP_APPFONT ( 6 , 168 ) ;
- Size = MAP_APPFONT ( 248 , 16 ) ;
- WordBreak = TRUE ;
- Hide = TRUE;
- };
-};
-
- // ********************************************************************** EOF
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
new file mode 100644
index 0000000..f61c424
--- /dev/null
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="TwoLinesPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="twolines">
+ <property name="label" translatable="yes">Write in double lines</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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Double-lined</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="enclosing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Initial character</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="label30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Final character</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="GtkTreeView" id="startbracket">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">liststore1</property>
+ <property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection5"/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="endbracket">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">liststore2</property>
+ <property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection6"/>
+ </child>
+ </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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enclosing character</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame14">
+ <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="alignment14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="svxlo:SvxFontPrevWindow" id="preview">
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Preview</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">(None)</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">(</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">[</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes"><</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">{</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Other Characters...</col>
+ <col id="1">5</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">(None)</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">)</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">]</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">></col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">}</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Other Characters...</col>
+ <col id="1">5</col>
+ </row>
+ </data>
+ </object>
+</interface>
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index a8ebc09..3acb66a 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -80,7 +80,7 @@ private:
protected:
SfxModalDialog(Window *pParent, const ResId& );
- SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
+ SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription);
SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL );
String& GetExtraData() { return aExtraData; }
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index e8f960d..f9f8600 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -232,6 +232,7 @@ private:
protected:
SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
+ SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet);
SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet );
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index f66627a..201b308 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -238,6 +238,17 @@ SfxTabPage::SfxTabPage( Window *pParent,
{
}
+
+
+SfxTabPage::SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
+ : TabPage(pParent, rID, rUIXMLDescription)
+ , pSet ( &rAttrSet )
+ , bHasExchangeSupport ( sal_False )
+ , pTabDlg ( NULL )
+ , pImpl ( new TabPageImpl )
+{
+}
+
// -----------------------------------------------------------------------
SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ) :
TabPage(pParent, nStyle),
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 4096824..e97fb96 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -60,6 +60,7 @@ private:
public:
SvxFontPrevWindow( Window* pParent, const ResId& rId );
+ SvxFontPrevWindow(Window* pParent);
virtual ~SvxFontPrevWindow();
virtual void StateChanged( StateChangedType nStateChange );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 0852996..41a766e 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -520,6 +520,18 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
Init();
}
+SvxFontPrevWindow::SvxFontPrevWindow(Window* pParent) :
+ Window(pParent)
+{
+ Init();
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent)
+{
+ SvxFontPrevWindow *pWindow = new SvxFontPrevWindow(pParent);
+ return pWindow;
+}
+
SvxFontPrevWindow::~SvxFontPrevWindow()
{
delete pImpl;
diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index 088ef04..417b17d 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -51,6 +51,8 @@ private:
public:
TabPage( Window* pParent, WinBits nStyle = 0 );
+ TabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription);
+
TabPage( Window* pParent, const ResId& rResId );
virtual void Paint( const Rectangle& rRect );
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 9daace2..85ee67d 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -113,6 +113,13 @@ TabPage::TabPage( Window* pParent, const ResId& rResId ) :
Show();
}
+TabPage::TabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription)
+ : Window(WINDOW_TABPAGE)
+{
+ ImplInit(pParent, 0);
+ m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
+}
+
// -----------------------------------------------------------------------
void TabPage::StateChanged( StateChangedType nType )
More information about the Libreoffice-commits
mailing list