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

4 files changed, 1 insertions, 32 deletions

diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 84c02d1dd0..d26675847e 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -506,12 +506,6 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
                 // 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)
@@ -2901,8 +2895,6 @@ void SwNewDBMgr::ExecuteFormLetter(	SwWrtShell& rSh,
             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) )
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 4ddb31a697..62f17960cc 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -102,13 +102,6 @@ ModelessDialog DLG_PRINTMONITOR
         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 ) ;
@@ -135,10 +128,6 @@ ModelessDialog DLG_PRINTMONITOR
     {
         Text [ en-US ] = "Save-Monitor";
     };
-    String STR_SAVEMON
-    {
-        Text [ en-US ] = "Save-Monitor";
-    };
     Text [ en-US ] = "Print monitor" ;
 };
 
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 407b2ffca7..fd044a248e 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1016,14 +1016,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
     }
     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---------------------------------------------------
 
   -----------------------------------------------------------------------*/
@@ -1111,10 +1103,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
                 }
                 pFilter = aIter.Next();
             }
-            String sStat(SW_RES(STR_STATSTR_LETTER));
-            sStat += ' ';
-            sStat += String::CreateFromInt32( nDoc );
-            aSaveMonitor.aPrintInfo.SetText(sStat);
 
         }
         break;
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 0163d26835..5432ce1a83 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -117,6 +117,7 @@ class SwMailMergeOutputPage : public svt::OWizardPage
     long            m_nFromToFTPos;
     long            m_nFromToNFPos;
     long            m_nRBOffset;
+    
     bool            m_bCancelSaving;
 
     SwMailMergeWizard*  m_pWizard;
@@ -140,7 +141,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage
     DECL_LINK(SendDocumentsHdl_Impl, PushButton*);
     DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*);
     DECL_LINK(SaveCancelHdl_Impl, Button*);
-
 protected:
         virtual bool    canAdvance() const;
         virtual void    ActivatePage();