diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:31:57 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:31:57 +0000 |
commit | d1cca37ec2dbbfc57e6344cdf4999dbcdf29de21 (patch) | |
tree | 31783646417536518bf52026f6e37390efb267f6 /wizards/com/sun | |
parent | 251ded9d23b7af9d87e7dd5ece779f3a08e564ba (diff) |
INTEGRATION: CWS dbwizardpp4 (1.5.28); FILE MERGED
2006/06/29 14:16:27 bc 1.5.28.1: #i56533#Now pagebreak is inserted in front of first table
Diffstat (limited to 'wizards/com/sun')
-rw-r--r-- | wizards/com/sun/star/wizards/text/TextTableHandler.java | 6 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/text/ViewHandler.java | 22 |
2 files changed, 12 insertions, 16 deletions
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index 629162e51208..b55c16a2959d 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -4,9 +4,9 @@ * * $RCSfile: TextTableHandler.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2006-04-07 12:57:15 $ + * last change: $Author: kz $ $Date: 2006-07-06 14:31:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -174,7 +174,7 @@ public class TextTableHandler { public static BreakType resetBreakTypeofTextTable(Object oTextTable) { BreakType CorrBreakValue = null; - // BreakType BreakValue = (BreakType) com.sun.star.wizards.common.Helper.getUnoStructValue(oTextTable, "BreakType"); + BreakType BreakValue = (BreakType) com.sun.star.wizards.common.Helper.getUnoStructValue(oTextTable, "BreakType"); // if (BreakValue.equals(BreakType.NONE) == false){ // CorrBreakValue = BreakValue; Helper.setUnoPropertyValue(oTextTable, "BreakType", BreakType.NONE); diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java index 78340010cd24..e74d1f993882 100644 --- a/wizards/com/sun/star/wizards/text/ViewHandler.java +++ b/wizards/com/sun/star/wizards/text/ViewHandler.java @@ -4,9 +4,9 @@ * * $RCSfile: ViewHandler.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2006-04-07 12:57:29 $ + * last change: $Author: kz $ $Date: 2006-07-06 14:31:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,8 +71,6 @@ public class ViewHandler { public void selectFirstPage(TextTableHandler oTextTableHandler) { try { - XTextRange xRange; - XTextContent xTextTable; XPageCursor xPageCursor = (XPageCursor) UnoRuntime.queryInterface(XPageCursor.class, xTextViewCursorSupplier.getViewCursor()); XTextCursor xViewTextCursor = (XTextCursor) UnoRuntime.queryInterface(XTextCursor.class, xPageCursor); xPageCursor.jumpToFirstPage(); @@ -82,18 +80,16 @@ public class ViewHandler { XNameAccess xName = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oPageStyles); Object oPageStyle = xName.getByName("First Page"); XIndexAccess xAllTextTables = (XIndexAccess) UnoRuntime.queryInterface(XIndexAccess.class, oTextTableHandler.xTextTablesSupplier.getTextTables()); - int TextTablesCount = xAllTextTables.getCount(); - // for (int i = 0; i<TextTablesCount; i++){ - xTextTable = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, xAllTextTables.getByIndex(0)); - xRange = (XTextRange) UnoRuntime.queryInterface(XTextRange.class, xTextTable.getAnchor().getText()); + XTextContent xTextTable = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, xAllTextTables.getByIndex(0)); + XTextRange xRange = (XTextRange) UnoRuntime.queryInterface(XTextRange.class, xTextTable.getAnchor().getText()); xViewTextCursor.gotoRange(xRange, false); - if (xPageCursor.getPage() == (short) 1) { - Helper.setUnoPropertyValue(xTextTable, "PageDescName", "First Page"); - TextTableHandler.resetBreakTypeofTextTable(xTextTable); - } +// if (xPageCursor.getPage() == (short) 1) { +// Helper.setUnoPropertyValue(xTextTable, "PageDescName", "First Page"); +// TextTableHandler.resetBreakTypeofTextTable(xTextTable); +// } // } XTextRange xHeaderRange = (XTextRange) Helper.getUnoPropertyValue(oPageStyle, "HeaderText", XTextRange.class); - if (com.sun.star.uno.AnyConverter.isVoid(xHeaderRange) == false) { + if (!com.sun.star.uno.AnyConverter.isVoid(xHeaderRange)) { xViewTextCursor.gotoRange(xHeaderRange, false); xViewTextCursor.collapseToStart(); } else |