diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /writerfilter | |
parent | Typo in comment in resmgr.hxx (diff) | |
download | core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/qa/cppunittests/doctok/testdoctok.cxx | 8 | ||||
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 15 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 30 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 7 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 5 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfvalue.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfvalue.hxx | 10 |
13 files changed, 41 insertions, 59 deletions
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx index 9c382466ab51..837128ba5ae9 100644 --- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx +++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx @@ -81,8 +81,8 @@ namespace testdoctok OSL_ASSERT(xFactory.is()); uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xFactory, uno::UNO_QUERY); @@ -99,7 +99,7 @@ namespace testdoctok { uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xNameContainer(xFactory->createInstanceWithContext - (::rtl::OUString::createFromAscii + (OUString::createFromAscii ("com.sun.star.ucb.SimpleFileAccess" ), xComponentContext), uno::UNO_QUERY ); @@ -130,7 +130,7 @@ namespace testdoctok rtl_uString *absfile=NULL; rtl_uString_newConcat(&absfile, dir, fname); - rtl::OUString sInputFileURL( absfile ); + OUString sInputFileURL( absfile ); for (sal_uInt32 n = 0; n < sInputFileURL.getLength(); ++n) { diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index 69e0e7b998f9..8b6d256f3020 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx @@ -45,8 +45,8 @@ public: virtual void setUp(); - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); void test(); @@ -65,8 +65,8 @@ void RtfTest::setUp() m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); } -bool RtfTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool RtfTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { uno::Sequence< beans::PropertyValue > aDescriptor(1); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index eb45169be270..20413490b68f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3132,9 +3132,9 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_SEQ : { // command looks like: " SEQ Table \* ARABIC " - ::rtl::OUString sCmd(pContext->GetCommand()); + OUString sCmd(pContext->GetCommand()); // find the sequence name, e.g. "SEQ" - ::rtl::OUString sSeqName = lcl_FindQuotedText(sCmd, "SEQ ", '\\'); + OUString sSeqName = lcl_FindQuotedText(sCmd, "SEQ ", '\\'); sSeqName = sSeqName.trim(); // create a sequence field master using the sequence name diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 6a0a2ce9575e..d5a509fcd25e 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -934,9 +934,9 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) text::GraphicCrop aGraphicCrop( 0, 0, 0, 0 ); uno::Reference< beans::XPropertySet > xSourceGraphProps( xShape, uno::UNO_QUERY ); - uno::Any aAny = xSourceGraphProps->getPropertyValue( rtl::OUString("GraphicCrop")); + uno::Any aAny = xSourceGraphProps->getPropertyValue( OUString("GraphicCrop")); if(aAny >>= aGraphicCrop) { - xGraphProps->setPropertyValue( rtl::OUString("GraphicCrop"), + xGraphProps->setPropertyValue( OUString("GraphicCrop"), uno::makeAny( aGraphicCrop ) ); } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e4eda7312c19..102c0ba3e045 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -83,11 +83,6 @@ break using std::make_pair; -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; namespace writerfilter { namespace rtftok { @@ -326,12 +321,12 @@ void RTFDocumentImpl::setSuperstream(RTFDocumentImpl *pSuperstream) m_pSuperstream = pSuperstream; } -void RTFDocumentImpl::setAuthor(rtl::OUString& rAuthor) +void RTFDocumentImpl::setAuthor(OUString& rAuthor) { m_aAuthor = rAuthor; } -void RTFDocumentImpl::setAuthorInitials(rtl::OUString& rAuthorInitials) +void RTFDocumentImpl::setAuthorInitials(OUString& rAuthorInitials) { m_aAuthorInitials = rAuthorInitials; } @@ -3179,16 +3174,16 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTF_TRRH: { - rtl::OUString hRule = rtl::OUString::createFromAscii("auto"); + OUString hRule = OUString::createFromAscii("auto"); if ( nParam < 0 ) { RTFValue::Pointer_t pAbsValue(new RTFValue(-nParam)); pIntValue.swap( pAbsValue ); - hRule = rtl::OUString::createFromAscii("exact"); + hRule = OUString::createFromAscii("exact"); } else if ( nParam > 0 ) - hRule = rtl::OUString::createFromAscii("atLeast"); + hRule = OUString::createFromAscii("atLeast"); lcl_putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TrPrBase_trHeight, NS_ooxml::LN_CT_Height_val, pIntValue); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 6690680e44fb..16e149326464 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -256,7 +256,7 @@ namespace writerfilter { { public: RTFShape(); - std::vector< std::pair<rtl::OUString, rtl::OUString> > aProperties; + std::vector< std::pair<OUString, OUString> > aProperties; sal_Int32 nLeft; sal_Int32 nTop; sal_Int32 nRight; @@ -405,7 +405,7 @@ namespace writerfilter { int nMinute; /// Text from special destinations. - rtl::OUStringBuffer aDestinationText; + OUStringBuffer aDestinationText; /// Same as the int value of NS_rtf::LN_ISTD in aParagraphAttributes, for performance reasons. int nCurrentStyleIndex; @@ -441,15 +441,15 @@ namespace writerfilter { Stream& Mapper(); void setSubstream(bool bIsSubtream); void setSuperstream(RTFDocumentImpl *pSuperstream); - void setAuthor(rtl::OUString& rAuthor); - void setAuthorInitials(rtl::OUString& rAuthorInitials); + void setAuthor(OUString& rAuthor); + void setAuthorInitials(OUString& rAuthorInitials); bool isSubstream() const; void finishSubstream(); - void setIgnoreFirst(rtl::OUString& rIgnoreFirst); + void setIgnoreFirst(OUString& rIgnoreFirst); void seek(sal_uInt32 nPos); uno::Reference<lang::XMultiServiceFactory> getModelFactory(); RTFParserState& getState(); - void setDestinationText(rtl::OUString& rString); + void setDestinationText(OUString& rString); /// Resolve a picture: If not inline, then anchored. int resolvePict(bool bInline); void replayShapetext(); @@ -487,9 +487,9 @@ namespace writerfilter { void resetSprms(); void resetAttributes(); void resolveSubstream(sal_uInt32 nPos, Id nId); - void resolveSubstream(sal_uInt32 nPos, Id nId, rtl::OUString& rIgnoreFirst); + void resolveSubstream(sal_uInt32 nPos, Id nId, OUString& rIgnoreFirst); - void text(rtl::OUString& rString); + void text(OUString& rString); // Sends a single character to dmapper, taking care of buffering. void singleChar(sal_uInt8 nValue, bool bRunProps = false); // Sends run properties to dmapper, taking care of buffering. @@ -558,15 +558,15 @@ namespace writerfilter { std::queue< std::pair<Id, sal_uInt32> > m_nHeaderFooterPositions; sal_uInt32 m_nGroupStartPos; /// Ignore the first occurrence of this text. - rtl::OUString m_aIgnoreFirst; + OUString m_aIgnoreFirst; /// Bookmark name <-> index map. - std::map<rtl::OUString, int> m_aBookmarks; + std::map<OUString, int> m_aBookmarks; /// Revision index <-> author map. - std::map<int, rtl::OUString> m_aAuthors; + std::map<int, OUString> m_aAuthors; /// Annotation author of the next annotation. - rtl::OUString m_aAuthor; + OUString m_aAuthor; /// Initials of author of the next annotation. - rtl::OUString m_aAuthorInitials; + OUString m_aAuthorInitials; RTFSprms m_aFormfieldSprms; RTFSprms m_aFormfieldAttributes; @@ -592,9 +592,9 @@ namespace writerfilter { /// If a frame start token is already sent to dmapper (nesting them is not OK). bool m_bIsInFrame; // Unicode characters are collected here so we don't have to send them one by one. - rtl::OUStringBuffer m_aUnicodeBuffer; + OUStringBuffer m_aUnicodeBuffer; /// Same for hex characters. - rtl::OStringBuffer m_aHexBuffer; + OStringBuffer m_aHexBuffer; /// Formula import. oox::formulaimport::XmlStreamBuilder m_aMathBuffer; /// Normal text property, that is math italic and math spacing are not applied to the current run. diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 864a8bda7962..b7d0e1941326 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -43,11 +43,6 @@ #include "../dmapper/GraphicHelpers.hxx" #include <rtfsdrimport.hxx> -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; namespace writerfilter { namespace rtftok { @@ -105,7 +100,7 @@ void RTFSdrImport::resolve(RTFShape& rShape) // Default line width is 0.75 pt (26 mm100) in Word, 0 in Writer. uno::Any aLineWidth = uno::makeAny(sal_Int32(26)); - for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::iterator i = rShape.aProperties.begin(); + for (std::vector< std::pair<OUString, OUString> >::iterator i = rShape.aProperties.begin(); i != rShape.aProperties.end(); ++i) { if ( i->first == "shapeType" ) diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx index 9e5645fe54d3..a508f7752687 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.hxx +++ b/writerfilter/source/rtftok/rtfsdrimport.hxx @@ -44,7 +44,7 @@ namespace writerfilter { void resolveDhgt(uno::Reference<beans::XPropertySet> xPropertySet, sal_Int32 nZOrder); void resolveFLine(uno::Reference<beans::XPropertySet> xPropertySet, sal_Int32 nFLine); private: - void createShape(rtl::OUString aService, uno::Reference<drawing::XShape>& xShape, uno::Reference<beans::XPropertySet>& xPropertySet); + void createShape(OUString aService, uno::Reference<drawing::XShape>& xShape, uno::Reference<beans::XPropertySet>& xPropertySet); RTFDocumentImpl& m_rImport; uno::Reference<drawing::XDrawPage> m_xDrawPage; diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index 1c3c5a517f68..5dbce120e36c 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -32,7 +32,6 @@ #include <resourcemodel/QNameToString.hxx> #include <doctok/resourceids.hxx> // NS_rtf namespace -using rtl::OStringBuffer; namespace writerfilter { namespace rtftok { diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index a19beac6b8f6..ebd549aa0f8f 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -34,11 +34,6 @@ #include <rtftokenizer.hxx> #include <rtfskipdestination.hxx> -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; namespace writerfilter { namespace rtftok { diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index cca18bebfbcc..e77d10dcd52d 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -54,7 +54,7 @@ namespace writerfilter { private: SvStream& Strm(); int resolveKeyword(); - int dispatchKeyword(rtl::OString& rKeyword, bool bParam, int nParam); + int dispatchKeyword(OString& rKeyword, bool bParam, int nParam); RTFDocumentImpl& m_rImport; SvStream* m_pInStream; diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index e4dd41fbc4b1..7fecd8e3978e 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -31,10 +31,8 @@ namespace writerfilter { namespace rtftok { -using rtl::OString; -using rtl::OUString; -RTFValue::RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, +RTFValue::RTFValue(int nValue, OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> xShape, uno::Reference<io::XInputStream> xStream, uno::Reference<embed::XEmbeddedObject> xObject, bool bForceString) : m_nValue(nValue), diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 6199a8a0de4a..23e9d822cc2c 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -42,19 +42,19 @@ namespace writerfilter { { public: typedef boost::shared_ptr<RTFValue> Pointer_t; - RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape, + RTFValue(int nValue, OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape, uno::Reference<io::XInputStream> rStream, uno::Reference<embed::XEmbeddedObject> rObject, bool bForceString); RTFValue(int nValue); - RTFValue(rtl::OUString sValue, bool bForce = false); + RTFValue(OUString sValue, bool bForce = false); RTFValue(RTFSprms rAttributes); RTFValue(RTFSprms rAttributes, RTFSprms rSprms); RTFValue(uno::Reference<drawing::XShape> rShape); RTFValue(uno::Reference<io::XInputStream> rStream); RTFValue(uno::Reference<embed::XEmbeddedObject> rObject); virtual ~RTFValue(); - void setString(rtl::OUString sValue); + void setString(OUString sValue); virtual int getInt() const; - virtual rtl::OUString getString() const; + virtual OUString getString() const; virtual uno::Any getAny() const; virtual writerfilter::Reference<Properties>::Pointer_t getProperties(); virtual writerfilter::Reference<Stream>::Pointer_t getStream(); @@ -67,7 +67,7 @@ namespace writerfilter { private: RTFValue& operator=(RTFValue const& rOther); int m_nValue; - rtl::OUString m_sValue; + OUString m_sValue; boost::shared_ptr<RTFSprms> m_pAttributes; boost::shared_ptr<RTFSprms> m_pSprms; uno::Reference<drawing::XShape> m_xShape; |