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 /xmloff/inc/txtlists.hxx | |
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 'xmloff/inc/txtlists.hxx')
-rw-r--r-- | xmloff/inc/txtlists.hxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index f079ae47e623..bff6a0bedf96 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -58,35 +58,35 @@ class XMLTextListsHelper : private boost::noncopyable // keeping track of processed lists for import and export // Add optional parameter <sListStyleDefaultListId> (#i92811#) - void KeepListAsProcessed( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName, - ::rtl::OUString sContinueListId, - ::rtl::OUString sListStyleDefaultListId = ::rtl::OUString() ); + void KeepListAsProcessed( OUString sListId, + OUString sListStyleName, + OUString sContinueListId, + OUString sListStyleDefaultListId = OUString() ); - sal_Bool IsListProcessed( const ::rtl::OUString sListId ) const; - ::rtl::OUString GetListStyleOfProcessedList( - const ::rtl::OUString sListId ) const; - ::rtl::OUString GetContinueListIdOfProcessedList( - const ::rtl::OUString sListId ) const; - const ::rtl::OUString& GetLastProcessedListId() const; - const ::rtl::OUString& GetListStyleOfLastProcessedList() const; + sal_Bool IsListProcessed( const OUString sListId ) const; + OUString GetListStyleOfProcessedList( + const OUString sListId ) const; + OUString GetContinueListIdOfProcessedList( + const OUString sListId ) const; + const OUString& GetLastProcessedListId() const; + const OUString& GetListStyleOfLastProcessedList() const; - ::rtl::OUString GenerateNewListId() const; + OUString GenerateNewListId() const; // Provide list id for a certain list block for import (#i92811#) - ::rtl::OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock ); + OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock ); // keep track of continue list chain for export - void StoreLastContinuingList( ::rtl::OUString sListId, - ::rtl::OUString sContinuingListId ); + void StoreLastContinuingList( OUString sListId, + OUString sContinuingListId ); - ::rtl::OUString GetLastContinuingListId( ::rtl::OUString sListId ) const; + OUString GetLastContinuingListId( OUString sListId ) const; // keep track of opened list elements of a certain list for export - void PushListOnStack( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName ); + void PushListOnStack( OUString sListId, + OUString sListStyleName ); void PopListFromStack(); - sal_Bool EqualsToTopListStyleOnStack( const ::rtl::OUString sListId ) const; + sal_Bool EqualsToTopListStyleOnStack( const OUString sListId ) const; /** for importing numbered-paragraph note that the ID namespace for numbered-paragraph and regular list @@ -96,13 +96,13 @@ class XMLTextListsHelper : private boost::noncopyable ::com::sun::star::container::XIndexReplace> EnsureNumberedParagraph( SvXMLImport & i_rImport, - const ::rtl::OUString i_ListId, - sal_Int16 & io_rLevel, const ::rtl::OUString i_StyleName); + const OUString i_ListId, + sal_Int16 & io_rLevel, const OUString i_StyleName); /// get ID of the last numbered-paragraph iff it has given style-name - ::rtl::OUString GetNumberedParagraphListId( + OUString GetNumberedParagraphListId( const sal_uInt16 i_Level, - const ::rtl::OUString i_StyleName); + const OUString i_StyleName); /** Creates a NumRule from given style-name. @param i_rImport the SvXMLImport @@ -118,8 +118,8 @@ class XMLTextListsHelper : private boost::noncopyable SvXMLImport & i_rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>& i_xNumRule, - const ::rtl::OUString i_ParentStyleName, - const ::rtl::OUString i_StyleName, + const OUString i_ParentStyleName, + const OUString i_StyleName, sal_Int16 & io_rLevel, sal_Bool* o_pRestartNumbering = 0, sal_Bool* io_pSetDefaults = 0); @@ -137,12 +137,12 @@ class XMLTextListsHelper : private boost::noncopyable // container type for processed lists: // map with <ListId> as key and pair( <ListStyleName, ContinueListId> ) // as value - typedef ::std::map< ::rtl::OUString, - ::std::pair< ::rtl::OUString, ::rtl::OUString >, + typedef ::std::map< OUString, + ::std::pair< OUString, OUString >, ::comphelper::UStringLess > tMapForLists; tMapForLists* mpProcessedLists; - ::rtl::OUString msLastProcessedListId; - ::rtl::OUString msListStyleOfLastProcessedList; + OUString msLastProcessedListId; + OUString msListStyleOfLastProcessedList; /* additional container for processed lists. map with <ListStyleName> as key and pair( <ListId, ListStyleDefaultListId> ) @@ -153,28 +153,28 @@ class XMLTextListsHelper : private boost::noncopyable // container type to build up continue list chain: // map with <ListId> of master list as key and <ListId> of last list // continuing the master list as value - typedef ::std::map< ::rtl::OUString, ::rtl::OUString, + typedef ::std::map< OUString, OUString, ::comphelper::UStringLess > tMapForContinuingLists; tMapForContinuingLists* mpContinuingLists; // stack type for opened list elements and its list style: // vector with pair( <ListId>, <ListStyleName> ) as value - typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + typedef ::std::vector< ::std::pair< OUString, OUString > > tStackForLists; tStackForLists* mpListStack; /// to connect numbered-paragraphs that have no list-id attribute: /// vector of pair of style-name and list-id (indexed by level) - typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + typedef ::std::vector< ::std::pair< OUString, OUString > > LastNumberedParagraphs_t; LastNumberedParagraphs_t mLastNumberedParagraphs; /// numbered-paragraphs - typedef ::std::vector< ::std::pair< ::rtl::OUString, + typedef ::std::vector< ::std::pair< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > > > NumParaList_t; - ::std::map< ::rtl::OUString, NumParaList_t > mNPLists; + ::std::map< OUString, NumParaList_t > mNPLists; }; #endif |