diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-29 07:23:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-29 07:23:08 +0000 |
| commit | f8bc11cdc749799fdbba231b9fea2ec92cfc7a40 (patch) | |
| tree | 26ab6d67cfbdbe5868f3a03c93773a4fbcb1f467 /sfx2 | |
| parent | 6b3b55fd1a4d08b1bf968518295adc2296227094 (diff) | |
INTEGRATION: CWS swqbugfixes02 (1.7.62); FILE MERGED
2004/06/09 07:37:18 os 1.7.62.1: #i29960# set printer warning at the appropriate config item - there are no items anymore
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/printopt.cxx | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index a1d0b35d5227..62bd13e00cee 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printopt.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: svesik $ $Date: 2004-04-21 13:13:30 $ + * last change: $Author: kz $ $Date: 2004-06-29 08:23:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,14 +194,10 @@ BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FALSE; - if( aPaperSizeCB.IsChecked() != aPaperSizeCB.GetSavedValue() || - aPaperOrientationCB.IsChecked() != aPaperOrientationCB.GetSavedValue() ) - { - USHORT nFlag = aPaperSizeCB.IsChecked() ? SFX_PRINTER_CHG_SIZE : 0; - - nFlag |= aPaperOrientationCB.IsChecked() ? SFX_PRINTER_CHG_ORIENTATION : 0; - bModified |= ( 0 != rSet.Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlag ) ) ); - } + if( aPaperSizeCB.IsChecked() != aPaperSizeCB.GetSavedValue()) + aWarnOptions.SetPaperSize(aPaperSizeCB.IsChecked()); + if( aPaperOrientationCB.IsChecked() != aPaperOrientationCB.GetSavedValue() ) + aWarnOptions.SetPaperOrientation(aPaperOrientationCB.IsChecked()); if( aTransparencyCB.IsChecked() != aTransparencyCB.GetSavedValue() ) aWarnOptions.SetTransparency( aTransparencyCB.IsChecked() ); @@ -223,18 +219,8 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& rSet ) SvtPrinterOptions aPrinterOptions; SvtPrintFileOptions aPrintFileOptions; - if( SFX_ITEM_SET == rSet.GetItemState( SID_PRINTER_CHANGESTODOC, FALSE, &pItem ) ) - { - USHORT nFlag = ( (const SfxFlagItem*)pItem )->GetValue(); - - aPaperSizeCB.Check( 0 != ( nFlag & SFX_PRINTER_CHG_SIZE ) ); - aPaperOrientationCB.Check( 0 != ( nFlag & SFX_PRINTER_CHG_ORIENTATION ) ); - } - else - { - aPaperSizeCB.Check( aWarnOptions.IsPaperSize() ); - aPaperOrientationCB.Check( aWarnOptions.IsPaperOrientation() ); - } + aPaperSizeCB.Check( aWarnOptions.IsPaperSize() ); + aPaperOrientationCB.Check( aWarnOptions.IsPaperOrientation() ); aTransparencyCB.Check( aWarnOptions.IsTransparency() ); |