summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/configsettings.cxx4
-rw-r--r--vcl/source/gdi/jobset.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx12
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx8
-rw-r--r--vcl/source/gdi/print.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx20
6 files changed, 26 insertions, 26 deletions
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index fe9c69c1c7a0..25ec2cd50c74 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -57,7 +57,7 @@ SettingsConfigItem::~SettingsConfigItem()
void SettingsConfigItem::ImplCommit()
{
- std::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group;
+ std::unordered_map< OUString, SmallOUStrMap >::const_iterator group;
for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
{
@@ -122,7 +122,7 @@ void SettingsConfigItem::getValues()
OUString SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const
{
- std::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
+ std::unordered_map< OUString, SmallOUStrMap >::const_iterator group = m_aSettings.find( rGroup );
if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() )
{
return OUString();
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index dfe238e47fb5..cc8712a48615 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -355,8 +355,8 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
rOStream.WriteBytes( &aOldJobData, nOldJobDataSize );
rOStream.WriteBytes( rJobData.GetDriverData(), rJobData.GetDriverDataLen() );
- std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
- const std::unordered_map< OUString, OUString, OUStringHash >& rValueMap(
+ std::unordered_map< OUString, OUString >::const_iterator it;
+ const std::unordered_map< OUString, OUString >& rValueMap(
rJobData.GetValueMap());
for( it = rValueMap.begin(); it != rValueMap.end(); ++it )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index fbf9fa996c3e..16549094c6f0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -713,7 +713,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// find or create a hierarchical field
// first find the fully qualified name up to this field
aDomain = aFullName.copy( 0, nTokenIndex-1 );
- std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+ std::unordered_map< OString, sal_Int32 >::const_iterator it = m_aFieldNameMap.find( aDomain );
if( it == m_aFieldNameMap.end() )
{
// create new hierarchy field
@@ -774,7 +774,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// insert widget into its hierarchy field
if( !aDomain.isEmpty() )
{
- std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+ std::unordered_map< OString, sal_Int32 >::const_iterator it = m_aFieldNameMap.find( aDomain );
if( it != m_aFieldNameMap.end() )
{
OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" );
@@ -801,11 +801,11 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
if( ! m_aContext.AllowDuplicateFieldNames )
{
- std::unordered_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName );
+ std::unordered_map<OString, sal_Int32>::iterator it = m_aFieldNameMap.find( aFullName );
if( it != m_aFieldNameMap.end() ) // not unique
{
- std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it;
+ std::unordered_map< OString, sal_Int32 >::const_iterator check_it;
OString aTry;
sal_Int32 nTry = 2;
do
@@ -2645,7 +2645,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle )
if( ! m_aRoleMap.empty() )
{
aLine.append( "/RoleMap<<" );
- for( std::unordered_map<OString,OString,OStringHash>::const_iterator
+ for( std::unordered_map<OString,OString>::const_iterator
it = m_aRoleMap.begin(); it != m_aRoleMap.end(); ++it )
{
aLine.append( '/' );
@@ -11422,7 +11422,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
{
PDFWidget& rGroupWidget = m_aWidgets[ group->second ];
// check whether all kids have a unique OnValue
- std::unordered_map< OUString, sal_Int32, OUStringHash > aOnValues;
+ std::unordered_map< OUString, sal_Int32 > aOnValues;
int nChildren = rGroupWidget.m_aKidsIndex.size();
bool bIsUnique = true;
for( int nKid = 0; nKid < nChildren && bIsUnique; nKid++ )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 7b8fc46a3cb3..f4e764879137 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -468,8 +468,8 @@ public:
{}
};
- typedef std::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams;
- typedef std::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap;
+ typedef std::unordered_map< OString, SvMemoryStream* > PDFAppearanceStreams;
+ typedef std::unordered_map< OString, PDFAppearanceStreams > PDFAppearanceMap;
struct PDFWidget : public PDFAnnotation
{
@@ -680,7 +680,7 @@ private:
*/
bool m_bEmitStructure;
/* role map of struct tree root */
- std::unordered_map< OString, OString, OStringHash >
+ std::unordered_map< OString, OString >
m_aRoleMap;
/* contains all widgets used in the PDF
@@ -689,7 +689,7 @@ private:
/* maps radio group id to index of radio group control in m_aWidgets */
std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets;
/* unordered_map for field names, used to ensure unique field names */
- std::unordered_map< OString, sal_Int32, OStringHash > m_aFieldNameMap;
+ std::unordered_map< OString, sal_Int32 > m_aFieldNameMap;
/* contains Bitmaps for gradient functions until they are written
* to the file stream */
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 515b12de1d4a..98410f9a764e 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -374,7 +374,7 @@ ImplPrnQueueList::~ImplPrnQueueList()
void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData )
{
- std::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it =
+ std::unordered_map< OUString, sal_Int32 >::iterator it =
m_aNameToIndex.find( pData->maPrinterName );
if( it == m_aNameToIndex.end() )
{
@@ -397,7 +397,7 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData )
ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter )
{
ImplPrnQueueData* pData = nullptr;
- std::unordered_map<OUString,sal_Int32,OUStringHash>::iterator it =
+ std::unordered_map<OUString,sal_Int32>::iterator it =
m_aNameToIndex.find( rPrinter );
if( it != m_aNameToIndex.end() )
pData = &m_aQueueInfos[it->second];
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index a825d0b23438..f41ae699ca03 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -135,9 +135,9 @@ public:
ControlDependency() : mnDependsOnEntry( -1 ) {}
};
- typedef std::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap;
- typedef std::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap;
- typedef std::unordered_map< OUString, css::uno::Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap;
+ typedef std::unordered_map< OUString, size_t > PropertyToIndexMap;
+ typedef std::unordered_map< OUString, ControlDependency > ControlDependencyMap;
+ typedef std::unordered_map< OUString, css::uno::Sequence< sal_Bool > > ChoiceDisableMap;
VclPtr< Printer > mxPrinter;
css::uno::Sequence< css::beans::PropertyValue > maUIOptions;
@@ -1373,7 +1373,7 @@ bool PrinterController::getPrinterModified() const
css::uno::Sequence< css::beans::PropertyValue > PrinterController::getJobProperties( const css::uno::Sequence< css::beans::PropertyValue >& i_rMergeList ) const
{
- std::unordered_set< OUString, OUStringHash > aMergeSet;
+ std::unordered_set< OUString > aMergeSet;
size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3;
for( int i = 0; i < i_rMergeList.getLength(); i++ )
aMergeSet.insert( i_rMergeList[i].Name );
@@ -1422,14 +1422,14 @@ const css::uno::Sequence< css::beans::PropertyValue >& PrinterController::getUIO
css::beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty )
{
- std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
+ std::unordered_map< OUString, size_t >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rProperty );
return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : nullptr;
}
const css::beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const
{
- std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
+ std::unordered_map< OUString, size_t >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rProperty );
return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : nullptr;
}
@@ -1445,7 +1445,7 @@ void PrinterController::setValue( const OUString& i_rPropertyName, const css::un
void PrinterController::setValue( const css::beans::PropertyValue& i_rPropertyValue )
{
- std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
+ std::unordered_map< OUString, size_t >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rPropertyValue.Name );
if( it != mpImplData->maPropertyToIndex.end() )
mpImplData->maUIProperties[ it->second ] = i_rPropertyValue;
@@ -1525,7 +1525,7 @@ void PrinterController::setUIOptions( const css::uno::Sequence< css::beans::Prop
bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const
{
bool bEnabled = false;
- std::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it =
+ std::unordered_map< OUString, size_t >::const_iterator prop_it =
mpImplData->maPropertyToIndex.find( i_rProperty );
if( prop_it != mpImplData->maPropertyToIndex.end() )
{
@@ -1755,7 +1755,7 @@ sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_In
css::uno::Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const
{
css::uno::Any aRet;
- std::unordered_map< OUString, css::uno::Any, OUStringHash >::const_iterator it =
+ std::unordered_map< OUString, css::uno::Any >::const_iterator it =
m_aPropertyMap.find( i_rPropertyName );
if( it != m_aPropertyMap.end() )
aRet = it->second;
@@ -1792,7 +1792,7 @@ bool PrinterOptionsHelper::processProperties( const css::uno::Sequence< css::bea
for( sal_Int32 i = 0; i < nElements; i++ )
{
bool bElementChanged = false;
- std::unordered_map< OUString, css::uno::Any, OUStringHash >::iterator it =
+ std::unordered_map< OUString, css::uno::Any >::iterator it =
m_aPropertyMap.find( pVals[ i ].Name );
if( it != m_aPropertyMap.end() )
{
generated by cgit (git 2.34.1) at 2024-07-23 04:27:53 +0000