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

Added Textbox functionality #228

Merged
merged 1 commit into from
May 8, 2014
Merged

Added Textbox functionality #228

merged 1 commit into from
May 8, 2014

Conversation

basjan
Copy link
Contributor

@basjan basjan commented May 7, 2014

No description provided.

@basjan
Copy link
Contributor Author

basjan commented May 7, 2014

@ivanlanin I am still struggling with GitHub. I thought that I had merged my local branch with the upstream develop branch. However, it seems that still almost all files have some differences.

@ivanlanin
Copy link
Contributor

Hi @basjan. Based on the network graph, your local branch is not in sync with develop. I was doing heavy refactorings so the updates were very frequent. Please sync again with the current. If you follow the setup in this page, you will have to run these command:

git fetch upstream
git merge upstream/develop

There may be some conflicts. Please help us to resolve them. After that, please push again your changes. You'll see that there will be not too much files changed anymore.

Thanks.

@ivanlanin ivanlanin added this to the 0.11.0 milestone May 8, 2014
@ivanlanin ivanlanin merged commit 364131a into PHPOffice:develop May 8, 2014
@ivanlanin
Copy link
Contributor

Hi @basjan. I've merged your code with some modifications:

  • addTextBox moved to AbstractContainer
  • Style\TextBox inherited from Style\Image
  • Sample_25_TextBox.php added

Here's the final diff. Please feel free to modify or elaborate the changes. Thanks.

@basjan basjan deleted the textbox branch May 8, 2014 13:42
@basjan
Copy link
Contributor Author

basjan commented May 8, 2014

Hi @ivanlanin. Thanks for the modifications.
It seems that one bug slipped in. When adding text to a TextBox with the AddText function, the writeContainerElements does no longer include <w:p> elements. It in fact treats the AddText function as an AddTextRun function.

I cannot find, where the bug should be. Do you have any idea ?

@basjan
Copy link
Contributor Author

basjan commented May 8, 2014

@ivanlanin I already found the bug. See issue #229

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

Successfully merging this pull request may close these issues.

None yet

2 participants