summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /fpicker
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/aqua/ControlHelper.hxx2
-rw-r--r--fpicker/source/aqua/NSString_OOoAdditions.hxx6
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.cxx48
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.hxx42
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx70
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.hxx32
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.cxx7
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.hxx24
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.cxx4
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx64
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.hxx36
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx60
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx48
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx44
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.hxx22
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.cxx6
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlaccess.cxx1
-rw-r--r--fpicker/source/win32/filepicker/controlcommand.cxx4
-rw-r--r--fpicker/source/win32/filepicker/controlcommand.hxx6
-rw-r--r--fpicker/source/win32/filepicker/controlcommandresult.hxx6
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.cxx1
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.cxx9
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.hxx24
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.cxx3
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.hxx4
-rw-r--r--fpicker/source/win32/filepicker/previewbase.cxx1
-rw-r--r--fpicker/source/win32/filepicker/shared.hxx6
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx1
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.hxx16
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.cxx9
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.hxx30
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx1
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.hxx8
-rw-r--r--fpicker/source/win32/misc/AutoBuffer.cxx1
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.cxx14
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.hxx4
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx1
-rw-r--r--fpicker/source/win32/misc/resourceprovider.hxx2
-rw-r--r--fpicker/test/svdem.cxx4
42 files changed, 334 insertions, 349 deletions
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index c6fc4db1af8b..4619f98457a7 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -35,8 +35,6 @@
using namespace com::sun::star;
-using ::rtl::OUString;
-
class ControlHelper {
public:
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index 3827afedcf24..52e5c41b72f6 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -27,9 +27,9 @@
//for Cocoa types
@interface NSString (OOoAdditions)
-+ (id) stringWithOUString:(const rtl::OUString&)ouString;
-- (id) initWithOUString:(const rtl::OUString&)ouString;
-- (rtl::OUString) OUString;
++ (id) stringWithOUString:(const OUString&)ouString;
+- (id) initWithOUString:(const OUString&)ouString;
+- (OUString) OUString;
@end
#endif // _NSSTRING_OOOADDITIONS_HXX_
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index 6397a2561274..17c81520b33d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -143,7 +143,7 @@ CFileOpenDialog::~CFileOpenDialog()
//
//------------------------------------------------------------------------
-void SAL_CALL CFileOpenDialog::setTitle(const rtl::OUString& aTitle)
+void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle)
{
m_dialogTitle = aTitle;
m_ofn.lpstrTitle = reinterpret_cast<LPCTSTR>(m_dialogTitle.getStr());
@@ -153,7 +153,7 @@ void SAL_CALL CFileOpenDialog::setTitle(const rtl::OUString& aTitle)
//
//------------------------------------------------------------------------
-void CFileOpenDialog::setFilter(const rtl::OUString& aFilter)
+void CFileOpenDialog::setFilter(const OUString& aFilter)
{
// Format is like
// "*.TXT" or multiple separate by ';' like "*.TXT;*.DOC;*.SXW"
@@ -188,7 +188,7 @@ sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const
//
//------------------------------------------------------------------------
-void SAL_CALL CFileOpenDialog::setDefaultName(const rtl::OUString& aName)
+void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName)
{
m_fileNameBuffer.setLength(0);
m_fileNameBuffer.append(aName);
@@ -199,7 +199,7 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const rtl::OUString& aName)
//
//------------------------------------------------------------------------
-void SAL_CALL CFileOpenDialog::setDisplayDirectory(const rtl::OUString& aDirectory)
+void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory)
{
m_displayDirectory = aDirectory;
m_ofn.lpstrInitialDir = reinterpret_cast<LPCTSTR>(m_displayDirectory.getStr());
@@ -209,7 +209,7 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const rtl::OUString& aDirecto
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
+OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
{
return m_displayDirectory;
}
@@ -218,9 +218,9 @@ rtl::OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() const
+OUString SAL_CALL CFileOpenDialog::getFullFileName() const
{
- return rtl::OUString(m_fileNameBuffer.getStr(),
+ return OUString(m_fileNameBuffer.getStr(),
_wcslenex(m_fileNameBuffer.getStr()));
}
@@ -228,29 +228,29 @@ rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() const
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getFileName() const
+OUString SAL_CALL CFileOpenDialog::getFileName() const
{
- return rtl::OUString(m_fileTitleBuffer.getStr());
+ return OUString(m_fileTitleBuffer.getStr());
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-rtl::OUString CFileOpenDialog::getFileExtension()
+OUString CFileOpenDialog::getFileExtension()
{
if (m_ofn.nFileExtension)
- return rtl::OUString(m_fileNameBuffer.getStr() + m_ofn.nFileExtension,
+ return OUString(m_fileNameBuffer.getStr() + m_ofn.nFileExtension,
rtl_ustr_getLength(m_fileNameBuffer.getStr() + m_ofn.nFileExtension));
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-void CFileOpenDialog::setDefaultFileExtension(const rtl::OUString& aExtension)
+void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension)
{
m_defaultExtension = aExtension;
m_ofn.lpstrDefExt = reinterpret_cast<LPCTSTR>(m_defaultExtension.getStr());
@@ -340,7 +340,7 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)
// Attention: assuming that nFileOffset is always greater 0 because under
// Windows there is always a drive letter or a server in a complete path
// the OPENFILENAME docu never says that nFileOffset can be 0
- m_displayDirectory = rtl::OUString(reinterpret_cast<const sal_Unicode*>(m_ofn.lpstrFile),m_ofn.nFileOffset);
+ m_displayDirectory = OUString(reinterpret_cast<const sal_Unicode*>(m_ofn.lpstrFile),m_ofn.nFileOffset);
}
}
@@ -348,7 +348,7 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
+OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
{
OSL_ASSERT(IsWindow(m_hwndFileOpenDlg));
@@ -361,16 +361,16 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
if (nLen > 0)
{
m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
- return rtl::OUString(m_helperBuffer.getStr());
+ return OUString(m_helperBuffer.getStr());
}
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
+OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
{
OSL_ASSERT(IsWindow(m_hwndFileOpenDlg));
@@ -383,16 +383,16 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
if (nLen > 0)
{
m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
- return rtl::OUString(m_helperBuffer.getStr());
+ return OUString(m_helperBuffer.getStr());
}
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
+OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
{
OSL_ASSERT(IsWindow(m_hwndFileOpenDlg));
@@ -405,16 +405,16 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
if (nLen > 0)
{
m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
- return rtl::OUString(m_helperBuffer.getStr());
+ return OUString(m_helperBuffer.getStr());
}
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const rtl::OUString&)
+sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&)
{
return 0;
}
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index bd335b73ccd1..94b0281faa0d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -142,11 +142,11 @@ public:
virtual ~CFileOpenDialog();
- virtual void SAL_CALL setTitle(const rtl::OUString& aTitle);
+ virtual void SAL_CALL setTitle(const OUString& aTitle);
// to set a filter string using the M$ format
// e.g. FltName\0*.txt;*.rtf\0...\0\0
- void SAL_CALL setFilter(const rtl::OUString& aFilter);
+ void SAL_CALL setFilter(const OUString& aFilter);
// set the index of the current filter when the
// dialog is about to shown, the index starts with 1
@@ -162,29 +162,29 @@ public:
// set the name and optional the path of the
// file that will be initially be shown when
// the dialog will be displayed
- virtual void SAL_CALL setDefaultName(const rtl::OUString& aName);
+ virtual void SAL_CALL setDefaultName(const OUString& aName);
// set the initial directory
- virtual void SAL_CALL setDisplayDirectory(const rtl::OUString& aDirectory);
+ virtual void SAL_CALL setDisplayDirectory(const OUString& aDirectory);
// returns only the path of the selected file
- virtual rtl::OUString SAL_CALL getLastDisplayDirectory() const;
+ virtual OUString SAL_CALL getLastDisplayDirectory() const;
// returns the full file name including drive letter, path
// file name and file extension
- virtual rtl::OUString SAL_CALL getFullFileName() const;
+ virtual OUString SAL_CALL getFullFileName() const;
// returns the file name and the file extension without
// drive letter and path
- rtl::OUString SAL_CALL getFileName() const;
+ OUString SAL_CALL getFileName() const;
// returns the file extension of the selected file
- rtl::OUString SAL_CALL getFileExtension();
+ OUString SAL_CALL getFileExtension();
// set a default extension, only the first three letters of
// the given extension will be used; the given extension
// should not contain a '.'
- void SAL_CALL setDefaultFileExtension(const rtl::OUString& aExtension);
+ void SAL_CALL setDefaultFileExtension(const OUString& aExtension);
// enables or disables the multiselection mode for
// the FileOpen/FileSave dialog
@@ -209,14 +209,14 @@ public:
// including path and drive information
// can be called only if the dialog is
// already displayed
- rtl::OUString SAL_CALL getCurrentFilePath() const;
+ OUString SAL_CALL getCurrentFilePath() const;
// retrievs the currently selected folder
- rtl::OUString SAL_CALL getCurrentFolderPath() const;
+ OUString SAL_CALL getCurrentFolderPath() const;
// retrievs the currently selected file name
// without drive and path
- rtl::OUString SAL_CALL getCurrentFileName() const;
+ OUString SAL_CALL getCurrentFileName() const;
protected:
// have to be overwritten when subclasses
@@ -234,7 +234,7 @@ protected:
virtual void SAL_CALL postModal(sal_Int16 nDialogResult);
// message handler, to be overwritten by subclasses
- virtual sal_uInt32 SAL_CALL onShareViolation(const rtl::OUString& aPathName);
+ virtual sal_uInt32 SAL_CALL onShareViolation(const OUString& aPathName);
virtual sal_uInt32 SAL_CALL onFileOk();
virtual void SAL_CALL onSelChanged(HWND hwndListBox);
virtual void SAL_CALL onHelp();
@@ -276,14 +276,14 @@ protected:
private:
// FileOpen or FileSaveDialog
bool m_bFileOpenDialog;
- rtl::OUString m_dialogTitle;
- rtl::OUString m_displayDirectory;
- rtl::OUString m_defaultExtension;
-
- mutable rtl::OUStringBuffer m_filterBuffer;
- mutable rtl::OUStringBuffer m_fileTitleBuffer;
- mutable rtl::OUStringBuffer m_helperBuffer;
- mutable rtl::OUStringBuffer m_fileNameBuffer;
+ OUString m_dialogTitle;
+ OUString m_displayDirectory;
+ OUString m_defaultExtension;
+
+ mutable OUStringBuffer m_filterBuffer;
+ mutable OUStringBuffer m_fileTitleBuffer;
+ mutable OUStringBuffer m_helperBuffer;
+ mutable OUStringBuffer m_fileNameBuffer;
CGetFileNameWrapper m_GetFileNameWrapper;
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index e8514093cb1f..8c98a07e15f3 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -53,11 +53,11 @@ namespace
const bool STARTUP_SUSPENDED = true;
const bool STARTUP_ALIVE = false;
- uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+ uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(2);
- aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+ uno::Sequence<OUString> aRet(2);
+ aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -93,7 +93,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
{
if ( rBHelper.bDisposed )
throw lang::DisposedException(
- rtl::OUString( "object is already disposed" ),
+ OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
if ( !rBHelper.bInDispose && !rBHelper.bDisposed )
@@ -109,7 +109,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
{
if ( rBHelper.bDisposed )
throw lang::DisposedException(
- rtl::OUString( "object is already disposed" ),
+ OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
@@ -174,9 +174,9 @@ void SAL_CALL CFilePicker::dialogSizeChanged()
// If there are more then one listener the return value of the last one wins
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
+OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
{
- rtl::OUString aHelpText;
+ OUString aHelpText;
::cppu::OInterfaceContainerHelper* pICHelper =
rBHelper.getContainer( getCppuType((uno::Reference<XFilePickerListener>*)0));
@@ -195,7 +195,7 @@ rtl::OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
overwrittes the one before if it is not empty
*/
- rtl::OUString temp;
+ OUString temp;
uno::Reference<XFilePickerListener> xFPListener(iter.next(), uno::UNO_QUERY);
if (xFPListener.is())
@@ -267,7 +267,7 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setTitle(const rtl::OUString& aTitle) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -278,7 +278,7 @@ void SAL_CALL CFilePicker::setTitle(const rtl::OUString& aTitle) throw(uno::Runt
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::appendFilter(const rtl::OUString& aTitle, const rtl::OUString& aFilter)
+void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter)
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -290,7 +290,7 @@ void SAL_CALL CFilePicker::appendFilter(const rtl::OUString& aTitle, const rtl::
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setCurrentFilter(const rtl::OUString& aTitle)
+void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -302,7 +302,7 @@ void SAL_CALL CFilePicker::setCurrentFilter(const rtl::OUString& aTitle)
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -313,7 +313,7 @@ rtl::OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeExcepti
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::appendFilterGroup(const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
+void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -325,7 +325,7 @@ void SAL_CALL CFilePicker::appendFilterGroup(const rtl::OUString& sGroupTitle, c
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)
+void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -337,7 +337,7 @@ void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setDisplayDirectory(const rtl::OUString& aDirectory)
+void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -349,7 +349,7 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const rtl::OUString& aDirectory)
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -360,7 +360,7 @@ rtl::OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeExce
//
//-----------------------------------------------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -370,22 +370,22 @@ uno::Sequence<rtl::OUString> SAL_CALL CFilePicker::getFiles() throw(uno::Runtime
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
- const uno::Sequence< ::rtl::OUString > lSource = m_pImpl->getFiles();
+ const uno::Sequence< OUString > lSource = m_pImpl->getFiles();
const ::sal_Int32 c = lSource.getLength();
if (c < 2)
return lSource;
- const ::rtl::OUString sPath = lSource[0];
- ::comphelper::SequenceAsVector< ::rtl::OUString > lTarget;
+ const OUString sPath = lSource[0];
+ ::comphelper::SequenceAsVector< OUString > lTarget;
::sal_Int32 i = 1;
for (i=1; i<c; ++i)
{
- const ::rtl::OUString sFile = lSource[i];
+ const OUString sFile = lSource[i];
if (sFile.indexOf ('/') > 0)
{
// a) file contains own path !
@@ -394,7 +394,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL CFilePicker::getSelectedFiles() throw
else
{
// b) file is relative to given path
- ::rtl::OUStringBuffer sFull(256);
+ OUStringBuffer sFull(256);
sFull.append (sPath);
sFull.appendAscii("/" );
@@ -432,7 +432,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
OSL_FAIL("Could not start event notifier thread!");
throw uno::RuntimeException(
- rtl::OUString("Error executing dialog"),
+ OUString("Error executing dialog"),
static_cast<XFilePicker2*>(this));
}
@@ -482,7 +482,7 @@ throw(uno::RuntimeException)
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const ::rtl::OUString& aLabel)
+void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel)
throw (uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -495,7 +495,7 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const ::rtl::OUString&
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
+OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
throw (uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -600,7 +600,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
uno::Any aAny;
if ( 0 == aArguments.getLength( ) )
throw lang::IllegalArgumentException(
- rtl::OUString( "no arguments" ),
+ OUString( "no arguments" ),
static_cast<XFilePicker2*>(this), 1);
aAny = aArguments[0];
@@ -608,7 +608,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) &&
(aAny.getValueType() != ::getCppuType((sal_Int8*)0)) )
throw lang::IllegalArgumentException(
- rtl::OUString("invalid argument type"),
+ OUString("invalid argument type"),
static_cast<XFilePicker2*>(this), 1);
sal_Int16 templateId = -1;
@@ -670,7 +670,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
default:
throw lang::IllegalArgumentException(
- rtl::OUString( "Unknown template" ),
+ OUString( "Unknown template" ),
static_cast< XFilePicker2* >( this ),
1 );
}
@@ -707,20 +707,20 @@ void SAL_CALL CFilePicker::cancel()
// XServiceInfo
// -------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getImplementationName()
+OUString SAL_CALL CFilePicker::getImplementationName()
throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
}
// -------------------------------------------------
// XServiceInfo
// -------------------------------------------------
-sal_Bool SAL_CALL CFilePicker::supportsService(const rtl::OUString& ServiceName)
+sal_Bool SAL_CALL CFilePicker::supportsService(const OUString& ServiceName)
throw(uno::RuntimeException )
{
- uno::Sequence <rtl::OUString> SupportedServicesNames = FilePicker_getSupportedServiceNames();
+ uno::Sequence <OUString> SupportedServicesNames = FilePicker_getSupportedServiceNames();
for (sal_Int32 n = SupportedServicesNames.getLength(); n--;)
if (SupportedServicesNames[n] == ServiceName)
@@ -733,7 +733,7 @@ sal_Bool SAL_CALL CFilePicker::supportsService(const rtl::OUString& ServiceName)
// XServiceInfo
// -------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
throw(uno::RuntimeException)
{
return FilePicker_getSupportedServiceNames();
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 8791661f63db..2d81c34cc44a 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -83,7 +83,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( )
@@ -96,42 +96,42 @@ 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 );
//------------------------------------------------------------------------------------
// XFilePicker2 functions
//------------------------------------------------------------------------------------
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles( )
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);
//------------------------------------------------------------------------------------
@@ -147,10 +147,10 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
throw(::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel )
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
@@ -196,13 +196,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);
//------------------------------------------------------------------------------------
@@ -211,7 +211,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( );
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 315bbbabc34d..53d1e51f2c73 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -35,7 +35,6 @@
// namespace directives
//-------------------------------------------------------------------
-using ::rtl::OUString;
//-------------------------------------------------------------------------------------
// ctor
@@ -218,13 +217,13 @@ sal_Bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEnt
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilterContainer::setCurrentFilter( const ::rtl::OUString& aName )
+void SAL_CALL CFilterContainer::setCurrentFilter( const OUString& aName )
{
m_sCurrentFilter = aName;
}
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL CFilterContainer::getCurrentFilter() const
+OUString SAL_CALL CFilterContainer::getCurrentFilter() const
{
return m_sCurrentFilter;
}
@@ -278,7 +277,7 @@ void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength
// e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
//-------------------------------------------------------------------
-rtl::OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
+OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
{
// calculate the required buffer size
sal_uInt32 reqBuffSize = _getTotalFilterLength( aFilterContainer );
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 306fb7192488..2ef15ac0b1ca 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -34,7 +34,7 @@ class CFilterContainer
public:
// defines a filter entry which is made of a name and a filter value
// e.g. 'Text *.txt'
- typedef std::pair< rtl::OUString, rtl::OUString > FILTER_ENTRY_T;
+ typedef std::pair< OUString, OUString > FILTER_ENTRY_T;
public:
explicit CFilterContainer( sal_Int32 initSize = 0 );
@@ -44,13 +44,13 @@ public:
// returns false if duplicates are not allowed and
// the filter is already in the container
sal_Bool SAL_CALL addFilter(
- const ::rtl::OUString& aName,
- const ::rtl::OUString& aFilter,
+ const OUString& aName,
+ const OUString& aFilter,
sal_Bool bAllowDuplicates = sal_False );
// delete the specified filter returns true on
// success and false if the filter was not found
- sal_Bool SAL_CALL delFilter( const ::rtl::OUString& aName );
+ sal_Bool SAL_CALL delFilter( const OUString& aName );
// the number of filter already added
sal_Int32 SAL_CALL numFilter( );
@@ -61,12 +61,12 @@ public:
// retrieve a filter from the container both methods
// return true on success and false if the specified
// filter was not found
- sal_Bool SAL_CALL getFilter( const ::rtl::OUString& aName, ::rtl::OUString& theFilter ) const;
- sal_Bool SAL_CALL getFilter( sal_Int32 aIndex, ::rtl::OUString& theFilter ) const;
+ sal_Bool SAL_CALL getFilter( const OUString& aName, OUString& theFilter ) const;
+ sal_Bool SAL_CALL getFilter( sal_Int32 aIndex, OUString& theFilter ) const;
// returns the position of the specified filter or -1
// if the filter was not found
- sal_Int32 SAL_CALL getFilterPos( const ::rtl::OUString& aName ) const;
+ sal_Int32 SAL_CALL getFilterPos( const OUString& aName ) const;
// starts enumerating the filter in the container
void SAL_CALL beginEnumFilter( );
@@ -75,10 +75,10 @@ public:
sal_Bool SAL_CALL getNextFilter( FILTER_ENTRY_T& nextFilterEntry );
// cache current filter
- void SAL_CALL setCurrentFilter( const ::rtl::OUString& aName );
+ void SAL_CALL setCurrentFilter( const OUString& aName );
// returns cached current filter
- ::rtl::OUString SAL_CALL getCurrentFilter() const;
+ OUString SAL_CALL getCurrentFilter() const;
protected:
typedef std::vector< FILTER_ENTRY_T > FILTER_VECTOR_T;
@@ -88,13 +88,13 @@ private:
CFilterContainer( const CFilterContainer& );
CFilterContainer& SAL_CALL operator=( const CFilterContainer& );
- sal_Int32 SAL_CALL getFilterTagPos( const ::rtl::OUString& aName ) const;
+ sal_Int32 SAL_CALL getFilterTagPos( const OUString& aName ) const;
private:
FILTER_VECTOR_T m_vFilters;
FILTER_VECTOR_T::const_iterator m_iter;
sal_Bool m_bIterInitialized;
- ::rtl::OUString m_sCurrentFilter;
+ OUString m_sCurrentFilter;
};
//----------------------------------------------------------------
@@ -102,7 +102,7 @@ private:
// the Win32 API requires, e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
//----------------------------------------------------------------
-rtl::OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer );
+OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer );
#endif
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 43eee4a49672..bc37fbad9666 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -402,7 +402,7 @@ sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow )
// occurred (the file in not there or not accessible etc.)
//---------------------------------------------------
-sal_Bool SAL_CALL CFilePreview::update( const rtl::OUString& aFileName )
+sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName )
{
OSL_PRECOND( IsWindow( m_hwnd ), "Preview window not initialized" );
@@ -484,7 +484,7 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC )
//
//---------------------------------------------------
-sal_Bool CFilePreview::loadFile( const rtl::OUString& aFileName )
+sal_Bool CFilePreview::loadFile( const OUString& aFileName )
{
HANDLE hFile = 0;
HGLOBAL hGlobal = 0;
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index d543bb07971d..f7d7177464da 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -140,7 +140,7 @@ public:
// preview of the given file will be shown
// returns true on success or false if an error
// occurred (the file in not there or not accessible etc.)
- virtual sal_Bool SAL_CALL update( const rtl::OUString& aFileName );
+ virtual sal_Bool SAL_CALL update( const OUString& aFileName );
protected:
// clients can create instances only through the static create method
@@ -162,7 +162,7 @@ protected:
protected:
virtual void SAL_CALL onPaint( HWND hWnd, HDC hDC );
- sal_Bool loadFile( const rtl::OUString& aFileName );
+ sal_Bool loadFile( const OUString& aFileName );
private:
CAutoOleInit m_autoOleInit;
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index ce5165594641..77a86181d5ae 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -72,11 +72,11 @@ namespace
const bool STARTUP_SUSPENDED = true;
const bool STARTUP_ALIVE = false;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
+ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = ::rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+ css::uno::Sequence< OUString > aRet(2);
+ aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -137,7 +137,7 @@ void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode)
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setTitle(const ::rtl::OUString& sTitle)
+void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -148,8 +148,8 @@ void SAL_CALL VistaFilePicker::setTitle(const ::rtl::OUString& sTitle)
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::appendFilter(const ::rtl::OUString& sTitle ,
- const ::rtl::OUString& sFilter)
+void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
+ const OUString& sFilter)
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
@@ -162,7 +162,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const ::rtl::OUString& sTitle ,
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setCurrentFilter(const ::rtl::OUString& sTitle)
+void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
@@ -174,7 +174,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const ::rtl::OUString& sTitle)
}
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getCurrentFilter()
+OUString SAL_CALL VistaFilePicker::getCurrentFilter()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -182,12 +182,12 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const ::rtl::OUString& sTitle)
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, ::rtl::OUString());
+ const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
return sTitle;
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::appendFilterGroup(const ::rtl::OUString& /*sGroupTitle*/,
+void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString& /*sGroupTitle*/,
const css::uno::Sequence< css::beans::StringPair >& rFilters )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
@@ -200,7 +200,7 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const ::rtl::OUString&
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setDefaultName(const ::rtl::OUString& sName )
+void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -211,13 +211,13 @@ void SAL_CALL VistaFilePicker::setDefaultName(const ::rtl::OUString& sName )
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirectory)
+void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
- const ::rtl::OUString aPackage("org.openoffice.Office.Common/");
- const ::rtl::OUString aRelPath("Path/Info");
- const ::rtl::OUString aKey("WorkPathChanged");
+ const OUString aPackage("org.openoffice.Office.Common/");
+ const OUString aRelPath("Path/Info");
+ const OUString aKey("WorkPathChanged");
css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey, ::comphelper::ConfigurationHelper::E_READONLY);
@@ -238,20 +238,20 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec
}
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
+OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
- const ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+ const OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
return sDirectory;
}
//-----------------------------------------------------------------------------------------
// @deprecated cant be supported any longer ... see IDL description for further details
-css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getFiles()
+css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -259,13 +259,13 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getFiles()
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const css::uno::Sequence< ::rtl::OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< ::rtl::OUString >());
+ const css::uno::Sequence< OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< OUString >());
m_lLastFiles = lFiles;
return lFiles;
}
//-----------------------------------------------------------------------------------------
-css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
+css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -273,7 +273,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSelectedFiles
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const css::uno::Sequence< ::rtl::OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< ::rtl::OUString >());
+ const css::uno::Sequence< OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< OUString >());
m_lLastFiles = lFiles;
return lFiles;
}
@@ -303,7 +303,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSelectedFiles
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::PROCESS_MESSAGES);
const ::sal_Bool bOK = rRequest->getArgumentOrDefault(PROP_DIALOG_SHOW_RESULT, (::sal_Bool)sal_False );
- m_lLastFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES , css::uno::Sequence< ::rtl::OUString >());
+ m_lLastFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES , css::uno::Sequence< OUString >());
::sal_Int16 nResult = css::ui::dialogs::ExecutableDialogResults::CANCEL;
if (bOK)
@@ -368,7 +368,7 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
//-----------------------------------------------------------------------------------------
void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,
- const ::rtl::OUString& sLabel )
+ const OUString& sLabel )
throw (css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -383,7 +383,7 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,
//
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
+OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
throw (css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -391,7 +391,7 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,
rRequest->setArgument(PROP_CONTROL_ID, nControlId);
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const ::rtl::OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, ::rtl::OUString());
+ const OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, OUString());
return sLabel;
}
@@ -476,7 +476,7 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
{
if (lArguments.getLength() < 1)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
static_cast< css::ui::dialogs::XFilePicker2* >( this ),
1);
@@ -603,20 +603,20 @@ void SAL_CALL VistaFilePicker::cancel()
// XServiceInfo
// -------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName()
+OUString SAL_CALL VistaFilePicker::getImplementationName()
throw(css::uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.fpicker.VistaFileDialog");
+ return OUString("com.sun.star.comp.fpicker.VistaFileDialog");
}
// -------------------------------------------------
// XServiceInfo
// -------------------------------------------------
-sal_Bool SAL_CALL VistaFilePicker::supportsService(const ::rtl::OUString& sServiceName)
+sal_Bool SAL_CALL VistaFilePicker::supportsService(const OUString& sServiceName)
throw(css::uno::RuntimeException )
{
- css::uno::Sequence< ::rtl::OUString > lSupportedServicesNames = VistaFilePicker_getSupportedServiceNames();
+ css::uno::Sequence< OUString > lSupportedServicesNames = VistaFilePicker_getSupportedServiceNames();
for (sal_Int32 n = lSupportedServicesNames.getLength(); n--;)
if (lSupportedServicesNames[n] == sServiceName)
@@ -629,7 +629,7 @@ sal_Bool SAL_CALL VistaFilePicker::supportsService(const ::rtl::OUString& sServi
// XServiceInfo
// -------------------------------------------------
-css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
throw(css::uno::RuntimeException)
{
return VistaFilePicker_getSupportedServiceNames();
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 0986838bb688..5728a7c81993 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -85,7 +85,7 @@ public:
// XExecutableDialog functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle )
+ virtual void SAL_CALL setTitle( const OUString& sTitle )
throw( css::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute( )
@@ -98,47 +98,47 @@ public:
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
throw( css::uno::RuntimeException );
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString& sName )
+ virtual void SAL_CALL setDefaultName( const OUString& sName )
throw( css::uno::RuntimeException );
- virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& sDirectory )
+ virtual void SAL_CALL setDisplayDirectory( const OUString& sDirectory )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getDisplayDirectory( )
+ virtual OUString SAL_CALL getDisplayDirectory( )
throw( css::uno::RuntimeException );
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( )
+ virtual css::uno::Sequence< OUString > SAL_CALL getFiles( )
throw( css::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilePicker2 functions
//------------------------------------------------------------------------------------
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles( )
+ virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles( )
throw( css::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilterManager functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL appendFilter( const ::rtl::OUString& sTitle ,
- const ::rtl::OUString& sFilter )
+ virtual void SAL_CALL appendFilter( const OUString& sTitle ,
+ const OUString& sFilter )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
- virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& sTitle )
+ virtual void SAL_CALL setCurrentFilter( const OUString& sTitle )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getCurrentFilter( )
+ virtual OUString SAL_CALL getCurrentFilter( )
throw( css::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilterGroupManager functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle,
+ virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle,
const css::uno::Sequence< css::beans::StringPair >& lFilters )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
@@ -161,10 +161,10 @@ public:
throw(css::uno::RuntimeException );
virtual void SAL_CALL setLabel( sal_Int16 nControlId,
- const ::rtl::OUString& sLabel )
+ const OUString& sLabel )
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
throw (css::uno::RuntimeException);
//------------------------------------------------
@@ -219,13 +219,13 @@ public:
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(css::uno::RuntimeException);
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(css::uno::RuntimeException);
/*
@@ -235,7 +235,7 @@ public:
void SAL_CALL fileSelectionChanged(const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL directoryChanged(const css::ui::dialogs::FilePickerEvent& aEvent );
- ::rtl::OUString SAL_CALL helpRequested(const css::ui::dialogs::FilePickerEvent& aEvent ) const;
+ OUString SAL_CALL helpRequested(const css::ui::dialogs::FilePickerEvent& aEvent ) const;
void SAL_CALL controlStateChanged(const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL dialogSizeChanged( );
@@ -260,7 +260,7 @@ public:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
//---------------------------------------------------------------------
- css::uno::Sequence< ::rtl::OUString > m_lLastFiles;
+ css::uno::Sequence< OUString > m_lLastFiles;
//---------------------------------------------------------------------
/** execute the COM dialog within a STA thread
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 772265059a36..3935ca298bb5 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -240,8 +240,8 @@ void VistaFilePickerEventHandler::stopListening()
}
}
-static const ::rtl::OUString PROP_CONTROL_ID("control_id");
-static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener");
+static const OUString PROP_CONTROL_ID("control_id");
+static const OUString PROP_PICKER_LISTENER("picker_listener");
//-----------------------------------------------------------------------------------------
class AsyncPickerEvents : public RequestHandler
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 95b12b3e805b..971955314bfc 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -63,7 +63,7 @@ namespace vista{
static const ::sal_Int16 INVALID_CONTROL_ID = -1;
static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
-typedef ::comphelper::SequenceAsVector< ::rtl::OUString > TStringList;
+typedef ::comphelper::SequenceAsVector< OUString > TStringList;
// Guids used for IFileDialog::SetClientGuid
static const GUID CLIENTID_FILEDIALOG_SIMPLE = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
@@ -77,10 +77,10 @@ static const GUID CLIENTID_FILEOPEN_PLAY = {0x32CFB147, 0xF5AE, 0x4F9
static const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
//-----------------------------------------------------------------------------
-::rtl::OUString lcl_getURLFromShellItem (IShellItem* pItem)
+OUString lcl_getURLFromShellItem (IShellItem* pItem)
{
LPOLESTR pStr = NULL;
- ::rtl::OUString sURL;
+ OUString sURL;
SIGDN eConversion = SIGDN_FILESYSPATH;
HRESULT hr = pItem->GetDisplayName ( eConversion, &pStr );
@@ -91,9 +91,9 @@ static const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46B
hr = pItem->GetDisplayName ( eConversion, &pStr );
if ( FAILED(hr) )
- return ::rtl::OUString();
+ return OUString();
- sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
+ sURL = OUString(reinterpret_cast<sal_Unicode*>(pStr));
}
else
{
@@ -313,8 +313,8 @@ void VistaFilePickerImpl::impl_sta_removeFilePickerListener(const RequestRef& rR
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)
{
- const ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, ::rtl::OUString());
- const ::rtl::OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, ::rtl::OUString());
+ const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
+ const OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -329,7 +329,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
rRequest->getArgumentOrDefault(PROP_FILTER_GROUP, css::uno::Sequence< css::beans::StringPair >());
// SYNCHRONIZED->
- ::rtl::OUString aEmpty;
+ OUString aEmpty;
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( m_lFilters.numFilter() > 0 && aFilterGroup.getLength() > 0 )
@@ -347,7 +347,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_setCurrentFilter(const RequestRef& rRequest)
{
- const ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, ::rtl::OUString());
+ const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -370,7 +370,7 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
- ::rtl::OUString sTitle;
+ OUString sTitle;
::sal_Int32 nRealIndex = (nIndex-1); // COM dialog base on 1 ... filter container on 0 .-)
if (
(nRealIndex >= 0 ) &&
@@ -479,7 +479,7 @@ static const ::sal_Int32 GROUP_CHECKBOXES = 4;
//-------------------------------------------------------------------------------
static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogCustomize iCustom, sal_uInt16 nControlId)
{
- ::rtl::OUString aLabel = rResourceProvider.getResString(nControlId);
+ OUString aLabel = rResourceProvider.getResString(nControlId);
aLabel = SOfficeToWindowsLabel(aLabel);
iCustom->SetControlLabel(nControlId, reinterpret_cast<LPCWSTR>(aLabel.getStr()) );
}
@@ -639,7 +639,7 @@ void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequ
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
{
- ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_TITLE, ::rtl::OUString());
+ OUString sTitle = rRequest->getArgumentOrDefault(PROP_TITLE, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -653,7 +653,7 @@ void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
{
- ::rtl::OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+ OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -667,7 +667,7 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)
{
- ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString());
+ OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString());
if( !m_bInExecute)
{
@@ -704,7 +704,7 @@ void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)
HRESULT hResult = iDialog->GetFolder( &pFolder );
if ( FAILED(hResult) )
return;
- ::rtl::OUString sFolder = lcl_getURLFromShellItem ( pFolder );
+ OUString sFolder = lcl_getURLFromShellItem ( pFolder );
if( sFolder.getLength())
rRequest->setArgument( PROP_DIRECTORY, sFolder );
}
@@ -712,7 +712,7 @@ void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)
{
- ::rtl::OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+ OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
TFileDialog iDialog = impl_getBaseDialogInterface();
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -741,7 +741,7 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
::osl::ResettableMutexGuard aLock(m_aMutex);
::std::vector< COMDLG_FILTERSPEC > lFilters = lcl_buildFilterList(m_lFilters);
- ::rtl::OUString sCurrentFilter = m_lFilters.getCurrentFilter();
+ OUString sCurrentFilter = m_lFilters.getCurrentFilter();
sal_Int32 nCurrentFilter = m_lFilters.getFilterPos(sCurrentFilter);
TFileDialog iDialog = impl_getBaseDialogInterface();
TFileDialogCustomize iCustomize = impl_getCustomizeInterface();
@@ -818,7 +818,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
TStringList lFiles;
if (iItem.is())
{
- const ::rtl::OUString sURL = lcl_getURLFromShellItem(iItem);
+ const OUString sURL = lcl_getURLFromShellItem(iItem);
if (sURL.getLength() > 0)
lFiles.push_back(sURL);
}
@@ -834,7 +834,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
hResult = iItems->GetItemAt(i, &iItem);
if ( SUCCEEDED(hResult) )
{
- const ::rtl::OUString sURL = lcl_getURLFromShellItem(iItem);
+ const OUString sURL = lcl_getURLFromShellItem(iItem);
if (sURL.getLength() > 0)
lFiles.push_back(sURL);
}
@@ -882,10 +882,10 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
{
if (m_sFilename.getLength())
{
- ::rtl::OUString aFileURL(m_sDirectory);
+ OUString aFileURL(m_sDirectory);
sal_Int32 nIndex = aFileURL.lastIndexOf('/');
if (nIndex != aFileURL.getLength()-1)
- aFileURL += ::rtl::OUString("/");
+ aFileURL += OUString("/");
aFileURL += m_sFilename;
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -909,7 +909,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
}
// Check existence of file. Set folder only for this special case
- ::rtl::OUString aSystemPath;
+ OUString aSystemPath;
osl_getSystemPathFromFileURL( aFileURL.pData, &aSystemPath.pData );
WIN32_FIND_DATA aFindFileData;
@@ -1062,11 +1062,11 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)
case css::ui::dialogs::ControlActions::ADD_ITEMS :
{
- css::uno::Sequence< ::rtl::OUString > lItems;
+ css::uno::Sequence< OUString > lItems;
aValue >>= lItems;
for (::sal_Int32 i=0; i<lItems.getLength(); ++i)
{
- const ::rtl::OUString& sItem = lItems[i];
+ const OUString& sItem = lItems[i];
hResult = iCustom->AddControlItem(nId, i, reinterpret_cast<LPCTSTR>(sItem.getStr()));
}
}
@@ -1130,7 +1130,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)
{
::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );
- ::rtl::OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, ::rtl::OUString() );
+ OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, OUString() );
// dont check for right values here ...
// most parameters are optional !
@@ -1168,12 +1168,12 @@ void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)
iCustom->SetControlState(nId, eState);
}
//-------------------------------------------------------------------------------
-void VistaFilePickerImpl::impl_SetDefaultExtension( const rtl::OUString& currentFilter )
+void VistaFilePickerImpl::impl_SetDefaultExtension( const OUString& currentFilter )
{
TFileDialog iDialog = impl_getBaseDialogInterface();
if (currentFilter.getLength())
{
- rtl::OUString FilterExt;
+ OUString FilterExt;
m_lFilters.getFilter(currentFilter, FilterExt);
sal_Int32 posOfPoint = FilterExt.indexOf(L'.');
@@ -1183,7 +1183,7 @@ void VistaFilePickerImpl::impl_SetDefaultExtension( const rtl::OUString& current
if (posOfSemiColon < 0)
posOfSemiColon = FilterExt.getLength() - 1;
- FilterExt = rtl::OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
+ FilterExt = OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
iDialog->SetDefaultExtension ( reinterpret_cast<LPCTSTR>(FilterExt.getStr()) );
}
}
@@ -1216,8 +1216,8 @@ void VistaFilePickerImpl::onAutoExtensionChanged (bool bChecked)
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
- const ::rtl::OUString sFilter = m_lFilters.getCurrentFilter ();
- ::rtl::OUString sExt ;
+ const OUString sFilter = m_lFilters.getCurrentFilter ();
+ OUString sExt ;
if ( !m_lFilters.getFilter (sFilter, sExt))
return;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 4279ab9b54e8..467922818e1c 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -74,26 +74,26 @@ static const ::sal_Int32 FEATURE_PLAY = 256;
static const ::sal_Int32 FEATURE_READONLY = 512;
static const ::sal_Int32 FEATURE_VERSION = 1024;
-static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert]
-static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
-static const ::rtl::OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!)
-static const ::rtl::OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString PROP_TITLE("title" ); // [OUString]
-static const ::rtl::OUString PROP_FILENAME("filename" ); // [OUString]
-static const ::rtl::OUString PROP_DIRECTORY("directory" ); // [OUString]
-static const ::rtl::OUString PROP_FEATURES("features" ); // [sal_Int32]
-static const ::rtl::OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
-static const ::rtl::OUString PROP_FILTER_TITLE("filter_title" ); // [OUString]
-static const ::rtl::OUString PROP_FILTER_VALUE("filter_value" ); // [OUString]
-static const ::rtl::OUString PROP_FORCE("force" ); // [sal_Bool]
-static const ::rtl::OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters
-
-static const ::rtl::OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_VALUE("control_value" ); // [Any]
-static const ::rtl::OUString PROP_CONTROL_LABEL("control_label" ); // [OUString]
-static const ::rtl::OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString STRING_SEPARATOR("------------------------------------------" );
+static const OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert]
+static const OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
+static const OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!)
+static const OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
+static const OUString PROP_TITLE("title" ); // [OUString]
+static const OUString PROP_FILENAME("filename" ); // [OUString]
+static const OUString PROP_DIRECTORY("directory" ); // [OUString]
+static const OUString PROP_FEATURES("features" ); // [sal_Int32]
+static const OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
+static const OUString PROP_FILTER_TITLE("filter_title" ); // [OUString]
+static const OUString PROP_FILTER_VALUE("filter_value" ); // [OUString]
+static const OUString PROP_FORCE("force" ); // [sal_Bool]
+static const OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters
+
+static const OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16]
+static const OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16]
+static const OUString PROP_CONTROL_VALUE("control_value" ); // [Any]
+static const OUString PROP_CONTROL_LABEL("control_label" ); // [OUString]
+static const OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF
+static const OUString STRING_SEPARATOR("------------------------------------------" );
//-----------------------------------------------------------------------------
/** native implementation of the file picker on Vista and upcoming windows versions.
@@ -282,7 +282,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
/// fill filter list of internal used dialog.
void impl_sta_setFiltersOnDialog();
- void impl_SetDefaultExtension( const rtl::OUString& currentFilter );
+ void impl_SetDefaultExtension( const OUString& currentFilter );
private:
@@ -309,7 +309,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
* Because the outside provided UNO API decouple showing the dialog
* and asking for results .-)
*/
- css::uno::Sequence< ::rtl::OUString > m_lLastFiles;
+ css::uno::Sequence< OUString > m_lLastFiles;
//---------------------------------------------------------------------
/** help us to handle dialog events and provide them to interested office
@@ -327,10 +327,10 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
HWND m_hParentWindow;
//
- ::rtl::OUString m_sDirectory;
+ OUString m_sDirectory;
//
- ::rtl::OUString m_sFilename;
+ OUString m_sFilename;
// Resource provider
CResourceProvider m_ResProvider;
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index d55a4eae29e2..f67291698e1a 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -109,16 +109,16 @@ CWinFileOpenImpl::~CWinFileOpenImpl()
// we expect the directory in URL format
//------------------------------------------------------------------------
-void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
+void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
throw( IllegalArgumentException, uno::RuntimeException )
{
- rtl::OUString aSysDirectory;
+ OUString aSysDirectory;
if( aDirectory.getLength() > 0)
{
if ( ::osl::FileBase::E_None !=
::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory))
throw IllegalArgumentException(
- rtl::OUString("Invalid directory"),
+ OUString("Invalid directory"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// we ensure that there is a trailing '/' at the end of
@@ -139,7 +139,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
// we return the directory in URL format
//------------------------------------------------------------------------
-rtl::OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
+OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
{
return m_FilePickerState->getDisplayDirectory(this);
}
@@ -148,7 +148,7 @@ rtl::OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeExceptio
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::setDefaultName(const rtl::OUString& aName)
+void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
throw( IllegalArgumentException, uno::RuntimeException )
{
// we don't set the default name directly
@@ -169,7 +169,7 @@ void SAL_CALL CWinFileOpenImpl::setDefaultName(const rtl::OUString& aName)
// the first entry is the path url, all other entries are file names
//-----------------------------------------------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL CWinFileOpenImpl::getFiles()
+uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()
throw(uno::RuntimeException)
{
return m_FilePickerState->getFiles(this);
@@ -189,7 +189,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)
rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
else
throw uno::RuntimeException(
- rtl::OUString("Error executing dialog"),
+ OUString("Error executing dialog"),
static_cast<XFilePicker2*>(m_FilePicker));
return rc;
@@ -201,14 +201,14 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)
// empty
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const rtl::OUString& aFilter)
+void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUString& aFilter)
throw(IllegalArgumentException, uno::RuntimeException)
{
sal_Bool bRet = m_filterContainer->addFilter(aTitle, aFilter);
if (!bRet)
throw IllegalArgumentException(
- rtl::OUString("filter already exists"),
+ OUString("filter already exists"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// #95345# see MSDN OPENFILENAME
@@ -226,14 +226,14 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const
// sets a current filter
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
+void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
throw( IllegalArgumentException, uno::RuntimeException)
{
sal_Int32 filterPos = m_filterContainer->getFilterPos(aTitle);
if (filterPos < 0)
throw IllegalArgumentException(
- rtl::OUString("filter doesn't exist"),
+ OUString("filter doesn't exist"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// filter index of the base class starts with 1
@@ -244,11 +244,11 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
// returns the currently selected filter
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
{
sal_uInt32 nIndex = getSelectedFilterIndex();
- rtl::OUString currentFilter;
+ OUString currentFilter;
if (nIndex > 0)
{
// filter index of the base class starts with 1
@@ -273,7 +273,7 @@ inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator()
// XFilterGroupManager
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
+void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
throw (IllegalArgumentException, uno::RuntimeException)
{
(void) sGroupTitle; // avoid warning
@@ -350,7 +350,7 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const rtl::OUString& aLabel )
+void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel )
throw (uno::RuntimeException)
{
OSL_ASSERT(m_FilePickerState);
@@ -362,14 +362,14 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const rtl::OUStr
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
+OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
throw (uno::RuntimeException)
{
OSL_ASSERT(m_FilePickerState);
if ( !filterControlCommand( aControlId ))
return m_FilePickerState->getLabel(aControlId);
else
- return rtl::OUString();
+ return OUString();
}
//-----------------------------------------------------------------------------------------
@@ -570,7 +570,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
//-----------------------------------------
sal_Int16 aCtrlId = sal::static_int_cast< sal_Int16 >(GetDlgCtrlID(hWnd));
- rtl::OUString aLabel = m_ResProvider.getResString(aCtrlId);
+ OUString aLabel = m_ResProvider.getResString(aCtrlId);
if (aLabel.getLength())
setLabel(aCtrlId, aLabel);
}
@@ -872,7 +872,7 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)
FilePickerEvent evt;
evt.ElementId = sal::static_int_cast< sal_Int16 >(lphi->iCtrlId);
- rtl::OUString aPopupHelpText = m_FilePicker->helpRequested(evt);
+ OUString aPopupHelpText = m_FilePicker->helpRequested(evt);
if (aPopupHelpText.getLength())
{
@@ -941,7 +941,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
{
sal_uInt32 nIndex = getSelectedFilterIndex();
- rtl::OUString currentFilter;
+ OUString currentFilter;
if (nIndex > 0)
{
// filter index of the base class starts with 1
@@ -949,7 +949,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
if (currentFilter.getLength())
{
- rtl::OUString FilterExt;
+ OUString FilterExt;
m_filterContainer->getFilter(currentFilter, FilterExt);
sal_Int32 posOfPoint = FilterExt.indexOf(L'.');
@@ -959,7 +959,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
if (posOfSemiColon < 0)
posOfSemiColon = FilterExt.getLength() - 1;
- FilterExt = rtl::OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
+ FilterExt = OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
SendMessage(m_hwndFileOpenDlg, CDM_SETDEFEXT, 0, reinterpret_cast<LPARAM>(FilterExt.getStr()));
}
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index d74b3eeead3f..b1be8a1dfbfa 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -65,35 +65,35 @@ public:
// XFilePicker
//-----------------------------------------------------------------------------------------
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName )
+ virtual void SAL_CALL setDefaultName( const OUString& aName )
throw( ::com::sun::star::lang::IllegalArgumentException, ::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 );
- 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( ) throw ( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getDisplayDirectory( ) throw ( ::com::sun::star::uno::RuntimeException );
//-----------------------------------------------------------------------------------------
// XFilterManager
//-----------------------------------------------------------------------------------------
- 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
//-----------------------------------------------------------------------------------------
- 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);
//-----------------------------------------------------------------------------------------
@@ -109,10 +109,10 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel )
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
throw ( ::com::sun::star::uno::RuntimeException);
//------------------------------------------------
@@ -203,7 +203,7 @@ private:
std::auto_ptr<CCustomControl> m_CustomControls;
CFilePicker* m_FilePicker;
WNDPROC m_pfnOldDlgProc;
- rtl::OUString m_defaultName;
+ OUString m_defaultName;
sal_Bool m_bInitialSelChanged;
CHelpPopupWindow m_HelpPopupWindow;
CFilePickerState* m_FilePickerState;
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index b20b65d020cc..1d7450c5e5ef 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -79,12 +79,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&
{
if ( m_rBroadcastHelper.bDisposed )
throw lang::DisposedException(
- ::rtl::OUString( "FilePicker is already disposed" ),
+ OUString( "FilePicker is already disposed" ),
uno::Reference< uno::XInterface >() );
if ( m_rBroadcastHelper.bInDispose )
throw lang::DisposedException(
- ::rtl::OUString( "FilePicker will be disposed now." ),
+ OUString( "FilePicker will be disposed now." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.addInterface( aType, xListener );
@@ -99,7 +99,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&
{
if ( m_rBroadcastHelper.bDisposed )
throw lang::DisposedException(
- ::rtl::OUString( "FilePicker is already disposed." ),
+ OUString( "FilePicker is already disposed." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 265259dbece1..6205b7ca8ae9 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -80,7 +80,7 @@ class Request
//---------------------------------------------------------------------
template< class TArgumentType >
- void setArgument(const ::rtl::OUString& sName ,
+ void setArgument(const OUString& sName ,
const TArgumentType& aValue)
{
m_lArguments[sName] <<= aValue;
@@ -88,7 +88,7 @@ class Request
//---------------------------------------------------------------------
template< class TArgumentType >
- TArgumentType getArgumentOrDefault(const ::rtl::OUString& sName ,
+ TArgumentType getArgumentOrDefault(const OUString& sName ,
const TArgumentType& aDefault)
{
return m_lArguments.getUnpackedValueOrDefault(sName, aDefault);
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index e9e5bc289f6a..65345b045b53 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -34,7 +34,6 @@
// namespace directives
//------------------------------------------------------------
-using rtl::OUString;
namespace // private
{
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index e68093d23723..33518470c5b4 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -183,7 +183,7 @@ sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const
CLabelControlCommand::CLabelControlCommand(
sal_Int16 aControlId,
- const rtl::OUString& aLabel ) :
+ const OUString& aLabel ) :
CControlCommand( aControlId ),
m_aLabel( aLabel )
{
@@ -239,7 +239,7 @@ CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCom
//
//---------------------------------------------
-rtl::OUString SAL_CALL CLabelControlCommand::getLabel( ) const
+OUString SAL_CALL CLabelControlCommand::getLabel( ) const
{
return m_aLabel;
}
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index 2c7ae2fd2363..01063ff901a8 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -99,16 +99,16 @@ class CLabelControlCommand : public CControlCommand
public:
CLabelControlCommand(
sal_Int16 aControlId,
- const rtl::OUString& aLabel );
+ const OUString& aLabel );
virtual void SAL_CALL exec( CFilePickerState* aFilePickerState );
virtual CControlCommandResult* SAL_CALL handleRequest( CControlCommandRequest* aRequest );
- rtl::OUString SAL_CALL getLabel( ) const;
+ OUString SAL_CALL getLabel( ) const;
private:
- rtl::OUString m_aLabel;
+ OUString m_aLabel;
};
//---------------------------------------------
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 983dd784cee3..2853ca9d73ba 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -78,19 +78,19 @@ private:
class CLabelCommandResult : public CControlCommandResult
{
public:
- CLabelCommandResult( sal_Bool bResult, const rtl::OUString& aLabel ) :
+ CLabelCommandResult( sal_Bool bResult, const OUString& aLabel ) :
CControlCommandResult( bResult ),
m_aLabel( aLabel )
{
}
- rtl::OUString SAL_CALL getLabel( ) const
+ OUString SAL_CALL getLabel( ) const
{
return m_aLabel;
}
private:
- rtl::OUString m_aLabel;
+ OUString m_aLabel;
};
#endif
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index e019fd0aac42..a760f112aeb4 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -36,7 +36,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
using ::com::sun::star::lang::IllegalArgumentException;
-using rtl::OUString;
//------------------------------------------------------------------------
//
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 991f15a1f51b..f178de583973 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -38,7 +38,6 @@
//
//---------------------------------------------
-using rtl::OUString;
using com::sun::star::uno::Any;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -152,7 +151,7 @@ void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, s
//
//---------------------------------------------
-void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel )
+void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel )
{
CLabelControlCommand* label_command = new CLabelControlCommand(
aControlId, aLabel );
@@ -207,9 +206,9 @@ OUString MatchFixBrokenPath(const OUString& path)
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
-static ::rtl::OUString trimTrailingSpaces(const ::rtl::OUString& rString)
+static OUString trimTrailingSpaces(const OUString& rString)
{
- rtl::OUString aResult(rString);
+ OUString aResult(rString);
sal_Int32 nIndex = rString.lastIndexOf(' ');
if (nIndex == rString.getLength()-1)
@@ -219,7 +218,7 @@ static ::rtl::OUString trimTrailingSpaces(const ::rtl::OUString& rString)
if (nIndex >= 0)
aResult = rString.copy(0,nIndex+1);
else
- aResult = ::rtl::OUString();
+ aResult = OUString();
}
return aResult;
}
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 5a250e2db4e0..414dd3360792 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -56,13 +56,13 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable ) = 0;
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel ) = 0;
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel ) = 0;
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId ) = 0;
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) = 0;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog ) = 0;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog ) = 0;
- virtual rtl::OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) = 0;
+ virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) = 0;
};
//---------------------------------------------
@@ -82,13 +82,13 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel );
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel );
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId );
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
+ virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
void SAL_CALL reset( );
@@ -116,13 +116,13 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel );
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel );
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId );
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
+ virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
void SAL_CALL initFilePickerControls( CControlCommand* firstControlCommand );
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index c0f70a79ba23..732d3e01b920 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -25,7 +25,6 @@
//
//------------------------------------------------------------------------
-using rtl::OUString;
using osl::Mutex;
//------------------------------------------------------------------------
@@ -110,7 +109,7 @@ CHelpPopupWindow::~CHelpPopupWindow( )
//
//---------------------------------------------------
-void SAL_CALL CHelpPopupWindow::setText( const rtl::OUString& aHelpText )
+void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText )
{
m_HelpText = aHelpText;
}
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index 3e565c2f59cc..de52b916245f 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -74,7 +74,7 @@ public:
The client may set the text the window is showing
on next activation.
*/
- void SAL_CALL setText( const rtl::OUString& aHelpText );
+ void SAL_CALL setText( const OUString& aHelpText );
/*
Shows the window with the text that was last set.
@@ -111,7 +111,7 @@ private:
HWND m_hwndParent;
HINSTANCE m_hInstance;
sal_Bool m_bWndClassRegistered;
- ::rtl::OUString m_HelpText;
+ OUString m_HelpText;
HBITMAP m_hBitmapShadow;
HBRUSH m_hBrushShadow;
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 0488b4ed10a1..e20b7b0c9e6f 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -24,7 +24,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
//-------------------------------
//
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index d7dcd14d2e63..06c83efefd98 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -22,9 +22,9 @@
#include <rtl/ustring.hxx>
-const ::rtl::OUString BACKSLASH( "\\" );
-const ::rtl::OUString FILTER_SEPARATOR( "------------------------------------------" );
-const ::rtl::OUString ALL_FILES_WILDCARD( "*.*" );
+const OUString BACKSLASH( "\\" );
+const OUString FILTER_SEPARATOR( "------------------------------------------" );
+const OUString ALL_FILES_WILDCARD( "*.*" );
const ::sal_Bool ALLOW_DUPLICATES = sal_True;
#endif
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 2b889e39a552..2ea545867b24 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -35,7 +35,6 @@ using com::sun::star::lang::XMultiServiceFactory;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::lang::DisposedException;
using com::sun::star::lang::IllegalArgumentException;
-using rtl::OUString;
using osl::MutexGuard;
using namespace cppu;
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 3854de3aeb04..aa36dc6995ca 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -48,7 +48,7 @@ public:
// XExecutableDialog
//------------------------------------------------------------------------------------
- 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( )
@@ -58,29 +58,29 @@ public:
// XFolderPicker functions
//------------------------------------------------------------------------------------
- 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 rtl::OUString SAL_CALL getDirectory( )
+ virtual OUString SAL_CALL getDirectory( )
throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDescription( const rtl::OUString& aDescription )
+ virtual void SAL_CALL setDescription( const OUString& aDescription )
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/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 71fb53653eea..10705cd4b795 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -27,7 +27,6 @@
#include <systools/win32/comtools.hxx>
-using rtl::OUString;
using osl::Condition;
const sal_uInt32 MSG_BROWSEFORFOLDER = WM_USER + 1;
@@ -341,7 +340,7 @@ OUString SAL_CALL CMtaFolderPicker::getDirectory( )
//
//--------------------------------------------------------------------
-void SAL_CALL CMtaFolderPicker::setDescription( const rtl::OUString& aDescription )
+void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription )
{
m_Description = aDescription;
}
@@ -429,7 +428,7 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
//
//--------------------------------------------------------------------
-LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const rtl::OUString& aDirectory )
+LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory )
{
// parameter checking
if ( !aDirectory.getLength( ) )
@@ -491,7 +490,7 @@ void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable )
//
//--------------------------------------------------------------------
-void SAL_CALL CMtaFolderPicker::setSelection( const rtl::OUString& aDirectory )
+void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory )
{
OSL_ASSERT( IsWindow( m_hwnd ) );
@@ -506,7 +505,7 @@ void SAL_CALL CMtaFolderPicker::setSelection( const rtl::OUString& aDirectory )
//
//--------------------------------------------------------------------
-void SAL_CALL CMtaFolderPicker::setStatusText( const rtl::OUString& aStatusText )
+void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText )
{
OSL_ASSERT( IsWindow( m_hwnd ) );
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index aebb156db50f..6824d41420a5 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -98,14 +98,14 @@ public:
// shell functions
sal_Bool SAL_CALL browseForFolder( );
- virtual void SAL_CALL setDisplayDirectory( const rtl::OUString& aDirectory );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( );
- virtual rtl::OUString SAL_CALL getDirectory( );
+ virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory );
+ virtual OUString SAL_CALL getDisplayDirectory( );
+ virtual OUString SAL_CALL getDirectory( );
- virtual void SAL_CALL setDescription( const rtl::OUString& aDescription );
+ virtual void SAL_CALL setDescription( const OUString& aDescription );
- virtual void SAL_CALL setTitle( const rtl::OUString& aTitle );
- rtl::OUString SAL_CALL getTitle( );
+ virtual void SAL_CALL setTitle( const OUString& aTitle );
+ OUString SAL_CALL getTitle( );
//-----------------------------------------------------
// XCancellable
@@ -115,18 +115,18 @@ public:
protected:
void SAL_CALL enableOk( sal_Bool bEnable );
- void SAL_CALL setSelection( const rtl::OUString& aDirectory );
- void SAL_CALL setStatusText( const rtl::OUString& aStatusText );
+ void SAL_CALL setSelection( const OUString& aDirectory );
+ void SAL_CALL setStatusText( const OUString& aStatusText );
virtual void SAL_CALL onInitialized( );
- virtual void SAL_CALL onSelChanged( const rtl::OUString& aNewPath ) = 0;
+ virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) = 0;
private:
sal_uInt32 onValidateFailed();
// helper functions
- LPITEMIDLIST SAL_CALL getItemIdListFromPath( const rtl::OUString& aDirectory );
- rtl::OUString SAL_CALL getPathFromItemIdList( LPCITEMIDLIST lpItemIdList );
+ LPITEMIDLIST SAL_CALL getItemIdListFromPath( const OUString& aDirectory );
+ OUString SAL_CALL getPathFromItemIdList( LPCITEMIDLIST lpItemIdList );
void SAL_CALL releaseItemIdList( LPITEMIDLIST lpItemIdList );
unsigned int run( );
@@ -159,10 +159,10 @@ private:
unsigned m_uStaThreadId;
HANDLE m_hEvtThrdReady;
HWND m_hwndStaRequestWnd;
- rtl::OUString m_dialogTitle;
- rtl::OUString m_Description;
- rtl::OUString m_displayDir;
- rtl::OUString m_SelectedDir;
+ OUString m_dialogTitle;
+ OUString m_Description;
+ OUString m_displayDir;
+ OUString m_SelectedDir;
BROWSEINFOW m_bi;
CAutoPathBuff m_pathBuff;
HINSTANCE m_hInstance;
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index add1ee46da65..9cf282aa48d7 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -33,7 +33,6 @@
using com::sun::star::uno::RuntimeException;
using com::sun::star::lang::IllegalArgumentException;
using com::sun::star::lang::EventObject;
-using rtl::OUString;
using namespace com::sun::star::ui::dialogs;
using osl::FileBase;
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 77abfa2e2efd..1c87dfc59325 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -46,17 +46,17 @@ public:
// XFolderPicker
//-----------------------------------------------------
- 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 rtl::OUString SAL_CALL getDirectory( )
+ virtual OUString SAL_CALL getDirectory( )
throw( com::sun::star::uno::RuntimeException );
protected:
- virtual void SAL_CALL onSelChanged( const rtl::OUString& aNewPath );
+ virtual void SAL_CALL onSelChanged( const OUString& aNewPath );
private:
CFolderPicker* m_pFolderPicker;
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index 43e4bceba3e1..17162e3c479b 100644
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
@@ -32,7 +32,6 @@
// namespace directives
//------------------------------------------------------------------------
-using rtl::OUString;
//------------------------------------------------------------------------
//
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 403ab1cdeffc..5abdcb459e68 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -27,8 +27,6 @@
// namespace directives
//------------------------------------------------------------
-using rtl::OUString;
-using rtl::OUStringBuffer;
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -39,9 +37,9 @@ using ::com::sun::star::uno::Sequence;
//
//------------------------------------------------------------
-const rtl::OUString TILDE( "~" );
+const OUString TILDE( "~" );
const sal_Unicode TILDE_SIGN = L'~';
-const rtl::OUString AMPERSAND( "&" );
+const OUString AMPERSAND( "&" );
const sal_Unicode AMPERSAND_SIGN = L'&';
//------------------------------------------------------------
@@ -447,7 +445,7 @@ void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar,
// '&' -> '&&'
//------------------------------------------------------------
-OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
+OUString SOfficeToWindowsLabel( const OUString& aSOLabel )
{
OUString aWinLabel = aSOLabel;
@@ -459,7 +457,7 @@ OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
// doubled in length, maybe some waste
// of memory but how long is a label
// normaly(?)
- rtl::OUStringBuffer aBuffer( nStrLen * 2 );
+ OUStringBuffer aBuffer( nStrLen * 2 );
Replace( aWinLabel, TILDE_SIGN, AMPERSAND_SIGN, aBuffer );
@@ -478,7 +476,7 @@ OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
// '~' -> '~~'
//------------------------------------------------------------
-OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel )
+OUString WindowsToSOfficeLabel( const OUString& aWinLabel )
{
OUString aSOLabel = aWinLabel;
@@ -490,7 +488,7 @@ OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel )
// doubled in length, maybe some waste
// of memory but how long is a label
// normaly(?)
- rtl::OUStringBuffer aBuffer( nStrLen * 2 );
+ OUStringBuffer aBuffer( nStrLen * 2 );
Replace( aSOLabel, AMPERSAND_SIGN, TILDE_SIGN, aBuffer );
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 9c6a69ddab80..52ed28dd15ee 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -82,7 +82,7 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr );
// '~' -> '&'
// '~~' -> '~'
// '&' -> '&&'
-rtl::OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel );
+OUString SOfficeToWindowsLabel( const OUString& aSOLabel );
// converts a windows label to a soffice label
// the following rules for character replacements
@@ -90,7 +90,7 @@ rtl::OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel );
// '&' -> '~'
// '&&' -> '&'
// '~' -> '~~'
-rtl::OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel );
+OUString WindowsToSOfficeLabel( const OUString& aWinLabel );
#endif
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 4e4cc9e0a9e7..3cd22e602f37 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -32,7 +32,6 @@
// namespace directives
//------------------------------------------------------------
-using rtl::OUString;
using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 852b225bf30c..d02164faf37e 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -33,7 +33,7 @@ public:
CResourceProvider( );
~CResourceProvider( );
- rtl::OUString getResString( sal_Int16 aId );
+ OUString getResString( sal_Int16 aId );
private:
CResourceProvider_Impl* m_pImpl;
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 2e83bd4c04c2..19723a1366d9 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -70,7 +70,7 @@ String aEmptyStr;
SAL_IMPLEMENT_MAIN()
{
Reference< XMultiServiceFactory > xMS;
- xMS = cppu::createRegistryServiceFactory( rtl::OUString( "applicat.rdb" ), sal_True );
+ xMS = cppu::createRegistryServiceFactory( OUString( "applicat.rdb" ), sal_True );
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMSch;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext;
@@ -114,7 +114,7 @@ private:
void Main()
{
MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- aMainWin.SetText(rtl::OUString("VCL - Workbench"));
+ aMainWin.SetText(OUString("VCL - Workbench"));
aMainWin.Show();
Application::Execute();