summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx2
-rw-r--r--cui/source/options/connpooloptions.cxx2
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx2
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx2
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx2
-rw-r--r--include/svtools/editbrowsebox.hxx33
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx26
-rw-r--r--svtools/source/brwbox/editbrowsebox2.cxx2
-rw-r--r--svx/source/fmcomp/fmgridif.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx2
14 files changed, 45 insertions, 40 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 7fae410c9c4e..74670143d312 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -451,7 +451,7 @@ sal_Int32 lcl_getColumnInDataOrHeader(
} // anonymous namespace
DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ) :
- ::svt::EditBrowseBox( pParent, nStyle, EBBF_SMART_TAB_TRAVEL | EBBF_HANDLE_COLUMN_TEXT, BROWSER_STANDARD_FLAGS ),
+ ::svt::EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::HANDLE_COLUMN_TEXT, nStyle, BROWSER_STANDARD_FLAGS ),
m_nSeekRow( 0 ),
m_bIsReadOnly( false ),
m_bIsDirty( false ),
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index bd71f71c08ab..a025522724c0 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -88,7 +88,7 @@ namespace offapp
DriverListControl::DriverListControl(vcl::Window* _pParent)
- :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, WB_BORDER,
+ :EditBrowseBox(_pParent, EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_BORDER,
BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL | BrowserMode::HIDECURSOR | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT)
,m_aSeekRow(m_aSettings.end())
,m_sYes(CUI_RES(RID_SVXSTR_YES))
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 0ae9329e2f65..0a7035d6f7f6 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -129,7 +129,7 @@ namespace dbaui
// class ORelationControl
ORelationControl::ORelationControl(vcl::Window *pParent)
: EditBrowseBox(pParent,
- EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE,
+ EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT,
WB_TABSTOP | WB_BORDER,
BrowserMode::AUTOSIZE_LASTCOL)
, m_pBoxControl(NULL)
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index d32c49e2a264..b007531d29c0 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -47,7 +47,7 @@ const sal_uInt16 COL_DROP = 8;
// OTableGrantControl
OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits)
- :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, nBits )
+ :EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, nBits )
,m_pCheckCell( NULL )
,m_pEdit( NULL )
,m_nDataPos( 0 )
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index bd9e978265ff..46f20905c59c 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -91,7 +91,7 @@ namespace dbaui
// IndexFieldsControl
IndexFieldsControl::IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle)
- : EditBrowseBox(_pParent, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS)
+ : EditBrowseBox(_pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS)
, m_aSeekRow(m_aFields.end())
, m_pSortingCell(NULL)
, m_pFieldNameCell(NULL)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index dfbbae2d4812..bc01a5c2e87f 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -96,7 +96,7 @@ namespace
}
OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )
- :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BrowserMode::COLUMNSELECTION | BrowserMode::KEEPHIGHLIGHT | BrowserMode::HIDESELECT |
+ :EditBrowseBox( pParent,EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_3DLOOK, BrowserMode::COLUMNSELECTION | BrowserMode::KEEPHIGHLIGHT | BrowserMode::HIDESELECT |
BrowserMode::HIDECURSOR | BrowserMode::HLINES | BrowserMode::VLINES )
,m_nSeekRow(0)
,m_nMaxColumns(0)
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 1bda40e23fd2..a92af1c10353 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::util;
#define HANDLE_ID 0
OTableRowView::OTableRowView(vcl::Window* pParent)
- :EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EBBF_NONE,
+ :EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EditBrowseBoxFlags::NONE,
BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL |
BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | BrowserMode::VLINES)
,m_nDataPos(-1)
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index bc534d72453a..43320ef78185 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -35,24 +35,27 @@
#include <svtools/brwhead.hxx>
#include <svtools/svmedit.hxx>
#include <vcl/svapp.hxx>
+#include <o3tl/typed_flags_set.hxx>
// EditBrowseBoxFlags (EBBF)
-#define EBBF_NONE ((sal_Int32)0x0000)
+enum class EditBrowseBoxFlags
+{
+ NONE = 0x0000,
/** if this bit is _not_ set, the handle column will be invalidated upon
changing the row in the browse box. This is for forcing the row picture to
be repainted. If you do not have row pictures or text, you don't need this
invalidation, then you would specify this bit to prevent flicker
*/
-#define EBBF_NO_HANDLE_COLUMN_CONTENT ((sal_Int32)0x0001)
+ NO_HANDLE_COLUMN_CONTENT = 0x0001,
/** set this bit to activate the cell on a MouseButtonDown, not a MouseButtonUp event
*/
-#define EBBF_ACTIVATE_ON_BUTTONDOWN ((sal_Int32)0x0002)
-/** if this bit is set and EBBF_NO_HANDLE_COLUMN_CONTENT is _not_ set, the handle
+ ACTIVATE_ON_BUTTONDOWN = 0x0002,
+/** if this bit is set and EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT is _not_ set, the handle
column is drawn with the text contained in column 0 instead of an image
*/
-#define EBBF_HANDLE_COLUMN_TEXT ((sal_Int32)0x0004)
+ HANDLE_COLUMN_TEXT = 0x0004,
/** If this bit is set, tab traveling is somewhat modified<br/>
If the control gets the focus because the user pressed the TAB key, then the
@@ -61,11 +64,13 @@
@see Window::GetGetFocusFlags
@see GETFOCUS_*
*/
-#define EBBF_SMART_TAB_TRAVEL ((sal_Int32)0x0008)
-
-/// @deprecated
-#define EBBF_NOROWPICTURE EBBF_NO_HANDLE_COLUMN_CONTENT
+ SMART_TAB_TRAVEL = 0x0008,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<EditBrowseBoxFlags> : is_typed_flags<EditBrowseBoxFlags, 0x0f> {};
+}
class Edit;
@@ -488,7 +493,7 @@ namespace svt
CheckBoxControl* pCheckBoxPaint;
- sal_Int32 m_nBrowserFlags;
+ EditBrowseBoxFlags m_nBrowserFlags;
ImageList m_aStatusImages;
::std::unique_ptr< EditBrowseBoxImpl> m_aImpl;
@@ -590,8 +595,8 @@ namespace svt
// secure starting of StartEditHdl
public:
- EditBrowseBox(vcl::Window* pParent, sal_Int32 nBrowserFlags = EBBF_NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = BrowserMode::NONE );
- EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = BrowserMode::NONE );
+ EditBrowseBox(vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = BrowserMode::NONE );
+ EditBrowseBox(vcl::Window* pParent, const ResId& rId, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, BrowserMode nMode = BrowserMode::NONE );
virtual ~EditBrowseBox();
bool IsEditing() const {return aController.Is();}
@@ -604,8 +609,8 @@ namespace svt
virtual void Dispatch(sal_uInt16 nId);
CellControllerRef Controller() const { return aController; }
- sal_Int32 GetBrowserFlags() const { return m_nBrowserFlags; }
- void SetBrowserFlags(sal_Int32 nFlags);
+ EditBrowseBoxFlags GetBrowserFlags() const { return m_nBrowserFlags; }
+ void SetBrowserFlags(EditBrowseBoxFlags nFlags);
virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true);
virtual void DeactivateCell(bool bUpdate = true);
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 6b20efa6c1da..d420b3611531 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -165,7 +165,7 @@ public:
// class OFieldExpressionControl
OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent)
- :EditBrowseBox( _pParent, EBBF_NONE, WB_TABSTOP,
+ :EditBrowseBox( _pParent, EditBrowseBoxFlags::NONE, WB_TABSTOP,
BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL |
BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | BrowserMode::VLINES)
,m_aGroupPositions(GROUPS_START_LEN,-1)
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index cf045780561c..c9b762d4d461 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -133,7 +133,7 @@ namespace svt
}
- EditBrowseBox::EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode )
+ EditBrowseBox::EditBrowseBox(vcl::Window* pParent, const ResId& rId, EditBrowseBoxFlags nBrowserFlags, BrowserMode _nMode )
:BrowseBox( pParent, rId, _nMode )
,nStartEvent(0)
,nEndEvent(0)
@@ -154,7 +154,7 @@ namespace svt
}
- EditBrowseBox::EditBrowseBox( vcl::Window* pParent, sal_Int32 nBrowserFlags, WinBits nBits, BrowserMode _nMode )
+ EditBrowseBox::EditBrowseBox( vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags, WinBits nBits, BrowserMode _nMode )
:BrowseBox( pParent, nBits, _nMode )
,nStartEvent(0)
,nEndEvent(0)
@@ -339,13 +339,13 @@ namespace svt
return;
RowStatus eStatus = GetRowStatus( nPaintRow );
- sal_Int32 nBrowserFlags = GetBrowserFlags();
+ EditBrowseBoxFlags nBrowserFlags = GetBrowserFlags();
- if (nBrowserFlags & EBBF_NO_HANDLE_COLUMN_CONTENT)
+ if (nBrowserFlags & EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT)
return;
// draw the text of the header column
- if (nBrowserFlags & EBBF_HANDLE_COLUMN_TEXT )
+ if (nBrowserFlags & EditBrowseBoxFlags::HANDLE_COLUMN_TEXT )
{
rDev.DrawText( rRect, GetCellText( nPaintRow, 0 ),
TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_CLIP );
@@ -509,7 +509,7 @@ namespace svt
BrowseBox::MouseButtonDown(rEvt);
aMouseEvent.Clear();
- if (0 != (m_nBrowserFlags & EBBF_ACTIVATE_ON_BUTTONDOWN))
+ if (m_nBrowserFlags & EditBrowseBoxFlags::ACTIVATE_ON_BUTTONDOWN)
{
// the base class does not travel upon MouseButtonDown, but implActivateCellOnMouseEvent assumes we traveled ...
GoToRowColumnId( rEvt.GetRow(), rEvt.GetColumnId() );
@@ -529,7 +529,7 @@ namespace svt
BrowseBox::MouseButtonUp(rEvt);
aMouseEvent.Clear();
- if (0 == (m_nBrowserFlags & EBBF_ACTIVATE_ON_BUTTONDOWN))
+ if (!(m_nBrowserFlags & EditBrowseBoxFlags::ACTIVATE_ON_BUTTONDOWN))
if (rEvt.GetRow() >= 0)
implActivateCellOnMouseEvent(rEvt, true);
}
@@ -917,13 +917,13 @@ namespace svt
if (nNewRow != nEditRow)
{
vcl::Window& rWindow = GetDataWindow();
- if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0)
+ if ((nEditRow >= 0) && !(GetBrowserFlags() & EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT))
{
Rectangle aRect = GetFieldRectPixel(nEditRow, 0, false );
// status cell should be painted if and only if text is displayed
// note: bPaintStatus is mutable, but Solaris has problems with assigning
// probably because it is part of a bitfield
- pTHIS->bPaintStatus = ( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT;
+ pTHIS->bPaintStatus = ( GetBrowserFlags() & EditBrowseBoxFlags::HANDLE_COLUMN_TEXT ) == EditBrowseBoxFlags::HANDLE_COLUMN_TEXT;
rWindow.Invalidate(aRect);
pTHIS->bPaintStatus = true;
}
@@ -980,7 +980,7 @@ namespace svt
long nNewRow = GetCurRow();
if (nEditRow != nNewRow)
{
- if ((GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0)
+ if (!(GetBrowserFlags() & EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT))
InvalidateStatusCell(nNewRow);
nEditRow = nNewRow;
}
@@ -1309,13 +1309,13 @@ namespace svt
}
- void EditBrowseBox::SetBrowserFlags(sal_Int32 nFlags)
+ void EditBrowseBox::SetBrowserFlags(EditBrowseBoxFlags nFlags)
{
if (m_nBrowserFlags == nFlags)
return;
- bool RowPicturesChanges = ((m_nBrowserFlags & EBBF_NO_HANDLE_COLUMN_CONTENT) !=
- (nFlags & EBBF_NO_HANDLE_COLUMN_CONTENT));
+ bool RowPicturesChanges = ((m_nBrowserFlags & EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT) !=
+ (nFlags & EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT));
m_nBrowserFlags = nFlags;
if (RowPicturesChanges)
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 79d554f00dd2..e3c6d3444a49 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -145,7 +145,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags )
{
bHasFocus = bFocus;
- if ( GetBrowserFlags( ) & EBBF_SMART_TAB_TRAVEL )
+ if ( GetBrowserFlags( ) & EditBrowseBoxFlags::SMART_TAB_TRAVEL )
{
if ( bHasFocus // we got the focus
&& ( _nGetFocusFlags & GETFOCUS_TAB ) // using the TAB key
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 67c12f9efd1d..a3955d0d52bd 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2437,8 +2437,8 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn)
void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception )
{
FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow());
- sal_Int32 nOldFlags = pGrid->GetBrowserFlags();
- pGrid->SetBrowserFlags(nOldFlags | EBBF_NOROWPICTURE);
+ EditBrowseBoxFlags nOldFlags = pGrid->GetBrowserFlags();
+ pGrid->SetBrowserFlags(nOldFlags | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT);
VCLXWindow::draw(x, y);
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d44ca658801f..f419f6280bdf 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -865,7 +865,7 @@ DbGridControl::DbGridControl(
Reference< XComponentContext > _rxContext,
vcl::Window* pParent,
WinBits nBits)
- :DbGridControl_Base(pParent, EBBF_NONE, nBits, DEFAULT_BROWSE_MODE )
+ :DbGridControl_Base(pParent, EditBrowseBoxFlags::NONE, nBits, DEFAULT_BROWSE_MODE )
,m_xContext(_rxContext)
,m_aBar(this)
,m_nAsynAdjustEvent(0)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 2e7a0195d3f6..b086d92da3d7 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3696,7 +3696,7 @@ void SwTOXStylesTabPage::Modify()
#define ITEM_WORDONLY 7
SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder)
- : SwEntryBrowseBox_Base( pParent, EBBF_NONE, WB_TABSTOP | WB_BORDER,
+ : SwEntryBrowseBox_Base( pParent, EditBrowseBoxFlags::NONE, WB_TABSTOP | WB_BORDER,
BrowserMode::KEEPHIGHLIGHT |
BrowserMode::COLUMNSELECTION |
BrowserMode::MULTISELECTION |
generated by cgit (git 2.34.1) at 2024-07-03 00:46:19 +0000