extensions/source/abpilot/fieldmappingimpl.cxx | 2 +-
svx/source/tbxctrls/colorwindow.hxx | 1 -
svx/source/tbxctrls/tbcontrl.cxx | 17 -----------------
vcl/source/window/brdwin.cxx | 6 +++---
vcl/source/window/floatwin.cxx | 3 +--
5 files changed, 5 insertions(+), 24 deletions(-)
New commits:
commit ede822998331d75f1a17d86d609cb732d880accd
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jun 2 12:51:10 2016 +0100
DataAccess.xcs says xs:short not xs:int for this type
noticed when examing tdf#96251
Change-Id: Iec8748ad323bcb59e8e1f6b4135b4a3b313a6e44
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx
b/extensions/source/abpilot/fieldmappingimpl.cxx
index 921a126..a4f1c53 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -293,7 +293,7 @@ namespace abp
aAddressBookSettings.setNodeValue( OUString( "DataSourceName" ),
makeAny( _rDataSourceName ) );
aAddressBookSettings.setNodeValue( OUString( "Command" ), makeAny(
_rTableName ) );
- aAddressBookSettings.setNodeValue( OUString( "CommandType" ),
makeAny( (sal_Int32)CommandType::TABLE ) );
+ aAddressBookSettings.setNodeValue( OUString( "CommandType" ),
makeAny( (sal_Int16)CommandType::TABLE ) );
// commit the changes done
aAddressBookSettings.commit();
commit 9f68bd964d7aacd52ce601b96909a964547af600
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jun 2 12:28:18 2016 +0100
these overrides just call only their parent version
looks like the sort of simplfication that could be automated
Change-Id: I29ce13fe1b98e99be096e44239b971f6971c5f98
diff --git a/svx/source/tbxctrls/colorwindow.hxx
b/svx/source/tbxctrls/colorwindow.hxx
index c18834f..c2ffb56 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -61,7 +61,6 @@ private:
protected:
virtual void Resize() override;
- virtual bool Close() override;
public:
SvxColorWindow_Impl( const OUString& rCommand,
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 49da834..b0c2596 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -258,7 +258,6 @@ private:
protected:
virtual void Resize() override;
- virtual bool Close() override;
virtual void GetFocus() override;
public:
@@ -283,7 +282,6 @@ private:
protected:
virtual void Resize() override;
- virtual bool Close() override;
virtual void GetFocus() override;
public:
SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame,
vcl::Window* pParentWindow );
@@ -1458,11 +1456,6 @@ void SvxColorWindow_Impl::StartSelection()
mpColorSet->StartSelection();
}
-bool SvxColorWindow_Impl::Close()
-{
- return SfxPopupWindow::Close();
-}
-
void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
if ( nSID == SID_COLOR_TABLE )
@@ -1850,11 +1843,6 @@ void SvxFrameWindow_Impl::StartSelection()
aFrameSet->StartSelection();
}
-bool SvxFrameWindow_Impl::Close()
-{
- return SfxPopupWindow::Close();
-}
-
static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
{
return SvxBorderLine::threeDMediumColor( aMain );
@@ -2030,11 +2018,6 @@ void SvxLineWindow_Impl::Resize()
m_aLineStyleLb->Resize();
}
-bool SvxLineWindow_Impl::Close()
-{
- return SfxPopupWindow::Close();
-}
-
void SvxLineWindow_Impl::GetFocus()
{
if ( m_aLineStyleLb )
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 28583f5..dd8a8ae 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -957,9 +957,9 @@ bool ImplStdBorderWindowView::Tracking( const
TrackingEvent& rTEvt )
{
// dispatch to correct window type (why is Close() not
virtual ??? )
// TODO: make Close() virtual
- VclPtr<vcl::Window> pWin =
pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
- SystemWindow *pSysWin = dynamic_cast<SystemWindow*
>(pWin.get());
- DockingWindow *pDockWin =
dynamic_cast<DockingWindow*>(pWin.get());
+ vcl::Window *pWin =
pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
+ SystemWindow *pSysWin = dynamic_cast<SystemWindow*
>(pWin);
+ DockingWindow *pDockWin =
dynamic_cast<DockingWindow*>(pWin);
if ( pSysWin )
pSysWin->Close();
else if ( pDockWin )
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index d130466..82283c9 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -569,7 +569,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const
vcl::Window* pWindow )
IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void)
{
- VclPtr<FloatingWindow> xThis(this);
+ VclPtr<FloatingWindow> pThis(this);
mnPostId = nullptr;
mnPopupModeFlags = FloatWinPopupFlags::NONE;
mbPopupMode = false;
@@ -590,7 +590,6 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) )
{
- VclPtr<FloatingWindow> xThis(this);
Close();
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
