diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-30 14:29:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-04 08:49:02 +0200 |
commit | 9b57cc2b9a4266136a9cc6ad76f7997f41a6f535 (patch) | |
tree | d9bb19a885fcdc8681fbcaba197c0a43c9367916 | |
parent | 81ea1b554de5d2d2b56a9e651b0ebd06bffc7289 (diff) |
convert sc/source/filter/inc/qpro*.hxx from String to OUString
Change-Id: I5d1f3c1daeee0a08c344c55d5d86d5d618718698
-rw-r--r-- | sc/source/filter/inc/qpro.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/qprostyle.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/qpro/qpro.cxx | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx index d6a654eff5e4..716e8e4b1d96 100644 --- a/sc/source/filter/inc/qpro.hxx +++ b/sc/source/filter/inc/qpro.hxx @@ -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 ); diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx index eb58bf816735..5c8730acef4a 100644 --- a/sc/source/filter/inc/qprostyle.hxx +++ b/sc/source/filter/inc/qprostyle.hxx @@ -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; } diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index f6658845a784..cabbab6bc37b 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -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; } |