mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new loplugin: change virtual methods to non-virtual

Browse Source 
Where we can prove that the virtual method is never overriden.

In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.

Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
This commit is contained in:
Noel Grandin 2015-01-20 12:38:10 +02:00
parent 26ad60aec6
commit b44cbb26ef
615 changed files with 1921 additions and 1965 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
View File

@ -161,7 +161,7 @@ protected:
/** This method creates (once) and returns the accessible data table child.
@attention This method requires locked mutex's and a living object.
@return The XAccessible interface of the data table. */
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > implGetTable();
/** This method creates (once) and returns the specified header bar.

2
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
View File

@ -278,7 +278,7 @@ protected:
behaviour.
@attention This method requires locked mutex's and a living object.
@return <TRUE/>, if the object is really showing. */
virtual bool implIsShowing();
bool implIsShowing();
/** Derived classes return the bounding box relative to the parent window.
@attention This method requires locked mutex's and a living object.

4
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
View File

@ -149,7 +149,7 @@ protected:
/** This method creates (once) and returns the accessible data table child.
@attention This method requires locked mutex's and a living object.
@return The XAccessible interface of the data table. */
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > implGetTable();
/** This method creates (once) and returns the specified header bar.
@ -169,7 +169,7 @@ protected:
/** This method creates and returns an accessible table.
@return An AccessibleGridControlTable. */
virtual AccessibleGridControlTable* createAccessibleTable();
AccessibleGridControlTable* createAccessibleTable();
private:
// members ----------------------------------------------------------------

2
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
View File

@ -243,7 +243,7 @@ protected:
behaviour.
@attention This method requires locked mutex's and a living object.
@return <TRUE/>, if the object is really showing. */
virtual bool implIsShowing();
bool implIsShowing();
/** Derived classes return the bounding box relative to the parent window.
@attention This method requires locked mutex's and a living object.

4
accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
View File

@ -171,10 +171,10 @@ protected:
/** @attention This method requires locked mutex's and a living object.
@return The count of used rows. */
virtual sal_Int32 implGetRowCount() const;
sal_Int32 implGetRowCount() const;
/** @attention This method requires locked mutex's and a living object.
@return The count of used columns. */
virtual sal_Int32 implGetColumnCount() const;
sal_Int32 implGetColumnCount() const;
// internal helper methods ------------------------------------------------

2
accessibility/inc/accessibility/extended/accessibletabbar.hxx
View File

@ -54,7 +54,7 @@ namespace accessibility
protected:
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
View File

@ -70,7 +70,7 @@ namespace accessibility
sal_uInt16 GetPageId() const { return m_nPageId; }
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
View File

@ -66,7 +66,7 @@ namespace accessibility
void MoveChild( sal_Int32 i, sal_Int32 j );
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
accessibility/inc/accessibility/extended/listboxaccessible.hxx
View File

@ -59,7 +59,7 @@ namespace accessibility
// own overridables
/// will be called for any VclWindowEvent events broadcasted by our VCL window
virtual void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
/** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event

2
accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
View File

@ -116,7 +116,7 @@ protected:
DECL_LINK( MenuEventListener, VclSimpleEvent* );
virtual void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );
void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) = 0;

10
accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
View File

@ -111,9 +111,9 @@ public:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleComponent
virtual bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint)
bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint)
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleAt (const ::com::sun::star::awt::Point& aPoint)
throw (::com::sun::star::uno::RuntimeException);
@ -138,7 +138,7 @@ public:
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
bool IsInDropDown();
void HandleDropOpen();
virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList);
void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList);
void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList);
void UpdateSelection_Impl_Acc (bool b_IsDropDownList);
@ -179,7 +179,7 @@ protected:
/** Create the specified child and insert it into the list of children.
Sets the child's states.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
CreateChild (sal_Int32 i);
/** Call this method when the item list has been changed, i.e. items
@ -191,7 +191,7 @@ protected:
Index of the new or removed item. A value of -1 indicates that
the whole list has been cleared.
*/
virtual void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex);
void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex);
// VCLXAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
View File

@ -40,7 +40,7 @@ protected:
DECL_LINK( WindowEventListener, VclSimpleEvent* );
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
// XComponent
virtual void SAL_CALL disposing() SAL_OVERRIDE;

2
accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
View File

@ -66,7 +66,7 @@ protected:
OUString GetItemText();
sal_uInt16 GetItemId() const { return m_nItemId; }
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
View File

@ -70,7 +70,7 @@ protected:
sal_uInt16 GetPageId() const { return m_nPageId; }
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
View File

@ -134,7 +134,7 @@ public:
// XAccessibleExtendedComponent
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException);
virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

2
avmedia/source/framework/soundhandler.hxx
View File

@ -94,7 +94,7 @@ class SoundHandler : // interfaces
static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
/* Helper for initialization of service by using own reference! */
virtual void SAL_CALL impl_initService ( );
void SAL_CALL impl_initService ( );
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL ,

4
avmedia/source/gstreamer/gstplayer.hxx
View File

@ -48,8 +48,8 @@ public:
void preparePlaybin( const OUString& rURL, GstElement *pSink );
bool create( const OUString& rURL );
virtual void processMessage( GstMessage *message );
virtual GstBusSyncReply processSyncMessage( GstMessage *message );
void processMessage( GstMessage *message );
GstBusSyncReply processSyncMessage( GstMessage *message );
// XPlayer
virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

2
basctl/source/inc/accessibledialogcontrolshape.hxx
View File

@ -78,7 +78,7 @@ protected:
OUString GetModelStringProperty( const sal_Char* pPropertyName );
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;

4
basctl/source/inc/accessibledialogwindow.hxx
View File

@ -99,8 +99,8 @@ protected:
DECL_LINK( WindowEventListener, VclSimpleEvent* );
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
basctl/source/inc/dlgedclip.hxx
View File

@ -39,7 +39,7 @@ private:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_SeqData;
protected:
virtual bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
public:
DlgEdTransferableImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aSeqFlavors, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aSeqData );

2
basctl/source/inc/dlgedfunc.hxx
View File

@ -45,7 +45,7 @@ public:
virtual bool MouseButtonDown( const MouseEvent& rMEvt );
virtual bool MouseButtonUp( const MouseEvent& rMEvt );
virtual bool MouseMove( const MouseEvent& rMEvt );
virtual bool KeyInput( const KeyEvent& rKEvt );
bool KeyInput( const KeyEvent& rKEvt );
};

50
basctl/source/inc/dlgedobj.hxx
View File

