diff options
author | Ulrich Kitzinger <ulrich.kitzinger@muenchen.de> | 2014-03-17 15:13:14 +0100 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-06 10:52:45 +0200 |
commit | b22bb599d703dad93801e881350c2a3029c694bf (patch) | |
tree | 196bd417628bd414abc24687ebfd54b805d50e53 | |
parent | Zugriff auf static Variable synchronisiert (Trac 11400) (diff) | |
download | core-b22bb599d703dad93801e881350c2a3029c694bf.tar.gz core-b22bb599d703dad93801e881350c2a3029c694bf.zip |
Auswahl von Papiergröße und -orientierung deaktiviert (Trac #11826)
Change-Id: If327010c6b2e88d5d638df5ce502e94f99355141
-rw-r--r-- | padmin/source/prtsetup.cxx | 18 | ||||
-rw-r--r-- | padmin/source/prtsetup.hxx | 1 |
2 files changed, 13 insertions, 6 deletions
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 5ee49581c1da..b07f3be10f5d 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -206,6 +206,7 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent) { get(m_pPaperText, "paperft"); get(m_pPaperBox, "paperlb"); + get(m_pOrientText, "label4"); get(m_pOrientBox, "orientlb"); get(m_pDuplexText, "duplexft"); get(m_pDuplexBox, "duplexlb"); @@ -247,6 +248,8 @@ void RTSPaperPage::update() // orientation m_pOrientBox->SelectEntryPos( m_pParent->m_aJobData.m_eOrientation == orientation::Portrait ? 0 : 1); + m_pOrientBox->Enable( sal_False ); + m_pOrientText->Enable( sal_False ); // duplex if( m_pParent->m_aJobData.m_pParser && @@ -265,6 +268,8 @@ void RTSPaperPage::update() (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "PageSize" ) )) ) { m_pParent->insertAllPPDValues( *m_pPaperBox, m_pParent->m_aJobData.m_pParser, pKey ); + m_pPaperBox->Enable( sal_False ); + m_pPaperText->Enable( sal_False ); } else { @@ -290,25 +295,26 @@ void RTSPaperPage::update() IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox ) { const PPDKey* pKey = NULL; - if( pBox == m_pPaperBox ) + /*if( pBox == m_pPaperBox ) { if( m_pParent->m_aJobData.m_pParser ) pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "PageSize" ) ); } - else if( pBox == m_pDuplexBox ) + else */ + if( pBox == m_pDuplexBox ) { if( m_pParent->m_aJobData.m_pParser ) pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "Duplex" ) ); - } - else if( pBox == m_pSlotBox ) + } else + if( pBox == m_pSlotBox ) { if( m_pParent->m_aJobData.m_pParser ) pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "InputSlot" ) ); } - else if( pBox == m_pOrientBox ) + /*else if( pBox == m_pOrientBox ) { m_pParent->m_aJobData.m_eOrientation = m_pOrientBox->GetSelectEntryPos() == 0 ? orientation::Portrait : orientation::Landscape; - } + }*/ if( pKey ) { PPDValue* pValue = diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx index efc217084c2c..69e7b700dff4 100644 --- a/padmin/source/prtsetup.hxx +++ b/padmin/source/prtsetup.hxx @@ -88,6 +88,7 @@ class RTSPaperPage : public TabPage FixedText* m_pPaperText; ListBox* m_pPaperBox; + FixedText* m_pOrientText; ListBox* m_pOrientBox; FixedText* m_pDuplexText; |