From d08e63fb1ab16d96e3d1404c4b82267447104a0f Mon Sep 17 00:00:00 2001 From: Heiko Tietze Date: Thu, 6 Dec 2018 17:09:20 +0100 Subject: tdf#121759 Revert "tdf#99296 - Disable headers/footers by default" This reverts commit 08b5048198d59441cb8033ed14cd17e68c943004. Disabled h/f lead to an inactive menu entry (tdf#121759). Also, the change was not accepted by the OP (tdf#99296). See discussion on the mailing list, Gerrit, and BZ. Change-Id: Ie3dcf14c173a1813da05d8f2a9c8f2eda14cee46 Reviewed-on: https://gerrit.libreoffice.org/64727 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- .../tests/java/mod/_sc/ScAccessiblePageHeader.java | 44 ++++++++-------------- 1 file changed, 15 insertions(+), 29 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index d7ff676f5a0e..74670742c8ae 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -106,35 +106,6 @@ public class ScAccessiblePageHeader extends TestCase { e.printStackTrace(log); } - XStyleFamiliesSupplier StyleFam = UnoRuntime.queryInterface( - XStyleFamiliesSupplier.class, - xSpreadsheetDoc ); - XNameAccess StyleFamNames = StyleFam.getStyleFamilies(); - XStyle StdStyle = null; - - XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject( - new Type(XNameAccess.class), - StyleFamNames.getByName("PageStyles")); - StdStyle = (XStyle) AnyConverter.toObject( - new Type(XStyle.class), PageStyles.getByName("Default")); - - //get the property-set - final XPropertySet PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); - - // tdf#99296 - Disable headers/footers by default - try { - PropSet.setPropertyValue("HeaderIsOn", Boolean.TRUE); - PropSet.setPropertyValue("FooterIsOn", Boolean.TRUE); - } catch (com.sun.star.beans.UnknownPropertyException upe) { - log.println("Don't know the Property 'HeaderIsOn' or 'FooterIsOn'"); - } catch (com.sun.star.lang.WrappedTargetException wte) { - log.println("WrappedTargetException while setting Property 'HeaderIsOn' or 'FooterIsOn'"); - } catch (com.sun.star.lang.IllegalArgumentException iae) { - log.println("IllegalArgumentException while setting Property 'HeaderIsOn' or 'FooterIsOn'"); - } catch (com.sun.star.beans.PropertyVetoException pve) { - log.println("PropertyVetoException while setting Property 'HeaderIsOn' or 'FooterIsOn'"); - } - XModel aModel = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); XController xController = aModel.getCurrentController(); @@ -180,6 +151,21 @@ public class ScAccessiblePageHeader extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); + XStyleFamiliesSupplier StyleFam = UnoRuntime.queryInterface( + XStyleFamiliesSupplier.class, + xSpreadsheetDoc ); + XNameAccess StyleFamNames = StyleFam.getStyleFamilies(); + XStyle StdStyle = null; + + XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject( + new Type(XNameAccess.class), + StyleFamNames.getByName("PageStyles")); + StdStyle = (XStyle) AnyConverter.toObject( + new Type(XStyle.class), PageStyles.getByName("Default")); + + //get the property-set + final XPropertySet PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + XHeaderFooterContent RPHC = null; // creation of testobject here // first we write what we are intend to do to log file -- cgit 4'>distro/collabora/cp-6.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/oox/Makefile
AgeCommit message (Expand)Author