@ -72,16 +72,16 @@ protected:
void EndListening(bool bRemoveListener = true);
bool isListening() const { return bIsListening; }
virtual bool TransformSdrToControlCoordinates(
bool TransformSdrToControlCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
virtual bool TransformSdrToFormCoordinates(
bool TransformSdrToFormCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
virtual bool TransformControlToSdrCoordinates(
bool TransformControlToSdrCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
virtual bool TransformFormToSdrCoordinates(
bool TransformFormToSdrCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
@ -91,42 +91,42 @@ public:
virtual ~DlgEdObj();
virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE;
virtual void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
virtual DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE;
virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
virtual DlgEdObj* Clone() const SAL_OVERRIDE; // not working yet
virtual void clonedFrom(const DlgEdObj* _pSource); // not working yet
void clonedFrom(const DlgEdObj* _pSource); // not working yet
// FullDrag support
virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
bool supportsService( OUString const & serviceName ) const;
virtual OUString GetDefaultName() const;
virtual OUString GetUniqueName() const;
OUString GetDefaultName() const;
OUString GetUniqueName() const;
virtual sal_Int32 GetStep() const;
sal_Int32 GetStep() const;
virtual void UpdateStep();
virtual void SetDefaults();
void SetDefaults();
virtual void SetRectFromProps();
virtual void SetPropsFromRect();
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > GetControl() const;
virtual void PositionAndSizeChange( const ::com::sun::star::beans::PropertyChangeEvent& evt );
virtual void SAL_CALL NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException);
virtual void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
void SAL_CALL NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException);
void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
// PropertyChangeListener
virtual void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception);
void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception);
// ContainerListener
virtual void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL _elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL _elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
bool MakeDataAware( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
@ -161,11 +161,11 @@ public:
virtual ~DlgEdForm();
virtual DlgEditor& GetDlgEditor () const { return rDlgEditor; }
DlgEditor& GetDlgEditor () const { return rDlgEditor; }
virtual void AddChild( DlgEdObj* pDlgEdObj );
virtual void RemoveChild( DlgEdObj* pDlgEdObj );
virtual std::vector<DlgEdObj*> const& GetChildren() const { return pChildren; }
void AddChild( DlgEdObj* pDlgEdObj );
void RemoveChild( DlgEdObj* pDlgEdObj );
std::vector<DlgEdObj*> const& GetChildren() const { return pChildren; }
virtual void UpdateStep() SAL_OVERRIDE;
@ -174,10 +174,10 @@ public:
virtual void PositionAndSizeChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) SAL_OVERRIDE;
virtual void UpdateTabIndices();
virtual void UpdateTabOrder();
virtual void UpdateGroups();
virtual void UpdateTabOrderAndGroups();
void UpdateTabIndices();
void UpdateTabOrder();
void UpdateGroups();
void UpdateTabOrderAndGroups();
::com::sun::star::awt::DeviceInfo getDeviceInfo() const;

2
basic/inc/sbobjmod.hxx
View File

@ -60,7 +60,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
bool mbInit;
//protected:
virtual void InitObject();
void InitObject();
public:
TYPEINFO_OVERRIDE();
SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );

2
basic/source/classes/eventatt.cxx
View File

@ -141,7 +141,7 @@ class BasicScriptListener_Impl : public WeakImplHelper1< XScriptListener >
StarBASICRef maBasicRef;
Reference< frame::XModel > m_xModel;
virtual void firing_impl(const ScriptEvent& aScriptEvent, Any* pRet);
void firing_impl(const ScriptEvent& aScriptEvent, Any* pRet);
public:
BasicScriptListener_Impl( StarBASIC* pBasic, const Reference< frame::XModel >& xModel )

2
basic/source/classes/sbunoobj.cxx
View File

@ -3894,7 +3894,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
// solely transmits several events to an general AllListener
class BasicAllListener_Impl : public BasicAllListenerHelper
{
virtual void firing_impl(const AllEventObject& Event, Any* pRet);
void firing_impl(const AllEventObject& Event, Any* pRet);
public:
SbxObjectRef xSbxObj;

2
chart2/source/controller/dialogs/ChangingResource.hxx
View File

@ -40,7 +40,7 @@ public:
ChangingResource();
virtual ~ChangingResource();
virtual void setChangeListener( ResourceChangeListener* pListener );
void setChangeListener( ResourceChangeListener* pListener );
protected:
ResourceChangeListener* m_pChangeListener;

10
chart2/source/controller/dialogs/ChartTypeDialogController.hxx
View File

@ -111,16 +111,16 @@ public:
, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const;
virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException);
virtual bool isSubType( const OUString& rServiceName );
virtual ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference<
bool isSubType( const OUString& rServiceName );
ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xTemplateProps );
virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
virtual OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const;
virtual bool commitToModel( const ChartTypeParameter& rParameter
OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const;
bool commitToModel( const ChartTypeParameter& rParameter
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate( const ChartTypeParameter& rParameter
, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xTemplateManager ) const;

4
chart2/source/controller/inc/AccessibleBase.hxx
View File

@ -133,7 +133,7 @@ protected:
@return If an object is the addressee of the event it should return
true, false otherwise.
*/
virtual bool NotifyEvent( EventType eType, const AccessibleUniqueId & rId );
bool NotifyEvent( EventType eType, const AccessibleUniqueId & rId );
/** Adds a state to the set.
*/
@ -200,7 +200,7 @@ protected:
This method cares about mutex locking, and thus should be called without
the mutex locked.
*/
virtual void KillAllChildren();
void KillAllChildren();
/** Is called from getAccessibleChild(). Before this method is called, an
update of children is done if necessary.

2
chart2/source/controller/inc/AccessibleChartView.hxx
View File

@ -110,7 +110,7 @@ private: // methods
a decoration. Thus you have an offset of (currently) (2,2)
which isn't taken into account.
*/
virtual ::com::sun::star::awt::Rectangle GetWindowPosSize() const;
::com::sun::star::awt::Rectangle GetWindowPosSize() const;
ExplicitValueProvider* getExplicitValueProvider();

2
chart2/source/controller/main/DragMethod_Base.hxx
View File

@ -35,7 +35,7 @@ public:
, ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE );
virtual ~DragMethod_Base();
virtual OUString getUndoDescription() const;
OUString getUndoDescription() const;
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;

4
chart2/source/inc/ErrorBar.hxx
View File

@ -158,9 +158,9 @@ protected:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ____ XChild ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent()
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setParent(
void SAL_CALL setParent(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent )
throw (::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException);

2
chart2/source/inc/MutexContainer.hxx
View File

@ -33,7 +33,7 @@ public:
protected:
mutable ::osl::Mutex m_aMutex;
virtual ::osl::Mutex & GetMutex() const;
::osl::Mutex & GetMutex() const;
};
} // namespace chart

