strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

store print options at the document

Browse source
This commit is contained in:
Oliver Specht 2001-05-10 07:48:50 +00:00
parent d54e400dbd
commit 4f72c48866
17 changed files with 177 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sw/inc/doc.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: doc.hxx,v $
*
* $Revision: 1.23 $
* $Revision: 1.24 $
*
* last change: $Author: fme $ $Date: 2001-05-03 10:10:14 $
* last change: $Author: os $ $Date: 2001-05-10 08:41:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -229,6 +229,7 @@ struct SwDocStat;
struct SwHash;
struct SwSortOptions;
struct SwDefTOXBase_Impl;
struct SwPrintData;
namespace com { namespace sun { namespace star {
namespace i18n {
@ -337,6 +338,7 @@ class SwDoc
SwNewDBMgr *pNewDBMgr; // Pointer auf den neuen DBMgr fuer
// Evaluierung der DB-Fields
SfxPrinter *pPrt;
SwPrintData *pPrtData; // Print configuration
SwDoc *pGlossaryDoc; // Pointer auf das Glossary-Dokument. Dieses
@ -1228,6 +1230,9 @@ public:
const JobSetup* GetJobsetup() const;
void SetJobsetup( const JobSetup& rJobSetup );
SwPrintData* GetPrintData() const;
void SetPrintData(SwPrintData& rPrtData);
// Dokument - Info
// legt sie auf jedenfall an!
const SfxDocumentInfo* GetInfo();

43
sw/inc/swprtopt.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: swprtopt.hxx,v $
*
* $Revision: 1.1.1.1 $
* $Revision: 1.2 $
*
* last change: $Author: hr $ $Date: 2000-09-18 17:14:28 $
* last change: $Author: os $ $Date: 2001-05-10 08:41:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -65,13 +65,16 @@
#ifndef _SV_MULTISEL_HXX //autogen
#include <tools/multisel.hxx>
#endif
#ifndef _SW_PRINTDATA_HXX
#include <printdata.hxx>
#endif
#define POSTITS_NONE 0
#define POSTITS_ONLY 1
#define POSTITS_ENDDOC 2
#define POSTITS_ENDPAGE 3
class SwPrtOptions
class SwPrtOptions : public SwPrintData
{
USHORT nJobNo;
String sJobName;
@ -95,21 +98,31 @@ public:
ULONG nMergeCnt; // Anzahl der Serienbriefe
ULONG nMergeAct; // Aktueller Serienbriefnr.
USHORT nCopyCount;
USHORT nPrintPostIts;
BOOL bPrintGraph, //Grafiken/OLE Drucken
bPrintTable, //Tabellen Drucken
bPrintDraw, //Zeichenobjekte Drucken
bPrintControl, //Controls Drucken
bPrintLeftPage,
bPrintRightPage,
bPrintReverse,
bPaperFromSetup,
bCollate,
// USHORT nPrintPostIts;
// BOOL bPrintGraph, //Grafiken/OLE Drucken
// bPrintTable, //Tabellen Drucken
// bPrintDraw, //Zeichenobjekte Drucken
// bPrintControl, //Controls Drucken
// bPrintLeftPage,
// bPrintRightPage,
// bPrintReverse,
// bPaperFromSetup,
BOOL bCollate,
bPrintSelection, // Markierung drucken
bPrintPageBackground,
bPrintBlackFont,
// bPrintPageBackground,
// bPrintBlackFont,
bSinglePrtJobs,
bJobStartet;
SwPrtOptions& operator=(const SwPrintData& rData)
{
SwPrintData::operator=(rData);
return *this;
}
};

12
sw/inc/viewsh.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewsh.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: fme $ $Date: 2001-05-03 10:13:40 $
* last change: $Author: os $ $Date: 2001-05-10 08:41:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -100,6 +100,7 @@ class SwLayIdle;
struct ShellResource;
class SwRegionRects;
class SwFrm;
struct SwPrintData;
//JP 19.07.98: - Bug 52312
// define fuer Flags, die im CTOR oder den darunter liegenden Schichten
@ -203,6 +204,9 @@ public:
SfxPrinter* GetPrt( sal_Bool bCreate = sal_False ) const;
void InitPrt( SfxPrinter * ); //Nach Druckerwechsel, vom Doc
SwPrintData* GetPrintData() const;
void SetPrintData(SwPrintData& rPrtData);
//Klammerung von zusammengehoerenden Aktionen.
inline void StartAction();
void ImplStartAction();
@ -310,8 +314,8 @@ public:
void SetParaSpaceMax( sal_Bool bNew, sal_Bool bAtPages );
// compatible behaviour of tabs
sal_Bool IsTabCompat() const;
void SetTabCompat( sal_Bool bNew );
sal_Bool IsTabCompat() const {return FALSE;}
void SetTabCompat( sal_Bool bNew ){};
//Ruft den Idle-Formatierer des Layouts
void LayoutIdle();

21
sw/source/core/doc/docnew.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: docnew.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: jp $ $Date: 2001-04-26 19:46:43 $
* last change: $Author: os $ $Date: 2001-05-10 08:42:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -139,6 +139,9 @@
#ifndef _NDTXT_HXX
#include <ndtxt.hxx>
#endif
#ifndef _SW_PRINTDATA_HXX
#include <printdata.hxx>
#endif
#ifndef _DOCFLD_HXX
#include <docfld.hxx>
#endif
@ -287,6 +290,7 @@ SwDoc::SwDoc() :
pOutlineRule( 0 ),
pLayout( 0 ), // Rootframe des spezifischen Layouts.
pPrt( 0 ),
pPrtData( 0 ),
pUndos( new SwUndos( 0, 20 ) ),
pExtInputRing( 0 ),
pLayouter( 0 ),
@ -697,8 +701,19 @@ SfxPrinter* SwDoc::_GetPrt() const
((SwDoc*)this)->SetPrt( pNewPrt );
return pPrt;
}
//---------------------------------------------------
SwPrintData* SwDoc::GetPrintData() const
{
return pPrtData;
}
//---------------------------------------------------
void SwDoc::SetPrintData(SwPrintData& rPrtData)
{
if(!pPrtData)
pPrtData = new SwPrintData;
*pPrtData = rPrtData;
}
//---------------------------------------------------

7
sw/source/core/view/viewpg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewpg.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: jp $ $Date: 2000-10-25 12:03:41 $
* last change: $Author: os $ $Date: 2001-05-10 08:45:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1271,6 +1271,9 @@ Size ViewShell::GetPagePreViewPrtMaxSize() const
/*************************************************************************
$Log: not supported by cvs2svn $
Revision 1.2 2000/10/25 12:03:41 jp
Spellchecker/Hyphenator are not longer member of the shells
Revision 1.1.1.1 2000/09/19 00:08:29 hr
initial import

82
sw/source/core/view/viewsh.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewsh.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: fme $ $Date: 2001-05-03 10:14:42 $
* last change: $Author: os $ $Date: 2001-05-10 08:45:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1779,6 +1779,14 @@ SfxPrinter *ViewShell::GetPrt( BOOL bCreate ) const
return GetDoc()->GetPrt( bCreate );
}
SwPrintData* ViewShell::GetPrintData() const
{
return GetDoc()->GetPrintData();
}
void ViewShell::SetPrintData(SwPrintData& rPrtData)
{
GetDoc()->SetPrintData(rPrtData);
}
const SwNodes& ViewShell::GetNodes() const
{
@ -2119,73 +2127,3 @@ BOOL ViewShell::IsNewLayout() const
/************************************************************************
$Log: not supported by cvs2svn $
Revision 1.3 2001/02/23 12:45:24 os
Complete use of DefaultNumbering component
Revision 1.2 2000/10/17 09:25:09 os
#79537# CareChildWin/GetCareWin need current shell as parameter
Revision 1.1.1.1 2000/09/19 00:08:29 hr
initial import
Revision 1.384 2000/09/18 16:04:37 willem.vandorp
OpenOffice header added.
Revision 1.383 2000/09/08 08:12:53 os
Change: Set/Toggle/Has/Knows/Show/GetChildWindow
Revision 1.382 2000/07/17 10:30:51 ama
Opt: Smarter scrolling for RVP
Revision 1.381 2000/05/10 13:44:10 ama
Unicode changes
Revision 1.380 2000/04/05 10:02:14 os
#67584# scroll bar settings in read-only documents corrected
Revision 1.379 2000/03/03 15:17:22 os
StarView remainders removed
Revision 1.378 1999/12/22 12:08:47 jp
Bug #69762#: VisPortChg - dont ignore FlyFrames
Revision 1.377 1999/12/06 17:27:18 jp
Bug #69762#: VisPortChg - calculate the correct scroll range
Revision 1.376 1999/10/20 16:42:39 jp
Bug #68106#: new slot/interface for update all charts in a document
Revision 1.375 1999/10/06 13:29:31 jp
SmoothScroll: change the calculation of the scrollfactor
Revision 1.374 1999/09/30 09:46:53 os
new compatibility option
Revision 1.373 1999/09/29 14:31:40 kz
Check for Existance of ViewPort before use
Revision 1.372 1999/09/27 10:22:54 os
#68725# smooth scrolling: added missing flag in GetWindowClipRegionPixel()
Revision 1.371 1999/09/22 12:39:08 aw
changes for IAO-Handle handling in SW (AW)
Revision 1.370 1999/09/22 12:37:10 os
big handles
Revision 1.369 1999/09/06 13:19:24 aw
changes due to support of new handles
Rev 1.365 13 Aug 1999 15:11:32 MA
adoption to new markers, but still inkomplete
Rev 1.364 23 Jul 1999 16:23:02 AW
changes for new markers
*************************************************************************/

9
sw/source/core/view/vprint.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: vprint.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: ama $ $Date: 2001-03-02 10:25:44 $
* last change: $Author: os $ $Date: 2001-05-10 08:45:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1536,7 +1536,7 @@ SwPrtOptSave::~SwPrtOptSave()
void ViewShell::PrepareForPrint( const SwPrtOptions &rOptions )
{
// Viewoptions fuer den Drucker setzen
pOpt->SetGraphic ( TRUE == rOptions.bPrintGraph );
pOpt->SetGraphic ( TRUE == rOptions.bPrintGraphic );
pOpt->SetTable ( TRUE == rOptions.bPrintTable );
pOpt->SetDraw ( TRUE == rOptions.bPrintDraw );
pOpt->SetControl ( TRUE == rOptions.bPrintControl );
@ -1557,6 +1557,9 @@ void ViewShell::PrepareForPrint( const SwPrtOptions &rOptions )
/************************************************************************
$Log: not supported by cvs2svn $
Revision 1.5 2001/03/02 10:25:44 ama
Fix #65244#: Right and left pages, virtual page numbering
Revision 1.4 2001/02/14 09:57:12 jp
changes: international -> localdatawrapper

19
sw/source/ui/app/appopt.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: appopt.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: os $ $Date: 2001-05-07 13:58:02 $
* last change: $Author: os $ $Date: 2001-05-10 08:46:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -315,8 +315,10 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId )
/*-----------------01.02.97 13.02-------------------
Optionen fuer PrintTabPage
--------------------------------------------------*/
SwPrintOptions* pOpt = GetPrtOptions(!bTextDialog);
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, pOpt );
SwPrintData* pOpt = pAppView ? pAppView->GetWrtShell().GetPrintData() : 0;
if(!pOpt)
pOpt = GetPrtOptions(!bTextDialog);
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, *pOpt );
pRet->Put(aAddPrinterItem);
/*-----------------01.02.97 13.12-------------------
@ -505,8 +507,10 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
if (pOpt)
{
const SwAddPrinterItem* pAddPrinterAttr = (const SwAddPrinterItem*)pItem;
pAddPrinterAttr->SetPrintOptions(pOpt);
pOpt->SetFaxName( pAddPrinterAttr->GetFax());
*pOpt = *pAddPrinterAttr;
if(pAppView)
pAppView->GetWrtShell().SetPrintData(*pOpt);
}
}
@ -619,6 +623,9 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
/*-------------------------------------------------------------------------
$Log: not supported by cvs2svn $
Revision 1.11 2001/05/07 13:58:02 os
#86002# don't apply web settings to text view and vice versa
Revision 1.10 2001/05/04 12:06:24 os
check whether the view is active

12
sw/source/ui/app/docshini.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: docshini.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: os $ $Date: 2001-04-03 13:39:55 $
* last change: $Author: os $ $Date: 2001-05-10 08:46:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -164,7 +164,9 @@
#include <offmgr/app.hxx>
#endif
#ifndef _PRTOPT_HXX
#include <prtopt.hxx>
#endif
#ifndef _FMTCOL_HXX //autogen
#include <fmtcol.hxx>
#endif
@ -291,7 +293,8 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor )
{
AddLink(); // pDoc / pIo ggf. anlegen
if ( ISA( SwWebDocShell ) )
sal_Bool bWeb = ISA( SwWebDocShell );
if ( bWeb )
SetHTMLTemplate( *GetDoc() ); //Styles aus HTML.vor
else if( ISA( SwGlobalDocShell ) )
GetDoc()->SetGlobalDoc(); // Globaldokument
@ -380,6 +383,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor )
}
pDoc->SetKernAsianPunctuation(!aAsian.IsKerningWesternTextOnly());
pDoc->SetCharCompressType((SwCharCompressType)aAsian.GetCharDistanceCompression());
pDoc->SetPrintData(*SW_MOD()->GetPrtOptions(bWeb));
SubInitNew();
}

89
sw/source/ui/config/cfgitems.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: cfgitems.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: os $ $Date: 2001-03-22 09:28:06 $
* last change: $Author: os $ $Date: 2001-05-10 08:47:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -370,21 +370,7 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ):
SfxPoolItem(rAddPrinterItem)
{
bPrintGraphic = rAddPrinterItem.bPrintGraphic ;
bPrintTable = rAddPrinterItem.bPrintTable ;
bPrintDrawing = rAddPrinterItem.bPrintDrawing ;
bPrintControl = rAddPrinterItem.bPrintControl ;
bPrintLeftPage = rAddPrinterItem.bPrintLeftPage ;
bPrintRightPage = rAddPrinterItem.bPrintRightPage;
bPrintReverse = rAddPrinterItem.bPrintReverse ;
bPaperFromSetup = rAddPrinterItem.bPaperFromSetup;
bPrintProspect = rAddPrinterItem.bPrintProspect ;
bPrintPageBackground= rAddPrinterItem.bPrintPageBackground;
bPrintBlackFont = rAddPrinterItem.bPrintBlackFont;
bPrintSingleJobs = rAddPrinterItem.bPrintSingleJobs;
nPrintPostIts = rAddPrinterItem.nPrintPostIts ;
sFaxName = rAddPrinterItem.sFaxName ;
*((SwPrintData*)this) = rAddPrinterItem;
};
/*--------------------------------------------------------------------
@ -392,42 +378,17 @@ SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ):
--------------------------------------------------------------------*/
SwAddPrinterItem::SwAddPrinterItem( USHORT nWhich):
SfxPoolItem(nWhich),
bPrintGraphic(FALSE),
bPrintTable(FALSE),
bPrintDrawing(FALSE),
bPrintControl(FALSE),
bPrintLeftPage(FALSE),
bPrintRightPage(FALSE),
bPrintReverse(FALSE),
bPaperFromSetup(FALSE),
bPrintProspect(FALSE),
bPrintPageBackground(FALSE),
nPrintPostIts(0),
sFaxName( aEmptyStr )
SfxPoolItem(nWhich)
{
}
/*--------------------------------------------------------------------
Beschreibung: CTOR aus SwPrintOptions
--------------------------------------------------------------------*/
SwAddPrinterItem::SwAddPrinterItem( USHORT nWhich, SwPrintOptions* pPrtOpt ) :
SwAddPrinterItem::SwAddPrinterItem( USHORT nWhich, const SwPrintData& rPrtData ) :
SfxPoolItem(nWhich)
{
bPrintGraphic = pPrtOpt->IsPrintGraphic();
bPrintTable = pPrtOpt->IsPrintTable();
bPrintDrawing = pPrtOpt->IsPrintDraw();
bPrintControl = pPrtOpt->IsPrintControl();
bPrintLeftPage = pPrtOpt->IsPrintLeftPage();
bPrintRightPage= pPrtOpt->IsPrintRightPage();
bPrintReverse = pPrtOpt->IsPrintReverse();
bPaperFromSetup= pPrtOpt->IsPaperFromSetup();
bPrintProspect = pPrtOpt->IsPrintProspect();
bPrintPageBackground= pPrtOpt->IsPrintPageBackground();
nPrintPostIts = pPrtOpt->GetPrintPostIts();
bPrintBlackFont = pPrtOpt->IsPrintBlackFont();
bPrintSingleJobs = pPrtOpt->IsPrintSingleJobs();
sFaxName = pPrtOpt->GetFaxName();
SwPrintData::operator=(rPrtData);
}
/*--------------------------------------------------------------------
Beschreibung:
@ -448,41 +409,8 @@ int SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const
const SwAddPrinterItem& rItem = (SwAddPrinterItem&)rAttr;
return ( bPrintGraphic == rItem.bPrintGraphic &&
bPrintDrawing == rItem.bPrintDrawing &&
bPrintControl == rItem.bPrintControl &&
bPrintTable == rItem.bPrintTable &&
bPrintLeftPage == rItem.bPrintLeftPage &&
bPrintRightPage == rItem.bPrintRightPage &&
bPrintReverse == rItem.bPrintReverse &&
bPaperFromSetup == rItem.bPaperFromSetup &&
bPrintProspect == rItem.bPrintProspect &&
bPrintPageBackground == rItem.bPrintPageBackground &&
bPrintBlackFont == rItem.bPrintBlackFont &&
bPrintSingleJobs== rItem.bPrintSingleJobs&&
nPrintPostIts == rItem.nPrintPostIts &&
sFaxName == rItem.sFaxName );
return SwPrintData::operator==(rItem);
}
// -----------------------------------------------------------------------
void SwAddPrinterItem::SetPrintOptions( SwPrintOptions* pPrtOpt ) const
{
pPrtOpt->SetPrintGraphic (bPrintGraphic);
pPrtOpt->SetPrintTable (bPrintTable);
pPrtOpt->SetPrintDraw (bPrintDrawing);
pPrtOpt->SetPrintControl (bPrintControl);
pPrtOpt->SetPrintLeftPage (bPrintLeftPage);
pPrtOpt->SetPrintRightPage (bPrintRightPage);
pPrtOpt->SetPrintReverse (bPrintReverse);
pPrtOpt->SetPaperFromSetup (bPaperFromSetup);
pPrtOpt->SetPrintPostIts (nPrintPostIts);
pPrtOpt->SetPrintProspect (bPrintProspect);
pPrtOpt->SetPrintPageBackground( bPrintPageBackground );
pPrtOpt->SetPrintBlackFont( bPrintBlackFont );
pPrtOpt->SetPrintSingleJobs( bPrintSingleJobs );
}
/*-----------------03.11.97 10:00-------------------
Item fuer Einstellungsdialog, ShadowCursorSeite
--------------------------------------------------*/
@ -591,6 +519,9 @@ int SwTestItem::operator==( const SfxPoolItem& rAttr ) const
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
Revision 1.2 2001/03/22 09:28:06 os
options dialog changes
Revision 1.1.1.1 2000/09/18 17:14:32 hr
initial import

8
sw/source/ui/config/optpage.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: optpage.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: os $ $Date: 2001-05-04 11:20:22 $
* last change: $Author: os $ $Date: 2001-05-10 08:47:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -528,7 +528,7 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked();
aAddPrinterAttr.bPrintTable = aTabCB.IsChecked();
aAddPrinterAttr.bPrintDrawing = aDrawCB.IsChecked();
aAddPrinterAttr.bPrintDraw = aDrawCB.IsChecked();
aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked();
aAddPrinterAttr.bPrintPageBackground = aBackgroundCB.IsChecked();
aAddPrinterAttr.bPrintBlackFont = aBlackFontCB.IsChecked();
@ -568,7 +568,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& )
{
aGrfCB.Check( pAddPrinterAttr->bPrintGraphic);
aTabCB.Check( pAddPrinterAttr->bPrintTable);
aDrawCB.Check( pAddPrinterAttr->bPrintDrawing);
aDrawCB.Check( pAddPrinterAttr->bPrintDraw);
aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl);
aBackgroundCB.Check( pAddPrinterAttr->bPrintPageBackground);
aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont);

