qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 44 +++++----------- sc/source/core/data/docpool.cxx | 2 2 files changed, 16 insertions(+), 30 deletions(-)
New commits: commit d08e63fb1ab16d96e3d1404c4b82267447104a0f Author: Heiko Tietze <tietze.he...@gmail.com> AuthorDate: Thu Dec 6 17:09:20 2018 +0100 Commit: Heiko Tietze <tietze.he...@gmail.com> CommitDate: Fri Dec 7 08:40:31 2018 +0100 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 <tietze.he...@gmail.com> 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 diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 530c79e11d92..0a0819b533e0 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -290,7 +290,7 @@ ScDocumentPool::ScDocumentPool() mvPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_SIZE ); mvPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER ); mvPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER ); - mvPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, false ); + mvPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, true ); mvPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, true ); mvPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, true ); mvPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, false ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits