diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-05-28 19:41:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 11:55:13 +0200 |
| commit | 9881bea8d41997fb46579eb5f0314300159c96cc (patch) | |
| tree | f52daa7055d2d28959e2d1ad576d963b7c0d3b2d /sfx2 | |
| parent | ec4034c4a4f23574401ba2a74b635d9ed4befbc8 (diff) | |
remove unnecessary use of OUString::getStr
Change-Id: I3d13e1c0bb6aa4a7aacc463198747c1368ebc9b4
Reviewed-on: https://gerrit.libreoffice.org/38114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 30a14417d389..fceeab0d7e50 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -130,7 +130,7 @@ void SfxModalDialog::GetDialogData_Impl() if ( aDlgOpt.Exists() ) { // load settings - SetWindowState( OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + SetWindowState( OUStringToOString( aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US ) ); Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME ); OUString aTemp; if ( aUserItem >>= aTemp ) diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index e26ace875906..b8762a49318f 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -415,14 +415,13 @@ namespace sfx2 sal_Int32 nExistentPos = _rToBeExtended.indexOf( _rWC ); if ( -1 < nExistentPos ) { // found this wildcard (already part of _rToBeExtended) - const sal_Unicode* pBuffer = _rToBeExtended.getStr(); if ( ( 0 == nExistentPos ) - || ( s_cWildcardSeparator == pBuffer[ nExistentPos - 1 ] ) + || ( s_cWildcardSeparator == _rToBeExtended[ nExistentPos - 1 ] ) ) { // the wildcard really starts at this position (it starts at pos 0 or the previous character is a separator sal_Int32 nExistentWCEnd = nExistentPos + _rWC.getLength(); if ( ( _rToBeExtended.getLength() == nExistentWCEnd ) - || ( s_cWildcardSeparator == pBuffer[ nExistentWCEnd ] ) + || ( s_cWildcardSeparator == _rToBeExtended[ nExistentWCEnd ] ) ) { // it's really the complete wildcard we found // (not something like _rWC being "*.t" and _rToBeExtended containing "*.txt") diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 046f7baae4bc..35bd6256b999 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -545,7 +545,7 @@ void SfxTabDialog::Start_Impl() SvtViewOptions aDlgOpt(EViewType::TabDialog, OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8)); if ( aDlgOpt.Exists() ) { - SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); // initial TabPage from Program/Help/config nActPage = (sal_uInt16)aDlgOpt.GetPageID(); |