diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-05-16 17:33:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-16 17:33:55 +0100 |
| commit | 2df3ff140e5f803c3bb22fd621045e416c84c587 (patch) | |
| tree | 9fbbf68317c659e6acb4a59d228439d5417f4850 /padmin | |
| parent | 3d1297419fa4f5d6ce6b07ee61594db1e9bdf038 (diff) | |
replace %s in printer settings dialog with printername
Change-Id: I9594d929316b917b47b40324e3e6666043ddc1fe
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/prtsetup.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 4df90de6d837..f3f42a1fe1d8 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -91,9 +91,10 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const String& rPrinter, bool get(m_pCancelButton, "cancel"); get(m_pTabControl, "notebook"); - String aTitle( GetText() ); - aTitle.SearchAndReplace( String( "%s" ), m_aJobData.m_aPrinterName ); - SetText( aTitle ); + setDeferredProperties(); + + OUString aTitle(GetText()); + SetText(aTitle.replaceAll("%s", m_aJobData.m_aPrinterName)); if( ! bAllPages ) { @@ -117,16 +118,11 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const String& rPrinter, bool RTSDialog::~RTSDialog() { - if( m_pPaperPage ) - delete m_pPaperPage; - if( m_pDevicePage ) - delete m_pDevicePage; - if( m_pOtherPage ) - delete m_pOtherPage; - if( m_pFontSubstPage ) - delete m_pFontSubstPage; - if( m_pCommandPage ) - delete m_pCommandPage; + delete m_pPaperPage; + delete m_pDevicePage; + delete m_pOtherPage; + delete m_pFontSubstPage; + delete m_pCommandPage; } // -------------------------------------------------------------------------- |