summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/options/fontsubs.cxx4
-rw-r--r--cui/source/options/optfltr.cxx8
-rw-r--r--cui/source/options/optlingu.cxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx14
-rw-r--r--include/svtools/svtabbx.hxx4
-rw-r--r--include/svtools/treelistbox.hxx12
-rw-r--r--include/svx/checklbx.hxx3
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx2
-rw-r--r--sd/source/ui/dlg/dlgassim.cxx2
-rw-r--r--svtools/source/contnr/svlbitm.cxx10
-rw-r--r--svtools/source/contnr/treelistbox.cxx2
12 files changed, 36 insertions, 37 deletions
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index c6f906902987..80b11f4dc149 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -126,8 +126,8 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF
pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom!
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont1));
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont2));
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 03262fb2bb53..5280ae3930df 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -339,12 +339,12 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType,
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
new SvLBoxContextBmp(Image(), Image(), false)));
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
- new SvLBoxButton(loadEnabled ? SvLBoxButtonKind_enabledCheckbox
- : SvLBoxButtonKind_disabledCheckbox,
+ new SvLBoxButton(loadEnabled ? SvLBoxButtonKind::EnabledCheckbox
+ : SvLBoxButtonKind::DisabledCheckbox,
pCheckButtonData)));
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
- new SvLBoxButton(saveEnabled ? SvLBoxButtonKind_enabledCheckbox
- : SvLBoxButtonKind_disabledCheckbox,
+ new SvLBoxButton(saveEnabled ? SvLBoxButtonKind::EnabledCheckbox
+ : SvLBoxButtonKind::DisabledCheckbox,
pCheckButtonData)));
pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(_rTxt)));
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index e25312724918..450f0eca0526 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1783,7 +1783,7 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol )
pCheckButtonData = new SvLBoxButtonData(m_pLinguOptionsCLB);
if (CBCOL_FIRST == nCol)
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
if (CBCOL_SECOND == nCol)
pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); // empty column
pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
@@ -1912,7 +1912,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol
}
if (CBCOL_FIRST == nCol)
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
if (CBCOL_SECOND == nCol)
pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); // empty column
pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e5b29cfe6814..543341a8d281 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -477,12 +477,12 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16
if (nCol == CBCOL_SECOND)
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
else
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
if (nCol == CBCOL_FIRST)
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
else
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
pEntry->AddItem(o3tl::make_unique<OfaImpBrwString>(rTxt));
return pEntry;
@@ -1806,12 +1806,12 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol)
if (nCol == CBCOL_SECOND)
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
else
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
if (nCol == CBCOL_FIRST)
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
else
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, pCheckButtonData));
pEntry->AddItem(o3tl::make_unique<OfaImpBrwString>(rTxt));
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 329459e56502..624a64d987fc 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -671,7 +671,7 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
if ( p->m_eKind == ENABLED_UPDATE )
{
RemoveEntry( nEntryPos );
- m_dialog.addAdditional( p, SvLBoxButtonKind_disabledCheckbox );
+ m_dialog.addAdditional( p, SvLBoxButtonKind::DisabledCheckbox );
}
if ( aCmd == CMD_IGNORE_UPDATE )
m_dialog.setIgnoredUpdate( p, true, false );
@@ -685,7 +685,7 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
if ( p->m_eKind == ENABLED_UPDATE )
{
RemoveEntry( nEntryPos );
- m_dialog.insertItem( p, SvLBoxButtonKind_enabledCheckbox );
+ m_dialog.insertItem( p, SvLBoxButtonKind::EnabledCheckbox );
}
m_dialog.setIgnoredUpdate( p, false, false );
}
@@ -738,11 +738,11 @@ void UpdateDialog::addEnabledUpdate( OUString const & name,
if ( ! isIgnoredUpdate( pEntry ) )
{
- sal_uInt16 nPos = insertItem( pEntry, SvLBoxButtonKind_enabledCheckbox );
+ sal_uInt16 nPos = insertItem( pEntry, SvLBoxButtonKind::EnabledCheckbox );
m_pUpdates->CheckEntryPos( nPos );
}
else
- addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
+ addAdditional( pEntry, SvLBoxButtonKind::DisabledCheckbox );
m_pUpdate->Enable();
m_pUpdates->Enable();
@@ -763,7 +763,7 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
m_ListboxEntries.push_back( pEntry );
isIgnoredUpdate( pEntry );
- addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
+ addAdditional( pEntry, SvLBoxButtonKind::DisabledCheckbox );
}
@@ -778,7 +778,7 @@ void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
m_specificErrors.push_back( data );
m_ListboxEntries.push_back( pEntry );
- addAdditional( pEntry, SvLBoxButtonKind_staticImage);
+ addAdditional( pEntry, SvLBoxButtonKind::StaticImage);
}
void UpdateDialog::checkingDone() {
@@ -1248,7 +1248,7 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, allHandler, CheckBox&, void)
i != m_ListboxEntries.end(); ++i )
{
if ( (*i)->m_bIgnored || ( (*i)->m_eKind != ENABLED_UPDATE ) )
- insertItem( (*i), SvLBoxButtonKind_disabledCheckbox );
+ insertItem( (*i), SvLBoxButtonKind::DisabledCheckbox );
}
}
else
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 6d4f6e500093..bf86082484df 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -76,7 +76,7 @@ public:
virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = nullptr,
bool bChildrenOnDemand = false,
sal_uLong nPos=TREELIST_APPEND, void* pUserData = nullptr,
- SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) override;
+ SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox ) override;
virtual SvTreeListEntry* InsertEntry( const OUString& rText,
const Image& rExpandedEntryBmp,
@@ -84,7 +84,7 @@ public:
SvTreeListEntry* pParent = nullptr,
bool bChildrenOnDemand = false,
sal_uLong nPos = TREELIST_APPEND, void* pUserData = nullptr,
- SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) override;
+ SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox ) override;
virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = nullptr );
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index c365f041e21a..a161d6125582 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -59,11 +59,11 @@ namespace utl {
class AccessibleStateSetHelper;
}
-enum SvLBoxButtonKind
+enum class SvLBoxButtonKind
{
- SvLBoxButtonKind_enabledCheckbox,
- SvLBoxButtonKind_disabledCheckbox,
- SvLBoxButtonKind_staticImage
+ EnabledCheckbox,
+ DisabledCheckbox,
+ StaticImage
};
enum SvButtonState { SV_BUTTON_UNCHECKED, SV_BUTTON_CHECKED, SV_BUTTON_TRISTATE };
@@ -649,7 +649,7 @@ public:
virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = nullptr,
bool bChildrenOnDemand = false,
sal_uLong nPos=TREELIST_APPEND, void* pUserData = nullptr,
- SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
+ SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox );
virtual SvTreeListEntry* InsertEntry( const OUString& rText,
const Image& rExpandedEntryBmp,
@@ -657,7 +657,7 @@ public:
SvTreeListEntry* pParent = nullptr,
bool bChildrenOnDemand = false,
sal_uLong nPos = TREELIST_APPEND, void* pUserData = nullptr,
- SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
+ SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox );
const Image& GetDefaultExpandedEntryBmp( ) const;
const Image& GetDefaultCollapsedEntryBmp( ) const;
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index 0e0e87201160..cad5b4a17174 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -51,8 +51,7 @@ public:
void InsertEntry ( const OUString& rStr,
sal_uLong nPos = TREELIST_APPEND,
void* pUserData = nullptr,
- SvLBoxButtonKind eButtonKind =
- SvLBoxButtonKind_enabledCheckbox );
+ SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox );
void RemoveEntry ( sal_uLong nPos );
void SelectEntryPos ( sal_uLong nPos );
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 18d0663aa965..571e146aa2da 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -265,7 +265,7 @@ void ScSolverOptionsDialog::FillListBox()
// check box entry
pEntry = new SvTreeListEntry;
std::unique_ptr<SvLBoxButton> pButton(new SvLBoxButton(
- SvLBoxButtonKind_enabledCheckbox, mpCheckButtonData));
+ SvLBoxButtonKind::EnabledCheckbox, mpCheckButtonData));
if ( ScUnoHelpFunctions::GetBoolFromAny( aValue ) )
pButton->SetStateChecked();
else
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index fe439cd83f8c..a446f8553cb3 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -95,7 +95,7 @@ SvTreeListEntry* SdPageListControl::InsertPage( const OUString& rPageName )
{
SvTreeListEntry* pEntry = new SvTreeListEntry;
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, m_pCheckButton));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_pCheckButton));
pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom!
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rPageName));
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 9690e664bf23..787bfd0d1676 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -299,7 +299,7 @@ SvLBoxButton::SvLBoxButton()
: SvLBoxItem()
, isVis(false)
, pData(nullptr)
- , eKind(SvLBoxButtonKind_enabledCheckbox)
+ , eKind(SvLBoxButtonKind::EnabledCheckbox)
, nItemFlags(SvItemStateFlags::NONE)
{
SetStateUnchecked();
@@ -332,8 +332,8 @@ void SvLBoxButton::Paint(
const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
const SvViewDataEntry* /*pView*/, const SvTreeListEntry& /*rEntry*/)
{
- SvBmp nIndex = eKind == SvLBoxButtonKind_staticImage ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex(nItemFlags);
- DrawImageFlags nStyle = eKind != SvLBoxButtonKind_disabledCheckbox && rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable;
+ SvBmp nIndex = eKind == SvLBoxButtonKind::StaticImage ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex(nItemFlags);
+ DrawImageFlags nStyle = eKind != SvLBoxButtonKind::DisabledCheckbox && rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable;
//Native drawing
bool bNativeOK = false;
@@ -416,14 +416,14 @@ void SvLBoxButton::InitViewData(SvTreeListBox* pView,SvTreeListEntry* pEntry, Sv
Size aSize( pData->Width(), pData->Height() );
ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
- if ( eKind != SvLBoxButtonKind_staticImage && pView )
+ if ( eKind != SvLBoxButtonKind::StaticImage && pView )
ImplAdjustBoxSize(aSize, eCtrlType, *pView);
pViewData->maSize = aSize;
}
bool SvLBoxButton::CheckModification() const
{
- return eKind == SvLBoxButtonKind_enabledCheckbox;
+ return eKind == SvLBoxButtonKind::EnabledCheckbox;
}
void SvLBoxButton::SetStateInvisible()
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 40127142d607..f0bec8a23d77 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1980,7 +1980,7 @@ SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource )
OUString aStr;
Image aCollEntryBmp;
Image aExpEntryBmp;
- SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox;
+ SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox;
SvLBoxString* pStringItem = static_cast<SvLBoxString*>(pSource->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
if( pStringItem )
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 11:23:16 +0000