[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source
cui/AllLangResTarget_cui.mk|1
cui/UIConfig_cui.mk|1
cui/source/dialogs/cuires.src | 10 ++
cui/source/dialogs/hlmarkwn.cxx| 90 +
cui/source/dialogs/hlmarkwn.hrc| 25 --
cui/source/dialogs/hlmarkwn.src| 77 -
cui/source/inc/helpid.hrc |4 -
cui/source/inc/hlmarkwn.hxx| 16 ++--
cui/uiconfig/ui/hyperlinkmarkdialog.ui | 89
extras/source/glade/libreoffice-catalog.xml.in |3
10 files changed, 161 insertions(+), 155 deletions(-)
New commits:
commit c4bf1f35405d3dcbd152e2e194d9e79946c0f471
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Tue Jun 17 00:24:41 2014 +0200
Convert RID_SVXFLOAT_HYPERLINK_MARKWND to .ui
Change-Id: I58d21506ec17d1c0e73dd042b94ec2ee2e3ddf11
Reviewed-on: https://gerrit.libreoffice.org/9803
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index ebc0ce4..c6cea1e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/cuires.src \
cui/source/dialogs/gallery.src \
cui/source/dialogs/hangulhanjadlg.src \
-cui/source/dialogs/hlmarkwn.src \
cui/source/dialogs/hyperdlg.src \
cui/source/dialogs/iconcdlg.src \
cui/source/dialogs/multipat.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8fb9657..d150fb6 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hangulhanjaoptdialog \
cui/uiconfig/ui/hatchpage \
+ cui/uiconfig/ui/hyperlinkmarkdialog \
cui/uiconfig/ui/hyphenate \
cui/uiconfig/ui/insertfloatingframe \
cui/uiconfig/ui/insertoleobject \
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index ac1a0c3..fa223cf 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -107,4 +107,14 @@ String RID_SVXSTR_FILTERNAME_CFG
Text [ en-US ] = Configuration (*.cfg) ;
};
+String RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES
+{
+Text [ en-US ] = Targets do not exist in the document. ;
+};
+
+String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
+{
+Text [ en-US ] = Couldn't open the document. ;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 2e15476..0f45021 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -38,7 +38,6 @@
#include svtools/treelistentry.hxx
#include cuires.hrc
-#include hlmarkwn.hrc
#include hlmarkwn.hxx
#include hltpbase.hxx
@@ -64,23 +63,33 @@ struct TargetData
}
};
-
-
//# #
//# Tree-Window #
//# #
+SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle)
+: SvTreeListBox(pParent, nStyle)
+, mpParentWnd(NULL)
+{
+SetNodeDefaultImages();
+}
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHlmarkTreeLBox(Window
*pParent, VclBuilder::stringmap rMap)
+{
+WinBits nWinStyle = WB_TABSTOP;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+nWinStyle |= WB_BORDER;
+return new SvxHlmarkTreeLBox(pParent, nWinStyle);
+}
-SvxHlmarkTreeLBox::SvxHlmarkTreeLBox( Window* pParent, const ResId rResId )
-: SvTreeListBox ( pParent, rResId ),
- mpParentWnd ( (SvxHlinkDlgMarkWnd*) pParent )
+Size SvxHlmarkTreeLBox::GetOptimalSize() const
{
-SetNodeDefaultImages();
+return LogicToPixel(Size(103, 162), MAP_APPFONT);
}
void SvxHlmarkTreeLBox::Paint( const Rectangle rRect )
{
-if( mpParentWnd-mnError == LERR_NOERROR )
+if (!mpParentWnd || mpParentWnd-mnError == LERR_NOERROR)
{
SvTreeListBox::Paint(rRect);
}
@@ -118,28 +127,26 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle rRect )
|* Contructor / Destructor
|*
|/
-
SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
-: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND )
),
-maBtApply( this, CUI_RES (BT_APPLY) ),
-maBtClose( this, CUI_RES (BT_CLOSE) ),
-maLbTree ( this, CUI_RES (TLB_MARK) ),
-mbUserMoved ( false ),
-mpParent( pParent ),
-mnError ( LERR_NOERROR )
+: ModalDialog(pParent, HyperlinkMark,
+cui/ui/hyperlinkmarkdialog.ui)
+
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk|1
cui/UIConfig_cui.mk|1
cui/source/inc/autocdlg.hxx|7 -
cui/source/inc/cuires.hrc |1
cui/source/inc/helpid.hrc |1
cui/source/tabpages/autocdlg.cxx | 79 ++---
cui/source/tabpages/autocdlg.hrc | 64 -
cui/source/tabpages/autocdlg.src | 72 ---
cui/uiconfig/ui/smarttagoptionspage.ui | 123 +
9 files changed, 167 insertions(+), 182 deletions(-)
New commits:
commit d25b1bf2bd617a9e29fd27c9550170fef0469481
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 4 12:52:33 2014 +0100
convert smarttag options page to .ui
Change-Id: Iae72fb5debaa5fe642cba940cf6775f5fd927fcd
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index bb32b79..ebc0ce4 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/treeopt.src \
-cui/source/tabpages/autocdlg.src \
cui/source/tabpages/border.src \
cui/source/tabpages/frmdirlbox.src \
cui/source/tabpages/page.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8a4d328..cd18592 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/showcoldialog \
cui/uiconfig/ui/similaritysearchdialog \
cui/uiconfig/ui/slantcornertabpage \
+ cui/uiconfig/ui/smarttagoptionspage \
cui/uiconfig/ui/smoothdialog \
cui/uiconfig/ui/solarizedialog \
cui/uiconfig/ui/specialcharacters \
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index a74f09e..e6748d0 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -461,10 +461,9 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage
private:
// controls
-CheckBoxm_aMainCB;
-SvxCheckListBox m_aSmartTagTypesLB;
-PushButton m_aPropertiesPB;
-FixedText m_aTitleFT;
+CheckBox* m_pMainCB;
+SvxCheckListBox*m_pSmartTagTypesLB;
+PushButton* m_pPropertiesPB;
/// construction via Create()
OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet rSet );
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 6d2df87..2d7f527 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -128,7 +128,6 @@
#define OFA_TP_VIEW (RID_OFA_START + 202)
#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
#define RID_OFAPAGE_MSFILTEROPT2(RID_OFA_START + 121)
-#define RID_OFAPAGE_SMARTTAG_OPTIONS(RID_OFA_START + 125)
#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
#define RID_SVXPAGE_OPTIONS_JAVA(RID_SVX_START + 253)
#define RID_SVXPAGE_ABOUT_CONFIG(RID_SVX_START + 301)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 263a788..8b23869 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -32,7 +32,6 @@
#define HID_OFA_FONT_SUBST_CLB CUI_HID_OFA_FONT_SUBST_CLB
#define HID_DBPATH_CTL_PATH CUI_HID_DBPATH_CTL_PATH
#define HID_DBPATH_HEADERBAR CUI_HID_DBPATH_HEADERBAR
-#define HID_OFAPAGE_SMARTTAG_OPTIONS CUI_HID_OFAPAGE_SMARTTAG_OPTIONS
#define HID_OFADLG_TREELISTBOX CUI_HID_OFADLG_TREELISTBOX
#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST
CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST
#define HID_COLORPAGE_DOCCOLOR_LB CUI_HID_COLORPAGE_DOCCOLOR_LB
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f681ee7..43edca3 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -46,11 +46,11 @@
#include rtl/strbuf.hxx
#include autocdlg.hxx
-#include autocdlg.hrc
#include helpid.hrc
#include editeng/acorrcfg.hxx
#include editeng/svxacorr.hxx
#include cuicharmap.hxx
+#include cuires.hrc
#include editeng/unolingu.hxx
#include dialmgr.hxx
#include svx/svxids.hrc
@@ -2357,22 +2357,23 @@ extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
makeAutoCompleteMultiListBox(Wi
OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
const SfxItemSet rSet )
-: SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
-m_aMainCB( this, CUI_RES(CB_SMARTTAGS) ),
-m_aSmartTagTypesLB( this, CUI_RES(LB_SMARTTAGS) ),
-m_aPropertiesPB( this, CUI_RES(PB_SMARTTAGS) ),
-m_aTitleFT( this, CUI_RES(FT_SMARTTAGS) )
+: SfxTabPage(pParent, SmartTagOptionsPage,
cui/ui/smarttagoptionspage.ui, rSet)
{
-FreeResource();
+get(m_pMainCB, main);
+get(m_pSmartTagTypesLB, list);
+
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/cuires.hrc |1
cui/source/inc/helpid.hrc |1
cui/source/options/certpath.cxx | 84 ++---
cui/source/options/certpath.hrc | 52
cui/source/options/certpath.hxx | 15 --
cui/source/options/certpath.src | 90 --
cui/uiconfig/ui/certdialog.ui | 246
9 files changed, 293 insertions(+), 198 deletions(-)
New commits:
commit a83517bd1b99c170e7d3b2fd59af3e85d983c756
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 14 13:35:50 2014 +
convert certificate path dialog to .ui format
Change-Id: Ifb711805a37f7cd49b6063c5d17aa7a3f5dcfdaa
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 10c80b0..e9ef5e8 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/passwdomdlg.src \
cui/source/dialogs/scriptdlg.src \
cui/source/dialogs/svuidlg.src \
-cui/source/options/certpath.src \
cui/source/options/connpooloptions.src \
cui/source/options/dbregister.src \
cui/source/options/doclinkdialog.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index bedb80c..c619d78 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/calloutdialog \
cui/uiconfig/ui/calloutpage \
cui/uiconfig/ui/cellalignment \
+ cui/uiconfig/ui/certdialog \
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/comment \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 15a6372..b64d9a3 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -374,7 +374,6 @@
#define RID_SVXSTR_ROW (RID_SVX_START +
1201)
#define RID_SVXSTR_COL (RID_SVX_START +
1202)
#define RID_SVXSTR_AUTO_ENTRY (RID_SVX_START +
1203)
-#define RID_SVXDLG_CERTPATH (RID_SVX_START +
1204)
#define RID_SVXSTR_USE_REPLACE (RID_SVX_START +
1205)
#define RID_SVXSTR_CPTL_STT_WORD(RID_SVX_START +
1206)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 547e7b7..88e7848 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -216,7 +216,6 @@
#define HID_MACRO_HEADERTABLISTBOX CUI_HID_MACRO_HEADERTABLISTBOX
#define HID_HYPERLINK_DIALOG
CUI_HID_HYPERLINK_DIALOG
-#define HID_DLG_CERTPATH
CUI_HID_DLG_CERTPATH
#endif
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 8f2023d..2d55e4e 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -16,7 +16,6 @@
#include unotools/securityoptions.hxx
#include cuires.hrc
#include certpath.hxx
-#include certpath.hrc
#include dialmgr.hxx
#include com/sun/star/mozilla/MozillaBootstrap.hpp
@@ -26,39 +25,37 @@
using namespace ::com::sun::star;
-CertPathDialog::CertPathDialog( Window* pParent ) :
- ModalDialog( pParent, CUI_RES( RID_SVXDLG_CERTPATH ) )
-, m_aCertPathFL ( this, CUI_RES( FL_CERTPATH ) )
-, m_aCertPathFT ( this, CUI_RES( FT_CERTPATH ) )
-, m_aCertPathListContainer( this, CUI_RES( LB_CERTPATH ) )
-, m_aCertPathList( m_aCertPathListContainer, WB_BORDER )
-, m_aAddBtn ( this, CUI_RES( PB_ADD ) )
-, m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
-, m_aOKBtn ( this, CUI_RES( PB_OK ) )
-, m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) )
-, m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
-, m_sAddDialogText(CUI_RESSTR(STR_ADDDLGTEXT))
-, m_sManual(CUI_RESSTR(STR_MANUAL))
+CertPathDialog::CertPathDialog(Window* pParent)
+: ModalDialog(pParent, CertDialog, cui/ui/certdialog.ui)
{
+get(m_pOKBtn, ok);
+get(m_pAddBtn, add);
+get(m_pCertPathListContainer, paths);
+Size aSize(LogicToPixel(Size(210, 60), MAP_APPFONT));
+m_pCertPathListContainer-set_width_request(aSize.Width());
+m_pCertPathListContainer-set_height_request(aSize.Height());
+m_pCertPathList =
+new svx::SvxRadioButtonListBox(*m_pCertPathListContainer, 0);
+m_sAddDialogText = getFixedText(certdir)-GetText();
+m_sManual = getFixedText(manual)-GetText();
+
static long aStaticTabs[]=
{
3, 0, 15, 75
};
-m_aCertPathList.SvSimpleTable::SetTabs( aStaticTabs );
+m_pCertPathList-SvSimpleTable::SetTabs( aStaticTabs );
-OUString sProfile(CUI_RESSTR(STR_PROFILE));
-OUString sDirectory(CUI_RESSTR(STR_DIRECTORY));
+OUString
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/customize/eventdlg.cxx | 71 +++--
cui/source/customize/eventdlg.hrc | 30
cui/source/customize/eventdlg.hxx |3
cui/source/customize/eventdlg.src | 98 -
cui/source/customize/macropg.cxx |3
cui/source/customize/macropg.hrc |1
cui/source/customize/macropg_impl.hxx |1
cui/source/inc/cuires.hrc |1
cui/source/inc/helpid.hrc |2
cui/uiconfig/ui/eventsconfigpage.ui | 254 ++
12 files changed, 284 insertions(+), 182 deletions(-)
New commits:
commit f8eb77651943a3f893c9426366b7d5374b28a3c7
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 7 10:48:02 2014 +
convert events config page to .ui
Change-Id: Ida0a6d1242333497cde9f2ef7a8830602caa0ccb
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index f050387..10c80b0 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,cui/res,\
$(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/customize/acccfg.src \
cui/source/customize/cfg.src \
-cui/source/customize/eventdlg.src \
cui/source/customize/macropg.src \
cui/source/dialogs/colorpicker.src \
cui/source/dialogs/commonlingui.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 87baa01..1d66286 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/distributiondialog \
cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \
+ cui/uiconfig/ui/eventsconfigpage \
cui/uiconfig/ui/formatcellsdialog \
cui/uiconfig/ui/gallerysearchprogress \
cui/uiconfig/ui/gallerythemedialog \
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index ea10378..9320c2b 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -46,7 +46,6 @@
#include dialmgr.hxx
#include cuires.hrc
-#include eventdlg.hrc
#include helpid.hrc
#include selector.hxx
#include cfg.hxx
@@ -55,30 +54,28 @@
using namespace ::com::sun::star;
-SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet
rSet, SvxEventConfigPage::EarlyInit ) :
-
-_SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ),
-aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
-aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
-bAppConfig ( sal_True )
+SvxEventConfigPage::SvxEventConfigPage(Window *pParent, const SfxItemSet rSet,
+SvxEventConfigPage::EarlyInit)
+: _SvxMacroTabPage(pParent, EventsConfigPage,
+cui/ui/eventsconfigpage.ui, rSet)
+, bAppConfig(true)
{
-mpImpl-sStrEvent = OUString( CUI_RES( STR_EVENT ));
-mpImpl-sAssignedMacro = OUString( CUI_RES( STR_ASSMACRO ));
-mpImpl-pEventLB= new MacroEventListBox( this, CUI_RES(
LB_EVENT ));
-mpImpl-pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ));
-mpImpl-pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ));
-mpImpl-pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ));
-mpImpl-aMacroImg = Image( CUI_RES( IMG_MACRO) );
-mpImpl-aComponentImg = Image( CUI_RES( IMG_COMPONENT) );
-
-FreeResource();
-
-// must be done after FreeResource is called
-InitResources();
+get(m_pSaveInListBox, savein);
+
+mpImpl-sStrEvent = getFixedText(eventft)-GetText();
+mpImpl-sAssignedMacro = getFixedText(actionft)-GetText();
+get(mpImpl-pEventLB, events);
+Size aSize(LogicToPixel(Size(205, 229), MAP_APPFONT));
+mpImpl-pEventLB-set_width_request(aSize.Width());
+mpImpl-pEventLB-set_height_request(aSize.Height());
+get(mpImpl-pAssignPB, macro);
+get(mpImpl-pDeletePB, delete);
+mpImpl-aMacroImg = getFixedImage(macroimg)-GetImage();
+mpImpl-aComponentImg = getFixedImage(componentimg)-GetImage();
-mpImpl-pEventLB-GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT );
+InitResources();
-aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage,
+m_pSaveInListBox-SetSelectHdl( LINK( this, SvxEventConfigPage,
SelectHdl_Impl ) );
uno::Reference frame::XGlobalEventBroadcaster xSupplier;
@@ -88,13 +85,12 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent,
const SfxItemSet rSet,
sal_uInt16 nPos(0);
m_xAppEvents = xSupplier-getEvents();
-nPos = aSaveInListBox.InsertEntry(
+nPos = m_pSaveInListBox-InsertEntry(
utl::ConfigManager::getProductName() );
-aSaveInListBox.SetEntryData( nPos, new bool(true) );
-aSaveInListBox.SelectEntryPos( nPos, true );
+m_pSaveInListBox-SetEntryData( nPos, new bool(true) );
+
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/svx svx/source
cui/AllLangResTarget_cui.mk|1
cui/UIConfig_cui.mk|1
cui/source/dialogs/cuigrfflt.cxx | 144 ++-
cui/source/dialogs/grfflt.hrc | 42 -
cui/source/dialogs/grfflt.src | 88
cui/source/factory/dlgfact.cxx | 13 -
cui/source/factory/dlgfact.hxx | 12 -
cui/source/inc/cuigrfflt.hxx | 88 ++--
cui/source/inc/helpid.hrc |1
cui/uiconfig/ui/embossdialog.ui| 183 +
extras/source/glade/libreoffice-catalog.xml.in |3
include/svx/dialogs.hrc|1
include/svx/svxdlg.hxx |4
svx/source/dialog/grfflt.cxx |2
14 files changed, 226 insertions(+), 357 deletions(-)
New commits:
commit 44f85f3804d69cd437a5baeae2d1aeadf1873f74
Author: Caolán McNamara caol...@redhat.com
Date: Sat Feb 1 12:29:27 2014 +
convert emboss dialog to .ui
Change-Id: I16883023ba7386437ff1cc9cd7d3393db8fb4654
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 3650b3d..f050387 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/cuires.src \
cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
-cui/source/dialogs/grfflt.src \
cui/source/dialogs/hangulhanjadlg.src \
cui/source/dialogs/hlmarkwn.src \
cui/source/dialogs/hyperdlg.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 3796244..6f43adc 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/cuiimapdlg \
cui/uiconfig/ui/dimensionlinestabpage \
cui/uiconfig/ui/editdictionarydialog \
+ cui/uiconfig/ui/embossdialog \
cui/uiconfig/ui/eventassigndialog \
cui/uiconfig/ui/eventassignpage \
cui/uiconfig/ui/formatnumberdialog \
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index d342013..c67d064 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -26,124 +26,9 @@
#include sfx2/request.hxx
#include dialmgr.hxx
#include cuigrfflt.hxx
-#include grfflt.hrc
#include cuires.hrc
#include svx/dialogs.hrc
-oldGraphicFilterDialog::PreviewWindow::PreviewWindow( Window* pParent, const
ResId rResId ) :
-Control( pParent, rResId )
-{
-}
-
-//
-
-
-void oldGraphicFilterDialog::PreviewWindow::Paint( const Rectangle rRect )
-{
-Control::Paint( rRect );
-
-const Size aOutputSize( GetOutputSizePixel() );
-
-if( maGraphic.IsAnimated() )
-{
-const Size aGraphicSize( LogicToPixel( maGraphic.GetPrefSize(),
maGraphic.GetPrefMapMode() ) );
-const Point aGraphicPosition( ( aOutputSize.Width() -
aGraphicSize.Width() ) 1,
- ( aOutputSize.Height() -
aGraphicSize.Height() ) 1 );
-maGraphic.StartAnimation( this, aGraphicPosition, aGraphicSize );
-}
-else
-{
-const Size aGraphicSize( maGraphic.GetSizePixel() );
-const Point aGraphicPosition( ( aOutputSize.Width() -
aGraphicSize.Width() ) 1,
- ( aOutputSize.Height() -
aGraphicSize.Height() ) 1 );
-maGraphic.Draw( this, aGraphicPosition, aGraphicSize );
-}
-}
-
-//
-
-
-void oldGraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic
rGraphic )
-{
-maGraphic = rGraphic;
-
-if( maGraphic.IsAnimated() || maGraphic.IsTransparent() )
-Invalidate();
-else
-Paint( Rectangle( Point(), GetOutputSizePixel() ) );
-}
-
-oldGraphicFilterDialog::oldGraphicFilterDialog( Window* pParent, const ResId
rResId, const Graphic rGraphic ) :
-ModalDialog ( pParent, rResId ),
-maModifyHdl ( LINK( this, oldGraphicFilterDialog, ImplModifyHdl ) ),
-mfScaleX( 0.0 ),
-mfScaleY( 0.0 ),
-maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(),
rGraphic.GetPrefMapMode() ) ),
-maPreview ( this, CUI_RES( CTL_PREVIEW ) ),
-maBtnOK ( this, CUI_RES( BTN_OK ) ),
-maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
-maBtnHelp ( this, CUI_RES( BTN_HELP ) ),
-maFlParameter ( this, CUI_RES( FL_PARAMETER ) )
-{
-const Size aPreviewSize( maPreview.GetOutputSizePixel() );
-SizeaGrfSize( maSizePixel );
-
-if( rGraphic.GetType() == GRAPHIC_BITMAP
-aPreviewSize.Width() aPreviewSize.Height()
-aGrfSize.Width() aGrfSize.Height() )
-{
-const double fGrfWH = (double)
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/cuires.hrc|2
cui/source/inc/labdlg.hxx| 18 ++--
cui/source/tabpages/labdlg.cxx | 82 +
cui/source/tabpages/labdlg.hrc | 26 --
cui/source/tabpages/labdlg.src | 64
cui/uiconfig/ui/calloutdialog.ui | 148 +++
include/svx/dialogs.hrc |2
9 files changed, 194 insertions(+), 150 deletions(-)
New commits:
commit be4035d00f37c492494fa7860955b6d0868c7f77
Author: Caolán McNamara caol...@redhat.com
Date: Sun Jan 5 22:46:17 2014 +
convert callout tabdialog to .ui
Change-Id: If16ddb848eb0a46d0d5d91cb6366a6e268cd1b7a
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 4db5d6d..804180e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/border.src \
cui/source/tabpages/dstribut.src \
cui/source/tabpages/frmdirlbox.src \
-cui/source/tabpages/labdlg.src \
cui/source/tabpages/macroass.src \
cui/source/tabpages/page.src \
cui/source/tabpages/paragrph.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index b5dfe0d..07a669d 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/borderbackgrounddialog \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/breaknumberoption \
+ cui/uiconfig/ui/calloutdialog \
cui/uiconfig/ui/calloutpage \
cui/uiconfig/ui/cellalignment \
cui/uiconfig/ui/charnamepage \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 0c51510..f3580e6 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -40,8 +40,6 @@
// RID_CUI_GALLERY_END (RID_SVX_START + 410)
// used in tabpages
-#define RID_SVXDLG_LINE (RID_SVX_START + 50)
-#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
#define RID_SVXSTRARY_PAPERSIZE_DRAW(RID_SVX_START + 143)
#define RID_SVXSTR_TABLE_PRESET_NONE(RID_SVX_START + 969)
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 2d049d6..1df123b 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -93,22 +93,22 @@ public:
class SvxCaptionTabDialog : public SfxTabDialog
{
private:
-const SdrView* pView;
-sal_uInt16 nAnchorCtrls;
+const SdrView* pView;
+sal_uInt16 nAnchorCtrls;
+sal_uInt16 m_nSwPosSizePageId;
+sal_uInt16 m_nPositionSizePageId;
+sal_uInt16 m_nCaptionPageId;
LinkaValidateLink;
virtual voidPageCreated( sal_uInt16 nId, SfxTabPage rPage );
public:
+SvxCaptionTabDialog(Window* pParent, const SdrView* pView,
+sal_uInt16 nAnchorTypes = 0);
-SvxCaptionTabDialog(Window* pParent, const SdrView* pView,
-sal_uInt16 nAnchorTypes = 0 );
-
-~SvxCaptionTabDialog();
-
-/// link for the Writer to validate positions
-void SetValidateFramePosLink( const Link rLink );
+/// link for the Writer to validate positions
+void SetValidateFramePosLink( const Link rLink );
};
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 41bc3d7..1fd3866 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -34,7 +34,6 @@
#include svx/sxctitm.hxx
#include svx/dlgutil.hxx
-#include labdlg.hrc
#include labdlg.hxx
#include transfrm.hxx
@@ -508,65 +507,56 @@ void SvxCaptionTabPage::FillValueSet()
//
-SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView*
pSdrView, sal_uInt16 nAnchorTypes)
- : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ),
-pView ( pSdrView ),
-nAnchorCtrls(nAnchorTypes)
+SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView*
pSdrView,
+sal_uInt16 nAnchorTypes)
+: SfxTabDialog( pParent, CalloutDialog, cui/ui/calloutdialog.ui)
+, pView(pSdrView)
+, nAnchorCtrls(nAnchorTypes)
+, m_nSwPosSizePageId(0)
+, m_nPositionSizePageId(0)
+, m_nCaptionPageId(0)
{
-FreeResource();
-
-DBG_ASSERT( pView, Keine gueltige View Uebergeben! );
+assert(pView); //Keine gueltige View Uebergeben!
//different positioning page in Writer
-if(nAnchorCtrls 0x00ff )
+if (nAnchorCtrls 0x00ff)
{
-AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create,
-SvxSwPosSizeTabPage::GetRanges );
-RemoveTabPage( RID_SVXPAGE_POSITION_SIZE);
+
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/bbdlg.hxx | 11 --
cui/source/inc/cuires.hrc |1
cui/source/tabpages/bbdlg.cxx | 34 ++-
cui/source/tabpages/bbdlg.src | 54
cui/uiconfig/ui/borderbackgrounddialog.ui | 133 ++
7 files changed, 147 insertions(+), 88 deletions(-)
New commits:
commit acee1b8b8c68c5c9d7492dbcc95635e68551713f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 19 12:30:43 2013 +
convert border background dialog to .ui
Change-Id: I661384b04fef7f59c2b4feffe093cf75103d55d1
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 3265c7e..9bf5505 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/treeopt.src \
cui/source/tabpages/align.src \
cui/source/tabpages/autocdlg.src \
-cui/source/tabpages/bbdlg.src \
cui/source/tabpages/border.src \
cui/source/tabpages/dstribut.src \
cui/source/tabpages/frmdirlbox.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 1ae0d83..174b243 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/bitmaptabpage \
+ cui/uiconfig/ui/borderbackgrounddialog \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/breaknumberoption \
cui/uiconfig/ui/cellalignment \
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index a1bddb3..0b3139a 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -28,17 +28,14 @@
class SvxBorderBackgroundDlg: public SfxTabDialog
{
public:
-SvxBorderBackgroundDlg( Window *pParent,
-const SfxItemSet rCoreSet,
-sal_Bool bEnableSelector = sal_False );
-
-~SvxBorderBackgroundDlg();
-
+SvxBorderBackgroundDlg(Window *pParent, const SfxItemSet rCoreSet,
+bool bEnableSelector = false);
protected:
virtual voidPageCreated( sal_uInt16 nPageId, SfxTabPage rTabPage );
private:
-sal_BoolbEnableBackgroundSelector; /// for Border/Background
+bool m_bEnableBackgroundSelector; /// for Border/Background
+sal_uInt16 m_nBackgroundPageId;
};
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index fc70da2..da21280 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -41,7 +41,6 @@
// used in tabpages
#define RID_SVXDLG_LINE (RID_SVX_START + 50)
-#define RID_SVXDLG_BBDLG(RID_SVX_START + 40)
#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
#define RID_SVXSTRARY_PAPERSIZE_DRAW(RID_SVX_START + 143)
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index dc99b22..30a487c 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -17,43 +17,27 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include tools/shl.hxx
-#include svx/dialogs.hrc
-#include cuires.hrc
-
#include bbdlg.hxx
#include border.hxx
#include backgrnd.hxx
-#include dialmgr.hxx
-
-// class SvxBorderBackgroundDlg --
-
-SvxBorderBackgroundDlg::SvxBorderBackgroundDlg( Window *pParent,
-const SfxItemSet rCoreSet,
-sal_Bool bEnableSelector ) :
-
-SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_BBDLG ), rCoreSet ),
-bEnableBackgroundSelector( bEnableSelector )
-{
-FreeResource();
-AddTabPage( RID_SVXPAGE_BORDER, SvxBorderTabPage::Create, 0 );
-AddTabPage( RID_SVXPAGE_BACKGROUND, SvxBackgroundTabPage::Create, 0 );
-}
-// ---
+SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent,
+const SfxItemSet rCoreSet, bool bEnableSelector)
-SvxBorderBackgroundDlg::~SvxBorderBackgroundDlg()
+: SfxTabDialog(pParent, BorderBackgroundDialog,
+cui/ui/borderbackgrounddialog.ui, rCoreSet)
+, m_bEnableBackgroundSelector(bEnableSelector)
+, m_nBackgroundPageId(0)
{
+AddTabPage(borders, SvxBorderTabPage::Create, 0 );
+m_nBackgroundPageId = AddTabPage(background,
SvxBackgroundTabPage::Create, 0 );
}
-// ---
-
void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage
rTabPage )
{
// Make it possible to switch between color/graphic:
-if ( bEnableBackgroundSelector (RID_SVXPAGE_BACKGROUND == nPageId)
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/sdrcelldlg.cxx| 58 +---
cui/source/dialogs/sdrcelldlg.src| 91 ---
cui/source/inc/cuires.hrc|4
cui/source/inc/sdrcelldlg.hxx|3
cui/uiconfig/ui/formatcellsdialog.ui | 161 +++
7 files changed, 188 insertions(+), 131 deletions(-)
New commits:
commit a6dab58bd3542ff7a64af3d4080c89d419dd0fce
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 26 15:51:42 2013 +
convert format cells dialog to .ui
Change-Id: I451d3e28cc87f82ffb73b4e4c86a134eb1fc117a
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 6da235f..15966db 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/multipat.src \
cui/source/dialogs/passwdomdlg.src \
cui/source/dialogs/scriptdlg.src \
-cui/source/dialogs/sdrcelldlg.src \
cui/source/dialogs/showcols.src \
cui/source/dialogs/srchxtra.src \
cui/source/dialogs/svuidlg.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 78eaa8c..4bfd0bd 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
+ cui/uiconfig/ui/formatcellsdialog \
cui/uiconfig/ui/hatchpage \
cui/uiconfig/ui/hyphenate \
cui/uiconfig/ui/insertfloatingframe \
diff --git a/cui/source/dialogs/sdrcelldlg.cxx
b/cui/source/dialogs/sdrcelldlg.cxx
index 2a2a982..79f9249 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -28,47 +28,37 @@
#include svx/dialogs.hrc
SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet*
pAttr, SdrModel* pModel )
-: SfxTabDialog( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
-, mrOutAttrs( *pAttr )
-, mpColorTab ( pModel-GetColorList() )
-, mpGradientList ( pModel-GetGradientList() )
-, mpHatchingList ( pModel-GetHatchList() )
-, mpBitmapList ( pModel-GetBitmapList() )
-
-{
-FreeResource();
-
-AddTabPage( RID_SVXPAGE_CHAR_NAME );
-AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
-AddTabPage( RID_SVXPAGE_BORDER );
-AddTabPage( RID_SVXPAGE_AREA );
-}
-
-SvxFormatCellsDialog::~SvxFormatCellsDialog()
+: SfxTabDialog(pParent, FormatCellsDialog,
cui/ui/formatcellsdialog.ui, pAttr)
+, mrOutAttrs(*pAttr)
+, mpColorTab(pModel-GetColorList())
+, mpGradientList(pModel-GetGradientList())
+, mpHatchingList(pModel-GetHatchList())
+, mpBitmapList(pModel-GetBitmapList())
+, m_nAreaPageId(0)
{
+AddTabPage(name, RID_SVXPAGE_CHAR_NAME);
+AddTabPage(effects, RID_SVXPAGE_CHAR_EFFECTS);
+AddTabPage(border, RID_SVXPAGE_BORDER );
+m_nAreaPageId = AddTabPage(area, RID_SVXPAGE_AREA);
}
void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage rPage )
{
-switch( nId )
+if (nId == m_nAreaPageId)
{
-case RID_SVXPAGE_AREA:
-( (SvxAreaTabPage) rPage ).SetColorList( mpColorTab );
-( (SvxAreaTabPage) rPage ).SetGradientList( mpGradientList );
-( (SvxAreaTabPage) rPage ).SetHatchingList( mpHatchingList );
-( (SvxAreaTabPage) rPage ).SetBitmapList( mpBitmapList );
-( (SvxAreaTabPage) rPage ).SetPageType( PT_AREA );
-( (SvxAreaTabPage) rPage ).SetDlgType( 1 );
-( (SvxAreaTabPage) rPage ).SetPos( 0 );
-( (SvxAreaTabPage) rPage ).Construct();
-( (SvxAreaTabPage) rPage ).ActivatePage( mrOutAttrs );
-
-break;
-
-default:
-SfxTabDialog::PageCreated( nId, rPage );
-break;
+SvxAreaTabPage rAreaPage = ((SvxAreaTabPage)rPage);
+rAreaPage.SetColorList( mpColorTab );
+rAreaPage.SetGradientList( mpGradientList );
+rAreaPage.SetHatchingList( mpHatchingList );
+rAreaPage.SetBitmapList( mpBitmapList );
+rAreaPage.SetPageType( PT_AREA );
+rAreaPage.SetDlgType( 1 );
+rAreaPage.SetPos( 0 );
+rAreaPage.Construct();
+rAreaPage.ActivatePage( mrOutAttrs );
}
+else
+SfxTabDialog::PageCreated( nId, rPage );
}
void SvxFormatCellsDialog::Apply()
diff --git a/cui/source/dialogs/sdrcelldlg.src
b/cui/source/dialogs/sdrcelldlg.src
deleted file mode 100644
index 387c799..000
--- a/cui/source/dialogs/sdrcelldlg.src
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/optasian.hxx | 34 +--
cui/source/options/optasian.cxx | 137 ++
cui/source/options/optasian.hrc | 42
cui/source/options/optasian.src | 141 --
cui/uiconfig/ui/optasianpage.ui | 381
7 files changed, 463 insertions(+), 274 deletions(-)
New commits:
commit 20b9f53e9681aa1a4e3a257a417aae0c4eb03f7d
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Sep 26 23:39:48 2013 +0200
Convert optasian page to .ui + adapt code.
Change-Id: Ia3ea3fcf38512431fb99191f230450f26c7b3e2f
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index e82b4e0..119a1d6 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/dbregister.src \
cui/source/options/doclinkdialog.src \
cui/source/options/internationaloptions.src \
-cui/source/options/optasian.src \
cui/source/options/optchart.src \
cui/source/options/optcolor.src \
cui/source/options/optdict.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 5d3538b..9868086 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optaccessibilitypage \
cui/uiconfig/ui/optadvancedpage \
cui/uiconfig/ui/optappearancepage \
+ cui/uiconfig/ui/optasianpage \
cui/uiconfig/ui/optbasicidepage \
cui/uiconfig/ui/optbrowserpage \
cui/uiconfig/ui/optctlpage \
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index db7b2b0..e68452a 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -29,26 +29,22 @@
struct SvxAsianLayoutPage_Impl;
class SvxAsianLayoutPage : public SfxTabPage
{
-FixedLineaKerningGB;
-RadioButton aCharKerningRB;
-RadioButton aCharPunctKerningRB;
+RadioButton* m_pCharKerningRB;
+RadioButton* m_pCharPunctKerningRB;
-FixedLineaCharDistGB;
-RadioButton aNoCompressionRB;
-RadioButton aPunctCompressionRB;
-RadioButton aPunctKanaCompressionRB;
+RadioButton* m_pNoCompressionRB;
+RadioButton* m_pPunctCompressionRB;
+RadioButton* m_pPunctKanaCompressionRB;
-FixedLineaStartEndGB;
+FixedText* m_pLanguageFT;
+SvxLanguageBox* m_pLanguageLB;
+CheckBox* m_pStandardCB;
-FixedText aLanguageFT;
-SvxLanguageBox aLanguageLB;
-CheckBoxaStandardCB;
-
-FixedText aStartFT;
-EditaStartED;
-FixedText aEndFT;
-EditaEndED;
-FixedText aHintFT;
+FixedText* m_pStartFT;
+Edit*m_pStartED;
+FixedText* m_pEndFT;
+Edit*m_pEndED;
+FixedText* m_pHintFT;
SvxAsianLayoutPage_Impl* pImpl;
@@ -62,8 +58,8 @@ public:
virtual ~SvxAsianLayoutPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet rAttrSet );
-static sal_uInt16* GetRanges();
-virtual sal_BoolFillItemSet( SfxItemSet rSet );
+static sal_uInt16* GetRanges();
+virtual sal_BoolFillItemSet( SfxItemSet rSet );
virtual voidReset( const SfxItemSet rSet );
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index a74b30a..2c86765 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -21,7 +21,6 @@
#include optasian.hxx
#include editeng/langitem.hxx
#include editeng/unolingu.hxx
-#include optasian.hrc
#include dialmgr.hxx
#include cuires.hrc
#include i18nlangtag/mslangid.hxx
@@ -64,7 +63,7 @@ typedef ::std::map LanguageType, SvxForbiddenChars_Impl*
SvxForbiddenCharacte
struct SvxAsianLayoutPage_Impl
{
SvxAsianConfig aConfig;
-SvxAsianLayoutPage_Impl() {}
+SvxAsianLayoutPage_Impl() {}
~SvxAsianLayoutPage_Impl();
@@ -123,34 +122,31 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet
rSet ) :
-SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
-aKerningGB( this, CUI_RES(GB_KERNING)),
-aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )),
-aCharPunctKerningRB(this, CUI_RES(RB_CHAR_PUNCT )),
-aCharDistGB(this, CUI_RES(GB_CHAR_DIST )),
-aNoCompressionRB( this, CUI_RES(RB_NO_COMP)),
-aPunctCompressionRB(this, CUI_RES(RB_PUNCT_COMP )),
- aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )),
-aStartEndGB(this, CUI_RES(GB_START_END )),
-aLanguageFT(this, CUI_RES(FT_LANGUAGE )),
-aLanguageLB(this,
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/factory/dlgfact.cxx |6 -
cui/source/inc/cuires.hrc|1
cui/source/inc/swpossizetabpage.hxx | 147
cui/source/inc/transfrm.hxx |6 -
cui/source/tabpages/swpossizetabpage.cxx |4
cui/source/tabpages/swpossizetabpage.hrc | 53 --
cui/source/tabpages/swpossizetabpage.hxx | 147
cui/source/tabpages/transfrm.cxx | 45 +++-
cui/source/tabpages/transfrm.hrc | 24
cui/source/tabpages/transfrm.src | 74 --
cui/uiconfig/ui/positionsizedialog.ui| 161 +++
include/svx/dialogs.hrc |2
14 files changed, 338 insertions(+), 334 deletions(-)
New commits:
commit 6abf5a706ff49c996dd3c608939481fa8eccd5f7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Mon Aug 19 22:06:31 2013 -0300
Convert position and size dialog to widget UI
Change-Id: I283667cd21fee7dd905c5353245317ed90102c96
Reviewed-on: https://gerrit.libreoffice.org/5524
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 2ba3b3a..af8e41d 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/page.src \
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
-cui/source/tabpages/transfrm.src \
))
# vim: set noet sw=4 ts=4:
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 9435977..a0d790c 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/positionsizedialog \
cui/uiconfig/ui/possizetabpage \
cui/uiconfig/ui/querychangelineenddialog \
cui/uiconfig/ui/querydeletechartcolordialog \
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e3436c4..ab7a4ba 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1386,14 +1386,14 @@ SfxAbstractTabDialog*
AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
case RID_SCH_TransformTabDLG_SVXPAGE_ANGLE :
{
pDlg = new SvxTransformTabDialog( pParent, pAttr,pSdrView,
bSizeTabPage ? SVX_OBJ_NOPROTECT : SVX_OBJ_NOPROTECT|SVX_OBJ_NORESIZE);
-pDlg-RemoveTabPage( RID_SVXPAGE_ANGLE );
-pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
+pDlg-RemoveTabPage( RID_SVXPAGE_ANGLE );
+pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
}
break;
case RID_SCH_TransformTabDLG_SVXPAGE_SLANT:
{
pDlg = new SvxTransformTabDialog( pParent, pAttr,pSdrView,
bSizeTabPage ? SVX_OBJ_NOPROTECT : SVX_OBJ_NOPROTECT|SVX_OBJ_NORESIZE);
-pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
+pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
}
break;
default:
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 1a54c25..abf3728 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -44,7 +44,6 @@
#define RID_SVX_FORMAT_CELLS_DLG( RID_SVX_START + 42 )
// used in tabpages
-#define RID_SVXDLG_TRANSFORM(RID_SVX_START + 45)
#define RID_SVXDLG_LINE (RID_SVX_START + 50)
#define RID_SVXDLG_BBDLG(RID_SVX_START + 40)
#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
diff --git a/cui/source/tabpages/swpossizetabpage.hxx
b/cui/source/inc/swpossizetabpage.hxx
similarity index 100%
rename from cui/source/tabpages/swpossizetabpage.hxx
rename to cui/source/inc/swpossizetabpage.hxx
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 5b3138a..ab5e9f2 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -46,10 +46,14 @@ const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
class SvxTransformTabDialog : public SfxTabDialog
{
+sal_uInt16 nPosSize;
+sal_uInt16 nSWPosSize;
+sal_uInt16 nRotation;
+sal_uInt16 nSlant;
private:
const SdrView* pView;
-sal_uInt16 nAnchorCtrls;
+sal_uInt16 nAnchorCtrls;
LinkaValidateLink;
virtual voidPageCreated( sal_uInt16 nId, SfxTabPage rPage );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index c7c1407..9fc7067 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/cuires.hrc|1
cui/source/inc/textanim.hxx |2
cui/source/tabpages/textanim.cxx | 23 ++
cui/source/tabpages/textanim.src | 89 --
cui/uiconfig/ui/textdialog.ui| 132 +++
7 files changed, 142 insertions(+), 107 deletions(-)
New commits:
commit e1283c873c8a535fd91a9d077970aab6cd1a98f3
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Sat Aug 17 21:23:17 2013 -0300
Convert text dialog to widget UI
Change-Id: Ifd1303db2b3da95d80baaace898fc3e93996fa76
Reviewed-on: https://gerrit.libreoffice.org/5486
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 8b1b8e3..2ba3b3a 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/page.src \
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
-cui/source/tabpages/textanim.src \
cui/source/tabpages/transfrm.src \
))
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 2d93b34..632a2d6 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/swpossizepage \
cui/uiconfig/ui/textattrtabpage \
cui/uiconfig/ui/textanimtabpage \
+ cui/uiconfig/ui/textdialog \
cui/uiconfig/ui/textflowpage \
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/transparencytabpage \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index d3f0779..c7ef478 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -44,7 +44,6 @@
#define RID_SVX_FORMAT_CELLS_DLG( RID_SVX_START + 42 )
// used in tabpages
-#define RID_SVXDLG_TEXT (RID_SVX_START + 183)
#define RID_SVXDLG_TRANSFORM(RID_SVX_START + 45)
#define RID_SVXDLG_LINE (RID_SVX_START + 50)
#define RID_SVXDLG_BBDLG(RID_SVX_START + 40)
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index e70f20b..df483f1 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -92,6 +92,8 @@ public:
\/
class SvxTextTabDialog : public SfxTabDialog
{
+sal_uInt16 m_nTextId;
+sal_uInt16 m_nTextAnimId;
private:
const SdrView* pView;
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 5334071..02edafe 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -45,13 +45,14 @@ static sal_uInt16 pRanges[] =
SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView ) :
-SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ),
+SfxTabDialog( pParent
+ ,TextDialog
+ ,cui/ui/textdialog.ui
+ , pAttr ),
pView ( pSdrView )
{
-FreeResource();
-
-AddTabPage( RID_SVXPAGE_TEXTATTR, SvxTextAttrPage::Create, 0);
-AddTabPage( RID_SVXPAGE_TEXTANIMATION, SvxTextAnimationPage::Create, 0);
+m_nTextId = AddTabPage( RID_SVXPAGE_TEXTATTR, SvxTextAttrPage::Create,
0);
+m_nTextAnimId = AddTabPage( RID_SVXPAGE_TEXTANIMATION,
SvxTextAnimationPage::Create, 0);
}
/*
@@ -62,21 +63,11 @@ SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage rPage )
{
-switch( nId )
-{
-case RID_SVXPAGE_TEXTATTR:
+if (nId == m_nTextId)
{
( (SvxTextAttrPage) rPage ).SetView( pView );
( (SvxTextAttrPage) rPage ).Construct();
}
-break;
-
-case RID_SVXPAGE_TEXTANIMATION:
-break;
-
-default:
-break;
-}
}
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
deleted file mode 100644
index 41ea9b7..000
--- a/cui/source/tabpages/textanim.src
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/cuitabline.hxx|5 +
cui/source/tabpages/tabline.cxx | 119 ++--
cui/source/tabpages/tabline.hrc | 29 ---
cui/source/tabpages/tabline.src | 72 -
cui/source/tabpages/tpline.cxx |1
cui/source/tabpages/tplnedef.cxx |1
cui/source/tabpages/tplneend.cxx |1
cui/uiconfig/ui/linedialog.ui| 161 +++
10 files changed, 226 insertions(+), 165 deletions(-)
New commits:
commit a9770af052e5c3d9de893ef84c608479c03f06a7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Mon Aug 5 13:39:17 2013 -0300
Convert line dialog to widget UI
Change-Id: Idbad94c9f2f946f4d2be9b0a88ac2fdbbbd71e2b
Reviewed-on: https://gerrit.libreoffice.org/5287
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 45818b9..b8ee0c0 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -77,7 +77,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
cui/source/tabpages/swpossizetabpage.src \
-cui/source/tabpages/tabline.src \
cui/source/tabpages/textanim.src \
cui/source/tabpages/textattr.src \
cui/source/tabpages/transfrm.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index b36425e..2c79f77 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
+ cui/uiconfig/ui/linedialog \
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
cui/uiconfig/ui/linestyletabpage \
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 0a03598..19f47b3 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -25,6 +25,11 @@
class SvxLineTabDialog : public SfxTabDialog
{
+sal_uInt16m_nLineTabPage;
+sal_uInt16m_nShadowTabPage;
+sal_uInt16m_nStyleTabPage;
+sal_uInt16m_nEndTabPage;
+
private:
SdrModel* pDrawModel;
const SdrObject*pObj;
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index f213077..fdc2cbe 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -25,7 +25,6 @@
#include svx/dialogs.hrc
#include cuires.hrc
-#include tabline.hrc
#include cuitabarea.hxx
#include cuitabline.hxx
@@ -44,7 +43,14 @@ SvxLineTabDialog::SvxLineTabDialog
sal_Bool bHasObj
) :
-SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ),
+SfxTabDialog( pParent
+ , LineDialog
+ , cui/ui/linedialog.ui
+ , pAttr ),
+m_nLineTabPage(0),
+m_nShadowTabPage(0),
+m_nStyleTabPage(0),
+m_nEndTabPage(0),
pDrawModel ( pModel ),
pObj( pSdrObj ),
rOutAttrs ( *pAttr ),
@@ -64,8 +70,6 @@ SvxLineTabDialog::SvxLineTabDialog
nPosLineEndLb( 0 ),
mbAreaTP( sal_False )
{
-FreeResource();
-
bool bLineOnly = false;
if( pObj pObj-GetObjInventor() == SdrInventor )
{
@@ -85,16 +89,16 @@ SvxLineTabDialog::SvxLineTabDialog
}
-AddTabPage( RID_SVXPAGE_LINE, SvxLineTabPage::Create, 0);
+m_nLineTabPage = AddTabPage( RID_SVXPAGE_LINE, SvxLineTabPage::Create,
0);
if( bLineOnly )
-AddTabPage( RID_SVXPAGE_SHADOW, SvxShadowTabPage::Create, 0 );
+m_nShadowTabPage = AddTabPage( RID_SVXPAGE_SHADOW,
SvxShadowTabPage::Create, 0 );
else
-RemoveTabPage( RID_SVXPAGE_SHADOW );
+RemoveTabPage( RID_SVXPAGE_SHADOW );
-AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0);
-AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0);
+m_nStyleTabPage = AddTabPage( RID_SVXPAGE_LINE_DEF,
SvxLineDefTabPage::Create, 0);
+m_nEndTabPage = AddTabPage( RID_SVXPAGE_LINEEND_DEF,
SvxLineEndDefTabPage::Create, 0);
-SetCurPageId( RID_SVXPAGE_LINE );
+SetCurPageId( RID_SVXPAGE_LINE );
CancelButton rBtnCancel = GetCancelButton();
rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) );
@@ -194,58 +198,53 @@ IMPL_LINK_NOARG_INLINE_END(SvxLineTabDialog,
CancelHdlImpl)
void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage rPage )
{
-switch( nId )
+if( nId == m_nLineTabPage)
{
-case RID_SVXPAGE_LINE:
-( (SvxLineTabPage) rPage ).SetColorList( pColorList );
-( (SvxLineTabPage) rPage ).SetDashList( pDashList );
-( (SvxLineTabPage) rPage ).SetLineEndList(
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuiimapdlg.hrc | 38 -
cui/source/dialogs/cuiimapdlg.src | 147
cui/source/dialogs/cuiimapwnd.cxx | 37 +
cui/source/inc/cuiimapwnd.hxx | 29 +---
cui/uiconfig/ui/cuiimapdlg.ui | 269 ++
7 files changed, 293 insertions(+), 229 deletions(-)
New commits:
commit 1e91ddc06159806620d93385c900cd3d98b14814
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Thu Aug 1 13:56:03 2013 +0300
Convert ImageMap Properties to Widget UI
Change-Id: I619b2dab67b22d75839b9968e7e784b5dd5268ad
Reviewed-on: https://gerrit.libreoffice.org/5226
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 3d1d8de..45818b9 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/customize/macropg.src \
cui/source/dialogs/colorpicker.src \
cui/source/dialogs/commonlingui.src \
-cui/source/dialogs/cuiimapdlg.src \
cui/source/dialogs/cuires.src \
cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index a3f8efd..1401bb8 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/comment \
+ cui/uiconfig/ui/cuiimapdlg \
cui/uiconfig/ui/formatnumberdialog \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
diff --git a/cui/source/dialogs/cuiimapdlg.hrc
b/cui/source/dialogs/cuiimapdlg.hrc
index 8d2fcf4..e69de29 100644
--- a/cui/source/dialogs/cuiimapdlg.hrc
+++ b/cui/source/dialogs/cuiimapdlg.hrc
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include cuires.hrc
-
-// ImapDlg-Dialoge
-
-#define FT_URLDESCRIPTION 1
-#define FT_URL1 2
-#define FT_TARGET 3
-#define FT_NAME 4
-#define FT_DESCRIPTION 5
-#define EDT_URLDESCRIPTION 1
-#define EDT_URL 2
-#define EDT_NAME3
-#define EDT_DESCRIPTION 4
-#define BTN_HELP1 1
-#define BTN_OK1 2
-#define BTN_CANCEL1 3
-#define FL_URL 1
-#define CBB_TARGETS 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuiimapdlg.src
b/cui/source/dialogs/cuiimapdlg.src
index 660077e..e69de29 100644
--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include helpid.hrc
-#include cuiimapdlg.hrc
-
-ModalDialog RID_SVXDLG_IMAPURL
-{
-HelpID = cui:ModalDialog:RID_SVXDLG_IMAPURL;
-SVLook = TRUE ;
-OutputSize = TRUE ;
-Closeable = TRUE ;
-Moveable = TRUE ;
-Size = MAP_APPFONT ( 214 , 188 ) ;
-Text [ en-US ] = Properties ;
-
-FixedText FT_URL1
-{
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/cuires.hrc|1
cui/source/inc/cuitabarea.hxx| 11 +-
cui/source/tabpages/tabarea.cxx | 87
cui/source/tabpages/tabarea.hrc | 69 -
cui/source/tabpages/tabarea.src | 90 -
cui/source/tabpages/tparea.cxx |1
cui/source/tabpages/tpbitmap.cxx |1
cui/source/tabpages/tpcolor.cxx |1
cui/source/tabpages/tpgradnt.cxx |1
cui/source/tabpages/tphatch.cxx |1
cui/source/tabpages/tpshadow.cxx |1
cui/uiconfig/ui/areadialog.ui| 200 +++
14 files changed, 255 insertions(+), 211 deletions(-)
New commits:
commit 4e0c83d43c2effbeda70313531363dc70a6febf7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Mon Jul 29 09:05:44 2013 -0300
Convert area dialog to widget UI
Conflicts:
cui/UIConfig_cui.mk
Change-Id: I6464d6af19aa84dee88e7e46cfa46f2ac1ab3660
Reviewed-on: https://gerrit.libreoffice.org/5165
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 9a49234..3d1d8de 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
cui/source/tabpages/swpossizetabpage.src \
-cui/source/tabpages/tabarea.src \
cui/source/tabpages/tabline.src \
cui/source/tabpages/textanim.src \
cui/source/tabpages/textattr.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index da49182..9ed5ec2 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acorreplacepage \
cui/uiconfig/ui/applyautofmtpage \
+ cui/uiconfig/ui/areadialog \
cui/uiconfig/ui/areatabpage \
cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index f0c9c4d..2ac707c 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -49,7 +49,6 @@
#define RID_SVXDLG_LINE (RID_SVX_START + 50)
#define RID_SVXDLG_BBDLG(RID_SVX_START + 40)
#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
-#define RID_SVXDLG_AREA (RID_SVX_START + 55)
#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
#define RID_SVXSTRARY_PAPERSIZE_DRAW(RID_SVX_START + 143)
#define RID_SVXSTR_TABLE_PRESET_NONE(RID_SVX_START + 969)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 44a05d9..313c6b7 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -36,6 +36,14 @@ class SdrView;
class SvxAreaTabDialog : public SfxTabDialog
{
+sal_uInt16m_nAreaTabPage;
+sal_uInt16m_nShadowTabPage;
+sal_uInt16m_nTransparenceTabPage;
+sal_uInt16m_nColorTabPage;
+sal_uInt16m_nGradientTabPage;
+sal_uInt16m_nHatchTabPage;
+sal_uInt16m_nBitmapTabPage;
+
private:
SdrModel* mpDrawModel;
@@ -69,7 +77,8 @@ protected:
public:
SvxAreaTabDialog( Window* pParent,
- const SfxItemSet* pAttr, SdrModel* pModel,
+ const SfxItemSet* pAttr,
+ SdrModel* pModel,
const SdrView* pSdrView = NULL );
~SvxAreaTabDialog();
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index a5b6772..007257b 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -32,7 +32,6 @@
#include svx/svdmodel.hxx
#include svx/drawitem.hxx
#include cuitabarea.hxx
-#include tabarea.hrc
#include dlgname.hxx
#include dialmgr.hxx
@@ -42,13 +41,22 @@ SvxAreaTabDialog::SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrView* /* pSdrView */
-) :
-
-SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ),
-
-mpDrawModel ( pModel ),
-mpColorList ( pModel-GetColorList() ),
-mpNewColorList( pModel-GetColorList() ),
+)
+: SfxTabDialog( pParent,
+ AreaDialog,
+ cui/ui/areadialog.ui,
+ pAttr )
+, m_nAreaTabPage(0)
+, m_nShadowTabPage(0)
+, m_nTransparenceTabPage(0)
+, m_nColorTabPage(0)
+, m_nGradientTabPage(0)
+, m_nHatchTabPage(0)
+, m_nBitmapTabPage(0)
+
+, mpDrawModel ( pModel ),
+mpColorList ( pModel-GetColorList() ),
+mpNewColorList ( pModel-GetColorList() ),
mpGradientList
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/helpid.hrc |1
cui/source/options/optjsearch.cxx | 275 -
cui/source/options/optjsearch.hrc | 43 ---
cui/source/options/optjsearch.hxx | 41 +--
cui/source/options/optjsearch.src | 181
cui/uiconfig/ui/optjsearchpage.ui | 418 ++
8 files changed, 575 insertions(+), 386 deletions(-)
New commits:
commit 1543e30a33832e882b973f0ae8722e6c88a46963
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Thu Jun 6 17:04:41 2013 +0200
Convert Search in Japanese page to .ui format
Change-Id: I1874f36d3e69b39fcb456de85b28c7a09f7bdbf2
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 518444f..163ce00 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/opthtml.src \
cui/source/options/optinet2.src \
cui/source/options/optjava.src \
-cui/source/options/optjsearch.src \
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/optsave.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8cb1c66..4bd60b4 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
+ cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
cui/uiconfig/ui/optonlineupdatepage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index bbae785..1fc1141 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -38,7 +38,6 @@
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
#define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
#define HID_OPTIONS_JAVA_CLASSPATH CUI_HID_OPTIONS_JAVA_CLASSPATH
-#define HID_SVXPAGE_JSEARCH_OPTIONS CUI_HID_SVXPAGE_JSEARCH_OPTIONS
#define HID_SVXDLG_FILTER_WARNING CUI_HID_SVXDLG_FILTER_WARNING
#define HID_OFADLG_OPTIONS_TREE CUI_HID_OFADLG_OPTIONS_TREE
#define HID_OFA_CONNPOOL_DRIVERLIST CUI_HID_OFA_CONNPOOL_DRIVERLIST
diff --git a/cui/source/options/optjsearch.cxx
b/cui/source/options/optjsearch.cxx
index 86770d5..fa183e7 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -23,38 +23,35 @@
#include cuires.hrc
#include dialmgr.hxx
#include optjsearch.hxx
-#include optjsearch.hrc
using namespace com::sun::star::i18n;
//
SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const
SfxItemSet rSet ) :
-SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
-
-aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
-aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ),
-aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
-aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA )
),
-aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
-aMatchMinusDashChoon( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
-aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS )
),
-aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI )
),
-aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
-aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
-aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
-aMatchTsithichiDhizi( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
-aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
-aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
-aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ),
-aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ),
-aMatchProlongedSoundMark( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK
) ),
-aIgnore ( this, CUI_RES( FL_IGNORE ) ),
-aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
-aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
-aIgnoreMiddleDot( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
+SfxTabPage( pParent, OptJSearchPage, cui/ui/optjsearchpage.ui, rSet )
{
-FreeResource();
+get( m_pMatchCase, matchcase);
+get( m_pMatchFullHalfWidth, matchfullhalfwidth);
+get( m_pMatchHiraganaKatakana, matchhiraganakatakana);
+get( m_pMatchContractions, matchcontractions);
+get( m_pMatchMinusDashChoon, matchminusdashchoon);
+get( m_pMatchRepeatCharMarks,
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/options/optctl.cxx | 98 ++
cui/source/options/optctl.hrc | 51 ---
cui/source/options/optctl.hxx | 22 +--
cui/source/options/optctl.src | 116
cui/uiconfig/ui/optctlpage.ui | 290 ++
7 files changed, 346 insertions(+), 233 deletions(-)
New commits:
commit 3d4d89cf5a181aa306dfadc8cfb9a2cf8e59bfcd
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Wed May 29 19:35:24 2013 +0200
Convert option Complex text layout to .ui
convert the complex text layout widget and do the rest
of the conversion.
Change-Id: I8d928284e9532dfbc2f5e8d7d59f789de7865925
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index abc25df..6cd18c5 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optasian.src \
cui/source/options/optchart.src \
cui/source/options/optcolor.src \
-cui/source/options/optctl.src \
cui/source/options/optdict.src \
cui/source/options/optfltr.src \
cui/source/options/optgdlg.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index c065510..c61d486 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optadvancedpage \
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optbrowserpage \
+ cui/uiconfig/ui/optctlpage \
cui/uiconfig/ui/optemailpage \
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 1a62bb7..2ad83c5 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -19,7 +19,6 @@
#include optctl.hxx
#include dialmgr.hxx
-#include optctl.hrc
#include cuires.hrc
#include svl/ctloptions.hxx
@@ -27,40 +26,35 @@
IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
{
-sal_Bool bIsSequenceChecking = m_aSequenceCheckingCB.IsChecked();
-m_aRestrictedCB.Enable( bIsSequenceChecking );
-m_aTypeReplaceCB.Enable( bIsSequenceChecking );
+sal_Bool bIsSequenceChecking = m_pSequenceCheckingCB-IsChecked();
+m_pRestrictedCB-Enable( bIsSequenceChecking );
+m_pTypeReplaceCB-Enable( bIsSequenceChecking );
// #i48117#: by default restricted and typereplace have to be switched on
if(bIsSequenceChecking)
{
-m_aTypeReplaceCB.Check( sal_True );
-m_aRestrictedCB.Check( sal_True );
+m_pTypeReplaceCB-Check( sal_True );
+m_pRestrictedCB-Check( sal_True );
}
return 0;
}
SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet rSet
) :
-SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
-
-m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ),
-m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ),
-m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ),
-m_aTypeReplaceCB( this, CUI_RES( CB_TYPE_REPLACE ) ),
-m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ),
-m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ),
-m_aMovementLogicalRB( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ),
-m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ),
-m_aGeneralFL( this, CUI_RES( FL_GENERAL ) ),
-m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ),
-m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) )
+SfxTabPage( pParent, OptCTLPage, cui/ui/optctlpage.ui, rSet )
{
-FreeResource();
+get( m_pSequenceCheckingCB, sequencechecking);
+get( m_pRestrictedCB, restricted);
+get( m_pTypeReplaceCB, typeandreplace);
+
+get( m_pMovementLogicalRB, movementlogical);
+get( m_pMovementVisualRB, movementvisual);
+
+get( m_pNumeralsLB, numerals);
-m_aSequenceCheckingCB.SetClickHdl( LINK( this, SvxCTLOptionsPage,
SequenceCheckingCB_Hdl ) );
+m_pSequenceCheckingCB-SetClickHdl( LINK( this, SvxCTLOptionsPage,
SequenceCheckingCB_Hdl ) );
-m_aNumeralsLB.SetDropDownLineCount( m_aNumeralsLB.GetEntryCount() );
+m_pNumeralsLB-SetDropDownLineCount( m_pNumeralsLB-GetEntryCount() );
}
//
-
SvxCTLOptionsPage::~SvxCTLOptionsPage()
@@ -78,30 +72,30 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet )
SvtCTLOptions aCTLOptions;
// Sequence checking
-sal_Bool bChecked = m_aSequenceCheckingCB.IsChecked();
-if ( bChecked != m_aSequenceCheckingCB.GetSavedValue() )
+sal_Bool bChecked = m_pSequenceCheckingCB-IsChecked();
+if ( bChecked != m_pSequenceCheckingCB-GetSavedValue() )
{
aCTLOptions.SetCTLSequenceChecking( bChecked );