2
chart2/source/inc/OPropertySet.hxx
View File

@ -151,7 +151,7 @@ protected:
virtual void firePropertyChangeEvent();
/// call this when a derived component is disposed
virtual void disposePropertySet();
void disposePropertySet();
// Interfaces

2
chart2/source/model/main/UndoManager.cxx
View File

@ -77,7 +77,7 @@ namespace chart
}
// IUndoManagerImplementation
virtual ::osl::Mutex& getMutex();
::osl::Mutex& getMutex();
virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE;
virtual Reference< XUndoManager > getThis() SAL_OVERRIDE;

4
chart2/source/model/template/ChartTypeTemplate.hxx
View File

@ -116,7 +116,7 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL applyStyles(
void SAL_CALL applyStyles(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
throw (::com::sun::star::uno::RuntimeException);
@ -224,7 +224,7 @@ protected:
represents one of the dimensions of the coordinate systems. If there are series
requesting asecondary axes a secondary y axes is added</p>
*/
virtual void createAxes(
void createAxes(
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys );

4
chart2/source/view/axes/Tickmarks_Equidistant.hxx
View File

@ -36,8 +36,8 @@ public:
, sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 );
virtual ~EquidistantTickIter();
virtual double* firstValue();
virtual double* nextValue();
double* firstValue();
double* nextValue();
virtual TickInfo* firstInfo() SAL_OVERRIDE;
virtual TickInfo* nextInfo() SAL_OVERRIDE;

2
chart2/source/view/charttypes/CategoryPositionHelper.hxx
View File

@ -35,7 +35,7 @@ public:
double getScaledSlotWidth() const;
virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const;
virtual void setCategoryWidth( double fCategoryWidth );
void setCategoryWidth( double fCategoryWidth );
//Distance between two neighboring bars in same category, seen relative to width of the bar
void setInnerDistance( double fInnerDistance );

2
chart2/source/view/inc/PlottingPositionHelper.hxx
View File

@ -45,7 +45,7 @@ public:
virtual ~PlottingPositionHelper();
virtual PlottingPositionHelper* clone() const;
virtual PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale );
PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale );
virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix);

16
chart2/source/view/inc/VCoordinateSystem.hxx
View File

@ -51,7 +51,7 @@ public:
static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel );
virtual void initPlottingTargets(
void initPlottingTargets(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xLogicTarget
, const ::com::sun::star::uno::Reference<
@ -64,7 +64,7 @@ public:
void setParticle( const OUString& rCooSysParticle );
virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;}
//better performance for big data
@ -109,18 +109,18 @@ public:
virtual void initVAxisInList();
virtual void updateScalesAndIncrementsOnAxes();
virtual void createMaximumAxesLabels();
virtual void createAxesLabels();
virtual void updatePositions();
virtual void createAxesShapes();
void createMaximumAxesLabels();
void createAxesLabels();
void updatePositions();
void createAxesShapes();
virtual void createGridShapes();
virtual bool getPropertySwapXAndYAxis() const;
bool getPropertySwapXAndYAxis() const;
sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const;
virtual bool needSeriesNamesForAxis() const;
bool needSeriesNamesForAxis() const;
void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames );
protected: //methods

16
chart2/source/view/inc/VSeriesPlotter.hxx
View File

