RID_SVXDLG_NEWHYPERLINK conversion to .ui

Conflicts: cui/UIConfig_cui.mk Change-Id: I8f06518f2d84e333b553c247ca3d9a28d1280eea
author: Szymon Kłos <eszkadev@gmail.com> 2014-06-22 12:24:33 +0200
committer: Caolán McNamara <caolanm@redhat.com> 2014-06-24 10:05:21 +0100
commit: 360796b491d9e05f1438e97c88f15ad0f1cda281 (patch)
tree: a082d6aaedb3e99d70c0a74a31c973ce50f62088 /cui/source/dialogs
parent: 95e6cc2ecbcb653f76c4a1ee109908a12b84e456 (diff)
9 files changed, 359 insertions, 1163 deletions
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 45ec57a2c13f..97f548566ab3 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -24,7 +24,6 @@
 #include "hlmailtp.hxx"
 #include "hldoctp.hxx"
 #include "hldocntp.hxx"
-#include "hyperdlg.hrc"
 #include <svx/svxids.hrc>
 
 using ::com::sun::star::uno::Reference;
@@ -83,7 +82,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
 |************************************************************************/
 
 SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
-:   IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
+:   IconChoiceDialog( pParent, "HyperlinkDialog", "cui/ui/hyperlinkdialog.ui" ),
     maCtrl          ( SID_HYPERLINK_GETLINK, *pBindings, this ),
     mpBindings      ( pBindings ),
     mbReadOnly      ( false ),
@@ -112,6 +111,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, SvxHyperlinkNewDocTp::Create );
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+    SetCurPageId(RID_SVXPAGE_HYPERLINK_INTERNET);
 
     // create itemset for tabpages
     mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
@@ -301,14 +301,18 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
 
     mbIsHTMLDoc = (pItem->GetInsertMode() & HLINK_HTMLMODE) ? true : false;
 
-    SfxItemSet& aPageSet =  (SfxItemSet&)GetTabPage (nPageId)->GetItemSet ();
-    aPageSet.Put ( *pItem );
-
-    pCurrentPage->Reset( aPageSet );
-    if ( mbGrabFocus )
+    IconChoicePage* pPage = GetTabPage (nPageId);
+    if(pPage)
     {
-        pCurrentPage->SetInitFocus();   // #92535# grab the focus only once at initialization
-        mbGrabFocus = false;
+        SfxItemSet& aPageSet =  (SfxItemSet&)pPage->GetItemSet ();
+        aPageSet.Put ( *pItem );
+
+        pCurrentPage->Reset( aPageSet );
+        if ( mbGrabFocus )
+        {
+            pCurrentPage->SetInitFocus();   // #92535# grab the focus only once at initialization
+            mbGrabFocus = false;
+        }
     }
     return nPageId;
 }
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index c04c81c1ba55..39bc47b4cd10 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -33,7 +33,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/ucbhelper.hxx>
 
-#include "hyperdlg.hrc"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
@@ -84,9 +83,9 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri
         }
         if ( bIsValidURL )
         {
-            sal_Int32 nPos = maLbDocTypes.GetSelectEntryPos();
+            sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-                aURLObject.SetExtension( ((DocumentTypeData*)maLbDocTypes.GetEntryData( nPos ))->aStrExt );
+                aURLObject.SetExtension( ((DocumentTypeData*)m_pLbDocTypes->GetEntryData( nPos ))->aStrExt );
         }
 
     }
@@ -99,47 +98,41 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri
 |*
 |************************************************************************/
 
-SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
-    maGrpNewDoc     ( this, CUI_RES (GRP_NEWDOCUMENT) ),
-    maRbtEditNow    ( this, CUI_RES (RB_EDITNOW) ),
-    maRbtEditLater  ( this, CUI_RES (RB_EDITLATER) ),
-    maFtPath        ( this, CUI_RES (FT_PATH_NEWDOC) ),
-    maCbbPath       ( this, INET_PROT_FILE ),
-    maBtCreate      ( this, CUI_RES (BTN_CREATE) ),
-    maFtDocTypes    ( this, CUI_RES (FT_DOCUMENT_TYPES) ),
-    maLbDocTypes    ( this, CUI_RES (LB_DOCUMENT_TYPES) )
+SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
+:   SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkNewDocPage", "cui/ui/hyperlinknewdocpage.ui", rItemSet )
 {
+    get(m_pRbtEditNow, "editnow");
+    get(m_pRbtEditLater, "editlater");
+    get(m_pCbbPath, "path");
+    m_pCbbPath->SetSmartProtocol(INET_PROT_FILE);
+    get(m_pBtCreate, "create");
+    m_pBtCreate->SetModeImage(Image(CUI_RES(RID_SVXBMP_NEWDOC)));
+    get(m_pLbDocTypes, "types");
+
     // Set HC bitmaps and disable display of bitmap names.
-    maBtCreate.EnableTextDisplay (false);
+    m_pBtCreate->EnableTextDisplay (false);
 
     InitStdControls();
-    FreeResource();
 
     SetExchangeSupport ();
 
-    maCbbPath.SetPosSizePixel ( LogicToPixel( Point( COL_2 , 25 ), MAP_APPFONT ),
-                                LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) );
-    maCbbPath.Show();
-    maCbbPath.SetBaseURL(SvtPathOptions().GetWorkPath());
+    m_pCbbPath->Show();
+    m_pCbbPath->SetBaseURL(SvtPathOptions().GetWorkPath());
 
     // set defaults
-    maRbtEditNow.Check();
-
-    maBtCreate.SetClickHdl        ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) );
+    m_pRbtEditNow->Check();
 
-    maBtCreate.SetAccessibleRelationMemberOf( &maGrpNewDoc );
-    maBtCreate.SetAccessibleRelationLabeledBy( &maFtPath );
+    m_pBtCreate->SetClickHdl        ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) );
 
     FillDocumentList ();
 }
 
 SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp ()
 {
-    for ( sal_uInt16 n=0; n<maLbDocTypes.GetEntryCount(); n++ )
+    for ( sal_uInt16 n=0; n<m_pLbDocTypes->GetEntryCount(); n++ )
     {
         DocumentTypeData* pTypeData = (DocumentTypeData*)
-                                      maLbDocTypes.GetEntryData ( n );
+                                      m_pLbDocTypes->GetEntryData ( n );
         delete pTypeData;
     }
 }
@@ -200,14 +193,14 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
                 OUString aTitleName( aTitle );
                 aTitleName = aTitleName.replaceFirst( "~", "" );
 
-                sal_Int16 nPos = maLbDocTypes.InsertEntry ( aTitleName );
+                sal_Int16 nPos = m_pLbDocTypes->InsertEntry ( aTitleName );
                 OUString aStrDefExt( pFilter->GetDefaultExtension () );
                 DocumentTypeData *pTypeData = new DocumentTypeData ( aDocumentUrl, aStrDefExt.copy( 2 ) );
-                maLbDocTypes.SetEntryData ( nPos, pTypeData );
+                m_pLbDocTypes->SetEntryData ( nPos, pTypeData );
             }
         }
     }
-    maLbDocTypes.SelectEntryPos ( 0 );
+    m_pLbDocTypes->SelectEntryPos ( 0 );
 
     LeaveWait();
 }
