Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the Spudsoft Excel emitter to the latest code from the author's repository #46

Open
wants to merge 17 commits into
base: flugtiger_master
Choose a base branch
from

Conversation

hvbtup
Copy link

@hvbtup hvbtup commented Oct 28, 2019

Please see my commits from Oct 25 to Oct 28, 2019.
After the Spudsoft Excel emitter was included into BIRT (May 17, 2013) for 4.3.0, many new features and bug fixes have been added by its author Jim Talbut, but these changes never made it into newer BIRT versions.
I'm a GIT noob, I don't know if and how it is possible to choose a specifiy set of commits for a pull request. My ultimate goal would be to see these changes added to the official BIRT repository.

Henning von Bargen and others added 9 commits July 30, 2019 18:45
…725):

 * Support for word "fields" (formulas)
 * avoid superfluos nested table
All of this is controlled by the following user properties:
PROP_NAME_LAYOUTMODE = "WordEmitter.LayoutMode"
PROP_NAME_FIELDFUNCTION = "WordEmitter.FieldFunction"
PROP_NAME_NESTED_TABLE = "WordEmitter.NestedTable"

By adding WordEmitter.LayoutMode = "NONE" to a list, the emitter avoids creating word tables for the list.

By adding WordEmitter.FieldFunction = "any non-empty string" to a label, the emitter uses the label's content as a field function.

WordEmitter.NestedTable is a boolean property and usually works automatic: It avoids a nested 1x1 table for a "foreign" element (dynamic text)
if this element is in a cell of a table or grid.
Note that the border properties of the element are ignored then.
By setting the value to true, it forces the old behaviour.

Furthermore, the DOC emitter now supports "show header on first".
This means you can force a layout element to start at a given y position
on the page. This is done by supplying a UserProperty. See the code for
details.
…utput.

Word 2003 = WPML emitter, Word 2007 = DOCX emitter.
This did not work as it should for the case when showHeaderOnFirst=false
was specified for the master page, causing problems with the page header
and the page footer, too.
@Flugtiger Flugtiger self-assigned this Oct 28, 2019
@Flugtiger
Copy link
Owner

Flugtiger commented Oct 28, 2019

Hi,
thank you for taking your time to make this pull request. I will review it shortly but answer your questions first:

I don't know if and how it is possible to choose a specifiy set of commits for a pull request

well, first you need to create a new branch on the current head of the main branch of the base repository (in this case "flugtiger/birt:flugtiger_master"). Then, you put all commits that you want to include in your pull request into this branch and eventually, you create a pull request with your own branch as source and the base branch in the base repository as target. More information can be found here: Creating a pull request

My ultimate goal would be to see these changes added to the official BIRT repository.

To do this, you have to open a separate pull request targeting the official birt repo. To make your changes be based upon the official repo, you can rebase your changes from the branch "flugtiger_master" onto (git rebase --onto) the main branch of the official repo ("eclipse/birt:master"). Please use a new branch for this rebase (otherwise you would affect this pull request). After this rebase you can open a pull request on the official repo with your rebased branch as source of the pull request. Please be aware, that the reactions of the maintainers of the official birt repository are very slow if there are any at all so it's hard to get anything into the official repo.

@Flugtiger
Copy link
Owner

In case you need more information on how to "put all commits that you want to include in your pull request into this branch", there are multiple options with git:

You could create a new branch on your current HEAD (with git branch <branch_name>) and then kick out all unwanted commits with an interactive git rebase
OR
you create a fresh branch at the HEAD of the flugtiger_master branch and then add all commits you want inside this branch with git cherry-pick.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants