rather than use pixel widths, use appfont units

Change-Id: If9551f63ac59ffedd0bd614e4f4fe05c9047e1dc

3 files changed, 9 insertions, 9 deletions

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 1c62c1fc59a6..91553257015a 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -90,8 +90,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml
     pLinkMgr( NULL ),
     bHtmlMode(bHtml)
 {
-    get(m_pFtFiles, "FILES");
     get(m_pTbLinks, "TB_LINKS");
+    Size aSize(LogicToPixel(Size(257, 87), MAP_APPFONT));
+    m_pTbLinks->set_width_request(aSize.Width());
+    m_pTbLinks->set_height_request(aSize.Height());
     get(m_pFtFullFileName, "FULL_FILE_NAME");
     get(m_pFtFullSourceName, "FULL_SOURCE_NAME");
     get(m_pFtFullTypeName, "FULL_TYPE_NAME");
@@ -102,20 +104,20 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml
     get(m_pPbChangeSource, "CHANGE_SOURCE");
     get(m_pPbBreakLink, "BREAK_LINK");
 
-    m_pTbLinks->SetHelpId(HID_LINKDLG_TABLB);
     m_pTbLinks->SetSelectionMode( MULTIPLE_SELECTION );
     m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT );
+    FixedText *pFtFiles = get<FixedText>("FILES");
+    pFtFiles->set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0), MAP_APPFONT).Width());
+    FixedText *pFtLinks = get<FixedText>("LINKS");
+    pFtLinks->set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0), MAP_APPFONT).Width());
+    FixedText *pFtTypes = get<FixedText>("TYPE");
+    pFtTypes->set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0), MAP_APPFONT).Width());
     m_pTbLinks->Resize();  // OS: hack for correct selection
 
     // UpdateTimer for DDE-/Grf-links, which are waited for
     aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
     aUpdateTimer.SetTimeout( 1000 );
 
-    // Set the ZOrder, and accessible name to the dialog's title
-    m_pTbLinks->SetZOrder(0, WINDOW_ZORDER_FIRST);
-    m_pTbLinks->SetAccessibleName(this->GetText());
-    m_pTbLinks->SetAccessibleRelationLabeledBy(m_pFtFiles);
-
     m_pPbOpenSource->Hide();
 
     m_pTbLinks->SetSelectHdl( LINK( this, SvBaseLinksDlg, LinksSelectHdl ) );
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index bc15fab66256..deec50c6069f 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -75,7 +75,6 @@
 #define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY"
 #define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
 #define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
-#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
 #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
 
 #define HID_HYPERLINK_DIALOG                                        "CUI_HID_HYPERLINK_DIALOG"
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 6c045ce5eb8c..f42889593a31 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -41,7 +41,6 @@ class SvBaseLinksDlg : public ModalDialog
 {
     using Window::SetType;
 
-    FixedText *m_pFtFiles;
     SvTabListBox *m_pTbLinks;
     FixedText *m_pFtFullFileName;
     FixedText *m_pFtFullSourceName;