@@ -223,9 +216,9 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr
                                                SvxLinkInsertMode& eMode )
 {
     // get data from dialog-controls
-    rStrURL = maCbbPath.GetText();
+    rStrURL = m_pCbbPath->GetText();
     INetURLObject aURL;
-    if ( ImplGetURLObject( rStrURL, maCbbPath.GetBaseURL(), aURL ) )
+    if ( ImplGetURLObject( rStrURL, m_pCbbPath->GetBaseURL(), aURL ) )
     {
         rStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
     }
@@ -239,9 +232,9 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr
 |*
 |************************************************************************/
 
-IconChoicePage* SvxHyperlinkNewDocTp::Create( Window* pWindow, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkNewDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
 {
-    return( new SvxHyperlinkNewDocTp( pWindow, rItemSet ) );
+    return( new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ) );
 }
 
 /*************************************************************************
@@ -252,7 +245,7 @@ IconChoicePage* SvxHyperlinkNewDocTp::Create( Window* pWindow, const SfxItemSet&
 
 void SvxHyperlinkNewDocTp::SetInitFocus()
 {
-    maCbbPath.GrabFocus();
+    m_pCbbPath->GrabFocus();
 }
 
 /*************************************************************************
@@ -264,7 +257,7 @@ void SvxHyperlinkNewDocTp::SetInitFocus()
 bool SvxHyperlinkNewDocTp::AskApply()
 {
     INetURLObject aINetURLObject;
-    bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject );
+    bool bRet = ImplGetURLObject( m_pCbbPath->GetText(), m_pCbbPath->GetBaseURL(), aINetURLObject );
     if ( !bRet )
     {
         WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
@@ -284,7 +277,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
     EnterWait();
 
     // get data from dialog-controls
-    OUString aStrNewName = maCbbPath.GetText();
+    OUString aStrNewName = m_pCbbPath->GetText();
 
     if ( aStrNewName == aEmptyStr )
         aStrNewName = maStrInitURL;
@@ -293,7 +286,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
     // create a real URL-String
 
     INetURLObject aURL;
-    if ( ImplGetURLObject( aStrNewName, maCbbPath.GetBaseURL(), aURL ) )
+    if ( ImplGetURLObject( aStrNewName, m_pCbbPath->GetBaseURL(), aURL ) )
     {
 
 
@@ -330,11 +323,11 @@ void SvxHyperlinkNewDocTp::DoApply ()
                 if ( aStrNewName != aEmptyStr )
                 {
                     // get private-url
-                    sal_Int32 nPos = maLbDocTypes.GetSelectEntryPos();
+                    sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos();
                     if( nPos == LISTBOX_ENTRY_NOTFOUND )
                         nPos=0;
                     OUString aStrDocName ( ( ( DocumentTypeData* )
-                                         maLbDocTypes.GetEntryData( nPos ) )->aStrURL );
+                                         m_pLbDocTypes->GetEntryData( nPos ) )->aStrURL );
 
                     // create items
                     SfxStringItem aName( SID_FILE_NAME, aStrDocName );
@@ -342,7 +335,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
                     SfxStringItem aFrame( SID_TARGETNAME, OUString("_blank") );
 
                     OUString aStrFlags('S');
-                    if ( maRbtEditLater.IsChecked() )
+                    if ( m_pRbtEditLater->IsChecked() )
                     {
                         aStrFlags += OUString('H');
                     }
@@ -371,7 +364,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
                     }
                 }
 
-                if ( maRbtEditNow.IsChecked() && pCurrentDocFrame )
+                if ( m_pRbtEditNow->IsChecked() && pCurrentDocFrame )
                 {
                     pCurrentDocFrame->ToTop();
                 }
@@ -381,7 +374,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
         {
         }
 
-        if ( pViewFrame && maRbtEditLater.IsChecked() )
+        if ( pViewFrame && m_pRbtEditLater->IsChecked() )
         {
             SfxObjectShell* pObjShell = pViewFrame->GetObjectShell();
             pObjShell->DoClose();
@@ -403,8 +396,8 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
     uno::Reference < XFolderPicker2 >  xFolderPicker = FolderPicker::create(xContext);
 
     OUString            aStrURL;
-    OUString            aTempStrURL( maCbbPath.GetText() );
-    utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL );
+    OUString            aTempStrURL( m_pCbbPath->GetText() );
+    utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, m_pCbbPath->GetBaseURL(), aStrURL );
 
     OUString            aStrPath = aStrURL;
     bool            bZeroPath = aStrPath.isEmpty();
@@ -429,7 +422,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
         if( bHandleFileName )
             aStrName = bZeroPath? aTempStrURL : OUString(aURL.getName());
 
-        maCbbPath.SetBaseURL( xFolderPicker->getDirectory() );
+        m_pCbbPath->SetBaseURL( xFolderPicker->getDirectory() );
         OUString          aStrTmp( xFolderPicker->getDirectory() );
 
         if( aStrTmp[ aStrTmp.getLength() - 1 ] != sSlash[0] )
@@ -442,11 +435,11 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
         INetURLObject   aNewURL( aStrTmp );
 
         if( !aStrName.isEmpty() && !aNewURL.getExtension().isEmpty() &&
-            maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+            m_pLbDocTypes->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
         {
             // get private-url
-            sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos();
-            aNewURL.setExtension( ( ( DocumentTypeData* ) maLbDocTypes.GetEntryData( nPos ) )->aStrExt );
+            sal_uInt16 nPos = m_pLbDocTypes->GetSelectEntryPos();
+            aNewURL.setExtension( ( ( DocumentTypeData* ) m_pLbDocTypes->GetEntryData( nPos ) )->aStrExt );
         }
 
         if( aNewURL.GetProtocol() == INET_PROT_FILE )
@@ -458,7 +451,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
             aStrTmp = aNewURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
         }
 
-        maCbbPath.SetText ( aStrTmp );
+        m_pCbbPath->SetText ( aStrTmp );
     }
     return( 0L );
 }
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index f6682485f1bb..2a8308168d96 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -23,7 +23,6 @@
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #include "hldoctp.hxx"
-#include "hyperdlg.hrc"
 #include "hlmarkwn_def.hxx"
 
 sal_Char const sHash[]          = "#";
@@ -35,49 +34,40 @@ sal_Char const sFileScheme[]    = INET_FILE_SCHEME;
 |*
 |************************************************************************/
 
-SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet)
-    : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ),
-    maGrpDocument   ( this, CUI_RES (GRP_DOCUMENT) ),
-    maFtPath        ( this, CUI_RES (FT_PATH_DOC) ),
-    maCbbPath       ( this, INET_PROT_FILE ),
-    maBtFileopen    ( this, CUI_RES (BTN_FILEOPEN) ),
-    maGrpTarget     ( this, CUI_RES (GRP_TARGET) ),
-    maFtTarget      ( this, CUI_RES (FT_TARGET_DOC) ),
-    maEdTarget      ( this, CUI_RES (ED_TARGET_DOC) ),
-    maFtURL         ( this, CUI_RES (FT_URL) ),
-    maFtFullURL     ( this, CUI_RES (FT_FULL_URL) ),
-    maBtBrowse      ( this, CUI_RES (BTN_BROWSE) ),
+SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
+    : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkDocPage", "cui/ui/hyperlinkdocpage.ui", rItemSet ),
     mbMarkWndOpen   ( false )
 {
+    get(m_pCbbPath, "path");
+    m_pCbbPath->SetSmartProtocol(INET_PROT_FILE);
+    get(m_pBtFileopen, "fileopen");
+    m_pBtFileopen->SetModeImage(Image(CUI_RES(RID_SVXBMP_FILEOPEN)));
+    get(m_pEdTarget, "target");
+    get(m_pFtFullURL, "url");
+    get(m_pBtBrowse, "browse");
+    m_pBtBrowse->SetModeImage(Image(CUI_RES(RID_SVXBMP_TARGET)));
+
     // Disable display of bitmap names.
-    maBtBrowse.EnableTextDisplay (false);
-    maBtFileopen.EnableTextDisplay (false);
+    m_pBtBrowse->EnableTextDisplay (false);
+    m_pBtFileopen->EnableTextDisplay (false);
 
     InitStdControls();
-    FreeResource();
 
-    // Init URL-Box (pos&size, Open-Handler)
-    maCbbPath.SetPosSizePixel ( LogicToPixel( Point( COL_2, 15 ), MAP_APPFONT ),
-                                LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) );
-    maCbbPath.Show();
+    m_pCbbPath->Show();
     OUString aFileScheme( INET_FILE_SCHEME );
-    maCbbPath.SetBaseURL(aFileScheme);
-    maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH );
+    m_pCbbPath->SetBaseURL(aFileScheme);
+    m_pCbbPath->SetHelpId( HID_HYPERDLG_DOC_PATH );
 
     SetExchangeSupport ();
 
     // overload handlers
-    maBtFileopen.SetClickHdl ( LINK ( this, SvxHyperlinkDocTp, ClickFileopenHdl_Impl ) );
-    maBtBrowse.SetClickHdl   ( LINK ( this, SvxHyperlinkDocTp, ClickTargetHdl_Impl ) );
-    maCbbPath.SetModifyHdl   ( LINK ( this, SvxHyperlinkDocTp, ModifiedPathHdl_Impl ) );
-    maEdTarget.SetModifyHdl  ( LINK ( this, SvxHyperlinkDocTp, ModifiedTargetHdl_Impl ) );
+    m_pBtFileopen->SetClickHdl ( LINK ( this, SvxHyperlinkDocTp, ClickFileopenHdl_Impl ) );
+    m_pBtBrowse->SetClickHdl   ( LINK ( this, SvxHyperlinkDocTp, ClickTargetHdl_Impl ) );
+    m_pCbbPath->SetModifyHdl   ( LINK ( this, SvxHyperlinkDocTp, ModifiedPathHdl_Impl ) );
+    m_pEdTarget->SetModifyHdl  ( LINK ( this, SvxHyperlinkDocTp, ModifiedTargetHdl_Impl ) );
 
-    maCbbPath.SetLoseFocusHdl( LINK ( this, SvxHyperlinkDocTp, LostFocusPathHdl_Impl ) );
+    m_pCbbPath->SetLoseFocusHdl( LINK ( this, SvxHyperlinkDocTp, LostFocusPathHdl_Impl ) );
 
-    maBtBrowse.SetAccessibleRelationMemberOf( &maGrpTarget );
-    maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget );
-    maBtFileopen.SetAccessibleRelationMemberOf( &maGrpDocument );
-    maBtFileopen.SetAccessibleRelationLabeledBy( &maFtPath );
     maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) );
 }
 
@@ -95,13 +85,13 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL)
 {
     sal_Int32 nPos = rStrURL.indexOf(sHash);
     // path
-    maCbbPath.SetText ( rStrURL.copy( 0, ( nPos == -1 ? rStrURL.getLength() : nPos ) ) );
+    m_pCbbPath->SetText ( rStrURL.copy( 0, ( nPos == -1 ? rStrURL.getLength() : nPos ) ) );
 
     // set target in document at editfield
     OUString aStrMark;
     if ( nPos != -1 && nPos < rStrURL.getLength()-1 )
         aStrMark = rStrURL.copy( nPos+1 );
-     maEdTarget.SetText ( aStrMark );
+     m_pEdTarget->SetText ( aStrMark );
 
     ModifiedPathHdl_Impl ( NULL );
 }
@@ -116,9 +106,9 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
 {
     // get data from dialog-controls
     OUString aStrURL;
-    OUString aStrPath ( maCbbPath.GetText() );
-    const OUString aBaseURL ( maCbbPath.GetBaseURL() );
-    OUString aStrMark( maEdTarget.GetText() );
+    OUString aStrPath ( m_pCbbPath->GetText() );
+    const OUString aBaseURL ( m_pCbbPath->GetBaseURL() );
+    OUString aStrMark( m_pEdTarget->GetText() );
 
     if ( aStrPath != aEmptyStr )
     {
@@ -167,9 +157,9 @@ void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNam
 |*
 |************************************************************************/
 
-IconChoicePage* SvxHyperlinkDocTp::Create( Window* pWindow, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
 {
-    return( new SvxHyperlinkDocTp( pWindow, rItemSet ) );
+    return( new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ) );
 }
 
 /*************************************************************************
@@ -180,7 +170,7 @@ IconChoicePage* SvxHyperlinkDocTp::Create( Window* pWindow, const SfxItemSet& rI
 
 void SvxHyperlinkDocTp::SetInitFocus()
 {
-    maCbbPath.GrabFocus();
+    m_pCbbPath->GrabFocus();
 }
 
 /*************************************************************************
@@ -212,8 +202,8 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
 
         utl::LocalFileHelper::ConvertURLToSystemPath( aURL, aPath );
 
-        maCbbPath.SetBaseURL( aURL );
-        maCbbPath.SetText( aPath );
+        m_pCbbPath->SetBaseURL( aURL );
+        m_pCbbPath->SetText( aPath );
 
         if ( aOldURL != GetCurrentURL() )
             ModifiedPathHdl_Impl (NULL);
@@ -267,7 +257,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
     maTimer.SetTimeout( 2500 );
     maTimer.Start();
 
-    maFtFullURL.SetText( maStrURL );
+    m_pFtFullURL->SetText( maStrURL );
 
     return( 0L );
 }
@@ -308,9 +298,9 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl)
     maStrURL = GetCurrentURL();
 
     if ( IsMarkWndVisible() )
-        mpMarkWnd->SelectEntry ( maEdTarget.GetText() );
+        mpMarkWnd->SelectEntry ( m_pEdTarget->GetText() );
 
-    maFtFullURL.SetText( maStrURL );
+    m_pFtFullURL->SetText( maStrURL );
 
     return( 0L );
 }
@@ -325,7 +315,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl)
 {
     maStrURL = GetCurrentURL();
 
-    maFtFullURL.SetText( maStrURL );
+    m_pFtFullURL->SetText( maStrURL );
 
     return (0L);
 }
@@ -338,7 +328,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl)
 
 void SvxHyperlinkDocTp::SetMarkStr ( const OUString& aStrMark )
 {
-    maEdTarget.SetText ( aStrMark );
+    m_pEdTarget->SetText ( aStrMark );
 
     ModifiedTargetHdl_Impl ( NULL );
 }
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 6ef153622e78..832f3c4dec9d 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -22,7 +22,6 @@
 #include <svl/adrparse.hxx>
 
 #include "hlinettp.hxx"
-#include "hyperdlg.hrc"
 #include "hlmarkwn_def.hxx"
 
 sal_Char const sAnonymous[]    = "anonymous";
@@ -36,62 +35,50 @@ sal_Char const sFTPScheme[]    = INET_FTP_SCHEME;
 |************************************************************************/
 
 SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
+                                                 IconChoiceDialog* pDlg,
                                                  const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ),
+:   SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkInternetPage", "cui/ui/hyperlinkinternetpage.ui",
                               rItemSet ) ,
