From a6e4f39c82a75fb2684d3563b9c2a7af3518d2bc Mon Sep 17 00:00:00 2001
From: Thomas Lange <tl@openoffice.org>
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 <os@openoffice.org>
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 <tl@openoffice.org>
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 <pl@openoffice.org>
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