Commits

hr  committed e66ad6b

#i10000: undo integration sw301bf02 (r264013) (sw/source/ui/dbui only); stuff went in via os117 as well)

  • Participants
  • Parent commits 3f16a2f

Comments (0)

Files changed (4)

File sw/source/ui/dbui/dbmgr.cxx

                 // the printer dialog does not come up
                 aPrintArgs.Put( SfxBoolItem( SID_ASYNCHRON, rMergeDesc.bPrintAsync ));
             }
-            else
-            {
-                rView.GetDocShell()->GetMedium()->GetItemSet()->Put( SfxBoolItem( SID_HIDDEN, sal_False ));
-            }
-
-
             // convert PropertyValues
             const beans::PropertyValue* pPrintOptions = rMergeDesc.aPrintOptions.getConstArray();
             for( sal_Int32 nOption = 0; nOption < rMergeDesc.aPrintOptions.getLength(); ++nOption)
             else
             {
                 SfxObjectShellRef xWorkDocSh( new SwDocShell( SFX_CREATE_MODE_INTERNAL ));
-                //the value 22 is used in the PrintMonitor for unknown reasons
-                xWorkDocSh->SetTitle( xDocShell->GetTitle( 22 ) );
                 SfxMedium* pWorkMed = new SfxMedium( sTempURL, STREAM_STD_READ, TRUE );
                 pWorkMed->SetFilter( pSfxFlt );
                 if( xWorkDocSh->DoLoad(pWorkMed) )

File sw/source/ui/dbui/dbui.src

 		CENTER = TRUE ;
 		Text [ en-US ] = "is being saved to" ;
 	};
-    FixedText FT_SAVING
-    {
-        Pos = MAP_APPFONT ( 6, 17 ) ;
-        Size = MAP_APPFONT (  100, 8 ) ;
-        CENTER = TRUE ;
-        Text [ en-US ] = "is being saved to" ;
-    };
 	FixedText FT_PRINTER
 	{
 		Pos = MAP_APPFONT ( 6, 28 ) ;
 	{
 		Text [ en-US ] = "Save-Monitor";
 	};
-    String STR_SAVEMON
-    {
-        Text [ en-US ] = "Save-Monitor";
-    };
 	Text [ en-US ] = "Print monitor" ;
 };
 

File sw/source/ui/dbui/mmoutputpage.cxx

     }
     return 0;
 }
-/*-- 17.07.2008 08:09:06---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-IMPL_LINK(SwMailMergeOutputPage, SaveCancelHdl_Impl, Button*, EMPTYARG )
-{
-    m_bCancelSaving = true;
-    return 0;
-}
 /*-- 17.05.2004 13:51:02---------------------------------------------------
 
   -----------------------------------------------------------------------*/
                 }
                 pFilter = aIter.Next();
             }
-            String sStat(SW_RES(STR_STATSTR_LETTER));
-            sStat += ' ';
-            sStat += String::CreateFromInt32( nDoc );
-            aSaveMonitor.aPrintInfo.SetText(sStat);
 
         }
         break;

File sw/source/ui/dbui/mmoutputpage.hxx

     long            m_nFromToFTPos;
     long            m_nFromToNFPos;
     long            m_nRBOffset;
+    
     bool            m_bCancelSaving;
 
     SwMailMergeWizard*  m_pWizard;
     DECL_LINK(SendDocumentsHdl_Impl, PushButton*);
     DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*);
     DECL_LINK(SaveCancelHdl_Impl, Button*);
-
 protected:
 		virtual bool    canAdvance() const;
         virtual void    ActivatePage();