23
sw/source/ui/config/prtopt.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: prtopt.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: os $ $Date: 2000-10-10 08:29:28 $
* last change: $Author: os $ $Date: 2001-05-10 08:47:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -127,21 +127,10 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames()
---------------------------------------------------------------------------*/
SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
ConfigItem(bWeb ? C2U("Office.WriterWeb/Print") : C2U("Office.Writer/Print")),
bPrintGraphic(sal_True),
bPrintTable(sal_True),
bPrintDraw(sal_True),
bPrintControl(sal_True),
bPrintLeftPage(sal_True),
bPrintRightPage(sal_True),
bReverse(sal_False),
bPaperFromSetup(sal_False),
bPrintProspect(sal_False),
bPrintSingleJobs(sal_False),
bPrintPageBackground(!bWeb),
bPrintBlackFont(bWeb),
nPrintPostIts(POSTITS_NONE),
bIsWeb(bWeb)
{
bPrintPageBackground = !bWeb;
bPrintBlackFont = bWeb;
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
EnableNotification(aNames);
@ -161,7 +150,7 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
case 3: bPrintPageBackground= *(sal_Bool*)pValues[nProp].getValue(); break;
case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break;
case 5: pValues[nProp] >>= nPrintPostIts ; break;
case 6: bReverse = *(sal_Bool*)pValues[nProp].getValue(); break;
case 6: bPrintReverse = *(sal_Bool*)pValues[nProp].getValue(); break;
case 7: bPrintProspect = *(sal_Bool*)pValues[nProp].getValue(); break;
case 8: bPrintSingleJobs = *(sal_Bool*)pValues[nProp].getValue(); break;
case 9: pValues[nProp] >>= sFaxName; break;
@ -203,7 +192,7 @@ void SwPrintOptions::Commit()
case 3: bVal = bPrintPageBackground; pValues[nProp].setValue(&bVal, rType); break;
case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break;
case 5: pValues[nProp] <<= nPrintPostIts ; break;
case 6: bVal = bReverse ; pValues[nProp].setValue(&bVal, rType); break;
case 6: bVal = bPrintReverse ; pValues[nProp].setValue(&bVal, rType); break;
case 7: bVal = bPrintProspect ; pValues[nProp].setValue(&bVal, rType); break;
case 8: bVal = bPrintSingleJobs ; pValues[nProp].setValue(&bVal, rType); break;
case 9: pValues[nProp] <<= sFaxName; break;

34
sw/source/ui/inc/cfgitems.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: cfgitems.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: os $ $Date: 2001-03-22 09:40:18 $
* last change: $Author: os $ $Date: 2001-05-10 08:48:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -68,6 +68,9 @@
#ifndef _AUTHRATR_HXX
#include <authratr.hxx>
#endif
#ifndef _SW_PRINTDATA_HXX
#include <printdata.hxx>
#endif
class SwWriterApp;
class SwModule;
@ -78,7 +81,6 @@ class SwAddPrinterTabPage;
class SfxPrinter;
class ViewShell;
class SwViewOption;
class SwPrintOptions;
class SwContentOptPage;
class SwShdwCrsrOptionsTabPage;
class SwDocEditDialog;
@ -172,36 +174,20 @@ public:
Item fuer Einstellungsdialog - Drucker/Zusaetze
--------------------------------------------------------- */
class SwAddPrinterItem : public SfxPoolItem
class SwAddPrinterItem : public SfxPoolItem, public SwPrintData
{
friend SwAddPrinterTabPage;
String sFaxName;
ULONG nPrintPostIts;
BOOL bPrintGraphic :1,
bPrintTable :1,
bPrintDrawing :1,
bPrintLeftPage :1,
bPrintRightPage :1,
bPrintControl :1,
bPrintReverse :1,
bPaperFromSetup :1,
bPrintProspect :1,
bPrintPageBackground:1,
bPrintBlackFont :1,
bPrintSingleJobs :1;
public:
TYPEINFO();
SwAddPrinterItem( USHORT nWhich = FN_PARAM_ADDPRINTER );
SwAddPrinterItem( USHORT nWhich, SwPrintOptions* pPrtOpt );
SwAddPrinterItem( USHORT nWhich, const SwPrintData& rPrtData );
SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem);
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
void SetPrintOptions( SwPrintOptions* pPrtOpt ) const;
const String &GetFax() const { return sFaxName; }
const rtl::OUString &GetFax() const { return sFaxName; }
void SetFax( const String& rFax) { sFaxName = rFax; }
@ -209,7 +195,7 @@ public:
void SetPrintProspect(BOOL bFlag ){ bPrintProspect = bFlag; }
BOOL IsPrintGraphic () const { return bPrintGraphic; }
BOOL IsPrintTable () const { return bPrintTable; }
BOOL IsPrintDraw () const { return bPrintDrawing; }
BOOL IsPrintDraw () const { return bPrintDraw; }
BOOL IsPrintControl () const { return bPrintControl; }
BOOL IsPrintLeftPage () const { return bPrintLeftPage; }
BOOL IsPrintRightPage() const { return bPrintRightPage; }

45
sw/source/ui/inc/prtopt.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: prtopt.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: os $ $Date: 2000-10-10 08:37:39 $
* last change: $Author: os $ $Date: 2001-05-10 08:48:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -64,29 +64,13 @@
#ifndef _UTL_CONFIGITEM_HXX_
#include <unotools/configitem.hxx>
#endif
#ifndef _SW_PRINTDATA_HXX
#include <printdata.hxx>
#endif
class SwPrintOptions : public utl::ConfigItem
class SwPrintOptions : public SwPrintData, public utl::ConfigItem
{
sal_Bool
bPrintGraphic :1,
bPrintTable :1,
bPrintDraw :1,
bPrintControl :1,
bPrintPageBackground:1,
bPrintBlackFont :1,
bPrintLeftPage :1,
bPrintRightPage :1,
bReverse :1,
bPrintProspect :1,
bPrintSingleJobs :1,
bPaperFromSetup :1;
sal_Bool bIsWeb;
sal_uInt32 nPrintPostIts;
rtl::OUString sFaxName;
sal_Bool bIsWeb;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
@ -102,13 +86,13 @@ public:
sal_Bool IsPrintControl() const { return bPrintControl; }
sal_Bool IsPrintLeftPage() const { return bPrintLeftPage; }
sal_Bool IsPrintRightPage() const { return bPrintRightPage; }
sal_Bool IsPrintReverse() const { return bReverse; }
sal_Bool IsPrintReverse() const { return bPrintReverse; }
sal_Bool IsPaperFromSetup() const { return bPaperFromSetup; }
sal_Bool IsPrintProspect() const { return bPrintProspect; }
sal_Bool IsPrintPageBackground() const { return bPrintPageBackground; }
sal_Bool IsPrintBlackFont() const { return bPrintBlackFont;}
sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs;}
sal_uInt32 GetPrintPostIts() const { return nPrintPostIts; }
sal_Int16 GetPrintPostIts() const { return nPrintPostIts; }
const rtl::OUString GetFaxName() const{return sFaxName;}
void SetPrintGraphic ( sal_Bool b ) { SetModified(); bPrintGraphic = b;}
@ -117,14 +101,21 @@ public:
void SetPrintControl ( sal_Bool b ) { SetModified(); bPrintControl = b; }
void SetPrintLeftPage ( sal_Bool b ) { SetModified(); bPrintLeftPage = b;}
void SetPrintRightPage( sal_Bool b ) { SetModified(); bPrintRightPage = b;}
void SetPrintReverse ( sal_Bool b ) { SetModified(); bReverse = b;}
void SetPrintReverse ( sal_Bool b ) { SetModified(); bPrintReverse = b;}
void SetPaperFromSetup( sal_Bool b ) { SetModified(); bPaperFromSetup = b;}
void SetPrintPostIts ( sal_uInt32 n){ SetModified(); nPrintPostIts = n; }
void SetPrintPostIts ( sal_Int16 n){ SetModified(); nPrintPostIts = n; }
void SetPrintProspect ( sal_Bool b ) { SetModified(); bPrintProspect = b; }
void SetPrintPageBackground(sal_Bool b){ SetModified(); bPrintPageBackground = b;}
void SetPrintBlackFont(sal_Bool b){ SetModified(); bPrintBlackFont = b;}
void SetPrintSingleJobs(sal_Bool b){ SetModified(); bPrintSingleJobs = b;}
void SetFaxName(const rtl::OUString& rSet){sFaxName = rSet;}
SwPrintOptions& operator=(const SwPrintData& rData)
{
SwPrintData::operator=( rData );
SetModified();
return *this;
}
};
#endif

