diff options
| -rw-r--r-- | sw/inc/modcfg.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/config/modcfg.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/mailmrge.hxx | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index c27f3be749be..98615f8eb378 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -332,8 +332,8 @@ public: void SetNameFromColumn( const OUString& rSet ) { m_aMiscConfig.m_sNameFromColumn = rSet; m_aMiscConfig.SetModified();} - bool IsFileEncyrptedFromColumn() const { return m_aMiscConfig.m_bIsPasswordFromColumn;} - void SetIsFileEncyrptedFromColumn( bool bSet ) + bool IsFileEncryptedFromColumn() const { return m_aMiscConfig.m_bIsPasswordFromColumn;} + void SetIsFileEncryptedFromColumn( bool bSet ) { m_aMiscConfig.SetModified(); m_aMiscConfig.m_bIsPasswordFromColumn = bSet; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 3f261c47c344..587a142c2a61 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -152,7 +152,7 @@ public: virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const = 0; virtual bool IsSaveSingleDoc() const = 0; virtual bool IsGenerateFromDataBase() const = 0; - virtual bool IsFileEncyrptedFromDataBase() const = 0; + virtual bool IsFileEncryptedFromDataBase() const = 0; virtual OUString GetColumnName() const = 0; virtual OUString GetPasswordColumnName() const = 0; virtual OUString GetTargetURL() const = 0; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index a715f6280c44..99f23f595a3c 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -645,9 +645,9 @@ bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const return pDlg->IsGenerateFromDataBase(); } -bool AbstractMailMergeDlg_Impl::IsFileEncyrptedFromDataBase() const +bool AbstractMailMergeDlg_Impl::IsFileEncryptedFromDataBase() const { - return pDlg->IsFileEncyrptedFromDataBase(); + return pDlg->IsFileEncryptedFromDataBase(); } OUString AbstractMailMergeDlg_Impl::GetColumnName() const diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 3a7ecc581512..97bb2c0c0606 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -507,7 +507,7 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const override; virtual bool IsSaveSingleDoc() const override; virtual bool IsGenerateFromDataBase() const override; - virtual bool IsFileEncyrptedFromDataBase() const override; + virtual bool IsFileEncryptedFromDataBase() const override; virtual OUString GetColumnName() const override; virtual OUString GetPasswordColumnName() const override; virtual OUString GetTargetURL() const override; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 0eca50378902..21f8591f4439 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -559,7 +559,7 @@ bool SwMailMergeDlg::ExecQryShell() nMergeType = DBMGR_MERGE_FILE; pModOpt->SetMailingPath( GetURLfromPath() ); pModOpt->SetIsNameFromColumn(m_pGenerateFromDataBaseCB->IsChecked()); - pModOpt->SetIsFileEncyrptedFromColumn(m_pPasswordCB->IsChecked()); + pModOpt->SetIsFileEncryptedFromColumn(m_pPasswordCB->IsChecked()); if (!AskUserFilename()) { pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectedEntry()); diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 3ce420932f4a..82c3b2f4218b 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -1218,9 +1218,9 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames() "FormLetter/FileOutput/Path", // 8 "FormLetter/FileOutput/FileName/FromManualSetting", // 9 "FormLetter/FileOutput/FileName/Generation",//10 - "FormLetter/PrintOutput/AskForMerge" //11 + "FormLetter/PrintOutput/AskForMerge", //11 "FormLetter/FileOutput/FilePassword/FromDatabaseField", // 12 - "FormLetter/FileOutput/FilePassword/Generation",//13 + "FormLetter/FileOutput/FilePassword/Generation" //13 }; OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -1290,8 +1290,8 @@ void SwMiscConfig::Load() case 9 : pValues[nProp] >>= sTmp; m_sMailName = sTmp; break; case 10: m_bIsNameFromColumn = *o3tl::doAccess<bool>(pValues[nProp]); break; case 11: pValues[nProp] >>= m_bAskForMailMergeInPrint; break; - case 12: m_bIsPasswordFromColumn = *o3tl::doAccess<bool>(pValues[nProp]); break; - case 13: pValues[nProp] >>= sTmp; m_sPasswordFromColumn = sTmp; break; + case 12: pValues[nProp] >>= sTmp; m_sPasswordFromColumn = sTmp; break; + case 13: m_bIsPasswordFromColumn = *o3tl::doAccess<bool>(pValues[nProp]); break; } } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a3a443aec18a..881ad74fca2e 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -3131,7 +3131,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, if(pImpl->pMergeDialog->IsGenerateFromDataBase()) aMergeDesc.sDBcolumn = pImpl->pMergeDialog->GetColumnName(); - if(pImpl->pMergeDialog->IsFileEncyrptedFromDataBase()) + if(pImpl->pMergeDialog->IsFileEncryptedFromDataBase()) aMergeDesc.sDBPasswordColumn = pImpl->pMergeDialog->GetPasswordColumnName(); } diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index d5730a80736c..b861ae3eba70 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -135,7 +135,7 @@ public: bool IsSaveSingleDoc() const { return m_pSaveSingleDocRB->IsChecked(); } bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); } - bool IsFileEncyrptedFromDataBase() const { return m_pPasswordCB->IsChecked(); } + bool IsFileEncryptedFromDataBase() const { return m_pPasswordCB->IsChecked(); } OUString GetColumnName() const { return m_pColumnLB->GetSelectedEntry(); } OUString GetPasswordColumnName() const { return m_pPasswordLB->GetSelectedEntry(); } OUString GetTargetURL() const; |