-    maGrpLinkTyp           ( this, CUI_RES (GRP_LINKTYPE) ),
-    maRbtLinktypInternet    ( this, CUI_RES (RB_LINKTYP_INTERNET) ),
-    maRbtLinktypFTP         ( this, CUI_RES (RB_LINKTYP_FTP) ),
-    maFtTarget              ( this, CUI_RES (FT_TARGET_HTML) ),
-    maCbbTarget             ( this, INET_PROT_HTTP ),
-    maBtBrowse              ( this, CUI_RES (BTN_BROWSE) ),
-    maFtLogin               ( this, CUI_RES (FT_LOGIN) ),
-    maEdLogin               ( this, CUI_RES (ED_LOGIN) ),
-    maFtPassword            ( this, CUI_RES (FT_PASSWD) ),
-    maEdPassword            ( this, CUI_RES (ED_PASSWD) ),
-    maCbAnonymous           ( this, CUI_RES (CBX_ANONYMOUS) ),
     mbMarkWndOpen           ( false )
 {
+    get(m_pRbtLinktypInternet, "linktyp_internet");
+    get(m_pRbtLinktypFTP, "linktyp_ftp");
+    get(m_pCbbTarget, "target");
+    m_pCbbTarget->SetSmartProtocol(INET_PROT_HTTP);
+    get(m_pBtBrowse, "browse");
+    m_pBtBrowse->SetModeImage(Image(CUI_RES (RID_SVXBMP_BROWSE)));
+    get(m_pFtLogin, "login_label");
+    get(m_pEdLogin, "login");
+    get(m_pFtPassword, "password_label");
+    get(m_pEdPassword, "password");
+    get(m_pCbAnonymous, "anonymous");
+
     // Disable display of bitmap names.
-    maBtBrowse.EnableTextDisplay (false);
+    m_pBtBrowse->EnableTextDisplay (false);
 
     InitStdControls();
-    FreeResource();
 
-    // Init URL-Box (pos&size, Open-Handler)
-    maCbbTarget.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ),
-                                  LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) );
-    maCbbTarget.Show();
-    maCbbTarget.SetHelpId( HID_HYPERDLG_INET_PATH );
+    m_pCbbTarget->Show();
+    m_pCbbTarget->SetHelpId( HID_HYPERDLG_INET_PATH );
 
     SetExchangeSupport ();
 
 
     // set defaults
-    maRbtLinktypInternet.Check ();
-    maFtLogin.Show( false );
-    maFtPassword.Show( false );
-    maEdLogin.Show( false );
-    maEdPassword.Show( false );
-    maCbAnonymous.Show( false );
-    maBtBrowse.Enable( true );
+    m_pRbtLinktypInternet->Check ();
+    m_pBtBrowse->Enable( true );
 
 
     // overload handlers
     Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
-    maRbtLinktypInternet.SetClickHdl( aLink );
-    maRbtLinktypFTP.SetClickHdl     ( aLink );
-    maCbAnonymous.SetClickHdl       ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
-    maBtBrowse.SetClickHdl          ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) );
-    maEdLogin.SetModifyHdl          ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) );
-    maCbbTarget.SetLoseFocusHdl     ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
-    maCbbTarget.SetModifyHdl        ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
+    m_pRbtLinktypInternet->SetClickHdl( aLink );
+    m_pRbtLinktypFTP->SetClickHdl     ( aLink );
+    m_pCbAnonymous->SetClickHdl       ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
+    m_pBtBrowse->SetClickHdl          ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) );
+    m_pEdLogin->SetModifyHdl          ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) );
+    m_pCbbTarget->SetLoseFocusHdl     ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
+    m_pCbbTarget->SetModifyHdl        ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
     maTimer.SetTimeoutHdl           ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
-
-    maFtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
-    maCbbTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
-    maBtBrowse.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
-    maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget );
 }
 
 SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp ()
@@ -125,36 +112,36 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& rStrURL)
     // set URL-field
     // Show the scheme, #72740
     if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
-        maCbbTarget.SetText( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
+        m_pCbbTarget->SetText( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
     else
-        maCbbTarget.SetText(rStrURL); // #77696#
+        m_pCbbTarget->SetText(rStrURL); // #77696#
 
     SetScheme(aStrScheme);
 }
 
 void SvxHyperlinkInternetTp::setAnonymousFTPUser()
 {
-    maEdLogin.SetText(OUString(sAnonymous));
+    m_pEdLogin->SetText(OUString(sAnonymous));
     SvAddressParser aAddress( SvtUserOptions().GetEmail() );
-    maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : OUString() );
+    m_pEdPassword->SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : OUString() );
 
-    maFtLogin.Disable ();
-    maFtPassword.Disable ();
-    maEdLogin.Disable ();
-    maEdPassword.Disable ();
-    maCbAnonymous.Check();
+    m_pFtLogin->Disable ();
+    m_pFtPassword->Disable ();
+    m_pEdLogin->Disable ();
+    m_pEdPassword->Disable ();
+    m_pCbAnonymous->Check();
 }
 
 void SvxHyperlinkInternetTp::setFTPUser(const OUString& rUser, const OUString& rPassword)
 {
-    maEdLogin.SetText ( rUser );
-    maEdPassword.SetText ( rPassword );
-
-    maFtLogin.Enable ();
-    maFtPassword.Enable ();
-    maEdLogin.Enable ();
-    maEdPassword.Enable ();
-    maCbAnonymous.Check(false);
+    m_pEdLogin->SetText ( rUser );
+    m_pEdPassword->SetText ( rPassword );
+
+    m_pFtLogin->Enable ();
+    m_pFtPassword->Enable ();
+    m_pEdLogin->Enable ();
+    m_pEdPassword->Enable ();
+    m_pCbAnonymous->Check(false);
 }
 
 /*************************************************************************
@@ -174,7 +161,7 @@ void SvxHyperlinkInternetTp::GetCurentItemData ( OUString& rStrURL, OUString& aS
 OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
 {
     // erase leading and trailing whitespaces
-    OUString aStrURL( maCbbTarget.GetText().trim() );
+    OUString aStrURL( m_pCbbTarget->GetText().trim() );
 
     INetURLObject aURL(aStrURL);
 
@@ -185,8 +172,8 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
     }
 
     // username and password for ftp-url
-    if( aURL.GetProtocol() == INET_PROT_FTP && !maEdLogin.GetText().isEmpty() )
-        aURL.SetUserAndPass ( maEdLogin.GetText(), maEdPassword.GetText() );
+    if( aURL.GetProtocol() == INET_PROT_FTP && !m_pEdLogin->GetText().isEmpty() )
+        aURL.SetUserAndPass ( m_pEdLogin->GetText(), m_pEdPassword->GetText() );
 
     if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
         return aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
@@ -200,9 +187,9 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
 |*
 |************************************************************************/
 
