diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svdibrow.hxx | 2 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 6 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index e735cee9db59..defb0e260df1 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -55,7 +55,7 @@ friend class ImpItemEdit; virtual long GetRowCount() const override; virtual bool SeekRow(long nRow) override; - virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override; + virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override; virtual void DoubleClick(const BrowserMouseEvent&) override; virtual void KeyInput(const KeyEvent& rEvt) override; virtual void Select() override; diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index e9bbaed89a6e..b0fa861ed605 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3897,7 +3897,7 @@ void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XI } -void SAL_CALL FmXCheckBoxCell::setState( short n ) +void SAL_CALL FmXCheckBoxCell::setState( sal_Int16 n ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3909,14 +3909,14 @@ void SAL_CALL FmXCheckBoxCell::setState( short n ) } -short SAL_CALL FmXCheckBoxCell::getState() +sal_Int16 SAL_CALL FmXCheckBoxCell::getState() { ::osl::MutexGuard aGuard( m_aMutex ); if (m_pBox) { UpdateFromColumn(); - return static_cast<short>(m_pBox->GetState()); + return static_cast<sal_Int16>(m_pBox->GetState()); } return TRISTATE_INDET; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b2c137b038cf..c73bb9b01e10 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -594,7 +594,7 @@ namespace svxform } - SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos ) + SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uLong nRelPos ) { // insert current entry diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index d1e1be7a8e1d..0dd39a03ce9d 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -378,7 +378,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent) } bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, - short nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) + sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) { bool bRet=false; UnmarkAllObj(); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 4e3f67431c22..ff07bd88e8ad 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -328,7 +328,7 @@ OUString SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) cons return sRet; } -void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const +void SdrItemBrowserControl::PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const { if (nCurrentPaintRow<0 || static_cast<std::size_t>(nCurrentPaintRow)>=aList.size()) { return; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 2441f6dc778e..7d38f60d1e12 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1268,7 +1268,7 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, bool bReuseParentForPicker, - std::function<void(const OUString&, const NamedColor&)> const & aFunction): + ColorSelectFunction const & aFunction): ToolbarPopup( rFrame, pParentWindow, "palette_popup_window", "svx/ui/oldcolorwindow.ui" ), theSlotId( nSlotId ), @@ -1382,7 +1382,7 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager weld::Window* pParentWindow, weld::MenuButton* pMenuButton, bool bInterimBuilder, - std::function<void(const OUString&, const NamedColor&)> const & aFunction) + ColorSelectFunction const & aFunction) : ToolbarPopupBase(rFrame) , m_xBuilder(bInterimBuilder ? Application::CreateInterimBuilder(pMenuButton, "svx/ui/colorwindow.ui") : Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui")) |