diff options
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbui.src | 11 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.hxx | 2 |
4 files changed, 32 insertions, 1 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index d13311ed0828..10e5d48f28a2 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -506,6 +506,12 @@ 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) @@ -2895,6 +2901,8 @@ 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 cf6929437b3f..3c267fbf9f49 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -102,6 +102,13 @@ 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 ) ; @@ -128,6 +135,10 @@ 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 803ef93b9cdc..757b917e406d 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1016,6 +1016,14 @@ 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--------------------------------------------------- -----------------------------------------------------------------------*/ @@ -1103,6 +1111,10 @@ 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 6a02a8482416..a63bc19970e7 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -117,7 +117,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage long m_nFromToFTPos; long m_nFromToNFPos; long m_nRBOffset; - bool m_bCancelSaving; SwMailMergeWizard* m_pWizard; @@ -141,6 +140,7 @@ 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(); |