ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fix --enable-mergelibs=more on macos

Browse Source 
fix duplicate symbols

Change-Id: I6ec0b07026db6df6b76228a6bedb95c610e7ea07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163316
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2024-02-14 07:51:41 +01:00
committed by Noel Grandin
parent b6ef30d1b0
commit 5e70dd0235
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fpicker/source/aqua/FilterHelper.hxx
+4 -4
View File
@@ -39,7 +39,7 @@ typedef css::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transpo
typedef ::std::list<NSString *> NSStringList;
typedef ::std::list<OUString> OUStringList;
struct FilterEntry
struct AquaFilterEntry
{
protected:
OUString m_sTitle;
@@ -47,13 +47,13 @@ protected:
UnoFilterList m_aSubFilters;
public:
FilterEntry( const OUString& _rTitle, const OUStringList _rFilter )
AquaFilterEntry( const OUString& _rTitle, const OUStringList _rFilter )
: m_sTitle( _rTitle )
, m_sFilterSuffixList( _rFilter )
{
}
FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters );
AquaFilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters );
OUString const & getTitle() const { return m_sTitle; }
OUStringList const & getFilterSuffixList() const { return m_sFilterSuffixList; }
@@ -72,7 +72,7 @@ public:
const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); }
};
typedef ::std::vector < FilterEntry > FilterList;
typedef ::std::vector < AquaFilterEntry > FilterList;
class FilterHelper {
fpicker/source/aqua/FilterHelper.mm
+7 -7
View File
@@ -48,14 +48,14 @@ void fillSuffixList(OUStringList& aSuffixList, std::u16string_view suffixString)
#pragma mark FilterEntry
FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
AquaFilterEntry::AquaFilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
:m_sTitle( _rTitle )
,m_aSubFilters( _rSubFilters )
{
}
bool FilterEntry::hasSubFilters() const
bool AquaFilterEntry::hasSubFilters() const
{
bool bReturn = ( 0 < m_aSubFilters.getLength() );
@@ -63,7 +63,7 @@ bool FilterEntry::hasSubFilters() const
}
sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
sal_Int32 AquaFilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
{
_rSubFilterList = m_aSubFilters;
sal_Int32 nReturn = m_aSubFilters.getLength();
@@ -135,7 +135,7 @@ public:
FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { }
bool operator () ( const FilterEntry& _rEntry )
bool operator () ( const AquaFilterEntry& _rEntry )
{
bool bMatch;
if( !_rEntry.hasSubFilters() ) {
@@ -274,7 +274,7 @@ void FilterHelper::appendFilter(const OUString& aTitle, std::u16string_view aFil
// append the filter
OUStringList suffixList;
fillSuffixList(suffixList, aFilterString);
m_pFilterList->push_back(FilterEntry( aTitle, suffixList ) );
m_pFilterList->push_back(AquaFilterEntry( aTitle, suffixList ) );
}
void FilterHelper::setCurrentFilter( const OUString& aTitle )
@@ -305,7 +305,7 @@ void FilterHelper::appendFilterGroup( const css::uno::Sequence< css::beans::Stri
// append the filter
if (bPrependSeparator) {
OUStringList emptyList;
m_pFilterList->push_back(FilterEntry("-", emptyList));
m_pFilterList->push_back(AquaFilterEntry("-", emptyList));
}
const css::beans::StringPair* pSubFilters = aFilters.getConstArray();
@@ -391,7 +391,7 @@ void FilterHelper::SetFilterAtIndex(unsigned index)
if (m_pFilterList->size() <= index) {
index = 0;
}
FilterEntry entry = m_pFilterList->at(index);
AquaFilterEntry entry = m_pFilterList->at(index);
SetCurFilter(entry.getTitle());
}