-IconChoicePage* SvxHyperlinkInternetTp::Create( Window* pWindow, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkInternetTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
 {
-    return( new SvxHyperlinkInternetTp( pWindow, rItemSet ) );
+    return( new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ) );
 }
 
 /*************************************************************************
@@ -213,7 +200,7 @@ IconChoicePage* SvxHyperlinkInternetTp::Create( Window* pWindow, const SfxItemSe
 
 void SvxHyperlinkInternetTp::SetInitFocus()
 {
-    maCbbTarget.GrabFocus();
+    m_pCbbTarget->GrabFocus();
 }
 
 /*************************************************************************
@@ -224,7 +211,7 @@ void SvxHyperlinkInternetTp::SetInitFocus()
 
 IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl)
 {
-    OUString aScheme = GetSchemeFromURL( maCbbTarget.GetText() );
+    OUString aScheme = GetSchemeFromURL( m_pCbbTarget->GetText() );
     if( !aScheme.isEmpty() )
         SetScheme( aScheme );
 
@@ -255,10 +242,10 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl)
 
 IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
 {
-    OUString aStrLogin ( maEdLogin.GetText() );
+    OUString aStrLogin ( m_pEdLogin->GetText() );
     if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) )
     {
-        maCbAnonymous.Check();
+        m_pCbAnonymous->Check();
         ClickAnonymousHdl_Impl(NULL);
     }
 
@@ -275,19 +262,19 @@ void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme)
     bool bInternet = !(bFTP);
 
     //update protocol button selection:
-    maRbtLinktypFTP.Check(bFTP);
-    maRbtLinktypInternet.Check(bInternet);
+    m_pRbtLinktypFTP->Check(bFTP);
+    m_pRbtLinktypInternet->Check(bInternet);
 
     //update target:
     RemoveImproperProtocol(rScheme);
-    maCbbTarget.SetSmartProtocol( GetSmartProtocolFromButtons() );
+    m_pCbbTarget->SetSmartProtocol( GetSmartProtocolFromButtons() );
 
     //show/hide  special fields for FTP:
-    maFtLogin.Show( bFTP );
-    maFtPassword.Show( bFTP );
-    maEdLogin.Show( bFTP );
-    maEdPassword.Show( bFTP );
-    maCbAnonymous.Show( bFTP );
+    m_pFtLogin->Show( bFTP );
+    m_pFtPassword->Show( bFTP );
+    m_pEdLogin->Show( bFTP );
+    m_pEdPassword->Show( bFTP );
+    m_pCbAnonymous->Show( bFTP );
 
     //update 'link target in document'-window and opening-button
     if (rScheme.startsWith(sHTTPScheme) || rScheme.isEmpty())
@@ -311,28 +298,28 @@ void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme)
 
 void SvxHyperlinkInternetTp::RemoveImproperProtocol(const OUString& aProperScheme)
 {
-    OUString aStrURL ( maCbbTarget.GetText() );
+    OUString aStrURL ( m_pCbbTarget->GetText() );
     if ( aStrURL != aEmptyStr )
     {
         OUString aStrScheme(GetSchemeFromURL(aStrURL));
         if ( !aStrScheme.isEmpty() && aStrScheme != aProperScheme )
         {
             aStrURL = aStrURL.copy( aStrScheme.getLength() );
-            maCbbTarget.SetText ( aStrURL );
+            m_pCbbTarget->SetText ( aStrURL );
         }
     }
 }
 
 OUString SvxHyperlinkInternetTp::GetSchemeFromButtons() const
 {
-    if( maRbtLinktypFTP.IsChecked() )
+    if( m_pRbtLinktypFTP->IsChecked() )
         return OUString(INET_FTP_SCHEME);
     return OUString(INET_HTTP_SCHEME);
 }
 
 INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
 {
-    if( maRbtLinktypFTP.IsChecked() )
+    if( m_pRbtLinktypFTP->IsChecked() )
     {
         return INET_PROT_FTP;
     }
@@ -361,17 +348,17 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl)
 IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
 {
     // disable login-editfields if checked
-    if ( maCbAnonymous.IsChecked() )
+    if ( m_pCbAnonymous->IsChecked() )
     {
-        if ( maEdLogin.GetText().toAsciiLowerCase().startsWith( sAnonymous ) )
+        if ( m_pEdLogin->GetText().toAsciiLowerCase().startsWith( sAnonymous ) )
         {
             maStrOldUser = aEmptyStr;
             maStrOldPassword = aEmptyStr;
         }
         else
         {
-            maStrOldUser = maEdLogin.GetText();
-            maStrOldPassword = maEdPassword.GetText();
+            maStrOldUser = m_pEdLogin->GetText();
+            maStrOldPassword = m_pEdPassword->GetText();
         }
 
         setAnonymousFTPUser();
@@ -421,7 +408,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
 
 void SvxHyperlinkInternetTp::RefreshMarkWindow()
 {
-    if ( maRbtLinktypInternet.IsChecked() && IsMarkWndVisible() )
+    if ( m_pRbtLinktypInternet->IsChecked() && IsMarkWndVisible() )
     {
         EnterWait();
         OUString aStrURL( CreateAbsoluteURL() );
@@ -442,7 +429,7 @@ void SvxHyperlinkInternetTp::RefreshMarkWindow()
 
 void SvxHyperlinkInternetTp::SetMarkStr ( const OUString& aStrMark )
 {
-    OUString aStrURL ( maCbbTarget.GetText() );
+    OUString aStrURL ( m_pCbbTarget->GetText() );
 
     const sal_Unicode sUHash = '#';
     sal_Int32 nPos = aStrURL.lastIndexOf( sUHash );
@@ -452,7 +439,7 @@ void SvxHyperlinkInternetTp::SetMarkStr ( const OUString& aStrMark )
 
     aStrURL += OUString(sUHash) + aStrMark;
 
-    maCbbTarget.SetText ( aStrURL );
+    m_pCbbTarget->SetText ( aStrURL );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index c8721cf7373d..daaec31ed649 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -28,7 +28,6 @@
 #include <unotools/moduleoptions.hxx>
 
 #include "hlmailtp.hxx"
-#include "hyperdlg.hrc"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -39,47 +38,40 @@ using namespace ::com::sun::star;
 |*
 |************************************************************************/
 
-SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ),
-                              rItemSet ),
-    maGrpMailNews   ( this, CUI_RES (GRP_MAILNEWS) ),
-    maRbtMail       ( this, CUI_RES (RB_LINKTYP_MAIL) ),
-    maRbtNews       ( this, CUI_RES (RB_LINKTYP_NEWS) ),
-    maFtReceiver    ( this, CUI_RES (FT_RECEIVER) ),
-    maCbbReceiver   ( this, INET_PROT_MAILTO ),
-    maBtAdrBook     ( this, CUI_RES (BTN_ADRESSBOOK) ),
-    maFtSubject     ( this, CUI_RES (FT_SUBJECT) ),
-    maEdSubject     ( this, CUI_RES (ED_SUBJECT) )
+SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
+:   SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkMailPage", "cui/ui/hyperlinkmailpage.ui",
+                              rItemSet )
 {
+    get(m_pRbtMail, "linktyp_mail");
+    get(m_pRbtNews, "linktyp_news");
+    get(m_pCbbReceiver, "receiver");
+    m_pCbbReceiver->SetSmartProtocol(INET_PROT_MAILTO);
+    get(m_pBtAdrBook, "adressbook");
+    m_pBtAdrBook->SetModeImage(Image(CUI_RES(RID_SVXBMP_ADRESSBOOK)));
+    get(m_pFtSubject, "subject_label");
+    get(m_pEdSubject, "subject");
+
     // Disable display of bitmap names.
-    maBtAdrBook.EnableTextDisplay (false);
+    m_pBtAdrBook->EnableTextDisplay (false);
 
     InitStdControls();
-    FreeResource();
-
-    // Init URL-Box (pos&size, Open-Handler)
-    maCbbReceiver.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ),
-                                    LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) );
 
-    maCbbReceiver.Show();
-    maCbbReceiver.SetHelpId( HID_HYPERDLG_MAIL_PATH );
+    m_pCbbReceiver->Show();
+    m_pCbbReceiver->SetHelpId( HID_HYPERDLG_MAIL_PATH );
 
     SetExchangeSupport ();
 
     // set defaults
-    maRbtMail.Check ();
+    m_pRbtMail->Check ();
 
     // overload handlers
-    maRbtMail.SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
-    maRbtNews.SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
-    maBtAdrBook.SetClickHdl      ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
-    maCbbReceiver.SetModifyHdl   ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) );
+    m_pRbtMail->SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
+    m_pRbtNews->SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
+    m_pBtAdrBook->SetClickHdl      ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
+    m_pCbbReceiver->SetModifyHdl   ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) );
 
     if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
-        maBtAdrBook.Hide();
-
-    maBtAdrBook.SetAccessibleRelationMemberOf( &maGrpMailNews );
-    maBtAdrBook.SetAccessibleRelationLabeledBy( &maFtReceiver );
+        m_pBtAdrBook->Hide();
 }
 
 SvxHyperlinkMailTp::~SvxHyperlinkMailTp ()
@@ -117,14 +109,14 @@ void SvxHyperlinkMailTp::FillDlgFields(const OUString& rStrURL)
         if ( nPos != -1 )
             aStrURLc = aStrURLc.copy( 0, nPos );
 
-        maEdSubject.SetText ( aStrSubject );
+        m_pEdSubject->SetText ( aStrSubject );
     }
     else
     {
-        maEdSubject.SetText (aEmptyStr);
+        m_pEdSubject->SetText (aEmptyStr);
     }
 
-    maCbbReceiver.SetText ( aStrURLc );
+    m_pCbbReceiver->SetText ( aStrURLc );
 
     SetScheme( aStrScheme );
 }
