summaryrefslogtreecommitdiff
path: root/framework/source/helper/oframes.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-08 10:11:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-08 08:53:09 +0000
commit98460e7a502e61f8885c6fb960f0f9fa69de4f3e (patch)
treea7c06d89a21d76a265e96a95312fbdb7cb85a579 /framework/source/helper/oframes.cxx
parent1a743fd8a27d063525e3567619a2971770c61574 (diff)
loplugin:expandablemethods in framework
Change-Id: I444f31f06d2445392a59879c2d7fb1f8ad1c24c6 Reviewed-on: https://gerrit.libreoffice.org/30684 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/helper/oframes.cxx')
-rw-r--r--framework/source/helper/oframes.cxx19
1 files changed, 5 insertions, 14 deletions
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 4f96df15f476..f243584b1e97 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -42,12 +42,13 @@ OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner
, m_pFrameContainer ( pFrameContainer )
, m_bRecursiveSearchProtection( false )
{
- // Safe impossible cases
- // Method is not defined for ALL incoming parameters!
- SAL_WARN_IF( !impldbg_checkParameter_OFramesCtor( xOwner, pFrameContainer ), "fwk", "OFrames::OFrames(): Invalid parameter detected!" );
+ // An instance of this class can only work with valid initialization.
+ // We share the mutex with our owner class, need a valid factory to instanciate new services and
+ // use the access to our owner for some operations.
+ SAL_WARN_IF( !xOwner.is() || !pFrameContainer, "fwk", "OFrames::OFrames(): Invalid parameter detected!" );
}
-// (proteced!) destructor
+// (protected!) destructor
OFrames::~OFrames()
{
@@ -345,16 +346,6 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram
But ... look for right testing! See using of this methods!
-----------------------------------------------------------------------------------------------------------------*/
-// An instance of this class can only work with valid initialization.
-// We share the mutex with our owner class, need a valid factory to instanciate new services and
-// use the access to our owner for some operations.
-bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Reference< XFrame >& xOwner ,
- FrameContainer* pFrameContainer )
-{
- return xOwner.is() && pFrameContainer != nullptr;
-}
-
-
// A search for frames must initiate with right flags.
// Some one are superflous and not supported yet. But here we control only the range of incoming parameter!
bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags )