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

convert sc/source/filter/inc/qpro*.hxx from String to OUString

Change-Id: I5d1f3c1daeee0a08c344c55d5d86d5d618718698
üst 81ea1b55
......@@ -40,7 +40,7 @@ class ScQProReader : public ScBiffReader
bool nextRecord();
sal_uInt16 getId() { return mnId; }
sal_uInt16 getLength() { return mnLength; }
void readString( String &rString, sal_uInt16 nLength );
void readString( OUString &rString, sal_uInt16 nLength );
ScQProReader( SfxMedium &rMedium );
~ScQProReader(){ };
FltError import( ScDocument *pDoc );
......
......@@ -38,7 +38,7 @@ class ScQProStyle
sal_uInt8 maFont[ maxsize ];
sal_uInt16 maFontRecord[ maxsize ];
sal_uInt16 maFontHeight[ maxsize ];
String maFontType[ maxsize ];
OUString maFontType[ maxsize ];
public:
ScQProStyle();
......@@ -51,7 +51,7 @@ class ScQProStyle
maFontHeight[ nIndex ] = nPtSize;
}
}
void setFontType( sal_uInt16 nIndex, String &aLabel )
void setFontType( sal_uInt16 nIndex, OUString &aLabel )
{ if (nIndex < maxsize) maFontType[ nIndex ] = aLabel; }
void setAlign( sal_uInt16 nIndex, sal_uInt8 nData )
{ if (nIndex < maxsize) maAlign[ nIndex ] = nData; }
......
......@@ -53,7 +53,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
switch( getId() )
{
case 0x000f:{ // Label cell
String aLabel;
OUString aLabel;
*mpStream >> nCol >> nDummy >> nRow >> nStyle >> nDummy;
sal_uInt16 nLen = getLength();
if (nLen >= 7)
......@@ -190,7 +190,7 @@ FltError ScQProReader::import( ScDocument *pDoc )
case 0x00cf:{ // Font description
sal_uInt16 nPtSize, nFontAttr;
String aLabel;
OUString aLabel;
*mpStream >> nPtSize >> nFontAttr;
pStyleElement->setFontRecord( j, nFontAttr, nPtSize );
sal_uInt16 nLen = getLength();
......@@ -221,12 +221,12 @@ bool ScQProReader::nextRecord()
return bValue;
}
void ScQProReader::readString( String &rString, sal_uInt16 nLength )
void ScQProReader::readString( OUString &rString, sal_uInt16 nLength )
{
sal_Char* pText = new sal_Char[ nLength + 1 ];
mpStream->Read( pText, nLength );
pText[ nLength ] = 0;
rString = String( pText, mpStream->GetStreamCharSet() );
rString = OUString( pText, nLength, mpStream->GetStreamCharSet() );
delete [] pText;
}
......
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