@ -153,7 +153,7 @@ public:
)
*/
virtual void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
throw (::com::sun::star::uno::RuntimeException);
// MinimumAndMaximumSupplier
@ -210,7 +210,7 @@ public:
, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory );
virtual std::vector< ViewLegendEntry > createLegendEntriesForSeries(
std::vector< ViewLegendEntry > createLegendEntriesForSeries(
const ::com::sun::star::awt::Size& rEntryKeyAspectRatio,
const VDataSeries& rSeries,
const ::com::sun::star::uno::Reference<
@ -330,7 +330,7 @@ protected:
@param bVertical
for y-error bars this is true, for x-error-bars it is false.
*/
virtual void createErrorBar(
void createErrorBar(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
, const ::com::sun::star::drawing::Position3D & rPos
@ -342,26 +342,26 @@ protected:
, double* pfScaledLogicX
);
virtual void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
, VDataSeries& rVDataSeries, sal_Int32 nPointIndex
, const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
, double* pfScaledLogicX=0 );
virtual void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
, VDataSeries& rVDataSeries, sal_Int32 nPointIndex
, const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
, double* pfScaledLogicX=0 );
virtual void createRegressionCurvesShapes( VDataSeries& rVDataSeries
void createRegressionCurvesShapes( VDataSeries& rVDataSeries
, const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
, const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xEquationTarget
, bool bMaySkipPointsInRegressionCalculation );
virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID
void createRegressionCurveEquationShapes( const OUString & rEquationCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xEquationProperties
, const ::com::sun::star::uno::Reference<
@ -370,7 +370,7 @@ protected:
::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator
, ::com::sun::star::awt::Point aDefaultPos );
virtual void setMappedProperties(
void setMappedProperties(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xTarget
, const ::com::sun::star::uno::Reference<

141
compilerplugins/clang/removevirtuals.cxx Normal file
View File

@ -0,0 +1,141 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <cassert>
#include <string>
#include <iostream>
#include "plugin.hxx"
#include "compat.hxx"
#include <sys/mman.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/stat.h>
#include <assert.h>
#include <cstring>
/**
This is intended to be run as the second stage of the "unnecessaryvirtuals" clang plugin.
*/
namespace {
class RemoveVirtuals:
public RecursiveASTVisitor<RemoveVirtuals>, public loplugin::RewritePlugin
{
public:
explicit RemoveVirtuals(InstantiationData const & data);
~RemoveVirtuals();
virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
bool VisitCXXMethodDecl( const CXXMethodDecl* var );
private:
// I use a brute-force approach - mmap the results file and do a linear search on it
// It works surprisingly well, because the file is small enough to fit into L2 cache on modern CPU's
size_t mmapFilesize;
int mmapFD;
char* mmappedData;
};
static size_t getFilesize(const char* filename)
{
struct stat st;
stat(filename, &st);
return st.st_size;
}
RemoveVirtuals::RemoveVirtuals(InstantiationData const & data): RewritePlugin(data)
{
static const char sInputFile[] = "/home/noel/libo4/result.txt";
mmapFilesize = getFilesize(sInputFile);
//Open file
mmapFD = open(sInputFile, O_RDONLY, 0);
assert(mmapFD != -1);
//Execute mmap
mmappedData = static_cast<char*>(mmap(NULL, mmapFilesize, PROT_READ, MAP_PRIVATE | MAP_POPULATE, mmapFD, 0));
assert(mmappedData != NULL);
}
RemoveVirtuals::~RemoveVirtuals()
{
//Cleanup
int rc = munmap(mmappedData, mmapFilesize);
assert(rc == 0);
close(mmapFD);
}
static std::string niceName(const CXXMethodDecl* functionDecl)
{
std::string s =
functionDecl->getParent()->getQualifiedNameAsString() + "::"
+ compat::getReturnType(*functionDecl).getAsString() + "-"
+ functionDecl->getNameAsString() + "(";
for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
s += pParmVarDecl->getType().getAsString();
s += ",";
}
s += ")";
if (functionDecl->isConst()) {
s += "const";
}
return s;
}
bool RemoveVirtuals::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl )
{
if (rewriter == nullptr) {
return true;
}
if (ignoreLocation(functionDecl)) {
return true;
}
// ignore stuff that forms part of the stable URE interface
if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(
functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) {
return true;
}
// don't mess with templates
if (functionDecl->getParent()->getDescribedClassTemplate() != nullptr) {
return true;
}
if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate) {
return true;
}
if (!functionDecl->isVirtualAsWritten()) {
return true;
}
std::string aNiceName = "\n" + niceName(functionDecl) + "\n";
const char *aNiceNameStr = aNiceName.c_str();
char* found = std::search(mmappedData, mmappedData + mmapFilesize, aNiceNameStr, aNiceNameStr + strlen(aNiceNameStr));
if(!(found < mmappedData + mmapFilesize)) {
return true;
}
if (functionDecl->isPure()) {
removeText(functionDecl->getSourceRange());
} else {
std::string aOrigText = rewriter->getRewrittenText(functionDecl->getSourceRange());
size_t iVirtualTokenIndex = aOrigText.find_first_of("virtual ");
if (iVirtualTokenIndex == std::string::npos) {
return true;
}
replaceText(functionDecl->getSourceRange(), aOrigText.replace(iVirtualTokenIndex, strlen("virtual "), ""));
}
return true;
}
loplugin::Plugin::Registration< RemoveVirtuals > X("removevirtuals", false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

119
compilerplugins/clang/unnecessaryvirtual.cxx Normal file
View File

@ -0,0 +1,119 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <cassert>
#include <string>
#include <iostream>
#include "plugin.hxx"
#include "compat.hxx"
/**
Dump a list of virtual methods and a list of methods overriding virtual methods.
Then we will post-process the 2 lists and find the set of virtual methods which don't need to be virtual.
The process goes something like this:
$ make check
$ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unnecessaryvirtual' check > log.txt
$ grep 'definition' log.txt | cut -f 2 | sort -u > definition.txt
$ grep 'overriding' log.txt | cut -f 2 | sort -u > overriding.txt
$ cat definition.txt overriding.txt | sort | uniq -u > result.txt
$ echo "\n" >> result.txt
$ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='removevirtuals' $dir; done
Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around
to get it to work :-)
Notably templates tend to confuse it into removing stuff that is still needed.
*/
namespace {
class UnnecessaryVirtual:
public RecursiveASTVisitor<UnnecessaryVirtual>, public loplugin::Plugin
{
public:
explicit UnnecessaryVirtual(InstantiationData const & data): Plugin(data) {}
virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
bool VisitCXXMethodDecl( const CXXMethodDecl* var );
};
static std::string niceName(const CXXMethodDecl* functionDecl)
{
std::string s =
functionDecl->getParent()->getQualifiedNameAsString() + "::"
+ compat::getReturnType(*functionDecl).getAsString() + "-"
+ functionDecl->getNameAsString() + "(";
for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
s += pParmVarDecl->getType().getAsString();
s += ",";
}
s += ")";
if (functionDecl->isConst()) {
s += "const";
}
return s;
}
bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl )
{
if (ignoreLocation(functionDecl)) {
return true;
}
functionDecl = functionDecl->getCanonicalDecl();
// ignore stuff that forms part of the stable URE interface
if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(
functionDecl->getNameInfo().getLoc()))) {
return true;
}
if (!functionDecl->isVirtual()) {
return true;
}
// ignore UNO interface definitions, cannot change those
static const char cssPrefix[] = "com::sun::star";
if (functionDecl->getParent()->getQualifiedNameAsString().compare(0, strlen(cssPrefix), cssPrefix) == 0) {
return true;
}
std::string aNiceName = niceName(functionDecl);
// Ignore virtual destructors for now.
// I cannot currently detect the case where we are overriding a pure virtual destructor.
if (dyn_cast<CXXDestructorDecl>(functionDecl)) {
return true;
}
if (functionDecl->size_overridden_methods() == 0) {
// ignore definition of virtual functions in templates
// if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate
// && functionDecl->getParent()->getDescribedClassTemplate() == nullptr)
// {
cout << "definition\t" << aNiceName << endl;
// }
} else {
for (CXXMethodDecl::method_iterator iter = functionDecl->begin_overridden_methods(); iter != functionDecl->end_overridden_methods(); ++iter) {
const CXXMethodDecl *pOverriddenMethod = *iter;
// we only care about the first level override to establish that a virtual qualifier was useful.
if (pOverriddenMethod->size_overridden_methods() == 0) {
// ignore UNO interface definitions, cannot change those
if (pOverriddenMethod->getParent()->getQualifiedNameAsString().compare(0, strlen(cssPrefix), cssPrefix) != 0) {
std::string aOverriddenNiceName = niceName(pOverriddenMethod);
cout << "overriding\t" << aOverriddenNiceName << endl;
}
}
}
}
return true;
}
loplugin::Plugin::Registration< UnnecessaryVirtual > X("unnecessaryvirtual", false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
connectivity/source/drivers/firebird/Connection.hxx
View File

@ -174,7 +174,7 @@ namespace connectivity
Connection(FirebirdDriver* _pDriver);
virtual ~Connection();
virtual void construct( const ::rtl::OUString& url,
void construct( const ::rtl::OUString& url,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
throw(css::sdbc::SQLException,
css::uno::RuntimeException,
@ -211,7 +211,7 @@ namespace connectivity
* Create and/or connect to the sdbcx Catalog. This is completely
* unrelated to the SQL "Catalog".
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
createCatalog();
// OComponentHelper

4
connectivity/source/drivers/firebird/ResultSet.hxx
View File

@ -110,10 +110,10 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
virtual void SAL_CALL checkColumnIndex( sal_Int32 index )
void SAL_CALL checkColumnIndex( sal_Int32 index )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL checkRowIndex()
void SAL_CALL checkRowIndex()
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);

2
connectivity/source/drivers/mork/MConnection.hxx
View File

@ -58,7 +58,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog;
public:
virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
OConnection(MorkDriver* const driver);
virtual ~OConnection();

2
connectivity/source/drivers/mork/MStatement.hxx
View File

@ -144,7 +144,7 @@ namespace connectivity
void analyseSQL();
void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef,
connectivity::OSQLParseNode* pAscendingDescending);
virtual void createTable( ) throw (
void createTable( ) throw (
::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
public:

4
connectivity/source/drivers/postgresql/pq_baseresultset.hxx
View File

@ -85,9 +85,9 @@ protected:
*/
virtual void checkClosed()
throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) = 0;
virtual void checkColumnIndex( sal_Int32 index )
void checkColumnIndex( sal_Int32 index )
throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException );
virtual void checkRowIndex( bool mustBeOnValidRow );
void checkRowIndex( bool mustBeOnValidRow );
virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) = 0;
com::sun::star::uno::Any convertTo(

10
connectivity/source/inc/dbase/DIndex.hxx
View File

@ -105,7 +105,7 @@ namespace connectivity
const ODbaseTable* getTable() const { return m_pTable; }
const NDXHeader& getHeader() const { return m_aHeader; }
virtual OIndexIterator* createIterator(OBoolOperator_BASE* pOp,
OIndexIterator* createIterator(OBoolOperator_BASE* pOp,
const OOperand_BASE* pOperand = NULL);
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
@ -117,10 +117,10 @@ namespace connectivity
bool IsText() const {return m_aHeader.db_keytype == 0;}
sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;}
virtual bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
virtual bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
virtual bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
virtual bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
void createINFEntry();
bool CreateImpl();

2
connectivity/source/inc/dbase/DResultSet.hxx
View File

@ -47,7 +47,7 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
virtual bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE;
virtual file::OSQLAnalyzer* createAnalyzer();
file::OSQLAnalyzer* createAnalyzer();
public:
DECLARE_SERVICE_INFO();

4
connectivity/source/inc/file/FResultSet.hxx
View File

@ -271,8 +271,8 @@ namespace connectivity
// special methods
inline sal_Int32 mapColumn(sal_Int32 column);
virtual bool OpenImpl();
virtual void doTableSpecials(const OSQLTable& _xTable);
bool OpenImpl();
void doTableSpecials(const OSQLTable& _xTable);
inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; }

2
connectivity/source/inc/file/FStatement.hxx
View File

@ -111,7 +111,7 @@ namespace connectivity
virtual void initializeResultSet(OResultSet* _pResult);
// create the analyzer
virtual OSQLAnalyzer* createAnalyzer();
OSQLAnalyzer* createAnalyzer();
void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
sal_Int32 getPrecision ( sal_Int32 sqlType);

4
connectivity/source/inc/file/fanalyzer.hxx
View File

@ -71,8 +71,8 @@ namespace connectivity
void dispose();
void start(OSQLParseNode* pSQLParseNode);
virtual bool hasRestriction() const;
virtual bool hasFunctions() const;
bool hasRestriction() const;
bool hasFunctions() const;
inline bool evaluateRestriction() { return m_aInterpreter->start(); }
void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
void setOrigColumns(const OFileColumns& rCols);

2
connectivity/source/inc/file/fcode.hxx
View File

@ -75,7 +75,7 @@ namespace connectivity
virtual const ORowSetValue& getValue() const = 0;
virtual void setValue(const ORowSetValue& _rVal) = 0;
virtual sal_Int32 getDBType() const {return m_eDBType;}
sal_Int32 getDBType() const {return m_eDBType;}
virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0);
inline bool isValid() const;

