diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-23 12:34:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:02 +0200 |
| commit | 7c9188659d0882906ed917d5251d5faaf007a477 (patch) | |
| tree | 74b7ab7be808657179820283fdbea0a973051fd1 /sw | |
| parent | 99af8b070c5bff885511b29faf3c9df937297f81 (diff) | |
convert include/sfx2/objsh.hxx from String to OUString
Change-Id: I9587190cea24da93ec0496f2eccf0d32d98980ee
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/docsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/docsh.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index efa659b47024..ccff4f09acf0 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -297,7 +297,7 @@ public: virtual bool IsChangeRecording() const; virtual bool HasChangeRecordProtection() const; virtual void SetChangeRecording( bool bActivate ); - virtual bool SetProtectionPassword( const String &rPassword ); + virtual bool SetProtectionPassword( const OUString &rPassword ); virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ); }; diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 2a0c0af82921..1b6b9a455388 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -1235,7 +1235,7 @@ void SwDocShell::SetChangeRecording( bool bActivate ) } -bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) +bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) { const SfxAllItemSet aSet( GetPool() ); const SfxItemSet* pArgs = &aSet; @@ -1249,7 +1249,7 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) bool bRes = false; - if (rNewPassword.Len()) + if (!rNewPassword.isEmpty()) { // when password protection is applied change tracking must always be active SetChangeRecording( true ); |