include/sfx2/bindings.hxx | 2 +-
include/sfx2/sidebar/Theme.hxx | 2 +-
sfx2/source/control/bindings.cxx | 2 +-
sfx2/source/notebookbar/SfxNotebookBar.cxx | 2 +-
sfx2/source/sidebar/Deck.cxx | 2 +-
sfx2/source/sidebar/Theme.cxx | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b4e1389f7abecbd8b323d9c4653ee506054a1f85
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 23 20:59:50 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Aug 24 09:02:41 2019 +0200
loplugin:returnconstval in sfx2
Change-Id: I9761dbfa66ea59d5c9c0cd87740fdb8ca34008eb
Reviewed-on: https://gerrit.libreoffice.org/78034
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 33b8e4a58cac..8b8cc0c7080d 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -149,7 +149,7 @@ public:
SAL_DLLPRIVATE void SetDispatchProvider_Impl( const css::uno::Reference<
css::frame::XDispatchProvider > & rFrame );
void SetActiveFrame( const css::uno::Reference<
css::frame::XFrame > & rFrame );
- const css::uno::Reference< css::frame::XFrame > GetActiveFrame() const;
+ css::uno::Reference< css::frame::XFrame > GetActiveFrame() const;
// Reconfig
sal_uInt16 EnterRegistrations(const char *pFile = nullptr, int nLine
= 0);
void LeaveRegistrations( const char *pFile = nullptr, int
nLine = 0 );
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 16a4798cdf9f..c0b8697d7732 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -130,7 +130,7 @@ public:
static Image GetImage (const ThemeItem eItem);
static Color GetColor (const ThemeItem eItem);
static const Paint& GetPaint (const ThemeItem eItem);
- static const Wallpaper GetWallpaper (const ThemeItem eItem);
+ static Wallpaper GetWallpaper (const ThemeItem eItem);
static sal_Int32 GetInteger (const ThemeItem eItem);
static bool GetBoolean (const ThemeItem eItem);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 044f0351dc49..dfbf7c8b33b6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1677,7 +1677,7 @@ void SfxBindings::SetActiveFrame( const
css::uno::Reference< css::frame::XFrame
pDispatcher->GetFrame()->GetFrame().GetFrameInterface(),
css::uno::UNO_QUERY ) );
}
-const css::uno::Reference< css::frame::XFrame > SfxBindings::GetActiveFrame()
const
+css::uno::Reference< css::frame::XFrame > SfxBindings::GetActiveFrame() const
{
const css::uno::Reference< css::frame::XFrame > xFrame( pImpl->xProv,
css::uno::UNO_QUERY );
if ( xFrame.is() || !pDispatcher )
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 4bdce004ad91..672c949531bb 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -185,7 +185,7 @@ static utl::OConfigurationTreeRoot
lcl_getCurrentImplConfigRoot()
true);
}
-static const utl::OConfigurationNode lcl_getCurrentImplConfigNode(const
Reference<css::frame::XFrame>& xFrame,
+static utl::OConfigurationNode lcl_getCurrentImplConfigNode(const
Reference<css::frame::XFrame>& xFrame,
utl::OConfigurationTreeRoot const & rNotebookbarNode )
{
if (!rNotebookbarNode.isValid())
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 7e451035af34..8f57dba36b4a 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -332,7 +332,7 @@ void Deck::ShowPanel(const Panel& rPanel)
}
}
-static const OUString GetWindowClassification(const vcl::Window* pWindow)
+static OUString GetWindowClassification(const vcl::Window* pWindow)
{
const OUString& rsName (pWindow->GetText());
if (!rsName.isEmpty())
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index bc6236d34bbd..a5a1ed3e94b0 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -94,7 +94,7 @@ const Paint& Theme::GetPaint (const ThemeItem eItem)
return rTheme.maPaints[nIndex];
}
-const Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
+Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
{
return GetPaint(eItem).GetWallpaper();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
