New branch 'private/ajrhunt/c4' available with the following commits: commit 56138f038bb5ed5df136ad6b048ea13c7633a2d8 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 561fe695470adac3c1b2b8d10d4cec53b111768f 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 4bb5d07d2c2cc31daf286c337ea930ee25adbaab 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 274e7d6b6d300f67be7fab94b1ee3beecb0ace55 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 db75d120f415c39aec229f8a70a29629d84944ee 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 135a166c4ae6900230d62dad97898dead334c327 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 d1ad5c0ac1bf9a545338f13f23d2464f065e702b 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 bb54060261c053ced0ef1c398feada8570410da7 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 bddc9856fd323566401540d8ce838f1354a505f4 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 e7a260c0d35d0ea5481cd57000efe66b9e813aaf 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 d5cd9c1d4ddb7b68590322694797dc2978c784a7 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Aug 15 09:52:58 2014 +0200 aScrSize should be mutable. Change-Id: I7376ea17aa4f66c9d9085757b84fb69dd0ad71cb commit 21db820147386e484b08106621a2f6bbb2565a2d Author: Andrzej Hunt <andr...@ahunt.org> Date: Tue Sep 9 06:12:44 2014 +0200 Fix PaintTile scaling preparation. Change-Id: I0a725fd5c030f3c089c2bbd25947088c321eb2d4 commit 16e3cc87092b6b3f9fdea5e60e02012e75584d6e 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 e41c2a95b5e3aab633b1c154d65ad6144b06b4f7 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 ea293f900fa6cfcbf254696ebb5dbc73bde87358 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 25203ba0f60348e0279dfade61e392a85d64590c 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 bfa2c9570237e42a27421968de79afcc5b5cdf78 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 6be194d3a6f0fb81114ce6467c1bf86d82216eb0 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits