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

convert SVTOOLS module from String to OUString

Change-Id: I647e952769c79b95e11af778b07d64d3a6fbe226
üst 5eab9486
......@@ -1066,8 +1066,8 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr
if( _eType == ::svt::BBTYPE_TABLECELL && _nPos != -1 )
{
const String sVar1( RTL_CONSTASCII_USTRINGPARAM( "%1" ) );
const String sVar2( RTL_CONSTASCII_USTRINGPARAM( "%2" ) );
const OUString sVar1( "%1" );
const OUString sVar2( "%2" );
sal_uInt16 nColumnCount = GetColumnCount();
if (nColumnCount > 0)
......@@ -1075,12 +1075,12 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr
sal_Int32 nRow = _nPos / nColumnCount;
sal_uInt16 nColumn = static_cast< sal_uInt16 >( _nPos % nColumnCount );
String aText( SVT_RESSTR(STR_SVT_ACC_DESC_TABLISTBOX) );
aText.SearchAndReplace( sVar1, OUString::number( nRow ) );
String sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) );
if ( sColHeader.Len() == 0 )
OUString aText( SVT_RESSTR(STR_SVT_ACC_DESC_TABLISTBOX) );
aText = aText.replaceFirst( sVar1, OUString::number( nRow ) );
OUString sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) );
if ( sColHeader.isEmpty() )
sColHeader = OUString::number( nColumn );
aText.SearchAndReplace( sVar2, sColHeader );
aText = aText.replaceFirst( sVar2, sColHeader );
aRetText = aText;
}
}
......
......@@ -85,7 +85,7 @@ public:
inline SvtURLBox_Impl( )
{
FilterMatch::createWildCardFilterList(String(),m_aFilters);
FilterMatch::createWildCardFilterList(OUString(),m_aFilters);
}
};
......
......@@ -178,7 +178,7 @@ namespace svt
m_pNextPage = new PushButton(this, WB_TABSTOP);
m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
m_pNextPage->SetText(String(SVT_RESSTR(STR_WIZDLG_NEXT)));
m_pNextPage->SetText(OUString(SVT_RESSTR(STR_WIZDLG_NEXT)));
m_pNextPage->Show();
AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
......
......@@ -211,7 +211,7 @@ bool SfxErrorHandler::CreateString(
//-------------------------------------------------------------------------
class ResString: public String
class ResString: public OUString
/* [Beschreibung]
......@@ -224,14 +224,14 @@ class ResString: public String
sal_uInt16 nFlags;
public:
sal_uInt16 GetFlags() const {return nFlags;}
const String & GetString() const {return *this;}
const OUString & GetString() const {return *this;}
ResString( ResId &rId);
};
//-------------------------------------------------------------------------
ResString::ResString(ResId & rId):
String(rId.SetAutoRelease(sal_False).toString()),
OUString(rId.SetAutoRelease(sal_False).toString()),
nFlags(0)
{
ResMgr * pResMgr = rId.GetResMgr();
......
......@@ -2005,8 +2005,10 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
if( GetSequence( rFlavor, aSeq ) && ( 2048 == aSeq.getLength() ) )
{
rBmk = INetBookmark( String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), osl_getThreadTextEncoding() ),
String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024, osl_getThreadTextEncoding() ) );
const sal_Char* p1 = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() );
const sal_Char* p2 = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024;
rBmk = INetBookmark( OUString( p1, strlen(p1), osl_getThreadTextEncoding() ),
OUString( p2, strlen(p2), osl_getThreadTextEncoding() ) );
bRet = sal_True;
}
}
......
......@@ -121,7 +121,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
m_bTitleAmbiguous = sal_False;
if (m_pDialog)
m_pDialog->SetText(String(m_sTitle));
m_pDialog->SetText(OUString(m_sTitle));
}
}
......
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