summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2013-08-31 17:50:25 +0200
committerPhilipp Riemer <ruderphilipp@gmail.com>2013-08-31 22:41:10 +0200
commitbf42b6f9f51b4bc66e267ae24c87ac79122825cc (patch)
tree449f642fc53e3d654ae36a39877efc41a8b74fcc /framework/inc
parent3f84d81412f123bda0dde57c4e52abe9f49f58af (diff)
fdo#62475 - remove visual noise
This is a follow up commit to - 22d1beb78a475e4846af945afde1c4d6c263b5d6 - 1c7af455ab9345304a7ac48ce2e0310de2ac8a75 Change-Id: I102685391125f3b4f7bdf838f8bd17a2283d558d
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/helper/oframes.hxx46
-rw-r--r--framework/inc/interaction/quietinteraction.hxx8
2 files changed, 3 insertions, 51 deletions
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 4056651ea2bc..62ebac4c4c68 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -56,20 +56,11 @@ namespace framework{
@devstatus deprecated
*//*-*************************************************************************************************************/
-
class OFrames : private ThreadHelpBase , // Must be the first of baseclasses - Is necessary for right initialization of objects!
public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrames >
{
- //-------------------------------------------------------------------------------------------------------------
- // public methods
- //-------------------------------------------------------------------------------------------------------------
-
public:
- //---------------------------------------------------------------------------------------------------------
- // constructor / destructor
- //---------------------------------------------------------------------------------------------------------
-
/*-****************************************************************************************************//**
@short standard ctor
@descr These initialize a new instance of this class with all needed information for work.
@@ -83,13 +74,10 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror -
*//*-*****************************************************************************************************/
-
OFrames( const css::uno::Reference< css::frame::XFrame >& xOwner ,
FrameContainer* pFrameContainer );
- //---------------------------------------------------------------------------------------------------------
// XFrames
- //---------------------------------------------------------------------------------------------------------
/*-****************************************************************************************************//**
@short append frame to container
@@ -103,7 +91,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror We do nothing in release or throw an assert in debug version.
*//*-*****************************************************************************************************/
-
virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@@ -118,7 +105,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror We do nothing in release or throw an assert in debug version.
*//*-*****************************************************************************************************/
-
virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@@ -132,12 +118,9 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror An empty list is returned.
*//*-*****************************************************************************************************/
-
virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
- //---------------------------------------------------------------------------------------------------------
// XIndexAccess
- //---------------------------------------------------------------------------------------------------------
/*-****************************************************************************************************//**
@short get count of all current frames in container
@@ -152,7 +135,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror If a lock is set, we return 0 for prevent further access!
*//*-*****************************************************************************************************/
-
virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@@ -169,14 +151,11 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror If a lock is set, we return an empty Any!
@onerror If index out of range, an IndexOutOfBoundsException is thrown.
*//*-*****************************************************************************************************/
-
virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw( css::lang::IndexOutOfBoundsException ,
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
- //---------------------------------------------------------------------------------------------------------
// XElementAccess
- //---------------------------------------------------------------------------------------------------------
/*-****************************************************************************************************//**
@short get uno-type of all container items
@@ -190,7 +169,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror -
*//*-*****************************************************************************************************/
-
virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@@ -206,13 +184,8 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror We return sal_False.
*//*-*****************************************************************************************************/
-
virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException );
- //-------------------------------------------------------------------------------------------------------------
- // protected methods
- //-------------------------------------------------------------------------------------------------------------
-
protected:
/*-****************************************************************************************************//**
@@ -228,7 +201,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror -
*//*-*****************************************************************************************************/
-
virtual ~OFrames();
/*-****************************************************************************************************//**
@@ -247,13 +219,8 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror -
*//*-*****************************************************************************************************/
-
virtual void impl_resetObject();
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
-
private:
/*-****************************************************************************************************//**
@@ -268,14 +235,11 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@onerror -
*//*-*****************************************************************************************************/
-
void impl_appendSequence( css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqDestination ,
const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqSource );
- //-------------------------------------------------------------------------------------------------------------
// debug methods
// (should be private everyway!)
- //-------------------------------------------------------------------------------------------------------------
/*-****************************************************************************************************//**
@short debug-method to check incoming parameter of some other mehods of this class
@@ -294,7 +258,6 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
#ifdef ENABLE_ASSERTIONS
private:
-
static sal_Bool impldbg_checkParameter_OFramesCtor ( const css::uno::Reference< css::frame::XFrame >& xOwner ,
FrameContainer* pFrameContainer );
static sal_Bool impldbg_checkParameter_append ( const css::uno::Reference< css::frame::XFrame >& xFrame );
@@ -303,21 +266,18 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
#endif // #ifdef ENABLE_ASSERTIONS
- //-------------------------------------------------------------------------------------------------------------
// variables
// (should be private everyway!)
- //-------------------------------------------------------------------------------------------------------------
private:
-
css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// reference to owner of this instance (Hold no hard reference!)
FrameContainer* m_pFrameContainer ; /// with owner shared list to hold all direct children of an XFramesSupplier
sal_Bool m_bRecursiveSearchProtection ; /// flag to protect against recursive searches of frames at parents
-}; // class OFrames
+};
-} // namespace framework
+}
-#endif // #ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 52ed4895c616..9a5353486b2b 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -48,20 +48,17 @@ class QuietInteraction : private ThreadHelpBase
, public ::cppu::WeakImplHelper1<
css::task::XInteractionHandler >
{
- //_____________________________________
// member
private:
/// in case an unknown interaction was aborted - we save it for our external user!
css::uno::Any m_aRequest;
- //_____________________________________
// uno interface
public:
// XInterface, XTypeProvider
- //_________________________________
/**
@interface XInteractionHandler
@short called from outside to handle a problem
@@ -80,11 +77,8 @@ class QuietInteraction : private ThreadHelpBase
*/
virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException );
- //_____________________________________
// c++ interface
public:
-
- //_________________________________
/**
@short ctor to guarantee right initialized instances of this class
@descr -
@@ -93,7 +87,6 @@ class QuietInteraction : private ThreadHelpBase
*/
QuietInteraction();
- //_________________________________
/**
@short return the handled interaction request
@descr We saved any getted interaction request internaly.
@@ -109,7 +102,6 @@ class QuietInteraction : private ThreadHelpBase
*/
css::uno::Any getRequest() const;
- //_________________________________
/**
@short returns information if interaction was used
@descr It can be useful to know the reason for a failed operation.