INTEGRATION: CWS aw024 (1.31.18); FILE MERGED

2006/09/21 19:02:42 aw 1.31.18.11: RESYNC: (1.39-1.40); FILE MERGED
2006/07/04 12:49:45 aw 1.31.18.10: RESYNC: (1.38-1.39); FILE MERGED
2006/05/12 18:40:23 aw 1.31.18.9: RESYNC: (1.36-1.38); FILE MERGED
2006/01/30 18:58:03 aw 1.31.18.8: RESYNC: (1.35-1.36); FILE MERGED
2006/01/26 22:05:11 aw 1.31.18.7: RESYNC: (1.34-1.35); FILE MERGED
2005/09/18 04:03:02 aw 1.31.18.6: RESYNC: (1.33-1.34); FILE MERGED
2005/08/04 15:44:43 sj 1.31.18.5: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism
2005/05/19 12:31:20 aw 1.31.18.4: #i39529#
2005/05/13 15:55:16 aw 1.31.18.3: RESYNC: (1.32-1.33); FILE MERGED
2005/03/24 00:31:08 aw 1.31.18.2: RESYNC: (1.31-1.32); FILE MERGED
2004/12/23 16:52:38 aw 1.31.18.1: #i39525

svx/source/gallery2/galmisc.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: galmisc.cxx,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 05:16:47 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 13:26:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,11 @@
 #include <svtools/itempool.hxx>
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
+
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+
 #include "impgrf.hxx"
 #include "svdpage.hxx"
 #include "svdograf.hxx"
@@ -194,7 +199,6 @@ BOOL GallerySvDrawImport( SvStream& rIStm, FmFormModel& rModel )
         uno::Reference< io::XInputStream > xInputStream( new utl::OInputStreamWrapper( rIStm ) );
 
         rModel.GetItemPool().SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
-//BFS04     rModel.SetStreamingSdrModel( TRUE );
         uno::Reference< lang::XComponent > xComponent;
 
         bRet = SvxDrawingLayerImport( &rModel, xInputStream, xComponent, "com.sun.star.comp.Draw.XMLOasisImporter" );
@@ -204,8 +208,6 @@ BOOL GallerySvDrawImport( SvStream& rIStm, FmFormModel& rModel )
             bRet = SvxDrawingLayerImport( &rModel, xInputStream, xComponent, "com.sun.star.comp.Draw.XMLImporter" );
         }
 
-//        bRet = SvxDrawingLayerImport( &rModel, xInputStream );
-//BFS04     rModel.SetStreamingSdrModel( FALSE );
     }
 
     return bRet;
@@ -444,7 +446,9 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
                 if( mpFilter )
                 {
                     aProgressText = String( GAL_RESID( RID_SVXSTR_GALLERY_FILTER ) );
-                    mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) );
+//                  mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) );     // sj: progress wasn't working up from SO7 at all
+//                                                                                              // so I am removing this. The gallery progress should
+//                                                                                              // be changed to use the XStatusIndicator instead of XProgressMonitor
                 }
                 else
                     aProgressText = String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) );
@@ -460,8 +464,8 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
 
 GalleryProgress::~GalleryProgress()
 {
-    if( mpFilter )
-        mpFilter->SetUpdatePercentHdl( Link() );
+//  if( mpFilter )
+//      mpFilter->SetUpdatePercentHdl( Link() );
 }
 
 // ------------------------------------------------------------------------
@@ -472,14 +476,6 @@ void GalleryProgress::Update( ULONG nVal, ULONG nMaxVal )
         mxProgressBar->setValue( Min( (ULONG)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (ULONG) GALLERY_PROGRESS_RANGE ) );
 }
 
-// ------------------------------------------------------------------------
-
-IMPL_LINK( GalleryProgress, Update, GraphicFilter*, pFilter )
-{
-    Update( pFilter->GetPercent(), 100 );
-    return 0L;
-}
-
 // -----------------------
 // - GalleryTransferable -
 // -----------------------