diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-23 02:37:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-23 08:46:41 +0000 |
| commit | b5a89ad137d0750b65f0820ebc9fa4e13a84067b (patch) | |
| tree | 0a812171bb0d4c8976e7e0349b204b37549eeacb /vcl | |
| parent | dd66b3f847f0061dcd9822104bbe6f45afbada63 (diff) | |
callcatcher: update list
.ui conversion has finally make inroads into core vcl widgets, no
WorkWindow are initialized from ResIds anymore post conversion
of the xslt filter dialog
Change-Id: I4a1764d9fb9be9e252630e3afc9972221bc16be6
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/wrkwin.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 23 |
2 files changed, 0 insertions, 25 deletions
diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx index f8b4e8d1e655..e283400cd445 100644 --- a/vcl/inc/vcl/wrkwin.hxx +++ b/vcl/inc/vcl/wrkwin.hxx @@ -59,11 +59,9 @@ private: protected: WorkWindow( WindowType nType ); SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: - WorkWindow( Window* pParent, const ResId& rResId ); WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 69f8779a4be8..1256f258a89f 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -119,18 +119,6 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -WorkWindow::WorkWindow( Window* pParent, const ResId& rResId ) : - SystemWindow( WINDOW_WORKWINDOW ) -{ - ImplInitWorkWindowData(); - rResId.SetRT( RSC_WORKWIN ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); -} - -// ----------------------------------------------------------------------- - WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -151,17 +139,6 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) : // ----------------------------------------------------------------------- -void WorkWindow::ImplLoadRes( const ResId& rResId ) -{ - SystemWindow::ImplLoadRes( rResId ); - - ReadLongRes(); - if ( !(rResId.GetWinBits() & WB_HIDE) && (RSC_WORKWIN == rResId.GetRT()) ) - Show(); -} - -// ----------------------------------------------------------------------- - WorkWindow::~WorkWindow() { ImplSVData* pSVData = ImplGetSVData(); |