From 978512c43c879021aa4d8a0f5b94cd56b45455d1 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Thu, 30 Sep 2010 15:55:00 +0200
Subject: sw34refactor1: SwXTextView: remove unused parameter from
 BuildTmpSelectionDoc()

---
 sw/source/ui/uiview/view.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sw/source/ui/uiview/view.cxx')

diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 15c94782883f..dc05a1fdcddd 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -1912,8 +1912,7 @@ SfxObjectShellRef & SwView::GetOrCreateTmpSelectionDoc()
     if (!rxTmpDoc.Is())
     {
         SwXTextView *pImpl = GetViewImpl()->GetUNOObject_Impl();
-        rxTmpDoc = pImpl->BuildTmpSelectionDoc(
-                    GetViewImpl()->GetEmbeddedObjRef() );
+        rxTmpDoc = pImpl->BuildTmpSelectionDoc();
     }
     return rxTmpDoc;
 }
-- 
cgit 


From 5104cfc4b35a32ff3871dcd8f60079ceff2a608d Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Thu, 30 Sep 2010 16:03:07 +0200
Subject: sw34refactor1: remove obsolete (due to printer refactoring) class
 SwPrtOptions:  remove SwPrtOptions instances with SwPrintData.  replace
 SwPrtOptions::MakeOptions() with sw::InitPrintOptionsFromApplication().  move
 some constants from swprtopt.hxx to printdata.hxx.  remove swprtopt.hxx.

---
 sw/source/ui/uiview/view.cxx | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'sw/source/ui/uiview/view.cxx')

diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index dc05a1fdcddd..b1fd76c63aff 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -94,7 +94,6 @@
 #include <frmui.hrc>
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
-#include <swprtopt.hxx>
 #include <linguistic/lngprops.hxx>
 #include <editeng/unolingu.hxx>
 //#include <sfx2/app.hxx>
@@ -1926,17 +1925,12 @@ void SwView::AddTransferable(SwTransferable& rTransferable)
 
 /* --------------------------------------------------*/
 
-void SwPrtOptions::MakeOptions( BOOL bWeb )
-{
-    *this = *SW_MOD()->GetPrtOptions(bWeb);
-
-    nCopyCount = 1;
-    bCollate = FALSE;
-    bPrintSelection = FALSE;
-    bJobStartet = FALSE;
+namespace sw {
 
-    aMulti.SetTotalRange( Range( 0, RANGE_MAX ) );
-    aMulti.SelectAll();
-    aMulti.Select( 0, FALSE );
+void InitPrintOptionsFromApplication(SwPrintData & o_rData, bool const bWeb)
+{
+    o_rData = *SW_MOD()->GetPrtOptions(bWeb);
 }
 
+} // namespace sw
+
-- 
cgit