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

[Tor Lillqvist]

 vcl/source/gdi/pdfwriter_impl.cxx  |   20 ++++++++++----------
 vcl/source/gdi/pdfwriter_impl2.cxx |    4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1ef4b31e33d47a15ad643156ac9151961b71b712
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 9 23:03:13 2013 +0300

    Fix C++11ism (?)
    
    Change-Id: I133303e9501414aca0eadddc2ecc14a9d29d6488

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e3d9ecf..305c4ca 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9489,8 +9489,8 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
                   "<</FunctionType 0\n");
     switch (rObject.m_aGradient.GetStyle())
     {
-        case GradientStyle::GradientStyle_LINEAR:
-        case GradientStyle::GradientStyle_AXIAL:
+        case GradientStyle_LINEAR:
+        case GradientStyle_AXIAL:
             aLine.append("/Domain[ 0 1]\n");
             break;
         default:
@@ -9499,10 +9499,10 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
     aLine.append("/Size[ " );
     switch (rObject.m_aGradient.GetStyle())
     {
-        case GradientStyle::GradientStyle_LINEAR:
+        case GradientStyle_LINEAR:
             aLine.append('2');
             break;
-        case GradientStyle::GradientStyle_AXIAL:
+        case GradientStyle_AXIAL:
             aLine.append('3');
             break;
         default:
@@ -9532,12 +9532,12 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
     sal_uInt8 aCol[3];
     switch (rObject.m_aGradient.GetStyle())
     {
-        case GradientStyle::GradientStyle_AXIAL:
+        case GradientStyle_AXIAL:
             aCol[0] = rObject.m_aGradient.GetEndColor().GetRed();
             aCol[1] = rObject.m_aGradient.GetEndColor().GetGreen();
             aCol[2] = rObject.m_aGradient.GetEndColor().GetBlue();
             CHECK_RETURN( writeBuffer( aCol, 3 ) );
-        case GradientStyle::GradientStyle_LINEAR:
+        case GradientStyle_LINEAR:
         {
             aCol[0] = rObject.m_aGradient.GetStartColor().GetRed();
             aCol[1] = rObject.m_aGradient.GetStartColor().GetGreen();
@@ -9588,8 +9588,8 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
     aLine.append( " 0 obj\n");
     switch (rObject.m_aGradient.GetStyle())
     {
-        case GradientStyle::GradientStyle_LINEAR:
-        case GradientStyle::GradientStyle_AXIAL:
+        case GradientStyle_LINEAR:
+        case GradientStyle_AXIAL:
             aLine.append("<</ShadingType 2\n");
             break;
         default:
@@ -9625,8 +9625,8 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
 
     switch (rObject.m_aGradient.GetStyle())
     {
-        case GradientStyle::GradientStyle_LINEAR:
-        case GradientStyle::GradientStyle_AXIAL:
+        case GradientStyle_LINEAR:
+        case GradientStyle_AXIAL:
         {
             aLine.append("/Domain[ 0 1 ]\n"
                     "/Coords[ " );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 0fd93ad..9484df2 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -2049,8 +2049,8 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess* i_pBitmap )
 static bool lcl_canUsePDFAxialShading(const Gradient& rGradient) {
     switch (rGradient.GetStyle())
     {
-        case GradientStyle::GradientStyle_LINEAR:
-        case GradientStyle::GradientStyle_AXIAL:
+        case GradientStyle_LINEAR:
+        case GradientStyle_AXIAL:
             break;
         default:
             return false;