Merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-lok-error-detection into lp://staging/ubuntu-docviewer-app
Proposed by
Stefano Verzegnassi
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Nicholas Skaggs | ||||
| Approved revision: | 197 | ||||
| Merged at revision: | 197 | ||||
| Proposed branch: | lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-lok-error-detection | ||||
| Merge into: | lp://staging/ubuntu-docviewer-app | ||||
| Diff against target: |
569 lines (+207/-58) 13 files modified
.bzrignore (+1/-0) CMakeLists.txt (+3/-0) src/app/qml/common/ErrorDialog.qml (+0/-2) src/app/qml/loView/LOViewPage.qml (+25/-0) src/app/qml/ubuntu-docviewer-app.qml (+6/-2) src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt (+1/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp (+52/-12) src/plugin/libreofficetoolkit-qml-plugin/lodocument.h (+16/-7) src/plugin/libreofficetoolkit-qml-plugin/loerror.h (+37/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.cpp (+44/-24) src/plugin/libreofficetoolkit-qml-plugin/loview.h (+15/-7) src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp (+5/-3) src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml (+2/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-lok-error-detection | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jenkins Bot | continuous-integration | Approve | |
| Roman Shchekin | Approve | ||
|
Review via email:
|
|||
Commit message
* [loviewer] Adding error detection
* [loviewer] Removed updateZoomIfAut
* Added a debug option in CMakeLists
* added '*.user.*' filter in .bzrignore file
Description of the change
* [loviewer] Adding error detection
* [loviewer] Removed updateZoomIfAut
* Added a debug option in CMakeLists
* added '*.user.*' filter in .bzrignore file
To post a comment you must log in.
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
See my inline note (not important).