@@ -145,7 +137,7 @@ void SvxHyperlinkMailTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNa
 
 OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
 {
-    OUString aStrURL = maCbbReceiver.GetText();
+    OUString aStrURL = m_pCbbReceiver->GetText();
     INetURLObject aURL(aStrURL);
 
     if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
@@ -157,10 +149,10 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
     // subject for EMail-url
     if( aURL.GetProtocol() == INET_PROT_MAILTO )
     {
-        if ( maEdSubject.GetText() != OUString(aEmptyStr) )
+        if ( m_pEdSubject->GetText() != OUString(aEmptyStr) )
         {
             OUString aQuery("subject=");
-            aQuery += maEdSubject.GetText();
+            aQuery += m_pEdSubject->GetText();
             aURL.SetParam(aQuery);
         }
     }
@@ -177,9 +169,9 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
 |*
 |************************************************************************/
 
-IconChoicePage* SvxHyperlinkMailTp::Create( Window* pWindow, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkMailTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
 {
-    return( new SvxHyperlinkMailTp( pWindow, rItemSet ) );
+    return( new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ) );
 }
 
 /*************************************************************************
@@ -190,7 +182,7 @@ IconChoicePage* SvxHyperlinkMailTp::Create( Window* pWindow, const SfxItemSet& r
 
 void SvxHyperlinkMailTp::SetInitFocus()
 {
-    maCbbReceiver.GrabFocus();
+    m_pCbbReceiver->GrabFocus();
 }
 
 /*************************************************************************
@@ -204,16 +196,16 @@ void SvxHyperlinkMailTp::SetScheme(const OUString& rScheme)
     bool bMail = !rScheme.startsWith(sNewsScheme);
 
     //update protocol button selection:
-    maRbtMail.Check(bMail);
-    maRbtNews.Check(!bMail);
+    m_pRbtMail->Check(bMail);
+    m_pRbtNews->Check(!bMail);
 
     //update target:
     RemoveImproperProtocol(rScheme);
-    maCbbReceiver.SetSmartProtocol( GetSmartProtocolFromButtons() );
+    m_pCbbReceiver->SetSmartProtocol( GetSmartProtocolFromButtons() );
 
     //show/hide  special fields for MAIL:
-    maFtSubject.Enable(bMail);
-    maEdSubject.Enable(bMail);
+    m_pBtAdrBook->Enable(bMail);
+    m_pEdSubject->Enable(bMail);
 }
 
 /*************************************************************************
@@ -224,28 +216,28 @@ void SvxHyperlinkMailTp::SetScheme(const OUString& rScheme)
 
 void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme)
 {
-    OUString aStrURL ( maCbbReceiver.GetText() );
+    OUString aStrURL ( m_pCbbReceiver->GetText() );
     if ( aStrURL != aEmptyStr )
     {
         OUString aStrScheme = GetSchemeFromURL( aStrURL );
         if ( aStrScheme != aEmptyStr && aStrScheme != aProperScheme )
         {
             aStrURL = aStrURL.copy( aStrScheme.getLength() );
-            maCbbReceiver.SetText ( aStrURL );
+            m_pCbbReceiver->SetText ( aStrURL );
         }
     }
 }
 
 OUString SvxHyperlinkMailTp::GetSchemeFromButtons() const
 {
-    if( maRbtNews.IsChecked() )
+    if( m_pRbtNews->IsChecked() )
         return OUString(INET_NEWS_SCHEME);
     return OUString(INET_MAILTO_SCHEME);
 }
 
 INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
 {
-    if( maRbtNews.IsChecked() )
+    if( m_pRbtNews->IsChecked() )
     {
         return INET_PROT_NEWS;
     }
@@ -273,7 +265,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl)
 
 IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl)
 {
-    OUString aScheme = GetSchemeFromURL( maCbbReceiver.GetText() );
+    OUString aScheme = GetSchemeFromURL( m_pCbbReceiver->GetText() );
     if(!aScheme.isEmpty())
         SetScheme( aScheme );
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3423efdd5b87..b019bebde343 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -24,7 +24,6 @@
 #include <svl/macitem.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
-#include "hyperdlg.hrc"
 #include "cuihyperdlg.hxx"
 #include "hltpbase.hxx"
 #include "macroass.hxx"
@@ -34,40 +33,6 @@
 
 using namespace ::ucbhelper;
 
-//# ComboBox-Control, which is filled with all current framenames        #
-
-/*************************************************************************
-|*
-|* Contructor / Destructor
-|*
-|************************************************************************/
-
-SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId,
-                                        SfxDispatcher* pDispatch )
-:   ComboBox (pParent, rResId)
-{
-    SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
-    SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0;
-    if ( pFrame )
-    {
-        boost::scoped_ptr<TargetList> pList(new TargetList);
-        pFrame->GetTargetList(*pList);
-        if( !pList->empty() )
-        {
-            size_t nCount = pList->size();
-            size_t i;
-            for ( i = 0; i < nCount; i++ )
-            {
-                InsertEntry( pList->at( i ) );
-            }
-        }
-    }
-}
-
-SvxFramesComboBox::~SvxFramesComboBox ()
-{
-}
-
 //# ComboBox-Control for URL's with History and Autocompletion           #
 
 SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart )
@@ -76,6 +41,11 @@ SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart )
 {
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHyperURLBox(Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvxHyperURLBox(pParent, INET_PROT_HTTP);
+}
+
 sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
 {
     return( IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE );
@@ -116,21 +86,18 @@ bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt )
 //# Hyperlink-Dialog: Tabpages-Baseclass                                 #
 
 SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent,
-                                                   const ResId &rResId,
+                                                   IconChoiceDialog* pDlg,
+                                                   const OString& rID,
+                                                   const OUString& rUIXMLDescription,
                                                    const SfxItemSet& rItemSet )
-:   IconChoicePage          ( pParent, rResId, rItemSet ),
-    mpGrpMore               ( NULL ),
-    mpFtFrame               ( NULL ),
+:   IconChoicePage          ( pParent, rID, rUIXMLDescription, rItemSet ),
     mpCbbFrame              ( NULL ),
-    mpFtForm                ( NULL ),
     mpLbForm                ( NULL ),
-    mpFtIndication          ( NULL ),
     mpEdIndication          ( NULL ),
-    mpFtText                ( NULL ),
     mpEdText                ( NULL ),
     mpBtScript              ( NULL ),
     mbIsCloseDisabled       ( false ),
-    mpDialog                ( pParent ),
+    mpDialog                ( pDlg ),
     mbStdControlsInit       ( false ),
     aEmptyStr()
 {
@@ -142,20 +109,6 @@ SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase ()
 {
     maTimer.Stop();
 
-    if ( mbStdControlsInit )
-    {
-        delete mpGrpMore;
-        delete mpFtFrame;
-        delete mpCbbFrame;
-        delete mpFtForm;
-        delete mpLbForm;
-        delete mpFtIndication;
-        delete mpEdIndication;
-        delete mpFtText;
-        delete mpEdText ;
-        delete mpBtScript;
-    }
-
     delete mpMarkWnd;
 }
 
@@ -178,22 +131,34 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
 {
     if ( !mbStdControlsInit )
     {
-        mpGrpMore     = new FixedLine           ( this, ResId (GRP_MORE, *m_pResMgr) );
-        mpFtFrame     = new FixedText           ( this, ResId (FT_FRAME, *m_pResMgr) );
-        mpCbbFrame    = new SvxFramesComboBox   ( this, ResId (CB_FRAME, *m_pResMgr), GetDispatcher() );
-        mpFtForm      = new FixedText           ( this, ResId (FT_FORM, *m_pResMgr) );
-        mpLbForm      = new ListBox             ( this, ResId (LB_FORM, *m_pResMgr) );
-        mpFtIndication= new FixedText           ( this, ResId (FT_INDICATION, *m_pResMgr) );
-        mpEdIndication= new Edit                ( this, ResId (ED_INDICATION, *m_pResMgr) );
-        mpFtText      = new FixedText           ( this, ResId (FT_TEXT, *m_pResMgr) );
-        mpEdText      = new Edit                ( this, ResId (ED_TEXT, *m_pResMgr) );
-        mpBtScript    = new ImageButton         ( this, ResId (BTN_SCRIPT, *m_pResMgr) );
+        get(mpCbbFrame, "frame");
+
+        SfxDispatcher* pDispatch = GetDispatcher();
+        SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
+        SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0;
+        if ( pFrame )
+        {
+            boost::scoped_ptr<TargetList> pList(new TargetList);
+            pFrame->GetTargetList(*pList);
+            if( !pList->empty() )
+            {
+                size_t nCount = pList->size();
+                size_t i;
+                for ( i = 0; i < nCount; i++ )
+                {
+                    mpCbbFrame->InsertEntry( pList->at( i ) );
+                }
+            }
+        }
+
+        get(mpLbForm, "form");
+        get(mpEdIndication, "indication");
+        get(mpEdText, "name");
+        get(mpBtScript, "script");
+        mpBtScript->SetModeImage(Image(CUI_RES (RID_SVXBMP_SCRIPT)));
 
         mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) );
         mpBtScript->EnableTextDisplay (false);
-
-        mpBtScript->SetAccessibleRelationMemberOf( mpGrpMore );
-        mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm );
     }
 
     mbStdControlsInit = true;
diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
deleted file mode 100644
index 54152b33a036..000000000000
--- a/cui/source/dialogs/hyperdlg.hrc
+++ /dev/null
@@ -1,82 +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 .
- */
-
-/* Tabpage : Hyperlink - Internet */
-
-#define GRP_LINKTYPE                1
-#define RB_LINKTYP_INTERNET         2
-#define RB_LINKTYP_FTP              3
-#define FT_TARGET_HTML              5
-#define FT_LOGIN                    7
-#define ED_LOGIN                    8
-#define FT_PASSWD                   9
-#define ED_PASSWD                   10
-#define CBX_ANONYMOUS               11
-#define BTN_BROWSE                  12
-
-/* Tabpage : Hyperlink - Mail & News */
-
-#define GRP_MAILNEWS                1
-#define RB_LINKTYP_MAIL             2
-#define RB_LINKTYP_NEWS             3
-#define FT_RECEIVER                 4
-#define FT_SUBJECT                  6
-#define ED_SUBJECT                  7
-#define BTN_ADRESSBOOK              8
-
-/* Tabpage : Hyperlink - Document */
-
-#define GRP_DOCUMENT                1
-#define FT_PATH_DOC                 2
-#define BTN_FILEOPEN                4
-#define GRP_TARGET                  5
-#define FT_TARGET_DOC               6
-#define ED_TARGET_DOC               7
-#define FT_URL                      8
-#define FT_FULL_URL                 9
-
-/* Tabpage : Hyperlink - New document */
-
-#define GRP_NEWDOCUMENT             1
-#define RB_EDITNOW                  2
-#define RB_EDITLATER                3
-#define FT_PATH_NEWDOC              4
-#define ED_PATH_NEWDOC              5
-#define FT_DOCUMENT_TYPES           6
-#define LB_DOCUMENT_TYPES           7
-#define BTN_CREATE                  8
-
-/* Tabpage-section : Hyperlink - more justifications */
-
-#define GRP_MORE                    30
-#define FT_FRAME                    31
-#define CB_FRAME                    32
-#define FT_FORM                     33
-#define LB_FORM                     34
-#define FT_INDICATION               35
-#define ED_INDICATION               36
-#define FT_TEXT                     37
-#define ED_TEXT                     38
-#define BTN_SCRIPT                  39
-
-#define COL_OLD     54
-#define COL_2       63
-#define COL_DIFF    (COL_2 - COL_OLD)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 3d46cb76cc00..f94037a6e3cb 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -20,706 +20,10 @@
 #include <svtools/controldims.hrc>
 #include <cuires.hrc>
 #include "helpid.hrc"
-#include "hyperdlg.hrc"
 
 #define MASKCOLOR   MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
 #define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2
 
