summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-05-28 14:14:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-05-29 09:10:31 +0200
commit90d3311b08cef7418376d183b7116223db3e627d (patch)
treeb4bea5ebc78a2883bfc79ed7ba4e5dcdb85e5866 /sw
parent4c48de44ad933ef6dd19777b3ebf1a51db5e14e3 (diff)
warn:unotools.config:172285:172285:unotools/source/config/configitem.cxx:409: ignoring XHierarchicalNameAccess to /org.openoffice.Office.Writer/FormLetter/PrintOutput/AskForMergeFormLetter/FileOutput/FilePassword/FromDatabaseField com.sun.star.container.NoSuchElementException message: FormLetter/PrintOutput/AskForMergeFormLetter/FileOutput/FilePassword/FromDatabaseField /home/julien/lo/libreoffice/configmgr/source/access.cxx:436 missing comma + confusion in switch cases in SwMiscConfig::Load + typo Encyrpted->Encrypted Author: Gülşah Köse <gulsah.kose@collabora.com> Date: Fri May 22 11:51:33 2020 +0300 Add an option to create encyrpted PDF files with mailmerge. With that option user can create encyrpted pdf files with a password column in database via mailmerge. Change-Id: I1ae9bbeb3f69ed9c0ba51709852f8edd5f2dc683 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95033 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/modcfg.hxx4
-rw-r--r--sw/inc/swabstdlg.hxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/uibase/config/modcfg.cxx8
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx2
8 files changed, 13 insertions, 13 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 218e58679362..5ed47511c56b 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -341,8 +341,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 3e3bd5332021..1533d816eb8e 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 291ee814780f..163d315bbb9b 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -654,9 +654,9 @@ bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const
return m_xDlg->IsGenerateFromDataBase();
}
-bool AbstractMailMergeDlg_Impl::IsFileEncyrptedFromDataBase() const
+bool AbstractMailMergeDlg_Impl::IsFileEncryptedFromDataBase() const
{
- return m_xDlg->IsFileEncyrptedFromDataBase();
+ return m_xDlg->IsFileEncryptedFromDataBase();
}
OUString AbstractMailMergeDlg_Impl::GetColumnName() const
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 426dafc179b4..0f1a7c94f1e0 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -517,7 +517,7 @@ public:
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 8b7cccb67973..972f7d04a6cc 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -484,7 +484,7 @@ bool SwMailMergeDlg::ExecQryShell()
nMergeType = DBMGR_MERGE_FILE;
pModOpt->SetMailingPath( GetURLfromPath() );
pModOpt->SetIsNameFromColumn(m_xGenerateFromDataBaseCB->get_active());
- pModOpt->SetIsFileEncyrptedFromColumn(m_xPasswordCB->get_active());
+ pModOpt->SetIsFileEncryptedFromColumn(m_xPasswordCB->get_active());
if (!AskUserFilename())
{
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index b8838c784816..949aeff1e30d 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1187,9 +1187,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
};
return aNames;
}
@@ -1255,8 +1255,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 3bfb4e101a29..309d74ae8073 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3059,7 +3059,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
if(m_pImpl->pMergeDialog->IsGenerateFromDataBase())
aMergeDesc.sDBcolumn = m_pImpl->pMergeDialog->GetColumnName();
- if(m_pImpl->pMergeDialog->IsFileEncyrptedFromDataBase())
+ if(m_pImpl->pMergeDialog->IsFileEncryptedFromDataBase())
aMergeDesc.sDBPasswordColumn = m_pImpl->pMergeDialog->GetPasswordColumnName();
}
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index f95450028def..f409c664ffe9 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -126,7 +126,7 @@ public:
bool IsSaveSingleDoc() const { return m_xSaveSingleDocRB->get_active(); }
bool IsGenerateFromDataBase() const { return m_xGenerateFromDataBaseCB->get_active(); }
- bool IsFileEncyrptedFromDataBase() const { return m_xPasswordCB->get_active(); }
+ bool IsFileEncryptedFromDataBase() const { return m_xPasswordCB->get_active(); }
OUString GetColumnName() const { return m_xColumnLB->get_active_text(); }
OUString GetPasswordColumnName() const { return m_xPasswordLB->get_active_text(); }
OUString GetTargetURL() const;