Skip to content

C
core
Kaydet (Commit) d85029d3 authored tarafından Radu Ioan's avatar Radu Ioan Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

rtl:: removal in fpicker 

- remove rtl prefix
- remove RTL_CONSTASCII_USTRINGPARAM
- correct some misspells

Change-Id: Ifd2eb59ff7d70fd3df42f063fcca781ef89b7d12
Reviewed-on: https://gerrit.libreoffice.org/1270Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8f7855b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 209 deletions
fpicker/source/aqua/CFStringUtilities.hxx
Dosyayı görüntüle @ d85029d3
......@@ -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());
}
......
fpicker/source/aqua/FilterHelper.hxx
Dosyayı görüntüle @ d85029d3
......@@ -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);
};
......
fpicker/source/aqua/NSURL_OOoAdditions.hxx
Dosyayı görüntüle @ d85029d3
......@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
@interface NSURL (OOoAdditions)
- (rtl::OUString) OUStringForInfo:(InfoType)info;
- (OUString) OUStringForInfo:(InfoType)info;
@end
/*
......
fpicker/source/aqua/SalAquaFilePicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -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;
......
fpicker/source/aqua/SalAquaFolderPicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -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);
//------------------------------------------------
......
fpicker/source/aqua/SalAquaPicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -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( );
......
fpicker/source/generic/fpicker.cxx
Dosyayı görüntüle @ d85029d3
......@@ -36,7 +36,6 @@
using css::uno::Reference;
using css::uno::Sequence;
using rtl::OUString;
/*
* FilePicker implementation.
......@@ -46,18 +45,18 @@ static OUString FilePicker_getSystemPickerServiceName()
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFilePicker"));
return OUString ("com.sun.star.ui.dialogs.TDEFilePicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker"));
return OUString ("com.sun.star.ui.dialogs.KDEFilePicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker"));
return OUString ("com.sun.star.ui.dialogs.KDE4FilePicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFilePicker"));
return OUString ("com.sun.star.ui.dialogs.AquaFilePicker");
else
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFilePicker"));
return OUString ("com.sun.star.ui.dialogs.SystemFilePicker");
#endif
#ifdef WNT
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.Win32FilePicker"));
return OUString ("com.sun.star.ui.dialogs.Win32FilePicker");
#endif
}
......
fpicker/source/office/OfficeControlAccess.hxx
Dosyayı görüntüle @ d85029d3
......@@ -52,24 +52,24 @@ namespace svt
OControlAccess( IFilePickerController* _pController, SvtFileView* _pFileView );
// XControlAccess implementation
void setControlProperty( const ::rtl::OUString& _rControlName, const ::rtl::OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue );
::com::sun::star::uno::Any getControlProperty( const ::rtl::OUString& _rControlName, const ::rtl::OUString& _rControlProperty );
void setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue );
::com::sun::star::uno::Any getControlProperty( const OUString& _rControlName, const OUString& _rControlProperty );
// XControlInformation implementation
::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedControls( );
::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedControlProperties( const ::rtl::OUString& _rControlName );
sal_Bool isControlSupported( const ::rtl::OUString& _rControlName );
sal_Bool isControlPropertySupported( const ::rtl::OUString& _rControlName, const ::rtl::OUString& _rControlProperty );
::com::sun::star::uno::Sequence< OUString > getSupportedControls( );
::com::sun::star::uno::Sequence< OUString > getSupportedControlProperties( const OUString& _rControlName );
sal_Bool isControlSupported( const OUString& _rControlName );
sal_Bool isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty );
// XFilePickerControlAccess
void setValue( sal_Int16 _nId, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue );
::com::sun::star::uno::Any getValue( sal_Int16 _nId, sal_Int16 _nCtrlAction ) const;
void setLabel( sal_Int16 _nId, const ::rtl::OUString& _rValue );
::rtl::OUString getLabel( sal_Int16 _nId ) const;
void setLabel( sal_Int16 _nId, const OUString& _rValue );
OUString getLabel( sal_Int16 _nId ) const;
void enableControl( sal_Int16 _nId, sal_Bool _bEnable );
static void setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView );
static ::rtl::OUString getHelpURL( Window* _pControl, sal_Bool _bFileView );
static void setHelpURL( Window* _pControl, const OUString& _rURL, sal_Bool _bFileView );
static OUString getHelpURL( Window* _pControl, sal_Bool _bFileView );
private:
/** implements the various methods for setting properties on controls
......@@ -91,7 +91,7 @@ namespace svt
Control* _pControl, sal_Int16 _nProperty, const ::com::sun::star::uno::Any& _rValue,
sal_Bool _bIgnoreIllegalArgument = sal_True );
Control* implGetControl( const ::rtl::OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
/** implements the various methods for retrieving properties from controls
......
fpicker/source/office/OfficeFilePicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -48,7 +48,7 @@ typedef ::std::list < ElementEntry_Impl > ElementList;
typedef ::com::sun::star::beans::StringPair UnoFilterEntry;
typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively
typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringList; // can be transported more effectively
typedef ::com::sun::star::uno::Sequence< OUString > OUStringList; // can be transported more effectively
// class SvtFilePicker ---------------------------------------------------
......@@ -71,14 +71,14 @@ private:
sal_Bool m_bMultiSelection;
sal_Int16 m_nServiceType;
::rtl::OUString m_aDefaultName;
::rtl::OUString m_aCurrentFilter;
OUString m_aDefaultName;
OUString m_aCurrentFilter;
// #97148# --------------
::rtl::OUString m_aOldDisplayDirectory;
::rtl::OUString m_aOldHideDirectory;
OUString m_aOldDisplayDirectory;
OUString m_aOldHideDirectory;
::rtl::OUString m_aStandardDir;
OUString m_aStandardDir;
OUStringList m_aBlackList;
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
......@@ -103,13 +103,13 @@ public:
//------------------------------------------------------------------------------------
// XExecutableDialog functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setTitle( const ::rtl::OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
// XAsynchronousExecutableDialog functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setDialogTitle( const ::rtl::OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
......@@ -117,10 +117,10 @@ public:
//------------------------------------------------------------------------------------
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilePickerControlAccess functions
......@@ -128,8 +128,8 @@ public:
virtual void SAL_CALL setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setLabel( sal_Int16 ElementID, const ::rtl::OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException );
virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException );
virtual OUString SAL_CALL getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------------------------------------------
......@@ -155,14 +155,14 @@ public:
// XFilterManager functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL appendFilter( const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
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 OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
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 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
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);
//------------------------------------------------------------------------------------
// XInitialization functions
......@@ -175,15 +175,15 @@ public:
//------------------------------------------------------------------------------------
/* XServiceInfo */
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
/* Helper for XServiceInfo */
static com::sun::star::uno::Sequence< ::rtl::OUString >
static com::sun::star::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
static ::rtl::OUString impl_getStaticImplementationName();
static OUString impl_getStaticImplementationName();
/* Helper for registry */
static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL impl_createInstance (
......@@ -197,7 +197,7 @@ protected:
virtual SvtFileDialog* implCreateDialog( Window* _pParent );
virtual sal_Int16 implExecutePicker( );
virtual sal_Bool implHandleInitializationArgument(
const ::rtl::OUString& _rName,
const OUString& _rName,
const ::com::sun::star::uno::Any& _rValue
)
SAL_THROW( ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) );
......@@ -206,10 +206,10 @@ private:
WinBits getWinBits( WinBits& rExtraBits );
virtual void notify( sal_Int16 _nEventId, sal_Int16 _nControlId );
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 prepareExecute( );
......
fpicker/source/office/OfficeFolderPicker.cxx
Dosyayı görüntüle @ d85029d3
......@@ -44,7 +44,7 @@ SvtFolderPicker::~SvtFolderPicker()
{
}
void SAL_CALL SvtFolderPicker::setTitle( const ::rtl::OUString& _rTitle ) throw (RuntimeException)
void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) throw (RuntimeException)
{
OCommonPicker::setTitle( _rTitle );
}
......@@ -54,7 +54,7 @@ sal_Int16 SAL_CALL SvtFolderPicker::execute( ) throw (RuntimeException)
return OCommonPicker::execute();
}
void SAL_CALL SvtFolderPicker::setDialogTitle( const ::rtl::OUString& _rTitle) throw (RuntimeException)
void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (RuntimeException)
{
setTitle( _rTitle );
}
......@@ -109,39 +109,39 @@ IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog*, pDlg )
return 0;
}
void SAL_CALL SvtFolderPicker::setDisplayDirectory( const ::rtl::OUString& aDirectory )
void SAL_CALL SvtFolderPicker::setDisplayDirectory( const OUString& aDirectory )
throw( IllegalArgumentException, RuntimeException )
{
m_aDisplayDirectory = aDirectory;
}
::rtl::OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException )
OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException )
{
if ( ! getDialog() )
return m_aDisplayDirectory;
std::vector<rtl::OUString> aPathList(getDialog()->GetPathList());
std::vector<OUString> aPathList(getDialog()->GetPathList());
if(!aPathList.empty())
return aPathList[0];
return rtl::OUString();
return OUString();
}
::rtl::OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException )
OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException )
{
if ( ! getDialog() )
return m_aDisplayDirectory;
std::vector<rtl::OUString> aPathList(getDialog()->GetPathList());
std::vector<OUString> aPathList(getDialog()->GetPathList());
if(!aPathList.empty())
return aPathList[0];
return rtl::OUString();
return OUString();
}
void SAL_CALL SvtFolderPicker::setDescription( const ::rtl::OUString& aDescription )
void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription )
throw( RuntimeException )
{
m_aDescription = aDescription;
......@@ -153,16 +153,16 @@ void SvtFolderPicker::cancel() throw (RuntimeException)
}
/* XServiceInfo */
::rtl::OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException )
OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException )
{
return impl_getStaticImplementationName();
}
/* XServiceInfo */
sal_Bool SAL_CALL SvtFolderPicker::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException )
sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) throw( RuntimeException )
{
Sequence< ::rtl::OUString > seqServiceNames = getSupportedServiceNames();
const ::rtl::OUString* pArray = seqServiceNames.getConstArray();
Sequence< OUString > seqServiceNames = getSupportedServiceNames();
const OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 i = 0; i < seqServiceNames.getLength(); i++ )
{
if ( sServiceName == pArray[i] )
......@@ -174,23 +174,23 @@ sal_Bool SAL_CALL SvtFolderPicker::supportsService( const ::rtl::OUString& sServ
}
/* XServiceInfo */
Sequence< ::rtl::OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException )
Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
Sequence< ::rtl::OUString > SvtFolderPicker::impl_getStaticSupportedServiceNames()
Sequence< OUString > SvtFolderPicker::impl_getStaticSupportedServiceNames()
{
Sequence< ::rtl::OUString > seqServiceNames(1);
seqServiceNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFolderPicker" ));
Sequence< OUString > seqServiceNames(1);
seqServiceNames[0] = OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker" );
return seqServiceNames ;
}
/* Helper for XServiceInfo */
::rtl::OUString SvtFolderPicker::impl_getStaticImplementationName()
OUString SvtFolderPicker::impl_getStaticImplementationName()
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.OfficeFolderPicker" ));
return OUString( "com.sun.star.svtools.OfficeFolderPicker" );
}
/* Helper for registry */
......
fpicker/source/office/OfficeFolderPicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -40,7 +40,7 @@ typedef
class SvtFolderPicker: public SvtFolderPicker_Base
{
private:
::rtl::OUString m_aDescription;
OUString m_aDescription;
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >
m_xListener;
......@@ -56,10 +56,10 @@ public:
// XFolderPicker2 functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual ::rtl::OUString SAL_CALL getDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDescription( const ::rtl::OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual OUString SAL_CALL getDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDescription( const OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL cancel()
throw (com::sun::star::uno::RuntimeException);
......@@ -67,13 +67,13 @@ public:
//------------------------------------------------------------------------------------
// XExecutableDialog functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setTitle( const ::rtl::OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
// XAsynchronousExecutableDialog functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setDialogTitle( const ::rtl::OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
......@@ -81,14 +81,14 @@ public:
//------------------------------------------------------------------------------------
/* XServiceInfo */
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException );
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
/* Helper for XServiceInfo */
static com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
static ::rtl::OUString impl_getStaticImplementationName();
static com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
static OUString impl_getStaticImplementationName();
/* Helper for registry */
static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL impl_createInstance (
......
fpicker/source/office/PlacesListBox.cxx
Dosyayı görüntüle @ d85029d3
......@@ -36,9 +36,8 @@
#define COLUMN_NAME 1
using rtl::OUString;
PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const rtl::OUString& rTitle ) :
PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString& rTitle ) :
SvHeaderTabListBox( pParent, WB_TABSTOP | WB_NOINITIALSELECTION ),
mpHeaderBar( NULL ),
mpParent( pParent )
......@@ -73,7 +72,7 @@ void PlacesListBox_Impl::MouseButtonUp( const MouseEvent& rMEvt )
mpParent->updateView( );
}
PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg, const rtl::OUString& rTitle, const ResId& rResId ) :
PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg, const OUString& rTitle, const ResId& rResId ) :
Control( pFileDlg, rResId ),
maPlaces( ),
mpDlg( pFileDlg ),
......@@ -90,12 +89,12 @@ PlacesListBox::PlacesListBox( SvtFileDialog* pFileDlg, const rtl::OUString& rTit
mpImpl->SetDoubleClickHdl( LINK( this, PlacesListBox, DoubleClick ) ) ;
mpAddBtn = new ImageButton( this, 0 );
mpAddBtn->SetText( rtl::OUString( "+" ) );
mpAddBtn->SetText( OUString( "+" ) );
mpAddBtn->SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) );
mpAddBtn->Show();
mpDelBtn = new ImageButton( this, 0 );
mpDelBtn->SetText( rtl::OUString( "-" ) );
mpDelBtn->SetText( OUString( "-" ) );
mpDelBtn->SetPosSizePixel( Point( 0, 0 ), Size( 24, 24 ) );
mpDelBtn->Show();
}
......
fpicker/source/office/PlacesListBox.hxx
Dosyayı görüntüle @ d85029d3
......@@ -46,7 +46,7 @@ class PlacesListBox_Impl : public SvHeaderTabListBox
PlacesListBox* mpParent;
public:
PlacesListBox_Impl( PlacesListBox* pParent, const rtl::OUString& rTitle );
PlacesListBox_Impl( PlacesListBox* pParent, const OUString& rTitle );
~PlacesListBox_Impl( );
virtual void MouseButtonUp( const MouseEvent& rMEvt );
......@@ -67,7 +67,7 @@ class PlacesListBox : public Control
bool mbSelectionChanged;
public:
PlacesListBox( SvtFileDialog* pFileDlg, const rtl::OUString& rTitle, const ResId& rResId );
PlacesListBox( SvtFileDialog* pFileDlg, const OUString& rTitle, const ResId& rResId );
~PlacesListBox( );
void AppendPlace( PlacePtr pPlace );
......
fpicker/source/office/asyncfilepicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -29,7 +29,7 @@
class SvtFileView;
class SvtFileDialog;
typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringList;
typedef ::com::sun::star::uno::Sequence< OUString > OUStringList;
//........................................................................
namespace svt
......
fpicker/source/office/commonpicker.cxx
Dosyayı görüntüle @ d85029d3
......@@ -56,13 +56,13 @@ namespace svt
{
// the two properties we have
registerProperty(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), PROPERTY_ID_HELPURL,
OUString( "HelpURL" ), PROPERTY_ID_HELPURL,
PropertyAttribute::TRANSIENT,
&m_sHelpURL, ::getCppuType( &m_sHelpURL )
);
registerProperty(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" )), PROPERTY_ID_WINDOW,
OUString( "Window" ), PROPERTY_ID_WINDOW,
PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY,
&m_xWindow, ::getCppuType( &m_xWindow )
);
......@@ -248,7 +248,7 @@ namespace svt
//---------------------------------------------------------------------
// XControlAccess functions
//---------------------------------------------------------------------
void SAL_CALL OCommonPicker::setControlProperty( const ::rtl::OUString& aControlName, const ::rtl::OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException)
void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException)
{
checkAlive();
......@@ -261,7 +261,7 @@ namespace svt
}
//---------------------------------------------------------------------
Any SAL_CALL OCommonPicker::getControlProperty( const ::rtl::OUString& aControlName, const ::rtl::OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)
Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)
{
checkAlive();
......@@ -278,7 +278,7 @@ namespace svt
//---------------------------------------------------------------------
// XControlInformation functions
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCommonPicker::getSupportedControls( ) throw (RuntimeException)
Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls( ) throw (RuntimeException)
{
checkAlive();
......@@ -289,11 +289,11 @@ namespace svt
return aAccess.getSupportedControls( );
}
return Sequence< ::rtl::OUString >();
return Sequence< OUString >();
}
//---------------------------------------------------------------------
sal_Bool SAL_CALL OCommonPicker::isControlSupported( const ::rtl::OUString& aControlName ) throw (RuntimeException)
sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException)
{
checkAlive();
......@@ -308,7 +308,7 @@ namespace svt
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const ::rtl::OUString& aControlName ) throw (IllegalArgumentException, RuntimeException)
Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException)
{
checkAlive();
......@@ -319,11 +319,11 @@ namespace svt
return aAccess.getSupportedControlProperties( aControlName );
}
return Sequence< ::rtl::OUString >();
return Sequence< OUString >();
}
//---------------------------------------------------------------------
sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const ::rtl::OUString& aControlName, const ::rtl::OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)
sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)
{
checkAlive();
......@@ -340,7 +340,7 @@ namespace svt
//---------------------------------------------------------------------
// XExecutableDialog functions
//---------------------------------------------------------------------
void SAL_CALL OCommonPicker::setTitle( const rtl::OUString& _rTitle ) throw( RuntimeException )
void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException )
{
SolarMutexGuard aGuard;
m_aTitle = _rTitle;
......@@ -400,7 +400,7 @@ namespace svt
m_nCancelEvent = 0;
if ( !m_bExecuting )
// nothing to do. This may be because the dialog was cancelled after our cancel method
// nothing to do. This may be because the dialog was canceled after our cancel method
// posted this async event, or because somebody called cancel without the dialog
// being executed at this time.
return 0;
......@@ -420,7 +420,7 @@ namespace svt
{
checkAlive();
::rtl::OUString sSettingName;
OUString sSettingName;
Any aSettingValue;
PropertyValue aPropArg;
......@@ -455,8 +455,8 @@ namespace svt
else
{
OSL_FAIL(
( ::rtl::OString( "OCommonPicker::initialize: unknown argument type at position " )
+= ::rtl::OString::valueOf( (sal_Int32)( pArguments - _rArguments.getConstArray() ) )
( OString( "OCommonPicker::initialize: unknown argument type at position " )
+= OString::valueOf( (sal_Int32)( pArguments - _rArguments.getConstArray() ) )
).getStr()
);
continue;
......@@ -467,16 +467,16 @@ namespace svt
#endif
implHandleInitializationArgument( sSettingName, aSettingValue );
DBG_ASSERT( bKnownSetting,
( ::rtl::OString( "OCommonPicker::initialize: unknown argument \"" )
+= ::rtl::OString( sSettingName.getStr(), sSettingName.getLength(), osl_getThreadTextEncoding() )
+= ::rtl::OString( "\"!" )
( OString( "OCommonPicker::initialize: unknown argument \"" )
+= OString( sSettingName.getStr(), sSettingName.getLength(), osl_getThreadTextEncoding() )
+= OString( "\"!" )
).getStr()
);
}
}
//---------------------------------------------------------------------
sal_Bool OCommonPicker::implHandleInitializationArgument( const ::rtl::OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
sal_Bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
{
sal_Bool bKnown = sal_True;
if ( _rName == "ParentWindow" )
......
fpicker/source/office/commonpicker.hxx
Dosyayı görüntüle @ d85029d3
......@@ -60,7 +60,7 @@ namespace svt
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
// <properties>
::rtl::OUString m_sHelpURL;
OUString m_sHelpURL;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWindow;
// </properties>
......@@ -74,8 +74,8 @@ namespace svt
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xParentListenerAdapter;
protected:
::rtl::OUString m_aTitle;
::rtl::OUString m_aDisplayDirectory;
OUString m_aTitle;
OUString m_aDisplayDirectory;
protected:
inline SvtFileDialog* getDialog() { return m_pDlg; }
......@@ -135,22 +135,22 @@ namespace svt
//------------------------------------------------------------------------------------
// XExecutableDialog functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setTitle( const ::rtl::OUString& _rTitle ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XControlAccess functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setControlProperty( const ::rtl::OUString& aControlName, const ::rtl::OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const ::rtl::OUString& aControlName, const ::rtl::OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
// XControlInformation functions
//------------------------------------------------------------------------------------
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedControls( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isControlSupported( const ::rtl::OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedControlProperties( const ::rtl::OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isControlPropertySupported( const ::rtl::OUString& aControlName, const ::rtl::OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
// XCancellable functions
......@@ -178,7 +178,7 @@ namespace svt
@return <TRUE/> if the argument could be handled
*/
virtual sal_Bool implHandleInitializationArgument(
const ::rtl::OUString& _rName,
const OUString& _rName,
const ::com::sun::star::uno::Any& _rValue
)
SAL_THROW( ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) );
......
fpicker/source/office/fpsmartcontent.cxx
Dosyayı görüntüle @ d85029d3
......@@ -53,7 +53,7 @@ namespace svt
}
//--------------------------------------------------------------------
SmartContent::SmartContent( const ::rtl::OUString& _rInitialURL )
SmartContent::SmartContent( const OUString& _rInitialURL )
:m_pContent( NULL )
,m_eState( NOT_BOUND )
{
......@@ -137,7 +137,7 @@ namespace svt
}
//--------------------------------------------------------------------
void SmartContent::bindTo( const ::rtl::OUString& _rURL )
void SmartContent::bindTo( const OUString& _rURL )
{
if ( getURL() == _rURL )
// nothing to do, regardless of the state
......@@ -182,7 +182,7 @@ namespace svt
}
//--------------------------------------------------------------------
sal_Bool SmartContent::implIs( const ::rtl::OUString& _rURL, Type _eType )
sal_Bool SmartContent::implIs( const OUString& _rURL, Type _eType )
{
// bind to this content
bindTo( _rURL );
......@@ -215,15 +215,15 @@ namespace svt
}
//--------------------------------------------------------------------
void SmartContent::getTitle( ::rtl::OUString& /* [out] */ _rTitle )
void SmartContent::getTitle( OUString& /* [out] */ _rTitle )
{
if ( !isBound() || isInvalid() )
return;
try
{
::rtl::OUString sTitle;
m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= sTitle;
OUString sTitle;
m_pContent->getPropertyValue( OUString( "Title" ) ) >>= sTitle;
_rTitle = sTitle;
// from here on, we definately know that the content is valid
......@@ -251,7 +251,7 @@ namespace svt
Reference< XContent > xParent( xChild->getParent(), UNO_QUERY );
if ( xParent.is() )
{
const ::rtl::OUString aParentURL( xParent->getIdentifier()->getContentIdentifier() );
const OUString aParentURL( xParent->getIdentifier()->getContentIdentifier() );
bRet = ( !aParentURL.isEmpty() && aParentURL != m_pContent->getURL() );
// now we're definately valid
......@@ -300,12 +300,12 @@ namespace svt
return bRet;
}
rtl::OUString SmartContent::createFolder( const rtl::OUString& _rTitle )
OUString SmartContent::createFolder( const OUString& _rTitle )
{
rtl::OUString aCreatedUrl;
OUString aCreatedUrl;
try
{
rtl::OUString sFolderType;
OUString sFolderType;
Sequence< ContentInfo > aInfo = m_pContent->queryCreatableContentsInfo();
const ContentInfo* pInfo = aInfo.getConstArray();
......@@ -323,9 +323,9 @@ namespace svt
if ( !sFolderType.isEmpty() )
{
ucbhelper::Content aCreated;
Sequence< rtl::OUString > aNames( 1 );
rtl::OUString* pNames = aNames.getArray();
pNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
Sequence< OUString > aNames( 1 );
OUString* pNames = aNames.getArray();
pNames[0] = OUString( "Title" );
Sequence< Any > aValues( 1 );
Any* pValues = aValues.getArray();
pValues[0] = makeAny( _rTitle );
......
fpicker/source/office/fpsmartcontent.hxx
Dosyayı görüntüle @ d85029d3
......@@ -49,7 +49,7 @@ namespace svt
};
private:
::rtl::OUString m_sURL;
OUString m_sURL;
::ucbhelper::Content* m_pContent;
State m_eState;
::com::sun::star::uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
......@@ -59,14 +59,14 @@ namespace svt
private:
enum Type { Folder, Document };
/// checks if the currently bound content is a folder or document
sal_Bool implIs( const ::rtl::OUString& _rURL, Type _eType );
sal_Bool implIs( const OUString& _rURL, Type _eType );
SmartContent( const SmartContent& _rSource ); // never implemented
SmartContent& operator=( const SmartContent& _rSource ); // never implemented
public:
SmartContent();
SmartContent( const ::rtl::OUString& _rInitialURL );
SmartContent( const OUString& _rInitialURL );
~SmartContent();
public:
......@@ -131,7 +131,7 @@ namespace svt
/** returns the URL of the content
*/
inline ::rtl::OUString getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; }
inline OUString getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; }
/** (re)creates the content for the given URL
......@@ -143,13 +143,13 @@ namespace svt
@postcond
<member>getState</member> does not return NOT_BOUND after the call returns
*/
void bindTo( const ::rtl::OUString& _rURL );
void bindTo( const OUString& _rURL );
/** retrieves the title of the content
@precond
the content is bound and not invalid
*/
void getTitle( ::rtl::OUString& /* [out] */ _rTitle );
void getTitle( OUString& /* [out] */ _rTitle );
/** checks if the content has a parent folder
@precond
......@@ -168,14 +168,14 @@ namespace svt
@return
the URL of the created folder or an empty string
*/
rtl::OUString createFolder( const rtl::OUString& _rTitle );
OUString createFolder( const OUString& _rTitle );
/** binds to the given URL, checks whether or not it refers to a folder
@postcond
the content is not in the state UNKNOWN
*/
inline sal_Bool isFolder( const ::rtl::OUString& _rURL )
inline sal_Bool isFolder( const OUString& _rURL )
{
return implIs( _rURL, Folder );
}
......@@ -185,14 +185,14 @@ namespace svt
@postcond
the content is not in the state UNKNOWN
*/
inline sal_Bool isDocument( const ::rtl::OUString& _rURL )
inline sal_Bool isDocument( const OUString& _rURL )
{
return implIs( _rURL, Document );
}
/** checks if the content is existent (it is if and only if it is a document or a folder)
*/
inline sal_Bool is( const ::rtl::OUString& _rURL )
inline sal_Bool is( const OUString& _rURL )
{
return implIs( _rURL, Folder ) || implIs( _rURL, Document );
}
......
fpicker/source/office/iodlg.cxx
Dosyayı görüntüle @ d85029d3
This diff is collapsed.
fpicker/source/office/iodlg.hxx
Dosyayı görüntüle @ d85029d3
......@@ -212,11 +212,11 @@ public:
void FileSelect();
void FilterSelect();
void SetBlackList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList );
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const;
void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList );
const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const;
void SetStandardDir( const String& rStdDir );
const String& GetStandardDir() const;
std::vector<rtl::OUString> GetPathList() const; // for MultiSelection
std::vector<OUString> GetPathList() const; // for MultiSelection
void AddFilter( const String& rFilter,
const String& rType );
......@@ -286,10 +286,10 @@ public:
inline Image GetButtonImage( sal_uInt16 _nButtonId ) const { return m_aImages.GetImage( _nButtonId ); }
sal_Bool ContentIsFolder( const rtl::OUString& rURL ) { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
sal_Bool ContentHasParentFolder( const rtl::OUString& rURL );
sal_Bool ContentCanMakeFolder( const rtl::OUString& rURL );
sal_Bool ContentGetTitle( const rtl::OUString& rURL, String& rTitle );
sal_Bool ContentIsFolder( const OUString& rURL ) { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
sal_Bool ContentHasParentFolder( const OUString& rURL );
sal_Bool ContentCanMakeFolder( const OUString& rURL );
sal_Bool ContentGetTitle( const OUString& rURL, String& rTitle );
/** updates the sizes of the listboxes in the bottom area of the dialog, and of their labels,
according to the space occupied by the current label texts
......
fpicker/source/office/iodlgimp.cxx
Dosyayı görüntüle @ d85029d3
......@@ -45,17 +45,17 @@ using namespace ::utl;
// some stuff for easier changes for SvtViewOptions
static const sal_Char* pViewOptDataName = "dialog data";
#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName )
#define VIEWOPT_DATANAME OUString::createFromAscii( pViewOptDataName )
static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData )
{
rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( ::rtl::OUString( rData ) ) );
rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( OUString( rData ) ) );
}
static inline String GetViewOptUserItem( const SvtViewOptions& rOpt )
{
Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) );
::rtl::OUString aUserData;
OUString aUserData;
aAny >>= aUserData;
return String( aUserData );
......@@ -311,7 +311,7 @@ void SvtExpFileDlg_Impl::SetStandardDir( const String& _rDir )
namespace {
String lcl_DecoratedFilter( const String& _rOriginalFilter )
{
rtl::OUStringBuffer aDecoratedFilter;
OUStringBuffer aDecoratedFilter;
aDecoratedFilter.append('<');
aDecoratedFilter.append(_rOriginalFilter);
aDecoratedFilter.append('>');
......@@ -343,7 +343,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
{
String sName = _pFilterDesc->GetName();
if ( _pFilterDesc->isGroupSeparator() )
sName = rtl::OUString( "------------------------------------------" );
sName = OUString( "------------------------------------------" );
else
sName = _pFilterDesc->GetName();
......
fpicker/source/office/iodlgimp.hxx
Dosyayı görüntüle @ d85029d3
......@@ -100,7 +100,7 @@ protected:
class SvtUpButton_Impl : public SvtFileDialogURLSelector
{
private:
std::vector<rtl::OUString> _aURLs;
std::vector<OUString> _aURLs;
public:
SvtUpButton_Impl( SvtFileDialog* pParent, const ResId& rResId );
......@@ -129,7 +129,7 @@ private:
const SvtFileDialogFilter_Impl* _pCurFilter;
String m_sCurrentFilterDisplayName; // may differ from _pCurFilter->GetName in case it is a cached entry
::com::sun::star::uno::Sequence< ::rtl::OUString > _aBlackList;
::com::sun::star::uno::Sequence< OUString > _aBlackList;
public:
SvtFileDialogFilterList_Impl* _pFilter;
......@@ -194,8 +194,8 @@ public:
~SvtExpFileDlg_Impl();
inline void SetBlackList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) { _aBlackList = rBlackList; }
inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const { return _aBlackList; }
inline void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
inline const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
void SetStandardDir( const String& _rDir );
inline const String& GetStandardDir() const { return _aStdDir; }
inline void DisableFilterBoxAutoWidth() { _pLbFilter->EnableDDAutoWidth( sal_False ); }
......
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