diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /lotuswordpro | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'lotuswordpro')
133 files changed, 815 insertions, 818 deletions
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx index 21bb650b65b1..3d7cde81c2f2 100644 --- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx +++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx @@ -47,8 +47,8 @@ namespace virtual void setUp(); - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); void test(); @@ -69,8 +69,8 @@ namespace uno::UNO_QUERY_THROW); } - bool LotusWordProTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + bool LotusWordProTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { uno::Sequence< beans::PropertyValue > aDescriptor(1); @@ -81,9 +81,9 @@ namespace void LotusWordProTest::test() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/lotuswordpro/qa/cppunit/data/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(LotusWordProTest); diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index 3eee0f07054c..f48f38bf8617 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -54,8 +54,6 @@ #include "lwpfilter.hxx" using namespace com::sun::star; -using rtl::OString; -using rtl::OUStringBuffer; using com::sun::star::uno::Sequence; using com::sun::star::lang::XComponent; using com::sun::star::uno::Any; @@ -326,18 +324,18 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc } catch ( Exception& ) { - return ::rtl::OUString(); + return OUString(); } if (!xInputStream.is()) - return ::rtl::OUString(); + return OUString(); } Sequence< ::sal_Int8 > aData; sal_Int32 nLen = SAL_N_ELEMENTS( header ); if ( !( ( nLen == xInputStream->readBytes( aData, nLen ) ) && ( memcmp( ( void* )header, (void*) aData.getConstArray(), nLen ) == 0 ) ) ) - sTypeName = ::rtl::OUString(); + sTypeName = OUString(); return sTypeName; } diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index 8fa89b67e11d..aecbd1a0b1c3 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -64,7 +64,7 @@ protected: // oo.org declares ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::rtl::OUString msFilterName; + OUString msFilterName; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler; FilterType meType; @@ -88,7 +88,7 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) throw( com::sun::star::uno::RuntimeException ); // XInitialization @@ -96,22 +96,22 @@ public: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString LotusWordProImportFilter_getImplementationName() +OUString LotusWordProImportFilter_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx index eda611afd372..43e8a3430253 100644 --- a/lotuswordpro/source/filter/lwp9reader.cxx +++ b/lotuswordpro/source/filter/lwp9reader.cxx @@ -209,7 +209,7 @@ void Lwp9Reader::ParseDocument() pChangeMgr->ConvertAllChange(m_pStream); doc->Parse(m_pStream); - m_pStream->EndElement(::rtl::OUString("office:body")); + m_pStream->EndElement(OUString("office:body")); WriteDocEnd(); } @@ -245,7 +245,7 @@ void Lwp9Reader::WriteDocHeader() pAttrList->AddAttribute( A2OUSTR("office:class"), A2OUSTR("text")); pAttrList->AddAttribute( A2OUSTR("office:version"), A2OUSTR("1.0")); - m_pStream->StartElement( ::rtl::OUString("office:document") ); + m_pStream->StartElement( OUString("office:document") ); pAttrList->Clear(); } @@ -254,7 +254,7 @@ void Lwp9Reader::WriteDocHeader() */ void Lwp9Reader::WriteDocEnd() { - m_pStream->EndElement(::rtl::OUString("office:document")); + m_pStream->EndElement(OUString("office:document")); m_pStream->EndDocument(); } diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 25bdbea1dba9..597f7c0fc118 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -96,10 +96,10 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr() * @param pBullOver pointer to the bulletoverride of current paragraph. * @param pIndent pointer to the indentoverride of current paragraph. */ -rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, +OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, LwpIndentOverride* pIndent) { - rtl::OUString aEmpty; + OUString aEmpty; if(!pPara || !pIndent || !pBullOver) { @@ -148,7 +148,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv } m_vIDsPairList.push_back(std::make_pair(pBulletOver, aIndentID)); - rtl::OUString aStyleName; + OUString aStyleName; LwpFribPtr* pBulletParaFribs = pBulletPara->GetFribs(); sal_Bool bIsNumbering = (sal_Bool)(pBulletParaFribs->HasFrib(FRIB_TAG_PARANUMBER) != 0); @@ -194,17 +194,17 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv { if (pParaNumber->GetStyleID() != NUMCHAR_other) { - rtl::OUString aPrefix; + OUString aPrefix; XFNumFmt aFmt; if (aParaNumbering.pPrefix) { aPrefix += aParaNumbering.pPrefix->GetText(); } - rtl::OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber); + OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber); if (pParaNumber->GetStyleID() == NUMCHAR_01 || pParaNumber->GetStyleID() == NUMCHAR_Chinese4) { - aPrefix += rtl::OUString("0"); + aPrefix += OUString("0"); } aFmt.SetPrefix(aPrefix); @@ -221,7 +221,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv } else { - rtl::OUString aPrefix, aSuffix; + OUString aPrefix, aSuffix; if (aParaNumbering.pPrefix) { aPrefix = aParaNumbering.pPrefix->GetText(); @@ -232,7 +232,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv } pListStyle->SetListBullet(nPos, LwpSilverBullet::GetNumCharByStyleID(pParaNumber).toChar(), - rtl::OUString("Times New Roman"), aPrefix, aSuffix); + OUString("Times New Roman"), aPrefix, aSuffix); } pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0); @@ -254,7 +254,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv //Return the inner XFItem created. XFContentContainer* LwpBulletStyleMgr::AddBulletList( XFContentContainer* pCont, sal_Bool bIsOrdered, - const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped) + const OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped) { assert(nLevel>0); diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index 5bb67a3e182b..09fe87e9c569 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -84,12 +84,12 @@ class LwpBulletStyleMgr public: LwpBulletStyleMgr(); virtual ~LwpBulletStyleMgr(); - rtl::OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, + OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, LwpIndentOverride* pIndent); inline void SetFoundry(LwpFoundry* pFoundry); inline void SetContinueFlag(sal_Bool bFlag); XFContentContainer* AddBulletList(XFContentContainer* pCont, sal_Bool bIsOrdered, - const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped); + const OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped); inline void SetCurrentPos(sal_uInt16 nNewPos); inline void SetCurrentSilverBullet(const LwpObjectID& rNewID); inline LwpObjectID GetCurrentSilverBullet(); @@ -99,9 +99,9 @@ public: private: typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair; - std::vector <rtl::OUString> m_vStyleNameList; + std::vector <OUString> m_vStyleNameList; std::vector <OverridePair> m_vIDsPairList; - rtl::OUString m_aCurrentStyleName; + OUString m_aCurrentStyleName; LwpFoundry* m_pFoundry; XFList* m_pBulletList; sal_Bool m_bContinue; diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx index abd247074980..707c7deb27a6 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.hxx +++ b/lotuswordpro/source/filter/lwpdivinfo.hxx @@ -83,10 +83,10 @@ public: LwpObjectID* GetInitialLayoutID(){ return &m_InitialLayoutID;} LwpObjectID* GetFillerPageTextID(){ return &m_FillerPageTextID;} // add by ,03/14/2004 - rtl::OUString GetDivName() { return m_Name.str(); } + OUString GetDivName() { return m_Name.str(); } // end add - rtl::OUString GetClassName() { return m_ClassName.str(); } + OUString GetClassName() { return m_ClassName.str(); } inline sal_Bool HasContents(); inline sal_Bool IsOleDivision(); inline sal_Bool IsScrollable(); diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx index 4d980ce8ec24..772b28b87669 100644 --- a/lotuswordpro/source/filter/lwpdocdata.cxx +++ b/lotuswordpro/source/filter/lwpdocdata.cxx @@ -291,9 +291,9 @@ void LwpDocData::Read() pGlobal->SetEditorAttrMap(pEditorAttr->nID, pEditorAttr); } } -rtl::OUString LwpDocData::DateTimeToOUString(LtTm& dt) +OUString LwpDocData::DateTimeToOUString(LtTm& dt) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append((sal_Int32)dt.tm_year); buf.append( A2OUSTR("-") ); buf.append((sal_Int32)dt.tm_mon); @@ -310,10 +310,10 @@ rtl::OUString LwpDocData::DateTimeToOUString(LtTm& dt) return buf.makeStringAndClear(); } -rtl::OUString LwpDocData::TimeToOUString(LtTm& dt) +OUString LwpDocData::TimeToOUString(LtTm& dt) { //PT3H43M44S - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( A2OUSTR("PT") ); buf.append((sal_Int32)dt.tm_hour); buf.append( A2OUSTR("H") ); diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx index e5aa366a812a..acf33a51d5bd 100644 --- a/lotuswordpro/source/filter/lwpdocdata.hxx +++ b/lotuswordpro/source/filter/lwpdocdata.hxx @@ -175,8 +175,8 @@ private: LtTm m_nLastRevisionTime; LtTm m_nTotalEditTime; private: - rtl::OUString DateTimeToOUString(LtTm& dt); - rtl::OUString TimeToOUString(LtTm& dt); + OUString DateTimeToOUString(LtTm& dt); + OUString TimeToOUString(LtTm& dt); public: void Read(); diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 9a5f29fe83dc..9d978b9b6c35 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -330,40 +330,40 @@ void LwpDrawObj::SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag * @param nArrowStyle style of the arrowhead. * @return nWhichSide style name of the arrowhead. */ -rtl::OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle) +OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle) { // style name of arrowhead - rtl::OUString aArrowName; + OUString aArrowName; switch(nArrowStyle) { default: case AH_ARROW_FULLARROW: - aArrowName = rtl::OUString("Symmetric arrow"); + aArrowName = OUString("Symmetric arrow"); break; case AH_ARROW_HALFARROW: - aArrowName = rtl::OUString("Arrow concave"); + aArrowName = OUString("Arrow concave"); break; case AH_ARROW_LINEARROW: - aArrowName = rtl::OUString("arrow100"); + aArrowName = OUString("arrow100"); break; case AH_ARROW_INVFULLARROW: - aArrowName = rtl::OUString("reverse arrow"); + aArrowName = OUString("reverse arrow"); break; case AH_ARROW_INVHALFARROW: - aArrowName = rtl::OUString("reverse concave arrow"); + aArrowName = OUString("reverse concave arrow"); break; case AH_ARROW_INVLINEARROW: - aArrowName = rtl::OUString("reverse line arrow"); + aArrowName = OUString("reverse line arrow"); break; case AH_ARROW_TEE: - aArrowName = rtl::OUString("Dimension lines"); + aArrowName = OUString("Dimension lines"); break; case AH_ARROW_SQUARE: - aArrowName = rtl::OUString("Square"); + aArrowName = OUString("Square"); break; case AH_ARROW_CIRCLE: - aArrowName = rtl::OUString("Circle"); + aArrowName = OUString("Circle"); break; } @@ -380,7 +380,7 @@ XFFrame* LwpDrawObj::CreateXFDrawObject() this->Read(); // register style - rtl::OUString aStyleName = this->RegisterStyle(); + OUString aStyleName = this->RegisterStyle(); // create XF-Objects XFFrame* pXFObj = NULL; @@ -434,7 +434,7 @@ void LwpDrawLine::Read() *m_pStream >> m_aLineRec.aPenColor.unused; } -rtl::OUString LwpDrawLine::RegisterStyle() +OUString LwpDrawLine::RegisterStyle() { XFDrawStyle* pStyle = new XFDrawStyle(); @@ -449,7 +449,7 @@ rtl::OUString LwpDrawLine::RegisterStyle() } -XFFrame* LwpDrawLine::CreateDrawObj(const rtl::OUString& rStyleName ) +XFFrame* LwpDrawLine::CreateDrawObj(const OUString& rStyleName ) { XFDrawPath* pLine = new XFDrawPath(); pLine->MoveTo(XFPoint((double)(m_aLineRec.nStartX)/TWIPS_PER_CM * m_pTransData->fScaleX, @@ -513,7 +513,7 @@ void LwpDrawPolyLine::Read() } } -rtl::OUString LwpDrawPolyLine::RegisterStyle() +OUString LwpDrawPolyLine::RegisterStyle() { XFDrawStyle* pStyle = new XFDrawStyle(); @@ -528,7 +528,7 @@ rtl::OUString LwpDrawPolyLine::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawPolyLine::CreateDrawObj(const rtl::OUString& rStyleName ) +XFFrame* LwpDrawPolyLine::CreateDrawObj(const OUString& rStyleName ) { XFDrawPath* pPolyline = new XFDrawPath(); pPolyline->MoveTo(XFPoint((double)m_pVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, @@ -593,7 +593,7 @@ void LwpDrawPolygon::Read() } } -rtl::OUString LwpDrawPolygon::RegisterStyle() +OUString LwpDrawPolygon::RegisterStyle() { XFDrawStyle* pStyle = new XFDrawStyle(); @@ -608,7 +608,7 @@ rtl::OUString LwpDrawPolygon::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawPolygon::CreateDrawObj(const rtl::OUString& rStyleName) +XFFrame* LwpDrawPolygon::CreateDrawObj(const OUString& rStyleName) { XFDrawPath* pPolygon = new XFDrawPath(); pPolygon->MoveTo(XFPoint((double)m_pVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, @@ -673,7 +673,7 @@ void LwpDrawRectangle::Read() } } -rtl::OUString LwpDrawRectangle::RegisterStyle() +OUString LwpDrawRectangle::RegisterStyle() { XFDrawStyle* pStyle = new XFDrawStyle(); @@ -688,7 +688,7 @@ rtl::OUString LwpDrawRectangle::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawRectangle::CreateDrawObj(const rtl::OUString& rStyleName) +XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName) { if (m_eType == OT_RNDRECT) { @@ -715,7 +715,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const rtl::OUString& rStyleName) } } -XFFrame* LwpDrawRectangle::CreateRoundedRect(const rtl::OUString& rStyleName) +XFFrame* LwpDrawRectangle::CreateRoundedRect(const OUString& rStyleName) { XFDrawPath* pRoundedRect = new XFDrawPath(); pRoundedRect->MoveTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, @@ -832,7 +832,7 @@ void LwpDrawEllipse::Read() } } -rtl::OUString LwpDrawEllipse::RegisterStyle() +OUString LwpDrawEllipse::RegisterStyle() { XFDrawStyle* pStyle = new XFDrawStyle(); @@ -847,7 +847,7 @@ rtl::OUString LwpDrawEllipse::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawEllipse::CreateDrawObj(const rtl::OUString& rStyleName ) +XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName ) { XFDrawPath* pEllipse = new XFDrawPath(); pEllipse->MoveTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, @@ -911,7 +911,7 @@ void LwpDrawArc::Read() } } -rtl::OUString LwpDrawArc::RegisterStyle() +OUString LwpDrawArc::RegisterStyle() { XFDrawStyle* pStyle = new XFDrawStyle(); @@ -926,7 +926,7 @@ rtl::OUString LwpDrawArc::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawArc::CreateDrawObj(const rtl::OUString& rStyleName ) +XFFrame* LwpDrawArc::CreateDrawObj(const OUString& rStyleName ) { XFDrawPath* pArc = new XFDrawPath(); pArc->MoveTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, @@ -1055,7 +1055,7 @@ void LwpDrawTextBox::Read() m_pStream->Read(m_aTextRec.pTextString, TextLength); } -rtl::OUString LwpDrawTextBox::RegisterStyle() +OUString LwpDrawTextBox::RegisterStyle() { XFParaStyle* pStyle = new XFParaStyle(); @@ -1064,7 +1064,7 @@ rtl::OUString LwpDrawTextBox::RegisterStyle() XFFont* pFont = new XFFont(); rtl_TextEncoding aEncoding = RTL_TEXTENCODING_MS_1252; - rtl::OUString aFontName = rtl::OUString((sal_Char*)m_aTextRec.tmpTextFaceName, + OUString aFontName = OUString((sal_Char*)m_aTextRec.tmpTextFaceName, strlen((char*)m_aTextRec.tmpTextFaceName), aEncoding); pFont->SetFontName(aFontName); @@ -1076,7 +1076,7 @@ rtl::OUString LwpDrawTextBox::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName ) +XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName ) { XFFrame* pTextBox = new XFFrame(sal_True); @@ -1093,7 +1093,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName ) } XFParagraph* pXFPara = new XFParagraph(); - pXFPara->Add(rtl::OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding)); + pXFPara->Add(OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding)); pXFPara->SetStyleName(rStyleName); pTextBox->Add(pXFPara); @@ -1247,7 +1247,7 @@ void LwpDrawTextArt::Read() } -rtl::OUString LwpDrawTextArt::RegisterStyle() +OUString LwpDrawTextArt::RegisterStyle() { XFParaStyle* pStyle = new XFParaStyle(); @@ -1256,7 +1256,7 @@ rtl::OUString LwpDrawTextArt::RegisterStyle() XFFont* pFont = new XFFont(); rtl_TextEncoding aEncoding = RTL_TEXTENCODING_MS_1252; - rtl::OUString aFontName = rtl::OUString((sal_Char*)m_aTextArtRec.tmpTextFaceName, + OUString aFontName = OUString((sal_Char*)m_aTextArtRec.tmpTextFaceName, strlen((char*)m_aTextArtRec.tmpTextFaceName), aEncoding); pFont->SetFontName(aFontName); @@ -1268,7 +1268,7 @@ rtl::OUString LwpDrawTextArt::RegisterStyle() return pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } -XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName) +XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName) { XFFrame* pRetObj = NULL; XFDrawStyle* pStyle = new XFDrawStyle(); @@ -1292,7 +1292,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName) } XFParagraph* pXFPara = new XFParagraph(); - pXFPara->Add(rtl::OUString((sal_Char*)m_aTextArtRec.pTextString, (m_aTextArtRec.nTextLen-1), aEncoding)); + pXFPara->Add(OUString((sal_Char*)m_aTextArtRec.pTextString, (m_aTextArtRec.nTextLen-1), aEncoding)); pXFPara->SetStyleName(rStyleName); pRetObj->Add(pXFPara); @@ -1302,7 +1302,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName) return pRetObj; } -XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const rtl::OUString& rStyleName ) +XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const OUString& rStyleName ) { return this->CreateDrawObj(rStyleName); } @@ -1457,7 +1457,7 @@ void LwpDrawBitmap::Read() m_pStream->Read(pPicData, nDIBRemaining); } -rtl::OUString LwpDrawBitmap::RegisterStyle() +OUString LwpDrawBitmap::RegisterStyle() { XFImageStyle* pBmpStyle = new XFImageStyle(); pBmpStyle->SetYPosType(enumXFFrameYPosFromTop, enumXFFrameYRelFrame); @@ -1467,7 +1467,7 @@ rtl::OUString LwpDrawBitmap::RegisterStyle() return pXFStyleManager->AddStyle(pBmpStyle)->GetStyleName(); } -XFFrame* LwpDrawBitmap::CreateDrawObj(const rtl::OUString& rStyleName) +XFFrame* LwpDrawBitmap::CreateDrawObj(const OUString& rStyleName) { XFImage* pImage = new XFImage(); pImage->SetImageData(m_pImageData, m_aBmpRec.nFileSize); diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx index 80a0430fdf57..e570b7c121c1 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.hxx +++ b/lotuswordpro/source/filter/lwpdrawobj.hxx @@ -95,7 +95,7 @@ protected: const SdwColor& rColor); void SetPosition(XFFrame* pObj); void SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag, sal_uInt8 nLineWidth); - rtl::OUString GetArrowName(sal_uInt8 nArrowStyle); + OUString GetArrowName(sal_uInt8 nArrowStyle); protected: /** @@ -107,21 +107,21 @@ protected: * @descr register styles of a draw object according to the saved records data. * @return the style name which has been registered. */ - virtual rtl::OUString RegisterStyle() = 0; + virtual OUString RegisterStyle() = 0; /** * @descr create XF-draw object and assign the style name to it. * @param style name. * @return pointer of the created XF-draw object. */ - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName) = 0; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) = 0; /** * @descr create XF-draw object and assign the style name to it. * @param style name. * @return pointer of the created XF-draw object. */ - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName) = 0; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) = 0; public: /** @@ -156,12 +156,12 @@ public: protected: virtual void Read() {} - virtual rtl::OUString RegisterStyle() + virtual OUString RegisterStyle() { - return rtl::OUString(); + return OUString(); } - virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; } - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; } + virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) { return NULL; } + virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) { return NULL; } }; @@ -180,9 +180,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; /** @@ -201,9 +201,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; @@ -223,9 +223,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; /** @@ -243,12 +243,12 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); private: - XFFrame* CreateRoundedRect(const rtl::OUString& rStyleName); + XFFrame* CreateRoundedRect(const OUString& rStyleName); }; /** @@ -266,9 +266,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; @@ -288,9 +288,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; /** @@ -311,9 +311,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; /** @@ -336,9 +336,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; /** @@ -353,12 +353,12 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle() + virtual OUString RegisterStyle() { - return rtl::OUString(); + return OUString(); } - virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;} - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;} + virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/){return NULL;} + virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/){return NULL;} }; /** @@ -376,9 +376,9 @@ public: protected: virtual void Read(); - virtual rtl::OUString RegisterStyle(); - virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName); - virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName); + virtual OUString RegisterStyle(); + virtual XFFrame* CreateDrawObj(const OUString& rStyleName); + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; #endif diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index 852e34ab656d..f1b082a7f2c2 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -93,11 +93,10 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; sal_Bool IsWordproFile( uno::Reference<XInputStream>& rInputStream); -sal_Bool IsWordproFile(rtl::OUString file); +sal_Bool IsWordproFile(OUString file); LWPFilterReader::LWPFilterReader() { @@ -110,7 +109,7 @@ LWPFilterReader::~LWPFilterReader() sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor ) throw( RuntimeException ) { - ::rtl::OUString sURL; + OUString sURL; for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ ) { //Note we should attempt to use "InputStream" if it exists first! @@ -206,11 +205,11 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro } -::rtl::OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString ret; - rtl::OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) + OUString ret; + OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) // opening as template is done when a parameter tells to do so and a template filter can be detected // (otherwise no valid filter would be found) or if the detected filter is a template filter and // there is no parameter that forbids to open as template @@ -247,7 +246,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro if(!bOpenAsTemplate) { aDescriptor.realloc( nPropertyCount + 1 ); - aDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate"); + aDescriptor[nPropertyCount].Name = OUString("AsTemplate"); aDescriptor[nPropertyCount].Value <<= sal_True; } return OUString("wordpro_template"); @@ -281,7 +280,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro if(!bOpenAsTemplate) { aDescriptor.realloc( nPropertyCount + 1 ); - aDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate"); + aDescriptor[nPropertyCount].Name = OUString("AsTemplate"); aDescriptor[nPropertyCount].Value <<= sal_True; } return OUString("wordpro_template"); @@ -450,7 +449,7 @@ sal_Bool IsWordProStr(const sal_Int8 *pBuf) return bRet; } -sal_Bool IsWordproFile(rtl::OUString file) +sal_Bool IsWordproFile(OUString file) { sal_Bool bRet = sal_False; SfxMedium aMedium( file, STREAM_STD_READ); diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 8d50f3c54982..3c058ec434ab 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -163,7 +163,7 @@ public: * @descr function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever * a file is to be loaded. */ - virtual ::rtl::OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException); public: uno::Reference< XFilter > rFilter; diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx index d54660f88f3f..24d1e37afb23 100644 --- a/lotuswordpro/source/filter/lwpfrib.hxx +++ b/lotuswordpro/source/filter/lwpfrib.hxx @@ -108,10 +108,10 @@ protected: LwpFrib* m_pNext; sal_uInt8 m_nFribType; ModifierInfo* m_pModifiers; - rtl::OUString m_StyleName; + OUString m_StyleName; public: sal_Bool m_ModFlag; - rtl::OUString GetStyleName(){return m_StyleName;}//add by 1-10 + OUString GetStyleName(){return m_StyleName;}//add by 1-10 // void SetStyle(LwpFoundry* pFoundry); sal_Bool IsModified(){return m_ModFlag;} void SetModifiers(ModifierInfo* pModifiers); diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx index 77db1448d460..5c293eb82d95 100644 --- a/lotuswordpro/source/filter/lwpfribmark.cxx +++ b/lotuswordpro/source/filter/lwpfribmark.cxx @@ -659,15 +659,15 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula) else if (sFormula == A2OUSTR("%FLeeeeoa") || sFormula == A2OUSTR("%FLffffooaa") || sFormula == A2OUSTR("%FLEEEEOA")) { pDateStyle = new XFDateStyle; - rtl::OUString sText; + OUString sText; pDateStyle->AddYear(); - sText = rtl::OUString(0x5e74); + sText = OUString(0x5e74); pDateStyle->AddText(sText); pDateStyle->AddMonth(sal_False); - sText = rtl::OUString(0x6708); + sText = OUString(0x6708); pDateStyle->AddText(sText); pDateStyle->AddMonthDay(sal_False); - sText = rtl::OUString(0x65e5); + sText = OUString(0x65e5); pDateStyle->AddText(sText); } else if (sFormula == A2OUSTR("%FLoa") || sFormula == A2OUSTR("%FLooaa") || sFormula == A2OUSTR("%FLOA") ) @@ -675,10 +675,10 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula) pDateStyle = new XFDateStyle; OUString sText; pDateStyle->AddMonth(sal_False); - sText = rtl::OUString(0x6708); + sText = OUString(0x6708); pDateStyle->AddText(sText); pDateStyle->AddMonthDay(sal_False); - sText = rtl::OUString(0x65e5); + sText = OUString(0x65e5); pDateStyle->AddText(sText); } else if (sFormula == A2OUSTR("%FLYYYY/M/D") || sFormula == A2OUSTR("%FLGGGG/od/ad")) @@ -967,11 +967,11 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula) { pTimeStyle = new XFTimeStyle; pTimeStyle->AddHour(sal_False); - rtl::OUString sText; - sText = rtl::OUString(0x70b9); + OUString sText; + sText = OUString(0x70b9); pTimeStyle->AddText(sText); pTimeStyle->AddMinute(sal_False); - sText = rtl::OUString(0x5206); + sText = OUString(0x5206); pTimeStyle->AddText(sText); } else if (sFormula == A2OUSTR("%FLjjjF") || sFormula == A2OUSTR("%FLJJJFF") ) @@ -979,11 +979,11 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula) pTimeStyle = new XFTimeStyle; pTimeStyle->SetAmPm(sal_True); pTimeStyle->AddHour(sal_False); - rtl::OUString sText; - sText = rtl::OUString(0x70b9); + OUString sText; + sText = OUString(0x70b9); pTimeStyle->AddText(sText); pTimeStyle->AddMinute(sal_False); - sText = rtl::OUString(0x5206); + sText = OUString(0x5206); pTimeStyle->AddText(sText); } //chinese version end diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 239df1787504..89c0db7b5029 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -269,7 +269,7 @@ void LwpFribPtr::XFConvert() break; case FRIB_TAG_HARDSPACE: { - rtl::OUString sHardSpace(sal_Unicode(0x00a0)); + OUString sHardSpace(sal_Unicode(0x00a0)); LwpHyperlinkMgr* pHyperlink = m_pPara->GetStory()->GetHyperlinkMgr(); if (pHyperlink->GetHyperlinkFlag()) @@ -280,7 +280,7 @@ void LwpFribPtr::XFConvert() break; case FRIB_TAG_SOFTHYPHEN: { - rtl::OUString sSoftHyphen(sal_Unicode(0x00ad)); + OUString sSoftHyphen(sal_Unicode(0x00ad)); pFrib->ConvertChars(m_pXFPara,sSoftHyphen); } break; diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx index 71dcc243d7dd..489b0cfd47ce 100644 --- a/lotuswordpro/source/filter/lwpglobalmgr.cxx +++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx @@ -137,7 +137,7 @@ void LwpGlobalMgr::SetEditorAttrMap(sal_uInt16 nID, LwpEditorAttr* pAttr) m_EditorAttrMap[nID] = pAttr; } -rtl::OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID) +OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID) { std::map<sal_uInt16,LwpEditorAttr*>::iterator iter; iter = m_EditorAttrMap.find(nID); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index aa6fa88968af..171ab2c69776 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -701,7 +701,7 @@ void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont) { pEquData[nIndex] = pGrafData[nBegin + nIndex]; } - pXFNotePara->Add(rtl::OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), osl_getThreadTextEncoding())); + pXFNotePara->Add(OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), osl_getThreadTextEncoding())); delete [] pEquData; } pXFNote->Add(pXFNotePara); diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index 8c22e0bc2af2..4956575ec1ba 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -304,14 +304,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP { if (bNegtive) { - aPrefix = rtl::OUString("("); + aPrefix = OUString("("); } if (!bPost) { aPrefix += aSymbol; if (bShowSpace) { - aPrefix += rtl::OUString(" "); + aPrefix += OUString(" "); } } } @@ -322,14 +322,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP aSuffix = aSymbol; if (bShowSpace) { - aSuffix.Insert(rtl::OUString(" "),0); + aSuffix.Insert(OUString(" "),0); } } if (bNegtive) { - aSuffix += rtl::OUString(")"); + aSuffix += OUString(")"); } } } @@ -421,11 +421,11 @@ XFStyle* LwpNumericFormat::Convert() { if (cNegative.IsDefaultPrefix() && aNegPrefix.Len() == 0) { - aNegPrefix = rtl::OUString("("); + aNegPrefix = OUString("("); } if (cNegative.IsDefaultSuffix() && aNegSuffix.Len() == 0) { - aNegSuffix = rtl::OUString(")"); + aNegSuffix = OUString(")"); } } diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 97ff249d0e86..25e14e5b393d 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -193,50 +193,50 @@ private: void InitCurrencySymbol() { sal_uInt16 nC=FMT_ARGENTINEANPESO; - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A")); //FMT_ARGENTINEANPESO = 1, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A$")); //FMT_AUSTRALIANDOLLAR = 2, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("A")); //FMT_ARGENTINEANPESO = 1, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("A$")); //FMT_AUSTRALIANDOLLAR = 2, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("￡",RTL_TEXTENCODING_UTF8)); //FMT_BRITISHPOUND = 6, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("C$")); //FMT_CANADIANDOLLAR = 7, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("C$")); //FMT_CANADIANDOLLAR = 7, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("PRC￥",RTL_TEXTENCODING_UTF8),sal_False,sal_True); //FMT_CHINESEYUAN = 8, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("ECU"),sal_True, sal_True);//FMT_ECU = 11, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("HK$")); //FMT_HONGKONGDOLLAR = 16, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("ECU"),sal_True, sal_True);//FMT_ECU = 11, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("HK$")); //FMT_HONGKONGDOLLAR = 16, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("IR￡",RTL_TEXTENCODING_UTF8)); //FMT_IRISHPUNT = 20, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("￥",RTL_TEXTENCODING_UTF8)); //FMT_JAPANESEYEN = 22, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Mex$")); //FMT_MEXICANPESO = 25, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NZ$")); //FMT_NEWZEALANDDOLLAR = 27, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("S$")); //FMT_SINGAPOREDOLLAR = 33, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R")); //FMT_SOUTHAFRICANRAND = 36, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("W")); //FMT_SOUTHKOREANWON = 37, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NT$")); //FMT_TAIWANDOLLAR = 41, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("$")); //FMT_USDOLLAR = 43, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Mex$")); //FMT_MEXICANPESO = 25, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("NZ$")); //FMT_NEWZEALANDDOLLAR = 27, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("S$")); //FMT_SINGAPOREDOLLAR = 33, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R")); //FMT_SOUTHAFRICANRAND = 36, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("W")); //FMT_SOUTHKOREANWON = 37, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("NT$")); //FMT_TAIWANDOLLAR = 41, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("$")); //FMT_USDOLLAR = 43, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44, m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(String("€",RTL_TEXTENCODING_UTF8)); //FMT_EURO = 52 } diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx index 0c54a2bd4d8c..41680114c34f 100644 --- a/lotuswordpro/source/filter/lwpobjid.hxx +++ b/lotuswordpro/source/filter/lwpobjid.hxx @@ -143,14 +143,14 @@ inline void LwpObjectID::SetHigh(sal_uInt16 nh) } inline size_t LwpObjectID::HashCode() const { - rtl::OUString str; + OUString str; if(m_nIndex) { - str = rtl::OUString(m_nIndex) + rtl::OUString(m_nHigh); + str = OUString(m_nIndex) + OUString(m_nHigh); } else { - str = rtl::OUString(m_nLow) + rtl::OUString(m_nHigh); + str = OUString(m_nLow) + OUString(m_nHigh); } return str.hashCode(); } diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index 78720e2372a1..2c83616d5a97 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -102,7 +102,7 @@ protected: LwpObjectID m_pPrevObj; LwpObjectID m_pNextObj; - rtl::OUString m_strStyleName; + OUString m_strStyleName; }; /** diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index e274aa37cfb5..5628772dfdef 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -570,7 +570,7 @@ void LwpPara::RegisterStyle() // test codes if (m_pSilverBullet->IsBulletOrdered()) { - rtl::OUString aPreBullStyleName; + OUString aPreBullStyleName; LwpNumberingOverride* pNumbering = this->GetParaNumbering(); sal_uInt16 nPosition = pNumbering->GetPosition(); sal_Bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition); diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index 220d48e3dd04..37dab63f6b9c 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -170,7 +170,7 @@ public: inline LwpSilverBullet* GetSilverBullet(); inline LwpObjectID GetSilverBulletID(); - rtl::OUString GetBulletChar() const; + OUString GetBulletChar() const; sal_uInt32 GetBulletFontID() const; sal_uInt16 GetLevel() const; sal_Bool GetBulletFlag() const; @@ -180,12 +180,12 @@ public: double GetBelowSpacing(); LwpParaProperty* GetProperty(sal_uInt32 nPropType); void GatherDropcapInfo(); - rtl::OUString GetBulletStyleName() const; + OUString GetBulletStyleName() const; void SetBelowSpacing(double value); - void SetBulletStyleName(const rtl::OUString& rNewName); + void SetBulletStyleName(const OUString& rNewName); void SetBulletFlag(sal_Bool bFlag); void SetIndent(LwpIndentOverride* pIndentOverride); - void SetFirstFrib(rtl::OUString Content,sal_uInt32 FontID); + void SetFirstFrib(OUString Content,sal_uInt32 FontID); OUString GetContentText(sal_Bool bAllText = sal_False); void SetParaDropcap(sal_Bool bFlag); @@ -222,25 +222,25 @@ protected: LwpParaProperty* m_pProps; //LwpForked3NotifyList* m_NotifyList; //not saved - rtl::OUString m_StyleName; - rtl::OUString m_ParentStyleName;//Add to support toc + OUString m_StyleName; + OUString m_ParentStyleName;//Add to support toc LwpBreaksOverride* m_pBreaks; - rtl::OUString m_AftPageBreakName; - rtl::OUString m_BefPageBreakName; - rtl::OUString m_AftColumnBreakName; + OUString m_AftPageBreakName; + OUString m_BefPageBreakName; + OUString m_AftColumnBreakName; - rtl::OUString m_BefColumnBreakName; + OUString m_BefColumnBreakName; LwpIndentOverride* m_pIndentOverride; - rtl::OUString m_Content;//for silver bullet,get text of first frib, add by 2/1 + OUString m_Content;//for silver bullet,get text of first frib, add by 2/1 sal_uInt32 m_FontID;//for silver bullet - rtl::OUString m_AllText;//get all text in this paragraph + OUString m_AllText;//get all text in this paragraph sal_Bool m_bHasBullet; LwpObjectID m_aSilverBulletID; LwpSilverBullet* m_pSilverBullet; LwpBulletOverride* m_pBullOver; boost::scoped_ptr<LwpNumberingOverride> m_pParaNumbering; - rtl::OUString m_aBulletStyleName; + OUString m_aBulletStyleName; sal_Bool m_bBullContinue; //end add @@ -253,7 +253,7 @@ protected: XFContentContainer* m_pXFContainer; //Current container for VO_PARA - rtl::OUString m_TabStyleName; + OUString m_TabStyleName; enum { /* bit definitions for the paragraph object flags */ @@ -305,7 +305,7 @@ inline LwpObjectID LwpPara::GetSilverBulletID() { return m_aSilverBulletID; } -inline rtl::OUString LwpPara::GetBulletChar() const +inline OUString LwpPara::GetBulletChar() const { return m_Content; } @@ -317,7 +317,7 @@ inline sal_uInt16 LwpPara::GetLevel() const { return m_nLevel; } -inline void LwpPara::SetBulletStyleName(const rtl::OUString& rNewName) +inline void LwpPara::SetBulletStyleName(const OUString& rNewName) { m_aBulletStyleName = rNewName; } @@ -341,7 +341,7 @@ inline XFContentContainer* LwpPara::GetXFContainer() { return m_pXFContainer; } -inline rtl::OUString LwpPara::GetBulletStyleName() const +inline OUString LwpPara::GetBulletStyleName() const { return m_aBulletStyleName; } diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 30f33fa6c40a..06690f8e43f8 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -142,7 +142,7 @@ void LwpPara::SetAllText(OUString sText) /** * @short set first frib content */ -void LwpPara::SetFirstFrib(rtl::OUString Content,sal_uInt32 FontID) +void LwpPara::SetFirstFrib(OUString Content,sal_uInt32 FontID) { m_FontID= FontID; m_Content=Content; diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx index 320f60c9ab0c..27dedc073512 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.cxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx @@ -131,7 +131,7 @@ void LwpSilverBullet::RegisterStyle() m_pHideLevels[nPos] = aParaNumbering.nNumLevel; sal_uInt16 nDisplayLevel = this->GetDisplayLevel(nPos); bCumulative = (sal_Bool)(nDisplayLevel > 1); - rtl::OUString aPrefix = this->GetAdditionalName(nPos); + OUString aPrefix = this->GetAdditionalName(nPos); XFNumFmt aFmt; if (!bCumulative && aParaNumbering.pPrefix) @@ -157,7 +157,7 @@ void LwpSilverBullet::RegisterStyle() } else { - rtl::OUString aPrefix, aSuffix; + OUString aPrefix, aSuffix; if (aParaNumbering.pPrefix) { aPrefix = aParaNumbering.pPrefix->GetText(); @@ -168,7 +168,7 @@ void LwpSilverBullet::RegisterStyle() } pListStyle->SetListBullet(nPos, this->GetNumCharByStyleID(pParaNumber).toChar(), - rtl::OUString("Times New Roman"), aPrefix, aSuffix); + OUString("Times New Roman"), aPrefix, aSuffix); } pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0); @@ -186,9 +186,9 @@ void LwpSilverBullet::RegisterStyle() * @descr: * @return: Font name of the bullet. */ -rtl::OUString LwpSilverBullet::GetBulletFontName() +OUString LwpSilverBullet::GetBulletFontName() { - rtl::OUString aEmpty; + OUString aEmpty; //foundry has been set? if (!m_pFoundry) @@ -212,7 +212,7 @@ rtl::OUString LwpSilverBullet::GetBulletFontName() } //get font name from font manager. - rtl::OUString aFontName = pFontMgr->GetNameByID(nBulletFontID); + OUString aFontName = pFontMgr->GetNameByID(nBulletFontID); return aFontName; } @@ -223,7 +223,7 @@ rtl::OUString LwpSilverBullet::GetBulletFontName() */ UChar32 LwpSilverBullet::GetBulletChar() { - rtl::OUString aBulletChar = m_pBulletPara->GetBulletChar(); + OUString aBulletChar = m_pBulletPara->GetBulletChar(); return aBulletChar.toChar(); } @@ -254,9 +254,9 @@ LwpPara* LwpSilverBullet::GetBulletPara() * includes numbering prefix, format and suffix. * @return: An OUString object which store the numbering character. */ -rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber) +OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber) { - rtl::OUString aEmpty; + OUString aEmpty; if (!pParaNumber) { @@ -264,7 +264,7 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe return aEmpty; } - rtl::OUString strNumChar("1"); + OUString strNumChar("1"); sal_uInt16 nStyleID = pParaNumber->GetStyleID(); UChar32 uC = 0x0000; @@ -273,40 +273,40 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe case NUMCHAR_1: case NUMCHAR_01: case NUMCHAR_Chinese4: - strNumChar = rtl::OUString("1"); + strNumChar = OUString("1"); break; case NUMCHAR_A : - strNumChar = rtl::OUString("A"); + strNumChar = OUString("A"); break; case NUMCHAR_a: - strNumChar = rtl::OUString("a"); + strNumChar = OUString("a"); break; case NUMCHAR_I: - strNumChar = rtl::OUString("I"); + strNumChar = OUString("I"); break; case NUMCHAR_i: - strNumChar = rtl::OUString("i"); + strNumChar = OUString("i"); break; case NUMCHAR_other: uC = static_cast<UChar32>(pParaNumber->GetNumberChar()); - strNumChar = rtl::OUString(uC); + strNumChar = OUString(uC); break; case NUMCHAR_Chinese1: { sal_Unicode sBuf[13] = {0x58f9,0x002c,0x0020,0x8d30,0x002c,0x0020,0x53c1,0x002c,0x0020,0x002e,0x002e,0x002e,0x0}; - strNumChar = rtl::OUString(sBuf); + strNumChar = OUString(sBuf); } break; case NUMCHAR_Chinese2: { sal_Unicode sBuf[13] = {0x4e00,0x002c,0x0020,0x4e8c,0x002c,0x0020,0x4e09,0x002c,0x0020,0x002e,0x002e,0x002e,0x0}; - strNumChar = rtl::OUString(sBuf); + strNumChar = OUString(sBuf); } break; case NUMCHAR_Chinese3: { sal_Unicode sBuf[13] = {0x7532,0x002c,0x0020,0x4e59,0x002c,0x0020,0x4e19,0x002c,0x0020,0x002e,0x002e,0x002e,0x0}; - strNumChar = rtl::OUString(sBuf); + strNumChar = OUString(sBuf); } break; case NUMCHAR_none: @@ -367,9 +367,9 @@ sal_uInt16 LwpSilverBullet::GetDisplayLevel(sal_uInt8 nPos) * @param: nPos position of the numbering. * @return: Division or Section name. */ -rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos) +OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos) { - rtl::OUString aRet, aEmpty; + OUString aRet, aEmpty; sal_uInt16 nHideBit = (1 << nPos); sal_Bool bDivisionName = sal_False; sal_Bool bSectionName = sal_False; @@ -419,9 +419,9 @@ rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos) return aRet; } -rtl::OUString LwpSilverBullet::GetDivisionName() +OUString LwpSilverBullet::GetDivisionName() { - rtl::OUString aRet; + OUString aRet; if (!m_pFoundry) { @@ -443,9 +443,9 @@ rtl::OUString LwpSilverBullet::GetDivisionName() return aRet; } -rtl::OUString LwpSilverBullet::GetSectionName() +OUString LwpSilverBullet::GetSectionName() { - rtl::OUString aEmpty; + OUString aEmpty; LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY)); if (!pStory) { diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx index 709fb85ef4d4..342e06a09bbe 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.hxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx @@ -103,23 +103,23 @@ public: sal_Bool IsBulletOrdered(); - rtl::OUString GetBulletFontName(); + OUString GetBulletFontName(); - inline rtl::OUString GetBulletStyleName() const; + inline OUString GetBulletStyleName() const; UChar32 GetBulletChar(); - rtl::OUString GetPrefix() { return rtl::OUString(); } + OUString GetPrefix() { return OUString(); } - rtl::OUString GetSuffix() { return rtl::OUString(); } + OUString GetSuffix() { return OUString(); } - inline rtl::OUString GetNumberingName(); + inline OUString GetNumberingName(); inline LwpPara* GetNumberingPara(); sal_Bool HasName(); - static rtl::OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber); + static OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber); inline sal_Bool IsPosCumulative(sal_uInt16 nHideLevels); inline sal_Bool IsLesserLevel(sal_uInt16 nPos); @@ -129,11 +129,11 @@ public: sal_uInt16 GetDisplayLevel(sal_uInt8 nPos); - rtl::OUString GetAdditionalName(sal_uInt8 nPos); + OUString GetAdditionalName(sal_uInt8 nPos); - rtl::OUString GetDivisionName(); + OUString GetDivisionName(); - rtl::OUString GetSectionName(); + OUString GetSectionName(); private: sal_uInt16 m_nFlags; @@ -143,7 +143,7 @@ private: LwpAtomHolder* m_pAtomHolder; LwpPara* m_pBulletPara; - rtl::OUString m_strStyleName; + OUString m_strStyleName; sal_uInt16 m_pHideLevels[10]; private: @@ -156,12 +156,12 @@ private: CUMULATIVE = 0x10 }; }; -inline rtl::OUString LwpSilverBullet::GetBulletStyleName() const +inline OUString LwpSilverBullet::GetBulletStyleName() const { return m_strStyleName; } -inline rtl::OUString LwpSilverBullet::GetNumberingName() +inline OUString LwpSilverBullet::GetNumberingName() { return GetName()->str(); } diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx index 5b2e6f62496c..3edee62ca07b 100644 --- a/lotuswordpro/source/filter/lwpstory.cxx +++ b/lotuswordpro/source/filter/lwpstory.cxx @@ -511,12 +511,12 @@ OUString LwpStory::RegisterFirstFribStyle() return A2OUSTR(""); } -sal_Bool LwpStory::IsBullStyleUsedBefore(const rtl::OUString& rStyleName, const sal_uInt8& nPos) +sal_Bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos) { std::vector <NamePosPair>::reverse_iterator rIter; for (rIter = m_vBulletStyleNameList.rbegin(); rIter != m_vBulletStyleNameList.rend(); ++rIter) { - rtl::OUString aName = (*rIter).first; + OUString aName = (*rIter).first; sal_uInt8 nPosition = (*rIter).second; if (aName == rStyleName && nPosition == nPos) { diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx index 7bbd2b5a2f99..8ef75e32604b 100644 --- a/lotuswordpro/source/filter/lwpstory.hxx +++ b/lotuswordpro/source/filter/lwpstory.hxx @@ -80,7 +80,7 @@ private: LwpObjectID m_FirstParaStyle; // for bullet , 05/23/2005 - typedef std::pair<rtl::OUString, sal_uInt8> NamePosPair; + typedef std::pair<OUString, sal_uInt8> NamePosPair; std::vector <NamePosPair> m_vBulletStyleNameList; // , 02/16/2005 @@ -133,8 +133,8 @@ public: LwpPara* GetLastParaOfPreviousStory(); OUString GetContentText(sal_Bool bAllText = sal_False);//add by ,for CHB,05/5/25 - inline void AddBullStyleName2List(const rtl::OUString& rStyleName, const sal_uInt8& nPos); - sal_Bool IsBullStyleUsedBefore(const rtl::OUString& rStyleName, const sal_uInt8& nPos); + inline void AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos); + sal_Bool IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos); OUString RegisterFirstFribStyle(); }; @@ -193,7 +193,7 @@ LwpHyperlinkMgr* LwpStory::GetHyperlinkMgr() { return m_pHyperlinkMgr; } -inline void LwpStory::AddBullStyleName2List(const rtl::OUString& rStyleName, const sal_uInt8& nPos) +inline void LwpStory::AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos) { m_vBulletStyleNameList.push_back(std::make_pair(rStyleName, nPos)); } diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index e8acdfe0aa25..a9988bc27249 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -128,9 +128,9 @@ sal_Bool LwpFormulaInfo::ReadText() m_pObjStrm->QuickRead( pBuf.get(), nStrLen ); *(pBuf.get()+nStrLen)='\0'; String aText; - aText += rtl::OUString("\""); + aText += OUString("\""); aText.Append(String(pBuf.get(),nStrLen,osl_getThreadTextEncoding())); - aText += rtl::OUString("\""); + aText += OUString("\""); m_aStack.push_back(new LwpFormulaText(aText)); return sal_True; @@ -446,9 +446,9 @@ LwpFormulaConst::LwpFormulaConst(double dVal) m_dVal = dVal; } -rtl::OUString LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/) +OUString LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/) { - return rtl::OUString::valueOf(m_dVal); + return OUString::valueOf(m_dVal); } /** @@ -483,7 +483,7 @@ LwpFormulaCellAddr::LwpFormulaCellAddr(sal_Int16 aCol, sal_Int16 aRow) * @param * @return String */ -rtl::OUString LwpFormulaCellAddr::ToString(LwpTableLayout* pCellsMap) +OUString LwpFormulaCellAddr::ToString(LwpTableLayout* pCellsMap) { String aCellAddr; aCellAddr.AppendAscii("<");//< @@ -519,7 +519,7 @@ LwpFormulaCellRangeAddr::LwpFormulaCellRangeAddr(sal_Int16 aStartCol, * @param * @return String. */ -rtl::OUString LwpFormulaCellRangeAddr::ToString(LwpTableLayout* pCellsMap) +OUString LwpFormulaCellRangeAddr::ToString(LwpTableLayout* pCellsMap) { String aCellAddr; aCellAddr.AppendAscii("<");//< @@ -587,7 +587,7 @@ void LwpFormulaFunc::AddArg(LwpFormulaArg* pArg) */ String LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap) { - rtl::OUStringBuffer aFormula; + OUStringBuffer aFormula; aFormula.append(static_cast<sal_Unicode>('(')); aFormula.append(ToString(pCellsMap)); aFormula.append(static_cast<sal_Unicode>(')')); @@ -600,7 +600,7 @@ String LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap) * @param * @return sal_Bool. */ -rtl::OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap) +OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap) { String aFormula; @@ -636,7 +636,7 @@ rtl::OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap) * @param * @return sal_Bool. */ -rtl::OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap) +OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap) { String aFormula; if (2==m_aArgs.size()) @@ -669,7 +669,7 @@ rtl::OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap) * @param * @return sal_Bool. */ -rtl::OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap) +OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap) { String aFormula; if (1==m_aArgs.size()) @@ -699,64 +699,64 @@ String LwpFormulaTools::GetName(sal_uInt16 nTokenType) switch(nTokenType) { case TK_SUM: - aName = rtl::OUString("SUM"); + aName = OUString("SUM"); break; case TK_IF: - aName = rtl::OUString("IF");//Not supported by SODC + aName = OUString("IF");//Not supported by SODC break; case TK_COUNT: - aName = rtl::OUString("COUNT");//Not supported by SODC + aName = OUString("COUNT");//Not supported by SODC break; case TK_MINIMUM: - aName = rtl::OUString("MIN"); + aName = OUString("MIN"); break; case TK_MAXIMUM: - aName = rtl::OUString("MAX"); + aName = OUString("MAX"); break; case TK_AVERAGE: - aName = rtl::OUString("MEAN"); + aName = OUString("MEAN"); break; case TK_ADD: - aName = rtl::OUString("+"); + aName = OUString("+"); break; case TK_SUBTRACT: - aName = rtl::OUString("-"); + aName = OUString("-"); break; case TK_MULTIPLY: - aName = rtl::OUString("*"); + aName = OUString("*"); break; case TK_DIVIDE: - aName = rtl::OUString("/"); + aName = OUString("/"); break; case TK_UNARY_MINUS: - aName = rtl::OUString("-"); + aName = OUString("-"); break; case TK_LESS: - aName = rtl::OUString("L"); + aName = OUString("L"); break; case TK_LESS_OR_EQUAL: - aName = rtl::OUString("LEQ"); + aName = OUString("LEQ"); break; case TK_GREATER: - aName = rtl::OUString("G"); + aName = OUString("G"); break; case TK_GREATER_OR_EQUAL: - aName = rtl::OUString("GEQ"); + aName = OUString("GEQ"); break; case TK_EQUAL: - aName = rtl::OUString("EQ"); + aName = OUString("EQ"); break; case TK_NOT_EQUAL: - aName = rtl::OUString("NEQ"); + aName = OUString("NEQ"); break; case TK_NOT: - aName = rtl::OUString("NOT"); + aName = OUString("NOT"); break; case TK_AND: - aName = rtl::OUString("AND"); + aName = OUString("AND"); break; case TK_OR: - aName = rtl::OUString("OR"); + aName = OUString("OR"); break; default: assert(false); diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index ceaa41970a32..8efc8975d28a 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -110,7 +110,7 @@ class LwpFormulaArg { public: virtual ~LwpFormulaArg() = 0; - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap)=0; + virtual OUString ToString(LwpTableLayout* pCellsMap)=0; virtual String ToArgString(LwpTableLayout* pCellsMap){ return ToString(pCellsMap);} }; @@ -125,7 +125,7 @@ class LwpFormulaConst:public LwpFormulaArg { public: LwpFormulaConst( double dVal); - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap); + virtual OUString ToString(LwpTableLayout* pCellsMap); private: double m_dVal; }; @@ -134,7 +134,7 @@ class LwpFormulaText:public LwpFormulaArg { public: LwpFormulaText( String aText); - virtual rtl::OUString ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;} + virtual OUString ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;} private: String m_aText; }; @@ -147,7 +147,7 @@ public: sal_Int16 GetCol(){return m_aCol;} sal_Int16 GetRow(){return m_aRow;} - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap); + virtual OUString ToString(LwpTableLayout* pCellsMap); private: sal_Int16 m_aCol; sal_Int16 m_aRow; @@ -158,7 +158,7 @@ class LwpFormulaCellRangeAddr:public LwpFormulaArg public: LwpFormulaCellRangeAddr(sal_Int16 aStartCol, sal_Int16 aStartRow, sal_Int16 aEndCol, sal_Int16 aEndRow); - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap); + virtual OUString ToString(LwpTableLayout* pCellsMap); private: sal_Int16 m_aStartCol; sal_Int16 m_aStartRow; @@ -174,7 +174,7 @@ public: void AddArg(LwpFormulaArg* pArg); - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap); + virtual OUString ToString(LwpTableLayout* pCellsMap); String ToArgString(LwpTableLayout* pCellsMap); protected: @@ -186,14 +186,14 @@ class LwpFormulaOp : public LwpFormulaFunc { public: LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;} - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap); + virtual OUString ToString(LwpTableLayout* pCellsMap); }; class LwpFormulaUnaryOp : public LwpFormulaFunc { public: LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;} - virtual rtl::OUString ToString(LwpTableLayout* pCellsMap); + virtual OUString ToString(LwpTableLayout* pCellsMap); }; diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx index 7eb92efe9156..ef4af4549ca3 100644 --- a/lotuswordpro/source/filter/lwptoc.cxx +++ b/lotuswordpro/source/filter/lwptoc.cxx @@ -153,7 +153,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont) if(!pLevel) { // add an blank template so that SODC won't add default style to this level - pToc->AddTemplate(Int32ToOUString(i), rtl::OUString(), pTemplate); + pToc->AddTemplate(Int32ToOUString(i), OUString(), pTemplate); continue; } diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index a965917168f2..53b3a021a54e 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -133,7 +133,7 @@ private: std::vector<std::pair<OUString,OUString> > m_TOCList; - rtl::OUString m_TabStyleName; + OUString m_TabStyleName; XFContentContainer* m_pCont; }; diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx index 07879029c2e5..dd723cc42816 100644 --- a/lotuswordpro/source/filter/lwptools.cxx +++ b/lotuswordpro/source/filter/lwptools.cxx @@ -235,7 +235,7 @@ OUString LwpTools::convertToFileUrl(const OString &fileName) OUString LwpTools::DateTimeToOUString(LtTm & dt) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(dt.tm_year); buf.append( A2OUSTR("-") ); buf.append(dt.tm_mon); @@ -262,10 +262,10 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat) else style = icu::DateFormat::SHORT;//system short date format /* ::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLocale(); - rtl::OUString strLang = aLocale.Language; - rtl::OUString strCountry = aLocale.Country; + OUString strLang = aLocale.Language; + OUString strCountry = aLocale.Country; strLang = strLang + A2OUSTR("_"); - rtl::OUString strLocale = strLang + strCountry; + OUString strLocale = strLang + strCountry; int32_t nLength = 0; int32_t nLengthNeed; @@ -287,8 +287,8 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat) /* FIXME-BCP47: handle language tags! */ //1 get locale for system ::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLanguageTag().getLocale(); - rtl::OUString strLang = aLocale.Language; - rtl::OUString strCountry = aLocale.Country; + OUString strLang = aLocale.Language; + OUString strCountry = aLocale.Country; icu::Locale bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()), (char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr())); //2 get icu format pattern by locale @@ -676,10 +676,10 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat) XFTimeStyle* LwpTools::GetSystemTimeStyle() { /* ::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLocale(); - rtl::OUString strLang = aLocale.Language; - rtl::OUString strCountry = aLocale.Country; + OUString strLang = aLocale.Language; + OUString strCountry = aLocale.Country; strLang = strLang + A2OUSTR("_"); - rtl::OUString strLocale = strLang + strCountry; + OUString strLocale = strLang + strCountry; int32_t nLength = 0; int32_t nLengthNeed; @@ -701,8 +701,8 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle() /* FIXME-BCP47: handle language tags! */ //1 get locale for system ::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLanguageTag().getLocale(); - rtl::OUString strLang = aLocale.Language; - rtl::OUString strCountry = aLocale.Country; + OUString strLang = aLocale.Language; + OUString strCountry = aLocale.Country; icu::Locale bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()), (char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr())); diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx index 1ecc9cd6643e..2ed2f41f8d11 100644 --- a/lotuswordpro/source/filter/lwptools.hxx +++ b/lotuswordpro/source/filter/lwptools.hxx @@ -106,7 +106,7 @@ public: static sal_Bool isFileUrl(const OString& fileName); static OUString convertToFileUrl(const OString& fileName); - static rtl::OUString DateTimeToOUString(LtTm& dt); + static OUString DateTimeToOUString(LtTm& dt); static XFDateStyle* GetSystemDateStyle(sal_Bool bLongFormat); static XFTimeStyle* GetSystemTimeStyle(); diff --git a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx b/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx index 60a71e2126d9..30265d9a0dee 100644 --- a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx @@ -75,7 +75,7 @@ public: /** * @descr: Add a attribute to the attribute list. */ - virtual void AddAttribute(const rtl::OUString& name, const rtl::OUString& value) = 0; + virtual void AddAttribute(const OUString& name, const OUString& value) = 0; /** * @descr: Clear all the attributes in the attribute list. diff --git a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx index 500ca86553c1..27715d416ba9 100644 --- a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx @@ -79,12 +79,12 @@ public: * @descr Set style to apply. You can get the style name by use XFStyleManager::AddStyle(pStyle), * or just set a fixed style name. */ - virtual void SetStyleName(rtl::OUString style) = 0; + virtual void SetStyleName(OUString style) = 0; /** * @descr return the style name. */ - virtual rtl::OUString GetStyleName() = 0; + virtual OUString GetStyleName() = 0; /** * @descr Deep copy. diff --git a/lotuswordpro/source/filter/xfilter/ixfstream.hxx b/lotuswordpro/source/filter/xfilter/ixfstream.hxx index 9a120f82bf39..d400b98326c6 100644 --- a/lotuswordpro/source/filter/xfilter/ixfstream.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfstream.hxx @@ -87,19 +87,19 @@ public: * @descr Wrap XDocumentHandler::startElement() * @param oustr element tag name. */ - virtual void StartElement(const rtl::OUString& oustr) = 0; + virtual void StartElement(const OUString& oustr) = 0; /** * @descr Wrap XDocumentHandler::endElement() * @param oustr element tag name. */ - virtual void EndElement(const rtl::OUString& oustr) = 0; + virtual void EndElement(const OUString& oustr) = 0; /** * @descr output text node. * @param oustr text content. */ - virtual void Characters(const rtl::OUString& oustr) = 0; + virtual void Characters(const OUString& oustr) = 0; /** * @descr return the Attribute list interface. diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx index 94596056b988..5309a2866e4b 100644 --- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx @@ -72,21 +72,21 @@ public: /** * @descr: return the style name. */ - virtual rtl::OUString GetStyleName() = 0; + virtual OUString GetStyleName() = 0; /** * @descr: set the name of the style. */ - virtual void SetStyleName(const rtl::OUString& styleName) = 0; + virtual void SetStyleName(const OUString& styleName) = 0; /** * @descr return the parent style name. */ - virtual rtl::OUString GetParentStyleName() = 0; + virtual OUString GetParentStyleName() = 0; /** * @descr: Parant paragraph style. */ - virtual void SetParentStyleName(const rtl::OUString& parent) = 0; + virtual void SetParentStyleName(const OUString& parent) = 0; /** * @descr: return the style family. You can reference to enumXFStyle. */ diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx index abeac7369e70..5c88f41be6cb 100644 --- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx +++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx @@ -67,23 +67,23 @@ class XFAnnotation : public XFContentContainer { public: - void SetDate(rtl::OUString date); + void SetDate(OUString date); - void SetAuthor(rtl::OUString author); + void SetAuthor(OUString author); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strDate; - rtl::OUString m_strAuthor; + OUString m_strDate; + OUString m_strAuthor; }; -inline void XFAnnotation::SetDate(rtl::OUString date) +inline void XFAnnotation::SetDate(OUString date) { m_strDate = date; } -inline void XFAnnotation::SetAuthor(rtl::OUString author) +inline void XFAnnotation::SetAuthor(OUString author) { m_strAuthor = author; } diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx index 5f413b7423c5..186d89c5313d 100644 --- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx @@ -68,37 +68,37 @@ public: XFArrowStyle(); public: - void SetArrowName(rtl::OUString name); + void SetArrowName(OUString name); - void SetViewbox(rtl::OUString viewBox); + void SetViewbox(OUString viewBox); - void SetSVGPath(rtl::OUString path); + void SetSVGPath(OUString path); virtual enumXFStyle GetStyleFamily(); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strName; - rtl::OUString m_strViewBox; - rtl::OUString m_strPath; + OUString m_strName; + OUString m_strViewBox; + OUString m_strPath; }; inline XFArrowStyle::XFArrowStyle() { } -inline void XFArrowStyle::SetArrowName(rtl::OUString name) +inline void XFArrowStyle::SetArrowName(OUString name) { m_strName = name; } -inline void XFArrowStyle::SetViewbox(rtl::OUString viewBox) +inline void XFArrowStyle::SetViewbox(OUString viewBox) { m_strViewBox = viewBox; } -inline void XFArrowStyle::SetSVGPath(rtl::OUString path) +inline void XFArrowStyle::SetSVGPath(OUString path) { m_strPath = path; } diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx index 5ce056d483e8..ca400eda93e4 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx @@ -93,7 +93,7 @@ inline void Encode_(sal_uInt8 *src, sal_Char* dest) /** * @descr Base64 encode. */ -rtl::OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len) +OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len) { sal_Char *buffer; sal_Int32 nNeeded; @@ -126,7 +126,7 @@ rtl::OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len) Encode_(last,buffer+nNeeded+1-5); } - rtl::OUString str = rtl::OUString::createFromAscii(buffer); + OUString str = OUString::createFromAscii(buffer); delete[] buffer; return str; diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx index 0e019b13deb0..68a2233deb7e 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx @@ -75,7 +75,7 @@ public: /** * @descr Encode binary buffer to base64 encoding. */ - static rtl::OUString Encode(sal_uInt8 *buf, sal_Int32 len); + static OUString Encode(sal_uInt8 *buf, sal_Int32 len); }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx index fb14177b2063..308dbea736ad 100644 --- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx @@ -96,7 +96,7 @@ void XFBGImage::ToXml(IXFStream *pStrm) if( m_bPosition ) { - rtl::OUString str = GetAlignName(m_eVertAlign) + A2OUSTR(" "); + OUString str = GetAlignName(m_eVertAlign) + A2OUSTR(" "); if( m_eHoriAlign == enumXFAlignStart ) str += A2OUSTR("left"); else if( m_eHoriAlign == enumXFAlignCenter ) diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx index a107ea060e42..2d5dbea093d8 100644 --- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx @@ -75,7 +75,7 @@ public: /** * @descr Use file link as image source. */ - void SetFileLink(rtl::OUString fileName); + void SetFileLink(OUString fileName); /** * @descr Use base64 stream as image source. @@ -108,8 +108,8 @@ public: friend bool operator==(XFBGImage& img1, XFBGImage& img2); friend bool operator!=(XFBGImage& img1, XFBGImage& img2); private: - rtl::OUString m_strFileName; - rtl::OUString m_strData; + OUString m_strFileName; + OUString m_strData; sal_Bool m_bUserFileLink; sal_Bool m_bRepeate; sal_Bool m_bStretch; @@ -118,7 +118,7 @@ private: enumXFAlignType m_eVertAlign; }; -inline void XFBGImage::SetFileLink(rtl::OUString fileName) +inline void XFBGImage::SetFileLink(OUString fileName) { m_strFileName = fileName; m_bUserFileLink = sal_True; diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx index 1e90ad243daa..9a212e19add6 100644 --- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx @@ -74,15 +74,15 @@ public: m_bStart = isStart; } - rtl::OUString GetDivision(){return m_strDivision;} - void SetDivision(rtl::OUString sDivName){m_strDivision = sDivName;} - rtl::OUString GetName(){return m_strName;} + OUString GetDivision(){return m_strDivision;} + void SetDivision(OUString sDivName){m_strDivision = sDivName;} + OUString GetName(){return m_strName;} public: /** * @descr Set bookmark name, which will be used in bookmark-ref or formula. */ - void SetName(rtl::OUString name) + void SetName(OUString name) { m_strName = name; } @@ -107,8 +107,8 @@ public: private: sal_Bool m_bStart; - rtl::OUString m_strName; - rtl::OUString m_strDivision; + OUString m_strName; + OUString m_strDivision; }; class XFBookmarkStart : public XFBookmark diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx index 9a99b5b33319..89a3fcb07836 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.cxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx @@ -113,9 +113,9 @@ void XFBorder::SetWidthOutter(double outer) m_fWidthOutter = outer; } -rtl::OUString XFBorder::GetLineWidth() +OUString XFBorder::GetLineWidth() { - rtl::OUString str; + OUString str; if( m_bDouble ) { @@ -126,9 +126,9 @@ rtl::OUString XFBorder::GetLineWidth() return str; } -rtl::OUString XFBorder::ToString() +OUString XFBorder::ToString() { - rtl::OUString str; + OUString str; if( m_bDouble ) { diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx index 57aba73ed174..67c5be707734 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.hxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx @@ -107,9 +107,9 @@ private: /** * @descr Forst line width to OOo border width format. */ - rtl::OUString GetLineWidth(); + OUString GetLineWidth(); - rtl::OUString ToString(); + OUString ToString(); friend bool operator==(XFBorder& b1, XFBorder& b2); friend bool operator!=(XFBorder& b1, XFBorder& b2); diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index 49f25956fa9b..25dd1609d99c 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -166,13 +166,13 @@ void XFCell::SetValue(double value) SetValue(DoubleToOUString(value,18)); } -void XFCell::SetValue(rtl::OUString value) +void XFCell::SetValue(OUString value) { m_eValueType = enumXFValueTypeFloat; m_strValue = value; } -rtl::OUString XFCell::GetCellName() +OUString XFCell::GetCellName() { XFRow *pRow = m_pOwnerRow; @@ -184,7 +184,7 @@ rtl::OUString XFCell::GetCellName() if( !pTable ) return A2OUSTR(""); - rtl::OUString name; + OUString name; if( pTable->IsSubTable() ) { name = pTable->GetTableName() + A2OUSTR(".") + Int32ToOUString(m_nCol) + A2OUSTR(".") + Int32ToOUString(pRow->GetRow()); diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx index b293f76a0841..9ecddf5f6924 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx @@ -108,12 +108,12 @@ public: /** * @descr Set cell number value. */ - void SetValue(rtl::OUString value); + void SetValue(OUString value); /** * @descr Set cell formula. */ - void SetFormula(rtl::OUString formula); + void SetFormula(OUString formula); /** * @descr Set cell protected. @@ -133,7 +133,7 @@ public: /** * @descr Return cell name. It's a tool function for formula. */ - rtl::OUString GetCellName(); + OUString GetCellName(); /** * @descr Return cell column id. @@ -167,9 +167,9 @@ private: sal_Int32 m_nColSpaned; sal_Int32 m_nRepeated; enumXFValueType m_eValueType; - rtl::OUString m_strValue; - rtl::OUString m_strDisplay; - rtl::OUString m_strFormula; + OUString m_strValue; + OUString m_strDisplay; + OUString m_strFormula; sal_Bool m_bProtect; }; @@ -183,7 +183,7 @@ inline void XFCell::SetRepeated(sal_Int32 repeated) m_nRepeated = repeated; } -inline void XFCell::SetFormula(rtl::OUString formula) +inline void XFCell::SetFormula(OUString formula) { m_strFormula = formula; } diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx index ab0fe328bece..268a7c784365 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx @@ -202,7 +202,7 @@ sal_Bool XFCellStyle::Equal(IXFStyle *pStyle) void XFCellStyle::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); pAttrList->Clear(); if( !style.isEmpty() ) diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx index 5b096427d45d..12799354f339 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx @@ -86,7 +86,7 @@ public: /** * @descr Set cell data format style name. */ - void SetDataStyle(rtl::OUString style); + void SetDataStyle(OUString style); /** * @descr: Set the pading of the paragraph.This is the distance @@ -132,8 +132,8 @@ public: virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strDataStyle; - rtl::OUString m_strParentStyleName; + OUString m_strDataStyle; + OUString m_strParentStyleName; enumXFAlignType m_eHoriAlign; enumXFAlignType m_eVertAlign; @@ -154,7 +154,7 @@ inline void XFCellStyle::SetAlignType(enumXFAlignType hori, enumXFAlignType vert m_eVertAlign = vert; } -inline void XFCellStyle::SetDataStyle(rtl::OUString style) +inline void XFCellStyle::SetDataStyle(OUString style) { m_strDataStyle = style; } diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/source/filter/xfilter/xfchange.hxx index b3b607d1fe40..4786399322cd 100644 --- a/lotuswordpro/source/filter/xfilter/xfchange.hxx +++ b/lotuswordpro/source/filter/xfilter/xfchange.hxx @@ -84,12 +84,12 @@ public: XFChangeRegion(){} ~XFChangeRegion(){} virtual void ToXml(IXFStream *pStrm); - void SetChangeID(rtl::OUString sID){m_sID=sID;} - rtl::OUString GetChangeID(){return m_sID;} - void SetEditor(rtl::OUString sEditor){m_sEditor=sEditor;} + void SetChangeID(OUString sID){m_sID=sID;} + OUString GetChangeID(){return m_sID;} + void SetEditor(OUString sEditor){m_sEditor=sEditor;} protected: - rtl::OUString m_sID; - rtl::OUString m_sEditor; + OUString m_sID; + OUString m_sEditor; }; class XFChangeInsert : public XFChangeRegion @@ -114,10 +114,10 @@ public: XFChange(){} ~XFChange(){} void ToXml(IXFStream *pStrm); - void SetChangeID(rtl::OUString sID){m_sID=sID;} - rtl::OUString GetChangeID(){return m_sID;} + void SetChangeID(OUString sID){m_sID=sID;} + OUString GetChangeID(){return m_sID;} private: - rtl::OUString m_sID; + OUString m_sID; }; class XFChangeStart : public XFContent @@ -126,10 +126,10 @@ public: XFChangeStart(){} ~XFChangeStart(){} void ToXml(IXFStream *pStrm); - void SetChangeID(rtl::OUString sID){m_sID=sID;} - rtl::OUString GetChangeID(){return m_sID;} + void SetChangeID(OUString sID){m_sID=sID;} + OUString GetChangeID(){return m_sID;} private: - rtl::OUString m_sID; + OUString m_sID; }; class XFChangeEnd : public XFContent @@ -138,10 +138,10 @@ public: XFChangeEnd(){} ~XFChangeEnd(){} void ToXml(IXFStream *pStrm); - void SetChangeID(rtl::OUString sID){m_sID=sID;} - rtl::OUString GetChangeID(){return m_sID;} + void SetChangeID(OUString sID){m_sID=sID;} + OUString GetChangeID(){return m_sID;} private: - rtl::OUString m_sID; + OUString m_sID; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.cxx b/lotuswordpro/source/filter/xfilter/xfcolor.cxx index 09d505865dd8..ede680821d7e 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolor.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcolor.cxx @@ -61,7 +61,7 @@ #include <stdio.h> #include "xfcolor.hxx" -rtl::OUString XFColor::ToString() const +OUString XFColor::ToString() const { char buf[8]; @@ -72,7 +72,7 @@ rtl::OUString XFColor::ToString() const if( buf[i] == ' ' ) buf[i] = '0'; } - return rtl::OUString::createFromAscii(buf); + return OUString::createFromAscii(buf); } bool operator==(XFColor& c1, XFColor& c2) diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx index 1d503224c9bf..e169e70f4e8a 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx @@ -113,7 +113,7 @@ public: */ sal_Bool IsValid() const{ return m_bValid;} - rtl::OUString ToString ()const; + OUString ToString ()const; friend bool operator==(XFColor& c1, XFColor& c2); friend bool operator!=(XFColor& c1, XFColor& c2); diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx index af89aff656fb..fc7b9ba5b008 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx @@ -78,19 +78,19 @@ public: /** * @short: All content except XFTextContent can have a style. */ - virtual void SetStyleName(rtl::OUString style){m_strStyleName = style;} + virtual void SetStyleName(OUString style){m_strStyleName = style;} /** * @short: return the style name. */ - virtual rtl::OUString GetStyleName(){return m_strStyleName;} + virtual OUString GetStyleName(){return m_strStyleName;} /** */ virtual IXFContent* Clone(){return NULL;} protected: - rtl::OUString m_strStyleName; + OUString m_strStyleName; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index 7453fe3d7ac9..1403c12d627f 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -121,7 +121,7 @@ void XFContentContainer::RemoveAt(sal_uInt32 nPos) { m_aContents.erase(m_aContents.begin()+nPos); } -void XFContentContainer::Add(const rtl::OUString& text) +void XFContentContainer::Add(const OUString& text) { XFTextContent *pTC = new XFTextContent(); pTC->SetText(text); diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index b2eefac5b8d6..3097de2347c9 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -95,7 +95,7 @@ public: /** * @descr convience function for add text content. */ - virtual void Add(const rtl::OUString& text); + virtual void Add(const OUString& text); /** * @descr return the number of contents in the container. diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx index d53b99c67b55..9df7507dd001 100644 --- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx @@ -72,7 +72,7 @@ public: XFCrossRefStart(); ~XFCrossRefStart(); void SetRefType(sal_uInt8 nType); - void SetMarkName(rtl::OUString sName); + void SetMarkName(OUString sName); void ToXml(IXFStream *pStrm); private: enum{ @@ -82,7 +82,7 @@ private: CROSSREF_PARANUMBER = 3 }; sal_uInt8 m_nType; - rtl::OUString m_strMarkName; + OUString m_strMarkName; }; inline void XFCrossRefStart::SetRefType(sal_uInt8 nType) @@ -90,7 +90,7 @@ inline void XFCrossRefStart::SetRefType(sal_uInt8 nType) m_nType = nType; } -inline void XFCrossRefStart::SetMarkName(rtl::OUString sName) +inline void XFCrossRefStart::SetMarkName(OUString sName) { m_strMarkName = sName; } diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx index 924e92c81c48..513855132f1a 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx @@ -76,9 +76,9 @@ public: public: void SetDate(XFDateTime& dt); - void SetDate(const rtl::OUString& date); + void SetDate(const OUString& date); - void SetText(rtl::OUString& text); + void SetText(OUString& text); void SetFixed(sal_Bool fixed = sal_True); @@ -86,9 +86,9 @@ public: private: sal_Bool m_bFixed; - rtl::OUString m_strText; + OUString m_strText; XFDateTime m_aDateTime; - rtl::OUString m_strDate; + OUString m_strDate; sal_Bool m_bValued; }; @@ -99,13 +99,13 @@ inline void XFDate::SetDate(XFDateTime& dt) m_bValued = sal_True; } -inline void XFDate::SetDate(const rtl::OUString& date) +inline void XFDate::SetDate(const OUString& date) { m_strDate = date; m_bValued = sal_True; } -inline void XFDate::SetText(rtl::OUString& text) +inline void XFDate::SetText(OUString& text) { m_strText = text; } diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx index 352ede62fc22..026c129f5f48 100644 --- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx @@ -91,9 +91,9 @@ public: void SetFixed(sal_Bool fixed); - void SetLanguage(rtl::OUString lang); + void SetLanguage(OUString lang); - void SetCountry(rtl::OUString country); + void SetCountry(OUString country); void SetAutoOrder(sal_Bool bAutoOrder); @@ -119,7 +119,7 @@ public: void AddAmPm(sal_Bool bAmPm); - void AddText( rtl::OUString part ); + void AddText( OUString part ); virtual enumXFStyle GetStyleFamily(); @@ -128,8 +128,8 @@ public: private: sal_Bool m_bFixed; sal_Bool m_bAutoOrder; - rtl::OUString m_strLanguage; - rtl::OUString m_strCountry; + OUString m_strLanguage; + OUString m_strCountry; XFStyleContainer m_aParts; }; @@ -143,12 +143,12 @@ inline void XFDateStyle::SetFixed(sal_Bool fixed) m_bFixed = fixed; } -inline void XFDateStyle::SetLanguage(rtl::OUString lang) +inline void XFDateStyle::SetLanguage(OUString lang) { m_strLanguage = lang; } -inline void XFDateStyle::SetCountry(rtl::OUString country) +inline void XFDateStyle::SetCountry(OUString country) { m_strCountry = country; } @@ -214,7 +214,7 @@ inline void XFDateStyle::AddQuarter(sal_Bool bLongFmt) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddText( rtl::OUString text ) +inline void XFDateStyle::AddText( OUString text ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateText); diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx index f62fb8688119..9120aaba4079 100644 --- a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx @@ -59,7 +59,7 @@ ************************************************************************/ #include "xfdocfield.hxx" -void XFFileName::SetType(rtl::OUString sType) +void XFFileName::SetType(OUString sType) { m_strType = sType; } diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx index bf41b369c607..f98bb2ef0604 100644 --- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx @@ -66,10 +66,10 @@ class XFFileName : public XFContent { public: - void SetType(rtl::OUString sType); + void SetType(OUString sType); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strType; + OUString m_strType; }; class XFWordCount : public XFContent { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx index b7abdf13040c..1cfa356a5157 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx @@ -102,7 +102,7 @@ void XFDrawLine::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( A2OUSTR("svg:y2"), DoubleToOUString(m_aPoint2.GetY()) + A2OUSTR("cm") ); //transform - rtl::OUString strTransform; + OUString strTransform; if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE ) strTransform = A2OUSTR("rotate (") + DoubleToOUString(m_fRotate) + A2OUSTR(") "); if( m_nFlag&XFDRAWOBJECT_FLAG_TRANLATE ) diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx index 5ee61396a983..c2bec7330cd7 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx @@ -114,7 +114,7 @@ void XFDrawObject::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( A2OUSTR("svg:height"), DoubleToOUString(m_aRect.GetHeight()) + A2OUSTR("cm") ); //transform - rtl::OUString strTransform; + OUString strTransform; if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE ) strTransform = A2OUSTR("rotate (") + DoubleToOUString(m_fRotate) + A2OUSTR(") "); if( m_nFlag&XFDRAWOBJECT_FLAG_TRANLATE ) diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 5bdd5973214c..45eb38170b9f 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -86,7 +86,7 @@ public: /** * @descr Set style name for drawing text. */ - void SetTextStyleName(rtl::OUString style); + void SetTextStyleName(OUString style); /** * @descr Set drawing obejct rotate. @@ -114,7 +114,7 @@ public: protected: XFContentContainer m_aContents; - rtl::OUString m_strTextStyle; + OUString m_strTextStyle; double m_fRotate; XFPoint m_aRotatePoint; double m_fScaleX; @@ -125,7 +125,7 @@ protected: unsigned int m_nFlag; }; -inline void XFDrawObject::SetTextStyleName(rtl::OUString style) +inline void XFDrawObject::SetTextStyleName(OUString style) { m_strTextStyle = style; } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx index d0cc8b8a68e2..a77bd24034e0 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx @@ -63,10 +63,10 @@ XFSvgPathEntry::XFSvgPathEntry() { } -rtl::OUString XFSvgPathEntry::ToString() +OUString XFSvgPathEntry::ToString() { assert(!m_strCommand.isEmpty()); - rtl::OUString str = m_strCommand; + OUString str = m_strCommand; std::vector<XFPoint>::iterator it; for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it ) @@ -140,13 +140,13 @@ void XFDrawPath::ToXml(IXFStream *pStrm) //view-box: XFRect rect = m_aRect; - rtl::OUString strViewBox = A2OUSTR("0 0 "); + OUString strViewBox = A2OUSTR("0 0 "); strViewBox += DoubleToOUString(rect.GetWidth()*1000) + A2OUSTR(" "); strViewBox += DoubleToOUString(rect.GetHeight()*1000); pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), strViewBox); //points - rtl::OUString strPath; + OUString strPath; std::vector<XFSvgPathEntry>::iterator it; for( it = m_aPaths.begin(); it != m_aPaths.end(); ++it ) { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx index d27f989fc8c9..5124512b534d 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx @@ -76,18 +76,18 @@ public: /** * @descr Set svg path command,L for line,M for move,... */ - void SetCommand(rtl::OUString cmd); + void SetCommand(OUString cmd); /** * @descr Set svg path point. */ void AddPoint(XFPoint pt); - rtl::OUString ToString(); + OUString ToString(); friend class XFDrawPath; private: - rtl::OUString m_strCommand; + OUString m_strCommand; std::vector<XFPoint> m_aPoints; }; @@ -127,7 +127,7 @@ private: std::vector<XFSvgPathEntry> m_aPaths; }; -inline void XFSvgPathEntry::SetCommand(rtl::OUString cmd) +inline void XFSvgPathEntry::SetCommand(OUString cmd) { m_strCommand = cmd; } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx index 809524c93ac3..b59a84cdadb1 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx @@ -71,13 +71,13 @@ void XFDrawPolygon::ToXml(IXFStream *pStrm) pAttrList->Clear(); //view-box: XFRect rect = CalcViewBox(); - rtl::OUString strViewBox = A2OUSTR("0 0 "); + OUString strViewBox = A2OUSTR("0 0 "); strViewBox += DoubleToOUString(rect.GetWidth()*1000) + A2OUSTR(" "); strViewBox += DoubleToOUString(rect.GetHeight()*1000); pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), strViewBox); //points - rtl::OUString strPoints; + OUString strPoints; for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it ) { XFPoint pt = *it; diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx index 0e178534955a..00a14896c88b 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx @@ -71,13 +71,13 @@ void XFDrawPolyline::ToXml(IXFStream *pStrm) pAttrList->Clear(); //view-box: XFRect rect = CalcViewBox(); - rtl::OUString strViewBox = A2OUSTR("0 0 "); + OUString strViewBox = A2OUSTR("0 0 "); strViewBox += DoubleToOUString(rect.GetWidth()*1000) + A2OUSTR(" "); strViewBox += DoubleToOUString(rect.GetHeight()*1000); pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), strViewBox); //points - rtl::OUString strPoints; + OUString strPoints; for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it ) { XFPoint pt = *it; diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx index 78e3bf7932cb..49ee8bd99b57 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx @@ -267,7 +267,7 @@ void XFDrawStyle::ToXml(IXFStream *pStrm) if (m_pFontWorkStyle) { // style - rtl::OUString aStr = A2OUSTR(""); + OUString aStr = A2OUSTR(""); switch (m_pFontWorkStyle->GetStyleType()) { default: // fall through! diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx index 6be52102006b..4f16e41ba3dc 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx @@ -111,12 +111,12 @@ public: /** * @descr Set drawing object arrow start style,only lines can have arrows. */ - void SetArrowStart(rtl::OUString start, double size=0.3, sal_Bool center = sal_False); + void SetArrowStart(OUString start, double size=0.3, sal_Bool center = sal_False); /** * @descr Set drawing obejct arrow end style,only lines can have arrows. */ - void SetArrowEnd(rtl::OUString end, double size=0.3, sal_Bool center = sal_False); + void SetArrowEnd(OUString end, double size=0.3, sal_Bool center = sal_False); void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust); @@ -130,8 +130,8 @@ private: sal_Int32 m_nWrapLines; XFDrawLineStyle *m_pLineStyle; XFDrawAreaStyle *m_pAreaStyle; - rtl::OUString m_strArrowStart; - rtl::OUString m_strArrowEnd; + OUString m_strArrowStart; + OUString m_strArrowEnd; double m_fArrowStartSize; double m_fArrowEndSize; sal_Bool m_bArrowStartCenter; @@ -145,7 +145,7 @@ inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs) } -inline void XFDrawStyle::SetArrowStart(rtl::OUString start, double size, sal_Bool center) +inline void XFDrawStyle::SetArrowStart(OUString start, double size, sal_Bool center) { assert(size>0); m_strArrowStart = start; @@ -153,7 +153,7 @@ inline void XFDrawStyle::SetArrowStart(rtl::OUString start, double size, sal_Boo m_bArrowStartCenter = center; } -inline void XFDrawStyle::SetArrowEnd(rtl::OUString end, double size, sal_Bool center) +inline void XFDrawStyle::SetArrowEnd(OUString end, double size, sal_Bool center) { assert(size>0); m_strArrowEnd = end; diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx index a2ad88943806..eb0597406b52 100644 --- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx @@ -89,7 +89,7 @@ private: sal_Int32 m_nCharCount; sal_Int32 m_nLines; double m_fDistance; - rtl::OUString m_strStyleName; + OUString m_strStyleName; }; inline void XFDropcap::SetCharCount(sal_Int32 count) diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx index 1b5fcb70a22f..7cd9eb4a384b 100644 --- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx @@ -79,8 +79,8 @@ public: virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strID; - rtl::OUString m_strLabel; + OUString m_strID; + OUString m_strLabel; XFContentContainer m_aContents; }; @@ -95,7 +95,7 @@ inline void XFEndNote::SetLabel(sal_Unicode label) chs[0] = label; chs[1] = 0; - m_strLabel = rtl::OUString(chs); + m_strLabel = OUString(chs); } inline void XFEndNote::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx index c5f79a53d18a..4943eb78d7dd 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.hxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx @@ -80,22 +80,22 @@ public: /** * @descr Set entry string value. */ - void SetStringValue(const rtl::OUString& value); + void SetStringValue(const OUString& value); /** * @descr Set display string. */ - void SetStringDisplay(const rtl::OUString& display); + void SetStringDisplay(const OUString& display); /** * @descr Set entry name. */ - void SetEntryName(const rtl::OUString& name); + void SetEntryName(const OUString& name); /** * @descr Set entry key. The keys is available only for enumXFEntryAlphabetical. */ - void SetKey(const rtl::OUString& key1, const rtl::OUString& key2=A2OUSTR("")); + void SetKey(const OUString& key1, const OUString& key2=A2OUSTR("")); /** * @descr Set whether it's a main entry. This is available only for enumXFEntryAlphabetical. @@ -111,11 +111,11 @@ public: private: enumXFEntry m_eType; - rtl::OUString m_strValue; - rtl::OUString m_strDisplay; - rtl::OUString m_strKey1; - rtl::OUString m_strKey2; - rtl::OUString m_strName; + OUString m_strValue; + OUString m_strDisplay; + OUString m_strKey1; + OUString m_strKey2; + OUString m_strName; sal_Bool m_bMainEntry; sal_Int32 m_nOutlineLevel; }; @@ -125,22 +125,22 @@ inline void XFEntry::SetEntryType(enumXFEntry type) m_eType = type; } -inline void XFEntry::SetStringValue(const rtl::OUString& value) +inline void XFEntry::SetStringValue(const OUString& value) { m_strValue = value; } -inline void XFEntry::SetStringDisplay(const rtl::OUString& display) +inline void XFEntry::SetStringDisplay(const OUString& display) { m_strDisplay = display; } -inline void XFEntry::SetEntryName(const rtl::OUString& name) +inline void XFEntry::SetEntryName(const OUString& name) { m_strName = name; } -inline void XFEntry::SetKey(const rtl::OUString& key1, const rtl::OUString& key2/* =A2OUSTR */) +inline void XFEntry::SetKey(const OUString& key1, const OUString& key2/* =A2OUSTR */) { m_strKey1 = key1; m_strKey2 = key2; diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx index c7d1310c399d..7ea9f5872b2e 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.cxx +++ b/lotuswordpro/source/filter/xfilter/xffont.cxx @@ -88,9 +88,9 @@ XFFont::XFFont() } /* The Following variable are to be compared: - rtl::OUString m_strFontName; - rtl::OUString m_strFontNameAsia; - rtl::OUString m_strFontNameComplex; + OUString m_strFontName; + OUString m_strFontNameAsia; + OUString m_strFontNameComplex; sal_Int16 m_nFontSize; sal_Int16 m_nFontSizeAsia; sal_Int16 m_nFontSizeComplex; @@ -261,19 +261,19 @@ void XFFont::ToXml(IXFStream *pStrm) //font size: if( (m_nFlag & XFFONT_FLAG_SIZE) && m_nFontSize != 0 ) { - rtl::OUString strSize = Int32ToOUString(m_nFontSize); + OUString strSize = Int32ToOUString(m_nFontSize); strSize += A2OUSTR("pt"); pAttrList->AddAttribute(A2OUSTR("fo:font-size"),strSize); } if( (m_nFlag & XFFONT_FLAG_SIZE_ASIA) && m_nFontSizeAsia ) { - rtl::OUString strSize = Int32ToOUString(m_nFontSizeAsia); + OUString strSize = Int32ToOUString(m_nFontSizeAsia); strSize += A2OUSTR("pt"); pAttrList->AddAttribute(A2OUSTR("style:font-size-asian"),strSize); } if( (m_nFlag & XFFONT_FLAG_SIZE_COMPLEX) && m_nFontSizeComplex ) { - rtl::OUString strSize = Int32ToOUString(m_nFontSizeComplex); + OUString strSize = Int32ToOUString(m_nFontSizeComplex); strSize += A2OUSTR("pt"); pAttrList->AddAttribute(A2OUSTR("style:font-size-complex"),strSize); } @@ -347,7 +347,7 @@ void XFFont::ToXml(IXFStream *pStrm) if( (m_nFlag & XFFONT_FLAG_EMPHASIZE) && m_eEmphasize ) { - rtl::OUString empha = GetEmphasizeName(m_eEmphasize); + OUString empha = GetEmphasizeName(m_eEmphasize); empha += A2OUSTR(" "); if( m_bEmphasizeTop ) empha += A2OUSTR("above"); @@ -375,7 +375,7 @@ void XFFont::ToXml(IXFStream *pStrm) ((m_nFlag & XFFONT_FLAG_POSITION) && m_nPosition != 0) ) { - rtl::OUString tmp; + OUString tmp; tmp = Int32ToOUString(m_nPosition) + A2OUSTR("% "); tmp += Int32ToOUString(m_nScale) + A2OUSTR("%"); pAttrList->AddAttribute(A2OUSTR("style:text-position"), tmp ); diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx index ce9711fc7d9f..73e319019eb0 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.hxx +++ b/lotuswordpro/source/filter/xfilter/xffont.hxx @@ -120,17 +120,17 @@ public: /** * @descr Set font name. */ - void SetFontName(rtl::OUString name); + void SetFontName(OUString name); /** * @descr Set font name for asia locale. */ - void SetFontNameAsia(rtl::OUString name); + void SetFontNameAsia(OUString name); /** * @descr Set font name for BIDI locale. */ - void SetFontNameComplex(rtl::OUString name); + void SetFontNameComplex(OUString name); /** * @descr Set font size. @@ -262,9 +262,9 @@ public: friend bool operator!=(XFFont& f1, XFFont& f2); friend class XFFontFactory; private: - rtl::OUString m_strFontName; - rtl::OUString m_strFontNameAsia; - rtl::OUString m_strFontNameComplex; + OUString m_strFontName; + OUString m_strFontNameAsia; + OUString m_strFontNameComplex; sal_Int16 m_nFontSize; sal_Int16 m_nFontSizeAsia; sal_Int16 m_nFontSizeComplex; @@ -298,7 +298,7 @@ private: }; -inline void XFFont::SetFontName(rtl::OUString name) +inline void XFFont::SetFontName(OUString name) { m_strFontName = name; m_nFlag |= XFFONT_FLAG_NAME; @@ -307,13 +307,13 @@ inline void XFFont::SetFontName(rtl::OUString name) SetFontNameComplex(name); } -inline void XFFont::SetFontNameAsia(rtl::OUString name) +inline void XFFont::SetFontNameAsia(OUString name) { m_strFontNameAsia = name; m_nFlag |= XFFONT_FLAG_NAME_ASIA; } -inline void XFFont::SetFontNameComplex(rtl::OUString name) +inline void XFFont::SetFontNameComplex(OUString name) { m_strFontNameComplex = name; m_nFlag |= XFFONT_FLAG_NAME_COMPLEX; diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index e4059dee45a8..1e615f1b1b9e 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -59,19 +59,19 @@ ************************************************************************/ #include "xffontdecl.hxx" -XFFontDecl::XFFontDecl(rtl::OUString name, rtl::OUString family, sal_Bool fixed) +XFFontDecl::XFFontDecl(OUString name, OUString family, sal_Bool fixed) { m_strFontName = name; m_strFontFamily = family; m_bPitchFixed = fixed; } -rtl::OUString XFFontDecl::GetFontName() +OUString XFFontDecl::GetFontName() { return m_strFontName; } -rtl::OUString XFFontDecl::GetFontFamily() +OUString XFFontDecl::GetFontFamily() { return m_strFontFamily; } diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx index f46b091980d5..80ebbda9a5df 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx @@ -71,24 +71,24 @@ class XFFontDecl { public: - XFFontDecl(rtl::OUString name, rtl::OUString family, sal_Bool fixed = false); + XFFontDecl(OUString name, OUString family, sal_Bool fixed = false); public: /** * @descr Get font name. */ - rtl::OUString GetFontName(); + OUString GetFontName(); /** * @descr Get font family. */ - rtl::OUString GetFontFamily(); + OUString GetFontFamily(); sal_Bool GetFontPitchFixed(); private: - rtl::OUString m_strFontName; - rtl::OUString m_strFontFamily; + OUString m_strFontName; + OUString m_strFontFamily; sal_Bool m_bPitchFixed; }; diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx index 8185a2b6ac43..0435244c0985 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx @@ -80,8 +80,8 @@ public: virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strID; - rtl::OUString m_strLabel; + OUString m_strID; + OUString m_strLabel; }; inline XFFootNote::XFFootNote() @@ -95,7 +95,7 @@ inline void XFFootNote::SetLabel(sal_Unicode label) chs[0] = label; chs[1] = 0; - m_strLabel = rtl::OUString(chs); + m_strLabel = OUString(chs); } inline void XFFootNote::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx index b3a92e27ab39..245e694174da 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx @@ -68,15 +68,15 @@ public: XFFootnoteConfig(); public: - void SetBodyStyle(rtl::OUString style); + void SetBodyStyle(OUString style); - void SetCitationStyle(rtl::OUString style); + void SetCitationStyle(OUString style); - void SetDefaultStyle(rtl::OUString style); + void SetDefaultStyle(OUString style); - void SetMasterPage(rtl::OUString masterPage); + void SetMasterPage(OUString masterPage); - void SetNumberFormat(rtl::OUString numberFormat); + void SetNumberFormat(OUString numberFormat); void SetStartValue(sal_Int32 value=0); @@ -86,26 +86,26 @@ public: void SetInsertInPage(sal_Bool page=sal_True); - void SetNumPrefix(rtl::OUString numprefix); + void SetNumPrefix(OUString numprefix); - void SetNumSuffix(rtl::OUString numsuffix); + void SetNumSuffix(OUString numsuffix); - void SetMessageOn(rtl::OUString message); + void SetMessageOn(OUString message); - void SetMessageFrom(rtl::OUString message); + void SetMessageFrom(OUString message); virtual void ToXml(IXFStream *pStrm); protected: - rtl::OUString m_strBodyStyle; - rtl::OUString m_strCitationStyle; - rtl::OUString m_strDefaultStyle; - rtl::OUString m_strMasterPage; - rtl::OUString m_strNumFmt; - rtl::OUString m_strNumPrefix; - rtl::OUString m_strNumSuffix; - rtl::OUString m_strMessageFrom; - rtl::OUString m_strMessageOn; + OUString m_strBodyStyle; + OUString m_strCitationStyle; + OUString m_strDefaultStyle; + OUString m_strMasterPage; + OUString m_strNumFmt; + OUString m_strNumPrefix; + OUString m_strNumSuffix; + OUString m_strMessageFrom; + OUString m_strMessageOn; sal_Int32 m_nStartValue; sal_Int32 m_nRestartType; sal_Bool m_bInsertInPage; @@ -125,27 +125,27 @@ inline XFFootnoteConfig::XFFootnoteConfig() m_bIsFootnote = sal_True; } -inline void XFFootnoteConfig::SetBodyStyle(rtl::OUString style) +inline void XFFootnoteConfig::SetBodyStyle(OUString style) { m_strBodyStyle = style; } -inline void XFFootnoteConfig::SetCitationStyle(rtl::OUString style) +inline void XFFootnoteConfig::SetCitationStyle(OUString style) { m_strCitationStyle = style; } -inline void XFFootnoteConfig::SetDefaultStyle(rtl::OUString style) +inline void XFFootnoteConfig::SetDefaultStyle(OUString style) { m_strDefaultStyle = style; } -inline void XFFootnoteConfig::SetMasterPage(rtl::OUString masterPage) +inline void XFFootnoteConfig::SetMasterPage(OUString masterPage) { m_strMasterPage = masterPage; } -inline void XFFootnoteConfig::SetNumberFormat(rtl::OUString numberFormat) +inline void XFFootnoteConfig::SetNumberFormat(OUString numberFormat) { m_strNumFmt = numberFormat; } @@ -172,22 +172,22 @@ inline void XFFootnoteConfig::SetInsertInPage(sal_Bool page) m_bInsertInPage = page; } -inline void XFFootnoteConfig::SetNumPrefix(rtl::OUString numprefix) +inline void XFFootnoteConfig::SetNumPrefix(OUString numprefix) { m_strNumPrefix = numprefix; } -inline void XFFootnoteConfig::SetNumSuffix(rtl::OUString numsuffix) +inline void XFFootnoteConfig::SetNumSuffix(OUString numsuffix) { m_strNumSuffix = numsuffix; } -inline void XFFootnoteConfig::SetMessageOn(rtl::OUString message) +inline void XFFootnoteConfig::SetMessageOn(OUString message) { m_strMessageOn = message; } -inline void XFFootnoteConfig::SetMessageFrom(rtl::OUString message) +inline void XFFootnoteConfig::SetMessageFrom(OUString message) { m_strMessageFrom = message; } diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index ea55077d63b6..9670a1b6bce5 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -105,7 +105,7 @@ public: /** * @descr Set frame name. */ - void SetName(rtl::OUString name); + void SetName(OUString name); /** * @descr Set z-index of the frame. @@ -154,7 +154,7 @@ public: /** * @descr: Link the text content of the two frame. */ - void SetNextLink(rtl::OUString next); + void SetNextLink(OUString next); /** * @descr Get the frame type. image, drawing or text-box. @@ -181,12 +181,12 @@ private: protected: enumXFAnchor m_eAnchor; sal_Int32 m_nAnchorPage; - rtl::OUString m_strName; + OUString m_strName; sal_uInt32 m_nZIndex; XFRect m_aRect; double m_fMinHeight; double m_fMaxHeight; - rtl::OUString m_strNextLink; + OUString m_strNextLink; enumXFFrameType m_eType; sal_uInt32 m_nFlag; sal_Bool m_isTextBox; @@ -197,7 +197,7 @@ inline void XFFrame::SetAnchorType(enumXFAnchor anchor) m_eAnchor = anchor; } -inline void XFFrame::SetName(rtl::OUString name) +inline void XFFrame::SetName(OUString name) { m_strName = name; } @@ -250,7 +250,7 @@ inline void XFFrame::SetPosition(const XFRect& rect) m_aRect = rect; } -inline void XFFrame::SetNextLink(rtl::OUString next) +inline void XFFrame::SetNextLink(OUString next) { m_strNextLink = next; } diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx index 0ba7435dcc7d..b884e5cefa44 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx @@ -200,7 +200,7 @@ void XFFrameStyle::ToXml(IXFStream *pStrm) //protect: if( m_bProtectContent || m_bProtectSize || m_bProtectPos ) { - rtl::OUString protect; + OUString protect; if( m_bProtectContent ) protect += A2OUSTR("content"); if( m_bProtectSize ) diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx b/lotuswordpro/source/filter/xfilter/xfglobal.cxx index fe5c993b9c5f..e634e48985c6 100644 --- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx +++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx @@ -75,39 +75,39 @@ int XFGlobal::s_nObjID = 1; int XFGlobal::s_nImageID = 1; -rtl::OUString XFGlobal::GenSectionName() +OUString XFGlobal::GenSectionName() { //give it a initial name: return A2OUSTR("sect") + Int32ToOUString(s_nSectionID++); } -rtl::OUString XFGlobal::GenFrameName() +OUString XFGlobal::GenFrameName() { //give it a initial name: return A2OUSTR("frame") + Int32ToOUString(s_nFrameID++); } -rtl::OUString XFGlobal::GenTableName() +OUString XFGlobal::GenTableName() { return A2OUSTR("table") + Int32ToOUString(s_nFrameID++); } -rtl::OUString XFGlobal::GenNoteName() +OUString XFGlobal::GenNoteName() { return A2OUSTR("ftn") + Int32ToOUString(s_nNoteID++); } -rtl::OUString XFGlobal::GenStrokeDashName() +OUString XFGlobal::GenStrokeDashName() { return A2OUSTR("stroke dash ") + Int32ToOUString(s_nStrokeDashID++); } -rtl::OUString XFGlobal::GenAreaName() +OUString XFGlobal::GenAreaName() { return A2OUSTR("draw area") + Int32ToOUString(s_nAreaID++); } -rtl::OUString XFGlobal::GenImageName() +OUString XFGlobal::GenImageName() { return A2OUSTR("Graphic") + Int32ToOUString(s_nImageID++); } diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx index 496c77f9fb71..caa8b0a578f4 100644 --- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx +++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx @@ -96,37 +96,37 @@ public: /** * @descr Generate a name for the section. */ - static rtl::OUString GenSectionName(); + static OUString GenSectionName(); /** * @descr Gen a name for the frame. */ - static rtl::OUString GenFrameName(); + static OUString GenFrameName(); /** * @descr Generate a name for a table. */ - static rtl::OUString GenTableName(); + static OUString GenTableName(); /** * @descr Generate a name for a note. */ - static rtl::OUString GenNoteName(); + static OUString GenNoteName(); /** * @descr Generate a name for the stroke style. */ - static rtl::OUString GenStrokeDashName(); + static OUString GenStrokeDashName(); /** * @descr Generate a name for the area fill style. */ - static rtl::OUString GenAreaName(); + static OUString GenAreaName(); /** * @descr Generate a name for an image object */ - static rtl::OUString GenImageName(); + static OUString GenImageName(); /** * @descr Reset all global variables. diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx index 85c7b830053b..417af0239bd1 100644 --- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx +++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx @@ -66,21 +66,21 @@ public: XFHyperlink(); public: - void SetHRef(rtl::OUString href); + void SetHRef(OUString href); - void SetText(rtl::OUString text); + void SetText(OUString text); - void SetName(rtl::OUString name); + void SetName(OUString name); - void SetTargetFrame(rtl::OUString frame=A2OUSTR("_self")); + void SetTargetFrame(OUString frame=A2OUSTR("_self")); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strHRef; - rtl::OUString m_strName; - rtl::OUString m_strFrame; - rtl::OUString m_strText; + OUString m_strHRef; + OUString m_strName; + OUString m_strFrame; + OUString m_strText; }; inline XFHyperlink::XFHyperlink() @@ -88,22 +88,22 @@ inline XFHyperlink::XFHyperlink() m_strFrame = A2OUSTR("_self"); } -inline void XFHyperlink::SetHRef(rtl::OUString href) +inline void XFHyperlink::SetHRef(OUString href) { m_strHRef = href; } -inline void XFHyperlink::SetName(rtl::OUString name) +inline void XFHyperlink::SetName(OUString name) { m_strName = name; } -inline void XFHyperlink::SetTargetFrame(rtl::OUString frame) +inline void XFHyperlink::SetTargetFrame(OUString frame) { m_strFrame = frame; } -inline void XFHyperlink::SetText(rtl::OUString text) +inline void XFHyperlink::SetText(OUString text) { m_strText = text; } diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx index f23816d54a1f..0938bc12702f 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx @@ -66,7 +66,7 @@ XFImage::XFImage() : m_bUseLink(sal_False) m_strName = XFGlobal::GenImageName(); } -void XFImage::SetFileURL(rtl::OUString url) +void XFImage::SetFileURL(OUString url) { m_strImageFile = url; m_bUseLink = sal_True; diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx index 31d150e32dff..faa0dcff77ad 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.hxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx @@ -76,7 +76,7 @@ public: /** * @descr Use file link source.a */ - void SetFileURL(rtl::OUString url); + void SetFileURL(OUString url); /** * @descr Use base64 stream. @@ -89,8 +89,8 @@ public: virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strImageFile; - rtl::OUString m_strData; + OUString m_strImageFile; + OUString m_strData; sal_Bool m_bUseLink; }; diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx index f65e5d7b673f..3d30962f008a 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx @@ -164,7 +164,7 @@ void XFImageStyle::ToXml(IXFStream *pStrm) //protect: if( m_bProtectContent || m_bProtectSize || m_bProtectPos ) { - rtl::OUString protect; + OUString protect; if( m_bProtectContent ) protect += A2OUSTR("content"); if( m_bProtectSize ) @@ -190,7 +190,7 @@ void XFImageStyle::ToXml(IXFStream *pStrm) //clip: if( FABS(m_fClipLeft)>FLOAT_MIN || FABS(m_fClipRight)>FLOAT_MIN || FABS(m_fClipTop)>FLOAT_MIN || FABS(m_fClipBottom)>FLOAT_MIN ) { - rtl::OUString clip = A2OUSTR("rect("); + OUString clip = A2OUSTR("rect("); clip += DoubleToOUString(m_fClipTop) + A2OUSTR("cm "); clip += DoubleToOUString(m_fClipRight) + A2OUSTR("cm "); clip += DoubleToOUString(m_fClipBottom) + A2OUSTR("cm "); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx index c62289a4f555..bb6a972f6988 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.cxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx @@ -92,7 +92,7 @@ XFIndex::~XFIndex() } } -void XFIndex::AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTemplate* templ) +void XFIndex::AddTemplate(OUString level, OUString style, XFIndexTemplate* templ) { templ->SetLevel( level ); if(m_eType != enumXFIndexTOC) // TOC's styles are applied to template entries separately @@ -112,7 +112,7 @@ void XFIndex::SetSeparator(sal_Bool sep) m_bSeparator = sep; } -void XFIndex::AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName) +void XFIndex::AddTocSource(sal_uInt16 nLevel, const OUString sStyleName) { if (nLevel > MAX_TOC_LEVEL) { @@ -126,9 +126,9 @@ void XFIndex::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - rtl::OUString strIndexName; - rtl::OUString strTplName; - rtl::OUString strSourceName; + OUString strIndexName; + OUString strTplName; + OUString strSourceName; if(m_eType == enumXFIndexTOC ) { @@ -221,7 +221,7 @@ void XFIndex::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( A2OUSTR("text:outline-level"), Int32ToOUString(i)); pStrm->StartElement( A2OUSTR("text:index-source-styles") ); - std::vector<rtl::OUString>::iterator it_str; + std::vector<OUString>::iterator it_str; for (it_str = m_aTOCSource[i].begin(); it_str != m_aTOCSource[i].end(); ++it_str) { pAttrList->Clear(); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index 94b08575305f..e5b7c1e4870e 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -85,25 +85,25 @@ public: /** * @descr Set template level. */ - void SetLevel(rtl::OUString level); + void SetLevel(OUString level); /** * @descr Set style. */ - void SetStyleName(rtl::OUString style); + void SetStyleName(OUString style); /** * @descr Add a entry in the template. */ - void AddEntry(enumXFIndexTemplate entry, rtl::OUString styleName = A2OUSTR("")); + void AddEntry(enumXFIndexTemplate entry, OUString styleName = A2OUSTR("")); /** * @descr Add a tab entry in the template. */ - void AddTabEntry(enumXFTab type, double len, sal_Unicode leader = '*', sal_Unicode delimiter='.', rtl::OUString styleName = A2OUSTR("")); + void AddTabEntry(enumXFTab type, double len, sal_Unicode leader = '*', sal_Unicode delimiter='.', OUString styleName = A2OUSTR("")); /** * @descr Add a entry in the template. */ - void AddTextEntry(rtl::OUString sSpan, rtl::OUString styleName = A2OUSTR("")); + void AddTextEntry(OUString sSpan, OUString styleName = A2OUSTR("")); /** * @descr clear all index template parts. @@ -115,22 +115,22 @@ private: /** * @descr Helper function. */ - void SetTagName(rtl::OUString tag); + void SetTagName(OUString tag); friend class XFIndex; private: - rtl::OUString m_nLevel; - rtl::OUString m_strStyle; + OUString m_nLevel; + OUString m_strStyle; enumXFTab m_eTabType; double m_fTabLength; - rtl::OUString m_strTabDelimiter; - rtl::OUString m_strTabLeader; - rtl::OUString m_strTagName; - typedef std::pair<enumXFIndexTemplate, rtl::OUString> TOCTEMPLATE_ENTRY_TYPE; + OUString m_strTabDelimiter; + OUString m_strTabLeader; + OUString m_strTagName; + typedef std::pair<enumXFIndexTemplate, OUString> TOCTEMPLATE_ENTRY_TYPE; std::vector<TOCTEMPLATE_ENTRY_TYPE> m_aEntries; // template entry + text style - std::map<sal_uInt16, rtl::OUString> m_aTextEntries; + std::map<sal_uInt16, OUString> m_aTextEntries; - rtl::OUString m_strChapterTextStyle; + OUString m_strChapterTextStyle; }; /** @@ -153,7 +153,7 @@ public: /** * @descr Add index templaet entry. */ - void AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTemplate* templ); + void AddTemplate(OUString level, OUString style, XFIndexTemplate* templ); /** * @descr Set if protected index to prevent handly-revise. @@ -167,12 +167,12 @@ public: virtual void ToXml(IXFStream *pStrm); - void AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName); + void AddTocSource(sal_uInt16 nLevel, const OUString sStyleName); private: enumXFIndex m_eType; - rtl::OUString m_strTitle; - rtl::OUString m_strSectStyle; + OUString m_strTitle; + OUString m_strSectStyle; bool m_bProtect; bool m_bSeparator; XFParagraph *m_pTitle; @@ -180,7 +180,7 @@ private: std::vector<XFIndexTemplate *> m_aTemplates; // template entry + style #define MAX_TOC_LEVEL 10 - std::vector<rtl::OUString> m_aTOCSource[MAX_TOC_LEVEL+1]; + std::vector<OUString> m_aTOCSource[MAX_TOC_LEVEL+1]; sal_uInt32 m_nMaxLevel; }; @@ -190,37 +190,37 @@ inline XFIndexTemplate::XFIndexTemplate() m_nLevel = Int32ToOUString(0); } -inline void XFIndexTemplate::SetLevel(rtl::OUString level) +inline void XFIndexTemplate::SetLevel(OUString level) { m_nLevel = level; } -inline void XFIndexTemplate::SetStyleName(rtl::OUString style) +inline void XFIndexTemplate::SetStyleName(OUString style) { m_strStyle = style; } -inline void XFIndexTemplate::SetTagName(rtl::OUString tag) +inline void XFIndexTemplate::SetTagName(OUString tag) { m_strTagName = tag; } -inline void XFIndexTemplate::AddEntry(enumXFIndexTemplate entry, rtl::OUString styleName) +inline void XFIndexTemplate::AddEntry(enumXFIndexTemplate entry, OUString styleName) { - std::pair<enumXFIndexTemplate, rtl::OUString> pair(entry, styleName); + std::pair<enumXFIndexTemplate, OUString> pair(entry, styleName); m_aEntries.push_back(pair); } -inline void XFIndexTemplate::AddTabEntry(enumXFTab type, double len, sal_Unicode leader, sal_Unicode delimiter, rtl::OUString styleName) +inline void XFIndexTemplate::AddTabEntry(enumXFTab type, double len, sal_Unicode leader, sal_Unicode delimiter, OUString styleName) { m_eTabType = type; - m_strTabLeader = rtl::OUString( leader ); - m_strTabDelimiter = rtl::OUString( delimiter ); + m_strTabLeader = OUString( leader ); + m_strTabDelimiter = OUString( delimiter ); m_fTabLength = len; AddEntry(enumXFIndexTemplateTab, styleName); } -inline void XFIndexTemplate::AddTextEntry(rtl::OUString sText, rtl::OUString styleName) +inline void XFIndexTemplate::AddTextEntry(OUString sText, OUString styleName) { sal_uInt16 nLen = m_aEntries.size(); AddEntry(enumXFIndexTemplateSpan, styleName); diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx index bc93fce89ee6..565d2c6a0025 100644 --- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx +++ b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx @@ -69,20 +69,20 @@ class XFInputList : public XFContent { public: - void SetName(rtl::OUString sName); - void SetLabels(std::vector<rtl::OUString> list); + void SetName(OUString sName); + void SetLabels(std::vector<OUString> list); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strName; - std::vector<rtl::OUString> m_list; + OUString m_strName; + std::vector<OUString> m_list; }; -inline void XFInputList::SetName(rtl::OUString sName) +inline void XFInputList::SetName(OUString sName) { m_strName = sName; } -inline void XFInputList::SetLabels(std::vector<rtl::OUString> list) +inline void XFInputList::SetLabels(std::vector<OUString> list) { m_list=list; } diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx index 4d5f73bc2d05..cd514da8c673 100644 --- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx @@ -74,11 +74,11 @@ public: void SetNumberIncrement(sal_Int32 increment); - void SetSeperator(sal_Int32 increment, rtl::OUString seperator); + void SetSeperator(sal_Int32 increment, OUString seperator); - void SetNumberFormat(rtl::OUString numfmt = A2OUSTR("1")); + void SetNumberFormat(OUString numfmt = A2OUSTR("1")); - void SetTextStyle(rtl::OUString style); + void SetTextStyle(OUString style); void SetRestartOnPage(sal_Bool restart = sal_True); @@ -93,9 +93,9 @@ private: double m_fOffset; sal_Int32 m_nIncrement; sal_Int32 m_nSepIncrement; - rtl::OUString m_strSeparator; - rtl::OUString m_strNumFmt; - rtl::OUString m_strTextStyle; + OUString m_strSeparator; + OUString m_strNumFmt; + OUString m_strTextStyle; sal_Bool m_bRestartOnPage; sal_Bool m_bCountEmptyLines; sal_Bool m_bCountFrameLines; @@ -127,18 +127,18 @@ inline void XFLineNumberConfig::SetNumberIncrement(sal_Int32 increment) m_nIncrement = increment; } -inline void XFLineNumberConfig::SetSeperator(sal_Int32 increment, rtl::OUString seperator) +inline void XFLineNumberConfig::SetSeperator(sal_Int32 increment, OUString seperator) { m_nSepIncrement = increment; m_strSeparator = seperator; } -inline void XFLineNumberConfig::SetNumberFormat(rtl::OUString numfmt) +inline void XFLineNumberConfig::SetNumberFormat(OUString numfmt) { m_strNumFmt = numfmt; } -inline void XFLineNumberConfig::SetTextStyle(rtl::OUString style) +inline void XFLineNumberConfig::SetTextStyle(OUString style) { m_strTextStyle = style; } diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx index 37e3dca1ad2e..505403261968 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx @@ -121,7 +121,7 @@ void XFListLevelBullet::ToXml(IXFStream *pStrm) //text:style-name,ignore now. m_aNumFmt.ToXml(pStrm); //bullet-char - rtl::OUString bullet(m_chBullet); + OUString bullet(m_chBullet); pAttrList->AddAttribute( A2OUSTR("text:bullet-char"), bullet ); pStrm->StartElement( A2OUSTR("text:list-level-style-bullet") ); @@ -274,9 +274,9 @@ void XFListStyle::SetListPosition(sal_Int32 level, void XFListStyle::SetListBullet(sal_Int32 level, UChar32 bullet, - rtl::OUString fontname, - rtl::OUString prefix, - rtl::OUString suffix + OUString fontname, + OUString prefix, + OUString suffix ) { assert(level>=1&&level<=10); diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx index 655cce9bae09..a5395fe0237d 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx @@ -150,15 +150,15 @@ public: { m_chBullet = ch; } - void SetPrefix(rtl::OUString prefix) + void SetPrefix(OUString prefix) { m_aNumFmt.SetPrefix(prefix); } - void SetSuffix(rtl::OUString suffix) + void SetSuffix(OUString suffix) { m_aNumFmt.SetSuffix(suffix); } - void SetFontName(rtl::OUString name) + void SetFontName(OUString name) { m_strFontName = name; } @@ -167,7 +167,7 @@ public: private: XFNumFmt m_aNumFmt; int32_t m_chBullet; - rtl::OUString m_strFontName; + OUString m_strFontName; }; //not complete. @@ -178,7 +178,7 @@ public: private: sal_Int16 m_nWidth; sal_Int16 m_nHeight; - rtl::OUString m_strBinaryData; + OUString m_strBinaryData; }; @@ -205,9 +205,9 @@ public: void SetListBullet(sal_Int32 level, UChar32 bullet_char, - rtl::OUString fontname = A2OUSTR(""), - rtl::OUString prefix = A2OUSTR(""), - rtl::OUString suffix = A2OUSTR("") + OUString fontname = A2OUSTR(""), + OUString prefix = A2OUSTR(""), + OUString suffix = A2OUSTR("") ); void SetListNumber( sal_Int32 level, XFNumFmt& numFmt, sal_Int16 nStartValue = 1 ); diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx index fa7304019181..19879326cbc9 100644 --- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx @@ -97,7 +97,7 @@ enumXFStyle XFMasterPage::GetStyleFamily() } -void XFMasterPage::SetPageMaster(rtl::OUString pm) +void XFMasterPage::SetPageMaster(OUString pm) { m_strPageMaster = pm; } diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx index 1c5a9af12dac..f61b67cf0a56 100644 --- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx +++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx @@ -73,7 +73,7 @@ public: virtual ~XFMasterPage(); public: - void SetPageMaster(rtl::OUString pm); + void SetPageMaster(OUString pm); void SetHeader(XFHeader *pHeader); @@ -84,7 +84,7 @@ public: virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strPageMaster; + OUString m_strPageMaster; XFHeader *m_pHeader; XFFooter *m_pFooter; }; diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx index 01da9c813ae6..924ab181b0f0 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx @@ -228,8 +228,8 @@ void XFNumberStyle::ToXml_Negative(IXFStream *pStrm) IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - rtl::OUString strStyleName = GetStyleName(); - rtl::OUString strGEStyle = strStyleName + A2OUSTR("PO"); + OUString strStyleName = GetStyleName(); + OUString strGEStyle = strStyleName + A2OUSTR("PO"); SetStyleName(strGEStyle); ToXml_Normal(pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx index cd29303e2fc3..1a2953c951b7 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx @@ -82,15 +82,15 @@ public: void SetColor(const XFColor& color); XFColor GetColor(){return m_aColor;} - void SetPrefix(rtl::OUString prefix); + void SetPrefix(OUString prefix); - void SetSurfix(rtl::OUString surfix); + void SetSurfix(OUString surfix); - void SetNegativeStyle(rtl::OUString prefix, rtl::OUString suffix, const XFColor& color=XFColor(255,0,0)); + void SetNegativeStyle(OUString prefix, OUString suffix, const XFColor& color=XFColor(255,0,0)); void SetNumberType(enumXFNumberType type); - void SetCurrencySymbol(sal_Bool post, rtl::OUString symbol, sal_Bool bShowSpace=sal_False); + void SetCurrencySymbol(sal_Bool post, OUString symbol, sal_Bool bShowSpace=sal_False); virtual enumXFStyle GetStyleFamily(); @@ -117,14 +117,14 @@ protected: sal_Bool m_bGroup; XFColor m_aColor; sal_Bool m_bCurrencySymbolPost; - rtl::OUString m_strCurrencySymbol; - rtl::OUString m_strPrefix; - rtl::OUString m_strSuffix; + OUString m_strCurrencySymbol; + OUString m_strPrefix; + OUString m_strSuffix; sal_Bool m_bRedIfNegative; XFColor m_aNegativeColor; - rtl::OUString m_strNegativePrefix; - rtl::OUString m_strNegativeSuffix; + OUString m_strNegativePrefix; + OUString m_strNegativeSuffix; }; inline void XFNumberStyle::SetDecimalDigits(sal_Int32 decimal) @@ -142,7 +142,7 @@ inline void XFNumberStyle::SetMinExponent(sal_Int32 exponent) m_nMinExponent = exponent; } -inline void XFNumberStyle::SetNegativeStyle(rtl::OUString prefix, rtl::OUString suffix, const XFColor& color) +inline void XFNumberStyle::SetNegativeStyle(OUString prefix, OUString suffix, const XFColor& color) { m_bRedIfNegative = sal_True; m_aNegativeColor = color; @@ -165,17 +165,17 @@ inline void XFNumberStyle::SetNumberType(enumXFNumberType type) m_eType = type; } -inline void XFNumberStyle::SetPrefix(rtl::OUString prefix) +inline void XFNumberStyle::SetPrefix(OUString prefix) { m_strPrefix = prefix; } -inline void XFNumberStyle::SetSurfix(rtl::OUString surfix) +inline void XFNumberStyle::SetSurfix(OUString surfix) { m_strSuffix = surfix; } -inline void XFNumberStyle::SetCurrencySymbol(sal_Bool post, rtl::OUString symbol, sal_Bool bShowSpace) +inline void XFNumberStyle::SetCurrencySymbol(sal_Bool post, OUString symbol, sal_Bool bShowSpace) { m_bCurrencySymbolPost = post; m_strCurrencySymbol = symbol; diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx index f74899425c4e..2fc99df98012 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx @@ -82,7 +82,7 @@ public: (2 item2 * @param: prefix *********************************************************************/ - void SetPrefix(rtl::OUString prefix) + void SetPrefix(OUString prefix) { m_strPrefix = prefix; } @@ -93,7 +93,7 @@ public: 2) item2 * @param: prefix *********************************************************************/ - void SetSuffix(rtl::OUString suffix) + void SetSuffix(OUString suffix) { m_strSuffix = suffix; } @@ -117,7 +117,7 @@ public: '','','','','', * @param: prefix *********************************************************************/ - void SetFormat(rtl::OUString format) + void SetFormat(OUString format) { m_strFormat = format; } @@ -140,9 +140,9 @@ public: pAttrList->AddAttribute( A2OUSTR("text:start-value"), Int16ToOUString(m_nStartValue) ); } private: - rtl::OUString m_strPrefix; - rtl::OUString m_strSuffix; - rtl::OUString m_strFormat; + OUString m_strPrefix; + OUString m_strSuffix; + OUString m_strFormat; sal_Int16 m_nStartValue; }; diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx index f8da4b214599..5c72ff198067 100644 --- a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx +++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx @@ -61,27 +61,27 @@ #include "ixfstream.hxx" #include "ixfattrlist.hxx" -void XFOfficeMeta::SetCreator(rtl::OUString creator) +void XFOfficeMeta::SetCreator(OUString creator) { m_strCreator = creator; } -void XFOfficeMeta::SetDescription(rtl::OUString dsr) +void XFOfficeMeta::SetDescription(OUString dsr) { m_strDsr = dsr; } -void XFOfficeMeta::SetKeywords(rtl::OUString keywords) +void XFOfficeMeta::SetKeywords(OUString keywords) { m_strKeywords = keywords; } -void XFOfficeMeta::SetCreationTime(rtl::OUString crtime) +void XFOfficeMeta::SetCreationTime(OUString crtime) { m_strCrtime = crtime; } -void XFOfficeMeta::SetLastTime(rtl::OUString lstime) +void XFOfficeMeta::SetLastTime(OUString lstime) { m_strLstime = lstime; } -void XFOfficeMeta::SetEditTime(rtl::OUString edtime) +void XFOfficeMeta::SetEditTime(OUString edtime) { m_strEdtime = edtime; } diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx index 74a82f56fa31..118fea5642eb 100644 --- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx +++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx @@ -69,23 +69,23 @@ public: XFOfficeMeta(){} virtual ~XFOfficeMeta(){} - void SetCreator(rtl::OUString creator); - void SetDescription(rtl::OUString dsr); - void SetKeywords(rtl::OUString keywords); - void SetCreationTime(rtl::OUString crtime); - void SetLastTime(rtl::OUString lstime); - void SetEditTime(rtl::OUString edtime); + void SetCreator(OUString creator); + void SetDescription(OUString dsr); + void SetKeywords(OUString keywords); + void SetCreationTime(OUString crtime); + void SetLastTime(OUString lstime); + void SetEditTime(OUString edtime); virtual void ToXml(IXFStream *pStream); private: - rtl::OUString m_strGenerator; - rtl::OUString m_strTitle; - rtl::OUString m_strCreator; - rtl::OUString m_strDsr; - rtl::OUString m_strKeywords; - rtl::OUString m_strCrtime; - rtl::OUString m_strLstime; - rtl::OUString m_strEdtime; + OUString m_strGenerator; + OUString m_strTitle; + OUString m_strCreator; + OUString m_strDsr; + OUString m_strKeywords; + OUString m_strCrtime; + OUString m_strLstime; + OUString m_strEdtime; }; diff --git a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx index dfb7946e3cd0..52a73d3fb6a2 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx @@ -71,7 +71,7 @@ class XFPageNumber : public XFContent { public: - void SetNumFmt(rtl::OUString fmt); + void SetNumFmt(OUString fmt); virtual void ToXml(IXFStream *pStrm); @@ -79,7 +79,7 @@ private: XFNumFmt m_aNumFmt; }; -inline void XFPageNumber::SetNumFmt(rtl::OUString fmt) +inline void XFPageNumber::SetNumFmt(OUString fmt) { m_aNumFmt.SetFormat(fmt); } diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx index 277e14c6446a..8ce3d775464e 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx @@ -403,7 +403,7 @@ sal_Bool XFParaStyle::Equal(IXFStyle *pStyle) void XFParaStyle::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); pAttrList->Clear(); if( !style.isEmpty() ) diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index ba4607cfcd78..336a25adf063 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -101,9 +101,9 @@ public: * @descr Set layout for the paragraph.When such property was setted, this paragraph will * start at an new page. */ - void SetMasterPage(rtl::OUString master); + void SetMasterPage(OUString master); - rtl::OUString GetMasterPage(); + OUString GetMasterPage(); /** * @descr set the paragraph defaut font. @@ -242,7 +242,7 @@ public: sal_Bool GetNumberRight(){return m_bNumberRight;} protected: - rtl::OUString m_strMasterPage; + OUString m_strMasterPage; enumXFAlignType m_eAlignType; enumXFAlignType m_eLastLineAlign; sal_Bool m_bJustSingleWord; @@ -268,7 +268,7 @@ protected: sal_Bool m_bNumberRight; }; -inline void XFParaStyle::SetMasterPage(rtl::OUString master) +inline void XFParaStyle::SetMasterPage(OUString master) { m_strMasterPage = master; } @@ -328,7 +328,7 @@ inline void XFParaStyle::ClearTabStyles() m_aTabs.Reset(); } -inline rtl::OUString XFParaStyle::GetMasterPage() +inline OUString XFParaStyle::GetMasterPage() { return m_strMasterPage; } diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx index 783f88c9556d..9e4c08a6e18f 100644 --- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx +++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx @@ -71,14 +71,14 @@ class XFHolderStart : public XFContent public: XFHolderStart(); ~XFHolderStart(); - void SetType(rtl::OUString sType); - void SetDesc(rtl::OUString sDesc); - void SetPrompt(rtl::OUString sText); + void SetType(OUString sType); + void SetDesc(OUString sDesc); + void SetPrompt(OUString sText); void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strType; - rtl::OUString m_strDesc; - rtl::OUString m_strText; + OUString m_strType; + OUString m_strDesc; + OUString m_strText; }; XFHolderStart::XFHolderStart() @@ -89,17 +89,17 @@ XFHolderStart::~XFHolderStart() { } -inline void XFHolderStart::SetType(rtl::OUString sType) +inline void XFHolderStart::SetType(OUString sType) { m_strType = sType; } -inline void XFHolderStart::SetDesc(rtl::OUString sDesc) +inline void XFHolderStart::SetDesc(OUString sDesc) { m_strDesc = sDesc; } -inline void XFHolderStart::SetPrompt(rtl::OUString sText) +inline void XFHolderStart::SetPrompt(OUString sText) { m_strText = sText; } diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx b/lotuswordpro/source/filter/xfilter/xfruby.hxx index 4b7f93a7a77e..ecae0cf8245e 100644 --- a/lotuswordpro/source/filter/xfilter/xfruby.hxx +++ b/lotuswordpro/source/filter/xfilter/xfruby.hxx @@ -71,10 +71,10 @@ public: class XFRubyEnd : public XFContent { public: - void SetText(rtl::OUString sText); + void SetText(OUString sText); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strText; + OUString m_strText; }; void XFRubyStart::ToXml(IXFStream *pStrm) @@ -88,7 +88,7 @@ void XFRubyStart::ToXml(IXFStream *pStrm) pStrm->StartElement( A2OUSTR("text:ruby-base") ); } -void XFRubyEnd::SetText(rtl::OUString sText) +void XFRubyEnd::SetText(OUString sText) { m_strText = sText; } diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx index 64d09a6847d1..14f2b03edc4d 100644 --- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx @@ -94,7 +94,7 @@ enumXFStyle XFRubyStyle::GetStyleFamily() void XFRubyStyle::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); pAttrList->Clear(); if( !style.isEmpty() ) diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx index 8848d7695573..047a4487230f 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx @@ -73,7 +73,7 @@ XFSaxAttrList::~XFSaxAttrList() // delete m_pSvAttrList; } -void XFSaxAttrList::AddAttribute(const rtl::OUString& name, const rtl::OUString& value) +void XFSaxAttrList::AddAttribute(const OUString& name, const OUString& value) { m_pSvAttrList->AddAttribute(name,value); } diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx index c22d248b8c00..831740985b9f 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx @@ -76,7 +76,7 @@ public: public: //Interface ISaxAttributeList: - virtual void AddAttribute(const rtl::OUString& name, const rtl::OUString& value); + virtual void AddAttribute(const OUString& name, const OUString& value); virtual void Clear(); diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx index b0c94dc8c82d..1e057761d87f 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx @@ -104,14 +104,14 @@ void XFSaxStream::EndDocument() m_aHandler->endDocument(); } -void XFSaxStream::StartElement(const rtl::OUString& oustr) +void XFSaxStream::StartElement(const OUString& oustr) { if (m_aHandler.is()) m_aHandler->startElement( oustr, m_pAttrList->GetAttributeList() ); m_pAttrList->Clear(); } -void XFSaxStream::EndElement(const rtl::OUString& oustr) +void XFSaxStream::EndElement(const OUString& oustr) { if (m_aHandler.is()) m_aHandler->endElement(oustr); @@ -120,7 +120,7 @@ void XFSaxStream::EndElement(const rtl::OUString& oustr) m_pAttrList->Clear(); } -void XFSaxStream::Characters(const rtl::OUString& oustr) +void XFSaxStream::Characters(const OUString& oustr) { if (m_aHandler.is()) m_aHandler->characters(oustr); diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx index 834d8f82483e..a343a5b3c5e4 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx @@ -109,17 +109,17 @@ public: /** * @descr Start output element. */ - virtual void StartElement(const rtl::OUString& oustr); + virtual void StartElement(const OUString& oustr); /** * @descr End output element. */ - virtual void EndElement(const rtl::OUString& oustr); + virtual void EndElement(const OUString& oustr); /** * @descr Output Character section. */ - virtual void Characters(const rtl::OUString& oustr); + virtual void Characters(const OUString& oustr); /** * @descr Get the attribute list interface. diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx index c54cc3c8402c..f7e9918ecd8a 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx @@ -77,7 +77,7 @@ void XFSection::ToXml(IXFStream *pStrm) IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); if( !style.isEmpty() ) pAttrList->AddAttribute( A2OUSTR("text:style-name"), style); //section name diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx index 089785b76066..f77a2a972a40 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx @@ -84,11 +84,11 @@ public: virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strSectionName; + OUString m_strSectionName; sal_Bool m_bProtected; sal_Bool m_bHiden; XFColor m_aBackColor; - rtl::OUString m_strSourceLink; + OUString m_strSourceLink; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx index e705f764c256..194e02b28278 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx @@ -69,10 +69,10 @@ XFShadow::~XFShadow() { } -rtl::OUString XFShadow::ToString() +OUString XFShadow::ToString() { - rtl::OUString buf; - rtl::OUString strOff = DoubleToOUString(m_fOffset); + OUString buf; + OUString strOff = DoubleToOUString(m_fOffset); buf = m_aColor.ToString(); switch(m_ePosition) diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx index 7d8972580e38..a94d0a6d102e 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx @@ -106,7 +106,7 @@ public: */ XFColor GetColor(); - rtl::OUString ToString(); + OUString ToString(); virtual void ToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx index 64524c59a56b..361495647536 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx @@ -68,22 +68,22 @@ XFStyle::~XFStyle() { } -rtl::OUString XFStyle::GetStyleName() +OUString XFStyle::GetStyleName() { return m_strStyleName; } -void XFStyle::SetStyleName(const rtl::OUString& styleName) +void XFStyle::SetStyleName(const OUString& styleName) { m_strStyleName = styleName; } -rtl::OUString XFStyle::GetParentStyleName() +OUString XFStyle::GetParentStyleName() { return m_strParentStyleName; } -void XFStyle::SetParentStyleName(const rtl::OUString& styleName) +void XFStyle::SetParentStyleName(const OUString& styleName) { m_strParentStyleName = styleName; } diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx index 2ba09745b658..15a8c7ffe768 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx @@ -77,22 +77,22 @@ public: /** * @descr get style name. */ - virtual rtl::OUString GetStyleName(); + virtual OUString GetStyleName(); /** * @descr set style name. */ - virtual void SetStyleName(const rtl::OUString& styleName); + virtual void SetStyleName(const OUString& styleName); /** * @descr Set parent style name. */ - virtual rtl::OUString GetParentStyleName(); + virtual OUString GetParentStyleName(); /** * @descr return parent style name. */ - virtual void SetParentStyleName(const rtl::OUString& styleName); + virtual void SetParentStyleName(const OUString& styleName); /** * @descr get styel family. @@ -110,8 +110,8 @@ public: virtual sal_Bool Equal(IXFStyle *pStyle); protected: - rtl::OUString m_strStyleName; - rtl::OUString m_strParentStyleName; + OUString m_strStyleName; + OUString m_strParentStyleName; enumXFStyle m_enumFamily; }; diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx index 0b98b935b14b..7c9a19e72a8e 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx @@ -65,7 +65,7 @@ #include "xffontfactory.hxx" #include "../lwpglobalmgr.hxx" -XFStyleContainer::XFStyleContainer(const rtl::OUString& strStyleNamePrefix) +XFStyleContainer::XFStyleContainer(const OUString& strStyleNamePrefix) :m_strStyleNamePrefix(strStyleNamePrefix) { } @@ -111,7 +111,7 @@ void XFStyleContainer::Reset() IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle) { IXFStyle *pConStyle = NULL; - rtl::OUString name; + OUString name; if( !pStyle ) return NULL; @@ -168,7 +168,7 @@ IXFStyle* XFStyleContainer::FindSameStyle(IXFStyle *pStyle) return NULL; } -IXFStyle* XFStyleContainer::FindStyle(rtl::OUString name) +IXFStyle* XFStyleContainer::FindStyle(OUString name) { std::vector<IXFStyle*>::iterator it; for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it ) diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx index 259f1f78fe5f..420a2eb8f6f9 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx @@ -74,7 +74,7 @@ class XFStyleContainer : public IXFObject public: XFStyleContainer(){} - XFStyleContainer(const rtl::OUString& strStyleNamePrefix); + XFStyleContainer(const OUString& strStyleNamePrefix); XFStyleContainer(const XFStyleContainer& other); @@ -97,7 +97,7 @@ public: /** * @descr get style by name. */ - IXFStyle* FindStyle(rtl::OUString name); + IXFStyle* FindStyle(OUString name); /** * @descr clear container. @@ -125,7 +125,7 @@ private: static void ManageStyleFont(IXFStyle *pStyle); private: std::vector<IXFStyle*> m_aStyles; - rtl::OUString m_strStyleNamePrefix; + OUString m_strStyleNamePrefix; }; inline size_t XFStyleContainer::GetCount() const diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx index 3062c8898158..7e04eb482769 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx @@ -107,7 +107,7 @@ void XFStyleManager::AddFontDecl(XFFontDecl& aFontDecl) IXFStyle* XFStyleManager::AddStyle(IXFStyle *pStyle) { assert(pStyle); - rtl::OUString name; + OUString name; IXFStyle *pStyleRet = NULL; if( !pStyle ) @@ -219,7 +219,7 @@ IXFStyle* XFStyleManager::AddStyle(IXFStyle *pStyle) return pStyleRet; } -IXFStyle* XFStyleManager::FindStyle(rtl::OUString name) +IXFStyle* XFStyleManager::FindStyle(OUString name) { IXFStyle *pStyle = (IXFStyle*)FindParaStyle(name); if( pStyle ) @@ -272,7 +272,7 @@ IXFStyle* XFStyleManager::FindStyle(rtl::OUString name) return NULL; } -XFParaStyle* XFStyleManager::FindParaStyle(rtl::OUString name) +XFParaStyle* XFStyleManager::FindParaStyle(OUString name) { IXFStyle *pStyle = s_aParaStyles.FindStyle(name); if( pStyle ) @@ -281,7 +281,7 @@ XFParaStyle* XFStyleManager::FindParaStyle(rtl::OUString name) return (XFParaStyle*)s_aStdParaStyles.FindStyle(name); } -XFTextStyle* XFStyleManager::FindTextStyle(rtl::OUString name) +XFTextStyle* XFStyleManager::FindTextStyle(OUString name) { IXFStyle *pStyle = s_aTextStyles.FindStyle(name); if( pStyle ) diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx index 5e4f6770f878..2c7705b9d82d 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx @@ -97,11 +97,11 @@ public: IXFStyle* AddStyle(IXFStyle *pStyle); - IXFStyle* FindStyle(rtl::OUString name); + IXFStyle* FindStyle(OUString name); - XFParaStyle* FindParaStyle(rtl::OUString name); + XFParaStyle* FindParaStyle(OUString name); - XFTextStyle* FindTextStyle(rtl::OUString name); + XFTextStyle* FindTextStyle(OUString name); void SetLineNumberConfig(XFLineNumberConfig *pLNConfig); diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx index 12db75debf7b..678a1a12d627 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.cxx +++ b/lotuswordpro/source/filter/xfilter/xftable.cxx @@ -126,7 +126,7 @@ XFTable::~XFTable() m_aColumns.clear(); } -void XFTable::SetColumnStyle(sal_Int32 col, rtl::OUString style) +void XFTable::SetColumnStyle(sal_Int32 col, OUString style) { m_aColumns[col] = style; } @@ -157,7 +157,7 @@ void XFTable::AddHeaderRow(XFRow *pRow) m_aHeaderRows.Add(pRow); } -rtl::OUString XFTable::GetTableName() +OUString XFTable::GetTableName() { if( m_bSubTable ) { @@ -188,7 +188,7 @@ XFRow* XFTable::GetRow(sal_Int32 row) sal_Int32 XFTable::GetColumnCount() { int colMax = -1; - std::map<sal_Int32,rtl::OUString>::iterator it; + std::map<sal_Int32,OUString>::iterator it; for( it=m_aColumns.begin(); it!=m_aColumns.end(); ++it ) { if( it->first>colMax ) @@ -225,11 +225,11 @@ void XFTable::ToXml(IXFStream *pStrm) //output columns: { int lastCol = 0; - std::map<sal_Int32,rtl::OUString>::iterator it; + std::map<sal_Int32,OUString>::iterator it; for( it=m_aColumns.begin(); it!=m_aColumns.end(); ++it ) { sal_Int32 col = (*it).first; - rtl::OUString style = m_aColumns[col]; + OUString style = m_aColumns[col]; //default col repeated: if( col >lastCol+1 ) diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx index 00b1fde1419c..e9ae0229603b 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.hxx +++ b/lotuswordpro/source/filter/xfilter/xftable.hxx @@ -79,24 +79,24 @@ public: virtual ~XFTable(); public: - void SetTableName(rtl::OUString name); + void SetTableName(OUString name); - void SetColumnStyle(sal_Int32 col, rtl::OUString style); + void SetColumnStyle(sal_Int32 col, OUString style); void AddRow(XFRow *pRow); void AddHeaderRow(XFRow *pRow); - void SetDefaultCellStyle(rtl::OUString style); + void SetDefaultCellStyle(OUString style); - void SetDefaultRowStyle(rtl::OUString style); + void SetDefaultRowStyle(OUString style); - void SetDefaultColStyle(rtl::OUString style); + void SetDefaultColStyle(OUString style); public: void SetOwnerCell(XFCell *pCell); - rtl::OUString GetTableName(); + OUString GetTableName(); sal_Int32 GetRowCount(); @@ -115,18 +115,18 @@ public: void RemoveRow(sal_Int32 row); private: - rtl::OUString m_strName; + OUString m_strName; sal_Bool m_bSubTable; XFCell *m_pOwnerCell; XFContentContainer m_aHeaderRows; std::map<sal_Int32,XFRow*> m_aRows; - std::map<sal_Int32,rtl::OUString> m_aColumns; - rtl::OUString m_strDefCellStyle; - rtl::OUString m_strDefRowStyle; - rtl::OUString m_strDefColStyle; + std::map<sal_Int32,OUString> m_aColumns; + OUString m_strDefCellStyle; + OUString m_strDefRowStyle; + OUString m_strDefColStyle; }; -inline void XFTable::SetTableName(rtl::OUString name) +inline void XFTable::SetTableName(OUString name) { m_strName = name; } @@ -143,17 +143,17 @@ inline sal_Bool XFTable::IsSubTable() } -inline void XFTable::SetDefaultCellStyle(rtl::OUString style) +inline void XFTable::SetDefaultCellStyle(OUString style) { m_strDefCellStyle = style; } -inline void XFTable::SetDefaultRowStyle(rtl::OUString style) +inline void XFTable::SetDefaultRowStyle(OUString style) { m_strDefRowStyle = style; } -inline void XFTable::SetDefaultColStyle(rtl::OUString style) +inline void XFTable::SetDefaultColStyle(OUString style) { m_strDefColStyle = style; } diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx index 2dda0206a641..22fe63574ad4 100644 --- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx @@ -83,8 +83,8 @@ public: private: enumXFTab m_eType; double m_fLength; - rtl::OUString m_strDelimiter; - rtl::OUString m_strLeader; + OUString m_strDelimiter; + OUString m_strLeader; }; inline void XFTabStyle::SetTabType(enumXFTab type) @@ -103,7 +103,7 @@ inline void XFTabStyle::SetDelimiter(sal_Unicode delimiter) chs[0] = delimiter; chs[1] = 0; - m_strDelimiter = rtl::OUString(chs); + m_strDelimiter = OUString(chs); } inline void XFTabStyle::SetLeaderChar(sal_Unicode leader) @@ -112,7 +112,7 @@ inline void XFTabStyle::SetLeaderChar(sal_Unicode leader) chs[0] = leader; chs[1] = 0; - m_strLeader = rtl::OUString(chs); + m_strLeader = OUString(chs); } diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx index 83cf2d6249e3..fe66d2cb7fe9 100644 --- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx @@ -60,7 +60,7 @@ #include "xftextcontent.hxx" #include "ixfstream.hxx" -XFTextContent::XFTextContent(rtl::OUString text):m_strText(text) +XFTextContent::XFTextContent(OUString text):m_strText(text) { } @@ -73,7 +73,7 @@ enumXFContent XFTextContent::GetContentType() return enumXFContentText; } -void XFTextContent::SetText(const rtl::OUString& text) +void XFTextContent::SetText(const OUString& text) { m_strText = text; } @@ -81,9 +81,9 @@ void XFTextContent::SetText(const rtl::OUString& text) void XFTextContent::ToXml(IXFStream *pStrm) { // pStrm->Characters(m_strText); - rtl::OUString sSpaceToken(" "); - sSpaceToken += rtl::OUString(" "); - rtl::OUString sSubString; + OUString sSpaceToken(" "); + sSpaceToken += OUString(" "); + OUString sSubString; sal_Int32 nIndex = 0; sal_Int32 nSize = m_strText.getLength(); sal_Int32 i,j; @@ -107,7 +107,7 @@ void XFTextContent::ToXml(IXFStream *pStrm) } IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( A2OUSTR("text:c"), rtl::OUString::valueOf(j-nIndex) ); + pAttrList->AddAttribute( A2OUSTR("text:c"), OUString::valueOf(j-nIndex) ); pStrm->StartElement( A2OUSTR("text:s") ); pStrm->EndElement( A2OUSTR("text:s") ); diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx index 870a64a4ccf2..7f55f2149392 100644 --- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx @@ -74,7 +74,7 @@ class XFTextContent : public XFContent public: XFTextContent(){} - XFTextContent(rtl::OUString text); + XFTextContent(OUString text); virtual ~XFTextContent(); @@ -82,14 +82,14 @@ public: /** * @descr Set the text. */ - void SetText(const rtl::OUString& text); + void SetText(const OUString& text); virtual enumXFContent GetContentType(); virtual void ToXml(IXFStream *pStrm); private: - rtl::OUString m_strText; + OUString m_strText; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx b/lotuswordpro/source/filter/xfilter/xftextspan.cxx index 9e176a6cf360..0631c2660ca8 100644 --- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx @@ -67,8 +67,8 @@ XFTextSpan::XFTextSpan() } -XFTextSpan::XFTextSpan(rtl::OUString& text, - rtl::OUString& style +XFTextSpan::XFTextSpan(OUString& text, + OUString& style ) { Add(text); @@ -99,7 +99,7 @@ void XFTextSpan::Add(IXFContent *pContent) m_aContents.push_back(pContent); } -void XFTextSpan::Add(rtl::OUString& text) +void XFTextSpan::Add(OUString& text) { IXFContent *pText = new XFTextContent(text); Add(pText); @@ -107,7 +107,7 @@ void XFTextSpan::Add(rtl::OUString& text) void XFTextSpan::ToXml(IXFStream *pStrm) { - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); IXFAttrList *pAttrList = pStrm->GetAttrList(); assert(pAttrList); @@ -130,7 +130,7 @@ void XFTextSpan::ToXml(IXFStream *pStrm) void XFTextSpanStart::ToXml(IXFStream *pStrm) { - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); IXFAttrList *pAttrList = pStrm->GetAttrList(); assert(pAttrList); diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/source/filter/xfilter/xftextspan.hxx index f60ffb1ba3f8..4b5b349d91b9 100644 --- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx +++ b/lotuswordpro/source/filter/xfilter/xftextspan.hxx @@ -70,12 +70,12 @@ class XFTextSpan : public XFContent { public: XFTextSpan(); - XFTextSpan(rtl::OUString& text, rtl::OUString& style ); + XFTextSpan(OUString& text, OUString& style ); virtual ~XFTextSpan(); void Add(IXFContent *pContent); - void Add(rtl::OUString& text); + void Add(OUString& text); virtual enumXFContent GetContentType(); virtual void ToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx index 1820c2885514..577734714388 100644 --- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx @@ -112,16 +112,16 @@ enumXFStyle XFTextStyle::GetStyleFamily() void XFTextStyle::ToXml(IXFStream *strm) { IXFAttrList *pAttrList = strm->GetAttrList(); - rtl::OUString style = GetStyleName(); + OUString style = GetStyleName(); pAttrList->Clear(); if( !style.isEmpty() ) - pAttrList->AddAttribute(rtl::OUString("style:name"),GetStyleName()); + pAttrList->AddAttribute(OUString("style:name"),GetStyleName()); if( !GetParentStyleName().isEmpty() ) pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName()); - pAttrList->AddAttribute(rtl::OUString("style:family"),A2OUSTR("text") ); - strm->StartElement(rtl::OUString("style:style")); + pAttrList->AddAttribute(OUString("style:family"),A2OUSTR("text") ); + strm->StartElement(OUString("style:style")); //Font properties: pAttrList->Clear(); @@ -129,10 +129,10 @@ void XFTextStyle::ToXml(IXFStream *strm) if( m_pFont ) m_pFont->ToXml(strm); - strm->StartElement(rtl::OUString("style:properties")); - strm->EndElement(rtl::OUString("style:properties")); + strm->StartElement(OUString("style:properties")); + strm->EndElement(OUString("style:properties")); - strm->EndElement(rtl::OUString("style:style")); + strm->EndElement(OUString("style:style")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx index 722e988c18e4..ba4b7b67e68d 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx @@ -80,12 +80,12 @@ public: void SetLongFmt(sal_Bool bLongFmt); - void SetText(rtl::OUString& text); + void SetText(OUString& text); protected: enumXFDatePart m_ePart; sal_Bool m_bLongFmt; - rtl::OUString m_strText; + OUString m_strText; }; class XFTimePart : public XFDateTimePart @@ -120,7 +120,7 @@ public: void SetAmPm(sal_Bool bAmPm); - void AddText( rtl::OUString part ); + void AddText( OUString part ); virtual enumXFStyle GetStyleFamily(); @@ -146,7 +146,7 @@ inline void XFDateTimePart::SetLongFmt(sal_Bool bLongFmt) m_bLongFmt = bLongFmt; } -inline void XFDateTimePart::SetText(rtl::OUString& text) +inline void XFDateTimePart::SetText(OUString& text) { m_strText = text; } @@ -186,7 +186,7 @@ inline void XFTimeStyle::SetAmPm(sal_Bool bAmPm) m_bAmPm = bAmPm; } -inline void XFTimeStyle::AddText( rtl::OUString text ) +inline void XFTimeStyle::AddText( OUString text ) { XFTimePart part; part.SetPartType(enumXFDateText); diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx index 942928a15b9c..89803b599f09 100644 --- a/lotuswordpro/source/filter/xfilter/xfutil.cxx +++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx @@ -64,54 +64,54 @@ #include <rtl/ustrbuf.hxx> #include <sstream> -rtl::OUString Int32ToOUString(sal_Int32 num) +OUString Int32ToOUString(sal_Int32 num) { /*std::stringstream sstrm; sstrm<<(int)num; - return rtl::OUString::createFromAscii(sstrm.str().c_str()); + return OUString::createFromAscii(sstrm.str().c_str()); */ - return rtl::OUString::valueOf(num); + return OUString::valueOf(num); } -rtl::OUString Int16ToOUString(sal_Int16 num) +OUString Int16ToOUString(sal_Int16 num) { /*std::stringstream sstrm; sstrm<<(int)num; - return rtl::OUString::createFromAscii(sstrm.str().c_str()); + return OUString::createFromAscii(sstrm.str().c_str()); */ sal_Int32 nNum = static_cast<sal_Int32>(num); - return rtl::OUString::valueOf(nNum); + return OUString::valueOf(nNum); } -rtl::OUString FloatToOUString(float num, sal_Int32 /*precision*/) +OUString FloatToOUString(float num, sal_Int32 /*precision*/) { /*std::stringstream sstrm; std::string strRet; sstrm.precision(precision); sstrm<<num; - return rtl::OUString::createFromAscii(sstrm.str().c_str()); + return OUString::createFromAscii(sstrm.str().c_str()); */ - return rtl::OUString::valueOf(num); + return OUString::valueOf(num); } -rtl::OUString DoubleToOUString(double num, sal_Int32 /*precision*/) +OUString DoubleToOUString(double num, sal_Int32 /*precision*/) { /*std::stringstream sstrm; std::string strRet; sstrm.precision(precision); sstrm<<num; - return rtl::OUString::createFromAscii(sstrm.str().c_str()); + return OUString::createFromAscii(sstrm.str().c_str()); */ - return rtl::OUString::valueOf(num); + return OUString::valueOf(num); } -rtl::OUString DateTimeToOUString(XFDateTime& dt) +OUString DateTimeToOUString(XFDateTime& dt) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(dt.nYear); buf.append( A2OUSTR("-") ); buf.append(dt.nMonth); @@ -129,7 +129,7 @@ rtl::OUString DateTimeToOUString(XFDateTime& dt) return buf.makeStringAndClear(); } -rtl::OUString GetTableColName(sal_Int32 col) +OUString GetTableColName(sal_Int32 col) { int remain = 0; char ch; @@ -156,7 +156,7 @@ rtl::OUString GetTableColName(sal_Int32 col) } //tool functions: -rtl::OUString GetUnderlineName(enumXFUnderline type) +OUString GetUnderlineName(enumXFUnderline type) { switch(type) { @@ -218,7 +218,7 @@ rtl::OUString GetUnderlineName(enumXFUnderline type) return A2OUSTR(""); } -rtl::OUString GetReliefName(enumXFRelief type) +OUString GetReliefName(enumXFRelief type) { switch(type) { @@ -234,7 +234,7 @@ rtl::OUString GetReliefName(enumXFRelief type) return A2OUSTR(""); } -rtl::OUString GetCrossoutName(enumXFCrossout type) +OUString GetCrossoutName(enumXFCrossout type) { switch(type) { @@ -259,7 +259,7 @@ rtl::OUString GetCrossoutName(enumXFCrossout type) return A2OUSTR(""); } -rtl::OUString GetTransformName(enumXFTransform type) +OUString GetTransformName(enumXFTransform type) { switch(type) { case enumXFTransformUpper: @@ -280,7 +280,7 @@ rtl::OUString GetTransformName(enumXFTransform type) return A2OUSTR(""); } -rtl::OUString GetEmphasizeName(enumXFEmphasize type) +OUString GetEmphasizeName(enumXFEmphasize type) { switch(type) { case enumXFEmphasizeDot: @@ -301,7 +301,7 @@ rtl::OUString GetEmphasizeName(enumXFEmphasize type) return A2OUSTR(""); } -rtl::OUString GetTextDirName(enumXFTextDir dir) +OUString GetTextDirName(enumXFTextDir dir) { switch(dir) { @@ -335,7 +335,7 @@ rtl::OUString GetTextDirName(enumXFTextDir dir) return A2OUSTR(""); } -rtl::OUString GetFrameXPos(enumXFFrameXPos pos) +OUString GetFrameXPos(enumXFFrameXPos pos) { switch(pos) { @@ -357,7 +357,7 @@ rtl::OUString GetFrameXPos(enumXFFrameXPos pos) return A2OUSTR(""); } -rtl::OUString GetFrameXRel(enumXFFrameXRel rel) +OUString GetFrameXRel(enumXFFrameXRel rel) { switch(rel) { @@ -406,7 +406,7 @@ rtl::OUString GetFrameXRel(enumXFFrameXRel rel) return A2OUSTR(""); } -rtl::OUString GetFrameYPos(enumXFFrameYPos pos) +OUString GetFrameYPos(enumXFFrameYPos pos) { switch(pos) { @@ -424,7 +424,7 @@ rtl::OUString GetFrameYPos(enumXFFrameYPos pos) return A2OUSTR(""); } -rtl::OUString GetFrameYRel(enumXFFrameYRel rel) +OUString GetFrameYRel(enumXFFrameYRel rel) { switch(rel) { @@ -452,7 +452,7 @@ rtl::OUString GetFrameYRel(enumXFFrameYRel rel) return A2OUSTR(""); } -rtl::OUString GetAlignName(enumXFAlignType align) +OUString GetAlignName(enumXFAlignType align) { if( align == enumXFAlignStart ) return A2OUSTR("start"); @@ -474,7 +474,7 @@ rtl::OUString GetAlignName(enumXFAlignType align) return A2OUSTR(""); } -rtl::OUString GetDrawKind(enumXFDrawKind kind) +OUString GetDrawKind(enumXFDrawKind kind) { if( kind == enumXFDrawKindFull ) return A2OUSTR("full"); @@ -486,9 +486,9 @@ rtl::OUString GetDrawKind(enumXFDrawKind kind) return A2OUSTR("arc"); } -rtl::OUString GetPageUsageName(enumXFPageUsage usage) +OUString GetPageUsageName(enumXFPageUsage usage) { - rtl::OUString sRet; + OUString sRet; switch(usage) { case enumXFPageUsageAll: @@ -510,9 +510,9 @@ rtl::OUString GetPageUsageName(enumXFPageUsage usage) return sRet; } -rtl::OUString GetValueType(enumXFValueType type) +OUString GetValueType(enumXFValueType type) { - rtl::OUString sRet; + OUString sRet; switch(type) { case enumXFValueTypeBoolean: @@ -543,7 +543,7 @@ rtl::OUString GetValueType(enumXFValueType type) return sRet; } -rtl::OUString GetColorMode(enumXFColorMode mode) +OUString GetColorMode(enumXFColorMode mode) { switch(mode) { diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx index f9b13bd9530d..d89da05554ae 100644 --- a/lotuswordpro/source/filter/xfilter/xfutil.hxx +++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx @@ -66,49 +66,49 @@ #include <string> -#define A2OUSTR(str) rtl::OUString::createFromAscii(str) +#define A2OUSTR(str) OUString::createFromAscii(str) -rtl::OUString Int32ToOUString(sal_Int32 num); +OUString Int32ToOUString(sal_Int32 num); -rtl::OUString Int16ToOUString(sal_Int16 num); +OUString Int16ToOUString(sal_Int16 num); -rtl::OUString FloatToOUString(float num, sal_Int32 precision=6); +OUString FloatToOUString(float num, sal_Int32 precision=6); -rtl::OUString DoubleToOUString(double num, sal_Int32 precision=6); +OUString DoubleToOUString(double num, sal_Int32 precision=6); -rtl::OUString DateTimeToOUString(XFDateTime& dt); +OUString DateTimeToOUString(XFDateTime& dt); -rtl::OUString GetTableColName(sal_Int32 col); +OUString GetTableColName(sal_Int32 col); -rtl::OUString GetUnderlineName(enumXFUnderline type); +OUString GetUnderlineName(enumXFUnderline type); -rtl::OUString GetReliefName(enumXFRelief type); +OUString GetReliefName(enumXFRelief type); -rtl::OUString GetCrossoutName(enumXFCrossout type); +OUString GetCrossoutName(enumXFCrossout type); -rtl::OUString GetTransformName(enumXFTransform type); +OUString GetTransformName(enumXFTransform type); -rtl::OUString GetEmphasizeName(enumXFEmphasize type); +OUString GetEmphasizeName(enumXFEmphasize type); -rtl::OUString GetTextDirName(enumXFTextDir dir); +OUString GetTextDirName(enumXFTextDir dir); -rtl::OUString GetFrameXPos(enumXFFrameXPos pos); +OUString GetFrameXPos(enumXFFrameXPos pos); -rtl::OUString GetFrameXRel(enumXFFrameXRel rel); +OUString GetFrameXRel(enumXFFrameXRel rel); -rtl::OUString GetFrameYPos(enumXFFrameYPos pos); +OUString GetFrameYPos(enumXFFrameYPos pos); -rtl::OUString GetFrameYRel(enumXFFrameYRel rel); +OUString GetFrameYRel(enumXFFrameYRel rel); -rtl::OUString GetAlignName(enumXFAlignType align); +OUString GetAlignName(enumXFAlignType align); -rtl::OUString GetDrawKind(enumXFDrawKind kind); +OUString GetDrawKind(enumXFDrawKind kind); -rtl::OUString GetPageUsageName(enumXFPageUsage usage); +OUString GetPageUsageName(enumXFPageUsage usage); -rtl::OUString GetValueType(enumXFValueType type); +OUString GetValueType(enumXFValueType type); -rtl::OUString GetColorMode(enumXFColorMode mode); +OUString GetColorMode(enumXFColorMode mode); #endif |