summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-12 10:30:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-12 11:38:00 +0100
commit3abc98687715072080ba408b12fd8ef0a17573d5 (patch)
tree225351937aae21d349c75b2e6e879b3b6638ea76 /vcl
parent540b7d3ae4ee9fa4b46d2af6261e44de6bd4d462 (diff)
GetAutoHelpId logically can only return an empty string now
Change-Id: Ie7368f083a5aa6bcfb249375fbae1f4cd92e02ba
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/resource.cxx18
1 files changed, 1 insertions, 17 deletions
diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx
index abc5eed43d08..78871305c311 100644
--- a/vcl/source/window/resource.cxx
+++ b/vcl/source/window/resource.cxx
@@ -24,16 +24,6 @@
#include "window.h"
-static OString ImplAutoHelpID( ResMgr* pResMgr )
-{
- OString aRet;
-
- if( pResMgr && Application::IsAutoHelpIdEnabled() )
- aRet = pResMgr->GetAutoHelpId();
-
- return aRet;
-}
-
namespace vcl {
WinBits Window::ImplInitRes( const ResId& rResId )
@@ -46,18 +36,12 @@ WinBits Window::ImplInitRes( const ResId& rResId )
return nStyle;
}
-WindowResHeader Window::ImplLoadResHeader( const ResId& rResId )
+WindowResHeader Window::ImplLoadResHeader( const ResId& /*rResId*/ )
{
WindowResHeader aHeader;
aHeader.nObjMask = (RscWindowFlags)ReadLongRes();
- // we need to calculate auto helpids before the resource gets closed
- // if the resource only contains flags, it will be closed before we try to read a help id
- // so we always create an auto help id that might be overwritten later
- // HelpId
- aHeader.aHelpId = ImplAutoHelpID( rResId.GetResMgr() );
-
// ResourceStyle
aHeader.nRSStyle = (RSWND)ReadLongRes();
// WinBits