diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-22 11:13:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-22 11:25:13 +0000 |
| commit | def619581f3a833c4c476548c6d17a76d204dd28 (patch) | |
| tree | bb80d634d1372b7cb4f497253db485e172b0e9af /sc/source/ui/docshell | |
| parent | b4a89972cb6a6370224d5de3b88f9e642f93624a (diff) | |
fix sc build
Change-Id: I2c5ad65863a516516f8a944fb1344753e08d6c9e
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index cc730647c9bd..d9d0646548b4 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1154,7 +1154,7 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, sal_Boo //------------------------------------------------------------------------ -bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi ) +bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, sal_Bool bApi ) { bool bDone = false; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 917c88b62c54..24e4c82b8d7d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -803,11 +803,11 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); - if ( pPasswordItem && pPasswordItem->GetValue().Len() ) + if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aValues.realloc( 2 ); - aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Password") ); - aValues[1].Value <<= ::rtl::OUString( pPasswordItem->GetValue() ); + aValues[1].Name = OUString("Password"); + aValues[1].Value <<= pPasswordItem->GetValue(); } SC_MOD()->SetInSharedDocSaving( true ); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 4509c11b6a30..5591d60b4cc8 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2345,11 +2345,11 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() if ( GetMedium() ) { SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); - if ( pPasswordItem && pPasswordItem->GetValue().Len() ) + if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aArgs.realloc( 2 ); - aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Password" )); - aArgs[1].Value <<= ::rtl::OUString( pPasswordItem->GetValue() ); + aArgs[1].Name = OUString("Password"); + aArgs[1].Value <<= pPasswordItem->GetValue(); } } |