diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 14:35:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 15:51:31 +0100 |
| commit | bad1f11fff68ad204521a2dfb42dcd4a315a32b6 (patch) | |
| tree | 0ee7c1e527a8170fa5bd8ba0f53569668c984716 | |
| parent | tdf#74795 RTF import: handle row-level default cell margins (diff) | |
| download | core-bad1f11fff68ad204521a2dfb42dcd4a315a32b6.tar.gz core-bad1f11fff68ad204521a2dfb42dcd4a315a32b6.zip | |
no src file has BorderStyle in use anymore
Change-Id: Id2d2d845c73a7c83bef2e66ede542e99b0475af8
| -rw-r--r-- | include/tools/rc.h | 3 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 16 | ||||
| -rw-r--r-- | vcl/source/window/resource.cxx | 6 |
3 files changed, 1 insertions, 24 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index b84e6e27f595..06cd3777b724 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -48,8 +48,7 @@ namespace o3tl { #define WINDOW_HELPTEXT 0x0100 #define WINDOW_QUICKTEXT 0x0200 #define WINDOW_EXTRALONG 0x0800 -#define WINDOW_BORDER_STYLE 0x1000 -#define WINDOW_HELPID 0x2000 +#define WINDOW_HELPID 0x1000 // For "WorkWindow" resources: diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index cf4e9e07c3e1..f094b3e0eba2 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -281,22 +281,6 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, nId = aNmTb.Put( "ExtraLong", VARNAME ); pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_EXTRALONG ); - // border style - RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE ); - aBaseLst.push_back( pBorderStyleEnum ); - - // set constants in table - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WindowBorderStyle::NORMAL ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WindowBorderStyle::MONO ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WindowBorderStyle::MENU ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WindowBorderStyle::NOBORDER ); - - // add variable - nId = aNmTb.Put( "BorderStyle", VARNAME ); - pClassWindow->SetVariable( nId, pBorderStyleEnum, nullptr, - 0, - WINDOW_BORDER_STYLE ); - return pClassWindow; } diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx index fba41a6c7e34..9d47801e636f 100644 --- a/vcl/source/window/resource.cxx +++ b/vcl/source/window/resource.cxx @@ -146,12 +146,6 @@ void Window::ImplLoadRes( const ResId& rResId ) sal_uIntPtr nRes = ReadLongRes(); SetData( reinterpret_cast<void*>(nRes) ); } - - if ( nObjMask & WINDOW_BORDER_STYLE ) - { - sal_uInt16 nBorderStyle = (sal_uInt16)ReadLongRes(); - SetBorderStyle( static_cast<WindowBorderStyle>(nBorderStyle) ); - } } } /* namespace vcl */ |