summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-09 10:09:42 +0200
committerNoel Grandin <noel@peralex.com>2014-06-09 10:10:13 +0200
commit184a00b96235f6432294ded63ce4a4a318effdb5 (patch)
treee4ae0e00cb168fa43d280cfb51a50515258b5320 /framework
parent534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff)
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx2
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx4
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx2
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx4
4 files changed, 2 insertions, 10 deletions
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 5b96a0d74a07..41eb059f376c 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -88,7 +88,7 @@ namespace framework
OUString getUINameFromCommand( const OUString& rCommandURL );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL );
void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
- bool isContextSensitiveToolbarNonVisible();
+ bool isContextSensitiveToolbarNonVisible() { return m_bResetActive;}
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 6814ace0c1c7..a428ccdce2b6 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -202,10 +202,6 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl
}
}
-bool ToolbarLayoutManager::isLayoutDirty()
-{
- return m_bLayoutDirty;
-}
void ToolbarLayoutManager::doLayout(const ::Size& aContainerSize)
{
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 1169e5cab87d..b137ac03c6c3 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -94,7 +94,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
bool isPreviewFrame();
// layouting
- bool isLayoutDirty();
+ bool isLayoutDirty() { return m_bLayoutDirty;}
void doLayout(const ::Size& aContainerSize);
// creation/destruction
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 5321064ef9d9..857519ebdf0f 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -333,10 +333,6 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl
return aSeq;
}
-bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible()
-{
- return m_bResetActive;
-}
void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
{