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

[ayhanyalcinsoy (via logerrit)]

 oox/source/export/shapes.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 451eab287acd88abc19c97bd99e50cbfa4480bb4
Author:     ayhanyalcinsoy <ayhanyalcinsoy at pisilinux.org>
AuthorDate: Sat Jan 4 09:50:28 2020 +0300
Commit:     Regina Henschel <rb.henschel at t-online.de>
CommitDate: Sat Jan 25 11:43:56 2020 +0100

    tdf#128049:FILESAVE PPTX Improve export of shape 'forbidden'
    
    Change-Id: I68e0364acd62962785c1e2dc0ee6a1791cf7bc9f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86154
    Tested-by: Jenkins
    Reviewed-by: Regina Henschel <rb.henschel at t-online.de>

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5dedd509d2ff..be650130f2b1 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -562,6 +562,7 @@ static bool lcl_IsOnBlacklist(OUString const & rShapeType)
         "cube",
         "paper",
         "frame",
+        "forbidden",
         "smiley",
         "sun",
         "flower",
@@ -620,7 +621,6 @@ static bool lcl_IsOnBlacklist(OUString const & rShapeType)
 static bool lcl_IsOnWhitelist(OUString const & rShapeType)
 {
     static const std::initializer_list<OUStringLiteral> vWhitelist = {
-        "forbidden",
         "heart",
         "puzzle"
     };
@@ -985,6 +985,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
             case mso_sptDonut:
             case mso_sptSun:
             case mso_sptMoon:
+            case mso_sptNoSmoking:
             case mso_sptHorizontalScroll:
             case mso_sptBevel:
             case mso_sptBracketPair: