summaryrefslogtreecommitdiff
path: root/fpicker/source/aqua
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker/source/aqua')
-rw-r--r--fpicker/source/aqua/CFStringUtilities.hxx16
-rw-r--r--fpicker/source/aqua/FilterHelper.hxx32
-rw-r--r--fpicker/source/aqua/NSURL_OOoAdditions.hxx2
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.hxx35
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.hxx16
-rw-r--r--fpicker/source/aqua/SalAquaPicker.hxx10
6 files changed, 55 insertions, 56 deletions
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 7ca583425fce..9845e92c2bd9 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -34,10 +34,10 @@ enum InfoType {
PATHWITHOUTLASTCOMPONENT
};
-rtl::OUString CFStringToOUString(const CFStringRef sOrig);
-rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info = FULLPATH);
-rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info);
-CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString);
+OUString CFStringToOUString(const CFStringRef sOrig);
+OUString FSRefToOUString(FSRef fsRef, InfoType info = FULLPATH);
+OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info);
+CFStringRef CFStringCreateWithOUString(const OUString& aString);
//debug utils
#define PARAMFILLER "\n "
@@ -54,7 +54,7 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, value1);
}
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const rtl::OUString& value1) {
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1) {
OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
}
@@ -122,11 +122,11 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
}
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const rtl::OUString& value1, const char* param2, const rtl::OUString& value2) {
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1, const char* param2, const OUString& value2) {
OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr(), PARAMFILLER, param2, OUStringToOString(value2, RTL_TEXTENCODING_UTF8).getStr());
}
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const rtl::OUString& value1, const char* param2, const int value2) {
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1, const char* param2, const int value2) {
OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %d", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr(), PARAMFILLER, param2, value2);
}
@@ -174,7 +174,7 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, cons
}
#endif
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const rtl::OUString& retVal) {
+inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const OUString& retVal) {
OSL_TRACE("<<< %s::%s%sreturnValue = %s", classname, methodname, PARAMFILLER, OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
}
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 189508a58713..c519a21d5f19 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -37,25 +37,25 @@
typedef ::com::sun::star::beans::StringPair UnoFilterEntry;
typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively
typedef ::std::list<NSString *> NSStringList;
-typedef ::std::list<rtl::OUString> OUStringList;
+typedef ::std::list<OUString> OUStringList;
struct FilterEntry
{
protected:
- rtl::OUString m_sTitle;
+ OUString m_sTitle;
OUStringList m_sFilterSuffixList;
UnoFilterList m_aSubFilters;
public:
- FilterEntry( const rtl::OUString& _rTitle, const OUStringList _rFilter )
+ FilterEntry( const OUString& _rTitle, const OUStringList _rFilter )
: m_sTitle( _rTitle )
, m_sFilterSuffixList( _rFilter )
{
}
- FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters );
+ FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters );
- rtl::OUString getTitle() const { return m_sTitle; }
+ OUString getTitle() const { return m_sTitle; }
OUStringList getFilterSuffixList() const { return m_sFilterSuffixList; }
/// determines if the filter has sub filter (i.e., the filter is a filter group in real)
@@ -81,17 +81,17 @@ public:
virtual ~FilterHelper();
//XFilterManager delegates
- void SAL_CALL appendFilter( const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilter )
+ void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle )
+ void SAL_CALL setCurrentFilter( const OUString& aTitle )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- ::rtl::OUString SAL_CALL getCurrentFilter( )
+ OUString SAL_CALL getCurrentFilter( )
throw( ::com::sun::star::uno::RuntimeException );
//XFilterGroupManager delegates
- void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
+ void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -100,7 +100,7 @@ public:
NSStringList* getFilterNames();
//misc
- void SetCurFilter( const rtl::OUString& rFilter );
+ void SetCurFilter( const OUString& rFilter );
void SetFilterAtIndex(unsigned index);
OUStringList getCurrentFilterSuffixList();
int getCurrentFilterIndex();
@@ -109,19 +109,19 @@ public:
private:
FilterList *m_pFilterList;
- rtl::OUString m_aCurrentFilter;
+ OUString m_aCurrentFilter;
NSStringList *m_pFilterNames;
- int implAddFilter( const rtl::OUString rFilter, const OUStringList rSuffixList);
- int implAddFilterGroup( const rtl::OUString rFilter,
+ int implAddFilter( const OUString rFilter, const OUStringList rSuffixList);
+ int implAddFilterGroup( const OUString rFilter,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters );
- sal_Bool FilterNameExists( const rtl::OUString rTitle );
+ sal_Bool FilterNameExists( const OUString rTitle );
sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
- void ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter );
+ void ensureFilterList( const OUString& _rInitialCurrentFilter );
- void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixString);
+ void fillSuffixList(OUStringList& aSuffixList, const OUString& suffixString);
};
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
index 6d1f312ad4b1..811e9cf97748 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
@interface NSURL (OOoAdditions)
-- (rtl::OUString) OUStringForInfo:(InfoType)info;
+- (OUString) OUStringForInfo:(InfoType)info;
@end
/*
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 63fcb86ffc19..608c185d1a9f 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -46,7 +46,6 @@
//----------------------------------------------------------
// forward declarations
//----------------------------------------------------------
-using ::rtl::OUString;
//----------------------------------------------------------
// class declaration
@@ -82,7 +81,7 @@ public:
// XExecutableDialog functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+ virtual void SAL_CALL setTitle( const OUString& aTitle )
throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute( )
@@ -95,37 +94,37 @@ public:
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName )
+ virtual void SAL_CALL setDefaultName( const OUString& aName )
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory )
+ virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
throw( com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getDisplayDirectory( )
+ virtual OUString SAL_CALL getDisplayDirectory( )
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( )
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilterManager functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL appendFilter( const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilter )
+ virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle )
+ virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getCurrentFilter( )
+ virtual OUString SAL_CALL getCurrentFilter( )
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilterGroupManager functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
+ virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
@@ -141,10 +140,10 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
throw(::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
+ virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
@@ -173,13 +172,13 @@ public:
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
@@ -188,7 +187,7 @@ public:
void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
- // rtl::OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
+ // OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
void SAL_CALL dialogSizeChanged( );
@@ -196,7 +195,7 @@ public:
return m_pDelegate;
}
- inline rtl::OUString getSaveFileName() {
+ inline OUString getSaveFileName() {
return m_sSaveFileName;
}
@@ -215,7 +214,7 @@ private:
FilterHelper *m_pFilterHelper;
- rtl::OUString m_sSaveFileName;
+ OUString m_sSaveFileName;
AquaFilePickerDelegate *m_pDelegate;
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 3a329190c31b..9a3ce4f7d221 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -55,7 +55,7 @@ public:
// XExecutableDialog functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+ virtual void SAL_CALL setTitle( const OUString& aTitle )
throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute( )
@@ -65,29 +65,29 @@ public:
// XFolderPicker functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL setDisplayDirectory( const rtl::OUString& rDirectory )
+ virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( )
+ virtual OUString SAL_CALL getDisplayDirectory( )
throw( com::sun::star::uno::RuntimeException );
- virtual rtl::OUString SAL_CALL getDirectory( )
+ virtual OUString SAL_CALL getDirectory( )
throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDescription( const rtl::OUString& rDescription )
+ virtual void SAL_CALL setDescription( const OUString& rDescription )
throw( com::sun::star::uno::RuntimeException );
//------------------------------------------------
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
//------------------------------------------------
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index 72425f2b8b0d..ca532149807b 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -47,7 +47,7 @@ public:
int run();
int runandwaitforresult();
- inline rtl::OUString getDisplayDirectory() { return m_sDisplayDirectory; }
+ inline OUString getDisplayDirectory() { return m_sDisplayDirectory; }
inline ControlHelper* getControlHelper() const {
return m_pControlHelper;
@@ -55,7 +55,7 @@ public:
protected:
- rtl::OUString m_sDisplayDirectory;
+ OUString m_sDisplayDirectory;
NSSavePanel *m_pDialog;
@@ -72,13 +72,13 @@ protected:
NavigationServices_DialogType m_nDialogType;
- void implsetTitle( const ::rtl::OUString& aTitle )
+ void implsetTitle( const OUString& aTitle )
throw( ::com::sun::star::uno::RuntimeException );
- void implsetDisplayDirectory( const rtl::OUString& rDirectory )
+ void implsetDisplayDirectory( const OUString& rDirectory )
throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
- rtl::OUString implgetDisplayDirectory( )
+ OUString implgetDisplayDirectory( )
throw( com::sun::star::uno::RuntimeException );
void implInitialize( );
generated by cgit (git 2.34.1) at 2024-08-07 01:57:16 +0000