String -> OUString

Change-Id: I896ce861e55d98a45bd4e6b4a65607f25489557e

4 files changed, 19 insertions, 21 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index b1b42c0ee1e9..7c6e44cf08fd 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -50,7 +50,7 @@ public:
     ~ReadOnlyImage();
 
     virtual void        RequestHelp( const HelpEvent& rHEvt );
-    static const String& GetHelpTip();
+    static const OUString& GetHelpTip();
 };
 
 class MacroSecurity : public TabDialog
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 47926d6c70e7..c93e6922d0da 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -67,7 +67,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X
 {
     static long nTabs[] = { 3, 0, 30*CS_LB_WIDTH/100, 60*CS_LB_WIDTH/100 };
     maCertLB.SetTabs( &nTabs[0] );
-    maCertLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
+    maCertLB.InsertHeaderEntry( XMLSEC_RES( STR_HEADERBAR ) );
     maCertLB.SetSelectHdl( LINK( this, CertificateChooser, CertificateHighlightHdl ) );
     maCertLB.SetDoubleClickHdl( LINK( this, CertificateChooser, CertificateSelectHdl ) );
     maViewBtn.SetClickHdl( LINK( this, CertificateChooser, ViewButtonHdl ) );
@@ -172,12 +172,12 @@ void CertificateChooser::ImplInitialize()
         // fill list of certificates; the first entry will be selected
         for ( sal_Int32 nC = 0; nC < nCertificates; ++nC )
         {
-            String sEntry( XmlSec::GetContentPart( maCerts[ nC ]->getSubjectName() ) );
-            sEntry += '\t';
-            sEntry += XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() );
-            sEntry += '\t';
-            sEntry += XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() );
-            SvLBoxEntry* pEntry = maCertLB.InsertEntry( sEntry );
+            OUStringBuffer sEntry( XmlSec::GetContentPart( maCerts[ nC ]->getSubjectName() ) );
+            sEntry.append( '\t' );
+            sEntry.append( XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() ) );
+            sEntry.append( '\t' );
+            sEntry.append( XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ) );
+            SvLBoxEntry* pEntry = maCertLB.InsertEntry( sEntry.makeStringAndClear() );
             pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user data as index
         }
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index b98a59035c8f..32616ae78ea8 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -69,7 +69,6 @@ using namespace ::com::sun::star::security;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 namespace css = ::com::sun::star;
-using ::rtl::OUString;
 
 namespace
 {
@@ -208,9 +207,9 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
     const long nControlWidth = aControlSize.Width();
     static long nTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 74*nControlWidth/100 };
     maSignaturesLB.SetTabs( &nTabs[ 0 ] );
-    maSignaturesLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
+    maSignaturesLB.InsertHeaderEntry( XMLSEC_RES( STR_HEADERBAR ) );
 
-    maSigsNotvalidatedFI.SetText( String( XMLSEC_RES( STR_NO_INFO_TO_VERIFY ) ) );
+    maSigsNotvalidatedFI.SetText( XMLSEC_RES( STR_NO_INFO_TO_VERIFY ) );
 
     FreeResource();
 
@@ -577,7 +576,6 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 
     uno::Reference< ::com::sun::star::security::XCertificate > xCert;
 
-    String aNullStr;
     size_t nInfos = maCurrentSignatureInformations.size();
     size_t nValidSigs = 0, nValidCerts = 0;
     bool bAllNewSignatures = true;
@@ -613,9 +611,9 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 
             DBG_ASSERT( xCert.is(), "Certificate not found and can't be created!" );
 
-            String  aSubject;
-            String  aIssuer;
-            String  aDateTimeStr;
+            OUString aSubject;
+            OUString aIssuer;
+            OUString aDateTimeStr;
 
             bool bSigValid = false;
             bool bCertValid = false;
@@ -681,7 +679,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
                 aImage = maSigsValidImg.GetImage();
             }
 
-            SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( aNullStr, aImage, aImage );
+            SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( OUString(), aImage, aImage );
             maSignaturesLB.SetEntryText( aSubject, pEntry, 1 );
             maSignaturesLB.SetEntryText( aIssuer, pEntry, 2 );
             maSignaturesLB.SetEntryText( aDateTimeStr, pEntry, 3 );
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index eb4cee57ef8e..4d951ed18b33 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl)
         ::rtl::OUString aSystemFileURL = ( aNewObj.GetProtocol() != INET_PROT_NOT_VALID ) ?
             aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT );
 
-        String aNewPathStr(aSystemFileURL);
+        OUString aNewPathStr(aSystemFileURL);
 
         if ( osl::FileBase::getSystemPathFromFileURL( aSystemFileURL, aSystemFileURL ) == osl::FileBase::E_None )
             aNewPathStr = aSystemFileURL;
@@ -340,7 +340,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent,
 {
     static long nTabs[] = { 3, 0, 35*CS_LB_WIDTH/100, 70*CS_LB_WIDTH/100 };
     maTrustCertLB.SetTabs( &nTabs[ 0 ] );
-    maTrustCertLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
+    maTrustCertLB.InsertHeaderEntry( XMLSEC_RES( STR_HEADERBAR ) );
 
     FreeResource();
 
@@ -425,7 +425,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
         Rectangle   aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ),
                                      OutputToScreenPixel( aLogicPix.BottomRight() ) );
 
-        String aStr(ReadOnlyImage::GetHelpTip());
+        OUString aStr(ReadOnlyImage::GetHelpTip());
         if ( Help::IsBalloonHelpEnabled() )
             Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
             aStr );
@@ -436,9 +436,9 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
         Window::RequestHelp( rHEvt );
 }
 
-const String& ReadOnlyImage::GetHelpTip()
+const OUString& ReadOnlyImage::GetHelpTip()
 {
-     static String  aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP));
+     static OUString aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP));
      return aStr;
 }