New branch 'feature/droid_calimpress4' available with the following commits: commit 695ecf39e15e56aae7513c05e7f9e99475e54865 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 22:14:48 2014 +0100
Add libanimcore to factory list. This helps various .ppt and .pptx files. Change-Id: Ib53fed6083b369d3421eab082bda0e31d1f3847a commit 9e6910c6de36c1daaf944e8846604b14e8e288eb Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 20:43:43 2014 +0100 Fix wrong conditional for zoom-saneness-check. Change-Id: I54cb8ffc71c162e75675d306b903ef40ad05092f commit 5949203f6d6397d83638bdac0962c54dd7744bc4 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 20:03:26 2014 +0100 Temp: the DrView scaling will be completely wrong for tiled rendering. (No idea why yet) Change-Id: I9fcbd9055d82feb59b1c957234c9d7747f95ced9 commit fc8c9d672cf6e60ac298712c191e0714f2cb800d Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 16:12:56 2014 +0100 Don't render infinitely large document if empty. Change-Id: I887d8cef0c24b1e5155969a9f571660ca54ef463 commit 4684a28ed9cf728d83a6c145ae7fe3bdbfdad67d Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:28:36 2014 +0100 TODO: printfun needs fixing (see previous commit). We don't need this for tiled rendering for now though. Change-Id: Iac9ed2a4327840ac0af00eb1903484e127fac2c8 commit 8b0d78c0dec2827d7fd4a0a03ee4360bffcf9109 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:28:03 2014 +0100 Use twips internally for FillInfo too. Otherwise errors sum up leading to tile-mismatches for tiled rendering. Change-Id: I5328771a2d7c284870bb028b53fe69a61e00ba6d commit 70107287abe762aa2184088cd7943caab98a1fbb Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:24:25 2014 +0100 Adjust MapModes for gridwin tiled rendering. Change-Id: I8d31521d6b22f375c6de413f2070746f4758a431 commit 9937abbc35f4a25c8163c24ef11e41bac3e4e790 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:22:48 2014 +0100 Don't abort rendering if Android window 'minimized'. This simply has no relevance to tiled rendering. Change-Id: Iee348cf6792d83d364c33de81415a7cbe0be6a47 commit 0f986d60604ccd0d56c39a87cc650543a36610e2 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:21:42 2014 +0100 We want to keep nPPTX/Y for our old scaling. Change-Id: Ia10baf8eebeb92c421066a392387a1ad71e56ce9 commit be0cac3975208e9e4eb974a08e7eebcff450e399 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:20:53 2014 +0100 Remove incorrect fudge factor. Change-Id: I3a8d2b2ca1f90a07bd9fffd9e33f59b23671569c commit dc2b5027dc6c5973370f664fd076b8dbfc2709d3 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:20:07 2014 +0100 ScreenPos calculations in twips too. Change-Id: Ibc45f414a56e3c4cdf6c7f384d561938382c1653 commit 6812861779d868d086431a0d434e60cdff292bf8 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Tue Sep 30 15:19:30 2014 +0100 Use twips internally for GetScrPos. Change-Id: I48c674815c95f73722a427fd2d8d9a3dca9b3a6c commit 8ddada7c71e300bdbf6f97a81fa3c9388215d3c9 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Aug 27 14:29:07 2014 +0200 Use GetScrPos so that col/row-headers match the grid. Without this we can still get single pixel errors which can sum up over multiple columns/row. Change-Id: Id428dafab1ca771c123c84d815261263a7d33fed commit 819d1f5094f62f349f80c100dfb98f6f5178b39f Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Aug 27 20:52:09 2014 +0200 Match TiledRendering scaling to the new ViewData PaintMapMode. This is a bit hacky, still need to figure out what's going wrong that we need this weird conversion. Change-Id: Id1c62401f9f85c6d436bdd73b51ccf126100cbc4 commit d5ecf0b7f8efc7f797f6d2a2b38ab4d1843b23fe Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Aug 27 20:42:48 2014 +0200 Don't use UpdateVisibleRange for calc tiled rendering. Change-Id: Iaba02741acc280dfc4c500e0d08271b39560149b commit 5d2755116c09b927b8b3714fc5b73371e4704151 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Aug 27 20:37:45 2014 +0200 Set visible range from origin for Calc Tiled Rendering. Change-Id: I255b8865786088751c5d71da9db2ba38defed3bd commit 28a55d42b20ba07493ab39d3c34fc02698ce6136 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Aug 27 14:46:06 2014 +0200 Allow PaintMapMode retrieval. We need this for conversions elsewhere (outside of ScViewData). Conflicts: sc/source/ui/inc/viewdata.hxx Change-Id: I86ce18a22095488d3d3750bd13a5fab46a352be5 commit 950d1de733bb03711b2b31f1bacdae4a4ca1513d Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 16:48:01 2014 +0200 Use MapMode instead of nPPTX/nPPTY. This is far from complete: we need to replace all uses of nPPTX/nPPTY for things to work correctly. Change-Id: I7c8aca62c537d8770903f4a6ae0a164479af3fc1 commit c2291239b8088a7b2042f6fee03f891d14814c59 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 16:46:11 2014 +0200 ScOutputData needs ScViewData for scaling. Change-Id: I14cd3e835ba8233478514d5f6832737aa2c99bf9 commit aac260c00dc60b2890c88fea7e8c5f0b14b474ae Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 16:06:06 2014 +0200 Make nPrtToScreenFactor and GetOutputFactor fractions. These are then used for our output MapMode which required Fractions too. Change-Id: Icbfd9f808a6efe297096c94dc4043cef88c0ba0b commit 880c74c01c7d52367d6466251434dd10b238a739 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 09:54:58 2014 +0200 ScViewData::GetActiveWin can be const. We need to reuse this in other const methods, so lets make it const too. Change-Id: I6d96fa2370081d515f8629998d8a1e218bec643a commit 3c7ec768e9e9ee19f2b20d7086f882608a33807f Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 09:53:56 2014 +0200 Allow overriding limits for SetZoom for Tiled Rendering. Change-Id: Ic656012921408ce5c8dc691933a71a9e0ac78e5d commit 779d7d94f8788b2f318afbf430dde6571ee60ab2 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 09:52:58 2014 +0200 aScrSize should be mutable. Change-Id: I7376ea17aa4f66c9d9085757b84fb69dd0ad71cb commit adaca273875e88cd2338b0899bceab417e854943 Author: Andrzej Hunt <andr...@ahunt.org> Date: Tue Sep 9 06:12:44 2014 +0200 Fix PaintTile scaling preparation. Change-Id: I0a725fd5c030f3c089c2bbd25947088c321eb2d4 commit 1bafc7d0ea1a9151d4c9008f0e1f400a3cf0e542 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Thu Jun 26 17:06:58 2014 +0100 Ensure we actually render all cells in the selected area. Only cells within maVisibleRange are rendered, even if we request a larger area (and maVisibleRange is otherwise not updated for tiled rendering). Hence we should explicitly set it here. Change-Id: I399be9df1f266a2b3d32a95483960b21f561c6b3 commit 135f09735c91cb7c4bd6ddcf6b5cf2c924dcbb42 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Thu Jun 26 14:30:08 2014 +0100 Take into account drawing layer for data area size. The drawing layer could potentially have items that are outwith the data area, but we probably want to have them included for tiled rendering. Change-Id: I958c4fa29491cdb0fd80392dfcfa033306f2b76c commit 500c3807149101baedd739defb1f87b04b82ebf3 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Jun 18 09:33:16 2014 +0100 Implement data area size retrieval. Cell dimensions appear to be in TWIPs (but the drawing layer is in 100th mm). commit 22438d4974023d152e0a0697f2121174d1314a9c Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Wed Jun 18 08:28:04 2014 +0100 Allow overriding of device for Paint, and use that for Tiles. Paint handles figuring out which cells are within the visible area for us etc. Gridwin being a Window which paints to itself is a bit of a pain, since we now need to be able to reroute painting calls to alternative output devices, however these changes seem to be sufficient to at least get the cells in the desired tile rendered. Change-Id: I7bd1434c97acc6e9ef6e1e63cbcf039b987c88e4 commit 01184931dfe42fe3c87213b68b907a3507f3bfe4 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Mon Jun 16 16:19:56 2014 +0100 Calc: Add tiled rendering device to the paint view. This prevents the previous warnings of SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), \ this should never be needed Change-Id: I76cb7c9ed4d45bfcbd297f697314309b4e036f80 commit c0b791a90a40fff513dd92aef37d1a9d2990e0ce Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Mon Jun 16 15:00:02 2014 +0100 Render tiles from calc. Currently the document size and number of cells to be rendered is hardcoded, this will need some more work to select the correct cells for a given tile (i.e. cells from location). Also, there isn't really a "size" for a calc sheet, so presumably we'd need to instead return the area containing cells that aren't empty, whilst still being able to render larger tiles? (And in any case the client will need to be aware of this and provide an appropriate interface, i.e. the current LO UI simply extends the sheet ad-infinitum.) We also currently get some warnings most likely related to the way we push our OutputDevice into the rendering methods: SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), \ this should never be needed Change-Id: Ia9d64d7de6c22d5b401350f88497a7ec106f1973 commit 0bf465b6605749fee79c11acde9773ae19551b96 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Thu Jul 31 10:07:39 2014 +0200 Use one test instance to run all LOK tests. Recreating Office instances after destruction (when still within the same process) currently fails, hence we need to do all tests at once for now. Change-Id: Ic7652c909e1cd970fe1ee76995e61fb6aae8f96c _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits