[Libreoffice-commits] core.git: 2 commits - sfx2/source vcl/headless

[Caolán McNamara]

 sfx2/source/doc/guisaveas.cxx |    6 +++---
 vcl/headless/svpgdi.cxx       |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d1419cf8ff4e9f502443012a4e8c31fa25532032
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 12:22:24 2015 +0100

    need cairo >= 1.10.0 for these features
    
    Change-Id: I8e1e45caadc6cc537f27a194851dd00b1f1d0e89

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 66d398a..3131410 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -107,7 +107,7 @@ namespace
         if (rBuffer->getScanlineFormat() != basebmp::Format::ThirtyTwoBitTcMaskBGRX)
             return false;
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
         basegfx::B2IVector size = rBuffer->getSize();
         sal_Int32 nStride = rBuffer->getScanlineStride();
         return (cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, size.getX()) == nStride);
@@ -141,7 +141,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
     bool bRet = false;
     (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
 #if ENABLE_CAIRO_CANVAS
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
     if (m_bUseLineColor || !m_bUseFillColor)
         return bRet;
 
commit fa709289806801b04f34fb780b655e29fe193959
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 10:43:11 2015 +0100

    this is assigned back to a sal_Int8 anyway
    
    Change-Id: I3b1a4b30da3c538e347758e01dbe2f1cecc4a0e7

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 3d98457..306202f 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -147,9 +147,9 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
 }
 
 
-static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName )
+static sal_Int8 getStoreModeFromSlotName( const OUString& aSlotName )
 {
-    sal_uInt8 nResult = 0;
+    sal_Int8 nResult = 0;
     if ( aSlotName == "ExportTo" )
         nResult = EXPORT_REQUESTED;
     else if ( aSlotName == "ExportToPDF" )
@@ -161,7 +161,7 @@ static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName )
     else if ( aSlotName == "SaveAs" )
         nResult = SAVEAS_REQUESTED;
     else if ( aSlotName == "SaveAsRemote" )
-        nResult = static_cast<sal_uInt8>(SAVEASREMOTE_REQUESTED);
+        nResult = SAVEASREMOTE_REQUESTED;
     else
         throw task::ErrorCodeIOException(
             ("getStoreModeFromSlotName(\"" + aSlotName