[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sfx2/inc sfx2/source
Muhammet Kara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 23 19:35:17 UTC 2019
sfx2/inc/autoredactdialog.hxx | 8 ++--
sfx2/source/doc/autoredactdialog.cxx | 66 ++++++++++++++++++++++-------------
2 files changed, 46 insertions(+), 28 deletions(-)
New commits:
commit 9fc2afbb2a10e29617791005168b64a881ebfb3f
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Fri Aug 23 10:31:34 2019 +0300
Commit: Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Fri Aug 23 21:34:23 2019 +0200
AutoRedaction: Adapt Save & DeleteHdl
[NO-FORWARD-PORT]
Change-Id: I0feeed87cc69f364980657f5b6a2dfdee05ce2f3
Reviewed-on: https://gerrit.libreoffice.org/78037
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
Tested-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index b128e9d67634..9399ba530a80 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -82,10 +82,10 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public SfxModalDialog
VclPtr<PushButton> m_pDeleteBtn;
DECL_LINK(Load, Button*, void);
- /*DECL_LINK(Save, Button*, void);
- DECL_LINK(AddHdl, Button*, void);
- DECL_LINK(EditHdl, Button*, void);
- DECL_LINK(DeleteHdl, Button*, void);*/
+ DECL_LINK(Save, Button*, void);
+ /*DECL_LINK(AddHdl, Button*, void);
+ DECL_LINK(EditHdl, Button*, void);*/
+ DECL_LINK(DeleteHdl, Button*, void);
DECL_LINK(LoadHdl, sfx2::FileDialogHelper*, void);
DECL_LINK(SaveHdl, sfx2::FileDialogHelper*, void);
diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx
index b62cb249b426..0bfe244e760f 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -30,6 +30,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <unotools/viewoptions.hxx>
+#include <vcl/msgbox.hxx>
#include <svtools/treelistentry.hxx>
@@ -213,13 +214,13 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, Load, Button*, void)
StartFileDialog(StartFileDialogType::Open, "Load Targets");
}
-/*IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
+IMPL_LINK_NOARG(SfxAutoRedactDialog, Save, Button*, void)
{
//Allow saving the targets into a file
StartFileDialog(StartFileDialogType::SaveAs, "Save Targets");
}
-IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, Button*, void)
+/*IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, Button*, void)
{
// Open the Add Target dialog, craete a new target and insert into the targets vector and the listbox
SfxAddTargetDialog aAddTargetDialog(getDialog(), m_xTargetsBox->GetNameProposal());
@@ -342,39 +343,47 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, EditHdl, Button*, void)
// And sync the targets box row with the actual target data
m_xTargetsBox->setRowData(nSelectedRow, pTarget);
-}
+}*/
IMPL_LINK_NOARG(SfxAutoRedactDialog, DeleteHdl, Button*, void)
{
- std::vector<int> aSelectedRows = m_xTargetsBox->get_selected_rows();
+ sal_uLong nSelectionCount = m_pTargetsBox->GetSelectionCount();
//No selection, so nothing to delete
- if (aSelectedRows.empty())
+ if (nSelectionCount < 1)
return;
- if (aSelectedRows.size() > 1)
+ if (nSelectionCount > 1)
{
- OUString sMsg("Are you sure you would like to delete "
- + OUString::number(aSelectedRows.size()) + " targets at once?");
+ OUString sMsg("Are you sure you would like to delete " + OUString::number(nSelectionCount)
+ + " targets at once?");
+
//Warn the user about multiple deletions
- std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(
- getDialog(), VclMessageType::Question, VclButtonsType::OkCancel, sMsg));
- if (xBox->run() == RET_CANCEL)
+ if (ScopedVclPtrInstance<WarningBox>(this, MessBoxStyle::OkCancel, sMsg)->Execute()
+ == RET_CANCEL)
return;
}
- // After each delete, the indexes of the following items decrease by one.
- int delta = 0;
- for (const auto& i : aSelectedRows)
+ SvTreeListEntry* pSelected = m_pTargetsBox->FirstSelected();
+
+ for (sal_uLong i = nSelectionCount; i > 0; i--)
{
- m_aTableTargets.erase(m_aTableTargets.begin() + (i - delta));
- m_xTargetsBox->remove(i - delta++);
+ // remove the target
+ RedactionTarget* pTarget = static_cast<RedactionTarget*>(pSelected->GetUserData());
+ delete pTarget;
+
+ // remove from the table
+ SvTreeListEntry* nextSelected = m_pTargetsBox->NextSelected(pSelected);
+ m_pTargetsBox->RemoveEntry(pSelected);
+ pSelected = nextSelected;
}
-}*/
+
+ m_pTargetsBox->SelectAll(false);
+}
namespace
{
-/*boost::property_tree::ptree redactionTargetToJSON(RedactionTarget* pTarget)
+boost::property_tree::ptree redactionTargetToJSON(RedactionTarget* pTarget)
{
boost::property_tree::ptree aNode;
aNode.put("sName", pTarget->sName.toUtf8().getStr());
@@ -385,7 +394,7 @@ namespace
aNode.put("nID", pTarget->nID);
return aNode;
-}*/
+}
RedactionTarget* JSONtoRedactionTarget(const boost::property_tree::ptree::value_type& rValue)
{
@@ -456,7 +465,7 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, LoadHdl, sfx2::FileDialogHelper*, void)
IMPL_LINK_NOARG(SfxAutoRedactDialog, SaveHdl, sfx2::FileDialogHelper*, void)
{
- /*assert(m_pFileDlg);
+ assert(m_pFileDlg);
OUString sTargetsFile;
if (ERRCODE_NONE == m_pFileDlg->GetError())
@@ -469,13 +478,18 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, SaveHdl, sfx2::FileDialogHelper*, void)
osl::File::getSystemPathFromFileURL(sTargetsFile, sSysPath);
sTargetsFile = sSysPath;
- weld::WaitObject aWaitObject(getDialog());
+ EnterWait();
try
{
- // Put the targets into a JSON array
boost::property_tree::ptree aTargetsArray;
- for (const auto& targetPair : m_aTableTargets)
+ std::vector<std::pair<RedactionTarget*, OUString>> vRedactionTargets;
+
+ // Get the targets
+ getTargets(vRedactionTargets);
+
+ // Put the targets into a JSON array
+ for (const auto& targetPair : vRedactionTargets)
{
aTargetsArray.push_back(std::make_pair("", redactionTargetToJSON(targetPair.first)));
}
@@ -495,7 +509,9 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, SaveHdl, sfx2::FileDialogHelper*, void)
"Exception caught while trying to save the targets JSON to file: " << e.Message);
return;
//TODO: Warn the user with a message box
- }*/
+ }
+
+ LeaveWait();
}
void SfxAutoRedactDialog::StartFileDialog(StartFileDialogType nType, const OUString& rTitle)
@@ -569,6 +585,8 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(vcl::Window* pParent)
m_pTargetsBox = VclPtr<TargetsTable>::Create(*m_pTargetsContainer);
m_pLoadBtn->SetClickHdl(LINK(this, SfxAutoRedactDialog, Load));
+ m_pSaveBtn->SetClickHdl(LINK(this, SfxAutoRedactDialog, Save));
+ m_pDeleteBtn->SetClickHdl(LINK(this, SfxAutoRedactDialog, DeleteHdl));
// Can be used to remmeber the last set of redaction targets?
/*OUString sExtraData;
More information about the Libreoffice-commits
mailing list