diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:05:49 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:48 +0300 |
commit | 951ed199f1a47c02dad3dc899b9804b4574a151d (patch) | |
tree | d8f82a3afa345351ce6a4a206424c6f2bd2aed46 /framework/source/helper | |
parent | be616c26f990d651c752be201e29e2b89ba17f2a (diff) |
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
Diffstat (limited to 'framework/source/helper')
-rw-r--r-- | framework/source/helper/dockingareadefaultacceptor.cxx | 3 | ||||
-rw-r--r-- | framework/source/helper/ocomponentaccess.cxx | 10 | ||||
-rw-r--r-- | framework/source/helper/ocomponentenumeration.cxx | 10 | ||||
-rw-r--r-- | framework/source/helper/oframes.cxx | 24 | ||||
-rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 13 | ||||
-rw-r--r-- | framework/source/helper/statusindicator.cxx | 9 | ||||
-rw-r--r-- | framework/source/helper/statusindicatorfactory.cxx | 18 | ||||
-rw-r--r-- | framework/source/helper/tagwindowasmodified.cxx | 9 | ||||
-rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 12 | ||||
-rw-r--r-- | framework/source/helper/uiconfigelementwrapperbase.cxx | 2 | ||||
-rw-r--r-- | framework/source/helper/vclstatusindicator.cxx | 10 | ||||
-rw-r--r-- | framework/source/helper/wakeupthread.cxx | 4 |
12 files changed, 0 insertions, 124 deletions
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index a1c9acb7e95a..33c79a8492f8 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; - // constructor DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Reference< XFrame >& xOwner ) @@ -42,14 +41,12 @@ DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Refere { } - // destructor DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() { } - // XDockingAreaAcceptor css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception) { diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index f8679988eff1..63238bc90416 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -34,7 +34,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; - // constructor OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner ) @@ -44,14 +43,12 @@ OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwne SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" ); } - // destructor OComponentAccess::~OComponentAccess() { } - // XEnumerationAccess css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception ) { @@ -79,7 +76,6 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration return xReturn; } - // XElementAccess Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception ) { @@ -88,7 +84,6 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e return ::getCppuType((const css::uno::Reference< XComponent >*)NULL); } - // XElementAccess sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception ) { @@ -109,7 +104,6 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std:: return bReturn; } - // private method void OComponentAccess::impl_collectAllChildComponents( const css::uno::Reference< XFramesSupplier >& xNode , @@ -143,7 +137,6 @@ void OComponentAccess::impl_collectAllChildComponents( const css::uno::Refere // ... otherwise break a recursive path and go back at current stack! } - // private method css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const @@ -176,10 +169,8 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons return xComponent; } - // debug methods - /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! @@ -190,7 +181,6 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ - sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner ) { return xOwner.is(); diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 2f3057c8d137..650228013e61 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -30,7 +30,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; - // constructor OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) @@ -42,7 +41,6 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Referenc SAL_WARN_IF( !impldbg_checkParameter_OComponentEnumerationCtor( seqComponents ), "fwk", "OComponentEnumeration::OComponentEnumeration(): Invalid parameter detected!" ); } - // destructor OComponentEnumeration::~OComponentEnumeration() @@ -51,7 +49,6 @@ OComponentEnumeration::~OComponentEnumeration() impl_resetObject(); } - // XEventListener void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { @@ -66,7 +63,6 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro impl_resetObject(); } - // XEnumeration sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception ) { @@ -79,7 +75,6 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti return ( m_nPosition < (sal_uInt32)(m_seqComponents.getLength()) ); } - // XEnumeration Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , @@ -105,7 +100,6 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementExcepti return aComponent; } - // proteced method void OComponentEnumeration::impl_resetObject() @@ -125,10 +119,8 @@ void OComponentEnumeration::impl_resetObject() m_nPosition = 0 ; } - // debug methods - /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! @@ -139,7 +131,6 @@ void OComponentEnumeration::impl_resetObject() But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ - // An empty list is allowed ... hasMoreElements() will return false then! sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) { @@ -156,7 +147,6 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor return bOK ; } - sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent ) { return aEvent.Source.is(); diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 00652b6cd109..c1ca703da3aa 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -34,8 +34,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::std ; - - // constructor OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner , @@ -49,7 +47,6 @@ 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() @@ -58,7 +55,6 @@ OFrames::~OFrames() impl_resetObject(); } - // XFrames void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { @@ -82,7 +78,6 @@ 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 ) { @@ -107,7 +102,6 @@ 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 ) { @@ -133,18 +127,15 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int // All searchflags are supported by this implementation! // If some flags should not be supported - don't call me with this flags!!! - // Search with AUTO-flag is not supported yet! // We think about right implementation. SAL_WARN_IF( (nSearchFlags & FrameSearchFlag::AUTO), "fwk", "OFrames::queryFrames(): Search with AUTO-flag is not supported yet!" ); - // Search for ALL and GLOBAL is superflous! // We support all necessary flags, from which these two flags are derived. // ALL = PARENT + SELF + CHILDREN + SIBLINGS // GLOBAL = ALL + TASKS - // Add parent to list ... if any exist! if( nSearchFlags & FrameSearchFlag::PARENT ) { @@ -157,7 +148,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int } } - // Add owner to list if SELF is searched. if( nSearchFlags & FrameSearchFlag::SELF ) { @@ -166,7 +156,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int impl_appendSequence( seqFrames, seqSelf ); } - // Add SIBLINGS to list. if( nSearchFlags & FrameSearchFlag::SIBLINGS ) { @@ -186,7 +175,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int m_bRecursiveSearchProtection = sal_False; } - // If searched for children, step over all elements in container and collect the information. if ( nSearchFlags & FrameSearchFlag::CHILDREN ) { @@ -212,7 +200,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int return seqFrames; } - // XIndexAccess sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) { @@ -234,7 +221,6 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) return nCount; } - // XIndexAccess Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , @@ -265,7 +251,6 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce return aReturnValue; } - // XElementAccess Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception ) { @@ -273,7 +258,6 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL ); } - // XElementAccess sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception ) { @@ -297,7 +281,6 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception return bHasElements; } - // proteced method void OFrames::impl_resetObject() @@ -314,7 +297,6 @@ void OFrames::impl_resetObject() m_pFrameContainer = NULL; } - // private method void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination , @@ -353,10 +335,8 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram seqDestination = seqResult; } - // debug methods - /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! @@ -367,7 +347,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 ouer owner class, need a valid factory to instanciate new services and // use the access to ouer owner for some operations. @@ -377,7 +356,6 @@ 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 ) @@ -385,7 +363,6 @@ 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 ) @@ -393,7 +370,6 @@ 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 ) diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index a542484e7095..411e3dbf03a1 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -38,23 +38,18 @@ #include <vcl/wrkwin.hxx> #include <rtl/string.hxx> - namespace framework{ - - PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_bWindowStateAlreadySet(sal_False ) { } - PersistentWindowState::~PersistentWindowState() { } - void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -83,7 +78,6 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u xFrame->addFrameActionListener(this); } - void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -143,14 +137,12 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } } - void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { // nothing todo here - because we hold the frame as weak reference only } - OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame) { @@ -171,7 +163,6 @@ OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< return sModuleName; } - OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sModuleName) { @@ -202,7 +193,6 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno:: return sWindowState; } - void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sModuleName , const OUString& sWindowState) @@ -231,7 +221,6 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere {} } - OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { OUString sWindowState; @@ -260,8 +249,6 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: return sWindowState; } - - void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , const OUString& sWindowState) { diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 2889d58f096a..168442c55bb2 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -19,24 +19,19 @@ #include <config_features.h> - #include <helper/statusindicator.hxx> namespace framework{ - - StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory) : m_xFactory (pFactory) { } - StatusIndicator::~StatusIndicator() { } - void SAL_CALL StatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException, std::exception) @@ -54,7 +49,6 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , #endif } - void SAL_CALL StatusIndicator::end() throw(css::uno::RuntimeException, std::exception) { @@ -68,7 +62,6 @@ void SAL_CALL StatusIndicator::end() #endif } - void SAL_CALL StatusIndicator::reset() throw(css::uno::RuntimeException, std::exception) { @@ -82,7 +75,6 @@ void SAL_CALL StatusIndicator::reset() #endif } - void SAL_CALL StatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException, std::exception) { @@ -98,7 +90,6 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText) #endif } - void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) { diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index ef05159898f9..5f138561e8d8 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -49,11 +49,9 @@ namespace framework{ - sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar"; - StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_pWakeUp (0 ) @@ -63,13 +61,11 @@ StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::u { } - StatusIndicatorFactory::~StatusIndicatorFactory() { impl_stopWakeUpThread(); } - void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -105,7 +101,6 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css:: impl_createProgress(); } - css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator() throw(css::uno::RuntimeException, std::exception) { @@ -115,7 +110,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto return xIndicator; } - void SAL_CALL StatusIndicatorFactory::update() throw(css::uno::RuntimeException, std::exception) { @@ -123,7 +117,6 @@ void SAL_CALL StatusIndicatorFactory::update() m_bAllowReschedule = sal_True; } - void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText , sal_Int32 nRange) @@ -153,7 +146,6 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus impl_reschedule(sal_True); } - void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild) { // SAFE -> ---------------------------------- @@ -184,7 +176,6 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus impl_reschedule(sal_True); } - void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIndicator >& xChild) { // SAFE -> ---------------------------------- @@ -238,7 +229,6 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn impl_reschedule(sal_True); } - void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ) { @@ -268,7 +258,6 @@ void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStat impl_reschedule(sal_True); } - void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XStatusIndicator >& xChild , sal_Int32 nValue ) { @@ -301,7 +290,6 @@ void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XSt impl_reschedule(sal_False); } - void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() { // SAFE -> ---------------------------------- @@ -394,7 +382,6 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() } - void StatusIndicatorFactory::impl_createProgress() { // SAFE -> ---------------------------------- @@ -441,7 +428,6 @@ void StatusIndicatorFactory::impl_createProgress() m_xProgress = xProgress; } - void StatusIndicatorFactory::impl_showProgress() { // SAFE -> ---------------------------------- @@ -483,7 +469,6 @@ void StatusIndicatorFactory::impl_showProgress() } } - void StatusIndicatorFactory::impl_hideProgress() { // SAFE -> ---------------------------------- @@ -509,7 +494,6 @@ void StatusIndicatorFactory::impl_hideProgress() } } - void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) { // SAFE -> @@ -550,7 +534,6 @@ void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) } } - void StatusIndicatorFactory::impl_startWakeUpThread() { osl::MutexGuard g(m_mutex); @@ -565,7 +548,6 @@ void StatusIndicatorFactory::impl_startWakeUpThread() } } - void StatusIndicatorFactory::impl_stopWakeUpThread() { osl::MutexGuard g(m_mutex); diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 30a0f957783a..6ebaa567357c 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -36,21 +36,16 @@ #include <vcl/wrkwin.hxx> #include <tools/wintypes.hxx> - namespace framework{ - - TagWindowAsModified::TagWindowAsModified() { } - TagWindowAsModified::~TagWindowAsModified() { } - void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -72,7 +67,6 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno impl_update (xFrame); } - void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -111,7 +105,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent // <- SYNCHRONIZED } - void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -135,7 +128,6 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven impl_update (xFrame); } - void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -162,7 +154,6 @@ void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEven } } - void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XFrame >& xFrame) { if ( ! xFrame.is ()) diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 16b157fa5c73..5f6791cff4bf 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -50,20 +50,16 @@ namespace framework{ static const ::sal_Int32 INVALID_ICON_ID = -1; static const ::sal_Int32 DEFAULT_ICON_ID = 0; - - TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_xFrame ( ) { } - TitleBarUpdate::~TitleBarUpdate() { } - void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -97,7 +93,6 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any xBroadcaster->addTitleChangeListener (this); } - void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -113,14 +108,12 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE } } - void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */) throw (css::uno::RuntimeException, std::exception) { impl_forceUpdate (); } - void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { @@ -198,8 +191,6 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr // <- VCL SYNCHRONIZED } - - sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ) { @@ -228,7 +219,6 @@ sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::fr return sal_False; } - void TitleBarUpdate::impl_forceUpdate() { css::uno::Reference< css::frame::XFrame > xFrame; @@ -253,7 +243,6 @@ void TitleBarUpdate::impl_forceUpdate() #endif } - void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XController > xController = xFrame->getController (); @@ -325,7 +314,6 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra // <- VCL SYNCHRONIZED } - void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame) { // no window ... no chance to set any title -> return diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 2bbccfee7c8c..bf3a8c86093a 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -452,7 +452,6 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc { SolarMutexClearableGuard aLock; - if ( xSettings.is() ) { // Create a copy of the data if the container is not const @@ -491,7 +490,6 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_ { SolarMutexGuard g; - if ( bWriteable ) return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY ); diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 4bdb97a0d1b9..ef84803b6e3f 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -22,11 +22,8 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> - namespace framework { - - VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) : m_xParentWindow (xParentWindow ) , m_pStatusBar (0 ) @@ -39,12 +36,10 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWin static_cast< css::task::XStatusIndicator* >(this)); } - VCLStatusIndicator::~VCLStatusIndicator() { } - void SAL_CALL VCLStatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException, std::exception) @@ -71,7 +66,6 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , m_nValue = 0; } - void SAL_CALL VCLStatusIndicator::reset() throw(css::uno::RuntimeException, std::exception) { @@ -83,7 +77,6 @@ void SAL_CALL VCLStatusIndicator::reset() } } - void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException, std::exception) { @@ -103,7 +96,6 @@ void SAL_CALL VCLStatusIndicator::end() } } - void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException, std::exception) { @@ -113,7 +105,6 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) m_pStatusBar->SetText(sText); } - void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) { @@ -136,7 +127,6 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) m_pStatusBar->SetProgressValue(nPercent); } - void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , Window* pParentWindow) { diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index b0cd2a94e851..e695a603a1b5 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -26,14 +26,11 @@ namespace framework{ - - WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener) : m_xListener (xListener) { } - void SAL_CALL WakeUpThread::run() { ::osl::Condition aSleeper; @@ -53,7 +50,6 @@ void SAL_CALL WakeUpThread::run() } } - void SAL_CALL WakeUpThread::onTerminated() { delete this; |