[Libreoffice-commits] core.git: 4 commits - canvas/source connectivity/source sw/source
Caolán McNamara
caolanm at redhat.com
Sun Aug 21 12:06:02 UTC 2016
canvas/source/cairo/cairo_canvashelper.cxx | 23 --------------------
connectivity/source/drivers/firebird/Connection.hxx | 7 ------
sw/source/core/inc/unoport.hxx | 4 +--
sw/source/core/unocore/unoredline.cxx | 4 +--
4 files changed, 5 insertions(+), 33 deletions(-)
New commits:
commit 782dffe709158b1060a29f2882c8b72fe221bb7b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 13:00:36 2016 +0100
coverity#1371619 Uncaught exception
Change-Id: I29f297eeef071c322d7056612d374775acabe755
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index a3398b6..5a96789 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -297,7 +297,7 @@ public:
static css::uno::Any GetPropertyValue(
OUString const& PropertyName, SwRangeRedline const& rRedline) throw (std::exception);
static css::uno::Sequence< css::beans::PropertyValue > CreateRedlineProperties(
- SwRangeRedline const& rRedline, bool const bIsStart) throw();
+ SwRangeRedline const& rRedline, bool const bIsStart) throw (std::exception);
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index a6120f2..113fb9b 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -315,7 +315,7 @@ uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, co
}
uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties(
- const SwRangeRedline& rRedline, bool bIsStart ) throw()
+ const SwRangeRedline& rRedline, bool bIsStart ) throw (std::exception)
{
uno::Sequence< beans::PropertyValue > aRet(12);
const SwRedlineData* pNext = rRedline.GetRedlineData().Next();
commit 7e35227ee719ba5870903b5b1b06aa0220bb6080
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 12:59:53 2016 +0100
coverity#1371620 Uncaught exception
Change-Id: I001a977419624267d887c2c603523aa0cf7d0e56
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 32b5e8e..a3398b6 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -295,7 +295,7 @@ public:
bool const bIsStart);
static css::uno::Any GetPropertyValue(
- OUString const& PropertyName, SwRangeRedline const& rRedline) throw();
+ OUString const& PropertyName, SwRangeRedline const& rRedline) throw (std::exception);
static css::uno::Sequence< css::beans::PropertyValue > CreateRedlineProperties(
SwRangeRedline const& rRedline, bool const bIsStart) throw();
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index c6b4fdb..a6120f2 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -276,7 +276,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) th
return css::uno::Sequence<sal_Int8>();
}
-uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline ) throw()
+uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline ) throw(std::exception)
{
uno::Any aRet;
if(rPropertyName == UNO_NAME_REDLINE_AUTHOR)
commit 982fbb183e159c90e6aec17c648d7f6bc45c9c20
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 12:56:15 2016 +0100
coverity#1371622 Uninitialized scalar field
Change-Id: Id1408665b01889eabe449047f2d8f62229aeeb16
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index c35758c..2bd7675 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -93,13 +93,6 @@ namespace connectivity
bool m_bIsEmbedded;
/**
- * Denotes that the database stored in the .odb file is an
- * archive file (.fbk). Older version of LO had a .fdb file, not a
- * .fbk.
- * (Only used if m_bIsEmbedded is true).
- */
- bool m_bIsFbkStored;
- /**
* Handle for the parent DatabaseDocument. We need to notify this
* whenever any data is written to our temporary database so that
* the user is able to save this back to the .odb file.
commit 43297fc501cd51982db1e7ed1fa1d4a1c18d0871
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 21 12:53:03 2016 +0100
Related: tdf#86473 git rid of special pixel snapping for rectangles
Change-Id: Ia9ab5c58975df2de8c261d92a866cbe264d03205
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 9b64c08..4f28f5d 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -973,27 +973,6 @@ namespace cairocanvas
if( nPointCount > 1)
{
bool bIsBezier = aPolygon.areControlPointsUsed();
- bool bIsRectangle = ::basegfx::tools::isRectangle(aPolygon);
- if (bIsRectangle)
- {
- //tdf#86473, if this rectangle will end up after rounding
- //to have no area, then nothing will be drawn, so remove
- //such rectangles from the rounding optimization(?) effort
- basegfx::B2DRange aRange = ::basegfx::tools::getRange(aPolygon);
- double x1 = aRange.getMinX();
- double x2 = aRange.getMaxX();
- double y1 = aRange.getMinY();
- double y2 = aRange.getMaxY();
- cairo_matrix_transform_point(&aOrigMatrix, &x1, &y1);
- cairo_matrix_transform_point(&aOrigMatrix, &x2, &y2);
- basegfx::B2DRange aRoundedRange(basegfx::fround(x1),
- basegfx::fround(y1),
- basegfx::fround(x2),
- basegfx::fround(y2));
- bIsRectangle = aRoundedRange.getWidth() != 0.0 &&
- aRoundedRange.getHeight() != 0.0;
- }
-
::basegfx::B2DPoint aA, aB, aP;
for( sal_uInt32 j=0; j < nExtendedPointCount; j++ )
@@ -1004,7 +983,7 @@ namespace cairocanvas
nY = aP.getY();
cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY );
- if( ! bIsBezier && (bIsRectangle || aOperation == Clip) )
+ if (!bIsBezier && aOperation == Clip)
{
nX = basegfx::fround( nX );
nY = basegfx::fround( nY );
More information about the Libreoffice-commits
mailing list