summaryrefslogtreecommitdiff
path: root/sot/source/base/exchange.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sot/source/base/exchange.cxx')
-rw-r--r--sot/source/base/exchange.cxx60
1 files changed, 33 insertions, 27 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 57e65862aea2..20b8efddbfff 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,12 @@
#include <sot/clsids.hxx>
#include <rtl/instance.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <comphelper/documentconstants.hxx>
+#ifdef GetObject
+#undef GetObject
+#endif
+
using namespace::com::sun::star::uno;
using namespace::com::sun::star::datatransfer;
@@ -209,7 +213,7 @@ namespace
/*136 SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII, "Calc 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*137 SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
- /*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+ /*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
};
return &aInstance[0];
@@ -223,11 +227,11 @@ namespace
//-----------------------------------------------------------------------
-static List& InitFormats_Impl()
+static tDataFlavorList& InitFormats_Impl()
{
SotData_Impl * pSotData = SOTDATA();
if( !pSotData->pDataFlavorList )
- pSotData->pDataFlavorList = new List();
+ pSotData->pDataFlavorList = new tDataFlavorList();
return *pSotData->pDataFlavorList;
}
@@ -257,10 +261,10 @@ sal_uLong SotExchange::RegisterFormatName( const String& rName )
: i );
// dann in der dynamischen Liste
- List& rL = InitFormats_Impl();
- for( i = 0, nMax = rL.Count(); i < nMax; i++ )
+ tDataFlavorList& rL = InitFormats_Impl();
+ for( i = 0, nMax = rL.size(); i < nMax; i++ )
{
- DataFlavor* pFlavor = (DataFlavor*) rL.GetObject( i );
+ DataFlavor* pFlavor = rL[ i ];
if( pFlavor && rName == String( pFlavor->HumanPresentableName ) )
return i + SOT_FORMATSTR_ID_USER_END + 1;
}
@@ -272,7 +276,7 @@ sal_uLong SotExchange::RegisterFormatName( const String& rName )
pNewFlavor->HumanPresentableName = rName;
pNewFlavor->DataType = ::getCppuType( (const ::rtl::OUString*) 0 );
- rL.Insert( pNewFlavor, LIST_APPEND );
+ rL.push_back( pNewFlavor );
return nMax + SOT_FORMATSTR_ID_USER_END + 1;
}
@@ -292,10 +296,10 @@ sal_uLong SotExchange::RegisterFormatMimeType( const String& rMimeType )
return i;
// dann in der dynamischen Liste
- List& rL = InitFormats_Impl();
- for( i = 0, nMax = rL.Count(); i < nMax; i++ )
+ tDataFlavorList& rL = InitFormats_Impl();
+ for( i = 0, nMax = rL.size(); i < nMax; i++ )
{
- DataFlavor* pFlavor = (DataFlavor*) rL.GetObject( i );
+ DataFlavor* pFlavor = rL[ i ];
if( pFlavor && rMimeType == String( pFlavor->MimeType ) )
return i + SOT_FORMATSTR_ID_USER_END + 1;
}
@@ -307,7 +311,7 @@ sal_uLong SotExchange::RegisterFormatMimeType( const String& rMimeType )
pNewFlavor->HumanPresentableName = rMimeType;
pNewFlavor->DataType = ::getCppuType( (const ::rtl::OUString*) 0 );
- rL.Insert( pNewFlavor, LIST_APPEND );
+ rL.push_back( pNewFlavor );
return nMax + SOT_FORMATSTR_ID_USER_END + 1;
}
@@ -324,9 +328,9 @@ sal_uLong SotExchange::RegisterFormat( const DataFlavor& rFlavor )
if( !nRet )
{
- List& rL = InitFormats_Impl();
- nRet = rL.Count() + SOT_FORMATSTR_ID_USER_END + 1;
- rL.Insert( new DataFlavor( rFlavor ), LIST_APPEND );
+ tDataFlavorList& rL = InitFormats_Impl();
+ nRet = rL.size() + SOT_FORMATSTR_ID_USER_END + 1;
+ rL.push_back( new DataFlavor( rFlavor ) );
}
return nRet;
@@ -353,13 +357,13 @@ sal_Bool SotExchange::GetFormatDataFlavor( sal_uLong nFormat, DataFlavor& rFlavo
}
else
{
- List& rL = InitFormats_Impl();
+ tDataFlavorList& rL = InitFormats_Impl();
nFormat -= SOT_FORMATSTR_ID_USER_END + 1;
- if( rL.Count() > nFormat )
+ if( rL.size() > nFormat )
{
- rFlavor = *(DataFlavor*) rL.GetObject( nFormat );
+ rFlavor = *rL[ nFormat ];
bRet = sal_True;
}
else
@@ -387,12 +391,12 @@ String SotExchange::GetFormatMimeType( sal_uLong nFormat )
sMimeType.AssignAscii( FormatArray_Impl::get()[nFormat].pMimeType );
else
{
- List& rL = InitFormats_Impl();
+ tDataFlavorList& rL = InitFormats_Impl();
nFormat -= SOT_FORMATSTR_ID_USER_END + 1;
- if( rL.Count() > nFormat )
- sMimeType = ((DataFlavor*) rL.GetObject( nFormat ))->MimeType;
+ if( rL.size() > nFormat )
+ sMimeType = rL[ nFormat ]->MimeType;
}
DBG_ASSERT( sMimeType.Len(), "SotExchange::GetFormatMimeType(): DataFlavor not initialized" );
@@ -425,11 +429,11 @@ sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
: i );
// dann in der dynamischen Liste
- List& rL = InitFormats_Impl();
+ tDataFlavorList& rL = InitFormats_Impl();
::rtl::OUString aMimeType( rMimeType );
- for( i = 0, nMax = rL.Count(); i < nMax; i++ )
+ for( i = 0, nMax = rL.size(); i < nMax; i++ )
{
- DataFlavor* pFlavor = (DataFlavor*) rL.GetObject( i );
+ DataFlavor* pFlavor = rL[ i ];
if( pFlavor && aMimeType == pFlavor->MimeType )
return i + SOT_FORMATSTR_ID_USER_END + 1;
}
@@ -465,10 +469,10 @@ sal_uLong SotExchange::GetFormat( const DataFlavor& rFlavor )
: i );
// dann in der dynamischen Liste
- List& rL = InitFormats_Impl();
- for( i = 0, nMax = rL.Count(); i < nMax; i++ )
+ tDataFlavorList& rL = InitFormats_Impl();
+ for( i = 0, nMax = rL.size(); i < nMax; i++ )
{
- DataFlavor* pFlavor = (DataFlavor*) rL.GetObject( i );
+ DataFlavor* pFlavor = rL[ i ];
if( pFlavor && rMimeType == pFlavor->MimeType )
return i + SOT_FORMATSTR_ID_USER_END + 1;
}
@@ -506,3 +510,5 @@ sal_Bool SotExchange::IsInternal( const SvGlobalName& rName )
return sal_True;
return sal_False;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */