cws tl80: merge with DEV300 m77

11 files changed, 11 insertions, 15 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ec2429ec654c..d9f730e0224f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1964,7 +1964,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
         }
 
         if ( !_inout_rxFrame.is() && SfxViewFrame::Current() )
-            _inout_rxFrame = SfxViewFrame::Current()->GetFrame()->GetFrameInterface();
+            _inout_rxFrame = SfxViewFrame::Current()->GetFrame().GetFrameInterface();
 
         if ( !_inout_rxFrame.is() )
         {
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index bb59ac425e91..5ea43e165883 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -310,7 +310,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG )
     }
 
 
-/*  uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame()->GetFrameInterface(), uno::UNO_QUERY );
+/*  uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
     if ( xProv.is() )
     {
 !!! (pb) we need a new config item here
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 879eeab2c40f..f9e2c3814552 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -62,7 +62,7 @@ SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId,
 {
     TargetList* pList = new TargetList;
     SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
-    SfxFrame* pFrame = pViewFrame ? pViewFrame->GetTopFrame() : 0;
+    SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0;
     if ( pFrame )
     {
         pFrame->GetTargetList(*pList);
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index bfafd3bfd2bd..19df0ac00e7b 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -36,7 +36,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 );
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 78d3789efcfa..e978edbdc1af 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -67,6 +67,7 @@ class SvxGeneralTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
 private:
+    FixedLine           aAddrFrm;
     FixedText           aCompanyLbl;
     SvxUserEdit         aCompanyEdit;
     FixedText           aNameLbl;
@@ -97,12 +98,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 3be184ffd146..a2ef9da67553 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -51,13 +51,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;
@@ -65,7 +65,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/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 5aee41b17996..2ac80aa64094 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -68,12 +68,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/dbregister.cxx b/cui/source/options/dbregister.cxx
index 763600205df3..c617a3e4c515 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -118,13 +118,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 f44660c85874..e42b825e9868 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -94,6 +94,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 ),
@@ -124,9 +125,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 )
 
 {
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 63cd5f1a8ea9..f3d31aa33025 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -217,13 +217,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) ) ),
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;