summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/generic/fpicker.cxx20
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx16
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx2
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx8
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.cxx6
-rw-r--r--fpicker/source/win32/filepicker/previewbase.cxx4
-rw-r--r--fpicker/source/win32/filepicker/workbench/Test_fps.cxx4
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx2
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.cxx16
-rw-r--r--fpicker/test/svdem.cxx2
12 files changed, 44 insertions, 44 deletions
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 359ef6f7f2f4..d4c6769015aa 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -93,7 +93,7 @@ static Reference< css::uno::XInterface > FilePicker_createInstance (
{
// Always fall back to OfficeFilePicker.
xResult = xFactory->createInstanceWithContext (
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFilePicker")),
+ OUString( "com.sun.star.ui.dialogs.OfficeFilePicker"),
rxContext);
}
if (xResult.is())
@@ -106,14 +106,14 @@ static Reference< css::uno::XInterface > FilePicker_createInstance (
static OUString FilePicker_getImplementationName()
{
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.fpicker.FilePicker"));
+ return OUString("com.sun.star.comp.fpicker.FilePicker");
}
static Sequence< OUString > FilePicker_getSupportedServiceNames()
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker"));
+ OUString( "com.sun.star.ui.dialogs.FilePicker");
return aServiceNames;
}
@@ -125,13 +125,13 @@ static OUString FolderPicker_getSystemPickerServiceName()
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
#ifdef UNX
if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.TDEFolderPicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.KDEFolderPicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.AquaFolderPicker");
#endif
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.SystemFolderPicker");
}
static Reference< css::uno::XInterface > FolderPicker_createInstance (
@@ -164,7 +164,7 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance (
{
// Always fall back to OfficeFolderPicker.
xResult = xFactory->createInstanceWithContext (
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFolderPicker")),
+ OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker"),
rxContext);
}
if (xResult.is())
@@ -177,14 +177,14 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance (
static OUString FolderPicker_getImplementationName()
{
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.fpicker.FolderPicker"));
+ return OUString("com.sun.star.comp.fpicker.FolderPicker");
}
static Sequence< OUString > FolderPicker_getSupportedServiceNames()
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker"));
+ OUString( "com.sun.star.ui.dialogs.FolderPicker");
return aServiceNames;
}
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index acc3fc677949..de1f84a156ed 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -56,8 +56,8 @@ namespace
uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<rtl::OUString> aRet(2);
- aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
- aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+ aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = rtl::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(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
+ rtl::OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
@@ -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(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
+ rtl::OUString("Error executing dialog"),
static_cast<XFilePicker2*>(this));
}
@@ -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(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("invalid argument type")),
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
+ rtl::OUString( "Unknown template" ),
static_cast< XFilePicker2* >( this ),
1 );
}
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 40c2fa37d548..bc02fa0109c6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -75,8 +75,8 @@ namespace
css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+ aRet[0] = ::rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = ::rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -606,7 +606,7 @@ void SAL_CALL VistaFilePicker::cancel()
::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName()
throw(css::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog"));
+ return ::rtl::OUString("com.sun.star.comp.fpicker.VistaFileDialog");
}
// -------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 75a3f797f4de..95b12b3e805b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -885,7 +885,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
::rtl::OUString aFileURL(m_sDirectory);
sal_Int32 nIndex = aFileURL.lastIndexOf('/');
if (nIndex != aFileURL.getLength()-1)
- aFileURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFileURL += ::rtl::OUString("/");
aFileURL += m_sFilename;
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index fcea195267f6..d55a4eae29e2 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -118,7 +118,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
if ( ::osl::FileBase::E_None !=
::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory))
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid directory")),
+ rtl::OUString("Invalid directory"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// we ensure that there is a trailing '/' at the end of
@@ -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(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
+ rtl::OUString("Error executing dialog"),
static_cast<XFilePicker2*>(m_FilePicker));
return rc;
@@ -208,7 +208,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const
if (!bRet)
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter already exists")),
+ rtl::OUString("filter already exists"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// #95345# see MSDN OPENFILENAME
@@ -233,7 +233,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
if (filterPos < 0)
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter doesn't exist")),
+ rtl::OUString("filter doesn't exist"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// filter index of the base class starts with 1
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 7c4b6bb6f88c..b20b65d020cc 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(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed" )),
+ ::rtl::OUString( "FilePicker is already disposed" ),
uno::Reference< uno::XInterface >() );
if ( m_rBroadcastHelper.bInDispose )
throw lang::DisposedException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker will be disposed now." )),
+ ::rtl::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(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed." )),
+ ::rtl::OUString( "FilePicker is already disposed." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index db176f7cc7b6..0488b4ed10a1 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -80,11 +80,11 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
{
if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP)
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("unsupported image format")), 0, 1);
+ OUString("unsupported image format"), 0, 1);
if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0)))
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid image data")), 0, 2);
+ OUString("invalid image data"), 0, 2);
// save the new image data and force a redraw
m_ImageData = aImage;
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 7a3eca82f13d..9d3347893fd4 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -273,9 +273,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] )
if ( xFPNotifier.is( ) )
xFPNotifier->addFilePickerListener( xFPListener );
- xFilePicker->setTitle( OUString(RTL_CONSTASCII_USTRINGPARAM("FileOpen Simple...")));
+ xFilePicker->setTitle( OUString("FileOpen Simple..."));
xFilePicker->setMultiSelectionMode( sal_True );
- xFilePicker->setDefaultName( OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\test2.sxw")));
+ xFilePicker->setDefaultName( OUString("d:\\test2.sxw"));
OUString aDirURL;
OUString aSysPath = OStringToOUString( "d:\\ueaeoe", osl_getThreadTextEncoding( ) );
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 953c50d665b3..de5f714a0fc3 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -52,7 +52,7 @@ namespace
Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFolderPicker"));
+ aRet[0] = OUString("com.sun.star.ui.dialogs.SystemFolderPicker");
return aRet;
}
}
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 6f49d07d17bf..97c29ec25273 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -78,7 +78,7 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
if ( ::osl::FileBase::E_None != rc )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "directory is not a valid file url" )),
+ OUString( "directory is not a valid file url" ),
static_cast< cppu::OWeakObject * >( m_pFolderPicker ),
1 );
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 93c9244227b5..8a993306b03f 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -139,7 +139,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
if ( !aItem.hasValue( ) ||
aItem.getValueType( ) != getCppuType((OUString*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -161,7 +161,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
if ( !aItemList.hasValue( ) ||
aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -189,7 +189,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
(aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -202,7 +202,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
// index was not correct
if ( CB_ERR == lRet )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid item position" )),
+ OUString( "invalid item position" ),
rXInterface,
aArgPos );
}
@@ -241,7 +241,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
(aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -250,7 +250,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
if ( nPos < -1 )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
+ OUString("invalid index"),
rXInterface,
aArgPos );
@@ -258,7 +258,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
if ( (CB_ERR == lRet) && (-1 != nPos) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
+ OUString("invalid index"),
rXInterface,
aArgPos );
}
@@ -351,7 +351,7 @@ void SAL_CALL CheckboxSetState(
if ( !aState.hasValue( ) ||
aState.getValueType( ) != getCppuType((sal_Bool*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index e9bc6ed74915..2e83bd4c04c2 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( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+ xMS = cppu::createRegistryServiceFactory( rtl::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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 08:29:46 +0000