-/*************************************************************************
-|
-| Tabpage : Internet
-|
-*************************************************************************/
-
-TabPage RID_SVXPAGE_HYPERLINK_INTERNET
-{
-    Hide = TRUE ;
-    HelpID = HID_HYPERLINK_INTERNET;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 162 ) ;
-    Text [ en-US ] = "Hyperlink" ;
-
-    FixedLine GRP_LINKTYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Hyperlink type" ;
-    };
-    RadioButton RB_LINKTYP_INTERNET
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET";
-        Pos = MAP_APPFONT( COL_2, 13 );
-        Size = MAP_APPFONT( 57, 10 );
-        Text [ en-US ] = "~Web";
-    };
-    RadioButton RB_LINKTYP_FTP
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP";
-        Pos = MAP_APPFONT( 114 + COL_DIFF, 13 );
-        Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
-        Text [ en-US ] = "~FTP";
-    };
-    FixedText FT_TARGET_HTML
-    {
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF, 8 ) ;
-        Text [ en-US ] = "Tar~get" ;
-    };
-    FixedText FT_LOGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "~Login name" ;
-    };
-    Edit ED_LOGIN
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 42 ) ;
-        Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_PASSWD
-    {
-        Pos = MAP_APPFONT ( 12 , 60 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "~Password" ;
-    };
-    Edit ED_PASSWD
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 59 ) ;
-        Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
-        PassWord = TRUE ;
-    };
-    CheckBox CBX_ANONYMOUS
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS";
-        Pos = MAP_APPFONT ( COL_2 , 75 ) ;
-        Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Anonymous ~user" ;
-    };
-    ImageButton BTN_BROWSE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE";
-        Pos = MAP_APPFONT ( 235, 24 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-        Text [ en-US ] = "WWW Browser";
-
-        QuickHelpText [ en-US ] = "Open web browser, copy an URL, and paste it to Target field" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "browse.bmp" ; };
-            MASKCOLOR
-        };
-    };
-
-    FixedLine GRP_MORE
-    {
-        Pos = MAP_APPFONT ( 6 , 92 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Further settings" ;
-    };
-    FixedText FT_FRAME
-    {
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "F~rame" ;
-    };
-    ComboBox CB_FRAME
-    {
-        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 104 ) ;
-        Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_FORM
-    {
-        Pos = MAP_APPFONT ( 126 , 105 ) ;
-        Size = MAP_APPFONT ( 33 , 8 ) ;
-        Text [ en-US ] = "F~orm" ;
-    };
-    ListBox LB_FORM
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 160 , 104 ) ;
-        Size = MAP_APPFONT ( 70 , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        AutoHScroll = TRUE ;
-        DDExtraWidth = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Text" ; Default ; > ;
-            < "Button" ; Default ; > ;
-        };
-    };
-    FixedText FT_INDICATION
-    {
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "Te~xt" ;
-    };
-    Edit ED_INDICATION
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 122 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_TEXT
-    {
-        Pos = MAP_APPFONT ( 12 , 140 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "N~ame" ;
-    };
-    Edit ED_TEXT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 139 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    ImageButton BTN_SCRIPT
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT";
-        Pos = MAP_APPFONT ( 235, 103-1 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-
-        QuickHelpText [ en-US ] = "Events" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "script.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Events";
-    };
-};
-
-/*************************************************************************
-|
-| Tabpage : Mail & News
-|
-*************************************************************************/
-
-TabPage RID_SVXPAGE_HYPERLINK_MAIL
-{
-    Hide = TRUE ;
-    HelpID = HID_HYPERLINK_MAIL;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 162 ) ;
-    Text [ en-US ] = "Hyperlink" ;
-
-    FixedLine GRP_MAILNEWS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Mail & news" ;
-    };
-    RadioButton RB_LINKTYP_MAIL
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL";
-        Pos = MAP_APPFONT( COL_2, 13 );
-        Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
-        Text [ en-US ] = "~E-mail";
-    };
-    RadioButton RB_LINKTYP_NEWS
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS";
-        Pos = MAP_APPFONT( 113, 13 );
-        Size = MAP_APPFONT( 56, 10 );
-        Text [ en-US ] = "~News";
-    };
-    FixedText FT_RECEIVER
-    {
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "Re~cipient" ;
-    };
-    FixedText FT_SUBJECT
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "~Subject" ;
-    };
-    Edit ED_SUBJECT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 42 ) ;
-        Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
-    };
-    ImageButton BTN_ADRESSBOOK
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK";
-        Pos = MAP_APPFONT ( 235, 24 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "adrbook.bmp" ; };
-            MASKCOLOR
-        };
-
-        Text [ en-US ] = "Data Sources...";
-        QuickHelpText [ en-US ] = "Data Sources..." ;
-    };
-
-    FixedLine GRP_MORE
-    {
-        Pos = MAP_APPFONT ( 6 , 92 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Further settings" ;
-    };
-    FixedText FT_FRAME
-    {
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "F~rame" ;
-    };
-    ComboBox CB_FRAME
-    {
-        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 104 ) ;
-        Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_FORM
-    {
-        Pos = MAP_APPFONT ( 126 , 105 ) ;
-        Size = MAP_APPFONT ( 33 , 10 ) ;
-        Text [ en-US ] = "F~orm" ;
-    };
-    ListBox LB_FORM
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 160 , 104 ) ;
-        Size = MAP_APPFONT ( 70 , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        AutoHScroll = TRUE ;
-        DDExtraWidth = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Text" ; Default ; > ;
-            < "Button" ; Default ; > ;
-        };
-    };
-    FixedText FT_INDICATION
-    {
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "Te~xt" ;
-    };
-    Edit ED_INDICATION
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 122 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_TEXT
-    {
-        Pos = MAP_APPFONT ( 12 , 140 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "N~ame" ;
-    };
-    Edit ED_TEXT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 139 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    ImageButton BTN_SCRIPT
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT";
-        Pos = MAP_APPFONT ( 235, 103-1 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Events" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "script.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Events";
-    };
-};
-
-/*************************************************************************
-|
-| Tabpage : Documents
-|
-*************************************************************************/
-
-TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
-{
-    Hide = TRUE ;
-    HelpID = HID_HYPERLINK_DOCUMENT;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 162 ) ;
-    Text [ en-US ] = "Hyperlink" ;
-
-    FixedLine GRP_DOCUMENT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Document" ;
-    };
-    FixedText FT_PATH_DOC
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "~Path" ;
-    };
-    ImageButton BTN_FILEOPEN
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN";
-        Pos = MAP_APPFONT ( 235, 14 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Open File" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "fileopen.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Open File";
-    };
-    FixedLine GRP_TARGET
-    {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Target in document" ;
-    };
-    FixedText FT_TARGET_DOC
-    {
-        Pos = MAP_APPFONT ( 12 , 53 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "Targ~et" ;
-    };
-    Edit ED_TARGET_DOC
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 52 ) ;
-        Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_URL
-    {
-        Pos = MAP_APPFONT ( 12 , 70 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "URL" ;
-    };
-    FixedText FT_FULL_URL
-    {
-        Pos = MAP_APPFONT ( COL_2 , 70 ) ;
-        Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
-        Text [ en-US ] = "Test text" ;
-    };
-    ImageButton BTN_BROWSE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE";
-        Pos = MAP_APPFONT ( 235, 51 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Target in Document" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "target.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Target in Document";
-    };
-
-    FixedLine GRP_MORE
-    {
-        Pos = MAP_APPFONT ( 6 , 92 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Further settings" ;
-    };
-    FixedText FT_FRAME
-    {
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "F~rame" ;
-    };
-    ComboBox CB_FRAME
-    {
-        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 104 ) ;
-        Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_FORM
-    {
-        Pos = MAP_APPFONT ( 126 , 105 ) ;
-        Size = MAP_APPFONT ( 33 , 10 ) ;
-        Text [ en-US ] = "F~orm" ;
-    };
-    ListBox LB_FORM
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 160 , 104 ) ;
-        Size = MAP_APPFONT ( 70 , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        AutoHScroll = TRUE ;
-        DDExtraWidth = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Text" ; Default ; > ;
-            < "Button" ; Default ; > ;
-        };
-    };
-    FixedText FT_INDICATION
-    {
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "Te~xt" ;
-    };
-    Edit ED_INDICATION
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 122 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_TEXT
-    {
-        Pos = MAP_APPFONT ( 12 , 140 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "N~ame" ;
-    };
-    Edit ED_TEXT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 139 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    ImageButton BTN_SCRIPT
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT";
-        Pos = MAP_APPFONT ( 235, 103-1 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Events" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "script.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Events";
-    };
-};
-
-/*************************************************************************
-|
-| Tabpage : New Documents
-|
-*************************************************************************/
-
-TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
-{
-    Hide = TRUE ;
-    HelpID = HID_HYPERLINK_NEWDOCUMENT;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 162 ) ;
-    Text [ en-US ] = "Hyperlink" ;
-
-    FixedLine GRP_NEWDOCUMENT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "New document" ;
-    };
-    RadioButton RB_EDITNOW
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW";
-        Pos = MAP_APPFONT( COL_2, 13 );
-        Size = MAP_APPFONT( 85 - COL_DIFF, 10 );
-        Text [ en-US ] = "Edit ~now";
-    };
-    RadioButton RB_EDITLATER
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER";
-        Pos = MAP_APPFONT( 142, 13 );
-        Size = MAP_APPFONT( 84, 10 );
-        Text [ en-US ] = "Edit ~later";
-    };
-    FixedText FT_PATH_NEWDOC
-    {
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "~File" ;
-    };
-    Edit ED_PATH_NEWDOC
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 25 ) ;
-        Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_DOCUMENT_TYPES
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "File ~type" ;
-    };
-    ListBox LB_DOCUMENT_TYPES
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 42 ) ;
-        Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ;
-        TabStop = TRUE ;
-        DropDown = FALSE ;
-    };
-    ImageButton BTN_CREATE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE";
-        Pos = MAP_APPFONT ( 235, 24 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-
-        QuickHelpText [ en-US ] = "Select Path" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "newdoc.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Select Path";
-    };
-
-    FixedLine GRP_MORE
-    {
-        Pos = MAP_APPFONT ( 6 , 92 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Further settings" ;
-    };
-    FixedText FT_FRAME
-    {
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "F~rame" ;
-    };
-    ComboBox CB_FRAME
-    {
-        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 104 ) ;
-        Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_FORM
-    {
-        Pos = MAP_APPFONT ( 126 , 105 ) ;
-        Size = MAP_APPFONT ( 33 , 10 ) ;
-        Text [ en-US ] = "F~orm" ;
-    };
-    ListBox LB_FORM
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 160 , 104 ) ;
-        Size = MAP_APPFONT ( 70 , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        AutoHScroll = TRUE ;
-        DDExtraWidth = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Text" ; Default ; > ;
-            < "Button" ; Default ; > ;
-        };
-    };
-    FixedText FT_INDICATION
-    {
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "Te~xt" ;
-    };
-    Edit ED_INDICATION
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 122 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    FixedText FT_TEXT
-    {
-        Pos = MAP_APPFONT ( 12 , 140 ) ;
-        Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
-        Text [ en-US ] = "N~ame" ;
-    };
-    Edit ED_TEXT
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( COL_2 , 139 ) ;
-        Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
-    };
-    ImageButton BTN_SCRIPT
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT";
-        Pos = MAP_APPFONT ( 235, 103-1 ) ;
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Events" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap { File = "script.bmp" ; };
-            MASKCOLOR
-        };
-        Text [ en-US ] = "Events";
-    };
-};
-
-/*************************************************************************
-|
-| Tabpage-Dialog : Hyperlinks
-|
-*************************************************************************/
-ModalDialog RID_SVXDLG_NEWHYPERLINK
-{
-    HelpID = CMD_SID_HYPERLINK_DIALOG;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 325 , 185 ) ;
-    Text [ en-US ] = "Hyperlink" ;
-    Moveable = TRUE ;
-};
-
-/*************************************************************************
-|
-| Tabpage-Dialog : Hyperlinks
-|
-*************************************************************************/
-
 String RID_SVXSTR_HYPDLG_APPLYBUT
 {
     Text [ en-US ] = "Apply" ;
@@ -821,4 +125,40 @@ Image RID_SVXBMP_HLDOCNTP
     MASKCOLOR
 };
 
