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

[Jochen Nitschke]

 filter/source/graphicfilter/icgm/cgm.hxx    |    1 +
 filter/source/graphicfilter/icgm/classx.cxx |   26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 8ad521d9147df325b7aee27d8e5c670a02e6afcf
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Thu Dec 15 10:48:16 2016 +0100

    convert macro to member function
    
    Change-Id: I4fe043b919a3ae438ee7fdfabcdb8d4e075b27cd
    Reviewed-on: https://gerrit.libreoffice.org/32037
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index e9651d1..0f3d686 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -101,6 +101,7 @@ class CGM
         double              ImplGetFloat( RealPrecision, sal_uInt32 nRealSize );
         sal_uInt32          ImplGetBitmapColor( bool bDirectColor = false );
         void                ImplSetMapMode();
+        void                ImplSetUnderlineMode();
         void                ImplMapDouble( double& );
         void                ImplMapX( double& );
         void                ImplMapY( double& );
diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx
index 4864f99..cfcff128 100644
--- a/filter/source/graphicfilter/icgm/classx.cxx
+++ b/filter/source/graphicfilter/icgm/classx.cxx
@@ -22,19 +22,19 @@
 #include <outact.hxx>
 
 
-#define ImplSetUnderlineMode()                                  \
-                                                                \
-    sal_uInt32 nMode = ImplGetUI16();                               \
-    switch ( nMode )                                            \
-    {                                                           \
-        case 1 : pElement->eUnderlineMode = UM_LOW; break;      \
-        case 2 : pElement->eUnderlineMode = UM_HIGH; break;     \
-        case 4 : pElement->eUnderlineMode = UM_STRIKEOUT; break;\
-        case 8 : pElement->eUnderlineMode = UM_OVERSCORE; break;\
-        default: pElement->eUnderlineMode = UM_OFF; break;      \
-    }                                                           \
+void CGM::ImplSetUnderlineMode()
+{
+    sal_uInt32 nMode = ImplGetUI16();
+    switch ( nMode )
+    {
+        case 1 : pElement->eUnderlineMode = UM_LOW; break;
+        case 2 : pElement->eUnderlineMode = UM_HIGH; break;
+        case 4 : pElement->eUnderlineMode = UM_STRIKEOUT; break;
+        case 8 : pElement->eUnderlineMode = UM_OVERSCORE; break;
+        default: pElement->eUnderlineMode = UM_OFF; break;
+    }
     pElement->nUnderlineColor = ImplGetBitmapColor();
-
+}
 
 void CGM::ImplDoClass6()
 {
@@ -48,7 +48,7 @@ void CGM::ImplDoClass6()
                 case 0 : /*inquire function support */break;
                 case -1 : /*set underline mode*/
                 {
-                    ImplSetUnderlineMode()
+                    ImplSetUnderlineMode();
                 }
                 break;
                 case -2 : /*set script mode */break;