mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

targeted string re-work

Browse Source 
Change-Id: I39922dc7cbb32ce236995df89b183d4db1210b15
This commit is contained in:
Norbert Thiebaud
2012-06-01 05:14:07 -05:00
parent da621dadb7
commit e18d881753
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
uui/source/iahndl-filter.cxx
View File

@@ -82,7 +82,7 @@ executeFilterDialog(
catch (std::bad_alloc const &) catch (std::bad_alloc const &)
{ {
throw uno::RuntimeException( throw uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")), rtl::OUString("out of memory"),
uno::Reference< uno::XInterface >()); uno::Reference< uno::XInterface >());
} }
} }
@@ -115,8 +115,7 @@ handleNoSuchFilterRequest_(
try try
{ {
xFilterContainer.set( xServiceFactory->createInstance( xFilterContainer.set( xServiceFactory->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ::rtl::OUString( "com.sun.star.document.FilterFactory") ),
"com.sun.star.document.FilterFactory")) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
} }
catch ( uno::Exception const & ) catch ( uno::Exception const & )
@@ -146,8 +145,7 @@ handleNoSuchFilterRequest_(
// out by using DocumentService property later! // out by using DocumentService property later!
uno::Reference< container::XEnumeration > xFilters uno::Reference< container::XEnumeration > xFilters
= xFilterContainer->createSubSetEnumerationByQuery( = xFilterContainer->createSubSetEnumerationByQuery(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ::rtl::OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360"));
"_query_all:sort_prop=uiname:iflags=1:eflags=143360")));
while (xFilters->hasMoreElements()) while (xFilters->hasMoreElements())
{ {
try try
@@ -156,9 +154,9 @@ handleNoSuchFilterRequest_(
uui::FilterNamePair aPair; uui::FilterNamePair aPair;
aPair.sInternal = lProps.getUnpackedValueOrDefault( aPair.sInternal = lProps.getUnpackedValueOrDefault(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), ::rtl::OUString()); rtl::OUString("Name"), ::rtl::OUString());
aPair.sUI = lProps.getUnpackedValueOrDefault( aPair.sUI = lProps.getUnpackedValueOrDefault(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), ::rtl::OUString()); rtl::OUString("UIName"), ::rtl::OUString());
if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) ) if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) )
{ {
continue; continue;
@@ -223,8 +221,7 @@ handleAmbigousFilterRequest_(
try try
{ {
xFilterContainer.set( xServiceFactory->createInstance( xFilterContainer.set( xServiceFactory->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ::rtl::OUString( "com.sun.star.document.FilterFactory") ),
"com.sun.star.document.FilterFactory")) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
} }
catch ( uno::Exception & ) catch ( uno::Exception & )
@@ -324,8 +321,7 @@ handleFilterOptionsRequest_(
try try
{ {
xFilterCFG.set( xServiceFactory->createInstance( xFilterCFG.set( xServiceFactory->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ),
"com.sun.star.document.FilterFactory" )) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
} }
catch ( uno::Exception const & ) catch ( uno::Exception const & )
@@ -341,7 +337,7 @@ handleFilterOptionsRequest_(
for( sal_Int32 ind = 0; ind < nPropCount; ++ind ) for( sal_Int32 ind = 0; ind < nPropCount; ++ind )
{ {
if( rRequest.rProperties[ind].Name.equals( if( rRequest.rProperties[ind].Name.equals(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"))) ) ::rtl::OUString("FilterName")) )
{ {
rRequest.rProperties[ind].Value >>= aFilterName; rRequest.rProperties[ind].Value >>= aFilterName;
break; break;
@@ -356,7 +352,7 @@ handleFilterOptionsRequest_(
nProperty < nPropertyCount; nProperty < nPropertyCount;
++nProperty ) ++nProperty )
if( aProps[nProperty].Name.equals( if( aProps[nProperty].Name.equals(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) ) ::rtl::OUString("UIComponent")) )
{ {
::rtl::OUString aServiceName; ::rtl::OUString aServiceName;
aProps[nProperty].Value >>= aServiceName; aProps[nProperty].Value >>= aServiceName;

8
uui/source/iahndl-ssl.cxx
View File

@@ -97,7 +97,7 @@ isDomainMatch(
if (hostName.equalsIgnoreAsciiCase( element )) if (hostName.equalsIgnoreAsciiCase( element ))
return true; return true;
if ( 0 == element.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "*" )) ) && if ( 0 == element.indexOf( rtl::OUString( "*" ) ) &&
hostName.getLength() >= element.getLength() ) hostName.getLength() >= element.getLength() )
{ {
rtl::OUString cmpStr = element.copy( 1 ); rtl::OUString cmpStr = element.copy( 1 );
@@ -133,7 +133,7 @@ getLocalizedDatTimeStr(
pNumberFormatter->GetOutputString( pNumberFormatter->GetOutputString(
aDate - *pNullDate, nFormat, aTmpStr, &pColor ); aDate - *pNullDate, nFormat, aTmpStr, &pColor );
aDateTimeStr = aTmpStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); aDateTimeStr = aTmpStr + rtl::OUString(" ");
nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang ); nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang );
pNumberFormatter->GetOutputString( pNumberFormatter->GetOutputString(
@@ -184,7 +184,7 @@ executeUnknownAuthDialog(
catch (std::bad_alloc const &) catch (std::bad_alloc const &)
{ {
throw uno::RuntimeException( throw uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")), rtl::OUString("out of memory"),
uno::Reference< uno::XInterface >()); uno::Reference< uno::XInterface >());
} }
} }
@@ -258,7 +258,7 @@ executeSSLWarnDialog(
catch (std::bad_alloc const &) catch (std::bad_alloc const &)
{ {
throw uno::RuntimeException( throw uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")), rtl::OUString("out of memory"),
uno::Reference< uno::XInterface >()); uno::Reference< uno::XInterface >());
} }
} }

2
uui/source/sslwarndlg.cxx
View File

@@ -49,7 +49,7 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl_Impl)
uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >( xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY ); getServiceFactory().get()->createInstance( rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
xDocumentDigitalSignatures.get()->showCertificate(getCert()); xDocumentDigitalSignatures.get()->showCertificate(getCert());

2
uui/source/unknownauthdlg.cxx
View File

@@ -56,7 +56,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl)
uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >( xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY ); getServiceFactory().get()->createInstance( rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
xDocumentDigitalSignatures.get()->showCertificate(getCert()); xDocumentDigitalSignatures.get()->showCertificate(getCert());