diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-11 20:34:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-11 22:38:42 +0200 |
| commit | 06e9c32d8be8192cd2b6c840aa639622ca0ff44e (patch) | |
| tree | 3fcdc16182b1851efb55babd15c609e31a170bd8 /toolkit | |
| parent | 1020191c9772c869a9ac4d83264d35e54e8694c9 (diff) | |
Revert "Permit scrollable AWT tab pages a la scrolled Dialog"
UITest_sort failing
https://gerrit.libreoffice.org/c/core/+/103942
Jenkins Verified-1 Patch Set 7: Verified-1
where UITest_sort failed
Jenkins Verified+1 Patch Set 7: Verified+1
but that's just an android build which doesn't run any tests
This reverts commit b3f2530aa2767ba43cd4702422fc3ed0d37821d6.
Change-Id: I9414e5d7cc5873848f95dab65f03836ccb2ff0c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104194
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxcontainer.cxx | 16 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/controls/tabpagemodel.cxx | 6 |
3 files changed, 6 insertions, 19 deletions
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 44f0844f6965..541a9913440c 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -26,7 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vcl/tabpage.hxx> #include <tools/debug.hxx> #include <helper/scrollabledialog.hxx> #include <toolkit/helper/property.hxx> @@ -252,8 +251,7 @@ void SAL_CALL VCLXContainer::setProperty( VclPtr<vcl::Window> pWindow = GetWindow(); MapMode aMode( MapUnit::MapAppFont ); toolkit::ScrollableDialog* pScrollable = dynamic_cast< toolkit::ScrollableDialog* >( pWindow.get() ); - TabPage* pScrollTabPage = dynamic_cast< TabPage* >( pWindow.get() ); - if ( pWindow && (pScrollable || pScrollTabPage) ) + if ( pWindow && pScrollable ) { OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() ); if ( !pDev ) @@ -267,20 +265,16 @@ void SAL_CALL VCLXContainer::setProperty( switch ( nPropType ) { case BASEPROPERTY_SCROLLHEIGHT: - pScrollable ? pScrollable->SetScrollHeight( aSize.Height() ) : (void)0; - pScrollTabPage ? pScrollTabPage->SetScrollHeight( aSize.Height() ) : (void)0; + pScrollable->SetScrollHeight( aSize.Height() ); break; case BASEPROPERTY_SCROLLWIDTH: - pScrollable ? pScrollable->SetScrollWidth( aSize.Width() ) : (void)0; - pScrollTabPage ? pScrollTabPage->SetScrollWidth( aSize.Width() ) : (void)0; + pScrollable->SetScrollWidth( aSize.Width() ); break; case BASEPROPERTY_SCROLLTOP: - pScrollable ? pScrollable->SetScrollTop( aSize.Height() ) : (void)0; - pScrollTabPage ? pScrollTabPage->SetScrollTop( aSize.Height() ) : (void)0; + pScrollable->SetScrollTop( aSize.Height() ); break; case BASEPROPERTY_SCROLLLEFT: - pScrollable ? pScrollable->SetScrollLeft( aSize.Width() ) : (void)0; - pScrollTabPage ? pScrollTabPage->SetScrollLeft( aSize.Width() ) : (void)0; + pScrollable->SetScrollLeft( aSize.Width() ); break; default: break; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index fd63b743a009..7bf211d7150f 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -664,8 +664,7 @@ std::pair<WinBits,MessBoxStyle> ImplGetWinBits( sal_uInt32 nComponentAttribs, Wi if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_NO ) nStyle |= MessBoxStyle::DefaultNo; } - if ( nCompType == WindowType::MULTILINEEDIT || nCompType == WindowType::DIALOG - || nCompType == WindowType::GROUPBOX || nCompType == WindowType::TABPAGE ) + if ( nCompType == WindowType::MULTILINEEDIT || nCompType == WindowType::DIALOG || nCompType == WindowType::GROUPBOX ) { if( nComponentAttribs & css::awt::VclWindowPeerAttribute::AUTOHSCROLL ) nWinBits |= WB_AUTOHSCROLL; diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 30f45d9258bd..8a0856f2d08a 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -46,12 +46,6 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES ); - ImplRegisterProperty( BASEPROPERTY_HSCROLL ); - ImplRegisterProperty( BASEPROPERTY_VSCROLL ); - ImplRegisterProperty( BASEPROPERTY_SCROLLWIDTH ); - ImplRegisterProperty( BASEPROPERTY_SCROLLHEIGHT ); - ImplRegisterProperty( BASEPROPERTY_SCROLLTOP ); - ImplRegisterProperty( BASEPROPERTY_SCROLLLEFT ); } OUString SAL_CALL UnoControlTabPageModel::getImplementationName() |