diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 21:10:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-06 07:02:42 +0100 |
| commit | 0a8bf4b534775bb64e6baa228dce881c5c0d65a5 (patch) | |
| tree | b6753e237796855f7af63b9730a21eecdb50bc3b /vcl | |
| parent | 5ae49477396c1a0d7dd2d387bf46ac8c02cbeb53 (diff) | |
FloatingWindows are no longer loaded from resource files
Change-Id: I2705bbb4db52779e0065400f09604384fd9cf151
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 05b806f7d120..718683fc883d 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -152,18 +152,6 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) : - SystemWindow( WINDOW_FLOATINGWINDOW ) -{ - rResId.SetRT( RSC_FLOATINGWINDOW ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : SystemWindow(WINDOW_FLOATINGWINDOW) { @@ -179,36 +167,6 @@ void FloatingWindow::doDeferredInit(WinBits nBits) mbIsDefferedInit = false; } -void FloatingWindow::ImplLoadRes( const ResId& rResId ) -{ - SystemWindow::ImplLoadRes( rResId ); - - sal_uLong nObjMask = ReadLongRes(); - - if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH | - RSC_FLOATINGWINDOW_HEIGHT) & nObjMask ) - { - // use Sizes from the Resource - Size aSize; - MapUnit eSizeMap = MAP_PIXEL; - - if ( RSC_FLOATINGWINDOW_WHMAPMODE & nObjMask ) - eSizeMap = (MapUnit) ReadShortRes(); - if ( RSC_FLOATINGWINDOW_WIDTH & nObjMask ) - aSize.Width() = ReadShortRes(); - if ( RSC_FLOATINGWINDOW_HEIGHT & nObjMask ) - aSize.Height() = ReadShortRes(); - - SetRollUpOutputSizePixel( LogicToPixel( aSize, eSizeMap ) ); - } - - if (nObjMask & RSC_FLOATINGWINDOW_ZOOMIN ) - { - if ( ReadShortRes() ) - RollUp(); - } -} - FloatingWindow::~FloatingWindow() { if( mbPopupModeCanceled ) |