summaryrefslogtreecommitdiff
path: root/framework/source/helper/oframes.cxx
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 18:54:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 14:41:41 -0600
commitfcbefea01766e0888f7813672d9eddbdec5a9046 (patch)
tree8861652061bb2189350824217c98a259a9a9d2ec /framework/source/helper/oframes.cxx
parenta395c9fa387eabf2d09360f1023f5e3e66af21a8 (diff)
Remove visual noise from framework
Conflicts: framework/inc/dispatch/oxt_handler.hxx framework/inc/services/layoutmanager.hxx framework/inc/tabwin/tabwindow.hxx framework/source/dispatch/menudispatcher.cxx framework/source/helper/dockingareadefaultacceptor.cxx framework/source/helper/ocomponentaccess.cxx framework/source/helper/ocomponentenumeration.cxx framework/source/helper/oframes.cxx framework/source/layoutmanager/toolbarlayoutmanager.hxx framework/source/recording/dispatchrecorder.cxx framework/source/services/desktop.cxx framework/source/services/frame.cxx framework/source/services/urltransformer.cxx Change-Id: Ibb04e3f6f0796e7f2be16dcce38542f8b90708d4 Reviewed-on: https://gerrit.libreoffice.org/8265 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/source/helper/oframes.cxx')
-rw-r--r--framework/source/helper/oframes.cxx46
1 files changed, 20 insertions, 26 deletions
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 4ba1b88f1d75..f0ce0c24611c 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -37,9 +37,9 @@ using namespace ::osl ;
using namespace ::std ;
-//*****************************************************************************************************************
+
// constructor
-//*****************************************************************************************************************
+
OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner ,
FrameContainer* pFrameContainer )
// Init baseclasses first
@@ -54,18 +54,17 @@ OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner
SAL_WARN_IF( !impldbg_checkParameter_OFramesCtor( xOwner, pFrameContainer ), "fwk", "OFrames::OFrames(): Invalid parameter detected!" );
}
-//*****************************************************************************************************************
+
// (proteced!) destructor
-//*****************************************************************************************************************
+
OFrames::~OFrames()
{
// Reset instance, free memory ....
impl_resetObject();
}
-//*****************************************************************************************************************
+
// XFrames
-//*****************************************************************************************************************
void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -89,9 +88,8 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::append():Our owner is dead - you can't append any frames ...!" );
}
-//*****************************************************************************************************************
+
// XFrames
-//*****************************************************************************************************************
void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -116,9 +114,8 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::remove(): Our owner is dead - you can't remove any frames ...!" );
}
-//*****************************************************************************************************************
+
// XFrames
-//*****************************************************************************************************************
Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -223,9 +220,8 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
return seqFrames;
}
-//*****************************************************************************************************************
+
// XIndexAccess
-//*****************************************************************************************************************
sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -247,9 +243,9 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
return nCount;
}
-//*****************************************************************************************************************
+
// XIndexAccess
-//*****************************************************************************************************************
+
Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException ,
WrappedTargetException ,
RuntimeException, std::exception )
@@ -279,18 +275,16 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
return aReturnValue;
}
-//*****************************************************************************************************************
+
// XElementAccess
-//*****************************************************************************************************************
Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception )
{
// This "container" support XFrame-interfaces only!
return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL );
}
-//*****************************************************************************************************************
+
// XElementAccess
-//*****************************************************************************************************************
sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -314,9 +308,9 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception
return bHasElements;
}
-//*****************************************************************************************************************
+
// proteced method
-//*****************************************************************************************************************
+
void OFrames::impl_resetObject()
{
// Attention:
@@ -331,9 +325,9 @@ void OFrames::impl_resetObject()
m_pFrameContainer = NULL;
}
-//*****************************************************************************************************************
+
// private method
-//*****************************************************************************************************************
+
void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination ,
const Sequence< css::uno::Reference< XFrame > >& seqSource )
{
@@ -384,7 +378,7 @@ 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 ouer owner class, need a valid factory to instanciate new services and
// use the access to ouer owner for some operations.
@@ -394,7 +388,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Refere
return xOwner.is() && pFrameContainer != 0;
}
-//*****************************************************************************************************************
+
// Its only allowed to add valid references to container.
// AND - alle frames must support XFrames-interface!
sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame )
@@ -402,7 +396,7 @@ sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFra
return xFrame.is();
}
-//*****************************************************************************************************************
+
// Its only allowed to add valid references to container...
// ... => You can only delete valid references!
sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame )
@@ -410,7 +404,7 @@ sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFra
return xFrame.is();
}
-//*****************************************************************************************************************
+
// 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!
sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags )