diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/ww1/w1class.cxx | 13 | ||||
-rw-r--r-- | sw/source/filter/ww1/w1class.hxx | 16 | ||||
-rw-r--r-- | sw/source/filter/ww1/w1par.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww1/w1par.hxx | 2 |
4 files changed, 17 insertions, 16 deletions
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 4c93211d1290..7a6552ef9d20 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -68,7 +68,7 @@ sal_Unicode Ww1PlainText::operator [] ( sal_uLong ulOffset ) return cRet; } -String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const +OUString Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const { OSL_ENSURE(ulOffset+nLen<Count(), "Ww1PlainText"); @@ -852,11 +852,12 @@ Ww1StringList::Ww1StringList( SvStream& rSt, sal_uLong nFc, sal_uInt16 nCb ) } } } -const String Ww1StringList::GetStr( sal_uInt16 nNum ) const + +const OUString Ww1StringList::GetStr( sal_uInt16 nNum ) const { - String sRet; + OUString sRet; if( nNum <= nMax ) - sRet = String( pIdxA[ nNum+1 ], RTL_TEXTENCODING_MS_1252 ); + sRet = OUString( pIdxA[ nNum+1 ], strlen(pIdxA[ nNum+1 ]), RTL_TEXTENCODING_MS_1252 ); return sRet; } @@ -925,7 +926,7 @@ long Ww1Bookmarks::Len() const return pPos[1]->Where(nEndIdx) - pPos[0]->Where(nPlcIdx[0]); } -const String Ww1Bookmarks::GetName() const +const OUString Ww1Bookmarks::GetName() const { if( nIsEnd ) return OUString("???"); @@ -1031,7 +1032,7 @@ Ww1Assoc::Ww1Assoc(Ww1Fib& _rFib) } } -String Ww1Assoc::GetStr(sal_uInt16 code) +OUString Ww1Assoc::GetStr(sal_uInt16 code) { OStringBuffer sRet; OSL_ENSURE(code<MaxFields, "out of range"); diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx index 337929e724ff..c0824e2e0e0d 100644 --- a/sw/source/filter/ww1/w1class.hxx +++ b/sw/source/filter/ww1/w1class.hxx @@ -167,9 +167,9 @@ public: sal_Unicode Out( OUString&, sal_uLong=0xffffffff); sal_Unicode Out( sal_Unicode& ); friend std::ostream& operator <<(std::ostream&, Ww1PlainText&); - String& Fill( String&, sal_uLong=0, sal_uLong=0xffffffff ); + OUString& Fill( OUString&, sal_uLong=0, sal_uLong=0xffffffff ); sal_Unicode operator []( sal_uLong ); - String GetText( sal_uLong ulOffset, sal_uLong nLen ) const; + OUString GetText( sal_uLong ulOffset, sal_uLong nLen ) const; enum Consts { MinChar = 32 }; static bool IsChar( sal_Unicode c ) { return c >= MinChar; } @@ -241,7 +241,7 @@ public: // class Ww1Style { - String aName; + OUString aName; W1_CHP aChpx; Ww1SprmPapx* pPapx; Ww1StyleSheet* pParent; @@ -254,8 +254,8 @@ public: bool IsUsed() const { return bUsed; } void SetDefaults(sal_uInt8); void SetParent(Ww1StyleSheet* newParent) { pParent = newParent; } - void SetName(const String& rName) { bUsed = sal_True; aName = rName; } - const String& GetName() const { return aName; } + void SetName(const OUString& rName) { bUsed = sal_True; aName = rName; } + const OUString& GetName() const { return aName; } Ww1Style& GetBase(); sal_uInt16 GetnBase() const { return stcBase; } sal_uInt16 GetnNext() const { return stcNext; } @@ -928,7 +928,7 @@ public: Ww1StringList( SvStream& rSt, sal_uLong nFc, sal_uInt16 nCb ); ~Ww1StringList() { if( pIdxA ) { delete pIdxA[0]; delete pIdxA; } } - const String GetStr( sal_uInt16 nNum ) const; + const OUString GetStr( sal_uInt16 nNum ) const; sal_uInt16 Count() const { return nMax; } sal_Bool GetError() const { return (nMax != 0) && !pIdxA; } }; @@ -1055,7 +1055,7 @@ class Ww1Assoc sal_Char* pStrTbl[ MaxFields ]; sal_Bool bOK; - String GetStr(sal_uInt16); + OUString GetStr(sal_uInt16); public: Ww1Assoc(Ww1Fib&); @@ -1296,7 +1296,7 @@ public: sal_Bool GetError() const { return !bOK; } long GetHandle() const; sal_Bool GetIsEnd() const { return ( nIsEnd ) ? sal_True : sal_False; } - const String GetName() const; + const OUString GetName() const; long Len() const; friend std::ostream& operator <<(std::ostream&, Ww1Bookmarks&); void Start(Ww1Shell&, Ww1Manager&); diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx index 561c28484d19..6f00243286b1 100644 --- a/sw/source/filter/ww1/w1par.cxx +++ b/sw/source/filter/ww1/w1par.cxx @@ -117,7 +117,7 @@ sal_uLong WW1Reader::Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, co // in einen Stream werden alle Informationen, die aus der Datei // gelesen werden, in die shell ge'piped'. // -Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, const String& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags) +Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags) : SwFltShell(&rD, rPam, rBaseURL, bNew, nFieldFlags) { } diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx index ac5e57b3360c..d642436e5695 100644 --- a/sw/source/filter/ww1/w1par.hxx +++ b/sw/source/filter/ww1/w1par.hxx @@ -27,7 +27,7 @@ class Ww1Shell : public SwFltShell { public: - Ww1Shell(SwDoc&, SwPaM&, const String& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags); + Ww1Shell(SwDoc&, SwPaM&, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags); }; |