INTEGRATION: CWS impress91 (1.102.100); FILE MERGED

2006/04/04 10:50:48 cl 1.102.100.1: do not export notes and handout stuff in draw

xmloff/source/draw/sdxmlexp.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdxmlexp.cxx,v $
  *
- *  $Revision: 1.103 $
+ *  $Revision: 1.104 $
  *
- *  last change: $Author: vg $ $Date: 2006-04-07 14:54:10 $
+ *  last change: $Author: kz $ $Date: 2006-04-26 20:43:30 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -656,6 +656,8 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
     // #88245# init mnObjectCount once, use counter itself as flag. It
     // is initialized to 0.
     if(!mnObjectCount)
+    {
+        if( IsImpress() )
         {
              // #91587# add handout master count
             Reference<presentation::XHandoutMasterSupplier> xHandoutSupp(GetModel(), UNO_QUERY);
@@ -671,6 +673,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
                     }
                 }
             }
+        }
 
         if(mxDocMasterPages.is())
         {
@@ -684,6 +687,8 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
                     mnObjectCount += ImpRecursiveObjectCount(xMasterPage);
                 }
 
+                if( IsImpress() )
+                {
                     // #91587# take notes pages from master pages into account
                     Reference<presentation::XPresentationPage> xPresPage;
                     if((aAny >>= xPresPage) && xPresPage.is())
@@ -700,6 +705,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
                     }
                 }
             }
+        }
 
         if(mxDocDrawPages.is())
         {
@@ -713,6 +719,8 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
                     mnObjectCount += ImpRecursiveObjectCount(xPage);
                 }
 
+                if( IsImpress() )
+                {
                     // #91587# take notes pages from draw pages into account
                     Reference<presentation::XPresentationPage> xPresPage;
                     if((aAny >>= xPresPage) && xPresPage.is())
@@ -729,6 +737,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
                     }
                 }
             }
+        }
 
         // #82003# init progress bar
         GetProgressBarHelper()->SetReference(mnObjectCount);
@@ -1441,15 +1450,18 @@ ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetOrCreatePageMasterInfo( Reference< X
 
 void SdXMLExport::ImpPrepPageMasterInfos()
 {
+    if( IsImpress() )
+    {
         // create page master info for handout master page
-    Reference< XDrawPage > xMasterPage;
 
         Reference< XHandoutMasterSupplier > xHMS( GetModel(), UNO_QUERY );
         if( xHMS.is() )
-        xMasterPage = xHMS->getHandoutMasterPage();
-
+        {
+            Reference< XDrawPage > xMasterPage( xHMS->getHandoutMasterPage() );
             if( xMasterPage.is() )
                 mpHandoutPageMaster = ImpGetOrCreatePageMasterInfo(xMasterPage);
+        }
+    }
 
     // create page master infos for master pages
     if(mnDocMasterPageCount)
@@ -1457,7 +1469,7 @@ void SdXMLExport::ImpPrepPageMasterInfos()
         // look for needed page-masters, create these
         for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++)
         {
-            mxDocMasterPages->getByIndex(nMPageId) >>= xMasterPage;
+            Reference< XDrawPage > xMasterPage( mxDocMasterPages->getByIndex(nMPageId), UNO_QUERY );
             ImpXMLEXPPageMasterInfo* pNewInfo = 0L;
 
             if(xMasterPage.is())
@@ -1860,7 +1872,8 @@ void SdXMLExport::ImpPrepMasterPageInfos()
         maMasterPagesStyleNames[nCnt] = ImpCreatePresPageStyleName( xDrawPage );
     }
 
-
+    if( IsImpress() )
+    {
         Reference< presentation::XHandoutMasterSupplier > xHandoutSupp( GetModel(), UNO_QUERY );
         if( xHandoutSupp.is() )
         {
@@ -1871,6 +1884,7 @@ void SdXMLExport::ImpPrepMasterPageInfos()
                 maHandoutMasterStyleName = ImpCreatePresPageStyleName( xHandoutPage, false );
             }
         }
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////////