From f6e4f736a63512f8dd9aff517fb12b05fb98f55e Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 22 Jan 2010 13:32:32 +0100 Subject: vcl109: #i108553# add forgotten export statement --- cui/source/factory/init.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cui') diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index de01a2deb1b3..6655ee834a06 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -39,7 +39,7 @@ // caution: needs C-Linkage since dynamically loaded via symbol name extern "C" { -bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, String& o_rResult) +SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, String& o_rResult) { bool bRet = false; SvxCharacterMap* aDlg = new SvxCharacterMap( i_pParent ); -- cgit From 515edd55e546f810455f469e9725fb22e3ed8367 Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Thu, 18 Feb 2010 16:15:58 +0100 Subject: mtaccfixes: #100833# FixedLine needs to be in correct z-order --- cui/source/inc/optpath.hxx | 2 +- cui/source/options/optpath.cxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'cui') diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index c05b0b778c58..1255f0f70676 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -71,12 +71,12 @@ class SvxPathTabPage; class SvxPathTabPage : public SfxTabPage { private: + FixedLine aStdBox; FixedText aTypeText; FixedText aPathText; SvxControlFocusHelper aPathCtrl; PushButton aStandardBtn; PushButton aPathBtn; - FixedLine aStdBox; HeaderBar* pHeaderBar; ::svx::OptHeaderTabListBox* pPathBox; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 8e004b54b018..7dc3ba68b68d 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -220,13 +220,12 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ), + aStdBox ( this, CUI_RES( GB_STD ) ), aTypeText ( this, CUI_RES( FT_TYPE ) ), aPathText ( this, CUI_RES( FT_PATH ) ), aPathCtrl ( this, CUI_RES( LB_PATH ) ), aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ), aPathBtn ( this, CUI_RES( BTN_PATH ) ), - aStdBox ( this, CUI_RES( GB_STD ) ), - pHeaderBar ( NULL ), pPathBox ( NULL ), pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ), -- cgit From e412e3ad219c36d151cfa4304380e38dda7438d3 Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Fri, 19 Feb 2010 13:02:37 +0100 Subject: mtaccfixes: #100833# FixedLine needs to be in correct z-order --- cui/source/inc/cuioptgenrl.hxx | 3 +-- cui/source/inc/dbregister.hxx | 3 +-- cui/source/options/dbregister.cxx | 2 +- cui/source/options/optgenrl.cxx | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'cui') diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 19d21ba5c255..0c28bf90c8fc 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -70,6 +70,7 @@ class SvxGeneralTabPage : public SfxTabPage { using TabPage::DeactivatePage; private: + FixedLine aAddrFrm; FixedText aCompanyLbl; SvxUserEdit aCompanyEdit; FixedText aNameLbl; @@ -100,12 +101,10 @@ private: FixedText aFaxMailLbl; SvxUserEdit aFaxEdit; SvxUserEdit aEmailEdit; - FixedLine aAddrFrm; CheckBox aUseDataCB; GeneralTabPage_Impl* pImpl; - #ifdef _SVX_OPTGENRL_CXX DECL_LINK( ModifyHdl_Impl, Edit * ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 84bc2fa4054c..311c2ce6e111 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -54,13 +54,13 @@ namespace svx class DbRegistrationOptionsPage : public SfxTabPage { private: + FixedLine aStdBox; FixedText aTypeText; FixedText aPathText; SvxControlFocusHelper aPathCtrl; PushButton m_aNew; PushButton m_aEdit; PushButton m_aDelete; - FixedLine aStdBox; HeaderBar* pHeaderBar; ::svx::OptHeaderTabListBox* pPathBox; @@ -68,7 +68,6 @@ namespace svx ULONG m_nOldCount; BOOL m_bModified; - #ifdef SVX_DBREGISTER_HXX DECL_LINK( NewHdl, void * ); DECL_LINK( EditHdl, void * ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 91635d80f5f1..37861d52e623 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -121,13 +121,13 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ), + aStdBox ( this, CUI_RES( GB_STD ) ), aTypeText ( this, CUI_RES( FT_TYPE ) ), aPathText ( this, CUI_RES( FT_PATH ) ), aPathCtrl ( this, CUI_RES( LB_PATH ) ), m_aNew ( this, CUI_RES( BTN_NEW ) ), m_aEdit ( this, CUI_RES( BTN_EDIT ) ), m_aDelete ( this, CUI_RES( BTN_DELETE ) ), - aStdBox ( this, CUI_RES( GB_STD ) ), pHeaderBar ( NULL ), pPathBox ( NULL ), m_pCurEntry ( NULL ), diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 85c0d450cc47..567c37b8bbe4 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -96,6 +96,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ), + aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), aCompanyLbl ( this, CUI_RES( FT_COMPANY ), true ), aCompanyEdit ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ), aNameLbl ( this, CUI_RES( FT_NAME ), true ), @@ -126,9 +127,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe aFaxMailLbl ( this, CUI_RES( FT_FAXMAIL ), true ), aFaxEdit ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ), aEmailEdit ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ), - aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), aUseDataCB ( this, CUI_RES( CB_USEDATA ) ), - pImpl ( new GeneralTabPage_Impl ) { -- cgit From 27bb69577e35656e3ad2cf602bee266b0354aaad Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 29 Jan 2010 17:01:54 +0100 Subject: sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates --- cui/util/cui.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cui') diff --git a/cui/util/cui.map b/cui/util/cui.map index b43a11bd5096..06074d301dc3 100644 --- a/cui/util/cui.map +++ b/cui/util/cui.map @@ -1,4 +1,4 @@ -CUI_1_0 { +UDK_3_0_0 { global: CreateDialogFactory; GetSpecialCharsForEdit; -- cgit