diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-21 19:11:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-21 19:13:26 +0200 |
| commit | 2747303afeef33f3b71b33642b6bde259194e867 (patch) | |
| tree | 76609698f2c1601edcba45fc54e6ed3668c2345d | |
| parent | ad6b352bffdba5c45fa0915c7fdf8f5460409fc3 (diff) | |
dmapper: rtl::OUString -> OUString
Change-Id: Ib14cf2731a451226deb4aa27fd05420a0daaba4f
32 files changed, 423 insertions, 427 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 9ede97900d8e..d428fc118fe4 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -208,11 +208,11 @@ void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType, rToFill.Color = nLineColor; } -void lcl_SwapQuotesInField(::rtl::OUString &rFmt) +void lcl_SwapQuotesInField(OUString &rFmt) { //Swap unescaped " and ' with ' and " sal_Int32 nLen = rFmt.getLength(); - ::rtl::OUStringBuffer aBuffer( rFmt.getStr() ); + OUStringBuffer aBuffer( rFmt.getStr() ); const sal_Unicode* pFmt = rFmt.getStr(); for (sal_Int32 nI = 0; nI < nLen; ++nI) { @@ -223,7 +223,7 @@ void lcl_SwapQuotesInField(::rtl::OUString &rFmt) } rFmt = aBuffer.makeStringAndClear(); } -bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) +bool lcl_IsNotAM(OUString& rFmt, sal_Int32 nPos) { return ( (nPos == rFmt.getLength() - 1) || @@ -234,10 +234,10 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) ); } -::rtl::OUString ConvertMSFormatStringToSO( - const ::rtl::OUString& rFormat, lang::Locale& rLocale, bool bHijri) +OUString ConvertMSFormatStringToSO( + const OUString& rFormat, lang::Locale& rLocale, bool bHijri) { - ::rtl::OUString sFormat(rFormat); + OUString sFormat(rFormat); lcl_SwapQuotesInField(sFormat); //#102782#, #102815#, #108341# & #111944# have to work at the same time :-) @@ -246,7 +246,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) sal_Int32 nLen = sFormat.getLength(); sal_Int32 nI = 0; // const sal_Unicode* pFormat = sFormat.getStr(); - ::rtl::OUStringBuffer aNewFormat( sFormat ); + OUStringBuffer aNewFormat( sFormat ); while (nI < nLen) { if (aNewFormat[nI] == '\\') diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/writerfilter/source/dmapper/ConversionHelper.hxx index b0346f40ecbf..b23872b53e29 100644 --- a/writerfilter/source/dmapper/ConversionHelper.hxx +++ b/writerfilter/source/dmapper/ConversionHelper.hxx @@ -41,8 +41,8 @@ namespace ConversionHelper{ sal_Int32 nLineColor, ::com::sun::star::table::BorderLine2& rToFill, bool bIsOOXML ); //convert the number format string form MS format to SO format - ::rtl::OUString ConvertMSFormatStringToSO( - const ::rtl::OUString& rFormat, ::com::sun::star::lang::Locale& rLocale, bool bHijri); + OUString ConvertMSFormatStringToSO( + const OUString& rFormat, ::com::sun::star::lang::Locale& rLocale, bool bHijri); sal_Int32 convertTwipToMM100(sal_Int32 _t); // probably the most useless unit in the world - English Metric Units (EMU) 360 000 EMU == 1cm sal_Int32 convertEMUToMM100(sal_Int32 _t); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index e491d7b23133..bc8d8261d079 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -169,9 +169,9 @@ DomainMapper::~DomainMapper() void DomainMapper::lcl_attribute(Id nName, Value & val) { - static ::rtl::OUString sLocalBookmarkName; + static OUString sLocalBookmarkName; sal_Int32 nIntValue = val.getInt(); - rtl::OUString sStringValue = val.getString(); + OUString sStringValue = val.getString(); SectionPropertyMap * pSectionContext = m_pImpl->GetSectionContext(); @@ -300,13 +300,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) //as CharStyleName or ParaStyleName //if the style is a user defined style then it must have an ISTD - built-in styles might not have it StyleSheetTablePtr pStyleSheets = m_pImpl->GetStyleSheetTable(); - ::rtl::OUString sValue = ::rtl::OUString::valueOf(nIntValue, 16); + OUString sValue = OUString::valueOf(nIntValue, 16); const StyleSheetEntryPtr pEntry = pStyleSheets->FindStyleSheetByISTD(sValue); if( pEntry.get( ) ) { bool bParaStyle = (pEntry->nStyleTypeCode == STYLE_TYPE_PARA); if(bParaStyle) - m_pImpl->SetCurrentParaStyleId(::rtl::OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16)); + m_pImpl->SetCurrentParaStyleId(OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16)); if (m_pImpl->GetTopContext() && m_pImpl->GetTopContextType() != CONTEXT_SECTION) m_pImpl->GetTopContext()->Insert( bParaStyle ? @@ -758,7 +758,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) //contains the bookmark identifier - has to be added to the bookmark name imported before //if it is already available then the bookmark should be inserted m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue ); - sLocalBookmarkName = ::rtl::OUString(); + sLocalBookmarkName = OUString(); break; case NS_rtf::LN_LISTLEVEL: break; @@ -884,7 +884,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_Sym_char: if( m_pImpl->GetTopContext() && m_pImpl->GetTopContext()->GetFootnote().is()) { - m_pImpl->GetTopContext()->GetFootnote()->setLabel(::rtl::OUString( sal_Unicode(nIntValue))); + m_pImpl->GetTopContext()->GetFootnote()->setLabel(OUString( sal_Unicode(nIntValue))); break; } else //it's a _real_ symbol @@ -1102,8 +1102,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_EastAsianLayout_combineBrackets: if (m_pImpl->GetTopContext()) { - rtl::OUString sCombinePrefix = getBracketStringFromEnum(nIntValue); - rtl::OUString sCombineSuffix = getBracketStringFromEnum(nIntValue, false); + OUString sCombinePrefix = getBracketStringFromEnum(nIntValue); + OUString sCombineSuffix = getBracketStringFromEnum(nIntValue, false); m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_PREFIX, true, uno::makeAny ( sCombinePrefix )); m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, true, uno::makeAny ( sCombineSuffix )); } @@ -1472,7 +1472,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType bool bExchangeLeftRight = false; Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue->getInt(); - rtl::OUString sStringValue = pValue->getString(); + OUString sStringValue = pValue->getString(); PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); switch(nSprmId) @@ -2986,7 +2986,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { m_pImpl->SetCurrentParaStyleId( sStringValue ); StyleSheetTablePtr pStyleTable = m_pImpl->GetStyleSheetTable(); - const ::rtl::OUString sConvertedStyleName = pStyleTable->ConvertStyleName( sStringValue, true ); + const OUString sConvertedStyleName = pStyleTable->ConvertStyleName( sStringValue, true ); if (m_pImpl->GetTopContext() && m_pImpl->GetTopContextType() != CONTEXT_SECTION) m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sConvertedStyleName )); //apply numbering to paragraph if it was set at the style, but only if the paragraph itself @@ -3008,7 +3008,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; case NS_ooxml::LN_EG_RPrBase_rStyle: { - rtl::OUString sConvertedName( m_pImpl->GetStyleSheetTable()->ConvertStyleName( sStringValue, true ) ); + OUString sConvertedName( m_pImpl->GetStyleSheetTable()->ConvertStyleName( sStringValue, true ) ); // First check if the style exists in the document. StyleSheetEntryPtr pEntry = m_pImpl->GetStyleSheetTable( )->FindStyleSheetByStyleName( sConvertedName ); bool bExists = pEntry.get( ) && ( pEntry->nStyleTypeCode == STYLE_TYPE_CHAR ); @@ -3191,7 +3191,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType pProperties->resolve(*pOLEHandler); if ( pOLEHandler->isOLEObject( ) ) { - ::rtl::OUString sStreamName = pOLEHandler->copyOLEOStream( m_pImpl->GetTextDocument() ); + OUString sStreamName = pOLEHandler->copyOLEOStream( m_pImpl->GetTextDocument() ); if( !sStreamName.isEmpty() ) { m_pImpl->appendOLE( sStreamName, pOLEHandler ); @@ -3269,7 +3269,7 @@ void DomainMapper::lcl_startParagraphGroup() { m_pImpl->getTableManager().startParagraphGroup(); m_pImpl->PushProperties(CONTEXT_PARAGRAPH); - static ::rtl::OUString sDefault("Standard" ); + static OUString sDefault("Standard"); if (m_pImpl->GetTopContext()) { if (!m_pImpl->IsInShape()) @@ -3356,7 +3356,7 @@ void DomainMapper::lcl_endCharacterGroup() void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) { //TODO: Determine the right text encoding (FIB?) - ::rtl::OUString sText( (const sal_Char*) data_, len, RTL_TEXTENCODING_MS_1252 ); + OUString sText( (const sal_Char*) data_, len, RTL_TEXTENCODING_MS_1252 ); #ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("text"); dmapper_logger->chars(sText); @@ -3734,33 +3734,33 @@ sal_Int16 DomainMapper::getEmphasisValue(const sal_Int32 nIntValue) } } -rtl::OUString DomainMapper::getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix) +OUString DomainMapper::getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix) { switch(nIntValue) { case 1: if (bIsPrefix) - return rtl::OUString( "(" ); - return rtl::OUString( ")" ); + return OUString( "(" ); + return OUString( ")" ); case 2: if (bIsPrefix) - return rtl::OUString( "[" ); - return rtl::OUString( "]" ); + return OUString( "[" ); + return OUString( "]" ); case 3: if (bIsPrefix) - return rtl::OUString( "<" ); - return rtl::OUString( ">" ); + return OUString( "<" ); + return OUString( ">" ); case 4: if (bIsPrefix) - return rtl::OUString( "{" ); - return rtl::OUString( "}" ); + return OUString( "{" ); + return OUString( "}" ); case 0: default: - return rtl::OUString(); + return OUString(); } } @@ -3821,7 +3821,7 @@ uno::Reference< text::XTextRange > DomainMapper::GetCurrentTextRange() return m_pImpl->GetTopTextAppend()->getEnd(); } -::rtl::OUString DomainMapper::getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ) +OUString DomainMapper::getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ) { StyleSheetTablePtr pStyleSheets = m_pImpl->GetStyleSheetTable(); return pStyleSheets->getOrCreateCharStyle( rCharProperties ); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index d6cc79f5e98c..7fcd9e3e64ec 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -321,7 +321,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if(aTableStyleIter != m_aTableProperties->end()) { // Apply table style properties recursively - ::rtl::OUString sTableStyleName; + OUString sTableStyleName; aTableStyleIter->second >>= sTableStyleName; StyleSheetTablePtr pStyleSheetTable = m_rDMapper_Impl.GetStyleSheetTable(); const StyleSheetEntryPtr pStyleSheet = pStyleSheetTable->FindStyleSheetByISTD( sTableStyleName ); @@ -500,7 +500,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl { if ( rInfo.pTableStyle ) { - rtl::OUString sMask; + OUString sMask; pTcCnfStyleIt->second >>= sMask; nRowStyleMask = sMask.toInt32( 2 ); } @@ -532,7 +532,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl if ( aCnfStyleIter != aCellIterator->get( )->end( ) ) { if ( rInfo.pTableStyle ) { - rtl::OUString sMask; + OUString sMask; aCnfStyleIter->second >>= sMask; nCellStyleMask = sMask.toInt32( 2 ); } @@ -599,7 +599,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl #ifdef DEBUG_DMAPPER_TABLE_HANDLER //-->debug cell properties { - ::rtl::OUString sNames; + OUString sNames; const uno::Sequence< beans::PropertyValues > aDebugCurrentRow = aCellProperties[nRow]; sal_Int32 nDebugCells = aDebugCurrentRow.getLength(); (void) nDebugCells; @@ -609,11 +609,11 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl sal_Int32 nDebugCellProperties = aDebugCellProperties.getLength(); for( sal_Int32 nDebugProperty = 0; nDebugProperty < nDebugCellProperties; ++nDebugProperty) { - const ::rtl::OUString sName = aDebugCellProperties[nDebugProperty].Name; + const OUString sName = aDebugCellProperties[nDebugProperty].Name; sNames += sName; - sNames += ::rtl::OUString('-'); + sNames += OUString('-'); } - sNames += ::rtl::OUString('\n'); + sNames += OUString('\n'); } (void)sNames; } @@ -708,7 +708,7 @@ void DomainMapperTableHandler::endTable() { #ifdef DEBUG_DMAPPER_TABLE_HANDLER fprintf( stderr, "Conversion to table error: %s\n", - rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); dmapper_logger->chars(std::string("failed to import table!")); #else (void)e; @@ -718,7 +718,7 @@ void DomainMapperTableHandler::endTable() { #ifdef DEBUG_DMAPPER_TABLE_HANDLER fprintf( stderr, "Exception during table creation: %s\n", - rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) ); + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) ); #else (void) e; #endif diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index e22a1e6d69f5..46cf115a2258 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -511,7 +511,7 @@ void DomainMapperTableManager::endOfRowAction() void DomainMapperTableManager::clearData() { m_nRow = m_nCell = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0; - m_sTableStyleName = ::rtl::OUString(); + m_sTableStyleName = OUString(); m_pTableStyleTextProperies.reset(); } diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 55af1b347bcb..e41f50f761d2 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -42,7 +42,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t sal_Int32 m_nTableWidth; //might be set directly or has to be calculated from the column positions bool m_bOOXML; bool m_bImplicitMerges; - ::rtl::OUString m_sTableStyleName; + OUString m_sTableStyleName; PropertyMapPtr m_pTableStyleTextProperies; ::std::vector< IntVectorPtr > m_aTableGrid; @@ -73,7 +73,7 @@ public: IntVectorPtr getCurrentGrid( ); IntVectorPtr getCurrentSpans( ); - const ::rtl::OUString& getTableStyleName() const { return m_sTableStyleName; } + const OUString& getTableStyleName() const { return m_sTableStyleName; } /// copy the text properties of the table style and its parent into pContext void CopyTextProperties(PropertyMapPtr pContext, StyleSheetTablePtr pStyleSheetTable); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index d1c3e8154817..81565129b066 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -101,10 +101,10 @@ sal_Bool lcl_IsUsingEnhancedFields( const uno::Reference< lang::XMultiServiceFac bool bResult(sal_False); try { - rtl::OUString writerConfig = rtl::OUString( "org.openoffice.Office.Common"); + OUString writerConfig = "org.openoffice.Office.Common"; uno::Reference< uno::XInterface > xCfgAccess = ::comphelper::ConfigurationHelper::openConfig( rFac, writerConfig, ::comphelper::ConfigurationHelper::E_READONLY ); - ::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess, rtl::OUString( "Filter/Microsoft/Import" ), rtl::OUString( "ImportWWFieldsAsEnhancedFields" ) ) >>= bResult; + ::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess, OUString( "Filter/Microsoft/Import" ), OUString( "ImportWWFieldsAsEnhancedFields" ) ) >>= bResult; } catch( const uno::Exception& ) @@ -119,19 +119,19 @@ void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet >& rxFie if ( rxFieldProps.is() ) { if ( !pFFDataHandler->getName().isEmpty() ) - rxFieldProps->setPropertyValue( rtl::OUString( "Name" ), uno::makeAny( pFFDataHandler->getName() ) ); + rxFieldProps->setPropertyValue( "Name", uno::makeAny( pFFDataHandler->getName() ) ); const FFDataHandler::DropDownEntries_t& rEntries = pFFDataHandler->getDropDownEntries(); - uno::Sequence< rtl::OUString > sItems( rEntries.size() ); + uno::Sequence< OUString > sItems( rEntries.size() ); ::std::copy( rEntries.begin(), rEntries.end(), ::comphelper::stl_begin(sItems)); if ( sItems.getLength() ) - rxFieldProps->setPropertyValue( rtl::OUString( "Items" ), uno::makeAny( sItems ) ); + rxFieldProps->setPropertyValue( "Items", uno::makeAny( sItems ) ); sal_Int32 nResult = pFFDataHandler->getDropDownResult().toInt32(); if ( nResult ) - rxFieldProps->setPropertyValue( rtl::OUString( "SelectedItem" ), uno::makeAny( sItems[ nResult ] ) ); + rxFieldProps->setPropertyValue( "SelectedItem", uno::makeAny( sItems[ nResult ] ) ); if ( !pFFDataHandler->getHelpText().isEmpty() ) - rxFieldProps->setPropertyValue( rtl::OUString( "Help" ), uno::makeAny( pFFDataHandler->getHelpText() ) ); + rxFieldProps->setPropertyValue( "Help", uno::makeAny( pFFDataHandler->getHelpText() ) ); } } @@ -153,13 +153,13 @@ void lcl_handleTextField( const uno::Reference< beans::XPropertySet >& rxFieldPr struct FieldConversion { - ::rtl::OUString sWordCommand; + OUString sWordCommand; const sal_Char* cFieldServiceName; const sal_Char* cFieldMasterServiceName; FieldId eFieldId; }; -typedef ::std::map< ::rtl::OUString, FieldConversion> +typedef ::std::map< OUString, FieldConversion> FieldConversionMap_t; @@ -260,7 +260,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::GetDocumentSettings() } -void DomainMapper_Impl::SetDocumentSettingsProperty( const ::rtl::OUString& rPropName, const uno::Any& rValue ) +void DomainMapper_Impl::SetDocumentSettingsProperty( const OUString& rPropName, const uno::Any& rValue ) { uno::Reference< beans::XPropertySet > xSettings = GetDocumentSettings(); if( xSettings.is() ) @@ -287,7 +287,7 @@ void DomainMapper_Impl::RemoveLastParagraph( ) uno::Reference< text::XTextCursor > xCursor = xTextAppend->createTextCursor(); xCursor->gotoEnd(false); xCursor->goLeft( 1, true ); - xCursor->setString(::rtl::OUString()); + xCursor->setString(OUString()); } catch( const uno::Exception& ) { @@ -543,7 +543,7 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId) { StyleSheetEntryPtr pEntry; if( m_bInStyleSheetImport ) - pEntry = GetStyleSheetTable()->FindParentStyleSheet(::rtl::OUString()); + pEntry = GetStyleSheetTable()->FindParentStyleSheet(OUString()); else pEntry = GetStyleSheetTable()->FindStyleSheetByISTD(GetCurrentParaStyleId()); @@ -650,7 +650,7 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); for( sal_uInt32 nProperty = 0; nProperty < nBorderPropertyCount; ++nProperty) { - ::rtl::OUString sPropertyName = rPropNameSupplier.GetName(aBorderProperties[nProperty]); + OUString sPropertyName = rPropNameSupplier.GetName(aBorderProperties[nProperty]); pFrameProperties[nStart].Name = sPropertyName; pFrameProperties[nStart].Value = xTextRangeProperties->getPropertyValue(sPropertyName); if( nProperty < 4 ) @@ -681,7 +681,7 @@ void lcl_AddRangeAndStyle( PropertyMap::iterator aParaStyleIter = pPropertyMap->find(PropertyDefinition( PROP_PARA_STYLE_NAME, false ) ); if( aParaStyleIter != pPropertyMap->end()) { - ::rtl::OUString sName; + OUString sName; aParaStyleIter->second >>= sName; pToBeSavedProperties->SetParaStyleName(sName); } @@ -1080,16 +1080,16 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) } -util::DateTime lcl_DateStringToDateTime( const ::rtl::OUString& rDateTime ) +util::DateTime lcl_DateStringToDateTime( const OUString& rDateTime ) { util::DateTime aDateTime; //xsd::DateTime in the format [-]CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm] example: 2008-01-21T10:42:00Z //OUString getToken( sal_Int32 token, sal_Unicode cTok, sal_Int32& index ) const SAL_THROW(()) sal_Int32 nIndex = 0; - ::rtl::OUString sDate = rDateTime.getToken( 0, 'T', nIndex ); + OUString sDate = rDateTime.getToken( 0, 'T', nIndex ); // HACK: this is broken according to the spec, but MSOffice always treats the time as local, // and writes it as Z (=UTC+0) - ::rtl::OUString sTime = rDateTime.getToken( 0, 'Z', nIndex ); + OUString sTime = rDateTime.getToken( 0, 'Z', nIndex ); nIndex = 0; aDateTime.Year = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() ); aDateTime.Month = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() ); @@ -1102,7 +1102,7 @@ util::DateTime lcl_DateStringToDateTime( const ::rtl::OUString& rDateTime ) return aDateTime; } -void DomainMapper_Impl::appendTextPortion( const ::rtl::OUString& rString, PropertyMapPtr pPropertyMap ) +void DomainMapper_Impl::appendTextPortion( const OUString& rString, PropertyMapPtr pPropertyMap ) { if (m_aTextAppendStack.empty()) return; @@ -1155,9 +1155,9 @@ void DomainMapper_Impl::appendTextContent( -void DomainMapper_Impl::appendOLE( const ::rtl::OUString& rStreamName, OLEHandlerPtr pOLEHandler ) +void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pOLEHandler ) { - static const rtl::OUString sEmbeddedService("com.sun.star.text.TextEmbeddedObject"); + static const OUString sEmbeddedService("com.sun.star.text.TextEmbeddedObject"); try { uno::Reference< text::XTextContent > xOLE( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW ); @@ -1203,7 +1203,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val ) val.getAny() >>= formula; if( formula.is() ) { - static const rtl::OUString sEmbeddedService("com.sun.star.text.TextEmbeddedObject"); + static const OUString sEmbeddedService("com.sun.star.text.TextEmbeddedObject"); try { uno::Reference< text::XTextContent > xStarMath( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW ); @@ -1251,7 +1251,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter( xCursor->gotoEnd( true ); //the paragraph after this new section is already inserted xCursor->goLeft(1, true); - static const rtl::OUString sSectionService("com.sun.star.text.TextSection"); + static const OUString sSectionService("com.sun.star.text.TextSection"); uno::Reference< text::XTextContent > xSection( m_xTextFactory->createInstance(sSectionService), uno::UNO_QUERY_THROW ); xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) ); xRet = uno::Reference< beans::XPropertySet > (xSection, uno::UNO_QUERY ); @@ -1362,13 +1362,13 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) if (GetTextFactory().is()) xFootnoteText.set( GetTextFactory()->createInstance( bIsFootnote ? - ::rtl::OUString( "com.sun.star.text.Footnote" ) : ::rtl::OUString( "com.sun.star.text.Endnote" )), + OUString( "com.sun.star.text.Footnote" ) : OUString( "com.sun.star.text.Endnote" )), uno::UNO_QUERY_THROW ); uno::Reference< text::XFootnote > xFootnote( xFootnoteText, uno::UNO_QUERY_THROW ); pTopContext->SetFootnote( xFootnote ); if( pTopContext->GetFootnoteSymbol() != 0) { - xFootnote->setLabel( ::rtl::OUString( pTopContext->GetFootnoteSymbol() ) ); + xFootnote->setLabel( OUString( pTopContext->GetFootnoteSymbol() ) ); } FontTablePtr pFontTable = GetFontTable(); uno::Sequence< beans::PropertyValue > aFontProperties; @@ -1405,7 +1405,7 @@ void DomainMapper_Impl::CreateRedline( uno::Reference< text::XTextRange > xRange { try { - ::rtl::OUString sType; + OUString sType; PropertyNameSupplier & rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier( ); switch ( pRedline->m_nToken & 0xffff ) { @@ -1483,10 +1483,10 @@ void DomainMapper_Impl::PushAnnotation() if (!GetTextFactory().is()) return; m_xAnnotationField = uno::Reference< beans::XPropertySet >( GetTextFactory()->createInstance( - ::rtl::OUString( "com.sun.star.text.TextField.Annotation" ) ), + "com.sun.star.text.TextField.Annotation" ), uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xAnnotationText; - m_xAnnotationField->getPropertyValue(::rtl::OUString( "TextRange")) >>= xAnnotationText; + m_xAnnotationField->getPropertyValue("TextRange") >>= xAnnotationText; m_aTextAppendStack.push(uno::Reference< text::XTextAppend >( xAnnotationText, uno::UNO_QUERY_THROW )); } catch( const uno::Exception& ) @@ -1556,7 +1556,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape dmapper_logger->unoPropertySet(xProps); #endif uno::Reference< lang::XServiceInfo > xSInfo( xShape, uno::UNO_QUERY_THROW ); - bool bIsGraphic = xSInfo->supportsService( rtl::OUString( "com.sun.star.drawing.GraphicObjectShape" ) ); + bool bIsGraphic = xSInfo->supportsService( "com.sun.star.drawing.GraphicObjectShape" ); // If there are position properties, the shape should not be inserted "as character". sal_Int32 nHoriPosition = 0, nVertPosition = 0; @@ -1642,11 +1642,11 @@ void DomainMapper_Impl::PopShapeContext() } -::rtl::OUString lcl_FindQuotedText( const ::rtl::OUString& rCommand, +OUString lcl_FindQuotedText( const OUString& rCommand, const sal_Char* cStartQuote, const sal_Unicode uEndQuote ) { - ::rtl::OUString sRet; - ::rtl::OUString sStartQuote( ::rtl::OUString::createFromAscii(cStartQuote) ); + OUString sRet; + OUString sStartQuote( OUString::createFromAscii(cStartQuote) ); sal_Int32 nStartIndex = rCommand.indexOf( sStartQuote ); if( nStartIndex >= 0 ) { @@ -1662,12 +1662,12 @@ void DomainMapper_Impl::PopShapeContext() } -sal_Int16 lcl_ParseNumberingType( const ::rtl::OUString& rCommand ) +sal_Int16 lcl_ParseNumberingType( const OUString& rCommand ) { sal_Int16 nRet = style::NumberingType::PAGE_DESCRIPTOR; // The command looks like: " PAGE \* Arabic " - ::rtl::OUString sNumber = lcl_FindQuotedText(rCommand, "\\* ", ' '); + OUString sNumber = lcl_FindQuotedText(rCommand, "\\* ", ' '); if( !sNumber.isEmpty() ) { @@ -1759,7 +1759,7 @@ style::NumberingType:: } -OUString lcl_ParseFormat( const ::rtl::OUString& rCommand ) +OUString lcl_ParseFormat( const OUString& rCommand ) { // The command looks like: " DATE \@ "dd MMMM yyyy" return lcl_FindQuotedText(rCommand, "\\@ \"", '\"'); @@ -1767,7 +1767,7 @@ OUString lcl_ParseFormat( const ::rtl::OUString& rCommand ) /*------------------------------------------------------------------------- extract a parameter (with or without quotes) between the command and the following backslash -----------------------------------------------------------------------*/ -::rtl::OUString lcl_ExtractParameter(const ::rtl::OUString& rCommand, sal_Int32 nCommandLength ) +OUString lcl_ExtractParameter(const OUString& rCommand, sal_Int32 nCommandLength ) { sal_Int32 nStartIndex = nCommandLength; sal_Int32 nEndIndex = 0; @@ -1781,7 +1781,7 @@ extract a parameter (with or without quotes) between the command and the followi { nEndIndex = rCommand.indexOf(" \\", nStartIndex); } - ::rtl::OUString sRet; + OUString sRet; if( nEndIndex > nStartIndex + 1 ) { //remove spaces at start and end of the result @@ -1800,7 +1800,7 @@ extract a parameter (with or without quotes) between the command and the followi -::rtl::OUString lcl_ExctractAskVariableAndHint( const ::rtl::OUString& rCommand, ::rtl::OUString& rHint ) +OUString lcl_ExctractAskVariableAndHint( const OUString& rCommand, OUString& rHint ) { // the first word after "ASK " is the variable // the text after the variable and before a '\' is the hint @@ -1809,12 +1809,12 @@ extract a parameter (with or without quotes) between the command and the followi sal_Int32 nIndex = rCommand.indexOf( ' ', 2);//find last space after 'ASK' while(rCommand.getStr()[nIndex] == ' ') ++nIndex; - ::rtl::OUString sShortCommand( rCommand.copy( nIndex ) ); //cut off the " ASK " + OUString sShortCommand( rCommand.copy( nIndex ) ); //cut off the " ASK " nIndex = 0; sShortCommand = sShortCommand.getToken( 0, '\\', nIndex); nIndex = 0; - ::rtl::OUString sRet = sShortCommand.getToken( 0, ' ', nIndex); + OUString sRet = sShortCommand.getToken( 0, ' ', nIndex); if( nIndex > 0) rHint = sShortCommand.copy( nIndex ); if( rHint.isEmpty() ) @@ -1824,13 +1824,13 @@ extract a parameter (with or without quotes) between the command and the followi bool lcl_FindInCommand( - const ::rtl::OUString& rCommand, + const OUString& rCommand, sal_Unicode cSwitch, - ::rtl::OUString& rValue ) + OUString& rValue ) { bool bRet = false; - ::rtl::OUString sSearch('\\'); - sSearch += ::rtl::OUString( cSwitch ); + OUString sSearch('\\'); + sSearch += OUString( cSwitch ); sal_Int32 nIndex = rCommand.indexOf( sSearch ); if( nIndex >= 0 ) { @@ -1869,7 +1869,7 @@ void DomainMapper_Impl::GetCurrentLocale(lang::Locale& rLocale) extract the number format from the command and apply the resulting number format to the XPropertySet -----------------------------------------------------------------------*/ -void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand, +void DomainMapper_Impl::SetNumberFormat( const OUString& rCommand, uno::Reference< beans::XPropertySet >& xPropertySet ) { OUString sFormatString = lcl_ParseFormat( rCommand ); @@ -1882,7 +1882,7 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand, //determine current locale - todo: is it necessary to initialize this locale? lang::Locale aCurrentLocale = aUSLocale; GetCurrentLocale( aCurrentLocale ); - ::rtl::OUString sFormat = ConversionHelper::ConvertMSFormatStringToSO( sFormatString, aCurrentLocale, bHijri); + OUString sFormat = ConversionHelper::ConvertMSFormatStringToSO( sFormatString, aCurrentLocale, bHijri); //get the number formatter and convert the string to a format value try { @@ -1902,19 +1902,19 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand, uno::Reference< beans::XPropertySet > DomainMapper_Impl::FindOrCreateFieldMaster( - const sal_Char* pFieldMasterService, const ::rtl::OUString& rFieldMasterName ) + const sal_Char* pFieldMasterService, const OUString& rFieldMasterName ) throw(::com::sun::star::uno::Exception) { // query master, create if not available uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( GetTextDocument(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xFieldMasterAccess = xFieldsSupplier->getTextFieldMasters(); uno::Reference< beans::XPropertySet > xMaster; - ::rtl::OUString sFieldMasterService( ::rtl::OUString::createFromAscii(pFieldMasterService) ); - ::rtl::OUStringBuffer aFieldMasterName; + OUString sFieldMasterService( OUString::createFromAscii(pFieldMasterService) ); + OUStringBuffer aFieldMasterName; aFieldMasterName.appendAscii( pFieldMasterService ); aFieldMasterName.append(sal_Unicode('.')); aFieldMasterName.append(rFieldMasterName); - ::rtl::OUString sFieldMasterName = aFieldMasterName.makeStringAndClear(); + OUString sFieldMasterName = aFieldMasterName.makeStringAndClear(); if(xFieldMasterAccess->hasByName(sFieldMasterName)) { //get the master @@ -1950,7 +1950,7 @@ void DomainMapper_Impl::PushFieldContext() if (xTextAppend.is()) { //insert a dummy char to make sure the start range doesn't move together with the to-be-appended text - xTextAppend->appendTextPortion(::rtl::OUString( '-' ), uno::Sequence< beans::PropertyValue >() ); + xTextAppend->appendTextPortion(OUString( '-' ), uno::Sequence< beans::PropertyValue >() ); uno::Reference< text::XTextCursor > xCrsr = xTextAppend->createTextCursorByRange( xTextAppend->getEnd() ); xCrsr->goLeft( 1, false ); xStart = xCrsr->getStart(); @@ -1985,14 +1985,14 @@ FieldContext::~FieldContext() } -void FieldContext::AppendCommand(const ::rtl::OUString& rPart) +void FieldContext::AppendCommand(const OUString& rPart) { m_sCommand += rPart; } -::std::vector<rtl::OUString> FieldContext::GetCommandParts() const +::std::vector<OUString> FieldContext::GetCommandParts() const { - ::std::vector<rtl::OUString> aResult; + ::std::vector<OUString> aResult; sal_Int32 nIndex = 0; bool bInString = false; OUString sPart; @@ -2049,7 +2049,7 @@ void FieldContext::AppendCommand(const ::rtl::OUString& rPart) /*------------------------------------------------------------------------- //collect the pieces of the command -----------------------------------------------------------------------*/ -void DomainMapper_Impl::AppendFieldCommand(::rtl::OUString& rPartOfCommand) +void DomainMapper_Impl::AppendFieldCommand(OUString& rPartOfCommand) { #ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("appendFieldCommand"); @@ -2066,7 +2066,7 @@ void DomainMapper_Impl::AppendFieldCommand(::rtl::OUString& rPartOfCommand) } -typedef std::multimap < sal_Int32, ::rtl::OUString > TOCStyleMap; +typedef std::multimap < sal_Int32, OUString > TOCStyleMap; const FieldConversionMap_t & lcl_GetFieldConversion() { @@ -2079,67 +2079,67 @@ if(!bFilled) { static const FieldConversion aFields[] = { -// {::rtl::OUString("ADDRESSBLOCK"), "", "", FIELD_ADDRESSBLOCK }, -// {::rtl::OUString("ADVANCE"), "", "", FIELD_ADVANCE }, - {::rtl::OUString("ASK"), "SetExpression", "SetExpression", FIELD_ASK }, - {::rtl::OUString("AUTONUM"), "SetExpression", "SetExpression", FIELD_AUTONUM }, - {::rtl::OUString("AUTONUMLGL"), "SetExpression", "SetExpression", FIELD_AUTONUMLGL }, - {::rtl::OUString("AUTONUMOUT"), "SetExpression", "SetExpression", FIELD_AUTONUMOUT }, - {::rtl::OUString("AUTHOR"), "DocInfo.CreateAuthor", "", FIELD_AUTHOR }, - {::rtl::OUString("DATE"), "DateTime", "", FIELD_DATE }, - {::rtl::OUString("COMMENTS"), "DocInfo.Description", "", FIELD_COMMENTS }, - {::rtl::OUString("CREATEDATE"), "DocInfo.CreateDateTime", "", FIELD_CREATEDATE }, - {::rtl::OUString("DOCPROPERTY"), "", "", FIELD_DOCPROPERTY }, - {::rtl::OUString("DOCVARIABLE"), "User", "", FIELD_DOCVARIABLE }, - {::rtl::OUString("EDITTIME"), "DocInfo.EditTime", "", FIELD_EDITTIME }, - {::rtl::OUString("FILLIN"), "Input", "", FIELD_FILLIN }, - {::rtl::OUString("FILENAME"), "FileName", "", FIELD_FILENAME }, -// {::rtl::OUString("FILESIZE"), "", "", FIELD_FILESIZE }, -// {::rtl::OUString("FORMULA"), "", "", FIELD_FORMULA }, - {::rtl::OUString("FORMCHECKBOX"), "", "", FIELD_FORMCHECKBOX}, - {::rtl::OUString("FORMDROPDOWN"), "DropDown", "", FIELD_FORMDROPDOWN}, - {::rtl::OUString("FORMTEXT"), "Input", "", FIELD_FORMTEXT}, -// {::rtl::OUString("GOTOBUTTON"), "", "", FIELD_GOTOBUTTON }, - {::rtl::OUString("HYPERLINK"), "", "", FIELD_HYPERLINK }, - {::rtl::OUString("IF"), "ConditionalText", "", FIELD_IF }, -// {::rtl::OUString("INFO"), "","", FIELD_INFO }, -// {::rtl::OUString("INCLUDEPICTURE"), "", "", FIELD_INCLUDEPICTURE}, - {::rtl::OUString("KEYWORDS"), "DocInfo.KeyWords", "", FIELD_KEYWORDS }, - {::rtl::OUString("LASTSAVEDBY"), "DocInfo.ChangeAuthor", "", FIELD_LASTSAVEDBY }, - {::rtl::OUString("MACROBUTTON"), "Macro", "", FIELD_MACROBUTTON }, - {::rtl::OUString("MERGEFIELD"), "Database", "Database", FIELD_MERGEFIELD}, - {::rtl::OUString("MERGEREC"), "DatabaseNumberOfSet", "", FIELD_MERGEREC }, -// {::rtl::OUString("MERGESEQ"), "", "", FIELD_MERGESEQ }, - {::rtl::OUString("NEXT"), "DatabaseNextSet", "", FIELD_NEXT }, - {::rtl::OUString("NEXTIF"), "DatabaseNextSet", "", FIELD_NEXTIF }, - {::rtl::OUString("PAGE"), "PageNumber", "", FIELD_PAGE }, - {::rtl::OUString("PAGEREF"), "GetReference", "", FIELD_PAGEREF }, - {::rtl::OUString("REF"), "GetReference", "", FIELD_REF }, - {::rtl::OUString("REVNUM"), "DocInfo.Revision", "", FIELD_REVNUM }, - {::rtl::OUString("SAVEDATE"), "DocInfo.Change", "", FIELD_SAVEDATE }, -// {::rtl::OUString("SECTION"), "", "", FIELD_SECTION }, -// {::rtl::OUString("SECTIONPAGES"), "", "", FIELD_SECTIONPAGES }, - {::rtl::OUString("SEQ"), "SetExpression", "SetExpression", FIELD_SEQ }, -// {::rtl::OUString("SET"), "","", FIELD_SET }, -// {::rtl::OUString("SKIPIF"),"", "", FIELD_SKIPIF }, -// {::rtl::OUString("STYLEREF"),"", "", FIELD_STYLEREF }, - {::rtl::OUString("SUBJECT"), "DocInfo.Subject", "", FIELD_SUBJECT }, -// {::rtl::OUString("SYMBOL"),"", "", FIELD_SYMBOL }, - {::rtl::OUString("TEMPLATE"), "TemplateName", "", FIELD_TEMPLATE}, - {::rtl::OUString("TIME"), "DateTime", "", FIELD_TIME }, - {::rtl::OUString("TITLE"), "DocInfo.Title", "", FIELD_TITLE }, - {::rtl::OUString("USERINITIALS"), "Author", "", FIELD_USERINITIALS }, -// {::rtl::OUString("USERADDRESS"), "", "", FIELD_USERADDRESS }, - {::rtl::OUString("USERNAME"), "Author", "", FIELD_USERNAME }, - - - {::rtl::OUString("TOC"), "com.sun.star.text.ContentIndex", "", FIELD_TOC}, - {::rtl::OUString("TC"), "com.sun.star.text.ContentIndexMark", "", FIELD_TC}, - {::rtl::OUString("NUMCHARS"), "CharacterCount", "", FIELD_NUMCHARS}, - {::rtl::OUString("NUMWORDS"), "WordCount", "", FIELD_NUMWORDS}, - {::rtl::OUString("NUMPAGES"), "PageCount", "", FIELD_NUMPAGES}, - -// {::rtl::OUString(""), "", "", FIELD_}, +// {OUString("ADDRESSBLOCK"), "", "", FIELD_ADDRESSBLOCK }, +// {OUString("ADVANCE"), "", "", FIELD_ADVANCE }, + {OUString("ASK"), "SetExpression", "SetExpression", FIELD_ASK }, + {OUString("AUTONUM"), "SetExpression", "SetExpression", FIELD_AUTONUM }, + {OUString("AUTONUMLGL"), "SetExpression", "SetExpression", FIELD_AUTONUMLGL }, + {OUString("AUTONUMOUT"), "SetExpression", "SetExpression", FIELD_AUTONUMOUT }, + {OUString("AUTHOR"), "DocInfo.CreateAuthor", "", FIELD_AUTHOR }, + {OUString("DATE"), "DateTime", "", FIELD_DATE }, + {OUString("COMMENTS"), "DocInfo.Description", "", FIELD_COMMENTS }, + {OUString("CREATEDATE"), "DocInfo.CreateDateTime", "", FIELD_CREATEDATE }, + {OUString("DOCPROPERTY"), "", "", FIELD_DOCPROPERTY }, + {OUString("DOCVARIABLE"), "User", "", FIELD_DOCVARIABLE }, + {OUString("EDITTIME"), "DocInfo.EditTime", "", FIELD_EDITTIME }, + {OUString("FILLIN"), "Input", "", FIELD_FILLIN }, + {OUString("FILENAME"), "FileName", "", FIELD_FILENAME }, +// {OUString("FILESIZE"), "", "", FIELD_FILESIZE }, +// {OUString("FORMULA"), "", "", FIELD_FORMULA }, + {OUString("FORMCHECKBOX"), "", "", FIELD_FORMCHECKBOX}, + {OUString("FORMDROPDOWN"), "DropDown", "", FIELD_FORMDROPDOWN}, + {OUString("FORMTEXT"), "Input", "", FIELD_FORMTEXT}, +// {OUString("GOTOBUTTON"), "", "", FIELD_GOTOBUTTON }, + {OUString("HYPERLINK"), "", "", FIELD_HYPERLINK }, + {OUString("IF"), "ConditionalText", "", FIELD_IF }, +// {OUString("INFO"), "","", FIELD_INFO }, +// {OUString("INCLUDEPICTURE"), "", "", FIELD_INCLUDEPICTURE}, + {OUString("KEYWORDS"), "DocInfo.KeyWords", "", FIELD_KEYWORDS }, + {OUString("LASTSAVEDBY"), "DocInfo.ChangeAuthor", "", FIELD_LASTSAVEDBY }, + {OUString("MACROBUTTON"), "Macro", "", FIELD_MACROBUTTON }, + {OUString("MERGEFIELD"), "Database", "Database", FIELD_MERGEFIELD}, + {OUString("MERGEREC"), "DatabaseNumberOfSet", "", FIELD_MERGEREC }, +// {OUString("MERGESEQ"), "", "", FIELD_MERGESEQ }, + {OUString("NEXT"), "DatabaseNextSet", "", FIELD_NEXT }, + {OUString("NEXTIF"), "DatabaseNextSet", "", FIELD_NEXTIF }, + {OUString("PAGE"), "PageNumber", "", FIELD_PAGE }, + {OUString("PAGEREF"), "GetReference", "", FIELD_PAGEREF }, + {OUString("REF"), "GetReference", "", FIELD_REF }, + {OUString("REVNUM"), "DocInfo.Revision", "", FIELD_REVNUM }, + {OUString("SAVEDATE"), "DocInfo.Change", "", FIELD_SAVEDATE }, +// {OUString("SECTION"), "", "", FIELD_SECTION }, +// {OUString("SECTIONPAGES"), "", "", FIELD_SECTIONPAGES }, + {OUString("SEQ"), "SetExpression", "SetExpression", FIELD_SEQ }, +// {OUString("SET"), "","", FIELD_SET }, +// {OUString("SKIPIF"),"", "", FIELD_SKIPIF }, +// {OUString("STYLEREF"),"", "", FIELD_STYLEREF }, + {OUString("SUBJECT"), "DocInfo.Subject", "", FIELD_SUBJECT }, +// {OUString("SYMBOL"),"", "", FIELD_SYMBOL }, + {OUString("TEMPLATE"), "TemplateName", "", FIELD_TEMPLATE}, + {OUString("TIME"), "DateTime", "", FIELD_TIME }, + {OUString("TITLE"), "DocInfo.Title", "", FIELD_TITLE }, + {OUString("USERINITIALS"), "Author", "", FIELD_USERINITIALS }, +// {OUString("USERADDRESS"), "", "", FIELD_USERADDRESS }, + {OUString("USERNAME"), "Author", "", FIELD_USERNAME }, + + + {OUString("TOC"), "com.sun.star.text.ContentIndex", "", FIELD_TOC}, + {OUString("TC"), "com.sun.star.text.ContentIndexMark", "", FIELD_TC}, + {OUString("NUMCHARS"), "CharacterCount", "", FIELD_NUMCHARS}, + {OUString("NUMWORDS"), "WordCount", "", FIELD_NUMWORDS}, + {OUString("NUMPAGES"), "PageCount", "", FIELD_NUMPAGES}, + +// {OUString(""), "", "", FIELD_}, }; size_t nConversions = SAL_N_ELEMENTS(aFields); @@ -2166,9 +2166,9 @@ const FieldConversionMap_t & lcl_GetEnhancedFieldConversion() { static const FieldConversion aEnhancedFields[] = { - {::rtl::OUString("FORMCHECKBOX"), "FormFieldmark", "", FIELD_FORMCHECKBOX}, - {::rtl::OUString("FORMDROPDOWN"), "FormFieldmark", "", FIELD_FORMDROPDOWN}, - {::rtl::OUString("FORMTEXT"), "Fieldmark", "", FIELD_FORMTEXT}, + {OUString("FORMCHECKBOX"), "FormFieldmark", "", FIELD_FORMCHECKBOX}, + {OUString("FORMDROPDOWN"), "FormFieldmark", "", FIELD_FORMDROPDOWN}, + {OUString("FORMTEXT"), "Fieldmark", "", FIELD_FORMTEXT}, }; size_t nConversions = SAL_N_ELEMENTS(aEnhancedFields); @@ -2189,7 +2189,7 @@ void DomainMapper_Impl::handleFieldAsk uno::Reference< beans::XPropertySet > xFieldProperties) { //doesn the command contain a variable name? - ::rtl::OUString sVariable, sHint; + OUString sVariable, sHint; sVariable = lcl_ExctractAskVariableAndHint( pContext->GetCommand(), sHint ); @@ -2271,7 +2271,7 @@ void DomainMapper_Impl::handleAuthor nLen = sizeof( " USERNAME" ); } - ::rtl::OUString sParam = + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), nLen ); if(!sParam.isEmpty()) @@ -2291,7 +2291,7 @@ void DomainMapper_Impl::handleAuthor { //some docproperties should be imported as document statistic fields, some as DocInfo fields //others should be user fields - ::rtl::OUString sParam = + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" DOCPROPERTY") ); if(!sParam.isEmpty()) @@ -2329,7 +2329,7 @@ void DomainMapper_Impl::handleAuthor //Security, }; //search for a field mapping - ::rtl::OUString sFieldServiceName; + OUString sFieldServiceName; sal_uInt16 nMap = 0; for( ; nMap < sizeof(aDocProperties) / sizeof(DocPropertyMap); ++nMap ) @@ -2337,12 +2337,12 @@ void DomainMapper_Impl::handleAuthor if(sParam.equalsAscii(aDocProperties[nMap].pDocPropertyName)) { sFieldServiceName = - ::rtl::OUString::createFromAscii + OUString::createFromAscii (aDocProperties[nMap].pServiceName); break; } } - ::rtl::OUString sServiceName("com.sun.star.text.TextField."); + OUString sServiceName("com.sun.star.text.TextField."); bool bIsCustomField = false; if(sFieldServiceName.isEmpty()) { @@ -2392,16 +2392,16 @@ void DomainMapper_Impl::handleToc PropertyNameSupplier& rPropNameSupplier, uno::Reference< uno::XInterface > & /*xFieldInterface*/, uno::Reference< beans::XPropertySet > /*xFieldProperties*/, - const ::rtl::OUString & sTOCServiceName) + const OUString & sTOCServiceName) { - ::rtl::OUString sValue; + OUString sValue; bool bTableOfFigures = false; bool bHyperlinks = false; bool bFromOutline = false; bool bFromEntries = false; sal_Int16 nMaxLevel = 10; - ::rtl::OUString sTemplate; - ::rtl::OUString sChapterNoSeparator; + OUString sTemplate; + OUString sChapterNoSeparator; // \a Builds a table of figures but does not include the captions's label and number if( lcl_FindInCommand( pContext->GetCommand(), 'a', sValue )) { //make it a table of figures @@ -2463,7 +2463,7 @@ void DomainMapper_Impl::handleToc if( lcl_FindInCommand( pContext->GetCommand(), 't', sValue )) { sal_Int32 nPos = 0; - ::rtl::OUString sToken = sValue.getToken( 1, '"', nPos); + OUString sToken = sValue.getToken( 1, '"', nPos); sTemplate = sToken.isEmpty() ? sValue : sToken; } // \u Builds a table of contents by using the applied paragraph outline level @@ -2499,7 +2499,7 @@ void DomainMapper_Impl::handleToc : sTOCServiceName), uno::UNO_QUERY_THROW); if (xTOC.is()) - xTOC->setPropertyValue(rPropNameSupplier.GetName( PROP_TITLE ), uno::makeAny(::rtl::OUString())); + xTOC->setPropertyValue(rPropNameSupplier.GetName( PROP_TITLE ), uno::makeAny(OUString())); if( !bTableOfFigures && xTOC.is() ) { xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_LEVEL ), uno::makeAny( nMaxLevel ) ); @@ -2514,7 +2514,7 @@ void DomainMapper_Impl::handleToc sal_Int32 nPosition = 0; while( nPosition >= 0) { - ::rtl::OUString sStyleName = sTemplate.getToken( 0, ',', nPosition ); + OUString sStyleName = sTemplate.getToken( 0, ',', nPosition ); //empty tokens should be skipped while( sStyleName.isEmpty() && nPosition > 0 ) sStyleName = sTemplate.getToken( 0, ',', nPosition ); @@ -2533,7 +2533,7 @@ void DomainMapper_Impl::handleToc { TOCStyleMap::iterator aTOCStyleIter = aMap.find( nLevel ); - uno::Sequence< rtl::OUString> aStyles( nLevelCount ); + uno::Sequence< OUString> aStyles( nLevelCount ); for ( sal_Int32 nStyle = 0; nStyle < nLevelCount; ++nStyle, ++aTOCStyleIter ) { aStyles[nStyle] = aTOCStyleIter->second; @@ -2623,7 +2623,7 @@ void DomainMapper_Impl::CloseFieldCommand() { uno::Reference< uno::XInterface > xFieldInterface; //at first determine the field type - erase leading and trailing whitespaces - ::rtl::OUString sCommand( pContext->GetCommand().trim() ); + OUString sCommand( pContext->GetCommand().trim() ); sal_Int32 nSpaceIndex = sCommand.indexOf( ' ' ); if( 0 <= nSpaceIndex ) sCommand = sCommand.copy( 0, nSpaceIndex ); @@ -2671,12 +2671,12 @@ void DomainMapper_Impl::CloseFieldCommand() FieldConversionMap_t aEnhancedFieldConversionMap = lcl_GetEnhancedFieldConversion(); FieldConversionMap_t::iterator aEnhancedIt = aEnhancedFieldConversionMap.find(sCommand); if ( aEnhancedIt != aEnhancedFieldConversionMap.end()) - sServiceName += ::rtl::OUString::createFromAscii(aEnhancedIt->second.cFieldServiceName ); + sServiceName += OUString::createFromAscii(aEnhancedIt->second.cFieldServiceName ); } else { - sServiceName += rtl::OUString( "TextField."); - sServiceName += ::rtl::OUString::createFromAscii(aIt->second.cFieldServiceName ); + sServiceName += OUString( "TextField."); + sServiceName += OUString::createFromAscii(aIt->second.cFieldServiceName ); } #ifdef DEBUG_DOMAINMAPPER @@ -2724,7 +2724,7 @@ void DomainMapper_Impl::CloseFieldCommand() break; case FIELD_COMMENTS : { - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") ); + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") ); // A parameter with COMMENTS shouldn't set fixed // ( or at least the binary filter doesn't ) // If we set fixed then we wont export a field cmd. @@ -2750,7 +2750,7 @@ void DomainMapper_Impl::CloseFieldCommand() break; case FIELD_DOCVARIABLE : { - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" DOCVARIABLE") ); + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" DOCVARIABLE") ); //create a user field and type uno::Reference< beans::XPropertySet > xMaster = FindOrCreateFieldMaster( "com.sun.star.text.FieldMaster.User", sParam ); @@ -2817,9 +2817,9 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_GOTOBUTTON : break; case FIELD_HYPERLINK: { - ::std::vector<rtl::OUString> aParts = pContext->GetCommandParts(); - ::std::vector<rtl::OUString>::const_iterator aItEnd = aParts.end(); - ::std::vector<rtl::OUString>::const_iterator aPartIt = aParts.begin(); + ::std::vector<OUString> aParts = pContext->GetCommandParts(); + ::std::vector<OUString>::const_iterator aItEnd = aParts.end(); + ::std::vector<OUString>::const_iterator aPartIt = aParts.begin(); OUString sURL; @@ -2864,7 +2864,7 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_INCLUDEPICTURE: break; case FIELD_KEYWORDS : { - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" KEYWORDS") ); + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" KEYWORDS") ); if(!sParam.isEmpty()) { xFieldProperties->setPropertyValue( @@ -2878,7 +2878,7 @@ void DomainMapper_Impl::CloseFieldCommand() { //extract macro name sal_Int32 nIndex = sizeof(" MACROBUTTON "); - ::rtl::OUString sMacro = pContext->GetCommand().getToken( 0, ' ', nIndex); + OUString sMacro = pContext->GetCommand().getToken( 0, ' ', nIndex); if (xFieldProperties.is()) xFieldProperties->setPropertyValue( rPropNameSupplier.GetName(PROP_MACRO_NAME), uno::makeAny( sMacro )); @@ -2895,7 +2895,7 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_MERGEFIELD : { //todo: create a database field and fieldmaster pointing to a column, only - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" MERGEFIELD") ); + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" MERGEFIELD") ); //create a user field and type uno::Reference< beans::XPropertySet > xMaster = FindOrCreateFieldMaster( "com.sun.star.text.FieldMaster.Database", sParam ); @@ -2929,7 +2929,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (xFieldProperties.is()) { bool bPageRef = aIt->second.eFieldId == FIELD_PAGEREF; - ::rtl::OUString sBookmark = lcl_ExtractParameter(pContext->GetCommand(), + OUString sBookmark = lcl_ExtractParameter(pContext->GetCommand(), (bPageRef ? sizeof(" PAGEREF") : sizeof(" REF"))); // Do we need a GetReference (default) or a GetExpression field? @@ -2945,7 +2945,7 @@ void DomainMapper_Impl::CloseFieldCommand() rPropNameSupplier.GetName(PROP_SOURCE_NAME), uno::makeAny( sBookmark) ); sal_Int16 nFieldPart = (bPageRef ? text::ReferenceFieldPart::PAGE : text::ReferenceFieldPart::TEXT); - ::rtl::OUString sValue; + OUString sValue; if( lcl_FindInCommand( pContext->GetCommand(), 'p', sValue )) { //above-below @@ -2990,7 +2990,7 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_STYLEREF : break; case FIELD_SUBJECT : { - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" SUBJECT") ); + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" SUBJECT") ); if(!sParam.isEmpty()) { xFieldProperties->setPropertyValue( @@ -3006,7 +3006,7 @@ void DomainMapper_Impl::CloseFieldCommand() break; case FIELD_TITLE : { - ::rtl::OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" TITLE") ); + OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" TITLE") ); if(!sParam.isEmpty()) { xFieldProperties->setPropertyValue( @@ -3019,19 +3019,19 @@ void DomainMapper_Impl::CloseFieldCommand() break; case FIELD_TOC: handleToc(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties, - ::rtl::OUString::createFromAscii(aIt->second.cFieldServiceName)); + OUString::createFromAscii(aIt->second.cFieldServiceName)); break; case FIELD_TC : { uno::Reference< beans::XPropertySet > xTC( m_xTextFactory->createInstance( - ::rtl::OUString::createFromAscii(aIt->second.cFieldServiceName)), + OUString::createFromAscii(aIt->second.cFieldServiceName)), uno::UNO_QUERY_THROW); - ::rtl::OUString sTCText = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" TC") ); + OUString sTCText = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" TC") ); if( !sTCText.isEmpty()) xTC->setPropertyValue(rPropNameSupplier.GetName(PROP_ALTERNATIVE_TEXT), uno::makeAny(sTCText)); - ::rtl::OUString sValue; + OUString sValue; // \f TC entry in doc with multiple tables // if( lcl_FindInCommand( pContext->GetCommand(), 'f', sValue )) // { @@ -3090,7 +3090,7 @@ bool DomainMapper_Impl::IsFieldResultAsString() } -void DomainMapper_Impl::SetFieldResult( ::rtl::OUString& rResult ) +void DomainMapper_Impl::SetFieldResult( OUString& rResult ) { #ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("setFieldResult"); @@ -3195,7 +3195,7 @@ void DomainMapper_Impl::PopFieldContext() uno::Reference< text::XTextCursor > xCrsr = xTextAppend->createTextCursorByRange(pContext->GetStartRange()); //remove the dummy character xCrsr->goRight( 1, true ); - xCrsr->setString( ::rtl::OUString() ); + xCrsr->setString( OUString() ); uno::Reference< text::XTextContent > xToInsert( pContext->GetTOC(), uno::UNO_QUERY ); if( xToInsert.is() ) { @@ -3267,7 +3267,7 @@ void DomainMapper_Impl::PopFieldContext() } -void DomainMapper_Impl::AddBookmark( const ::rtl::OUString& rBookmarkName, const ::rtl::OUString& rId ) +void DomainMapper_Impl::AddBookmark( const OUString& rBookmarkName, const OUString& rId ) { if (m_aTextAppendStack.empty()) return; @@ -3278,7 +3278,7 @@ void DomainMapper_Impl::AddBookmark( const ::rtl::OUString& rBookmarkName, const { if( aBookmarkIter != m_aBookmarkMap.end() ) { - static const rtl::OUString sBookmarkService("com.sun.star.text.Bookmark"); + static const OUString sBookmarkService("com.sun.star.text.Bookmark"); if (m_xTextFactory.is()) { uno::Reference< text::XTextContent > xBookmark( m_xTextFactory->createInstance( sBookmarkService ), uno::UNO_QUERY_THROW ); @@ -3470,7 +3470,7 @@ bool DomainMapper_Impl::ExecuteFrameConversion() { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Exception caught when converting to frame: %s\n", - rtl::OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif (void)rEx; bRet = false; @@ -3515,7 +3515,7 @@ sal_Int32 DomainMapper_Impl::GetCurrentRedlineToken( ) return nToken; } -void DomainMapper_Impl::SetCurrentRedlineAuthor( rtl::OUString sAuthor ) +void DomainMapper_Impl::SetCurrentRedlineAuthor( OUString sAuthor ) { if (!m_xAnnotationField.is()) { @@ -3527,13 +3527,13 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( rtl::OUString sAuthor ) m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor)); } -void DomainMapper_Impl::SetCurrentRedlineInitials( rtl::OUString sInitials ) +void DomainMapper_Impl::SetCurrentRedlineInitials( OUString sInitials ) { if (m_xAnnotationField.is()) m_xAnnotationField->setPropertyValue("Initials", uno::makeAny(sInitials)); } -void DomainMapper_Impl::SetCurrentRedlineDate( rtl::OUString sDate ) +void DomainMapper_Impl::SetCurrentRedlineDate( OUString sDate ) { if (!m_xAnnotationField.is()) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index ac8fe3c6d95b..3e28f2262357 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -119,13 +119,13 @@ class FieldContext bool m_bFieldCommandCompleted; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStartRange; - ::rtl::OUString m_sCommand; + OUString m_sCommand; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > m_xTextField; ::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField > m_xFormField; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTOC;//TOX ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTC;//TOX entry - ::rtl::OUString m_sHyperlinkURL; + OUString m_sHyperlinkURL; FFDataHandler::Pointer_t m_pFFDataHandler; FormControlHelper::Pointer_t m_pFormControlHelper; @@ -135,8 +135,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetStartRange() const { return m_xStartRange; } - void AppendCommand(const ::rtl::OUString& rPart); - const ::rtl::OUString& GetCommand() const {return m_sCommand; } + void AppendCommand(const OUString& rPart); + const OUString& GetCommand() const {return m_sCommand; } void SetCommandCompleted() { m_bFieldCommandCompleted = true; } bool IsCommandCompleted() const { return m_bFieldCommandCompleted; } @@ -152,8 +152,8 @@ public: void SetTC( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xTC ) { m_xTC = xTC; } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTC( ) { return m_xTC; } - void SetHyperlinkURL( const ::rtl::OUString& rURL ) { m_sHyperlinkURL = rURL; } - const ::rtl::OUString& GetHyperlinkURL() { return m_sHyperlinkURL; } + void SetHyperlinkURL( const OUString& rURL ) { m_sHyperlinkURL = rURL; } + const OUString& GetHyperlinkURL() { return m_sHyperlinkURL; } void setFFDataHandler(FFDataHandler::Pointer_t pFFDataHandler) { m_pFFDataHandler = pFFDataHandler; } FFDataHandler::Pointer_t getFFDataHandler() const { return m_pFFDataHandler; } @@ -161,7 +161,7 @@ public: void setFormControlHelper(FormControlHelper::Pointer_t pFormControlHelper) { m_pFormControlHelper = pFormControlHelper; } FormControlHelper::Pointer_t getFormControlHelper() const { return m_pFormControlHelper; } - ::std::vector<rtl::OUString> GetCommandParts() const; + ::std::vector<OUString> GetCommandParts() const; }; struct TextAppendContext @@ -226,9 +226,9 @@ struct DeletableTabStop : public ::com::sun::star::style::TabStop struct BookmarkInsertPosition { bool m_bIsStartOfText; - ::rtl::OUString m_sBookmarkName; + OUString m_sBookmarkName; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xTextRange; - BookmarkInsertPosition(bool bIsStartOfText, const ::rtl::OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange): + BookmarkInsertPosition(bool bIsStartOfText, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange): m_bIsStartOfText( bIsStartOfText ), m_sBookmarkName( rName ), m_xTextRange( xTextRange ) @@ -244,8 +244,8 @@ struct AnnotationPosition struct RedlineParams { - ::rtl::OUString m_sAuthor; - ::rtl::OUString m_sDate; + OUString m_sAuthor; + OUString m_sDate; sal_Int32 m_nId; sal_Int32 m_nToken; }; @@ -277,7 +277,7 @@ class WRITERFILTER_DLLPRIVATE DomainMapper_Impl public: typedef TableManager< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, PropertyMapPtr > TableManager_t; typedef TableDataHandler< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, TablePropertyMapPtr > TableDataHandler_t; - typedef std::map < ::rtl::OUString, BookmarkInsertPosition > BookmarkMap_t; + typedef std::map < OUString, BookmarkInsertPosition > BookmarkMap_t; private: SourceDocumentType m_eDocumentType; @@ -329,7 +329,7 @@ private: ::std::vector<DeletableTabStop> m_aCurrentTabStops; sal_uInt32 m_nCurrentTabStopIndex; - ::rtl::OUString m_sCurrentParaStyleId; + OUString m_sCurrentParaStyleId; bool m_bInStyleSheetImport; //in import of fonts, styles, lists or lfos bool m_bInAnyTableImport; //in import of fonts, styles, lists or lfos @@ -360,11 +360,11 @@ private: AnnotationPosition m_aAnnotationPosition; void GetCurrentLocale(::com::sun::star::lang::Locale& rLocale); - void SetNumberFormat( const ::rtl::OUString& rCommand, + void SetNumberFormat( const OUString& rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropertySet ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > FindOrCreateFieldMaster( const sal_Char* pFieldMasterService, - const ::rtl::OUString& rFieldMasterName ) + const OUString& rFieldMasterName ) throw(::com::sun::star::uno::Exception); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetDocumentSettings(); @@ -396,7 +396,7 @@ public: { return m_xTextDocument; } - void SetDocumentSettingsProperty( const ::rtl::OUString& rPropName, const uno::Any& rValue ); + void SetDocumentSettingsProperty( const OUString& rPropName, const uno::Any& rValue ); void CreateRedline( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xRange, RedlineParamsPtr& pRedline ); @@ -420,10 +420,10 @@ public: bool isBreakDeferred( BreakType deferredBreakType ); void clearDeferredBreaks(); void finishParagraph( PropertyMapPtr pPropertyMap ); - void appendTextPortion( const ::rtl::OUString& rString, PropertyMapPtr pPropertyMap ); + void appendTextPortion( const OUString& rString, PropertyMapPtr pPropertyMap ); void appendTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >, const uno::Sequence< beans::PropertyValue > ); - void appendOLE( const ::rtl::OUString& rStreamName, OLEHandlerPtr pOleHandler ); + void appendOLE( const OUString& rStreamName, OLEHandlerPtr pOleHandler ); void appendStarMath( const Value& v ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > appendTextSectionAfter( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xBefore ); @@ -482,8 +482,8 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStopAndClear(); void NextTabStop() {++m_nCurrentTabStopIndex;} - void SetCurrentParaStyleId(::rtl::OUString sStringValue) {m_sCurrentParaStyleId = sStringValue;} - ::rtl::OUString GetCurrentParaStyleId() const {return m_sCurrentParaStyleId;} + void SetCurrentParaStyleId(OUString sStringValue) {m_sCurrentParaStyleId = sStringValue;} + OUString GetCurrentParaStyleId() const {return m_sCurrentParaStyleId;} ::com::sun::star::uno::Any GetPropertyFromStyleSheet(PropertyIds eId); void SetStyleSheetImport( bool bSet ) { m_bInStyleSheetImport = bSet;} @@ -512,7 +512,7 @@ public: bool IsOpenFieldCommand() const; bool IsOpenField() const; //collect the pieces of the command - void AppendFieldCommand(::rtl::OUString& rPartOfCommand); + void AppendFieldCommand(OUString& rPartOfCommand); void handleFieldAsk (FieldContextPtr pContext, PropertyNameSupplier& rPropNameSupplier, @@ -539,19 +539,19 @@ public: PropertyNameSupplier& rPropNameSupplier, uno::Reference< uno::XInterface > & xFieldInterface, uno::Reference< beans::XPropertySet > xFieldProperties, - const ::rtl::OUString & sTOCServiceName); + const OUString & sTOCServiceName); //the field command has to be closed (0x14 appeared) void CloseFieldCommand(); //the _current_ fields require a string type result while TOCs accept richt results bool IsFieldResultAsString(); //apply the result text to the related field - void SetFieldResult( ::rtl::OUString& rResult ); + void SetFieldResult( OUString& rResult ); // set FFData of top field context void SetFieldFFData( FFDataHandler::Pointer_t pFFDataHandler ); //the end of field is reached (0x15 appeared) - the command might still be open void PopFieldContext(); - void AddBookmark( const ::rtl::OUString& rBookmarkName, const ::rtl::OUString& rId ); + void AddBookmark( const OUString& rBookmarkName, const OUString& rId ); void AddAnnotationPosition(const bool bStart); @@ -615,13 +615,13 @@ public: RedlineParamsPtr GetTopRedline( ); sal_Int32 GetCurrentRedlineToken( ); - void SetCurrentRedlineAuthor( rtl::OUString sAuthor ); - void SetCurrentRedlineDate( rtl::OUString sDate ); + void SetCurrentRedlineAuthor( OUString sAuthor ); + void SetCurrentRedlineDate( OUString sDate ); void SetCurrentRedlineId( sal_Int32 nId ); void SetCurrentRedlineToken( sal_Int32 nToken ); void RemoveCurrentRedline( ); void ResetParaRedline( ); - void SetCurrentRedlineInitials( rtl::OUString sInitials ); + void SetCurrentRedlineInitials( OUString sInitials ); void ApplySettingsTable(); SectionPropertyMap * GetSectionContext(); diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index d9ff1da1f008..799416d24fef 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -42,17 +42,17 @@ FFDataHandler::~FFDataHandler() { } -const rtl::OUString & FFDataHandler::getName() const +const OUString & FFDataHandler::getName() const { return m_sName; } -const rtl::OUString & FFDataHandler::getHelpText() const +const OUString & FFDataHandler::getHelpText() const { return m_sHelpText; } -const rtl::OUString & FFDataHandler::getStatusText() const +const OUString & FFDataHandler::getStatusText() const { return m_sStatusText; } @@ -77,7 +77,7 @@ bool FFDataHandler::getCheckboxChecked() const return false; } -const rtl::OUString & FFDataHandler::getDropDownResult() const +const OUString & FFDataHandler::getDropDownResult() const { return m_sDropDownResult; } @@ -87,7 +87,7 @@ const FFDataHandler::DropDownEntries_t & FFDataHandler::getDropDownEntries() con return m_DropDownEntries; } -const rtl::OUString & FFDataHandler::getTextDefault() const +const OUString & FFDataHandler::getTextDefault() const { return m_sTextDefault; } diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 3b24d5934c3c..aeff21f62073 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -27,7 +27,7 @@ class FFDataHandler : public LoggedProperties public: // typedefs typedef ::boost::shared_ptr<FFDataHandler> Pointer_t; - typedef ::std::vector<rtl::OUString> DropDownEntries_t; + typedef ::std::vector<OUString> DropDownEntries_t; // constructor FFDataHandler(); @@ -35,13 +35,13 @@ public: virtual ~FFDataHandler(); // member: name - const rtl::OUString & getName() const; + const OUString & getName() const; // member: helpText - const rtl::OUString & getHelpText() const; + const OUString & getHelpText() const; // member: statusText - const rtl::OUString & getStatusText() const; + const OUString & getStatusText() const; // member: checkboxHeight sal_uInt32 getCheckboxHeight() const; @@ -53,28 +53,28 @@ public: bool getCheckboxChecked() const; // member: dropDownResult - const rtl::OUString & getDropDownResult() const; + const OUString & getDropDownResult() const; // member: dropDownEntries const DropDownEntries_t & getDropDownEntries() const; // member: textDefault - const rtl::OUString & getTextDefault() const; + const OUString & getTextDefault() const; // sprm void resolveSprm(Sprm & r_sprm); private: - rtl::OUString m_sName; - rtl::OUString m_sHelpText; - rtl::OUString m_sStatusText; + OUString m_sName; + OUString m_sHelpText; + OUString m_sStatusText; sal_uInt32 m_nCheckboxHeight; bool m_bCheckboxAutoHeight; int m_nCheckboxChecked; int m_nCheckboxDefault; - rtl::OUString m_sDropDownResult; + OUString m_sDropDownResult; DropDownEntries_t m_DropDownEntries; - rtl::OUString m_sTextDefault; + OUString m_sTextDefault; // sprm void lcl_sprm(Sprm & r_sprm); diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index d5de5d8c9f51..3175ea11880e 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -56,7 +56,7 @@ void FontTable::lcl_attribute(Id Name, Value & val) if(!m_pImpl->pCurrentEntry) return ; int nIntValue = val.getInt(); - ::rtl::OUString sValue = val.getString(); + OUString sValue = val.getString(); switch(Name) { case NS_rtf::LN_CBFFNM1: @@ -127,7 +127,7 @@ void FontTable::lcl_sprm(Sprm& rSprm) Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue->getInt(); (void)nIntValue; - rtl::OUString sStringValue = pValue->getString(); + OUString sStringValue = pValue->getString(); switch(nSprmId) { case NS_ooxml::LN_CT_Font_charset: diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index c2b3fb618d73..9308da881351 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -34,17 +34,17 @@ struct FontEntry { typedef boost::shared_ptr<FontEntry> Pointer_t; - ::rtl::OUString sFontName; - ::rtl::OUString sFontName1; + OUString sFontName; + OUString sFontName1; bool bTrueType; sal_Int16 nPitchRequest; sal_Int32 nTextEncoding; sal_Int32 nFontFamilyId; sal_Int32 nBaseWeight; sal_Int32 nAltFontIndex; - ::rtl::OUString sPanose; - ::rtl::OUString sFontSignature; - ::rtl::OUString sAlternativeFont; + OUString sPanose; + OUString sFontSignature; + OUString sAlternativeFont; FontEntry() : bTrueType(false), nPitchRequest( 0 ), diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 6facaa64a0cf..38daa1d2ea58 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -90,16 +90,16 @@ uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm() if (xFormsSupplier.is()) { uno::Reference<container::XNameContainer> xFormsNamedContainer(xFormsSupplier->getForms()); - static ::rtl::OUString sDOCXForm("DOCX-Standard"); + static OUString sDOCXForm("DOCX-Standard"); - ::rtl::OUString sFormName(sDOCXForm); + OUString sFormName(sDOCXForm); sal_uInt16 nUnique = 0; while (xFormsNamedContainer->hasByName(sFormName)) { ++nUnique; sFormName = sDOCXForm; - sFormName += ::rtl::OUString::valueOf(nUnique); + sFormName += OUString::valueOf(nUnique); } uno::Reference<uno::XInterface> xForm(getServiceFactory()->createInstance("com.sun.star.form.component.Form")); @@ -143,7 +143,7 @@ FormControlHelper::~FormControlHelper() } bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRange, - const ::rtl::OUString & rControlName) + const OUString & rControlName) { if ( !m_pFFData ) return false; @@ -231,12 +231,12 @@ bool FormControlHelper::processField(uno::Reference<text::XFormField> xFormField aAny <<= m_pFFData->getCheckboxChecked(); if ( xPropSet.is() ) xPropSet->setPropertyValue("Checked", aAny); - rtl::OUString sName; + OUString sName; } else if (m_pImpl->m_eFieldId == FIELD_FORMDROPDOWN ) { xFormField->setFieldType(ODF_FORMDROPDOWN); - uno::Sequence< rtl::OUString > sItems; + uno::Sequence< OUString > sItems; sItems.realloc( m_pFFData->getDropDownEntries().size() ); ::std::copy( m_pFFData->getDropDownEntries().begin(), m_pFFData->getDropDownEntries().end(), ::comphelper::stl_begin(sItems)); if ( sItems.getLength() ) @@ -272,16 +272,16 @@ bool FormControlHelper::insertControl(uno::Reference<text::XTextRange> xTextRang if (! xFormComps.is()) return false; - static ::rtl::OUString sControl("Control"); + static OUString sControl("Control"); sal_Int32 nControl = 0; bool bDone = false; - ::rtl::OUString sControlName; + OUString sControlName; do { - ::rtl::OUString sTmp(sControl); - sTmp += ::rtl::OUString::valueOf(nControl); + OUString sTmp(sControl); + sTmp += OUString::valueOf(nControl); nControl++; if (! xFormCompsByName->hasByName(sTmp)) diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx index 499afc6555b9..3ec1a8887eff 100644 --- a/writerfilter/source/dmapper/FormControlHelper.hxx +++ b/writerfilter/source/dmapper/FormControlHelper.hxx @@ -49,9 +49,9 @@ private: ImplPointer_t m_pImpl; bool createCheckbox(uno::Reference<text::XTextRange> xTextRange, - const ::rtl::OUString & rControlName); + const OUString & rControlName); bool createDropdown(uno::Reference<text::XTextRange> xTextRange, - const ::rtl::OUString & rControlName); + const OUString & rControlName); }; } diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index 23a1602d111c..4d190e54a912 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -134,7 +134,7 @@ void PositionHandler::lcl_sprm( Sprm& ) { } -void PositionHandler::setPositionOffset(const ::rtl::OUString & sText, bool vertical) +void PositionHandler::setPositionOffset(const OUString & sText, bool vertical) { if( vertical ) savedPositionOffsetV = ConversionHelper::convertEMUToMM100( sText.toInt32()); @@ -142,7 +142,7 @@ void PositionHandler::setPositionOffset(const ::rtl::OUString & sText, bool vert savedPositionOffsetH = ConversionHelper::convertEMUToMM100( sText.toInt32()); } -void PositionHandler::setAlignH(const ::rtl::OUString & sText) +void PositionHandler::setAlignH(const OUString & sText) { if( sText == "left") savedAlignH = text::HoriOrientation::LEFT; @@ -156,7 +156,7 @@ void PositionHandler::setAlignH(const ::rtl::OUString & sText) savedAlignH = text::HoriOrientation::OUTSIDE; } -void PositionHandler::setAlignV(const ::rtl::OUString & sText) +void PositionHandler::setAlignV(const OUString & sText) { if( sText == "top" ) savedAlignV = text::VertOrientation::TOP; diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index 38e4085210fd..f60da105f580 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -36,9 +36,9 @@ class WRITERFILTER_DLLPRIVATE PositionHandler: public LoggedProperties public: PositionHandler( bool vertical ); ~PositionHandler( ); - static void setPositionOffset(const ::rtl::OUString & sText, bool vertical); - static void setAlignH(const ::rtl::OUString & sText); - static void setAlignV(const ::rtl::OUString & sText); + static void setPositionOffset(const OUString & sText, bool vertical); + static void setAlignH(const OUString & sText); + static void setAlignV(const OUString & sText); sal_Int16 m_nOrient; sal_Int16 m_nRelation; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 1889c0dfd0b6..a48e73258818 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -247,9 +247,9 @@ public: bool bInShapeOptionMode; sal_Int32 nShapeOptionType; - ::rtl::OUString sName; - ::rtl::OUString sAlternativeText; - ::rtl::OUString title; + OUString sName; + OUString sAlternativeText; + OUString title; GraphicImport_Impl(GraphicImportType eImportType, DomainMapper& rDMapper) : nXSize(0) @@ -886,7 +886,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) uno::Reference< beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY_THROW ); - rtl::OUString sUrl; + OUString sUrl; xShapeProps->getPropertyValue("GraphicURL") >>= sUrl; ::com::sun::star::beans::PropertyValues aMediaProperties( 1 ); diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx index 9eefa2356b80..783ebdcc0de1 100644 --- a/writerfilter/source/dmapper/MeasureHandler.cxx +++ b/writerfilter/source/dmapper/MeasureHandler.cxx @@ -59,7 +59,7 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal) break; case NS_ooxml::LN_CT_Height_hRule: // 90666; { - ::rtl::OUString sHeightType = rVal.getString(); + OUString sHeightType = rVal.getString(); if ( sHeightType == "exact" ) m_nRowHeightSizeType = text::SizeType::FIX; } @@ -72,7 +72,7 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal) case NS_ooxml::LN_CT_Height_val: // 90665 -- a string value { m_nUnit = NS_ooxml::LN_Value_ST_TblWidth_dxa; - ::rtl::OUString sHeight = rVal.getString(); + OUString sHeight = rVal.getString(); m_nMeasureValue = sHeight.toInt32(); } break; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 18046cb3e72d..30e8730c52aa 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -39,10 +39,6 @@ using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; - #define MAKE_PROPVAL(NameId, Value) \ beans::PropertyValue(aPropNameSupplier.GetName(NameId), 0, uno::makeAny(Value), beans::PropertyState_DIRECT_VALUE ) @@ -538,7 +534,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, xFactory->createInstance("com.sun.star.style.NumberingStyle"), uno::UNO_QUERY_THROW ); - rtl::OUString sStyleName = GetStyleName( GetId( ) ); + OUString sStyleName = GetStyleName( GetId( ) ); xStyles->insertByName( sStyleName, makeAny( xStyle ) ); diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index e39897e41b1f..b52aeb485191 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -49,9 +49,9 @@ class ListLevel : public PropertyMap sal_Int32 m_nFPrev; //LN_FPREV sal_Int32 m_nFPrevSpace; //LN_FPREVSPACE sal_Int32 m_nFWord6; //LN_FWORD6 - ::rtl::OUString m_sRGBXchNums; //LN_RGBXCHNUMS + OUString m_sRGBXchNums; //LN_RGBXCHNUMS sal_Int16 m_nXChFollow; //LN_IXCHFOLLOW - ::rtl::OUString m_sBulletChar; + OUString m_sBulletChar; sal_Int32 m_nTabstop; boost::shared_ptr< StyleSheetEntry > m_pParaStyle; bool m_outline; @@ -78,20 +78,20 @@ public: // Setters for the import void SetValue( Id nId, sal_Int32 nValue ); - void SetBulletChar( rtl::OUString sValue ) { m_sBulletChar = sValue; }; + void SetBulletChar( OUString sValue ) { m_sBulletChar = sValue; }; void SetParaStyle( boost::shared_ptr< StyleSheetEntry > pStyle ); - void AddRGBXchNums( rtl::OUString sValue ) { m_sRGBXchNums += sValue; }; + void AddRGBXchNums( OUString sValue ) { m_sRGBXchNums += sValue; }; // Getters - rtl::OUString GetBulletChar( ) { return m_sBulletChar; }; + OUString GetBulletChar( ) { return m_sBulletChar; }; boost::shared_ptr< StyleSheetEntry > GetParaStyle( ) { return m_pParaStyle; }; bool isOutlineNumbering() const { return m_outline; } // UNO mapping functions // rPrefix and rSuffix are out parameters - static sal_Int16 GetParentNumbering( rtl::OUString sText, sal_Int16 nLevel, - rtl::OUString& rPrefix, rtl::OUString& rSuffix ); + static sal_Int16 GetParentNumbering( OUString sText, sal_Int16 nLevel, + OUString& rPrefix, OUString& rSuffix ); com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetProperties( ); @@ -110,7 +110,7 @@ class AbstractListDef { private: sal_Int32 m_nTPLC; //LN_TPLC - ::rtl::OUString m_sRGISTD; //LN_RGISTD + OUString m_sRGISTD; //LN_RGISTD sal_Int32 m_nSimpleList; //LN_FSIMPLELIST sal_Int32 m_nRestart; //LN_FRESTARTHDN sal_Int32 m_nUnsigned; //LN_UNSIGNED26_2 @@ -135,7 +135,7 @@ public: // Setters using during the import void SetId( sal_Int32 nId ) { m_nId = nId; }; void SetValue( sal_uInt32 nSprmId, sal_Int32 nValue ); - void AddRGISTD( rtl::OUString sValue ) { m_sRGISTD += sValue; }; + void AddRGISTD( OUString sValue ) { m_sRGISTD += sValue; }; // Accessors sal_Int32 GetId( ) { return m_nId; }; @@ -171,7 +171,7 @@ public: AbstractListDef::Pointer GetAbstractDefinition( ) { return m_pAbstractDef; }; // Mapping functions - static rtl::OUString GetStyleName( sal_Int32 nId ); + static OUString GetStyleName( sal_Int32 nId ); com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 3cf7c7fa04b5..84663e3e5e7e 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -61,7 +61,7 @@ OLEHandler::~OLEHandler() void OLEHandler::lcl_attribute(Id rName, Value & rVal) { - rtl::OUString sStringValue = rVal.getString(); + OUString sStringValue = rVal.getString(); (void)rName; switch( rName ) { @@ -181,9 +181,9 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) } -::rtl::OUString OLEHandler::copyOLEOStream( uno::Reference< text::XTextDocument > xTextDocument ) +OUString OLEHandler::copyOLEOStream( uno::Reference< text::XTextDocument > xTextDocument ) { - ::rtl::OUString sRet; + OUString sRet; if( !m_xInputStream.is( ) ) return sRet; try @@ -194,8 +194,8 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) //hack to work with the ImportEmbeddedObjectResolver static sal_Int32 nObjectCount = 100; uno::Reference< container::XNameAccess > xNA( xEmbeddedResolver, uno::UNO_QUERY_THROW ); - ::rtl::OUString aURL("Obj"); - aURL += ::rtl::OUString::valueOf( nObjectCount++ ); + OUString aURL("Obj"); + aURL += OUString::valueOf( nObjectCount++ ); uno::Reference < io::XOutputStream > xOLEStream; if( (xNA->getByName( aURL ) >>= xOLEStream) && xOLEStream.is() ) { @@ -213,8 +213,8 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) } } - static const ::rtl::OUString sProtocol("vnd.sun.star.EmbeddedObject:"); - ::rtl::OUString aPersistName( xEmbeddedResolver->resolveEmbeddedObjectURL( aURL ) ); + static const OUString sProtocol("vnd.sun.star.EmbeddedObject:"); + OUString aPersistName( xEmbeddedResolver->resolveEmbeddedObjectURL( aURL ) ); sRet = aPersistName.copy( sProtocol.getLength() ); } diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 880edb41a20d..aa15703c1884 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -46,12 +46,12 @@ namespace dmapper */ class WRITERFILTER_DLLPRIVATE OLEHandler : public LoggedProperties { - ::rtl::OUString m_sObjectType; - ::rtl::OUString m_sProgId; - ::rtl::OUString m_sShapeId; - ::rtl::OUString m_sDrawAspect; - ::rtl::OUString m_sObjectId; - ::rtl::OUString m_sr_id; + OUString m_sObjectType; + OUString m_sProgId; + OUString m_sShapeId; + OUString m_sDrawAspect; + OUString m_sObjectId; + OUString m_sr_id; sal_Int32 m_nDxaOrig; sal_Int32 m_nDyaOrig; @@ -78,7 +78,7 @@ public: inline bool isOLEObject( ) { return m_xInputStream.is( ); }; - ::rtl::OUString copyOLEOStream( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > xTextDocument ); + OUString copyOLEOStream( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > xTextDocument ); ::com::sun::star::awt::Size getSize() const { return m_aShapeSize;} ::com::sun::star::awt::Point getPosition() const { return m_aShapePosition;} diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 88461aa0a08b..66aecf68262c 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -16,14 +16,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "PropertyIds.hxx" #include <rtl/ustring.hxx> +#include "PropertyIds.hxx" #include <map> namespace writerfilter { namespace dmapper{ -typedef ::std::map< PropertyIds, ::rtl::OUString> PropertyNameMap_t; +typedef ::std::map< PropertyIds, OUString> PropertyNameMap_t; struct PropertyNameSupplier_Impl { @@ -44,12 +44,12 @@ PropertyNameSupplier::~PropertyNameSupplier() } -const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const +const OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const { PropertyNameMap_t::iterator aIt = m_pImpl->aNameMap.find(eId); if(aIt == m_pImpl->aNameMap.end()) { - ::rtl::OUString sName; + OUString sName; switch(eId) { case PROP_CHAR_WEIGHT: sName = "CharWeight"; break; diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index d007460e3e0f..8a55b829d440 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -297,7 +297,7 @@ class PropertyNameSupplier public: PropertyNameSupplier(); ~PropertyNameSupplier(); - const rtl::OUString& GetName( PropertyIds eId ) const; + const OUString& GetName( PropertyIds eId ) const; static PropertyNameSupplier& GetPropertyNameSupplier(); }; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 214fe91def51..70bb53b65f18 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -121,7 +121,7 @@ static void lcl_AnyToTag(const uno::Any & rAny) rAny >>= aFloat; dmapper_logger->attribute("floatValue", aFloat); - ::rtl::OUString aStr; + OUString aStr; rAny >>= aStr; dmapper_logger->attribute("stringValue", aStr); } @@ -133,7 +133,7 @@ static void lcl_AnyToTag(const uno::Any & rAny) void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any& rAny, bool bOverwrite ) { #ifdef DEBUG_DMAPPER_PROPERTY_MAP - const ::rtl::OUString& rInsert = PropertyNameSupplier:: + const OUString& rInsert = PropertyNameSupplier:: GetPropertyNameSupplier().GetName(eId); dmapper_logger->startElement("propertyMap.insert"); @@ -188,7 +188,7 @@ void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const aMapIter->second >>= aFloat; pLogger->attribute("floatValue", aFloat); - ::rtl::OUString aStr; + OUString aStr; aMapIter->second >>= auInt; pLogger->attribute("stringValue", aStr); } @@ -325,16 +325,16 @@ SectionPropertyMap::~SectionPropertyMap() } -::rtl::OUString lcl_FindUnusedPageStyleName(const uno::Sequence< ::rtl::OUString >& rPageStyleNames) +OUString lcl_FindUnusedPageStyleName(const uno::Sequence< OUString >& rPageStyleNames) { static const sal_Char cDefaultStyle[] = "Converted"; //find the hightest number x in each style with the name "cDefaultStyle+x" and //return an incremented name sal_Int32 nMaxIndex = 0; const sal_Int32 nDefaultLength = sizeof(cDefaultStyle)/sizeof(sal_Char) - 1; - const ::rtl::OUString sDefaultStyle( cDefaultStyle, nDefaultLength, RTL_TEXTENCODING_ASCII_US ); + const OUString sDefaultStyle( cDefaultStyle, nDefaultLength, RTL_TEXTENCODING_ASCII_US ); - const ::rtl::OUString* pStyleNames = rPageStyleNames.getConstArray(); + const OUString* pStyleNames = rPageStyleNames.getConstArray(); for( sal_Int32 nStyle = 0; nStyle < rPageStyleNames.getLength(); ++nStyle) { if( pStyleNames[nStyle].getLength() > nDefaultLength && @@ -345,8 +345,8 @@ SectionPropertyMap::~SectionPropertyMap() nMaxIndex = nIndex; } } - ::rtl::OUString sRet( sDefaultStyle ); - sRet += rtl::OUString::valueOf( nMaxIndex + 1); + OUString sRet( sDefaultStyle ); + sRet += OUString::valueOf( nMaxIndex + 1); return sRet; } @@ -364,7 +364,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( { if( m_sFirstPageStyleName.isEmpty() && xPageStyles.is() ) { - uno::Sequence< ::rtl::OUString > aPageStyleNames = xPageStyles->getElementNames(); + uno::Sequence< OUString > aPageStyleNames = xPageStyles->getElementNames(); m_sFirstPageStyleName = lcl_FindUnusedPageStyleName(aPageStyleNames); m_aFirstPageStyle = uno::Reference< beans::XPropertySet > ( xTextFactory->createInstance("com.sun.star.style.PageStyle"), @@ -382,7 +382,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( { if( m_sFollowPageStyleName.isEmpty() && xPageStyles.is() ) { - uno::Sequence< ::rtl::OUString > aPageStyleNames = xPageStyles->getElementNames(); + uno::Sequence< OUString > aPageStyleNames = xPageStyles->getElementNames(); m_sFollowPageStyleName = lcl_FindUnusedPageStyleName(aPageStyleNames); m_aFollowPageStyle = uno::Reference< beans::XPropertySet > ( xTextFactory->createInstance("com.sun.star.style.PageStyle"), @@ -484,7 +484,7 @@ void SectionPropertyMap::ApplyBorderToPageStyles( { if( m_pBorderLines[nBorder] ) { - const ::rtl::OUString sBorderName = rPropNameSupplier.GetName( aBorderIds[nBorder] ); + const OUString sBorderName = rPropNameSupplier.GetName( aBorderIds[nBorder] ); if (xFirst.is()) xFirst->setPropertyValue( sBorderName, uno::makeAny( *m_pBorderLines[nBorder] )); if(xSecond.is()) @@ -512,7 +512,7 @@ void SectionPropertyMap::SetBorderDistance( uno::Reference< beans::XPropertySet sal_Int32 nDist = nDistance; if( nOffsetFrom == 1 ) { - const ::rtl::OUString sMarginName = rPropNameSupplier.GetName( eMarginId ); + const OUString sMarginName = rPropNameSupplier.GetName( eMarginId ); uno::Any aMargin = xStyle->getPropertyValue( sMarginName ); sal_Int32 nMargin = 0; aMargin >>= nMargin; @@ -523,7 +523,7 @@ void SectionPropertyMap::SetBorderDistance( uno::Reference< beans::XPropertySet // Set the distance to ( Margin - distance ) nDist = nMargin - nDistance; } - const ::rtl::OUString sBorderDistanceName = rPropNameSupplier.GetName( eDistId ); + const OUString sBorderDistanceName = rPropNameSupplier.GetName( eDistId ); if (xStyle.is()) xStyle->setPropertyValue( sBorderDistanceName, uno::makeAny( nDist )); } @@ -537,7 +537,7 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( try { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); - const ::rtl::OUString sTextColumns = rPropNameSupplier.GetName( PROP_TEXT_COLUMNS ); + const OUString sTextColumns = rPropNameSupplier.GetName( PROP_TEXT_COLUMNS ); if (xColumnContainer.is()) xColumnContainer->getPropertyValue(sTextColumns) >>= xColumns; uno::Reference< beans::XPropertySet > xColumnPropSet( xColumns, uno::UNO_QUERY_THROW ); @@ -655,7 +655,7 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp bool bHasPrevHeader = false; bool bHasHeader = false; - rtl::OUString sHeaderIsOn = rPropNameSupplier.GetName( PROP_HEADER_IS_ON ); + OUString sHeaderIsOn = rPropNameSupplier.GetName( PROP_HEADER_IS_ON ); if (xPrevStyle.is()) xPrevStyle->getPropertyValue( sHeaderIsOn ) >>= bHasPrevHeader; if (xStyle.is()) @@ -668,7 +668,7 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp bool bHasPrevFooter = false; bool bHasFooter = false; - rtl::OUString sFooterIsOn = rPropNameSupplier.GetName( PROP_FOOTER_IS_ON ); + OUString sFooterIsOn = rPropNameSupplier.GetName( PROP_FOOTER_IS_ON ); if (xPrevStyle.is()) xPrevStyle->getPropertyValue( sFooterIsOn ) >>= bHasPrevFooter; if (xStyle.is()) @@ -683,7 +683,7 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp { bool bIsHeader = ( i < nNbProps / 2 ); PropertyIds aPropId = aProperties[i]; - rtl::OUString sName = rPropNameSupplier.GetName( aPropId ); + OUString sName = rPropNameSupplier.GetName( aPropId ); if ( ( bIsHeader && bCopyHeader ) || ( !bIsHeader && bCopyFooter ) ) { @@ -877,7 +877,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) CopyLastHeaderFooter( false, rDM_Impl ); PrepareHeaderFooterProperties( false ); - const ::rtl::OUString sTrayIndex = rPropNameSupplier.GetName( PROP_PRINTER_PAPER_TRAY_INDEX ); + const OUString sTrayIndex = rPropNameSupplier.GetName( PROP_PRINTER_PAPER_TRAY_INDEX ); if( m_nPaperBin >= 0 ) xFollowPageStyle->setPropertyValue( sTrayIndex, uno::makeAny( m_nPaperBin ) ); uno::Reference< text::XTextColumns > xColumns; @@ -911,7 +911,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) sal_Int32 nCharWidth = 423; //240 twip/ 12 pt //todo: is '0' the right index here? - const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(::rtl::OUString::valueOf(static_cast<sal_Int32>(0), 16)); + const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(OUString::valueOf(static_cast<sal_Int32>(0), 16)); if( pEntry.get( ) ) { PropertyMap::iterator aElement_ = pEntry->pProperties->find(PropertyDefinition( PROP_CHAR_HEIGHT_ASIAN, false )); @@ -1020,7 +1020,7 @@ void SectionPropertyMap::_ApplyProperties( uno::Reference< beans::XPropertySet > uno::UNO_QUERY); if (xMultiSet.is()) { // FIXME why is "this" a STL container??? - uno::Sequence<rtl::OUString> names(this->size()); + uno::Sequence<OUString> names(this->size()); uno::Sequence<uno::Any> values(this->size()); PropertyMap::iterator it = this->begin(); for (size_t i = 0; it != this->end(); ++it, ++i) diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 78f9c6244773..fc88ddbcdf92 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -86,7 +86,7 @@ class PropertyMap : public _PropertyMap //depending on sprmCSymbol sal_Unicode m_cFootnoteSymbol; // 0 == invalid sal_Int32 m_nFootnoteFontId; // negative values are invalid ids - ::rtl::OUString m_sFootnoteFontName; + OUString m_sFootnoteFontName; ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote > m_xFootnote; protected: @@ -117,8 +117,8 @@ public: sal_Int32 GetFootnoteFontId() const { return m_nFootnoteFontId;} void SetFootnoteFontId(sal_Int32 nSet) { m_nFootnoteFontId = nSet;} - const ::rtl::OUString& GetFootnoteFontName() const { return m_sFootnoteFontName;} - void SetFootnoteFontName( const ::rtl::OUString& rSet ) { m_sFootnoteFontName = rSet;} + const OUString& GetFootnoteFontName() const { return m_sFootnoteFontName;} + void SetFootnoteFontName( const OUString& rSet ) { m_sFootnoteFontName = rSet;} virtual void insertTableProperties( const PropertyMap* ); @@ -142,8 +142,8 @@ class SectionPropertyMap : public PropertyMap bool m_bIsFirstSection; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStartingRange; - ::rtl::OUString m_sFirstPageStyleName; - ::rtl::OUString m_sFollowPageStyleName; + OUString m_sFirstPageStyleName; + OUString m_sFollowPageStyleName; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_aFirstPageStyle; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_aFollowPageStyle; @@ -293,7 +293,7 @@ class ParagraphProperties sal_Int8 m_nDropCapLength; //number of characters - ::rtl::OUString m_sParaStyleName; + OUString m_sParaStyleName; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStartingRange; //start of a frame ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xEndingRange; //end of the frame @@ -363,8 +363,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetEndingRange() const { return m_xEndingRange; } void SetEndingRange( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xSet ) { m_xEndingRange = xSet; } - void SetParaStyleName( const ::rtl::OUString& rSet ) { m_sParaStyleName = rSet;} - const ::rtl::OUString& GetParaStyleName() const { return m_sParaStyleName;} + void SetParaStyleName( const OUString& rSet ) { m_sParaStyleName = rSet;} + const OUString& GetParaStyleName() const { return m_sParaStyleName;} void ResetFrameProperties(); }; @@ -382,7 +382,7 @@ class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties sal_Int32 mnCT_Spacing_line; sal_Int32 mnCT_Spacing_lineRule; - ::rtl::OUString msCT_Fonts_ascii; + OUString msCT_Fonts_ascii; bool mbCT_TrPrBase_tblHeader; sal_Int32 mnCT_TrPrBase_jc; sal_Int32 mnCT_TcPrBase_vAlign; @@ -413,7 +413,7 @@ public: void SetCT_Spacing_lineRule( sal_Int32 nSet ) {mnCT_Spacing_lineRule = nSet; mbCT_Spacing_lineRuleSet = true; } - void SetCT_Fonts_ascii( const ::rtl::OUString& rSet ) + void SetCT_Fonts_ascii( const OUString& rSet ) {msCT_Fonts_ascii = rSet; } void SetCT_TrPrBase_tblHeader( bool bSet ) {mbCT_TrPrBase_tblHeader = bSet; mbCT_TrPrBase_tblHeaderSet = true; } @@ -440,7 +440,7 @@ public: return mbCT_Spacing_lineRuleSet; } - bool GetCT_Fonts_ascii(::rtl::OUString& rToFill) const + bool GetCT_Fonts_ascii(OUString& rToFill) const { if( msCT_Fonts_ascii.getLength() > 0 ) rToFill = msCT_Fonts_ascii; diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 065c4c39312e..c2dc342288a7 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -40,9 +40,9 @@ struct SettingsTable_Impl DomainMapper& m_rDMapper; const uno::Reference< lang::XMultiServiceFactory > m_xTextFactory; - ::rtl::OUString m_sCharacterSpacing; - ::rtl::OUString m_sDecimalSymbol; - ::rtl::OUString m_sListSeparatorForFields; //2.15.1.56 listSeparator (List Separator for Field Code Evaluation) + OUString m_sCharacterSpacing; + OUString m_sDecimalSymbol; + OUString m_sListSeparatorForFields; //2.15.1.56 listSeparator (List Separator for Field Code Evaluation) int m_nDefaultTabStop; int m_nHyphenationZone; @@ -56,15 +56,15 @@ struct SettingsTable_Impl int m_nCryptProviderType; int m_nCryptAlgorithmClass; int m_nCryptAlgorithmType; - ::rtl::OUString m_sCryptAlgorithmSid; + OUString m_sCryptAlgorithmSid; int m_nCryptSpinCount; - ::rtl::OUString m_sCryptProvider; - ::rtl::OUString m_sAlgIdExt; - ::rtl::OUString m_sAlgIdExtSource; - ::rtl::OUString m_sCryptProviderTypeExt; - ::rtl::OUString m_sCryptProviderTypeExtSource; - ::rtl::OUString m_sHash; - ::rtl::OUString m_sSalt; + OUString m_sCryptProvider; + OUString m_sAlgIdExt; + OUString m_sAlgIdExtSource; + OUString m_sCryptProviderTypeExt; + OUString m_sCryptProviderTypeExtSource; + OUString m_sHash; + OUString m_sSalt; bool m_bLinkStyles; sal_Int16 m_nZoomFactor; bool m_bEvenAndOddHeaders; @@ -129,7 +129,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue->getInt(); (void)nIntValue; - rtl::OUString sStringValue = pValue->getString(); + OUString sStringValue = pValue->getString(); switch(nSprmId) { diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index b257e636cb4c..0ed6efc72af6 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -47,7 +47,7 @@ namespace writerfilter { namespace dmapper { -typedef ::std::map< ::rtl::OUString, ::rtl::OUString> StringPairMap_t; +typedef ::std::map< OUString, OUString> StringPairMap_t; @@ -258,10 +258,10 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask struct ListCharStylePropertyMap_t { - ::rtl::OUString sCharStyleName; + OUString sCharStyleName; PropertyValueVector_t aPropertyValues; - ListCharStylePropertyMap_t(const ::rtl::OUString& rCharStyleName, const PropertyValueVector_t& rPropertyValues): + ListCharStylePropertyMap_t(const OUString& rCharStyleName, const PropertyValueVector_t& rPropertyValues): sCharStyleName( rCharStyleName ), aPropertyValues( rPropertyValues ) {} @@ -283,7 +283,7 @@ struct StyleSheetTable_Impl StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Reference< text::XTextDocument> xTextDocument); - ::rtl::OUString HasListCharStyle( const PropertyValueVector_t& rCharProperties ); + OUString HasListCharStyle( const PropertyValueVector_t& rCharProperties ); }; @@ -302,9 +302,9 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Referenc } -::rtl::OUString StyleSheetTable_Impl::HasListCharStyle( const PropertyValueVector_t& rPropValues ) +OUString StyleSheetTable_Impl::HasListCharStyle( const PropertyValueVector_t& rPropValues ) { - ::rtl::OUString sRet; + OUString sRet; ListCharStylePropertyVector_t::const_iterator aListVectorIter = m_aListCharStylePropertyVector.begin(); while( aListVectorIter != m_aListCharStylePropertyVector.end() ) { @@ -368,16 +368,16 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) return ; int nIntValue = val.getInt(); (void)nIntValue; - ::rtl::OUString sValue = val.getString(); + OUString sValue = val.getString(); switch(Name) { case NS_rtf::LN_ISTD: - m_pImpl->m_pCurrentEntry->sStyleIdentifierD = ::rtl::OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16); + m_pImpl->m_pCurrentEntry->sStyleIdentifierD = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16); break; case NS_rtf::LN_STI: { - ::rtl::OUString tempStyleIdentifier = GetStyleIdFromIndex(static_cast<sal_uInt32>(nIntValue)); + OUString tempStyleIdentifier = GetStyleIdFromIndex(static_cast<sal_uInt32>(nIntValue)); if (!tempStyleIdentifier.isEmpty()) m_pImpl->m_pCurrentEntry->sStyleIdentifierI = tempStyleIdentifier; if (nIntValue == 0 || nIntValue == 65) @@ -389,11 +389,11 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) break; case NS_rtf::LN_ISTDBASE: if (static_cast<sal_uInt32>(nIntValue) != 0xfff) - m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = ::rtl::OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16); + m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16); break; case NS_rtf::LN_ISTDNEXT: if (static_cast<sal_uInt32>(nIntValue) != 0xfff) - m_pImpl->m_pCurrentEntry->sNextStyleIdentifier = ::rtl::OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16); + m_pImpl->m_pCurrentEntry->sNextStyleIdentifier = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16); break; case NS_rtf::LN_FSCRATCH: case NS_rtf::LN_FINVALHEIGHT: @@ -464,7 +464,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue.get() ? pValue->getInt() : 0; (void)nIntValue; - rtl::OUString sStringValue = pValue.get() ? pValue->getString() : rtl::OUString(); + OUString sStringValue = pValue.get() ? pValue->getString() : OUString(); switch(nSprmId) { @@ -635,7 +635,7 @@ public: void Insert( beans::PropertyValue aVal ); uno::Sequence< uno::Any > getValues(); - uno::Sequence< ::rtl::OUString > getNames(); + uno::Sequence< OUString > getNames(); }; void PropValVector::Insert( beans::PropertyValue aVal ) { @@ -664,10 +664,10 @@ uno::Sequence< uno::Any > PropValVector::getValues() } return aRet; } -uno::Sequence< ::rtl::OUString > PropValVector::getNames() +uno::Sequence< OUString > PropValVector::getNames() { - uno::Sequence< ::rtl::OUString > aRet( size() ); - ::rtl::OUString* pNames = aRet.getArray(); + uno::Sequence< OUString > aRet( size() ); + OUString* pNames = aRet.getArray(); sal_Int32 nVal = 0; _PropValVector::iterator aIt = begin(); while(aIt != end()) @@ -704,7 +704,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) bool bInsert = false; uno::Reference< container::XNameContainer > xStyles = bParaStyle ? xParaStyles : xCharStyles; uno::Reference< style::XStyle > xStyle; - ::rtl::OUString sConvertedStyleName = ConvertStyleName( pEntry->sStyleName ); + OUString sConvertedStyleName = ConvertStyleName( pEntry->sStyleName ); if(xStyles->hasByName( sConvertedStyleName )) xStyles->getByName( sConvertedStyleName ) >>= xStyle; else @@ -745,7 +745,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) pEntry->pProperties->Insert(PROP_CHAR_HEIGHT, true, aTwoHundredFortyTwip, false); // western font not already set -> apply first font const FontEntry::Pointer_t pWesternFontEntry(rFontTable->getFontEntry( 0 )); - rtl::OUString sWesternFontName = pWesternFontEntry->sFontName; + OUString sWesternFontName = pWesternFontEntry->sFontName; pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( sWesternFontName ), false); // CJK ... apply second font @@ -794,7 +794,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) { aPropValues.realloc( aPropValues.getLength( ) + 1 ); beans::PropertyValue aStyleVal( rPropNameSupplier.GetName( PROP_NUMBERING_STYLE_NAME ), 0, - uno::makeAny( rtl::OUString() ), + uno::makeAny( OUString() ), beans::PropertyState_DIRECT_VALUE ); aPropValues[ aPropValues.getLength( ) - 1 ] = aStyleVal; } @@ -909,7 +909,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) } -const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const ::rtl::OUString& sIndex) +const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& sIndex) { StyleSheetEntryPtr pRet; for( sal_uInt32 nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos ) @@ -924,7 +924,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const ::rtl::OUSt } -const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const ::rtl::OUString& sIndex) +const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const OUString& sIndex) { StyleSheetEntryPtr pRet; for( sal_uInt32 nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos ) @@ -939,7 +939,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const ::rtl: } -const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(const ::rtl::OUString& sIndex) +const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(const OUString& sIndex) { StyleSheetEntryPtr pRet; for( sal_uInt32 nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos ) @@ -955,7 +955,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(con -const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(::rtl::OUString sBaseStyle) +const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(OUString sBaseStyle) { if( sBaseStyle.isEmpty() ) { @@ -1116,9 +1116,9 @@ static const sal_Char* const aStyleNamePairs[] = }; -::rtl::OUString StyleSheetTable::ConvertStyleName( const ::rtl::OUString& rWWName, bool bExtendedSearch) +OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExtendedSearch) { - ::rtl::OUString sRet( rWWName ); + OUString sRet( rWWName ); if( bExtendedSearch ) { //search for the rWWName in the IdentifierD of the existing styles and convert the sStyleName member @@ -1136,8 +1136,8 @@ static const sal_Char* const aStyleNamePairs[] = for( sal_uInt32 nPair = 0; nPair < sizeof(aStyleNamePairs) / sizeof( sal_Char*) / 2; ++nPair) { m_pImpl->m_aStyleNameMap.insert( StringPairMap_t::value_type( - ::rtl::OUString::createFromAscii(aStyleNamePairs[2 * nPair]), - ::rtl::OUString::createFromAscii(aStyleNamePairs[2 * nPair + 1]) )); + OUString::createFromAscii(aStyleNamePairs[2 * nPair]), + OUString::createFromAscii(aStyleNamePairs[2 * nPair + 1]) )); } } StringPairMap_t::iterator aIt = m_pImpl->m_aStyleNameMap.find( sRet ); @@ -1146,13 +1146,13 @@ static const sal_Char* const aStyleNamePairs[] = return sRet; } -::rtl::OUString StyleSheetTable::GetStyleIdFromIndex(const sal_uInt32 sti) +OUString StyleSheetTable::GetStyleIdFromIndex(const sal_uInt32 sti) { - ::rtl::OUString sRet; + OUString sRet; if (sti >= (sizeof(aStyleNamePairs) / sizeof( sal_Char*) / 2)) - sRet = ::rtl::OUString(); + sRet = OUString(); else - sRet = ::rtl::OUString::createFromAscii(aStyleNamePairs[2 * sti]); + sRet = OUString::createFromAscii(aStyleNamePairs[2 * sti]); return sRet; } @@ -1211,10 +1211,10 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) } -::rtl::OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ) +OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ) { //find out if any of the styles already has the required properties then return it's name - ::rtl::OUString sListLabel = m_pImpl->HasListCharStyle(rCharProperties); + OUString sListLabel = m_pImpl->HasListCharStyle(rCharProperties); if( !sListLabel.isEmpty() ) return sListLabel; const char cListLabel[] = "ListLabel "; @@ -1224,13 +1224,13 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) xStyleFamilies->getByName("CharacterStyles") >>= xCharStyles; //search for all character styles with the name sListLabel + <index> sal_Int32 nStyleFound = 0; - uno::Sequence< ::rtl::OUString > aStyleNames = xCharStyles->getElementNames(); - const ::rtl::OUString* pStyleNames = aStyleNames.getConstArray(); + uno::Sequence< OUString > aStyleNames = xCharStyles->getElementNames(); + const OUString* pStyleNames = aStyleNames.getConstArray(); for( sal_Int32 nStyle = 0; nStyle < aStyleNames.getLength(); ++nStyle ) { if( pStyleNames[nStyle].matchAsciiL( cListLabel, sizeof( cListLabel ) - 1 )) { - ::rtl::OUString sSuffix = pStyleNames[nStyle].copy( sizeof( cListLabel ) - 1 ); + OUString sSuffix = pStyleNames[nStyle].copy( sizeof( cListLabel ) - 1 ); sal_Int32 nSuffix = sSuffix.toInt32(); if( nSuffix > 0 ) { @@ -1239,8 +1239,8 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) } } } - sListLabel = ::rtl::OUString::createFromAscii( cListLabel ); - sListLabel += ::rtl::OUString::valueOf( ++nStyleFound ); + sListLabel = OUString::createFromAscii( cListLabel ); + sListLabel += OUString::valueOf( ++nStyleFound ); //create a new one otherwise uno::Reference< lang::XMultiServiceFactory > xDocFactory( m_pImpl->m_xTextDocument, uno::UNO_QUERY_THROW ); PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 708bf805e60a..c0ee6defc392 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -51,18 +51,18 @@ struct StyleSheetTable_Impl; class StyleSheetEntry { public: - ::rtl::OUString sStyleIdentifierI; - ::rtl::OUString sStyleIdentifierD; + OUString sStyleIdentifierI; + OUString sStyleIdentifierD; bool bIsDefaultStyle; bool bInvalidHeight; bool bHasUPE; //universal property expansion StyleType nStyleTypeCode; //sgc - ::rtl::OUString sBaseStyleIdentifier; - ::rtl::OUString sNextStyleIdentifier; - ::rtl::OUString sStyleName; - ::rtl::OUString sStyleName1; + OUString sBaseStyleIdentifier; + OUString sNextStyleIdentifier; + OUString sStyleName; + OUString sStyleName1; PropertyMapPtr pProperties; - ::rtl::OUString sConvertedStyleName; + OUString sConvertedStyleName; StyleSheetEntry(); virtual ~StyleSheetEntry(); @@ -85,16 +85,16 @@ public: virtual ~StyleSheetTable(); void ApplyStyleSheets( FontTablePtr rFontTable ); - const StyleSheetEntryPtr FindStyleSheetByISTD(const ::rtl::OUString& sIndex); - const StyleSheetEntryPtr FindStyleSheetByStyleName(const ::rtl::OUString& rIndex); - const StyleSheetEntryPtr FindStyleSheetByConvertedStyleName(const ::rtl::OUString& rIndex); + const StyleSheetEntryPtr FindStyleSheetByISTD(const OUString& sIndex); + const StyleSheetEntryPtr FindStyleSheetByStyleName(const OUString& rIndex); + const StyleSheetEntryPtr FindStyleSheetByConvertedStyleName(const OUString& rIndex); // returns the parent of the one with the given name - if empty the parent of the current style sheet is returned - const StyleSheetEntryPtr FindParentStyleSheet(::rtl::OUString sBaseStyle); + const StyleSheetEntryPtr FindParentStyleSheet(OUString sBaseStyle); - ::rtl::OUString ConvertStyleName( const ::rtl::OUString& rWWName, bool bExtendedSearch = false ); - ::rtl::OUString GetStyleIdFromIndex(const sal_uInt32 sti); + OUString ConvertStyleName( const OUString& rWWName, bool bExtendedSearch = false ); + OUString GetStyleIdFromIndex(const sal_uInt32 sti); - ::rtl::OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ); + OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ); private: // Properties diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 0b19382667fa..7504a79cc4c3 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -35,9 +35,9 @@ struct ThemeTable_Impl ThemeTable_Impl() : m_currentThemeFontId(0), m_currentFontThemeEntry() {} - std::map<sal_uInt32, std::map<sal_uInt32, ::rtl::OUString> > m_themeFontMap; + std::map<sal_uInt32, std::map<sal_uInt32, OUString> > m_themeFontMap; sal_uInt32 m_currentThemeFontId; - std::map<sal_uInt32, ::rtl::OUString> m_currentFontThemeEntry; + std::map<sal_uInt32, OUString> m_currentFontThemeEntry; }; ThemeTable::ThemeTable() @@ -60,7 +60,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val) dmapper_logger->attribute("name", (*QNameToString::Instance())(Name)); dmapper_logger->attribute("value", val.toString()); #endif - ::rtl::OUString sValue = val.getString(); + OUString sValue = val.getString(); switch(Name) { case NS_ooxml::LN_CT_TextFont_typeface: @@ -92,7 +92,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue->getInt(); (void)nIntValue; - rtl::OUString sStringValue = pValue->getString(); + OUString sStringValue = pValue->getString(); switch(nSprmId) { @@ -107,7 +107,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_FontScheme_minorFont: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - m_pImpl->m_currentFontThemeEntry = std::map<sal_uInt32, rtl::OUString>(); + m_pImpl->m_currentFontThemeEntry = std::map<sal_uInt32, OUString>(); if( pProperties.get()) pProperties->resolve(*this); m_pImpl->m_themeFontMap[nSprmId] = m_pImpl->m_currentFontThemeEntry; @@ -148,9 +148,9 @@ void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Poi #endif } -const ::rtl::OUString ThemeTable::getFontNameForTheme(const Id id) const +const OUString ThemeTable::getFontNameForTheme(const Id id) const { - std::map<sal_uInt32, ::rtl::OUString> tmpThemeFontMap; + std::map<sal_uInt32, OUString> tmpThemeFontMap; switch (id) { case NS_ooxml::LN_Value_ST_Theme_majorEastAsia: @@ -166,7 +166,7 @@ const ::rtl::OUString ThemeTable::getFontNameForTheme(const Id id) const tmpThemeFontMap = m_pImpl->m_themeFontMap[NS_ooxml::LN_CT_FontScheme_minorFont]; break; default: - return ::rtl::OUString(); + return OUString(); } switch (id) @@ -176,29 +176,29 @@ const ::rtl::OUString ThemeTable::getFontNameForTheme(const Id id) const case NS_ooxml::LN_Value_ST_Theme_minorAscii: case NS_ooxml::LN_Value_ST_Theme_minorHAnsi: { - std::map<sal_uInt32, ::rtl::OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_latin); + std::map<sal_uInt32, OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_latin); if (Iter != tmpThemeFontMap.end()) return (Iter)->second; - return ::rtl::OUString(); + return OUString(); } case NS_ooxml::LN_Value_ST_Theme_majorBidi: case NS_ooxml::LN_Value_ST_Theme_minorBidi: { - std::map<sal_uInt32, ::rtl::OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_cs); + std::map<sal_uInt32, OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_cs); if (Iter != tmpThemeFontMap.end()) return (Iter)->second; - return ::rtl::OUString(); + return OUString(); } case NS_ooxml::LN_Value_ST_Theme_majorEastAsia: case NS_ooxml::LN_Value_ST_Theme_minorEastAsia: { - std::map<sal_uInt32, ::rtl::OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_ea); + std::map<sal_uInt32, OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_ea); if (Iter != tmpThemeFontMap.end()) return (Iter)->second; - return ::rtl::OUString(); + return OUString(); } default: - return ::rtl::OUString(); + return OUString(); } } diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index 3b70b8d21c5e..2f1d83ecb024 100644 --- a/writerfilter/source/dmapper/ThemeTable.hxx +++ b/writerfilter/source/dmapper/ThemeTable.hxx @@ -39,7 +39,7 @@ public: ThemeTable(); virtual ~ThemeTable(); - const ::rtl::OUString getFontNameForTheme(const Id id) const; + const OUString getFontNameForTheme(const Id id) const; private: // Properties diff --git a/writerfilter/source/dmapper/genclass.xsl b/writerfilter/source/dmapper/genclass.xsl index 58b127e08be8..53c7bb382e8e 100644 --- a/writerfilter/source/dmapper/genclass.xsl +++ b/writerfilter/source/dmapper/genclass.xsl @@ -174,7 +174,7 @@ <xsl:param name="name"/> <xsl:choose> <xsl:when test="$name='OUString'"> - <xsl:text>::rtl::OUString</xsl:text> + <xsl:text>OUString</xsl:text> </xsl:when> <xsl:otherwise> <xsl:value-of select="$name"/> |