2
connectivity/source/inc/java/lang/Object.hxx
View File

@ -97,7 +97,7 @@ namespace connectivity
void clearObject(JNIEnv& rEnv);
void clearObject();
virtual OUString toString() const;
OUString toString() const;
static void ThrowSQLException(JNIEnv * pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext);
static void ThrowLoggedSQLException(

4
connectivity/source/inc/odbc/OConnection.hxx
View File

@ -80,11 +80,11 @@ namespace connectivity
SQLRETURN OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, bool bSilent);
virtual OConnection* cloneConnection(); // creates a new connection
OConnection* cloneConnection(); // creates a new connection
public:
oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const;
virtual SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver);
// OConnection(const SQLHANDLE _pConnectionHandle);

6
connectivity/source/inc/odbc/OStatement.hxx
View File

@ -99,9 +99,9 @@ namespace connectivity
void setEscapeProcessing( const bool _bEscapeProc );
template < typename T, SQLINTEGER BufferLength > SQLRETURN setStmtOption (SQLINTEGER fOption, T value) const;
virtual void setResultSetConcurrency(sal_Int32 _par0) ;
virtual void setResultSetType(sal_Int32 _par0) ;
virtual void setUsingBookmarks(bool _bUseBookmark) ;
void setResultSetConcurrency(sal_Int32 _par0) ;
void setResultSetType(sal_Int32 _par0) ;
void setUsingBookmarks(bool _bUseBookmark) ;
void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException);
void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException);

2
cui/source/factory/dlgfact.hxx
View File

@ -511,7 +511,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
public:
virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId,
SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
const SfxItemSet* pAttrSet=0 );

12
cui/source/inc/cuitabarea.hxx
View File

@ -740,8 +740,8 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual XPropertyListRef GetPropertyList( XPropertyListType t );
virtual void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
XPropertyListRef GetPropertyList( XPropertyListType t );
void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
void SetColorList( XColorListRef pColList );
XColorListRef GetColorList() { return pColorList; }
@ -757,22 +757,22 @@ public:
virtual void FillUserData() SAL_OVERRIDE;
virtual bool IsModified()
bool IsModified()
{
return *pnColorListState & CT_MODIFIED;
}
virtual void SetModified(bool bIsModified)
void SetModified(bool bIsModified)
{
if (bIsModified)
*pnColorListState |= CT_MODIFIED;
else
*pnColorListState &= ~CT_MODIFIED;
}
virtual void AddState(ChangeType nState)
void AddState(ChangeType nState)
{
*pnColorListState |= nState;
}
virtual void Update(bool bLoaded);
void Update(bool bLoaded);
};
#endif // INCLUDED_CUI_SOURCE_INC_CUITABAREA_HXX

4
cui/source/inc/hltpbase.hxx
View File

