diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-11-10 14:39:06 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-11-10 14:39:06 +0100 |
| commit | 05f5182e2e42c9bdd2efa8ddd9997290f2d82e8f (patch) | |
| tree | a922915f4ab08af994ff64e43e921955f8931470 /sw/source/ui/uiview/view.cxx | |
| parent | fc6443a92f54248125638bc7fc32a3026cf2038f (diff) | |
| parent | ca2e5d3b551e1b7bcc0b4f0c37b431927f6cbbff (diff) | |
rebase to DEV300_m92
Diffstat (limited to 'sw/source/ui/uiview/view.cxx')
| -rw-r--r-- | sw/source/ui/uiview/view.cxx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 15c94782883f..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> @@ -1912,8 +1911,7 @@ SfxObjectShellRef & SwView::GetOrCreateTmpSelectionDoc() if (!rxTmpDoc.Is()) { SwXTextView *pImpl = GetViewImpl()->GetUNOObject_Impl(); - rxTmpDoc = pImpl->BuildTmpSelectionDoc( - GetViewImpl()->GetEmbeddedObjRef() ); + rxTmpDoc = pImpl->BuildTmpSelectionDoc(); } return rxTmpDoc; } @@ -1927,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 + |