[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/inc sw/source
Julien Nabet (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jun 17 12:40:06 UTC 2020
sw/inc/modcfg.hxx | 4 ++--
sw/inc/swabstdlg.hxx | 2 +-
sw/source/ui/dialog/swdlgfact.cxx | 4 ++--
sw/source/ui/dialog/swdlgfact.hxx | 2 +-
sw/source/ui/envelp/mailmrge.cxx | 2 +-
sw/source/uibase/config/modcfg.cxx | 8 ++++----
sw/source/uibase/dbui/dbmgr.cxx | 2 +-
sw/source/uibase/inc/mailmrge.hxx | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 83a4d3272aa4a4bd875abc9964f4e4e7aadd1b4e
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu May 28 14:14:41 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jun 17 14:39:32 2020 +0200
Fix 983db96a17630be906b868d2be811663f0d846f6
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 at 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 at redhat.com>
(cherry picked from commit 90d3311b08cef7418376d183b7116223db3e627d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95248
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index cb197d0f1a91..b7271e051040 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 7b691ce16bf7..c7d1114ed6ae 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 2bffa03bd995..e053a69086cf 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -656,9 +656,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 6f7a8b226416..15b865ccc5bc 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 ef4a35257aed..20dccccbba6c 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -493,7 +493,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 5f7c2124396e..a0109e8a22c6 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1188,9 +1188,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;
}
@@ -1256,8 +1256,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 2daa67893592..c5f726758fb1 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3073,7 +3073,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 3f82cf083688..eab41016a88b 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;
More information about the Libreoffice-commits
mailing list