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 /oox/source | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'oox/source')
23 files changed, 29 insertions, 50 deletions
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx index 1a90ce48ccd2..2d41797631f6 100644 --- a/oox/source/core/contexthandler.cxx +++ b/oox/source/core/contexthandler.cxx @@ -29,7 +29,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index 2a7442bdbcfe..560965a1543b 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -28,8 +28,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index ffeb255df0a6..03fd60a7481e 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 3791b950dc26..c71f966b587c 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -30,7 +30,6 @@ namespace core { using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 8643d2c75d74..4d31f0547787 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -56,7 +56,6 @@ using ::comphelper::MediaDescriptor; using ::comphelper::SequenceAsHashMap; using ::oox::ole::OleObjectHelper; using ::oox::ole::VbaProject; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index a581d10c1d66..1bc095fd1395 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::xml::sax; using ::comphelper::MediaDescriptor; using ::comphelper::SequenceAsHashMap; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx index 3c970bbff1a0..f390698be446 100644 --- a/oox/source/core/fragmenthandler.cxx +++ b/oox/source/core/fragmenthandler.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index bfc68343a1b9..b94ff56a9641 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -28,7 +28,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; @@ -86,9 +85,9 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis if( !str.isEmpty() ) { Sequence< ::com::sun::star::xml::FastAttribute > attrs = rAttribs.getFastAttributeList()->getFastAttributes(); - // printf("MCE: %s\n", ::rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); + // printf("MCE: %s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); // TODO: Check & Get the namespaces in "Ignorable" - // printf("NS: %d : %s\n", attrs.getLength(), ::rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); + // printf("NS: %d : %s\n", attrs.getLength(), OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); } } return false; diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 43018cd35233..0f302b840bec 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index c49fe6320bf4..ef4d0b139cfe 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -27,8 +27,6 @@ namespace core { // ============================================================================ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index 899a8d25efd5..73005eb216f8 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -30,8 +30,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx index aec65592db88..6873e4d194ce 100644 --- a/oox/source/core/services.cxx +++ b/oox/source/core/services.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/implementationentry.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; // Declare static functions providing service information ===================== diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 2289e4d4be61..73d223eec1bc 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -72,9 +72,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using ::comphelper::MediaDescriptor; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::sax_fastparser::FSHelperPtr; using ::sax_fastparser::FastSerializerHelper; @@ -496,7 +493,7 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const util::DateTime& rTi } static void -writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, Sequence< rtl::OUString > aItems ) +writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, Sequence< OUString > aItems ) { if( aItems.getLength() == 0 ) return; diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index 51eccab59548..b3e79048eb67 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -50,7 +50,7 @@ class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xm sal_Int32 m_nInBlock; - ::rtl::OUString m_aCustomPropertyName; + OUString m_aCustomPropertyName; public: explicit OOXMLDocPropHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xDocProp ); @@ -60,10 +60,10 @@ public: void InitNew(); void AddCustomProperty( const ::com::sun::star::uno::Any& aAny ); - ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const ::rtl::OUString& aChars ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetKeywordsSet( const ::rtl::OUString& aChars ); - ::com::sun::star::lang::Locale GetLanguage( const ::rtl::OUString& aChars ); - void UpdateDocStatistic( const ::rtl::OUString& aChars ); + ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars ); + ::com::sun::star::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars ); + ::com::sun::star::lang::Locale GetLanguage( const OUString& aChars ); + void UpdateDocStatistic( const OUString& aChars ); // com.sun.star.xml.sax.XFastDocumentHandler @@ -74,14 +74,14 @@ public: // com.sun.star.xml.sax.XFastContextHandler virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index ea91a6a2daa4..f4d3092e83ee 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index 25122942c20b..acbf15de00c2 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -41,9 +41,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XOOXMLDocumentPropertiesImporter virtual void SAL_CALL importProperties( diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index e42ddcf82967..5497be835933 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -62,7 +62,7 @@ class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2 public: DiagramQStylesFragmentHandler( oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, DiagramQStyleMap& rStylesMap ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); @@ -75,7 +75,7 @@ private: const AttributeList& rAttribs, ShapeStyleRef& o_rStyle); - ::rtl::OUString maStyleName; + OUString maStyleName; DiagramStyle maStyleEntry; DiagramQStyleMap& mrStylesMap; }; @@ -85,7 +85,7 @@ class ColorFragmentHandler : public ::oox::core::FragmentHandler2 public: ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, DiagramColorMap& rColorMap ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); @@ -94,7 +94,7 @@ public: virtual void onEndElement(); private: - ::rtl::OUString maColorName; + OUString maColorName; DiagramColor maColorEntry; DiagramColorMap& mrColorsMap; }; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 000859d9ef70..07b5371fbf17 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2302,7 +2302,7 @@ void ChartExport::exportDataLabels( { (void)rEx; // avoid warning for pro build OSL_TRACE( "Exception caught during Export of data label: %s", - rtl::OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); } if( xPropSet.is() ) diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx index e72a90acd738..23f89aeaa299 100644 --- a/oox/source/helper/binaryoutputstream.cxx +++ b/oox/source/helper/binaryoutputstream.cxx @@ -111,7 +111,7 @@ BinaryOutputStream::writeCharArrayUC( const OUString& rString, rtl_TextEncoding } void -BinaryOutputStream::writeUnicodeArray( const ::rtl::OUString& rString, bool bAllowNulChars ) +BinaryOutputStream::writeUnicodeArray( const OUString& rString, bool bAllowNulChars ) { OUString sBuf( rString ); if( !bAllowNulChars ) @@ -127,7 +127,7 @@ BinaryOutputStream::writeUnicodeArray( const ::rtl::OUString& rString, bool bAll } void -BinaryOutputStream::writeCompressedUnicodeArray( const rtl::OUString& rString, bool bCompressed, bool bAllowNulChars ) +BinaryOutputStream::writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars ) { if ( bCompressed ) // ISO-8859-1 maps all byte values 0xHH to the same Unicode code point U+00HH diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 1cdf563dc956..af3e0b41a228 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -91,8 +91,6 @@ using namespace ::com::sun::star::uno; using ::com::sun::star::drawing::TextHorizontalAdjust; using ::com::sun::star::drawing::TextVerticalAdjust; -using ::rtl::OString; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 6d44cf07f000..2b51604fb467 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -114,7 +114,7 @@ OUString& XmlStream::AttributeList::operator[] (int token) return attrs[token]; } -rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString& def ) const +OUString XmlStream::AttributeList::attribute( int token, const OUString& def ) const { std::map< int, OUString >::const_iterator find = attrs.find( token ); if( find != attrs.end()) @@ -158,7 +158,7 @@ sal_Unicode XmlStream::AttributeList::attribute( int token, sal_Unicode def ) co return def; } -XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const rtl::OUString& txt ) +XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const OUString& txt ) : token( t ) , attributes( AttributeListBuilder( a )) , text( txt ) @@ -353,7 +353,7 @@ void XmlStreamBuilder::appendClosingTag( int token ) tags.push_back( Tag( CLOSING( token ))); } -void XmlStreamBuilder::appendCharacters( const rtl::OUString& chars ) +void XmlStreamBuilder::appendCharacters( const OUString& chars ) { assert( !tags.empty()); tags.back().text += chars; diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx index 8ca11b9caca1..26725ffdf0f6 100644 --- a/oox/source/ppt/comments.cxx +++ b/oox/source/ppt/comments.cxx @@ -29,7 +29,7 @@ void CommentAuthorList::setValues(const CommentAuthorList& list) } //DateTime is saved as : 2013-01-10T15:53:26.000 -void Comment::setDateTime (::rtl::OUString datetime) +void Comment::setDateTime (OUString datetime) { aDateTime.Year = datetime.getToken(0,'-').toInt32(); aDateTime.Month = datetime.getToken(1,'-').toInt32(); diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index d38d815a8514..247b81b981a1 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -281,7 +281,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, sal_Bool bFirst { // Comments are present and commentAuthors.xml has still not been read mbCommentAuthorsRead = true; - rtl::OUString aCommentAuthorsFragmentPath = "ppt/commentAuthors.xml"; + OUString aCommentAuthorsFragmentPath = "ppt/commentAuthors.xml"; Reference< XPresentationPage > xPresentationPage( xSlide, UNO_QUERY ); Reference< XDrawPage > xCommentAuthorsPage( xPresentationPage->getNotesPage() ); SlidePersistPtr pCommentAuthorsPersistPtr( |