[Libreoffice-commits] core.git: dbaccess/source include/svtools svtools/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Oct 21 06:19:17 UTC 2016
dbaccess/source/ui/inc/sbagrid.hxx | 3 ---
include/svtools/editbrowsebox.hxx | 1 -
include/svtools/fileview.hxx | 1 -
include/svtools/headbar.hxx | 2 --
include/svtools/imap.hxx | 3 ---
include/svtools/imapobj.hxx | 2 --
include/svtools/ivctrl.hxx | 2 --
include/svtools/toolboxcontroller.hxx | 1 -
include/svtools/treelist.hxx | 1 -
include/svtools/treelistbox.hxx | 3 ---
include/svtools/valueset.hxx | 1 -
svtools/source/brwbox/editbrowsebox.cxx | 7 +------
svtools/source/contnr/fileview.cxx | 2 +-
svtools/source/contnr/ivctrl.cxx | 6 +-----
svtools/source/contnr/treelist.cxx | 7 +------
svtools/source/contnr/treelistbox.cxx | 14 ++------------
svtools/source/control/headbar.cxx | 14 ++------------
svtools/source/control/valueset.cxx | 7 +------
svtools/source/misc/imap.cxx | 4 ++--
svtools/source/uno/toolboxcontroller.cxx | 7 +------
20 files changed, 12 insertions(+), 76 deletions(-)
New commits:
commit 5034914c7a9ad903f8f02cde11d94c7180b62dc9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Oct 20 15:35:44 2016 +0200
loplugin:expandablemethodds in include/svtools
Change-Id: I679b7985861203496813782138d1cf965fbc427b
Reviewed-on: https://gerrit.libreoffice.org/30107
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 5a79761..18e20d5 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -186,9 +186,6 @@ namespace dbaui
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
void ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos);
-
- private:
- using FmGridHeader::StartDrag;
};
// interfaces for communication between the vcl grid control and a controller
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 1f2be5b..90cb12d 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -634,7 +634,6 @@ namespace svt
using Control::ImplInitSettings;
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SVT_DLLPRIVATE void DetermineFocus( const GetFocusFlags _nGetFocusFlags = GetFocusFlags::NONE);
- static inline void HideAndDisable(CellControllerRef& rController);
inline void EnableAndShow() const;
SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp);
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 70c21e1..89b392a 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -100,7 +100,6 @@ public:
const OString& GetHelpId( ) const;
void SetSizePixel( const Size& rNewSize ) override;
virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override;
- void SetSortColumn( bool bValue ) { bSortColumn = bValue; }
/** initialize the view with the content of a folder given by URL, and apply an immediate filter
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index dbe8022..3e1f281 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -283,8 +283,6 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- void StartDrag();
- void Drag();
virtual void EndDrag();
virtual void Select();
virtual void DoubleClick();
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 0538c67..de17d95 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -103,9 +103,6 @@ public:
// deletes all internal objects
void ClearImageMap();
- // returns the current version number
- static sal_uInt16 GetVersion() { return IMAGE_MAP_VERSION; }
-
const OUString& GetName() const { return aName; }
void SetName( const OUString& rName ) { aName = rName; }
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index 54f81d4..b633563 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -87,8 +87,6 @@ public:
bool bActive );
virtual ~IMapObject() {};
- static sal_uInt16 GetVersion() { return IMAP_OBJ_VERSION; }
-
virtual sal_uInt16 GetType() const = 0;
virtual bool IsHit( const Point& rPoint ) const = 0;
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 27779af..023e270 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -261,8 +261,6 @@ public:
bool DoKeyInput( const KeyEvent& rKEvt );
- bool IsEntryEditing() const;
-
sal_Int32 GetEntryCount() const;
SvxIconChoiceCtrlEntry* GetEntry( sal_Int32 nPos ) const;
sal_Int32 GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const;
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 75b1ab2..9325846 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -124,7 +124,6 @@ class SVT_DLLPUBLIC ToolboxController :
protected:
bool getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox );
- void setSupportVisibleProperty(bool bValue);
struct Listener
{
Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) :
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 7bcc858..73dea10 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -216,7 +216,6 @@ public:
{ return aCloneLink; }
SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link
- static SvTreeListEntry* CreateEntry(); // To create Entries
sal_uInt16 GetRefCount() const { return nRefCount; }
void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; }
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 5898ad7..740731c 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -483,8 +483,6 @@ public:
void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; }
- static SvTreeListBox* GetSourceView();
-
virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
virtual SvTreeListEntry* CreateEntry() const; // To create new Entries
@@ -692,7 +690,6 @@ public:
virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) override;
void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) override;
- void ShowTargetEmphasis( SvTreeListEntry*, bool bShow );
void ScrollOutputArea( short nDeltaEntries );
short GetColumnsCount() const { return nColumns; }
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index b676f8d..78cf013 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -298,7 +298,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual void Select();
- void DoubleClick();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
/// Insert @rImage item.
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index d374f81..df1df08 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1010,7 +1010,7 @@ namespace svt
if (bHasFocus)
GrabFocus(); // ensure that we have (and keep) the focus
- HideAndDisable(aOldController);
+ aOldController->suspend();
// update if requested
if (bUpdate)
@@ -1249,11 +1249,6 @@ namespace svt
InvalidateStatusCell(GetCurRow());
}
- inline void EditBrowseBox::HideAndDisable(CellControllerRef& rController)
- {
- rController->suspend();
- }
-
inline void EditBrowseBox::EnableAndShow() const
{
Controller()->resume();
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index b97d2c1..6343ae7 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -980,7 +980,7 @@ SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits,
mpImpl.reset( new SvtFileView_Impl( this, xCmdEnv, nFlags, bOnlyFolder ) );
mpImpl->mpView->ForbidEmptyText();
- SetSortColumn( true );
+ bSortColumn = true;
HeaderBar* pHeaderBar = mpImpl->mpView->GetHeaderBar();
pHeaderBar->SetSelectHdl( LINK( this, SvtFileView, HeaderSelect_Impl ) );
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 2ded15f..032345a 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -278,10 +278,6 @@ void SvtIconChoiceCtrl::ClickIcon()
GetSelectedEntry();
_aClickIconHdl.Call( this );
}
-bool SvtIconChoiceCtrl::IsEntryEditing() const
-{
- return _pImpl->IsEntryEditing();
-}
void SvtIconChoiceCtrl::SetChoiceWithCursor()
{
@@ -301,7 +297,7 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
{
// under OS/2, we get key up/down even while editing
- if( IsEntryEditing() )
+ if( _pImpl->IsEntryEditing() )
return true;
_pCurKeyEvent = const_cast<KeyEvent*>(&rKEvt);
bool bHandled = _pImpl->KeyInput( rKEvt );
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index f7d9128..844dc17 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -391,16 +391,11 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const
{
if( aCloneLink.IsSet() )
return aCloneLink.Call( pSource );
- SvTreeListEntry* pEntry = CreateEntry();
+ SvTreeListEntry* pEntry = new SvTreeListEntry;
pEntry->Clone(pSource);
return pEntry;
}
-SvTreeListEntry* SvTreeList::CreateEntry()
-{
- return new SvTreeListEntry;
-}
-
SvTreeListEntry* SvTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const
{
SvTreeListEntry* pClonedEntry = CloneEntry( pEntry );
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index ba4abb0..0cab871 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -718,11 +718,6 @@ void SvTreeListBox::RemoveSelection()
pModel->Remove(*it);
}
-SvTreeListBox* SvTreeListBox::GetSourceView()
-{
- return g_pDDSource;
-}
-
void SvTreeListBox::RecalcViewData()
{
SvTreeListEntry* pEntry = First();
@@ -746,7 +741,7 @@ void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, bool bShow)
return;
if ( !bShow && !(nImpFlags & SvTreeListBoxFlags::TARGEMPH_VIS) )
return;
- ShowTargetEmphasis( pEntry, bShow );
+ pImpl->PaintDDCursor( pEntry );
if( bShow )
nImpFlags |= SvTreeListBoxFlags::TARGEMPH_VIS;
else
@@ -1191,7 +1186,7 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox
sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
- return ExecuteDrop( rEvt, GetSourceView() );
+ return ExecuteDrop( rEvt, g_pDDSource );
}
/**
@@ -2138,11 +2133,6 @@ void SvTreeListBox::ModelHasCleared()
SvListView::ModelHasCleared();
}
-void SvTreeListBox::ShowTargetEmphasis( SvTreeListEntry* pEntry, bool /*bShow*/ )
-{
- pImpl->PaintDDCursor( pEntry );
-}
-
void SvTreeListBox::ScrollOutputArea( short nDeltaEntries )
{
if( !nDeltaEntries || !pImpl->aVerSBar->IsVisible() )
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index c3de48a..3907c97 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -684,7 +684,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, bool bCommand )
StartTracking();
mnStartPos = rMousePos.X()-mnMouseOff;
mnDragPos = mnStartPos;
- StartDrag();
+ maStartDragHdl.Call( this );
if (mbItemMode)
Invalidate();
else
@@ -801,7 +801,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
}
}
- Drag();
+ maDragHdl.Call( this );
}
void HeaderBar::ImplEndDrag( bool bCancel )
@@ -1104,16 +1104,6 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-void HeaderBar::StartDrag()
-{
- maStartDragHdl.Call( this );
-}
-
-void HeaderBar::Drag()
-{
- maDragHdl.Call( this );
-}
-
void HeaderBar::EndDrag()
{
maEndDragHdl.Call( this );
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index d8d79cc..a0dc24f 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1220,7 +1220,7 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMouseEvent )
StartTracking( StartTrackingFlags::ScrollRepeat );
}
else if ( rMouseEvent.GetClicks() == 2 )
- DoubleClick();
+ maDoubleClickHdl.Call( this );
return;
}
@@ -1567,11 +1567,6 @@ void ValueSet::Select()
maSelectHdl.Call( this );
}
-void ValueSet::DoubleClick()
-{
- maDoubleClickHdl.Call( this );
-}
-
void ValueSet::UserDraw( const UserDrawEvent& )
{
}
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 1b96d67..839450a 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -71,7 +71,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding();
rOStm.WriteUInt16( GetType() );
- rOStm.WriteUInt16( GetVersion() );
+ rOStm.WriteUInt16( IMAP_OBJ_VERSION );
rOStm.WriteUInt16( eEncoding );
const OString aRelURL = OUStringToOString(
@@ -922,7 +922,7 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
// write MagicCode
rOStm.WriteCharPtr( IMAPMAGIC );
- rOStm.WriteUInt16( GetVersion() );
+ rOStm.WriteUInt16( IMAGE_MAP_VERSION );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding);
write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, OString()); //dummy
rOStm.WriteUInt16( nCount );
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index e063571..79a03db 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -716,11 +716,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController:
return new ::cppu::OPropertyArrayHelper(aProps);
}
-void ToolboxController::setSupportVisibleProperty(bool bValue)
-{
- m_bSupportVisible = bValue;
-}
-
sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( css::uno::Any& aConvertedValue ,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
@@ -754,7 +749,7 @@ throw( css::uno::Exception, std::exception)
{
bool rValue(false);
if (( aValue >>= rValue ) && m_bInitialized)
- this->setSupportVisibleProperty( rValue );
+ m_bSupportVisible = rValue;
}
}
More information about the Libreoffice-commits
mailing list