@ -90,12 +90,12 @@ protected:
SvxHlinkDlgMarkWnd* mpMarkWnd;
void InitStdControls ();
virtual void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem );
void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem );
virtual void FillDlgFields(const OUString& rStrURL) = 0;
virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,
SvxLinkInsertMode& eMode ) = 0;
virtual OUString CreateUiNameFromURL( const OUString& aStrURL );
OUString CreateUiNameFromURL( const OUString& aStrURL );
void GetDataFromCommonFields( OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,

6
cui/source/inc/iconcdlg.hxx
View File

@ -112,8 +112,8 @@ public :
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
void SetUserData(const OUString& rString) { aUserString = rString; }
OUString GetUserData() { return aUserString; }
virtual void FillUserData();
virtual bool IsReadOnly() const;
void FillUserData();
bool IsReadOnly() const;
virtual bool QueryClose();
void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
@ -166,7 +166,7 @@ protected :
void HidePageImpl ( IconChoicePageData* pData );
virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; }
inline IconChoicePage* GetTabPage( sal_uInt16 nPageId )
{ return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }

2
cui/source/inc/macroass.hxx
View File

@ -63,7 +63,7 @@ public:
const SvxMacroTableDtor& GetMacroTbl() const;
void SetMacroTbl( const SvxMacroTableDtor& rTbl );
virtual void ScriptChanged();
void ScriptChanged();
virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
using TabPage::ActivatePage; // FIXME WTF is this nonsense?
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;

2
cui/source/inc/newtabledlg.hxx
View File

@ -36,7 +36,7 @@ public:
SvxNewTableDialog( vcl::Window* pWindow );
virtual short Execute(void) SAL_OVERRIDE;
virtual void Apply(void);
void Apply(void);
virtual sal_Int32 getRows() const SAL_OVERRIDE;
virtual sal_Int32 getColumns() const SAL_OVERRIDE;

6
cui/source/inc/passwdomdlg.hxx
View File

@ -43,9 +43,9 @@ public:
virtual ~PasswordToOpenModifyDialog();
// AbstractPasswordToOpenModifyDialog
virtual OUString GetPasswordToOpen() const;
virtual OUString GetPasswordToModify() const;
virtual bool IsRecommendToOpenReadonly() const;
OUString GetPasswordToOpen() const;
OUString GetPasswordToModify() const;
bool IsRecommendToOpenReadonly() const;
};

2
cui/source/inc/sdrcelldlg.hxx
View File

@ -39,7 +39,7 @@ private:
sal_uInt16 m_nBorderPageId;
protected:
virtual void Apply();
void Apply();
public:
SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );

2
dbaccess/source/core/api/CacheSet.hxx
View File

@ -117,7 +117,7 @@ namespace dbaccess
virtual bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// ::com::sun::star::sdbcx::XRowLocate
virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
virtual bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;

2
dbaccess/source/core/api/KeySet.hxx
View File

@ -198,7 +198,7 @@ namespace dbaccess
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL ensureRowForData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
void SAL_CALL ensureRowForData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// ::com::sun::star::sdbcx::XRowLocate
virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
View File

@ -127,7 +127,7 @@ public:
/** tell the container to free all resources. After that it's in a state like after the construction, i.e.
you may call <code>initialize</code> again (maybe with another configuration node).
*/
virtual void dispose();
void dispose();
protected:
/** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and

2
dbaccess/source/core/dataaccess/databasedocument.hxx
View File

@ -315,7 +315,7 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
// XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

3
dbaccess/source/core/dataaccess/documentdefinition.cxx
View File

@ -230,9 +230,6 @@ namespace dbaccess
virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException, std::exception) SAL_OVERRIDE
{
}
virtual void SAL_CALL onShowWindow( bool /*bVisible*/ ) throw (RuntimeException)
{
}
// XComponentSupplier
virtual Reference< util::XCloseable > SAL_CALL getComponent( ) throw (RuntimeException, std::exception) SAL_OVERRIDE
{

2
dbaccess/source/core/inc/definitioncontainer.hxx
View File

@ -231,7 +231,7 @@ protected:
@throws NoSuchElementException if there is no object with the given name.
@see createObject
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >
implGetByName(const OUString& _rName, bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException);
/** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e.

4
dbaccess/source/core/recovery/settingsimport.hxx
View File

@ -45,11 +45,11 @@ namespace dbaccess
virtual ::rtl::Reference< SettingsImport > nextState(
const OUString& i_rElementName
) = 0;
virtual void startElement(
void startElement(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& i_rAttributes
);
virtual void endElement();
virtual void characters( const OUString& i_rCharacters );
void characters( const OUString& i_rCharacters );
protected:
virtual ~SettingsImport();

2
dbaccess/source/core/recovery/storagestream.hxx
View File

@ -73,7 +73,7 @@ namespace dbaccess
/** simply calls closeInput on our input stream, override to extend/modify this behavior
*/
virtual void close();
void close();
protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&

2
dbaccess/source/ui/app/AppController.hxx
View File

@ -543,7 +543,7 @@ namespace dbaui
/** disconnects from our XConnection, and cleans up this connection
*/
virtual void disconnect();
void disconnect();
// late construction
virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;

2
dbaccess/source/ui/control/RelationControl.cxx
View File

@ -108,7 +108,7 @@ namespace dbaui
virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE;
virtual void Init(const TTableConnectionData::value_type& _pConnData);
void Init(const TTableConnectionData::value_type& _pConnData);
virtual void Init() SAL_OVERRIDE { ORelationControl_Base::Init(); }
virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE;
virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE;

10
dbaccess/source/ui/inc/ConnectionLineAccess.hxx
View File

@ -44,7 +44,7 @@ namespace dbaui
/** isEditable returns the current editable state
@return true if it is editable otherwise false
*/
virtual bool isEditable() const;
bool isEditable() const;
public:
OConnectionLineAccess(OTableConnection* _pLine);
@ -79,15 +79,15 @@ namespace dbaui
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleComponent
virtual bool SAL_CALL contains( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
bool SAL_CALL contains( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
// XAccessibleRelationSet
virtual sal_Int32 SAL_CALL getRelationCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

8
dbaccess/source/ui/inc/FieldControls.hxx
View File

@ -41,7 +41,7 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
virtual void SetSpecialReadOnly(bool _bReadOnly);
void SetSpecialReadOnly(bool _bReadOnly);
};
@ -59,7 +59,7 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
virtual void SetSpecialReadOnly(bool _bReadOnly);
void SetSpecialReadOnly(bool _bReadOnly);
};
class OPropNumericEditCtrl : public NumericField
@ -75,7 +75,7 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
virtual void SetSpecialReadOnly(bool _bReadOnly);
void SetSpecialReadOnly(bool _bReadOnly);
};
@ -92,7 +92,7 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
virtual void SetSpecialReadOnly(bool _bReadOnly);
void SetSpecialReadOnly(bool _bReadOnly);
};

2
dbaccess/source/ui/inc/FieldDescControl.hxx
View File

@ -194,7 +194,7 @@ namespace dbaui
void copy();
void paste();
virtual void Init();
void Init();
virtual void GetFocus() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;

