Skip to content

C
core
Kaydet (Commit) 8ebb69d3 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert vcl/field.hxx from String to OUString 

Change-Id: Ibbca39643906e0d1b7e9ef11f19008508ba16777
üst 8ab01bf9
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
include/vcl/field.hxx
Dosyayı görüntüle @ 8ebb69d3
...@@ -290,7 +290,7 @@ public: ...@@ -290,7 +290,7 @@ public:
virtual void Reformat(); virtual void Reformat();
String GetCurrencySymbol() const; OUString GetCurrencySymbol() const;
virtual void SetValue( sal_Int64 nNewValue ); virtual void SetValue( sal_Int64 nNewValue );
virtual sal_Int64 GetValue() const; virtual sal_Int64 GetValue() const;
......
vcl/source/control/field.cxx
Dosyayı görüntüle @ 8ebb69d3
...@@ -222,44 +222,44 @@ static bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, ...@@ -222,44 +222,44 @@ static bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
return true; return true;
} }
static void ImplUpdateSeparatorString( String& io_rText, static void ImplUpdateSeparatorString( OUString& io_rText,
const String& rOldDecSep, const String& rNewDecSep, const OUString& rOldDecSep, const OUString& rNewDecSep,
const String& rOldThSep, const String& rNewThSep ) const OUString& rOldThSep, const OUString& rNewThSep )
{ {
OUStringBuffer aBuf( io_rText.Len() ); OUStringBuffer aBuf( io_rText.getLength() );
xub_StrLen nIndexDec = 0, nIndexTh = 0, nIndex = 0; sal_Int32 nIndexDec = 0, nIndexTh = 0, nIndex = 0;
const sal_Unicode* pBuffer = io_rText.GetBuffer(); const sal_Unicode* pBuffer = io_rText.getStr();
while( nIndex != STRING_NOTFOUND ) while( nIndex != -1 )
{ {
nIndexDec = io_rText.Search( rOldDecSep, nIndex ); nIndexDec = io_rText.indexOf( rOldDecSep, nIndex );
nIndexTh = io_rText.Search( rOldThSep, nIndex ); nIndexTh = io_rText.indexOf( rOldThSep, nIndex );
if( (nIndexTh != STRING_NOTFOUND && nIndexDec != STRING_NOTFOUND && nIndexTh < nIndexDec ) if( (nIndexTh != -1 && nIndexDec != -1 && nIndexTh < nIndexDec )
|| (nIndexTh != STRING_NOTFOUND && nIndexDec == STRING_NOTFOUND) || (nIndexTh != -1 && nIndexDec == -1)
) )
{ {
aBuf.append( pBuffer + nIndex, nIndexTh - nIndex ); aBuf.append( pBuffer + nIndex, nIndexTh - nIndex );
aBuf.append( rNewThSep ); aBuf.append( rNewThSep );
nIndex = nIndexTh + rOldThSep.Len(); nIndex = nIndexTh + rOldThSep.getLength();
} }
else if( nIndexDec != STRING_NOTFOUND ) else if( nIndexDec != -1 )
{ {
aBuf.append( pBuffer + nIndex, nIndexDec - nIndex ); aBuf.append( pBuffer + nIndex, nIndexDec - nIndex );
aBuf.append( rNewDecSep ); aBuf.append( rNewDecSep );
nIndex = nIndexDec + rOldDecSep.Len(); nIndex = nIndexDec + rOldDecSep.getLength();
} }
else else
{ {
aBuf.append( pBuffer + nIndex ); aBuf.append( pBuffer + nIndex );
nIndex = STRING_NOTFOUND; nIndex = -1;
} }
} }
io_rText = aBuf.makeStringAndClear(); io_rText = aBuf.makeStringAndClear();
} }
static void ImplUpdateSeparators( const String& rOldDecSep, const String& rNewDecSep, static void ImplUpdateSeparators( const OUString& rOldDecSep, const OUString& rNewDecSep,
const String& rOldThSep, const String& rNewThSep, const OUString& rOldThSep, const OUString& rNewThSep,
Edit* pEdit ) Edit* pEdit )
{ {
bool bChangeDec = (rOldDecSep != rNewDecSep); bool bChangeDec = (rOldDecSep != rNewDecSep);
...@@ -269,7 +269,7 @@ static void ImplUpdateSeparators( const String& rOldDecSep, const String& rNewDe ...@@ -269,7 +269,7 @@ static void ImplUpdateSeparators( const String& rOldDecSep, const String& rNewDe
{ {
sal_Bool bUpdateMode = pEdit->IsUpdateMode(); sal_Bool bUpdateMode = pEdit->IsUpdateMode();
pEdit->SetUpdateMode( sal_False ); pEdit->SetUpdateMode( sal_False );
String aText = pEdit->GetText(); OUString aText = pEdit->GetText();
ImplUpdateSeparatorString( aText, rOldDecSep, rNewDecSep, rOldThSep, rNewThSep ); ImplUpdateSeparatorString( aText, rOldDecSep, rNewDecSep, rOldThSep, rNewThSep );
pEdit->SetText( aText ); pEdit->SetText( aText );
...@@ -887,12 +887,12 @@ void NumericField::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -887,12 +887,12 @@ void NumericField::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) )
{ {
String sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
if ( IsDefaultLocale() ) if ( IsDefaultLocale() )
ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() );
String sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this );
ReformatAll(); ReformatAll();
} }
...@@ -1059,12 +1059,12 @@ void NumericBox::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -1059,12 +1059,12 @@ void NumericBox::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) )
{ {
String sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
if ( IsDefaultLocale() ) if ( IsDefaultLocale() )
ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() );
String sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this );
ReformatAll(); ReformatAll();
} }
...@@ -1871,12 +1871,12 @@ void MetricField::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -1871,12 +1871,12 @@ void MetricField::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) )
{ {
String sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
if ( IsDefaultLocale() ) if ( IsDefaultLocale() )
ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() );
String sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this );
ReformatAll(); ReformatAll();
} }
...@@ -1996,12 +1996,12 @@ void MetricBox::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -1996,12 +1996,12 @@ void MetricBox::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) )
{ {
String sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
if ( IsDefaultLocale() ) if ( IsDefaultLocale() )
ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() );
String sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this );
ReformatAll(); ReformatAll();
} }
...@@ -2163,7 +2163,7 @@ CurrencyFormatter::~CurrencyFormatter() ...@@ -2163,7 +2163,7 @@ CurrencyFormatter::~CurrencyFormatter()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
String CurrencyFormatter::GetCurrencySymbol() const OUString CurrencyFormatter::GetCurrencySymbol() const
{ {
return ImplGetLocaleDataWrapper().getCurrSymbol(); return ImplGetLocaleDataWrapper().getCurrSymbol();
} }
...@@ -2278,12 +2278,12 @@ void CurrencyField::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -2278,12 +2278,12 @@ void CurrencyField::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) )
{ {
String sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
if ( IsDefaultLocale() ) if ( IsDefaultLocale() )
ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() );
String sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this );
ReformatAll(); ReformatAll();
} }
...@@ -2380,12 +2380,12 @@ void CurrencyBox::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -2380,12 +2380,12 @@ void CurrencyBox::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) )
{ {
String sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
if ( IsDefaultLocale() ) if ( IsDefaultLocale() )
ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() );
String sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep();
String sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep();
ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this );
ReformatAll(); ReformatAll();
} }
......
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