+Image RID_SVXBMP_BROWSE
+{
+    ImageBitmap = Bitmap { File = "browse.bmp" ; };
+    MASKCOLOR
+};
+
+Image RID_SVXBMP_SCRIPT
+{
+    ImageBitmap = Bitmap { File = "script.bmp" ; };
+    MASKCOLOR
+};
+
+Image RID_SVXBMP_ADRESSBOOK
+{
+    ImageBitmap = Bitmap { File = "adrbook.bmp" ; };
+    MASKCOLOR
+};
+
+Image RID_SVXBMP_FILEOPEN
+{
+    ImageBitmap = Bitmap { File = "fileopen.bmp" ; };
+    MASKCOLOR
+};
+
+Image RID_SVXBMP_TARGET
+{
+    ImageBitmap = Bitmap { File = "target.bmp" ; };
+    MASKCOLOR
+};
+
+Image RID_SVXBMP_NEWDOC
+{
+    ImageBitmap = Bitmap { File = "newdoc.bmp" ; };
+    MASKCOLOR
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 8fd3ac036509..a171fa9531b5 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -66,9 +66,10 @@ static inline OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
 |
 \**********************************************************************/
 
-IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId,
+IconChoicePage::IconChoicePage( Window *pParent, const OString& rID,
+                                const OUString& rUIXMLDescription,
                                 const SfxItemSet &rAttrSet )
-:   TabPage                   ( pParent, rResId ),
+:   TabPage                   ( pParent, rID, rUIXMLDescription ),
     pSet                      ( &rAttrSet ),
     bHasExchangeSupport       ( false ),
     pDialog                   ( NULL )
@@ -191,39 +192,46 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt )
 |
 \**********************************************************************/
 
-IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtIconChoiceCtrl(Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvtIconChoiceCtrl(pParent, WB_3DLOOK | WB_ICON | WB_BORDER |
+                            WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME |
+                            WB_NODRAGSELECTION | WB_TABSTOP);
+}
+
+IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
+                                     const OUString& rUIXMLDescription,
                                      const EIconChoicePos ePos,
                                      const SfxItemSet *pItemSet )
-:   ModalDialog         ( pParent, rResId ),
+:   ModalDialog         ( pParent, rID, rUIXMLDescription ),
     meChoicePos     ( ePos ),
-    maIconCtrl      ( this, WB_3DLOOK | WB_ICON | WB_BORDER |
-                            WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME |
-                            WB_NODRAGSELECTION | WB_TABSTOP ),
     mnCurrentPageId ( USHRT_MAX ),
 
-    aOKBtn          ( this, WB_DEFBUTTON ),
-    aCancelBtn      ( this, WB_DEFBUTTON ),
-    aHelpBtn        ( this ),
-    aResetBtn       ( this ),
     pSet            ( pItemSet ),
     pOutSet         ( NULL ),
     pExampleSet     ( NULL ),
     pRanges         ( NULL ),
-    nResId          ( rResId.GetId() ),
+    rId             ( rID ),
 
     bHideResetBtn   ( false ),
     bModal          ( false ),
     bInOK           ( false ),
     bItemsReset     ( false )
 {
-
-    maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
+    get(m_pOKBtn, "ok");
+    get(m_pCancelBtn, "cancel");
+    get(m_pHelpBtn, "help");
+    get(m_pResetBtn, "back");
+    get(m_pIconCtrl, "icon_control");
+    get(m_pTabContainer, "tab");
+
+    m_pIconCtrl->SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
     SetCtrlPos ( meChoicePos );
-    maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
-    maIconCtrl.Show();
-    maIconCtrl.SetChoiceWithCursor ( true );
-    maIconCtrl.SetSelectionMode( SINGLE_SELECTION );
-    maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL );
+    m_pIconCtrl->SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
+    m_pIconCtrl->Show();
+    m_pIconCtrl->SetChoiceWithCursor ( true );
+    m_pIconCtrl->SetSelectionMode( SINGLE_SELECTION );
+    m_pIconCtrl->SetHelpId( HID_ICCDIALOG_CHOICECTRL );
 
     // ItemSet
     if ( pSet )
@@ -233,29 +241,28 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     }
 
     // Buttons
-    aOKBtn.SetClickHdl   ( LINK( this, IconChoiceDialog, OkHdl ) );
-    aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN );
-    aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN );
-    aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) );
-    aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) );
-    aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN );
-    aOKBtn.Show();
-    aCancelBtn.Show();
-    aHelpBtn.Show();
-    aResetBtn.Show();
+    m_pOKBtn->SetClickHdl   ( LINK( this, IconChoiceDialog, OkHdl ) );
+    m_pOKBtn->SetHelpId( HID_ICCDIALOG_OK_BTN );
+    m_pCancelBtn->SetHelpId( HID_ICCDIALOG_CANCEL_BTN );
+    m_pResetBtn->SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) );
+    m_pResetBtn->SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) );
+    m_pResetBtn->SetHelpId( HID_ICCDIALOG_RESET_BTN );
+    m_pOKBtn->Show();
+    m_pCancelBtn->Show();
+    m_pHelpBtn->Show();
+    m_pResetBtn->Show();
 
     SetPosSizeCtrls ( true );
 }
 
 
-
 IconChoiceDialog ::~IconChoiceDialog ()
 {
     // save configuration at INI-Manager
     // and remove pages
-    SvtViewOptions aTabDlgOpt( E_TABDIALOG, OUString::number(nResId) );
-    aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
-    aTabDlgOpt.SetPageID( mnCurrentPageId );
+    //SvtViewOptions aTabDlgOpt( E_TABDIALOG, rId );
+    //aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
+    //aTabDlgOpt.SetPageID( mnCurrentPageId );
 
     for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i )
     {
@@ -267,9 +274,9 @@ IconChoiceDialog ::~IconChoiceDialog ()
             OUString aPageData(pData->pPage->GetUserData());
             if ( !aPageData.isEmpty() )
             {
-                SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number(pData->nId) );
+                //SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number(pData->nId) );
 
-                SetViewOptUserItem( aTabPageOpt, aPageData );
+                //SetViewOptUserItem( aTabPageOpt, aPageData );
             }
 
             if ( pData->bOnDemand )
@@ -280,9 +287,9 @@ IconChoiceDialog ::~IconChoiceDialog ()
     }
 
     // remove Userdata from Icons
-    for ( sal_uLong i=0; i < maIconCtrl.GetEntryCount(); i++)
+    for ( sal_uLong i=0; i < m_pIconCtrl->GetEntryCount(); i++)
     {
-        SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
+        SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i );
         sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
         delete pUserData;
     }
@@ -319,7 +326,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
     pData->bOnDemand = bItemsOnDemand;
 
     sal_uInt16 *pId = new sal_uInt16 ( nId );
-    SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon );
+    SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->InsertEntry( rIconText, rChoiceIcon );
     pEntry->SetUserData ( (void*) pId );
     return pEntry;
 }
@@ -351,7 +358,7 @@ void IconChoiceDialog::Paint( const Rectangle& rRect )
 
 EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos )
 {
-    WinBits aWinBits = maIconCtrl.GetStyle ();
+    WinBits aWinBits = m_pIconCtrl->GetStyle ();
 
     switch ( meChoicePos )
     {
@@ -372,7 +379,7 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos )
             aWinBits |= WB_ALIGN_TOP | WB_NOVSCROLL;
             break;
     }
-    maIconCtrl.SetStyle ( aWinBits );
+    m_pIconCtrl->SetStyle ( aWinBits );
 
     SetPosSizeCtrls();
 
@@ -450,7 +457,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit )
 
     // Reset-Button
     Size aResetButtonSize ( bInit ? aDefaultButtonSize :
-                                    aResetBtn.GetSizePixel () );
+                                    m_pResetBtn->GetSizePixel () );
 
 
     // IconChoiceCtrl resizen & positionieren
@@ -488,8 +495,8 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit )
                                       nDefaultHeight );
             break;
     }
-    maIconCtrl.SetPosSizePixel ( aIconCtrlPos, aNewIconCtrlSize );
-    maIconCtrl.ArrangeIcons();
+    m_pIconCtrl->SetPosSizePixel ( aIconCtrlPos, aNewIconCtrlSize );
+    m_pIconCtrl->ArrangeIcons();
 
 
     // resize & position the pages
