mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfx2 classification toolbar: set state of all listboxes on status change

Browse Source 
With this the listboxes reflect the state of the document after load.
This also means that the only difference between the first listbox and
the remaining ones is the first one influences the UI as well, but
everything else is implemented.

Change-Id: Ibea0e2fbc431f7327342fd8c2a1d31c34b73d6a8
Reviewed-on: https://gerrit.libreoffice.org/25188
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-05-20 09:37:21 +02:00
parent 72edb6967f
commit 5840c2787c
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sfx2/classificationhelper.hxx
View File

@@ -58,7 +58,8 @@ public:
SfxClassificationHelper(const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties);
~SfxClassificationHelper();
const OUString& GetBACName();
/// Get the currently selected category for eType.
const OUString& GetBACName(SfxClassificationPolicyType eType);
/// Return all possible valid category names, based on the policy.
std::vector<OUString> GetBACNames();
/// Setting this sets all the other properties, based on the policy.

23
sfx2/source/view/classificationcontroller.cxx
View File

@@ -208,16 +208,29 @@ void ClassificationCategoriesController::statusChanged(const frame::FeatureState
}
// Restore state based on the doc. model.
VclPtr<ListBox> pCategories = m_pClassification->getCategories(SfxClassificationPolicyType::IntellectualProperty);
const OUString& rCategoryName = aHelper.GetBACName();
if (!rCategoryName.isEmpty())
pCategories->SelectEntry(rCategoryName);
for (size_t i = m_pClassification->getLabelsSize(); i > 0; --i)
{
auto eType = static_cast<SfxClassificationPolicyType>(i);
const OUString& rCategoryName = aHelper.GetBACName(eType);
if (!rCategoryName.isEmpty())
{
VclPtr<ListBox> pCategories = m_pClassification->getCategories(eType);
pCategories->SelectEntry(rCategoryName);
}
}
}
void ClassificationCategoriesController::removeEntries()
{
if (m_pClassification)
m_pClassification->getCategories(SfxClassificationPolicyType::IntellectualProperty)->Clear();
{
for (size_t i = m_pClassification->getLabelsSize(); i > 0; --i)
{
auto eType = static_cast<SfxClassificationPolicyType>(i);
VclPtr<ListBox> pCategories = m_pClassification->getCategories(eType);
pCategories->Clear();
}
}
}
ClassificationControl::ClassificationControl(vcl::Window* pParent)

6
sfx2/source/view/classificationhelper.cxx
View File

@@ -542,9 +542,9 @@ SfxClassificationHelper::~SfxClassificationHelper()
{
}
const OUString& SfxClassificationHelper::GetBACName()
const OUString& SfxClassificationHelper::GetBACName(SfxClassificationPolicyType eType)
{
return m_pImpl->m_aCategory[SfxClassificationPolicyType::IntellectualProperty].m_aName;
return m_pImpl->m_aCategory[eType].m_aName;
}
bool SfxClassificationHelper::HasImpactLevel()
@@ -765,7 +765,7 @@ void SfxClassificationHelper::SetBACName(const OUString& rName, SfxClassificatio
void SfxClassificationHelper::UpdateInfobar(SfxViewFrame& rViewFrame)
{
OUString aBACName = GetBACName();
OUString aBACName = GetBACName(SfxClassificationPolicyType::IntellectualProperty);
bool bImpactLevel = HasImpactLevel();
if (!aBACName.isEmpty() && bImpactLevel)
{