Kaydet (Commit) 183f260e authored tarafından Noel Grandin's avatar Noel Grandin

convert FORMS modules from String to OUString

Change-Id: Iadb3638b03e1a9712553ea5e4c041493d4e1656a
üst ec79a0ca
...@@ -104,19 +104,19 @@ void OCurrencyModel::implConstruct() ...@@ -104,19 +104,19 @@ void OCurrencyModel::implConstruct()
switch ( aLocaleInfo.getCurrPositiveFormat() ) switch ( aLocaleInfo.getCurrPositiveFormat() )
{ {
case 0: // $1 case 0: // $1
sCurrencySymbol = String(aLocaleInfo.getCurrSymbol()); sCurrencySymbol = aLocaleInfo.getCurrSymbol();
bPrependCurrencySymbol = sal_True; bPrependCurrencySymbol = sal_True;
break; break;
case 1: // 1$ case 1: // 1$
sCurrencySymbol = String(aLocaleInfo.getCurrSymbol()); sCurrencySymbol = aLocaleInfo.getCurrSymbol();
bPrependCurrencySymbol = sal_False; bPrependCurrencySymbol = sal_False;
break; break;
case 2: // $ 1 case 2: // $ 1
sCurrencySymbol = OUString(String(aLocaleInfo.getCurrSymbol())) + OUString(" "); sCurrencySymbol = aLocaleInfo.getCurrSymbol() + " ";
bPrependCurrencySymbol = sal_True; bPrependCurrencySymbol = sal_True;
break; break;
case 3: // 1 $ case 3: // 1 $
sCurrencySymbol = OUString(" ") + OUString(String(aLocaleInfo.getCurrSymbol())); sCurrencySymbol = " " + aLocaleInfo.getCurrSymbol();
bPrependCurrencySymbol = sal_False; bPrependCurrencySymbol = sal_False;
break; break;
} }
......
...@@ -535,7 +535,7 @@ namespace frm ...@@ -535,7 +535,7 @@ namespace frm
{ {
// display the error and outta here // display the error and outta here
SQLContext aError; SQLContext aError;
aError.Message = String( FRM_RES_STRING( RID_STR_SYNTAXERROR ) ); aError.Message = FRM_RES_STRING( RID_STR_SYNTAXERROR );
aError.Details = sErrorMessage; aError.Details = sErrorMessage;
displayException( aError ); displayException( aError );
return sal_False; return sal_False;
......
...@@ -688,7 +688,7 @@ namespace frm ...@@ -688,7 +688,7 @@ namespace frm
pImgProd->SetImage( sURL ); pImgProd->SetImage( sURL );
else else
// caution: the medium may be NULL if somebody gave us a invalid URL to work with // caution: the medium may be NULL if somebody gave us a invalid URL to work with
pImgProd->SetImage(String()); pImgProd->SetImage(OUString());
m_bDownloading = sal_False; m_bDownloading = sal_False;
return; return;
} }
...@@ -702,7 +702,7 @@ namespace frm ...@@ -702,7 +702,7 @@ namespace frm
} }
else else
{ {
pImgProd->SetImage(String()); pImgProd->SetImage(OUString());
delete m_pMedium; delete m_pMedium;
m_pMedium = 0; m_pMedium = 0;
m_bDownloading = sal_False; m_bDownloading = sal_False;
...@@ -715,7 +715,7 @@ namespace frm ...@@ -715,7 +715,7 @@ namespace frm
if (m_pMedium || rURL.isEmpty()) if (m_pMedium || rURL.isEmpty())
{ {
// Den Stream am Producer freigeben, bevor das Medium geloscht wird. // Den Stream am Producer freigeben, bevor das Medium geloscht wird.
GetImageProducer()->SetImage(String()); GetImageProducer()->SetImage(OUString());
delete m_pMedium; delete m_pMedium;
m_pMedium = NULL; m_pMedium = NULL;
} }
......
...@@ -59,8 +59,8 @@ namespace frm ...@@ -59,8 +59,8 @@ namespace frm
// defaults // defaults
Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont(); Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
aFont.SetName( String( "Times New Roman" ) ); aFont.SetName( "Times New Roman" );
pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
// 12 pt font size // 12 pt font size
MapMode aPointMapMode( MAP_POINT ); MapMode aPointMapMode( MAP_POINT );
......
...@@ -468,7 +468,7 @@ namespace frm ...@@ -468,7 +468,7 @@ namespace frm
{ {
m_pViewport->Push( PUSH_FONT ); m_pViewport->Push( PUSH_FONT );
m_pViewport->SetFont( m_pEngine->GetStandardFont(0) ); m_pViewport->SetFont( m_pEngine->GetStandardFont(0) );
nFontWidth = m_pViewport->GetTextWidth( String( "x" ) ); nFontWidth = m_pViewport->GetTextWidth( "x" );
m_pViewport->Pop(); m_pViewport->Pop();
} }
// ... is the scroll size for the horizontal scrollbar // ... is the scroll size for the horizontal scrollbar
......
...@@ -249,17 +249,17 @@ namespace frm ...@@ -249,17 +249,17 @@ namespace frm
ErrCode nResult = aFP.Execute(); ErrCode nResult = aFP.Execute();
if ( nResult == 0 ) if ( nResult == 0 )
{ {
String sFileName = aFP.GetPath(); OUString sFileName = aFP.GetPath();
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( SvStream* pStream = ::utl::UcbStreamHelper::CreateStream(
sFileName, ( bLoad ? STREAM_READ : STREAM_WRITE | STREAM_TRUNC ) | STREAM_SHARE_DENYALL sFileName, ( bLoad ? STREAM_READ : STREAM_WRITE | STREAM_TRUNC ) | STREAM_SHARE_DENYALL
); );
if ( pStream ) if ( pStream )
{ {
EETextFormat eFormat = EE_FORMAT_XML; EETextFormat eFormat = EE_FORMAT_XML;
String sFilter = aFP.GetCurrentFilter(); OUString sFilter = aFP.GetCurrentFilter();
for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i ) for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i )
{ {
if ( sFilter.EqualsAscii( aExportFormats[i].pDescription ) ) if ( sFilter.equalsAscii( aExportFormats[i].pDescription ) )
{ {
eFormat = aExportFormats[i].eFormat; eFormat = aExportFormats[i].eFormat;
break; break;
......
...@@ -55,11 +55,11 @@ namespace frm ...@@ -55,11 +55,11 @@ namespace frm
|| ( _nFeatureId == LID_RECORD_FILLER ); || ( _nFeatureId == LID_RECORD_FILLER );
} }
static String getLabelString( sal_uInt16 _nResId ) static OUString getLabelString( sal_uInt16 _nResId )
{ {
String sLabel = OUString( " " ); OUString sLabel( " " );
sLabel += String( FRM_RES_STRING( _nResId ) ); sLabel += FRM_RES_STRING( _nResId );
sLabel += OUString( " " ); sLabel += " ";
return sLabel; return sLabel;
} }
...@@ -294,8 +294,8 @@ namespace frm ...@@ -294,8 +294,8 @@ namespace frm
{ // it's _not_ a separator { // it's _not_ a separator
// insert the entry // insert the entry
m_pToolbar->InsertItem( pSupportedFeatures->nId, String(), pSupportedFeatures->bRepeat ? TIB_REPEAT : 0 ); m_pToolbar->InsertItem( pSupportedFeatures->nId, OUString(), pSupportedFeatures->bRepeat ? TIB_REPEAT : 0 );
m_pToolbar->SetQuickHelpText( pSupportedFeatures->nId, String() ); // TODO m_pToolbar->SetQuickHelpText( pSupportedFeatures->nId, OUString() ); // TODO
if ( !isArtificialItem( pSupportedFeatures->nId ) ) if ( !isArtificialItem( pSupportedFeatures->nId ) )
{ {
...@@ -622,7 +622,7 @@ namespace frm ...@@ -622,7 +622,7 @@ namespace frm
//--------------------------------------------------------------------- //---------------------------------------------------------------------
void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const
{ {
String sItemText; OUString sItemText;
switch ( _nItemId ) switch ( _nItemId )
{ {
case LID_RECORD_LABEL: case LID_RECORD_LABEL:
...@@ -634,11 +634,11 @@ namespace frm ...@@ -634,11 +634,11 @@ namespace frm
break; break;
case FormFeature::MoveAbsolute: case FormFeature::MoveAbsolute:
sItemText = OUString( "12345678" ); sItemText = "12345678";
break; break;
case FormFeature::TotalRecords: case FormFeature::TotalRecords:
sItemText = OUString( "123456" ); sItemText = "123456";
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment