include/svx/Palette.hxx | 12 ++++++------ include/svx/PaletteManager.hxx | 4 ++-- sc/source/ui/inc/docsh.hxx | 2 +- svx/source/tbxctrls/PaletteManager.cxx | 4 ++-- sw/inc/docsh.hxx | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit ffeac200b21a2f6b83cea2311562149554f87500 Author: Tor Lillqvist <[email protected]> Date: Wed Sep 17 19:17:13 2014 +0300 WaE: overriding virtual function declaration not marked 'override' Change-Id: Ic7f3e661a4824cca06fc16f2b1f23a2873ef4ecf diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index a877bd9..37c995e 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -243,7 +243,7 @@ public: sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; - virtual std::vector<Color> GetDocColors(); + virtual std::vector<Color> GetDocColors() SAL_OVERRIDE; virtual void LoadStyles( SfxObjectShell& rSource ) SAL_OVERRIDE; commit d032e5f519353cf5ac399ce01682fe4d930011f0 Author: Tor Lillqvist <[email protected]> Date: Wed Sep 17 19:04:16 2014 +0300 WaE: overriding virtual function declaration not marked 'override' Change-Id: I3c210fa3866fe34c4e5f9ea799a4156862290432 diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index b621a8a..6572410 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -202,7 +202,7 @@ public: sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; - virtual std::vector<Color> GetDocColors(); + virtual std::vector<Color> GetDocColors() SAL_OVERRIDE; virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) SAL_OVERRIDE; virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; commit 9de2ad3474e34383dfee6166d31983ba24ef0da8 Author: Tor Lillqvist <[email protected]> Date: Wed Sep 17 18:58:05 2014 +0300 WaE: passing class rtl::OUString by value, rather pass by reference Change-Id: Ie42cc9cbf13467d6c1644dc35e361250bd3a9533 diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index cb70d2c..7070bc1 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -67,8 +67,8 @@ public: void AddRecentColor(const Color& rRecentColor); void SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater); - void PopupColorPicker(const OUString aCommand); - static void DispatchColorCommand(const OUString aCommand, const Color aColor); + void PopupColorPicker(const OUString& aCommand); + static void DispatchColorCommand(const OUString& aCommand, const Color aColor); }; #endif // INCLUDED_SVX_PALETTEMANAGER_HXX diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 101c002..df4c4b8 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -204,7 +204,7 @@ void PaletteManager::SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater) mpBtnUpdater = pBtnUpdater; } -void PaletteManager::PopupColorPicker(const OUString aCommand) +void PaletteManager::PopupColorPicker(const OUString& aCommand) { SvColorDialog aColorDlg( 0 ); aColorDlg.SetColor ( mLastColor ); @@ -218,7 +218,7 @@ void PaletteManager::PopupColorPicker(const OUString aCommand) } } -void PaletteManager::DispatchColorCommand(const OUString aCommand, const Color aColor) +void PaletteManager::DispatchColorCommand(const OUString& aCommand, const Color aColor) { using namespace css::uno; using namespace css::frame; commit a9cd260ebb7bf5760eee536cd911780773c6051d Author: Tor Lillqvist <[email protected]> Date: Wed Sep 17 18:48:43 2014 +0300 WaE: overriding virtual function declaration not marked 'override' Change-Id: If610c94f02da66d3f83f0787ef0dcebab47ebe2d diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index 6eab3f4..32088a8 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -56,10 +56,10 @@ public: PaletteGPL( const OUString &rFPath, const OUString &rFName ); virtual ~PaletteGPL(); - virtual const OUString& GetName(); - virtual void LoadColorSet( SvxColorValueSet& rColorSet ); + virtual const OUString& GetName() SAL_OVERRIDE; + virtual void LoadColorSet( SvxColorValueSet& rColorSet ) SAL_OVERRIDE; - virtual bool IsValid(); + virtual bool IsValid() SAL_OVERRIDE; }; class PaletteSOC : public Palette @@ -72,10 +72,10 @@ public: PaletteSOC( const OUString &rFPath, const OUString &rFName ); virtual ~PaletteSOC(); - virtual const OUString& GetName(); - virtual void LoadColorSet( SvxColorValueSet& rColorSet ); + virtual const OUString& GetName() SAL_OVERRIDE; + virtual void LoadColorSet( SvxColorValueSet& rColorSet ) SAL_OVERRIDE; - virtual bool IsValid(); + virtual bool IsValid() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_PALETTE_HXX _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
