Kaydet (Commit) 6802dc06 authored tarafından Caolán McNamara's avatar Caolán McNamara

Dialogs no longer loaded from resource files

Change-Id: I55295009f474dbac15be792049fa5c6c95c1ec07
üst ca68971f
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#define RSC_WORKWIN (RSC_NOTYPE + 0x37) #define RSC_WORKWIN (RSC_NOTYPE + 0x37)
#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39) #define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
#define RSC_DIALOG (RSC_NOTYPE + 0x3a)
#define RSC_CONTROL (RSC_NOTYPE + 0x44) #define RSC_CONTROL (RSC_NOTYPE + 0x44)
#define RSC_BUTTON (RSC_NOTYPE + 0x45) #define RSC_BUTTON (RSC_NOTYPE + 0x45)
......
...@@ -70,8 +70,6 @@ private: ...@@ -70,8 +70,6 @@ private:
protected: protected:
using Window::ImplInit; using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); 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); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox);
public: public:
......
...@@ -69,7 +69,6 @@ void RscTypCont::Init() ...@@ -69,7 +69,6 @@ void RscTypCont::Init()
RscTop * pClassWindow; RscTop * pClassWindow;
RscTop * pClassSystemWindow; RscTop * pClassSystemWindow;
RscTop * pClassWorkWindow; RscTop * pClassWorkWindow;
RscTop * pClassDialog;
RscTop * pClassControl; RscTop * pClassControl;
RscTop * pClassButton; RscTop * pClassButton;
RscTop * pClassCheckBox; RscTop * pClassCheckBox;
...@@ -348,12 +347,6 @@ void RscTypCont::Init() ...@@ -348,12 +347,6 @@ void RscTypCont::Init()
pClassWorkWindow = InitClassWorkWindow( pClassSystemWindow ); pClassWorkWindow = InitClassWorkWindow( pClassSystemWindow );
pRoot->Insert( pClassWorkWindow ); 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 ); pClassControl = InitClassControl( pClassWindow );
......
...@@ -521,23 +521,11 @@ Dialog::Dialog( Window* pParent, WinBits nStyle ) ...@@ -521,23 +521,11 @@ Dialog::Dialog( Window* pParent, WinBits nStyle )
ImplInit( pParent, 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) void Dialog::set_action_area(VclButtonBox* pActionArea)
{ {
mpActionArea = pActionArea; mpActionArea = pActionArea;
} }
void Dialog::set_content_area(VclBox* pContentArea) void Dialog::set_content_area(VclBox* pContentArea)
{ {
mpContentArea = pContentArea; mpContentArea = pContentArea;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment