diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-02 13:21:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-02 14:22:21 +0100 |
| commit | f8922b67a4dc1ff0b889f33d2407584aed5d2e36 (patch) | |
| tree | c3dbbc81468176b79e03b8222bb174fc24a30e16 /vcl/unx | |
| parent | c7531408b3ef4b2d284edf35ed983c23e7585231 (diff) | |
Remove unnecessary comphelper::string::getToken
Change-Id: I49192637121441b9a1980350b9bb32cd995d4386
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 20 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index f4eb32eb8330..5dd8bfe7007c 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -230,15 +230,13 @@ void PrinterInfoManager::initialize() if (!aValue.isEmpty()) m_aGlobalDefaults.m_eOrientation = aValue.equalsIgnoreAsciiCase("Landscape") ? orientation::Landscape : orientation::Portrait; - using comphelper::string::getToken; - aValue = aConfig.ReadKey( "MarginAdjust" ); if (!aValue.isEmpty()) { - m_aGlobalDefaults.m_nLeftMarginAdjust = getToken(aValue, 0, ',').toInt32(); - m_aGlobalDefaults.m_nRightMarginAdjust = getToken(aValue, 1, ',').toInt32(); - m_aGlobalDefaults.m_nTopMarginAdjust = getToken(aValue, 2, ',').toInt32(); - m_aGlobalDefaults.m_nBottomMarginAdjust = getToken(aValue, 3, ',').toInt32(); + m_aGlobalDefaults.m_nLeftMarginAdjust = aValue.getToken(0, ',').toInt32(); + m_aGlobalDefaults.m_nRightMarginAdjust = aValue.getToken(1, ',').toInt32(); + m_aGlobalDefaults.m_nTopMarginAdjust = aValue.getToken(2, ',').toInt32(); + m_aGlobalDefaults.m_nBottomMarginAdjust = aValue.getToken(3, ',').toInt32(); } aValue = aConfig.ReadKey( "ColorDepth", "24" ); @@ -415,15 +413,13 @@ void PrinterInfoManager::initialize() if (!aValue.isEmpty()) aPrinter.m_aInfo.m_eOrientation = aValue.equalsIgnoreAsciiCase("Landscape") ? orientation::Landscape : orientation::Portrait; - using comphelper::string::getToken; - aValue = aConfig.ReadKey( "MarginAdjust" ); if (!aValue.isEmpty()) { - aPrinter.m_aInfo.m_nLeftMarginAdjust = getToken(aValue, 0, ',' ).toInt32(); - aPrinter.m_aInfo.m_nRightMarginAdjust = getToken(aValue, 1, ',' ).toInt32(); - aPrinter.m_aInfo.m_nTopMarginAdjust = getToken(aValue, 2, ',' ).toInt32(); - aPrinter.m_aInfo.m_nBottomMarginAdjust = getToken(aValue, 3, ',' ).toInt32(); + aPrinter.m_aInfo.m_nLeftMarginAdjust = aValue.getToken(0, ',' ).toInt32(); + aPrinter.m_aInfo.m_nRightMarginAdjust = aValue.getToken(1, ',' ).toInt32(); + aPrinter.m_aInfo.m_nTopMarginAdjust = aValue.getToken(2, ',' ).toInt32(); + aPrinter.m_aInfo.m_nBottomMarginAdjust = aValue.getToken(3, ',' ).toInt32(); } aValue = aConfig.ReadKey( "ColorDepth" ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index e2af3e5fb751..a9c42cf90576 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -726,7 +726,7 @@ bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt ) for ( int n = 0; n != nCount; ++n ) { - const rtl::OUString aToken = comphelper::string::getToken( rFilter, n, ';' ); + const rtl::OUString aToken = rFilter.getToken( n, ';' ); if ( aToken == rExt ) return true; } |