openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1575260 - in /openoffice/trunk/main: sd/source/ui/sidebar/ stlport/systemstl/ xmloff/source/transform/
Date Fri, 07 Mar 2014 13:47:33 GMT
Author: hdu
Date: Fri Mar  7 13:47:33 2014
New Revision: 1575260

URL: http://svn.apache.org/r1575260
Log:
#i123770# obsolete and remove the emulation of hash_map's data_type typedef

and fix its former usages by utilizing the standard compliant mapped_type
typedef instead

Modified:
    openoffice/trunk/main/sd/source/ui/sidebar/MasterPageObserver.cxx
    openoffice/trunk/main/stlport/systemstl/hash_map
    openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx
    openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx
    openoffice/trunk/main/xmloff/source/transform/TransformerActions.cxx

Modified: openoffice/trunk/main/sd/source/ui/sidebar/MasterPageObserver.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/sidebar/MasterPageObserver.cxx?rev=1575260&r1=1575259&r2=1575260&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/sidebar/MasterPageObserver.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/sidebar/MasterPageObserver.cxx Fri Mar  7 13:47:33
2014
@@ -186,7 +186,7 @@ void MasterPageObserver::Implementation:
     SdDrawDocument& rDocument)
 {
     // Gather the names of all the master pages in the given document.
-    MasterPageContainer::data_type aMasterPageSet;
+    MasterPageContainer::mapped_type aMasterPageSet;
     sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
     for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
     {

Modified: openoffice/trunk/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_map?rev=1575260&r1=1575259&r2=1575260&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_map (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_map Fri Mar  7 13:47:33 2014
@@ -62,7 +62,6 @@ class hash_map
 {
 public:
 	typedef unordered_map<__K,__T,__H,__E,__A> _super;
-	typedef __T data_type;
 
 	hash_map( void) {}
 	hash_map( size_t n) : _super( n) {}
@@ -83,7 +82,6 @@ class hash_multimap
 {
 public:
 	typedef unordered_multimap<__K,__T,__H,__E,__A> _super;
-	typedef __T data_type;
 
 	hash_multimap( void) {}
 	hash_multimap( size_t n) : _super( n) {}

Modified: openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx?rev=1575260&r1=1575259&r2=1575260&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx Fri Mar  7 13:47:33
2014
@@ -63,7 +63,7 @@ XMLTransformerOASISEventMap_Impl::XMLTra
 	if( pInit )
 	{
 		XMLTransformerOASISEventMap_Impl::key_type aKey;
-		XMLTransformerOASISEventMap_Impl::data_type aData;
+		XMLTransformerOASISEventMap_Impl::mapped_type aData;
 		while( pInit->m_pOASISName )
 		{
 			aKey.m_nPrefix = pInit->m_nOASISPrefix;

Modified: openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx?rev=1575260&r1=1575259&r2=1575260&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx Fri Mar  7 13:47:33
2014
@@ -62,7 +62,7 @@ public:
 void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
 {
 	XMLTransformerOOoEventMap_Impl::key_type aKey;
-	XMLTransformerOOoEventMap_Impl::data_type aData;
+	XMLTransformerOOoEventMap_Impl::mapped_type aData;
 	while( pInit->m_pOOoName )
 	{
 		aKey = OUString::createFromAscii(pInit->m_pOOoName);

Modified: openoffice/trunk/main/xmloff/source/transform/TransformerActions.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/TransformerActions.cxx?rev=1575260&r1=1575259&r2=1575260&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/TransformerActions.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/TransformerActions.cxx Fri Mar  7 13:47:33
2014
@@ -37,7 +37,7 @@ XMLTransformerActions::XMLTransformerAct
 	if( pInit )
 	{
 		XMLTransformerActions::key_type aKey;
-		XMLTransformerActions::data_type aData;
+		XMLTransformerActions::mapped_type aData;
 		while( pInit->m_nActionType != XML_TACTION_EOT )
 		{
 			aKey.m_nPrefix = pInit->m_nPrefix;
@@ -66,7 +66,7 @@ void XMLTransformerActions::Add( XMLTran
 	if( pInit )
 	{
 		XMLTransformerActions::key_type aKey;
-		XMLTransformerActions::data_type aData;
+		XMLTransformerActions::mapped_type aData;
 		while( pInit->m_nActionType != XML_TACTION_EOT )
 		{
 			aKey.m_nPrefix = pInit->m_nPrefix;



Mime
View raw message