summaryrefslogtreecommitdiff
path: root/fpicker/source/aqua/FilterHelper.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker/source/aqua/FilterHelper.hxx')
-rw-r--r--fpicker/source/aqua/FilterHelper.hxx16
1 files changed, 7 insertions, 9 deletions
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 1cd1ea1fbb50..56463126c945 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
-#define INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
+#pragma once
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -28,6 +27,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <list>
+#include <string_view>
#include <vector>
#include <premac.h>
@@ -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 {
@@ -83,7 +83,7 @@ public:
//XFilterManager delegates
/// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException
- void appendFilter( const OUString& aTitle, const OUString& aFilter );
+ void appendFilter( const OUString& aTitle, std::u16string_view aFilter );
/// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException
@@ -121,6 +121,4 @@ private:
void ensureFilterList( const OUString& _rInitialCurrentFilter );
};
-#endif // INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */