diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-21 12:15:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:29 +0200 |
| commit | f61dbc302975aaa253b00ea6b141bb12474b3c95 (patch) | |
| tree | 7150ea10f0111c4e6677030ac568c7be03424e08 | |
| parent | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff) | |
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes.
This is a followup patch to commit
272b1dd55797aacf511fb4342b0054e3697243f6
"new loplugin: change virtual methods to non-virtual"
Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
168 files changed, 538 insertions, 928 deletions
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 5cab24c71567..ca471f6cc252 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -69,7 +69,7 @@ protected: using SfxListener::StartListening; void StartListening(); using SfxListener::EndListening; - void EndListening(bool bRemoveListener = true); + void EndListening(bool bRemoveListener = true); bool isListening() const { return bIsListening; } bool TransformSdrToControlCoordinates( @@ -107,8 +107,8 @@ public: OUString GetDefaultName() const; OUString GetUniqueName() const; - sal_Int32 GetStep() const; - virtual void UpdateStep(); + sal_Int32 GetStep() const; + virtual void UpdateStep(); void SetDefaults(); virtual void SetRectFromProps(); diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx index e1fae545328e..4cf1645046d0 100644 --- a/canvas/source/directx/dx_linepolypolygon.hxx +++ b/canvas/source/directx/dx_linepolypolygon.hxx @@ -38,7 +38,7 @@ namespace dxcanvas private: // overridden, to clear mpPath - virtual void modifying() const; + virtual void modifying() const SAL_OVERRIDE; GDIPlusUserSharedPtr mpGdiPlusUser; mutable GraphicsPathSharedPtr mpPath; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 413ff20c7f7d..14ce8e13b5da 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -114,12 +114,12 @@ public: 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 ); - OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; + 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 ); + OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; bool commitToModel( const ChartTypeParameter& rParameter - , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); + , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); ::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; diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 16f43c65323c..0f100620f0eb 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -76,8 +76,8 @@ namespace chart { } + ::osl::Mutex& getMutex(); // IUndoManagerImplementation - ::osl::Mutex& getMutex(); virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE; virtual Reference< XUndoManager > getThis() SAL_OVERRIDE; diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx index 96020de28a95..0cca17086d34 100644 --- a/cppcanvas/source/wrapper/basegfxfactory.cxx +++ b/cppcanvas/source/wrapper/basegfxfactory.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> -#include <cppcanvas/text.hxx> #include <canvasgraphichelper.hxx> #include "implpolypolygon.hxx" diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 8c7420f858f4..0f12a217a8af 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -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; - 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 ); @@ -519,12 +519,14 @@ public: const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, - sal_uInt32 nResId - ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; + const css::uno::Reference< css::frame::XFrame >& _rxFrame, + sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, + const css::uno::Reference< css::frame::XFrame >& rxFrame, + sal_uInt32 nResId, + const OUString& rParameter ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index c98fe8cd4e95..29317d3ecaf2 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -112,9 +112,9 @@ public : virtual int DeactivatePage( SfxItemSet* pSet = 0 ); void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } - void FillUserData(); - bool IsReadOnly() const; - virtual bool QueryClose(); + void FillUserData(); + bool IsReadOnly() const; + virtual bool QueryClose(); void StateChanged( StateChangedType nType ) SAL_OVERRIDE; void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 22c70eb36350..c0e4fd66492b 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -63,7 +63,7 @@ public: const SvxMacroTableDtor& GetMacroTbl() const; void SetMacroTbl( const SvxMacroTableDtor& rTbl ); - 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; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 6360d5ec55ff..d8913ed932fa 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -194,7 +194,7 @@ namespace dbaui void copy(); void paste(); - void Init(); + void Init(); virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index aad6e83aa88e..a08bcf038287 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -54,7 +54,7 @@ public: @param _bShowPrefix If <TRUE/> than the prefix will be visible, otherwise not. */ - void ShowPrefix(bool _bShowPrefix); + void ShowPrefix(bool _bShowPrefix); /// get the currently set text, excluding the prefix indicating the type OUString GetTextNoPrefix() const; /// set a new text, leave the current prefix unchanged diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index ee6db1330b78..59807d0dfbba 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -199,12 +199,12 @@ namespace dbaui virtual void CellModified() SAL_OVERRIDE; virtual bool SaveModified() SAL_OVERRIDE; virtual void Init() SAL_OVERRIDE; - 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; - 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; diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index e4b4ea98ea6a..c08330cdbd04 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -132,7 +132,7 @@ bool EditSpellWrapper::SpellMore() if ( pSpellInfo->bMultipleDoc ) { bMore = pEE->SpellNextDocument(); - SetCurTextObj( pEE->GetCurTextObj() ); + SetCurTextObj( NULL ); if ( bMore ) { // The text has been entered into the engine, when backwords then diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index 00376ab01ec7..5e60060ac988 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -88,7 +88,7 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - 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; - void Repeat(); + void Repeat(); }; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index bd37e92974a0..29cb5a0e23a2 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -53,7 +53,7 @@ namespace pcr virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const SAL_OVERRIDE; virtual OUString getPropertyName( sal_Int32 _nPropId ) SAL_OVERRIDE; - bool isComposeable( const OUString& _rPropertyName ) const; + bool isComposeable( const OUString& _rPropertyName ) const; protected: static const OPropertyInfoImpl* getPropertyInfo(); diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 2a8dd5f48ec1..20b829802bdf 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -45,7 +45,7 @@ class CGM; class CGMBitmapDescriptor; class CGMOutAct { - protected: +protected: sal_uInt16 mnCurrentPage; // defaulted to zero sal_uInt32 mnGroupActCount; // grouping @@ -54,16 +54,16 @@ class CGMOutAct sal_uInt16 mnIndex; // figure sal_uInt8* mpFlags; - Point* mpPoints; - tools::PolyPolygon maPolyPolygon; - ::com::sun::star::awt::Gradient* mpGradient; + Point* mpPoints; + tools::PolyPolygon maPolyPolygon; + css::awt::Gradient* mpGradient; - CGM* mpCGM; + CGM* mpCGM; - public: +public: CGMOutAct( CGM& rCGM ); virtual ~CGMOutAct(); - void FirstOutPut() { mpCGM->mbFirstOutPut = false; } ; + void FirstOutPut() { mpCGM->mbFirstOutPut = false; } ; virtual void InsertPage() { mnCurrentPage++; } ; virtual void BeginGroup() {} ; virtual void EndGroup() {}; diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 51143f1b974b..4d8ffaccda30 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -65,7 +65,7 @@ protected: // XThread virtual void SAL_CALL run() SAL_OVERRIDE; - void SAL_CALL kill(); + void SAL_CALL kill(); virtual void SAL_CALL onTerminated() SAL_OVERRIDE; // The following method is called to duplicate the Event while respecting it's type. diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 5367ceb29c50..fdd5c886ca91 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -922,14 +922,14 @@ protected: virtual void onConnectedExternalValue( ); /** called whenever a connection to an external supplier of values (XValueBinding) has been suspended */ - void onDisconnectedExternalValue(); + void onDisconnectedExternalValue(); /** called whenever an external validator has been registered */ - void onConnectedValidator( ); + void onConnectedValidator( ); /** called whenever an external validator has been revoked */ - void onDisconnectedValidator( ); + void onDisconnectedValidator( ); /** nFieldType is the type of the field, on which the model will be linked. The linking happens when sal_True is returned. diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index e69bb805a807..eea64994c88d 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -65,8 +65,8 @@ namespace frm void invalidate(); protected: + void newStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener ); // overridables - void newStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener ); virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ); virtual void invalidateFeatureState_Broadcast(); diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 35ab7ef80505..4c7e56420c22 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -33,12 +33,13 @@ private: Link aSelChangedLink; Selection aOldSel; bool bMouseFlag; - DECL_LINK(ChangedHdl, void *); + + DECL_LINK(ChangedHdl, void *); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SelectionChanged(); + void SelectionChanged(); virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index ea1668dd0524..5bf159b4f5d4 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -101,9 +101,9 @@ private: protected: - void SliderMoved(); - void ArgumentModified(); - void FxClick(); + void SliderMoved(); + void ArgumentModified(); + void FxClick(); void InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, PushButton& rBtnFx, ArgEdit& rEdArg, RefButton& rRefBtn); @@ -135,7 +135,7 @@ public: bool IsRefMode() {return bRefMode;} void SetRefMode(bool bFlag) {bRefMode=bFlag;} - sal_uInt16 GetActiveLine() { return nActiveLine;} + sal_uInt16 GetActiveLine() { return nActiveLine;} void SetActiveLine(sal_uInt16 no); RefEdit* GetActiveEdit(); OUString GetActiveArgName(); @@ -145,7 +145,7 @@ public: void SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont); void SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen - sal_uInt16 GetSliderPos(); + sal_uInt16 GetSliderPos(); void SetSliderPos(sal_uInt16 nSliderPos); void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index cbe4d4aaea6d..c71534da4a28 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -195,7 +195,7 @@ public: SvtFileDialog( vcl::Window* _pParent, WinBits nBits ); virtual ~SvtFileDialog(); - long OK(); + long OK(); virtual short Execute() SAL_OVERRIDE; virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; @@ -205,7 +205,7 @@ public: void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const; void SetStandardDir( const OUString& rStdDir ); - const OUString& GetStandardDir() const; + const OUString& GetStandardDir() const; std::vector<OUString> GetPathList() const; // for MultiSelection void AddFilter( const OUString& rFilter, @@ -239,9 +239,9 @@ public: sal_Int32 getAvailableWidth(); sal_Int32 getAvailableHeight(); void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ); - bool setShowState( bool bShowState ); - bool getShowState(); - bool isAutoExtensionEnabled(); + bool setShowState( bool bShowState ); + bool getShowState(); + bool isAutoExtensionEnabled(); OUString getCurrentFileText( ) const; void setCurrentFileText( const OUString& _rText, bool _bSelectAll = false ); @@ -269,10 +269,10 @@ public: inline Image GetButtonImage( sal_uInt16 _nButtonId ) const { return m_aImages.GetImage( _nButtonId ); } - bool ContentIsFolder( const OUString& rURL ) { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); } - bool ContentHasParentFolder( const OUString& rURL ); - bool ContentCanMakeFolder( const OUString& rURL ); - bool ContentGetTitle( const OUString& rURL, OUString& rTitle ); + bool ContentIsFolder( const OUString& rURL ) { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); } + bool ContentHasParentFolder( const OUString& rURL ); + bool ContentCanMakeFolder( const OUString& rURL ); + bool ContentGetTitle( const OUString& rURL, OUString& rTitle ); private: SvtFileDialogFilter_Impl* implAddFilter( const OUString& _rFilter, const OUString& _rType ); @@ -291,7 +291,7 @@ private: </p> @return <TRUE/> if the new filter is "*.*" */ - bool createNewUserFilter( const OUString& _rNewFilter, bool _bAllowUserDefExt ); + bool createNewUserFilter( const OUString& _rNewFilter, bool _bAllowUserDefExt ); sal_uInt16 adjustFilter( const OUString& _rFilter ); diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index aa00c862c2c6..4d6a23194fc7 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -52,7 +52,7 @@ struct HBox /** * @returns The Size of HBox object */ - int WSize(); + int WSize(); /** * @returns The Height of HBox object as hunit value. */ diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 017c06152cf9..a9e800b78ab5 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -76,7 +76,7 @@ public: virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); + void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); }; typedef tools::SvRef<SvMetaModule> SvMetaModuleRef; diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx index 8700823e87cb..7aada8913406 100644 --- a/include/basegfx/tools/unopolypolygon.hxx +++ b/include/basegfx/tools/unopolypolygon.hxx @@ -36,9 +36,9 @@ namespace basegfx namespace unotools { typedef ::cppu::WeakComponentImplHelper3< - ::com::sun::star::rendering::XLinePolyPolygon2D, - ::com::sun::star::rendering::XBezierPolyPolygon2D, - ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; + ::com::sun::star::rendering::XLinePolyPolygon2D, + ::com::sun::star::rendering::XBezierPolyPolygon2D, + ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 8b9297a8054a..002589c006ab 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -63,7 +63,7 @@ public: void GetLineRange( sal_uInt16&, sal_uInt16& ); // Interface to execute a method from the applications - ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); + ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE; }; diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index f0cd12a30976..3af8dacdc9ec 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -102,10 +102,10 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - const OUString& GetSource() const; + const OUString& GetSource() const; const OUString& GetSource32() const { return aOUSource;} const OUString& GetComment() const { return aComment; } - void SetSource( const OUString& r ); + void SetSource( const OUString& r ); void SetSource32( const OUString& r ); bool Compile(); @@ -116,14 +116,14 @@ public: bool IsBP( sal_uInt16 nLine ) const; bool SetBP( sal_uInt16 nLine ); bool ClearBP( sal_uInt16 nLine ); - void ClearAllBP(); + void ClearAllBP(); // Store only image, no source (needed for new password protection) - bool StoreBinaryData( SvStream& ); - bool StoreBinaryData( SvStream&, sal_uInt16 nVer ); - bool LoadBinaryData( SvStream&, sal_uInt16 nVer ); - bool LoadBinaryData( SvStream& ); - bool ExceedsLegacyModuleSize(); + bool StoreBinaryData( SvStream& ); + bool StoreBinaryData( SvStream&, sal_uInt16 nVer ); + bool LoadBinaryData( SvStream&, sal_uInt16 nVer ); + bool LoadBinaryData( SvStream& ); + bool ExceedsLegacyModuleSize(); void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const; bool HasExeCode(); bool IsVBACompat() const { return mbVBACompat;} @@ -134,8 +134,8 @@ public: void AddVarName( const OUString& aName ); void RemoveVars(); ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > GetUnoModule(); - bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); - void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); + bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); + void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); SbxArrayRef GetMethods() { return pMethods;} OUString GetKeywordCase( const OUString& sKeyword ) const; }; diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index 12de6e03057f..98f984196dd6 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -84,13 +84,13 @@ public: virtual SbxDataType GetType() const; virtual SbxClassType GetClass() const; - virtual void Clear(); + virtual void Clear(); static SbxBase* Load( SvStream& ); static void Skip( SvStream& ); bool Store( SvStream& ); virtual bool LoadCompleted(); - bool StoreCompleted(); + bool StoreCompleted(); static SbxError GetError(); static void SetError( SbxError ); diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 1ccd03ee4aff..6edef5b11c2a 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -52,17 +52,17 @@ namespace comphelper ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); - bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); - bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); - bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); + bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); + bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); + bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); virtual OUString implGetText() = 0; virtual ::com::sun::star::lang::Locale implGetLocale() = 0; - virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; - void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; + void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); /** non-virtual versions of the methods */ diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 6d193e7697e8..35b45d25c642 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -82,19 +82,19 @@ namespace dbtools virtual ~FormattedColumnValue(); - void clear(); + void clear(); // access to the details of the formatting we determined sal_Int32 getFormatKey() const; sal_Int32 getFieldType() const; sal_Int16 getKeyType() const; const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& - getColumn() const; + getColumn() const; const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& - getColumnUpdate() const; + getColumnUpdate() const; - bool setFormattedValue( const OUString& _rFormattedStringValue ) const; - OUString getFormattedValue() const; + bool setFormattedValue( const OUString& _rFormattedStringValue ) const; + OUString getFormattedValue() const; private: ::std::unique_ptr< FormattedColumnValue_Data > m_pData; diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index fb7292d8a8b9..4c5ae155580d 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -61,11 +61,11 @@ namespace connectivity virtual ~ODescriptor(); - bool isNew() const { return m_bNew; } - bool getNew() const { return m_bNew; } + bool isNew() const { return m_bNew; } + bool getNew() const { return m_bNew; } void setNew(bool _bNew); - bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); } + bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); } virtual void construct(); diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx index de958efc7875..d1ed17d3a7d0 100644 --- a/include/cppcanvas/basegfxfactory.hxx +++ b/include/cppcanvas/basegfxfactory.hxx @@ -26,7 +26,6 @@ #include <cppcanvas/polypolygon.hxx> #include <cppcanvas/bitmap.hxx> #include <cppcanvas/renderer.hxx> -#include <cppcanvas/text.hxx> #include <cppcanvas/sprite.hxx> #include <basegfx/vector/b2isize.hxx> diff --git a/include/cppcanvas/text.hxx b/include/cppcanvas/text.hxx deleted file mode 100644 index 622e553a5ad9..000000000000 --- a/include/cppcanvas/text.hxx +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CPPCANVAS_TEXT_HXX -#define INCLUDED_CPPCANVAS_TEXT_HXX - -#include <boost/shared_ptr.hpp> -#include <cppcanvas/canvasgraphic.hxx> - - - - -/* Definition of Text interface */ - -namespace cppcanvas -{ - class Text : public virtual CanvasGraphic - { - public: - ; - ; - }; - - typedef ::boost::shared_ptr< ::cppcanvas::Text > TextSharedPtr; -} - -#endif // INCLUDED_CPPCANVAS_TEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index a48c62416569..de599c0ad53a 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -26,7 +26,6 @@ #include <cppcanvas/polypolygon.hxx> #include <cppcanvas/bitmap.hxx> #include <cppcanvas/renderer.hxx> -#include <cppcanvas/text.hxx> #include <cppcanvas/sprite.hxx> #include <cppcanvas/cppcanvasdllapi.h> diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index fd1d2567a57f..6cf592e4f072 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -166,7 +166,7 @@ namespace dbaui DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); virtual ~DBSubComponentController(); - void disconnect(); + void disconnect(); virtual void reconnect( bool _bUI ); bool ensureConnected( bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index f85c43b00836..3bff7c932dc6 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -297,7 +297,7 @@ public: void SetText(sal_Int32 nPara, const OUString& rText); - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const; @@ -464,7 +464,7 @@ public: virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ); virtual void ParaAttribsChanged( sal_Int32 nParagraph ); virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - void ParagraphHeightChanged( sal_Int32 nPara ); + void ParagraphHeightChanged( sal_Int32 nPara ); virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, @@ -508,7 +508,6 @@ public: static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); - SdrObject* GetCurTextObj() { return NULL; } /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); Link GetBeginDropHdl() const; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 7386faea93af..0c41aa8827a6 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -58,8 +58,8 @@ public: virtual SvxFieldData* Clone() const; virtual bool operator==( const SvxFieldData& ) const; - virtual MetaAction* createBeginComment() const; - MetaAction* createEndComment() const; + virtual MetaAction* createBeginComment() const; + MetaAction* createEndComment() const; }; /** diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index de71bd96f1a2..9189171a546b 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -44,10 +44,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { @@ -77,10 +77,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { @@ -106,10 +106,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r); }; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index b56ac7fd6878..836ad0665d3f 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -638,7 +638,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); - sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } + sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } void ImplCheckDepth( sal_Int16& rnDepth ) const; protected: @@ -646,7 +646,7 @@ protected: void ParagraphDeleted( sal_Int32 nParagraph ); void ParaAttribsChanged( sal_Int32 nParagraph ); - void StyleSheetChanged( SfxStyleSheet* pStyle ); + void StyleSheetChanged( SfxStyleSheet* pStyle ); void InvalidateBullet(sal_Int32 nPara); void PaintBullet( sal_Int32 nPara, const Point& rStartPos, @@ -663,7 +663,7 @@ public: virtual ~Outliner(); void Init( sal_uInt16 nOutlinerMode ); - sal_uInt16 GetMode() const { return nOutlinerMode; } + sal_uInt16 GetMode() const { return nOutlinerMode; } void SetVertical( bool bVertical ); bool IsVertical() const; @@ -744,28 +744,28 @@ public: Paragraph* GetHdlParagraph() const { return pHdlParagraph; } bool IsExpanding() const { return bIsExpanding; } - void ExpandHdl(); + void ExpandHdl(); void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } Link GetExpandHdl() const { return aExpandHdl; } - void ParagraphInsertedHdl(); + void ParagraphInsertedHdl(); void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} Link GetParaInsertedHdl() const { return aParaInsertedHdl; } - void ParagraphRemovingHdl(); + void ParagraphRemovingHdl(); void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} Link GetParaRemovingHdl() const { return aParaRemovingHdl; } - void DepthChangedHdl(); + void DepthChangedHdl(); void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} Link GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); } sal_uInt16 GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - long RemovingPagesHdl( OutlinerView* ); + long RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - long IndentingPagesHdl( OutlinerView* ); + long IndentingPagesHdl( OutlinerView* ); void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } // valid only in the two upper handlers @@ -806,9 +806,9 @@ public: void SetFirstPageNumber( sal_Int32 n ) { nFirstPage = n; } sal_Int32 GetFirstPageNumber() const { return nFirstPage; } - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); - void ClearPolygon(); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); + void ClearPolygon(); const Size& GetMinAutoPaperSize() const; void SetMinAutoPaperSize( const Size& rSz ); @@ -828,9 +828,9 @@ public: EBulletInfo GetBulletInfo( sal_Int32 nPara ); - void SetWordDelimiters( const OUString& rDelimiters ); - OUString GetWordDelimiters() const; - OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); + void SetWordDelimiters( const OUString& rDelimiters ); + OUString GetWordDelimiters() const; + OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); void StripPortions(); @@ -910,8 +910,8 @@ public: bool UpdateFields(); void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); - void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( ::com::sun::star::uno::Reference< diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index a9404de5862c..b135c7e7a1d6 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -42,7 +42,7 @@ public: virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; - sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); + sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual SfxItemState GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 1612e5db3130..1c2cf6f0aedc 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -199,7 +199,7 @@ public: virtual bool IsValid() const SAL_OVERRIDE; - void SetNotifyHdl( const Link& ); + void SetNotifyHdl( const Link& ); virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 257642fe8d3c..f48fcd28ed8d 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -44,7 +44,7 @@ protected: virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; virtual void implWriteExtHeader() SAL_OVERRIDE; virtual void implDumpRecordBody() SAL_OVERRIDE; - void implDumpClientAnchor(); + void implDumpClientAnchor(); private: sal_uInt32 dumpDffSimpleColor( const String& rName ); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index e055832c2445..926d6e46356d 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -963,8 +963,8 @@ protected: const OUString& rSysFileName ); virtual bool implIsValid() const SAL_OVERRIDE; - const OUString* implGetOption( const OUString& rKey ) const; - NameListRef implGetNameList( const OUString& rListName ) const; + const OUString* implGetOption( const OUString& rKey ) const; + NameListRef implGetNameList( const OUString& rListName ) const; private: typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 282d3a0e40bf..e3a7199fe355 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -406,8 +406,8 @@ public: protected: virtual void importControlData( BinaryInputStream& rInStrm ) = 0; - void importCommonExtraData( BinaryInputStream& rInStrm ); - void importCommonTrailingData( BinaryInputStream& rInStrm ); + void importCommonExtraData( BinaryInputStream& rInStrm ); + void importCommonTrailingData( BinaryInputStream& rInStrm ); private: /** Returns the data part identifier according to the model version. */ diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 0c996acfd999..72a225b55b22 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -152,7 +152,7 @@ protected: /** Called when the import process of the VBA project has been started. */ virtual void prepareImport(); /** Called when the import process of the VBA project is finished. */ - void finalizeImport(); + void finalizeImport(); private: VbaProject( const VbaProject& ); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 9001c5d1b5a3..d4a8efbcc494 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -127,7 +127,7 @@ public: FloatingWindow* GetFloatingWindow() const; virtual void Resizing( Size& rSize ); - bool Close(); + bool Close(); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 91ae1f25ac5e..fa5b7b9ac853 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -65,11 +65,11 @@ public: SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink ); void SetId( sal_uInt16 nItemId ); - sal_uInt16 GetId() const { return nId; } + sal_uInt16 GetId() const { return nId; } virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - void DeleteFloatingWindow(); + void DeleteFloatingWindow(); SfxMapUnit GetCoreMetric() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index e5c919900fe5..6fc50597ba3d 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -103,7 +103,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void FadeIn( bool ); + void FadeIn( bool ); DECL_LINK(TimerHdl, void *); SAL_DLLPRIVATE void Initialize_Impl(); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 1bb50587d722..cf778f417fe7 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -236,7 +236,7 @@ public: SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 6474682c0d7c..da7563457b1e 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -50,7 +50,7 @@ private: protected: virtual ~SfxHintPoster(); - void Event( SfxHint* pPostedHint ); + void Event( SfxHint* pPostedHint ); public: SfxHintPoster( const GenLink& rLink ); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 173e259bf8e0..b3646bcdbb94 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -75,7 +75,7 @@ public: SfxObjectFactory* pFactoryP, ... ); virtual ~SfxModule(); - ResMgr* GetResMgr(); + ResMgr* GetResMgr(); SfxSlotPool* GetSlotPool() const; void RegisterToolBoxControl(SfxTbxCtrlFactory*); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 0b1bb68d8d07..ddec48274d31 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -191,7 +191,7 @@ protected: SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx virtual ~SfxObjectShell(); - void ModifyChanged(); + void ModifyChanged(); virtual bool Close() SAL_OVERRIDE; /** declares the document to have capabilities to contain basic/dialog libraries @@ -247,7 +247,7 @@ public: void UpdateDocInfoForSave( ); void FlushDocInfo(); bool HasName() const { return bHasName; } - OUString GetAPIName() const; + OUString GetAPIName() const; void SetReadOnly(); bool IsReadOnly() const; bool IsReadOnlyMedium() const; @@ -257,7 +257,7 @@ public: void SetNoName(); bool IsInModalMode() const; bool IsInPrepareClose() const; - bool AcceptStateUpdate() const; + bool AcceptStateUpdate() const; bool IsHelpDocument() const; bool IsDocShared() const; @@ -296,7 +296,7 @@ public: // TODO/LATER: currently only overridden in Calc, should be made non-virtual virtual bool DoSaveCompleted( SfxMedium* pNewStor=0 ); - bool LoadOwnFormat( SfxMedium& pMedium ); + bool LoadOwnFormat( SfxMedium& pMedium ); virtual bool SaveAsOwnFormat( SfxMedium& pMedium ); virtual bool ConvertFrom( SfxMedium &rMedium ); virtual bool ConvertTo( SfxMedium &rMedium ); @@ -306,7 +306,7 @@ public: virtual bool Save(); virtual bool SaveAs( SfxMedium &rMedium ); virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - bool SwitchPersistance( + bool SwitchPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual void UpdateLinks(); virtual bool LoadExternal( SfxMedium& rMedium ); @@ -402,17 +402,17 @@ public: static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc ); - void ViewAssigned(); + void ViewAssigned(); virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); - bool HasSecurityOptOpenReadOnly() const; + bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); virtual Size GetFirstPageSize(); - bool DoClose(); + bool DoClose(); virtual void PrepareReload(); ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; virtual void CancelTransfers(); @@ -453,7 +453,7 @@ public: void InvalidateName(); // Re-set to unnamed // DDE-Interface - long DdeExecute( const OUString& rCmd ); + long DdeExecute( const OUString& rCmd ); virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); @@ -473,7 +473,7 @@ public: // Determine the position of the "Automatic" filter in the stylist void SetAutoStyleFilterIndex(sal_uInt16 nSet); sal_uInt16 GetAutoStyleFilterIndex(); - bool HasBasic() const; + bool HasBasic() const; BasicManager* GetBasicManager() const; com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetBasicContainer(); @@ -497,7 +497,7 @@ public: virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; @@ -508,7 +508,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); - vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > @@ -518,7 +518,7 @@ public: bool IsInPlaceActive(); bool IsUIActive(); virtual void InPlaceActivate( bool ); - void UIActivate( bool ); + void UIActivate( bool ); static bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, @@ -560,12 +560,12 @@ public: // The functions from SvEmbeddedObject virtual Printer * GetDocumentPrinter(); - virtual OutputDevice* GetDocumentRefDev(); + virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; - virtual void SetVisArea( const Rectangle & rVisArea ); + virtual void SetVisArea( const Rectangle & rVisArea ); const Rectangle & GetVisArea() const; - void SetVisAreaSize( const Size & rVisSize ); + void SetVisAreaSize( const Size & rVisSize ); virtual sal_uIntPtr GetMiscStatus() const; MapUnit GetMapUnit() const; @@ -800,7 +800,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index ba3404ee3676..b833ce17c335 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -387,7 +387,7 @@ public: SfxShell::Activate() */ - void ParentActivate(); + void ParentActivate(); /** The active parent of the <SfxDispatcher> on which the SfxShell is located, @@ -399,7 +399,7 @@ public: SfxShell::Deactivate() */ - void ParentDeactivate(); + void ParentDeactivate(); /** This method returns a pointer to the <SfxDispatcher>, when the SfxShell diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index e3046c624398..07121f89fa00 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -98,11 +98,11 @@ protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void Command( const CommandEvent& rCEvt ); virtual bool MouseButtonDown( const MouseEvent & ); virtual bool MouseMove( const MouseEvent & ); - bool MouseButtonUp( const MouseEvent & ); + bool MouseButtonUp( const MouseEvent & ); virtual void Paint( const UserDrawEvent &rUDEvt ); static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index f64401823ab8..5495c0b0bc6d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -73,26 +73,6 @@ namespace sfx2 }; - //= IToolPanelCompare - - class SFX2_DLLPUBLIC SAL_NO_VTABLE IToolPanelCompare - { - public: - /** compares to tool panel URLs - @return - <ul> - <li>-1 if the tool panel described by i_rLHS should precede the one described by i_rRHS</li> - <li>0 if the two panels have no particular relative order</li> - <li>1 if the tool panel described by i_rLHS should succeed the one described by i_rRHS</li> - - */ - ; - - protected: - ~IToolPanelCompare() {} - }; - - //= ModuleTaskPane class ModuleTaskPane_Impl; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index f3ca152c5f2a..168b8c4aaebf 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -120,9 +120,9 @@ private: protected: virtual void PopupModeEnd() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - void DeleteFloatingWindow(); + void DeleteFloatingWindow(); - sal_uInt16 GetId() const { return m_nId; } + sal_uInt16 GetId() const { return m_nId; } const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } void BindListener(); diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 91361265ed3f..a56376304d84 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -46,10 +46,10 @@ public: virtual ~SfxTemplatePanelControl(); void Update(); - virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void FreeResource (void); private: diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 5f8232872e96..18a3158158dd 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -115,11 +115,11 @@ public: SfxViewFrame* GetParentViewFrame() const; using SfxShell::GetDispatcher; - SfxDispatcher* GetDispatcher() { return pDispatcher; } + SfxDispatcher* GetDispatcher() { return pDispatcher; } SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } - vcl::Window& GetWindow() const; - void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + vcl::Window& GetWindow() const; + void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; @@ -136,19 +136,19 @@ public: bool IsVisible() const; void ToTop(); void Enable( bool bEnable ); - bool Close(); + bool Close(); virtual void Activate( bool bUI ) SAL_OVERRIDE; virtual void Deactivate( bool bUI ) SAL_OVERRIDE; // DDE-Interface - long DdeExecute( const OUString& rCmd ); - bool DdeGetData( const OUString& rItem, + long DdeExecute( const OUString& rCmd ); + bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); - bool DdeSetData( const OUString& rItem, + bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); + ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); void UpdateTitle(); @@ -160,12 +160,12 @@ public: SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - sal_uInt16 GetCurViewId() const; + sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; bool DoClose(); - sal_uIntPtr GetFrameType() const + sal_uIntPtr GetFrameType() const { return GetFrame().GetFrameType(); } SfxFrame& GetTopFrame() const { return GetFrame().GetTopFrame(); } @@ -178,14 +178,14 @@ public: bool IsInModalMode() const; void Resize(bool bForce=false); - void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true); - void ToggleChildWindow(sal_uInt16); - bool HasChildWindow(sal_uInt16); - bool KnowsChildWindow(sal_uInt16); - void ShowChildWindow(sal_uInt16,bool bVisible=true); - SfxChildWindow* GetChildWindow(sal_uInt16); - void ChildWindowExecute(SfxRequest&); - void ChildWindowState(SfxItemSet&); + void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true); + void ToggleChildWindow(sal_uInt16); + bool HasChildWindow(sal_uInt16); + bool KnowsChildWindow(sal_uInt16); + void ShowChildWindow(sal_uInt16,bool bVisible=true); + SfxChildWindow* GetChildWindow(sal_uInt16); + void ChildWindowExecute(SfxRequest&); + void ChildWindowState(SfxItemSet&); /** Append a new InfoBar (see https://wiki.documentfoundation.org/Design/Whiteboards/Infobar). diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 3498dc98a5b7..39bebeec25d8 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -172,9 +172,9 @@ public: virtual ErrCode DoVerb(long nVerb); - void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); - void InplaceActivating( SfxInPlaceClient* pClient ); - void InplaceDeactivated( SfxInPlaceClient* pClient ); + void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); + void InplaceActivating( SfxInPlaceClient* pClient ); + void InplaceDeactivated( SfxInPlaceClient* pClient ); virtual void UIActivating( SfxInPlaceClient* pClient ); virtual void UIDeactivated( SfxInPlaceClient* pClient ); @@ -188,7 +188,7 @@ public: * has been set. By the time this is called the document has been fully * imported. */ - void Initialize(); + void Initialize(); virtual bool PrepareClose( bool bUI = true ); virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual bool HasSelection( bool bText = true ) const; @@ -210,7 +210,7 @@ public: bool Escape(); // Viewing Interface - vcl::Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetWindow( vcl::Window *pViewPort ); virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; @@ -223,7 +223,7 @@ public: virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); - JobSetup GetJobSetup() const; + JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; // Working set @@ -256,7 +256,7 @@ public: const Size& GetMargin() const; void SetMargin( const Size& ); void DisconnectAllClients(); - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); bool NewWindowAllowed() const { return !bNoNewWindow; } void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index e08847b93f30..078a32be6ffc 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -58,7 +58,7 @@ public: const OUString & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); - void * CreateInstance( SotObject ** ppObj = NULL ) const; + void * CreateInstance( SotObject ** ppObj = NULL ) const; bool Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( sal_uInt16 nPos ) const diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 19428d6183bd..f23f1835825d 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -110,13 +110,13 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotObjectFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const; - virtual void * Cast( const SotFactory * ); + virtual void * Cast( const SotFactory * ); // only for the macros in So3 not to get out of hand - IUnknown * GetInterface( const SvGlobalName & ); + IUnknown * GetInterface( const SvGlobalName & ); bool Owner() const { return bOwner; } diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 10940c4bd7f5..830faf8a36fc 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -65,18 +65,18 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageStreamFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; - virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; virtual void ResetError() SAL_OVERRIDE; virtual void SetSize( sal_uInt64 nNewSize ) SAL_OVERRIDE; - sal_uInt32 GetSize() const; + sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); - bool Commit(); - bool Revert(); + bool Commit(); + bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; @@ -127,19 +127,19 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; - virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; SvMemoryStream * CreateMemoryStream(); static bool IsStorageFile( const OUString & rFileName ); static bool IsStorageFile( SvStream* pStream ); - const OUString& GetName() const; + const OUString& GetName() const; - bool Validate(); + bool Validate(); const OString& GetKey() const { return m_aKey;} @@ -152,36 +152,36 @@ public: return m_nVersion; } - sal_uLong GetErrorCode() const { return m_nError; } - sal_uLong GetError() const { return ERRCODE_TOERROR(m_nError); } + sal_uLong GetErrorCode() const { return m_nError; } + sal_uLong GetError() const { return ERRCODE_TOERROR(m_nError); } void SetError( sal_uLong nErrorCode ) { if( m_nError == SVSTREAM_OK ) m_nError = nErrorCode; } - void ResetError(); + void ResetError(); bool IsRoot() const { return m_bIsRoot; } void SignAsRoot( bool b = true ) { m_bIsRoot = b; } void SetDeleteStream( bool bDelete ) { m_bDelStm = bDelete; } // own data sector - void SetClass( const SvGlobalName & rClass, + void SetClass( const SvGlobalName & rClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - void SetConvertClass( const SvGlobalName & rConvertClass, + void SetConvertClass( const SvGlobalName & rConvertClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - SvGlobalName GetClassName(); // type of data in the storage - sal_uLong GetFormat(); - OUString GetUserName(); - bool ShouldConvert(); + SvGlobalName GetClassName(); // type of data in the storage + sal_uLong GetFormat(); + OUString GetUserName(); + bool ShouldConvert(); // list of all elements - void FillInfoList( SvStorageInfoList * ) const; - bool CopyTo( SotStorage * pDestStg ); - bool Commit(); - bool Revert(); + void FillInfoList( SvStorageInfoList * ) const; + bool CopyTo( SotStorage * pDestStg ); + bool Commit(); + bool Revert(); // create stream with connection to Storage, // more or less a Parent-Child relationship @@ -192,17 +192,17 @@ public: StreamMode = STREAM_STD_READWRITE, bool transacted = true ); // query whether Storage or Stream - bool IsStream( const OUString & rEleName ) const; - bool IsStorage( const OUString & rEleName ) const; - bool IsContained( const OUString & rEleName ) const; + bool IsStream( const OUString & rEleName ) const; + bool IsStorage( const OUString & rEleName ) const; + bool IsContained( const OUString & rEleName ) const; // remove element - bool Remove( const OUString & rEleName ); + bool Remove( const OUString & rEleName ); // change element's name - bool Rename( const OUString & rEleName, + bool Rename( const OUString & rEleName, const OUString & rNewName ); - bool CopyTo( const OUString & rEleName, SotStorage * pDest, + bool CopyTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); - bool MoveTo( const OUString & rEleName, SotStorage * pDest, + bool MoveTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); bool IsOLEStorage() const; diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index a35b62a2d694..60727de9c5aa 100644 --- a/include/svl/SfxBroadcaster.hxx +++ b/include/svl/SfxBroadcaster.hxx @@ -38,7 +38,6 @@ private: protected: void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); - void ListenersGone(); public: TYPEINFO(); diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 5a64eb1d1435..1a9b2e685f47 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -473,7 +473,7 @@ public: void NewContent(); - sal_uInt32 Close( bool bSeekToEndOfRec = true ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; /** write record with multiple content items with identical size diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 7fc64e1189f2..c458cef78443 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -151,7 +151,7 @@ public: virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); - const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; + const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, bool bDirect = false, @@ -170,7 +170,7 @@ public: bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; - SvStream & Load(SvStream &); + SvStream & Load(SvStream &); virtual SvStream & Store(SvStream &) const; bool HasPersistentRefCounts() const; void LoadCompleted(); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index cc9009d5942d..05ee6e9d4a4f 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -106,7 +106,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet SfxItemPropertyMap m_aMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; protected: - bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; + bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : @@ -127,12 +127,12 @@ public: const SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, + void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); - void setPropertyValue( const OUString& rPropertyName, + void setPropertyValue( const OUString& rPropertyName, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 8fd2e3f997fd..5184e9b940be 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -80,15 +80,15 @@ public: virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = 0) const; // Get number of items - sal_uInt16 Count() const { return _nCount; } - sal_uInt16 TotalCount() const; + sal_uInt16 Count() const { return _nCount; } + sal_uInt16 TotalCount() const; - const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; + const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; const SfxPoolItem* GetItem( sal_uInt16 nWhich, bool bSrchInParent = true, TypeId aItemType = 0 ) const; // Get Which-value of the item at position nPos - sal_uInt16 GetWhichByPos(sal_uInt16 nPos) const; + sal_uInt16 GetWhichByPos(sal_uInt16 nPos) const; // Get item-status SfxItemState GetItemState( sal_uInt16 nWhich, @@ -97,12 +97,12 @@ public: bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = NULL) const; - void DisableItem(sal_uInt16 nWhich); - void InvalidateItem( sal_uInt16 nWhich ); - sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); - void ClearInvalidItems( bool bHardDefault = false ); - void InvalidateAllItems(); // HACK(via nWhich = 0) ??? - void InvalidateDefaultItems(); + void DisableItem(sal_uInt16 nWhich); + void InvalidateItem( sal_uInt16 nWhich ); + sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); + void ClearInvalidItems( bool bHardDefault = false ); + void InvalidateAllItems(); // HACK(via nWhich = 0) ??? + void InvalidateDefaultItems(); inline void SetParent( const SfxItemSet* pNew ); @@ -116,22 +116,22 @@ public: SfxItemState eDontCareAs = SfxItemState::UNKNOWN, SfxItemState eDefaultAs = SfxItemState::UNKNOWN ); - bool Set( const SfxItemSet&, bool bDeep = true ); + bool Set( const SfxItemSet&, bool bDeep = true ); - void Intersect( const SfxItemSet& rSet ); - void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); - void Differentiate( const SfxItemSet& rSet ); - void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); + void Intersect( const SfxItemSet& rSet ); + void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); + void Differentiate( const SfxItemSet& rSet ); + void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); SfxItemPool* GetPool() const { return _pPool; } - const sal_uInt16* GetRanges() const { return _pWhichRanges; } + const sal_uInt16* GetRanges() const { return _pWhichRanges; } void SetRanges( const sal_uInt16 *pRanges ); void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ); const SfxItemSet* GetParent() const { return _pParent; } - SvStream & Load( SvStream &, bool bDirect = false, + SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - SvStream & Store( SvStream &, bool bDirect = false ) const; + SvStream & Store( SvStream &, bool bDirect = false ) const; bool operator==(const SfxItemSet &) const; sal_Int32 getHash() const; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 9c416a2f561f..8a3f7abab782 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -63,9 +63,9 @@ public: SvNumberFormatter* GetNumberFormatter() const; // override to adapt attributes in the document - void NumberFormatDeleted(sal_uInt32 nKey); + void NumberFormatDeleted(sal_uInt32 nKey); // override to possibly format something anew - void SettingsChanged(); + void SettingsChanged(); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 738e867a616f..c1e724992415 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -47,14 +47,14 @@ public: const std::vector<OUString>& GetList() const; // String-Separator: \n - void SetString( const OUString& ); - OUString GetString(); + void SetString( const OUString& ); + OUString GetString(); void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 1dd3ca44d244..3be7495c6d44 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -362,9 +362,9 @@ protected: nRow starts at 0 */ virtual bool SeekRow( long nRow ) = 0; - void DrawCursor(); - void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); - void PaintData( vcl::Window& rWin, const Rectangle& rRect ); + void DrawCursor(); + void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); + void PaintData( vcl::Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; // Advice for the subclass: the visible scope of rows has changed. @@ -384,10 +384,10 @@ protected: virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); // number of visible rows in the window (incl. "truncated" rows) - sal_uInt16 GetVisibleRows() + sal_uInt16 GetVisibleRows() { return (sal_uInt16)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } long GetTopRow() { return nTopRow; } - sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } + sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } // Focus-Rect enable / disable void DoShowCursor( const char *pWhoLog ); @@ -450,9 +450,9 @@ public: // neue Handler virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); - void MouseMove( const BrowserMouseEvent& rEvt ); + void MouseMove( const BrowserMouseEvent& rEvt ); virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - void StartScroll(); + void StartScroll(); virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); @@ -460,7 +460,7 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - long QueryColumnResize( sal_uInt16 nColId, long nWidth ); + long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); @@ -497,8 +497,8 @@ public: void SetDataRowHeight( long nPixel ); long GetDataRowHeight() const; void SetTitleLines( sal_uInt16 nLines ); - sal_uInt16 GetTitleLines() const { return nTitleLines; } - long GetTitleHeight() const; + sal_uInt16 GetTitleLines() const { return nTitleLines; } + long GetTitleHeight() const; // access to dynamic values of cursor row OUString GetColumnTitle( sal_uInt16 nColumnId ) const; @@ -554,7 +554,7 @@ public: bool bComplete = false ) const; long GetRowAtYPosPixel( long nY, bool bRelToBrowser = true ) const; - sal_uInt16 GetColumnAtXPosPixel( long nX, + sal_uInt16 GetColumnAtXPosPixel( long nX, bool bRelToBrowser = true ) const; // invalidations @@ -816,8 +816,8 @@ public: virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 10dff86e49a8..e970842480a7 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -274,11 +274,11 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void SelectionChanging(); - void DateRangeChanged(); - void RequestDateInfo(); - void DoubleClick(); - void Select(); + void SelectionChanging(); + void DateRangeChanged(); + void RequestDateInfo(); + void DoubleClick(); + void Select(); const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index a898b08bc658..1919ba0666c4 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -47,12 +47,12 @@ public: void SetMode( sal_Int16 eMode ); - short Execute(); + short Execute(); private: vcl::Window* mpParent; - Color maColor; - sal_Int16 meMode; + Color maColor; + sal_Int16 meMode; }; #endif // INCLUDED_SVTOOLS_COLRDLG_HXX diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 377f92b29f95..42d9a708edb3 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -311,8 +311,8 @@ private: void SVT_DLLPRIVATE ImplAfterDataChange(); protected: - void GraphicManagerDestroyed(); - SvStream* GetSwapStream() const; + void GraphicManagerDestroyed(); + SvStream* GetSwapStream() const; void SetSwapState(); virtual void Load( SvStream& ) SAL_OVERRIDE; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index e9ff21b7d364..f7cb8c14ca1d 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -297,9 +297,9 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); - void StartDrag(); - void Drag(); + void UserDraw( const UserDrawEvent& rUDEvt ); + void StartDrag(); + void Drag(); virtual void EndDrag(); virtual void Select(); virtual void DoubleClick(); diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 874614ba214a..22b3d3546785 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -87,9 +87,9 @@ public: bool bActive ); virtual ~IMapObject() {}; - sal_uInt16 GetVersion() const; - virtual sal_uInt16 GetType() const = 0; - virtual bool IsHit( const Point& rPoint ) const = 0; + sal_uInt16 GetVersion() const; + virtual sal_uInt16 GetType() const = 0; + virtual bool IsHit( const Point& rPoint ) const = 0; void Write ( SvStream& rOStm, const OUString& rBaseURL ) const; void Read( SvStream& rIStm, const OUString& rBaseURL ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 2c086637bddc..84ec8d8748f8 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -228,10 +228,10 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); - void DocumentRectChanged(); - void VisibleRectChanged(); - bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); + void DocumentRectChanged(); + void VisibleRectChanged(); + bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -240,11 +240,11 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - void ClickIcon(); + void ClickIcon(); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void DrawEntryImage( + void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ); @@ -320,10 +320,10 @@ public: void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); #endif - bool HasBackground() const; - bool HasFont() const; - bool HasFontTextColor() const; - bool HasFontFillColor() const; + bool HasBackground() const; + bool HasFont() const; + bool HasFontTextColor() const; + bool HasFontFillColor() const; void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } bool AutoFontColor () { return _bAutoFontColor; } diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index f165f5a91b50..86b7773568ee 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -744,7 +744,7 @@ public: virtual void Drag(); virtual void EndDrag(); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void ExtraDown(); void Activate() SAL_OVERRIDE; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index a3f3bf4629ed..505397087896 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -69,8 +69,8 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; - void StartScroll(); - void EndScroll( long nDeltaX, long nDeltaY ); + void StartScroll(); + void EndScroll( long nDeltaX, long nDeltaY ); using OutputDevice::SetMapMode; virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 1f702147f894..b8414851256c 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -77,10 +77,10 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); - void HBarDblClick(); - void HBarStartDrag(); - void HBarDrag(); - void HBarEndDrag(); + void HBarDblClick(); + void HBarStartDrag(); + void HBarDrag(); + void HBarEndDrag(); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index e41f52e8cbb2..675999d9cdb2 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -403,7 +403,7 @@ public: virtual void Select(); virtual void DoubleClick(); - void Split(); + void Split(); virtual void ActivatePage(); virtual bool DeactivatePage(); virtual bool StartRenaming(); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index f3558583a1d7..96c501d6ad8e 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -564,7 +564,7 @@ protected: void NotifyBeginScroll(); virtual void NotifyEndScroll(); // nLines == 0 => horizontal Scrolling - void NotifyScrolling( long nLines ); + void NotifyScrolling( long nLines ); virtual void NotifyScrolled(); void SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; } const Link& GetScrolledHdl() const { return aScrolledHdl; } @@ -577,7 +577,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void CursorMoved( SvTreeListEntry* pNewCursor ); + void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -595,7 +595,7 @@ protected: void AdjustEntryHeightAndRecalc( const vcl::Font& rFont ); public: - void SetExtendedWinBits( ExtendedWinBits _nBits ); + void SetExtendedWinBits( ExtendedWinBits _nBits ); void DisconnectFromModel(); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8342b603eee6..fe6f8e5597f7 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -303,7 +303,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Select(); - void DoubleClick(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, const Image& rImage, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 3851b8e349a3..bacf8a322360 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -50,8 +50,8 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index f66294fbebde..b7daff733d68 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -42,8 +42,8 @@ public: void SetSize(const Size& rSize); void CopyBackground( const DialControlBmp& rSrc ); void DrawBackground( const Size& rSize, bool bEnabled ); - void DrawBackground(); - void DrawElements( const OUString& rText, sal_Int32 nAngle ); + void DrawBackground(); + void DrawElements( const OUString& rText, sal_Int32 nAngle ); protected: Rectangle maRect; @@ -58,7 +58,7 @@ private: void Init(); - vcl::Window& mrParent; + vcl::Window& mrParent; long mnCenterX; long mnCenterY; }; @@ -150,7 +150,7 @@ protected: std::unique_ptr< DialControl_Impl > mpImpl; virtual void HandleMouseEvent( const Point& rPos, bool bInitial ); - void HandleEscapeEvent(); + void HandleEscapeEvent(); void SetRotation( sal_Int32 nAngle, bool bBroadcast ); diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 05799ed8347b..a84e56019db2 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -43,11 +43,11 @@ public: SvxRotateModeItem( const SvxRotateModeItem& rItem ); virtual ~SvxRotateModeItem(); - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index fdb56896a0fe..bd20470df7ce 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -229,7 +229,7 @@ private: protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 3982175f2f22..e723a3768992 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -141,9 +141,9 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; // Is called by the PaintView virtual void SetMarkHandles(); // aHdl - fill (List of handles) - void SetMarkRects(); // Rects at the PageViews - void CheckMarked(); // Scan MarkList after Del and Lock Layer ... - void AddDragModeHdl(SdrDragMode eMode); + void SetMarkRects(); // Rects at the PageViews + void CheckMarked(); // Scan MarkList after Del and Lock Layer ... + void AddDragModeHdl(SdrDragMode eMode); virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 27854e05c051..dcb2b713d9b6 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -130,7 +130,7 @@ public: const SvStream * GetStream() const { return m_pStream; } virtual void SetSynchronMode(bool bTheSync = true) { m_bSync = bTheSync; } - bool IsSynchronMode() const { return m_bSync; } + bool IsSynchronMode() const { return m_bSync; } virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount, sal_Size * pRead) const; @@ -247,7 +247,7 @@ private: protected: sal_uInt64 m_nBufFilePos; ///< File position of pBuf[0] - StreamMode eStreamMode; + StreamMode eStreamMode; bool bIsWritable; virtual sal_Size GetData( void* pData, sal_Size nSize ); @@ -385,7 +385,7 @@ public: bool WriteByteStringLine( const OUString& rStr, rtl_TextEncoding eDestCharSet ); /// Switch to no endian swapping and write 0xfeff - bool StartWritingUnicodeText(); + bool StartWritingUnicodeText(); /** If eReadBomCharSet==RTL_TEXTENCODING_DONTKNOW: read 16bit, if 0xfeff do nothing (UTF-16), if 0xfffe switch endian swapping (UTF-16), if 0xefbb @@ -396,7 +396,7 @@ public: If eReadBomCharSet!=RTL_TEXTENCODING_DONTKNOW: only read a BOM of that encoding and switch endian swapping if UTF-16 and 0xfffe. */ - bool StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ); + bool StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ); /** Read a line of Unicode. @@ -404,7 +404,7 @@ public: Maximum of codepoints (UCS-2 or UTF-16 pairs, not bytes) to read, if line is longer it will be truncated. */ - bool ReadUniStringLine(OUString& rStr, sal_Int32 nMaxCodepointsToRead); + bool ReadUniStringLine(OUString& rStr, sal_Int32 nMaxCodepointsToRead); /** Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet */ diff --git a/include/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx deleted file mode 100644 index 1aa35dc238cd..000000000000 --- a/include/vcl/ImageListProvider.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_IMAGELISTPROVIDER_HXX -#define INCLUDED_VCL_IMAGELISTPROVIDER_HXX - -#include <sal/types.h> - -namespace com { namespace sun { namespace star { namespace lang { class IllegalArgumentException; }}}} - -class ImageList; - - -namespace vcl -{ - enum ImageListType - { - IMAGELISTTYPE_UNKNOWN = 0, - HIGHCONTRAST_NO = 1, - HIGHCONTRAST_YES = 2 - }; - - /* abstract */ class IImageListProvider - { - public: - ; - - protected: - ~IImageListProvider() {} - }; -} /* vcl */ - -#endif // INCLUDED_VCL_IMAGELISTPROVIDER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index d0394bb94cf5..d7d9d296ca2d 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -68,9 +68,9 @@ public: Accelerator( const ResId& rResId ); virtual ~Accelerator(); - void Activate(); - void Deactivate(); - void Select(); + void Activate(); + void Deactivate(); + void Select(); void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ); void InsertItem( const ResId& rResId ); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 5601f1ffc93d..d537592de190 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -44,7 +44,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void Click(); + void Click(); void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 7e59b06e3ede..3ea832d9525d 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -168,16 +168,16 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); - void Toggle(); + void Toggle(); void SetSymbol( SymbolType eSymbol ); SymbolType GetSymbol() const { return meSymbol; } void SetSymbolAlign( SymbolAlign eAlign ); void SetDropDown( sal_uInt16 nStyle ); - sal_uInt16 GetDropDown() const { return mnDDStyle; } + sal_uInt16 GetDropDown() const { return mnDDStyle; } void SetState( TriState eState ); TriState GetState() const { return meState; } diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index ca9325a1494f..1ae7479a19db 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -173,7 +173,7 @@ public: void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const { return mnFloatBits;} - void setPosSizePixel( long nX, long nY, + void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, @@ -311,10 +311,10 @@ public: virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); - void TitleButtonClick( sal_uInt16 nButton ); - void Pin(); - void Roll(); - void PopupModeEnd(); + void TitleButtonClick( sal_uInt16 nButton ); + void Pin(); + void Roll(); + void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 9479fcbdeba8..d4169265a024 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -223,8 +223,8 @@ public: virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); virtual OUString GetText() const SAL_OVERRIDE; - void SetPlaceholderText( const OUString& rStr ); - OUString GetPlaceholderText() const; + void SetPlaceholderText( const OUString& rStr ); + OUString GetPlaceholderText() const; void SaveValue() { maSaveValue = GetText(); } const OUString& GetSavedValue() const { return maSaveValue; } @@ -244,7 +244,7 @@ public: virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size CalcSize(sal_Int32 nChars) const; - sal_Int32 GetMaxVisChars() const; + sal_Int32 GetMaxVisChars() const; sal_Int32 GetCharPos( const Point& rWindowPos ) const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 92b0967127f3..0119e9dc0d5f 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -185,15 +185,15 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } - bool SetModeImage( const Image& rImage ); + bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const { return maImage;} - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; static Image loadThemeImage(const OString &rFileName); }; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 8ff335346d8f..05ab48ad2c98 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -118,8 +118,8 @@ private: protected: - void Linker( OutputDevice* pOut, bool bLink ); - long Hook(); + void Linker( OutputDevice* pOut, bool bLink ); + long Hook(); public: GDIMetaFile(); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index a1986ba634f0..8bd9c77a2b27 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -213,11 +213,11 @@ protected: public: virtual ~Menu(); - void Activate(); - void Deactivate(); + void Activate(); + void Deactivate(); virtual void Highlight(); virtual void Select(); - void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ); void InsertItem( sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nItemBits = MenuItemBits::NONE, @@ -243,9 +243,9 @@ public: void CreateAutoMnemonics(); void SetMenuFlags( sal_uInt16 nFlags ) { nMenuFlags = nFlags; } - sal_uInt16 GetMenuFlags() const { return nMenuFlags; } + sal_uInt16 GetMenuFlags() const { return nMenuFlags; } - sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId(sal_uInt16 nPos) const; sal_uInt16 GetItemId(const OString &rIdent) const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; @@ -280,17 +280,17 @@ public: { EnableItem(GetItemId(rIdent), bEnable); } - bool IsItemEnabled( sal_uInt16 nItemId ) const; + bool IsItemEnabled( sal_uInt16 nItemId ) const; void ShowItem( sal_uInt16 nItemId, bool bVisible = true ); void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, false ); } - bool IsItemPosVisible( sal_uInt16 nItemPos ) const; - bool IsMenuVisible() const; + bool IsItemPosVisible( sal_uInt16 nItemPos ) const; + bool IsMenuVisible() const; virtual bool IsMenuBar() const = 0; void RemoveDisabledEntries( bool bCheckPopups = true, bool bRemoveEmptyPopups = false ); - bool HasValidEntries( bool bCheckPopups = true ); + bool HasValidEntries( bool bCheckPopups = true ); void SetItemText( sal_uInt16 nItemId, const OUString& rStr ); OUString GetItemText( sal_uInt16 nItemId ) const; @@ -359,15 +359,15 @@ public: void SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); // gets the activation key of the specified item - KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; + KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; - vcl::Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; // returns whether the item a position nItemPos is highlighted or not. - bool IsHighlighted( sal_uInt16 nItemPos ) const; + bool IsHighlighted( sal_uInt16 nItemPos ) const; void HighlightItem( sal_uInt16 nItemPos ); void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c8adafd90137..6a2aaa2ea85e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -498,8 +498,8 @@ public: sal_uInt16 nFlags = 0 ); // Call before and after a paint operation to reduce flushing - void BeginPaint(); - void EndPaint(); + void BeginPaint(); + void EndPaint(); protected: @@ -1569,9 +1569,9 @@ public: void EnableMapMode( bool bEnable = true ); bool IsMapModeEnabled() const { return mbMap; } - void SetMapMode(); + void SetMapMode(); virtual void SetMapMode( const MapMode& rNewMapMode ); - void SetRelativeMapMode( const MapMode& rNewMapMode ); + void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } // #i75163# diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index bfa9469f5a48..d6cfc2d1010b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -304,7 +304,7 @@ public: static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); static OUString GetDefaultPrinterName(); - void Error(); + void Error(); const OUString& GetName() const { return maPrinterName; } const OUString& GetDriverName() const { return maDriver; } diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 0208635477ce..da949dfdf8d2 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -105,7 +105,7 @@ public: virtual void LoseFocus() SAL_OVERRIDE; using Window::Scroll; - void Scroll(); + void Scroll(); virtual void EndScroll(); long DoScroll( long nNewPos ); diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index 859852e458c1..3eb720a89fc4 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -83,8 +83,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void Slide(); - void EndSlide(); + void Slide(); + void EndSlide(); void EnableDrag( bool bEnable = true ) { mbFullDrag = bEnable; } diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 243107afd804..4fb25f31829f 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -59,8 +59,8 @@ public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); - void Up(); - void Down(); + void Up(); + void Down(); virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 81ffe4ffe14f..c24556e5d72f 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -65,9 +65,9 @@ public: explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); virtual ~Splitter(); - void StartSplit(); - void EndSplit(); - void Split(); + void StartSplit(); + void EndSplit(); + void Split(); virtual void Splitting( Point& rSplitPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -87,12 +87,12 @@ public: void SetDragRectPixel( const Rectangle& rDragRect, vcl::Window* pRefWin = NULL ); const Rectangle& GetDragRectPixel() const { return maDragRect; } - vcl::Window* GetDragWindow() const { return mpRefWin; } + vcl::Window* GetDragWindow() const { return mpRefWin; } - void SetSplitPosPixel( long nPos ); + void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } - bool IsHorizontal() const { return mbHorzSplit; } + bool IsHorizontal() const { return mbHorzSplit; } void SetHorizontal(bool bNew); // set the stepsize of the splitter for cursor movement diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 124f26c9302e..a9ad080e8715 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -125,8 +125,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void Click(); - void DoubleClick(); + void Click(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 602bad2b4aea..8da2381cd7e7 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -110,7 +110,7 @@ class VCL_DLLPUBLIC Idle : public Timer void Start() { Timer::Start(); } void Stop() { Timer::Stop(); } - void DoIdle(); + void DoIdle(); virtual void Timeout() SAL_OVERRIDE { DoIdle(); } }; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 9b9d2c21f6e9..d4baf3e16800 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -36,11 +36,6 @@ struct ImplToolBoxPrivateData; class ImplTrackRect; class PopupMenu; -namespace vcl -{ - class IImageListProvider; -} - #define TOOLBOX_CUSTOMIZE_RESIZE ((sal_uInt16)0xFFFE) class VCL_DLLPUBLIC ToolBoxCustomizeEvent @@ -249,7 +244,6 @@ private: SAL_DLLPRIVATE ToolBox (const ToolBox &); SAL_DLLPRIVATE ToolBox& operator= (const ToolBox &); - SAL_DLLPRIVATE void ImplUpdateImageList(); // called if StateChanged public: SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL ); SAL_DLLPRIVATE void ImplDisableFlatButtons(); @@ -290,13 +284,13 @@ public: virtual ~ToolBox(); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - void Highlight(); + void Highlight(); virtual void Select(); - void Customize( const ToolBoxCustomizeEvent& rCEvt ); - void UserDraw( const UserDrawEvent& rUDEvt ); + void Customize( const ToolBoxCustomizeEvent& rCEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -368,19 +362,19 @@ public: bool IsHorizontal() const { return mbHorz; } void SetLineCount( sal_uInt16 nNewLines ); - sal_uInt16 GetLineCount() const { return mnLines; } - sal_uInt16 GetCurLine() const { return mnCurLine; } + sal_uInt16 GetLineCount() const { return mnLines; } + sal_uInt16 GetCurLine() const { return mnCurLine; } void ShowLine( bool bNext ); // Used to enable/disable scrolling one page at a time for toolbar void SetPageScroll( bool b ); - sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemCount() const; ToolBoxItemType GetItemType( sal_uInt16 nPos ) const; - sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; - sal_uInt16 GetItemPos( const Point& rPos ) const; - sal_uInt16 GetItemId( sal_uInt16 nPos ) const; - sal_uInt16 GetItemId( const Point& rPos ) const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetItemPos( const Point& rPos ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; /// Map the command name (like .uno:Save) back to item id. sal_uInt16 GetItemId( const OUString& rCommand ) const; Rectangle GetItemRect( sal_uInt16 nItemId ) const; @@ -393,11 +387,11 @@ public: Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const; Rectangle GetScrollRect() const; - sal_uInt16 GetCurItemId() const { return mnCurItemId; } - sal_uInt16 GetDownItemId() const { return mnDownItemId; } - sal_uInt16 GetClicks() const { return mnMouseClicks; } - sal_uInt16 GetModifier() const { return mnMouseModifier; } - sal_uInt16 GetKeyModifier() const { return mnKeyModifier; } + sal_uInt16 GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetDownItemId() const { return mnDownItemId; } + sal_uInt16 GetClicks() const { return mnMouseClicks; } + sal_uInt16 GetModifier() const { return mnMouseModifier; } + sal_uInt16 GetKeyModifier() const { return mnKeyModifier; } void SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ); ToolBoxItemBits GetItemBits( sal_uInt16 nItemId ) const; @@ -413,8 +407,8 @@ public: void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; void SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ); - vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; - sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } + vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; + sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } void StartSelection(); void EndSelection(); @@ -478,7 +472,7 @@ public: void SetDockingRects( const Rectangle& rOutRect, const Rectangle& rInRect ); void SetFloatingLines( sal_uInt16 nFloatLines ); - sal_uInt16 GetFloatingLines() const; + sal_uInt16 GetFloatingLines() const; void SetStyle( WinBits nNewStyle ); WinBits GetStyle() const { return mnWinStyle; } @@ -493,7 +487,7 @@ public: bool IsMenuStringsEnabled() const { return mbMenuStrings; } void SetOutStyle( sal_uInt16 nNewStyle ); - sal_uInt16 GetOutStyle() const { return mnOutStyle; } + sal_uInt16 GetOutStyle() const { return mnOutStyle; } void EnableCustomize( bool bEnable = true ); bool IsCustomize() { return mbCustomize; } @@ -538,7 +532,7 @@ public: // to allow for customization of the menu the coresponding handler is called // when the menu button was clicked and before the menu is executed void SetMenuType( sal_uInt16 aType = TOOLBOX_MENUTYPE_CUSTOMIZE ); - sal_uInt16 GetMenuType() const; + sal_uInt16 GetMenuType() const; bool IsMenuEnabled() const; PopupMenu* GetMenu() const; void UpdateCustomMenu(); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 786764bdf7bf..d0ecd51c0b06 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -89,7 +89,7 @@ public: virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; virtual void DeleteSelected() SAL_OVERRIDE; virtual OUString GetSelected() const SAL_OVERRIDE; - OUString GetSelected( LineEnd aSeparator ) const; + OUString GetSelected( LineEnd aSeparator ) const; virtual void Cut() SAL_OVERRIDE; virtual void Copy() SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d4827439bfd5..72fc3cc72bc2 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -704,7 +704,7 @@ public: virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } - void PostPaint(); + void PostPaint(); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); @@ -797,7 +797,7 @@ public: using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; - void SetSettings( const AllSettings& rSettings, bool bChild ); + void SetSettings( const AllSettings& rSettings, bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); @@ -959,10 +959,10 @@ public: // window extents of the client window, coordinates to be used in SetPosPixel Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; - bool IsScrollable() const; + bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 ); - void Scroll( long nHorzScroll, long nVertScroll, + void Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index e21b4983ca1d..5ad1c29e5ef3 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -173,7 +173,7 @@ public: void enterEventContext(); void leaveEventContext(); - bool isOldFormat() const; + bool isOldFormat() const; }; /** Imports only settings diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 17f12fd6c00a..d3ab6bb50ef3 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -40,8 +40,6 @@ #include <dbaccess/ToolBoxHelper.hxx> -#include <vcl/ImageListProvider.hxx> - namespace comphelper { class OPropertyChangeMultiplexer; diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 1d93491a3b1b..7954cf4cdf46 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -134,14 +134,14 @@ public: void SetListFile( FILE * fList ){ fListing = fList; } FILE * GetListFile(){ return fListing; } RscVerbosity GetVerbosity() const { return m_verbosity; } - void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal ); - void StdErr( const char * ); - void LstOut( const char * ); - void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId, + void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal ); + void StdErr( const char * ); + void LstOut( const char * ); + void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId, const char * pMessage = NULL ); // Dieser Fehler sollte nur im Compilermodus auftreten, // das Programm wird mit exit() verlassen - void FatalError( const ERRTYPE& rError, const RscId &aId, + void FatalError( const ERRTYPE& rError, const RscId &aId, const char * pMessage = NULL ); }; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 5aca8a3ba5b5..6a28fe9a5b21 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -56,7 +56,7 @@ public: ScMergeAttr( const ScMergeAttr& ); virtual ~ScMergeAttr(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -110,7 +110,7 @@ public: ScProtectionAttr( const ScProtectionAttr& ); virtual ~ScProtectionAttr(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -283,11 +283,11 @@ public: ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); virtual ~ScViewObjectModeItem(); - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -303,7 +303,7 @@ public: ScDoubleItem( const ScDoubleItem& rItem ); virtual ~ScDoubleItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -311,7 +311,7 @@ public: double GetValue() const { return nValue; } - void SetValue( const double nVal ) { nValue = nVal;} + void SetValue( const double nVal ) { nValue = nVal;} private: double nValue; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 22513598210b..21673e10624c 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -51,7 +51,7 @@ public: ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); virtual ~ScTpDefaultsItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 0b284efce4d7..024003d709dd 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -114,7 +114,7 @@ public: virtual bool getIsDataLayoutDimension(long nColumn) = 0; virtual bool IsDateDimension(long nDim) = 0; virtual sal_uLong GetNumberFormat(long nDim); - sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); + sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); virtual void DisposeData() = 0; virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) = 0; diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index eceddc0d9e5d..95ab0c888ea8 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -87,7 +87,7 @@ public: ScTpFormulaItem( const ScTpFormulaItem& rItem ); virtual ~ScTpFormulaItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ed7e14f78b66..78aee0aa28a7 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -61,7 +61,7 @@ public: ScTpPrintItem( const ScTpPrintItem& rItem ); virtual ~ScTpPrintItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index e7538d62b4e9..b6e6ba485b97 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -404,7 +404,7 @@ public: // set own index & return new index // could override to use more indexes per action - void SetIndex( sal_uInt32& rIndex ); + void SetIndex( sal_uInt32& rIndex ); virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual sal_Size GetLen() const SAL_OVERRIDE; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 0d0888d00b50..8a960f5db307 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -108,7 +108,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - void WriteEmbeddedData( XclExpStream& rStrm ); + void WriteEmbeddedData( XclExpStream& rStrm ); void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } /** Builds file name from the passed file URL. Tries to convert to relative file name. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6ff6e45aa43c..4db040f7d0f6 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -300,8 +300,8 @@ public: /** Writes the OBJ record and the entire chart substream. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); - void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); + void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); + void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const; diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 5118672aa862..d075ebc97b97 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -56,7 +56,7 @@ public: virtual void SetCellData( ScMyCell& rMyCell ) = 0; virtual void Sort() = 0; - void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; struct ScMyShape diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 8f476190b6b5..4a7ee80233f9 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -127,7 +127,7 @@ private: DECL_LINK( UpdateFocusHdl, void* ); protected: - bool DoClose( sal_uInt16 nId ); + bool DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 3798998b9d1c..07b532f58718 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -91,7 +91,7 @@ protected: virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - void SetSize(); + void SetSize(); virtual void ToggleFloatingMode() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 1e61b9591a2c..b1878265ba4e 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -287,7 +287,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou protected: using Window::Resize; - void Resize( const Size& rSize ); + void Resize( const Size& rSize ); virtual void PrePaint() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; @@ -383,7 +383,7 @@ public: void DoInvertRect( const Rectangle& rPixel ); void CheckNeedsRepaint(); - void SwitchView(); + void SwitchView(); void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 6a976e9b7409..d3b374d84e63 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -302,7 +302,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - void Resizing( Size& rSize ); + void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index fdb8697e41b3..7018dfe969ca 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -54,10 +54,10 @@ class ScPrivatSplit : public Control ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); - short GetDeltaX(); - short GetDeltaY(); + short GetDeltaX(); + short GetDeltaY(); - void CtrModified(); + void CtrModified(); void SetYRange(Range cRgeY); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 6ef999235f23..344ca1d4ca88 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -214,7 +214,7 @@ protected: virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; - OUString GetDescription() const; + OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 81947fabeda4..f6c218162537 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -114,7 +114,7 @@ protected: virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; - void StartPopup(); + void StartPopup(); public: diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index baecc2659d29..80a7f41a6e25 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -63,7 +63,7 @@ public: ScInputStatusItem( const ScInputStatusItem& rItem ); virtual ~ScInputStatusItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -154,7 +154,7 @@ public: ScSortItem( const ScSortItem& rItem ); virtual ~ScSortItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -179,7 +179,7 @@ public: ScQueryItem( const ScQueryItem& rItem ); virtual ~ScQueryItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -208,7 +208,7 @@ public: ScSubTotalItem( const ScSubTotalItem& rItem ); virtual ~ScSubTotalItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -229,7 +229,7 @@ public: ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -249,7 +249,7 @@ public: ScConsolidateItem( const ScConsolidateItem& rItem ); virtual ~ScConsolidateItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -268,7 +268,7 @@ public: ScPivotItem( const ScPivotItem& rItem ); virtual ~ScPivotItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -291,7 +291,7 @@ public: ScSolveItem( const ScSolveItem& rItem ); virtual ~ScSolveItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -310,7 +310,7 @@ public: ScTabOpItem( const ScTabOpItem& rItem ); virtual ~ScTabOpItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index ea1d9361714f..e00fa143d8b0 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -94,8 +94,8 @@ public: private: void Init(); - OUString GetFirstFormula() const; - OUString GetSecondFormula() const; + OUString GetFirstFormula() const; + OUString GetSecondFormula() const; void SetFirstFormula( const OUString& rFmlaStr ); void SetSecondFormula( const OUString& rFmlaStr ); diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 0685cce9f1e7..522791559aff 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -265,29 +265,29 @@ public: virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) SAL_OVERRIDE; - void SetLayoutName(const OUString& aName); + void SetLayoutName(const OUString& aName); virtual OUString GetLayoutName() const SAL_OVERRIDE { return maLayoutName; } void SetFileName(const OUString& aName) { maFileName = aName; } - OUString GetFileName() const { return maFileName; } + OUString GetFileName() const { return maFileName; } void SetBookmarkName(const OUString& aName) { maBookmarkName = aName; } - OUString GetBookmarkName() const { return maBookmarkName; } + OUString GetBookmarkName() const { return maBookmarkName; } SdPageLink* GetLink() { return mpPageLink; } void ConnectLink(); void DisconnectLink(); - void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, + void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, bool bScaleAllObj); - const OUString& GetName() const; - OUString GetRealName() const { return FmFormPage::GetName(); }; + const OUString& GetName() const; + OUString GetRealName() const { return FmFormPage::GetName(); }; - void SetPresentationLayout(const OUString& rLayoutName, + void SetPresentationLayout(const OUString& rLayoutName, bool bReplaceStyleSheets = true, bool bSetMasterPage = true, bool bReverseOrder = false); - void EndListenOutlineText(); + void EndListenOutlineText(); void SetBackgroundFullSize( bool bIn ); bool IsBackgroundFullSize() const { return mbBackgroundFullSize; } diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 9f8455622d12..944d7e0e8a1b 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -98,13 +98,13 @@ public: virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; - void SelectAll(); - void DoCut(vcl::Window* pWindow=NULL); - void DoCopy(vcl::Window* pWindow=NULL); - void DoPaste(vcl::Window* pWindow=NULL); + void SelectAll(); + void DoCut(vcl::Window* pWindow=NULL); + void DoCopy(vcl::Window* pWindow=NULL); + void DoPaste(vcl::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); - void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); + void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index d46bf2cc64a2..daa1ad28ac4f 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -37,7 +37,7 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox public: FadeEffectLB(vcl::Window* pParent, WinBits nStyle); virtual ~FadeEffectLB(); - void Fill(); + void Fill(); /* void selectEffectFromPage( SdPage* pPage ); */ void applySelected( SdPage* pSlide ) const; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 1ca849a83e3f..bd1ac112877b 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -85,7 +85,7 @@ private: DECL_LINK( CheckFileHdl, void * ); void UpdateTree(); - void OpenFileDialog(); + void OpenFileDialog(); ::com::sun::star::presentation::ClickAction GetActualClickAction(); void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx deleted file mode 100644 index 7f6017e1a966..000000000000 --- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_CONTROLLER_SLSCOMMAND_HXX -#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CONTROLLER_SLSCOMMAND_HXX - -namespace sd { namespace slidesorter { namespace controller { - -/** Base class for command objects. It specifies the interface for commands - whose execution can be scheduled via the SlotManager. -*/ -class Command -{ -public: - virtual ~Command (void) {}; - ; -}; - -} } } // end of namespace sd::slidesorter::controller - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 8c12d481e288..08903068387e 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -20,7 +20,6 @@ #include "controller/SlsSelectionManager.hxx" #include "SlideSorter.hxx" -#include "SlsCommand.hxx" #include "controller/SlideSorterController.hxx" #include "controller/SlsAnimator.hxx" #include "controller/SlsAnimationFunction.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 12a027ded663..24712a5bd941 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -35,7 +35,6 @@ #include "controller/SlsSelectionFunction.hxx" #include "controller/SlsSelectionManager.hxx" #include "controller/SlsSelectionObserver.hxx" -#include "SlsCommand.hxx" #include "model/SlideSorterModel.hxx" #include "model/SlsPageEnumerationProvider.hxx" #include "model/SlsPageDescriptor.hxx" diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index b7219a30ccba..da743c778e82 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -208,8 +208,8 @@ protected: virtual void CheckItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true ) {} virtual bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return true; } virtual void LoadedFamilies() {} - void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); } - void InvalidateBindings(); + void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); } + void InvalidateBindings(); virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0; virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) = 0; virtual void ClearFamilyList() = 0; @@ -267,12 +267,12 @@ public: DECL_LINK( MenuSelectHdl, Menu * ); virtual void EnableEdit( bool b = true ) { bCanEdit = b; } - void EnableDel( bool b = true ) { bCanDel = b; } - void EnableNew( bool b = true ) { bCanNew = b; } - void EnableHide( bool b = true ) { bCanHide = b; } - void EnableShow( bool b = true ) { bCanShow = b; } + void EnableDel( bool b = true ) { bCanDel = b; } + void EnableNew( bool b = true ) { bCanNew = b; } + void EnableHide( bool b = true ) { bCanHide = b; } + void EnableShow( bool b = true ) { bCanShow = b; } - vcl::Window* GetWindow() { return pWindow; } + vcl::Window* GetWindow() { return pWindow; } void EnableTreeDrag( bool b = true ); void ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ); @@ -281,7 +281,7 @@ public: OUString GetSelectedEntry() const; SfxObjectShell* GetObjectShell() const { return pCurObjShell; } - void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen + void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen inline bool CanEdit( void ) const { return bCanEdit; } inline bool CanDel( void ) const { return bCanDel; } @@ -290,7 +290,7 @@ public: inline bool CanShow( void ) const { return bCanShow; } // normally for derivates from SvTreeListBoxes, but in this case the dialog handles context menus - PopupMenu* CreateContextMenu( void ); + PopupMenu* CreateContextMenu( void ); }; class DropToolBox_Impl : public ToolBox, public DropTargetHelper @@ -323,7 +323,7 @@ private: DECL_LINK( MenuSelectHdl, Menu* ); protected: - void Command( const CommandEvent& rMEvt ); + void Command( const CommandEvent& rMEvt ); virtual void EnableEdit( bool = true ) SAL_OVERRIDE; virtual void EnableItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; virtual void CheckItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 3d20a0e1dc31..87a68d765ec0 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -242,11 +242,11 @@ protected: void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); SfxChild_Impl* FindChild_Impl( const vcl::Window& rWindow ) const; - bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); + bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); - void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); - static bool IsPluginMode( SfxObjectShell* pObjShell ); + void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); + static bool IsPluginMode( SfxObjectShell* pObjShell ); public: SfxWorkWindow( vcl::Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); @@ -308,13 +308,13 @@ public: void ShowChildWindow_Impl(sal_uInt16, bool bVisible, bool bSetFocus); void SetChildWindow_Impl(sal_uInt16, bool bOn, bool bSetFocus); SfxChildWindow* GetChildWindow_Impl(sal_uInt16); - void InitializeChild_Impl(SfxChildWin_Impl*); + void InitializeChild_Impl(SfxChildWin_Impl*); SfxSplitWindow* GetSplitWindow_Impl(SfxChildAlignment); bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( vcl::Window *pChild ); - bool ActivateNextChild_Impl( bool bForward = true ); + bool ActivateNextChild_Impl( bool bForward = true ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; // Methods for StatusBar diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 5d1479395601..896c7f2f287b 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -124,8 +124,8 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; - bool SetData( const OUString& rData ); - virtual sal_uLong GetMiscStatus() const SAL_OVERRIDE; + bool SetData( const OUString& rData ); + virtual sal_uLong GetMiscStatus() const SAL_OVERRIDE; virtual void OnDocumentPrinterChanged( Printer * ) SAL_OVERRIDE; virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; @@ -207,9 +207,9 @@ public: void Repaint(); - virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE; + virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE; - SfxItemPool& GetPool() const; + SfxItemPool& GetPool() const; void Execute( SfxRequest& rReq ); void GetState(SfxItemSet &); diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index ad8249d21ebe..d168ab1fc624 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -776,48 +776,6 @@ public: } }; -/*======================================================================== - * - * PageObject. - * - *======================================================================*/ -#if 1 /* EXP */ -class PageObject -{ -public: - explicit PageObject (PageHolder const & rxPage = PageHolder()) - : m_xPage (rxPage), m_bDirty (false) - {} - - virtual ~PageObject() - {} - - PageHolder & get() { return m_xPage; } - PageHolder const & get() const { return m_xPage; } - - void clean() { m_bDirty = false; } - void touch() { m_bDirty = true; } - - sal_uInt32 location() const - { - PageData const * pagedata = m_xPage.get(); - return (pagedata != 0) ? pagedata->location() : STORE_PAGE_NULL; - } - void location (sal_uInt32 nAddr) - { - PageData * pagedata = m_xPage.get(); - if (pagedata != 0) - pagedata->location (nAddr); - } - -protected: - PageHolder m_xPage; - bool m_bDirty; - - ; - ; -}; -#endif /* EXP */ class OStorePageBIOS; diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx index 37527e442a26..f68fc472a203 100644 --- a/svl/source/notify/SfxBroadcaster.cxx +++ b/svl/source/notify/SfxBroadcaster.cxx @@ -110,13 +110,6 @@ void SfxBroadcaster::AddListener( SfxListener& rListener ) } -// called, if no more listeners exists - -void SfxBroadcaster::ListenersGone() -{ -} - - // forward a notification to all registered listeners void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint) @@ -143,9 +136,6 @@ void SfxBroadcaster::RemoveListener( SfxListener& rListener ) *aIter = 0; size_t positionOfRemovedElement = std::distance(mpImpl->m_Listeners.begin(), aIter); mpImpl->m_RemovedPositions.push_back(positionOfRemovedElement); - - if ( !HasListeners() ) - ListenersGone(); } bool SfxBroadcaster::HasListeners() const diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index d6d69910425d..92dc9d013dfc 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -88,7 +88,7 @@ public: bool IsFrozen() const { return _bFrozen; } void Freeze( bool bFreeze = true ) { _bFrozen = bFreeze; } - void Draw( BrowseBox& rBox, OutputDevice& rDev, + void Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, bool bCurs ); void SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index f905504d111e..d490e479e2bf 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -276,8 +276,8 @@ namespace svt { namespace table virtual long pixelWidthToAppFont( long const i_pixels ) const SAL_OVERRIDE; virtual void hideTracking() SAL_OVERRIDE; virtual void showTracking( Rectangle const & i_location, sal_uInt16 const i_flags ) SAL_OVERRIDE; - RowPos getRowAtPoint( const Point& rPoint ) const; - ColPos getColAtPoint( const Point& rPoint ) const; + RowPos getRowAtPoint( const Point& rPoint ) const; + ColPos getColAtPoint( const Point& rPoint ) const; virtual TableCell hitTest( const Point& rPoint ) const SAL_OVERRIDE; virtual ColumnMetrics getColumnMetrics( ColPos const i_column ) const SAL_OVERRIDE; virtual bool isRowSelected( RowPos i_row ) const SAL_OVERRIDE; diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 2b9b7c6c9507..2c6848e0a4ff 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -59,8 +59,8 @@ namespace svt { namespace table virtual void MouseButtonDown( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - void SetControlBackground(const Color& rColor); - void SetControlBackground(); + void SetControlBackground(const Color& rColor); + void SetControlBackground(); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void SetBackground(const Wallpaper& rColor); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 93525810ca4f..e58953cc7380 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -338,7 +338,7 @@ public: virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// aPromptText - virtual OUString GetPar2() const SAL_OVERRIDE; + virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; OUString GetHelp() const; diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 20422e6feb27..c83d1de861f7 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -74,14 +74,14 @@ public: bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); } - void SetCharFmt( SwCharFmt* ); + void SetCharFmt( SwCharFmt* ); - void SetCharFmtName(const OUString& rSet); - virtual OUString GetCharFmtName()const SAL_OVERRIDE; + void SetCharFmtName(const OUString& rSet); + virtual OUString GetCharFmtName() const SAL_OVERRIDE; //For i120928,access the cp info of graphic within bullet void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;} - sal_Unicode GetGrfBulletCP()const {return cGrfBulletCP;} + sal_Unicode GetGrfBulletCP() const {return cGrfBulletCP;} virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 2b2fa240a25c..feeb45f2c784 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -236,7 +236,7 @@ public: void DocSzChgd(const Size& rNewSize); const Size& GetDocSz() const { return aDocSz; } - void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); + void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); inline void AdjustEditWin(); diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 5fc129de1104..16ed7c7f2583 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -86,7 +86,7 @@ public: protected: SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; - void Init(); + void Init(); void Save(); public: @@ -95,9 +95,8 @@ public: inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; void CreateEmptyNumRule(sal_uInt16 nIdx); // for import - void ApplyNumRules( - const SwNumRulesWithName &rCopy, - sal_uInt16 nIdx); + void ApplyNumRules( const SwNumRulesWithName &rCopy, + sal_uInt16 nIdx); }; diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index 7126dfc371cc..3c8e319b0c6d 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -71,18 +71,10 @@ class UcbLockBytesHandler : public SvRefBase { bool m_bActive; public: - enum LoadHandlerItem - { - DATA_AVAILABLE, - DONE, - CANCEL - }; - UcbLockBytesHandler() : m_bActive( true ) {} - ; void Activate( bool bActivate = true ) { m_bActive = bActivate; } bool IsActive() const { return m_bActive; } }; diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index 6932bac8facb..fa275cc84038 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -54,8 +54,8 @@ public: // font instance specific data virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const = 0; - int GetHeight() const { return mnHeight; } - int GetWidth() const { return mnWidth; } + int GetHeight() const { return mnHeight; } + int GetWidth() const { return mnWidth; } virtual sal_IntPtr GetFontId() const = 0; int GetFontMagic() const { return mnMagic; } bool IsScalable() const { return (mnHeight == 0); } diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index a49962ee127b..2fec0559096c 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -583,7 +583,7 @@ public: const Image& GetImage() const { return maImage; } void SetImage( const Image& rImg ) { maImage = rImg; } - void MBDown(); + void MBDown(); boost::signals2::signal< void ( ImplWin* ) > buttonDownSignal; boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index d5ec8272ab4a..17e2233f85b9 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -87,7 +87,7 @@ public: virtual SalGraphicsImpl* GetImpl() const = 0; /// Check that our mpImpl is OpenGL and return the context, otherwise NULL. - OpenGLContext* GetOpenGLContext() const; + OpenGLContext* GetOpenGLContext() const; void setAntiAliasB2DDraw(bool bNew) { m_bAntiAliasB2DDraw = bNew; } bool getAntiAliasB2DDraw() const { return m_bAntiAliasB2DDraw; } diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index ae1fe9dda55c..e77cb0041c98 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -175,7 +175,7 @@ public: virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0; virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); } virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0; - bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 + bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 // methods using glyph indexing virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&, @@ -193,7 +193,7 @@ public: virtual void MoveGlyph( int nStart, long nNewXPos ) = 0; virtual void DropGlyph( int nStart ) = 0; virtual void Simplify( bool bIsBase ) = 0; - void DisableGlyphInjection( bool /*bDisable*/ ) {} + void DisableGlyphInjection( bool /*bDisable*/ ) {} protected: // used by layout engines @@ -240,7 +240,7 @@ public: // used only by OutputDevice::ImplLayout, TODO: make friend explicit MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont = NULL ); - bool AddFallback( SalLayout& rFallbackLayout, + bool AddFallback( SalLayout& rFallbackLayout, ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont ); virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index f09c19fe1a5a..54d87e5be7ce 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -51,12 +51,9 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void Show( bool bVisible ) = 0; - void Enable( bool /* nEnable */ ) {} + void Enable( bool /* nEnable */ ) {} virtual void GrabFocus() {} - void SetBackground() {} - void SetBackground( SalColor /* nSalColor */ ) {} - virtual void SetForwardKey( bool /* bEnable */ ) {} virtual const SystemEnvData* GetSystemData() const = 0; diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 767c7c36f6af..56e08ad65c1c 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -25,7 +25,6 @@ #include <vcl/image.hxx> #include <vcl/toolbox.hxx> #include <vcl/controllayout.hxx> -#include <vcl/ImageListProvider.hxx> #include <vector> @@ -150,10 +149,6 @@ struct ImplToolBoxPrivateData Wallpaper maDisplayBackground; - // support for highcontrast - vcl::IImageListProvider* mpImageListProvider; - vcl::ImageListType meImageListType; - bool mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper mbAssumeDocked:1, // only used during calculations to override current floating/popup mode mbAssumeFloating:1, diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index af530f867e0b..a11f1fa8b144 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -360,7 +360,7 @@ public: virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE; - SalMenu* GetMenu( void ); + SalMenu* GetMenu( void ); virtual void DrawMenuBar() SAL_OVERRIDE; void EnsureAppMenuWatch(); @@ -377,7 +377,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE; virtual SalFrame* GetParent() const SAL_OVERRIDE; virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE; - virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; + virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE; // Enable/Disable ScreenSaver, SystemAgents, ... virtual void StartPresentation( bool bStart ) SAL_OVERRIDE; @@ -402,8 +402,8 @@ public: virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; - virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS @@ -435,19 +435,19 @@ public: // shaped system windows // set clip region to none (-> rectangular windows, normal state) - virtual void ResetClipRegion() SAL_OVERRIDE; + virtual void ResetClipRegion() SAL_OVERRIDE; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; + virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; // done setting up the clipregion - virtual void EndSetClipRegion() SAL_OVERRIDE; + virtual void EndSetClipRegion() SAL_OVERRIDE; - static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); + static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); - void damaged (const basegfx::B2IBox& rDamageRect); + void damaged (const basegfx::B2IBox& rDamageRect); - virtual Window GetX11Window() SAL_OVERRIDE; + virtual Window GetX11Window() SAL_OVERRIDE; }; #define OOO_TYPE_FIXED ooo_fixed_get_type() diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7659321f38b3..3a3d79e80702 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -58,14 +58,14 @@ public: GtkSalMenu( bool bMenuBar ); virtual ~GtkSalMenu(); - virtual bool VisibleMenuBar() SAL_OVERRIDE; // must return TRUE to actually DISPLAY native menu bars + virtual bool VisibleMenuBar() SAL_OVERRIDE; // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE; virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE; virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE; - const GtkSalFrame* GetFrame() const; + const GtkSalFrame* GetFrame() const; virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE; virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; virtual void ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE; @@ -74,16 +74,16 @@ public: virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; - void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } - Menu* GetMenu() { return mpVCLMenu; } - GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } - void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } - GMenuModel* GetMenuModel() { return mpMenuModel; } - unsigned GetItemCount() { return maItems.size(); } - GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } - void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } - GActionGroup* GetActionGroup() { return mpActionGroup; } - bool IsItemVisible( unsigned nPos ); + void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } + Menu* GetMenu() { return mpVCLMenu; } + GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } + void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } + GMenuModel* GetMenuModel() { return mpMenuModel; } + unsigned GetItemCount() { return maItems.size(); } + GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } + void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } + GActionGroup* GetActionGroup() { return mpActionGroup; } + bool IsItemVisible( unsigned nPos ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, @@ -114,7 +114,7 @@ public: sal_uInt16 mnId; // Item ID MenuItemType mnType; // Item type - bool mbVisible; // Item visibility. + bool mbVisible; // Item visibility. Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 26bb5e9ec63e..4eac942d686b 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -259,7 +259,7 @@ protected: Cursor aPointerCache_[POINTER_COUNT]; // Keyboard - bool bNumLockFromXS_; // Num Lock handled by X Server + bool bNumLockFromXS_; // Num Lock handled by X Server int nNumLockIndex_; // modifier index in modmap int nNumLockMask_; // keyevent state mask for KeySym nShiftKeySym_; // first shift modifier @@ -306,9 +306,9 @@ public: void ModifierMapping(); void SimulateKeyPress( sal_uInt16 nKeyCode ); KeyIndicatorState GetIndicatorState() const; - OUString GetKeyNameFromKeySym( KeySym keysym ) const; - OUString GetKeyName( sal_uInt16 nKeyCode ) const; - sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; + OUString GetKeyNameFromKeySym( KeySym keysym ) const; + OUString GetKeyName( sal_uInt16 nKeyCode ) const; + sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; KeySym GetKeySym( XKeyEvent *pEvent, unsigned char *pPrintable, int *pLen, @@ -336,7 +336,7 @@ public: const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; } srv_vendor_t GetServerVendor() const { return meServerVendor; } void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); } - bool IsDisplay() const { return !!pXLib_; } + bool IsDisplay() const { return !!pXLib_; } GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; } GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; } GC GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; } @@ -395,10 +395,10 @@ public: virtual ~SalX11Display(); virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; - void Yield(); + void Yield(); virtual void PostUserEvent() SAL_OVERRIDE; - bool IsEvent(); + bool IsEvent(); void SetupInput( SalI18N_InputMethod *pInputMethod ); }; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index af894caef2c4..2ca876e82614 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -250,7 +250,7 @@ public: const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; - bool drawAlphaBitmap( + bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rBitmap ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index ff8372117b77..bd6416686242 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1487,8 +1487,6 @@ void ToolBox::ImplInitSettings( bool bFont, SetBackground( aColor ); SetPaintTransparent( false ); SetParentClipMode( 0 ); - - ImplUpdateImageList(); } } } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 402757ab18dd..e1cad517c76d 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -30,7 +30,6 @@ #include <vcl/toolbox.hxx> #include <vcl/mnemonic.hxx> #include <vcl/menu.hxx> -#include <vcl/ImageListProvider.hxx> #include <vcl/settings.hxx> #include <vcl/IconThemeInfo.hxx> @@ -52,9 +51,7 @@ using namespace com::sun::star; #define TB_SEP_SIZE 8 ImplToolBoxPrivateData::ImplToolBoxPrivateData() : - m_pLayoutData( NULL ), - mpImageListProvider( NULL ), - meImageListType( vcl::IMAGELISTTYPE_UNKNOWN ) + m_pLayoutData( NULL ) { meButtonSize = TOOLBOX_BUTTONSIZE_DONTCARE; mpMenu = new PopupMenu(); @@ -2052,20 +2049,4 @@ void ToolBox::WillUsePopupMode( bool b ) mpData->mbWillUsePopupMode = b; } -void ToolBox::ImplUpdateImageList() -{ - if (mpData->mpImageListProvider != NULL) - { - try - { - ImageListType eType = vcl::HIGHCONTRAST_NO; - if (eType != mpData->meImageListType) - { - mpData->meImageListType = eType; - } - } - catch (com::sun::star::lang::IllegalArgumentException &) {} - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx index f3ce41f0d76b..988d6560f596 100644 --- a/writerfilter/source/dmapper/TagLogger.hxx +++ b/writerfilter/source/dmapper/TagLogger.hxx @@ -29,17 +29,6 @@ namespace writerfilter { -#ifdef DEBUG_WRITERFILTER - class IdToString - { - public: - typedef std::shared_ptr<IdToString> Pointer_t; - ; - - protected: - ~IdToString() {} - }; -#endif class TagLogger { diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index a4b4d61514aa..8f9cb2ad8490 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -110,8 +110,7 @@ public: virtual void resolveComment(Stream & rStream, const sal_Int32 nId) SAL_OVERRIDE; - OOXMLPropertySet * getPicturePropSet - (const OUString & rId); + OOXMLPropertySet * getPicturePropSet(const OUString & rId); virtual void resolvePicture(Stream & rStream, const OUString & rId) SAL_OVERRIDE; virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE; diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 820ff70f3ae1..2221f053a298 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -22,7 +22,6 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <excep/XmlSearchExceptions.hxx> -#include <util/CompressorIterator.hxx> #include <util/Decompressor.hxx> @@ -31,18 +30,6 @@ namespace xmlsearch { namespace qe { - class NonnegativeIntegerGenerator - { - public: - - static const sal_Int32 END; - - virtual ~NonnegativeIntegerGenerator() { }; - ; - ; - }; - - class RoleFiller { public: diff --git a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx deleted file mode 100644 index f37884068f3d..000000000000 --- a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_COMPRESSORITERATOR_HXX -#define INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_COMPRESSORITERATOR_HXX - - -namespace xmlsearch { - - namespace util { - - class CompressorIterator - { - public: - ; - - protected: - ~CompressorIterator() {} - }; - - - } - -} - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx index 6ca159e8a709..836dd586c3e0 100644 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx @@ -21,7 +21,6 @@ #include <vector> #include <excep/XmlSearchExceptions.hxx> -#include <util/RandomAccessStream.hxx> namespace xmlsearch { @@ -62,9 +61,7 @@ namespace xmlsearch { { public: - StreamDecompressor( RandomAccessStream* ) - { - } + StreamDecompressor() {} virtual ~StreamDecompressor() { } diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx deleted file mode 100644 index efcebc85a830..000000000000 --- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_RANDOMACCESSSTREAM_HXX -#define INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_RANDOMACCESSSTREAM_HXX - -#include <osl/file.hxx> - -namespace xmlsearch { - - namespace util { - - - class RandomAccessStream - { - public: - - virtual ~RandomAccessStream() { }; - - // The calle is responsible for allocating the buffer - ; - ; - ; - ; - ; - - - protected: - - enum OPENFLAG { Read = osl_File_OpenFlag_Read, - Write = osl_File_OpenFlag_Write, - Create = osl_File_OpenFlag_Create }; - - }; - - - } -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx index e64ddc7f817e..b96319f35f7c 100644 --- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx +++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx @@ -25,9 +25,6 @@ using namespace xmlsearch; using namespace xmlsearch::qe; -const sal_Int32 NonnegativeIntegerGenerator::END = -1; - - RoleFiller RoleFiller::roleFiller_; diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx index a52fb75bcf15..78f5ec8e273b 100644 --- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx +++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx @@ -18,7 +18,6 @@ */ #include <util/Decompressor.hxx> -#include <util/CompressorIterator.hxx> using namespace xmlsearch; using namespace xmlsearch::util; |