10
sw/source/ui/uiview/pview.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: pview.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: obo $ $Date: 2000-11-09 10:14:21 $
* last change: $Author: os $ $Date: 2001-05-10 08:48:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -156,6 +156,7 @@
#endif
#include "wrtsh.hxx"
#include "docsh.hxx"
#include "doc.hxx"
#include "cmdid.h"
#include "viewopt.hxx"
#include "globals.hrc"
@ -2002,7 +2003,7 @@ USHORT SwPagePreView::Print( SfxProgress &rProgress, PrintDialog *pDlg )
SwPrtOptions aOpts( pObjShell->GetTitle(0) );
BOOL bPrtPros;
::MakeOptions( pDlg, aOpts, &bPrtPros, FALSE, GetPrinter() );
::MakeOptions( pDlg, aOpts, &bPrtPros, FALSE, GetPrinter(), GetDocShell()->GetDoc()->GetPrintData() );
if( bNormalPrint )
{
@ -2220,6 +2221,9 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt )
/*************************************************************************
$Log: not supported by cvs2svn $
Revision 1.5 2000/11/09 10:14:21 obo
Without string include
Revision 1.4 2000/11/07 13:09:54 hjs
use min/max from stl

8
sw/source/ui/uiview/viewfunc.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewfunc.hxx,v $
*
* $Revision: 1.1.1.1 $
* $Revision: 1.2 $
*
* last change: $Author: hr $ $Date: 2000-09-18 17:14:49 $
* last change: $Author: os $ $Date: 2001-05-10 08:48:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -78,9 +78,9 @@ class SwScrollbar;
class ViewShell;
class Window;
class SwWrtShell;
struct SwPrintData;
// folgende Funktionen stehen im viewprt.cxx
void MakeOptions( PrintDialog*, SwPrtOptions&, BOOL* pFlag, BOOL bWeb, SfxPrinter* pPrt = 0 );
void MakeOptions( PrintDialog*, SwPrtOptions&, BOOL* pFlag, BOOL bWeb, SfxPrinter* pPrt, SwPrintData* pData );
PrintDialog* CreatePrintDialog( Window* , USHORT, SwWrtShell* );
void SetPrinter( SfxPrinter*, BOOL bWeb );
SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& );

56
sw/source/ui/uiview/viewprt.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewprt.cxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: jp $ $Date: 2001-04-12 13:31:23 $
* last change: $Author: os $ $Date: 2001-05-10 08:48:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -215,7 +215,7 @@ void SetPrinter( SfxPrinter* pNew, BOOL bWeb )
{
// Wir lassen die Druckoptionen so, wie sie sind.
// pAddPrinterAttr->SetPrintOptions( pOpt );
if( pAddPrinterAttr->GetFax().Len() )
if( pAddPrinterAttr->GetFax().getLength() )
pOpt->SetFaxName(pAddPrinterAttr->GetFax());
}
}
@ -258,48 +258,22 @@ USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags )
--------------------------------------------------------------------*/
void MakeOptions( PrintDialog* pDlg, SwPrtOptions& rOpts, BOOL* pPrtProspect,
BOOL bWeb, SfxPrinter* pPrt )
BOOL bWeb, SfxPrinter* pPrt, SwPrintData* pData )
{
if(!pData)
pData = SW_MOD()->GetPrtOptions(bWeb);
const SwAddPrinterItem* pAddPrinterAttr;
if( pPrt && SFX_ITEM_SET == pPrt->GetOptions().GetItemState(
FN_PARAM_ADDPRINTER, FALSE, (const SfxPoolItem**)&pAddPrinterAttr ))
{
rOpts.bPrintGraph = pAddPrinterAttr->IsPrintGraphic ();
rOpts.bPrintTable = pAddPrinterAttr->IsPrintTable ();
rOpts.bPrintDraw = pAddPrinterAttr->IsPrintDraw ();
rOpts.bPrintControl = pAddPrinterAttr->IsPrintControl ();
rOpts.bPrintLeftPage = pAddPrinterAttr->IsPrintLeftPage ();
rOpts.bPrintRightPage = pAddPrinterAttr->IsPrintRightPage();
rOpts.bPrintReverse = pAddPrinterAttr->IsPrintReverse ();
rOpts.bPaperFromSetup = pAddPrinterAttr->IsPaperFromSetup();
rOpts.bPrintPageBackground = pAddPrinterAttr->IsPrintPageBackground();
rOpts.bPrintBlackFont = pAddPrinterAttr->IsPrintBlackFont();
rOpts.bSinglePrtJobs = pAddPrinterAttr->IsPrintSingleJobs();
rOpts.nPrintPostIts = pAddPrinterAttr->GetPrintPostIts ();
if( pPrtProspect )
*pPrtProspect = pAddPrinterAttr->IsPrintProspect();
SfxItemSet aSet(pPrt->GetOptions());
aSet.Put(SwAddPrinterItem(FN_PARAM_ADDPRINTER, *pData));
pPrt->SetOptions(aSet);
}
else
{
SwPrintOptions* pOpts = SW_MOD()->GetPrtOptions(bWeb);
rOpts.bPrintGraph = pOpts->IsPrintGraphic ();
rOpts.bPrintTable = pOpts->IsPrintTable ();
rOpts.bPrintDraw = pOpts->IsPrintDraw ();
rOpts.bPrintControl = pOpts->IsPrintControl ();
rOpts.bPrintLeftPage = pOpts->IsPrintLeftPage ();
rOpts.bPrintRightPage = pOpts->IsPrintRightPage();
rOpts.bPrintReverse = pOpts->IsPrintReverse ();
rOpts.bPaperFromSetup = pOpts->IsPaperFromSetup();
rOpts.bPrintPageBackground = pOpts->IsPrintPageBackground();
rOpts.bPrintBlackFont = pOpts->IsPrintBlackFont();
rOpts.bSinglePrtJobs = pOpts->IsPrintSingleJobs();
rOpts.nPrintPostIts = pOpts->GetPrintPostIts ();
if( pPrtProspect )
*pPrtProspect = pOpts->IsPrintProspect();
}
rOpts = *pData;
if( pPrtProspect )
*pPrtProspect = pData->bPrintProspect;
rOpts.aMulti.SetTotalRange( Range( 0, RANGE_MAX ) );
rOpts.aMulti.SelectAll( FALSE );
rOpts.nCopyCount = 1;
@ -385,7 +359,7 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg,
BOOL bWeb = 0 != PTR_CAST(SwWebView, this);
if( pMgr->GetMergeType() == DBMGR_MERGE_MAILMERGE )
{
::MakeOptions( pDlg, aOpts, 0, bWeb, GetPrinter() );
::MakeOptions( pDlg, aOpts, 0, bWeb, GetPrinter(), pSh->GetPrintData() );
bStartJob = pMgr->MergePrint( *this, aOpts, *pProgress );
}
else
@ -423,7 +397,7 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg,
pSh->ResetModified();
BOOL bPrtPros;
::MakeOptions( pDlg, aOpts, &bPrtPros, bWeb, GetPrinter() );
::MakeOptions( pDlg, aOpts, &bPrtPros, bWeb, GetPrinter(), pSh->GetPrintData() );
if( -1 != bPrintSelection )
aOpts.bPrintSelection = 0 != bPrintSelection;
@ -614,7 +588,7 @@ void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb )
if( pSh && pSh->GetPrt() && pOpt)
{
// Applikationseigene Druckoptionen in SfxPrinter schiessen
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, pOpt);
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, *pOpt);
SfxItemSet aSet( pSh->GetAttrPool(),
FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
SID_HTML_MODE, SID_HTML_MODE,