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

String -> OUString

Browse Source 
Change-Id: Ia4d1fd7ef627459666ed204601313a96507b9104
This commit is contained in:
Ivan Timofeev
2012-09-24 16:39:58 +04:00
parent b4c8346a1e
commit 62a7d56345
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xmlsecurity/source/dialogs/resourcemanager.cxx
View File

@@ -29,7 +29,6 @@
#include <rtl/ustrbuf.h> #include <rtl/ustrbuf.h>
#include <vector> #include <vector>
using ::rtl::OUString;
using namespace std; using namespace std;
namespace XmlSec namespace XmlSec
@@ -58,18 +57,18 @@ namespace XmlSec
Time( _rDT.Hours, _rDT.Minutes, _rDT.Seconds, _rDT.HundredthSeconds ) ); Time( _rDT.Hours, _rDT.Minutes, _rDT.Seconds, _rDT.HundredthSeconds ) );
} }
String GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT ) OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT )
{ {
// String with date and time information (#i20172#) // String with date and time information (#i20172#)
DateTime aDT( GetDateTime( _rDT ) ); DateTime aDT( GetDateTime( _rDT ) );
const LocaleDataWrapper& rLoDa = GetLocaleData(); const LocaleDataWrapper& rLoDa = GetLocaleData();
String sRet( rLoDa.getDate( aDT ) ); OUStringBuffer sRet( rLoDa.getDate( aDT ) );
sRet += ' '; sRet.append( ' ' );
sRet += rLoDa.getTime( aDT ); sRet.append( rLoDa.getTime( aDT ) );
return sRet; return sRet.makeStringAndClear();
} }
String GetDateString( const ::com::sun::star::util::DateTime& _rDT ) OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT )
{ {
return GetLocaleData().getDate( GetDateTime( _rDT ) ); return GetLocaleData().getDate( GetDateTime( _rDT ) );
} }
@@ -295,7 +294,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
#endif #endif
String GetContentPart( const String& _rRawString ) OUString GetContentPart( const OUString& _rRawString )
{ {
char const * aIDs[] = { "CN", "OU", "O", "E", NULL }; char const * aIDs[] = { "CN", "OU", "O", "E", NULL };
OUString retVal; OUString retVal;
@@ -319,11 +318,11 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
return retVal; return retVal;
} }
String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak ) OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak )
{ {
const sal_Int8* pSerNumSeq = _rSeq.getConstArray(); const sal_Int8* pSerNumSeq = _rSeq.getConstArray();
int nCnt = _rSeq.getLength(); int nCnt = _rSeq.getLength();
String aStr; OUStringBuffer aStr;
const char pHexDigs[ 17 ] = "0123456789ABCDEF"; const char pHexDigs[ 17 ] = "0123456789ABCDEF";
char pBuffer[ 3 ] = " "; char pBuffer[ 3 ] = " ";
sal_uInt8 nNum; sal_uInt8 nNum;
@@ -337,19 +336,19 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
pBuffer[ 1 ] = pHexDigs[ nNum & 0x0F ]; pBuffer[ 1 ] = pHexDigs[ nNum & 0x0F ];
nNum >>= 4; nNum >>= 4;
pBuffer[ 0 ] = pHexDigs[ nNum ]; pBuffer[ 0 ] = pHexDigs[ nNum ];
aStr.AppendAscii( pBuffer ); aStr.appendAscii( pBuffer );
--nBreak; --nBreak;
if( nBreak ) if( nBreak )
aStr.AppendAscii( _pSep ); aStr.appendAscii( _pSep );
else else
{ {
nBreak = nBreakStart; nBreak = nBreakStart;
aStr.AppendAscii( "\n" ); aStr.append( '\n' );
} }
} }
return aStr; return aStr.makeStringAndClear();
} }
long ShrinkToFitWidth( Control& _rCtrl, long _nOffs ) long ShrinkToFitWidth( Control& _rCtrl, long _nOffs )

8
xmlsecurity/source/dialogs/resourcemanager.hxx
View File

@@ -38,16 +38,16 @@ namespace XmlSec
const LocaleDataWrapper& GetLocaleData( void ); const LocaleDataWrapper& GetLocaleData( void );
DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT ); DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
String GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
String GetDateString( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT );
std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> > std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> >
parseDN(const ::rtl::OUString& rRawString); parseDN(const ::rtl::OUString& rRawString);
std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView( std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView(
const ::rtl::OUString & rRawString); const ::rtl::OUString & rRawString);
String GetContentPart( const String& _rRawString ); OUString GetContentPart( const OUString& _rRawString );
String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF ); OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
long ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 ); // return = new width long ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 ); // return = new width
void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 ); void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 );