2
dbaccess/source/ui/inc/JAccess.hxx
View File

@ -38,7 +38,7 @@ namespace dbaui
/** isEditable returns the current editable state
@return true if the controller is not readonly otherwise false
*/
virtual bool isEditable() const;
bool isEditable() const;
public:
/** OJoinDesignViewAccess needs a valid view
*/

2
dbaccess/source/ui/inc/JoinDesignView.hxx
View File

@ -51,7 +51,7 @@ namespace dbaui
virtual void initialize() SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE;
virtual void SaveTabWinUIConfig(OTableWindow* pWin);
void SaveTabWinUIConfig(OTableWindow* pWin);
OJoinController& getController() const { return m_rController; }
// called when fields are deleted

12
dbaccess/source/ui/inc/JoinTableView.hxx
View File

@ -137,7 +137,7 @@ namespace dbaui
virtual void RemoveTabWin( OTableWindow* pTabWin );
// hide all TabWins (does NOT delete them; they are put in an UNDO action)
virtual void HideTabWins();
void HideTabWins();
virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) = 0;
@ -225,7 +225,7 @@ namespace dbaui
virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE;
// DnD stuff
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
@ -242,9 +242,9 @@ namespace dbaui
@note The standard implementation just passes the new data to the
Wins
*/
virtual void TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPosition);
void TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPosition);
virtual void TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize);
void TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize);
void modified();
@ -259,7 +259,7 @@ namespace dbaui
Size getRealOutputSize() const { return m_aOutputSize; }
virtual void EnsureVisible(const OTableWindow* _pWin);
virtual void EnsureVisible(const Point& _rPoint,const Size& _rSize);
void EnsureVisible(const Point& _rPoint,const Size& _rSize);
TTableWindowData::value_type createTableWindowData(const OUString& _rComposedName
,const OUString& _sTableName
@ -271,7 +271,7 @@ namespace dbaui
virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void ConnDoubleClicked( OTableConnection* pConnection );
virtual void SetDefaultTabWinPosSize( OTableWindow* pTabWin );
void SetDefaultTabWinPosSize( OTableWindow* pTabWin );
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;

2
dbaccess/source/ui/inc/QueryDesignView.hxx
View File

@ -88,7 +88,7 @@ namespace dbaui
// set the view readonly or not
virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE;
// check if the statement is correct when not returning false
virtual bool checkStatement();
bool checkStatement();
// set the statement for representation
virtual void setStatement(const OUString& _rsStatement) SAL_OVERRIDE;
// returns the current sql statement

22
dbaccess/source/ui/inc/QueryTextView.hxx
View File

@ -35,21 +35,21 @@ namespace dbaui
virtual void GetFocus() SAL_OVERRIDE;
virtual bool isCutAllowed();
virtual bool isPasteAllowed();
virtual bool isCopyAllowed();
virtual void copy();
virtual void cut();
virtual void paste();
bool isCutAllowed();
bool isPasteAllowed();
bool isCopyAllowed();
void copy();
void cut();
void paste();
// clears the whole query
virtual void clear();
void clear();
// set the view readonly or not
virtual void setReadOnly(bool _bReadOnly);
void setReadOnly(bool _bReadOnly);
// check if the statement is correct when not returning false
virtual bool checkStatement();
bool checkStatement();
// set the statement for representation
virtual void setStatement(const OUString& _rsStatement);
virtual OUString getStatement();
void setStatement(const OUString& _rsStatement);
OUString getStatement();
// allow access to our edit
OSqlEdit* getSqlEdit() const { return m_pEdit; }

28
dbaccess/source/ui/inc/QueryViewSwitch.hxx
View File

@ -41,25 +41,25 @@ namespace dbaui
OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~OQueryViewSwitch();
virtual bool isCutAllowed();
virtual bool isPasteAllowed();
virtual bool isCopyAllowed();
virtual void copy();
virtual void cut();
virtual void paste();
bool isCutAllowed();
bool isPasteAllowed();
bool isCopyAllowed();
void copy();
void cut();
void paste();
// clears the whole query
virtual void clear();
void clear();
// set the view readonly or not
virtual void setReadOnly(bool _bReadOnly);
void setReadOnly(bool _bReadOnly);
// check if the statement is correct when not returning false
virtual bool checkStatement();
bool checkStatement();
// set the statement for representation
virtual void setStatement(const OUString& _rsStatement);
void setStatement(const OUString& _rsStatement);
// returns the current sql statement
virtual OUString getStatement();
OUString getStatement();
/// late construction
virtual void Construct();
virtual void initialize();
void Construct();
void initialize();
/** show the text or the design view
@return
<TRUE/> if and only if the view could be successfully, switched, <FALSE/> otherwise
@ -85,7 +85,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const;
protected:
// return the Rectangle where I can paint myself
virtual void resizeDocumentView(Rectangle& rRect);
void resizeDocumentView(Rectangle& rRect);
private:
void impl_forceSQLView();

2
dbaccess/source/ui/inc/TableConnectionData.hxx
View File

@ -95,7 +95,7 @@ namespace dbaui
OUString GetConnName() const { return m_aConnName; }
virtual void SetConnName( const OUString& rConnName ){ m_aConnName = rConnName; }
void SetConnName( const OUString& rConnName ){ m_aConnName = rConnName; }
/** Update create a new connection
@return true if successful

4
dbaccess/source/ui/inc/TableController.hxx
View File

@ -134,8 +134,8 @@ namespace dbaui
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn);
virtual void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut);
void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn);
void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut);
protected:
void startTableListening();

4
dbaccess/source/ui/inc/TableDesignControl.hxx
View File

@ -76,8 +76,8 @@ namespace dbaui
virtual bool IsInsertNewAllowed( long nRow ) = 0;
virtual bool IsDeleteAllowed( long nRow ) = 0;
virtual bool IsUpdatable() const {return m_bUpdatable;}
virtual void SetUpdatable( bool bUpdate=true );
bool IsUpdatable() const {return m_bUpdatable;}
void SetUpdatable( bool bUpdate=true );
virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE;
virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;

2
dbaccess/source/ui/inc/TableDesignView.hxx
View File

@ -98,7 +98,7 @@ namespace dbaui
virtual void paste() SAL_OVERRIDE;
// set the view readonly or not
virtual void setReadOnly(bool _bReadOnly);
void setReadOnly(bool _bReadOnly);
virtual void initialize() SAL_OVERRIDE;
void reSync(); // resync window data with realdata

2
dbaccess/source/ui/inc/TableWindow.hxx
View File

@ -82,7 +82,7 @@ namespace dbaui
virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual OTableWindowListBox* CreateListBox();
OTableWindowListBox* CreateListBox();
// called at FIRST Init
bool FillListBox();
// called at EACH Init

2
dbaccess/source/ui/inc/TableWindowAccess.hxx
View File

@ -46,7 +46,7 @@ namespace dbaui
/** isEditable returns the current editable state
@return true if it is editable otherwise false
*/
virtual bool isEditable() const;
bool isEditable() const;
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
public:

20
dbaccess/source/ui/inc/brwctrlr.hxx
View File

@ -244,19 +244,19 @@ namespace dbaui
virtual bool InitializeGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > CreateGridModel();
::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > CreateGridModel();
// our default implementation simply instantiates a stardiv.one.form.component.Grid service
// you most probably don't want to override this behaviuor
// the default implementation of disposing distributes the events to the following disposingXXX functions
virtual void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners
virtual void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners
virtual void disposingFormModel(const ::com::sun::star::lang::EventObject& Source);
virtual void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source);
void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners
void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners
void disposingFormModel(const ::com::sun::star::lang::EventObject& Source);
void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source);
// want to be a listener to the grid control ? use this !
virtual void addControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl);
virtual void removeControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl);
void addControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl);
void removeControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl);
// want to be a listener to the grid model ? use this !
virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel);
@ -286,9 +286,9 @@ namespace dbaui
// whole process (_both_ XLoadable::reload calls _together_) form the "reload operation"
// empty the frame where our view resides
virtual bool CommitCurrent();
bool CommitCurrent();
// commit the current column (i.e. cell)
virtual bool SaveModified(bool bAskFor = true);
bool SaveModified(bool bAskFor = true);
// save the modified record
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const;
@ -302,7 +302,7 @@ namespace dbaui
void initFormatter();
/// loads or reloads the form
virtual bool reloadForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable);
bool reloadForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable);
virtual bool preReloadForm(){ return false; }
virtual void postReloadForm(){}

