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

[Tor Lillqvist]

 vcl/source/filter/wmf/emfwr.cxx |    8 ++------
 vcl/source/filter/wmf/wmfwr.cxx |   33 +++------------------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

New commits:
commit 277bcdf1d1b5bb6a172de7f9f9a7fe77c75e2e49
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 29 11:05:55 2016 +0300

    Get rid of some repetitive warnings about unimplemented MetaActionTypes
    
    Change-Id: I79b11918a7d1fd9d47dcf2f14f27924ab739c21f

diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index e71f14c..eeacabe 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -1517,15 +1517,11 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             case( MetaActionType::WALLPAPER ):
             case( MetaActionType::TEXTLINE ):
             case( MetaActionType::GRADIENTEX ):
-            {
-                // !!! >>> we don't want to support these actions
-            }
+                // Explicitly ignored cases
             break;
 
             default:
-                OSL_FAIL(OStringBuffer(
-                    "EMFWriter::ImplWriteActions: unsupported MetaAction #" ).
-                     append(static_cast<sal_Int32>(nType)).getStr());
+                // TODO: Implement more cases as necessary. Let's not bother with a warning.
             break;
         }
     }
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 6ab45c7..f89b1f5 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -1609,41 +1609,14 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                     break;
                 }
 
-                // Unsupported Actions
-                case MetaActionType::MASK:
-                case MetaActionType::MASKSCALE:
-                case MetaActionType::MASKSCALEPART:
-                {
-                    OSL_FAIL( "Unsupported action: MetaMask...Action!" );
-                }
-                break;
-
                 case MetaActionType::CLIPREGION:
-                break;
-
-                case MetaActionType::ISECTREGIONCLIPREGION:
-                {
-                    OSL_FAIL( "Unsupported action: MetaISectRegionClipRegionAction!" );
-                }
-                break;
-
-                case MetaActionType::MOVECLIPREGION:
-                {
-                    OSL_FAIL( "Unsupported action: MetaMoveClipRegionAction!" );
-                }
-                break;
-
                 case MetaActionType::TEXTLANGUAGE:
-                    SAL_FALLTHROUGH;
-                case( MetaActionType::COMMENT ): // ignore
+                case MetaActionType::COMMENT:
+                    // Explicitly ignored cases
                 break;
 
                 default:
-                {
-                    OSL_FAIL(OStringBuffer(
-                        "WMFWriter::WriteRecords: unsupported MetaAction #" ).
-                         append(static_cast<sal_Int32>(pMA->GetType())).getStr());
-                }
+                    // TODO: Implement more cases as necessary. Let's not bother with a warning.
                 break;
           }