This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit e21710ad6f561f9e32d31584b1039eb782baffc0
Author: mseidel <msei...@apache.org>
AuthorDate: Sat Nov 28 14:55:26 2020 +0100
Fixed branding for Report Builder
(cherry picked from commit e904c4c24b493a0363ec6a5c690d0b2ae345a2f0)
---
main/reportbuilder/license/readme_en-US.html | 20 ++++++-------
main/reportbuilder/license/readme_en-US.txt | 28 ++++++++---------
.../sun/star/wizards/report/IReportDocument.java | 35 +++++++++++-----------
.../reportbuilder/ReportBuilderImplementation.java | 23 +++++++-------
4 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/main/reportbuilder/license/readme_en-US.html
b/main/reportbuilder/license/readme_en-US.html
index d8fb705..0c6c08e 100644
--- a/main/reportbuilder/license/readme_en-US.html
+++ b/main/reportbuilder/license/readme_en-US.html
@@ -1,6 +1,6 @@
<html>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,42 +8,42 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<head>
<title>Report Builder</title>
</head>
- <body>
+ <body>
<h1>Report Builder</h1>
<p>This file contains important information about the installation.</p>
- <p>This software offered by ASf will enhance Apache Open Office
software. The following features will be added:</p>
+ <p>This software offered by ASF will enhance Apache OpenOffice. The
following features will be added:</p>
<ul>
<li><p>In a Base database document, in the Reports window, you
now have an additional choice to "Create Report in Design
View".</p></li>
- <li><p>An interactive window allows you to create a database
report by drag-and-drop, with visual feedback.</p></li>
+ <li><p>An interactive window allows you to create a database
report by drag-and-drop, with visual feedback.</p></li>
<li><p>All reports created by Report Builder can also be edited
in the Report Builder window. </p></li>
</ul>
<p>You find more information about installation and usage of
the extension in the following paragraphs of this readme file.</p>
<h2>Notes on Installation</h2>
<h3>System Requirements</h3>
<ul>
- <li><p>A recent version of Apache Open Office</p></li>
+ <li><p>A recent version of Apache OpenOffice</p></li>
<li><p>A recent version of the Java(TM) Runtime
Environment</p></li>
</ul>
<h3>Installing</h3>
- <p>You need administrator rights to install a shared
extension for all users on your network. You do not need administrator rights
to install a user extension for your own use only.</p>
+ <p>You need administrator rights to install a shared
extension for all users on your network. You do not need administrator rights
to install a user extension for your own use only.</p>
<p>Double-click the extension file (*.oxt) in your
system's file browser or choose <b>Tools > Extension Manager</b>and click
<B>Add</B>.</P>
<h3>Uninstalling</h3>
<p>Choose Tools > Extension Manager, click the Report
Builder entry, then click Remove.</P>
<h2>Using the Extension</h2>
- <p>You find complete instructions on using the Report Builder
in the application help that is installed with Apache Open Office. Press F1 to
open the Help Viewer, then enter the words "Report Builder" in the Index text
box.</p>
+ <p>You find complete instructions on using the Report Builder
in the application help that is installed with Apache OpenOffice. Press F1 to
open the Help Viewer, then enter the words "Report Builder" in the Index text
box.</p>
</body>
</html>
diff --git a/main/reportbuilder/license/readme_en-US.txt
b/main/reportbuilder/license/readme_en-US.txt
index 7a142f1..a62fa0b 100644
--- a/main/reportbuilder/license/readme_en-US.txt
+++ b/main/reportbuilder/license/readme_en-US.txt
@@ -1,5 +1,5 @@
###############################################################
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,46 +7,46 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
###############################################################
Report Builder
=====================
This file contains important information about the installation.
-This software offered by ASF will enhance Apache Open Office software. The
following features will be added:
+This software offered by ASF will enhance Apache OpenOffice. The following
features will be added:
* In a Base database document, in the Reports window, you now have an
additional choice to "Create Report in Design View".
-* An interactive window allows you to create a database report by
drag-and-drop, with visual feedback.
-* All reports created by Report Builder can also be edited in the Report
Builder window.
-
+* An interactive window allows you to create a database report by
drag-and-drop, with visual feedback.
+* All reports created by Report Builder can also be edited in the Report
Builder window.
+
You find more information about installation and usage of the extension in the
following paragraphs of this readme file.
Notes on Installation
---------------------
-
+
System Requirements
-* A recent version of Apache Open Office
+* A recent version of Apache OpenOffice
* A recent version of the Java(TM) Runtime Environment
-
+
Installing
-You need administrator rights to install a shared extension for all users on
your network. You do not need administrator rights to install a user
extension for your own use only.
+You need administrator rights to install a shared extension for all users on
your network. You do not need administrator rights to install a user extension
for your own use only.
* Double-click the extension file (*.oxt) in your system's file browser or
choose Tools > Extension Manager and click Add.
Uninstalling
-
+
* Choose Tools > Extension Manager, click the Report Builder entry, then click
Remove.
Using the Extension
-You find complete instructions on using the Report Builder in the application
help that is installed with Apache Open Office. Press F1 to open the Help
Viewer, then enter the words "Report Builder" in the Index text box.
+You find complete instructions on using the Report Builder in the application
help that is installed with Apache OpenOffice. Press F1 to open the Help
Viewer, then enter the words "Report Builder" in the Index text box.
diff --git a/main/wizards/com/sun/star/wizards/report/IReportDocument.java
b/main/wizards/com/sun/star/wizards/report/IReportDocument.java
index 3a23669..8d6a119 100644
--- a/main/wizards/com/sun/star/wizards/report/IReportDocument.java
+++ b/main/wizards/com/sun/star/wizards/report/IReportDocument.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
package com.sun.star.wizards.report;
import com.sun.star.beans.PropertyValue;
@@ -32,8 +33,8 @@ import java.util.Vector;
/**
* New Interface which gives us the possibility to switch on the fly between
the old
- * Wizard and the new Sun Report Builder Wizard, which use the same UI.
- *
+ * Wizard and the new Report Builder Wizard, which use the same UI.
+ *
* @author ll93751
*/
public interface IReportDocument
@@ -48,7 +49,7 @@ public interface IReportDocument
//
-------------------------------------------------------------------------
// Access Helper
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/**
* Gives access to the DB Values
* @return
@@ -64,7 +65,7 @@ public interface IReportDocument
public com.sun.star.awt.XWindowPeer getWizardParent();
/**
- *
+ *
* @return the Frame of the document Window or Report Builder Window
*/
public com.sun.star.frame.XFrame getFrame();
@@ -73,10 +74,10 @@ public interface IReportDocument
//
-------------------------------------------------------------------------
// First step: After entering the table name, select fields
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/**
* Is called after first step, set Tablename and the fields, which should
occur in the Report.
- * @param _aType
+ * @param _aType
* @param TableName
* @param FieldNames
*/
@@ -94,7 +95,7 @@ public interface IReportDocument
//
-------------------------------------------------------------------------
// Second step: Label field titles
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/**
* Set new names for the titles
* @param sFieldTitles
@@ -112,7 +113,7 @@ public interface IReportDocument
public void liveupdate_changeUserFieldContent(final String FieldName,
final String TitleName);
//
-------------------------------------------------------------------------
// Third step: Grouping
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/* Grouping Page */
// Document should not hold the grouping information!
/**
@@ -143,7 +144,7 @@ public interface IReportDocument
public void setGrouping(String[] aGroupList);
//
-------------------------------------------------------------------------
// Fourth step: Sorting
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/**
* Set the list how to sort
* @param aSort
@@ -151,7 +152,7 @@ public interface IReportDocument
public void setSorting(String[][] aSort);
//
-------------------------------------------------------------------------
// Fivth step: Templates / Layout
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/* Template Page */
public void setPageOrientation(int nOrientation) throws
com.sun.star.lang.IllegalArgumentException;
@@ -182,7 +183,7 @@ public interface IReportDocument
public void layout_setupRecordSection(String TemplateName);
//
-------------------------------------------------------------------------
// finishing
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
// preview (update titlenames)
// addTextListener
/**
@@ -224,7 +225,7 @@ public interface IReportDocument
public void dispose();
//
-------------------------------------------------------------------------
// Garbage dump
- //
-------------------------------------------------------------------------
+ //
-------------------------------------------------------------------------
/* DataImport */
// ???
// public void addTextSectionCopies();
@@ -257,7 +258,7 @@ public interface IReportDocument
/**
* check internal invariants
- * @throws a
+ * @throws a
*/
public void checkInvariants() throws java.lang.Exception;
}
diff --git
a/main/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
b/main/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index b8a27bb..26bff0d 100644
---
a/main/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++
b/main/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
package com.sun.star.wizards.reportbuilder;
import com.sun.star.util.XModeSelector;
@@ -66,7 +67,7 @@ import java.util.logging.Logger;
/**
* This class use the IReportDocument Interface to communicate between the UI
- * and the ReportBuilderLayouter which communicates to the new Sun Report
Builder.
+ * and the ReportBuilderLayouter which communicates to the new Report Builder.
*
* @author ll93751
*/
@@ -81,7 +82,7 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
private ReportBuilderImplementation(XMultiServiceFactory _serviceFactory)
{
- // creates an access to the ReportBuilder Extension
+ // creates an access to the Report Builder Extension
super(_serviceFactory, ReportLayouter.SOOPTLANDSCAPE);
}
@@ -233,8 +234,8 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
}
/**
- * Returns the Frame of the underlieing Document
- * @return Returns the Frame of the parent (underlieing) Document
+ * Returns the Frame of the underlying Document
+ * @return Returns the Frame of the parent (underlying) Document
*/
public XFrame getFrame()
{
@@ -324,7 +325,7 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
/**
* Change the current Layouter by a new one with the given Name _sName.
- * If there exist no other layouter with the given name, nothing happens,
the layouter will not change to
+ * If there exist no other layouter with the given name, nothing happens,
the layouter will not change to
* an illegal one.
* @param _sName Name of the other layouter.
*/
@@ -559,7 +560,7 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
}
/**
- * Helper function to get a
com.sun.star.wizards.report.layout.ReportBuilderLayouter by it's name
+ * Helper function to get a
com.sun.star.wizards.report.layout.ReportBuilderLayouter by its name
*
* @param _sClassName
* @return the object or null
@@ -646,7 +647,7 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
String[] a = new String[getLayoutMap().size()];
String[] b = new String[getLayoutMap().size()];
- // run through the whole layoutmap and
+ // run through the whole layoutmap and
final Set aKeys = getLayoutMap().keySet();
final Iterator aKeyIterator = aKeys.iterator();
int i = 0;
