[Libreoffice-commits] core.git: 2 commits - sc/qa vcl/unx
Caolán McNamara
caolanm at redhat.com
Thu Nov 24 09:52:33 UTC 2016
sc/qa/unit/range.cxx | 12 ++++--------
vcl/unx/gtk3/gtk3gtkframe.cxx | 6 ++++++
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit f9fee44d1b49d859f9ee6ab22cc34c758aac71f0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 24 09:51:07 2016 +0000
can have gtk >= 3.10.0 with cairo < 1.14.0
I imagine that without cairo 1.14.0 there's no point scaling, so force 1
then.
Change-Id: I0e778ed5a57f9ede9f4b78369c470b23b94fe82f
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5acb139..645f800 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1576,13 +1576,19 @@ void GtkSalFrame::AllocateFrame()
cairo_surface_destroy(m_pSurface);
#if GTK_CHECK_VERSION(3,10,0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
int scale = getDisplay()->IsOwnHiDpiScale() ? 1 : gtk_widget_get_scale_factor(m_pWindow);
+#else
+ int scale = 1;
+#endif
m_pSurface = gdk_window_create_similar_image_surface(widget_get_window(m_pWindow),
CAIRO_FORMAT_ARGB32,
aFrameSize.getX() * scale,
aFrameSize.getY() * scale,
scale);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
cairo_surface_set_device_scale(m_pSurface, scale, scale);
+#endif
#else
m_pSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
aFrameSize.getX(),
commit c7f2115d774485a235b671c82302dbf38841e3c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 24 09:07:01 2016 +0000
coverity#1394669 Uninitialized pointer field
and
coverity#1394670 Uninitialized pointer field
Change-Id: I5869ff5dc19a994d33d44313becec1eb590e31f8
diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/range.cxx
index c1e4214..9684344 100644
--- a/sc/qa/unit/range.cxx
+++ b/sc/qa/unit/range.cxx
@@ -29,14 +29,14 @@ public:
void testAddressParsing();
private:
- ScDocument *m_pDoc;
ScDocShellRef m_xDocShRef;
};
void ScAddressTest::testAddressParsing()
{
ScAddress aAddr;
- ScRefFlags nRes = aAddr.Parse("1", m_pDoc, formula::FormulaGrammar::CONV_OOO);
+ ScDocument& rDoc = m_xDocShRef->GetDocument();
+ ScRefFlags nRes = aAddr.Parse("1", &rDoc, formula::FormulaGrammar::CONV_OOO);
CPPUNIT_ASSERT_MESSAGE("Should fail to parse.", !(nRes & ScRefFlags::VALID));
}
@@ -49,8 +49,6 @@ void ScAddressTest::setUp()
SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
-
- m_pDoc = &m_xDocShRef->GetDocument();
}
void ScAddressTest::tearDown()
@@ -72,14 +70,14 @@ public:
void testRangeParsing();
private:
- ScDocument *m_pDoc;
ScDocShellRef m_xDocShRef;
};
void ScRangeTest::testRangeParsing()
{
ScRange aRange;
- ScRefFlags nRes = aRange.Parse(":1", m_pDoc, formula::FormulaGrammar::CONV_OOO);
+ ScDocument& rDoc = m_xDocShRef->GetDocument();
+ ScRefFlags nRes = aRange.Parse(":1", &rDoc, formula::FormulaGrammar::CONV_OOO);
CPPUNIT_ASSERT_MESSAGE("Should fail to parse.", !(nRes & ScRefFlags::VALID));
}
@@ -92,8 +90,6 @@ void ScRangeTest::setUp()
SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
-
- m_pDoc = &m_xDocShRef->GetDocument();
}
void ScRangeTest::tearDown()
More information about the Libreoffice-commits
mailing list