diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 14:37:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 15:51:31 +0100 |
| commit | 8d1295a104235ce003c9f44fc24072985706290f (patch) | |
| tree | 8f7dccb0858bf8f95d593e58f46f7873a4de1c6e | |
| parent | no src file has BorderStyle in use anymore (diff) | |
| download | core-8d1295a104235ce003c9f44fc24072985706290f.tar.gz core-8d1295a104235ce003c9f44fc24072985706290f.zip | |
new src file has ExtraLong in use anymore
Change-Id: I1d31fb41a8f7def6a95a46dd61d0be4b608c6994
| -rw-r--r-- | include/tools/rc.h | 9 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/resource.cxx | 5 |
3 files changed, 4 insertions, 12 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 06cd3777b724..b1fd2c081e56 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -44,11 +44,10 @@ namespace o3tl { #define WINDOW_WHMAPMODE 0x0008 #define WINDOW_WIDTH 0x0010 #define WINDOW_HEIGHT 0x0020 -#define WINDOW_TEXT 0x0080 -#define WINDOW_HELPTEXT 0x0100 -#define WINDOW_QUICKTEXT 0x0200 -#define WINDOW_EXTRALONG 0x0800 -#define WINDOW_HELPID 0x1000 +#define WINDOW_TEXT 0x0040 +#define WINDOW_HELPTEXT 0x0080 +#define WINDOW_QUICKTEXT 0x0100 +#define WINDOW_HELPID 0x0200 // For "WorkWindow" resources: diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index f094b3e0eba2..adff90201de7 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -278,8 +278,6 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, WINDOW_HELPTEXT ); nId = aNmTb.Put( "QuickHelpText", VARNAME ); pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, WINDOW_QUICKTEXT ); - nId = aNmTb.Put( "ExtraLong", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_EXTRALONG ); return pClassWindow; } diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx index 9d47801e636f..5f627e8f29d5 100644 --- a/vcl/source/window/resource.cxx +++ b/vcl/source/window/resource.cxx @@ -141,11 +141,6 @@ void Window::ImplLoadRes( const ResId& rResId ) } if ( nObjMask & WINDOW_QUICKTEXT ) SetQuickHelpText( ReadStringRes() ); - if ( nObjMask & WINDOW_EXTRALONG ) - { - sal_uIntPtr nRes = ReadLongRes(); - SetData( reinterpret_cast<void*>(nRes) ); - } } } /* namespace vcl */ |