diff options
Diffstat (limited to 'sw/source/filter/ww8')
44 files changed, 444 insertions, 444 deletions
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx index 677087a803f8..73732b830664 100644 --- a/sw/source/filter/ww8/WW8FFData.cxx +++ b/sw/source/filter/ww8/WW8FFData.cxx @@ -50,25 +50,25 @@ WW8FFData::~WW8FFData() { } -void WW8FFData::setHelp(const ::rtl::OUString & rHelp) +void WW8FFData::setHelp(const OUString & rHelp) { msHelp = rHelp; mbOwnHelp = true; } -void WW8FFData::setStatus(const ::rtl::OUString & rStatus) +void WW8FFData::setStatus(const OUString & rStatus) { msStatus = rStatus; mbOwnStat = true; } -void WW8FFData::addListboxEntry(const ::rtl::OUString & rEntry) +void WW8FFData::addListboxEntry(const OUString & rEntry) { mbListBox = true; msListEntries.push_back(rEntry); } -void WW8FFData::WriteOUString(SvStream * pDataStrm, const ::rtl::OUString & rStr, +void WW8FFData::WriteOUString(SvStream * pDataStrm, const OUString & rStr, bool bAddZero) { sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength()); @@ -147,11 +147,11 @@ void WW8FFData::Write(SvStream * pDataStrm) sal_uInt32 nListboxEntries = msListEntries.size(); *pDataStrm << nListboxEntries; - ::std::vector< ::rtl::OUString >::const_iterator aIt = msListEntries.begin(); + ::std::vector< OUString >::const_iterator aIt = msListEntries.begin(); while (aIt != msListEntries.end()) { - const ::rtl::OUString & rEntry = *aIt; + const OUString & rEntry = *aIt; WriteOUString(pDataStrm, rEntry, false); ++aIt; diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index 9d90866e7a8e..0b639af3a1c8 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -48,19 +48,19 @@ private: sal_uInt16 mnCheckboxHeight; // offset 10 and beyond - ::rtl::OUString msName; - ::rtl::OUString msDefault; // only for type == 0 + OUString msName; + OUString msDefault; // only for type == 0 sal_uInt16 mnDefault; // only for type != 0 - ::rtl::OUString msFormat; - ::rtl::OUString msHelp; - ::rtl::OUString msStatus; - ::rtl::OUString msMacroEnter; - ::rtl::OUString msMacroExit; + OUString msFormat; + OUString msHelp; + OUString msStatus; + OUString msMacroEnter; + OUString msMacroExit; - ::std::vector< ::rtl::OUString > msListEntries; + ::std::vector< OUString > msListEntries; protected: - void WriteOUString(SvStream * pStream, const ::rtl::OUString & rStr, bool bAddZero); + void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero); public: WW8FFData(); @@ -84,24 +84,24 @@ public: sal_uInt16 getMaxLen() const { return mnMaxLen; } void setCheckboxHeight(sal_uInt16 nCheckboxHeight) { mnCheckboxHeight = nCheckboxHeight; } sal_uInt16 getCheckboxHeight() const { return mnCheckboxHeight; } - void setName(const ::rtl::OUString & rName) { msName = rName; } - const ::rtl::OUString & getName() const { return msName; } - void setDefaultString(const ::rtl::OUString & rDefault) { msDefault = rDefault; } - const ::rtl::OUString & getDefaultString() const { return msDefault; } + void setName(const OUString & rName) { msName = rName; } + const OUString & getName() const { return msName; } + void setDefaultString(const OUString & rDefault) { msDefault = rDefault; } + const OUString & getDefaultString() const { return msDefault; } void setDefaultResult(sal_uInt16 nDefault) { mnDefault = nDefault; } sal_uInt16 getDefaultResult() const { return mnDefault; } - void setFormat(const ::rtl::OUString & rFormat) { msFormat = rFormat; } - const ::rtl::OUString & getFormat() const { return msFormat; } - void setHelp(const ::rtl::OUString & rHelp); - const ::rtl::OUString getHelp() const { return msHelp; } - void setStatus(const ::rtl::OUString & rStatus); - const ::rtl::OUString & getStatus() const { return msStatus; } - void setMacroEnter(const ::rtl::OUString & rMacroEnter) { msMacroEnter = rMacroEnter; } - const ::rtl::OUString & getMacroEnter() const { return msMacroEnter; } - void setMacroExit(const ::rtl::OUString & rMacroExit) { msMacroExit = rMacroExit; } - const ::rtl::OUString & getMacroExit() const { return msMacroExit; } + void setFormat(const OUString & rFormat) { msFormat = rFormat; } + const OUString & getFormat() const { return msFormat; } + void setHelp(const OUString & rHelp); + const OUString getHelp() const { return msHelp; } + void setStatus(const OUString & rStatus); + const OUString & getStatus() const { return msStatus; } + void setMacroEnter(const OUString & rMacroEnter) { msMacroEnter = rMacroEnter; } + const OUString & getMacroEnter() const { return msMacroEnter; } + void setMacroExit(const OUString & rMacroExit) { msMacroExit = rMacroExit; } + const OUString & getMacroExit() const { return msMacroExit; } - void addListboxEntry(const ::rtl::OUString & rEntry); + void addListboxEntry(const OUString & rEntry); void Write(SvStream * pDataStrm); }; diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index 0f6705911faa..b791df619734 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -64,10 +64,10 @@ namespace ww8 return nResult; } - ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset, + OUString WW8Struct::getUString(sal_uInt32 nOffset, sal_uInt32 nCount) { - ::rtl::OUString aResult; + OUString aResult; if (nCount > 0) { @@ -79,10 +79,10 @@ namespace ww8 if (nCount > nAvailable) nCount = nAvailable; #if defined OSL_LITENDIAN - aResult = rtl::OUString(reinterpret_cast<const sal_Unicode *>( + aResult = OUString(reinterpret_cast<const sal_Unicode *>( mp_data.get() + nStartOff), nCount); #else - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; for (sal_uInt32 i = 0; i < nCount; ++i) aBuf.append(static_cast<sal_Unicode>(getU16(nStartOff+i*2))); aResult = aBuf.makeStringAndClear(); diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 5cc79a5d7bca..b7187546d0fa 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -48,12 +48,12 @@ class WW8Struct : public ::sw::ExternalData sal_uInt32 getU32(sal_uInt32 nOffset) { return getU16(nOffset) + (getU16(nOffset + 1) << 16); } - ::rtl::OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount); + OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount); - ::rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount); + OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount); }; -typedef ::std::vector<rtl::OUString> StringVector_t; +typedef ::std::vector<OUString> StringVector_t; template <class T> class WW8Sttb : public WW8Struct { @@ -68,7 +68,7 @@ typedef ::std::vector<rtl::OUString> StringVector_t; virtual ~WW8Sttb(); sal_uInt32 getCount() const; - ::rtl::OUString getEntry(sal_uInt32 nEntry) const + OUString getEntry(sal_uInt32 nEntry) const { return m_Strings[nEntry]; } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1216829af07e..5f5934f156ca 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -120,7 +120,7 @@ using namespace ::com::sun::star; class FFDataWriterHelper { ::sax_fastparser::FSHelperPtr m_pSerializer; - void writeCommonStart( const rtl::OUString& rName ) + void writeCommonStart( const OUString& rName ) { m_pSerializer->startElementNS( XML_w, XML_ffData, FSEND ); m_pSerializer->singleElementNS( XML_w, XML_name, @@ -137,7 +137,7 @@ class FFDataWriterHelper } public: FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr pSerializer ) : m_pSerializer( pSerializer ){} - void WriteFormCheckbox( const rtl::OUString& rName, const rtl::OUString& rDefault, bool bChecked ) + void WriteFormCheckbox( const OUString& rName, const OUString& rDefault, bool bChecked ) { writeCommonStart( rName ); // Checkbox specific bits @@ -150,14 +150,14 @@ public: { m_pSerializer->singleElementNS( XML_w, XML_default, FSNS( XML_w, XML_val ), - rtl::OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); + OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); } if ( bChecked ) m_pSerializer->singleElementNS( XML_w, XML_checked, FSEND ); m_pSerializer->endElementNS( XML_w, XML_checkBox ); writeFinish(); } - void WriteFormText( const rtl::OUString& rName, const rtl::OUString& rDefault ) + void WriteFormText( const OUString& rName, const OUString& rDefault ) { writeCommonStart( rName ); if ( !rDefault.isEmpty() ) @@ -165,7 +165,7 @@ public: m_pSerializer->startElementNS( XML_w, XML_textInput, FSEND ); m_pSerializer->singleElementNS( XML_w, XML_default, FSNS( XML_w, XML_val ), - rtl::OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); + OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); m_pSerializer->endElementNS( XML_w, XML_textInput ); } writeFinish(); @@ -177,9 +177,9 @@ class FieldMarkParamsHelper const sw::mark::IFieldmark& mrFieldmark; public: FieldMarkParamsHelper( const sw::mark::IFieldmark& rFieldmark ) : mrFieldmark( rFieldmark ) {} - rtl::OUString getName() { return mrFieldmark.GetName(); } + OUString getName() { return mrFieldmark.GetName(); } template < typename T > - bool extractParam( const rtl::OUString& rKey, T& rResult ) + bool extractParam( const OUString& rKey, T& rResult ) { bool bResult = false; if ( mrFieldmark.GetParameters() ) @@ -706,8 +706,8 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) const ::sw::mark::IFieldmark& rFieldmark = *rInfos.pFieldmark; if ( rInfos.eType == ww::eFORMDROPDOWN ) { - uno::Sequence< ::rtl::OUString> vListEntries; - rtl::OUString sName, sHelp, sToolTip, sSelected; + uno::Sequence< OUString> vListEntries; + OUString sName, sHelp, sToolTip, sSelected; FieldMarkParamsHelper params( rFieldmark ); params.extractParam( ODF_FORMDROPDOWN_LISTENTRY, vListEntries ); @@ -724,7 +724,7 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) } else if ( rInfos.eType == ww::eFORMCHECKBOX ) { - rtl::OUString sName; + OUString sName; bool bChecked = false; FieldMarkParamsHelper params( rFieldmark ); @@ -735,13 +735,13 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) bChecked = true; FFDataWriterHelper ffdataOut( m_pSerializer ); - ffdataOut.WriteFormCheckbox( sName, rtl::OUString(), bChecked ); + ffdataOut.WriteFormCheckbox( sName, OUString(), bChecked ); } else if ( rInfos.eType == ww::eFORMTEXT ) { FieldMarkParamsHelper params( rFieldmark ); FFDataWriterHelper ffdataOut( m_pSerializer ); - ffdataOut.WriteFormText( params.getName(), rtl::OUString() ); + ffdataOut.WriteFormText( params.getName(), OUString() ); } } @@ -767,7 +767,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun ) if ( rInfos.pField ) { const SwDropDownField& rFld2 = *(SwDropDownField*)rInfos.pField; - uno::Sequence<rtl::OUString> aItems = + uno::Sequence<OUString> aItems = rFld2.GetItemSequence(); GetExport().DoComboBox(rFld2.GetName(), rFld2.GetHelp(), @@ -836,7 +836,7 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos ) // Replace tabs by </instrText><tab/><instrText> if ( i < ( nNbToken - 1 ) ) - RunText( rtl::OUString( "\t" ) ); + RunText( OUString( "\t" ) ); } m_pSerializer->endElementNS( XML_w, XML_r ); @@ -1285,7 +1285,7 @@ bool DocxAttributeOutput::StartURL( const String& rUrl, const String& rTarget ) { OUString osUrl( sUrl ); - OString sId = rtl::OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), + OString sId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", osUrl, true ), RTL_TEXTENCODING_UTF8 ); @@ -3671,7 +3671,7 @@ void DocxAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) void DocxAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) { m_pSerializer->singleElementNS( XML_w, XML_w, - FSNS( XML_w, XML_val ), rtl::OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND ); + FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND ); } void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief ) @@ -3774,9 +3774,9 @@ void DocxAttributeOutput::WritePostitFields() OString idstr = OString::valueOf( sal_Int32( i )); const SwPostItField* f = m_postitFields[ i ]; m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( XML_w, XML_id ), idstr.getStr(), - FSNS( XML_w, XML_author ), rtl::OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(), + FSNS( XML_w, XML_author ), OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(), FSNS( XML_w, XML_date ), msfilter::util::DateTimeToOString(f->GetDateTime()).getStr(), - FSNS( XML_w, XML_initials ), rtl::OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); + FSNS( XML_w, XML_initials ), OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); // Check for the text object existing, it seems that it can be NULL when saving a newly created // comment without giving focus back to the main document. As GetTxt() is empty in that case as well, // that is probably a bug in the Writer core. @@ -3934,7 +3934,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference() { // autonumbered m_pSerializer->singleElementNS( XML_w, nToken, - FSNS( XML_w, XML_id ), ::rtl::OString::valueOf( nId ).getStr(), + FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(), FSEND ); } else @@ -3942,7 +3942,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference() // not autonumbered m_pSerializer->singleElementNS( XML_w, nToken, FSNS( XML_w, XML_customMarkFollows ), "1", - FSNS( XML_w, XML_id ), ::rtl::OString::valueOf( nId ).getStr(), + FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(), FSEND ); RunText( pFootnote->GetNumStr() ); @@ -4050,7 +4050,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr fs->singleElementNS( XML_w, XML_numFmt, FSNS( XML_w, XML_val ), fmt, FSEND ); if( info.nFtnOffset != 0 ) fs->singleElementNS( XML_w, XML_numStart, FSNS( XML_w, XML_val ), - rtl::OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND ); + OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND ); if( listtag != 0 ) // we are writing to settings.xml, write also special footnote/endnote list { // there are currently only two hardcoded ones ( see FootnotesEndnotes()) fs->singleElementNS( XML_w, listtag, FSNS( XML_w, XML_id ), "0", FSEND ); diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 7c33d0764aae..050980eefc8b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -273,7 +273,7 @@ public: void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode ); void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark ); - void WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds ); + void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); private: /// Initialize the structures where we are going to collect some of the paragraph properties. @@ -589,8 +589,8 @@ private: sal_Int32 m_nNextMarkId; /// Bookmarks to output - std::vector<rtl::OString> m_rMarksStart; - std::vector<rtl::OString> m_rMarksEnd; + std::vector<OString> m_rMarksStart; + std::vector<OString> m_rMarksEnd; /// Is there a postit start to output? bool m_bPostitStart; @@ -598,7 +598,7 @@ private: bool m_bPostitEnd; /// Maps of the bookmarks ids - std::map<rtl::OString, sal_uInt16> m_rOpenedMarksIds; + std::map<OString, sal_uInt16> m_rOpenedMarksIds; /// The current table helper SwWriteTable *m_pTableWrt; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index e7bec6f95d61..b25b1eb86340 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -160,12 +160,12 @@ void DocxExport::ExportGrfBullet(const SwTxtNode&) CollectGrfsOfBullets(); } -::rtl::OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget ) +OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget ) { OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), rType, rTarget, true ); - return ::rtl::OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt ) @@ -240,11 +240,11 @@ void DocxExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark* #endif } -void DocxExport::DoComboBox(const rtl::OUString& rName, - const rtl::OUString& rHelp, - const rtl::OUString& rToolTip, - const rtl::OUString& rSelected, - uno::Sequence<rtl::OUString>& rListItems) +void DocxExport::DoComboBox(const OUString& rName, + const OUString& rHelp, + const OUString& rToolTip, + const OUString& rSelected, + uno::Sequence<OUString>& rListItems) { m_pDocumentFS->startElementNS( XML_w, XML_ffData, FSEND ); @@ -278,7 +278,7 @@ void DocxExport::DoComboBox(const rtl::OUString& rName, } m_pDocumentFS->singleElementNS( XML_w, XML_result, - FSNS( XML_w, XML_val ), rtl::OString::valueOf( nId ).getStr( ), + FSNS( XML_w, XML_val ), OString::valueOf( nId ).getStr( ), FSEND ); // Loop over the entries @@ -300,7 +300,7 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/) OSL_TRACE( "TODO DocxExport::ForFormText()" ); } -rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) +OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) { OUString aFileName = "charts/chart" + OUString::valueOf(nCount) + ".xml"; OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), @@ -314,7 +314,7 @@ rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, s oox::drawingml::ChartExport aChartExport( XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX ); aChartExport.ExportContent(); - return ::rtl::OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } void DocxExport::ExportDocument_Impl() @@ -634,7 +634,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* // and write the reference m_pDocumentFS->singleElementNS( XML_w, nReference, FSNS( XML_w, XML_type ), pType, - FSNS( XML_r, XML_id ), rtl::OUStringToOString( aRelId, RTL_TEXTENCODING_UTF8 ).getStr(), + FSNS( XML_r, XML_id ), OUStringToOString( aRelId, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); } @@ -700,7 +700,7 @@ void DocxExport::WriteSettings() FSEND ); // Zoom - rtl::OString aZoom(rtl::OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom()))); + OString aZoom(OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom()))); pFS->singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), aZoom.getStr(), FSEND); if( pDoc->get( IDocumentSettingAccess::EMBED_FONTS )) pFS->singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND ); @@ -708,7 +708,7 @@ void DocxExport::WriteSettings() pFS->singleElementNS( XML_w, XML_embedSystemFonts, FSEND ); if( settings.defaultTabStop != 0 ) pFS->singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val ), - rtl::OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND ); + OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND ); if( settings.evenAndOddHeaders ) pFS->singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND ); diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index ac5637d09469..d8790f8ba420 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -106,12 +106,12 @@ public: virtual void AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen ); - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); virtual void ExportGrfBullet(const SwTxtNode&); /// Returns the relationd id - rtl::OString AddRelation( const rtl::OUString& rType, const rtl::OUString& rTarget ); + OString AddRelation( const OUString& rType, const OUString& rTarget ); virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ } virtual void WriteChar( sal_Unicode ) { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); } @@ -131,18 +131,18 @@ public: virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence<rtl::OUString> &rListItems); + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence<OUString> &rListItems); virtual void DoFormText(const SwInputField * pFld); virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); /// Returns the relationd id - rtl::OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount ); + OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount ); void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); @@ -165,7 +165,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ); - virtual void OutputLinkedOLE( const rtl::OUString& ); + virtual void OutputLinkedOLE( const OUString& ); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 7f92fc6ff894..c18ea97a33eb 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -47,7 +47,7 @@ public: private: /// Implementatio of the filter abstract method. - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const { diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx index dad80d0ab2c5..189e4b17ed72 100644 --- a/sw/source/filter/ww8/hash_wrap.hxx +++ b/sw/source/filter/ww8/hash_wrap.hxx @@ -65,7 +65,7 @@ namespace ww } #if OSL_DEBUG_LEVEL > 1 bool bBroken=false; - rtl::OUString sError; + OUString sError; pIter = pWwSprmTab; const C *pBeforeEnd = pWwSprmTab + nNoElems - 1; while (pIter < pBeforeEnd) @@ -88,11 +88,11 @@ namespace ww reinterpret_cast<const sal_uInt8 *>(&(*pIter)); for (size_t i=0; i < nSize; ++i) { - sError += rtl::OUString::valueOf( + sError += OUString::valueOf( static_cast<sal_Int32>(pHack[i]), 16); - sError += rtl::OUString::valueOf(sal_Unicode(' ')); + sError += OUString::valueOf(sal_Unicode(' ')); } - sError += rtl::OUString::valueOf(sal_Unicode('\n')); + sError += OUString::valueOf(sal_Unicode('\n')); while (*pIter == *(pIter+1) && pIter < pBeforeEnd) ++pIter; } @@ -101,7 +101,7 @@ namespace ww } if (bBroken) { - OSL_FAIL( rtl::OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); } #endif } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 9636254b19a3..ce0c1e0f65cd 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1435,7 +1435,7 @@ void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eTyp m_aRunText->append("}}"); } -void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds ) +void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ) { for ( std::vector< OUString >::const_iterator it = rStarts.begin(), end = rStarts.end(); it != end; ++it ) { @@ -3273,7 +3273,7 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S static void lcl_AppendSP( OStringBuffer& rBuffer, const char cName[], - const ::rtl::OUString& rValue, + const OUString& rValue, const RtfExport& rExport ) { rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{" diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index fb40139341f4..5038f32787d2 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -73,8 +73,8 @@ public: virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); // Access to (anyway) private buffers, used by the sdr exporter - rtl::OStringBuffer& RunText(); - rtl::OStringBuffer& Styles(); + OStringBuffer& RunText(); + OStringBuffer& Styles(); /// Output text (without markup). virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); @@ -206,7 +206,7 @@ public: const SvxBrushItem* pBrush = 0);//For i120928,to export graphic of bullet void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode ); - void WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds ); + void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); void WriteHeaderFooter_Impl( const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg ); protected: @@ -456,20 +456,20 @@ private: /* * This is written after runs. */ - rtl::OStringBuffer m_aAfterRuns; + OStringBuffer m_aAfterRuns; /* * Same for colors and stylesheets: first we just want to output colors, * need to buffer the stylesheet table to output it after the color one. */ - rtl::OStringBuffer m_aStylesheet; + OStringBuffer m_aStylesheet; /* * This one just holds the style commands in the current style. */ - rtl::OStringBuffer m_aStyles; + OStringBuffer m_aStyles; /* * This is the same as m_aStyles but the conents of it is written last. */ - rtl::OStringBuffer m_aStylesEnd; + OStringBuffer m_aStylesEnd; /* * We just get a "end of strike" mark at the end of strike, store here what to finish: single or double strike. @@ -499,7 +499,7 @@ private: /* * For late output of row definitions. */ - rtl::OStringBuffer m_aRowDefs; + OStringBuffer m_aRowDefs; /* * Is a column break needed after the next \par? @@ -510,14 +510,14 @@ private: * If section breaks should be buffered to m_aSectionBreaks */ bool m_bBufferSectionBreaks; - rtl::OStringBuffer m_aSectionBreaks; + OStringBuffer m_aSectionBreaks; /* * If section headers (and footers) should be buffered to * m_aSectionHeaders. */ bool m_bBufferSectionHeaders; - rtl::OStringBuffer m_aSectionHeaders; + OStringBuffer m_aSectionHeaders; /* * Support for starting multiple tables at the same cell. @@ -528,7 +528,7 @@ private: * List of already started but not yet defined tables (need to be defined * after the nested tables). */ - std::vector< rtl::OString > m_aTables; + std::vector< OString > m_aTables; /* * If cell info is already output. */ @@ -560,7 +560,7 @@ public: /// Return the right export class. virtual MSWordExportBase& GetExport(); - rtl::OStringBuffer m_aTabStop; + OStringBuffer m_aTabStop; /// Access to the page style of the previous paragraph. const SwPageDesc* m_pPrevPageDesc; @@ -585,7 +585,7 @@ public: void FontPitchType( FontPitch ePitch ) const; /// Writes binary data as a hex dump. - static rtl::OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64); + static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64); }; #endif // _RTFATTRIBUTEOUTPUT_HXX_ diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 3f413a5293a2..cb769c77ec04 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -317,11 +317,11 @@ void RtfExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC); } -void RtfExport::DoComboBox(const rtl::OUString& /*rName*/, - const rtl::OUString& /*rHelp*/, - const rtl::OUString& /*rToolTip*/, - const rtl::OUString& /*rSelected*/, - uno::Sequence<rtl::OUString>& /*rListItems*/) +void RtfExport::DoComboBox(const OUString& /*rName*/, + const OUString& /*rHelp*/, + const OUString& /*rToolTip*/, + const OUString& /*rSelected*/, + uno::Sequence<OUString>& /*rListItems*/) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); @@ -332,10 +332,10 @@ void RtfExport::DoFormText(const SwInputField* pFld ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); - ::rtl::OUString sResult = pFld->ExpandField(true); - ::rtl::OUString sHelp( pFld->GetHelp() ); - ::rtl::OUString sName = pFld->GetPar2(); - ::rtl::OUString sStatus = pFld->GetToolTip(); + OUString sResult = pFld->ExpandField(true); + OUString sHelp( pFld->GetHelp() ); + OUString sName = pFld->GetPar2(); + OUString sStatus = pFld->GetToolTip(); m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST "{ FORMTEXT }"); m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD " {" OOO_STRING_SVTOOLS_RTF_FFTYPE "0" ); if( !sHelp.isEmpty() ) @@ -739,7 +739,7 @@ void RtfExport::OutputOLENode( const SwOLENode& ) /* noop, see RtfAttributeOutput::FlyFrameOLE */ } -void RtfExport::OutputLinkedOLE( const rtl::OUString& ) +void RtfExport::OutputLinkedOLE( const OUString& ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); } diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index e071e5c621f2..4f4f24e78e41 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -26,7 +26,7 @@ class RtfAttributeOutput; class RtfExportFilter; class RtfSdrExport; typedef std::map<sal_uInt16,Color> RtfColorTbl; -typedef std::map<sal_uInt16,rtl::OString> RtfStyleTbl; +typedef std::map<sal_uInt16,OString> RtfStyleTbl; typedef std::map<String,sal_uInt16> RtfRedlineTbl; class SwNode; class SwTxtNode; @@ -71,7 +71,7 @@ public: virtual void AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen ); - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); //For i120928,add an interface to export graphic of bullet virtual void ExportGrfBullet(const SwTxtNode& rNd); @@ -97,11 +97,11 @@ public: virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence<rtl::OUString> &rListItems); + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence<OUString> &rListItems); virtual void DoFormText(const SwInputField * pFld); @@ -131,7 +131,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ); - virtual void OutputLinkedOLE(const rtl::OUString&); + virtual void OutputLinkedOLE(const OUString&); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); @@ -169,8 +169,8 @@ public: sal_uInt16 GetRedline( const String& rAuthor ); const String* GetRedline( sal_uInt16 nId ); - void InsStyle( sal_uInt16 nId, const rtl::OString& rStyle ); - rtl::OString* GetStyle( sal_uInt16 nId ); + void InsStyle( sal_uInt16 nId, const OString& rStyle ); + OString* GetStyle( sal_uInt16 nId ); private: /// No copying. diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index db8b2df2e7a1..212adb2a6a43 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -61,8 +61,8 @@ public: RtfWriter m_aWriter; }; -::rtl::OUString RtfExport_getImplementationName(); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL RtfExport_getSupportedServiceNames() +OUString RtfExport_getImplementationName(); +::com::sun::star::uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL RtfExport_createInstance( const ::com::sun::star::uno::Reference< diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index b21f671c7f2a..bb1d1a02c7e1 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -411,7 +411,7 @@ void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle ) m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(rRectangle.Bottom()); } -void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ) +void RtfSdrExport::AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); @@ -426,7 +426,7 @@ void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Re extern const char* pShapeTypes[]; -static void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::rtl::OString& rValue) +static void lcl_AppendSP( OStringBuffer& rRunText, const char cName[], const OString& rValue) { rRunText.append('{').append(OOO_STRING_SVTOOLS_RTF_SP) .append('{').append(OOO_STRING_SVTOOLS_RTF_SN " ").append(cName).append('}') diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index edf5a7d92e38..2e8d2dd52fe7 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -45,9 +45,9 @@ class RtfSdrExport : public EscherEx sal_uInt32 m_nShapeFlags; /// Remember style, the most important shape attribute ;-) - rtl::OStringBuffer *m_pShapeStyle; + OStringBuffer *m_pShapeStyle; - std::map<rtl::OString,rtl::OString> m_aShapeProps; + std::map<OString,OString> m_aShapeProps; /// Remember which shape types we had already written. bool *m_pShapeTypeWritten; @@ -91,7 +91,7 @@ private: void AddLineDimensions( const Rectangle& rRectangle ); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ); + void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle ); void WriteOutliner(const OutlinerParaObject& rParaObj); diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx index 13546db0d40a..91d3c6170466 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.cxx +++ b/sw/source/filter/ww8/rtfstringbuffer.cxx @@ -50,7 +50,7 @@ void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutp pAttributeOutput->FlyFrameGraphic(m_pFlyFrmFmt, m_pGrfNode); } -rtl::OString RtfStringBufferValue::makeStringAndClear() +OString RtfStringBufferValue::makeStringAndClear() { return m_aBuffer.makeStringAndClear(); } @@ -80,23 +80,23 @@ void RtfStringBuffer::makeStringAndClear(RtfAttributeOutput* pAttributeOutput) i->makeStringAndClear(pAttributeOutput); } -rtl::OString RtfStringBuffer::makeStringAndClear() +OString RtfStringBuffer::makeStringAndClear() { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; for (RtfStringBuffer::Values_t::iterator i = m_aValues.begin(); i != m_aValues.end(); ++i) if (!i->isGraphic()) aBuf.append(i->makeStringAndClear()); return aBuf.makeStringAndClear(); } -rtl::OStringBuffer& RtfStringBuffer::getLastBuffer() +OStringBuffer& RtfStringBuffer::getLastBuffer() { if (m_aValues.empty() || m_aValues.back().isGraphic()) m_aValues.push_back(RtfStringBufferValue()); return m_aValues.back().m_aBuffer; } -rtl::OStringBuffer* RtfStringBuffer::operator->() +OStringBuffer* RtfStringBuffer::operator->() { return &getLastBuffer(); } diff --git a/sw/source/filter/ww8/rtfstringbuffer.hxx b/sw/source/filter/ww8/rtfstringbuffer.hxx index a6a8a8a35737..b0fc2a152f09 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.hxx +++ b/sw/source/filter/ww8/rtfstringbuffer.hxx @@ -46,10 +46,10 @@ public: /// This version handles graphics. void makeStringAndClear(RtfAttributeOutput* pAttributeOutput); /// This one doesn't. - rtl::OString makeStringAndClear(); + OString makeStringAndClear(); bool isGraphic() const; - rtl::OStringBuffer m_aBuffer; + OStringBuffer m_aBuffer; const SwFlyFrmFmt* m_pFlyFrmFmt; const SwGrfNode* m_pGrfNode; }; @@ -64,10 +64,10 @@ public: /// Writes the contents of the buffer directly to the supplied stream. void makeStringAndClear(RtfAttributeOutput* pAttributeOutput); /// Returns the bufferent strings as a string (ignores graphic elements!) - rtl::OString makeStringAndClear(); + OString makeStringAndClear(); /// Access to the last buffer. - rtl::OStringBuffer& getLastBuffer(); - rtl::OStringBuffer* operator->(); + OStringBuffer& getLastBuffer(); + OStringBuffer* operator->(); /// Similar to ->setLength(0), but for all buffers. void clear(); /// Same as ->append(), but for graphics and without expanding contents to save memory. diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index f57cb6c17397..9a596edac533 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -62,7 +62,7 @@ namespace ww std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems); #if OSL_DEBUG_LEVEL > 1 bool bBroken=false; - rtl::OUString sError; + OUString sError; const C *pIter = mpWwSprmTab; const C *pBeforeEnd = mpWwSprmTab + mnNoElems - 1; while (pIter < pBeforeEnd) @@ -85,11 +85,11 @@ namespace ww reinterpret_cast<const sal_uInt8 *>(&(*pIter)); for (size_t i=0; i < nSize; ++i) { - sError += rtl::OUString::valueOf( + sError += OUString::valueOf( static_cast<sal_Int32>(pHack[i]), 16); - sError += rtl::OUString::valueOf(sal_Unicode(' ')); + sError += OUString::valueOf(sal_Unicode(' ')); } - sError += rtl::OUString::valueOf(sal_Unicode('\n')); + sError += OUString::valueOf(sal_Unicode('\n')); while (*pIter == *(pIter+1) && pIter < pBeforeEnd) ++pIter; } @@ -98,7 +98,7 @@ namespace ww } if (bBroken) { - OSL_FAIL( rtl::OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); } #endif } diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 5c9e6ec42b1a..d903255a557c 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -295,7 +295,7 @@ namespace sw rObj.AbandonObject(); } - bool DrawingOLEAdaptor::TransferToDoc( rtl::OUString &rName ) + bool DrawingOLEAdaptor::TransferToDoc( OUString &rName ) { OSL_ENSURE(mxIPRef.is(), "Transferring invalid object to doc"); if (!mxIPRef.is()) @@ -312,7 +312,7 @@ namespace sw ::svt::EmbeddedObjectRef::SetGraphicToContainer( *mpGraphic, mrPers.GetEmbeddedObjectContainer(), rName, - rtl::OUString() ); + OUString() ); mxIPRef = 0; } @@ -473,7 +473,7 @@ namespace sw return aStyles; } - SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const rtl::OUString& rName) + SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName) { // Search first in the Doc-Styles SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName(rName); @@ -488,7 +488,7 @@ namespace sw return pColl; } - SwCharFmt* GetCharStyle(SwDoc &rDoc, const rtl::OUString& rName) + SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName) { SwCharFmt *pFmt = rDoc.FindCharFmtByName(rName); if (!pFmt) @@ -661,10 +661,10 @@ namespace sw } } - bool IsStarSymbol(const rtl::OUString &rFontName) + bool IsStarSymbol(const OUString &rFontName) { sal_Int32 nIndex = 0; - rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex)); + OUString sFamilyNm(GetNextFontToken(rFontName, nIndex)); return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") || sFamilyNm.equalsIgnoreAsciiCase("opensymbol")); } @@ -785,10 +785,10 @@ namespace sw std::for_each(maStack.begin(), maStack.end(), SetInDocAndDelete(mrDoc)); } - sal_uInt16 WrtRedlineAuthor::AddName( const rtl::OUString& rNm ) + sal_uInt16 WrtRedlineAuthor::AddName( const OUString& rNm ) { sal_uInt16 nRet; - typedef std::vector<rtl::OUString>::iterator myiter; + typedef std::vector<OUString>::iterator myiter; myiter aIter = std::find(maAuthors.begin(), maAuthors.end(), rNm); if (aIter != maAuthors.end()) nRet = static_cast< sal_uInt16 >(aIter - maAuthors.begin()); diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 4768a3efde7e..059299b66f3f 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -530,7 +530,7 @@ namespace sw @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ - SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const rtl::OUString& rName); + SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName); /** Get a Character Style which fits a given name @@ -548,7 +548,7 @@ namespace sw @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ - SwCharFmt* GetCharStyle(SwDoc &rDoc, const rtl::OUString& rName); + SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName); /** Sort sequence of Paragraph Styles by assigned outline style list level @@ -757,7 +757,7 @@ namespace sw @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ - bool IsStarSymbol(const rtl::OUString &rFontName); + bool IsStarSymbol(const OUString &rFontName); /** Make setting a drawing object's layer in a Writer document easy @@ -889,7 +889,7 @@ namespace sw class DrawingOLEAdaptor { private: - rtl::OUString msOrigPersistName; + OUString msOrigPersistName; com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef; SfxObjectShell& mrPers; const Graphic* mpGraphic; @@ -923,7 +923,7 @@ namespace sw @return On success true is returned, otherwise false. On success rName is then suitable for user with SwDoc::InsertOLE */ - bool TransferToDoc(rtl::OUString &rName); + bool TransferToDoc(OUString &rName); private: /// No assigning allowed DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&); diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 93d892ccf34e..bcb1253490bf 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -758,10 +758,10 @@ namespace sw // Force to NatNum when finding one of 'oOA' String sOldParams( rParams ); - rParams.SearchAndReplaceAll( rtl::OUString( "o" ), - rtl::OUString( "m" ) ); - rParams.SearchAndReplaceAll( rtl::OUString( "O" ), - rtl::OUString( "M" ) ); + rParams.SearchAndReplaceAll( OUString( "o" ), + OUString( "m" ) ); + rParams.SearchAndReplaceAll( OUString( "O" ), + OUString( "M" ) ); bool bForceNatNum = !sOldParams.Equals( rParams ); if (LANGUAGE_FRENCH != nDocLang) { @@ -811,7 +811,7 @@ namespace sw // But not if it's a '/' inside AM/PM if (!(IsPreviousAM(rParams, nI) && IsNextPM(rParams, nI))) { - rParams.Replace(nI, 1, rtl::OUString("\\/")); + rParams.Replace(nI, 1, OUString("\\/")); } nI++; nLen++; @@ -942,10 +942,10 @@ namespace sw rLang = LANGUAGE_JAPANESE; if (bForceNatNum) - rParams.Insert(rtl::OUString("[NatNum1][$-411]"),0); + rParams.Insert(OUString("[NatNum1][$-411]"),0); if (bHijri) - rParams.Insert(rtl::OUString("[~hijri]"), 0); + rParams.Insert(OUString("[~hijri]"), 0); OUString sTemp(rParams); pFormatter->PutEntry(sTemp, nCheckPos, nType, nKey, rLang); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index a39f12ff86a1..f0c655d05f0e 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -181,34 +181,34 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt) void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) { - rtl::OUString sSelected; - uno::Sequence<rtl::OUString> aListItems; + OUString sSelected; + uno::Sequence<OUString> aListItems; xPropSet->getPropertyValue("StringItemList") >>= aListItems; sal_Int32 nNoStrings = aListItems.getLength(); if (nNoStrings) { uno::Any aTmp = xPropSet->getPropertyValue("DefaultText"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sSelected = *pStr; } - rtl::OUString sName; + OUString sName; { uno::Any aTmp = xPropSet->getPropertyValue("Name"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sName = *pStr; } - rtl::OUString sHelp; + OUString sHelp; { // property "Help" does not exist and due to the no-existence an exception is thrown. try { uno::Any aTmp = xPropSet->getPropertyValue("HelpText"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sHelp = *pStr; } @@ -216,10 +216,10 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) {} } - rtl::OUString sToolTip; + OUString sToolTip; { uno::Any aTmp = xPropSet->getPropertyValue("Name"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sToolTip = *pStr; } @@ -227,11 +227,11 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) DoComboBox(sName, sHelp, sToolTip, sSelected, aListItems); } -void WW8Export::DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &rToolTip, - const rtl::OUString &rSelected, - uno::Sequence<rtl::OUString> &rListItems) +void WW8Export::DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &rToolTip, + const OUString &rSelected, + uno::Sequence<OUString> &rListItems) { OSL_ENSURE(bWrtWW8, "Not allowed"); if (!bWrtWW8) @@ -315,21 +315,21 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet) xPropSet->getPropertyValue("State") >>= nTemp; aFFData.setResult(nTemp); - ::rtl::OUString aStr; - static ::rtl::OUString sName("Name"); + OUString aStr; + static OUString sName("Name"); if (xPropSetInfo->hasPropertyByName(sName)) { xPropSet->getPropertyValue(sName) >>= aStr; aFFData.setName(aStr); } - static ::rtl::OUString sHelpText("HelpText"); + static OUString sHelpText("HelpText"); if (xPropSetInfo->hasPropertyByName(sHelpText)) { xPropSet->getPropertyValue(sHelpText) >>= aStr; aFFData.setHelp(aStr); } - static ::rtl::OUString sHelpF1Text("HelpF1Text"); + static OUString sHelpF1Text("HelpF1Text"); if (xPropSetInfo->hasPropertyByName(sHelpF1Text)) { xPropSet->getPropertyValue(sHelpF1Text) >>= aStr; @@ -1422,7 +1422,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh Graphic aGraphic(pGrfNd->GetGrf()); GraphicObject aGraphicObject( aGraphic ); - rtl::OString aUniqueId = aGraphicObject.GetUniqueID(); + OString aUniqueId = aGraphicObject.GetUniqueID(); if (!aUniqueId.isEmpty()) { @@ -1631,7 +1631,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, sal_uInt32 nOpaque = 0; if (const GraphicObject *pGraphicObject = rBrush.GetGraphicObject()) { - rtl::OString aUniqueId = pGraphicObject->GetUniqueID(); + OString aUniqueId = pGraphicObject->GetUniqueID(); if (!aUniqueId.isEmpty()) { const Graphic &rGraphic = pGraphicObject->GetGraphic(); @@ -2731,7 +2731,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, AddShape(ESCHER_ShpInst_PictureFrame, nShapeFlags, nShapeId); GraphicObject aGraphicObject(rGraphic); - rtl::OString aId = aGraphicObject.GetUniqueID(); + OString aId = aGraphicObject.GetUniqueID(); if (!aId.isEmpty()) { Rectangle aRect = rObj.GetLogicRect(); @@ -2882,11 +2882,11 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb //Open the ObjectPool SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage( - rtl::OUString(SL::aObjectPool), STREAM_READWRITE | + OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL); //Create a destination storage for the microsoft control - rtl::OUStringBuffer sStorageName; + OUStringBuffer sStorageName; sal_uInt32 nObjId = GenerateObjectID(); sStorageName.append('_').append( static_cast<sal_Int64>( nObjId )); SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(), @@ -2896,7 +2896,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb return false; - rtl::OUString sUName; + OUString sUName; if (!WriteOCXStream( mxModel, xOleStg,xControlModel,aSize,sUName)) return false; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index d04de434c5bf..eeaab4845dca 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -110,17 +110,17 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) { if ( !pFieldmark) { return String(); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) { - return rtl::OUString(" FORMTEXT "); + return OUString(" FORMTEXT "); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) { - return rtl::OUString(" FORMDROPDOWN "); + return OUString(" FORMDROPDOWN "); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) { - return rtl::OUString(" FORMCHECKBOX "); + return OUString(" FORMCHECKBOX "); } else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) { - return rtl::OUString(" TOC "); + return OUString(" TOC "); } else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) { - return rtl::OUString(" HYPERLINK "); + return OUString(" HYPERLINK "); } else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) { - return rtl::OUString(" PAGEREF "); + return OUString(" PAGEREF "); } else { return pFieldmark->GetFieldname(); } @@ -1845,7 +1845,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_ID_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sFieldId; + OUString sFieldId; it->second >>= sFieldId; eFieldId = (ww::eField)sFieldId.toInt32(); } @@ -1853,7 +1853,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) it = pFieldmark->GetParameters()->find( ODF_CODE_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sOUCode; + OUString sOUCode; it->second >>= sOUCode; sCode = sOUCode; } @@ -1878,7 +1878,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_OLE_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sOleId; + OUString sOleId; uno::Any aValue = it->second; aValue >>= sOleId; if ( !sOleId.isEmpty() ) @@ -1899,7 +1899,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_ID_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sFieldId; + OUString sFieldId; it->second >>= sFieldId; eFieldId = (ww::eField)sFieldId.toInt32(); } diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 628cb41c525b..eb1cf9d08249 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -45,7 +45,7 @@ using namespace sw::util; sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8 nLevel, sal_uInt16 nVal ) { sal_uInt16 nNumId = USHRT_MAX; - String sPrefix(rtl::OUString("WW8TempExport")); + String sPrefix(OUString("WW8TempExport")); sPrefix += OUString::number( nUniqueList++ ); SwNumRule* pMyNumRule = new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ), @@ -637,7 +637,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh, const Font& rFont = rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : numfunc::GetDefBulletFont(); - String sNumStr = rtl::OUString(rFmt.GetBulletChar()); + String sNumStr = OUString(rFmt.GetBulletChar()); rtl_TextEncoding eChrSet = rFont.GetCharSet(); String sFontName = rFont.GetName(); @@ -673,7 +673,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh, *rpCh = static_cast< sal_uInt8 >(cChar - 0xF000); } else - *rpCh = rtl::OUStringToOString(rtl::OUString(cChar), eChrSet).toChar(); + *rpCh = OUStringToOString(OUString(cChar), eChrSet).toChar(); } rpCh++; rCharLen--; @@ -698,7 +698,7 @@ void MSWordExportBase::SubstituteBullet( String& rNumStr, { if (!bSubstituteBullets) return; - rtl::OUString sFontName = rFontName; + OUString sFontName = rFontName; rNumStr.SetChar(0, msfilter::util::bestFitOpenSymbolToMSFont(rNumStr.GetChar(0), rChrSet, sFontName, !SupportsUnicode())); rFontName = sFontName; diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3be4c6718100..f8493cfc9415 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -527,7 +527,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos ) String aName = pFmt->GetName(); if ( aName.EqualsAscii( "Default" ) ) - aName = rtl::OUString("Normal"); + aName = OUString("Normal"); m_rExport.AttrOutput().StartStyle( aName, bFmtColl, nBase, nWwNext, GetWWId( *pFmt ), nPos, @@ -766,13 +766,13 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc) { mbWrtWW8 = bWrtWW8; - GetId(wwFont(rtl::OUString("Times New Roman"), PITCH_VARIABLE, + GetId(wwFont(OUString("Times New Roman"), PITCH_VARIABLE, FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252,bWrtWW8)); - GetId(wwFont(rtl::OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN, + GetId(wwFont(OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN, RTL_TEXTENCODING_SYMBOL,bWrtWW8)); - GetId(wwFont(rtl::OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS, + GetId(wwFont(OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS, RTL_TEXTENCODING_MS_1252,bWrtWW8)); const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT); @@ -2049,7 +2049,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, // Additional paragraph containing a space to // assure that by WW created RTF from written WW8 // does not crash WW. - rWrt.WriteStringAsPara( rtl::OUString(" ") ); + rWrt.WriteStringAsPara( OUString(" ") ); } } } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 86e3f5757374..2cdc3cbd975c 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -212,8 +212,8 @@ public: #define ANZ_DEFAULT_STYLES 16 // Names of the storage streams -#define sMainStream rtl::OUString("WordDocument") -#define sCompObj rtl::OUString("\1CompObj") +#define sMainStream OUString("WordDocument") +#define sCompObj OUString("\1CompObj") static void WriteDop( WW8Export& rWrt ) { @@ -339,7 +339,7 @@ const sal_Unicode *WW8DopTypography::GetJapanNotEndLevel1() return &aJapanNotEndLevel1[0]; } -static int lcl_CmpBeginEndChars( const rtl::OUString& rSWStr, +static int lcl_CmpBeginEndChars( const OUString& rSWStr, const sal_Unicode* pMSStr, int nMSStrByteLen ) { nMSStrByteLen /= sizeof( sal_Unicode ); @@ -1275,7 +1275,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt ) std::sort(aBookmarks.begin(), aBookmarks.end()); // First write the Bookmark Name Stringtable - std::vector<rtl::OUString> aNames; + std::vector<OUString> aNames; aNames.reserve(aBookmarks.size()); for (BkmIter bIt = aBookmarks.begin(); bIt < aBookmarks.end(); ++bIt) aNames.push_back(bIt->name); @@ -1399,7 +1399,7 @@ void WW8Export::MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo) pBkmks->MoveFieldMarks(nFrom, nTo); } -void WW8Export::AppendBookmark( const rtl::OUString& rName, bool bSkip ) +void WW8Export::AppendBookmark( const OUString& rName, bool bSkip ) { sal_uLong nSttCP = Fc2Cp( Strm().Tell() ) + ( bSkip? 1: 0 ); pBkmks->Append( nSttCP, rName ); @@ -1544,14 +1544,14 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId ) if( !pRedlAuthors ) { pRedlAuthors = new WW8_WrtRedlineAuthor; - pRedlAuthors->AddName(rtl::OUString("Unknown")); + pRedlAuthors->AddName(OUString("Unknown")); } return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) ); } //-------------------------------------------------------------------------- -void WW8Export::WriteAsStringTable(const std::vector<rtl::OUString>& rStrings, +void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen) { sal_uInt16 n, nCount = static_cast< sal_uInt16 >(rStrings.size()); @@ -1579,7 +1579,7 @@ void WW8Export::WriteAsStringTable(const std::vector<rtl::OUString>& rStrings, SwWW8Writer::WriteShort( rStrm, 0 ); for( n = 0; n < nCount; ++n ) { - const rtl::OUString &rString = rStrings[n]; + const OUString &rString = rStrings[n]; const String aNm(rString.copy(0, std::min<sal_Int32>(rString.getLength(), 255))); rStrm << (sal_uInt8)aNm.Len(); SwWW8Writer::WriteString8(rStrm, aNm, false, @@ -1640,7 +1640,7 @@ void SwWW8Writer::InsAsString16(ww::bytes &rO, const String& rStr) void SwWW8Writer::InsAsString8(ww::bytes &rO, const String& rStr, rtl_TextEncoding eCodeSet) { - rtl::OString sTmp(rtl::OUStringToOString(rStr, eCodeSet)); + OString sTmp(OUStringToOString(rStr, eCodeSet)); const sal_Char *pStart = sTmp.getStr(); const sal_Char *pEnd = pStart + sTmp.getLength(); rO.reserve(rO.size() + sTmp.getLength()); @@ -2681,7 +2681,7 @@ void WW8Export::WriteFkpPlcUsw() some magic. cmc */ /* Similiarly having msvbasic storage seems to also trigger creating this stream */ - GetWriter().GetStorage().OpenSotStorage(rtl::OUString(SL::aObjectPool), + GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL); } @@ -2716,7 +2716,7 @@ void WW8Export::WriteFkpPlcUsw() if ( pSttbfAssoc ) // #i106057# { - ::std::vector<rtl::OUString> aStrings; + ::std::vector<OUString> aStrings; ::ww8::StringVector_t & aSttbStrings = pSttbfAssoc->getStrings(); ::ww8::StringVector_t::const_iterator aItEnd = aSttbStrings.end(); @@ -3017,9 +3017,9 @@ void WW8Export::ExportDocument_Impl() if( bWrtWW8 ) { pFib->fWhichTblStm = 1; - xTableStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::a1Table), + xTableStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::a1Table), STREAM_STD_WRITE ); - xDataStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::aData), + xDataStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::aData), STREAM_STD_WRITE ); xDataStrm->SetBufferSize( 32768 ); // for graphics @@ -3196,7 +3196,7 @@ void WW8Export::ExportDocument_Impl() { xDataStrm.Clear(); pDataStrm = 0; - GetWriter().GetStorage().Remove(rtl::OUString(SL::aData)); + GetWriter().GetStorage().Remove(OUString(SL::aData)); } } } @@ -3263,7 +3263,7 @@ void WW8Export::PrepareStorage() SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ); - GetWriter().GetStorage().SetClass( aGName, 0, rtl::OUString::createFromAscii( pName )); + GetWriter().GetStorage().SetClass( aGName, 0, OUString::createFromAscii( pName )); SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) ); xStor->Write( pData, nLen ); @@ -3493,7 +3493,7 @@ void WW8Export::RestoreMacroCmds() try { uno::Reference < io::XStream > xSrcStream = - xSrcRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READ ); + xSrcRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READ ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xSrcStream ); if ( pStream && SVSTREAM_OK == pStream->GetError()) @@ -3552,7 +3552,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) type=2; ::sw::mark::IFieldmark::parameter_map_t::const_iterator pNameParameter = rFieldmark.GetParameters()->find("name"); - ::rtl::OUString ffname; + OUString ffname; if(pNameParameter != rFieldmark.GetParameters()->end()) pNameParameter->second >>= ffname; @@ -3599,7 +3599,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) } aFldHeader.bits |= ( (ffres<<2) & 0x7C ); - std::vector< ::rtl::OUString > aListItems; + std::vector< OUString > aListItems; if (type==2) { aFldHeader.bits |= 0x8000; // ffhaslistbox @@ -3607,18 +3607,18 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) ::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY); if(pListEntries != pParameters->end()) { - uno::Sequence< ::rtl::OUString > vListEntries; + uno::Sequence< OUString > vListEntries; pListEntries->second >>= vListEntries; copy(::comphelper::stl_begin(vListEntries), ::comphelper::stl_end(vListEntries), back_inserter(aListItems)); } } - const ::rtl::OUString ffdeftext; - const ::rtl::OUString ffformat; - const ::rtl::OUString ffhelptext; - const ::rtl::OUString ffstattext; - const ::rtl::OUString ffentrymcr; - const ::rtl::OUString ffexitmcr; + const OUString ffdeftext; + const OUString ffformat; + const OUString ffhelptext; + const OUString ffstattext; + const OUString ffentrymcr; + const OUString ffexitmcr; const sal_uInt8 aFldData[] = @@ -3648,7 +3648,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) slen += 4; // for num of list items const int items = aListItems.size(); for( int i = 0; i < items; i++ ) { - rtl::OUString item = aListItems[i]; + OUString item = aListItems[i]; slen += 2 * item.getLength() + 2; } } @@ -3679,7 +3679,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) const int items=aListItems.size(); *pDataStrm<<(sal_uInt32)items; for(int i=0;i<items;i++) { - rtl::OUString item=aListItems[i]; + OUString item=aListItems[i]; SwWW8Writer::WriteString_xstz( *pDataStrm, item, false ); } } diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 862854575a98..6e061bca486f 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -294,7 +294,7 @@ public: bool Write( SvStream *pTableStram ) const; void WriteDocx( DocxAttributeOutput* rAttrOutput ) const; void WriteRtf( const RtfAttributeOutput* rAttrOutput ) const; - rtl::OUString GetFamilyName() const { return rtl::OUString( msFamilyNm ); } + OUString GetFamilyName() const { return OUString( msFamilyNm ); } friend bool operator < (const wwFont &r1, const wwFont &r2); }; @@ -593,10 +593,10 @@ public: const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const; /// Find the reference. - bool HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ); + bool HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo ); /// Find the bookmark name. - String GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ); + String GetBookmarkName( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo ); /// Add a bookmark converted to a Word name. void AppendWordBookmark( const String& rName ); @@ -645,7 +645,7 @@ public: virtual void AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen ) = 0; - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ) = 0; + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) = 0; //For i120928,add this interface to export graphic of bullet virtual void ExportGrfBullet(const SwTxtNode& rNd) = 0; @@ -730,11 +730,11 @@ public: virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) = 0; virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) = 0; - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence<rtl::OUString> &rListItems) = 0; + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence<OUString> &rListItems) = 0; virtual void DoFormText(const SwInputField * pFld) = 0; @@ -798,7 +798,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ) = 0; - virtual void OutputLinkedOLE( const rtl::OUString& ) = 0; + virtual void OutputLinkedOLE( const OUString& ) = 0; /// Output SwSectionNode @@ -1009,14 +1009,14 @@ public: SvStorageRef xObjStg, String &rStorageName, SwOLENode *pOLENd); virtual void AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen ); - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); virtual void ExportGrfBullet(const SwTxtNode& rNd); void OutGrfBullets(const sw::Frame &rFrame); void MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo); - void WriteAsStringTable(const ::std::vector<rtl::OUString>&, sal_Int32& rfcSttbf, + void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0); virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); @@ -1089,11 +1089,11 @@ public: bool bIsWW8 ); virtual ~WW8Export(); - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence<rtl::OUString> &rListItems); + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence<OUString> &rListItems); virtual void DoFormText(const SwInputField * pFld); @@ -1127,7 +1127,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ); - virtual void OutputLinkedOLE( const rtl::OUString& ); + virtual void OutputLinkedOLE( const OUString& ); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 67d5c9ac0825..61632d5f20ef 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -225,7 +225,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well. SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage( - rtl::OUString(SL::aObjectPool), STREAM_READWRITE | + OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL ); if( xObjStg.Is() ) @@ -245,7 +245,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) bool bIsNotDuplicate = aRes.second; //.second is false when element already existed nPictureId = aRes.first->second; Set_UInt32(pDataAdr, nPictureId); - String sStorageName = rtl::OUString('_'); + String sStorageName = OUString('_'); sStorageName += OUString::number( nPictureId ); SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName, STREAM_READWRITE| STREAM_SHARE_DENYALL ); @@ -262,7 +262,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) GetOLEExp().ExportOLEObject( aObjRef, *xOleStg ); if ( nAspect == embed::Aspects::MSOLE_ICON ) { - ::rtl::OUString aObjInfo( "\3ObjInfo" ); + OUString aObjInfo( "\3ObjInfo" ); if ( !xOleStg->IsStream( aObjInfo ) ) { const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 }; @@ -338,14 +338,14 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) } } -void WW8Export::OutputLinkedOLE( const rtl::OUString& rOleId ) +void WW8Export::OutputLinkedOLE( const OUString& rOleId ) { uno::Reference< embed::XStorage > xDocStg = pDoc->GetDocStorage(); uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( "OLELinks", embed::ElementModes::READ ); SotStorageRef xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, STREAM_READ ); SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage( - rtl::OUString(SL::aObjectPool), STREAM_READWRITE | + OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL ); if( xObjStg.Is() && xObjSrc.Is() ) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 0b18e29c7884..7c8560c9e1d4 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -833,7 +833,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF pOutFmtNode = pOldMod; } -bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) +bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo ) { const SwTxtNode* pNd; @@ -869,7 +869,7 @@ bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pNa return false; } -String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) +String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo ) { String sRet; switch ( nTyp ) @@ -1908,7 +1908,7 @@ void WW8Export::StartCommentOutput(const String& rName) void WW8Export::EndCommentOutput(const String& rName) { - String sStr(rtl::OUString(" [")); + String sStr(OUString(" [")); sStr += rName; sStr.AppendAscii("] "); OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_CMD_END | WRITEFIELD_END | @@ -2469,7 +2469,7 @@ bool WW8AttributeOutput::DropdownField( const SwField* pFld ) if ( m_rWW8Export.bWrtWW8 ) { const SwDropDownField& rFld2 = *(SwDropDownField*)pFld; - uno::Sequence<rtl::OUString> aItems = + uno::Sequence<OUString> aItems = rFld2.GetItemSequence(); GetExport().DoComboBox(rFld2.GetName(), rFld2.GetHelp(), diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 365087437109..b40813e274cc 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -43,7 +43,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion, if (aWwFib.nFibBack >= 0x6A) //Word97 { - xTableStream = pStg->OpenSotStream(rtl::OUString::createFromAscii( + xTableStream = pStg->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) @@ -158,7 +158,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, while( (sal_uInt16)-1 != nCurPos ) { sShortcut.Erase( nLen ) += - rtl::OUString::valueOf(++nStart); // add an Number to it + OUString::valueOf(++nStart); // add an Number to it nCurPos = rBlocks.GetIndex( sShortcut ); } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 21b705875c8d..11a2b3dd1df1 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -150,7 +150,7 @@ Color WW8TransCol(SVBT32 nWC) return Color(nWC[0], nWC[1], nWC[2]); } -void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rFixed) +void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixed) { if (mbIsDisabled || rFixed.isEmpty()) return; @@ -666,7 +666,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, if (bSymbol == false && bDoingSymbol) { bDoingSymbol = false; - rtl::OUStringBuffer sTemp; + OUStringBuffer sTemp; comphelper::string::padToLength(sTemp, nTxtStart - nStartReplace, cReplaceSymbol); mpDrawEditEngine->QuickInsertText(sTemp.makeStringAndClear(), @@ -955,7 +955,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(String &rString, WW8_CP nS rString = comphelper::string::remove(rString, 0x1); rString = comphelper::string::remove(rString, 0x5); rString = comphelper::string::remove(rString, 0x8); - rString.SearchAndReplaceAllAscii("\007\007", rtl::OUString("\007\012")); + rString.SearchAndReplaceAllAscii("\007\007", OUString("\007\012")); rString.SearchAndReplaceAll(0x7, ' '); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index abdd6529ce56..8b4f9f285c6a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -144,7 +144,7 @@ public: mxCtx = comphelper::getProcessComponentContext(); } bool import( const uno::Reference< io::XInputStream >& rxIn ); - rtl::OUString getProjectName(); + OUString getProjectName(); }; bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rxIn ) @@ -156,7 +156,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx oox::StorageRef vbaStg = root.openSubStorage( "Macros" , false ); if ( vbaStg.get() ) { - oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), rtl::OUString("Writer") ); + oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), OUString("Writer") ); bRet = aVbaPrj.importVbaProject( *vbaStg ); } } @@ -167,9 +167,9 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx return bRet; } -rtl::OUString BasicProjImportHelper::getProjectName() +OUString BasicProjImportHelper::getProjectName() { - rtl::OUString sProjName( "Standard" ); + OUString sProjName( "Standard" ); uno::Reference< beans::XPropertySet > xProps( mrDocShell.GetModel(), uno::UNO_QUERY ); if ( xProps.is() ) { @@ -192,7 +192,7 @@ class Sttb : TBBase struct SBBItem { sal_uInt16 cchData; - rtl::OUString data; + OUString data; SBBItem() : cchData(0){} }; sal_uInt16 fExtend; @@ -208,7 +208,7 @@ public: ~Sttb(); bool Read(SvStream &rS); void Print( FILE* fp ); - rtl::OUString getStringAtIndex( sal_uInt32 ); + OUString getStringAtIndex( sal_uInt32 ); }; Sttb::Sttb() : fExtend( 0 ) @@ -248,15 +248,15 @@ void Sttb::Print( FILE* fp ) if ( cData ) { for ( sal_Int32 index = 0; index < cData; ++index ) - fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() ); } } -rtl::OUString +OUString Sttb::getStringAtIndex( sal_uInt32 index ) { - rtl::OUString aRet; + OUString aRet; if ( index < dataItems.size() ) aRet = dataItems[ index ].data; return aRet; @@ -737,7 +737,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, { fExtraTextRotation /= 100.0; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sTextRotateAngle( "TextRotateAngle" ); + const OUString sTextRotateAngle( "TextRotateAngle" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; aPropVal.Value <<= fExtraTextRotation; @@ -2737,7 +2737,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs) pStr->buffer[nEndUsed] = 0; pStr->length = nEndUsed; - emulateMSWordAddTextToParagraph(rtl::OUString(pStr, SAL_NO_ACQUIRE)); + emulateMSWordAddTextToParagraph(OUString(pStr, SAL_NO_ACQUIRE)); pStr = NULL; rPos += nL2; if (!maApos.back()) //a para end in apo doesn't count @@ -2759,7 +2759,7 @@ namespace //We want to force weak chars inside 0x0020 to 0x007F to LATIN sal_Int16 lcl_getScriptType( const uno::Reference<i18n::XBreakIterator>& rBI, - const rtl::OUString &rString, sal_Int32 nPos) + const OUString &rString, sal_Int32 nPos) { sal_Int16 nScript = rBI->getScriptType(rString, nPos); if (nScript == i18n::ScriptType::WEAK && rString[nPos] >= 0x0020 && rString[nPos] <= 0x007F) @@ -2771,7 +2771,7 @@ namespace //useful, and see lcl_getScriptType anyway sal_Int32 lcl_endOfScript( const uno::Reference<i18n::XBreakIterator>& rBI, - const rtl::OUString &rString, sal_Int32 nPos, sal_Int16 nScript) + const OUString &rString, sal_Int32 nPos, sal_Int16 nScript) { while (nPos < rString.getLength()) { @@ -2785,7 +2785,7 @@ namespace sal_Int32 lcl_getWriterScriptType( const uno::Reference<i18n::XBreakIterator>& rBI, - const rtl::OUString &rString, sal_Int32 nPos) + const OUString &rString, sal_Int32 nPos) { sal_Int16 nScript = i18n::ScriptType::WEAK; @@ -2841,7 +2841,7 @@ namespace //to auto-bias to LATIN. // //See https://bugs.freedesktop.org/show_bug.cgi?id=34319 for an example -void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString) +void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString) { if (rAddString.isEmpty()) return; @@ -2856,7 +2856,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0); sal_Int32 nLen = rAddString.getLength(); - rtl::OUString sParagraphText; + OUString sParagraphText; const SwCntntNode *pCntNd = pPaM->GetCntntNode(); const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL; if (pNd) @@ -2871,7 +2871,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS if (nEnd < 0) break; - rtl::OUString sChunk(rAddString.copy(nPos, nEnd-nPos)); + OUString sChunk(rAddString.copy(nPos, nEnd-nPos)); const sal_uInt16 aIds[] = {RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT}; const SvxFontItem *pOverriddenItems[] = {NULL, NULL, NULL}; bool aForced[] = {false, false, false}; @@ -2977,7 +2977,7 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const String& rAddString) #if OSL_DEBUG_LEVEL > 1 { - rtl::OString sText(rtl::OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8)); + OString sText(OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8)); SAL_INFO("sw.ww8", "<addTextToParagraph>" << sText.getStr() << "</addTextToParagraph>"); } #endif @@ -3029,7 +3029,7 @@ bool SwWW8ImplReader::ReadChars(WW8_CP& rPos, WW8_CP nNextAttr, long nTextEnd, { for(sal_uInt16 nCh = 0; nCh < nEnd - rPos; ++nCh) { - rDoc.InsertString( *pPaM, rtl::OUString(cSymbol) ); + rDoc.InsertString( *pPaM, OUString(cSymbol) ); } pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT ); } @@ -3171,13 +3171,13 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) bRet = HandlePageBreakChar(); break; case 0x1e: // Non-breaking hyphen - rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDHYPHEN) ); + rDoc.InsertString( *pPaM, OUString(CHAR_HARDHYPHEN) ); break; case 0x1f: // Non-required hyphens - rDoc.InsertString( *pPaM, rtl::OUString(CHAR_SOFTHYPHEN) ); + rDoc.InsertString( *pPaM, OUString(CHAR_SOFTHYPHEN) ); break; case 0xa0: // Non-breaking spaces - rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDBLANK) ); + rDoc.InsertString( *pPaM, OUString(CHAR_HARDBLANK) ); break; case 0x1: /* @@ -3264,7 +3264,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) if( '\x0' != cInsert ) { - rtl::OUString sInsert(cInsert); + OUString sInsert(cInsert); emulateMSWordAddTextToParagraph(sInsert); } if (!maApos.back()) //a para end in apo doesn't count @@ -3615,7 +3615,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType) if(pAktItemSet && !pFmt) { - rtl::OUString sPrefix(rtl::OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear()); + OUString sPrefix(OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear()); pNewSwCharFmt = rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)rDoc.GetDfltCharFmt()); pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT); pNewSwCharFmt->SetFmtAttr( *pAktItemSet ); @@ -3694,8 +3694,8 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage, maSectionManager(*this), m_aExtraneousParas(rD), maInsertedTables(rD), - maSectionNameGenerator(rD, rtl::OUString("WW")), - maGrfNameGenerator(bNewDoc, rtl::OUString('G')), + maSectionNameGenerator(rD, OUString("WW")), + maGrfNameGenerator(bNewDoc, OUString('G')), maParaStyleMapper(rD), maCharStyleMapper(rD), maTxtNodesHavingFirstLineOfstSet(), // #i103711# @@ -4168,7 +4168,7 @@ void SwWW8ImplReader::StoreMacroCmds() try { uno::Reference < io::XStream > xStream = - xRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE ); + xRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xStream ); sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds]; @@ -4206,9 +4206,9 @@ void SwWW8ImplReader::ReadDocVars() for(size_t i=0; i<aDocVarStrings.size(); i++) { uno::Any aDefaultValue; - ::rtl::OUString name(aDocVarStrings[i]); + OUString name(aDocVarStrings[i]); uno::Any aValue; - aValue <<= ::rtl::OUString(aDocValueStrings[i]); + aValue <<= OUString(aDocValueStrings[i]); try { xUserDefinedProps->addProperty( name, beans::PropertyAttribute::REMOVABLE, @@ -4237,11 +4237,11 @@ void SwWW8ImplReader::ReadDocInfo() if (xDocProps.is()) { if ( pWwFib->fDot ) { - rtl::OUString sTemplateURL; + OUString sTemplateURL; SfxMedium* pMedium = mpDocShell->GetMedium(); if ( pMedium ) { - rtl::OUString aName = pMedium->GetName(); + OUString aName = pMedium->GetName(); INetURLObject aURL( aName ); sTemplateURL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); if ( !sTemplateURL.isEmpty() ) @@ -4260,7 +4260,7 @@ void SwWW8ImplReader::ReadDocInfo() aSttb.Print( stderr ); #endif String sPath = aSttb.getStringAtIndex( 0x1 ); - rtl::OUString aURL; + OUString aURL; // attempt to convert to url ( won't work for obvious reasons on linux if ( sPath.Len() ) ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL ); @@ -4275,14 +4275,14 @@ void SwWW8ImplReader::ReadDocInfo() } } -static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName ) +static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const OUString& sTemplatePathOrURL, const OUString& sVBAProjName ) { if ( xPrjNameCache.is() ) { INetURLObject aObj; aObj.SetURL( sTemplatePathOrURL ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; - rtl::OUString aURL; + OUString aURL; if ( bIsURL ) aURL = sTemplatePathOrURL; else @@ -4292,8 +4292,8 @@ static void lcl_createTemplateToProjectEntry( const uno::Reference< container::X } try { - rtl::OUString templateNameWithExt = aObj.GetLastName(); - rtl::OUString templateName; + OUString templateNameWithExt = aObj.GetLastName(); + OUString templateName; sal_Int32 nIndex = templateNameWithExt.lastIndexOf( '.' ); if ( nIndex != -1 ) { @@ -4348,11 +4348,11 @@ bool WW8Customizations::Import( SwDocShell* pShell ) } } -bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache ) +bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache ) { SvtPathOptions aPathOpt; String aAddinPath = aPathOpt.GetAddinPath(); - uno::Sequence< rtl::OUString > sGlobalTemplates; + uno::Sequence< OUString > sGlobalTemplates; // first get the autoload addins in the directory STARTUP uno::Reference<ucb::XSimpleFileAccess3> xSFA(ucb::SimpleFileAccess::create(::comphelper::getProcessComponentContext())); @@ -4367,7 +4367,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF INetURLObject aObj; aObj.SetURL( sGlobalTemplates[ i ] ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; - rtl::OUString aURL; + OUString aURL; if ( bIsURL ) aURL = sGlobalTemplates[ i ]; else @@ -4382,10 +4382,10 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() ); lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() ); // Read toolbars & menus - SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( "WordDocument" )); + SvStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" )); refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); WW8Fib aWwFib( *refMainStream, 8 ); - SvStorageStreamRef xTableStream = rRoot->OpenSotStream(rtl::OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); + SvStorageStreamRef xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) { @@ -4642,7 +4642,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) xDocPropSupp(mpDocShell->GetModel(), uno::UNO_QUERY_THROW); uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); - rtl::OUString sCreatedFrom = xDocProps->getTemplateURL(); + OUString sCreatedFrom = xDocProps->getTemplateURL(); uno::Reference< container::XNameContainer > xPrjNameCache; uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY); if ( xSF.is() ) @@ -4897,14 +4897,14 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream, break; } - rTableStream = pStg->OpenSotStream( rtl::OUString::createFromAscii( + rTableStream = pStg->OpenSotStream( OUString::createFromAscii( pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); pTableStream = &rTableStream; pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rDataStream = pStg->OpenSotStream(rtl::OUString(SL::aData), + rDataStream = pStg->OpenSotStream(OUString(SL::aData), STREAM_STD_READ | STREAM_NOCREATE ); if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError()) @@ -5022,7 +5022,7 @@ namespace { String sUniPassword = QueryPasswordForMedium( rMedium ); - rtl::OString sPassword(rtl::OUStringToOString(sUniPassword, + OString sPassword(OUStringToOString(sUniPassword, WW8Fib::GetFIBCharset(pWwFib->chseTables))); sal_Int32 nLen = sPassword.getLength(); @@ -5641,7 +5641,7 @@ sal_uLong WW8Reader::OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuff { sal_uLong nRet = ERR_SWG_READ_ERROR; OSL_ENSURE( pStg, "wo ist mein Storage?" ); - rRef = pStg->OpenSotStream( rtl::OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL); + rRef = pStg->OpenSotStream( OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL); if( rRef.Is() ) { @@ -5830,8 +5830,8 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName, if( bRet ) { rStorageName = OUString('_'); - rStorageName += rtl::OUString::valueOf(nPictureId); - rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString( + rStorageName += OUString::valueOf(nPictureId); + rSrcStorage = rReader.pStg->OpenSotStorage(OUString( SL::aObjectPool)); if (!rReader.mpDocShell) bRet=false; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 1fabdbbb3d44..e6d706a70775 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -458,9 +458,9 @@ namespace sw class WW8FieldEntry { private: - ::rtl::OUString msBookmarkName; - ::rtl::OUString msMarkType; - ::rtl::OUString msMarkCode; + OUString msBookmarkName; + OUString msMarkType; + OUString msMarkCode; ::sw::mark::IFieldmark::parameter_map_t maParams; public: @@ -475,11 +475,11 @@ class WW8FieldEntry SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); }; xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); }; - ::rtl::OUString GetBookmarkName(); - ::rtl::OUString GetBookmarkCode(); - void SetBookmarkName(::rtl::OUString bookmarkName); - void SetBookmarkType(::rtl::OUString bookmarkType); - void SetBookmarkCode(::rtl::OUString bookmarkCode); + OUString GetBookmarkName(); + OUString GetBookmarkCode(); + void SetBookmarkName(OUString bookmarkName); + void SetBookmarkType(OUString bookmarkType); + void SetBookmarkCode(OUString bookmarkCode); ::sw::mark::IFieldmark::parameter_map_t& getParameters(); }; @@ -553,7 +553,7 @@ class WW8FormulaControl : private ::boost::noncopyable protected: SwWW8ImplReader &rRdr; public: - WW8FormulaControl(const rtl::OUString& rN, SwWW8ImplReader &rR) + WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rR) : rRdr(rR), fUnknown(0), fDropdownIndex(0), fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0), fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN ) @@ -573,12 +573,12 @@ public: sal_uInt16 nChecked; sal_uInt16 nDefaultChecked; - rtl::OUString sTitle; - rtl::OUString sDefault; - rtl::OUString sFormatting; - rtl::OUString sHelp; - rtl::OUString sToolTip; - std::vector<rtl::OUString> maListEntries; + OUString sTitle; + OUString sDefault; + OUString sFormatting; + OUString sHelp; + OUString sToolTip; + std::vector<OUString> maListEntries; virtual ~WW8FormulaControl() {} void FormulaRead(SwWw8ControlType nWhich,SvStream *pD); virtual sal_Bool Import(const com::sun::star::uno::Reference < @@ -586,7 +586,7 @@ public: com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, com::sun::star::awt::Size &rSz) = 0; - rtl::OUString sName; + OUString sName; }; class WW8FormulaCheckBox : public WW8FormulaControl @@ -665,7 +665,7 @@ class SwMSDffManager : public SvxMSDffManager private: SwWW8ImplReader& rReader; SvStream *pFallbackStream; - std::map<sal_uInt32,rtl::OString> aOldEscherBlipCache; + std::map<sal_uInt32,OString> aOldEscherBlipCache; virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName, SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const; @@ -840,12 +840,12 @@ public: class wwFrameNamer : private ::boost::noncopyable { private: - rtl::OUString msSeed; + OUString msSeed; sal_Int32 mnImportedGraphicsCount; bool mbIsDisabled; public: - void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rFixedPart); - wwFrameNamer(bool bIsDisabled, const rtl::OUString &rSeed) + void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixedPart); + wwFrameNamer(bool bIsDisabled, const OUString &rSeed) : msSeed(rSeed), mnImportedGraphicsCount(0), mbIsDisabled(bIsDisabled) { } @@ -1255,7 +1255,7 @@ private: pReffingStck = 0; } void DeleteAnchorStk() { DeleteStk( pAnchorStck ); pAnchorStck = 0; } - void emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString); + void emulateMSWordAddTextToParagraph(const OUString& rAddString); void simpleAddTextToParagraph(const String& rAddString); bool HandlePageBreakChar(); bool ReadChar(long nPosCp, long nCpOfs); @@ -1542,7 +1542,7 @@ private: // #i84783# // determine object attribute "Layout in Table Cell" bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const; - bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap ); + bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap ); //No copying SwWW8ImplReader(const SwWW8ImplReader &); SwWW8ImplReader& operator=(const SwWW8ImplReader&); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 40056b8f86eb..fbc2e083c576 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -772,7 +772,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule() if( pStyles->pStyRule ) // Bullet-Style already present return pStyles->pStyRule; - const String aBaseName(rtl::OUString("WW8StyleNum")); + const String aBaseName(OUString("WW8StyleNum")); const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) ); // #i86652# @@ -848,7 +848,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor // If NumRuleItems were set, either directly or through inheritance, disable them now pAktColl->SetFmtAttr( SwNumRuleItem() ); - String aName(rtl::OUString("Outline")); + String aName(OUString("Outline")); SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ), SvxNumberFormat::LABEL_WIDTH_AND_POSITION, OUTLINE_RULE ); @@ -4299,13 +4299,13 @@ void WW8RStyle::ImportOldFormatStyles() if (const sal_Char *pStr = GetEnglishNameFromSti(eSti)) sName = String(pStr, RTL_TEXTENCODING_ASCII_US); else - sName = rtl::OUString("Unknown"); + sName = OUString("Unknown"); } else // user style { - rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount); + OString aTmp = read_uInt8s_ToOString(rSt, nCount); nByteCount += aTmp.getLength(); - sName = rtl::OStringToOUString(aTmp, eStructChrSet); + sName = OStringToOUString(aTmp, eStructChrSet); } rSI.SetOrgWWIdent(sName, stc); rSI.bImported = true; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index b3312ba96d80..13d0646386f3 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -160,8 +160,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr ) if (aBookmarkName.Len()>0) { maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_FORMTEXT); - maFieldStack.back().getParameters()["Description"] = uno::makeAny(::rtl::OUString(aFormula.sToolTip)); - maFieldStack.back().getParameters()["Name"] = uno::makeAny(::rtl::OUString(aFormula.sTitle)); + maFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.sToolTip)); + maFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.sTitle)); } return FLD_TEXT; } @@ -213,8 +213,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr ) if (pFieldmark!=NULL) { IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters(); ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark); - (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(::rtl::OUString(aFormula.sTitle)); - (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(::rtl::OUString(aFormula.sToolTip)); + (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(OUString(aFormula.sTitle)); + (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(OUString(aFormula.sToolTip)); if(pCheckboxFm) pCheckboxFm->SetChecked(aFormula.nChecked); @@ -285,7 +285,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr) OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?"); if ( pFieldmark != NULL ) { - uno::Sequence< ::rtl::OUString > vListEntries(aFormula.maListEntries.size()); + uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size()); ::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries)); (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries); sal_Int32 nIndex = aFormula.fDropdownIndex < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0; @@ -1075,7 +1075,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, SwNumRule* WW8ListManager::CreateNextRule(bool bSimple) { // wird erstmal zur Bildung des Style Namens genommen - String sPrefix(rtl::OUString("WW8Num")); + String sPrefix(OUString("WW8Num")); sPrefix += OUString::number(nUniqueList++); // #i86652# sal_uInt16 nRul = @@ -1318,7 +1318,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) break; // Nauemsprefix aufbauen: fuer NumRule-Name (eventuell) // und (falls vorhanden) fuer Style-Name (dann auf jeden Fall) - String sPrefix(rtl::OUString("WW8NumSt")); + String sPrefix(OUString("WW8NumSt")); sPrefix += OUString::number( nLfo + 1 ); // jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!! // (bis dahin war hier die Parent NumRule vermerkt ) @@ -2220,7 +2220,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, { if ( iRes != 25 ) nChecked = iRes; - sDefault = ( wDef == 0 ) ? rtl::OUString( "0" ) : rtl::OUString( "1" ); + sDefault = ( wDef == 0 ) ? OUString( "0" ) : OUString( "1" ); } } // xstzTextFormat @@ -2274,7 +2274,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, } WW8FormulaListBox::WW8FormulaListBox(SwWW8ImplReader &rR) - : WW8FormulaControl(rtl::OUString(SL::aListBox), rR) + : WW8FormulaControl(OUString(SL::aListBox), rR) { } @@ -2333,7 +2333,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString, String pNm; if (xPropSetInfo->hasPropertyByName(pNm = "FontStyleName")) { - aTmp <<= rtl::OUString( pFontItem->GetStyleName()); + aTmp <<= OUString( pFontItem->GetStyleName()); rPropSet->setPropertyValue( pNm, aTmp ); } if (xPropSetInfo->hasPropertyByName(pNm = "FontFamily")) @@ -2352,7 +2352,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString, rPropSet->setPropertyValue( pNm, aTmp ); } - aTmp <<= rtl::OUString( pFontItem->GetFamilyName()); + aTmp <<= OUString( pFontItem->GetFamilyName()); aFont.SetName( pFontItem->GetFamilyName() ); aFont.SetStyleName( pFontItem->GetStyleName() ); aFont.SetFamily( pFontItem->GetFamily() ); @@ -2398,8 +2398,8 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString, break; } - if (bSet && xPropSetInfo->hasPropertyByName(rtl::OUString::createFromAscii(pMap->pPropNm))) - rPropSet->setPropertyValue(rtl::OUString::createFromAscii(pMap->pPropNm), aTmp); + if (bSet && xPropSetInfo->hasPropertyByName(OUString::createFromAscii(pMap->pPropNm))) + rPropSet->setPropertyValue(OUString::createFromAscii(pMap->pPropNm), aTmp); } // now calculate the size of the control OutputDevice* pOut = Application::GetDefaultDevice(); @@ -2450,9 +2450,9 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference < if (!maListEntries.empty()) { sal_uInt32 nLen = maListEntries.size(); - uno::Sequence< ::rtl::OUString > aListSource(nLen); + uno::Sequence< OUString > aListSource(nLen); for (sal_uInt32 nI = 0; nI < nLen; ++nI) - aListSource[nI] = rtl::OUString(maListEntries[nI]); + aListSource[nI] = OUString(maListEntries[nI]); aTmp <<= aListSource; xPropSet->setPropertyValue("StringItemList", aTmp ); @@ -2475,20 +2475,20 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference < { 0x2002,0x2002,0x2002,0x2002,0x2002 }; - rSz = rRdr.MiserableDropDownFormHack(rtl::OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet); + rSz = rRdr.MiserableDropDownFormHack(OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet); } return sal_True; } WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR) - : WW8FormulaControl(rtl::OUString(SL::aCheckBox), rR) + : WW8FormulaControl(OUString(SL::aCheckBox), rR) { } static void lcl_AddToPropertyContainer (uno::Reference<beans::XPropertySet> xPropSet, - const rtl::OUString & rPropertyName, const rtl::OUString & rValue) + const OUString & rPropertyName, const OUString & rValue) { uno::Reference<beans::XPropertySetInfo> xPropSetInfo = xPropSet->getPropertySetInfo(); @@ -2547,7 +2547,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference < } WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR) - : WW8FormulaControl(rtl::OUString(SL::aTextField) ,rR) + : WW8FormulaControl(OUString(SL::aTextField) ,rR) { } diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 8e92ce6c05b8..7aa31b67d17d 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -80,7 +80,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) // 0x2c, 0x30 Skalierung x,y in Promille // 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw - SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( rtl::OUString("\3PIC"), + SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"), STREAM_STD_READ | STREAM_NOCREATE); SvStorageStream* pS = xSrc3; pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -125,7 +125,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, SvStorageRef& rSrc1) { - SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( rtl::OUString("\3META"), + SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"), STREAM_STD_READ | STREAM_NOCREATE); SvStorageStream* pSt = xSrc2; pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -181,7 +181,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1) { // 03-META-Stream nicht da. Vielleicht ein 03-PICT ? - SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(rtl::OUString("\3PICT")); + SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT")); SvStorageStream* pStp = xSrc4; pStp->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); sal_uInt8 aTestA[10]; // Ist der 01Ole-Stream ueberhaupt vorhanden @@ -230,7 +230,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject, // TODO/MBA: is the object inserted multiple times here? Testing! // And is it a problem that we now use the same naming scheme as in the other apps? sw::hack::DrawingOLEAdaptor aOLEObj(rObject, *pPersist); - ::rtl::OUString sNewName; + OUString sNewName; bool bSuccess = aOLEObj.TransferToDoc(sNewName); OSL_ENSURE(bSuccess, "Insert OLE failed"); @@ -344,11 +344,11 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, long nX=0, nY=0; // nX, nY is graphic size bool bOleOk = true; - String aSrcStgName = rtl::OUString('_'); + String aSrcStgName = OUString('_'); // ergibt Name "_4711" aSrcStgName += OUString::number( nObjLocFc ); - SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool)); + SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool)); SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, STREAM_READWRITE| STREAM_SHARE_DENYALL ); @@ -425,7 +425,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; { - SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(rtl::OUString("\3ObjInfo"), + SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(OUString("\3ObjInfo"), STREAM_STD_READ | STREAM_NOCREATE ); if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() ) { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 2b9316156751..37229ccaae89 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -349,7 +349,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) // needed if the filterflags say we will convert bookmarks // to SetExpFields! And this the exception! - rtl::OUString sHex("\\x"); + OUString sHex("\\x"); bool bSetAsHex; bool bAllowCr = SwFltGetFlag(nFieldFlags, SwFltControlStack::ALLOW_FLD_CR) ? true : false; @@ -421,8 +421,8 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) void SwWW8ImplReader::ConvertFFileName( String& rName, const String& rOrg ) { rName = rOrg; - rName.SearchAndReplaceAllAscii( "\\\\", rtl::OUString( '\\' )); - rName.SearchAndReplaceAllAscii( "%20", rtl::OUString( ' ' )); + rName.SearchAndReplaceAllAscii( "\\\\", OUString( '\\' )); + rName.SearchAndReplaceAllAscii( "%20", OUString( ' ' )); // ggfs. anhaengende Anfuehrungszeichen entfernen if( rName.Len() && '"' == rName.GetChar( rName.Len()-1 )) @@ -575,10 +575,10 @@ String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nL // #i36594# // Fix provided by mloiseleur@openoffice.org. // A default date can have already 4 year digits, in some case - const xub_StrLen pos = sParams.Search(rtl::OUString("YYYY")); + const xub_StrLen pos = sParams.Search(OUString("YYYY")); if ( pos == STRING_NOTFOUND ) { - sParams.SearchAndReplace(rtl::OUString("YY"), rtl::OUString("YYYY")); + sParams.SearchAndReplace(OUString("YY"), OUString("YYYY")); } return sParams; } @@ -622,7 +622,7 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat, } if (bHijri) - sParams.Insert(rtl::OUString("[~hijri]"), 0); + sParams.Insert(OUString("[~hijri]"), 0); sal_Int32 nCheckPos = 0; short nType = NUMBERFORMAT_DEFINED; @@ -721,7 +721,7 @@ sal_uInt16 SwWW8ImplReader::End_Field() *pPaM->GetPoint() = maFieldStack.back().maStartPos; break; default: - rtl::OUString aCode = maFieldStack.back().GetBookmarkCode(); + OUString aCode = maFieldStack.back().GetBookmarkCode(); if ( !aCode.isEmpty() ) { // Unhandled field with stored code @@ -740,23 +740,23 @@ sal_uInt16 SwWW8ImplReader::End_Field() { const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters(); pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end()); - rtl::OUString sFieldId = rtl::OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) ); + OUString sFieldId = OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) ); pFieldmark->GetParameters()->insert( - std::pair< rtl::OUString, uno::Any > ( + std::pair< OUString, uno::Any > ( ODF_ID_PARAM, uno::makeAny( sFieldId ) ) ); pFieldmark->GetParameters()->insert( - std::pair< rtl::OUString, uno::Any > ( + std::pair< OUString, uno::Any > ( ODF_CODE_PARAM, uno::makeAny( aCode ) ) ); if ( maFieldStack.back().mnObjLocFc > 0 ) { // Store the OLE object as an internal link - String sOleId = rtl::OUString('_'); + String sOleId = OUString('_'); sOleId += OUString::number( maFieldStack.back().mnObjLocFc ); - SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool)); + SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool)); SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, STREAM_READ ); // Store it now! @@ -782,8 +782,8 @@ sal_uInt16 SwWW8ImplReader::End_Field() // Store the OLE Id as a parameter pFieldmark->GetParameters()->insert( - std::pair< rtl::OUString, uno::Any >( - ODF_OLE_PARAM, uno::makeAny( rtl::OUString( sOleId ) ) ) ); + std::pair< OUString, uno::Any >( + ODF_OLE_PARAM, uno::makeAny( OUString( sOleId ) ) ) ); } } @@ -840,27 +840,27 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw() return *this; } -::rtl::OUString WW8FieldEntry::GetBookmarkName() +OUString WW8FieldEntry::GetBookmarkName() { return msBookmarkName; } -::rtl::OUString WW8FieldEntry::GetBookmarkCode() +OUString WW8FieldEntry::GetBookmarkCode() { return msMarkCode; } -void WW8FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) +void WW8FieldEntry::SetBookmarkName(OUString bookmarkName) { msBookmarkName=bookmarkName; } -void WW8FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType) +void WW8FieldEntry::SetBookmarkType(OUString bookmarkType) { msMarkType=bookmarkType; } -void WW8FieldEntry::SetBookmarkCode(::rtl::OUString bookmarkCode) +void WW8FieldEntry::SetBookmarkCode(OUString bookmarkCode) { msMarkCode = bookmarkCode; } @@ -1144,7 +1144,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) // Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert. void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg ) { - rtl::OUString sHex("\\x"); + OUString sHex("\\x"); bool bAllowCr = SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT ) || SwFltGetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR ); sal_Unicode cChar; @@ -1212,7 +1212,7 @@ void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg ) void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const String& rTagText ) { - String aName(rtl::OUString("WwFieldTag")); + String aName(OUString("WwFieldTag")); if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer? aName += OUString::number( nId ); // ausgeben ? @@ -1385,7 +1385,7 @@ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF, } else { - sName = rtl::OUString("WWSetBkmk"); + sName = OUString("WWSetBkmk"); nNo = pReffingStck->aFieldVarNames.size()+1; sName += OUString::number(nNo); nNo += pPlcxMan->GetBook()->GetIMax(); @@ -1506,7 +1506,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr ) eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, String& rStr ) { if( !pNumFldType ){ // 1. Mal - SwSetExpFieldType aT( &rDoc, rtl::OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ ); + SwSetExpFieldType aT( &rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ ); pNumFldType = rDoc.InsertFldType( aT ); } SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyStr, @@ -1999,7 +1999,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr ) NewAttr(aSz); } - rDoc.InsertString(*pPaM, rtl::OUString(cChar)); + rDoc.InsertString(*pPaM, OUString(cChar)); if (nSize > 0) pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_FONTSIZE); @@ -2008,7 +2008,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr ) } else { - rDoc.InsertString(*pPaM, rtl::OUString("###")); + rDoc.InsertString(*pPaM, OUString("###")); } return FLD_OK; @@ -2217,10 +2217,10 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr ) #if defined(WW_NATIVE_TOC) if (1) { - ::rtl::OUString aBookmarkName("_REF"); + OUString aBookmarkName("_REF"); maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_PAGEREF); - maFieldStack.back().AddParam(rtl::OUString(), sName); + maFieldStack.back().AddParam(OUString(), sName); return FLD_TEXT; } #endif @@ -2262,7 +2262,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String& rStr) aVText += aReadParam.GetResult(); if (bNewVText) { - bBracket = aVText.EqualsIgnoreCaseAscii(rtl::OUString('['), 1, 0) + bBracket = aVText.EqualsIgnoreCaseAscii(OUString('['), 1, 0) ? true : false; bNewVText = false; } @@ -2313,7 +2313,7 @@ bool CanUseRemoteLink(const String &rGrfName) ::ucbhelper::Content aCnt(rGrfName, uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - rtl::OUString aTitle; + OUString aTitle; aCnt.getPropertyValue("Title") >>= aTitle; bUseRemote = !aTitle.isEmpty(); @@ -2539,7 +2539,7 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam) { String sCombinedCharacters; if ((-2 == rReadParam.SkipToNextToken()) && - rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('('), 1, 0)) + rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('('), 1, 0)) { for (int i=0;i<2;i++) { @@ -2549,8 +2549,8 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam) if (-2 != rReadParam.SkipToNextToken()) break; String sF = rReadParam.GetResult(); - if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0)) - || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('o'), 1, 0))) + if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(OUString('p'), 1, 0)) + || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(OUString('o'), 1, 0))) { if (-2 == rReadParam.SkipToNextToken()) { @@ -2620,7 +2620,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) if ('u' == nRet) { if (-2 == rReadParam.SkipToNextToken() && - (rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0))) + (rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('p'), 1, 0))) { if (-2 == rReadParam.SkipToNextToken()) { @@ -2924,7 +2924,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { #if defined(WW_NATIVE_TOC) if (1) { - ::rtl::OUString aBookmarkName("_TOC"); + OUString aBookmarkName("_TOC"); maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_TOC); return FLD_TEXT; @@ -3297,7 +3297,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) if ( aIt != aPattern.end() ) { SwFormToken aNumberEntrySeparator( TOKEN_TEXT ); - aNumberEntrySeparator.sText = rtl::OUString(" "); + aNumberEntrySeparator.sText = OUString(" "); aPattern.insert( ++aIt, aNumberEntrySeparator ); pForm->SetPattern( nStyleLevel, aPattern ); } @@ -3447,7 +3447,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr ) { #if defined(WW_NATIVE_TOC) if (1) { - ::rtl::OUString aBookmarkName("_HYPERLINK"); + OUString aBookmarkName("_HYPERLINK"); maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_HYPERLINK); return FLD_TEXT; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 8eb7940f9af1..43277d585541 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2705,7 +2705,7 @@ void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen if( bVer67 ) { //convert single byte from MS1252 to Unicode - cSymbol = rtl::OUString( + cSymbol = OUString( reinterpret_cast<const sal_Char*>(pData+2), 1, RTL_TEXTENCODING_MS_1252).toChar(); } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index a8ecc85e4f11..789412032541 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1903,7 +1903,7 @@ Err: String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc) { - rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc); + OUString aRet = read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc); rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end return aRet; } @@ -3847,8 +3847,8 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen rArray.push_back(read_uInt16_PascalString(rStrm)); else { - rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); - rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); + OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); + rArray.push_back(OStringToOUString(aTmp, eCS)); } // Skip the extra data @@ -3878,8 +3878,8 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen pValueArray->push_back(read_uInt16_PascalString(rStrm)); else { - rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); - pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS)); + OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); + pValueArray->push_back(OStringToOUString(aTmp, eCS)); } } } @@ -3904,9 +3904,9 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen ++nRead; if (nBChar) { - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); nRead += aTmp.getLength(); - rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); + rArray.push_back(OStringToOUString(aTmp, eCS)); } else rArray.push_back(aEmptyStr); @@ -4146,9 +4146,9 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex) return bFound ? aBookNames[i] : aEmptyStr; } -rtl::OUString WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggestedName) +OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName) { - rtl::OUString aRet(rSuggestedName.isEmpty() ? rtl::OUString("Unnamed") : rSuggestedName); + OUString aRet(rSuggestedName.isEmpty() ? OUString("Unnamed") : rSuggestedName); size_t i = 0; while (i < aBookNames.size()) { @@ -4158,7 +4158,7 @@ rtl::OUString WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggest sal_Int32 p = len - 1; while (p > 0 && aRet[p] >= '0' && aRet[p] <= '9') --p; - aRet = aRet.copy(0, p+1) + rtl::OUString::valueOf(nBookmarkId++); + aRet = aRet.copy(0, p+1) + OUString::valueOf(nBookmarkId++); i = 0; // start search from beginning } else diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 6913545d67bd..e52cbc5b7361 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -724,7 +724,7 @@ public: bool MapName(String& rName); String GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex); eBookStatus GetStatus() const; - rtl::OUString GetUniqueBookmarkName(const rtl::OUString &rSuggestedName); + OUString GetUniqueBookmarkName(const OUString &rSuggestedName); }; /* diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 27e23ef29ada..26a80a68cfeb 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star; // no. of visual data elements in a SwCTB ( fixed ) const short nVisualData = 5; -typedef std::map< sal_Int16, rtl::OUString > IdToString; +typedef std::map< sal_Int16, OUString > IdToString; class MSOWordCommandConvertor : public MSOCommandConvertor { @@ -59,8 +59,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOWordCommandConvertor(); - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); }; MSOWordCommandConvertor::MSOWordCommandConvertor() @@ -75,18 +75,18 @@ MSOWordCommandConvertor::MSOWordCommandConvertor() tcidToOOcmd[ 0x9d9 ] = ".uno:Print"; } -rtl::OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) +OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = msoToOOcmd.find( key ); if ( it != msoToOOcmd.end() ) sResult = it->second; return sResult; } -rtl::OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) +OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = tcidToOOcmd.find( key ); if ( it != tcidToOOcmd.end() ) sResult = it->second; @@ -117,7 +117,7 @@ Customization* SwCTBWrapper::GetCustomizaton( sal_Int16 index ) return &rCustomizations[ index ]; } -SwCTB* SwCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +SwCTB* SwCTBWrapper::GetCustomizationData( const OUString& sTBName ) { SwCTB* pCTB = NULL; for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it ) @@ -345,14 +345,14 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe if ( pCust ) { // currently only support built-in menu - rtl::OUString sMenuBar( "private:resource/menubar/" ); + OUString sMenuBar( "private:resource/menubar/" ); sMenuBar = sMenuBar.concat( "menubar" ); // Get menu name SwTBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() ); if ( !pTBC ) return false; - rtl::OUString sMenuName = pTBC->GetCustomText(); + OUString sMenuName = pTBC->GetCustomText(); sMenuName = sMenuName.replace('&','~'); // see if the document has already setting for the menubar @@ -378,7 +378,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe // create the popup menu uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); aPopupMenu[0].Name = "CommandURL"; - aPopupMenu[0].Value = uno::makeAny( rtl::OUString( "vnd.openoffice.org:" ) + sMenuName ); + aPopupMenu[0].Value = uno::makeAny( OUString( "vnd.openoffice.org:" ) + sMenuName ); aPopupMenu[1].Name = "Label"; aPopupMenu[1].Value <<= sMenuName; aPopupMenu[2].Name = "Type"; @@ -544,7 +544,7 @@ SwCTB::Print( FILE* fp ) { Indent a; indent_printf(fp, "[ 0x%x ] SwCTB - dump\n", nOffSet ); - indent_printf(fp, " name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp, " name %s\n", OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf(fp, " cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields. %x\n", static_cast< unsigned int >( cbTBData ) ); tb.Print(fp); @@ -568,7 +568,7 @@ SwCTB::Print( FILE* fp ) bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); + static OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { @@ -582,7 +582,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelp // set UI name for toolbar xProps->setPropertyValue( "UIName", uno::makeAny( name.getString() ) ); - rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); + OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< SwTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { // createToolBar item for control @@ -709,7 +709,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< std::vector< css::beans::PropertyValue > props; if ( bBuiltin ) { - rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId ); + OUString sCommand = helper.MSOCommandToOOCommand( cmdId ); if ( !sCommand.isEmpty() ) { beans::PropertyValue aProp; @@ -772,10 +772,10 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< return true; } -rtl::OUString +OUString SwTBC::GetCustomText() { - rtl::OUString sCustomText; + OUString sCustomText; if ( tbcd.get() ) sCustomText = tbcd->getGeneralInfo().CustomText(); return sCustomText; @@ -797,7 +797,7 @@ Xst::Print( FILE* fp ) { Indent a; indent_printf( fp, "[ 0x%x ] Xst -- dump\n", nOffSet ); - indent_printf( fp, " %s", rtl::OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf( fp, " %s", OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() ); } Tcg::Tcg() : nTcgVer( -1 ) @@ -1143,7 +1143,7 @@ void TcgSttbfCore::Print( FILE* fp ) if ( cData ) { for ( sal_Int32 index = 0; index < cData; ++index ) - indent_printf(fp," string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData ); + indent_printf(fp," string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData ); } } diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 85b8a902ab6f..bb38220bffd7 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -35,11 +35,11 @@ class Xst : public TBBase { - rtl::OUString sString; + OUString sString; public: Xst(){} bool Read(SvStream &rS); - rtl::OUString getString() { return sString; } + OUString getString() { return sString; } void Print( FILE* fp ); }; @@ -55,7 +55,7 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool ); - rtl::OUString GetCustomText(); + OUString GetCustomText(); }; class SwCTB : public TBBase @@ -80,7 +80,7 @@ public: bool IsMenuToolbar(); bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); - rtl::OUString GetName() { return tb.getName().getString(); } + OUString GetName() { return tb.getName().getString(); } }; class TBDelta : public TBBase @@ -174,7 +174,7 @@ public: bool ImportCustomToolBar( SfxObjectShell& rDocSh ); Customization* GetCustomizaton( sal_Int16 index ); - SwCTB* GetCustomizationData( const rtl::OUString& name ); + SwCTB* GetCustomizationData( const OUString& name ); void Print( FILE* ); }; @@ -272,7 +272,7 @@ class TcgSttbfCore : public TBBase struct SBBItem { sal_uInt16 cchData; - rtl::OUString data; + OUString data; sal_uInt16 extraData; SBBItem() : cchData(0), extraData(0){} }; |