summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-07-05 19:59:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-07-06 14:52:35 +0200
commit024bdf31b17814c1c96d7376ac77564a9361be65 (patch)
treefb9bc4e3f7412f03ac90a9e279affe65e4a6c813 /svx
parent35a6e10a42408331de5be54a878a8ee200f0743f (diff)
clarify that the parent is always a BrowserDataWin
Change-Id: I64aac74902c631e41fd54d7e198276885e2c4378 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/gridcell.cxx33
-rw-r--r--svx/source/inc/gridcell.hxx30
2 files changed, 29 insertions, 34 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 098ae2e3356b..5a5fc1ed314a 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -825,7 +825,6 @@ void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxMode
}
}
-
void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel )
{
DBG_ASSERT( m_pWindow, "DbCellControl::implAdjustEnabled: not to be called without window!" );
@@ -838,8 +837,7 @@ void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel
}
}
-
-void DbCellControl::Init( vcl::Window& rParent, const Reference< XRowSet >& _rxCursor )
+void DbCellControl::Init(BrowserDataWin& rParent, const Reference< XRowSet >& _rxCursor)
{
ImplInitWindow( rParent, InitWindowFacet::All );
@@ -1060,7 +1058,7 @@ DbTextField::~DbTextField( )
m_pEdit.reset();
}
-void DbTextField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor)
+void DbTextField::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1);
@@ -1243,7 +1241,7 @@ DbFormattedField::~DbFormattedField()
{
}
-void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor)
+void DbFormattedField::Init( BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1);
@@ -1634,7 +1632,7 @@ namespace
}
-void DbCheckBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor )
+void DbCheckBox::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
setTransparent( true );
@@ -1767,8 +1765,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe
static_cast< PatternField* >( m_pPainter.get() )->SetStrictFormat( bStrict );
}
-
-void DbPatternField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor)
+void DbPatternField::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
m_rColumn.SetAlignmentFromModel(-1);
@@ -1781,13 +1778,11 @@ void DbPatternField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCu
DbCellControl::Init( rParent, xCursor );
}
-
CellControllerRef DbPatternField::CreateController() const
{
return new SpinCellController( static_cast< PatternField* >( m_pWindow.get() ) );
}
-
OUString DbPatternField::impl_formatText( const OUString& _rText )
{
m_pPainter->SetText( _rText );
@@ -1851,7 +1846,7 @@ DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign )
{
}
-void DbSpinField::Init( vcl::Window& _rParent, const Reference< XRowSet >& _rxCursor )
+void DbSpinField::Init(BrowserDataWin& _rParent, const Reference< XRowSet >& _rxCursor)
{
m_rColumn.SetAlignmentFromModel( m_nStandardAlign );
@@ -1944,7 +1939,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
rPaintFormatter.SetFormat( sFormatString, aAppLanguage );
}
-VclPtr<Control> DbNumericField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
+VclPtr<Control> DbNumericField::createField(BrowserDataWin* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/)
{
WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
return VclPtr<DoubleNumericField>::Create( _pParent, _nFieldStyle );
@@ -2072,7 +2067,7 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS
static_cast< LongCurrencyField* >( m_pPainter.get() )->SetStrictFormat( bStrict );
}
-VclPtr<Control> DbCurrencyField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
+VclPtr<Control> DbCurrencyField::createField(BrowserDataWin* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
{
WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
return VclPtr<LongCurrencyField>::Create( _pParent, _nFieldStyle );
@@ -2177,7 +2172,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn )
doPropertyListening( FM_PROP_DATE_SHOW_CENTURY );
}
-VclPtr<Control> DbDateField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& _rxModel )
+VclPtr<Control> DbDateField::createField(BrowserDataWin* _pParent, bool bSpinButton, const Reference< XPropertySet >& _rxModel )
{
WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
// check if there is a DropDown property set to TRUE
@@ -2304,7 +2299,7 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn )
doPropertyListening( FM_PROP_STRICTFORMAT );
}
-VclPtr<Control> DbTimeField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
+VclPtr<Control> DbTimeField::createField(BrowserDataWin* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
{
WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
return VclPtr<TimeField>::Create( _pParent, _nFieldStyle );
@@ -2445,7 +2440,7 @@ void DbComboBox::implAdjustGenericFieldSetting(const Reference<XPropertySet>&)
// we no longer pay attention to FM_PROP_LINECOUNT
}
-void DbComboBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor )
+void DbComboBox::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
m_rColumn.SetAlignmentFromModel(css::awt::TextAlign::LEFT);
@@ -2559,7 +2554,7 @@ void DbListBox::SetList(const Any& rItems)
}
}
-void DbListBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor)
+void DbListBox::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
m_rColumn.SetAlignment(css::awt::TextAlign::LEFT);
@@ -2712,7 +2707,7 @@ void DbFilterField::SetList(const Any& rItems, bool bComboBox)
}
}
-void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< css::beans::XPropertySet >& xModel)
+void DbFilterField::CreateControl(BrowserDataWin* pParent, const Reference< css::beans::XPropertySet >& xModel)
{
switch (m_nControlClass)
{
@@ -2763,7 +2758,7 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< css::be
}
-void DbFilterField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor )
+void DbFilterField::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCursor)
{
Reference< css::beans::XPropertySet > xModel(m_rColumn.getModel());
m_rColumn.SetAlignment(css::awt::TextAlign::LEFT);
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index f63f2466b720..64fc8a9c0e11 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -277,7 +277,7 @@ public:
void SetTextLineColor(const Color& _rColor);
// initializing before a control is displayed
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor );
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor );
virtual ::svt::CellControllerRef CreateController() const = 0;
// writing the value into the model
@@ -392,7 +392,7 @@ public:
::svt::IEditImplementation* GetEditImplementation() { return m_pEdit.get(); }
bool IsSimpleEdit() const { return m_bIsSimpleEdit; }
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -415,7 +415,7 @@ public:
DbFormattedField(DbGridColumn& _rColumn);
virtual ~DbFormattedField() override;
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -437,7 +437,7 @@ class DbCheckBox : public DbCellControl
public:
DbCheckBox(DbGridColumn& _rColumn);
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
virtual void PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rRect,
@@ -458,7 +458,7 @@ class DbComboBox : public DbCellControl
public:
DbComboBox(DbGridColumn& _rColumn);
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -485,7 +485,7 @@ class DbListBox :public DbCellControl
public:
DbListBox(DbGridColumn& _rColumn);
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -508,7 +508,7 @@ class DbPatternField : public DbCellControl
{
public:
DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext );
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -541,12 +541,12 @@ protected:
DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = css::awt::TextAlign::RIGHT );
public:
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& _rxCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& _rxCursor ) override;
virtual ::svt::CellControllerRef CreateController() const override;
protected:
virtual VclPtr<Control> createField(
- vcl::Window* _pParent,
+ BrowserDataWin* _pParent,
bool bSpinButton,
const css::uno::Reference< css::beans::XPropertySet >& _rxModel
) = 0;
@@ -567,7 +567,7 @@ protected:
// DbSpinField
virtual VclPtr<Control> createField(
- vcl::Window* _pParent,
+ BrowserDataWin* _pParent,
bool bSpinButton,
const css::uno::Reference< css::beans::XPropertySet >& _rxModel
) override;
@@ -591,7 +591,7 @@ protected:
// DbSpinField
virtual VclPtr<Control> createField(
- vcl::Window* _pParent,
+ BrowserDataWin* _pParent,
bool bSpinButton,
const css::uno::Reference< css::beans::XPropertySet >& _rxModel
) override;
@@ -619,7 +619,7 @@ protected:
// DbSpinField
virtual VclPtr<Control> createField(
- vcl::Window* _pParent,
+ BrowserDataWin* _pParent,
bool bSpinButton,
const css::uno::Reference< css::beans::XPropertySet >& _rxModel
) override;
@@ -643,7 +643,7 @@ protected:
// DbSpinField
virtual VclPtr<Control> createField(
- vcl::Window* _pParent,
+ BrowserDataWin* _pParent,
bool bSpinButton,
const css::uno::Reference< css::beans::XPropertySet >& _rxModel
) override;
@@ -661,7 +661,7 @@ public:
DbFilterField(const css::uno::Reference< css::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn);
virtual ~DbFilterField() override;
- virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
+ virtual void Init( BrowserDataWin& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual ::svt::CellControllerRef CreateController() const override;
virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect) override;
virtual void Update() override;
@@ -679,7 +679,7 @@ private:
virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
void SetList(const css::uno::Any& rItems, bool bComboBox);
- void CreateControl(vcl::Window* pParent, const css::uno::Reference< css::beans::XPropertySet >& xModel);
+ void CreateControl(BrowserDataWin* pParent, const css::uno::Reference< css::beans::XPropertySet >& xModel);
DECL_LINK( OnClick, VclPtr<CheckBox>, void );
css::uno::Sequence< OUString > m_aValueList;