sc/source/ui/view/gridwin.cxx | 7 +++++--
sc/source/ui/view/tabview.cxx | 4 ++--
svx/source/svdraw/svdpdf.hxx | 17 ++++++++---------
3 files changed, 15 insertions(+), 13 deletions(-)
New commits:
commit be67fab68eb974e78686f8f9a2583af27d1119d4
Author: Marco Cecchetti <mrcek...@gmail.com>
AuthorDate: Sat Oct 27 17:25:06 2018 +0000
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Wed Nov 7 16:31:59 2018 +0100
lok: sc: make hi-dpi/zoom compatible with retrieving cell cursor
A bit different approach than trying to handle different zoom levels
at the samet time: instead, always handle the spreadsheet at 100%, but
use cairo to scale to the actual zoom level.
Change-Id: I318aec8fa4baaab2ee1f271223b2e10e26d41fcf
(cherry picked from commit 201045f9c47d219a2aa3a6571a48a92e6ac6569e)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 400b2ee959a7..5bce39050830 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5631,7 +5631,7 @@ OString ScGridWindow::getCellCursor( int nOutputWidth,
int nOutputHeight,
return getCellCursor(zoomX, zoomY);
}
-OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction&
rZoomY) const
+OString ScGridWindow::getCellCursor(const Fraction& /*rZoomX*/, const
Fraction& /*rZoomY*/) const
{
// GridWindow stores a shown cell cursor in mpOOCursors, hence
// we can use that to determine whether we would want to be showing
@@ -5647,7 +5647,10 @@ OString ScGridWindow::getCellCursor(const Fraction&
rZoomX, const Fraction& rZoo
Fraction defaultZoomX = pViewData->GetZoomX();
Fraction defaultZoomY = pViewData->GetZoomY();
- pViewData->SetZoom(rZoomX, rZoomY, true);
+ // hardcode to what we mean as 100% (256px tiles meaning 3840 twips)
+ Fraction aFracX(long(256 * TWIPS_PER_PIXEL), 3840);
+ Fraction aFracY(long(256 * TWIPS_PER_PIXEL), 3840);
+ pViewData->SetZoom(aFracX, aFracY, true);
Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );
long nSizeXPix;
commit 681f771daf74e3a788cd1be0f85636a57000c46c
Author: Marco Cecchetti <mrcek...@gmail.com>
AuthorDate: Sat Oct 27 17:15:35 2018 +0000
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Wed Nov 7 16:31:49 2018 +0100
lok: calc: fix needed when position caching is disabled
In case it would be needed to disable position caching we can't
retrieve the nTotalPixels value from the LOKHeight/WidthHelper.
The new code works in both cases.
Change-Id: I65562dd4458eee40c5db958067fc91af6b3eb79e
(cherry picked from commit 2cadae31dc3b041650d89c94225923ba3839e8c1)
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7c730e7d0a29..520dafa3cd18 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2589,7 +2589,7 @@ OUString ScTabView::getRowColumnHeaders(const
tools::Rectangle& rRectangle)
aBuffer.append("\"rows\": [\n");
- long nTotalPixels = aViewData.GetLOKHeightHelper().getPosition(nStartRow);
+ long nTotalPixels = nStartHeightPx;
SAL_INFO("sc.lok.header", "Row Header: [create string data for rows]:
start row: "
<< nStartRow << " start height: " << nTotalPixels);
@@ -2728,7 +2728,7 @@ OUString ScTabView::getRowColumnHeaders(const
tools::Rectangle& rRectangle)
aBuffer.append("\"columns\": [\n");
- nTotalPixels = aViewData.GetLOKWidthHelper().getPosition(nStartCol);
+ nTotalPixels = nStartWidthPx;
SAL_INFO("sc.lok.header", "Col Header: [create string data for cols]:
start col: "
<< nStartRow << " start width: " << nTotalPixels);
commit f5ae3fc056408a55365b04d45f98de64b667ab3c
Author: Marco Cecchetti <mrcek...@gmail.com>
AuthorDate: Sat Oct 27 16:53:10 2018 +0000
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Wed Nov 7 16:31:38 2018 +0100
fix compiler error: shadows a member of 'this'
Fix an annoying bug reported by compiler (warnings as errors enabled)
Moreover there are some minor change in formatting reported by
clang-format commit-hook
Change-Id: I148b0bc3384e9fab070bba4df5b15cbb44ece930
(cherry picked from commit e30214acc7f9d527876354200c8b9b792a323ecf)
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index a4a59a8bff82..6b4b0d63a816 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -41,7 +41,7 @@ class SdrPage;
class SdrObject;
class SvdProgressInfo;
typedef struct fpdf_document_t__* FPDF_DOCUMENT;
-typedef struct fpdf_pageobject_t__* FPDF_PAGEOBJECT; // (text, path, etc.)
+typedef struct fpdf_pageobject_t__* FPDF_PAGEOBJECT; // (text, path, etc.)
typedef struct fpdf_textpage_t__* FPDF_TEXTPAGE;
// Helper Class to import PDF
@@ -60,13 +60,13 @@ class ImpSdrPdfImport final
{
}
- Matrix(double a, double b, double c, double d, double e, double f)
- : ma(a)
- , mb(b)
- , mc(c)
- , md(d)
- , me(e)
- , mf(f)
+ Matrix(double da, double db, double dc, double dd, double de, double
df)
+ : ma(da)
+ , mb(db)
+ , mc(dc)
+ , md(dd)
+ , me(de)
+ , mf(df)
{
}
@@ -87,7 +87,6 @@ class ImpSdrPdfImport final
double d() const { return md; }
double e() const { return me; }
double f() const { return mf; }
-
/// Mutliply this * other.
void Concatinate(const Matrix& other)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
