diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 12:06:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 12:34:40 +0100 |
| commit | 180f0791daa3d3f959f4f70b9f83012bcbf47a64 (patch) | |
| tree | ae1509f2bfaa697ec613032c4f26fc4b0e841c60 /sfx2 | |
| parent | 783ba49aa0cd068c7e3dacdd3c13e9c37cf52e22 (diff) | |
comphelper: Use appropriate OUString functions on string constants
Change-Id: Id1d5c3cf2f76dbb33606cec1c0f17d4a1f282247
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 30e91648d882..7bc7712f822a 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1421,7 +1421,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) bool bNoSig = false; if ( IsModified() || !GetMedium() || GetMedium()->GetName().isEmpty() - || (!aODFVersion.equals( ODFVER_012_TEXT ) && !bHasSign) ) + || (aODFVersion != ODFVER_012_TEXT && !bHasSign) ) { // the document might need saving ( new, modified or in ODF1.1 format without signature ) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 6decd9777461..9a8c9e79452b 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -385,7 +385,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto try { // older versions can not have this property set, it exists only starting from ODF1.2 - xProps->setPropertyValue("Version", uno::makeAny( ODFVER_012_TEXT ) ); + xProps->setPropertyValue("Version", uno::makeAny<OUString>( ODFVER_012_TEXT ) ); } catch( uno::Exception& ) { @@ -1185,7 +1185,7 @@ bool SfxObjectShell::SaveTo_Impl bTryToPreserveScriptSignature = pMedium->GetFilter() && pFilter && pMedium->GetFilter()->GetFilterName() == pFilter->GetFilterName(); bNoPreserveForOasis = ( - (aODFVersion.equals( ODFVER_012_TEXT ) && nVersion == SvtSaveOptions::ODFVER_011) || + (aODFVersion == ODFVER_012_TEXT && nVersion == SvtSaveOptions::ODFVER_011) || (aODFVersion.isEmpty() && nVersion >= SvtSaveOptions::ODFVER_012) ); } |