From a6e4f39c82a75fb2684d3563b9c2a7af3518d2bc Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 14 Aug 2009 13:56:56 +0000 Subject: #i101242# new print UI --- sw/source/ui/inc/view.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 7ddfc2775299..0fb458573a61 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -88,7 +88,7 @@ class SwPrtOptions; class SwTransferable; class SwMailMergeConfigItem; class SwTxtNode; // #i23726# -struct SwPrintData; +class SwPrintData; class SwFormatClipboard; struct SwConversionArgs; class Graphic; -- cgit From 0d2b77c567c563b19ae4ed32a31d927282860129 Mon Sep 17 00:00:00 2001 From: Oliver Specht Date: Tue, 1 Sep 2009 07:59:10 +0000 Subject: #i101242# DoPrint removed --- sw/source/ui/inc/view.hxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 0fb458573a61..92788e714c4f 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -424,8 +424,6 @@ public: virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, - BOOL bSilent, BOOL bIsAPI ); ShellModes GetShellMode(); com::sun::star::view::XSelectionSupplier* GetUNOObject(); @@ -691,4 +689,4 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, BOOL bPreview); -#endif +#endif \ No newline at end of file -- cgit From 8b9588e75bd53b64fa3d1cd0a006a14e74578f96 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 1 Sep 2009 15:16:12 +0000 Subject: #i101242# applying view options and formatting doc now only done in getRendererCount --- sw/source/ui/inc/view.hxx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 92788e714c4f..d122df20c408 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -630,10 +630,6 @@ public: //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); - // get print options (SwPrtOptions) - static void MakeOptions( PrintDialog* pDlg, SwPrtOptions& rOpts, - BOOL* pPrtProspect, BOOL* pPrtProspect_RTL, BOOL bWeb, SfxPrinter* pPrt, SwPrintData* pData ); - SwView(SfxViewFrame* pFrame, SfxViewShell*); ~SwView(); -- cgit From 65756e786d115472d3607724456888d325608a95 Mon Sep 17 00:00:00 2001 From: Philipp Lohmann Date: Tue, 1 Sep 2009 16:31:53 +0000 Subject: remove warnings --- sw/source/ui/inc/view.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index d122df20c408..b181c85fa5ae 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -685,4 +685,5 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, BOOL bPreview); -#endif \ No newline at end of file +#endif + -- cgit From 55f1f483cfa4cde111593782f17c514a0056d7f0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 8 Jan 2010 18:32:51 +0100 Subject: #i107450#: build all other modules with new editeng lib --- sw/source/ui/inc/view.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 7ddfc2775299..94e64c7493b8 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -35,9 +35,9 @@ #include #include #include // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell) -#include +#include #include -#include +#include #include "swdllapi.h" #include #include -- cgit From a3dad64d25dfe6ef0297d6d2fbaf72fcef5017fb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 13 Jan 2010 22:25:07 +0100 Subject: #i107450#: move more code out of svx --- sw/source/ui/inc/view.hxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 94e64c7493b8..9dfde47be3dc 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -32,6 +32,7 @@ #include #include +#include #include #include #include // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell) @@ -197,6 +198,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* pReplList; + SvxHtmlOptions aHTMLOpt; Timer aTimer; //Fuer verzoegerte ChgLnks waehrend //einer Aktion String aPageStr; //Statusanzeige, aktuelle Seite @@ -306,6 +308,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * ); SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* ); + SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); inline long GetXScroll() const; inline long GetYScroll() const; -- cgit From 1a359bd2a8d7621574942287703e7df69ebffa16 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- sw/source/ui/inc/view.hxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sw/source/ui/inc/view.hxx') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index b181c85fa5ae..83d0f1b40e09 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: view.hxx,v $ - * $Revision: 1.60 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify -- cgit