summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-18 13:25:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-18 14:12:27 +0100
commit940f74ed9a5666348661bec29e8f4e8a302e6ac4 (patch)
treee35fea7d178acc15b7ebbb51413ddd422949d595
parentca871abe3395f4a4ca406c8eb191722e0c0a311b (diff)
fpicker: Use appropriate OUString functions on string constants
Change-Id: I9be920ec3d9da211daeabe872b02361a0500054a
-rw-r--r--fpicker/source/office/iodlg.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 41c76d30e053..5b9ff2b3feb2 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -107,9 +107,6 @@ using namespace ExtendedFilePickerElementIds;
using namespace CommonFilePickerElementIds;
using namespace InternalFilePickerElementIds;
-#define IODLG_CONFIGNAME OUString("FileDialog")
-#define IMPGRF_CONFIGNAME OUString("ImportGraphicDialog")
-
#define GET_DECODED_NAME(aObj) \
aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET )
@@ -244,7 +241,7 @@ namespace
bool lcl_getHomeDirectory( const OUString& _rForURL, OUString& /* [out] */ _rHomeDir )
{
- _rHomeDir = "";
+ _rHomeDir.clear();
// now ask the content broker for a provider for this scheme
@@ -557,7 +554,7 @@ void SvtFileDialog::Init_Impl
}
// set the ini file for extracting the size
- _pImp->_aIniKey = IODLG_CONFIGNAME;
+ _pImp->_aIniKey = "FileDialog";
AddControls_Impl( );
@@ -1912,7 +1909,7 @@ short SvtFileDialog::PrepareExecute()
&& (_aPath.indexOf('/') == -1))
{
aFileNameOnly = _aPath;
- _aPath = "";
+ _aPath.clear();
}
// no starting path specified?
@@ -2516,7 +2513,7 @@ void SvtFileDialog::AddControls_Impl( )
// create the "show preview" checkbox ( and the preview window, too ), if needed
if ( _nExtraBits & SFX_EXTRA_SHOWPREVIEW )
{
- _pImp->_aIniKey = IMPGRF_CONFIGNAME;
+ _pImp->_aIniKey = "ImportGraphicDialog";
// because the "<All Formats> (*.bmp,*...)" entry is to wide,
// we need to disable the auto width feature of the filter box
_pImp->DisableFilterBoxAutoWidth();
@@ -2763,7 +2760,7 @@ void SvtFileDialog::appendDefaultExtension(OUString& _rFileName,
OUString aType(_rFilterExtensions);
aType = aType.toAsciiLowerCase();
- if ( ! aType.equals(FILEDIALOG_FILTER_ALL) )
+ if ( aType != FILEDIALOG_FILTER_ALL )
{
sal_uInt16 nWildCard = comphelper::string::getTokenCount(aType, FILEDIALOG_DEF_EXTSEP);
sal_uInt16 nIndex;