[Libreoffice-commits] .: fpicker/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 10 05:39:23 PST 2012
fpicker/source/aqua/CFStringUtilities.hxx | 16 ++--
fpicker/source/aqua/FilterHelper.hxx | 32 ++++----
fpicker/source/aqua/NSURL_OOoAdditions.hxx | 2
fpicker/source/aqua/SalAquaFilePicker.hxx | 35 ++++-----
fpicker/source/aqua/SalAquaFolderPicker.hxx | 16 ++--
fpicker/source/aqua/SalAquaPicker.hxx | 10 +-
fpicker/source/generic/fpicker.cxx | 13 +--
fpicker/source/office/OfficeControlAccess.cxx | 86 +++++++++++-----------
fpicker/source/office/OfficeControlAccess.hxx | 22 ++---
fpicker/source/office/OfficeFilePicker.cxx | 100 +++++++++++++-------------
fpicker/source/office/OfficeFilePicker.hxx | 52 ++++++-------
fpicker/source/office/OfficeFolderPicker.cxx | 40 +++++-----
fpicker/source/office/OfficeFolderPicker.hxx | 24 +++---
fpicker/source/office/PlacesListBox.cxx | 9 +-
fpicker/source/office/PlacesListBox.hxx | 4 -
fpicker/source/office/asyncfilepicker.hxx | 2
fpicker/source/office/commonpicker.cxx | 38 ++++-----
fpicker/source/office/commonpicker.hxx | 22 ++---
fpicker/source/office/fpsmartcontent.cxx | 26 +++---
fpicker/source/office/fpsmartcontent.hxx | 20 ++---
fpicker/source/office/iodlg.cxx | 92 +++++++++++------------
fpicker/source/office/iodlg.hxx | 14 +--
fpicker/source/office/iodlgimp.cxx | 10 +-
fpicker/source/office/iodlgimp.hxx | 8 +-
24 files changed, 345 insertions(+), 348 deletions(-)
New commits:
commit d85029d38034a392079316daeca2ca6a82f65349
Author: Radu Ioan <ioan.radu.g at gmail.com>
Date: Sat Dec 8 13:42:54 2012 +0200
rtl:: removal in fpicker
- remove rtl prefix
- remove RTL_CONSTASCII_USTRINGPARAM
- correct some misspells
Change-Id: Ifd2eb59ff7d70fd3df42f063fcca781ef89b7d12
Reviewed-on: https://gerrit.libreoffice.org/1270
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 7ca5834..9845e92 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 189508a..c519a21 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 6d1f312..811e9cf 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 63fcb86..608c185 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 3a32919..9a3ce4f 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 72425f2..ca53214 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( );
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 960e029..359ef6f 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -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
}
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 81bd549..317da8b 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -122,11 +122,11 @@ namespace svt
};
// ................................................................
- struct ExtractControlName : public ::std::unary_function< ControlDescription, ::rtl::OUString >
+ struct ExtractControlName : public ::std::unary_function< ControlDescription, OUString >
{
- ::rtl::OUString operator()( const ControlDescription& _rDesc )
+ OUString operator()( const ControlDescription& _rDesc )
{
- return ::rtl::OUString::createFromAscii( _rDesc.pControlName );
+ return OUString::createFromAscii( _rDesc.pControlName );
}
};
@@ -161,8 +161,8 @@ namespace svt
// ................................................................
struct ControlPropertyLookup
{
- ::rtl::OUString m_sLookup;
- ControlPropertyLookup( const ::rtl::OUString& _rLookup ) : m_sLookup( _rLookup ) { }
+ OUString m_sLookup;
+ ControlPropertyLookup( const OUString& _rLookup ) : m_sLookup( _rLookup ) { }
sal_Bool operator()( const ControlProperty& _rProp )
{
@@ -187,15 +187,15 @@ namespace svt
}
//---------------------------------------------------------------------
- void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView )
+ void OControlAccess::setHelpURL( Window* _pControl, const OUString& sHelpURL, sal_Bool _bFileView )
{
- rtl::OUString sHelpID( sHelpURL );
+ OUString sHelpID( sHelpURL );
INetURLObject aHID( sHelpURL );
if ( aHID.GetProtocol() == INET_PROT_HID )
sHelpID = aHID.GetURLPath();
// URLs should always be UTF8 encoded and escaped
- rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
+ OString sID( OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
if ( _bFileView )
// the file view "overloaded" the SetHelpId
static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
@@ -204,24 +204,24 @@ namespace svt
}
//---------------------------------------------------------------------
- ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
+ OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
{
- rtl::OString aHelpId = _pControl->GetHelpId();
+ OString aHelpId = _pControl->GetHelpId();
if ( _bFileView )
// the file view "overloaded" the SetHelpId
aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
- ::rtl::OUString sHelpURL;
- ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
+ OUString sHelpURL;
+ OUString aTmp( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
INetURLObject aHID( aTmp );
if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
- sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME );
+ sHelpURL = OUString::createFromAscii( INET_HID_SCHEME );
sHelpURL += aTmp;
return sHelpURL;
}
// --------------------------------------------------------------------------
- Any OControlAccess::getControlProperty( const ::rtl::OUString& _rControlName, const ::rtl::OUString& _rControlProperty )
+ Any OControlAccess::getControlProperty( const OUString& _rControlName, const OUString& _rControlProperty )
{
// look up the control
sal_Int16 nControlId = -1;
@@ -243,7 +243,7 @@ namespace svt
}
//---------------------------------------------------------------------
- Control* OControlAccess::implGetControl( const ::rtl::OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const SAL_THROW( (IllegalArgumentException) )
+ Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const SAL_THROW( (IllegalArgumentException) )
{
Control* pControl = NULL;
ControlDescription tmpDesc;
@@ -271,7 +271,7 @@ namespace svt
}
//---------------------------------------------------------------------
- void OControlAccess::setControlProperty( const ::rtl::OUString& _rControlName, const ::rtl::OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue )
+ void OControlAccess::setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue )
{
// look up the control
sal_Int16 nControlId = -1;
@@ -288,16 +288,16 @@ namespace svt
}
// --------------------------------------------------------------------------
- Sequence< ::rtl::OUString > OControlAccess::getSupportedControls( )
+ Sequence< OUString > OControlAccess::getSupportedControls( )
{
- Sequence< ::rtl::OUString > aControls( s_nControlCount );
- ::rtl::OUString* pControls = aControls.getArray();
+ Sequence< OUString > aControls( s_nControlCount );
+ OUString* pControls = aControls.getArray();
// collect the names of all _actually_existent_ controls
for ( ControlDescIterator aControl = s_pControls; aControl != s_pControlsEnd; ++aControl )
{
if ( m_pFilePickerController->getControl( aControl->nControlId ) )
- *pControls++ = ::rtl::OUString::createFromAscii( aControl->pControlName );
+ *pControls++ = OUString::createFromAscii( aControl->pControlName );
}
aControls.realloc( pControls - aControls.getArray() );
@@ -305,7 +305,7 @@ namespace svt
}
// --------------------------------------------------------------------------
- Sequence< ::rtl::OUString > OControlAccess::getSupportedControlProperties( const ::rtl::OUString& _rControlName )
+ Sequence< OUString > OControlAccess::getSupportedControlProperties( const OUString& _rControlName )
{
sal_Int16 nControlId = -1;
sal_Int32 nPropertyMask = 0;
@@ -313,19 +313,19 @@ namespace svt
// will throw an IllegalArgumentException if the name is not valid
// fill in the property names
- Sequence< ::rtl::OUString > aProps( s_nPropertyCount );
- ::rtl::OUString* pProperty = aProps.getArray();
+ Sequence< OUString > aProps( s_nPropertyCount );
+ OUString* pProperty = aProps.getArray();
for ( ControlPropertyIterator aProp = s_pProperties; aProp != s_pPropertiesEnd; ++aProp )
if ( 0 != ( nPropertyMask & aProp->nPropertyId ) )
- *pProperty++ = ::rtl::OUString::createFromAscii( aProp->pPropertyName );
+ *pProperty++ = OUString::createFromAscii( aProp->pPropertyName );
aProps.realloc( pProperty - aProps.getArray() );
return aProps;
}
// --------------------------------------------------------------------------
- sal_Bool OControlAccess::isControlSupported( const ::rtl::OUString& _rControlName )
+ sal_Bool OControlAccess::isControlSupported( const OUString& _rControlName )
{
ControlDescription tmpDesc;
tmpDesc.pControlName = OUStringToOString(_rControlName, RTL_TEXTENCODING_UTF8).getStr();
@@ -333,7 +333,7 @@ namespace svt
}
// --------------------------------------------------------------------------
- sal_Bool OControlAccess::isControlPropertySupported( const ::rtl::OUString& _rControlName, const ::rtl::OUString& _rControlProperty )
+ sal_Bool OControlAccess::isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty )
{
// look up the control
sal_Int16 nControlId = -1;
@@ -432,7 +432,7 @@ namespace svt
case LISTBOX_FILTER:
if ( ControlActions::GET_SELECTED_ITEM == _nControlAction )
{
- aRet <<= ::rtl::OUString( m_pFilePickerController->getCurFilter() );;
+ aRet <<= OUString( m_pFilePickerController->getCurFilter() );;
}
else
{
@@ -470,7 +470,7 @@ namespace svt
}
//-----------------------------------------------------------------------------
- void OControlAccess::setLabel( sal_Int16 nId, const ::rtl::OUString &rLabel )
+ void OControlAccess::setLabel( sal_Int16 nId, const OUString &rLabel )
{
Control* pControl = m_pFilePickerController->getControl( nId, sal_True );
DBG_ASSERT( pControl, "OControlAccess::GetValue: don't have this control in the current mode!" );
@@ -479,9 +479,9 @@ namespace svt
}
//-----------------------------------------------------------------------------
- ::rtl::OUString OControlAccess::getLabel( sal_Int16 nId ) const
+ OUString OControlAccess::getLabel( sal_Int16 nId ) const
{
- ::rtl::OUString sLabel;
+ OUString sLabel;
Control* pControl = m_pFilePickerController->getControl( nId, sal_True );
DBG_ASSERT( pControl, "OControlAccess::GetValue: don't have this control in the current mode!" );
@@ -504,7 +504,7 @@ namespace svt
{
case ControlActions::ADD_ITEM:
{
- ::rtl::OUString aEntry;
+ OUString aEntry;
_rValue >>= aEntry;
if ( !aEntry.isEmpty() )
_pListbox->InsertEntry( aEntry );
@@ -513,7 +513,7 @@ namespace svt
case ControlActions::ADD_ITEMS:
{
- Sequence < ::rtl::OUString > aTemplateList;
+ Sequence < OUString > aTemplateList;
_rValue >>= aTemplateList;
if ( aTemplateList.getLength() )
@@ -557,7 +557,7 @@ namespace svt
{
case PROPERTY_FLAG_TEXT:
{
- ::rtl::OUString sText;
+ OUString sText;
if ( _rValue >>= sText )
{
_pControl->SetText( sText );
@@ -599,7 +599,7 @@ namespace svt
case PROPERTY_FLAG_HELPURL:
{
- ::rtl::OUString sHelpURL;
+ OUString sHelpURL;
if ( _rValue >>= sHelpURL )
{
setHelpURL( _pControl, sHelpURL, m_pFileView == _pControl );
@@ -616,16 +616,16 @@ namespace svt
DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
"OControlAccess::implSetControlProperty: invalid control/property combination!" );
- Sequence< ::rtl::OUString > aItems;
+ Sequence< OUString > aItems;
if ( _rValue >>= aItems )
{
// remove all previous items
static_cast< ListBox* >( _pControl )->Clear();
// add the new ones
- const ::rtl::OUString* pItems = aItems.getConstArray();
- const ::rtl::OUString* pItemsEnd = aItems.getConstArray() + aItems.getLength();
- for ( const ::rtl::OUString* pItem = pItems;
+ const OUString* pItems = aItems.getConstArray();
+ const OUString* pItemsEnd = aItems.getConstArray() + aItems.getLength();
+ for ( const OUString* pItem = pItems;
pItem != pItemsEnd;
++pItem
)
@@ -646,7 +646,7 @@ namespace svt
DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
"OControlAccess::implSetControlProperty: invalid control/property combination!" );
- ::rtl::OUString sSelected;
+ OUString sSelected;
if ( _rValue >>= sSelected )
{
static_cast< ListBox* >( _pControl )->SelectEntry( sSelected );
@@ -706,7 +706,7 @@ namespace svt
switch ( _nProperty )
{
case PROPERTY_FLAG_TEXT:
- aReturn <<= ::rtl::OUString( _pControl->GetText() );
+ aReturn <<= OUString( _pControl->GetText() );
break;
case PROPERTY_FLAG_ENDBALED:
@@ -726,8 +726,8 @@ namespace svt
DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
"OControlAccess::implGetControlProperty: invalid control/property combination!" );
- Sequence< ::rtl::OUString > aItems( static_cast< ListBox* >( _pControl )->GetEntryCount() );
- ::rtl::OUString* pItems = aItems.getArray();
+ Sequence< OUString > aItems( static_cast< ListBox* >( _pControl )->GetEntryCount() );
+ OUString* pItems = aItems.getArray();
for ( sal_uInt16 i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
*pItems++ = static_cast< ListBox* >( _pControl )->GetEntry( i );
@@ -741,7 +741,7 @@ namespace svt
"OControlAccess::implGetControlProperty: invalid control/property combination!" );
sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
- ::rtl::OUString sSelected;
+ OUString sSelected;
if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
sSelected = static_cast< ListBox* >( _pControl )->GetSelectEntry();
aReturn <<= sSelected;
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index c66aa32..ac472e7 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -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
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index adfa6a6..81071c2 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -65,22 +65,22 @@ using namespace ::utl;
struct FilterEntry
{
protected:
- ::rtl::OUString m_sTitle;
- ::rtl::OUString m_sFilter;
+ OUString m_sTitle;
+ OUString m_sFilter;
UnoFilterList m_aSubFilters;
public:
- FilterEntry( const ::rtl::OUString& _rTitle, const ::rtl::OUString& _rFilter )
+ FilterEntry( const OUString& _rTitle, const OUString& _rFilter )
:m_sTitle( _rTitle )
,m_sFilter( _rFilter )
{
}
- FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters );
+ FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters );
- ::rtl::OUString getTitle() const { return m_sTitle; }
- ::rtl::OUString getFilter() const { return m_sFilter; }
+ OUString getTitle() const { return m_sTitle; }
+ OUString getFilter() const { return m_sFilter; }
/// determines if the filter has sub filter (i.e., the filter is a filter group in real)
sal_Bool hasSubFilters( ) const;
@@ -99,7 +99,7 @@ public:
//=====================================================================
//---------------------------------------------------------------------
-FilterEntry::FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters )
+FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
:m_sTitle( _rTitle )
,m_aSubFilters( _rSubFilters )
{
@@ -125,7 +125,7 @@ struct ElementEntry_Impl
sal_Int16 m_nElementID;
sal_Int16 m_nControlAction;
Any m_aValue;
- rtl::OUString m_aLabel;
+ OUString m_aLabel;
sal_Bool m_bEnabled : 1;
sal_Bool m_bHasValue : 1;
@@ -136,7 +136,7 @@ struct ElementEntry_Impl
void setValue( const Any& rVal ) { m_aValue = rVal; m_bHasValue = sal_True; }
void setAction( sal_Int16 nAction ) { m_nControlAction = nAction; }
- void setLabel( const rtl::OUString& rVal ) { m_aLabel = rVal; m_bHasLabel = sal_True; }
+ void setLabel( const OUString& rVal ) { m_aLabel = rVal; m_bHasLabel = sal_True; }
void setEnabled( sal_Bool bEnabled ) { m_bEnabled = bEnabled; m_bHasEnabled = sal_True; }
};
@@ -252,7 +252,7 @@ WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits )
WinBits nBits = 0L;
rExtraBits = 0L;
- // set the standard bits acording to the service name
+ // set the standard bits according to the service name
if ( m_nServiceType == TemplateDescription::FILEOPEN_SIMPLE )
{
nBits = WB_OPEN;
@@ -350,10 +350,10 @@ namespace {
struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool >
{
protected:
- const ::rtl::OUString& rTitle;
+ const OUString& rTitle;
public:
- FilterTitleMatch( const ::rtl::OUString& _rTitle ) : rTitle( _rTitle ) { }
+ FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { }
//............................................................................
bool operator () ( const FilterEntry& _rEntry )
@@ -381,7 +381,7 @@ namespace {
}
//------------------------------------------------------------------------------------
-sal_Bool SvtFilePicker::FilterNameExists( const ::rtl::OUString& rTitle )
+sal_Bool SvtFilePicker::FilterNameExists( const OUString& rTitle )
{
sal_Bool bRet = sal_False;
@@ -416,7 +416,7 @@ sal_Bool SvtFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters
}
//------------------------------------------------------------------------------------
-void SvtFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter )
+void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
{
if ( !m_pFilterList )
{
@@ -503,7 +503,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFilePicker, OCommonPicker, SvtFilePicker_Ba
//------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::setTitle( const ::rtl::OUString& _rTitle ) throw (RuntimeException)
+void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException)
{
OCommonPicker::setTitle( _rTitle );
}
@@ -519,7 +519,7 @@ sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException)
//------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::setDialogTitle( const ::rtl::OUString& _rTitle ) throw (RuntimeException)
+void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException)
{
setTitle( _rTitle );
}
@@ -546,7 +546,7 @@ void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( Runt
m_bMultiSelection = bMode;
}
-void SAL_CALL SvtFilePicker::setDefaultName( const rtl::OUString& aName ) throw( RuntimeException )
+void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( RuntimeException )
{
checkAlive();
@@ -554,7 +554,7 @@ void SAL_CALL SvtFilePicker::setDefaultName( const rtl::OUString& aName ) throw(
m_aDefaultName = aName;
}
-void SAL_CALL SvtFilePicker::setDisplayDirectory( const rtl::OUString& aDirectory )
+void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory )
throw( IllegalArgumentException, RuntimeException )
{
checkAlive();
@@ -563,14 +563,14 @@ void SAL_CALL SvtFilePicker::setDisplayDirectory( const rtl::OUString& aDirector
m_aDisplayDirectory = aDirectory;
}
-rtl::OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException )
+OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException )
{
checkAlive();
SolarMutexGuard aGuard;
if ( getDialog() )
{
- rtl::OUString aPath = getDialog()->GetPath();
+ OUString aPath = getDialog()->GetPath();
// #97148# ----
if( m_aOldHideDirectory == aPath )
@@ -591,28 +591,28 @@ rtl::OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeExcept
return m_aDisplayDirectory;
}
-Sequence< rtl::OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException )
+Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException )
{
checkAlive();
SolarMutexGuard aGuard;
if ( ! getDialog() )
{
- Sequence< rtl::OUString > aEmpty;
+ Sequence< OUString > aEmpty;
return aEmpty;
}
// if there is more than one path we have to return the path to the
// files first and then the list of the selected entries
- std::vector<rtl::OUString> aPathList(getDialog()->GetPathList());
+ std::vector<OUString> aPathList(getDialog()->GetPathList());
size_t nCount = aPathList.size();
size_t nTotal = nCount > 1 ? nCount+1: nCount;
- Sequence< rtl::OUString > aPath( nTotal );
+ Sequence< OUString > aPath( nTotal );
if ( nCount == 1 )
- aPath[0] = rtl::OUString(aPathList[0]);
+ aPath[0] = OUString(aPathList[0]);
else if ( nCount > 1 )
{
INetURLObject aObj(aPathList[0]);
@@ -715,7 +715,7 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const rtl::OUString& rValue )
+void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue )
throw ( RuntimeException )
{
checkAlive();
@@ -755,13 +755,13 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const rtl::OUString&
}
//------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
+OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
throw ( RuntimeException )
{
checkAlive();
SolarMutexGuard aGuard;
- rtl::OUString aLabel;
+ OUString aLabel;
if ( getDialog() )
{
@@ -951,7 +951,7 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException )
// XFilterGroupManager functions
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::appendFilterGroup( const ::rtl::OUString& sGroupTitle,
+void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
const Sequence< StringPair >& aFilters )
throw ( IllegalArgumentException, RuntimeException )
{
@@ -962,11 +962,11 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const ::rtl::OUString& sGroupTit
// check the names
if ( FilterNameExists( aFilters ) )
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter name exists")),
+ OUString("filter name exists"),
static_cast< OWeakObject * >(this), 1);
// ensure that we have a filter list
- ::rtl::OUString sInitialCurrentFilter;
+ OUString sInitialCurrentFilter;
if ( aFilters.getLength() )
sInitialCurrentFilter = aFilters[0].First;
ensureFilterList( sInitialCurrentFilter );
@@ -979,8 +979,8 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const ::rtl::OUString& sGroupTit
// XFilterManager functions
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::appendFilter( const rtl::OUString& aTitle,
- const rtl::OUString& aFilter )
+void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
+ const OUString& aFilter )
throw( IllegalArgumentException, RuntimeException )
{
checkAlive();
@@ -999,7 +999,7 @@ void SAL_CALL SvtFilePicker::appendFilter( const rtl::OUString& aTitle,
}
//------------------------------------------------------------------------------------
-void SAL_CALL SvtFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
+void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
throw( IllegalArgumentException, RuntimeException )
{
checkAlive();
@@ -1015,14 +1015,14 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
}
//------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL SvtFilePicker::getCurrentFilter()
+OUString SAL_CALL SvtFilePicker::getCurrentFilter()
throw( RuntimeException )
{
checkAlive();
SolarMutexGuard aGuard;
- rtl::OUString aFilter = getDialog() ? rtl::OUString( getDialog()->GetCurFilter() ) :
- rtl::OUString( m_aCurrentFilter );
+ OUString aFilter = getDialog() ? OUString( getDialog()->GetCurFilter() ) :
+ OUString( m_aCurrentFilter );
return aFilter;
}
@@ -1063,7 +1063,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
if ( namedValue.Name == "StandardDir" )
{
- ::rtl::OUString sStandardDir;
+ OUString sStandardDir;
namedValue.Value >>= sStandardDir;
@@ -1086,7 +1086,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
}
//-------------------------------------------------------------------------
-sal_Bool SvtFilePicker::implHandleInitializationArgument( const ::rtl::OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
+sal_Bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
{
if ( _rName == "TemplateDescription" )
{
@@ -1116,16 +1116,16 @@ sal_Bool SvtFilePicker::implHandleInitializationArgument( const ::rtl::OUString&
//------------------------------------------------------------------------------------
/* XServiceInfo */
-rtl::OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException )
+OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException )
{
return impl_getStaticImplementationName();
}
/* XServiceInfo */
-sal_Bool SAL_CALL SvtFilePicker::supportsService( const rtl::OUString& sServiceName ) throw( RuntimeException )
+sal_Bool SAL_CALL SvtFilePicker::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] )
@@ -1137,24 +1137,24 @@ sal_Bool SAL_CALL SvtFilePicker::supportsService( const rtl::OUString& sServiceN
}
/* XServiceInfo */
-Sequence< rtl::OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
-Sequence< rtl::OUString > SvtFilePicker::impl_getStaticSupportedServiceNames()
+Sequence< OUString > SvtFilePicker::impl_getStaticSupportedServiceNames()
{
- Sequence< rtl::OUString > seqServiceNames( 1 );
- rtl::OUString* pArray = seqServiceNames.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFilePicker" ));
+ Sequence< OUString > seqServiceNames( 1 );
+ OUString* pArray = seqServiceNames.getArray();
+ pArray[0] = OUString( "com.sun.star.ui.dialogs.OfficeFilePicker" );
return seqServiceNames ;
}
/* Helper for XServiceInfo */
-rtl::OUString SvtFilePicker::impl_getStaticImplementationName()
+OUString SvtFilePicker::impl_getStaticImplementationName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.OfficeFilePicker" ));
+ return OUString( "com.sun.star.svtools.OfficeFilePicker" );
}
/* Helper for registry */
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index f7db337..2e90ebd 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -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( );
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index f04de64..1cf1d05 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -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 */
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 44ac092..3a58209 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -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 (
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 9c27d94..b10753e 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -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();
}
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 7185da8..49da34e 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -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 );
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index d573ae2..44b22e6 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -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
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index dafe8e9..06ccac4 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -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" )
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index e17fbd3..5008f68 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -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 ) );
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 9a68aae..3bdb516 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -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 );
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index 3215ae8..cc72d77 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -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 );
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 1f814aa..f64e3c9 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -238,7 +238,7 @@ namespace
INetURLObject aURL( aNewFile );
if ( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
- rtl::OUString sURL;
+ OUString sURL;
if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aNewFile, sURL ) )
aURL = INetURLObject( sURL );
}
@@ -284,10 +284,10 @@ namespace
if ( xProviderProps.is() )
{
Reference< XPropertySetInfo > xPropInfo = xProviderProps->getPropertySetInfo();
- const ::rtl::OUString sHomeDirPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HomeDirectory" ) );
+ const OUString sHomeDirPropertyName( "HomeDirectory" );
if ( !xPropInfo.is() || xPropInfo->hasPropertyByName( sHomeDirPropertyName ) )
{
- ::rtl::OUString sHomeDirectory;
+ OUString sHomeDirectory;
xProviderProps->getPropertyValue( sHomeDirPropertyName ) >>= sHomeDirectory;
_rHomeDir = sHomeDirectory;
}
@@ -326,10 +326,10 @@ namespace
/** retrieves the value of an environment variable
@return <TRUE/> if and only if the retrieved string value is not empty
*/
- bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, ::rtl::OUString& _rValue )
+ bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString& _rValue )
{
- _rValue = ::rtl::OUString();
- ::rtl::OUString sEnvName = ::rtl::OUString::createFromAscii( _pAsciiEnvName );
+ _rValue = OUString();
+ OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName );
osl_getEnvironment( sEnvName.pData, &_rValue.pData );
return !_rValue.isEmpty();
}
@@ -434,10 +434,10 @@ SvtFileDialog::~SvtFileDialog()
{
// save window state
SvtViewOptions aDlgOpt( E_DIALOG, _pImp->_aIniKey );
- aDlgOpt.SetWindowState(::rtl::OStringToOUString(GetWindowState(), osl_getThreadTextEncoding()));
+ aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(), osl_getThreadTextEncoding()));
String sUserData = _pFileView->GetConfigString();
- aDlgOpt.SetUserItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserData" )),
- makeAny( ::rtl::OUString( sUserData ) ) );
+ aDlgOpt.SetUserItem( OUString( "UserData" ),
+ makeAny( OUString( sUserData ) ) );
}
_pFileView->SetSelectHdl( Link() );
@@ -445,8 +445,8 @@ SvtFileDialog::~SvtFileDialog()
// Save bookmarked places
if(_pImp->_pPlaces->IsUpdated()) {
const std::vector<PlacePtr> aPlaces = _pImp->_pPlaces->GetPlaces();
- Sequence< ::rtl::OUString > placesUrlsList(_pImp->_pPlaces->GetNbEditablePlaces());
- Sequence< ::rtl::OUString > placesNamesList(_pImp->_pPlaces->GetNbEditablePlaces());
+ Sequence< OUString > placesUrlsList(_pImp->_pPlaces->GetNbEditablePlaces());
+ Sequence< OUString > placesNamesList(_pImp->_pPlaces->GetNbEditablePlaces());
int i(0);
for(std::vector<PlacePtr>::const_iterator it = aPlaces.begin(); it != aPlaces.end(); ++it) {
if((*it)->IsEditable()) {
@@ -778,7 +778,7 @@ void SvtFileDialog::Init_Impl
/// read our settings from the configuration
m_aConfiguration = OConfigurationTreeRoot::createWithServiceFactory(
::comphelper::getProcessServiceFactory(),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI/FilePicker" ) )
+ OUString( "/org.openoffice.Office.UI/FilePicker" )
);
}
@@ -789,7 +789,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG )
pThis->_pFileView->EndInplaceEditing( false );
SmartContent aContent( pThis->_pFileView->GetViewURL( ) );
- rtl::OUString aTitle;
+ OUString aTitle;
aContent.getTitle( aTitle );
svtools::QueryFolderNameDialog aDlg( pThis, aTitle, String( SvtResId( STR_SVT_NEW_FOLDER ) ) );
sal_Bool bHandled = sal_False;
@@ -798,7 +798,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG )
{
if ( aDlg.Execute() == RET_OK )
{
- rtl::OUString aUrl = aContent.createFolder( aDlg.GetName( ) );
+ OUString aUrl = aContent.createFolder( aDlg.GetName( ) );
if ( !aUrl.isEmpty( ) )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list