2
dbaccess/source/ui/inc/brwview.hxx
View File

@ -64,7 +64,7 @@ namespace dbaui
virtual ~UnoDataBrowserView();
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
/** as columns may be hidden there is a difference between a columns model pos and its view pos
so we you may use these translation function

4
dbaccess/source/ui/inc/curledit.hxx
View File

@ -56,9 +56,9 @@ public:
*/
void ShowPrefix(bool _bShowPrefix);
/// get the currently set text, excluding the prefix indicating the type
virtual OUString GetTextNoPrefix() const;
OUString GetTextNoPrefix() const;
/// set a new text, leave the current prefix unchanged
virtual void SetTextNoPrefix(const OUString& _rText);
void SetTextNoPrefix(const OUString& _rText);
inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); }
inline OUString GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; }

10
dbaccess/source/ui/inc/sbagrid.hxx
View File

@ -285,8 +285,8 @@ namespace dbaui
virtual void onColumnChange() SAL_OVERRIDE;
// my own overridables
virtual void BeforeDrop();
virtual void AfterDrop();
void BeforeDrop();
void AfterDrop();
// get a fields property set from a model pos
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getField(sal_uInt16 nModelPos);
@ -295,9 +295,9 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const;
// drag events
virtual void DoColumnDrag(sal_uInt16 nColumnPos);
virtual void DoRowDrag(sal_Int16 nRowPos);
virtual void DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos);
void DoColumnDrag(sal_uInt16 nColumnPos);
void DoRowDrag(sal_Int16 nRowPos);
void DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos);
void SetBrowserAttrs();
void SetColWidth(sal_uInt16 nColId);

4
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
View File

@ -199,12 +199,12 @@ namespace dbaui
virtual void CellModified() SAL_OVERRIDE;
virtual bool SaveModified() SAL_OVERRIDE;
virtual void Init() SAL_OVERRIDE;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const;
sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const;
virtual void ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE;
virtual sal_uInt16 GetDefaultColumnWidth(const OUString& rName) const;
sal_uInt16 GetDefaultColumnWidth(const OUString& rName) const;
// if you want to have an own header ...
virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE;

2
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
View File

@ -42,7 +42,7 @@ namespace dbaui
virtual void GetFocus() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
virtual void Init();
void Init();
void DisplayData( OFieldDescription* pFieldDescr );
void SaveData( OFieldDescription* pFieldDescr );

6
dbaccess/source/ui/tabledesign/TEditControl.hxx
View File

@ -100,8 +100,8 @@ namespace dbaui
virtual void CellModified() SAL_OVERRIDE;
virtual bool SaveModified() SAL_OVERRIDE; // is called before changing a cell (false prevents change)
virtual void Undo();
virtual void Redo();
void Undo();
void Redo();
virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const SAL_OVERRIDE;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE;
@ -125,7 +125,7 @@ namespace dbaui
OTableEditorCtrl(vcl::Window* pParentWin);
virtual ~OTableEditorCtrl();
virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE;
virtual void UpdateAll();
void UpdateAll();
SfxUndoManager& GetUndoManager() const;
void SetDescrWin( OTableFieldDescWin* pWin )

2
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
View File

@ -56,7 +56,7 @@ namespace dbaui
OTableFieldDescWin( vcl::Window* pParent);
virtual ~OTableFieldDescWin();
virtual void Init();
void Init();
void DisplayData( OFieldDescription* pFieldDescr );
void SaveData( OFieldDescription* pFieldDescr );

2
desktop/source/app/officeipcthread.cxx
View File

@ -153,7 +153,7 @@ public:
virtual bool next(OUString * argument) SAL_OVERRIDE { return next(argument, true); }
private:
virtual bool next(OUString * argument, bool prefix) {
bool next(OUString * argument, bool prefix) {
OSL_ASSERT(argument != NULL);
if (m_index < m_input.getLength()) {
if (prefix) {

4
desktop/source/deployment/registry/inc/dp_backenddb.hxx
View File

@ -158,8 +158,8 @@ public:
virtual ~RegisteredDb() {};
virtual void addEntry(OUString const & url);
virtual bool getEntry(OUString const & url);
void addEntry(OUString const & url);
bool getEntry(OUString const & url);
};

6
editeng/source/outliner/outlundo.hxx
View File

@ -88,7 +88,7 @@ public:
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
virtual void Repeat();
void Repeat();
};
// Help-Undo: If it does not exist an OutlinerUndoAction for a certain action
@ -105,7 +105,7 @@ public:
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
virtual void Repeat();
void Repeat();
};
@ -122,7 +122,7 @@ public:
virtual ~OLUndoExpand();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
virtual void Repeat();
void Repeat();
sal_uInt16* pParas; // 0 == nCount contains paragraph number
Outliner* pOutliner;

Some files were not shown because too many files have changed in this diff Show More