From 06e9c32d8be8192cd2b6c840aa639622ca0ff44e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 11 Oct 2020 20:34:08 +0100 Subject: Revert "Permit scrollable AWT tab pages a la scrolled Dialog" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara --- offapi/com/sun/star/awt/UnoControlDialogModel.idl | 30 --------------- .../sun/star/awt/tab/UnoControlTabPageModel.idl | 43 ---------------------- 2 files changed, 73 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl index 428ef7352441..b45545b272aa 100644 --- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl +++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl @@ -145,36 +145,6 @@ published service UnoControlDialogModel */ [optional, property, transient] com::sun::star::graphic::XGraphic Graphic; - /** specifies that a horizontal scrollbar should be added to the dialog - @since LibreOffice 4.0 - */ - [optional, property] boolean HScroll; - - /** specifies that a vertical scrollbar should be added to the dialog - @since LibreOffice 4.0 - */ - [optional, property] boolean VScroll; - - /** specifies the horizontal position of the scrolled dialog content - @since LibreOffice 4.0 - */ - [optional, property] long ScrollLeft; - - /** specifies the vertical position of the scrolled dialog content - @since LibreOffice 4.0 - */ - [optional, property] long ScrollTop; - - /** specifies the total width of the scrollable dialog content - @since LibreOffice 4.0 - */ - [optional, property] long ScrollWidth; - - /** specifies the total height of the scrollable dialog content - @since LibreOffice 4.0 - */ - [optional, property] long ScrollHeight; - }; diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl index 0c32f231f2ec..e4efdc605b13 100644 --- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl +++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl @@ -30,49 +30,6 @@ module com { module sun { module star { module awt { module tab { published service UnoControlTabPageModel { interface XTabPageModel; - - /** specifies the text that is displayed in the caption bar of the dialog. - */ - [optional, property] string Title; - - /** specifies the help text of the dialog. - */ - [optional, property] string HelpText; - - /** specifies the help URL of the dialog. - */ - [optional, property] string HelpURL; - - /** specifies that a horizontal scrollbar should be added to the dialog - @since LibreOffice 7.1 - */ - [optional, property] boolean HScroll; - - /** specifies that a vertical scrollbar should be added to the dialog - @since LibreOffice 7.1 - */ - [optional, property] boolean VScroll; - - /** specifies the horizontal position of the scrolled dialog content - @since LibreOffice 7.1 - */ - [optional, property] long ScrollLeft; - - /** specifies the vertical position of the scrolled dialog content - @since LibreOffice 7.1 - */ - [optional, property] long ScrollTop; - - /** specifies the total width of the scrollable dialog content - @since LibreOffice 7.1 - */ - [optional, property] long ScrollWidth; - - /** specifies the total height of the scrollable dialog content - @since LibreOffice 7.1 - */ - [optional, property] long ScrollHeight; - }; -- cgit