diff options
author | Thomas Lange <tl@openoffice.org> | 2009-09-03 15:12:37 +0000 |
---|---|---|
committer | Thomas Lange <tl@openoffice.org> | 2009-09-03 15:12:37 +0000 |
commit | 4c0bd776257fb1ad287e34b4e1bcf4bb6cd2f822 (patch) | |
tree | 6e4fa864d25d7629229d6582cb75ba93831bb676 /sw/inc | |
parent | ffdf4f75143bbcc0061cbf8479490d9b6cb7d5f2 (diff) |
#i101242# printing from HTML source view
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/dbmgr.hxx | 3 | ||||
-rw-r--r-- | sw/inc/printdata.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotxdoc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 9e13058e90e6..51242f33f224 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -252,9 +252,6 @@ public: // Mischen von Datensaetzen in Felder BOOL MergeNew( const SwMergeDescriptor& rMergeDesc ); BOOL Merge(SwWrtShell* pSh); - // Mischen von Datensaetzen in Felder, dann drucken - BOOL MergePrint( SwView& rView, - SwPrtOptions& rOpt, SfxProgress& rProgress, BOOL bIsAPI ); // printing parts of a merge result document BOOL MergePrintDocuments( SwView& rView, SwPrtOptions& rOpt, SfxProgress& rProgress, BOOL bIsAPI ); diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 14303ad40d5d..345546deabec 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -60,7 +60,7 @@ class SwPrintUIOptions : public vcl::PrinterOptionsHelper OutputDevice* m_pLast; public: - SwPrintUIOptions( BOOL bWeb = FALSE ); + SwPrintUIOptions( bool bWeb, bool bSwSrcView ); ~SwPrintUIOptions(); bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp ); diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index e0fa90de0ac7..8e56039cd53e 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -234,9 +234,9 @@ class SwXTextDocument : public SwXTextDocumentBaseClass, void GetNumberFormatter(); // used for XRenderable implementation - SfxViewShell * GuessViewShell( const css::uno::Reference< css::frame::XController > xController = css::uno::Reference< css::frame::XController >() ); + SfxViewShell * GuessViewShell( /* out */ bool &rbIsSwSrcView, const css::uno::Reference< css::frame::XController > xController = css::uno::Reference< css::frame::XController >() ); SwDoc * GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport ); - SfxViewShell * GetRenderView( const SwPrintUIOptions &rOpt, bool bIsPDFExport ); + SfxViewShell * GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport ); rtl::OUString maBuildId; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 636608279dbb..36da231f1832 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -388,8 +388,7 @@ public: SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); //Wird intern fuer die Shell gerufen die Druckt. Formatiert die Seiten. - void CalcPagesForPrint( sal_uInt16 nMax, SfxProgress* pProgress = 0, - const String* pStr = NULL, ULONG nMergeAct = 0, ULONG nMergeCnt = 0 ); + void CalcPagesForPrint( sal_uInt16 nMax, SfxProgress* pProgress = 0 ); //All about fields. void UpdateFlds(sal_Bool bCloseDB = sal_False); |