slideshow1: merge with DEV300 m49

5 files changed, 32 insertions, 37 deletions

diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 0461bd86cdc8..a20d6900964e 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -87,37 +87,43 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
     Sequence< OUString > aFilterList( xFilters->getElementNames() );
     for ( int i = 0; i < aFilterList.getLength(); i++ )
     {
-        Sequence< PropertyValue > aFilterProperties;
-        if ( xFilters->getByName( aFilterList[ i ] ) >>= aFilterProperties )
+        try
         {
-            FilterEntry aFilterEntry;
-            sal_Bool bImpressFilter = sal_False;
-            for ( int j = 0; j < aFilterProperties.getLength(); j++ )
+            Sequence< PropertyValue > aFilterProperties;
+            if ( xFilters->getByName( aFilterList[ i ] ) >>= aFilterProperties )
             {
-                PropertyValue& rProperty( aFilterProperties[ j ] );
-                switch( TKGet( rProperty.Name ) )
+                FilterEntry aFilterEntry;
+                sal_Bool bImpressFilter = sal_False;
+                for ( int j = 0; j < aFilterProperties.getLength(); j++ )
                 {
-                    case TK_DocumentService :
+                    PropertyValue& rProperty( aFilterProperties[ j ] );
+                    switch( TKGet( rProperty.Name ) )
                     {
-                        rtl::OUString sDocumentService;
-                        rProperty.Value >>= sDocumentService;
-                        if ( sDocumentService == OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) )
-                            bImpressFilter = sal_True;
-                        else
-                            j = aFilterProperties.getLength();
+                        case TK_DocumentService :
+                        {
+                            rtl::OUString sDocumentService;
+                            rProperty.Value >>= sDocumentService;
+                            if ( sDocumentService == OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) )
+                                bImpressFilter = sal_True;
+                            else
+                                j = aFilterProperties.getLength();
+                        }
+                        break;
+                        case TK_Name :      rProperty.Value >>= aFilterEntry.maName; break;
+                        case TK_UIName :    rProperty.Value >>= aFilterEntry.maUIName; break;
+                        case TK_Type :      rProperty.Value >>= aFilterEntry.maType; break;
+                        case TK_Flags :     rProperty.Value >>= aFilterEntry.maFlags; break;
+                        default : break;
                     }
-                    break;
-                    case TK_Name :      rProperty.Value >>= aFilterEntry.maName; break;
-                    case TK_UIName :    rProperty.Value >>= aFilterEntry.maUIName; break;
-                    case TK_Type :      rProperty.Value >>= aFilterEntry.maType; break;
-                    case TK_Flags :     rProperty.Value >>= aFilterEntry.maFlags; break;
-                    default : break;
+                }
+                if ( bImpressFilter && ( ( aFilterEntry.maFlags & 3 ) == 3 ) )
+                {
+                    aFilterEntryList.push_back( aFilterEntry );
                 }
             }
-            if ( bImpressFilter && ( ( aFilterEntry.maFlags & 3 ) == 3 ) )
-            {
-                aFilterEntryList.push_back( aFilterEntry );
-            }
+        }
+        catch( Exception& )
+        {
         }
     }
 
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index ccea22662d32..a85a6e8e8247 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -183,7 +183,7 @@ namespace {
             return aMethods;
         }
     };
-
+#if 0 // code currently unused (see below)
     sal_Int32 queryDocumentTypeDialog( const uno::Reference<uno::XComponentContext>& xContext,
                                        const rtl::OUString&                          rFilename )
     {
@@ -208,6 +208,7 @@ namespace {
         else
             return xHandler->getSelectedItem();
     }
+#endif
 }
 
 class FileEmitContext : public pdfparse::EmitContext
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 7082a7c3c284..a478bef72d2d 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -215,10 +215,6 @@ sal_Int32 PDFIProcessor::getFontId( const FontAttributes& rAttr ) const
 
     return nFont;
 }
-void PDFIProcessor::setWordSpace( double fWordSpace)
-{
-    m_fWordSpace=fWordSpace;
-}
 
 // line diagnose block - start
 void PDFIProcessor::processGlyphLine()
@@ -351,7 +347,6 @@ void PDFIProcessor::processGlyphLine()
          {
                preSpaceNull=false;
               if( fNullSpaceBreakerAvaregeSpaceValue > m_GlyphsList[i].getPrevGlyphsSpace() )
-
               {
                 processGlyph( 0,
                                       m_GlyphsList[i],
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 603ea2015abd..06f738ea61a9 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -108,7 +108,6 @@ namespace pdfi
 
         void sortElements( Element* pElement, bool bDeep = false );
         void sortDocument( bool bDeep = false );
-        void setWordSpace( double fWordSpace);
 
     private:
         void processGlyphLine();
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 9d99097d0e22..6ec897891677 100755
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -160,7 +160,6 @@ class Parser
     void           readInt32( sal_Int32& o_Value );
     sal_Int32      readInt32();
     void           readInt64( sal_Int64& o_Value );
-    sal_Int64      readInt64();
     void           readDouble( double& o_Value );
     double         readDouble();
     void           readBinaryData( uno::Sequence<sal_Int8>& rBuf );
@@ -220,11 +219,6 @@ void Parser::readInt64( sal_Int64& o_Value )
     o_Value = readNextToken().toInt64();
 }
 
-sal_Int64 Parser::readInt64()
-{
-    return readNextToken().toInt64();
-}
-
 void Parser::readDouble( double& o_Value )
 {
     o_Value = readNextToken().toDouble();