summaryrefslogtreecommitdiff
path: root/fpicker/source
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker/source')
-rw-r--r--fpicker/source/aqua/FilterHelper.mm4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx40
-rw-r--r--fpicker/source/win32/filepicker/shared.hxx6
-rw-r--r--fpicker/source/win32/filepicker/workbench/Test_fps.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx2
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.cxx4
8 files changed, 34 insertions, 34 deletions
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index b3ccbcdbeb62..b076990b3f83 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -359,7 +359,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
// append the filter
if (bPrependSeparator) {
- rtl::OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
+ rtl::OUString dash("-");
OUStringList emptyList;
m_pFilterList->push_back(FilterEntry(dash, emptyList));
}
@@ -417,7 +417,7 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
{
rtl::OUString aName = [sFilename OUString];
- rtl::OUString allMatcher(RTL_CONSTASCII_USTRINGPARAM(".*"));
+ rtl::OUString allMatcher(".*");
for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); iter++) {
if (aName.matchIgnoreAsciiCase(*iter, aName.getLength() - (*iter).getLength()) || ((*iter).equals(allMatcher))) {
return sal_True;
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index bc02fa0109c6..3cb4e3a585e5 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -215,9 +215,9 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
- const ::rtl::OUString aPackage( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/"));
- const ::rtl::OUString aRelPath( RTL_CONSTASCII_USTRINGPARAM("Path/Info"));
- const ::rtl::OUString aKey( RTL_CONSTASCII_USTRINGPARAM("WorkPathChanged"));
+ const ::rtl::OUString aPackage("org.openoffice.Office.Common/");
+ const ::rtl::OUString aRelPath("Path/Info");
+ const ::rtl::OUString aKey("WorkPathChanged");
css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey, ::comphelper::ConfigurationHelper::E_READONLY);
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index cef6ad360f35..772265059a36 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(RTL_CONSTASCII_USTRINGPARAM("control_id"));
-static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener"));
+static const ::rtl::OUString PROP_CONTROL_ID("control_id");
+static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener");
//-----------------------------------------------------------------------------------------
class AsyncPickerEvents : public RequestHandler
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 03e5a927b651..4279ab9b54e8 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(RTL_CONSTASCII_USTRINGPARAM("picker_listener" ) ); // [XFilePickerListenert]
-static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT(RTL_CONSTASCII_USTRINGPARAM("dialog_show_result" )); // [sal_Bool] true=OK, false=CANCEL
-static const ::rtl::OUString PROP_SELECTED_FILES(RTL_CONSTASCII_USTRINGPARAM("selected_files" )); // [seq< OUString >] contains all user selected files (can be empty!)
-static const ::rtl::OUString PROP_MULTISELECTION_MODE(RTL_CONSTASCII_USTRINGPARAM("multiselection_mode")); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString PROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title" )); // [OUString]
-static const ::rtl::OUString PROP_FILENAME(RTL_CONSTASCII_USTRINGPARAM("filename" ) ); // [OUString]
-static const ::rtl::OUString PROP_DIRECTORY(RTL_CONSTASCII_USTRINGPARAM("directory" )); // [OUString]
-static const ::rtl::OUString PROP_FEATURES(RTL_CONSTASCII_USTRINGPARAM("features" )); // [sal_Int32]
-static const ::rtl::OUString PROP_TEMPLATE_DESCR(RTL_CONSTASCII_USTRINGPARAM("templatedescription")); // [sal_Int32]
-static const ::rtl::OUString PROP_FILTER_TITLE(RTL_CONSTASCII_USTRINGPARAM("filter_title" )); // [OUString]
-static const ::rtl::OUString PROP_FILTER_VALUE(RTL_CONSTASCII_USTRINGPARAM("filter_value" )); // [OUString]
-static const ::rtl::OUString PROP_FORCE(RTL_CONSTASCII_USTRINGPARAM("force" )); // [sal_Bool]
-static const ::rtl::OUString PROP_FILTER_GROUP(RTL_CONSTASCII_USTRINGPARAM("filter-group" )); // [seq< css:beans::StringPair >] contains a group of filters
-
-static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id" )); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_ACTION(RTL_CONSTASCII_USTRINGPARAM("control_action" )); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_VALUE(RTL_CONSTASCII_USTRINGPARAM("control_value" )); // [Any]
-static const ::rtl::OUString PROP_CONTROL_LABEL(RTL_CONSTASCII_USTRINGPARAM("control_label" )); // [OUString]
-static const ::rtl::OUString PROP_CONTROL_ENABLE(RTL_CONSTASCII_USTRINGPARAM("control_enable" )); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString STRING_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM("------------------------------------------" ));
+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("------------------------------------------" );
//-----------------------------------------------------------------------------
/** native implementation of the file picker on Vista and upcoming windows versions.
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index 0589c58e02aa..d7dcd14d2e63 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(RTL_CONSTASCII_USTRINGPARAM( "\\" ));
-const ::rtl::OUString FILTER_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM( "------------------------------------------" ));
-const ::rtl::OUString ALL_FILES_WILDCARD(RTL_CONSTASCII_USTRINGPARAM( "*.*" ));
+const ::rtl::OUString BACKSLASH( "\\" );
+const ::rtl::OUString FILTER_SEPARATOR( "------------------------------------------" );
+const ::rtl::OUString ALL_FILES_WILDCARD( "*.*" );
const ::sal_Bool ALLOW_DUPLICATES = sal_True;
#endif
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 9d3347893fd4..57608ccaf112 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -76,7 +76,7 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker );
Reference< XMultiServiceFactory > g_xFactory;
-const OUString BMP_EXTENSION(RTL_CONSTASCII_USTRINGPARAM( "bmp" ));
+const OUString BMP_EXTENSION( "bmp" );
//-------------------------------------------------------------------------------------------------------------------------
// a test client
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 97c29ec25273..add1ee46da65 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -42,7 +42,7 @@ using osl::FileBase;
//
//------------------------------------------------------------------------
-const OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" ));
+const OUString BACKSLASH( "\\" );
//------------------------------------------------------------------------
// ctor
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 8a993306b03f..403ab1cdeffc 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -39,9 +39,9 @@ using ::com::sun::star::uno::Sequence;
//
//------------------------------------------------------------
-const rtl::OUString TILDE(RTL_CONSTASCII_USTRINGPARAM( "~" ));
+const rtl::OUString TILDE( "~" );
const sal_Unicode TILDE_SIGN = L'~';
-const rtl::OUString AMPERSAND(RTL_CONSTASCII_USTRINGPARAM( "&" ));
+const rtl::OUString AMPERSAND( "&" );
const sal_Unicode AMPERSAND_SIGN = L'&';
//------------------------------------------------------------