make keynote detection a bit more robust

Change-Id: I947bc5867a6b61a923d47cad48d04ab5fc2769c9

1 files changed, 8 insertions, 1 deletions

diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 4b7b0296079a..f324a1f94c3f 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -256,7 +256,8 @@ throw( com::sun::star::uno::RuntimeException, std::exception )
 
     if ( confidence == libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART )
     {
-       assert( !bIsPackage );
+       if ( bIsPackage ) // we passed a directory stream, but the filter claims it's APXL file?
+           return OUString();
 
         const Reference < container::XChild > xChild( xContent, UNO_QUERY );
         if ( xChild.is() )
@@ -271,6 +272,12 @@ throw( com::sun::star::uno::RuntimeException, std::exception )
                     bUCBContentChanged = true;
                     bIsPackage = true;
                 }
+                else
+                {
+                    // The passed stream has been detected as APXL file, but its parent dir is not a valid Keynote
+                    // package? Something is wrong here...
+                    return OUString();
+                }
             }
         }
     }