@@ -507,27 +514,27 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit )
                                       CTRLS_OFFSET );
                 aNewPageSize = Size ( aOutSize.Width() - aNewIconCtrlSize.Width() -
                                       (3*CTRLS_OFFSET),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
                                       (3*CTRLS_OFFSET) );
                 break;
             case PosRight :
                 aNewPagePos = aCtrlOffset;
                 aNewPageSize = Size ( aOutSize.Width() - aNewIconCtrlSize.Width() -
                                       (3*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
                                       (3*aCtrlOffset.X()) );
                 break;
             case PosTop :
                 aNewPagePos = Point ( aCtrlOffset.X(), aNewIconCtrlSize.Height() +
                                       (2*aCtrlOffset.X()) );
                 aNewPageSize = Size ( aOutSize.Width() - (2*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
                                       aNewIconCtrlSize.Height() - (4*aCtrlOffset.X()) );
                 break;
             case PosBottom :
                 aNewPagePos = aCtrlOffset;
                 aNewPageSize = Size ( aOutSize.Width() - (2*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
                                       aNewIconCtrlSize.Height() - (4*aCtrlOffset.X()) );
                 break;
         }
@@ -543,15 +550,15 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit )
     if ( meChoicePos == PosRight )
         nXOffset = aNewIconCtrlSize.Width()+(2*aCtrlOffset.X());
 
-    aResetBtn.SetPosSizePixel ( Point( aOutSize.Width() - nXOffset -
+    m_pResetBtn->SetPosSizePixel ( Point( aOutSize.Width() - nXOffset -
                                        aResetButtonSize.Width()-aCtrlOffset.X(),
                                        aOutSize.Height()-aResetButtonSize.Height()-
                                        aCtrlOffset.X() ),
                                aResetButtonSize );
     // Help-Button
     Size aHelpButtonSize ( bInit ? aDefaultButtonSize :
-                                   aHelpBtn.GetSizePixel () );
-    aHelpBtn.SetPosSizePixel ( Point( aOutSize.Width()-aResetButtonSize.Width()-
+                                   m_pHelpBtn->GetSizePixel () );
+    m_pHelpBtn->SetPosSizePixel ( Point( aOutSize.Width()-aResetButtonSize.Width()-
                                       aHelpButtonSize.Width()- nXOffset -
                                       (2*aCtrlOffset.X()),
                                       aOutSize.Height()-aHelpButtonSize.Height()-
@@ -559,16 +566,16 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit )
                                aHelpButtonSize );
     // Cancel-Button
     Size aCancelButtonSize ( bInit ? aDefaultButtonSize :
-                                     aCancelBtn.GetSizePixel () );
-    aCancelBtn.SetPosSizePixel ( Point( aOutSize.Width()-aCancelButtonSize.Width()-
+                                     m_pCancelBtn->GetSizePixel () );
+    m_pCancelBtn->SetPosSizePixel ( Point( aOutSize.Width()-aCancelButtonSize.Width()-
                                         aResetButtonSize.Width()-aHelpButtonSize.Width()-
                                         (3*aCtrlOffset.X()) -  nXOffset,
                                         aOutSize.Height()-aCancelButtonSize.Height()-
                                         aCtrlOffset.X() ),
                                 aCancelButtonSize );
     // OK-Button
-    Size aOKButtonSize ( bInit ? aDefaultButtonSize : aOKBtn.GetSizePixel () );
-    aOKBtn.SetPosSizePixel ( Point( aOutSize.Width()-aOKButtonSize.Width()-
+    Size aOKButtonSize ( bInit ? aDefaultButtonSize : m_pOKBtn->GetSizePixel () );
+    m_pOKBtn->SetPosSizePixel ( Point( aOutSize.Width()-aOKButtonSize.Width()-
                                     aCancelButtonSize.Width()-aResetButtonSize.Width()-
                                     aHelpButtonSize.Width()-(4*aCtrlOffset.X())-  nXOffset,
                                     aOutSize.Height()-aOKButtonSize.Height()-aCtrlOffset.X() ),
@@ -585,7 +592,7 @@ void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId )
     if ( pData->pPage )
     {
         Size aOutSize ( GetOutputSizePixel() );
-        Size aIconCtrlSize ( maIconCtrl.GetSizePixel() );
+        Size aIconCtrlSize ( m_pIconCtrl->GetSizePixel() );
 
         Point aNewPagePos;
         Size aNewPageSize;
@@ -594,30 +601,30 @@ void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId )
             case PosLeft :
                 aNewPagePos = Point ( aIconCtrlSize.Width() + (2*aCtrlOffset.X()),
                                       aCtrlOffset.X() );
-                aNewPageSize = Size ( aOutSize.Width() - maIconCtrl.GetSizePixel().Width() -
+                aNewPageSize = Size ( aOutSize.Width() - m_pIconCtrl->GetSizePixel().Width() -
                                       (3*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
                                       (3*aCtrlOffset.X()) );
                 break;
             case PosRight :
                 aNewPagePos = aCtrlOffset;
-                aNewPageSize = Size ( aOutSize.Width() - maIconCtrl.GetSizePixel().Width() -
+                aNewPageSize = Size ( aOutSize.Width() - m_pIconCtrl->GetSizePixel().Width() -
                                       (3*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
                                       (3*aCtrlOffset.X()) );
                 break;
             case PosTop :
                 aNewPagePos = Point ( aCtrlOffset.X(), aIconCtrlSize.Height() +
                                       (2*aCtrlOffset.X()) );
                 aNewPageSize = Size ( aOutSize.Width() - (2*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
-                                      maIconCtrl.GetSizePixel().Height() - (4*aCtrlOffset.X()) );
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
+                                      m_pIconCtrl->GetSizePixel().Height() - (4*aCtrlOffset.X()) );
                 break;
             case PosBottom :
                 aNewPagePos = aCtrlOffset;
                 aNewPageSize = Size ( aOutSize.Width() - (2*aCtrlOffset.X()),
-                                      aOutSize.Height() - aOKBtn.GetSizePixel().Height() -
-                                      maIconCtrl.GetSizePixel().Height() - (4*aCtrlOffset.X()) );
+                                      aOutSize.Height() - m_pOKBtn->GetSizePixel().Height() -
+                                      m_pIconCtrl->GetSizePixel().Height() - (4*aCtrlOffset.X()) );
                 break;
         }
 
@@ -635,9 +642,9 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl)
 {
     sal_uLong nPos;
 
-    SvxIconChoiceCtrlEntry *pEntry = maIconCtrl.GetSelectedEntry ( nPos );
+    SvxIconChoiceCtrlEntry *pEntry = m_pIconCtrl->GetSelectedEntry ( nPos );
     if ( !pEntry )
-        pEntry = maIconCtrl.GetCursor( );
+        pEntry = m_pIconCtrl->GetCursor( );
 
     sal_uInt16 *pId = (sal_uInt16*)pEntry->GetUserData ();
 
@@ -737,12 +744,12 @@ void IconChoiceDialog::ActivatePageImpl ()
             }
 
             if ( pTmpSet && !pData->bOnDemand )
-                pData->pPage = (pData->fnCreatePage)( this, *pTmpSet );
+                pData->pPage = (pData->fnCreatePage)( m_pTabContainer, this, *pTmpSet );
             else
-                pData->pPage = (pData->fnCreatePage)( this, *CreateInputItemSet( mnCurrentPageId ) );
+                pData->pPage = (pData->fnCreatePage)( m_pTabContainer, this, *CreateInputItemSet( mnCurrentPageId ) );
 
-            SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number(pData->nId) );
-            pData->pPage->SetUserData( GetViewOptUserItem( aTabPageOpt ) );
+            //SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number(pData->nId) );
+            //pData->pPage->SetUserData( GetViewOptUserItem( aTabPageOpt ) );
             SetPosSizePages ( pData->nId );
 
             if ( pData->bOnDemand )
@@ -767,9 +774,9 @@ void IconChoiceDialog::ActivatePageImpl ()
 
 
     if ( bReadOnly || bHideResetBtn )
-        aResetBtn.Hide();
+        m_pResetBtn->Hide();
     else
-        aResetBtn.Show();
+        m_pResetBtn->Show();
 
 }
 
@@ -963,7 +970,7 @@ short IconChoiceDialog::Execute()
 void IconChoiceDialog::Start( bool bShow )
 {
 
-    aCancelBtn.SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) );
+    m_pCancelBtn->SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) );
     bModal = false;
 
     Start_Impl();
@@ -1002,9 +1009,9 @@ void IconChoiceDialog::Start_Impl()
         nActPage = mnCurrentPageId;
 
     // configuration existing?
-    SvtViewOptions aTabDlgOpt( E_TABDIALOG, OUString::number(nResId) );
+    //SvtViewOptions aTabDlgOpt( E_TABDIALOG, rId );
 
-    if ( aTabDlgOpt.Exists() )
+    /*if ( aTabDlgOpt.Exists() )
     {
         // possibly position from config
         SetWindowState(OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
@@ -1017,8 +1024,8 @@ void IconChoiceDialog::Start_Impl()
 
         if ( GetPageData ( nActPage ) == NULL )
             nActPage = maPageList.front()->nId;
-    }
-    else if ( USHRT_MAX != mnCurrentPageId && GetPageData ( mnCurrentPageId ) != NULL )
+    }*/
+    //else if ( USHRT_MAX != mnCurrentPageId && GetPageData ( mnCurrentPageId ) != NULL )
         nActPage = mnCurrentPageId;
 
     mnCurrentPageId = nActPage;
@@ -1147,14 +1154,14 @@ short IconChoiceDialog::Ok()
 void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId )
 {
     // set focus to icon for the current visible page
-    for ( sal_uInt16 i=0; i<maIconCtrl.GetEntryCount(); i++)
+    for ( sal_uInt16 i=0; i<m_pIconCtrl->GetEntryCount(); i++)
     {
-        SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
+        SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i );
         sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
 
         if ( pUserData && *pUserData == nId )
         {
-            maIconCtrl.SetCursor( pEntry );
+            m_pIconCtrl->SetCursor( pEntry );
             break;
         }
     }
author	Szymon Kłos <eszkadev@gmail.com>	2014-06-22 12:24:33 +0200
committer	Caolán McNamara <caolanm@redhat.com>	2014-06-24 10:05:21 +0100
commit	360796b491d9e05f1438e97c88f15ad0f1cda281 (patch)
tree	a082d6aaedb3e99d70c0a74a31c973ce50f62088 /cui/source/dialogs
parent	95e6cc2ecbcb653f76c4a1ee109908a12b84e456 (diff)