diff options
-rw-r--r-- | vcl/unx/generic/dtrans/config.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/printer/jobdata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 20 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atktext.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 4 |
12 files changed, 47 insertions, 47 deletions
diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index f6e71ff0ed65..7d83f5e6f4a4 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -95,7 +95,7 @@ DtransX11ConfigItem::DtransX11ConfigItem() : if( pValue->getValueTypeClass() == TypeClass_STRING ) { const OUString* pLine = (const OUString*)pValue->getValue(); - if( pLine->getLength() ) + if( !pLine->isEmpty() ) { m_nSelectionTimeout = pLine->toInt32(); if( m_nSelectionTimeout < 1 ) diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 85c2e74b00b3..a0e020a9ae05 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -291,7 +291,7 @@ struct GetPPDAttribs ~GetPPDAttribs() { - if( m_aResult.getLength() ) + if( !m_aResult.isEmpty() ) unlink( m_aResult.getStr() ); } @@ -646,7 +646,7 @@ void CUPSManager::initialize() if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() ) continue; - if( it->second.m_aInfo.m_aFeatures.getLength() > 0 ) + if( !it->second.m_aInfo.m_aFeatures.isEmpty() ) continue; aRemovePrinters.push_back( it->first ); } @@ -732,7 +732,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PPD for %s is %s\n", OUStringToOString( aPrinter, osl_getThreadTextEncoding() ).getStr(), aPPDFile.getStr() ); #endif - if( aPPDFile.getLength() ) + if( !aPPDFile.isEmpty() ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); OUString aFileName( OStringToOUString( aPPDFile, aEncoding ) ); diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index bb059f02579d..9bd1d57b54af 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -54,7 +54,7 @@ JobData& JobData::operator=(const JobData& rRight) m_nPDFDevice = rRight.m_nPDFDevice; m_nColorDevice = rRight.m_nColorDevice; - if( ! m_pParser && m_aPrinterName.getLength() ) + if( !m_pParser && !m_aPrinterName.isEmpty() ) { PrinterInfoManager& rMgr = PrinterInfoManager::get(); rMgr.setupJobContextData( *this ); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 98bf630f4e21..fdb0f4ed3bd5 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -138,7 +138,7 @@ namespace psp ) { com::sun::star::lang::Locale aLoc( i_rLocale ); - if( bInsertDefault && aLoc.Language.getLength() == 0 ) + if( bInsertDefault && aLoc.Language.isEmpty() ) { // empty locale requested, fill in application UI locale aLoc = Application::GetSettings().GetUILocale(); @@ -175,17 +175,17 @@ namespace psp { rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); aKey.append( i_rKey ); - if( i_rOption.getLength() || i_rValue.getLength() ) + if( !i_rOption.isEmpty() || !i_rValue.isEmpty() ) { aKey.append( sal_Unicode( ':' ) ); aKey.append( i_rOption ); } - if( i_rValue.getLength() ) + if( !i_rValue.isEmpty() ) { aKey.append( sal_Unicode( ':' ) ); aKey.append( i_rValue ); } - if( aKey.getLength() && i_rTranslation.getLength() ) + if( aKey.getLength() && !i_rTranslation.isEmpty() ) { rtl::OUString aK( aKey.makeStringAndClear() ); com::sun::star::lang::Locale aLoc; @@ -207,12 +207,12 @@ namespace psp rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); aKey.append( i_rKey ); - if( i_rOption.getLength() || i_rValue.getLength() ) + if( !i_rOption.isEmpty() || !i_rValue.isEmpty() ) { aKey.append( sal_Unicode( ':' ) ); aKey.append( i_rOption ); } - if( i_rValue.getLength() ) + if( !i_rValue.isEmpty() ) { aKey.append( sal_Unicode( ':' ) ); aKey.append( i_rValue ); @@ -1159,9 +1159,9 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) pValue->m_eType = eType; pValue->m_aValue = aValue; - if( aOptionTranslation.getLength() ) + if( !aOptionTranslation.isEmpty() ) m_pTranslator->insertOption( aUniKey, aOption, aOptionTranslation, aTransLocale ); - if( aValueTranslation.getLength() ) + if( !aValueTranslation.isEmpty() ) m_pTranslator->insertValue( aUniKey, aOption, aValue, aValueTranslation, aTransLocale ); // eventually update query and remove from option list @@ -1511,7 +1511,7 @@ rtl::OUString PPDParser::translateKey( const rtl::OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale ) const { rtl::OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); - if( aResult.getLength() == 0 ) + if( aResult.isEmpty() ) aResult = i_rKey; return aResult; } @@ -1521,7 +1521,7 @@ rtl::OUString PPDParser::translateOption( const rtl::OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale ) const { rtl::OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); - if( aResult.getLength() == 0 ) + if( aResult.isEmpty() ) aResult = i_rOption; return aResult; } diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index be113e1f5a2a..f538b9497914 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -594,7 +594,7 @@ void PrinterInfoManager::initialize() aMergeInfo.m_aDriverName = String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ); aMergeInfo.m_aFeatures = String( RTL_CONSTASCII_USTRINGPARAM( "autoqueue" ) ); - if( m_aDefaultPrinter.getLength() ) + if( !m_aDefaultPrinter.isEmpty() ) { PrinterInfo aDefaultInfo( getPrinterInfo( m_aDefaultPrinter ) ); aMergeInfo.m_bPerformFontSubstitution = aDefaultInfo.m_bPerformFontSubstitution; @@ -727,13 +727,13 @@ bool PrinterInfoManager::writePrinterConfig() while( nIndex != -1 && ! bAutoQueue ) { OUString aToken( it->second.m_aInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); - if( aToken.getLength() && aToken.compareToAscii( "autoqueue" ) == 0 ) + if( !aToken.isEmpty() && aToken.compareToAscii( "autoqueue" ) == 0 ) bAutoQueue = true; } if( bAutoQueue ) continue; - if( it->second.m_aFile.getLength() ) + if( !it->second.m_aFile.isEmpty() ) { // check if file is writable if( files.find( it->second.m_aFile ) == files.end() ) @@ -766,7 +766,7 @@ bool PrinterInfoManager::writePrinterConfig() else // a new printer, write it to the first file available it->second.m_aFile = files.begin()->first; - if( ! it->second.m_aGroup.getLength() ) // probably a new printer + if( it->second.m_aGroup.isEmpty() ) // probably a new printer it->second.m_aGroup = OString( it->first.getStr(), it->first.getLength(), RTL_TEXTENCODING_UTF8 ); if( files.find( it->second.m_aFile ) != files.end() ) @@ -903,7 +903,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { - if( it->second.m_aFile.getLength() ) + if( !it->second.m_aFile.isEmpty() ) { // this printer already exists in a config file @@ -1122,7 +1122,7 @@ bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, c FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickCommand ) { const PrinterInfo& rPrinterInfo = getPrinterInfo (rPrintername); - const rtl::OUString& rCommand = (bQuickCommand && rPrinterInfo.m_aQuickCommand.getLength() ) ? + const rtl::OUString& rCommand = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ? rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand; rtl::OString aShellCommand = rtl::OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1); aShellCommand += rtl::OString( " 2>/dev/null" ); @@ -1279,7 +1279,7 @@ static void lpgetSysQueueTokenHandler( while( nPos != -1 ) { OString aTok( aClean.getToken( 0, ',', nPos ) ); - if( aTok.getLength() > 0 ) + if( !aTok.isEmpty() ) aOnlySet.insert( rtl::OStringToOUString( aTok, aEncoding ) ); } break; @@ -1325,7 +1325,7 @@ static void lpgetSysQueueTokenHandler( if( nPos != -1 ) { rtl::OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) ); - if( aComment.getLength() > 0 ) + if( !aComment.isEmpty() ) o_rQueues.back().m_aComment = rtl::OStringToOUString(aComment, aEncoding); continue; } @@ -1334,7 +1334,7 @@ static void lpgetSysQueueTokenHandler( if( nPos != -1 ) { rtl::OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) ); - if( aLoc.getLength() > 0 ) + if( !aLoc.isEmpty() ) o_rQueues.back().m_aLocation = rtl::OStringToOUString(aLoc, aEncoding); continue; } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index b9b9b29932a5..c88279017a1f 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2160,7 +2160,7 @@ void X11SalFrame::updateWMClass() pClass->res_name = const_cast<char*>(aResName.getStr()); rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); - const char *pResClass = aResClass.getLength() ? aResClass.getStr() : + const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() : SalGenericSystem::getFrameClassName(); pClass->res_class = const_cast<char*>(pResClass); @@ -3099,7 +3099,7 @@ void X11SalFrame::beginUnicodeSequence() rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); DeletionListener aDeleteWatch( this ); - if( rSeq.getLength() ) + if( !rSeq.isEmpty() ) endUnicodeSequence(); rSeq = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "u" ) ); @@ -3124,7 +3124,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) { bool bRet = false; rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); - if( rSeq.getLength() > 0 ) + if( !rSeq.isEmpty() ) { // range check if( (c >= sal_Unicode('0') && c <= sal_Unicode('9')) || @@ -3181,7 +3181,7 @@ bool X11SalFrame::endUnicodeSequence() CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); } } - bool bWasInput = rSeq.getLength() > 0; + bool bWasInput = !rSeq.isEmpty(); rSeq = rtl::OUString(); if( bWasInput && ! aDeleteWatch.isDeleted() ) CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL); diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index 96a56e3e46c2..f14fb3dbb8ad 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -80,7 +80,7 @@ adjust_boundaries( accessibility::XAccessibleText* pText, rtl::OUString aString; gint start = 0, end = 0; - if( rTextSegment.SegmentText.getLength() > 0 ) + if( !rTextSegment.SegmentText.isEmpty() ) { switch(boundary_type) { @@ -112,7 +112,7 @@ adjust_boundaries( accessibility::XAccessibleText* pText, // Determine the start index of the next segment aTextSegment = pText->getTextBehindIndex(rTextSegment.SegmentEnd, text_type_from_boundary(boundary_type)); - if( aTextSegment.SegmentText.getLength() > 0 ) + if( !aTextSegment.SegmentText.isEmpty() ) end = aTextSegment.SegmentStart; else end = pText->getCharacterCount(); @@ -126,7 +126,7 @@ adjust_boundaries( accessibility::XAccessibleText* pText, // Determine the end index of the previous segment aTextSegment = pText->getTextBeforeIndex(rTextSegment.SegmentStart, text_type_from_boundary(boundary_type)); - if( aTextSegment.SegmentText.getLength() > 0 ) + if( !aTextSegment.SegmentText.isEmpty() ) start = aTextSegment.SegmentEnd; else start = 0; diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index fca51df0ad00..989bdffd22d8 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -544,7 +544,7 @@ GetString(const uno::Any& rAny) { rtl::OString aFontName = rtl::OUStringToOString( rAny.get< rtl::OUString > (), RTL_TEXTENCODING_UTF8 ); - if( aFontName.getLength() ) + if( !aFontName.isEmpty() ) return g_strdup( aFontName.getStr() ); return NULL; @@ -555,7 +555,7 @@ SetString( uno::Any& rAny, const gchar * value ) { rtl::OString aFontName( value ); - if( aFontName.getLength() ) + if( !aFontName.isEmpty() ) { rAny = uno::makeAny( rtl::OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) ); return true; diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index e118f56cee2a..7141ded7f721 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -653,7 +653,7 @@ void GtkData::Init() // Set consistant name of the root accessible rtl::OUString aAppName = Application::GetAppName(); - if( aAppName.getLength() > 0 ) + if( !aAppName.isEmpty() ) { rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc); g_set_prgname(aPrgName.getStr()); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 27a8dc157580..f7fdbd1c855c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -600,7 +600,7 @@ void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrent m_pFilterList = new FilterList; // set the first filter to the current filter - if ( !m_aCurrentFilter.getLength() ) + if ( m_aCurrentFilter.isEmpty() ) m_aCurrentFilter = _rInitialCurrentFilter; } } @@ -867,7 +867,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw { if( aListIter->getFilter().equalsIgnoreAsciiCase( aStarDot+sExtension ) ) { - if( !aNewFilter.getLength() ) + if( aNewFilter.isEmpty() ) aNewFilter = aListIter->getTitle(); if( aOldFilter == aListIter->getTitle() ) @@ -1388,7 +1388,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS if (nControlId == ExtendedFilePickerElementIds::PUSHBUTTON_PLAY) { #ifdef GTK_STOCK_MEDIA_PLAY - if (!msPlayLabel.getLength()) + if (msPlayLabel.isEmpty()) msPlayLabel = rLabel; if (msPlayLabel == rLabel) gtk_button_set_label(GTK_BUTTON(pWidget), GTK_STOCK_MEDIA_PLAY); @@ -1871,9 +1871,9 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O aToken = rType.getToken( 0, ';', nIndex ); // Assume all have the "*.<extn>" syntax aToken = aToken.copy( aToken.lastIndexOf( aStarDot ) + 2 ); - if (aToken.getLength()) + if (!aToken.isEmpty()) { - if (aTokens.getLength()) + if (!aTokens.isEmpty()) aTokens += OUString(RTL_CONSTASCII_USTRINGPARAM(",")); aTokens = aTokens += aToken; gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, @@ -1923,7 +1923,7 @@ void SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const S void SalGtkFilePicker::SetFilters() { - if (!m_aInitialFilter.getLength()) + if (m_aInitialFilter.isEmpty()) m_aInitialFilter = m_aCurrentFilter; rtl::OUString sPseudoFilter; @@ -1956,7 +1956,7 @@ void SalGtkFilePicker::SetFilters() std::set<OUString>::const_iterator aEnd = aAllFormats.end(); for (std::set<OUString>::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter) { - if (sAllFilter.getLength()) + if (!sAllFilter.isEmpty()) sAllFilter += OUString(sal_Unicode(';')); sAllFilter += *aIter; } @@ -1995,9 +1995,9 @@ void SalGtkFilePicker::SetFilters() gtk_widget_hide( m_pFilterExpander ); // set the default filter - if (sPseudoFilter.getLength()) + if (!sPseudoFilter.isEmpty()) SetCurFilter( sPseudoFilter ); - else if(m_aCurrentFilter.getLength()) + else if(!m_aCurrentFilter.isEmpty()) SetCurFilter( m_aCurrentFilter ); OSL_TRACE( "end setting filters"); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index dc951a54addc..db173003e1e5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -87,7 +87,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) else { OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); - if( aNewURL.getLength() ) + if( !aNewURL.isEmpty() ) sURL = aNewURL; } } @@ -104,7 +104,7 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) { OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); - if( aNewURL.getLength() ) + if( !aNewURL.isEmpty() ) { // At this point the URL should contain ascii characters only actually sURL = OUStringToOString( aNewURL, osl_getThreadTextEncoding() ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 84ab2a903dce..e4856bde95c8 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1949,7 +1949,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen ) void GtkSalFrame::updateWMClass() { rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); - const char *pResClass = aResClass.getLength() ? aResClass.getStr() : + const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() : SalGenericSystem::getFrameClassName(); Display *display; @@ -4112,7 +4112,7 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon { sal_uInt32 nPosition = xText->getCaretPosition(); rtl::OUString sAllText = xText->getText(); - if (!sAllText.getLength()) + if (sAllText.isEmpty()) return sal_False; rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8); rtl::OUString sCursorText(sAllText.copy(0, nPosition)); |