summaryrefslogtreecommitdiff
path: root/padmin
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-09 22:47:20 +0100
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-03-11 11:07:09 +0100
commit937b63af3322f7f8b5e869b2c7431a2deaec3113 (patch)
treea832f6672188551a5be9538a02fb80d6e3fc8497 /padmin
parent5c32ac5104e9cade52c8a373033644282de9ceff (diff)
use startsWith() instead of compareToAscii()
brain damage... Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff
Diffstat (limited to 'padmin')
-rw-r--r--padmin/source/cmddlg.cxx16
-rw-r--r--padmin/source/padialog.cxx4
-rw-r--r--padmin/source/prtsetup.cxx2
3 files changed, 11 insertions, 11 deletions
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 17e386332ab7..5cad04d253fd 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -276,15 +276,15 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
while( nIndex != -1 )
{
OUString aToken( m_pParent->m_aJobData.m_aFeatures.getToken( 0, ',', nIndex ) );
- if( ! aToken.compareToAscii( "fax", 3 ) )
+ if( aToken.startsWith( "fax" ) )
{
m_bWasFax = true;
m_aFaxSwallowBox.Show( sal_True );
sal_Int32 nPos = 0;
- m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? sal_True : sal_False );
+ m_aFaxSwallowBox.Check( aToken.getToken( 1, '=', nPos ).startsWith( "swallow" ) ? sal_True : sal_False );
m_aConfigureBox.SelectEntryPos( m_nFaxEntry );
}
- else if( ! aToken.compareToAscii( "pdf=", 4 ) )
+ else if( aToken.startsWith( "pdf=" ) )
{
m_bWasPdf = true;
sal_Int32 nPos = 0;
@@ -331,8 +331,8 @@ void RTSCommandPage::save()
while( nIndex != -1 )
{
OUString aToken( m_pParent->m_aJobData.m_aFeatures.getToken( 0, ',', nIndex ) );
- if( aToken.compareToAscii( "fax", 3 ) &&
- aToken.compareToAscii( "pdf", 3 ) &&
+ if( !aToken.startsWith( "fax" ) &&
+ !aToken.startsWith( "pdf" ) &&
aToken.compareToAscii( "external_dialog" )
)
{
@@ -343,15 +343,15 @@ void RTSCommandPage::save()
aFeatures += String( aToken );
}
}
- else if( ! aToken.compareToAscii( "pdf=", 4 ) )
+ else if( aToken.startsWith( "pdf=" ) )
{
sal_Int32 nPos = 0;
aOldPdfPath = aToken.getToken( 1, '=', nPos );
}
- else if( ! aToken.compareToAscii( "fax=", 4 ) )
+ else if( aToken.startsWith( "fax=" ) )
{
sal_Int32 nPos = 0;
- bOldFaxSwallow = aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? false : true;
+ bOldFaxSwallow = aToken.getToken( 1, '=', nPos ).startsWith( "swallow" );
}
}
::std::list< String >* pList = &m_aPrinterCommands;
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 760b78730e08..bf89597b9b08 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -701,9 +701,9 @@ void PADialog::UpdateDevice()
{
if( aToken.compareToAscii( "autoqueue" ) == 0 )
bAutoQueue = true;
- else if( aToken.compareToAscii( "pdf=", 4 ) == 0 )
+ else if( aToken.startsWith("pdf=") )
bPdf = true;
- else if( aToken.compareToAscii( "fax", 3 ) == 0 )
+ else if( aToken.startsWith("fax") )
bFax = true;
}
}
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 3df1a5ea6fc3..2f136c9ab314 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -104,7 +104,7 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const String& rPrinter, bool
m_pTabControl->RemovePage(m_pTabControl->GetPageId("font"));
m_pTabControl->RemovePage(m_pTabControl->GetPageId("command"));
}
- else if( m_aJobData.m_aDriverName.compareToAscii( "CUPS:", 5 ) == 0 && ! PrinterInfoManager::get().isCUPSDisabled() )
+ else if( m_aJobData.m_aDriverName.startsWith("CUPS:") && ! PrinterInfoManager::get().isCUPSDisabled() )
{
// command page makes no sense for CUPS printers
m_pTabControl->RemovePage(m_pTabControl->GetPageId("command"));