Kaydet (Commit) 48388718 authored tarafından Caolán McNamara's avatar Caolán McNamara

adapt for singleton api change

üst cde15afd
...@@ -861,7 +861,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& ...@@ -861,7 +861,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
void TPGalleryThemeProperties::FillFilterList() void TPGalleryThemeProperties::FillFilterList()
{ {
GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
String aExt; String aExt;
String aName; String aName;
FilterEntry* pFilterEntry; FilterEntry* pFilterEntry;
...@@ -870,10 +870,10 @@ void TPGalleryThemeProperties::FillFilterList() ...@@ -870,10 +870,10 @@ void TPGalleryThemeProperties::FillFilterList()
sal_Bool bInList; sal_Bool bInList;
// graphic filters // graphic filters
for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ ) for( i = 0, nKeyCount = rFilter.GetImportFormatCount(); i < nKeyCount; i++ )
{ {
aExt = pFilter->GetImportFormatShortName( i ); aExt = rFilter.GetImportFormatShortName( i );
aName = pFilter->GetImportFormatName( i ); aName = rFilter.GetImportFormatName( i );
pTestEntry = (FilterEntry*) aFilterEntryList.First(); pTestEntry = (FilterEntry*) aFilterEntryList.First();
bInList = sal_False; bInList = sal_False;
...@@ -882,7 +882,7 @@ void TPGalleryThemeProperties::FillFilterList() ...@@ -882,7 +882,7 @@ void TPGalleryThemeProperties::FillFilterList()
String sWildcard; String sWildcard;
while( sal_True ) while( sal_True )
{ {
sWildcard = pFilter->GetImportWildcard( i, j++ ); sWildcard = rFilter.GetImportWildcard( i, j++ );
if ( !sWildcard.Len() ) if ( !sWildcard.Len() )
break; break;
if ( aExtensions.Search( sWildcard ) == STRING_NOTFOUND ) if ( aExtensions.Search( sWildcard ) == STRING_NOTFOUND )
...@@ -943,7 +943,7 @@ void TPGalleryThemeProperties::FillFilterList() ...@@ -943,7 +943,7 @@ void TPGalleryThemeProperties::FillFilterList()
String sWildcard; String sWildcard;
while( sal_True ) while( sal_True )
{ {
sWildcard = pFilter->GetImportWildcard( i, j++ ); sWildcard = rFilter.GetImportWildcard( i, j++ );
if ( !sWildcard.Len() ) if ( !sWildcard.Len() )
break; break;
if ( aExtensions.Search( sWildcard ) == STRING_NOTFOUND ) if ( aExtensions.Search( sWildcard ) == STRING_NOTFOUND )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment