diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-28 09:31:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-28 11:50:15 +0100 |
| commit | 396ab1eba7be8dcedf09854035b9f22137540d56 (patch) | |
| tree | 49b2dcb61f98a9dd7ff5b12223adae6a4e946564 /sc | |
| parent | 31fc0b74425253589b2ac0dcecb9e8a2714954b4 (diff) | |
convert pdf security page to .ui
Change-Id: Ie785f4b112b8992707f886720d92bd34d0823f39
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 5511b61cfdee..48ed4c6e3385 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1128,9 +1128,9 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool bJust if ( bJustQueryIfProtected && !bProtected ) return true; - String aTitle( ScResId( bProtected ? SCSTR_CHG_UNPROTECT : SCSTR_CHG_PROTECT ) ); - String aText( ScResId( SCSTR_PASSWORD ) ); - String aPassword; + OUString aTitle( ScResId( bProtected ? SCSTR_CHG_UNPROTECT : SCSTR_CHG_PROTECT ) ); + OUString aText( ScResId( SCSTR_PASSWORD ) ); + OUString aPassword; SfxPasswordDialog* pDlg = new SfxPasswordDialog( _pParent ? _pParent : GetActiveDialogParent(), &aText ); @@ -1144,7 +1144,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool bJust aPassword = pDlg->GetPassword(); delete pDlg; - if ( aPassword.Len() ) + if (!aPassword.isEmpty()) { if ( bProtected ) { diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index e1041b1964d5..0e03f04a2301 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -987,14 +987,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScDocProtection* pProtect = pDoc->GetDocProtection(); if (pProtect && pProtect->isProtected()) { - sal_Bool bCancel = false; - String aPassword; + sal_Bool bCancel = false; + OUString aPassword; if (pProtect->isProtectedWithPass()) { - String aText( ScResId(SCSTR_PASSWORD) ); + OUString aText(ScResId(SCSTR_PASSWORD)); - pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); + pDlg = new SfxPasswordDialog(GetDialogParent(), &aText); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); @@ -1015,7 +1015,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } else { - String aText( ScResId(SCSTR_PASSWORDOPT) ); + OUString aText(ScResId(SCSTR_PASSWORDOPT)); pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); @@ -1065,7 +1065,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScTableProtection* pProtect = pDoc->GetTabProtection(nTab); if (pProtect && pProtect->isProtectedWithPass()) { - String aText( ScResId(SCSTR_PASSWORDOPT) ); + OUString aText( ScResId(SCSTR_PASSWORDOPT) ); auto_ptr<SfxPasswordDialog> pDlg(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) ); pDlg->SetMinLen( 0 ); |