diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-26 15:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-26 17:00:21 +0100 |
| commit | 6802dc06de83c665f63b5086f354a961f326c081 (patch) | |
| tree | 34b996b4f24fbba1d22946037cc94d06d2006b59 | |
| parent | ca68971f0af83f1db52e8e06981d30a509926541 (diff) | |
Dialogs no longer loaded from resource files
Change-Id: I55295009f474dbac15be792049fa5c6c95c1ec07
| -rw-r--r-- | include/tools/rcid.h | 1 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 12 |
4 files changed, 0 insertions, 22 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index aecaef4e59d0..5ac6a999e7dd 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -52,7 +52,6 @@ #define RSC_WORKWIN (RSC_NOTYPE + 0x37) #define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39) -#define RSC_DIALOG (RSC_NOTYPE + 0x3a) #define RSC_CONTROL (RSC_NOTYPE + 0x44) #define RSC_BUTTON (RSC_NOTYPE + 0x45) diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 3e191da5d373..361c860ff0b0 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -70,8 +70,6 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplDialogRes( const ResId& rResId ); - SAL_DLLPRIVATE WinBits init(Window *pParent, const ResId& rResId); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox); public: diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index e5cd051f6a45..c8ebfbfb643a 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -69,7 +69,6 @@ void RscTypCont::Init() RscTop * pClassWindow; RscTop * pClassSystemWindow; RscTop * pClassWorkWindow; - RscTop * pClassDialog; RscTop * pClassControl; RscTop * pClassButton; RscTop * pClassCheckBox; @@ -348,12 +347,6 @@ void RscTypCont::Init() pClassWorkWindow = InitClassWorkWindow( pClassSystemWindow ); pRoot->Insert( pClassWorkWindow ); - - // Klasse anlegen - pClassDialog = new RscClass( pHS->getID( "Dialog" ), - RSC_DIALOG, pClassSystemWindow ); - pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aBaseLst.push_back( pClassDialog ); } { pClassControl = InitClassControl( pClassWindow ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index cb6ae13e190c..f8afa9f8ae8c 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -521,23 +521,11 @@ Dialog::Dialog( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -WinBits Dialog::init(Window *pParent, const ResId& rResId) -{ - WinBits nStyle = ImplInitRes( rResId ); - - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - return nStyle; -} - - void Dialog::set_action_area(VclButtonBox* pActionArea) { mpActionArea = pActionArea; } - void Dialog::set_content_area(VclBox* pContentArea) { mpContentArea = pContentArea; |