diff options
Diffstat (limited to 'svx')
168 files changed, 3862 insertions, 3862 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index e16dfafd2f55..03d5799dda80 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -18,11 +18,11 @@ */ -//------------------------------------------------------------------------ + // // Global header // -//------------------------------------------------------------------------ + #include <svl/itemset.hxx> #include <editeng/editdata.hxx> #include <editeng/outliner.hxx> @@ -30,11 +30,11 @@ #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> -//------------------------------------------------------------------------ + // // Project-local header // -//------------------------------------------------------------------------ + #include "AccessibleEmptyEditSource.hxx" #include <svx/unoshtxt.hxx> @@ -173,9 +173,9 @@ namespace accessibility }; - // ------------------------------------------------------------------------- + // Implementing AccessibleProxyEditSource_Impl - // ------------------------------------------------------------------------- + AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, @@ -219,9 +219,9 @@ namespace accessibility } - // ------------------------------------------------------------------------- + // Implementing AccessibleEmptyEditSource - // ------------------------------------------------------------------------- + AccessibleEmptyEditSource::AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, @@ -345,6 +345,6 @@ namespace accessibility } // end of namespace accessibility -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 6a920a7e6c53..c9f37a67c7ac 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -89,14 +89,14 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB } } -// ---------------------------------------------------------------------------- + AccFrameSelector::~AccFrameSelector() { RemoveFrameSelEventListener(); } -// ---------------------------------------------------------------------------- + void AccFrameSelector::RemoveFrameSelEventListener() { @@ -106,7 +106,7 @@ void AccFrameSelector::RemoveFrameSelEventListener() } } -// ---------------------------------------------------------------------------- + Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) throw (RuntimeException) @@ -114,7 +114,7 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) return this; } -// ---------------------------------------------------------------------------- + sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException) { @@ -123,7 +123,7 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException) return (meBorder == FRAMEBORDER_NONE) ? mpFrameSel->GetEnabledBorderCount() : 0; } -// ---------------------------------------------------------------------------- + Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) throw (RuntimeException) @@ -138,7 +138,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) return xRet; } -// ---------------------------------------------------------------------------- + Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) throw (RuntimeException) @@ -153,7 +153,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) return xRet; } -// ---------------------------------------------------------------------------- + sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) throw (RuntimeException) @@ -178,14 +178,14 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) return nIdx; } -// ---------------------------------------------------------------------------- + sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException) { return meBorder == FRAMEBORDER_NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX; } -// ---------------------------------------------------------------------------- + OUString AccFrameSelector::getAccessibleDescription( ) throw (RuntimeException) @@ -195,7 +195,7 @@ OUString AccFrameSelector::getAccessibleDescription( ) return maDescriptions.GetString(meBorder); } -// ---------------------------------------------------------------------------- + OUString AccFrameSelector::getAccessibleName( ) throw (RuntimeException) @@ -205,7 +205,7 @@ OUString AccFrameSelector::getAccessibleName( ) return maNames.GetString(meBorder); } -// ---------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( ) throw (RuntimeException) @@ -239,7 +239,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( return xRet; } -// ---------------------------------------------------------------------------- + Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) throw (RuntimeException) @@ -285,7 +285,7 @@ Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) return xRet; } -// ---------------------------------------------------------------------------- + Locale AccFrameSelector::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) @@ -293,7 +293,7 @@ Locale AccFrameSelector::getLocale( ) return Application::GetSettings().GetUILanguageTag().getLocale(); } -// ---------------------------------------------------------------------------- + void AccFrameSelector::addPropertyChangeListener( const Reference< XPropertyChangeListener >& xListener ) @@ -302,7 +302,7 @@ void AccFrameSelector::addPropertyChangeListener( maPropertyListeners.addInterface( xListener ); } -// ---------------------------------------------------------------------------- + void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyChangeListener >& xListener ) throw (RuntimeException) @@ -310,7 +310,7 @@ void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyC maPropertyListeners.removeInterface( xListener ); } -// ---------------------------------------------------------------------------- + sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) throw (RuntimeException) @@ -321,7 +321,7 @@ sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) return mpFrameSel->ContainsClickPoint( Point( aPt.X, aPt.Y ) ); } -// ---------------------------------------------------------------------------- + Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( const AwtPoint& aPt ) @@ -358,7 +358,7 @@ AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException) return aRet; } -// ---------------------------------------------------------------------------- + AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException) { @@ -378,7 +378,7 @@ AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException) return aRet; } -// ---------------------------------------------------------------------------- + AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException) { @@ -399,7 +399,7 @@ AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException) return aRet; } -// ---------------------------------------------------------------------------- + AwtSize AccFrameSelector::getSize( ) throw (RuntimeException) { @@ -419,7 +419,7 @@ AwtSize AccFrameSelector::getSize( ) throw (RuntimeException) return aRet; } -// ---------------------------------------------------------------------------- + sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException) { @@ -428,7 +428,7 @@ sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException) return sal_True; } -// ---------------------------------------------------------------------------- + sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException) { @@ -437,7 +437,7 @@ sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException) return sal_True; } -// ---------------------------------------------------------------------------- + sal_Bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException) { @@ -446,21 +446,21 @@ sal_Bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException) return sal_True; } -// ---------------------------------------------------------------------------- + void AccFrameSelector::addFocusListener( const Reference< XFocusListener >& xListener ) throw (RuntimeException) { maFocusListeners.addInterface( xListener ); } -// ---------------------------------------------------------------------------- + void AccFrameSelector::removeFocusListener( const Reference< XFocusListener >& xListener ) throw (RuntimeException) { maFocusListeners.removeInterface( xListener ); } -// ---------------------------------------------------------------------------- + void AccFrameSelector::grabFocus( ) throw (RuntimeException) { @@ -469,7 +469,7 @@ void AccFrameSelector::grabFocus( ) throw (RuntimeException) mpFrameSel->GrabFocus(); } -// ---------------------------------------------------------------------------- + Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) { @@ -505,7 +505,7 @@ Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) return aRet; } -// ---------------------------------------------------------------------------- + sal_Int32 AccFrameSelector::getForeground( ) throw (RuntimeException) @@ -515,7 +515,7 @@ sal_Int32 AccFrameSelector::getForeground( ) return mpFrameSel->GetControlForeground().GetColor(); } -// ---------------------------------------------------------------------------- + sal_Int32 AccFrameSelector::getBackground( ) throw (RuntimeException) @@ -525,7 +525,7 @@ sal_Int32 AccFrameSelector::getBackground( ) return mpFrameSel->GetControlBackground().GetColor(); } -// ---------------------------------------------------------------------------- + void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { @@ -541,7 +541,7 @@ void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleE } } -// ---------------------------------------------------------------------------- + void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { @@ -627,7 +627,7 @@ void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus) } } -// ---------------------------------------------------------------------------- + IMPL_LINK( AccFrameSelector, WindowEventListener, VclSimpleEvent*, pEvent ) { @@ -646,7 +646,7 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclSimpleEvent*, pEvent ) return 0; } -// ---------------------------------------------------------------------------- + void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -679,7 +679,7 @@ void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } } -// ---------------------------------------------------------------------------- + void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, const Any& _rOldValue, const Any& _rNewValue ) @@ -692,7 +692,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, } } -// ---------------------------------------------------------------------------- + void AccFrameSelector::Invalidate() { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 2eee09be2c6e..6f0de34fd2a0 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -887,13 +887,13 @@ void SAL_CALL //===== XAccessibleSelection ============================================ // -//-------------------------------------------------------------------------------- + void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 ) throw ( IndexOutOfBoundsException, RuntimeException ) { } -//---------------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) @@ -936,19 +936,19 @@ throw ( IndexOutOfBoundsException, return sal_False; } -//--------------------------------------------------------------------- + void SAL_CALL AccessibleShape::clearAccessibleSelection( ) throw ( RuntimeException ) { } -//------------------------------------------------------------------------- + void SAL_CALL AccessibleShape::selectAllAccessibleChildren( ) throw ( RuntimeException ) { } -//---------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount() throw ( RuntimeException ) { @@ -960,7 +960,7 @@ throw ( RuntimeException ) return nCount; } -//-------------------------------------------------------------------------------------- + Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException) { @@ -977,7 +977,7 @@ throw ( IndexOutOfBoundsException, RuntimeException) return Reference<XAccessible>(); } -//---------------------------------------------------------------------------------- + void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 ) throw ( IndexOutOfBoundsException, RuntimeException ) @@ -1154,7 +1154,7 @@ const uno::Sequence< sal_Int8 >& return theAccessibleShapeImplementationId::get().getSeq(); } -//------------------------------------------------------------------------------ + AccessibleShape* AccessibleShape::getImplementation( const uno::Reference< uno::XInterface >& rxIFace ) throw() @@ -1168,7 +1168,7 @@ AccessibleShape* return( pReturn ); } -//------------------------------------------------------------------------------ + sal_Int64 SAL_CALL AccessibleShape::getSomething( const uno::Sequence< sal_Int8 >& rIdentifier ) throw(uno::RuntimeException) diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index e316e93fc084..d900820c0ae7 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -78,16 +78,16 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi } } } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (RuntimeException) { return OUString( "VCLXAccessibleSvxFindReplaceDialog" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException) { diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index fe6cd4797422..a75e534c9b0d 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -32,11 +32,11 @@ namespace accessibility { - //------------------------------------------------------------------------ + // // EventQueue implementation // - //------------------------------------------------------------------------ + AccessibleTextEventQueue::AccessibleTextEventQueue() { @@ -90,6 +90,6 @@ namespace accessibility } // end of namespace accessibility -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 342131a2efcc..8236579d465f 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -18,11 +18,11 @@ */ -//------------------------------------------------------------------------ + // // Global header // -//------------------------------------------------------------------------ + #include <limits.h> #include <memory> @@ -48,11 +48,11 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -//------------------------------------------------------------------------ + // // Project-local header // -//------------------------------------------------------------------------ + #include "AccessibleTextEventQueue.hxx" #include <svx/AccessibleTextHelper.hxx> #include <svx/unoshape.hxx> @@ -77,11 +77,11 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { -//------------------------------------------------------------------------ + // // AccessibleTextHelper_Impl declaration // -//------------------------------------------------------------------------ + DBG_NAME( AccessibleTextHelper_Impl ) @@ -254,11 +254,11 @@ namespace accessibility int mnNotifierClientId; }; - //------------------------------------------------------------------------ + // // AccessibleTextHelper_Impl implementation // - //------------------------------------------------------------------------ + AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() : mxFrontEnd( NULL ), @@ -1732,11 +1732,11 @@ namespace accessibility return NULL; } - //------------------------------------------------------------------------ + // // AccessibleTextHelper implementation (simply forwards to impl) // - //------------------------------------------------------------------------ + SAL_WNODEPRECATED_DECLARATIONS_PUSH AccessibleTextHelper::AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ) : @@ -2072,6 +2072,6 @@ namespace accessibility } // end of namespace accessibility -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 89d647e9f9e6..2326463e858a 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -1143,14 +1143,14 @@ AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const { return static_cast<AccessibleShape*> (mxAccessibleShape.get()); } -// ----------------------------------------------------------------------------- + void ChildDescriptor::setIndexAtAccessibleShape(sal_Int32 _nIndex) { AccessibleShape* pShape = GetAccessibleShape(); if ( pShape ) pShape->setIndexInParent(_nIndex); } -// ----------------------------------------------------------------------------- + diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index ebb713fb3399..7314cf18b002 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -123,7 +123,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( maTreeInfo.SetViewForwarder( const_cast<SvxGraphCtrlAccessibleContext*>(this) ); } -//----------------------------------------------------------------------------- + /** on destruction, this component is disposed and all dispose listeners are called, except if this component was already disposed */ @@ -132,7 +132,7 @@ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext() disposing(); } -//----------------------------------------------------------------------------- + /** returns the XAccessible interface for a given SdrObject. Multiple calls for the same SdrObject return the same XAccessible. @@ -197,7 +197,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point && (rPoint.Y < aSize.Height); } -//----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException ) { @@ -228,7 +228,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt return xAccessible; } -//----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException ) { @@ -242,7 +242,7 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim return aBounds; } -//----------------------------------------------------------------------------- + awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException ) { @@ -251,7 +251,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE return awt::Point( aRect.getX(), aRect.getY() ); } -//----------------------------------------------------------------------------- + awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException ) { @@ -260,7 +260,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( return awt::Point( aRect.getX(), aRect.getY() ); } -//----------------------------------------------------------------------------- + awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException ) { @@ -282,7 +282,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void return mpPage->GetObjCount(); } -//----------------------------------------------------------------------------- + /** returns the SdrObject at index nIndex from the model of this graph */ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) @@ -299,7 +299,7 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) return mpPage->GetObj( nIndex ); } -//----------------------------------------------------------------------------- + /** sends an AccessibleEventObject to all added XAccessibleEventListeners */ void SvxGraphCtrlAccessibleContext::CommitChange ( @@ -323,7 +323,7 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent ); } -//----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException ) @@ -333,14 +333,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh return getAccessible( getSdrObject( nIndex ) ); } -//----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException ) { return mxParent; } -//----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException ) { @@ -372,14 +372,14 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( vo return -1; } -//----------------------------------------------------------------------------- + sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException ) { return AccessibleRole::PANEL; } -//----------------------------------------------------------------------------- + OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { @@ -387,7 +387,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void return msDescription; } -//----------------------------------------------------------------------------- + OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) { @@ -395,7 +395,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw return msName; } -//----------------------------------------------------------------------------- + /** Return empty reference to indicate that the relation set is not supported. @@ -405,7 +405,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA return Reference< XAccessibleRelationSet >(); } -//----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException ) { @@ -430,7 +430,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce return pStateSetHelper; } -//----------------------------------------------------------------------------- + lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException ) { @@ -461,7 +461,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R } } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException ) @@ -483,7 +483,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( cons } } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener ) throw( RuntimeException ) @@ -498,7 +498,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< } } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener ) throw (RuntimeException) @@ -513,7 +513,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Referenc } } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException ) { @@ -525,7 +525,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException mpControl->GrabFocus(); } -//----------------------------------------------------------------------------- + Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( RuntimeException ) { @@ -607,7 +607,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI mpView->MarkObj( pObj, mpView->GetSdrPageView()); } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { @@ -619,7 +619,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ return mpView->IsObjMarked( getSdrObject( nIndex ) ); } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException ) { @@ -631,7 +631,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R mpView->UnmarkAllObj(); } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException ) { @@ -643,7 +643,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw mpView->MarkAllObj(); } -//----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException ) { @@ -656,7 +656,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun return rList.GetMarkCount(); } -//----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) @@ -675,7 +675,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce return xAccessible; } -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) { @@ -746,7 +746,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( -//----------------------------------------------------------------------------- + void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() { @@ -785,7 +785,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() } } -//----------------------------------------------------------------------------- + Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) { @@ -800,7 +800,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R mpControl->GetSizePixel() ); } -//----------------------------------------------------------------------------- + /** Calculate the relative coordinates of the bounding box as difference between the absolute coordinates of the bounding boxes of this control @@ -829,7 +829,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeEx return aBounds; } -//----------------------------------------------------------------------------- + Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void ) { @@ -847,7 +847,7 @@ Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void ) return pId->getImplementationId(); } -//----------------------------------------------------------------------------- + void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { @@ -904,7 +904,7 @@ bool SvxGraphCtrlAccessibleContext::IsValid (void) const return true; } -//----------------------------------------------------------------------------- + Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const { @@ -919,7 +919,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const return aVisArea; } -//----------------------------------------------------------------------------- + Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const { @@ -934,7 +934,7 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const } } -//----------------------------------------------------------------------------- + Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const { @@ -944,7 +944,7 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const return rSize; } -//----------------------------------------------------------------------------- + Point SvxGraphCtrlAccessibleContext::PixelToLogic (const Point& rPoint) const { @@ -954,7 +954,7 @@ Point SvxGraphCtrlAccessibleContext::PixelToLogic (const Point& rPoint) const return rPoint; } -//----------------------------------------------------------------------------- + Size SvxGraphCtrlAccessibleContext::PixelToLogic (const Size& rSize) const { diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 44ea57bbfe87..18c68d275868 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -39,9 +39,9 @@ namespace svx using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -// ---------------- + // - SvxShowCharSetVirtualAcc - -// ---------------- + SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock()) ,mpParent( pParent ) ,m_pTable(NULL) @@ -53,14 +53,14 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : osl_atomic_decrement(&m_refCount); } -// ----------------------------------------------------------------------------- + SvxShowCharSetVirtualAcc::~SvxShowCharSetVirtualAcc() { ensureDisposed(); delete getExternalLock(); } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 ) @@ -73,14 +73,14 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent( if ( m_pTable ) m_pTable->fireEvent(_nEventId,_rOldValue,_rNewValue); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); return ( mpParent->getScrollBar()->IsVisible() ) ? 2 : 1; } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) { @@ -107,13 +107,13 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtual } return xRet; } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleKeyBinding() throw (uno::RuntimeException) { return uno::Any(); } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() throw (uno::RuntimeException) { @@ -123,7 +123,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -142,7 +142,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( throw IndexOutOfBoundsException(); return m_xAcc; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -155,7 +155,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( return xRet; } -// ----------------------------------------------------------------------------- + ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) { ::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 ); @@ -175,29 +175,29 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( } return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (RuntimeException) { return css::accessibility::AccessibleRole::SCROLL_PANE; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet( ) throw (RuntimeException) { return Reference< XAccessibleRelationSet >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -223,7 +223,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibl return pStateSet; } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxShowCharSetVirtualAcc::disposing() { OAccessibleContextHelper::disposing(); @@ -231,10 +231,10 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing() m_pTable->dispose(); m_pTable = NULL; } -// ----------------------------------------------------------------------------- -// ---------------- + + // - SvxShowCharSetItem - -// ---------------- + SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) : mrParent( rParent ) @@ -243,7 +243,7 @@ SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAc ,m_pParent(_pParent) { } -// ----------------------------------------------------------------------- + SvxShowCharSetItem::~SvxShowCharSetItem() { @@ -254,7 +254,7 @@ SvxShowCharSetItem::~SvxShowCharSetItem() } } -// ----------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessible() { @@ -267,7 +267,7 @@ uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessi return m_xAcc; } -// ----------------------------------------------------------------------- + void SvxShowCharSetItem::ClearAccessible() { @@ -279,9 +279,9 @@ void SvxShowCharSetItem::ClearAccessible() } -// --------------- + // - SvxShowCharSetAcc - -// --------------- + SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock()) ,m_pParent( _pParent ) @@ -293,14 +293,14 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc osl_atomic_decrement(&m_refCount); } -// ----------------------------------------------------------------------------- + SvxShowCharSetAcc::~SvxShowCharSetAcc() { ensureDisposed(); delete getExternalLock(); } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxShowCharSetAcc::disposing() { OAccessibleSelectionHelper::disposing(); @@ -313,16 +313,16 @@ void SAL_CALL SvxShowCharSetAcc::disposing() m_pParent = NULL; } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) -// ----------------------------------------------------------------------- + bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException) { return m_pParent && m_pParent->getCharSetControl()->IsSelected( sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex)); } -// ----------------------------------------------------------------------------- + // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -334,7 +334,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS m_pParent->getCharSetControl()->DeSelect(); } } -// ----------------------------------------------------------------------------- + ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetAcc::implGetBounds( ) throw (RuntimeException) { const Point aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() ); @@ -354,7 +354,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS return aRet; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() throw (uno::RuntimeException) { @@ -363,7 +363,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() return m_pParent->getCharSetControl()->getMaxCharCount(); } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -385,7 +385,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge return xRet; } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent() throw (uno::RuntimeException) @@ -395,7 +395,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge return m_pParent; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() throw (uno::RuntimeException) @@ -403,7 +403,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() return css::accessibility::AccessibleRole::TABLE; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() throw (uno::RuntimeException) @@ -412,7 +412,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION ); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() throw (uno::RuntimeException) @@ -422,7 +422,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC ); } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet() throw (uno::RuntimeException) @@ -430,7 +430,7 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha return uno::Reference< css::accessibility::XAccessibleRelationSet >(); } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet() throw (uno::RuntimeException) @@ -460,7 +460,7 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe return pStateSet; } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) @@ -480,8 +480,8 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge return xRet; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void SAL_CALL SvxShowCharSetAcc::grabFocus() throw (uno::RuntimeException) @@ -491,54 +491,54 @@ void SAL_CALL SvxShowCharSetAcc::grabFocus() m_pParent->getCharSetControl()->GrabFocus(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL SvxShowCharSetAcc::getAccessibleKeyBinding() throw (uno::RuntimeException) { return uno::Any(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount( ) throw (RuntimeException) { return ((getAccessibleChildCount()-1) / COLUMN_COUNT) + 1; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) throw (RuntimeException) { return COLUMN_COUNT; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException) { return OUString(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) { return OUString(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) { return 1; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) { return 1; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders( ) throw (RuntimeException) { return Reference< XAccessibleTable >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders( ) throw (RuntimeException) { return Reference< XAccessibleTable >(); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -547,7 +547,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) aSel[0] = m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()); return aSel; } -// ----------------------------------------------------------------------------- + Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -556,21 +556,21 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( aSel[0] = m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()); return aSel; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -581,48 +581,48 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In throw IndexOutOfBoundsException(); return pItem->GetAccessible(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption( ) throw (RuntimeException) { return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary( ) throw (RuntimeException) { return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetSelectIndexId() == getAccessibleIndex(nRow,nColumn); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { return (nRow*COLUMN_COUNT) + nColumn; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- -// ---------------- + + + // - SvxShowCharSetItemAcc - -// ---------------- + SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock()) ,mpParent( pParent ) @@ -635,17 +635,17 @@ SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OA osl_atomic_decrement(&m_refCount); } -// ----------------------------------------------------------------------------- + SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc() { ensureDisposed(); delete getExternalLock(); } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 ) -// ----------------------------------------------------------------------------- + void SvxShowCharSetItemAcc::ParentDestroyed() { @@ -653,7 +653,7 @@ void SvxShowCharSetItemAcc::ParentDestroyed() mpParent = NULL; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() throw (uno::RuntimeException) @@ -661,7 +661,7 @@ sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() return 0; } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -669,7 +669,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc throw lang::IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent() throw (uno::RuntimeException) @@ -679,7 +679,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc return mpParent->m_pParent; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() throw (uno::RuntimeException) @@ -687,7 +687,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() return css::accessibility::AccessibleRole::TABLE_CELL; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() throw (uno::RuntimeException) @@ -715,7 +715,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() return sDescription; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() throw (uno::RuntimeException) @@ -735,7 +735,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() return aRet; } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet() throw (uno::RuntimeException) @@ -743,7 +743,7 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha return uno::Reference< css::accessibility::XAccessibleRelationSet >(); } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet() throw (uno::RuntimeException) @@ -780,21 +780,21 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe return pStateSet; } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxShowCharSetItemAcc::grabFocus() throw (uno::RuntimeException) { // nothing to do } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL SvxShowCharSetItemAcc::getAccessibleKeyBinding() throw (uno::RuntimeException) { return uno::Any(); } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL SvxShowCharSetItemAcc::implGetBounds( ) throw (RuntimeException) { awt::Rectangle aRet; @@ -815,13 +815,13 @@ awt::Rectangle SAL_CALL SvxShowCharSetItemAcc::implGetBounds( ) throw (RuntimeE return aRet; } -// ----------------------------------------------------------------------------- + uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) throw (uno::RuntimeException) { return uno::Reference< css::accessibility::XAccessible >(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -844,7 +844,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeExc return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -859,7 +859,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeExc return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -869,7 +869,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException) nColor = m_pParent->getForeground(); return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -878,11 +878,11 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException) nColor = m_pParent->getBackground(); return nColor; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + } // namespace svx -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index b7db7f4e3944..527d2cff5f24 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -383,9 +383,9 @@ uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames( ) return aRet; } -// ----------------------------------------------------------------------------- + // XAccessibleSelection -// ----------------------------------------------------------------------------- + void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -397,7 +397,7 @@ void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildInde long nIndex = pPixelCtl->ShowPosition(pPixelCtl->IndexToPoint(nChildIndex)); NotifyChild(nIndex,sal_True,sal_False); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -406,7 +406,7 @@ sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nC return pPixelCtl->GetFoucsPosIndex() == nChildIndex; } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -414,7 +414,7 @@ void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) throw (Runtime IsValid(); } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -422,7 +422,7 @@ void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) throw (Runt IsValid(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -431,7 +431,7 @@ sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) th return 1; } -// ----------------------------------------------------------------------------- + uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -451,7 +451,7 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessi } return xChild; } -// ----------------------------------------------------------------------------- + void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 63c464669e93..4a716e26f8fb 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -792,7 +792,7 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang:: throw lang::DisposedException(); } -// ------------------------------------------------------------------------------------------------- + DBG_NAME( SvxRectCtlChildAccessibleContext ) @@ -1096,9 +1096,9 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeE return aRet; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (RuntimeException) { @@ -1107,7 +1107,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (R return 1; } -// ----------------------------------------------------------------------------- + sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -1123,7 +1123,7 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex return sal_True; } -// ----------------------------------------------------------------------------- + OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -1135,7 +1135,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_ return OUString("select"); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 20b9b3ea407c..01c7d3988184 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -21,7 +21,7 @@ #include "svx/EnhancedCustomShape2d.hxx" #include "svx/unoapi.hxx" -// ----------------------------------------------------------------------------- + EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ) : mnIndex ( nIndex ), @@ -29,20 +29,20 @@ EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( com::sun::star::uno::Refer { } -// ----------------------------------------------------------------------------- + EnhancedCustomShapeHandle::~EnhancedCustomShapeHandle() { } -// ----------------------------------------------------------------------------- + void SAL_CALL EnhancedCustomShapeHandle::acquire() throw() { OWeakObject::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL EnhancedCustomShapeHandle::release() throw() { diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index 836a314a453f..5ab94e236467 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -126,7 +126,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow() return NULL; } -// ----------------------------------------------------------------------- + void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ ) { diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 80d2bfe80460..5d4a38625143 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -34,13 +34,13 @@ #include <bmpmask.hrc> #include <svx/svxids.hrc> -//------------------------------------------------------------------------- + #define BMP_RESID(nId) ResId(nId, DIALOG_MGR()) #define TRANSP_COL (Color( 252, 252, 252 )) #define OWN_CALLMODE SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD -//------------------------------------------------------------------------- + #define TEST_COLS() \ { \ @@ -56,11 +56,11 @@ } \ } -// ------------------------------------------------------------------------- + SFX_IMPL_DOCKINGWINDOW_WITHID( SvxBmpMaskChildWindow, SID_BMPMASK ) -// ------------------------------------------------------------------------- + class ColorWindow : public Control { @@ -86,7 +86,7 @@ public: virtual void Paint( const Rectangle& rRect ); }; -//------------------------------------------------------------------------- + class MaskSet : public ValueSet { @@ -103,7 +103,7 @@ public: void onEditColor(); }; -//------------------------------------------------------------------------- + MaskSet::MaskSet( SvxBmpMask* pParent, const ResId& rId ) : ValueSet ( pParent, rId ), @@ -111,7 +111,7 @@ MaskSet::MaskSet( SvxBmpMask* pParent, const ResId& rId ) : { } -//------------------------------------------------------------------------- + void MaskSet::Select() { @@ -163,7 +163,7 @@ void MaskSet::onEditColor() delete pColorDlg; } -//------------------------------------------------------------------------- + class MaskData { @@ -186,7 +186,7 @@ public: DECL_LINK(ExecHdl, void *); }; -//------------------------------------------------------------------------- + MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : @@ -198,7 +198,7 @@ MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : { } -//------------------------------------------------------------------------- + IMPL_LINK( MaskData, PipetteHdl, ToolBox*, pTbx ) { @@ -210,7 +210,7 @@ IMPL_LINK( MaskData, PipetteHdl, ToolBox*, pTbx ) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) { @@ -246,7 +246,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK( MaskData, CbxTransHdl, CheckBox*, pCbx ) { @@ -309,7 +309,7 @@ IMPL_LINK( MaskData, CbxTransHdl, CheckBox*, pCbx ) return 0L; } -//------------------------------------------------------------------------- + IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb ) { @@ -322,7 +322,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb ) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG(MaskData, ExecHdl) { @@ -332,7 +332,7 @@ IMPL_LINK_NOARG(MaskData, ExecHdl) return 0L; } -//------------------------------------------------------------------------- + void ColorWindow::Paint( const Rectangle &/*Rect*/ ) { @@ -348,7 +348,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ ) SetFillColor( rOldFillColor ); } -//------------------------------------------------------------------------- + SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask, SfxBindings& rBindings ) : @@ -357,7 +357,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask, { } -//------------------------------------------------------------------------- + void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) @@ -372,7 +372,7 @@ void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState* } } -//------------------------------------------------------------------------- + SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, SfxBindings* pBindings, @@ -388,7 +388,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, pDlg->Initialize( pInfo ); } -//------------------------------------------------------------------------- + SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, SfxChildWindow *pCW, @@ -534,7 +534,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ ); } -//------------------------------------------------------------------------- + SvxBmpMask::~SvxBmpMask() { @@ -546,7 +546,7 @@ SvxBmpMask::~SvxBmpMask() delete pData; } -//------------------------------------------------------------------------- + /** is called by a MaskSet when it is selected */ void SvxBmpMask::onSelect( MaskSet* pSet ) @@ -565,7 +565,7 @@ void SvxBmpMask::onSelect( MaskSet* pSet ) pQSet4->SelectItem( 0 ); } -//------------------------------------------------------------------------- + bool SvxBmpMask::Close() { @@ -575,14 +575,14 @@ bool SvxBmpMask::Close() return SfxDockingWindow::Close(); } -//------------------------------------------------------------------------- + sal_Bool SvxBmpMask::NeedsColorList() const { return ( aLbColor1.GetEntryCount() == 0 ); } -//------------------------------------------------------------------------- + void SvxBmpMask::SetColorList( const XColorListRef &pList ) { @@ -613,7 +613,7 @@ void SvxBmpMask::SetColorList( const XColorListRef &pList ) } } -//------------------------------------------------------------------------- + void SvxBmpMask::SetColor( const Color& rColor ) { @@ -621,7 +621,7 @@ void SvxBmpMask::SetColor( const Color& rColor ) pCtlPipette->SetColor( aPipetteColor ); } -//------------------------------------------------------------------------- + void SvxBmpMask::PipetteClicked() { @@ -654,7 +654,7 @@ void SvxBmpMask::PipetteClicked() pData->PipetteHdl( &aTbxPipette ); } -//------------------------------------------------------------------------- + void SvxBmpMask::SetExecState( sal_Bool bEnable ) { @@ -666,7 +666,7 @@ void SvxBmpMask::SetExecState( sal_Bool bEnable ) aBtnExec.Disable(); } -//------------------------------------------------------------------------- + sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols ) { @@ -703,7 +703,7 @@ sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uI return nCount; } -//------------------------------------------------------------------------- + Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) { @@ -720,7 +720,7 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) return aBitmap; } -//------------------------------------------------------------------------- + BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& rColor, const long nTol ) { @@ -738,7 +738,7 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& return aBmpEx; } -//------------------------------------------------------------------------- + Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) { @@ -759,7 +759,7 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) return aAnimation; } -//------------------------------------------------------------------------- + GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) { @@ -1026,7 +1026,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) return aMtf; } -//------------------------------------------------------------------------- + BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color& rColor ) { @@ -1040,7 +1040,7 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color return rBmpEx; } -//------------------------------------------------------------------------- + Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor ) { @@ -1057,7 +1057,7 @@ Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Colo return aAnimation; } -//------------------------------------------------------------------------- + GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const Color& rColor ) { @@ -1091,7 +1091,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C return aMtf; } -//------------------------------------------------------------------------- + Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { @@ -1197,7 +1197,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) return aGraphic; } -//------------------------------------------------------------------------- + sal_Bool SvxBmpMask::IsEyedropping() const { diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index b47b53c2badb..2ac7ec8e83ab 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -47,7 +47,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCheckListBox(Window *pPa return new SvxCheckListBox(pParent, nWinStyle); } -// ----------------------------------------------------------------------- + SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) : @@ -57,7 +57,7 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) : Init_Impl(); } -// ----------------------------------------------------------------------- + SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId, const Image& rNormalStaticImage ) @@ -68,14 +68,14 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId, pCheckButton->aBmps[SV_BMP_STATICIMAGE] = rNormalStaticImage; } -// ----------------------------------------------------------------------- + SvxCheckListBox::~SvxCheckListBox() { delete pCheckButton; } -// ----------------------------------------------------------------------- + void SvxCheckListBox::Init_Impl() { @@ -83,7 +83,7 @@ void SvxCheckListBox::Init_Impl() EnableCheckButton( pCheckButton ); } -// ----------------------------------------------------------------------- + void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos, void* pUserData, @@ -93,7 +93,7 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos, eButtonKind ); } -// ----------------------------------------------------------------------- + void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos ) { @@ -101,7 +101,7 @@ void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos ) SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) ); } -// ----------------------------------------------------------------------- + void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect ) { @@ -109,7 +109,7 @@ void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect ) Select( GetEntry( nPos ), bSelect ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const { @@ -120,7 +120,7 @@ sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const return LISTBOX_ENTRY_NOTFOUND; } -// ----------------------------------------------------------------------- + OUString SvxCheckListBox::GetText( sal_uInt16 nPos ) const { @@ -131,7 +131,7 @@ OUString SvxCheckListBox::GetText( sal_uInt16 nPos ) const return OUString(); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const { @@ -146,7 +146,7 @@ sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const return nCheckCount; } -// ----------------------------------------------------------------------- + void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck ) { @@ -156,7 +156,7 @@ void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck ) SvButtonState( SV_BUTTON_UNCHECKED ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const { @@ -166,7 +166,7 @@ sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const return sal_False; } -// ----------------------------------------------------------------------- + void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData ) { @@ -180,7 +180,7 @@ void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData ) return pOld; } -// ----------------------------------------------------------------------- + void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const { @@ -190,7 +190,7 @@ void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const return NULL; } -// ----------------------------------------------------------------------- + void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) { @@ -203,7 +203,7 @@ void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) } } -// ----------------------------------------------------------------------- + void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -243,7 +243,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) SvTreeListBox::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) { @@ -265,7 +265,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvTreeListBox::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 0057afc771e3..04ac00b2f226 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -37,7 +37,7 @@ //============================================================================ // Local Defines and Function -//---------------------------------------------------------------------------- + static long nStaticTabs[]= { @@ -60,7 +60,7 @@ RedlinData::~RedlinData() //============================================================================ // class SvxRedlinEntry (Entries for list) -//---------------------------------------------------------------------------- + SvxRedlinEntry::SvxRedlinEntry() : SvTreeListEntry() @@ -125,7 +125,7 @@ void SvLBoxColorString::Paint( //============================================================================ // class SvxRedlinTable -//---------------------------------------------------------------------------- + SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent,nBits) @@ -390,7 +390,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, //============================================================================ // class SvxTPView -//---------------------------------------------------------------------------- + SvxTPView::SvxTPView(Window * pParent) : TabPage(pParent, "RedlineViewPage", "svx/ui/redlineviewpage.ui") @@ -551,7 +551,7 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) //============================================================================ // class SvxTPFilter -//---------------------------------------------------------------------------- + SvxTPFilter::SvxTPFilter( Window * pParent) : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui") @@ -1091,7 +1091,7 @@ IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef ) //============================================================================ // class SvxAcceptChgCtr -//---------------------------------------------------------------------------- + SvxAcceptChgCtr::SvxAcceptChgCtr(Window* pParent) : TabControl(pParent, WB_TABSTOP | WB_DIALOGCONTROL) diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index f7e7c1bfc304..7f2aa04ce3ce 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -26,7 +26,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> -// ----------------------------------------------------------------------- + FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 6b83afb9cb26..87c76972d374 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -85,7 +85,7 @@ void Cell::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ) } } -// ---------------------------------------------------------------------------- + void lclRecalcCoordVec( LongVec& rCoords, const LongVec& rSizes ) @@ -112,7 +112,7 @@ void lclSetMergedRange( CellVec& rCells, size_t nWidth, size_t nFirstCol, size_t rCells[ nFirstRow * nWidth + nFirstCol ].mbMergeOrig = true; } -// ---------------------------------------------------------------------------- + static const Style OBJ_STYLE_NONE; static const Cell OBJ_CELL_NONE; @@ -356,7 +356,7 @@ private: size_t mnRow; }; -// ---------------------------------------------------------------------------- + MergedCellIterator::MergedCellIterator( const Array& rArray, size_t nCol, size_t nRow ) { @@ -386,13 +386,13 @@ MergedCellIterator& MergedCellIterator::operator++() #define DBG_FRAME_CHECK_COL_1( col, funcname ) DBG_FRAME_CHECK( (col) <= GetColCount(), funcname, "invalid column index" ) #define DBG_FRAME_CHECK_ROW_1( row, funcname ) DBG_FRAME_CHECK( (row) <= GetRowCount(), funcname, "invalid row index" ) -// ---------------------------------------------------------------------------- + #define CELL( col, row ) mxImpl->GetCell( col, row ) #define CELLACC( col, row ) mxImpl->GetCellAcc( col, row ) #define ORIGCELL( col, row ) mxImpl->GetMergedOriginCell( col, row ) -// ---------------------------------------------------------------------------- + Array::Array() { @@ -1336,13 +1336,13 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const DrawRange( rDev, 0, 0, mxImpl->mnWidth - 1, mxImpl->mnHeight - 1, pForceColor ); } -// ---------------------------------------------------------------------------- + #undef ORIGCELL #undef CELLACC #undef CELL -// ---------------------------------------------------------------------------- + #undef DBG_FRAME_CHECK_ROW_1 #undef DBG_FRAME_CHECK_COL_1 diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index b0769c9131b8..07a7c4a1c7ca 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -29,9 +29,9 @@ #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> -// -------------------- + // - SvxGraphicFilter - -// -------------------- + sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) { @@ -281,7 +281,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj return nRet; } -// ----------------------------------------------------------------------------- + void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) { diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 9b2032248e64..9b90df4cdc9f 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -112,28 +112,28 @@ sal_uInt16* SvxHeaderPage::GetRanges() return pRanges; } -//------------------------------------------------------------------------ + SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxHeaderPage( pParent, rSet ); } -//------------------------------------------------------------------------ + sal_uInt16* SvxFooterPage::GetRanges() { return pRanges; } -// ----------------------------------------------------------------------- + SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxFooterPage( pParent, rSet ); } -// ----------------------------------------------------------------------- + SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) : @@ -142,7 +142,7 @@ SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) : { } -// ----------------------------------------------------------------------- + SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : @@ -151,7 +151,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : { } -// ----------------------------------------------------------------------- + SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : @@ -206,14 +206,14 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId SetFieldUnit( *m_pRMEdit, eFUnit ); } -// ----------------------------------------------------------------------- + SvxHFPage::~SvxHFPage() { delete pBBSet; } -// ----------------------------------------------------------------------- + sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) { @@ -248,7 +248,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) SfxMapUnit eUnit = pPool->GetMetric( nWSize ); SfxItemSet aSet ( *pPool, aWhichTab ); - //-------------------------------------------------------------------- + aSet.Put( SfxBoolItem( nWOn, m_pTurnOnBox->IsChecked() ) ); aSet.Put( SfxBoolItem( nWDynamic, m_pHeightDynBtn->IsChecked() ) ); @@ -318,7 +318,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) return sal_True; } -// ----------------------------------------------------------------------- + void SvxHFPage::Reset( const SfxItemSet& rSet ) { ActivatePage( rSet ); @@ -570,7 +570,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) if ( svx::ShowBorderBackgroundDlg( this, pBBSet, bEnableBackgroundSelector ) ) { - //---------------------------------------------------------------- + sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH ); @@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) m_pBspWin->SetFtColor( rItem.GetColor() ); } - //---------------------------------------------------------------- + nWhich = GetWhich( SID_ATTR_BORDER_OUTER ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index bd024f4a9585..ae705862eedd 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -140,7 +140,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar return pListBox; } -//------------------------------------------------------------------------ + void SvxLanguageBox::Init() { m_pLangTable = new SvtLanguageTable; @@ -175,7 +175,7 @@ void SvxLanguageBox::Init() m_nLangList = LANG_LIST_ALL; } } -//------------------------------------------------------------------------ + SvxLanguageBox::~SvxLanguageBox() { @@ -183,7 +183,7 @@ SvxLanguageBox::~SvxLanguageBox() delete m_pLangTable; } -//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_uInt16 nPos, bool bChecked ) { @@ -195,7 +195,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_uInt1 return nRet; } -//------------------------------------------------------------------------ + void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList, sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail ) @@ -318,14 +318,14 @@ void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList, } } -//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos ) { return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); } -//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType ) { @@ -381,21 +381,21 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal return nAt; } -//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos ) { return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType ); } -//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::InsertSystemLanguage( sal_uInt16 nPos ) { return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); } -//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_Bool bCheckEntry, sal_uInt16 nPos ) @@ -421,7 +421,7 @@ sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, return nAt; } -//------------------------------------------------------------------------ + void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType ) { @@ -431,7 +431,7 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType ) RemoveEntry( nAt ); } -//------------------------------------------------------------------------ + LanguageType SvxLanguageBox::GetSelectLanguage() const { @@ -443,7 +443,7 @@ LanguageType SvxLanguageBox::GetSelectLanguage() const return LanguageType( LANGUAGE_DONTKNOW ); } -//------------------------------------------------------------------------ + void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect ) { @@ -460,7 +460,7 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSel SelectEntryPos( nAt, bSelect ); } -//------------------------------------------------------------------------ + sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index f32e662e09ef..539fc65499f4 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -182,14 +182,14 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); } -//------------------------------------------------------------------------ + SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxGridTabPage( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ + sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) { @@ -216,7 +216,7 @@ sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) return bAttrModified; } -//------------------------------------------------------------------------ + void SvxGridTabPage::Reset( const SfxItemSet& rSet ) { @@ -295,7 +295,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) FillItemSet( *_pSet ); return( LEAVE_PAGE ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) { bAttrModified = sal_True; @@ -308,7 +308,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) } return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl) { @@ -320,7 +320,7 @@ IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) { @@ -334,7 +334,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) } return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl) { diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index be2986331e6d..14ffd752a4d8 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -52,7 +52,7 @@ struct OrientationHelper_Impl DECL_LINK( ClickHdl, void* ); }; -// ---------------------------------------------------------------------------- + OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox& rCbStacked ) : mrCtrlDial( rCtrlDial ), diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index eaf6ffb7cff3..c10815dd8bf5 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -98,7 +98,7 @@ SvxPageWindow::SvxPageWindow( Window* pParent ) : SetBackground(); } -// ----------------------------------------------------------------------- + SvxPageWindow::~SvxPageWindow() { @@ -113,7 +113,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pPare } -// ----------------------------------------------------------------------- + void SvxPageWindow::Paint( const Rectangle& ) { @@ -167,7 +167,7 @@ void SvxPageWindow::Paint( const Rectangle& ) } } -// ----------------------------------------------------------------------- + void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -353,7 +353,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s } } -// ----------------------------------------------------------------------- + void SvxPageWindow::SetBorder( const SvxBoxItem& rNew ) { @@ -361,7 +361,7 @@ void SvxPageWindow::SetBorder( const SvxBoxItem& rNew ) pImpl->pBorder = new SvxBoxItem( rNew ); } -// ----------------------------------------------------------------------- + void SvxPageWindow::SetBitmap( Bitmap* pBmp ) { @@ -374,14 +374,14 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp ) pImpl->bBitmap = false; } -// ----------------------------------------------------------------------- + void SvxPageWindow::SetHdBorder( const SvxBoxItem& rNew ) { delete pHdBorder; pHdBorder = new SvxBoxItem( rNew ); } -// ----------------------------------------------------------------------- + void SvxPageWindow::SetFtBorder( const SvxBoxItem& rNew ) { diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 1a0cb57875e9..e05f029f1d52 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -57,14 +57,14 @@ Size SvxParaPrevWindow::GetOptimalSize() const return getParagraphPreviewOptimalSize(this); } -// ----------------------------------------------------------------------- + void SvxParaPrevWindow::Paint( const Rectangle& ) { DrawParagraph( sal_True ); } -// ----------------------------------------------------------------------- + #define DEF_MARGIN 120 diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 25b2314a4388..9c84e195ada8 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -55,7 +55,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl) { @@ -72,7 +72,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl) return 0; } -// ----------------------------------------------------------------------- + SvxPasswordDialog::SvxPasswordDialog(Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") @@ -100,13 +100,13 @@ SvxPasswordDialog::SvxPasswordDialog(Window* pParent, sal_Bool bAllowEmptyPasswo } } -// ----------------------------------------------------------------------- + SvxPasswordDialog::~SvxPasswordDialog() { } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 37a68e8e2eeb..0ada39affbb4 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -20,7 +20,7 @@ #include "svx/relfld.hxx" #include "vcl/builder.hxx" -// ----------------------------------------------------------------------- + SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits) : MetricField( pParent, nBits) @@ -42,7 +42,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRelativeField(Window *pP { return new SvxRelativeField(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP); } -// ----------------------------------------------------------------------- + void SvxRelativeField::Modify() { @@ -81,7 +81,7 @@ void SvxRelativeField::Modify() } } -// ----------------------------------------------------------------------- + void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep ) @@ -93,7 +93,7 @@ void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, SetUnit( FUNIT_CM ); } -// ----------------------------------------------------------------------- + void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 2bcd6b9d9c2c..04c0c8f57f64 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -123,16 +123,16 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1 virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException); }; -//----------------------------------------------------------------------------- + SvxRubyData_Impl::SvxRubyData_Impl() : bHasSelectionChanged(false) { } -//----------------------------------------------------------------------------- + SvxRubyData_Impl::~SvxRubyData_Impl() { } -//----------------------------------------------------------------------------- + void SvxRubyData_Impl::SetController(Reference<XController> xCtrl) { if(xCtrl.get() != xController.get()) @@ -154,12 +154,12 @@ void SvxRubyData_Impl::SetController(Reference<XController> xCtrl) } } } -//----------------------------------------------------------------------------- + void SvxRubyData_Impl::selectionChanged( const EventObject& ) throw (RuntimeException) { bHasSelectionChanged = true; } -//----------------------------------------------------------------------------- + void SvxRubyData_Impl::disposing( const EventObject&) throw (RuntimeException) { try @@ -173,7 +173,7 @@ void SvxRubyData_Impl::disposing( const EventObject&) throw (RuntimeException) } xController = 0; } -//----------------------------------------------------------------------------- + void SvxRubyData_Impl::AssertOneEntry() { //create one entry @@ -400,7 +400,7 @@ void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) rLeft.SaveValue(); rRight.SaveValue(); } -//----------------------------------------------------------------------------- + void SvxRubyDialog::GetRubyText() { long nTempLastPos = GetLastPos(); @@ -425,7 +425,7 @@ void SvxRubyDialog::GetRubyText() } } } -//----------------------------------------------------------------------------- + void SvxRubyDialog::Update() { const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); @@ -715,7 +715,7 @@ void SvxRubyDialog::AssertOneEntry() pImpl->AssertOneEntry(); } -// ---------------------------------------------------------------------------- + void SvxRubyDialog::UpdateColors( void ) { @@ -737,7 +737,7 @@ void SvxRubyDialog::UpdateColors( void ) } } -// ---------------------------------------------------------------------------- + void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 2e4254136841..479a165ef287 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -40,7 +40,7 @@ SvxSearchController::SvxSearchController { } -// ----------------------------------------------------------------------- + void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 43465e18ffc5..8c490febd7cd 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star::accessibility; using namespace com::sun::star; using namespace comphelper; -// ----------------------------------------------------------------------- + #define REMEMBER_SIZE 10 @@ -163,14 +163,14 @@ SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) : (*this)[i].pItem = (*this)[i].pItem->Clone(); } -// ----------------------------------------------------------------------- + SearchAttrItemList::~SearchAttrItemList() { Clear(); } -// ----------------------------------------------------------------------- + void SearchAttrItemList::Put( const SfxItemSet& rSet ) { @@ -206,7 +206,7 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) { @@ -220,7 +220,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) return rSet; } -// ----------------------------------------------------------------------- + void SearchAttrItemList::Clear() { @@ -230,7 +230,7 @@ void SearchAttrItemList::Clear() SrchAttrItemList::clear(); } -// ----------------------------------------------------------------------- + // Deletes the pointer to the items void SearchAttrItemList::Remove(size_t nPos, size_t nLen) @@ -341,7 +341,7 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, Sf Construct_Impl(); } -// ----------------------------------------------------------------------- + SvxSearchDialog::~SvxSearchDialog() { @@ -492,7 +492,7 @@ void SvxSearchDialog::Construct_Impl() } } -// ----------------------------------------------------------------------- + bool SvxSearchDialog::Close() { @@ -521,7 +521,7 @@ bool SvxSearchDialog::Close() return true; } -// ----------------------------------------------------------------------- + sal_Int32 SvxSearchDialog::GetTransliterationFlags() const { @@ -541,7 +541,7 @@ void SvxSearchDialog::SetSaveToModule(bool b) pImpl->bSaveToModule = b; } -// ----------------------------------------------------------------------- + void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) { @@ -552,7 +552,7 @@ void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) m_pJapMatchFullHalfWidthCB->Check( !bVal ); } -// ----------------------------------------------------------------------- + void SvxSearchDialog::Activate() { @@ -565,7 +565,7 @@ void SvxSearchDialog::Activate() } } -// ----------------------------------------------------------------------- + void SvxSearchDialog::InitControls_Impl() { @@ -688,7 +688,7 @@ void SvxSearchDialog::ShowOptionalControls_Impl() } } -// ----------------------------------------------------------------------- + namespace { @@ -990,7 +990,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) } } -// ----------------------------------------------------------------------- + void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, const SfxItemSet* pRSet ) @@ -1050,7 +1050,7 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, } } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) { @@ -1170,7 +1170,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { @@ -1335,7 +1335,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) { @@ -1377,7 +1377,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) { @@ -1465,7 +1465,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch ) { @@ -1494,7 +1494,7 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch ) pListBox->InsertEntry(rStr, 0); } -// ----------------------------------------------------------------------- + void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) { @@ -1534,7 +1534,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) } } -// ----------------------------------------------------------------------- + void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) { @@ -1650,7 +1650,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) ( !pSearchList || !pSearchList->Count() ) ); } -// ----------------------------------------------------------------------- + void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) { @@ -1740,7 +1740,7 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) } } -// ----------------------------------------------------------------------- + void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) { @@ -1753,7 +1753,7 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) } } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) { @@ -1814,7 +1814,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl) { @@ -1822,7 +1822,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) { @@ -1918,7 +1918,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) { @@ -1959,7 +1959,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl) { @@ -1978,7 +1978,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) { @@ -1999,7 +1999,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) return 0; } -// ----------------------------------------------------------------------- + OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, sal_Bool bSrchFlag ) const @@ -2070,7 +2070,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, return rStr; } -// ----------------------------------------------------------------------- + void SvxSearchDialog::PaintAttrText_Impl() { @@ -2092,7 +2092,7 @@ void SvxSearchDialog::PaintAttrText_Impl() } } -// ----------------------------------------------------------------------- + void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) { @@ -2130,7 +2130,7 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) nModifyFlag |= MODIFY_ALLTABLES; } -// ----------------------------------------------------------------------- + void SvxSearchDialog::SaveToModule_Impl() { @@ -2208,7 +2208,7 @@ void SvxSearchDialog::SaveToModule_Impl() SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG); -// ----------------------------------------------------------------------- + SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, @@ -2236,7 +2236,7 @@ SvxSearchDialog *SvxSearchDialogWrapper::getDialog () return dialog; } -// ----------------------------------------------------------------------- + SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const { diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 40a1390ad2cf..f850b443d061 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -35,7 +35,7 @@ short SvxStandardDialog::Execute() return nRet; } -// ----------------------------------------------------------------------- + SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId ) : SfxModalDialog( pParent, rResId ) @@ -47,7 +47,7 @@ SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const { } -// ----------------------------------------------------------------------- + SvxStandardDialog::~SvxStandardDialog() { diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index bfa69a5f6352..144ca2b378da 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -23,7 +23,7 @@ #include <svx/dialmgr.hxx> #include <svx/strarray.hxx> -//------------------------------------------------------------------------ + SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : @@ -32,7 +32,7 @@ SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : { } -//------------------------------------------------------------------------ + SvxStringArray::SvxStringArray( const ResId& rResId ) : ResStringArray( rResId ) @@ -40,13 +40,13 @@ SvxStringArray::SvxStringArray( const ResId& rResId ) : } -//------------------------------------------------------------------------ + SvxStringArray::~SvxStringArray() { } -//------------------------------------------------------------------------ + const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const { diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 2308b0f492e6..e7e8aae81114 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -58,14 +58,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxTextEncodingBox(Window * return pListBox; } -//------------------------------------------------------------------------ + SvxTextEncodingBox::~SvxTextEncodingBox() { delete m_pEncTable; } -//------------------------------------------------------------------------ + sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const { @@ -78,7 +78,7 @@ sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const return LISTBOX_ENTRY_NOTFOUND; } -//------------------------------------------------------------------------ + void SvxTextEncodingBox::FillFromTextEncodingTable( sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, @@ -128,7 +128,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( } } -//------------------------------------------------------------------------ + void SvxTextEncodingBox::FillFromDbTextEncodingMap( sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, @@ -189,7 +189,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( #endif } -//------------------------------------------------------------------------ + void SvxTextEncodingBox::FillWithMimeAndSelectBest() { @@ -198,7 +198,7 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() SelectTextEncoding( nEnc ); } -//------------------------------------------------------------------------ + void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, const OUString& rEntry, sal_uInt16 nPos ) @@ -207,7 +207,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc ); } -//------------------------------------------------------------------------ + void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos ) { @@ -218,7 +218,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI SAL_WARN( "svx.dialog", "SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) ); } -//------------------------------------------------------------------------ + rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { @@ -230,7 +230,7 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const return RTL_TEXTENCODING_DONTKNOW; } -//------------------------------------------------------------------------ + void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect ) { diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 8a36e72eccc1..a2de927cac1d 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -23,7 +23,7 @@ #include "svx/txenctab.hxx" #include <tools/shl.hxx> -//------------------------------------------------------------------------ + SvxTextEncodingTable::SvxTextEncodingTable() : @@ -31,13 +31,13 @@ SvxTextEncodingTable::SvxTextEncodingTable() { } -//------------------------------------------------------------------------ + SvxTextEncodingTable::~SvxTextEncodingTable() { } -//------------------------------------------------------------------------ + const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const { @@ -49,7 +49,7 @@ const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc return OUString(); } -//------------------------------------------------------------------------ + rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const { diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 57cadf6c009f..d659b7eb7baf 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -430,7 +430,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnSpecularColor.SetAccessibleRelationMemberOf(&aFLMatSpecular); } -// ----------------------------------------------------------------------- + Svx3DWin::~Svx3DWin() { delete p3DView; @@ -446,7 +446,7 @@ Svx3DWin::~Svx3DWin() delete mpImpl; } -// ----------------------------------------------------------------------- + void Svx3DWin::Construct() { aBtnGeo.Check(); @@ -455,7 +455,7 @@ void Svx3DWin::Construct() aCtlLightPreview.Hide(); } -// ----------------------------------------------------------------------- + void Svx3DWin::Reset() { // Various initializations, default is AllAttributes @@ -480,7 +480,7 @@ void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState ) aBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff ); } -// ----------------------------------------------------------------------- + void Svx3DWin::Update( SfxItemSet& rAttrs ) { // remember 2d attributes @@ -1708,7 +1708,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnLatheObject.Enable(pConvertTo3DLatheItem->GetState()); } -// ----------------------------------------------------------------------- + void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) { // get remembered 2d attributes from the dialog @@ -2218,7 +2218,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY); } -// ----------------------------------------------------------------------- + void Svx3DWin::Resize() { if ( !IsFloatingMode() || @@ -2311,7 +2311,7 @@ void Svx3DWin::Resize() SfxDockingWindow::Resize(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) { bUpdate = !aBtnUpdate.IsChecked(); @@ -2335,7 +2335,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); @@ -2349,7 +2349,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) { @@ -2612,7 +2612,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { bool bUpdatePreview = false; @@ -2771,7 +2771,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn ) { @@ -2801,7 +2801,7 @@ IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) { if( p ) @@ -2903,7 +2903,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField ) { if( pField ) @@ -2934,7 +2934,7 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField ) return( 0L ); } -// ----------------------------------------------------------------------- + void Svx3DWin::ClickLight(PushButton& rBtn) { @@ -2962,7 +2962,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) aCtlLightPreview.CheckSelection(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) { @@ -2970,7 +2970,7 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) { @@ -3041,10 +3041,10 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) return( 0L ); } -// ----------------------------------------------------------------------- + // Method to ensure that the LB is also associated with a color // returns true if color was added -// ----------------------------------------------------------------------- + sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) { sal_Bool bRet = sal_False; @@ -3070,7 +3070,7 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) return( bRet ); } -// ----------------------------------------------------------------------- + void Svx3DWin::UpdatePreview() { if( pModel == NULL ) @@ -3107,7 +3107,7 @@ void Svx3DWin::DocumentReload() mpRemember2DAttributes = 0L; } -// ----------------------------------------------------------------------- + void Svx3DWin::InitColorLB( const SdrModel* pDoc ) { aLbLight1.Fill( pDoc->GetColorList() ); @@ -3140,7 +3140,7 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc ) aLbMatSpecular.SelectEntry( aColWhite ); } -// ----------------------------------------------------------------------- + sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) { sal_uInt16 nLight = 8; @@ -3186,7 +3186,7 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) return( nLight ); }; -// ----------------------------------------------------------------------- + ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) { ColorLB* pLb = NULL; @@ -3254,7 +3254,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, { } -// ----------------------------------------------------------------------- + void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/, SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ ) { diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index ff0e74f6584e..b36d6e6557d9 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -46,7 +46,7 @@ namespace svx //==================================================================== //= OColumnTransferable //==================================================================== - //-------------------------------------------------------------------- + OColumnTransferable::OColumnTransferable(const OUString& _rDatasource ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType @@ -58,7 +58,7 @@ namespace svx implConstruct(_rDatasource,_rConnectionResource,_nCommandType, _rCommand, _rFieldName); } - //-------------------------------------------------------------------- + OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, sal_Int32 _nFormats ) :m_nFormatFlags(_nFormats) { @@ -86,7 +86,7 @@ namespace svx } } - //-------------------------------------------------------------------- + OColumnTransferable::OColumnTransferable(const Reference< XPropertySet >& _rxForm, const OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn, const Reference< XConnection >& _rxConnection, sal_Int32 _nFormats) @@ -152,7 +152,7 @@ namespace svx } } - //-------------------------------------------------------------------- + sal_uInt32 OColumnTransferable::getDescriptorFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -164,7 +164,7 @@ namespace svx return s_nFormat; } - //-------------------------------------------------------------------- + void OColumnTransferable::implConstruct( const OUString& _rDatasource ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType @@ -210,7 +210,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void OColumnTransferable::AddSupportedFormats() { if (CTF_CONTROL_EXCHANGE & m_nFormatFlags) @@ -223,7 +223,7 @@ namespace svx AddFormat(getDescriptorFormatId()); } - //-------------------------------------------------------------------- + sal_Bool OColumnTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); @@ -239,7 +239,7 @@ namespace svx return sal_False; } - //-------------------------------------------------------------------- + sal_Bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats) { sal_Bool bFieldFormat = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR); @@ -261,7 +261,7 @@ namespace svx return sal_False; } - //-------------------------------------------------------------------- + ODataAccessDescriptor OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData) { if (_rData.HasFormat(getDescriptorFormatId())) @@ -312,7 +312,7 @@ namespace svx return aDescriptor; } - //-------------------------------------------------------------------- + sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData ,OUString& _rDatasource ,OUString& _rDatabaseLocation @@ -358,7 +358,7 @@ namespace svx return sal_True; } - //-------------------------------------------------------------------- + void OColumnTransferable::addDataToContainer( TransferDataContainer* _pContainer ) { OSL_ENSURE( _pContainer, "OColumnTransferable::addDataToContainer: invalid container!" ); @@ -392,7 +392,7 @@ namespace svx { construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand); } - //-------------------------------------------------------------------- + ODataAccessObjectTransferable::ODataAccessObjectTransferable( const OUString& _rDatasource ,const OUString& _rConnectionResource @@ -404,7 +404,7 @@ namespace svx construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,_rxConnection,(CommandType::COMMAND == _nCommandType),_rCommand); } - // ----------------------------------------------------------------------------- + ODataAccessObjectTransferable::ODataAccessObjectTransferable(const Reference< XPropertySet >& _rxLivingForm) { // collect some properties of the form @@ -446,7 +446,7 @@ namespace svx ,sCompleteStatement); } - // ----------------------------------------------------------------------------- + void ODataAccessObjectTransferable::AddSupportedFormats() { sal_Int32 nObjectType = CommandType::COMMAND; @@ -468,7 +468,7 @@ namespace svx AddFormat(SOT_FORMATSTR_ID_SBA_DATAEXCHANGE); } - // ----------------------------------------------------------------------------- + sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor ) { sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor); @@ -485,7 +485,7 @@ namespace svx return sal_False; } - // ----------------------------------------------------------------------------- + sal_Bool ODataAccessObjectTransferable::canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors) { for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); @@ -503,7 +503,7 @@ namespace svx return sal_False; } - // ----------------------------------------------------------------------------- + ODataAccessDescriptor ODataAccessObjectTransferable::extractObjectDescriptor(const TransferableDataHelper& _rData) { sal_Int32 nKnownFormatId = 0; @@ -542,7 +542,7 @@ namespace svx return ODataAccessDescriptor(); } - // ----------------------------------------------------------------------------- + void ODataAccessObjectTransferable::addCompatibleSelectionDescription( const Sequence< Any >& _rSelRows ) { const sal_Unicode cSeparator(11); @@ -560,12 +560,12 @@ namespace svx } } - // ----------------------------------------------------------------------------- + void ODataAccessObjectTransferable::ObjectReleased() { m_aDescriptor.clear(); } - // ----------------------------------------------------------------------------- + void ODataAccessObjectTransferable::construct( const OUString& _rDatasource ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType @@ -623,11 +623,11 @@ namespace svx m_sCompatibleObjectDescription += sSeparator; } - //-------------------------------------------------------------------- + OMultiColumnTransferable::OMultiColumnTransferable(const Sequence< PropertyValue >& _aDescriptors) : m_aDescriptors(_aDescriptors) { } - //-------------------------------------------------------------------- + sal_uInt32 OMultiColumnTransferable::getDescriptorFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -638,12 +638,12 @@ namespace svx } return s_nFormat; } - //-------------------------------------------------------------------- + void OMultiColumnTransferable::AddSupportedFormats() { AddFormat(getDescriptorFormatId()); } - //-------------------------------------------------------------------- + sal_Bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); @@ -655,7 +655,7 @@ namespace svx return sal_False; } - //-------------------------------------------------------------------- + sal_Bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors) { DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); @@ -668,7 +668,7 @@ namespace svx return aCheck == _rFlavors.end(); } - //-------------------------------------------------------------------- + Sequence< PropertyValue > OMultiColumnTransferable::extractDescriptor(const TransferableDataHelper& _rData) { Sequence< PropertyValue > aList; @@ -686,7 +686,7 @@ namespace svx } // if (_rData.HasFormat(getDescriptorFormatId())) return aList; } - // ----------------------------------------------------------------------------- + void OMultiColumnTransferable::ObjectReleased() { m_aDescriptors.realloc(0); diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 2d5be88f04b0..815a1a2a1542 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -46,7 +46,7 @@ namespace svx //==================================================================== //= OComponentTransferable //==================================================================== - //-------------------------------------------------------------------- + OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation ,const Reference< XContent>& _xContent) { @@ -55,7 +55,7 @@ namespace svx } - //-------------------------------------------------------------------- + sal_uInt32 OComponentTransferable::getDescriptorFormatId(sal_Bool _bExtractForm) { static sal_uInt32 s_nReportFormat = (sal_uInt32)-1; @@ -73,7 +73,7 @@ namespace svx return _bExtractForm ? s_nFormFormat : s_nReportFormat; } - //-------------------------------------------------------------------- + void OComponentTransferable::AddSupportedFormats() { sal_Bool bForm = sal_True; @@ -89,7 +89,7 @@ namespace svx AddFormat(getDescriptorFormatId(bForm)); } - //-------------------------------------------------------------------- + sal_Bool OComponentTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); @@ -99,7 +99,7 @@ namespace svx return sal_False; } - //-------------------------------------------------------------------- + sal_Bool OComponentTransferable::canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors,sal_Bool _bForm ) { DataFlavorExVector::const_iterator aEnd = _rFlavors.end(); @@ -115,7 +115,7 @@ namespace svx return sal_False; } - //-------------------------------------------------------------------- + ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData) { sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(sal_True)); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index f0404f09d287..659739661a3d 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -78,7 +78,7 @@ using ::com::sun::star::sdb::XRowSetSupplier; using ::com::sun::star::awt::XVclWindowPeer; -//------------------------------------------------------------------ + ::com::sun::star::awt::FontDescriptor ImplCreateFontDescriptor( const Font& rFont ) { ::com::sun::star::awt::FontDescriptor aFD; @@ -101,7 +101,7 @@ using ::com::sun::star::awt::XVclWindowPeer; return aFD; } -//------------------------------------------------------------------ + Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr ) { Font aFont; @@ -125,14 +125,14 @@ Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr ) //================================================================== //= FmXModifyMultiplexer //================================================================== -//------------------------------------------------------------------ + FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) { } -//------------------------------------------------------------------ + Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn; @@ -147,12 +147,12 @@ Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (Run return aReturn; } -//------------------------------------------------------------------ + void FmXModifyMultiplexer::disposing(const EventObject& ) throw( RuntimeException ) { } -//------------------------------------------------------------------ + void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeException ) { EventObject aMulti( e); @@ -163,14 +163,14 @@ void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeExceptio //================================================================== //= FmXUpdateMultiplexer //================================================================== -//------------------------------------------------------------------ + FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) { } -//------------------------------------------------------------------ + Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn; @@ -185,12 +185,12 @@ Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (Run return aReturn; } -//------------------------------------------------------------------ + void FmXUpdateMultiplexer::disposing(const EventObject& ) throw( RuntimeException ) { } -//------------------------------------------------------------------ + sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( RuntimeException ) { EventObject aMulti( e ); @@ -207,7 +207,7 @@ sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( Runtim return bResult; } -//------------------------------------------------------------------ + void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException ) { EventObject aMulti( e ); @@ -219,14 +219,14 @@ void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException //================================================================== //= FmXSelectionMultiplexer //================================================================== -//------------------------------------------------------------------ + FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) { } -//------------------------------------------------------------------ + Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn; @@ -241,12 +241,12 @@ Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw ( return aReturn; } -//------------------------------------------------------------------ + void FmXSelectionMultiplexer::disposing(const EventObject& ) throw( RuntimeException ) { } -//------------------------------------------------------------------ + void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEvent ) throw (RuntimeException) { EventObject aMulti(_rEvent); @@ -257,14 +257,14 @@ void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEv //================================================================== //= FmXContainerMultiplexer //================================================================== -//------------------------------------------------------------------ + FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) { } -//------------------------------------------------------------------ + Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn; @@ -279,11 +279,11 @@ Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw ( return aReturn; } -//------------------------------------------------------------------ + void FmXContainerMultiplexer::disposing(const EventObject& ) throw( RuntimeException ) { } -//------------------------------------------------------------------ + void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( RuntimeException ) { ContainerEvent aMulti( e ); @@ -291,7 +291,7 @@ void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( Ru notifyEach( &XContainerListener::elementInserted, aMulti ); } -//------------------------------------------------------------------ + void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( RuntimeException ) { ContainerEvent aMulti( e ); @@ -300,7 +300,7 @@ void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( Run } -//------------------------------------------------------------------ + void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( RuntimeException ) { ContainerEvent aMulti( e ); @@ -311,14 +311,14 @@ void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( Ru //================================================================== //= FmXGridControlMultiplexer //================================================================== -//------------------------------------------------------------------ + FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex ) :OWeakSubObject( rSource ) ,OInterfaceContainerHelper( _rMutex ) { } -//------------------------------------------------------------------ + Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn; @@ -332,12 +332,12 @@ Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw return aReturn; } -//------------------------------------------------------------------ + void FmXGridControlMultiplexer::disposing( const EventObject& ) throw( RuntimeException ) { } -//------------------------------------------------------------------ + void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _event ) throw (RuntimeException) { EventObject aForwardedEvent( _event ); @@ -349,13 +349,13 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even //= FmXGridControl //================================================================== -//------------------------------------------------------------------ + Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) { return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) )); } DBG_NAME(FmXGridControl ) -//------------------------------------------------------------------------------ + FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext) :UnoControl() ,m_aModifyListeners(*this, GetMutex()) @@ -370,13 +370,13 @@ FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext) DBG_CTOR(FmXGridControl ,NULL); } -//------------------------------------------------------------------------------ + FmXGridControl::~FmXGridControl() { DBG_DTOR(FmXGridControl ,NULL); } -//------------------------------------------------------------------ + Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (RuntimeException) { Any aReturn = FmXGridControl_BASE::queryInterface(_rType); @@ -386,13 +386,13 @@ Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (Runtime return aReturn; } -//------------------------------------------------------------------ + Sequence< Type> SAL_CALL FmXGridControl::getTypes( ) throw(RuntimeException) { return comphelper::concatSequences(UnoControl::getTypes(),FmXGridControl_BASE::getTypes()); } -//------------------------------------------------------------------ + Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId* pId = 0; @@ -427,7 +427,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw() return aServiceNames; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -441,14 +441,14 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) UnoControl::dispose(); } -//------------------------------------------------------------------------------ + OUString FmXGridControl::GetComponentServiceName() { OUString aName("DBGrid"); return aName; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::awt::XControlModel >& rModel) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -465,7 +465,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::aw return sal_True; } -//------------------------------------------------------------------------------ + FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) { FmXGridPeer* pReturn = new FmXGridPeer(m_xContext); @@ -490,7 +490,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) return pReturn; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit >& /*rToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer >& rParentPeer) throw( RuntimeException ) { if ( !mxModel.is() ) @@ -647,7 +647,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: } } -//------------------------------------------------------------------------------ + void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException ) { m_aModifyListeners.addInterface( l ); @@ -658,7 +658,7 @@ void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util:: } } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException) { SolarMutexGuard aGuard; @@ -666,7 +666,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega return xPeer->select(_rSelection); } -//------------------------------------------------------------------------------ + Any SAL_CALL FmXGridControl::getSelection( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -674,7 +674,7 @@ Any SAL_CALL FmXGridControl::getSelection( ) throw (RuntimeException) return xPeer->getSelection(); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException) { m_aSelectionListeners.addInterface( _rxListener ); @@ -685,7 +685,7 @@ void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSele } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException) { if( getPeer().is() && 1 == m_aSelectionListeners.getLength() ) @@ -696,7 +696,7 @@ void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XS m_aSelectionListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------------------ + Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType ) throw(RuntimeException) { if (getPeer().is()) @@ -709,7 +709,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xT return Sequence<sal_Bool>(); } -//------------------------------------------------------------------------------ + Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException) { if (getPeer().is()) @@ -722,7 +722,7 @@ Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const T return Sequence< Any>(); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException ) { if( getPeer().is() && m_aModifyListeners.getLength() == 1 ) @@ -733,7 +733,7 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun:: m_aModifyListeners.removeInterface( l ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -742,7 +742,7 @@ void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeExc m_bInDraw = sal_False; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeException ) { ::com::sun::star::util::ModeChangeEvent aModeChangeEvent; @@ -794,7 +794,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio } // XBoundComponent -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException ) { m_aUpdateListeners.addInterface( l ); @@ -805,7 +805,7 @@ void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException ) { if( getPeer().is() && m_aUpdateListeners.getLength() == 1 ) @@ -816,7 +816,7 @@ void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListe m_aUpdateListeners.removeInterface( l ); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException ) { Reference< XBoundComponent > xBound(getPeer(), UNO_QUERY); @@ -827,7 +827,7 @@ sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException ) } // XContainer -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException ) { m_aContainerListeners.addInterface( l ); @@ -838,7 +838,7 @@ void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerLi } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException ) { if( getPeer().is() && m_aContainerListeners.getLength() == 1 ) @@ -849,7 +849,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine m_aContainerListeners.removeInterface( l ); } -//------------------------------------------------------------------------------ + Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); @@ -859,7 +859,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryD return Reference< ::com::sun::star::frame::XDispatch > (); } -//------------------------------------------------------------------------------ + Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); @@ -869,7 +869,7 @@ Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridCont return Sequence< Reference< ::com::sun::star::frame::XDispatch > >(); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); @@ -877,7 +877,7 @@ void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Referenc xPeerInterception->registerDispatchProviderInterceptor(_xInterceptor); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); @@ -885,7 +885,7 @@ void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference xPeerInterception->releaseDispatchProviderInterceptor(_xInterceptor); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -899,7 +899,7 @@ void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridCont } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -914,14 +914,14 @@ void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridC m_aGridControlListeners.removeInterface( _listener ); } -//------------------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition() throw( RuntimeException ) { Reference< XGridControl > xGrid( getPeer(), UNO_QUERY ); return xGrid.is() ? xGrid->getCurrentColumnPosition() : -1; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException ) { Reference< XGridControl > xGrid( getPeer(), UNO_QUERY ); @@ -933,21 +933,21 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru } // XElementAccess -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException ) { Reference< XElementAccess > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->hasElements() : 0; } -//------------------------------------------------------------------------------ + Type SAL_CALL FmXGridControl::getElementType( ) throw(RuntimeException) { return ::getCppuType((const Reference< ::com::sun::star::awt::XTextComponent >*)NULL); } // XEnumerationAccess -//------------------------------------------------------------------------------ + Reference< XEnumeration > SAL_CALL FmXGridControl::createEnumeration() throw( RuntimeException ) { Reference< XEnumerationAccess > xPeer(getPeer(), UNO_QUERY); @@ -958,14 +958,14 @@ Reference< XEnumeration > SAL_CALL FmXGridControl::createEnumeration() throw( R } // XIndexAccess -//------------------------------------------------------------------------------ + sal_Int32 SAL_CALL FmXGridControl::getCount() throw( RuntimeException ) { Reference< XIndexAccess > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getCount() : 0; } -//------------------------------------------------------------------------------ + Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { Reference< XIndexAccess > xPeer(getPeer(), UNO_QUERY); @@ -976,7 +976,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun } // ::com::sun::star::util::XModeSelector -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); @@ -986,21 +986,21 @@ void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportExce xPeer->setMode(Mode); } -//------------------------------------------------------------------------------ + OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getMode() : OUString(); } -//------------------------------------------------------------------------------ + ::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getSupportedModes() : ::comphelper::StringSequence(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); @@ -1025,7 +1025,7 @@ protected: virtual void columnChanged(); }; -//------------------------------------------------------------------ + FmXGridPeer::GridListenerDelegator::GridListenerDelegator(FmXGridPeer* _pPeer) :m_pPeer(_pPeer) { @@ -1036,20 +1036,20 @@ FmXGridPeer::GridListenerDelegator::~GridListenerDelegator() { } -//------------------------------------------------------------------ + void FmXGridPeer::GridListenerDelegator::selectionChanged() { m_pPeer->selectionChanged(); } -//------------------------------------------------------------------ + void FmXGridPeer::GridListenerDelegator::columnChanged() { m_pPeer->columnChanged(); } //============================================================================== -//------------------------------------------------------------------ + Reference< XInterface > FmXGridPeer_CreateInstance(const Reference< XMultiServiceFactory>& _rxFactory) { FmXGridPeer* pNewObject = new FmXGridPeer( comphelper::getComponentContext(_rxFactory) ); @@ -1057,13 +1057,13 @@ Reference< XInterface > FmXGridPeer_CreateInstance(const Reference< XMultiServi return *pNewObject; } -//------------------------------------------------------------------ + Sequence< Type> SAL_CALL FmXGridPeer::getTypes( ) throw(RuntimeException) { return comphelper::concatSequences( VCLXWindow::getTypes(), FmXGridPeer_BASE::getTypes() ); } -//------------------------------------------------------------------ + Sequence<sal_Int8> SAL_CALL FmXGridPeer::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId* pId = 0; @@ -1079,7 +1079,7 @@ Sequence<sal_Int8> SAL_CALL FmXGridPeer::getImplementationId( ) throw(RuntimeEx return pId->getImplementationId(); } -//------------------------------------------------------------------ + Any SAL_CALL FmXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn = FmXGridPeer_BASE::queryInterface(_rType); @@ -1090,7 +1090,7 @@ Any SAL_CALL FmXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExcep return aReturn; } -//------------------------------------------------------------------ + void FmXGridPeer::selectionChanged() { EventObject aSource; @@ -1098,14 +1098,14 @@ void FmXGridPeer::selectionChanged() m_aSelectionListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aSource); } -//------------------------------------------------------------------ + void FmXGridPeer::columnChanged() { EventObject aEvent( *this ); m_aGridControlListeners.notifyEach( &XGridControlListener::columnChanged, aEvent ); } -//------------------------------------------------------------------ + namespace fmgridif { const OUString getDataModeIdentifier() @@ -1115,7 +1115,7 @@ namespace fmgridif } using namespace fmgridif; -//------------------------------------------------------------------ + FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) :m_aModifyListeners(m_aMutex) ,m_aUpdateListeners(m_aMutex) @@ -1134,13 +1134,13 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) m_pGridListener = new GridListenerDelegator( this ); } -//------------------------------------------------------------------------------ + FmGridControl* FmXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) { return new FmGridControl(m_xContext, pParent, this, nStyle); } -//------------------------------------------------------------------------------ + void FmXGridPeer::Create(Window* pParent, WinBits nStyle) { FmGridControl* pWin = imp_CreateControl(pParent, nStyle); @@ -1159,7 +1159,7 @@ void FmXGridPeer::Create(Window* pParent, WinBits nStyle) getSupportedURLs(); } -//------------------------------------------------------------------------------ + FmXGridPeer::~FmXGridPeer() { setRowSet(Reference< XRowSet > ()); @@ -1178,7 +1178,7 @@ const Sequence< sal_Int8 >& FmXGridPeer::getUnoTunnelImplementationId() throw() return theFmXGridPeerImplementationId::get().getSeq(); } -//------------------------------------------------------------------------------ + FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxIFace ) throw() { FmXGridPeer* pReturn = NULL; @@ -1189,7 +1189,7 @@ FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxI return pReturn; } -//------------------------------------------------------------------------------ + sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException) { sal_Int64 nReturn(0); @@ -1207,7 +1207,7 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden } // XEventListener -//------------------------------------------------------------------------------ + void FmXGridPeer::disposing(const EventObject& e) throw( RuntimeException ) { using namespace ::com::sun::star::util; @@ -1249,19 +1249,19 @@ using namespace ::com::sun::star::util; VCLXWindow::disposing(e); } -//------------------------------------------------------------------------------ + void FmXGridPeer::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException ) { m_aModifyListeners.addInterface( l ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException ) { m_aModifyListeners.removeInterface( l ); } -//------------------------------------------------------------------------------ + #define LAST_KNOWN_TYPE FormComponentType::PATTERNFIELD Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType ) throw(RuntimeException) { @@ -1358,7 +1358,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType return aReturnSequence; } -//------------------------------------------------------------------------------ + Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1438,7 +1438,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type return aReturnSequence; } -//------------------------------------------------------------------------------ + void FmXGridPeer::CellModified() { EventObject aEvt; @@ -1447,7 +1447,7 @@ void FmXGridPeer::CellModified() } // XPropertyChangeListener -//------------------------------------------------------------------------------ + void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1560,19 +1560,19 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE } // XBoundComponent -//------------------------------------------------------------------------------ + void FmXGridPeer::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException ) { m_aUpdateListeners.addInterface(l); } -//------------------------------------------------------------------------------ + void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException ) { m_aUpdateListeners.removeInterface(l); } -//------------------------------------------------------------------------------ + sal_Bool FmXGridPeer::commit() throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1595,7 +1595,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException ) } -//------------------------------------------------------------------------------ + void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1605,7 +1605,7 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeExceptio pGrid->positioned(_rEvent); } -//------------------------------------------------------------------------------ + void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -1618,7 +1618,7 @@ void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException } } -//------------------------------------------------------------------------------ + void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException ) { // not interested in ... @@ -1626,46 +1626,46 @@ void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeExce } // XLoadListener -//------------------------------------------------------------------------------ + void FmXGridPeer::loaded(const EventObject& /*rEvent*/) throw( RuntimeException ) { updateGrid(m_xCursor); } -//------------------------------------------------------------------------------ + void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException ) { updateGrid( Reference< XRowSet > (NULL) ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::reloading(const EventObject& /*aEvent*/) throw( RuntimeException ) { // empty the grid updateGrid( Reference< XRowSet > (NULL) ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeException ) { // empty the grid updateGrid( Reference< XRowSet > (NULL) ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException ) { updateGrid(m_xCursor); } // XGridPeer -//------------------------------------------------------------------------------ + Reference< XIndexContainer > FmXGridPeer::getColumns() throw( RuntimeException ) { return m_xColumns; } -//------------------------------------------------------------------------------ + void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) { static const OUString aPropsListenedTo[] = @@ -1690,7 +1690,7 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) } } -//------------------------------------------------------------------------------ + void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) { // the same props as in addColumnListeners ... linux has problems with global static UStrings, so @@ -1706,7 +1706,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) xCol->removePropertyChangeListener(aPropsListenedTo[i], this); } -//------------------------------------------------------------------------------ + void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1763,7 +1763,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( } } -//------------------------------------------------------------------------------ + void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException ) { if (bOn != isDesignMode()) @@ -1779,7 +1779,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException ) UpdateDispatches(); // will connect if not already connected and just update else } -//------------------------------------------------------------------------------ + sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException ) { Window* pWin = GetWindow(); @@ -1789,7 +1789,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException ) return sal_False; } -//------------------------------------------------------------------------------ + void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1823,7 +1823,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep FormControlFactory( m_xContext ).initializeTextFieldLineEnds( xNewColumn ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1879,7 +1879,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep pGrid->ActivateCell(); } -//------------------------------------------------------------------------------ + void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1897,7 +1897,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept removeColumnListeners(xOldColumn); } -//------------------------------------------------------------------------------ + void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -2081,7 +2081,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t VCLXWindow::setProperty( PropertyName, Value ); } -//------------------------------------------------------------------------------ + Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() { Reference< XAccessibleContext > xContext; @@ -2110,7 +2110,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() return xContext; } -//------------------------------------------------------------------------------ + Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { Any aProp; @@ -2159,7 +2159,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc return aProp; } -//------------------------------------------------------------------------------ + void FmXGridPeer::dispose() throw( RuntimeException ) { EventObject aEvt; @@ -2191,19 +2191,19 @@ void FmXGridPeer::dispose() throw( RuntimeException ) } // XContainer -//------------------------------------------------------------------------------ + void FmXGridPeer::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException ) { m_aContainerListeners.addInterface( l ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException ) { m_aContainerListeners.removeInterface( l ); } // ::com::sun::star::data::XDatabaseCursorSupplier -//------------------------------------------------------------------------------ + void FmXGridPeer::startCursorListening() { if (!m_nCursorListening) @@ -2227,7 +2227,7 @@ void FmXGridPeer::startCursorListening() m_nCursorListening++; } -//------------------------------------------------------------------------------ + void FmXGridPeer::stopCursorListening() { if (!--m_nCursorListening) @@ -2249,7 +2249,7 @@ void FmXGridPeer::stopCursorListening() } } -//------------------------------------------------------------------------------ + void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor) { FmGridControl* pGrid = (FmGridControl*)GetWindow(); @@ -2257,13 +2257,13 @@ void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor) pGrid->setDataSource(_rxCursor); } -//------------------------------------------------------------------------------ + Reference< XRowSet > FmXGridPeer::getRowSet() throw( RuntimeException ) { return m_xCursor; } -//------------------------------------------------------------------------------ + void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2300,26 +2300,26 @@ void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridPeer::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException ) { m_aGridControlListeners.addInterface( _listener ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException ) { m_aGridControlListeners.removeInterface( _listener ); } -//------------------------------------------------------------------------------ + sal_Int16 FmXGridPeer::getCurrentColumnPosition() throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); return pGrid ? pGrid->GetViewColumnPos(pGrid->GetCurColumnId()) : -1; } -//------------------------------------------------------------------------------ + void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2327,7 +2327,7 @@ void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeExcepti pGrid->GoToColumnId(pGrid->GetColumnIdFromViewPos(nPos)); } -//------------------------------------------------------------------------------ + void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -2377,27 +2377,27 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti } // XElementAccess -//------------------------------------------------------------------------------ + sal_Bool FmXGridPeer::hasElements() throw( RuntimeException ) { return getCount() != 0; } -//------------------------------------------------------------------------------ + Type SAL_CALL FmXGridPeer::getElementType( ) throw(RuntimeException) { return ::getCppuType((Reference< ::com::sun::star::awt::XControl> *)NULL); } // XEnumerationAccess -//------------------------------------------------------------------------------ + Reference< XEnumeration > FmXGridPeer::createEnumeration() throw( RuntimeException ) { return new ::comphelper::OEnumerationByIndex(this); } // XIndexAccess -//------------------------------------------------------------------------------ + sal_Int32 FmXGridPeer::getCount() throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2407,7 +2407,7 @@ sal_Int32 FmXGridPeer::getCount() throw( RuntimeException ) return 0; } -//------------------------------------------------------------------------------ + Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2432,7 +2432,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, } // ::com::sun::star::util::XModeSelector -//------------------------------------------------------------------------------ + void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { if (!supportsMode(Mode)) @@ -2453,13 +2453,13 @@ void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, Runti } } -//------------------------------------------------------------------------------ + OUString FmXGridPeer::getMode() throw( RuntimeException ) { return m_aMode; } -//------------------------------------------------------------------------------ + ::comphelper::StringSequence FmXGridPeer::getSupportedModes() throw( RuntimeException ) { static ::comphelper::StringSequence aModes; @@ -2473,7 +2473,7 @@ OUString FmXGridPeer::getMode() throw( RuntimeException ) return aModes; } -//------------------------------------------------------------------------------ + sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException ) { ::comphelper::StringSequence aModes(getSupportedModes()); @@ -2486,7 +2486,7 @@ sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException return sal_False; } -//------------------------------------------------------------------------------ + void FmXGridPeer::columnVisible(DbGridColumn* pColumn) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2501,7 +2501,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn) m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvt ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::columnHidden(DbGridColumn* pColumn) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2516,7 +2516,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn) m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvt ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException ) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); @@ -2528,7 +2528,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException ) pGrid->SetBrowserFlags(nOldFlags); } -//------------------------------------------------------------------------------ + Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatch > xResult; @@ -2547,7 +2547,7 @@ Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(cons return xResult; } -//------------------------------------------------------------------------------ + Sequence< Reference< ::com::sun::star::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException ) { if (m_xFirstDispatchInterceptor.is()) @@ -2557,7 +2557,7 @@ Sequence< Reference< ::com::sun::star::frame::XDispatch > > FmXGridPeer::queryDi return Sequence< Reference< ::com::sun::star::frame::XDispatch > >(); } -//------------------------------------------------------------------------------ + void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException ) { if (_xInterceptor.is()) @@ -2586,7 +2586,7 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::su } } -//------------------------------------------------------------------------------ + void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException ) { if (!_xInterceptor.is()) @@ -2640,7 +2640,7 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun UpdateDispatches(); } -//------------------------------------------------------------------------------ + void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( RuntimeException ) { DBG_ASSERT(m_pStateCache, "FmXGridPeer::statusChanged : invalid call !"); @@ -2668,13 +2668,13 @@ void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent DBG_ASSERT(i<aUrls.getLength(), "FmXGridPeer::statusChanged : got a call for an unknown url !"); } -//------------------------------------------------------------------------------ + sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException ) { return sal_True; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException) { Sequence< Any > aBookmarks; @@ -2692,7 +2692,7 @@ sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalAr // deal with selection at all. } -//------------------------------------------------------------------------------ + Any SAL_CALL FmXGridPeer::getSelection( ) throw (RuntimeException) { FmGridControl* pVclControl = static_cast<FmGridControl*>(GetWindow()); @@ -2700,19 +2700,19 @@ Any SAL_CALL FmXGridPeer::getSelection( ) throw (RuntimeException) return makeAny(aSelectionBookmarks); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException) { m_aSelectionListeners.addInterface( _rxListener ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXGridPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException) { m_aSelectionListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------------------ + void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException ) { if (m_xColumns == rEvent.Source) @@ -2733,7 +2733,7 @@ void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException ) } } -//------------------------------------------------------------------------------ + Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots() { static Sequence<sal_uInt16> aSupported; @@ -2755,7 +2755,7 @@ Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots() return aSupported; } -//------------------------------------------------------------------------------ + Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() { static Sequence< ::com::sun::star::util::URL> aSupported; @@ -2787,7 +2787,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() return aSupported; } -//------------------------------------------------------------------------------ + void FmXGridPeer::UpdateDispatches() { if (!m_pStateCache) @@ -2824,7 +2824,7 @@ void FmXGridPeer::UpdateDispatches() } } -//------------------------------------------------------------------------------ + void FmXGridPeer::ConnectToDispatcher() { DBG_ASSERT((m_pStateCache != NULL) == (m_pDispatchers != NULL), "FmXGridPeer::ConnectToDispatcher : inconsistent !"); @@ -2862,7 +2862,7 @@ void FmXGridPeer::ConnectToDispatcher() } } -//------------------------------------------------------------------------------ + void FmXGridPeer::DisConnectFromDispatcher() { if (!m_pStateCache || !m_pDispatchers) @@ -2883,7 +2883,7 @@ void FmXGridPeer::DisConnectFromDispatcher() m_pDispatchers = NULL; } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot) { if (!m_pStateCache) @@ -2908,7 +2908,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot) return -1; } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot) { if (!m_pDispatchers) diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b27532adfcab..ad402ddc863d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -132,10 +132,10 @@ namespace //================================================================== //= DbGridColumn //================================================================== -//------------------------------------------------------------------------------ + CellControllerRef DbGridColumn::s_xEmptyController; -//------------------------------------------------------------------------------ + void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::sun::star::beans::XPropertySet >& xField, sal_Int32 nTypeId) { Clear(); @@ -236,7 +236,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s m_xController = pCellControl->CreateController(); } -//------------------------------------------------------------------------------ + void DbGridColumn::impl_toggleScriptManager_nothrow( bool _bAttach ) { try @@ -259,7 +259,7 @@ void DbGridColumn::impl_toggleScriptManager_nothrow( bool _bAttach ) } } -//------------------------------------------------------------------------------ + void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) { if (m_pCell && m_pCell->ISA(FmXFilterCell)) @@ -270,7 +270,7 @@ void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumb } } -//------------------------------------------------------------------------------ + sal_Bool DbGridColumn::Commit() { sal_Bool bResult = sal_True; @@ -292,13 +292,13 @@ sal_Bool DbGridColumn::Commit() return bResult; } -//------------------------------------------------------------------------------ + DbGridColumn::~DbGridColumn() { Clear(); } -//------------------------------------------------------------------------------ + void DbGridColumn::setModel(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xModel) { if ( m_pCell ) @@ -310,7 +310,7 @@ void DbGridColumn::setModel(::com::sun::star::uno::Reference< ::com::sun::star:: impl_toggleScriptManager_nothrow( true ); } -//------------------------------------------------------------------------------ + void DbGridColumn::Clear() { if ( m_pCell ) @@ -332,7 +332,7 @@ void DbGridColumn::Clear() m_nFieldType = DataType::OTHER; } -//------------------------------------------------------------------------------ + sal_Int16 DbGridColumn::SetAlignment(sal_Int16 _nAlign) { if (_nAlign == -1) @@ -377,7 +377,7 @@ sal_Int16 DbGridColumn::SetAlignment(sal_Int16 _nAlign) return m_nAlign; } -//------------------------------------------------------------------------------ + sal_Int16 DbGridColumn::SetAlignmentFromModel(sal_Int16 nStandardAlign) { Any aAlign( m_xModel->getPropertyValue(FM_PROP_ALIGN)); @@ -390,7 +390,7 @@ sal_Int16 DbGridColumn::SetAlignmentFromModel(sal_Int16 nStandardAlign) return SetAlignment(nStandardAlign); } -//------------------------------------------------------------------------------ + void DbGridColumn::setLock(sal_Bool _bLock) { if (m_bLocked == _bLock) @@ -408,7 +408,7 @@ void DbGridColumn::setLock(sal_Bool _bLock) } } -//------------------------------------------------------------------------------ + OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) const { OUString aText; @@ -424,7 +424,7 @@ OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumb return aText; } -//------------------------------------------------------------------------------ + OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColumn >& xField, const Reference< XNumberFormatter >& xFormatter) const { OUString aText; @@ -439,7 +439,7 @@ OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColu return aText; } -//------------------------------------------------------------------------------ + Reference< ::com::sun::star::sdb::XColumn > DbGridColumn::GetCurrentFieldValue() const { Reference< ::com::sun::star::sdb::XColumn > xField; @@ -451,7 +451,7 @@ Reference< ::com::sun::star::sdb::XColumn > DbGridColumn::GetCurrentFieldValue( return xField; } -//------------------------------------------------------------------------------ + void DbGridColumn::Paint(OutputDevice& rDev, const Rectangle& rRect, const DbGridRow* pRow, @@ -518,7 +518,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, static_cast< FmXFilterCell* >( m_pCell )->PaintCell( rDev, rRect ); } -//------------------------------------------------------------------------------ + void DbGridColumn::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) { if ( m_pCell ) @@ -543,7 +543,7 @@ TYPEINIT1( DbCurrencyField, DbSpinField ) TYPEINIT1( DbNumericField, DbSpinField ) TYPEINIT1( DbFilterField, DbCellControl ) -//------------------------------------------------------------------------------ + DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ ) :OPropertyChangeListener(m_aMutex) ,m_pModelChangeBroadcaster(NULL) @@ -596,7 +596,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ ) } } -//------------------------------------------------------------------------------ + void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent) { try @@ -620,12 +620,12 @@ void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_ } } -//------------------------------------------------------------------------------ + void DbCellControl::doPropertyListening(const OUString& _rPropertyName) { implDoPropertyListening( _rPropertyName ); } -//------------------------------------------------------------------------------ + static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster) { if ( _pBroadcaster ) @@ -636,7 +636,7 @@ static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBr // no delete, this is done implicitly } } -//------------------------------------------------------------------------------ + DbCellControl::~DbCellControl() { lcl_clearBroadCaster(m_pModelChangeBroadcaster); @@ -646,7 +646,7 @@ DbCellControl::~DbCellControl() delete m_pPainter; } -//------------------------------------------------------------------------------ + void DbCellControl::implValuePropertyChanged( ) { OSL_ENSURE( !isValuePropertyLocked(), @@ -659,13 +659,13 @@ void DbCellControl::implValuePropertyChanged( ) } } -//------------------------------------------------------------------------------ + void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet >& /*_rxModel*/ ) { // nothing to to here } -//------------------------------------------------------------------------------ + void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -702,7 +702,7 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R implAdjustGenericFieldSetting( xSourceProps ); } -//------------------------------------------------------------------------------ + sal_Bool DbCellControl::Commit() { // lock the listening for value property changes @@ -723,7 +723,7 @@ sal_Bool DbCellControl::Commit() return bReturn; } -//------------------------------------------------------------------------------ + void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) { Window* pWindows[] = { m_pPainter, m_pWindow }; @@ -829,7 +829,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni } } -//------------------------------------------------------------------------------ + void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxModel,bool i_bReadOnly ) { DBG_ASSERT( m_pWindow, "DbCellControl::implAdjustReadOnly: not to be called without window!" ); @@ -849,7 +849,7 @@ void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxMode } } -//------------------------------------------------------------------------------ + void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbCellControl::implAdjustEnabled: not to be called without window!" ); @@ -862,7 +862,7 @@ void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel } } -//------------------------------------------------------------------------------ + void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor ) { ImplInitWindow( rParent, InitAll ); @@ -919,7 +919,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor m_xCursor = _rxCursor; } -//------------------------------------------------------------------------------ + void DbCellControl::SetTextLineColor() { if (m_pWindow) @@ -928,7 +928,7 @@ void DbCellControl::SetTextLineColor() m_pPainter->SetTextLineColor(); } -//------------------------------------------------------------------------------ + void DbCellControl::SetTextLineColor(const Color& _rColor) { if (m_pWindow) @@ -947,7 +947,7 @@ namespace } } -//------------------------------------------------------------------------------ + void DbCellControl::AlignControl(sal_Int16 nAlignment) { WinBits nAlignmentBit = 0; @@ -968,7 +968,7 @@ void DbCellControl::AlignControl(sal_Int16 nAlignment) lcl_implAlign( m_pPainter, nAlignmentBit ); } -//------------------------------------------------------------------------------ + void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ) { if ( m_pPainter->GetParent() == &_rDev ) @@ -995,14 +995,14 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ) m_pPainter->Draw( &_rDev, _rRect.TopLeft(), _rRect.GetSize(), 0 ); } -//------------------------------------------------------------------------------ + void DbCellControl::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { m_pPainter->SetText( GetFormatText( _rxField, _rxFormatter ) ); PaintCell( _rDev, _rRect ); } -//------------------------------------------------------------------------------ + double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const { double fValue = 0; @@ -1035,7 +1035,7 @@ double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn > return fValue; } -//------------------------------------------------------------------------------ + void DbCellControl::invalidatedController() { m_rColumn.GetParent().refreshController(m_rColumn.GetId(), DbGridControl::GrantControlAccess()); @@ -1048,14 +1048,14 @@ void DbCellControl::invalidatedController() //============================================================================== //= DbLimitedLengthField //============================================================================== -//------------------------------------------------------------------------------ + DbLimitedLengthField::DbLimitedLengthField( DbGridColumn& _rColumn ) :DbCellControl( _rColumn ) { doPropertyListening( FM_PROP_MAXTEXTLEN ); } -//------------------------------------------------------------------------------ + void DbLimitedLengthField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbLimitedLengthField::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -1068,7 +1068,7 @@ void DbLimitedLengthField::implAdjustGenericFieldSetting( const Reference< XProp } } -//------------------------------------------------------------------------------ + void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) { dynamic_cast< Edit* >( m_pWindow )->SetMaxTextLen( _nMaxLen ); @@ -1079,7 +1079,7 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) //============================================================================== //= DbTextField //============================================================================== -//------------------------------------------------------------------------------ + DbTextField::DbTextField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) ,m_pEdit( NULL ) @@ -1089,14 +1089,14 @@ DbTextField::DbTextField(DbGridColumn& _rColumn) { } -//------------------------------------------------------------------------------ + DbTextField::~DbTextField( ) { DELETEZ( m_pPainterImplementation ); DELETEZ( m_pEdit ); } -//------------------------------------------------------------------------------ + void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor) { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); @@ -1167,13 +1167,13 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor) DbLimitedLengthField::Init( rParent, xCursor ); } -//------------------------------------------------------------------------------ + CellControllerRef DbTextField::CreateController() const { return new EditCellController( m_pEdit ); } -//------------------------------------------------------------------------------ + void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { if ( m_pPainterImplementation ) @@ -1182,7 +1182,7 @@ void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect DbLimitedLengthField::PaintFieldToCell( _rDev, _rRect, _rxField, _rxFormatter ); } -//------------------------------------------------------------------------------ + OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { OUString aString; @@ -1199,14 +1199,14 @@ OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const return aString; } -//------------------------------------------------------------------------------ + void DbTextField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { m_pEdit->SetText( GetFormatText( _rxField, xFormatter ) ); m_pEdit->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); } -//------------------------------------------------------------------------------ + void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbTextField::updateFromModel: invalid call!" ); @@ -1226,7 +1226,7 @@ void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel ) m_pEdit->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); } -//------------------------------------------------------------------------------ + sal_Bool DbTextField::commitControl() { OUString aText( m_pEdit->GetText( getModelLineEndSetting( m_rColumn.getModel() ) ) ); @@ -1244,7 +1244,7 @@ sal_Bool DbTextField::commitControl() return sal_True; } -//------------------------------------------------------------------------------ + void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) { if ( m_pEdit ) @@ -1257,7 +1257,7 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) //= DbFormattedField //============================================================================== DBG_NAME(DbFormattedField); -//------------------------------------------------------------------------------ + DbFormattedField::DbFormattedField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED) @@ -1268,13 +1268,13 @@ DbFormattedField::DbFormattedField(DbGridColumn& _rColumn) doPropertyListening( FM_PROP_FORMATKEY ); } -//------------------------------------------------------------------------------ + DbFormattedField::~DbFormattedField() { DBG_DTOR(DbFormattedField,NULL); } -//------------------------------------------------------------------------------ + void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCursor) { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); @@ -1484,13 +1484,13 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso DbLimitedLengthField::Init( rParent, xCursor ); } -//------------------------------------------------------------------------------ + CellControllerRef DbFormattedField::CreateController() const { return new ::svt::FormattedFieldCellController( static_cast< FormattedField* >( m_pWindow ) ); } -//------------------------------------------------------------------------------ + void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException ) { if (_rEvent.PropertyName == FM_PROP_FORMATKEY ) @@ -1510,7 +1510,7 @@ void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) th } } -//------------------------------------------------------------------------------ + OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor) { // defaultmaessig keine Farb-Angabe @@ -1558,7 +1558,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb: return aText; } -//------------------------------------------------------------------------------ + void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { try @@ -1597,7 +1597,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X } } -//------------------------------------------------------------------------------ + void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFormattedField::updateFromModel: invalid call!" ); @@ -1619,7 +1619,7 @@ void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel ) } } -//------------------------------------------------------------------------------ + sal_Bool DbFormattedField::commitControl() { Any aNewVal; @@ -1641,7 +1641,7 @@ sal_Bool DbFormattedField::commitControl() //============================================================================== //= DbCheckBox //============================================================================== -//------------------------------------------------------------------------------ + DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) :DbCellControl( _rColumn, sal_True ) { @@ -1663,7 +1663,7 @@ namespace } } -//------------------------------------------------------------------------------ + void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) { setTransparent( sal_True ); @@ -1699,12 +1699,12 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) DbCellControl::Init( rParent, xCursor ); } -//------------------------------------------------------------------------------ + CellControllerRef DbCheckBox::CreateController() const { return new CheckBoxCellController((CheckBoxControl*)m_pWindow); } -//------------------------------------------------------------------------------ + static void lcl_setCheckBoxState( const Reference< ::com::sun::star::sdb::XColumn >& _rxField, CheckBoxControl* _pCheckBoxControl ) { @@ -1725,13 +1725,13 @@ static void lcl_setCheckBoxState( const Reference< ::com::sun::star::sdb::XCol _pCheckBoxControl->GetBox().SetState(eState); } -//------------------------------------------------------------------------------ + void DbCheckBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { lcl_setCheckBoxState( _rxField, static_cast<CheckBoxControl*>(m_pWindow) ); } -//------------------------------------------------------------------------------ + void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) @@ -1740,7 +1740,7 @@ void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, DbCellControl::PaintFieldToCell( rDev, rRect, _rxField, xFormatter ); } -//------------------------------------------------------------------------------ + void DbCheckBox::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCheckBox::updateFromModel: invalid call!" ); @@ -1750,7 +1750,7 @@ void DbCheckBox::updateFromModel( Reference< XPropertySet > _rxModel ) static_cast< CheckBoxControl* >( m_pWindow )->GetBox().SetState( static_cast< TriState >( nState ) ); } -//------------------------------------------------------------------------------ + sal_Bool DbCheckBox::commitControl() { m_rColumn.getModel()->setPropertyValue( FM_PROP_STATE, @@ -1758,7 +1758,7 @@ sal_Bool DbCheckBox::commitControl() return sal_True; } -//------------------------------------------------------------------------------ + OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return OUString(); @@ -1766,7 +1766,7 @@ OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, con //============================================================================== //= DbPatternField -//------------------------------------------------------------------------------ + DbPatternField::DbPatternField( DbGridColumn& _rColumn, const Reference<XComponentContext>& _rContext ) :DbCellControl( _rColumn ) ,m_xContext( _rContext ) @@ -1776,7 +1776,7 @@ DbPatternField::DbPatternField( DbGridColumn& _rColumn, const Reference<XCompone doPropertyListening( FM_PROP_STRICTFORMAT ); } -//------------------------------------------------------------------------------ + void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbPatternField::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -1800,7 +1800,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe } } -//------------------------------------------------------------------------------ + void DbPatternField::Init( Window& rParent, const Reference< XRowSet >& xCursor) { m_rColumn.SetAlignmentFromModel(-1); @@ -1814,13 +1814,13 @@ void DbPatternField::Init( Window& rParent, const Reference< XRowSet >& xCursor) DbCellControl::Init( rParent, xCursor ); } -//------------------------------------------------------------------------------ + CellControllerRef DbPatternField::CreateController() const { return new SpinCellController( static_cast< PatternField* >( m_pWindow ) ); } -//------------------------------------------------------------------------------ + OUString DbPatternField::impl_formatText( const OUString& _rText ) { m_pPainter->SetText( _rText ); @@ -1828,7 +1828,7 @@ OUString DbPatternField::impl_formatText( const OUString& _rText ) return m_pPainter->GetText(); } -//------------------------------------------------------------------------------ + OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { bool bIsForPaint = _rxField != m_rColumn.GetField(); @@ -1854,14 +1854,14 @@ OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::X return impl_formatText( sText ); } -//------------------------------------------------------------------------------ + void DbPatternField::UpdateFromField( const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { static_cast< Edit* >( m_pWindow )->SetText( GetFormatText( _rxField, _rxFormatter ) ); static_cast< Edit* >( m_pWindow )->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); } -//------------------------------------------------------------------------------ + void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbPatternField::updateFromModel: invalid call!" ); @@ -1873,7 +1873,7 @@ void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel ) static_cast< Edit* >( m_pWindow )->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); } -//------------------------------------------------------------------------------ + sal_Bool DbPatternField::commitControl() { OUString aText(m_pWindow->GetText()); @@ -1884,14 +1884,14 @@ sal_Bool DbPatternField::commitControl() //============================================================================== //= DbSpinField //============================================================================== -//------------------------------------------------------------------------------ + DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign ) :DbCellControl( _rColumn ) ,m_nStandardAlign( _nStandardAlign ) { } -//------------------------------------------------------------------------------ + void DbSpinField::Init( Window& _rParent, const Reference< XRowSet >& _rxCursor ) { m_rColumn.SetAlignmentFromModel( m_nStandardAlign ); @@ -1913,7 +1913,7 @@ void DbSpinField::Init( Window& _rParent, const Reference< XRowSet >& _rxCursor DbCellControl::Init( _rParent, _rxCursor ); } -//------------------------------------------------------------------------------ + CellControllerRef DbSpinField::CreateController() const { return new SpinCellController( static_cast< SpinField* >( m_pWindow ) ); @@ -1922,7 +1922,7 @@ CellControllerRef DbSpinField::CreateController() const //============================================================================== //= DbNumericField //============================================================================== -//------------------------------------------------------------------------------ + DbNumericField::DbNumericField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn ) { @@ -1934,7 +1934,7 @@ DbNumericField::DbNumericField( DbGridColumn& _rColumn ) doPropertyListening( FM_PROP_SHOWTHOUSANDSEP ); } -//------------------------------------------------------------------------------ + void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbNumericField::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -1989,7 +1989,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe } } -//------------------------------------------------------------------------------ + SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new DoubleNumericField( _pParent, _nFieldStyle ); @@ -1997,7 +1997,7 @@ SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle, namespace { - //-------------------------------------------------------------------------- + static OUString lcl_setFormattedNumeric_nothrow( DoubleNumericField& _rField, const DbCellControl& _rControl, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { @@ -2022,19 +2022,19 @@ namespace } } -//------------------------------------------------------------------------------ + OUString DbNumericField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) { return lcl_setFormattedNumeric_nothrow( *dynamic_cast< DoubleNumericField* >( m_pPainter ), *this, _rxField, _rxFormatter ); } -//------------------------------------------------------------------------------ + void DbNumericField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter) { lcl_setFormattedNumeric_nothrow( *dynamic_cast< DoubleNumericField* >( m_pWindow ), *this, _rxField, _rxFormatter ); } -//------------------------------------------------------------------------------ + void DbNumericField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbNumericField::updateFromModel: invalid call!" ); @@ -2046,7 +2046,7 @@ void DbNumericField::updateFromModel( Reference< XPropertySet > _rxModel ) m_pWindow->SetText( OUString() ); } -//------------------------------------------------------------------------------ + sal_Bool DbNumericField::commitControl() { OUString aText( m_pWindow->GetText()); @@ -2064,7 +2064,7 @@ sal_Bool DbNumericField::commitControl() //============================================================================== //= DbCurrencyField //============================================================================== -//------------------------------------------------------------------------------ + DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn) :DbSpinField( _rColumn ) ,m_nScale( 0 ) @@ -2078,7 +2078,7 @@ DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn) doPropertyListening( FM_PROP_CURRENCYSYMBOL ); } -//------------------------------------------------------------------------------ + void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbCurrencyField::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -2114,13 +2114,13 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS } } -//------------------------------------------------------------------------------ + SpinField* DbCurrencyField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new LongCurrencyField( _pParent, _nFieldStyle ); } -//------------------------------------------------------------------------------ + double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const { double fValue = GetValue(_rxField, xFormatter); @@ -2135,7 +2135,7 @@ double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XCol namespace { - //-------------------------------------------------------------------------- + static OUString lcl_setFormattedCurrency_nothrow( LongCurrencyField& _rField, const DbCurrencyField& _rControl, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { @@ -2160,19 +2160,19 @@ namespace } } -//------------------------------------------------------------------------------ + OUString DbCurrencyField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) { return lcl_setFormattedCurrency_nothrow( dynamic_cast< LongCurrencyField& >( *m_pPainter ), *this, _rxField, _rxFormatter ); } -//------------------------------------------------------------------------------ + void DbCurrencyField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter) { lcl_setFormattedCurrency_nothrow( dynamic_cast< LongCurrencyField& >( *m_pWindow ), *this, _rxField, _rxFormatter ); } -//------------------------------------------------------------------------------ + void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCurrencyField::updateFromModel: invalid call!" ); @@ -2192,7 +2192,7 @@ void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel ) m_pWindow->SetText( OUString() ); } -//------------------------------------------------------------------------------ + sal_Bool DbCurrencyField::commitControl() { OUString aText(m_pWindow->GetText()); @@ -2213,7 +2213,7 @@ sal_Bool DbCurrencyField::commitControl() //============================================================================== //= DbDateField //============================================================================== -//------------------------------------------------------------------------------ + DbDateField::DbDateField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn ) { @@ -2224,7 +2224,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn ) doPropertyListening( FM_PROP_DATE_SHOW_CENTURY ); } -//------------------------------------------------------------------------------ + SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel ) { // check if there is a DropDown property set to TRUE @@ -2241,7 +2241,7 @@ SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, con return pField; } -//------------------------------------------------------------------------------ + void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbDateField::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -2280,7 +2280,7 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet > namespace { - //-------------------------------------------------------------------------- + static OUString lcl_setFormattedDate_nothrow( DateField& _rField, const Reference< XColumn >& _rxField ) { OUString sDate; @@ -2305,19 +2305,19 @@ namespace return sDate; } } -//------------------------------------------------------------------------------ + OUString DbDateField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return lcl_setFormattedDate_nothrow( *dynamic_cast< DateField* >( m_pPainter ), _rxField ); } -//------------------------------------------------------------------------------ + void DbDateField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { lcl_setFormattedDate_nothrow( *dynamic_cast< DateField* >( m_pWindow ), _rxField ); } -//------------------------------------------------------------------------------ + void DbDateField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbDateField::updateFromModel: invalid call!" ); @@ -2329,7 +2329,7 @@ void DbDateField::updateFromModel( Reference< XPropertySet > _rxModel ) static_cast< DateField* >( m_pWindow )->SetText( OUString() ); } -//------------------------------------------------------------------------------ + sal_Bool DbDateField::commitControl() { OUString aText(m_pWindow->GetText()); @@ -2346,7 +2346,7 @@ sal_Bool DbDateField::commitControl() //============================================================================== //= DbTimeField //============================================================================== -//------------------------------------------------------------------------------ + DbTimeField::DbTimeField( DbGridColumn& _rColumn ) :DbSpinField( _rColumn, ::com::sun::star::awt::TextAlign::LEFT ) { @@ -2356,13 +2356,13 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn ) doPropertyListening( FM_PROP_STRICTFORMAT ); } -//------------------------------------------------------------------------------ + SpinField* DbTimeField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new TimeField( _pParent, _nFieldStyle ); } -//------------------------------------------------------------------------------ + void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbTimeField::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -2392,7 +2392,7 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet > namespace { - //-------------------------------------------------------------------------- + static OUString lcl_setFormattedTime_nothrow( TimeField& _rField, const Reference< XColumn >& _rxField ) { OUString sTime; @@ -2417,19 +2417,19 @@ namespace return sTime; } } -//------------------------------------------------------------------------------ + OUString DbTimeField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pPainter ), _rxField ); } -//------------------------------------------------------------------------------ + void DbTimeField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pWindow ), _rxField ); } -//------------------------------------------------------------------------------ + void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbTimeField::updateFromModel: invalid call!" ); @@ -2441,7 +2441,7 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel ) static_cast< TimeField* >( m_pWindow )->SetText( OUString() ); } -//------------------------------------------------------------------------------ + sal_Bool DbTimeField::commitControl() { OUString aText(m_pWindow->GetText()); @@ -2458,7 +2458,7 @@ sal_Bool DbTimeField::commitControl() //============================================================================== //= DbComboBox //============================================================================== -//------------------------------------------------------------------------------ + DbComboBox::DbComboBox(DbGridColumn& _rColumn) :DbCellControl(_rColumn) ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED) @@ -2469,7 +2469,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn) doPropertyListening( FM_PROP_LINECOUNT ); } -//------------------------------------------------------------------------------ + void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException ) { if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) ) @@ -2482,7 +2482,7 @@ void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( R } } -//------------------------------------------------------------------------------ + void DbComboBox::SetList(const Any& rItems) { ComboBoxControl* pField = (ComboBoxControl*)m_pWindow; @@ -2501,7 +2501,7 @@ void DbComboBox::SetList(const Any& rItems) } } -//------------------------------------------------------------------------------ + void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbComboBox::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -2513,7 +2513,7 @@ void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& } } -//------------------------------------------------------------------------------ + void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) { m_rColumn.SetAlignmentFromModel(::com::sun::star::awt::TextAlign::LEFT); @@ -2539,13 +2539,13 @@ void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) DbCellControl::Init( rParent, xCursor ); } -//------------------------------------------------------------------------------ + CellControllerRef DbComboBox::CreateController() const { return new ComboBoxCellController((ComboBoxControl*)m_pWindow); } -//------------------------------------------------------------------------------ + OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { OUString aString; @@ -2561,13 +2561,13 @@ OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColu return aString; } -//------------------------------------------------------------------------------ + void DbComboBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { m_pWindow->SetText(GetFormatText(_rxField, xFormatter)); } -//------------------------------------------------------------------------------ + void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbComboBox::updateFromModel: invalid call!" ); @@ -2579,7 +2579,7 @@ void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel ) static_cast< ComboBox* >( m_pWindow )->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); } -//------------------------------------------------------------------------------ + sal_Bool DbComboBox::commitControl() { OUString aText( m_pWindow->GetText()); @@ -2587,7 +2587,7 @@ sal_Bool DbComboBox::commitControl() return sal_True; } -//------------------------------------------------------------------------------ + DbListBox::DbListBox(DbGridColumn& _rColumn) :DbCellControl(_rColumn) ,m_bBound(sal_False) @@ -2598,7 +2598,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn) doPropertyListening( FM_PROP_LINECOUNT ); } -//------------------------------------------------------------------------------ + void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException ) { if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) ) @@ -2611,7 +2611,7 @@ void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeE } } -//------------------------------------------------------------------------------ + void DbListBox::SetList(const Any& rItems) { ListBoxControl* pField = (ListBoxControl*)m_pWindow; @@ -2638,7 +2638,7 @@ void DbListBox::SetList(const Any& rItems) } } -//------------------------------------------------------------------------------ + void DbListBox::Init( Window& rParent, const Reference< XRowSet >& xCursor) { m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); @@ -2653,7 +2653,7 @@ void DbListBox::Init( Window& rParent, const Reference< XRowSet >& xCursor) DbCellControl::Init( rParent, xCursor ); } -//------------------------------------------------------------------------------ + void DbListBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel ) { DBG_ASSERT( m_pWindow, "DbListBox::implAdjustGenericFieldSetting: not to be called without window!" ); @@ -2665,13 +2665,13 @@ void DbListBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& } } -//------------------------------------------------------------------------------ + CellControllerRef DbListBox::CreateController() const { return new ListBoxCellController((ListBoxControl*)m_pWindow); } -//------------------------------------------------------------------------------ + OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { OUString sText; @@ -2697,7 +2697,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum return sText; } -//------------------------------------------------------------------------------ + void DbListBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { OUString sFormattedText( GetFormatText( _rxField, xFormatter ) ); @@ -2707,7 +2707,7 @@ void DbListBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn static_cast< ListBox* >( m_pWindow )->SetNoSelection(); } -//------------------------------------------------------------------------------ + void DbListBox::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbListBox::updateFromModel: invalid call!" ); @@ -2727,7 +2727,7 @@ void DbListBox::updateFromModel( Reference< XPropertySet > _rxModel ) pListBox->SetNoSelection( ); } -//------------------------------------------------------------------------------ + sal_Bool DbListBox::commitControl() { Any aVal; @@ -2758,7 +2758,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG setAlignedController( sal_False ); } -//------------------------------------------------------------------------------ + DbFilterField::~DbFilterField() { if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX) @@ -2767,7 +2767,7 @@ DbFilterField::~DbFilterField() DBG_DTOR(DbFilterField,NULL); } -//------------------------------------------------------------------------------ + void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect) { static sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_VCENTER | TEXT_DRAW_LEFT; @@ -2784,7 +2784,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect) } } -//------------------------------------------------------------------------------ + void DbFilterField::SetList(const Any& rItems, sal_Bool bComboBox) { ::comphelper::StringSequence aTest; @@ -2811,7 +2811,7 @@ void DbFilterField::SetList(const Any& rItems, sal_Bool bComboBox) } } -//------------------------------------------------------------------------------ + void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel) { switch (m_nControlClass) @@ -2868,7 +2868,7 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun:: } } -//------------------------------------------------------------------------------ + void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor ) { Reference< ::com::sun::star::beans::XPropertySet > xModel(m_rColumn.getModel()); @@ -2907,7 +2907,7 @@ void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor ) pAsEdit->SetReadOnly( sal_False ); } -//------------------------------------------------------------------------------ + CellControllerRef DbFilterField::CreateController() const { CellControllerRef xController; @@ -2931,7 +2931,7 @@ CellControllerRef DbFilterField::CreateController() const return xController; } -//------------------------------------------------------------------------------ + void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFilterField::updateFromModel: invalid call!" ); @@ -2942,7 +2942,7 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel ) // remember: updateFromModel should be some kind of opposite of commitControl } -//------------------------------------------------------------------------------ + sal_Bool DbFilterField::commitControl() { OUString aText(m_aText); @@ -3019,7 +3019,7 @@ sal_Bool DbFilterField::commitControl() return sal_True; } -//------------------------------------------------------------------------------ + void DbFilterField::SetText(const OUString& rText) { m_aText = rText; @@ -3054,7 +3054,7 @@ void DbFilterField::SetText(const OUString& rText) m_rColumn.GetParent().RowModified(0,m_rColumn.GetId()); } -//------------------------------------------------------------------------------ + void DbFilterField::Update() { // should we fill the combobox with a filter proposal? @@ -3172,19 +3172,19 @@ void DbFilterField::Update() } } -//------------------------------------------------------------------------------ + OUString DbFilterField::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return OUString(); } -//------------------------------------------------------------------ + void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/) { OSL_FAIL( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" ); } -//------------------------------------------------------------------ + IMPL_LINK_NOARG(DbFilterField, OnClick) { TriState eState = ((CheckBoxControl*)m_pWindow)->GetBox().GetState(); @@ -3215,7 +3215,7 @@ TYPEINIT0(FmXGridCell); DBG_NAME(FmXGridCell); -//----------------------------------------------------------------------------- + FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl ) :OComponentHelper(m_aMutex) ,m_pColumn(pColumn) @@ -3229,7 +3229,7 @@ FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl ) DBG_CTOR(FmXGridCell,NULL); } -//----------------------------------------------------------------------------- + void FmXGridCell::init() { Window* pEventWindow( getEventWindow() ); @@ -3237,7 +3237,7 @@ void FmXGridCell::init() pEventWindow->AddEventListener( LINK( this, FmXGridCell, OnWindowEvent ) ); } -//----------------------------------------------------------------------------- + Window* FmXGridCell::getEventWindow() const { if ( m_pCellControl ) @@ -3245,7 +3245,7 @@ Window* FmXGridCell::getEventWindow() const return NULL; } -//----------------------------------------------------------------------------- + FmXGridCell::~FmXGridCell() { if (!OComponentHelper::rBHelper.bDisposed) @@ -3257,14 +3257,14 @@ FmXGridCell::~FmXGridCell() DBG_DTOR(FmXGridCell,NULL); } -//------------------------------------------------------------------ + void FmXGridCell::SetTextLineColor() { if (m_pCellControl) m_pCellControl->SetTextLineColor(); } -//------------------------------------------------------------------ + void FmXGridCell::SetTextLineColor(const Color& _rColor) { if (m_pCellControl) @@ -3272,7 +3272,7 @@ void FmXGridCell::SetTextLineColor(const Color& _rColor) } // XTypeProvider -//------------------------------------------------------------------ + Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) throw (RuntimeException) { Sequence< uno::Type > aTypes = ::comphelper::concatSequences( @@ -3287,11 +3287,11 @@ Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) throw (RuntimeException) return aTypes; } -//------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FmXGridCell ) // OComponentHelper -//----------------------------------------------------------------------------- + void FmXGridCell::disposing() { lang::EventObject aEvent( *this ); @@ -3306,7 +3306,7 @@ void FmXGridCell::disposing() DELETEZ(m_pCellControl); } -//------------------------------------------------------------------ + Any SAL_CALL FmXGridCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException) { Any aReturn = OComponentHelper::queryAggregation( _rType ); @@ -3321,26 +3321,26 @@ Any SAL_CALL FmXGridCell::queryAggregation( const ::com::sun::star::uno::Type& _ } // ::com::sun::star::awt::XControl -//----------------------------------------------------------------------------- + Reference< XInterface > FmXGridCell::getContext() throw( RuntimeException ) { return Reference< XInterface > (); } -//----------------------------------------------------------------------------- + Reference< ::com::sun::star::awt::XControlModel > FmXGridCell::getModel() throw( ::com::sun::star::uno::RuntimeException ) { return Reference< ::com::sun::star::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY); } // ::com::sun::star::form::XBoundControl -//------------------------------------------------------------------ + sal_Bool FmXGridCell::getLock() throw( RuntimeException ) { return m_pColumn->isLocked(); } -//------------------------------------------------------------------ + void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException ) { if (getLock() == _bLock) @@ -3352,7 +3352,7 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException ) } } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_Int32 _Width, ::sal_Int32 _Height, ::sal_Int16 _Flags ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::setPosSize: not implemented" ); @@ -3364,14 +3364,14 @@ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_In // not allowed to tamper with this for a grid cell } -//------------------------------------------------------------------ + awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::getPosSize: not implemented" ); return awt::Rectangle(); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::setVisible: not implemented" ); @@ -3379,7 +3379,7 @@ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeExcep // not allowed to tamper with this for a grid cell } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::setEnable: not implemented" ); @@ -3387,88 +3387,88 @@ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeExcepti // not allowed to tamper with this for a grid cell } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::setFocus( ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::setFocus: not implemented" ); // not allowed to tamper with this for a grid cell } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException) { m_aWindowListeners.addInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException) { m_aWindowListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException) { m_aFocusListeners.addInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException) { m_aFocusListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException) { m_aKeyListeners.addInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException) { m_aKeyListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException) { m_aMouseListeners.addInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException) { m_aMouseListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException) { m_aMouseMotionListeners.addInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException) { m_aMouseMotionListeners.removeInterface( _rxListener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" ); (void)_rxListener; } -//------------------------------------------------------------------ + void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException) { OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" ); (void)_rxListener; } -//------------------------------------------------------------------ + IMPL_LINK( FmXGridCell, OnWindowEvent, VclWindowEvent*, _pEvent ) { ENSURE_OR_THROW( _pEvent, "illegal event pointer" ); @@ -3477,19 +3477,19 @@ IMPL_LINK( FmXGridCell, OnWindowEvent, VclWindowEvent*, _pEvent ) return 1L; } -//------------------------------------------------------------------------------ + void FmXGridCell::onFocusGained( const awt::FocusEvent& _rEvent ) { m_aFocusListeners.notifyEach( &awt::XFocusListener::focusGained, _rEvent ); } -//------------------------------------------------------------------------------ + void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent ) { m_aFocusListeners.notifyEach( &awt::XFocusListener::focusLost, _rEvent ); } -//------------------------------------------------------------------------------ + void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) @@ -3579,7 +3579,7 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi /*************************************************************************/ TYPEINIT1(FmXDataCell, FmXGridCell); -//------------------------------------------------------------------------------ + void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) @@ -3587,7 +3587,7 @@ void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, m_pCellControl->PaintFieldToCell( rDev, rRect, _rxField, xFormatter ); } -//------------------------------------------------------------------------------ + void FmXDataCell::UpdateFromColumn() { Reference< ::com::sun::star::sdb::XColumn > xField(m_pColumn->GetCurrentFieldValue()); @@ -3604,7 +3604,7 @@ FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl ) { } -//------------------------------------------------------------------------------ + void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, const Reference< ::com::sun::star::sdb::XColumn >& _rxField, @@ -3649,7 +3649,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, /*************************************************************************/ DBG_NAME(FmXEditCell); -//------------------------------------------------------------------------------ + FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXTextCell( pColumn, _rControl ) ,m_aTextListeners(m_aMutex) @@ -3674,7 +3674,7 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ) } } -//------------------------------------------------------------------ + FmXEditCell::~FmXEditCell() { if (!OComponentHelper::rBHelper.bDisposed) @@ -3688,7 +3688,7 @@ FmXEditCell::~FmXEditCell() } // OComponentHelper -//----------------------------------------------------------------------------- + void FmXEditCell::disposing() { ::com::sun::star::lang::EventObject aEvt(*this); @@ -3703,7 +3703,7 @@ void FmXEditCell::disposing() FmXDataCell::disposing(); } -//------------------------------------------------------------------ + Any SAL_CALL FmXEditCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException) { Any aReturn = FmXTextCell::queryAggregation( _rType ); @@ -3714,7 +3714,7 @@ Any SAL_CALL FmXEditCell::queryAggregation( const ::com::sun::star::uno::Type& _ return aReturn; } -//------------------------------------------------------------------------- + Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXEditCell::getTypes( ) throw(RuntimeException) { return ::comphelper::concatSequences( @@ -3723,23 +3723,23 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXEditCell::getTypes( ) throw ); } -//------------------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FmXEditCell ) // ::com::sun::star::awt::XTextComponent -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::addTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException ) { m_aTextListeners.addInterface( l ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::removeTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException ) { m_aTextListeners.removeInterface( l ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3754,7 +3754,7 @@ void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeExcept } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rSel, const OUString& aText) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3766,7 +3766,7 @@ void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rS } } -//------------------------------------------------------------------------------ + OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3790,7 +3790,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException ) return aText; } -//------------------------------------------------------------------------------ + OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3804,7 +3804,7 @@ OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException ) return aText; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3813,7 +3813,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& m_pEditImplementation->SetSelection( Selection( aSelection.Min, aSelection.Max ) ); } -//------------------------------------------------------------------------------ + ::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3825,7 +3825,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& return ::com::sun::star::awt::Selection(aSel.Min(), aSel.Max()); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3833,7 +3833,7 @@ sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException ) return ( m_pEditImplementation && !m_pEditImplementation->IsReadOnly() && m_pEditImplementation->GetControl().IsEnabled() ) ? sal_True : sal_False; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3842,7 +3842,7 @@ void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeExcep m_pEditImplementation->SetReadOnly( !bEditable ); } -//------------------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3850,7 +3850,7 @@ sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException ) return m_pEditImplementation ? m_pEditImplementation->GetMaxTextLen() : 0; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3859,19 +3859,19 @@ void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeExcepti m_pEditImplementation->SetMaxTextLen( nLen ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& _Listener ) throw (RuntimeException) { m_aChangeListeners.addInterface( _Listener ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& _Listener ) throw (RuntimeException) { m_aChangeListeners.removeInterface( _Listener ); } -//------------------------------------------------------------------------------ + void FmXEditCell::onTextChanged() { ::com::sun::star::awt::TextEvent aEvent; @@ -3879,14 +3879,14 @@ void FmXEditCell::onTextChanged() m_aTextListeners.notifyEach( &awt::XTextListener::textChanged, aEvent ); } -//------------------------------------------------------------------------------ + void FmXEditCell::onFocusGained( const awt::FocusEvent& _rEvent ) { FmXTextCell::onFocusGained( _rEvent ); m_sValueOnEnter = getText(); } -//------------------------------------------------------------------------------ + void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent ) { FmXTextCell::onFocusLost( _rEvent ); @@ -3898,7 +3898,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent ) } } -//------------------------------------------------------------------------------ + void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) @@ -3916,7 +3916,7 @@ void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi /*************************************************************************/ DBG_NAME(FmXCheckBoxCell); -//------------------------------------------------------------------------------ + FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXDataCell( pColumn, _rControl ) ,m_aItemListeners(m_aMutex) @@ -3926,7 +3926,7 @@ FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rContro DBG_CTOR(FmXCheckBoxCell,NULL); } -//------------------------------------------------------------------ + FmXCheckBoxCell::~FmXCheckBoxCell() { if (!OComponentHelper::rBHelper.bDisposed) @@ -3939,7 +3939,7 @@ FmXCheckBoxCell::~FmXCheckBoxCell() } // OComponentHelper -//----------------------------------------------------------------------------- + void FmXCheckBoxCell::disposing() { ::com::sun::star::lang::EventObject aEvt(*this); @@ -3952,7 +3952,7 @@ void FmXCheckBoxCell::disposing() FmXDataCell::disposing(); } -//------------------------------------------------------------------ + Any SAL_CALL FmXCheckBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException) { Any aReturn = FmXDataCell::queryAggregation( _rType ); @@ -3963,7 +3963,7 @@ Any SAL_CALL FmXCheckBoxCell::queryAggregation( const ::com::sun::star::uno::Typ return aReturn; } -//------------------------------------------------------------------------- + Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) throw(RuntimeException) { return ::comphelper::concatSequences( @@ -3972,22 +3972,22 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) t ); } -//------------------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FmXCheckBoxCell ) -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< ::com::sun::star::awt::XItemListener >& l ) throw( RuntimeException ) { m_aItemListeners.addInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< ::com::sun::star::awt::XItemListener >& l ) throw( RuntimeException ) { m_aItemListeners.removeInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3999,7 +3999,7 @@ void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException ) } } -//------------------------------------------------------------------ + short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4012,7 +4012,7 @@ short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException ) return STATE_DONTKNOW; } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4021,19 +4021,19 @@ void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeExcept m_pBox->EnableTriState( b ); } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& _Listener ) throw (RuntimeException) { m_aActionListeners.addInterface( _Listener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& _Listener ) throw (RuntimeException) { m_aActionListeners.removeInterface( _Listener ); } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& _Label ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -4044,19 +4044,19 @@ void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& _Label ) throw (Runtime } } -//------------------------------------------------------------------ + void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& _Command ) throw (RuntimeException) { m_aActionCommand = _Command; } -//------------------------------------------------------------------ + Window* FmXCheckBoxCell::getEventWindow() const { return m_pBox; } -//------------------------------------------------------------------ + void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) @@ -4096,7 +4096,7 @@ void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& /*************************************************************************/ DBG_NAME(FmXListBoxCell); -//------------------------------------------------------------------------------ + FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl) :FmXTextCell( pColumn, _rControl ) ,m_aItemListeners(m_aMutex) @@ -4108,7 +4108,7 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl) m_pBox->SetDoubleClickHdl( LINK( this, FmXListBoxCell, OnDoubleClick ) ); } -//------------------------------------------------------------------ + FmXListBoxCell::~FmXListBoxCell() { if (!OComponentHelper::rBHelper.bDisposed) @@ -4121,7 +4121,7 @@ FmXListBoxCell::~FmXListBoxCell() } // OComponentHelper -//----------------------------------------------------------------------------- + void FmXListBoxCell::disposing() { ::com::sun::star::lang::EventObject aEvt(*this); @@ -4135,7 +4135,7 @@ void FmXListBoxCell::disposing() FmXTextCell::disposing(); } -//------------------------------------------------------------------ + Any SAL_CALL FmXListBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException) { Any aReturn = FmXTextCell::queryAggregation(_rType); @@ -4146,7 +4146,7 @@ Any SAL_CALL FmXListBoxCell::queryAggregation( const ::com::sun::star::uno::Type return aReturn; } -//------------------------------------------------------------------------- + Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) throw(RuntimeException) { return ::comphelper::concatSequences( @@ -4155,34 +4155,34 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) th ); } -//------------------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell ) -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::addItemListener(const Reference< ::com::sun::star::awt::XItemListener >& l) throw( RuntimeException ) { m_aItemListeners.addInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< ::com::sun::star::awt::XItemListener >& l) throw( RuntimeException ) { m_aItemListeners.removeInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::addActionListener(const Reference< ::com::sun::star::awt::XActionListener >& l) throw( RuntimeException ) { m_aActionListeners.addInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< ::com::sun::star::awt::XActionListener >& l) throw( RuntimeException ) { m_aActionListeners.removeInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4190,7 +4190,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr m_pBox->InsertEntry( aItem, nPos ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItems, sal_Int16 nPos) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4206,7 +4206,7 @@ void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItem } } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4217,20 +4217,20 @@ void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) thro } } -//------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXListBoxCell::getItemCount() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pBox ? m_pBox->GetEntryCount() : 0; } -//------------------------------------------------------------------ + OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString(); } -//------------------------------------------------------------------ + ::comphelper::StringSequence SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4249,7 +4249,7 @@ OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeExceptio return aSeq; } -//------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4261,7 +4261,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException return 0; } -//------------------------------------------------------------------ + Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4277,7 +4277,7 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( Runt } return aSeq; } -//------------------------------------------------------------------ + OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4293,7 +4293,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException ) return aItem; } -//------------------------------------------------------------------ + ::comphelper::StringSequence SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4311,7 +4311,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException ) return aSeq; } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4320,7 +4320,7 @@ void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) th m_pBox->SelectEntryPos( nPos, bSelect ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4332,7 +4332,7 @@ void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPosit } } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4341,7 +4341,7 @@ void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect m_pBox->SelectEntry( aItem, bSelect ); } -//------------------------------------------------------------------ + sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4352,7 +4352,7 @@ sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException ) return bMulti; } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4361,7 +4361,7 @@ void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeExc m_pBox->EnableMultiSelection( bMulti ); } -//------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4373,7 +4373,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeExceptio return nLines; } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4382,7 +4382,7 @@ void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Runt m_pBox->SetDropDownLineCount( nLines ); } -//------------------------------------------------------------------ + void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4391,7 +4391,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept m_pBox->SetTopEntry( nEntry ); } -//------------------------------------------------------------------ + void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { if ( ( &_rWindow == m_pBox ) @@ -4416,7 +4416,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _ } -//------------------------------------------------------------------ + IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick) { if (m_pBox) @@ -4438,7 +4438,7 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick) DBG_NAME( FmXComboBoxCell ); -//------------------------------------------------------------------------------ + FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXTextCell( pColumn, _rControl ) ,m_aItemListeners( m_aMutex ) @@ -4448,7 +4448,7 @@ FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rContro DBG_CTOR( FmXComboBoxCell, NULL ); } -//------------------------------------------------------------------------------ + FmXComboBoxCell::~FmXComboBoxCell() { if ( !OComponentHelper::rBHelper.bDisposed ) @@ -4460,7 +4460,7 @@ FmXComboBoxCell::~FmXComboBoxCell() DBG_DTOR( FmXComboBoxCell, NULL ); } -//----------------------------------------------------------------------------- + void FmXComboBoxCell::disposing() { ::com::sun::star::lang::EventObject aEvt(*this); @@ -4470,7 +4470,7 @@ void FmXComboBoxCell::disposing() FmXTextCell::disposing(); } -//------------------------------------------------------------------ + Any SAL_CALL FmXComboBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException) { Any aReturn = FmXTextCell::queryAggregation(_rType); @@ -4481,7 +4481,7 @@ Any SAL_CALL FmXComboBoxCell::queryAggregation( const ::com::sun::star::uno::Typ return aReturn; } -//------------------------------------------------------------------------- + Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes( ) throw(RuntimeException) { return ::comphelper::concatSequences( @@ -4490,34 +4490,34 @@ Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes( ) throw(RuntimeException) ); } -//------------------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FmXComboBoxCell ) -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::addItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException ) { m_aItemListeners.addInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::removeItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException ) { m_aItemListeners.removeInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::addActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException ) { m_aActionListeners.addInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException ) { m_aActionListeners.removeInterface( l ); } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::addItem( const OUString& _Item, sal_Int16 _Pos ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4525,7 +4525,7 @@ void SAL_CALL FmXComboBoxCell::addItem( const OUString& _Item, sal_Int16 _Pos ) m_pComboBox->InsertEntry( _Item, _Pos ); } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal_Int16 _Pos ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4541,7 +4541,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal } } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4552,20 +4552,20 @@ void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) t } } -//------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pComboBox ? m_pComboBox->GetEntryCount() : 0; } -//------------------------------------------------------------------ + OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 _Pos ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pComboBox ? OUString(m_pComboBox->GetEntry(_Pos)) : OUString(); } -//------------------------------------------------------------------ + Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4582,7 +4582,7 @@ Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeExceptio return aItems; } -//------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4594,7 +4594,7 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeExcepti return nLines; } -//------------------------------------------------------------------ + void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4602,7 +4602,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run m_pComboBox->SetDropDownLineCount( nLines ); } -//------------------------------------------------------------------------------ + void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { @@ -4631,14 +4631,14 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& /*************************************************************************/ TYPEINIT1(FmXFilterCell, FmXGridCell); -//------------------------------------------------------------------------------ + Reference< XInterface > FmXFilterCell_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& /*_rxFactory*/) { return *new FmXFilterCell(); } DBG_NAME(FmXFilterCell); -//------------------------------------------------------------------------------ + FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl ) :FmXGridCell( pColumn, pControl ) ,m_aTextListeners(m_aMutex) @@ -4649,7 +4649,7 @@ FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl ) static_cast< DbFilterField* >( m_pCellControl )->SetCommitHdl( LINK( this, FmXFilterCell, OnCommit ) ); } -//------------------------------------------------------------------ + FmXFilterCell::~FmXFilterCell() { if (!OComponentHelper::rBHelper.bDisposed) @@ -4662,7 +4662,7 @@ FmXFilterCell::~FmXFilterCell() } // XUnoTunnel -//------------------------------------------------------------------------------ + sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException) { sal_Int64 nReturn(0); @@ -4687,14 +4687,14 @@ const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId() return theFmXFilterCellUnoTunnelId::get().getSeq(); } -//------------------------------------------------------------------------------ + void FmXFilterCell::PaintCell( OutputDevice& rDev, const Rectangle& rRect ) { static_cast< DbFilterField* >( m_pCellControl )->PaintCell( rDev, rRect ); } // OComponentHelper -//----------------------------------------------------------------------------- + void FmXFilterCell::disposing() { ::com::sun::star::lang::EventObject aEvt(*this); @@ -4705,7 +4705,7 @@ void FmXFilterCell::disposing() FmXGridCell::disposing(); } -//------------------------------------------------------------------ + Any SAL_CALL FmXFilterCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException) { Any aReturn = FmXGridCell::queryAggregation(_rType); @@ -4716,7 +4716,7 @@ Any SAL_CALL FmXFilterCell::queryAggregation( const ::com::sun::star::uno::Type& return aReturn; } -//------------------------------------------------------------------------- + Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) throw(RuntimeException) { return ::comphelper::concatSequences( @@ -4725,81 +4725,81 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) thr ); } -//------------------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FmXFilterCell ) // ::com::sun::star::awt::XTextComponent -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::addTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException ) { m_aTextListeners.addInterface( l ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::removeTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException ) { m_aTextListeners.removeInterface( l ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); ((DbFilterField*)m_pCellControl)->SetText(aText); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::insertText( const ::com::sun::star::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException ) { } -//------------------------------------------------------------------------------ + OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return ((DbFilterField*)m_pCellControl)->GetText(); } -//------------------------------------------------------------------------------ + OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException ) { return getText(); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selection& /*aSelection*/ ) throw( RuntimeException ) { } -//------------------------------------------------------------------------------ + ::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection( void ) throw( RuntimeException ) { return ::com::sun::star::awt::Selection(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FmXFilterCell::isEditable( void ) throw( RuntimeException ) { return sal_True; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::setEditable( sal_Bool /*bEditable*/ ) throw( RuntimeException ) { } -//------------------------------------------------------------------------------ + sal_Int16 SAL_CALL FmXFilterCell::getMaxTextLen() throw( RuntimeException ) { return 0; } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeException ) { } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(FmXFilterCell, OnCommit) { ::cppu::OInterfaceIteratorHelper aIt( m_aTextListeners ); diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 17b565f87fa3..02b11a909522 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -24,7 +24,7 @@ #include "svx/fmtools.hxx" using namespace ::com::sun::star::uno; -//------------------------------------------------------------------------------ + const ::comphelper::StringSequence& getColumnTypes() { static ::comphelper::StringSequence aColumnTypes(10); @@ -45,7 +45,7 @@ const ::comphelper::StringSequence& getColumnTypes() return aColumnTypes; } -//------------------------------------------------------------------ + // Vergleichen von PropertyInfo extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) { @@ -54,7 +54,7 @@ extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) namespace { - //------------------------------------------------------------------------------ + sal_Int32 lcl_findPos(const OUString& aStr, const Sequence< OUString>& rList) { const OUString* pStrList = rList.getConstArray(); @@ -68,7 +68,7 @@ namespace } } -//------------------------------------------------------------------------------ + sal_Int32 getColumnTypeByModelName(const OUString& aModelName) { const OUString aModelPrefix("com.sun.star.form.component."); diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index fecc0e6f158f..41930be3ea2c 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -32,17 +32,17 @@ namespace svx //==================================================================== //= OXFormsTransferable //==================================================================== - //-------------------------------------------------------------------- + OXFormsTransferable::OXFormsTransferable( const OXFormsDescriptor &rhs ) : m_aDescriptor(rhs) { } - //-------------------------------------------------------------------- + void OXFormsTransferable::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_XFORMS ); } - //-------------------------------------------------------------------- + sal_Bool OXFormsTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); @@ -52,7 +52,7 @@ namespace svx } return sal_False; } - //-------------------------------------------------------------------- + const OXFormsDescriptor &OXFormsTransferable::extractDescriptor( const TransferableDataHelper &_rData ) { using namespace ::com::sun::star::uno; diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 37ca31537606..787542d8b9df 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -36,7 +36,7 @@ using namespace ::connectivity; //= OSystemParseContext //========================================================================== DBG_NAME(OSystemParseContext) -//----------------------------------------------------------------------------- + OSystemParseContext::OSystemParseContext() : IParseContext() { DBG_CTOR(OSystemParseContext,NULL); @@ -46,19 +46,19 @@ OSystemParseContext::OSystemParseContext() : IParseContext() aKeywords.get( m_aLocalizedKeywords ); } -//----------------------------------------------------------------------------- + OSystemParseContext::~OSystemParseContext() { DBG_DTOR(OSystemParseContext,NULL); } -//----------------------------------------------------------------------------- + ::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const { return SvtSysLocale().GetLanguageTag().getLocale(); } -//----------------------------------------------------------------------------- + OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const { OUString aMsg; @@ -82,7 +82,7 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const return aMsg; } -//----------------------------------------------------------------------------- + OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const { size_t nIndex = 0; @@ -125,7 +125,7 @@ OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) con return sKeyword; } -// ----------------------------------------------------------------------------- + IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OString& rToken) const { static const IParseContext::InternationalKeyCode Intl_TokenID[] = @@ -155,19 +155,19 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS // ============================================================================= namespace { - // ----------------------------------------------------------------------------- + ::osl::Mutex& getSafteyMutex() { static ::osl::Mutex s_aSafety; return s_aSafety; } - // ----------------------------------------------------------------------------- + oslInterlockedCount& getCounter() { static oslInterlockedCount s_nCounter; return s_nCounter; } - // ----------------------------------------------------------------------------- + OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,sal_Bool _bSet = sal_False) { static OSystemParseContext* s_pSharedContext = NULL; @@ -184,9 +184,9 @@ namespace } return s_pSharedContext; } - // ----------------------------------------------------------------------------- + } -// ----------------------------------------------------------------------------- + OParseContextClient::OParseContextClient() { ::osl::MutexGuard aGuard( getSafteyMutex() ); @@ -196,7 +196,7 @@ OParseContextClient::OParseContextClient() } } -// ----------------------------------------------------------------------------- + OParseContextClient::~OParseContextClient() { { @@ -205,12 +205,12 @@ OParseContextClient::~OParseContextClient() delete getSharedContext(NULL,sal_True); } } -// ----------------------------------------------------------------------------- + const OSystemParseContext* OParseContextClient::getParseContext() const { return getSharedContext(); } -// ----------------------------------------------------------------------------- + diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 5c80ac6d159f..00db0c691c38 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -80,14 +80,14 @@ namespace svx static PropertyMapEntry const * getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos ); }; - //-------------------------------------------------------------------- + ODADescriptorImpl::ODADescriptorImpl() :m_bSetOutOfDate(sal_True) ,m_bSequenceOutOfDate(sal_True) { } - //-------------------------------------------------------------------- + ODADescriptorImpl::ODADescriptorImpl(const ODADescriptorImpl& _rSource) :m_bSetOutOfDate( _rSource.m_bSetOutOfDate ) ,m_bSequenceOutOfDate( _rSource.m_bSequenceOutOfDate ) @@ -99,7 +99,7 @@ namespace svx m_aAsSequence = _rSource.m_aAsSequence; } - //-------------------------------------------------------------------- + sal_Bool ODADescriptorImpl::buildFrom( const Sequence< PropertyValue >& _rValues ) { const MapString2PropertyEntry& rProperties = getPropertyMap(); @@ -133,7 +133,7 @@ namespace svx return bValidPropsOnly; } - //-------------------------------------------------------------------- + sal_Bool ODADescriptorImpl::buildFrom( const Reference< XPropertySet >& _rxValues ) { Reference< XPropertySetInfo > xPropInfo; @@ -171,14 +171,14 @@ namespace svx return bValidPropsOnly; } - //-------------------------------------------------------------------- + void ODADescriptorImpl::invalidateExternRepresentations() { m_bSetOutOfDate = sal_True; m_bSequenceOutOfDate = sal_True; } - //-------------------------------------------------------------------- + const ODADescriptorImpl::MapString2PropertyEntry& ODADescriptorImpl::getPropertyMap( ) { // the properties we know @@ -215,7 +215,7 @@ namespace svx return s_aProperties; } - //-------------------------------------------------------------------- + PropertyMapEntry const * ODADescriptorImpl::getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos ) { const MapString2PropertyEntry& rProperties = getPropertyMap(); @@ -233,7 +233,7 @@ namespace svx throw RuntimeException(); } - //-------------------------------------------------------------------- + PropertyValue ODADescriptorImpl::buildPropertyValue( const DescriptorValues::const_iterator& _rPos ) { // the map entry @@ -250,7 +250,7 @@ namespace svx return aReturn; } - //-------------------------------------------------------------------- + void ODADescriptorImpl::updateSequence() { if (!m_bSequenceOutOfDate) @@ -275,19 +275,19 @@ namespace svx //==================================================================== //= ODataAccessDescriptor //==================================================================== - //-------------------------------------------------------------------- + ODataAccessDescriptor::ODataAccessDescriptor() :m_pImpl(new ODADescriptorImpl) { } - //-------------------------------------------------------------------- + ODataAccessDescriptor::ODataAccessDescriptor( const ODataAccessDescriptor& _rSource ) :m_pImpl(new ODADescriptorImpl(*_rSource.m_pImpl)) { } - //-------------------------------------------------------------------- + const ODataAccessDescriptor& ODataAccessDescriptor::operator=(const ODataAccessDescriptor& _rSource) { delete m_pImpl; @@ -295,14 +295,14 @@ namespace svx return *this; } - //-------------------------------------------------------------------- + ODataAccessDescriptor::ODataAccessDescriptor( const Reference< XPropertySet >& _rValues ) :m_pImpl(new ODADescriptorImpl) { m_pImpl->buildFrom(_rValues); } - //-------------------------------------------------------------------- + ODataAccessDescriptor::ODataAccessDescriptor( const Any& _rValues ) :m_pImpl(new ODADescriptorImpl) { @@ -315,26 +315,26 @@ namespace svx m_pImpl->buildFrom( xValues ); } - //-------------------------------------------------------------------- + ODataAccessDescriptor::ODataAccessDescriptor( const Sequence< PropertyValue >& _rValues ) :m_pImpl(new ODADescriptorImpl) { m_pImpl->buildFrom(_rValues); } - //-------------------------------------------------------------------- + ODataAccessDescriptor::~ODataAccessDescriptor() { delete m_pImpl; } - //-------------------------------------------------------------------- + void ODataAccessDescriptor::clear() { m_pImpl->m_aValues.clear(); } - //-------------------------------------------------------------------- + void ODataAccessDescriptor::erase(DataAccessDescriptorProperty _eWhich) { OSL_ENSURE(has(_eWhich), "ODataAccessDescriptor::erase: invalid call!"); @@ -342,13 +342,13 @@ namespace svx m_pImpl->m_aValues.erase(_eWhich); } - //-------------------------------------------------------------------- + sal_Bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const { return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end(); } - //-------------------------------------------------------------------- + const Any& ODataAccessDescriptor::operator [] ( DataAccessDescriptorProperty _eWhich ) const { if (!has(_eWhich)) @@ -361,14 +361,14 @@ namespace svx return m_pImpl->m_aValues[_eWhich]; } - //-------------------------------------------------------------------- + Any& ODataAccessDescriptor::operator[] ( DataAccessDescriptorProperty _eWhich ) { m_pImpl->invalidateExternRepresentations(); return m_pImpl->m_aValues[_eWhich]; } - //-------------------------------------------------------------------- + void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear) { if (_bClear) @@ -376,14 +376,14 @@ namespace svx m_pImpl->buildFrom(_rValues); } - //-------------------------------------------------------------------- + Sequence< PropertyValue > ODataAccessDescriptor::createPropertyValueSequence() { m_pImpl->updateSequence(); return m_pImpl->m_aAsSequence; } - //-------------------------------------------------------------------- + OUString ODataAccessDescriptor::getDataSource() const { OUString sDataSourceName; @@ -393,7 +393,7 @@ namespace svx (*this)[daDatabaseLocation] >>= sDataSourceName; return sDataSourceName; } - //-------------------------------------------------------------------- + void ODataAccessDescriptor::setDataSource(const OUString& _sDataSourceNameOrLocation) { if ( !_sDataSourceNameOrLocation.isEmpty() ) diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 1661cd8f5370..2e566a3282f3 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -84,7 +84,7 @@ namespace svx bool m_bNeedExistenceCheck; }; - //-------------------------------------------------------------------- + DatabaseLocationInputController_Impl::DatabaseLocationInputController_Impl( const Reference<XComponentContext>& _rContext, ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton ) :m_xContext( _rContext ) @@ -112,14 +112,14 @@ namespace svx m_rLocationInput.AddEventListener( LINK( this, DatabaseLocationInputController_Impl, OnControlAction ) ); } - //-------------------------------------------------------------------- + DatabaseLocationInputController_Impl::~DatabaseLocationInputController_Impl() { m_rBrowseButton.RemoveEventListener( LINK( this, DatabaseLocationInputController_Impl, OnControlAction ) ); m_rLocationInput.RemoveEventListener( LINK( this, DatabaseLocationInputController_Impl, OnControlAction ) ); } - //-------------------------------------------------------------------- + bool DatabaseLocationInputController_Impl::prepareCommit() { OUString sURL( impl_getCurrentURL() ); @@ -140,20 +140,20 @@ namespace svx return true; } - //-------------------------------------------------------------------- + void DatabaseLocationInputController_Impl::setURL( const OUString& _rURL ) { ::svt::OFileNotation aTransformer( _rURL ); m_rLocationInput.SetText( aTransformer.get( ::svt::OFileNotation::N_SYSTEM ) ); } - //-------------------------------------------------------------------- + OUString DatabaseLocationInputController_Impl::getURL() const { return impl_getCurrentURL(); } - //-------------------------------------------------------------------- + void DatabaseLocationInputController_Impl::impl_initFilterProperties_nothrow() { try @@ -198,7 +198,7 @@ namespace svx } } - // ----------------------------------------------------------------------------- + IMPL_LINK( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent*, _pEvent ) { if ( ( _pEvent->GetWindow() == &m_rBrowseButton ) @@ -218,7 +218,7 @@ namespace svx return 0L; } - // ----------------------------------------------------------------------------- + OUString DatabaseLocationInputController_Impl::impl_getCurrentURL() const { OUString sCurrentFile( m_rLocationInput.GetText() ); @@ -230,7 +230,7 @@ namespace svx return sCurrentFile; } - // ----------------------------------------------------------------------------- + void DatabaseLocationInputController_Impl::impl_onBrowseButtonClicked() { ::sfx2::FileDialogHelper aFileDlg( @@ -257,7 +257,7 @@ namespace svx } } - // ----------------------------------------------------------------------------- + void DatabaseLocationInputController_Impl::impl_onLocationModified() { m_bNeedExistenceCheck = true; @@ -266,31 +266,31 @@ namespace svx //==================================================================== //= DatabaseLocationInputController //==================================================================== - //-------------------------------------------------------------------- + DatabaseLocationInputController::DatabaseLocationInputController( const Reference<XComponentContext>& _rContext, ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton ) :m_pImpl( new DatabaseLocationInputController_Impl( _rContext, _rLocationInput, _rBrowseButton ) ) { } - //-------------------------------------------------------------------- + DatabaseLocationInputController::~DatabaseLocationInputController() { } - //-------------------------------------------------------------------- + bool DatabaseLocationInputController::prepareCommit() { return m_pImpl->prepareCommit(); } - //-------------------------------------------------------------------- + void DatabaseLocationInputController::setURL( const OUString& _rURL ) { m_pImpl->setURL( _rURL ); } - //-------------------------------------------------------------------- + OUString DatabaseLocationInputController::getURL() const { return m_pImpl->getURL(); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 6437cfe6d3a6..688489036221 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -330,23 +330,23 @@ namespace svxform m_aItemList.Show(); ItemSelectHdl( &m_aItemList ); } - //------------------------------------------------------------------------ + XFormsPage::~XFormsPage() { } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl) { DoToolBoxAction( m_aToolBox.GetCurItemId() ); return 0; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl) { EnableMenuItems( NULL ); return 0; } - //------------------------------------------------------------------------ + void XFormsPage::AddChildren( SvTreeListEntry* _pParent, const ImageList& _rImgLst, const Reference< css::xml::dom::XNode >& _xNode ) @@ -416,7 +416,7 @@ namespace svxform DBG_UNHANDLED_EXCEPTION(); } } - //------------------------------------------------------------------------ + bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) { bool bHandled = false; @@ -745,7 +745,7 @@ namespace svxform return bHandled; } - //------------------------------------------------------------------------ + SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvTreeListEntry* pParent = m_aItemList.FirstSelected(); @@ -766,7 +766,7 @@ namespace svxform sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode ); } - //------------------------------------------------------------------------ + SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = NULL; @@ -837,7 +837,7 @@ namespace svxform return pEntry; } - //------------------------------------------------------------------------ + void XFormsPage::EditEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = NULL; @@ -894,7 +894,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + bool XFormsPage::RemoveEntry() { bool bRet = false; @@ -986,7 +986,7 @@ namespace svxform return bRet; } - //------------------------------------------------------------------------ + bool XFormsPage::Notify( NotifyEvent& rNEvt ) { bool nHandled = false; @@ -1005,7 +1005,7 @@ namespace svxform return nHandled || Window::Notify( rNEvt ); } - //------------------------------------------------------------------------ + void XFormsPage::Resize() { Size aSize = GetOutputSizePixel(); @@ -1016,7 +1016,7 @@ namespace svxform aSize.Height() -= ( 4 + aTbxSize.Height() ); m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize ); } - //------------------------------------------------------------------------ + OUString XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos ) { DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" ); @@ -1161,13 +1161,13 @@ namespace svxform return sRet; } - //------------------------------------------------------------------------ + void XFormsPage::ClearModel() { m_bHasModel = false; m_aItemList.DeleteAndClear(); } - //------------------------------------------------------------------------ + OUString XFormsPage::LoadInstance( const Sequence< PropertyValue >& _xPropSeq, const ImageList& _rImgLst ) { @@ -1216,13 +1216,13 @@ namespace svxform return sRet; } - //------------------------------------------------------------------------ + bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID ) { return DoToolBoxAction( _nMenuID ); } - //------------------------------------------------------------------------ + void XFormsPage::EnableMenuItems( Menu* _pMenu ) { sal_Bool bEnableAdd = sal_False; @@ -1399,7 +1399,7 @@ namespace svxform // load xforms models of the current document LoadModels(); } - //------------------------------------------------------------------------ + DataNavigatorWindow::~DataNavigatorWindow() { SvtViewOptions aViewOpt( E_TABDIALOG, CFGNAME_DATANAVIGATOR ); @@ -1422,7 +1422,7 @@ namespace svxform m_xDataListener.clear(); } - // ----------------------------------------------------------------------- + IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox ) { sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos(); @@ -1437,7 +1437,7 @@ namespace svxform return 0; } - // ----------------------------------------------------------------------- + IMPL_LINK( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn ) { bool bIsDocModified = false; @@ -1750,7 +1750,7 @@ namespace svxform SetDocModified(); return 0; } - // ----------------------------------------------------------------------- + IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn ) { Menu* pMenu = pBtn->GetPopupMenu(); @@ -1774,7 +1774,7 @@ namespace svxform } return 0; } - // ----------------------------------------------------------------------- + IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl) { sal_uInt16 nId = 0; @@ -1788,13 +1788,13 @@ namespace svxform return 0; } - // ----------------------------------------------------------------------- + IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl) { ModelSelectHdl( NULL ); return 0; } - // ----------------------------------------------------------------------- + XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId ) { rCurId = m_aTabCtrl.GetCurPageId(); @@ -1842,7 +1842,7 @@ namespace svxform return pPage; } - // ----------------------------------------------------------------------- + void DataNavigatorWindow::LoadModels() { if ( !m_xFrameModel.is() ) @@ -1898,7 +1898,7 @@ namespace svxform ModelSelectHdl( &m_aModelsBox ); } } - // ----------------------------------------------------------------------- + void DataNavigatorWindow::SetPageModel() { OUString sModel( m_aModelsBox.GetSelectEntry() ); @@ -1931,7 +1931,7 @@ namespace svxform SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): unexpected exception" ); } } - // ----------------------------------------------------------------------- + void DataNavigatorWindow::InitPages() { OUString sModel( m_aModelsBox.GetSelectEntry() ); @@ -1980,7 +1980,7 @@ namespace svxform SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): unexpected exception" ); } } - // ----------------------------------------------------------------------- + void DataNavigatorWindow::ClearAllPageModels( bool bClearPages ) { if ( m_pInstPage ) @@ -2006,7 +2006,7 @@ namespace svxform m_aTabCtrl.RemovePage( m_aTabCtrl.GetPageId( 1 ) ); } } - // ----------------------------------------------------------------------- + void DataNavigatorWindow::CreateInstancePage( const Sequence< PropertyValue >& _xPropSeq ) { OUString sInstName; @@ -2033,13 +2033,13 @@ namespace svxform m_aTabCtrl.InsertPage( nPageId, sInstName, m_aTabCtrl.GetPageCount() - 2 ); } - //------------------------------------------------------------------------ + bool DataNavigatorWindow::HasFirstInstancePage() const { return ( m_aTabCtrl.GetPageId( 0 ) == TID_INSTANCE ); } - //------------------------------------------------------------------------ + sal_uInt16 DataNavigatorWindow::GetNewPageId() const { sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount(); @@ -2051,7 +2051,7 @@ namespace svxform return ( nMax + 1 ); } - //------------------------------------------------------------------------ + void DataNavigatorWindow::Resize() { Window::Resize(); @@ -2080,7 +2080,7 @@ namespace svxform m_aInstanceBtn.SetPosPixel( aPos ); } - //------------------------------------------------------------------------ + void DataNavigatorWindow::SetDocModified() { SfxObjectShell* pCurrentDoc = SfxObjectShell::Current(); @@ -2089,7 +2089,7 @@ namespace svxform pCurrentDoc->SetModified(); } - //------------------------------------------------------------------------ + void DataNavigatorWindow::NotifyChanges( bool _bLoadAll ) { if ( !m_bIsNotifyDisabled ) @@ -2110,7 +2110,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void DataNavigatorWindow::AddContainerBroadcaster( const XContainer_ref& xContainer ) { Reference< XContainerListener > xListener( @@ -2119,7 +2119,7 @@ namespace svxform m_aContainerList.push_back( xContainer ); } - //------------------------------------------------------------------------ + void DataNavigatorWindow::AddEventBroadcaster( const XEventTarget_ref& xTarget ) { Reference< XEventListener > xListener( @@ -2131,7 +2131,7 @@ namespace svxform m_aEventTargetList.push_back( xTarget ); } - //------------------------------------------------------------------------ + void DataNavigatorWindow::RemoveBroadcaster() { Reference< XContainerListener > xContainerListener( @@ -2155,7 +2155,7 @@ namespace svxform // class DataNavigator //======================================================================== DBG_NAME(DataNavigator) - //------------------------------------------------------------------------ + DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) : SfxDockingWindow( _pBindings, _pMgr, _pParent, @@ -2177,17 +2177,17 @@ namespace svxform m_aDataWin.Show(); } - //------------------------------------------------------------------------ + DataNavigator::~DataNavigator() { DBG_DTOR(DataNavigator,NULL); } - //----------------------------------------------------------------------- + void DataNavigator::Update( FmFormShell* /*pFormShell*/ ) { } - //----------------------------------------------------------------------- + void DataNavigator::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( !pState || SID_FM_DATANAVIGATOR_CONTROL != nSID ) @@ -2202,20 +2202,20 @@ namespace svxform Update( NULL ); } - //----------------------------------------------------------------------- + void DataNavigator::GetFocus() { SfxDockingWindow::GetFocus(); } - //----------------------------------------------------------------------- + bool DataNavigator::Close() { Update( NULL ); return SfxDockingWindow::Close(); } - //----------------------------------------------------------------------- + Size DataNavigator::CalcDockingSize( SfxChildAlignment eAlign ) { if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) ) @@ -2224,7 +2224,7 @@ namespace svxform return SfxDockingWindow::CalcDockingSize( eAlign ); } - //----------------------------------------------------------------------- + SfxChildAlignment DataNavigator::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { switch ( eAlign ) @@ -2239,7 +2239,7 @@ namespace svxform return eActAlign; } - //------------------------------------------------------------------------ + void DataNavigator::Resize() { SfxDockingWindow::Resize(); @@ -2260,10 +2260,10 @@ namespace svxform // class NavigatorFrameManager //======================================================================== - //----------------------------------------------------------------------- + SFX_IMPL_DOCKINGWINDOW( DataNavigatorManager, SID_FM_SHOW_DATANAVIGATOR ) - //----------------------------------------------------------------------- + DataNavigatorManager::DataNavigatorManager( Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) : @@ -2319,7 +2319,7 @@ namespace svxform CheckHdl( NULL ); } - //------------------------------------------------------------------------ + AddDataItemDialog::~AddDataItemDialog() { if ( m_xTempBinding.is() ) @@ -2346,7 +2346,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + IMPL_LINK( AddDataItemDialog, CheckHdl, CheckBox *, pBox ) { // Condition buttons are only enable if their check box is checked @@ -2381,7 +2381,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn ) { OUString sTemp, sPropName; @@ -2460,7 +2460,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddDataItemDialog, OKHdl) { bool bIsHandleBinding = ( DITBinding == m_eItemType ); @@ -2524,7 +2524,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + void AddDataItemDialog::InitDialog() { // set handler @@ -2546,7 +2546,7 @@ namespace svxform m_pOKBtn->SetClickHdl( LINK( this, AddDataItemDialog, OKHdl ) ); } - //------------------------------------------------------------------------ + void AddDataItemDialog::InitFromNode() { if ( m_pItemNode ) @@ -2690,7 +2690,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void AddDataItemDialog::InitDataTypeBox() { if ( m_eItemType != DITText ) @@ -2818,7 +2818,7 @@ namespace svxform ResultHdl( &m_aResultTimer ); } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddConditionDialog, EditHdl) { Reference< XNameContainer > xNameContnr; @@ -2843,7 +2843,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddConditionDialog, OKHdl) { /*!!! @@ -2861,14 +2861,14 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl) { m_aResultTimer.Start(); return 0; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddConditionDialog, ResultHdl) { OUString sCondition = comphelper::string::strip(m_pConditionED->GetText(), ' '); @@ -2932,13 +2932,13 @@ namespace svxform SelectHdl( m_pNamespacesList ); } - //------------------------------------------------------------------------ + NamespaceItemDialog::~NamespaceItemDialog() { delete m_pNamespacesList; } - //------------------------------------------------------------------------ + IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, EMPTYARG ) { sal_Bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL ); @@ -2948,7 +2948,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + IMPL_LINK( NamespaceItemDialog, ClickHdl, PushButton *, pBtn ) { if ( m_pAddNamespaceBtn == pBtn ) @@ -2998,7 +2998,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl) { try @@ -3030,7 +3030,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + void NamespaceItemDialog::LoadNamespaces() { try @@ -3080,7 +3080,7 @@ namespace svxform m_pOKBtn->SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) ); } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl) { OUString sPrefix = m_pPrefixED->GetText(); @@ -3133,7 +3133,7 @@ namespace svxform m_pOKBtn->SetClickHdl( LINK( this, AddSubmissionDialog, OKHdl ) ); } - //------------------------------------------------------------------------ + AddSubmissionDialog::~AddSubmissionDialog() { // #i38991# if we have added a binding, we need to remove it as well. @@ -3141,7 +3141,7 @@ namespace svxform m_xUIHelper->removeBindingIfUseless( m_xCreatedBinding ); } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl) { AddConditionDialog aDlg( this, PN_BINDING_EXPR, m_xTempBinding ); @@ -3152,7 +3152,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl) { OUString sName(m_pNameED->GetText()); @@ -3216,7 +3216,7 @@ namespace svxform return 0; } - //------------------------------------------------------------------------ + void AddSubmissionDialog::FillAllBoxes() { // method box @@ -3366,7 +3366,7 @@ namespace svxform m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString(); } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl) { ::sfx2::FileDialogHelper aDlg( diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index 7d2c3f376892..355d2ceac6e8 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -27,12 +27,12 @@ namespace svxform //==================================================================== //= ODataAccessCharsetHelper //==================================================================== - //-------------------------------------------------------------------- + ODataAccessCharsetHelper::ODataAccessCharsetHelper( ) { } - //-------------------------------------------------------------------- + bool ODataAccessCharsetHelper::ensureLoaded() const { if ( !ODbtoolsClient::ensureLoaded() ) diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index f1a31da37a69..ebdc7521205f 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -54,13 +54,13 @@ namespace svxform createDataAccessToolsFactoryFunction ODbtoolsClient::s_pFactoryCreationFunc = NULL; - //-------------------------------------------------------------------- + ODbtoolsClient::ODbtoolsClient() { m_bCreateAlready = sal_False; } - //-------------------------------------------------------------------- + bool ODbtoolsClient::ensureLoaded() const { if ( !m_bCreateAlready ) @@ -84,7 +84,7 @@ namespace svxform return m_xDataAccessFactory.is(); } - //-------------------------------------------------------------------- + ODbtoolsClient::~ODbtoolsClient() { // clear the factory _before_ revoking the client @@ -95,7 +95,7 @@ namespace svxform revokeClient(); } - //-------------------------------------------------------------------- + #ifndef DISABLE_DYNLOADING @@ -144,7 +144,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void ODbtoolsClient::revokeClient() { ::osl::MutexGuard aGuard(theODbtoolsClientMutex::get()); @@ -164,12 +164,12 @@ namespace svxform //==================================================================== //= OStaticDataAccessTools //==================================================================== - //-------------------------------------------------------------------- + OStaticDataAccessTools::OStaticDataAccessTools() { } - //-------------------------------------------------------------------- + bool OStaticDataAccessTools::ensureLoaded() const { @@ -179,7 +179,7 @@ namespace svxform return m_xDataAccessTools.is(); } - //-------------------------------------------------------------------- + Reference< XNumberFormatsSupplier > OStaticDataAccessTools::getNumberFormats(const Reference< XConnection>& _rxConn, sal_Bool _bAllowDefault) const { Reference< XNumberFormatsSupplier > xReturn; @@ -188,7 +188,7 @@ namespace svxform return xReturn; } - //-------------------------------------------------------------------- + sal_Int32 OStaticDataAccessTools::getDefaultNumberFormat( const Reference< XPropertySet >& _xColumn, const Reference< XNumberFormatTypes >& _xTypes, const Locale& _rLocale ) { sal_Int32 nReturn = 0; @@ -197,7 +197,7 @@ namespace svxform return nReturn; } - //-------------------------------------------------------------------- + Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName, const OUString& _rUser, const OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) ) @@ -208,7 +208,7 @@ namespace svxform return xReturn; } - //-------------------------------------------------------------------- + Reference< XConnection > OStaticDataAccessTools::connectRowset( const Reference< XRowSet >& _rxRowSet, const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection ) const SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) @@ -219,7 +219,7 @@ namespace svxform return xReturn; } - //-------------------------------------------------------------------- + Reference< XConnection > OStaticDataAccessTools::getRowSetConnection(const Reference< XRowSet >& _rxRowSet) const SAL_THROW ( (RuntimeException) ) { Reference< XConnection > xReturn; @@ -228,7 +228,7 @@ namespace svxform return xReturn; } - //-------------------------------------------------------------------- + void OStaticDataAccessTools::TransferFormComponentProperties(const Reference< XPropertySet>& _rxOld, const Reference< XPropertySet>& _rxNew, const Locale& _rLocale) const { @@ -236,7 +236,7 @@ namespace svxform m_xDataAccessTools->TransferFormComponentProperties(_rxOld, _rxNew, _rLocale); } - //-------------------------------------------------------------------- + OUString OStaticDataAccessTools::quoteName(const OUString& _rQuote, const OUString& _rName) const { OUString sReturn; @@ -245,7 +245,7 @@ namespace svxform return sReturn; } - // ------------------------------------------------ + OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const { OUString sReturn; @@ -254,7 +254,7 @@ namespace svxform return sReturn; } - //---------------------------------------------------------------- + Reference< XDataSource > OStaticDataAccessTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const { Reference< XDataSource > xReturn; @@ -263,7 +263,7 @@ namespace svxform return xReturn; } - //---------------------------------------------------------------- + sal_Bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const { sal_Bool bRet = sal_False; @@ -272,7 +272,7 @@ namespace svxform return bRet; } - //---------------------------------------------------------------- + sal_Bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const { sal_Bool bRet = sal_False; @@ -281,7 +281,7 @@ namespace svxform return bRet; } - //---------------------------------------------------------------- + Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, const OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) @@ -294,7 +294,7 @@ namespace svxform return aFields; } - //---------------------------------------------------------------- + bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection ) { bool bReturn = false; @@ -303,7 +303,7 @@ namespace svxform return bReturn; } - //---------------------------------------------------------------- + bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent ) { bool bReturn = false; @@ -318,17 +318,17 @@ namespace svxform //==================================================================== //= DBToolsObjectFactory //==================================================================== - //---------------------------------------------------------------- + DBToolsObjectFactory::DBToolsObjectFactory() { } - //---------------------------------------------------------------- + DBToolsObjectFactory::~DBToolsObjectFactory() { } - //---------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( const Reference<XComponentContext>& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn ) diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 667abec6d0d5..2804c2b6ec3c 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -31,7 +31,7 @@ namespace svxform //==================================================================== //= DelayedEvent //==================================================================== - //-------------------------------------------------------------------- + void DelayedEvent::Call( void* _pArg ) { CancelPendingCall(); @@ -40,7 +40,7 @@ namespace svxform m_nEventId = Application::PostUserEvent( LINK( this, DelayedEvent, OnCall ), _pArg ); } - //-------------------------------------------------------------------- + void DelayedEvent::CancelPendingCall() { if ( m_nEventId ) @@ -48,7 +48,7 @@ namespace svxform m_nEventId = 0; } - //-------------------------------------------------------------------- + IMPL_LINK( DelayedEvent, OnCall, void*, _pArg ) { m_nEventId = 0; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 5a4583c43b17..c28932817f4d 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -111,13 +111,13 @@ OFilterItemExchange::OFilterItemExchange() { } -//------------------------------------------------------------------------ + void OFilterItemExchange::AddSupportedFormats() { AddFormat(getFormatId()); } -//------------------------------------------------------------------------ + sal_uInt32 OFilterItemExchange::getFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -129,7 +129,7 @@ sal_uInt32 OFilterItemExchange::getFormatId() return s_nFormat; } -//------------------------------------------------------------------------ + OLocalExchange* OFilterExchangeHelper::createExchange() const { return new OFilterItemExchange; @@ -144,7 +144,7 @@ Image FmFilterData::GetImage() const //======================================================================== TYPEINIT1(FmParentData, FmFilterData); -//------------------------------------------------------------------------ + FmParentData::~FmParentData() { for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin(); @@ -154,7 +154,7 @@ FmParentData::~FmParentData() //======================================================================== TYPEINIT1(FmFormItem, FmParentData); -//------------------------------------------------------------------------ + Image FmFormItem::GetImage() const { static Image aImage; @@ -169,7 +169,7 @@ Image FmFormItem::GetImage() const //======================================================================== TYPEINIT1(FmFilterItems, FmParentData); -//------------------------------------------------------------------------ + FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const { for ( ::std::vector< FmFilterData* >::const_iterator i = m_aChildren.begin(); @@ -185,7 +185,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co return NULL; } -//------------------------------------------------------------------------ + Image FmFilterItems::GetImage() const { static Image aImage; @@ -200,7 +200,7 @@ Image FmFilterItems::GetImage() const //======================================================================== TYPEINIT1(FmFilterItem, FmFilterData); -//------------------------------------------------------------------------ + FmFilterItem::FmFilterItem( FmFilterItems* pParent, const OUString& aFieldName, const OUString& aText, @@ -211,7 +211,7 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent, { } -//------------------------------------------------------------------------ + Image FmFilterItem::GetImage() const { static Image aImage; @@ -322,7 +322,7 @@ public: const OUString& rText); }; -//------------------------------------------------------------------------ + FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers) :m_pModel( pModel ) ,m_xControllers( xControllers ) @@ -330,13 +330,13 @@ FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexA AddOrRemoveListener( m_xControllers, true ); } -//------------------------------------------------------------------------ + void FmFilterAdapter::dispose() throw( RuntimeException ) { AddOrRemoveListener( m_xControllers, false ); } -//------------------------------------------------------------------------ + void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd ) { for (sal_Int32 i = 0, nLen = _rxControllers->getCount(); i < nLen; ++i) @@ -359,7 +359,7 @@ void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxC } } -//------------------------------------------------------------------------ + void FmFilterAdapter::setText(sal_Int32 nRowPos, const FmFilterItem* pFilterItem, const OUString& rText) @@ -379,12 +379,12 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos, // XEventListener -//------------------------------------------------------------------------ + void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( RuntimeException ) { } -//------------------------------------------------------------------------ + namespace { OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl ) @@ -419,7 +419,7 @@ namespace } // XFilterControllerListener -//------------------------------------------------------------------------ + void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -469,7 +469,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th m_pModel->EnsureEmptyFilterRows( *pFormItem ); } -//------------------------------------------------------------------------ + void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -504,7 +504,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event m_pModel->EnsureEmptyFilterRows( *pFormItem ); } -//------------------------------------------------------------------------ + void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -536,7 +536,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) // class FmFilterModel //======================================================================== TYPEINIT1(FmFilterModel, FmParentData); -//------------------------------------------------------------------------ + FmFilterModel::FmFilterModel() :FmParentData(NULL, OUString()) ,OSQLParserClient(comphelper::getProcessComponentContext()) @@ -545,13 +545,13 @@ FmFilterModel::FmFilterModel() { } -//------------------------------------------------------------------------ + FmFilterModel::~FmFilterModel() { Clear(); } -//------------------------------------------------------------------------ + void FmFilterModel::Clear() { // notify @@ -577,7 +577,7 @@ void FmFilterModel::Clear() m_aChildren.clear(); } -//------------------------------------------------------------------------ + void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent) { if ( xCurrent == m_xController ) @@ -610,7 +610,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, const SetCurrentController(xCurrent); } -//------------------------------------------------------------------------ + void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmParentData* pParent) { try @@ -678,7 +678,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar } } -//------------------------------------------------------------------------ + FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XFormController > & xController) const { for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin(); @@ -700,7 +700,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons return NULL; } -//------------------------------------------------------------------------ + FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XForm >& xForm) const { for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin(); @@ -722,7 +722,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons return NULL; } -//------------------------------------------------------------------------ + void FmFilterModel::SetCurrentController(const Reference< XFormController > & xCurrent) { if ( xCurrent == m_xController ) @@ -749,7 +749,7 @@ void FmFilterModel::SetCurrentController(const Reference< XFormController > & xC } } -//------------------------------------------------------------------------ + void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem ) { // insert the condition behind the last filter items @@ -777,7 +777,7 @@ void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem ) } } -//------------------------------------------------------------------------ + void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData) { ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChildren(); @@ -789,7 +789,7 @@ void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, F Broadcast( aInsertedHint ); } -//------------------------------------------------------------------------ + void FmFilterModel::Remove(FmFilterData* pData) { FmParentData* pParent = pData->GetParent(); @@ -853,7 +853,7 @@ void FmFilterModel::Remove(FmFilterData* pData) } } -//------------------------------------------------------------------------ + void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos ) { // remove from parent's child list @@ -867,7 +867,7 @@ void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos ) delete pData; } -//------------------------------------------------------------------------ + sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const { FmFormItem* pFormItem = PTR_CAST( FmFormItem, pItem->GetParent()->GetParent() ); @@ -912,13 +912,13 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr return sal_False; } -//------------------------------------------------------------------------ + void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem) { Insert(pItems->GetChildren().end(), pFilterItem); } -//------------------------------------------------------------------------ + void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText) { ::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChildren(); @@ -938,7 +938,7 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText) } } -//------------------------------------------------------------------------ + void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent) { if (m_pCurrentItems == pCurrent) @@ -983,7 +983,7 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent) Broadcast( aHint ); } -//------------------------------------------------------------------------ + void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem ) { // checks whether for each form there's one free level for input @@ -1033,7 +1033,7 @@ public: }; const int nxDBmp = 12; -//------------------------------------------------------------------------ + void FmFilterItemsString::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry) { @@ -1067,7 +1067,7 @@ void FmFilterItemsString::Paint( rDev.DrawText( Point(rPos.X() + nxDBmp, rPos.Y()), GetText() ); } -//------------------------------------------------------------------------ + void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) @@ -1099,7 +1099,7 @@ public: const int nxD = 4; -//------------------------------------------------------------------------ + void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) @@ -1116,7 +1116,7 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, pViewData->maSize = aSize; } -//------------------------------------------------------------------------ + void FmFilterString::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/) { @@ -1166,14 +1166,14 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) m_aDropActionTimer.SetTimeoutHdl(LINK(this, FmFilterNavigator, OnDropActionTimer)); } -//------------------------------------------------------------------------ + FmFilterNavigator::~FmFilterNavigator() { EndListening( *m_pModel ); delete m_pModel; } -//------------------------------------------------------------------------ + void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent) { if (xCurrent == m_pModel->GetCurrentController()) @@ -1200,7 +1200,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl } } -//------------------------------------------------------------------------ + sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) { m_pEditingCurrently = pEntry; @@ -1210,7 +1210,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rS return pEntry && ((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem); } -//------------------------------------------------------------------------ + sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!"); @@ -1257,7 +1257,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString return sal_True; } -//------------------------------------------------------------------------ + IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry ) { // now remove the entry @@ -1265,7 +1265,7 @@ IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry ) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer) { if (--m_aTimerCounter > 0) @@ -1299,7 +1299,7 @@ IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer) } -//------------------------------------------------------------------------ + sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) { Point aDropPos = rEvt.maPosPixel; @@ -1391,7 +1391,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) return rEvt.mnAction; } -// ----------------------------------------------------------------------------- + namespace { FmFilterItems* getTargetItems(SvTreeListEntry* _pTarget) @@ -1405,7 +1405,7 @@ namespace return pTargetItems; } } -//------------------------------------------------------------------------ + sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) { // ware schlecht, wenn nach dem Droppen noch gescrollt wird ... @@ -1434,7 +1434,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) return sal_True; } -//------------------------------------------------------------------------ + void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, @@ -1453,7 +1453,7 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry, pEntry->ReplaceItem( pString, 1 ); } -//------------------------------------------------------------------------ + sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) @@ -1488,7 +1488,7 @@ sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) return sal_False; } -//------------------------------------------------------------------------ + void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if (rHint.ISA(FmFilterInsertedHint)) @@ -1521,7 +1521,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -//------------------------------------------------------------------------ + SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const { SvTreeListEntry* pEntry = NULL; @@ -1537,7 +1537,7 @@ SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const return pEntry; } -//------------------------------------------------------------------------ + void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) { const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel(); @@ -1549,7 +1549,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) Expand( pParentEntry ); } -//------------------------------------------------------------------------ + void FmFilterNavigator::Remove(FmFilterData* pItem) { // der Entry zu den Daten @@ -1562,7 +1562,7 @@ void FmFilterNavigator::Remove(FmFilterData* pItem) if (pEntry) GetModel()->Remove( pEntry ); } -// ----------------------------------------------------------------------------- + FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem*>& _rItemList) { // be sure that the data is only used within only one form! @@ -1596,7 +1596,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem pFirstItem = NULL; return pFirstItem; } -// ----------------------------------------------------------------------------- + void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy) { ::std::vector<FmFilterItem*>::const_iterator aEnd = _rFilterList.end(); @@ -1627,7 +1627,7 @@ void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rF m_pModel->EnsureEmptyFilterRows( *_pTargetItems->GetParent() ); } -//------------------------------------------------------------------------------ + void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { EndSelection(); @@ -1644,7 +1644,7 @@ void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi } } -//------------------------------------------------------------------------------ + void FmFilterNavigator::Command( const CommandEvent& rEvt ) { sal_Bool bHandled = sal_False; @@ -1746,7 +1746,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) if (!bHandled) SvTreeListBox::Command( rEvt ); } -// ----------------------------------------------------------------------------- + SvTreeListEntry* FmFilterNavigator::getNextEntry(SvTreeListEntry* _pStartWith) { SvTreeListEntry* pEntry = _pStartWith ? _pStartWith : LastSelected(); @@ -1756,7 +1756,7 @@ SvTreeListEntry* FmFilterNavigator::getNextEntry(SvTreeListEntry* _pStartWith) pEntry = Next(pEntry); return pEntry; } -// ----------------------------------------------------------------------------- + SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith) { SvTreeListEntry* pEntry = _pStartWith ? _pStartWith : FirstSelected(); @@ -1771,7 +1771,7 @@ SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith) } return pEntry; } -//------------------------------------------------------------------------ + void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt) { const KeyCode& rKeyCode = rKEvt.GetKeyCode(); @@ -1855,7 +1855,7 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt) SvTreeListBox::KeyInput(rKEvt); } -//------------------------------------------------------------------------------ + void FmFilterNavigator::DeleteSelection() { // to avoid the deletion of an entry twice (e.g. deletion of a parent and afterward @@ -1884,7 +1884,7 @@ void FmFilterNavigator::DeleteSelection() m_pModel->Remove((FmFilterData*)(*i)->GetUserData()); } } -// ----------------------------------------------------------------------------- + //======================================================================== // class FmFilterNavigatorWin @@ -1902,13 +1902,13 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin SfxDockingWindow::SetFloatingSize( Size(200,200) ); } -//------------------------------------------------------------------------ + FmFilterNavigatorWin::~FmFilterNavigatorWin() { delete m_pNavigator; } -//----------------------------------------------------------------------- + void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell) { if (!pFormShell) @@ -1932,7 +1932,7 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell) } } -//----------------------------------------------------------------------- + void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( !pState || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID ) @@ -1947,7 +1947,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c UpdateContent( NULL ); } -//----------------------------------------------------------------------- + bool FmFilterNavigatorWin::Close() { if ( m_pNavigator && m_pNavigator->IsEditingActive() ) @@ -1961,14 +1961,14 @@ bool FmFilterNavigatorWin::Close() return SfxDockingWindow::Close(); } -//----------------------------------------------------------------------- + void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const { SfxDockingWindow::FillInfo( rInfo ); rInfo.bVisible = sal_False; } -//----------------------------------------------------------------------- + Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign ) { if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) ) @@ -1977,7 +1977,7 @@ Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign ) return SfxDockingWindow::CalcDockingSize( eAlign ); } -//----------------------------------------------------------------------- + SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { switch (eAlign) @@ -1993,7 +1993,7 @@ SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAl return (eActAlign); } -//------------------------------------------------------------------------ + void FmFilterNavigatorWin::Resize() { SfxDockingWindow::Resize(); @@ -2008,14 +2008,14 @@ void FmFilterNavigatorWin::Resize() m_pNavigator->SetPosSizePixel( aExplPos, aExplSize ); } -// ----------------------------------------------------------------------------- + void FmFilterNavigatorWin::GetFocus() { // oj #97405# if ( m_pNavigator ) m_pNavigator->GrabFocus(); } -// ----------------------------------------------------------------------------- + //======================================================================== @@ -2023,7 +2023,7 @@ void FmFilterNavigatorWin::GetFocus() //======================================================================== SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR ) -//----------------------------------------------------------------------- + FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( Window *_pParent, sal_uInt16 _nId, SfxBindings *_pBindings, SfxChildWinInfo* _pInfo ) :SfxChildWindow( _pParent, _nId ) diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 1c24dbc2da06..db0fc3a19738 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -78,10 +78,10 @@ using ::com::sun::star::awt::XWindow; //======================================================================== //= FmPropBrwMgr //======================================================================== -//----------------------------------------------------------------------- + SFX_IMPL_FLOATINGWINDOW(FmPropBrwMgr, SID_FM_SHOW_PROPERTIES) -//----------------------------------------------------------------------- + FmPropBrwMgr::FmPropBrwMgr( Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) @@ -190,7 +190,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) // class FmPropBrw //======================================================================== DBG_NAME(FmPropBrw); -//------------------------------------------------------------------------ + FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo ) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) ) @@ -240,7 +240,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* m_sLastActivePage = _pInfo->aExtraString; } -//------------------------------------------------------------------------ + void FmPropBrw::Resize() { SfxFloatingWindow::Resize(); @@ -259,7 +259,7 @@ void FmPropBrw::Resize() } } -//------------------------------------------------------------------------ + FmPropBrw::~FmPropBrw() { if (m_xBrowserController.is()) @@ -287,7 +287,7 @@ FmPropBrw::~FmPropBrw() DBG_DTOR(FmPropBrw,NULL); } -//----------------------------------------------------------------------- + OUString FmPropBrw::getCurrentPage() const { OUString sCurrentPage; @@ -308,7 +308,7 @@ OUString FmPropBrw::getCurrentPage() const return sCurrentPage; } -//----------------------------------------------------------------------- + void FmPropBrw::implDetachController() { m_sLastActivePage = getCurrentPage(); @@ -336,7 +336,7 @@ void FmPropBrw::implDetachController() m_xMeAsFrame.clear(); } -//----------------------------------------------------------------------- + bool FmPropBrw::Close() { // suspend the controller (it is allowed to veto) @@ -375,7 +375,7 @@ bool FmPropBrw::Close() return bClose; } -//----------------------------------------------------------------------- + bool FmPropBrw::implIsReadOnlyModel() const { try @@ -391,7 +391,7 @@ bool FmPropBrw::implIsReadOnlyModel() const return true; } -//----------------------------------------------------------------------- + void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) { if ( m_xBrowserController.is() ) @@ -482,14 +482,14 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) } } -//----------------------------------------------------------------------- + void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const { rInfo.bVisible = sal_False; rInfo.aExtraString = getCurrentPage(); } -//----------------------------------------------------------------------- + IMPL_LINK( FmPropBrw, OnAsyncGetFocus, void*, /*NOTINTERESTEDIN*/ ) { if (m_xBrowserComponentWindow.is()) @@ -497,7 +497,7 @@ IMPL_LINK( FmPropBrw, OnAsyncGetFocus, void*, /*NOTINTERESTEDIN*/ ) return 0L; } -//----------------------------------------------------------------------- + namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) @@ -513,7 +513,7 @@ namespace return bEnabled; } } -//----------------------------------------------------------------------- + void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) { // the document in which we live @@ -595,7 +595,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) } } -//----------------------------------------------------------------------- + void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell ) { // the document in which we live @@ -628,7 +628,7 @@ void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell ) m_xLastKnownDocument = xDocument; } -//----------------------------------------------------------------------- + void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { if (!pState || SID_FM_PROPERTY_CONTROL != nSID) diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index df4a49bbeaaf..45e0bc23f792 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -39,7 +39,7 @@ namespace svxform //==================================================================== //= helper //==================================================================== - //-------------------------------------------------------------------- + static void setUnderline( const Reference< XVclWindowPeer >& _rxPeer, const UnderlineDescriptor& _rUnderline ) { OSL_ENSURE( _rxPeer.is(), "setUnderline: invalid peer!" ); @@ -53,7 +53,7 @@ namespace svxform _rxPeer->setProperty( FM_PROP_TEXTLINECOLOR, makeAny( _rUnderline.nUnderlineColor ) ); } - //-------------------------------------------------------------------- + static void getUnderline( const Reference< XVclWindowPeer >& _rxPeer, UnderlineDescriptor& _rUnderline ) { OSL_ENSURE( _rxPeer.is(), "getUnderline: invalid peer!" ); @@ -65,7 +65,7 @@ namespace svxform OSL_VERIFY( _rxPeer->getProperty( FM_PROP_TEXTLINECOLOR ) >>= _rUnderline.nUnderlineColor ); } - //-------------------------------------------------------------------- + static void getBorder( const Reference< XVclWindowPeer >& _rxPeer, BorderDescriptor& _rBoder ) { OSL_ENSURE( _rxPeer.is(), "getBorder: invalid peer!" ); @@ -74,7 +74,7 @@ namespace svxform OSL_VERIFY( _rxPeer->getProperty( FM_PROP_BORDERCOLOR ) >>= _rBoder.nBorderColor ); } - //-------------------------------------------------------------------- + static void setBorder( const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rBoder ) { OSL_ENSURE( _rxPeer.is(), "setBorder: invalid peer!" ); @@ -86,7 +86,7 @@ namespace svxform //==================================================================== //= ControlBorderManager //==================================================================== - //-------------------------------------------------------------------- + ControlBorderManager::ControlBorderManager() :m_nFocusColor ( 0x000000FF ) ,m_nMouseHoveColor( 0x007098BE ) @@ -95,12 +95,12 @@ namespace svxform { } - //-------------------------------------------------------------------- + ControlBorderManager::~ControlBorderManager() { } - //-------------------------------------------------------------------- + bool ControlBorderManager::canColorBorder( const Reference< XVclWindowPeer >& _rxPeer ) { OSL_PRECOND( _rxPeer.is(), "ControlBorderManager::canColorBorder: invalid peer!" ); @@ -135,7 +135,7 @@ namespace svxform return false; } - //-------------------------------------------------------------------- + ControlStatus ControlBorderManager::getControlStatus( const Reference< XControl >& _rxControl ) SAL_THROW(()) { ControlStatus nStatus = CONTROL_STATUS_NONE; @@ -152,7 +152,7 @@ namespace svxform return nStatus; } - //-------------------------------------------------------------------- + sal_Int32 ControlBorderManager::getControlColorByStatus( ControlStatus _nStatus ) { // "invalid" is ranked highest @@ -171,7 +171,7 @@ namespace svxform return 0x00000000; } - //-------------------------------------------------------------------- + void ControlBorderManager::updateBorderStyle( const Reference< XControl >& _rxControl, const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rFallback ) SAL_THROW(()) { OSL_PRECOND( _rxControl.is() && _rxPeer.is(), "ControlBorderManager::updateBorderStyle: invalid parameters!" ); @@ -187,7 +187,7 @@ namespace svxform setBorder( _rxPeer, aBorder ); } - //-------------------------------------------------------------------- + void ControlBorderManager::determineOriginalBorderStyle( const Reference< XControl >& _rxControl, BorderDescriptor& _rData ) const { _rData = ControlData(); @@ -214,7 +214,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void ControlBorderManager::controlStatusGained( const Reference< XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(()) { if ( _rxControl == _rControlData.xControl ) @@ -247,7 +247,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void ControlBorderManager::controlStatusLost( const Reference< XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(()) { if ( _rxControl != _rControlData.xControl ) @@ -271,20 +271,20 @@ namespace svxform } } - //-------------------------------------------------------------------- + void ControlBorderManager::enableDynamicBorderColor( ) { m_bDynamicBorderColors = true; } - //-------------------------------------------------------------------- + void ControlBorderManager::disableDynamicBorderColor( ) { m_bDynamicBorderColors = false; restoreAll(); } - //-------------------------------------------------------------------- + void ControlBorderManager::setStatusColor( ControlStatus _nStatus, sal_Int32 _nColor ) { switch ( _nStatus ) @@ -303,7 +303,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void ControlBorderManager::restoreAll() { if ( m_aFocusControl.xControl.is() ) @@ -329,35 +329,35 @@ namespace svxform } } - //-------------------------------------------------------------------- + void ControlBorderManager::focusGained( const Reference< XInterface >& _rxControl ) SAL_THROW(()) { if ( m_bDynamicBorderColors ) controlStatusGained( _rxControl, m_aFocusControl ); } - //-------------------------------------------------------------------- + void ControlBorderManager::focusLost( const Reference< XInterface >& _rxControl ) SAL_THROW(()) { if ( m_bDynamicBorderColors ) controlStatusLost( _rxControl, m_aFocusControl ); } - //-------------------------------------------------------------------- + void ControlBorderManager::mouseEntered( const Reference< XInterface >& _rxControl ) SAL_THROW(()) { if ( m_bDynamicBorderColors ) controlStatusGained( _rxControl, m_aMouseHoverControl ); } - //-------------------------------------------------------------------- + void ControlBorderManager::mouseExited( const Reference< XInterface >& _rxControl ) SAL_THROW(()) { if ( m_bDynamicBorderColors ) controlStatusLost( _rxControl, m_aMouseHoverControl ); } - //-------------------------------------------------------------------- + void ControlBorderManager::validityChanged( const Reference< XControl >& _rxControl, const Reference< XValidatableFormComponent >& _rxValidatable ) SAL_THROW(()) { try diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 1a2a3b8fe449..215ffa838aa3 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -70,7 +70,7 @@ namespace svxform namespace VisualEffect = ::com::sun::star::awt::VisualEffect; namespace ScriptType = ::com::sun::star::i18n::ScriptType; - //-------------------------------------------------------------------- + namespace { //.................................................................... @@ -193,7 +193,7 @@ namespace svxform //==================================================================== //= ControlLayouter //==================================================================== - //-------------------------------------------------------------------- + Reference< XPropertySet > ControlLayouter::getDefaultDocumentTextStyle( const Reference< XPropertySet >& _rxModel ) { // the style family collection @@ -210,7 +210,7 @@ namespace svxform return Reference< XPropertySet >( xStyleFamily->getByName( sStyleName ), UNO_QUERY_THROW ); } - //-------------------------------------------------------------------- + void ControlLayouter::initializeControlLayout( const Reference< XPropertySet >& _rxControlModel, DocumentType _eDocType ) { DBG_ASSERT( _rxControlModel.is(), "ControlLayouter::initializeControlLayout: invalid model!" ); @@ -279,7 +279,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { OUString sConfigName = "/org.openoffice.Office.Common/Forms/ControlLayout/"; @@ -289,7 +289,7 @@ namespace svxform sConfigName ); } - //-------------------------------------------------------------------- + bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType ) { OConfigurationNode aConfig = getLayoutSettings( _eDocType ); @@ -299,7 +299,7 @@ namespace svxform return bDynamicBorderColor; } - //-------------------------------------------------------------------- + bool ControlLayouter::useDocumentReferenceDevice( DocumentType _eDocType ) { if ( _eDocType == eUnknownDocumentType ) diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 6012e9c2009d..d1403f689ff9 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -27,7 +27,7 @@ using namespace ::svxform; -//----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; @@ -46,7 +46,7 @@ using namespace ::svxform; return xRet; } -//----------------------------------------------------------------------------- + // Encapsulation violation: We *know* that // SvxUnoDrawMSFactory::createInstanceWithArguments() always throws. @@ -60,7 +60,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH SAL_WNOUNREACHABLE_CODE_POP -//----------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { static const OUString aSvxComponentServiceNameList[] = diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index 35a6f7bba458..cbdcd6e0ad79 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -78,14 +78,14 @@ namespace svxform //==================================================================== namespace { - //---------------------------------------------------------------- + struct ModuleInfo { const sal_Char* pAsciiModuleOrServiceName; DocumentType eType; }; - //---------------------------------------------------------------- + const ModuleInfo* lcl_getModuleInfo() { static const ModuleInfo aModuleInfo[] = @@ -108,7 +108,7 @@ namespace svxform //==================================================================== //= DocumentClassification //==================================================================== - //-------------------------------------------------------------------- + DocumentType DocumentClassification::classifyDocument( const Reference< XModel >& _rxDocumentModel ) SAL_THROW(()) { DocumentType eType( eUnknownDocumentType ); @@ -147,7 +147,7 @@ namespace svxform return eType; } - //-------------------------------------------------------------------- + DocumentType DocumentClassification::classifyHostDocument( const Reference< XInterface >& _rxFormComponent ) SAL_THROW(()) { DocumentType eType( eUnknownDocumentType ); @@ -167,7 +167,7 @@ namespace svxform return eType; } - //-------------------------------------------------------------------- + DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const OUString& _rModuleIdentifier ) { const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); @@ -180,7 +180,7 @@ namespace svxform return eUnknownDocumentType; } - //-------------------------------------------------------------------- + OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType ) { const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index c137183caf2f..ca1e27c06846 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -39,14 +39,14 @@ namespace svxform //==================================================================== //= OLocalExchange //==================================================================== - //-------------------------------------------------------------------- + OLocalExchange::OLocalExchange( ) :m_bDragging( sal_False ) ,m_bClipboardOwner( sal_False ) { } - //-------------------------------------------------------------------- + void OLocalExchange::copyToClipboard( Window* _pWindow, const GrantAccess& ) { if ( m_bClipboardOwner ) @@ -59,7 +59,7 @@ namespace svxform CopyToClipboard( _pWindow ); } - //-------------------------------------------------------------------- + void OLocalExchange::clear() { if ( isClipboardOwner() ) @@ -78,7 +78,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) throw(RuntimeException) { TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans ); @@ -88,21 +88,21 @@ namespace svxform m_aClipboardListener.Call( this ); } - //-------------------------------------------------------------------- + void OLocalExchange::startDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& ) { m_bDragging = sal_True; StartDrag( _pWindow, _nDragSourceActions ); } - //-------------------------------------------------------------------- + void OLocalExchange::DragFinished( sal_Int8 nDropAction ) { TransferableHelper::DragFinished( nDropAction ); m_bDragging = sal_False; } - //-------------------------------------------------------------------- + sal_Bool OLocalExchange::hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId ) { DataFlavorExVector::const_iterator aSearch; @@ -114,7 +114,7 @@ namespace svxform return aSearch != _rFormats.end(); } - //-------------------------------------------------------------------- + sal_Bool OLocalExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& /*_rFlavor*/ ) { return sal_False; // do not have any formats by default @@ -123,13 +123,13 @@ namespace svxform //==================================================================== //= OControlTransferData //==================================================================== - //-------------------------------------------------------------------- + OControlTransferData::OControlTransferData( ) :m_pFocusEntry( NULL ) { } - //-------------------------------------------------------------------- + OControlTransferData::OControlTransferData( const Reference< XTransferable >& _rxTransferable ) :m_pFocusEntry( NULL ) { @@ -161,14 +161,14 @@ namespace svxform updateFormats( ); } - //-------------------------------------------------------------------- + static sal_Bool lcl_fillDataFlavorEx( SotFormatStringId nId, DataFlavorEx& _rFlavor ) { _rFlavor.mnSotId = nId; return SotExchange::GetFormatDataFlavor( _rFlavor.mnSotId, _rFlavor ); } - //-------------------------------------------------------------------- + void OControlTransferData::updateFormats( ) { m_aCurrentFormats.clear(); @@ -195,32 +195,32 @@ namespace svxform } } - //-------------------------------------------------------------------- + size_t OControlTransferData::onEntryRemoved( SvTreeListEntry* _pEntry ) { m_aSelectedEntries.erase( _pEntry ); return m_aSelectedEntries.size(); } - //-------------------------------------------------------------------- + void OControlTransferData::addSelectedEntry( SvTreeListEntry* _pEntry ) { m_aSelectedEntries.insert( _pEntry ); } - //-------------------------------------------------------------------- + void OControlTransferData::setFocusEntry( SvTreeListEntry* _pFocusEntry ) { m_pFocusEntry = _pFocusEntry; } - //------------------------------------------------------------------------ + void OControlTransferData::addHiddenControlsFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > seqInterfaces) { m_aHiddenControlModels = seqInterfaces; } - //------------------------------------------------------------------------ + void OControlTransferData::buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot) { m_aControlPaths.realloc(0); @@ -261,7 +261,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void OControlTransferData::buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot) { ListBoxEntrySet aEmpty; @@ -284,12 +284,12 @@ namespace svxform //==================================================================== //= OControlExchange //==================================================================== - //-------------------------------------------------------------------- + OControlExchange::OControlExchange( ) { } - //-------------------------------------------------------------------- + sal_Bool OControlExchange::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); @@ -315,7 +315,7 @@ namespace svxform return sal_True; } - //-------------------------------------------------------------------- + void OControlExchange::AddSupportedFormats() { if (m_pFocusEntry && !m_aSelectedEntries.empty()) @@ -328,7 +328,7 @@ namespace svxform AddFormat(getHiddenControlModelsFormatId()); } - //-------------------------------------------------------------------- + sal_uInt32 OControlExchange::getControlPathFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -340,7 +340,7 @@ namespace svxform return s_nFormat; } - //-------------------------------------------------------------------- + sal_uInt32 OControlExchange::getHiddenControlModelsFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -352,7 +352,7 @@ namespace svxform return s_nFormat; } - //-------------------------------------------------------------------- + sal_uInt32 OControlExchange::getFieldExchangeFormatId() { static sal_uInt32 s_nFormat = (sal_uInt32)-1; @@ -375,34 +375,34 @@ namespace svxform //==================================================================== //= OLocalExchangeHelper //==================================================================== - //-------------------------------------------------------------------- + OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource) :m_pDragSource(_pDragSource) ,m_pTransferable(NULL) { } - //-------------------------------------------------------------------- + OLocalExchangeHelper::~OLocalExchangeHelper() { implReset(); } - //-------------------------------------------------------------------- + void OLocalExchangeHelper::startDrag( sal_Int8 nDragSourceActions ) { DBG_ASSERT(m_pTransferable, "OLocalExchangeHelper::startDrag: not prepared!"); m_pTransferable->startDrag( m_pDragSource, nDragSourceActions, OLocalExchange::GrantAccess() ); } - //-------------------------------------------------------------------- + void OLocalExchangeHelper::copyToClipboard( ) const { DBG_ASSERT( m_pTransferable, "OLocalExchangeHelper::copyToClipboard: not prepared!" ); m_pTransferable->copyToClipboard( m_pDragSource, OLocalExchange::GrantAccess() ); } - //-------------------------------------------------------------------- + void OLocalExchangeHelper::implReset() { if (m_pTransferable) @@ -413,7 +413,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void OLocalExchangeHelper::prepareDrag( ) { DBG_ASSERT(!m_pTransferable || !m_pTransferable->isDragging(), "OLocalExchangeHelper::prepareDrag: recursive DnD?"); diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 3a6076ad15a8..610060d0335f 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::container; //======================================================================== TYPEINIT1( FmNavInsertedHint, SfxHint ); DBG_NAME(FmNavInsertedHint); -//------------------------------------------------------------------------ + FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos ) :pEntryData( pInsertedEntryData ) ,nPos( nRelPos ) @@ -85,7 +85,7 @@ FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt3 DBG_CTOR(FmNavInsertedHint,NULL); } -//------------------------------------------------------------------------ + FmNavInsertedHint::~FmNavInsertedHint() { DBG_DTOR(FmNavInsertedHint,NULL); @@ -97,14 +97,14 @@ FmNavInsertedHint::~FmNavInsertedHint() //======================================================================== TYPEINIT1( FmNavModelReplacedHint, SfxHint ); DBG_NAME(FmNavModelReplacedHint); -//------------------------------------------------------------------------ + FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData* pAffectedEntryData ) :pEntryData( pAffectedEntryData ) { DBG_CTOR(FmNavModelReplacedHint,NULL); } -//------------------------------------------------------------------------ + FmNavModelReplacedHint::~FmNavModelReplacedHint() { DBG_DTOR(FmNavModelReplacedHint,NULL); @@ -115,14 +115,14 @@ FmNavModelReplacedHint::~FmNavModelReplacedHint() //======================================================================== TYPEINIT1( FmNavRemovedHint, SfxHint ); DBG_NAME(FmNavRemovedHint); -//------------------------------------------------------------------------ + FmNavRemovedHint::FmNavRemovedHint( FmEntryData* pRemovedEntryData ) :pEntryData( pRemovedEntryData ) { DBG_CTOR(FmNavRemovedHint,NULL); } -//------------------------------------------------------------------------ + FmNavRemovedHint::~FmNavRemovedHint() { DBG_DTOR(FmNavRemovedHint,NULL); @@ -134,7 +134,7 @@ FmNavRemovedHint::~FmNavRemovedHint() //======================================================================== TYPEINIT1( FmNavNameChangedHint, SfxHint ); DBG_NAME(FmNavNameChangedHint); -//------------------------------------------------------------------------ + FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ) :pEntryData( pData ) ,aNewName( rNewName ) @@ -142,7 +142,7 @@ FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& DBG_CTOR(FmNavNameChangedHint,NULL); } -//------------------------------------------------------------------------ + FmNavNameChangedHint::~FmNavNameChangedHint() { DBG_DTOR(FmNavNameChangedHint,NULL); @@ -153,13 +153,13 @@ FmNavNameChangedHint::~FmNavNameChangedHint() //======================================================================== TYPEINIT1( FmNavClearedHint, SfxHint ); DBG_NAME(FmNavClearedHint); -//------------------------------------------------------------------------ + FmNavClearedHint::FmNavClearedHint() { DBG_CTOR(FmNavClearedHint,NULL); } -//------------------------------------------------------------------------ + FmNavClearedHint::~FmNavClearedHint() { DBG_DTOR(FmNavClearedHint,NULL); @@ -179,19 +179,19 @@ TYPEINIT1(FmNavViewMarksChanged, SfxHint); // class FmEntryDataList //======================================================================== DBG_NAME(FmEntryDataList); -//------------------------------------------------------------------------ + FmEntryDataList::FmEntryDataList() { DBG_CTOR(FmEntryDataList,NULL); } -//------------------------------------------------------------------------ + FmEntryDataList::~FmEntryDataList() { DBG_DTOR(FmEntryDataList,NULL); } -//------------------------------------------------------------------------ + FmEntryData* FmEntryDataList::remove( FmEntryData* pItem ) { for ( FmEntryDataBaseList::iterator it = maEntryDataList.begin(); @@ -208,7 +208,7 @@ FmEntryData* FmEntryDataList::remove( FmEntryData* pItem ) return pItem; } -//------------------------------------------------------------------------ + void FmEntryDataList::insert( FmEntryData* pItem, size_t Index ) { if ( Index < maEntryDataList.size() ) @@ -221,7 +221,7 @@ void FmEntryDataList::insert( FmEntryData* pItem, size_t Index ) maEntryDataList.push_back( pItem ); } -//------------------------------------------------------------------------ + void FmEntryDataList::clear() { for ( size_t i = 0, n = maEntryDataList.size(); i < n; ++i ) @@ -234,7 +234,7 @@ void FmEntryDataList::clear() //======================================================================== TYPEINIT0( FmEntryData ); DBG_NAME(FmEntryData); -//------------------------------------------------------------------------ + FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace ) :pParent( pParentData ) { @@ -244,7 +244,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface newObject( _rxIFace ); } -//------------------------------------------------------------------------ + FmEntryData::~FmEntryData() { Clear(); @@ -252,7 +252,7 @@ FmEntryData::~FmEntryData() DBG_DTOR(FmEntryData,NULL); } -//------------------------------------------------------------------------ + void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ) { // do not just copy, normalize it @@ -261,7 +261,7 @@ void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun: m_xChild = m_xChild.query( m_xNormalizedIFace ); } -//------------------------------------------------------------------------ + FmEntryData::FmEntryData( const FmEntryData& rEntryData ) { pChildList = new FmEntryDataList(); @@ -283,13 +283,13 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData ) m_xChild = rEntryData.m_xChild; } -//------------------------------------------------------------------------ + void FmEntryData::Clear() { GetChildList()->clear(); } -//------------------------------------------------------------------------ + sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData ) { if(this == pEntryData) @@ -322,7 +322,7 @@ sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData ) //======================================================================== TYPEINIT1( FmFormData, FmEntryData ); DBG_NAME(FmFormData); -//------------------------------------------------------------------------ + FmFormData::FmFormData( const Reference< XForm >& _rxForm, const ImageList& _rNormalImages, @@ -352,13 +352,13 @@ FmFormData::FmFormData( SetText( OUString() ); } -//------------------------------------------------------------------------ + FmFormData::~FmFormData() { DBG_DTOR(FmEntryData,NULL); } -//------------------------------------------------------------------------ + FmFormData::FmFormData( const FmFormData& rFormData ) :FmEntryData( rFormData ) { @@ -366,13 +366,13 @@ FmFormData::FmFormData( const FmFormData& rFormData ) m_xForm = rFormData.GetFormIface(); } -//------------------------------------------------------------------------ + FmEntryData* FmFormData::Clone() { return new FmFormData( *this ); } -//------------------------------------------------------------------------ + sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) { if(this == pEntryData) @@ -392,7 +392,7 @@ sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) //======================================================================== TYPEINIT1( FmControlData, FmEntryData ); DBG_NAME(FmControlData); -//------------------------------------------------------------------------ + FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, const ImageList& _rNormalImages, @@ -415,13 +415,13 @@ FmControlData::FmControlData( } } -//------------------------------------------------------------------------ + FmControlData::~FmControlData() { DBG_DTOR(FmControlData,NULL); } -//------------------------------------------------------------------------ + FmControlData::FmControlData( const FmControlData& rControlData ) :FmEntryData( rControlData ) { @@ -429,13 +429,13 @@ FmControlData::FmControlData( const FmControlData& rControlData ) m_xFormComponent = rControlData.GetFormComponent(); } -//------------------------------------------------------------------------ + FmEntryData* FmControlData::Clone() { return new FmControlData( *this ); } -//------------------------------------------------------------------------ + Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const { ////////////////////////////////////////////////////////////////////// @@ -543,7 +543,7 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const return aImage; } -//------------------------------------------------------------------------ + sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData ) { if(this == pEntryData) @@ -559,7 +559,7 @@ sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData ) return FmEntryData::IsEqualWithoutChildren( pControlData ); } -//------------------------------------------------------------------------ + void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, const ImageList& _rNormalImages @@ -581,7 +581,7 @@ namespace svxform // class NavigatorFrame //======================================================================== DBG_NAME(NavigatorFrame) - //------------------------------------------------------------------------ + NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) @@ -596,20 +596,20 @@ namespace svxform SfxDockingWindow::SetFloatingSize( Size(200,200) ); } - //------------------------------------------------------------------------ + NavigatorFrame::~NavigatorFrame() { delete m_pNavigatorTree; DBG_DTOR(NavigatorFrame,NULL); } - //----------------------------------------------------------------------- + void NavigatorFrame::UpdateContent( FmFormShell* pFormShell ) { m_pNavigatorTree->UpdateContent( pFormShell ); } - //----------------------------------------------------------------------- + void NavigatorFrame::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( !pState || SID_FM_FMEXPLORER_CONTROL != nSID ) @@ -624,7 +624,7 @@ namespace svxform UpdateContent( NULL ); } - //----------------------------------------------------------------------- + void NavigatorFrame::GetFocus() { if ( m_pNavigatorTree ) @@ -633,21 +633,21 @@ namespace svxform SfxDockingWindow::GetFocus(); } - //----------------------------------------------------------------------- + bool NavigatorFrame::Close() { UpdateContent( NULL ); return SfxDockingWindow::Close(); } - //----------------------------------------------------------------------- + void NavigatorFrame::FillInfo( SfxChildWinInfo& rInfo ) const { SfxDockingWindow::FillInfo( rInfo ); rInfo.bVisible = sal_False; } - //----------------------------------------------------------------------- + Size NavigatorFrame::CalcDockingSize( SfxChildAlignment eAlign ) { if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) ) @@ -656,7 +656,7 @@ namespace svxform return SfxDockingWindow::CalcDockingSize( eAlign ); } - //----------------------------------------------------------------------- + SfxChildAlignment NavigatorFrame::CheckAlignment( SfxChildAlignment _eActAlign, SfxChildAlignment _eAlign ) { if ( ( _eAlign == SFX_ALIGN_LEFT ) || ( _eAlign == SFX_ALIGN_RIGHT ) || ( _eAlign == SFX_ALIGN_NOALIGNMENT ) ) @@ -664,7 +664,7 @@ namespace svxform return _eActAlign; } - //------------------------------------------------------------------------ + void NavigatorFrame::Resize() { SfxDockingWindow::Resize(); @@ -685,10 +685,10 @@ namespace svxform // class NavigatorFrameManager //======================================================================== - //----------------------------------------------------------------------- + SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER ) - //----------------------------------------------------------------------- + NavigatorFrameManager::NavigatorFrameManager( Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) :SfxChildWindow( _pParent, _nId ) diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index 6759276e582a..c46e421b7bfd 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -27,27 +27,27 @@ //======================================================================== TYPEINIT1(FmInterfaceItem, SfxPoolItem); -//------------------------------------------------------------------------------ + bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); return( xInterface == ((FmInterfaceItem&)rAttr).GetInterface() ); } -//------------------------------------------------------------------------------ + SfxPoolItem* FmInterfaceItem::Clone( SfxItemPool* ) const { return new FmInterfaceItem( *this ); } -//------------------------------------------------------------------------------ + SvStream& FmInterfaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { OSL_FAIL( "FmInterfaceItem::Store: not implemented!" ); return rStrm; } -//------------------------------------------------------------------------------ + SfxPoolItem* FmInterfaceItem::Create( SvStream& /*rStrm*/, sal_uInt16 ) const { OSL_FAIL( "FmInterfaceItem::Create: not implemented!" ); diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index ce67f0f16d6b..f05aa25c969c 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -218,13 +218,13 @@ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum) return pPage; } -//------------------------------------------------------------------------ + SdrLayerID FmFormModel::GetControlExportLayerId( const SdrObject& rObj ) const { return rObj.GetLayer(); } -//------------------------------------------------------------------------ + void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _bForce ) { if( ( _bOpenDesignMode != m_bOpenInDesignMode ) || _bForce ) @@ -238,19 +238,19 @@ void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _ m_pImpl->bOpenInDesignIsDefaulted = sal_False; } -//------------------------------------------------------------------------ + void FmFormModel::SetOpenInDesignMode( sal_Bool bOpenDesignMode ) { implSetOpenInDesignMode( bOpenDesignMode, sal_False ); } -//------------------------------------------------------------------------ + sal_Bool FmFormModel::OpenInDesignModeIsDefaulted( ) { return m_pImpl->bOpenInDesignIsDefaulted; } -//------------------------------------------------------------------------ + sal_Bool FmFormModel::ControlsUseRefDevice() const { if ( !m_pImpl->aControlsUseRefDevice ) @@ -263,7 +263,7 @@ sal_Bool FmFormModel::ControlsUseRefDevice() const return *m_pImpl->aControlsUseRefDevice; } -//------------------------------------------------------------------------ + void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus ) { if( _bAutoControlFocus != m_bAutoControlFocus ) @@ -273,7 +273,7 @@ void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus ) } } -//------------------------------------------------------------------------ + void FmFormModel::SetObjectShell( SfxObjectShell* pShell ) { if (pShell == m_pObjShell) @@ -298,7 +298,7 @@ void FmFormModel::SetObjectShell( SfxObjectShell* pShell ) } } -//------------------------------------------------------------------------ + FmXUndoEnvironment& FmFormModel::GetUndoEnv() { return *m_pImpl->pUndoEnv; diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index f4321fb62a41..da83d8549301 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -58,7 +58,7 @@ using namespace ::svxform; TYPEINIT1(FmFormObj, SdrUnoObj); DBG_NAME(FmFormObj); -//------------------------------------------------------------------ + FmFormObj::FmFormObj(const OUString& rModelName) :SdrUnoObj ( rModelName ) ,m_nPos ( -1 ) @@ -71,7 +71,7 @@ FmFormObj::FmFormObj(const OUString& rModelName) impl_checkRefDevice_nothrow( true ); } -//------------------------------------------------------------------ + FmFormObj::FmFormObj() :SdrUnoObj ( "" ) ,m_nPos ( -1 ) @@ -80,7 +80,7 @@ FmFormObj::FmFormObj() DBG_CTOR(FmFormObj, NULL); } -//------------------------------------------------------------------ + FmFormObj::~FmFormObj() { DBG_DTOR(FmFormObj, NULL); @@ -92,7 +92,7 @@ FmFormObj::~FmFormObj() m_aEventsHistory.realloc(0); } -//------------------------------------------------------------------ + void FmFormObj::SetObjEnv(const Reference< XIndexContainer > & xForm, const sal_Int32 nIdx, const Sequence< ScriptEventDescriptor >& rEvts) { @@ -101,7 +101,7 @@ void FmFormObj::SetObjEnv(const Reference< XIndexContainer > & xForm, const sal_ m_nPos = nIdx; } -//------------------------------------------------------------------ + void FmFormObj::ClearObjEnv() { m_xParent.clear(); @@ -109,7 +109,7 @@ void FmFormObj::ClearObjEnv() m_nPos = -1; } -//------------------------------------------------------------------ + void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) { const FmFormModel* pFormModel = PTR_CAST( FmFormModel, GetModel() ); @@ -148,7 +148,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) } } -//------------------------------------------------------------------ + void FmFormObj::impl_isolateControlModel_nothrow() { try @@ -170,7 +170,7 @@ void FmFormObj::impl_isolateControlModel_nothrow() } } -//------------------------------------------------------------------ + void FmFormObj::SetPage(SdrPage* _pNewPage) { if ( GetPage() == _pNewPage ) @@ -328,19 +328,19 @@ void FmFormObj::SetPage(SdrPage* _pNewPage) pNewFormPage->GetImpl().formObjectInserted( *this ); } -//------------------------------------------------------------------ + sal_uInt32 FmFormObj::GetObjInventor() const { return FmFormInventor; } -//------------------------------------------------------------------ + sal_uInt16 FmFormObj::GetObjIdentifier() const { return OBJ_UNO; } -//------------------------------------------------------------------ + void FmFormObj::clonedFrom(const FmFormObj* _pSource) { DBG_ASSERT(_pSource != NULL, "FmFormObj::clonedFrom : invalid source !"); @@ -363,7 +363,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) // if we we're clone there was a call to operator=, so aEvts are excatly the events we need here ... } -//------------------------------------------------------------------ + FmFormObj* FmFormObj::Clone() const { FmFormObj* pFormObject = CloneHelper< FmFormObj >(); @@ -374,14 +374,14 @@ FmFormObj* FmFormObj::Clone() const return pFormObject; } -//------------------------------------------------------------------ + void FmFormObj::NbcReformatText() { impl_checkRefDevice_nothrow( false ); SdrUnoObj::NbcReformatText(); } -//------------------------------------------------------------------ + FmFormObj& FmFormObj::operator= (const FmFormObj& rObj) { if( this == &rObj ) @@ -407,7 +407,7 @@ FmFormObj& FmFormObj::operator= (const FmFormObj& rObj) return *this; } -//------------------------------------------------------------------ + namespace { OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) @@ -445,7 +445,7 @@ namespace } } -//------------------------------------------------------------------ + Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const Reference<css::form::XForms>& _rTopLevelDestContainer) { Reference< XInterface > xTopLevelSouce; @@ -589,14 +589,14 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > return xDestContainer; } -//------------------------------------------------------------------ + void FmFormObj::SetModel( SdrModel* _pNewModel ) { SdrUnoObj::SetModel( _pNewModel ); impl_checkRefDevice_nothrow(); } -//------------------------------------------------------------------ + FmFormObj* FmFormObj::GetFormObject( SdrObject* _pSdrObject ) { FmFormObj* pFormObject = dynamic_cast< FmFormObj* >( _pSdrObject ); @@ -609,7 +609,7 @@ FmFormObj* FmFormObj::GetFormObject( SdrObject* _pSdrObject ) return pFormObject; } -//------------------------------------------------------------------ + const FmFormObj* FmFormObj::GetFormObject( const SdrObject* _pSdrObject ) { const FmFormObj* pFormObject = dynamic_cast< const FmFormObj* >( _pSdrObject ); @@ -622,7 +622,7 @@ const FmFormObj* FmFormObj::GetFormObject( const SdrObject* _pSdrObject ) return pFormObject; } -//------------------------------------------------------------------ + void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XControlModel >& _rxModel ) { SdrUnoObj::SetUnoControlModel( _rxModel ); @@ -634,7 +634,7 @@ void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XContr impl_checkRefDevice_nothrow( true ); } -//------------------------------------------------------------------ + bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) { bool bResult = SdrUnoObj::EndCreate(rStat, eCmd); @@ -677,14 +677,14 @@ bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) return bResult; } -//------------------------------------------------------------------------------ + void FmFormObj::BrkCreate( SdrDragStat& rStat ) { SdrUnoObj::BrkCreate( rStat ); impl_isolateControlModel_nothrow(); } -// ----------------------------------------------------------------------------- + // #i70852# overload Layer interface to force to FormColtrol layer SdrLayerID FmFormObj::GetLayer() const diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 4906f554d6f9..644c4ecf11e3 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -55,14 +55,14 @@ using com::sun::star::container::XNameContainer; TYPEINIT1(FmFormPage, SdrPage); -//------------------------------------------------------------------ + FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage) :SdrPage(rModel, bMasterPage) ,m_pImpl( new FmFormPageImpl( *this ) ) { } -//------------------------------------------------------------------ + FmFormPage::FmFormPage(const FmFormPage& rPage) :SdrPage(rPage) ,m_pImpl(new FmFormPageImpl( *this ) ) @@ -71,13 +71,13 @@ FmFormPage::FmFormPage(const FmFormPage& rPage) m_sPageName = rPage.m_sPageName; } -//------------------------------------------------------------------ + FmFormPage::~FmFormPage() { delete m_pImpl; } -//------------------------------------------------------------------ + void FmFormPage::SetModel(SdrModel* pNewModel) { /* #35055# */ @@ -111,14 +111,14 @@ void FmFormPage::SetModel(SdrModel* pNewModel) } } -//------------------------------------------------------------------ + SdrPage* FmFormPage::Clone() const { return new FmFormPage(*this); // hier fehlt noch ein kopieren der Objekte } -//------------------------------------------------------------------ + void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason) { @@ -127,7 +127,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos, ((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj); } -//------------------------------------------------------------------ + const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate ) const { const SdrPage& rMasterPage( *this ); @@ -139,7 +139,7 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate return pFormPage->m_pImpl->getForms( _bForceCreate ); } -//------------------------------------------------------------------ + sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ) { @@ -205,7 +205,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, return sal_True; } -//------------------------------------------------------------------ + SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum) { SdrObject* pObj = SdrPage::RemoveObject(nObjNum); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 86842ed7959a..e46f288f52d6 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -66,7 +66,7 @@ using ::com::sun::star::drawing::XControlShape; using namespace ::svxform; DBG_NAME(FmFormPageImpl) -//------------------------------------------------------------------------------ + FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage ) :m_rPage( _rPage ) ,m_bFirstActivation( sal_True ) @@ -76,7 +76,7 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage ) DBG_CTOR(FmFormPageImpl,NULL); } -//------------------------------------------------------------------------------ + namespace { typedef Reference< XInterface > FormComponent; @@ -154,7 +154,7 @@ namespace }; } -//------------------------------------------------------------------------------ + void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl ) { // clone the Forms collection @@ -229,7 +229,7 @@ void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl ) } } -//------------------------------------------------------------------------------ + Reference< XMap > FmFormPageImpl::getControlToShapeMap() { Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY ); @@ -241,7 +241,7 @@ Reference< XMap > FmFormPageImpl::getControlToShapeMap() return xControlShapeMap; } -//------------------------------------------------------------------------------ + namespace { static void lcl_insertFormObject_throw( const FmFormObj& _object, const Reference< XMap >& _map ) @@ -284,7 +284,7 @@ namespace } } -//------------------------------------------------------------------------------ + Reference< XMap > FmFormPageImpl::impl_createControlShapeMap_nothrow() { Reference< XMap > xMap; @@ -314,7 +314,7 @@ Reference< XMap > FmFormPageImpl::impl_createControlShapeMap_nothrow() return xMap; } -//------------------------------------------------------------------------------ + const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCreate ) { if ( m_xForms.is() || !_bForceCreate ) @@ -346,7 +346,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea return m_xForms; } -//------------------------------------------------------------------------------ + FmFormPageImpl::~FmFormPageImpl() { xCurrentForm = NULL; @@ -355,7 +355,7 @@ FmFormPageImpl::~FmFormPageImpl() DBG_DTOR(FmFormPageImpl,NULL); } -//------------------------------------------------------------------------------ + bool FmFormPageImpl::validateCurForm() { if ( !xCurrentForm.is() ) @@ -369,13 +369,13 @@ bool FmFormPageImpl::validateCurForm() return xCurrentForm.is(); } -//------------------------------------------------------------------------------ + void FmFormPageImpl::setCurForm(Reference< ::com::sun::star::form::XForm > xForm) { xCurrentForm = xForm; } -//------------------------------------------------------------------------------ + Reference< XForm > FmFormPageImpl::getDefaultForm() { Reference< XForm > xForm; @@ -459,7 +459,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() return xForm; } -//------------------------------------------------------------------------------ + Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase, const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType ) @@ -553,7 +553,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo return xForm; } -//------------------------------------------------------------------------------ + Reference< XForm > FmFormPageImpl::findFormForDataSource( const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase, const OUString& _rCursorSource, sal_Int32 nCommandType) @@ -635,7 +635,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( return xResultForm; } -//------------------------------------------------------------------------------ + OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls) { #if OSL_DEBUG_LEVEL > 0 @@ -676,7 +676,7 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm return sName; } -//---------------------------------------------------------------------------------------------------------------------- + void FmFormPageImpl::formModelAssigned( const FmFormObj& _object ) { Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY ); @@ -695,7 +695,7 @@ void FmFormPageImpl::formModelAssigned( const FmFormObj& _object ) } } -//---------------------------------------------------------------------------------------------------------------------- + void FmFormPageImpl::formObjectInserted( const FmFormObj& _object ) { Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY ); @@ -713,7 +713,7 @@ void FmFormPageImpl::formObjectInserted( const FmFormObj& _object ) } } -//---------------------------------------------------------------------------------------------------------------------- + void FmFormPageImpl::formObjectRemoved( const FmFormObj& _object ) { Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY ); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 3e4374f25ee6..ef746cc93c12 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -180,18 +180,18 @@ namespace svxform //==================================================================== //= FormScriptListener //==================================================================== - //-------------------------------------------------------------------- + FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor ) :m_pScriptExecutor( pScriptExecutor ) { } - //-------------------------------------------------------------------- + FormScriptListener::~FormScriptListener() { } - //-------------------------------------------------------------------- + bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const { // This used to be implemented as: @@ -728,7 +728,7 @@ namespace svxform return delayed_event_listeners.find(k) != delayed_event_listeners.end(); } - //-------------------------------------------------------------------- + void FormScriptListener::impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSyncronousResult ) { OSL_PRECOND( m_pScriptExecutor, "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" ); @@ -737,7 +737,7 @@ namespace svxform m_pScriptExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult ); } - //-------------------------------------------------------------------- + void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -758,7 +758,7 @@ namespace svxform Application::PostUserEvent( LINK( this, FormScriptListener, OnAsyncScriptEvent ), new ScriptEvent( _rEvent ) ); } - //-------------------------------------------------------------------- + Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent ) throw (InvocationTargetException, RuntimeException) { Any aResult; @@ -770,20 +770,20 @@ namespace svxform return aResult; } - //-------------------------------------------------------------------- + void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL FormScriptListener::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); m_pScriptExecutor = NULL; } - //-------------------------------------------------------------------- + IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, ScriptEvent*, _pEvent ) { OSL_PRECOND( _pEvent != NULL, "FormScriptListener::OnAsyncScriptEvent: invalid event!" ); @@ -806,7 +806,7 @@ namespace svxform //==================================================================== //= FormScriptingEnvironment //==================================================================== - //-------------------------------------------------------------------- + FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel ) :m_refCount( 0 ) ,m_pScriptListener( NULL ) @@ -818,12 +818,12 @@ namespace svxform // This cycle is broken up when our instance is disposed. } - //-------------------------------------------------------------------- + FormScriptingEnvironment::~FormScriptingEnvironment() { } - //-------------------------------------------------------------------- + void FormScriptingEnvironment::impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -847,25 +847,25 @@ namespace svxform } } - //-------------------------------------------------------------------- + void FormScriptingEnvironment::registerEventAttacherManager( const Reference< XEventAttacherManager >& _rxManager ) { impl_registerOrRevoke_throw( _rxManager, true ); } - //-------------------------------------------------------------------- + void FormScriptingEnvironment::revokeEventAttacherManager( const Reference< XEventAttacherManager >& _rxManager ) { impl_registerOrRevoke_throw( _rxManager, false ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL FormScriptingEnvironment::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL FormScriptingEnvironment::release() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) @@ -876,12 +876,12 @@ namespace svxform return m_refCount; } - //-------------------------------------------------------------------- + IFormScriptingEnvironment::~IFormScriptingEnvironment() { } - //-------------------------------------------------------------------- + namespace { //................................................................ @@ -936,7 +936,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + void FormScriptingEnvironment::doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSyncronousResult ) { #ifdef DISABLE_SCRIPTING @@ -1022,7 +1022,7 @@ namespace svxform #endif } - //-------------------------------------------------------------------- + void FormScriptingEnvironment::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1030,7 +1030,7 @@ namespace svxform m_pScriptListener->dispose(); } - //-------------------------------------------------------------------- + PFormScriptingEnvironment createDefaultFormScriptingEnvironment( FmFormModel& _rModel ) { return new FormScriptingEnvironment( _rModel ); diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index bac1280cd1d4..670c26e83fea 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star; -// ------------------------------------------------------------------------ + #define DECL_SERVICE(ImplName) \ uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::Exception ); @@ -42,17 +42,17 @@ uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno DECL_SERVICE( LegacyFormController ) -// ------------------------------------------------------------------------ + namespace svxform { - // ------------------------------------------------------------------------ + // declare selfaware service uno::Reference< uno::XInterface > SAL_CALL OAddConditionDialog_Create( const uno::Reference< lang::XMultiServiceFactory >& ); OUString SAL_CALL OAddConditionDialog_GetImplementationName(); uno::Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames(); - // ------------------------------------------------------------------------ + void ImplSmartRegisterUnoServices() { uno::Reference< lang::XMultiServiceFactory > xServiceFactory(::comphelper::getProcessServiceFactory(), uno::UNO_QUERY); @@ -64,12 +64,12 @@ namespace svxform OUString sString; - // ------------------------------------------------------------------------ + // FormController REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) ); REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) ); - // ------------------------------------------------------------------------ + // FormController - register selfaware service xSingleFactory = ::cppu::createSingleFactory( xServiceFactory, OAddConditionDialog_GetImplementationName(), @@ -79,7 +79,7 @@ namespace svxform if ( xSingleFactory.is() ) xSet->insert( uno::makeAny( xSingleFactory ) ); - // ------------------------------------------------------------------------ + // DBGridControl REGISTER_SERVICE(FmXGridControl, FM_CONTROL_GRID); // compatibility REGISTER_SERVICE(FmXGridControl, FM_CONTROL_GRIDCONTROL); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 02e1a88f9696..a53998860c79 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -150,13 +150,13 @@ using namespace ::svxform; //======================================================================== TYPEINIT1( FmDesignModeChangedHint, SfxHint ); -//------------------------------------------------------------------------ + FmDesignModeChangedHint::FmDesignModeChangedHint( sal_Bool bDesMode ) :m_bDesignMode( bDesMode ) { } -//------------------------------------------------------------------------ + FmDesignModeChangedHint::~FmDesignModeChangedHint() { } @@ -210,7 +210,7 @@ SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) //======================================================================== TYPEINIT1(FmFormShell,SfxShell) -//------------------------------------------------------------------------ + FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) :SfxShell(_pParent) ,m_pImpl(new FmXFormShell(*this, _pParent->GetViewFrame())) @@ -228,7 +228,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) SetView(m_pFormView); } -//------------------------------------------------------------------------ + FmFormShell::~FmFormShell() { if ( m_pFormView ) @@ -239,14 +239,14 @@ FmFormShell::~FmFormShell() m_pImpl = NULL; } -//------------------------------------------------------------------------ + void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView) { FmNavViewMarksChanged aChangeNotification(pWhichView); Broadcast(aChangeNotification); } -//------------------------------------------------------------------------ + bool FmFormShell::PrepareClose(sal_Bool bUI) { if ( GetImpl()->didPrepareClose() ) @@ -299,7 +299,7 @@ bool FmFormShell::PrepareClose(sal_Bool bUI) return bResult; } -//------------------------------------------------------------------------ + void FmFormShell::impl_setDesignMode(sal_Bool bDesign) { if (m_pFormView) @@ -320,7 +320,7 @@ void FmFormShell::impl_setDesignMode(sal_Bool bDesign) GetViewShell()->GetViewFrame()->GetBindings().Invalidate(ControllerSlotMap); } -//------------------------------------------------------------------------ + sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature ) { sal_Bool bResult = sal_False; @@ -369,7 +369,7 @@ sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature ) return bResult; } -//------------------------------------------------------------------------ + void FmFormShell::Execute(SfxRequest &rReq) { sal_uInt16 nSlot = rReq.GetSlot(); @@ -830,7 +830,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } } -//------------------------------------------------------------------------ + void FmFormShell::GetState(SfxItemSet &rSet) { SfxWhichIter aIter( rSet ); @@ -1086,7 +1086,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) } } -//------------------------------------------------------------------------ + void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) { if ( !GetImpl()->getNavController().is() @@ -1186,7 +1186,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) } } -//------------------------------------------------------------------------ + FmFormPage* FmFormShell::GetCurPage() const { FmFormPage* pP = NULL; @@ -1195,7 +1195,7 @@ FmFormPage* FmFormShell::GetCurPage() const return pP; } -//------------------------------------------------------------------------ + void FmFormShell::SetView( FmFormView* _pView ) { if ( m_pFormView ) @@ -1225,7 +1225,7 @@ void FmFormShell::SetView( FmFormView* _pView ) GetImpl()->viewActivated( *m_pFormView ); } -//------------------------------------------------------------------------ + void FmFormShell::DetermineForms(sal_Bool bInvalidate) { // Existieren Formulare auf der aktuellen Page @@ -1238,19 +1238,19 @@ void FmFormShell::DetermineForms(sal_Bool bInvalidate) } } -//------------------------------------------------------------------------ + sal_Bool FmFormShell::GetY2KState(sal_uInt16& nReturn) { return GetImpl()->GetY2KState(nReturn); } -//------------------------------------------------------------------------ + void FmFormShell::SetY2KState(sal_uInt16 n) { GetImpl()->SetY2KState(n); } -//------------------------------------------------------------------------ + void FmFormShell::Activate(sal_Bool bMDI) { SfxShell::Activate(bMDI); @@ -1259,7 +1259,7 @@ void FmFormShell::Activate(sal_Bool bMDI) GetImpl()->viewActivated( *m_pFormView, sal_True ); } -//------------------------------------------------------------------------ + void FmFormShell::Deactivate(sal_Bool bMDI) { SfxShell::Deactivate(bMDI); @@ -1268,37 +1268,37 @@ void FmFormShell::Deactivate(sal_Bool bMDI) GetImpl()->viewDeactivated( *m_pFormView, sal_False ); } -//------------------------------------------------------------------------ + void FmFormShell::ExecuteTextAttribute( SfxRequest& _rReq ) { m_pImpl->ExecuteTextAttribute( _rReq ); } -//------------------------------------------------------------------------ + void FmFormShell::GetTextAttributeState( SfxItemSet& _rSet ) { m_pImpl->GetTextAttributeState( _rSet ); } -//------------------------------------------------------------------------ + bool FmFormShell::IsActiveControl() const { return m_pImpl->IsActiveControl(); } -//------------------------------------------------------------------------ + void FmFormShell::ForgetActiveControl() { m_pImpl->ForgetActiveControl(); } -//------------------------------------------------------------------------ + void FmFormShell::SetControlActivationHandler( const Link& _rHdl ) { m_pImpl->SetControlActivationHandler( _rHdl ); } -//------------------------------------------------------------------------ + namespace { SdrUnoObj* lcl_findUnoObject( const SdrObjList& _rObjList, const Reference< XControlModel >& _rxModel ) @@ -1322,7 +1322,7 @@ namespace } } -//------------------------------------------------------------------------ + void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrView& i_rView, OutputDevice& i_rDevice ) const { try @@ -1354,7 +1354,7 @@ void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrVi } } -//------------------------------------------------------------------------ + namespace { class FocusableControlsFilter : public ::svx::ISdrObjectFilter @@ -1383,7 +1383,7 @@ namespace }; } -//------------------------------------------------------------------------ + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const { @@ -1396,7 +1396,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP -//------------------------------------------------------------------------ + SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const { if ( !_rxModel.is() ) @@ -1439,7 +1439,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod return NULL; } -//------------------------------------------------------------------------ + Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const { const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView ); @@ -1449,7 +1449,7 @@ Reference< runtime::XFormController > FmFormShell::GetFormController( const Refe return pFormView->GetFormController( _rxForm, _rDevice ); } -//------------------------------------------------------------------------ + void FmFormShell::SetDesignMode( bool _bDesignMode ) { if ( _bDesignMode == m_bDesignMode ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index d05c8b6ca25d..7dd6351bc362 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -447,7 +447,7 @@ namespace xEventManager->registerScriptEvents(nIndex, aTransferable); } - //------------------------------------------------------------------------------ + OUString getServiceNameByControlType(sal_Int16 nType) { switch (nType) @@ -480,7 +480,7 @@ namespace } -//------------------------------------------------------------------------------ + // check if the control has one of the interfaces we can use for searching // *_pCurrentText will be filled with the current text of the control (as used when searching this control) sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl, @@ -523,7 +523,7 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun return sal_False; } -//------------------------------------------------------------------------------ + bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const { if (_rContainer == m_xStartingPoint) @@ -533,7 +533,7 @@ bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rC return Reference< XControlModel>(_rContainer, UNO_QUERY).is(); } -//------------------------------------------------------------------------------ + bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement) { if (!_rElement.is()) @@ -557,7 +557,7 @@ bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface> return aVal.hasValue(); } -//------------------------------------------------------------------------------ + sal_Bool isControlList(const SdrMarkList& rMarkList) { // enthaelt die liste nur Controls und mindestens ein control @@ -600,7 +600,7 @@ sal_Bool isControlList(const SdrMarkList& rMarkList) return bControlList && bHadAnyLeafs; } -//------------------------------------------------------------------------ + Reference< XForm > GetForm(const Reference< XInterface>& _rxElement) { Reference< XForm > xForm( _rxElement, UNO_QUERY ); @@ -637,7 +637,7 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing() // class FmXFormShell //======================================================================== DBG_NAME(FmXFormShell); -//------------------------------------------------------------------------ + FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) @@ -681,14 +681,14 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) EnableNotification(aNames); } -//------------------------------------------------------------------------ + FmXFormShell::~FmXFormShell() { delete m_pTextShell; DBG_DTOR(FmXFormShell,NULL); } -//------------------------------------------------------------------ + Reference< XModel > FmXFormShell::getContextDocument() const { Reference< XModel > xModel; @@ -709,13 +709,13 @@ Reference< XModel > FmXFormShell::getContextDocument() const return xModel; } -//------------------------------------------------------------------ + bool FmXFormShell::isEnhancedForm() const { return getDocumentType() == eEnhancedForm; } -//------------------------------------------------------------------ + bool FmXFormShell::impl_checkDisposed() const { if ( !m_pShell ) @@ -726,7 +726,7 @@ bool FmXFormShell::impl_checkDisposed() const return false; } -//------------------------------------------------------------------ + ::svxform::DocumentType FmXFormShell::getDocumentType() const { if ( m_eDocumentType != eUnknownDocumentType ) @@ -746,7 +746,7 @@ bool FmXFormShell::impl_checkDisposed() const return m_eDocumentType; } -//------------------------------------------------------------------ + bool FmXFormShell::IsReadonlyDoc() const { if ( impl_checkDisposed() ) @@ -758,17 +758,17 @@ bool FmXFormShell::IsReadonlyDoc() const return true; } -//------------------------------------------------------------------ + Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException ) { return FmXFormShell_BASE::queryInterface(type); } -//------------------------------------------------------------------------------ + Sequence< Type > SAL_CALL FmXFormShell::getTypes( ) throw(RuntimeException) { return FmXFormShell_BASE::getTypes(); } -//------------------------------------------------------------------------------ + Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException) { static ::cppu::OImplementationId* pId = 0; @@ -784,7 +784,7 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE return pId->getImplementationId(); } // EventListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException ) { impl_checkDisposed(); @@ -823,7 +823,7 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) { if ( impl_checkDisposed() ) @@ -859,7 +859,7 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw LockSlotInvalidation(sal_False); } -//------------------------------------------------------------------------------ + void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) { if ( impl_checkDisposed() ) @@ -888,7 +888,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( RuntimeException ) { if ( impl_checkDisposed() ) @@ -899,7 +899,7 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt setActiveController( xController ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( RuntimeException ) { if ( impl_checkDisposed() ) @@ -909,7 +909,7 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru m_pTextShell->formDeactivated( xController ); } -//------------------------------------------------------------------------------ + void FmXFormShell::disposing() { impl_checkDisposed(); @@ -985,7 +985,7 @@ void FmXFormShell::disposing() m_aNavControllerFeatures.dispose(); } -//------------------------------------------------------------------------------ + void FmXFormShell::UpdateSlot( sal_Int16 _nId ) { if ( impl_checkDisposed() ) @@ -1006,7 +1006,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) } } -//------------------------------------------------------------------------------ + void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) { if ( impl_checkDisposed() ) @@ -1025,7 +1025,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell); } -//------------------------------------------------------------------------------ + void FmXFormShell::LockSlotInvalidation(sal_Bool bLock) { if ( impl_checkDisposed() ) @@ -1044,7 +1044,7 @@ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock) } } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots) { if ( impl_checkDisposed() ) @@ -1064,7 +1064,7 @@ IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots) return 0L; } -//------------------------------------------------------------------------------ + void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) { if ( impl_checkDisposed() ) @@ -1085,7 +1085,7 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) } } -//------------------------------------------------------------------------------ + PopupMenu* FmXFormShell::GetConversionMenu() { @@ -1101,7 +1101,7 @@ PopupMenu* FmXFormShell::GetConversionMenu() return pNewMenu; } -//------------------------------------------------------------------------------ + bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) { for ( size_t i = 0; i < sizeof (nConvertSlots) / sizeof (nConvertSlots[0]); ++i ) @@ -1110,7 +1110,7 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) return false; } -//------------------------------------------------------------------------------ + bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) { OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" ); @@ -1121,7 +1121,7 @@ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) return executeControlConversionSlot( Reference< XFormComponent >( *aSelectedElement, UNO_QUERY ), _nSlotId ); } -//------------------------------------------------------------------------------ + bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent >& _rxObject, sal_uInt16 _nSlotId ) { if ( impl_checkDisposed() ) @@ -1328,7 +1328,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent return false; } -//------------------------------------------------------------------------------ + bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot ) { if ( m_aCurrentSelection.empty() ) @@ -1366,7 +1366,7 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo return true; // all other slots: assume "yes" } -//------------------------------------------------------------------------------ + void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu ) { for (sal_Int16 i=0; i<rMenu.GetItemCount(); ++i) @@ -1374,7 +1374,7 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu ) rMenu.EnableItem( rMenu.GetItemId(i), canConvertCurrentSelectionToControl( rMenu.GetItemId( i ) ) ); } -//------------------------------------------------------------------------------ + void FmXFormShell::LoopGrids(sal_Int16 nWhat) { if ( impl_checkDisposed() ) @@ -1443,7 +1443,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat) } } -//------------------------------------------------------------------------------ + Reference< XControlContainer > FmXFormShell::getControlContainerForView() { if ( impl_checkDisposed() ) @@ -1460,7 +1460,7 @@ Reference< XControlContainer > FmXFormShell::getControlContainerForView() return xControlContainer; } -//------------------------------------------------------------------------------ + void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >& _rxForForm ) { if ( impl_checkDisposed() ) @@ -1489,7 +1489,7 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > } } -//------------------------------------------------------------------------------ + void FmXFormShell::ExecuteSearch() { if ( impl_checkDisposed() ) @@ -1635,7 +1635,7 @@ void FmXFormShell::ExecuteSearch() // da ich in OnFoundData (fals ich dort war) Controls markiert habe } -//------------------------------------------------------------------------------ + sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) { if ( impl_checkDisposed() ) @@ -1674,7 +1674,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) return sal_False; } -//------------------------------------------------------------------------------ + void FmXFormShell::SetY2KState(sal_uInt16 n) { if ( impl_checkDisposed() ) @@ -1748,7 +1748,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) } } -//------------------------------------------------------------------------------ + void FmXFormShell::CloseExternalFormViewer() { if ( impl_checkDisposed() ) @@ -1769,7 +1769,7 @@ void FmXFormShell::CloseExternalFormViewer() m_xExternalDisplayedForm = NULL; } -//------------------------------------------------------------------------------ + Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const { if ( impl_checkDisposed() ) @@ -1784,7 +1784,7 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet return _xForm; } -//------------------------------------------------------------------------------ + Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const { if ( impl_checkDisposed() ) @@ -1799,7 +1799,7 @@ Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) return _xForm; } -//------------------------------------------------------------------------ + namespace { static bool lcl_isNavigationRelevant( sal_Int32 _nWhich ) @@ -1812,7 +1812,7 @@ namespace } } -//------------------------------------------------------------------------------ + bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState ) { const ::svx::ControllerFeatures& rController = @@ -1827,7 +1827,7 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete return _pCompleteState->Enabled; } -//------------------------------------------------------------------------------ + void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) { const ::svx::ControllerFeatures& rController = @@ -1862,7 +1862,7 @@ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) } } -//------------------------------------------------------------------------------ + void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen ) { Reference< XComponent> xComp( m_xActiveController, UNO_QUERY ); @@ -1875,7 +1875,7 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen ) xComp->removeEventListener( (XFormControllerListener*)this ); } -//------------------------------------------------------------------------------ + void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent ) { if ( impl_checkDisposed() ) @@ -1983,13 +1983,13 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle } } -//------------------------------------------------------------------------------ + void FmXFormShell::getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const { _rSelection = m_aCurrentSelection; } -//------------------------------------------------------------------------------ + bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList ) { m_aLastKnownMarkedControls.clear(); @@ -2000,13 +2000,13 @@ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList ) return setCurrentSelection( m_aLastKnownMarkedControls ); } -//------------------------------------------------------------------------------ + bool FmXFormShell::selectLastMarkedControls() { return setCurrentSelection( m_aLastKnownMarkedControls ); } -//------------------------------------------------------------------------------ + bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) { if ( impl_checkDisposed() ) @@ -2087,13 +2087,13 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) return true; } -//------------------------------------------------------------------------------ + bool FmXFormShell::isSolelySelected( const Reference< XInterface >& _rxObject ) { return ( m_aCurrentSelection.size() == 1 ) && ( *m_aCurrentSelection.begin() == _rxObject ); } -//------------------------------------------------------------------------------ + void FmXFormShell::forgetCurrentForm() { if ( !m_xCurrentForm.is() ) @@ -2107,7 +2107,7 @@ void FmXFormShell::forgetCurrentForm() impl_defaultCurrentForm_nothrow(); } -//------------------------------------------------------------------------------ + void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurForm ) { if ( impl_checkDisposed() ) @@ -2125,7 +2125,7 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo InvalidateSlot( DlgSlotMap[i], sal_False ); } -//------------------------------------------------------------------------------ + void FmXFormShell::startListening() { if ( impl_checkDisposed() ) @@ -2204,7 +2204,7 @@ void FmXFormShell::startListening() m_xNavigationController = NULL; } -//------------------------------------------------------------------------------ + void FmXFormShell::stopListening() { if ( impl_checkDisposed() ) @@ -2227,7 +2227,7 @@ void FmXFormShell::stopListening() m_xNavigationController = NULL; } -//------------------------------------------------------------------------------ + void FmXFormShell::ShowSelectionProperties( sal_Bool bShow ) { if ( impl_checkDisposed() ) @@ -2246,7 +2246,7 @@ void FmXFormShell::ShowSelectionProperties( sal_Bool bShow ) InvalidateSlot( SID_FM_CTL_PROPERTIES, sal_False ); } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere) { if ( impl_checkDisposed() ) @@ -2330,7 +2330,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere) return 0; } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere) { if ( impl_checkDisposed() ) @@ -2360,7 +2360,7 @@ IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere return 0L; } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextInfo) { if ( impl_checkDisposed() ) @@ -2373,7 +2373,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn Reference< XResultSet> xIter(xForm, UNO_QUERY); DBG_ASSERT(xIter.is(), "FmXFormShell::OnSearchContextRequest : unexpected : context has no iterator !"); - // -------------------------------------------------------------------------------------------- + // assemble the list of fields to involve (that is, the ControlSources of all fields that have such a property) OUString strFieldList, sFieldDisplayNames; m_arrSearchedControls.clear(); @@ -2563,7 +2563,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn } // XContainerListener -//------------------------------------------------------------------------------ + void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { if ( impl_checkDisposed() ) @@ -2576,7 +2576,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun:: m_pShell->DetermineForms(sal_True); } -//------------------------------------------------------------------------------ + void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { if ( impl_checkDisposed() ) @@ -2589,7 +2589,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun:: AddElement(xTemp); } -//------------------------------------------------------------------------------ + void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { if ( impl_checkDisposed() ) @@ -2601,7 +2601,7 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s m_pShell->DetermineForms(sal_True); } -//------------------------------------------------------------------------------ + void FmXFormShell::UpdateForms( sal_Bool _bInvalidate ) { if ( impl_checkDisposed() ) @@ -2626,14 +2626,14 @@ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate ) m_pShell->DetermineForms( _bInvalidate ); } -//------------------------------------------------------------------------------ + void FmXFormShell::AddElement(const Reference< XInterface>& _xElement) { if ( impl_checkDisposed() ) return; impl_AddElement_nothrow(_xElement); } -// ----------------------------------------------------------------------------- + void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element) { // am Container horchen @@ -2658,14 +2658,14 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element xSelSupplier->addSelectionChangeListener(this); } -//------------------------------------------------------------------------------ + void FmXFormShell::RemoveElement(const Reference< XInterface>& Element) { if ( impl_checkDisposed() ) return; impl_RemoveElement_nothrow(Element); } -//------------------------------------------------------------------------------ + void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Element) { const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); @@ -2694,7 +2694,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem m_aCurrentSelection.erase( wasSelectedPos ); } -//------------------------------------------------------------------------------ + void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException) { if ( impl_checkDisposed() ) @@ -2723,7 +2723,7 @@ void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun: m_pShell->NotifyMarkListChanged( m_pShell->GetFormView() ); } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/) { if ( impl_checkDisposed() ) @@ -2735,7 +2735,7 @@ IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/) return 0; } -//------------------------------------------------------------------------ + void FmXFormShell::SetSelectionDelayed() { if ( impl_checkDisposed() ) @@ -2745,7 +2745,7 @@ void FmXFormShell::SetSelectionDelayed() m_aMarkTimer.Start(); } -//------------------------------------------------------------------------ + void FmXFormShell::SetSelection(const SdrMarkList& rMarkList) { if ( impl_checkDisposed() ) @@ -2755,14 +2755,14 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList) m_pShell->NotifyMarkListChanged(m_pShell->GetFormView()); } -//------------------------------------------------------------------------ + void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList) { if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() ) ShowSelectionProperties( sal_True ); } -//------------------------------------------------------------------------------ + sal_Bool FmXFormShell::IsPropBrwOpen() const { if ( impl_checkDisposed() ) @@ -2772,7 +2772,7 @@ sal_Bool FmXFormShell::IsPropBrwOpen() const m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : sal_False ); } -//------------------------------------------------------------------------------ + class FmXFormShell::SuspendPropertyTracking { private: @@ -2798,7 +2798,7 @@ public: } }; -//------------------------------------------------------------------------------ + void FmXFormShell::SetDesignMode(bool bDesign) { if ( impl_checkDisposed() ) @@ -2884,7 +2884,7 @@ void FmXFormShell::SetDesignMode(bool bDesign) m_bChangingDesignMode = sal_False; } -//------------------------------------------------------------------------------ + Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlModel >& i_rxModel, const FmFormObj& i_rKnownFormObj ) { if ( impl_checkDisposed() ) @@ -2929,7 +2929,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod return xControl; } -//------------------------------------------------------------------------------ + void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint, const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ) { @@ -2984,7 +2984,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt } } -//------------------------------------------------------------------------------ + void FmXFormShell::startFiltering() { if ( impl_checkDisposed() ) @@ -3032,7 +3032,7 @@ void FmXFormShell::startFiltering() } } -//------------------------------------------------------------------------------ + void saveFilter(const Reference< runtime::XFormController >& _rxController) { Reference< XPropertySet> xFormAsSet(_rxController->getModel(), UNO_QUERY); @@ -3060,7 +3060,7 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController) } -//------------------------------------------------------------------------------ + void FmXFormShell::stopFiltering(sal_Bool bSave) { if ( impl_checkDisposed() ) @@ -3165,7 +3165,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell); } -//------------------------------------------------------------------------------ + void FmXFormShell::CreateExternalView() { if ( impl_checkDisposed() ) @@ -3574,7 +3574,7 @@ void FmXFormShell::CreateExternalView() InvalidateSlot( SID_FM_VIEW_AS_GRID, sal_False ); } -//------------------------------------------------------------------------ + void FmXFormShell::implAdjustConfigCache() { // get (cache) the wizard usage flag @@ -3585,7 +3585,7 @@ void FmXFormShell::implAdjustConfigCache() m_bUseWizards = ::cppu::any2bool(aFlags[0]); } -//------------------------------------------------------------------------ + void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) { if ( impl_checkDisposed() ) @@ -3605,7 +3605,7 @@ void FmXFormShell::Commit() { } -//------------------------------------------------------------------------ + void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { m_bUseWizards = _bUseThem; @@ -3617,7 +3617,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) PutProperties(aNames, aValues); } -//------------------------------------------------------------------------ + void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ ) { @@ -3658,7 +3658,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti UpdateForms( sal_True ); } -//------------------------------------------------------------------------ + IMPL_LINK( FmXFormShell, OnFirstTimeActivation, void*, /*NOTINTERESTEDIN*/ ) { if ( impl_checkDisposed() ) @@ -3680,14 +3680,14 @@ IMPL_LINK( FmXFormShell, OnFirstTimeActivation, void*, /*NOTINTERESTEDIN*/ ) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ ) { UpdateForms( sal_True ); return 0L; } -//------------------------------------------------------------------------ + void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ ) { @@ -3735,7 +3735,7 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi impl_defaultCurrentForm_nothrow(); } -//------------------------------------------------------------------------------ + void FmXFormShell::impl_defaultCurrentForm_nothrow() { if ( impl_checkDisposed() ) @@ -3765,7 +3765,7 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow() } } -//------------------------------------------------------------------------------ + void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels ) { if (!_rxModels.is()) @@ -3824,7 +3824,7 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels } } -//------------------------------------------------------------------------ + IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ ) { FmLoadAction aAction = m_aLoadingPages.front(); @@ -3834,7 +3834,7 @@ IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ ) return 0L; } -//------------------------------------------------------------------------------ + namespace { bool lcl_isLoadable( const Reference< XInterface >& _rxLoadable ) @@ -3872,7 +3872,7 @@ namespace } } -//------------------------------------------------------------------------ + void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ ) { DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) ) != ( FORMS_ASYNC | FORMS_UNLOAD ), @@ -3949,43 +3949,43 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour / } } -//------------------------------------------------------------------------ + void FmXFormShell::ExecuteTextAttribute( SfxRequest& _rReq ) { m_pTextShell->ExecuteTextAttribute( _rReq ); } -//------------------------------------------------------------------------ + void FmXFormShell::GetTextAttributeState( SfxItemSet& _rSet ) { m_pTextShell->GetTextAttributeState( _rSet ); } -//------------------------------------------------------------------------ + bool FmXFormShell::IsActiveControl( bool _bCountRichTextOnly ) const { return m_pTextShell->IsActiveControl( _bCountRichTextOnly ); } -//------------------------------------------------------------------------ + void FmXFormShell::ForgetActiveControl() { m_pTextShell->ForgetActiveControl(); } -//------------------------------------------------------------------------ + void FmXFormShell::SetControlActivationHandler( const Link& _rHdl ) { m_pTextShell->SetControlActivationHandler( _rHdl ); } -//------------------------------------------------------------------------ + void FmXFormShell::handleShowPropertiesRequest() { if ( onlyControlsAreMarked() ) ShowSelectionProperties( sal_True ); } -//------------------------------------------------------------------------ + void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent ) { // catch simple double clicks @@ -3999,7 +3999,7 @@ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent ) } } -//------------------------------------------------------------------------------ + bool FmXFormShell::HasControlFocus() const { bool bHasControlFocus = false; @@ -4031,7 +4031,7 @@ SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xSta { } -//------------------------------------------------------------------------------ + bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface>& xElement) { // wenn das Ding eine ControlSource und einen BoundField-Property hat @@ -4063,7 +4063,7 @@ bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface> return false; } -//------------------------------------------------------------------------------ + bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*xContainer*/) const { return true; @@ -4074,7 +4074,7 @@ bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*x SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem); -//------------------------------------------------------------------------------ + ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nId, Menu& _rMenu, SfxBindings& _rBindings ) :SfxMenuControl( _nId, _rBindings ) ,m_pMainMenu( &_rMenu ) @@ -4094,14 +4094,14 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI } } -//------------------------------------------------------------------------------ + ControlConversionMenuController::~ControlConversionMenuController() { m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL); delete m_pConversionMenu; } -//------------------------------------------------------------------------------ + void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { if (nSID == GetId()) diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index cd81bf31d08b..3816ab40fddb 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -68,13 +68,13 @@ using namespace ::svxform; //======================================================================== // = FmSearchThread -//------------------------------------------------------------------------ + void FmSearchThread::run() { m_pEngine->SearchNextImpl(); }; -//------------------------------------------------------------------------ + void FmSearchThread::onTerminated() { if (m_aTerminationHdl.IsSet()) @@ -88,7 +88,7 @@ void FmSearchThread::onTerminated() // SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject); DBG_NAME(FmRecordCountListener); -//------------------------------------------------------------------------ + FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::sdbc::XResultSet > & dbcCursor) { DBG_CTOR(FmRecordCountListener,NULL); @@ -107,7 +107,7 @@ FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star:: m_xListening->addPropertyChangeListener(FM_PROP_ROWCOUNT, (::com::sun::star::beans::XPropertyChangeListener*)this); } -//------------------------------------------------------------------------ + Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk) { Link lnkReturn = m_lnkWhoWantsToKnow; @@ -119,14 +119,14 @@ Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk) return lnkReturn; } -//------------------------------------------------------------------------ + FmRecordCountListener::~FmRecordCountListener() { DBG_DTOR(FmRecordCountListener,NULL); } -//------------------------------------------------------------------------ + void FmRecordCountListener::DisConnect() { if(m_xListening.is()) @@ -134,14 +134,14 @@ void FmRecordCountListener::DisConnect() m_xListening = NULL; } -//------------------------------------------------------------------------ + void SAL_CALL FmRecordCountListener::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException ) { DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !"); DisConnect(); } -//------------------------------------------------------------------------ + void FmRecordCountListener::NotifyCurrentCount() { if (m_lnkWhoWantsToKnow.IsSet()) @@ -152,7 +152,7 @@ void FmRecordCountListener::NotifyCurrentCount() } } -//------------------------------------------------------------------------ + void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& /*evt*/) throw(::com::sun::star::uno::RuntimeException) { NotifyCurrentCount(); @@ -160,7 +160,7 @@ void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::Prope //======================================================================== // FmSearchEngine - local classes -//------------------------------------------------------------------------ + SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTextComponent > & _xText) :ControlTextWrapper(_xText.get()) ,m_xText(_xText) @@ -168,13 +168,13 @@ SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTe DBG_ASSERT(m_xText.is(), "FmSearchEngine::SimpleTextWrapper::SimpleTextWrapper : invalid argument !"); } -//------------------------------------------------------------------------ + OUString SimpleTextWrapper::getCurrentText() const { return m_xText->getText(); } -//------------------------------------------------------------------------ + ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox > & _xBox) :ControlTextWrapper(_xBox.get()) ,m_xBox(_xBox) @@ -182,13 +182,13 @@ ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox DBG_ASSERT(m_xBox.is(), "FmSearchEngine::ListBoxWrapper::ListBoxWrapper : invalid argument !"); } -//------------------------------------------------------------------------ + OUString ListBoxWrapper::getCurrentText() const { return m_xBox->getSelectedItem(); } -//------------------------------------------------------------------------ + CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckBox > & _xBox) :ControlTextWrapper(_xBox.get()) ,m_xBox(_xBox) @@ -196,7 +196,7 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB DBG_ASSERT(m_xBox.is(), "FmSearchEngine::CheckBoxWrapper::CheckBoxWrapper : invalid argument !"); } -//------------------------------------------------------------------------ + OUString CheckBoxWrapper::getCurrentText() const { switch ((TriState)m_xBox->getState()) @@ -210,7 +210,7 @@ OUString CheckBoxWrapper::getCurrentText() const //======================================================================== // = FmSearchEngine -//------------------------------------------------------------------------ + sal_Bool FmSearchEngine::MoveCursor() { sal_Bool bSuccess = sal_True; @@ -269,7 +269,7 @@ sal_Bool FmSearchEngine::MoveCursor() return bSuccess; } -//------------------------------------------------------------------------ + sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd) { sal_Bool bSuccess(sal_True); @@ -297,7 +297,7 @@ sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& i return bSuccess; } -//------------------------------------------------------------------------ + void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::container::XIndexAccess > & xAllFields, sal_Int32 nField) { DBG_ASSERT( xAllFields.is() && ( nField >= 0 ) && ( nField < xAllFields->getCount() ), @@ -328,7 +328,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: m_arrUsedFields.insert(m_arrUsedFields.end(), fiCurrent); } -//------------------------------------------------------------------------ + OUString FmSearchEngine::FormatField(const FieldInfo& rField) { DBG_ASSERT(!m_bUsingTextComponents, "FmSearchEngine::FormatField : im UsingTextComponents-Mode bitte FormatField(sal_Int32) benutzen !"); @@ -361,7 +361,7 @@ OUString FmSearchEngine::FormatField(const FieldInfo& rField) return sReturn; } -//------------------------------------------------------------------------ + OUString FmSearchEngine::FormatField(sal_Int32 nWhich) { if (m_bUsingTextComponents) @@ -397,7 +397,7 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich) } } -//------------------------------------------------------------------------ + FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd) { @@ -407,7 +407,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; } FieldCollection::iterator iterInitialField = iterFieldLoop; - // -------------------------------------------------------------- + sal_Bool bFound(sal_False); sal_Bool bMovedAround(sal_False); do @@ -462,7 +462,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor return bFound ? SR_FOUND : SR_NOTFOUND; } -//------------------------------------------------------------------------ + FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd) { @@ -474,7 +474,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str WildCard aSearchExpression(strExpression); - // -------------------------------------------------------------- + sal_Bool bFound(sal_False); sal_Bool bMovedAround(sal_False); do @@ -540,7 +540,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str return bFound ? SR_FOUND : SR_NOTFOUND; } -//------------------------------------------------------------------------ + FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd) { @@ -576,7 +576,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString aParam.Locale = SvtSysLocale().GetLanguageTag().getLocale(); ::utl::TextSearch aLocalEngine(aParam); - // -------------------------------------------------------------- + bool bFound = false; sal_Bool bMovedAround(sal_False); do @@ -667,7 +667,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString DBG_NAME(FmSearchEngine); -//------------------------------------------------------------------------ + FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) @@ -706,7 +706,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, Init(sVisibleFields); } -//------------------------------------------------------------------------ + FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode) @@ -741,7 +741,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, Init(sVisibleFields); } -//------------------------------------------------------------------------ + FmSearchEngine::~FmSearchEngine() { clearControlTexts(); @@ -749,7 +749,7 @@ FmSearchEngine::~FmSearchEngine() DBG_DTOR(FmSearchEngine,NULL); } -//------------------------------------------------------------------------ + void FmSearchEngine::SetIgnoreWidthCJK(sal_Bool bSet) { if (bSet) @@ -758,13 +758,13 @@ void FmSearchEngine::SetIgnoreWidthCJK(sal_Bool bSet) m_nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH; } -//------------------------------------------------------------------------ + sal_Bool FmSearchEngine::GetIgnoreWidthCJK() const { return 0 != (m_nTransliterationFlags & TransliterationModules_IGNORE_WIDTH); } -//------------------------------------------------------------------------ + void FmSearchEngine::SetCaseSensitive(sal_Bool bSet) { if (bSet) @@ -773,13 +773,13 @@ void FmSearchEngine::SetCaseSensitive(sal_Bool bSet) m_nTransliterationFlags |= TransliterationModules_IGNORE_CASE; } -//------------------------------------------------------------------------ + sal_Bool FmSearchEngine::GetCaseSensitive() const { return 0 == (m_nTransliterationFlags & TransliterationModules_IGNORE_CASE); } -//------------------------------------------------------------------------ + void FmSearchEngine::clearControlTexts() { for ( ControlTextSuppliers::iterator aIter = m_aControlTexts.begin(); @@ -792,7 +792,7 @@ void FmSearchEngine::clearControlTexts() m_aControlTexts.clear(); } -//------------------------------------------------------------------------ + void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields) { clearControlTexts(); @@ -823,7 +823,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields) } } -//------------------------------------------------------------------------ + void FmSearchEngine::Init(const OUString& sVisibleFields) { // analyze the fields @@ -904,7 +904,7 @@ void FmSearchEngine::Init(const OUString& sVisibleFields) } -//------------------------------------------------------------------------ + void FmSearchEngine::SetFormatterUsing(sal_Bool bSet) { if (m_bFormatter == bSet) @@ -943,7 +943,7 @@ void FmSearchEngine::SetFormatterUsing(sal_Bool bSet) InvalidatePreviousLoc(); } -//------------------------------------------------------------------------ + void FmSearchEngine::PropagateProgress(sal_Bool _bDontPropagateOverflow) { if (m_aProgressHandler.IsSet()) @@ -967,7 +967,7 @@ void FmSearchEngine::PropagateProgress(sal_Bool _bDontPropagateOverflow) } } -//------------------------------------------------------------------------ + void FmSearchEngine::SearchNextImpl() { DBG_ASSERT(!(m_bWildcard && m_bRegular) && !(m_bRegular && m_bLevenshtein) && !(m_bLevenshtein && m_bWildcard), @@ -1068,7 +1068,7 @@ void FmSearchEngine::SearchNextImpl() InvalidatePreviousLoc(); } -//------------------------------------------------------------------------ + IMPL_LINK(FmSearchEngine, OnSearchTerminated, FmSearchThread*, /*pThread*/) { if (!m_aProgressHandler.IsSet()) @@ -1110,7 +1110,7 @@ IMPL_LINK(FmSearchEngine, OnSearchTerminated, FmSearchThread*, /*pThread*/) return 0L; } -//------------------------------------------------------------------------ + IMPL_LINK(FmSearchEngine, OnNewRecordCount, void*, pCounterAsVoid) { if (!m_aProgressHandler.IsSet()) @@ -1124,7 +1124,7 @@ IMPL_LINK(FmSearchEngine, OnNewRecordCount, void*, pCounterAsVoid) return 0L; } -//------------------------------------------------------------------------ + sal_Bool FmSearchEngine::CancelRequested() { m_aCancelAsynchAccess.acquire(); @@ -1133,7 +1133,7 @@ sal_Bool FmSearchEngine::CancelRequested() return bReturn; } -//------------------------------------------------------------------------ + void FmSearchEngine::CancelSearch() { m_aCancelAsynchAccess.acquire(); @@ -1141,7 +1141,7 @@ void FmSearchEngine::CancelSearch() m_aCancelAsynchAccess.release(); } -//------------------------------------------------------------------------ + sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex) { @@ -1162,7 +1162,7 @@ sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc return sal_True; } -//------------------------------------------------------------------------ + void FmSearchEngine::ImplStartNextSearch() { m_bCancelAsynchRequest = sal_False; @@ -1185,7 +1185,7 @@ void FmSearchEngine::ImplStartNextSearch() } } -//------------------------------------------------------------------------ + void FmSearchEngine::SearchNext(const OUString& strExpression) { m_strSearchExpression = strExpression; @@ -1193,14 +1193,14 @@ void FmSearchEngine::SearchNext(const OUString& strExpression) ImplStartNextSearch(); } -//------------------------------------------------------------------------ + void FmSearchEngine::SearchNextSpecial(sal_Bool _bSearchForNull) { m_eSearchForType = _bSearchForNull ? SEARCHFOR_NULL : SEARCHFOR_NOTNULL; ImplStartNextSearch(); } -//------------------------------------------------------------------------ + void FmSearchEngine::StartOver(const OUString& strExpression) { try @@ -1220,7 +1220,7 @@ void FmSearchEngine::StartOver(const OUString& strExpression) SearchNext(strExpression); } -//------------------------------------------------------------------------ + void FmSearchEngine::StartOverSpecial(sal_Bool _bSearchForNull) { try @@ -1240,14 +1240,14 @@ void FmSearchEngine::StartOverSpecial(sal_Bool _bSearchForNull) SearchNextSpecial(_bSearchForNull); } -//------------------------------------------------------------------------ + void FmSearchEngine::InvalidatePreviousLoc() { m_aPreviousLocBookmark.setValue(0,getVoidCppuType()); m_iterPreviousLocField = m_arrUsedFields.end(); } -//------------------------------------------------------------------------ + void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) { if (!bForce && (nFieldIndex == m_nCurrentFieldIndex)) diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c7eba1eb748e..d8c80f345b86 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -37,7 +37,7 @@ namespace svx //==================================================================== //= TextControlCharAttribDialog //==================================================================== - //-------------------------------------------------------------------- + TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog", "svx/ui/textcontrolchardialog.ui", &_rCoreSet ) diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index 94b40bd39955..029b0f9d8302 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -33,7 +33,7 @@ namespace svx //==================================================================== //= FmTextControlFeature //==================================================================== - //-------------------------------------------------------------------- + FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, const URL& _rFeatureURL, SfxSlotId _nSlotId, ISlotInvalidator* _pInvalidator ) :m_xDispatcher ( _rxDispatcher ) ,m_aFeatureURL ( _rFeatureURL ) @@ -57,18 +57,18 @@ namespace svx osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + FmTextControlFeature::~FmTextControlFeature( ) { } - //-------------------------------------------------------------------- + void FmTextControlFeature::dispatch() const SAL_THROW(()) { dispatch( Sequence< PropertyValue >( ) ); } - //-------------------------------------------------------------------- + void FmTextControlFeature::dispatch( const Sequence< PropertyValue >& _rArgs ) const SAL_THROW(()) { try @@ -82,7 +82,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException) { m_aFeatureState = _rState.State; @@ -92,13 +92,13 @@ namespace svx m_pInvalidator->Invalidate( m_nSlotId ); } - //-------------------------------------------------------------------- + void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) { // nothing to do } - //-------------------------------------------------------------------- + void FmTextControlFeature::dispose() SAL_THROW(()) { try diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 8365b206fbd4..36914c891158 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -184,9 +184,9 @@ namespace svx virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); }; - //-------------------------------------------------------------------- + DBG_NAME( FmFocusListenerAdapter ) - //-------------------------------------------------------------------- + FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< XControl >& _rxControl, IFocusObserver* _pObserver ) :m_pObserver( _pObserver ) ,m_xWindow( _rxControl, UNO_QUERY ) @@ -209,7 +209,7 @@ namespace svx osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + FmFocusListenerAdapter::~FmFocusListenerAdapter() { acquire(); @@ -218,7 +218,7 @@ namespace svx DBG_DTOR( FmFocusListenerAdapter, NULL ); } - //-------------------------------------------------------------------- + void FmFocusListenerAdapter::dispose() { if ( m_xWindow.is() ) @@ -228,21 +228,21 @@ namespace svx } } - //-------------------------------------------------------------------- + void SAL_CALL FmFocusListenerAdapter::focusGained( const FocusEvent& e ) throw (RuntimeException) { if ( m_pObserver ) m_pObserver->focusGained( e ); } - //-------------------------------------------------------------------- + void SAL_CALL FmFocusListenerAdapter::focusLost( const FocusEvent& e ) throw (RuntimeException) { if ( m_pObserver ) m_pObserver->focusLost( e ); } - //-------------------------------------------------------------------- + void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException) { (void)Source; @@ -281,9 +281,9 @@ namespace svx //==================================================================== //= FmMouseListenerAdapter //==================================================================== - //-------------------------------------------------------------------- + DBG_NAME( FmMouseListenerAdapter ) - //-------------------------------------------------------------------- + FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver ) :m_pObserver( _pObserver ) ,m_xWindow( _rxControl, UNO_QUERY ) @@ -306,7 +306,7 @@ namespace svx osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + FmMouseListenerAdapter::~FmMouseListenerAdapter() { acquire(); @@ -315,7 +315,7 @@ namespace svx DBG_DTOR( FmMouseListenerAdapter, NULL ); } - //-------------------------------------------------------------------- + void FmMouseListenerAdapter::dispose() { if ( m_xWindow.is() ) @@ -325,7 +325,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -337,25 +337,25 @@ namespace svx } } - //-------------------------------------------------------------------- + void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException) { (void)Source; @@ -366,7 +366,7 @@ namespace svx //==================================================================== //= FmTextControlShell //==================================================================== - //------------------------------------------------------------------------ + namespace { //.................................................................... @@ -545,7 +545,7 @@ namespace svx } } - //------------------------------------------------------------------------ + FmTextControlShell::FmTextControlShell( SfxViewFrame* _pFrame ) :m_bActiveControl( false ) ,m_bActiveControlIsReadOnly( true ) @@ -558,13 +558,13 @@ namespace svx m_aClipboardInvalidation.SetTimeout( 200 ); } - //------------------------------------------------------------------------ + FmTextControlShell::~FmTextControlShell() { dispose(); } - //------------------------------------------------------------------------ + IMPL_LINK( FmTextControlShell, OnInvalidateClipboard, void*, /*_pNotInterestedIn*/ ) { if ( m_bNeedClipboardInvalidation ) @@ -578,7 +578,7 @@ namespace svx return 0L; } - //------------------------------------------------------------------------ + void FmTextControlShell::transferFeatureStatesToItemSet( ControlFeatures& _rDispatchers, SfxAllItemSet& _rSet, bool _bTranslateLatin ) { SfxItemPool& rPool = *_rSet.GetPool(); @@ -650,7 +650,7 @@ namespace svx } } - //------------------------------------------------------------------------ + void FmTextControlShell::executeAttributeDialog( AttributeSet _eSet, SfxRequest& _rReq ) { const SvxFontListItem* pFontList = PTR_CAST( SvxFontListItem, m_pViewFrame->GetObjectShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ); @@ -764,7 +764,7 @@ namespace svx SfxItemPool::Free(pPool); } - //------------------------------------------------------------------------ + bool FmTextControlShell::executeSelectAll( ) { try @@ -783,7 +783,7 @@ namespace svx return false; // not handled } - //------------------------------------------------------------------------ + bool FmTextControlShell::executeClipboardSlot( SfxSlotId _nSlot ) { try @@ -825,7 +825,7 @@ namespace svx return false; // not handled } - //------------------------------------------------------------------------ + void FmTextControlShell::ExecuteTextAttribute( SfxRequest& _rReq ) { SfxSlotId nSlot = _rReq.GetSlot(); @@ -931,7 +931,7 @@ namespace svx _rReq.Done(); } - //------------------------------------------------------------------------ + void FmTextControlShell::GetTextAttributeState( SfxItemSet& _rSet ) { SfxWhichIter aIter( _rSet ); @@ -1034,7 +1034,7 @@ namespace svx } } - //------------------------------------------------------------------------ + bool FmTextControlShell::IsActiveControl( bool _bCountRichTextOnly ) const { if ( _bCountRichTextOnly && !m_bActiveControlIsRichText ) @@ -1043,7 +1043,7 @@ namespace svx return m_bActiveControl; } - //------------------------------------------------------------------------ + void FmTextControlShell::dispose() { if ( IsActiveControl() ) @@ -1052,13 +1052,13 @@ namespace svx stopControllerListening(); } - //------------------------------------------------------------------------ + void FmTextControlShell::designModeChanged( bool /*_bNewDesignMode*/ ) { m_rBindings.Invalidate( pTextControlSlots ); } - //------------------------------------------------------------------------ + void FmTextControlShell::formActivated( const Reference< XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 @@ -1086,7 +1086,7 @@ namespace svx } } - //------------------------------------------------------------------------ + void FmTextControlShell::formDeactivated( const Reference< XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 @@ -1102,7 +1102,7 @@ namespace svx stopControllerListening(); } - //------------------------------------------------------------------------ + void FmTextControlShell::startControllerListening( const Reference< XFormController >& _rxController ) { OSL_PRECOND( _rxController.is(), "FmTextControlShell::startControllerListening: invalid controller!" ); @@ -1135,7 +1135,7 @@ namespace svx m_xActiveController = _rxController; } - //------------------------------------------------------------------------ + void FmTextControlShell::stopControllerListening( ) { OSL_PRECOND( isControllerListening(), "FmTextControlShell::stopControllerListening: inconsistence!" ); @@ -1155,7 +1155,7 @@ namespace svx m_xActiveController.clear(); } - //------------------------------------------------------------------------ + void FmTextControlShell::implClearActiveControlRef() { // no more features for this control @@ -1189,7 +1189,7 @@ namespace svx m_bActiveControl = false; } - //------------------------------------------------------------------------ + void FmTextControlShell::controlDeactivated( ) { DBG_ASSERT( IsActiveControl(), "FmTextControlShell::controlDeactivated: no active control!" ); @@ -1199,7 +1199,7 @@ namespace svx m_rBindings.Invalidate( pTextControlSlots ); } - //------------------------------------------------------------------------ + void FmTextControlShell::controlActivated( const Reference< XControl >& _rxControl ) { // ensure that all knittings with the previously active control are lost @@ -1276,7 +1276,7 @@ namespace svx m_bNeedClipboardInvalidation = true; } - //------------------------------------------------------------------------ + void FmTextControlShell::fillFeatureDispatchers( const Reference< XControl > _rxControl, SfxSlotId* _pZeroTerminatedSlots, ControlFeatures& _rDispatchers ) { @@ -1297,7 +1297,7 @@ namespace svx } } - //------------------------------------------------------------------------ + void FmTextControlShell::impl_parseURL_nothrow( URL& _rURL ) { try @@ -1315,7 +1315,7 @@ namespace svx } } - //------------------------------------------------------------------------ + FmTextControlFeature* FmTextControlShell::implGetFeatureDispatcher( const Reference< XDispatchProvider >& _rxProvider, SfxApplication* _pApplication, SfxSlotId _nSlot ) { OSL_PRECOND( _rxProvider.is() && _pApplication, "FmTextControlShell::implGetFeatureDispatcher: invalid arg(s)!" ); @@ -1328,7 +1328,7 @@ namespace svx return NULL; } - //------------------------------------------------------------------------ + void FmTextControlShell::Invalidate( SfxSlotId _nSlot ) { m_rBindings.Invalidate( _nSlot ); @@ -1337,7 +1337,7 @@ namespace svx m_rBindings.Update( _nSlot ); } - //------------------------------------------------------------------------ + void FmTextControlShell::focusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) { Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); @@ -1353,7 +1353,7 @@ namespace svx controlActivated( xControl ); } - //------------------------------------------------------------------------ + void FmTextControlShell::focusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) { Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); @@ -1367,13 +1367,13 @@ namespace svx m_bActiveControl = false; } - //------------------------------------------------------------------------ + void FmTextControlShell::ForgetActiveControl() { implClearActiveControlRef(); } - //------------------------------------------------------------------------ + void FmTextControlShell::contextMenuRequested( const awt::MouseEvent& /*_rEvent*/ ) { m_rBindings.GetDispatcher()->ExecutePopup( SVX_RES( RID_FM_TEXTATTRIBUTE_MENU ) ); diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 5d5aa6ec2c99..f80c41b66ba9 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -167,7 +167,7 @@ void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Windo displayException(_rEvent.Reason, _pParent); } -//------------------------------------------------------------------------------ + sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement) { sal_Int32 nIndex = -1; @@ -201,7 +201,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce return nIndex; } -//------------------------------------------------------------------ + OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) { if (!xControlModel.is()) @@ -224,19 +224,19 @@ OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& x //======================================================================== // = CursorWrapper -//------------------------------------------------------------------------ + CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned) { ImplConstruct(Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned); } -//------------------------------------------------------------------------ + CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned) { ImplConstruct(_rxCursor, bUseCloned); } -//------------------------------------------------------------------------ + void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned) { if (bUseCloned) @@ -267,7 +267,7 @@ void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResu m_xGeneric = m_xMoveOperations.get(); } -//------------------------------------------------------------------------ + const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor) { m_xMoveOperations = Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY); @@ -282,13 +282,13 @@ const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star: return *this; } -//------------------------------------------------------------------------------ + FmXDisposeListener::~FmXDisposeListener() { setAdapter(NULL); } -//------------------------------------------------------------------------------ + void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) { if (m_pAdapter) @@ -308,7 +308,7 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) //============================================================================== DBG_NAME(FmXDisposeMultiplexer); -//------------------------------------------------------------------------------ + FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId) :m_xObject(_rxObject) ,m_pListener(_pListener) @@ -321,14 +321,14 @@ FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, con m_xObject->addEventListener(this); } -//------------------------------------------------------------------------------ + FmXDisposeMultiplexer::~FmXDisposeMultiplexer() { DBG_DTOR(FmXDisposeMultiplexer, NULL); } // ::com::sun::star::lang::XEventListener -//------------------------------------------------------------------ + void FmXDisposeMultiplexer::disposing(const ::com::sun::star::lang::EventObject& _Source) throw( RuntimeException ) { Reference< ::com::sun::star::lang::XEventListener> xPreventDelete(this); @@ -342,7 +342,7 @@ void FmXDisposeMultiplexer::disposing(const ::com::sun::star::lang::EventObject& m_xObject = NULL; } -//------------------------------------------------------------------ + void FmXDisposeMultiplexer::dispose() { if (m_xObject.is()) @@ -358,7 +358,7 @@ void FmXDisposeMultiplexer::dispose() } //============================================================================== -//------------------------------------------------------------------------------ + sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject) { // ask for the persistent service name @@ -432,7 +432,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi return OBJ_FM_CONTROL; } -//------------------------------------------------------------------------------ + sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet) { sal_Bool bIsAlive = sal_False; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 0ef9fd22bded..7092502ea5c7 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -141,9 +141,9 @@ private: }; -//------------------------------------------------------------------------------ + // some helper structs for caching property infos -//------------------------------------------------------------------------------ + struct PropertyInfo { sal_Bool bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it @@ -168,12 +168,12 @@ sal_Bool operator < (const Reference< XPropertySet >& lhs, typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache; -//------------------------------------------------------------------------------ + OUString static_STR_UNDO_PROPERTY; -//------------------------------------------------------------------------------ + DBG_NAME(FmXUndoEnvironment) -//------------------------------------------------------------------------------ + FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel) :rModel( _rModel ) ,m_pPropertySetCache( NULL ) @@ -192,7 +192,7 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel) } } -//------------------------------------------------------------------------------ + FmXUndoEnvironment::~FmXUndoEnvironment() { DBG_DTOR(FmXUndoEnvironment,NULL); @@ -203,7 +203,7 @@ FmXUndoEnvironment::~FmXUndoEnvironment() delete static_cast<PropertySetInfoCache*>(m_pPropertySetCache); } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::dispose() { OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::dispose: disposed twice?" ); @@ -251,7 +251,7 @@ void FmXUndoEnvironment::dispose() m_bDisposed = true; } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::ModeChanged() { OSL_PRECOND( rModel.GetObjectShell(), "FmXUndoEnvironment::ModeChanged: no object shell anymore!" ); @@ -294,7 +294,7 @@ void FmXUndoEnvironment::ModeChanged() } } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if (rHint.ISA(SdrHint)) @@ -343,7 +343,7 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } -//------------------------------------------------------------------ + void FmXUndoEnvironment::Inserted(SdrObject* pObj) { if (pObj->GetObjInventor() == FmFormInventor) @@ -359,7 +359,7 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj) } } -//------------------------------------------------------------------------------ + namespace { sal_Bool lcl_searchElement(const Reference< XIndexAccess>& xCont, const Reference< XInterface >& xElement) @@ -395,7 +395,7 @@ namespace } } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::Inserted(FmFormObj* pObj) { DBG_ASSERT( pObj, "FmXUndoEnvironment::Inserted: invalid object!" ); @@ -452,7 +452,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj) } } -//------------------------------------------------------------------ + void FmXUndoEnvironment::Removed(SdrObject* pObj) { if ( pObj->IsVirtualObj() ) @@ -473,7 +473,7 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj) } } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::Removed(FmFormObj* pObj) { DBG_ASSERT( pObj, "FmXUndoEnvironment::Removed: invalid object!" ); @@ -519,7 +519,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj) } // XEventListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { // check if it's an object we have cached information about @@ -537,7 +537,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime } // XPropertyChangeListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -732,7 +732,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) } // XContainerListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -747,7 +747,7 @@ void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) thr implSetModified(); } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::implSetModified() { if ( !IsLocked() && rModel.GetObjectShell() ) @@ -756,7 +756,7 @@ void FmXUndoEnvironment::implSetModified() } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -773,7 +773,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr implSetModified(); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -786,13 +786,13 @@ void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) thro implSetModified(); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException) { implSetModified(); } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms) { Lock(); @@ -800,7 +800,7 @@ void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms) UnLock(); } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms) { Lock(); @@ -808,7 +808,7 @@ void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms) UnLock(); } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element) { // am Container horchen @@ -835,7 +835,7 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(()) { OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" ); @@ -892,7 +892,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r } } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()) { OSL_PRECOND( _rxObject.is(), "FmXUndoEnvironment::switchListening: how should I listen at a NULL object?" ); @@ -926,7 +926,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje } } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement ) { OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::AddElement: not when I'm already disposed!" ); @@ -939,7 +939,7 @@ void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement ) switchListening( _rxElement, true ); } -//------------------------------------------------------------------------------ + void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement) { if ( m_bDisposed ) @@ -968,7 +968,7 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement } -//------------------------------------------------------------------------------ + FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyChangeEvent& evt) :SdrUndoAction(rNewMod) ,xObj(evt.Source, UNO_QUERY) @@ -983,7 +983,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC } -//------------------------------------------------------------------------------ + void FmUndoPropertyAction::Undo() { FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv(); @@ -1003,7 +1003,7 @@ void FmUndoPropertyAction::Undo() } } -//------------------------------------------------------------------------------ + void FmUndoPropertyAction::Redo() { FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv(); @@ -1023,7 +1023,7 @@ void FmUndoPropertyAction::Redo() } } -//------------------------------------------------------------------------------ + OUString FmUndoPropertyAction::GetComment() const { OUString aStr(static_STR_UNDO_PROPERTY); @@ -1034,7 +1034,7 @@ OUString FmUndoPropertyAction::GetComment() const DBG_NAME(FmUndoContainerAction); -//------------------------------------------------------------------------------ + FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod, Action _eAction, const Reference< XIndexContainer > & xCont, @@ -1071,7 +1071,7 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod, } } -//------------------------------------------------------------------------------ + FmUndoContainerAction::~FmUndoContainerAction() { // if we own the object .... @@ -1079,7 +1079,7 @@ FmUndoContainerAction::~FmUndoContainerAction() DBG_DTOR(FmUndoContainerAction,NULL); } -//------------------------------------------------------------------------------ + void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xElem ) { @@ -1094,7 +1094,7 @@ void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xEle } } -//------------------------------------------------------------------------------ + void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) { if ( m_xContainer->getCount() >= m_nIndex ) @@ -1123,7 +1123,7 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) } } -//------------------------------------------------------------------------------ + void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) ) { Reference< XInterface > xElement; @@ -1151,7 +1151,7 @@ void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) ) } } -//------------------------------------------------------------------------------ + void FmUndoContainerAction::Undo() { FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv(); @@ -1180,7 +1180,7 @@ void FmUndoContainerAction::Undo() } } -//------------------------------------------------------------------------------ + void FmUndoContainerAction::Redo() { FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv(); @@ -1208,7 +1208,7 @@ void FmUndoContainerAction::Redo() } } -//------------------------------------------------------------------------------ + FmUndoModelReplaceAction::FmUndoModelReplaceAction(FmFormModel& _rMod, SdrUnoObj* _pObject, const Reference< XControlModel > & _xReplaced) :SdrUndoAction(_rMod) ,m_xReplaced(_xReplaced) @@ -1216,14 +1216,14 @@ FmUndoModelReplaceAction::FmUndoModelReplaceAction(FmFormModel& _rMod, SdrUnoObj { } -//------------------------------------------------------------------------------ + FmUndoModelReplaceAction::~FmUndoModelReplaceAction() { // dispose our element if nobody else is responsible for DisposeElement(m_xReplaced); } -//------------------------------------------------------------------------------ + void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ) { @@ -1236,7 +1236,7 @@ void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Refe } } -//------------------------------------------------------------------------------ + void FmUndoModelReplaceAction::Undo() { try @@ -1275,7 +1275,7 @@ void FmUndoModelReplaceAction::Undo() } } -//------------------------------------------------------------------------------ + OUString FmUndoModelReplaceAction::GetComment() const { return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index e1e744337888..b0d3c0a3bd80 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -79,17 +79,17 @@ using namespace ::svxform; using namespace ::svx; //======================================================================== -//------------------------------------------------------------------------ + TYPEINIT1(FmFormView, E3dView); -//------------------------------------------------------------------------ + FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut ) :E3dView(pModel,pOut) { Init(); } -//------------------------------------------------------------------------ + void FmFormView::Init() { pFormShell = NULL; @@ -138,7 +138,7 @@ void FmFormView::Init() SetDesignMode( bInitDesignMode ); } -//------------------------------------------------------------------------ + FmFormView::~FmFormView() { if( pFormShell ) @@ -149,7 +149,7 @@ FmFormView::~FmFormView() pImpl = NULL; } -//------------------------------------------------------------------------ + FmFormPage* FmFormView::GetCurPage() { SdrPageView* pPageView = GetSdrPageView(); @@ -157,7 +157,7 @@ FmFormPage* FmFormView::GetCurPage() return pCurPage; } -//------------------------------------------------------------------------ + void FmFormView::MarkListHasChanged() { E3dView::MarkListHasChanged(); @@ -201,7 +201,7 @@ namespace } } -//------------------------------------------------------------------------ + void FmFormView::AddWindowToPaintView(OutputDevice* pNewWin) { E3dView::AddWindowToPaintView(pNewWin); @@ -216,7 +216,7 @@ void FmFormView::AddWindowToPaintView(OutputDevice* pNewWin) pImpl->addWindow( *pPageWindow ); } -//------------------------------------------------------------------------ + void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin) { const SdrPageWindow* pPageWindow = findPageWindow( this, pNewWin ); @@ -226,7 +226,7 @@ void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin) E3dView::DeleteWindowFromPaintView(pNewWin); } -//------------------------------------------------------------------------ + void FmFormView::ChangeDesignMode(sal_Bool bDesign) { if (bDesign == IsDesignMode()) @@ -313,14 +313,14 @@ void FmFormView::ChangeDesignMode(sal_Bool bDesign) pModel->GetUndoEnv().UnLock(); } -//------------------------------------------------------------------------ + void FmFormView::GrabFirstControlFocus( sal_Bool _bForceSync ) { if ( !IsDesignMode() ) pImpl->AutoFocus( _bForceSync ); } -//------------------------------------------------------------------------ + SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage) { SdrPageView* pPV = E3dView::ShowSdrPage(pPage); @@ -356,7 +356,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage) return pPV; } -//------------------------------------------------------------------------ + void FmFormView::HideSdrPage() { // --- 1. deactivate controls @@ -373,19 +373,19 @@ void FmFormView::HideSdrPage() E3dView::HideSdrPage(); } -//------------------------------------------------------------------------ + SdrModel* FmFormView::GetMarkedObjModel() const { return E3dView::GetMarkedObjModel(); } -//------------------------------------------------------------------------ + sal_Bool FmFormView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { return E3dView::Paste(rMod, rPos, pLst, nOptions); } -//------------------------------------------------------------------------ + void FmFormView::ActivateControls(SdrPageView* pPageView) { if (!pPageView) @@ -398,7 +398,7 @@ void FmFormView::ActivateControls(SdrPageView* pPageView) } } -//------------------------------------------------------------------------ + void FmFormView::DeactivateControls(SdrPageView* pPageView) { if( !pPageView ) @@ -411,19 +411,19 @@ void FmFormView::DeactivateControls(SdrPageView* pPageView) } } -//------------------------------------------------------------------------ + SdrObject* FmFormView::CreateFieldControl( const ODataAccessDescriptor& _rColumnDescriptor ) { return pImpl->implCreateFieldControl( _rColumnDescriptor ); } -//------------------------------------------------------------------------ + SdrObject* FmFormView::CreateXFormsControl( const OXFormsDescriptor &_rDesc ) { return pImpl->implCreateXFormsControl(_rDesc); } -//------------------------------------------------------------------------ + SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const { OUString sDataSource = rFieldDesc.getToken(0,sal_Unicode(11)); @@ -443,7 +443,7 @@ SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const return pImpl->implCreateFieldControl( aColumnDescriptor ); } -//------------------------------------------------------------------------ + void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC) { if( !IsDesignMode() ) @@ -465,7 +465,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt:: } } -//------------------------------------------------------------------------ + void FmFormView::RemoveControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC) { if( !IsDesignMode() ) @@ -474,7 +474,7 @@ void FmFormView::RemoveControlContainer(const Reference< ::com::sun::star::awt:: } } -// ----------------------------------------------------------------------------- + SdrPaintWindow* FmFormView::BeginCompleteRedraw(OutputDevice* pOut) { SdrPaintWindow* pPaintWindow = E3dView::BeginCompleteRedraw( pOut ); @@ -482,14 +482,14 @@ SdrPaintWindow* FmFormView::BeginCompleteRedraw(OutputDevice* pOut) return pPaintWindow; } -// ----------------------------------------------------------------------------- + void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFormLayer ) { E3dView::EndCompleteRedraw( rPaintWindow, bPaintFormLayer ); pImpl->resumeTabOrderUpdate(); } -// ----------------------------------------------------------------------------- + sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { sal_Bool bDone = sal_False; @@ -539,7 +539,7 @@ sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) bDone = E3dView::KeyInput(rKEvt,pWin); return bDone; } -// ----------------------------------------------------------------------------- + sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) { Reference< ::com::sun::star::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY); @@ -550,7 +550,7 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) { sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin ); @@ -565,7 +565,7 @@ sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) return bReturn; } -// ----------------------------------------------------------------------------- + FmFormObj* FmFormView::getMarkedGrid() const { FmFormObj* pFormObject = NULL; @@ -587,7 +587,7 @@ FmFormObj* FmFormView::getMarkedGrid() const return pFormObject; } -// ----------------------------------------------------------------------------- + void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, @@ -601,7 +601,7 @@ void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOf _rpLabel, _rpControl ); } -// ----------------------------------------------------------------------------- + Reference< runtime::XFormController > FmFormView::GetFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const { return pImpl->getFormController( _rxForm, _rDevice ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 3f65b4638e45..c6c29adce7db 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -152,7 +152,7 @@ using namespace ::svxform; namespace CommandType = ::com::sun::star::sdb::CommandType; namespace DataType = ::com::sun::star::sdbc::DataType; -//------------------------------------------------------------------------------ + class FmXFormView::ObjectRemoveListener : public SfxListener { FmXFormView* m_pParent; @@ -163,7 +163,7 @@ public: //======================================================================== DBG_NAME(FormViewPageWindowAdapter) -//------------------------------------------------------------------------ + FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) : m_xControlContainer( _rWindow.GetControlContainer() ), m_xContext( _rContext ), @@ -194,13 +194,13 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference< } } } -// ----------------------------------------------------------------------------- + FormViewPageWindowAdapter::~FormViewPageWindowAdapter() { DBG_DTOR(FormViewPageWindowAdapter,NULL); } -//------------------------------------------------------------------ + void FormViewPageWindowAdapter::dispose() { for ( ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin(); @@ -234,33 +234,33 @@ void FormViewPageWindowAdapter::dispose() } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException ) { return getCount() != 0; } -//------------------------------------------------------------------------------ + Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException ) { return ::getCppuType((const Reference< XFormController>*)0); } // XEnumerationAccess -//------------------------------------------------------------------------------ + Reference< XEnumeration > SAL_CALL FormViewPageWindowAdapter::createEnumeration(void) throw( RuntimeException ) { return new ::comphelper::OEnumerationByIndex(this); } // XIndexAccess -//------------------------------------------------------------------------------ + sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException ) { return m_aControllerList.size(); } -//------------------------------------------------------------------------------ + Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { if (nIndex < 0 || @@ -272,7 +272,7 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde return aElement; } -//------------------------------------------------------------------------ + void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -287,7 +287,7 @@ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl } } -//------------------------------------------------------------------------ + Reference< XFormController > getControllerSearchChildren( const Reference< XIndexAccess > & xIndex, const Reference< XTabControllerModel > & xModel) { if (xIndex.is() && xIndex->getCount()) @@ -311,7 +311,7 @@ Reference< XFormController > getControllerSearchChildren( const Reference< XInd } // Search the according controller -//------------------------------------------------------------------------ + Reference< XFormController > FormViewPageWindowAdapter::getController( const Reference< XForm > & xForm ) const { Reference< XTabControllerModel > xModel(xForm, UNO_QUERY); @@ -329,7 +329,7 @@ Reference< XFormController > FormViewPageWindowAdapter::getController( const Re return Reference< XFormController > (); } -//------------------------------------------------------------------------ + void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController ) { DBG_ASSERT( xForm.is(), "FormViewPageWindowAdapter::setController: there should be a form!" ); @@ -383,7 +383,7 @@ void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, } } -//------------------------------------------------------------------------ + void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxForm ) { OSL_PRECOND( _rxForm.is(), "FormViewPageWindowAdapter::updateTabOrder: illegal argument!" ); @@ -417,7 +417,7 @@ void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxFor } } -//------------------------------------------------------------------------ + FmXFormView::FmXFormView(FmFormView* _pView ) :m_pMarkedGrid(NULL) ,m_pView(_pView) @@ -431,7 +431,7 @@ FmXFormView::FmXFormView(FmFormView* _pView ) { } -//------------------------------------------------------------------------ + void FmXFormView::cancelEvents() { if ( m_nActivationEvent ) @@ -459,7 +459,7 @@ void FmXFormView::cancelEvents() } } -//------------------------------------------------------------------------ + void FmXFormView::notifyViewDying( ) { DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" ); @@ -467,7 +467,7 @@ void FmXFormView::notifyViewDying( ) cancelEvents(); } -//------------------------------------------------------------------------ + FmXFormView::~FmXFormView() { DBG_ASSERT( m_aPageWindowAdapters.empty(), "FmXFormView::~FmXFormView: Window list not empty!" ); @@ -489,7 +489,7 @@ FmXFormView::~FmXFormView() } // EventListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException ) { if ( m_xWindow.is() && Source.Source == m_xWindow ) @@ -497,14 +497,14 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx } // XFormControllerListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException ) { if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formActivated( rEvent ); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException ) { if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) @@ -512,7 +512,7 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run } // XContainerListener -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException ) { try @@ -540,18 +540,18 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run } } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException ) { elementInserted(evt); } -//------------------------------------------------------------------------------ + void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException ) { } -//------------------------------------------------------------------------------ + PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) const { for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); @@ -565,7 +565,7 @@ PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlCon return NULL; } -//------------------------------------------------------------------------------ + void FmXFormView::addWindow(const SdrPageWindow& rWindow) { FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() ); @@ -587,7 +587,7 @@ void FmXFormView::addWindow(const SdrPageWindow& rWindow) } } -//------------------------------------------------------------------------------ + void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) { // Wird gerufen, wenn @@ -614,7 +614,7 @@ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) } } -//------------------------------------------------------------------------------ + void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) { DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" ); @@ -624,7 +624,7 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) m_nErrorMessageEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnDelayedErrorMessage ) ); } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/) { m_nErrorMessageEvent = 0; @@ -632,21 +632,21 @@ IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/) return 0L; } -//------------------------------------------------------------------------------ + void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel ) { if ( _pDocModel && _pDocModel->GetAutoControlFocus() ) m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) ); } -//------------------------------------------------------------------------------ + void FmXFormView::suspendTabOrderUpdate() { OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" ); m_isTabOrderUpdateSuspended = true; } -//------------------------------------------------------------------------------ + void FmXFormView::resumeTabOrderUpdate() { OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" ); @@ -673,7 +673,7 @@ void FmXFormView::resumeTabOrderUpdate() m_aNeedTabOrderUpdate.clear(); } -//------------------------------------------------------------------------------ + IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) { m_nActivationEvent = 0; @@ -735,7 +735,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) return 0; } -//------------------------------------------------------------------------------ + void FmXFormView::Activate(sal_Bool bSync) { if (m_nActivationEvent) @@ -752,7 +752,7 @@ void FmXFormView::Activate(sal_Bool bSync) m_nActivationEvent = Application::PostUserEvent(LINK(this,FmXFormView,OnActivate)); } -//------------------------------------------------------------------------------ + void FmXFormView::Deactivate(sal_Bool bDeactivateController) { if (m_nActivationEvent) @@ -766,12 +766,12 @@ void FmXFormView::Deactivate(sal_Bool bDeactivateController) pShImpl->setActiveController( NULL ); } -//------------------------------------------------------------------------------ + FmFormShell* FmXFormView::GetFormShell() const { return m_pView ? m_pView->GetFormShell() : NULL; } -// ----------------------------------------------------------------------------- + void FmXFormView::AutoFocus( sal_Bool _bSync ) { if (m_nAutoFocusEvent) @@ -783,7 +783,7 @@ void FmXFormView::AutoFocus( sal_Bool _bSync ) m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus)); } -// ----------------------------------------------------------------------------- + bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl ) { if ( !i_rControl.is() ) @@ -824,7 +824,7 @@ bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl ) return false; } -// ----------------------------------------------------------------------------- + static Reference< XControl > lcl_firstFocussableControl( const Sequence< Reference< XControl > >& _rControls ) { Reference< XControl > xReturn; @@ -850,7 +850,7 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen return xReturn; } -// ----------------------------------------------------------------------------- + namespace { // ......................................................................... @@ -883,7 +883,7 @@ namespace } } -// ----------------------------------------------------------------------------- + Reference< XFormController > FmXFormView::getFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const { Reference< XFormController > xController; @@ -911,7 +911,7 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF return xController; } -// ----------------------------------------------------------------------------- + IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) { m_nAutoFocusEvent = 0; @@ -987,7 +987,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) return 1L; } -// ----------------------------------------------------------------------------- + void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) { FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL; @@ -1024,7 +1024,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) m_nControlWizardEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnStartControlWizard ) ); } -// ----------------------------------------------------------------------------- + IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) { m_nControlWizardEvent = 0; @@ -1097,7 +1097,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) return 1L; } -// ----------------------------------------------------------------------------- + namespace { void lcl_insertIntoFormComponentHierarchy_throw( const FmFormView& _rView, const SdrUnoObj& _rSdrObj, @@ -1118,7 +1118,7 @@ namespace } } -// ----------------------------------------------------------------------------- + SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ) { // not if we're in design mode @@ -1352,7 +1352,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript return NULL; } -// ----------------------------------------------------------------------------- + SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ) { // not if we're in design mode @@ -1482,7 +1482,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor return NULL; } -//------------------------------------------------------------------------ + bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, @@ -1510,7 +1510,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO return true; } -//------------------------------------------------------------------------ + bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, @@ -1669,20 +1669,20 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO return true; } -//------------------------------------------------------------------------------ + FmXFormView::ObjectRemoveListener::ObjectRemoveListener( FmXFormView* pParent ) :m_pParent( pParent ) { } -//------------------------------------------------------------------------------ + void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if (rHint.ISA(SdrHint) && (((SdrHint&)rHint).GetKind() == HINT_OBJREMOVED)) m_pParent->ObjectRemovedInAliveMode(((SdrHint&)rHint).GetObject()); } -//------------------------------------------------------------------------------ + void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) { // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht, @@ -1704,7 +1704,7 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) } } -//------------------------------------------------------------------------------ + void FmXFormView::stopMarkListWatching() { if ( m_pWatchStoredList ) @@ -1715,7 +1715,7 @@ void FmXFormView::stopMarkListWatching() } } -//------------------------------------------------------------------------------ + void FmXFormView::startMarkListWatching() { if ( !m_pWatchStoredList ) @@ -1731,7 +1731,7 @@ void FmXFormView::startMarkListWatching() } } -//------------------------------------------------------------------------------ + void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) { if ( m_pView ) @@ -1778,7 +1778,7 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) } } -//-------------------------------------------------------------------------- + static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj ) { sal_Bool bFound = sal_False; @@ -1789,7 +1789,7 @@ static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj ) return bFound; } -//------------------------------------------------------------------------------ + void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) { if ( !m_pView ) @@ -1876,7 +1876,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) m_aMark.Clear(); } } -// ----------------------------------------------------------------------------- + void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException) { if ( m_xWindow.is() && m_pView ) @@ -1884,7 +1884,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime m_pView->SetMoveOutside( true, FmFormView::ImplAccess() ); } } -// ----------------------------------------------------------------------------- + void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException) { // when switch the focus outside the office the mark didn't change @@ -1894,7 +1894,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx m_pView->SetMoveOutside( false, FmFormView::ImplAccess() ); } } -// ----------------------------------------------------------------------------- + void FmXFormView::removeGridWindowListening() { if ( m_xWindow.is() ) @@ -1908,7 +1908,7 @@ void FmXFormView::removeGridWindowListening() } } -// ----------------------------------------------------------------------------- + DocumentType FmXFormView::impl_getDocumentType() const { if ( GetFormShell() && GetFormShell()->GetImpl() ) diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 8364115fa320..508e88ab0bf7 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -110,7 +110,7 @@ namespace svxform //==================================================================== //= FormControlFactory //==================================================================== - //-------------------------------------------------------------------- + FormControlFactory::FormControlFactory( const Reference<XComponentContext>& _rContext ) :m_pData( new FormControlFactory_Data( _rContext ) ) { @@ -121,12 +121,12 @@ namespace svxform { } - //-------------------------------------------------------------------- + FormControlFactory::~FormControlFactory() { } - //-------------------------------------------------------------------- + sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const SdrUnoObj& _rObject ) { return initializeControlModel( @@ -136,7 +136,7 @@ namespace svxform ); } - //-------------------------------------------------------------------- + sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel ) { return initializeControlModel( @@ -144,7 +144,7 @@ namespace svxform ); } - // ----------------------------------------------------------------------------- + namespace { //.................................................................... @@ -391,7 +391,7 @@ namespace svxform } } - //-------------------------------------------------------------------- + sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel, const Rectangle& _rControlBoundRect ) { @@ -518,7 +518,7 @@ namespace svxform return nClassId; } - //------------------------------------------------------------------------------ + void FormControlFactory::initializeTextFieldLineEnds( const Reference< XPropertySet >& _rxModel ) { OSL_PRECOND( _rxModel.is(), "initializeTextFieldLineEnds: invalid model!" ); @@ -555,7 +555,7 @@ namespace svxform } } - //------------------------------------------------------------------------------ + void FormControlFactory::initializeFieldDependentProperties( const Reference< XPropertySet >& _rxDatabaseField, const Reference< XPropertySet >& _rxControlModel, const Reference< XNumberFormats >& _rxNumberFormats ) { @@ -653,7 +653,7 @@ namespace svxform } } - //------------------------------------------------------------------------------ + OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject ) { sal_uInt16 nResId(0); @@ -694,7 +694,7 @@ namespace svxform return SVX_RESSTR(nResId); } - //------------------------------------------------------------------------------ + OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer, const Reference< XPropertySet >& _rxObject ) { @@ -705,7 +705,7 @@ namespace svxform return getUniqueName( _rxContainer, sBaseName ); } - //------------------------------------------------------------------------------ + OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const OUString& _rBaseName ) { sal_Int32 n = 0; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 691e97016276..97d3dd8c2c58 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -97,7 +97,7 @@ using namespace ::comphelper; using namespace ::connectivity; using namespace ::connectivity::simple; -//------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) { @@ -268,7 +268,7 @@ private: bool m_bControlsInitialized; }; -//------------------------------------------------------------------------------ + ColumnInfoCache::ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSupplier ) :m_aColumns() ,m_bControlsInitialized( false ) @@ -302,7 +302,7 @@ ColumnInfoCache::ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSup } } -//------------------------------------------------------------------------------ + namespace { bool lcl_isBoundTo( const Reference< XPropertySet >& _rxControlModel, const Reference< XInterface >& _rxNormDBField ) @@ -326,7 +326,7 @@ namespace } } -//------------------------------------------------------------------------------ + void ColumnInfoCache::deinitializeControls() { for ( ColumnInfos::iterator col = m_aColumns.begin(); @@ -338,7 +338,7 @@ void ColumnInfoCache::deinitializeControls() } } -//------------------------------------------------------------------------------ + void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > >& _rControls ) { try @@ -418,7 +418,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > m_bControlsInitialized = true; } -//------------------------------------------------------------------------------ + const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos ) { if ( _pos >= m_aColumns.size() ) @@ -443,7 +443,7 @@ public: virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException); }; -//------------------------------------------------------------------ + void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException) { m_aValues = _rValues; @@ -484,7 +484,7 @@ protected: virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ); }; -//------------------------------------------------------------------------------ + void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -497,7 +497,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const } } -//------------------------------------------------------------------------------ + void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) { // these properties are ignored @@ -507,14 +507,14 @@ void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& UnoControl::ImplSetPeerProperty( rPropName, rVal ); } -//------------------------------------------------------------------------------ + IMPL_LINK( FormController, OnActivateTabOrder, void*, /*EMPTYTAG*/ ) { activateTabOrder(); return 1; } -//------------------------------------------------------------------------------ + struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch >, bool > { bool operator()( const Reference< XDispatch >& _rxDispatcher ) const @@ -547,7 +547,7 @@ IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisP /*************************************************************************/ DBG_NAME( FormController ) -//------------------------------------------------------------------ + FormController::FormController(const Reference< css::uno::XComponentContext > & _rxORB ) :FormController_BASE( m_aMutex ) ,OPropertySetHelper( FormController_BASE::rBHelper ) @@ -601,7 +601,7 @@ FormController::FormController(const Reference< css::uno::XComponentContext > & m_aFeatureInvalidationTimer.SetTimeoutHdl( LINK( this, FormController, OnInvalidateFeatures ) ); } -//------------------------------------------------------------------ + FormController::~FormController() { { @@ -637,19 +637,19 @@ FormController::~FormController() DBG_DTOR( FormController, NULL ); } -// ----------------------------------------------------------------------------- + void SAL_CALL FormController::acquire() throw () { FormController_BASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL FormController::release() throw () { FormController_BASE::release(); } -//------------------------------------------------------------------ + Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeException) { Any aRet = FormController_BASE::queryInterface( _rType ); @@ -660,7 +660,7 @@ Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeE return aRet; } -//------------------------------------------------------------------------------ + Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException ) { static ::cppu::OImplementationId* pId = NULL; @@ -707,13 +707,13 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) thro return ::comphelper::concatSequences( aCreatableServiceNames, aNonCreatableServiceNames ); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException ) { return sal_True; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( RuntimeException ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -721,7 +721,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime m_bModified = sal_False; } -//------------------------------------------------------------------------------ + Sequence< OUString> FormController::getSupportedServiceNames_Static(void) { static Sequence< OUString> aServices; @@ -734,7 +734,7 @@ Sequence< OUString> FormController::getSupportedServiceNames_Static(void) return aServices; } -// ----------------------------------------------------------------------------- + namespace { struct ResetComponentText : public ::std::unary_function< Reference< XTextComponent >, void > @@ -762,7 +762,7 @@ namespace }; } -// ----------------------------------------------------------------------------- + void FormController::impl_setTextOnAllFilter_throw() { m_bSuspendFilterTextListening = true; @@ -795,7 +795,7 @@ void FormController::impl_setTextOnAllFilter_throw() } } // OPropertySetHelper -//------------------------------------------------------------------------------ + sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/, sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) throw( IllegalArgumentException ) @@ -803,13 +803,13 @@ sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, An return sal_False; } -//------------------------------------------------------------------------------ + void FormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) throw( Exception ) { } -//------------------------------------------------------------------------------ + void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { switch (nHandle) @@ -889,14 +889,14 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons } } -//------------------------------------------------------------------------------ + Reference< XPropertySetInfo > FormController::getPropertySetInfo() throw( RuntimeException ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------------ + #define DECL_PROP_CORE(varname, type) \ pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((const type*)0), @@ -904,7 +904,7 @@ pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((co #define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1) -//------------------------------------------------------------------------------ + void FormController::fillProperties( Sequence< Property >& /* [out] */ _rProps, Sequence< Property >& /* [out] */ /*_rAggregateProps*/ @@ -917,26 +917,26 @@ void FormController::fillProperties( DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY); } -//------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper& FormController::getInfoHelper() { return *getArrayHelper(); } // XFilterController -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException ) { m_aFilterListeners.addInterface( _Listener ); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException ) { m_aFilterListeners.removeInterface( _Listener ); } -//------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( ::com::sun::star::uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -945,7 +945,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X return m_aFilterComponents.size(); } -//------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( ::com::sun::star::uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -954,7 +954,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X return m_aFilterRows.size(); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -973,7 +973,7 @@ void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, :: rFilterRow.erase( xText ); } -//------------------------------------------------------------------------------ + Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component ) throw( RuntimeException, IndexOutOfBoundsException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -985,7 +985,7 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY ); } -//------------------------------------------------------------------------------ + Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1018,7 +1018,7 @@ Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw return aExpressions; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (IndexOutOfBoundsException, RuntimeException) { // SYNCHRONIZED --> @@ -1059,7 +1059,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw ( m_aFilterListeners.notifyEach( &XFilterControllerListener::disjunctiveTermRemoved, aEvent ); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeException) { // SYNCHRONIZED --> @@ -1070,7 +1070,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti // <-- SYNCHRONIZED } -//------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL FormController::getActiveTerm() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1079,7 +1079,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti return m_nCurrentFilterPosition; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1096,14 +1096,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In } // XElementAccess -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return !m_aChildren.empty(); } -//------------------------------------------------------------------------------ + Type SAL_CALL FormController::getElementType(void) throw( RuntimeException ) { return ::getCppuType((const Reference< XFormController>*)0); @@ -1111,7 +1111,7 @@ Type SAL_CALL FormController::getElementType(void) throw( RuntimeException ) } // XEnumerationAccess -//------------------------------------------------------------------------------ + Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1119,14 +1119,14 @@ Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) thro } // XIndexAccess -//------------------------------------------------------------------------------ + sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aChildren.size(); } -//------------------------------------------------------------------------------ + Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1138,7 +1138,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBounds } // EventListener -//------------------------------------------------------------------------------ + void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeException ) { // Ist der Container disposed worden @@ -1161,7 +1161,7 @@ void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeExce } // OComponentHelper -//----------------------------------------------------------------------------- + void FormController::disposeAllFeaturesAndDispatchers() SAL_THROW(()) { for ( DispatcherContainer::iterator aDispatcher = m_aFeatureDispatchers.begin(); @@ -1181,7 +1181,7 @@ void FormController::disposeAllFeaturesAndDispatchers() SAL_THROW(()) m_aFeatureDispatchers.clear(); } -//----------------------------------------------------------------------------- + void FormController::disposing(void) { EventObject aEvt( *this ); @@ -1252,7 +1252,7 @@ void FormController::disposing(void) m_bDBConnection = sal_False; } -//------------------------------------------------------------------------------ + namespace { static bool lcl_shouldUseDynamicControlBorder( const Reference< XInterface >& _rxForm, const Any& _rDynamicColorProp ) @@ -1267,7 +1267,7 @@ namespace } } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1334,7 +1334,7 @@ void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) thr } } -//------------------------------------------------------------------------------ + bool FormController::replaceControl( const Reference< XControl >& _rxExistentControl, const Reference< XControl >& _rxNewControl ) { bool bSuccess = false; @@ -1395,7 +1395,7 @@ bool FormController::replaceControl( const Reference< XControl >& _rxExistentCon return bSuccess; } -//------------------------------------------------------------------------------ + void FormController::toggleAutoFields(sal_Bool bAutoFields) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1468,7 +1468,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields) } } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(FormController, OnToggleAutoFields) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1478,7 +1478,7 @@ IMPL_LINK_NOARG(FormController, OnToggleAutoFields) } // XTextListener -//------------------------------------------------------------------------------ + void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeException ) { // SYNCHRONIZED --> @@ -1535,7 +1535,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce } // XItemListener -//------------------------------------------------------------------------------ + void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1543,7 +1543,7 @@ void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) thro } // XModificationBroadcaster -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1551,7 +1551,7 @@ void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener m_aModifyListeners.addInterface( l ); } -//------------------------------------------------------------------------------ + void FormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1560,7 +1560,7 @@ void FormController::removeModifyListener(const Reference< XModifyListener > & l } // XModificationListener -//------------------------------------------------------------------------------ + void FormController::modified( const EventObject& _rEvent ) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1587,14 +1587,14 @@ void FormController::modified( const EventObject& _rEvent ) throw( RuntimeExcept impl_onModify(); } -//------------------------------------------------------------------------------ + void FormController::impl_checkDisposed_throw() const { if ( impl_isDisposed_nofail() ) throw DisposedException( OUString(), *const_cast< FormController* >( this ) ); } -//------------------------------------------------------------------------------ + void FormController::impl_onModify() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1609,7 +1609,7 @@ void FormController::impl_onModify() m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvt ); } -//------------------------------------------------------------------------------ + void FormController::impl_addFilterRow( const FmFilterRow& _row ) { m_aFilterRows.push_back( _row ); @@ -1621,7 +1621,7 @@ void FormController::impl_addFilterRow( const FmFilterRow& _row ) } } -//------------------------------------------------------------------------------ + void FormController::impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) { // SYNCHRONIZED --> @@ -1636,7 +1636,7 @@ void FormController::impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rCl m_aFilterListeners.notifyEach( &XFilterControllerListener::disjunctiveTermAdded, aEvent ); } -//------------------------------------------------------------------------------ + sal_Bool FormController::determineLockState() const { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1653,7 +1653,7 @@ sal_Bool FormController::determineLockState() const } // FocusListener -//------------------------------------------------------------------------------ + void FormController::focusGained(const FocusEvent& e) throw( RuntimeException ) { // SYNCHRONIZED --> @@ -1790,7 +1790,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException ) xContext->makeVisible( xCurrentControl ); } -//------------------------------------------------------------------------------ + IMPL_LINK( FormController, OnActivated, void*, /**/ ) { EventObject aEvent; @@ -1800,7 +1800,7 @@ IMPL_LINK( FormController, OnActivated, void*, /**/ ) return 0L; } -//------------------------------------------------------------------------------ + IMPL_LINK( FormController, OnDeactivated, void*, /**/ ) { EventObject aEvent; @@ -1810,7 +1810,7 @@ IMPL_LINK( FormController, OnDeactivated, void*, /**/ ) return 0L; } -//------------------------------------------------------------------------------ + void FormController::focusLost(const FocusEvent& e) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1827,31 +1827,31 @@ void FormController::focusLost(const FocusEvent& e) throw( RuntimeException ) } } -//-------------------------------------------------------------------- + void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } -//-------------------------------------------------------------------- + void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException) { // not interested in } -//-------------------------------------------------------------------- + void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException) { m_pControlBorderManager->mouseEntered( _rEvent.Source ); } -//-------------------------------------------------------------------- + void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException) { m_pControlBorderManager->mouseExited( _rEvent.Source ); } -//-------------------------------------------------------------------- + void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException) { Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), sal_False, sal_False ) ); @@ -1863,7 +1863,7 @@ void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSou m_pControlBorderManager->validityChanged( xControl, xValidatable ); } -//-------------------------------------------------------------------- + void FormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1976,7 +1976,7 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) th } } -//------------------------------------------------------------------------------ + Reference< XTabControllerModel > FormController::getModel() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1988,7 +1988,7 @@ Reference< XTabControllerModel > FormController::getModel() throw( RuntimeExcep return m_xTabController->getModel(); } -//------------------------------------------------------------------------------ + void FormController::addToEventAttacher(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2015,7 +2015,7 @@ void FormController::addToEventAttacher(const Reference< XControl > & xControl) } } -//------------------------------------------------------------------------------ + void FormController::removeFromEventAttacher(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2042,7 +2042,7 @@ void FormController::removeFromEventAttacher(const Reference< XControl > & xCont } } -//------------------------------------------------------------------------------ + void FormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2127,7 +2127,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai m_bControlsSorted = sal_True; } -//------------------------------------------------------------------------------ + Reference< XControlContainer > FormController::getContainer() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2139,7 +2139,7 @@ Reference< XControlContainer > FormController::getContainer() throw( RuntimeExc return m_xTabController->getContainer(); } -//------------------------------------------------------------------------------ + Sequence< Reference< XControl > > FormController::getControls(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2179,7 +2179,7 @@ Sequence< Reference< XControl > > FormController::getControls(void) throw( Runti return m_aControls; } -//------------------------------------------------------------------------------ + void FormController::autoTabOrder() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2190,7 +2190,7 @@ void FormController::autoTabOrder() throw( RuntimeException ) m_xTabController->autoTabOrder(); } -//------------------------------------------------------------------------------ + void FormController::activateTabOrder() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2201,7 +2201,7 @@ void FormController::activateTabOrder() throw( RuntimeException ) m_xTabController->activateTabOrder(); } -//------------------------------------------------------------------------------ + void FormController::setControlLock(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2255,7 +2255,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl) } } -//------------------------------------------------------------------------------ + void FormController::setLocks() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2266,7 +2266,7 @@ void FormController::setLocks() setControlLock( *pControls++ ); } -//------------------------------------------------------------------------------ + namespace { bool lcl_shouldListenForModifications( const Reference< XControl >& _rxControl, const Reference< XPropertyChangeListener >& _rxBoundFieldListener ) @@ -2296,7 +2296,7 @@ namespace } } -//------------------------------------------------------------------------------ + void FormController::startControlModifyListening(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2345,7 +2345,7 @@ void FormController::startControlModifyListening(const Reference< XControl > & x } } -//------------------------------------------------------------------------------ + void FormController::stopControlModifyListening(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2393,7 +2393,7 @@ void FormController::stopControlModifyListening(const Reference< XControl > & xC } } -//------------------------------------------------------------------------------ + void FormController::startListening() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2406,7 +2406,7 @@ void FormController::startListening() startControlModifyListening( *pControls++ ); } -//------------------------------------------------------------------------------ + void FormController::stopListening() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2420,7 +2420,7 @@ void FormController::stopListening() } -//------------------------------------------------------------------------------ + Reference< XControl > FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,sal_Bool _bRemove,sal_Bool _bOverWrite) const { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2447,7 +2447,7 @@ Reference< XControl > FormController::findControl(Sequence< Reference< XControl return Reference< XControl > (); } -//------------------------------------------------------------------------------ + void FormController::implControlInserted( const Reference< XControl>& _rxControl, bool _bAddToEventAttacher ) { Reference< XWindow > xWindow( _rxControl, UNO_QUERY ); @@ -2486,7 +2486,7 @@ void FormController::implControlInserted( const Reference< XControl>& _rxControl } -//------------------------------------------------------------------------------ + void FormController::implControlRemoved( const Reference< XControl>& _rxControl, bool _bRemoveFromEventAttacher ) { Reference< XWindow > xWindow( _rxControl, UNO_QUERY ); @@ -2517,7 +2517,7 @@ void FormController::implControlRemoved( const Reference< XControl>& _rxControl, } } -//------------------------------------------------------------------------------ + void FormController::implSetCurrentControl( const Reference< XControl >& _rxControl ) { if ( m_xCurrentControl.get() == _rxControl.get() ) @@ -2534,7 +2534,7 @@ void FormController::implSetCurrentControl( const Reference< XControl >& _rxCont xGridControl->addGridControlListener( this ); } -//------------------------------------------------------------------------------ + void FormController::insertControl(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2554,7 +2554,7 @@ void FormController::insertControl(const Reference< XControl > & xControl) startControlModifyListening( xControl ); } -//------------------------------------------------------------------------------ + void FormController::removeControl(const Reference< XControl > & xControl) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2580,7 +2580,7 @@ void FormController::removeControl(const Reference< XControl > & xControl) } // XLoadListener -//------------------------------------------------------------------------------ + void FormController::loaded(const EventObject& rEvent) throw( RuntimeException ) { OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FormController::loaded: where did this come from?" ); @@ -2636,7 +2636,7 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException ) updateAllDispatchers(); } -//------------------------------------------------------------------------------ + void FormController::updateAllDispatchers() const { ::std::for_each( @@ -2649,7 +2649,7 @@ void FormController::updateAllDispatchers() const ); } -//------------------------------------------------------------------------------ + IMPL_LINK_NOARG(FormController, OnLoad) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2667,7 +2667,7 @@ IMPL_LINK_NOARG(FormController, OnLoad) return 1L; } -//------------------------------------------------------------------------------ + void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2676,7 +2676,7 @@ void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeExcep updateAllDispatchers(); } -//------------------------------------------------------------------------------ + void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2688,7 +2688,7 @@ void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeExce unload(); } -//------------------------------------------------------------------------------ + void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2697,7 +2697,7 @@ void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException loaded(aEvent); } -//------------------------------------------------------------------------------ + void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2706,7 +2706,7 @@ void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeExce unload(); } -//------------------------------------------------------------------------------ + void FormController::unload() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2735,7 +2735,7 @@ void FormController::unload() throw( RuntimeException ) m_pColumnInfoCache.reset(); } -// ----------------------------------------------------------------------------- + void FormController::removeBoundFieldListener() { const Reference< XControl >* pControls = m_aControls.getConstArray(); @@ -2748,7 +2748,7 @@ void FormController::removeBoundFieldListener() } } -//------------------------------------------------------------------------------ + void FormController::startFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly ) { try @@ -2782,7 +2782,7 @@ void FormController::startFormListening( const Reference< XPropertySet >& _rxFor } } -//------------------------------------------------------------------------------ + void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly ) { try @@ -2815,7 +2815,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm } // com::sun::star::sdbc::XRowSetListener -//------------------------------------------------------------------------------ + void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2836,12 +2836,12 @@ void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeExc m_bCurrentRecordModified = m_bModified = sal_False; } -//------------------------------------------------------------------------------ + void FormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException ) { // not interested in ... } -//------------------------------------------------------------------------------ + void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException ) { // not interested in ... @@ -2849,7 +2849,7 @@ void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeE // XContainerListener -//------------------------------------------------------------------------------ + void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2895,7 +2895,7 @@ void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( } } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException ) { // simulate an elementRemoved @@ -2910,7 +2910,7 @@ void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( elementInserted( aInsertEvent ); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2937,7 +2937,7 @@ void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( R } } -//------------------------------------------------------------------------------ + Reference< XControl > FormController::isInList(const Reference< XWindowPeer > & xPeer) const { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -2956,7 +2956,7 @@ Reference< XControl > FormController::isInList(const Reference< XWindowPeer > & return Reference< XControl > (); } -//------------------------------------------------------------------------------ + void FormController::activateFirst() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2967,7 +2967,7 @@ void FormController::activateFirst() throw( RuntimeException ) m_xTabController->activateFirst(); } -//------------------------------------------------------------------------------ + void FormController::activateLast() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2979,7 +2979,7 @@ void FormController::activateLast() throw( RuntimeException ) } // XFormController -//------------------------------------------------------------------------------ + Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2988,7 +2988,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw return m_xFormOperations; } -//------------------------------------------------------------------------------ + Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2996,14 +2996,14 @@ Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( Run return m_xCurrentControl; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); m_aActivateListeners.addInterface(l); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3011,7 +3011,7 @@ void SAL_CALL FormController::removeActivateListener(const Reference< XFormContr m_aActivateListeners.removeInterface(l); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addChildController( const Reference< XFormController >& _ChildController ) throw( RuntimeException, IllegalArgumentException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3048,7 +3048,7 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll } } -//------------------------------------------------------------------------------ + Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3056,7 +3056,7 @@ Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw return m_xFormControllerContext; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3064,7 +3064,7 @@ void SAL_CALL FormController::setContext( const Reference< XFormControllerContex m_xFormControllerContext = _context; } -//------------------------------------------------------------------------------ + Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3072,7 +3072,7 @@ Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler( return m_xInteractionHandler; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3080,7 +3080,7 @@ void SAL_CALL FormController::setInteractionHandler( const Reference< XInteracti m_xInteractionHandler = _interactionHandler; } -//------------------------------------------------------------------------------ + void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -3260,7 +3260,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) } } -//------------------------------------------------------------------------------ + void FormController::startFiltering() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -3399,7 +3399,7 @@ void FormController::startFiltering() m_bAttachEvents = sal_True; } -//------------------------------------------------------------------------------ + void FormController::stopFiltering() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -3484,7 +3484,7 @@ void FormController::stopFiltering() } // XModeSelector -//------------------------------------------------------------------------------ + void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3512,7 +3512,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru } } -//------------------------------------------------------------------------------ + OUString SAL_CALL FormController::getMode(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3521,7 +3521,7 @@ OUString SAL_CALL FormController::getMode(void) throw( RuntimeException ) return m_aMode; } -//------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3537,7 +3537,7 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( Run return aModes; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3553,7 +3553,7 @@ sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( Runt return sal_False; } -//------------------------------------------------------------------------------ + Window* FormController::getDialogParentWindow() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -3570,7 +3570,7 @@ Window* FormController::getDialogParentWindow() } return pParentWindow; } -//------------------------------------------------------------------------------ + bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()) { try @@ -3612,7 +3612,7 @@ bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstIn return true; } -//------------------------------------------------------------------------------ + Reference< XControl > FormController::locateControl( const Reference< XControlModel >& _rxModel ) SAL_THROW(()) { try @@ -3639,7 +3639,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo return NULL; } -//------------------------------------------------------------------------------ + namespace { void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, Window* _pDialogParent ) @@ -3701,7 +3701,7 @@ namespace } // XRowSetApproveListener -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -3789,7 +3789,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent return true; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3806,7 +3806,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th return sal_True; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3824,7 +3824,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) } // XRowSetApproveBroadcaster -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3833,7 +3833,7 @@ void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetA m_aRowSetApproveListeners.addInterface(_rxListener); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3843,7 +3843,7 @@ void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowS } // XErrorListener -//------------------------------------------------------------------------------ + void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -3864,7 +3864,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R } // XErrorBroadcaster -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3873,7 +3873,7 @@ void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorList m_aErrorListeners.addInterface(aListener); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3883,7 +3883,7 @@ void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorL } // XDatabaseParameterBroadcaster2 -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3892,7 +3892,7 @@ void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDat m_aParameterListeners.addInterface(aListener); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3902,20 +3902,20 @@ void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< X } // XDatabaseParameterBroadcaster -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException ) { FormController::addDatabaseParameterListener( aListener ); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException ) { FormController::removeDatabaseParameterListener( aListener ); } // XDatabaseParameterListener -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException ) { SolarMutexGuard aSolarGuard; @@ -3993,7 +3993,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& } // XConfirmDeleteBroadcaster -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4002,7 +4002,7 @@ void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirm m_aDeleteListeners.addInterface(aListener); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4012,7 +4012,7 @@ void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConf } // XConfirmDeleteListener -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4074,7 +4074,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th return sal_False; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4088,7 +4088,7 @@ void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& m_aFeatureInvalidationTimer.Start(); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -4106,7 +4106,7 @@ void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException) invalidateFeatures( aInterceptedFeatures ); } -//------------------------------------------------------------------------------ + Reference< XDispatch > FormController::interceptedQueryDispatch( const URL& aURL, const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/) @@ -4148,7 +4148,7 @@ FormController::interceptedQueryDispatch( const URL& aURL, return xReturn; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException) { if ( _rArgs.getLength() != 1 ) @@ -4176,7 +4176,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper OSL_FAIL( "FormController::dispatch: unknown URL!" ); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException) { if (_rURL.Complete == FMURL_CONFIRM_DELETION) @@ -4194,19 +4194,19 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene OSL_FAIL("FormController::addStatusListener: invalid (unsupported) URL!"); } -//------------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL FormController::getParent() throw( RuntimeException ) { return m_xParent; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) throw( NoSupportException, RuntimeException ) { m_xParent = Parent; } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException) { (void)_rURL; @@ -4214,7 +4214,7 @@ void SAL_CALL FormController::removeStatusListener( const Reference< XStatusList // we never really added the listener, so we don't need to remove it } -//------------------------------------------------------------------------------ + Reference< XDispatchProviderInterceptor > FormController::createInterceptor(const Reference< XDispatchProviderInterception > & _xInterception) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -4237,7 +4237,7 @@ Reference< XDispatchProviderInterceptor > FormController::createInterceptor(con return pInterceptor; } -//------------------------------------------------------------------------------ + bool FormController::ensureInteractionHandler() { if ( m_xInteractionHandler.is() ) @@ -4250,7 +4250,7 @@ bool FormController::ensureInteractionHandler() return m_xInteractionHandler.is(); } -//------------------------------------------------------------------------------ + void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException) { if ( !ensureInteractionHandler() ) @@ -4258,7 +4258,7 @@ void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _r m_xInteractionHandler->handle( _rRequest ); } -//------------------------------------------------------------------------------ + void FormController::deleteInterceptor(const Reference< XDispatchProviderInterception > & _xInterception) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -4286,7 +4286,7 @@ void FormController::deleteInterceptor(const Reference< XDispatchProviderInterce m_aControlDispatchInterceptors.erase(aIter); } -//-------------------------------------------------------------------- + void FormController::implInvalidateCurrentControlDependentFeatures() { Sequence< sal_Int16 > aCurrentControlDependentFeatures(4); @@ -4299,7 +4299,7 @@ void FormController::implInvalidateCurrentControlDependentFeatures() invalidateFeatures( aCurrentControlDependentFeatures ); } -//-------------------------------------------------------------------- + void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException) { implInvalidateCurrentControlDependentFeatures(); diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index bd5e5336cf43..67bddcdd7f33 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -117,7 +117,7 @@ namespace svx } } - //-------------------------------------------------------------------- + namespace { //................................................................ @@ -166,7 +166,7 @@ namespace svx }; } - //-------------------------------------------------------------------- + sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const OUString& _rMainURL ) { const FeatureDescriptions& rDescriptions( getFeatureDescriptions() ); @@ -174,7 +174,7 @@ namespace svx return ( pos != rDescriptions.end() ) ? pos->nSlotId : -1; } - //-------------------------------------------------------------------- + sal_Int16 FeatureSlotTranslation::getFormFeatureForSlotId( sal_Int32 _nSlotId ) { const FeatureDescriptions& rDescriptions( getFeatureDescriptions() ); @@ -183,7 +183,7 @@ namespace svx return ( pos != rDescriptions.end() ) ? pos->nFormFeature : -1; } - //-------------------------------------------------------------------- + sal_Int32 FeatureSlotTranslation::getSlotIdForFormFeature( sal_Int16 _nFormFeature ) { const FeatureDescriptions& rDescriptions( getFeatureDescriptions() ); @@ -195,14 +195,14 @@ namespace svx //==================================================================== //= ControllerFeatures //==================================================================== - //-------------------------------------------------------------------- + ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) ,m_pImpl( NULL ) { } - //-------------------------------------------------------------------- + ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) ,m_pImpl( NULL ) @@ -210,7 +210,7 @@ namespace svx assign( _rxController ); } - //-------------------------------------------------------------------- + void ControllerFeatures::assign( const Reference< XFormController >& _rxController ) { dispose(); @@ -218,13 +218,13 @@ namespace svx m_pImpl->acquire(); } - //-------------------------------------------------------------------- + ControllerFeatures::~ControllerFeatures() { dispose(); } - //-------------------------------------------------------------------- + void ControllerFeatures::dispose() { if ( m_pImpl ) @@ -238,7 +238,7 @@ namespace svx //==================================================================== //= FormControllerHelper //==================================================================== - //-------------------------------------------------------------------- + FormControllerHelper::FormControllerHelper( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) { @@ -261,7 +261,7 @@ namespace svx osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + FormControllerHelper::~FormControllerHelper( ) { try @@ -275,7 +275,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void FormControllerHelper::dispose() { if ( m_xFormOperations.is() ) @@ -283,7 +283,7 @@ namespace svx m_xFormOperations.clear(); } - //-------------------------------------------------------------------- + sal_Bool FormControllerHelper::isEnabled( sal_Int32 _nSlotId ) const { if ( !m_xFormOperations.is() ) @@ -291,7 +291,7 @@ namespace svx return m_xFormOperations->isEnabled( FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ) ); } - //-------------------------------------------------------------------- + Reference< XRowSet > FormControllerHelper::getCursor() const { Reference< XRowSet > xCursor; @@ -300,26 +300,26 @@ namespace svx return xCursor; } - //-------------------------------------------------------------------- + void FormControllerHelper::getState( sal_Int32 _nSlotId, FeatureState& _rState ) const { if ( m_xFormOperations.is() ) _rState = m_xFormOperations->getState( FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ) ); } - //-------------------------------------------------------------------- + sal_Bool FormControllerHelper::commitCurrentControl( ) const { return impl_operateForm_nothrow( COMMIT_CONTROL ); } - //-------------------------------------------------------------------- + sal_Bool FormControllerHelper::commitCurrentRecord() const { return impl_operateForm_nothrow( COMMIT_RECORD ); } - //-------------------------------------------------------------------- + void FormControllerHelper::execute( sal_Int32 _nSlotId, const OUString& _rParamName, const Any& _rParamValue ) const { Sequence< NamedValue > aArguments(1); @@ -329,7 +329,7 @@ namespace svx impl_operateForm_nothrow( EXECUTE_ARGS, FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ), aArguments ); } - //-------------------------------------------------------------------- + bool FormControllerHelper::impl_operateForm_nothrow( const FormOperation _eWhat, const sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) const { @@ -390,14 +390,14 @@ namespace svx return false; } - //-------------------------------------------------------------------- + void FormControllerHelper::execute( sal_Int32 _nSlotId ) const { impl_operateForm_nothrow( EXECUTE, FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ), Sequence< NamedValue >() ); } - //-------------------------------------------------------------------- + void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException) { if ( !m_pInvalidationCallback ) @@ -415,7 +415,7 @@ namespace svx m_pInvalidationCallback->invalidateFeatures( aFeatures ); } - //-------------------------------------------------------------------- + void SAL_CALL FormControllerHelper::invalidateAllFeatures() throw (RuntimeException) { if ( !m_pInvalidationCallback ) @@ -458,20 +458,20 @@ namespace svx m_pInvalidationCallback->invalidateFeatures( aSupportedFeatures ); } - //-------------------------------------------------------------------- + void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& _Event ) throw (RuntimeException) { OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" ); m_aOperationError = _Event.Reason; } - //-------------------------------------------------------------------- + void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + sal_Bool FormControllerHelper::isInsertionRow() const { sal_Bool bIs = sal_False; @@ -480,7 +480,7 @@ namespace svx return bIs; } - //-------------------------------------------------------------------- + sal_Bool FormControllerHelper::isModifiedRow() const { sal_Bool bIs = sal_False; @@ -488,7 +488,7 @@ namespace svx bIs = m_xFormOperations->isModifiedRow(); return bIs; } - //-------------------------------------------------------------------- + bool FormControllerHelper::canDoFormFilter() const { if ( !m_xFormOperations.is() ) diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index cfde37763c31..79a2aa1c490f 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -51,7 +51,7 @@ namespace svxform //======================================================================== DBG_NAME(DispatchInterceptionMultiplexer) - //------------------------------------------------------------------------ + DispatchInterceptionMultiplexer::DispatchInterceptionMultiplexer( const Reference< XDispatchProviderInterception >& _rxToIntercept, DispatchInterceptor* _pMaster ) :DispatchInterceptionMultiplexer_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback) @@ -80,7 +80,7 @@ namespace svxform ::comphelper::decrement(m_refCount); } - //------------------------------------------------------------------------ + DispatchInterceptionMultiplexer::~DispatchInterceptionMultiplexer() { if (!rBHelper.bDisposed) @@ -89,7 +89,7 @@ namespace svxform DBG_DTOR(DispatchInterceptionMultiplexer,NULL); } - //------------------------------------------------------------------------------ + Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); @@ -105,7 +105,7 @@ namespace svxform return xResult; } - //------------------------------------------------------------------------------ + Sequence< Reference< XDispatch > > SAL_CALL DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException) { @@ -120,35 +120,35 @@ namespace svxform return aReturn; } - //------------------------------------------------------------------------------ + Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xSlaveDispatcher; } - //------------------------------------------------------------------------------ + void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException ) { ::osl::MutexGuard aGuard( *m_pMutex ); m_xSlaveDispatcher = xNewDispatchProvider; } - //------------------------------------------------------------------------------ + Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xMasterDispatcher; } - //------------------------------------------------------------------------------ + void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) throw( RuntimeException ) { ::osl::MutexGuard aGuard( *m_pMutex ); m_xMasterDispatcher = xNewSupplier; } - //------------------------------------------------------------------------------ + void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) throw( RuntimeException ) { if (m_bListening) @@ -159,7 +159,7 @@ namespace svxform } } - //------------------------------------------------------------------------------ + void DispatchInterceptionMultiplexer::ImplDetach() { ::osl::MutexGuard aGuard( *m_pMutex ); @@ -179,7 +179,7 @@ namespace svxform m_bListening = sal_False; } - //------------------------------------------------------------------------------ + void DispatchInterceptionMultiplexer::disposing() { // remove ourself as event listener from the interception component diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index e15235269925..bb47ba7aa61e 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -38,7 +38,7 @@ namespace svx //==================================================================== //= OSingleFeatureDispatcher //==================================================================== - //-------------------------------------------------------------------- + OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature, const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex ) :m_rMutex( _rMutex ) @@ -51,7 +51,7 @@ namespace svx { } - //-------------------------------------------------------------------- + void OSingleFeatureDispatcher::getUnoState( FeatureStateEvent& /* [out] */ _rState ) const { _rState.Source = *const_cast< OSingleFeatureDispatcher* >( this ); @@ -64,7 +64,7 @@ namespace svx _rState.State = aState.State; } - //-------------------------------------------------------------------- + void OSingleFeatureDispatcher::updateAllListeners() { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -81,7 +81,7 @@ namespace svx notifyStatus( NULL, aGuard ); } - //-------------------------------------------------------------------- + void OSingleFeatureDispatcher::notifyStatus( const Reference< XStatusListener >& _rxListener, ::osl::ClearableMutexGuard& _rFreeForNotification ) { FeatureStateEvent aUnoState; @@ -123,7 +123,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -162,7 +162,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException) { (void)_rURL; @@ -186,7 +186,7 @@ namespace svx notifyStatus( _rxControl, aGuard ); } - //-------------------------------------------------------------------- + void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException) { (void)_rURL; @@ -201,7 +201,7 @@ namespace svx m_aStatusListeners.removeInterface( _rxControl ); } - //-------------------------------------------------------------------- + void OSingleFeatureDispatcher::checkAlive() const SAL_THROW((DisposedException)) { if ( m_bDisposed ) diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 43cbe8231829..5e969a2799fc 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -35,7 +35,7 @@ namespace svxform //==================================================================== //= FormToolboxes //==================================================================== - //-------------------------------------------------------------------- + FormToolboxes::FormToolboxes( const Reference< XFrame >& _rxFrame ) { // the layout manager @@ -44,7 +44,7 @@ namespace svxform xFrameProps->getPropertyValue("LayoutManager") >>= m_xLayouter; } - //-------------------------------------------------------------------- + void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const { try @@ -72,14 +72,14 @@ namespace svxform } } - //-------------------------------------------------------------------- + bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const { return m_xLayouter.is() && m_xLayouter->isElementVisible( getToolboxResourceName( _nSlotId ) ); } - //-------------------------------------------------------------------- + OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const { OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ), diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 211bf65f168b..9920907f5420 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -106,79 +106,79 @@ namespace svxform const Reference< form::runtime::XFormController > m_xDelegator; }; - //-------------------------------------------------------------------- + Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl( ) throw (RuntimeException) { return m_xDelegator->getCurrentControl(); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException) { m_xDelegator->addActivateListener( _listener ); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException) { m_xDelegator->removeActivateListener( _listener ); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) throw (RuntimeException) { m_xDelegator->setModel( _model ); } - //-------------------------------------------------------------------- + Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel( ) throw (RuntimeException) { return m_xDelegator->getModel(); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) throw (RuntimeException) { m_xDelegator->setContainer( _container ); } - //-------------------------------------------------------------------- + Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer( ) throw (RuntimeException) { return m_xDelegator->getContainer(); } - //-------------------------------------------------------------------- + Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls( ) throw (RuntimeException) { return m_xDelegator->getControls(); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::autoTabOrder( ) throw (RuntimeException) { m_xDelegator->autoTabOrder(); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::activateTabOrder( ) throw (RuntimeException) { m_xDelegator->activateTabOrder(); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::activateFirst( ) throw (RuntimeException) { m_xDelegator->activateFirst(); } - //-------------------------------------------------------------------- + void SAL_CALL LegacyFormController::activateLast( ) throw (RuntimeException) { m_xDelegator->activateLast(); } - //-------------------------------------------------------------------- + OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) { return OUString( "org.openoffice.comp.svx.LegacyFormController" ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index a382e69ab5d7..6433330d4ca7 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -86,7 +86,7 @@ namespace svxform MapModelToShape; typedef MapModelToShape::value_type ModelShapePair; - //------------------------------------------------------------------------ + void collectShapeModelMapping( SdrPage* _pPage, MapModelToShape& _rMapping ) { OSL_ENSURE( _pPage, "collectShapeModelMapping: invalid arg!" ); @@ -117,7 +117,7 @@ namespace svxform // class NavigatorTree //======================================================================== - //------------------------------------------------------------------------ + NavigatorTree::NavigatorTree( Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added ,m_aControlExchange(this) @@ -165,7 +165,7 @@ namespace svxform SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel)); } - //------------------------------------------------------------------------ + NavigatorTree::~NavigatorTree() { if( nEditEvent ) @@ -180,13 +180,13 @@ namespace svxform delete m_pNavModel; } - //------------------------------------------------------------------------ + void NavigatorTree::Clear() { m_pNavModel->Clear(); } - //------------------------------------------------------------------------ + void NavigatorTree::UpdateContent( FmFormShell* pFormShell ) { if (m_bInitialUpdate) @@ -221,7 +221,7 @@ namespace svxform } } - //------------------------------------------------------------------------------ + sal_Bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden ) { SvTreeListEntry* pCurEntry = GetCurEntry(); @@ -257,7 +257,7 @@ namespace svxform return sal_True; } - //------------------------------------------------------------------------------ + sal_Bool NavigatorTree::implPrepareExchange( sal_Int8 _nAction ) { EndSelection(); @@ -293,7 +293,7 @@ namespace svxform return sal_True; } - //------------------------------------------------------------------------------ + void NavigatorTree::StartDrag( sal_Int8 /*nAction*/, const ::Point& /*rPosPixel*/ ) { EndSelection(); @@ -306,7 +306,7 @@ namespace svxform m_aControlExchange.startDrag( DND_ACTION_COPYMOVE ); } - //------------------------------------------------------------------------------ + void NavigatorTree::Command( const CommandEvent& rEvt ) { sal_Bool bHandled = sal_False; @@ -534,7 +534,7 @@ namespace svxform SvTreeListBox::Command( rEvt ); } - //------------------------------------------------------------------------ + SvTreeListEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData ) { if( !pEntryData ) return NULL; @@ -552,7 +552,7 @@ namespace svxform return NULL; } - //------------------------------------------------------------------------ + void NavigatorTree::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if( rHint.ISA(FmNavRemovedHint) ) @@ -612,7 +612,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos ) { ////////////////////////////////////////////////////////////////////// @@ -649,7 +649,7 @@ namespace svxform return pNewEntry; } - //------------------------------------------------------------------------ + void NavigatorTree::Remove( FmEntryData* pEntryData ) { if( !pEntryData ) @@ -685,21 +685,21 @@ namespace svxform UnlockSelectionHandling(); } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry ) { FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData(); return !pEntryData || pEntryData->ISA(FmFormData); } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry ) { FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData(); return pEntryData && pEntryData->ISA(FmControlData); } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::implAcceptPaste( ) { SvTreeListEntry* pFirstSelected = FirstSelected(); @@ -714,13 +714,13 @@ namespace svxform return ( nAction == implAcceptDataTransfer( aClipboardContent.GetDataFlavorExVector(), nAction, pFirstSelected, sal_False ) ); } - //------------------------------------------------------------------------ + sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD ) { return implAcceptDataTransfer( _rFlavors, _nAction, GetEntry( _rDropPos ), _bDnD ); } - //------------------------------------------------------------------------ + sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD ) { // no target -> no drop @@ -858,7 +858,7 @@ namespace svxform return DND_ACTION_MOVE; } - //------------------------------------------------------------------------ + sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& rEvt ) { ::Point aDropPos = rEvt.maPosPixel; @@ -913,13 +913,13 @@ namespace svxform return implAcceptDataTransfer( GetDataFlavorExVector(), rEvt.mnAction, aDropPos, sal_True ); } - //------------------------------------------------------------------------ + sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD ) { return implExecuteDataTransfer( _rData, _nAction, GetEntry( _rDropPos ), _bDnD ); } - //------------------------------------------------------------------------ + sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD ) { const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector(); @@ -1181,7 +1181,7 @@ namespace svxform return _nAction; } - //------------------------------------------------------------------------ + sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nResult( DND_ACTION_NONE ); @@ -1197,7 +1197,7 @@ namespace svxform return nResult; } - //------------------------------------------------------------------------ + void NavigatorTree::doPaste() { try @@ -1224,7 +1224,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTree::doCopy() { if ( implPrepareExchange( DND_ACTION_COPY ) ) @@ -1234,7 +1234,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTree::ModelHasRemoved( SvTreeListEntry* _pEntry ) { SvTreeListEntry* pTypedEntry = static_cast< SvTreeListEntry* >( _pEntry ); @@ -1252,7 +1252,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTree::doCut() { if ( implPrepareExchange( DND_ACTION_MOVE ) ) @@ -1276,7 +1276,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTree::KeyInput(const ::KeyEvent& rKEvt) { const KeyCode& rCode = rKEvt.GetKeyCode(); @@ -1311,7 +1311,7 @@ namespace svxform SvTreeListBox::KeyInput(rKEvt); } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) { if (!SvTreeListBox::EditingEntry( pEntry, rSelection )) @@ -1321,7 +1321,7 @@ namespace svxform // die Wurzel, die ich nicht umbenennen darf, hat als UserData NULL } - //------------------------------------------------------------------------ + void NavigatorTree::NewForm( SvTreeListEntry* pParentEntry ) { ////////////////////////////////////////////////////////////////////// @@ -1383,7 +1383,7 @@ namespace svxform EditEntry( pNewEntry ); } - //------------------------------------------------------------------------ + FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) { ////////////////////////////////////////////////////////////////////// @@ -1432,7 +1432,7 @@ namespace svxform return pNewFormControlData; } - //------------------------------------------------------------------------ + OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) { const sal_uInt16 nMaxCount = 99; @@ -1466,7 +1466,7 @@ namespace svxform return aNewName; } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { if (EditingCanceled()) @@ -1485,7 +1485,7 @@ namespace svxform return bRes; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(NavigatorTree, OnEdit) { nEditEvent = 0; @@ -1495,7 +1495,7 @@ namespace svxform return 0L; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) { if (--m_aTimerCounter > 0) @@ -1532,7 +1532,7 @@ namespace svxform return 0L; } - //------------------------------------------------------------------------ + IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) { m_sdiState = SDI_DIRTY; @@ -1549,7 +1549,7 @@ namespace svxform return 0L; } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer) { SynchronizeMarkList(); @@ -1557,7 +1557,7 @@ namespace svxform } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction) { if ( !m_aControlExchange.isClipboardOwner() ) @@ -1585,7 +1585,7 @@ namespace svxform return 0L; } - //------------------------------------------------------------------------ + void NavigatorTree::ShowSelectionProperties(sal_Bool bForce) { // zuerst brauche ich die FormShell @@ -1673,7 +1673,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTree::DeleteSelection() { // die Root darf ich natuerlich nicht mitloeschen @@ -1769,7 +1769,7 @@ namespace svxform // this ... :( // #i31038# { - // --------------- + // initialize UNDO OUString aUndoStr; if ( m_arrCurrentSelection.size() == 1 ) @@ -1814,7 +1814,7 @@ namespace svxform pFormModel->EndUndo(); } - //------------------------------------------------------------------------ + void NavigatorTree::CollectSelectionData(SELDATA_ITEMS sdiHow) { DBG_ASSERT(sdiHow != SDI_DIRTY, "NavigatorTree::CollectSelectionData : ever thought about your parameter ? DIRTY ?"); @@ -1888,7 +1888,7 @@ namespace svxform m_sdiState = sdiHow; } - //------------------------------------------------------------------------ + void NavigatorTree::SynchronizeSelection(FmEntryDataArray& arredToSelect) { LockSelectionHandling(); @@ -1951,7 +1951,7 @@ namespace svxform UnlockSelectionHandling(); } - //------------------------------------------------------------------------ + void NavigatorTree::SynchronizeSelection() { // Shell und View @@ -1964,7 +1964,7 @@ namespace svxform GetNavModel()->BroadcastMarkedObjects(pFormView->GetMarkedObjectList()); } - //------------------------------------------------------------------------ + void NavigatorTree::SynchronizeMarkList() { // die Shell werde ich brauchen ... @@ -2033,7 +2033,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData) { if (pEntryData == NULL) return sal_False; @@ -2047,7 +2047,7 @@ namespace svxform return sal_False; } - //------------------------------------------------------------------------ + sal_Bool NavigatorTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) @@ -2056,7 +2056,7 @@ namespace svxform return SvTreeListBox::Select(pEntry, bSelect ); } - //------------------------------------------------------------------------ + void NavigatorTree::UnmarkAllViewObj() { FmFormShell* pFormShell = GetNavModel()->GetFormShell(); @@ -2065,7 +2065,7 @@ namespace svxform FmFormView* pFormView = pFormShell->GetFormView(); pFormView->UnMarkAll(); } - //------------------------------------------------------------------------ + void NavigatorTree::MarkViewObj(FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep ) { FmFormShell* pFormShell = GetNavModel()->GetFormShell(); @@ -2113,7 +2113,7 @@ namespace svxform } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } } - //------------------------------------------------------------------------ + void NavigatorTree::CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects) { FmEntryDataList* pChildList = pFormData->GetChildList(); @@ -2131,7 +2131,7 @@ namespace svxform CollectObjects((FmFormData*)pEntryData,bDeep,_rObjects); } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ ) } - //------------------------------------------------------------------------ + void NavigatorTree::MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark) { if( !pControlData ) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index b4f480c36bda..1f0b60cc79e4 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -56,7 +56,7 @@ namespace svxform //======================================================================== // class OFormComponentObserver //======================================================================== - //------------------------------------------------------------------------ + OFormComponentObserver::OFormComponentObserver(NavigatorTreeModel* _pModel) :m_pNavModel(_pModel) ,m_nLocks(0) @@ -65,13 +65,13 @@ namespace svxform } // XPropertyChangeListener - //------------------------------------------------------------------------ + void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException ) { Remove( Source.Source ); } - //------------------------------------------------------------------------ + void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) throw(RuntimeException) { if( !m_pNavModel ) return; @@ -96,7 +96,7 @@ namespace svxform } // XContainerListener - //------------------------------------------------------------------------------ + void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException) { if (IsLocked() || !m_pNavModel) @@ -112,7 +112,7 @@ namespace svxform m_bCanUndo = sal_True; } - //------------------------------------------------------------------------------ + void OFormComponentObserver::Insert(const Reference< XInterface > & xIface, sal_Int32 nIndex) { Reference< XForm > xForm(xIface, UNO_QUERY); @@ -135,7 +135,7 @@ namespace svxform } } - //------------------------------------------------------------------------------ + void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException) { if (IsLocked() || !m_pNavModel) @@ -166,7 +166,7 @@ namespace svxform m_bCanUndo = sal_True; } - //------------------------------------------------------------------------------ + void OFormComponentObserver::Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) { if (IsLocked() || !m_pNavModel) @@ -183,7 +183,7 @@ namespace svxform m_bCanUndo = sal_True; } - //------------------------------------------------------------------------------ + void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException) { Reference< XInterface > xElement; @@ -195,7 +195,7 @@ namespace svxform // class NavigatorTreeModel //======================================================================== - //------------------------------------------------------------------------ + NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages ) :m_pFormShell(NULL) ,m_pFormPage(NULL) @@ -207,7 +207,7 @@ namespace svxform m_pRootList = new FmEntryDataList(); } - //------------------------------------------------------------------------ + NavigatorTreeModel::~NavigatorTreeModel() { ////////////////////////////////////////////////////////////////////// @@ -229,7 +229,7 @@ namespace svxform } - //------------------------------------------------------------------------ + void NavigatorTreeModel::SetModified( sal_Bool bMod ) { if( !m_pFormShell ) return; @@ -238,7 +238,7 @@ namespace svxform pObjShell->SetModified( bMod ); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::Clear() { Reference< css::form::XForms > xForms( GetForms()); @@ -255,7 +255,7 @@ namespace svxform Broadcast( aClearedHint ); } - //------------------------------------------------------------------------ + Reference< css::form::XForms > NavigatorTreeModel::GetForms() const { if( !m_pFormShell || !m_pFormShell->GetCurPage()) @@ -264,7 +264,7 @@ namespace svxform return m_pFormShell->GetCurPage()->GetForms(); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel) { if (IsListening(*m_pFormModel)) @@ -363,7 +363,7 @@ namespace svxform StartListening(*m_pFormModel); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::Remove(FmEntryData* pEntry, sal_Bool bAlterModel) { ////////////////////////////////////////////////////////////////////// @@ -453,7 +453,7 @@ namespace svxform StartListening(*m_pFormModel); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::RemoveForm(FmFormData* pFormData) { ////////////////////////////////////////////////////////////////////// @@ -485,7 +485,7 @@ namespace svxform xContainer->removeContainerListener((XContainerListener*)m_pPropChangeList); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::RemoveFormComponent(FmControlData* pControlData) { ////////////////////////////////////////////////////////////////////// @@ -500,7 +500,7 @@ namespace svxform xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::ClearBranch( FmFormData* pParentData ) { ////////////////////////////////////////////////////////////////////// @@ -517,7 +517,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTreeModel::FillBranch( FmFormData* pFormData ) { ////////////////////////////////////////////////////////////// @@ -581,7 +581,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTreeModel::InsertForm(const Reference< XForm > & xForm, sal_uInt32 nRelPos) { FmFormData* pFormData = (FmFormData*)FindData( xForm, GetRootList() ); @@ -600,7 +600,7 @@ namespace svxform Insert( pFormData, nRelPos ); } - //------------------------------------------------------------------------ + void NavigatorTreeModel::InsertFormComponent(const Reference< XFormComponent > & xComp, sal_uInt32 nRelPos) { ////////////////////////////////////////////////////////// @@ -629,7 +629,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTreeModel::ReplaceFormComponent( const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew @@ -643,7 +643,7 @@ namespace svxform Broadcast( aReplacedHint ); } - //------------------------------------------------------------------------ + FmEntryData* NavigatorTreeModel::FindData(const Reference< XInterface > & xElement, FmEntryDataList* pDataList, sal_Bool bRecurs) { // normalize @@ -664,7 +664,7 @@ namespace svxform return NULL; } - //------------------------------------------------------------------------ + FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs ) { FmEntryDataList* pDataList; @@ -696,7 +696,7 @@ namespace svxform return NULL; } - //------------------------------------------------------------------------ + void NavigatorTreeModel::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if( rHint.ISA(SdrHint) ) @@ -726,7 +726,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTreeModel::InsertSdrObj( const SdrObject* pObj ) { const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj ); @@ -753,7 +753,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTreeModel::RemoveSdrObj( const SdrObject* pObj ) { const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj ); @@ -838,7 +838,7 @@ namespace svxform // eine leere Liste interpretiert der NavigatorTree so, dass er seine Selektion komplett rausnimmt } - //------------------------------------------------------------------------ + void NavigatorTreeModel::UpdateContent( const Reference< css::form::XForms > & xForms ) { ////////////////////////////////////////////////////////////////////// @@ -860,7 +860,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + void NavigatorTreeModel::UpdateContent( FmFormShell* pShell ) { ////////////////////////////////////////////////////////////////////// @@ -901,7 +901,7 @@ namespace svxform } } - //------------------------------------------------------------------------ + Reference< XIndexContainer > NavigatorTreeModel::GetFormComponents( FmFormData* pFormData ) { ////////////////////////////////////////////////////////////////////// @@ -912,7 +912,7 @@ namespace svxform return Reference< XIndexContainer > (); } - //------------------------------------------------------------------------ + sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText ) { ////////////////////////////////////////////////////////////////////// @@ -947,7 +947,7 @@ namespace svxform return sal_True; } - //------------------------------------------------------------------ + SdrObject* NavigatorTreeModel::Search(SdrObjListIter& rIter, const Reference< XFormComponent > & xComp) { while (rIter.IsMore()) diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index ea3ffc9d847a..315d7a210766 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -31,12 +31,12 @@ namespace svxform //==================================================================== //= OSQLParserClient //==================================================================== - //-------------------------------------------------------------------- + OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext) { m_xContext = rxContext; } - //-------------------------------------------------------------------- + bool OSQLParserClient::ensureLoaded() const { if ( !ODbtoolsClient::ensureLoaded() ) diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index 876b9424df7c..00b9118801e1 100644 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -27,7 +27,7 @@ namespace svx //==================================================================== //= StringListResource //==================================================================== - //-------------------------------------------------------------------- + StringListResource::StringListResource( const ResId& _rResId ) :Resource( _rResId ) { @@ -40,7 +40,7 @@ namespace svx } } - //-------------------------------------------------------------------- + StringListResource::~StringListResource() { FreeResource(); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 689e25a2e921..44124b542431 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -112,7 +112,7 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta // class FmFieldWinListBox //================================================================== DBG_NAME(FmFieldWinListBox) -//------------------------------------------------------------------------------ + FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_BORDER ) ,pTabWin( pParent ) @@ -123,25 +123,25 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) SetHighlightRange( ); } -//------------------------------------------------------------------------------ + FmFieldWinListBox::~FmFieldWinListBox() { DBG_DTOR(FmFieldWinListBox,NULL); } -//------------------------------------------------------------------------------ + sal_Int8 FmFieldWinListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) { return DND_ACTION_NONE; } -//------------------------------------------------------------------------------ + sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ ) { return DND_ACTION_NONE; } -//------------------------------------------------------------------------------ + sal_Bool FmFieldWinListBox::DoubleClickHdl() { if ( pTabWin->createSelectionControls() ) @@ -150,7 +150,7 @@ sal_Bool FmFieldWinListBox::DoubleClickHdl() return SvTreeListBox::DoubleClickHdl(); } -//------------------------------------------------------------------------------ + void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { SvTreeListEntry* pSelected = FirstSelected(); @@ -181,13 +181,13 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi // class FmFieldWinData //======================================================================== DBG_NAME(FmFieldWinData); -//----------------------------------------------------------------------- + FmFieldWinData::FmFieldWinData() { DBG_CTOR(FmFieldWinData,NULL); } -//----------------------------------------------------------------------- + FmFieldWinData::~FmFieldWinData() { DBG_DTOR(FmFieldWinData,NULL); @@ -197,7 +197,7 @@ FmFieldWinData::~FmFieldWinData() // class FmFieldWin //======================================================================== DBG_NAME(FmFieldWin); -//----------------------------------------------------------------------- + FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE)) ,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings) @@ -216,7 +216,7 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _ SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); } -//----------------------------------------------------------------------- + FmFieldWin::~FmFieldWin() { if (m_pChangeListener) @@ -230,7 +230,7 @@ FmFieldWin::~FmFieldWin() DBG_DTOR(FmFieldWin,NULL); } -//----------------------------------------------------------------------- + void FmFieldWin::GetFocus() { if ( pListBox ) @@ -239,7 +239,7 @@ void FmFieldWin::GetFocus() SfxFloatingWindow::GetFocus(); } -//----------------------------------------------------------------------- + sal_Bool FmFieldWin::createSelectionControls( ) { SvTreeListEntry* pSelected = pListBox->FirstSelected(); @@ -270,7 +270,7 @@ sal_Bool FmFieldWin::createSelectionControls( ) return NULL != pSelected; } -//----------------------------------------------------------------------- + bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) @@ -286,20 +286,20 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) return SfxFloatingWindow::PreNotify( _rNEvt ); } -//----------------------------------------------------------------------- + bool FmFieldWin::Close() { return SfxFloatingWindow::Close(); } -//----------------------------------------------------------------------- + void FmFieldWin::_propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > xForm(evt.Source, ::com::sun::star::uno::UNO_QUERY); UpdateContent(xForm); } -//----------------------------------------------------------------------- + void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { if (!pState || SID_FM_FIELDS_CONTROL != nSID) @@ -314,7 +314,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo UpdateContent(NULL); } -//----------------------------------------------------------------------- + void FmFieldWin::UpdateContent(FmFormShell* pShell) { pListBox->Clear(); @@ -329,7 +329,7 @@ void FmFieldWin::UpdateContent(FmFormShell* pShell) UpdateContent( xForm ); } -//----------------------------------------------------------------------- + void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xForm) { try @@ -408,7 +408,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su } } -//----------------------------------------------------------------------- + void FmFieldWin::Resize() { SfxFloatingWindow::Resize(); @@ -426,16 +426,16 @@ void FmFieldWin::Resize() pListBox->SetPosSizePixel( aLBPos, aLBSize ); } -//----------------------------------------------------------------------- + void FmFieldWin::FillInfo( SfxChildWinInfo& rInfo ) const { rInfo.bVisible = sal_False; } -//----------------------------------------------------------------------- + SFX_IMPL_FLOATINGWINDOW(FmFieldWinMgr, SID_FM_ADD_FIELD) -//----------------------------------------------------------------------- + FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 7bf980cbdb8f..b811af0dd194 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -52,7 +52,7 @@ using ::com::sun::star::beans::XPropertySet; // class SvxFmAbsRecWin //======================================================================== -// ----------------------------------------------------------------------- + SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ) :NumericField( _pParent, WB_BORDER ) ,m_pController(_pController) @@ -66,12 +66,12 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle SetStrictFormat(true); } -// ----------------------------------------------------------------------- + SvxFmAbsRecWin::~SvxFmAbsRecWin() { } -// ----------------------------------------------------------------------- + void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) { if ( _bForce || ( GetText() != GetSavedValue() ) ) @@ -97,13 +97,13 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) } } -// ----------------------------------------------------------------------- + void SvxFmAbsRecWin::LoseFocus() { FirePosition( sal_False ); } -// ----------------------------------------------------------------------- + void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent ) { if( rKeyEvent.GetKeyCode() == KEY_RETURN && !GetText().isEmpty() ) @@ -150,7 +150,7 @@ static const MapSlotToCmd SlotToCommands[] = SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item ); -//----------------------------------------------------------------------- + SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) ,nLastSlot( 0 ) @@ -158,7 +158,7 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBo rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); } -//----------------------------------------------------------------------- + void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if (nSID == SID_FM_CONFIG) @@ -203,13 +203,13 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxToolBoxControl::StateChanged( nSID, eState,pState ); } -//----------------------------------------------------------------------- + SfxPopupWindowType SvxFmTbxCtlConfig::GetPopupWindowType() const { return( nLastSlot == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT ); } -//----------------------------------------------------------------------- + SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow() { if ( GetSlotId() == SID_FM_CONFIG ) @@ -220,7 +220,7 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow() return NULL; } -//----------------------------------------------------------------------- + void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) { ////////////////////////////////////////////////////////////////////// @@ -251,20 +251,20 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item ); DBG_NAME(SvxFmTbxCtlAbsRec); -//----------------------------------------------------------------------- + SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { DBG_CTOR(SvxFmTbxCtlAbsRec,NULL); } -//----------------------------------------------------------------------- + SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec() { DBG_DTOR(SvxFmTbxCtlAbsRec,NULL); } -//----------------------------------------------------------------------- + void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { sal_uInt16 nId = GetId(); @@ -290,7 +290,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons SfxToolBoxControl::StateChanged( nSID, eState,pState ); } -//----------------------------------------------------------------------- + Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); @@ -305,20 +305,20 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem ); DBG_NAME(SvxFmTbxCtlRecText); -//----------------------------------------------------------------------- + SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { DBG_CTOR(SvxFmTbxCtlRecText,NULL); } -//----------------------------------------------------------------------- + SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText() { DBG_DTOR(SvxFmTbxCtlRecText,NULL); } -//----------------------------------------------------------------------- + Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_TEXT)); @@ -339,20 +339,20 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem ); DBG_NAME(SvxFmTbxCtlRecFromText); -//----------------------------------------------------------------------- + SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { DBG_CTOR(SvxFmTbxCtlRecFromText,NULL); } -//----------------------------------------------------------------------- + SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() { DBG_DTOR(SvxFmTbxCtlRecFromText,NULL); } -//----------------------------------------------------------------------- + Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); @@ -372,7 +372,7 @@ Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) DBG_NAME(SvxFmTbxCtlRecTotal); SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem ); -//----------------------------------------------------------------------- + SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) ,pFixedText( NULL ) @@ -380,13 +380,13 @@ SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, To DBG_CTOR(SvxFmTbxCtlRecTotal,NULL); } -//----------------------------------------------------------------------- + SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal() { DBG_DTOR(SvxFmTbxCtlRecTotal,NULL); } -//----------------------------------------------------------------------- + Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) { pFixedText = new FixedText( pParent ); @@ -399,7 +399,7 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) return pFixedText; } -//----------------------------------------------------------------------- + void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { ////////////////////////////////////////////////////////////////////// @@ -425,7 +425,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co //======================================================================== SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem ); -//----------------------------------------------------------------------- + SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { @@ -443,7 +443,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r //======================================================================== SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem ); -//----------------------------------------------------------------------- + SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx index 8097f271c657..0ab81ee54875 100644 --- a/svx/source/form/typeconversionclient.cxx +++ b/svx/source/form/typeconversionclient.cxx @@ -27,12 +27,12 @@ namespace svxform //==================================================================== //= OTypeConversionClient //==================================================================== - //-------------------------------------------------------------------- + OTypeConversionClient::OTypeConversionClient() { } - //-------------------------------------------------------------------- + bool OTypeConversionClient::ensureLoaded() const { if ( !ODbtoolsClient::ensureLoaded() ) diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index b5456c487e7f..866fa7c9792b 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -43,13 +43,13 @@ namespace svxform //==================================================================== //= OAddConditionDialog //==================================================================== - //-------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB ) { return OAddConditionDialog::Create( _rxORB ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() { ::comphelper::StringSequence aSupported( 1 ); @@ -57,7 +57,7 @@ namespace svxform return aSupported; } - //-------------------------------------------------------------------- + OUString SAL_CALL OAddConditionDialog_GetImplementationName() { return OUString("org.openoffice.comp.svx.OAddConditionDialog"); @@ -66,7 +66,7 @@ namespace svxform //==================================================================== //= OAddConditionDialog //==================================================================== - //-------------------------------------------------------------------- + OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB ) :OAddConditionDialogBase( _rxORB ) { @@ -103,7 +103,7 @@ namespace svxform ); } - //------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId * pId = 0; @@ -119,37 +119,37 @@ namespace svxform return pId->getImplementationId(); } - //------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OAddConditionDialog::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *( new OAddConditionDialog( comphelper::getComponentContext(_rxFactory) ) ); } - //------------------------------------------------------------------------- + OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException) { return OAddConditionDialog_GetImplementationName(); } - //------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException) { return OAddConditionDialog_GetSupportedServiceNames(); } - //------------------------------------------------------------------------- + Reference<XPropertySetInfo> SAL_CALL OAddConditionDialog::getPropertySetInfo() throw(RuntimeException) { return createPropertySetInfo( getInfoHelper() ); } - //------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& OAddConditionDialog::getInfoHelper() { return *const_cast< OAddConditionDialog* >( this )->getArrayHelper(); } - //------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper* OAddConditionDialog::createArrayHelper( ) const { Sequence< Property > aProperties; @@ -157,7 +157,7 @@ namespace svxform return new ::cppu::OPropertyArrayHelper( aProperties ); } - //------------------------------------------------------------------------------ + Dialog* OAddConditionDialog::createDialog(Window* _pParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) @@ -166,7 +166,7 @@ namespace svxform return new AddConditionDialog( _pParent, m_sFacetName, m_xBinding ); } - //------------------------------------------------------------------------------ + void OAddConditionDialog::executedDialog( sal_Int16 _nExecutionResult ) { OAddConditionDialogBase::executedDialog( _nExecutionResult ); diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 03dede7fa335..e6fa0bc8edae 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -50,21 +50,21 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, { } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const { return false; } -// ----------------------------------------------------------------------- + bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */) { return false; } -// ----------------------------------------------------------------------- + bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const { @@ -81,21 +81,21 @@ bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const maRangeText == rItem.maRangeText; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const { return new SvxSmartTagItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 2ec403520c37..74d1a423ca66 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -66,7 +66,7 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, SetFromRotation( nRotation, bStacked ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxOrientationItem::GetPresentation ( @@ -89,7 +89,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { @@ -128,7 +128,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -//------------------------------------------------------------------------ + OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const { @@ -136,14 +136,14 @@ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal); } -//------------------------------------------------------------------------ + SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const { return new SvxOrientationItem( *this ); } -//------------------------------------------------------------------------ + SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const { @@ -152,14 +152,14 @@ SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() ); } -//------------------------------------------------------------------------ + sal_uInt16 SvxOrientationItem::GetValueCount() const { return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 } -//------------------------------------------------------------------------ + sal_Bool SvxOrientationItem::IsStacked() const { @@ -205,7 +205,7 @@ SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) : { } -//------------------------------------------------------------------------ + SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop, @@ -222,7 +222,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, } -//------------------------------------------------------------------------ + SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : @@ -234,7 +234,7 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : nBottomMargin = rItem.nBottomMargin; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxMarginItem::GetPresentation ( @@ -286,7 +286,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const { @@ -298,14 +298,14 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const ( nBottomMargin == ( (SvxMarginItem&)rItem ).nBottomMargin ) ); } -//------------------------------------------------------------------------ + SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const { return new SvxMarginItem(*this); } -//------------------------------------------------------------------------ + SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const { @@ -320,7 +320,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const return new SvxMarginItem( nLeft, nTop, nRight, nBottom, Which() ); } -//------------------------------------------------------------------------ + SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { @@ -332,7 +332,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) } -//------------------------------------------------------------------------ + bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -360,7 +360,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -//------------------------------------------------------------------------ + bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { @@ -391,7 +391,7 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -//------------------------------------------------------------------------ + sal_Bool SvxMarginItem::SetLeftMargin( sal_Int16 nLeft ) { @@ -399,7 +399,7 @@ sal_Bool SvxMarginItem::SetLeftMargin( sal_Int16 nLeft ) return sal_True; } -//------------------------------------------------------------------------ + sal_Bool SvxMarginItem::SetTopMargin( sal_Int16 nTop ) { @@ -407,7 +407,7 @@ sal_Bool SvxMarginItem::SetTopMargin( sal_Int16 nTop ) return sal_True; } -//------------------------------------------------------------------------ + sal_Bool SvxMarginItem::SetRightMargin( sal_Int16 nRight ) { @@ -415,7 +415,7 @@ sal_Bool SvxMarginItem::SetRightMargin( sal_Int16 nRight ) return sal_True; } -//------------------------------------------------------------------------ + sal_Bool SvxMarginItem::SetBottomMargin( sal_Int16 nBottom ) { diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 02bff07b4dd5..f975bd9bf02d 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -30,7 +30,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0)); TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem); @@ -52,21 +52,21 @@ SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : { } -// ----------------------------------------------------------------------- + SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartStyleItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { @@ -84,14 +84,14 @@ SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartDataDescrItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { @@ -110,28 +110,28 @@ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, { } -// ----------------------------------------------------------------------- + SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrderItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrderItem(rIn, Which()); } -// ----------------------------------------------------------------------- + bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { @@ -156,7 +156,7 @@ bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uI return true; } -// ----------------------------------------------------------------------- + bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { @@ -203,14 +203,14 @@ SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrientItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { @@ -229,7 +229,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : { } -// ----------------------------------------------------------------------- + SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : SfxPoolItem(rItem), @@ -237,14 +237,14 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : { } -// ----------------------------------------------------------------------- + OUString SvxDoubleItem::GetValueText() const { return rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.', false ); } -// ----------------------------------------------------------------------- + SfxItemPresentation SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -262,21 +262,21 @@ SfxItemPresentation SvxDoubleItem::GetPresentation return SFX_ITEM_PRESENTATION_NAMELESS; } -// ----------------------------------------------------------------------- + bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const { return (((SvxDoubleItem&)rItem).fVal == fVal); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxDoubleItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const { @@ -285,7 +285,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const return new SvxDoubleItem(_fVal, Which()); } -// ----------------------------------------------------------------------- + SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const { @@ -293,21 +293,21 @@ SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) cons return rOut; } -// ----------------------------------------------------------------------- + double SvxDoubleItem::GetMin() const { return DBL_MIN; } -// ----------------------------------------------------------------------- + double SvxDoubleItem::GetMax() const { return DBL_MAX; } -// ----------------------------------------------------------------------- + SfxFieldUnit SvxDoubleItem::GetUnit() const { @@ -317,14 +317,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const -// ----------------------------------------------------------------------- + bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= fVal; return true; } -// ----------------------------------------------------------------------- + bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { return rVal >>= fVal; @@ -344,28 +344,28 @@ SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, { } -// ----------------------------------------------------------------------- + SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartKindErrorItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartKindErrorItem(rIn, Which()); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { @@ -386,28 +386,28 @@ SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, { } -// ----------------------------------------------------------------------- + SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartIndicateItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartIndicateItem(rIn, Which()); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const { @@ -428,28 +428,28 @@ SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, { } -// ----------------------------------------------------------------------- + SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartRegressItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartRegressItem(rIn, Which()); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const { diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index a89cca42ebcf..ace0d31fad9b 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -121,7 +121,7 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) : { } -//------------------------------------------------------------------------ + SfxItemPresentation SvxGradientListItem::GetPresentation ( @@ -175,7 +175,7 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) : { } -//------------------------------------------------------------------------ + SfxItemPresentation SvxHatchListItem::GetPresentation ( diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 765d5651b720..b57e5a84149f 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -30,11 +30,11 @@ using namespace ::com::sun::star; DBG_NAMEEX(SvxB3DVectorItem) DBG_NAME(SvxB3DVectorItem) -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem); -// ----------------------------------------------------------------------- + SvxB3DVectorItem::SvxB3DVectorItem() { @@ -46,7 +46,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem() DBG_DTOR(SvxB3DVectorItem, 0); } -// ----------------------------------------------------------------------- + SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) : SfxPoolItem( _nWhich ), @@ -55,7 +55,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector DBG_CTOR(SvxB3DVectorItem, 0); } -// ----------------------------------------------------------------------- + SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : SfxPoolItem( rItem ), @@ -64,7 +64,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : DBG_CTOR(SvxB3DVectorItem, 0); } -// ----------------------------------------------------------------------- + bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { @@ -73,7 +73,7 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const return ((SvxB3DVectorItem&)rItem).aVal == aVal; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const { @@ -81,7 +81,7 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const return new SvxB3DVectorItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const { @@ -94,7 +94,7 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/ return new SvxB3DVectorItem(Which(), aStr); } -// ----------------------------------------------------------------------- + SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { @@ -109,7 +109,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ return rStream; } -// ----------------------------------------------------------------------- + bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { @@ -124,7 +124,7 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) con return true; } -// ----------------------------------------------------------------------- + bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { @@ -138,7 +138,7 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) return true; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 1e06287e33a1..f5d76c327c1b 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -24,7 +24,7 @@ #include "svx/hlnkitem.hxx" -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0)); diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 1199a2f0ab14..7fbaae33a857 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -38,7 +38,7 @@ const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789; -// ----------------------------------------------------------------------- + @@ -61,7 +61,7 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma eNumValType,nNumVal,pNumStr ); } -// ----------------------------------------------------------------------- + SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, @@ -93,7 +93,7 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } } -// ----------------------------------------------------------------------- + SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, @@ -130,7 +130,7 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } } -// ----------------------------------------------------------------------- + SvxNumberFormatShell::~SvxNumberFormatShell() { @@ -154,14 +154,14 @@ SvxNumberFormatShell::~SvxNumberFormatShell() } } -// ----------------------------------------------------------------------- + size_t SvxNumberFormatShell::GetUpdateDataCount() const { return aDelList.size(); } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ) { @@ -174,7 +174,7 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt3 *pDelArray++ = *it; } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, short& rFmtSelPos, @@ -191,7 +191,7 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, rFmtSelPos = FillEntryList_Impl( rFmtEntries ); } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, short& rFmtSelPos, @@ -204,7 +204,7 @@ void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, rFmtSelPos = FillEntryList_Impl( rFmtEntries ); } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::FormatChanged( sal_uInt16 nFmtLbPos, OUString& rPreviewStr, @@ -228,7 +228,7 @@ void SvxNumberFormatShell::FormatChanged( sal_uInt16 nFmtLbPos, } } } -// ----------------------------------------------------------------------- + bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos, sal_uInt16& rCatLbSelPos, short& rFmtSelPos, @@ -300,7 +300,7 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos, return bInserted; } -// ----------------------------------------------------------------------- + bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, sal_uInt16& rCatLbSelPos, @@ -336,7 +336,7 @@ bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, return true; } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::MakeFormat( OUString& rFormat, bool bThousand, bool bNegRed, @@ -375,7 +375,7 @@ void SvxNumberFormatShell::MakeFormat( OUString& rFormat, } } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::GetOptions( const OUString& rFormat, bool& rThousand, @@ -417,7 +417,7 @@ void SvxNumberFormatShell::GetOptions( const OUString& rFormat, } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, OUString& rPreviewStr, @@ -461,7 +461,7 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, } } -// ----------------------------------------------------------------------- + bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) { @@ -487,7 +487,7 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) return bFlag; } -// ----------------------------------------------------------------------- + bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pAt /* = NULL */ ) { @@ -517,7 +517,7 @@ bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pA } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, LanguageType& rLangType, @@ -526,7 +526,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, OUString& rPrevString, Color*& rpPrevColor ) { - // ------------------------------------------------------------------- + // Vorbedingung: Zahlenformatierer gefunden DBG_ASSERT( pFormatter != NULL, "Zahlenformatierer nicht gefunden!" ); @@ -557,7 +557,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, GetPreviewString_Impl( rPrevString, rpPrevColor ); } -// ----------------------------------------------------------------------- + short SvxNumberFormatShell::FillEntryList_Impl( std::vector<OUString>& rList ) { @@ -1122,7 +1122,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor ) { @@ -1148,37 +1148,37 @@ void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpC } } -// ----------------------------------------------------------------------- + ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetRemoved_Impl( size_t nKey ) { return ::std::find(aDelList.begin(), aDelList.end(), nKey); } -// ----------------------------------------------------------------------- + bool SvxNumberFormatShell::IsRemoved_Impl( size_t nKey ) { return GetRemoved_Impl( nKey ) != aDelList.end(); } -// ----------------------------------------------------------------------- + ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetAdded_Impl( size_t nKey ) { return ::std::find(aAddList.begin(), aAddList.end(), nKey); } -//------------------------------------------------------------------------ + bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey ) { return GetAdded_Impl( nKey ) != aAddList.end(); } -// ----------------------------------------------------------------------- + // Konvertierungs-Routinen: -// ------------------------ + void SvxNumberFormatShell::PosToCategory_Impl( sal_uInt16 nPos, short& rCategory ) { @@ -1200,7 +1200,7 @@ void SvxNumberFormatShell::PosToCategory_Impl( sal_uInt16 nPos, short& rCategory } } -// ----------------------------------------------------------------------- + void SvxNumberFormatShell::CategoryToPos_Impl( short nCategory, sal_uInt16& rPos ) { diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index ef2969f1f47a..ba5ac224fb2a 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -19,7 +19,7 @@ #include <svx/numinf.hxx> -// ----------------------------------------------------------------------- + TYPEINIT1(SvxNumberInfoItem, SfxPoolItem); @@ -42,7 +42,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const sal_uInt16 nId ) : @@ -52,7 +52,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, { } -// ----------------------------------------------------------------------- + SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const OUString& rVal, const sal_uInt16 nId ) : @@ -62,7 +62,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, { } -// ----------------------------------------------------------------------- + SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const sal_uInt16 nId ) : @@ -72,7 +72,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, { } -// ----------------------------------------------------------------------- + SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const OUString& rValueStr, @@ -85,7 +85,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, #undef INIT -// ----------------------------------------------------------------------- + SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : @@ -108,14 +108,14 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : } } -// ----------------------------------------------------------------------- + SvxNumberInfoItem::~SvxNumberInfoItem() { delete [] pDelFormatArr; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxNumberInfoItem::GetPresentation ( @@ -129,7 +129,7 @@ SfxItemPresentation SvxNumberInfoItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { @@ -163,7 +163,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const return bEqual; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const { @@ -171,21 +171,21 @@ SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const } // Laden/Speichern wird nicht gebraucht! -// ----------------------------------------------------------------------- + SfxPoolItem* SvxNumberInfoItem::Create( SvStream& /*rStream*/, sal_uInt16 ) const { return new SvxNumberInfoItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxNumberInfoItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } -// ----------------------------------------------------------------------- + void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, const sal_uInt32 nCount ) diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 50d6659e7629..225c9a5dca57 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -94,7 +94,7 @@ inline OUString GetUsageText( const sal_uInt16 eU ) } } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPageItem::GetPresentation ( @@ -155,7 +155,7 @@ SfxItemPresentation SvxPageItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -192,7 +192,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -//------------------------------------------------------------------------ + bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { switch( nMemberId ) @@ -234,7 +234,7 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -//------------------------------------------------------------------------ + SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const { @@ -257,7 +257,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const return pPage; } -//------------------------------------------------------------------------ + SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -295,7 +295,7 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const return new SvxSetItem(*this); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxSetItem::GetPresentation ( diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 794a55ca0e40..38e1384ab8dc 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -22,7 +22,7 @@ #include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxPostItAuthorItem, SfxStringItem, new SvxPostItAuthorItem(0)); TYPEINIT1_FACTORY(SvxPostItDateItem, SfxStringItem, new SvxPostItDateItem(0)); @@ -35,7 +35,7 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich ) SetWhich( _nWhich ); } -// ----------------------------------------------------------------------- + SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 _nWhich ) : @@ -43,7 +43,7 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, { } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPostItAuthorItem::GetPresentation ( @@ -69,7 +69,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const { @@ -83,7 +83,7 @@ SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich ) SetWhich( _nWhich ); } -// ----------------------------------------------------------------------- + SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich ) : @@ -91,7 +91,7 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich { } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPostItDateItem::GetPresentation ( @@ -117,7 +117,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const { @@ -131,7 +131,7 @@ SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich ) SetWhich( _nWhich ); } -// ----------------------------------------------------------------------- + SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich ) : @@ -139,7 +139,7 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich { } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPostItTextItem::GetPresentation ( @@ -165,7 +165,7 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 27f6e2c59571..c3e87d97a596 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star; TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0)); -//----------------------------------------------------------------------- + // SvxRotateModeItem - Ausrichtung bei gedrehtem Text -//----------------------------------------------------------------------- + SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich ) : SfxEnumItem( _nWhich, (sal_uInt16)eMode ) diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 06b393c0a9f9..c75be5c8c22d 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem); @@ -31,7 +31,7 @@ TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem); #define VIEWLAYOUT_PARAM_BOOKMODE "BookMode" #define VIEWLAYOUT_PARAMS 2 -// ----------------------------------------------------------------------- + SvxViewLayoutItem::SvxViewLayoutItem ( @@ -44,7 +44,7 @@ SvxViewLayoutItem::SvxViewLayoutItem { } -// ----------------------------------------------------------------------- + SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), @@ -52,34 +52,34 @@ SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) { } -// ----------------------------------------------------------------------- + SvxViewLayoutItem::~SvxViewLayoutItem() { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxViewLayoutItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { return 0; } -// ----------------------------------------------------------------------- + SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } -// ----------------------------------------------------------------------- + bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index ff646f30a0a6..97ac53b7a452 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -22,7 +22,7 @@ #include <svx/zoomslideritem.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem); @@ -32,14 +32,14 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem); #define ZOOMSLIDER_PARAM_MAXZOOM "MaxValue" #define ZOOMSLIDER_PARAMS 4 -// ----------------------------------------------------------------------- + SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) { } -// ----------------------------------------------------------------------- + SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ) @@ -49,34 +49,34 @@ SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig ) { } -// ----------------------------------------------------------------------- + SvxZoomSliderItem::~SvxZoomSliderItem() { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomSliderItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { return 0; } -// ----------------------------------------------------------------------- + SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } -// ----------------------------------------------------------------------- + bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 739adbf273e3..45791381cb8a 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno; SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem); -//-------------------------------------------------------------------- + SvxSmartTagsControl::SvxSmartTagsControl ( @@ -50,7 +50,7 @@ SvxSmartTagsControl::SvxSmartTagsControl rMenu.SetPopupMenu( _nId, mpMenu ); } -//-------------------------------------------------------------------- + const sal_uInt16 MN_ST_INSERT_START = 500; @@ -135,7 +135,7 @@ void SvxSmartTagsControl::FillMenu() } } -//-------------------------------------------------------------------- + void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -154,7 +154,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S } } -//-------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) { @@ -191,7 +191,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) } IMPL_LINK_INLINE_END( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) -//-------------------------------------------------------------------- + SvxSmartTagsControl::~SvxSmartTagsControl() { @@ -199,7 +199,7 @@ SvxSmartTagsControl::~SvxSmartTagsControl() delete mpMenu; } -//-------------------------------------------------------------------- + PopupMenu* SvxSmartTagsControl::GetPopup() const { diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 65ec3097d9a0..f36861967282 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -33,7 +33,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem); -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -56,7 +56,7 @@ SvxFontMenuControl::SvxFontMenuControl FillMenu(); } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -78,7 +78,7 @@ void SvxFontMenuControl::FillMenu() } } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -110,7 +110,7 @@ void SvxFontMenuControl::StateChanged( } } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -126,7 +126,7 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint ) FillMenu(); } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -144,7 +144,7 @@ IMPL_LINK_INLINE_START( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen ) } IMPL_LINK_INLINE_END( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen ) -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -156,7 +156,7 @@ SvxFontMenuControl::~SvxFontMenuControl() delete pMenu; } -//-------------------------------------------------------------------- + /* [Beschreibung] diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index a5384b3d8377..a5a9c09c3223 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -40,7 +40,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem); -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -65,7 +65,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen ) return 1; } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -149,7 +149,7 @@ void SvxFontSizeMenuControl::StateChanged( } } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -174,7 +174,7 @@ SvxFontSizeMenuControl::SvxFontSizeMenuControl pMenu->SetSelectHdl( LINK( this, SvxFontSizeMenuControl, MenuSelect ) ); } -//-------------------------------------------------------------------- + /* [Beschreibung] @@ -186,7 +186,7 @@ SvxFontSizeMenuControl::~SvxFontSizeMenuControl() delete pMenu; } -//-------------------------------------------------------------------- + /* [Beschreibung] diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 90f6d0776269..4c5412ad631c 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -26,9 +26,9 @@ namespace sdr { namespace contact { -// ------------------ + // - SdrMediaWindow - -// ------------------ + SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) : ::avmedia::MediaWindow( pParent, false ), @@ -36,13 +36,13 @@ SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& { } -// ------------------------------------------------------------------------------ + SdrMediaWindow::~SdrMediaWindow() { } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -58,7 +58,7 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) } } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -73,7 +73,7 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -88,7 +88,7 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) { @@ -98,7 +98,7 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) pWindow->KeyInput( rKEvt ); } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) { @@ -108,7 +108,7 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) pWindow->KeyUp( rKEvt ); } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::Command( const CommandEvent& rCEvt ) { @@ -123,7 +123,7 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt ) } } -// ------------------------------------------------------------------------------ + sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { @@ -143,7 +143,7 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) return( nRet ); } -// ------------------------------------------------------------------------------ + sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { @@ -163,7 +163,7 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return( nRet ); } -// ------------------------------------------------------------------------------ + void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 8aa9abe90288..c17d71ce97a5 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -26,29 +26,29 @@ namespace sdr { namespace contact { -// ---------------------------- + // - ViewContactOfSdrMediaObj - -// ---------------------------- + ViewContactOfSdrMediaObj::ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ) : ViewContactOfSdrObj( rMediaObj ) { } -// ------------------------------------------------------------------------------ + ViewContactOfSdrMediaObj::~ViewContactOfSdrMediaObj() { } -// ------------------------------------------------------------------------------ + ViewObjectContact& ViewContactOfSdrMediaObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) { return *( new ViewObjectContactOfSdrMediaObj( rObjectContact, *this, static_cast< SdrMediaObj& >( GetSdrObject() ).getMediaProperties() ) ); } -// ------------------------------------------------------------------------------ + Size ViewContactOfSdrMediaObj::getPreferredSize() const { @@ -70,7 +70,7 @@ Size ViewContactOfSdrMediaObj::getPreferredSize() const return Size(); } -// ------------------------------------------------------------------------------ + void ViewContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const { @@ -88,7 +88,7 @@ void ViewContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) co } } -// ------------------------------------------------------------------------------ + void ViewContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem ) { @@ -105,7 +105,7 @@ void ViewContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rIt } } -// ------------------------------------------------------------------------------ + void ViewContactOfSdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ) { diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 08f11004e96a..60ffec16afbd 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -62,12 +62,12 @@ namespace sdr { namespace contact { ViewContactOfUnoControl_Impl& operator=( const ViewContactOfUnoControl_Impl& ); // never implemented }; - //-------------------------------------------------------------------- + ViewContactOfUnoControl_Impl::ViewContactOfUnoControl_Impl() { } - //-------------------------------------------------------------------- + ViewContactOfUnoControl_Impl::~ViewContactOfUnoControl_Impl() { } @@ -76,7 +76,7 @@ namespace sdr { namespace contact { //= ViewContactOfUnoControl //==================================================================== DBG_NAME( ViewContactOfUnoControl ) - //-------------------------------------------------------------------- + ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject ) :ViewContactOfSdrObj( _rUnoObject ) ,m_pImpl( new ViewContactOfUnoControl_Impl ) @@ -84,13 +84,13 @@ namespace sdr { namespace contact { DBG_CTOR( ViewContactOfUnoControl, NULL ); } - //-------------------------------------------------------------------- + ViewContactOfUnoControl::~ViewContactOfUnoControl() { DBG_DTOR( ViewContactOfUnoControl, NULL ); } - //-------------------------------------------------------------------- + Reference< XControl > ViewContactOfUnoControl::getTemporaryControlForWindow( const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const { @@ -101,7 +101,7 @@ namespace sdr { namespace contact { return ViewObjectContactOfUnoControl::getTemporaryControlForWindow( _rWindow, _inout_ControlContainer, *pUnoObject ); } - //-------------------------------------------------------------------- + ViewObjectContact& ViewContactOfUnoControl::CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) { // print or print preview requires special handling @@ -118,7 +118,7 @@ namespace sdr { namespace contact { return *new ViewObjectContactOfUnoControl( _rObjectContact, *this ); } - //-------------------------------------------------------------------- + drawinglayer::primitive2d::Primitive2DSequence ViewContactOfUnoControl::createViewIndependentPrimitive2DSequence() const { // create range. Use model data directly, not getBoundRect()/getSnapRect; these will use diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index a873f34ae87a..62dd879c8c21 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -35,9 +35,9 @@ namespace sdr { namespace contact { -// ---------------------------------- + // - ViewObjectContactOfSdrMediaObj - -// ---------------------------------- + ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& rObjectContact, ViewContact& rViewContact, @@ -55,7 +55,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r } } -// ------------------------------------------------------------------------------ + ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() { @@ -63,7 +63,7 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() mpMediaWindow = NULL; } -// ------------------------------------------------------------------------------ + Window* ViewObjectContactOfSdrMediaObj::getWindow() const { @@ -95,7 +95,7 @@ Window* ViewObjectContactOfSdrMediaObj::getWindow() const return pRetval; } -// ------------------------------------------------------------------------------ + Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const { @@ -107,7 +107,7 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const return aRet; } -// ------------------------------------------------------------------------------ + void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const { @@ -135,7 +135,7 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte } } -// ------------------------------------------------------------------------------ + void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem ) { @@ -151,7 +151,7 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte } } -// ------------------------------------------------------------------------------ + }} // end of namespace sdr::contact diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index ba489eae6185..0659051844a3 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -223,31 +223,31 @@ namespace sdr { namespace contact { inline const Reference< XControl >& getControl() const { return m_xControl; } }; - //-------------------------------------------------------------------- + bool operator==( const ControlHolder& _rControl, const Reference< XInterface >& _rxCompare ) { return _rControl.getControl() == _rxCompare; } - //-------------------------------------------------------------------- + bool operator==( const Reference< XInterface >& _rxCompare, const ControlHolder& _rControl ) { return _rxCompare == _rControl.getControl(); } - //-------------------------------------------------------------------- + bool operator==( const ControlHolder& _rControl, const Any& _rxCompare ) { return _rControl == Reference< XInterface >( _rxCompare, UNO_QUERY ); } - //-------------------------------------------------------------------- + bool operator==( const Any& _rxCompare, const ControlHolder& _rControl ) { return Reference< XInterface >( _rxCompare, UNO_QUERY ) == _rControl; } - //-------------------------------------------------------------------- + void ControlHolder::setPosSize( const Rectangle& _rPosSize ) const { // no check whether we're valid, this is the responsibility of the caller @@ -264,21 +264,21 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + ::Rectangle ControlHolder::getPosSize() const { // no check whether we're valid, this is the responsibility of the caller return VCLUnoHelper::ConvertToVCLRect( m_xControlWindow->getPosSize() ); } - //-------------------------------------------------------------------- + void ControlHolder::setZoom( const ::basegfx::B2DVector& _rScale ) const { // no check whether we're valid, this is the responsibility of the caller m_xControlView->setZoom( (float)_rScale.getX(), (float)_rScale.getY() ); } - //-------------------------------------------------------------------- + void ControlHolder::invalidate() const { Reference< XWindowPeer > xPeer( m_xControl->getPeer() ); @@ -291,7 +291,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + ::basegfx::B2DVector ControlHolder::getZoom() const { // no check whether we're valid, this is the responsibility of the caller @@ -337,7 +337,7 @@ namespace sdr { namespace contact { UnoControlContactHelper& operator=( const UnoControlContactHelper& ); // never implemented }; - //-------------------------------------------------------------------- + void UnoControlContactHelper::adjustControlGeometry_throw( const ControlHolder& _rControl, const Rectangle& _rLogicBoundingRect, const basegfx::B2DHomMatrix& _rViewTransformation, const ::basegfx::B2DHomMatrix& _rZoomLevelNormalization ) { @@ -372,7 +372,7 @@ namespace sdr { namespace contact { _rControl.setZoom( aScale ); } - //-------------------------------------------------------------------- + void UnoControlContactHelper::disposeAndClearControl_nothrow( ControlHolder& _rControl ) { try @@ -432,13 +432,13 @@ namespace sdr { namespace contact { virtual bool isLayerVisible( SdrLayerID _nLayerID ) const; }; - //-------------------------------------------------------------------- + bool SdrPageViewAccess::isDesignMode() const { return m_rPageView.GetView().IsDesignMode(); } - //-------------------------------------------------------------------- + Reference< XControlContainer > SdrPageViewAccess::getControlContainer( const OutputDevice& _rDevice ) const { Reference< XControlContainer > xControlContainer = m_rPageView.GetControlContainer( _rDevice ); @@ -447,7 +447,7 @@ namespace sdr { namespace contact { return xControlContainer; } - //-------------------------------------------------------------------- + bool SdrPageViewAccess::isLayerVisible( SdrLayerID _nLayerID ) const { return m_rPageView.GetVisibleLayers().IsSet( _nLayerID ); @@ -477,13 +477,13 @@ namespace sdr { namespace contact { virtual bool isLayerVisible( SdrLayerID _nLayerID ) const; }; - //-------------------------------------------------------------------- + bool InvisibleControlViewAccess::isDesignMode() const { return true; } - //-------------------------------------------------------------------- + Reference< XControlContainer > InvisibleControlViewAccess::getControlContainer( const OutputDevice& _rDevice ) const { if ( !m_rControlContainer.is() ) @@ -496,7 +496,7 @@ namespace sdr { namespace contact { return m_rControlContainer; } - //-------------------------------------------------------------------- + bool InvisibleControlViewAccess::isLayerVisible( SdrLayerID /*_nLayerID*/ ) const { return false; @@ -527,19 +527,19 @@ namespace sdr { namespace contact { virtual bool isLayerVisible( SdrLayerID _nLayerID ) const; }; - //-------------------------------------------------------------------- + bool DummyPageViewAccess::isDesignMode() const { return true; } - //-------------------------------------------------------------------- + Reference< XControlContainer > DummyPageViewAccess::getControlContainer( const OutputDevice& /*_rDevice*/ ) const { return NULL; } - //-------------------------------------------------------------------- + bool DummyPageViewAccess::isLayerVisible( SdrLayerID /*_nLayerID*/ ) const { return true; @@ -923,7 +923,7 @@ namespace sdr { namespace contact { //= ViewObjectContactOfUnoControl_Impl //==================================================================== DBG_NAME( ViewObjectContactOfUnoControl_Impl ) - //-------------------------------------------------------------------- + ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl ) :m_pAntiImpl( _pAntiImpl ) ,m_bCreatingControl( false ) @@ -956,7 +956,7 @@ namespace sdr { namespace contact { #endif } - //-------------------------------------------------------------------- + ViewObjectContactOfUnoControl_Impl::~ViewObjectContactOfUnoControl_Impl() { if ( !impl_isDisposed_nofail() ) @@ -968,7 +968,7 @@ namespace sdr { namespace contact { DBG_DTOR( ViewObjectContactOfUnoControl_Impl, NULL ); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::impl_dispose_nothrow( bool _bAlsoDisposeControl ) { if ( impl_isDisposed_nofail() ) @@ -992,14 +992,14 @@ namespace sdr { namespace contact { m_pAntiImpl = NULL; } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::dispose() { SolarMutexGuard aSolarGuard; impl_dispose_nothrow( true ); } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl_Impl::getUnoObject( SdrUnoObj*& _out_rpObject ) const { OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::getUnoObject: already disposed()" ); @@ -1014,7 +1014,7 @@ namespace sdr { namespace contact { return ( _out_rpObject != NULL ); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::positionAndZoomControl( const basegfx::B2DHomMatrix& _rViewTransformation ) const { OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no output device or no control!" ); @@ -1043,7 +1043,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl_Impl::ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL ) { OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::ensureControl: already disposed()" ); @@ -1071,7 +1071,7 @@ namespace sdr { namespace contact { ); } - //-------------------------------------------------------------------- + const OutputDevice& ViewObjectContactOfUnoControl_Impl::impl_getOutputDevice_throw() const { ObjectContactOfPageView* pPageViewContact = dynamic_cast< ObjectContactOfPageView* >( &m_pAntiImpl->GetObjectContact() ); @@ -1087,7 +1087,7 @@ namespace sdr { namespace contact { return *pDevice; } - //-------------------------------------------------------------------- + const OutputDevice& ViewObjectContactOfUnoControl_Impl::impl_getPageViewOutputDevice_nothrow( const ObjectContactOfPageView& _rObjectContact ) { // if the PageWindow has a patched PaintWindow, use the original PaintWindow @@ -1109,7 +1109,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice, const basegfx::B2DHomMatrix& _rInitialViewTransformation ) { @@ -1188,7 +1188,7 @@ namespace sdr { namespace contact { return m_aControl.is(); } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl_Impl::createControlForDevice( IPageViewAccess& _rPageView, const OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, const basegfx::B2DHomMatrix& _rInitialViewTransformation, const basegfx::B2DHomMatrix& _rInitialZoomNormalization, ControlHolder& _out_rControl ) @@ -1254,7 +1254,7 @@ namespace sdr { namespace contact { return _out_rControl.is(); } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow( SdrPageView*& _out_rpPageView ) { OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: already disposed!" ); @@ -1271,7 +1271,7 @@ namespace sdr { namespace contact { return ( _out_rpPageView != NULL ); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( bool _bForce ) { OSL_PRECOND( m_aControl.is(), @@ -1289,7 +1289,7 @@ namespace sdr { namespace contact { impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, impl_isControlVisible_nofail(), _bForce ); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( const ControlHolder& _rControl, const SdrUnoObj& _rUnoObject, IPageViewAccess& _rPageView, bool _bIsCurrentlyVisible, bool _bForce ) { @@ -1310,7 +1310,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::impl_switchContainerListening_nothrow( bool _bStart ) { OSL_PRECOND( m_xContainer.is(), "ViewObjectContactOfUnoControl_Impl::impl_switchContainerListening_nothrow: no control container!" ); @@ -1330,7 +1330,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::impl_switchControlListening_nothrow( bool _bStart ) { OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::impl_switchControlListening_nothrow: invalid control!" ); @@ -1361,7 +1361,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::impl_switchDesignModeListening_nothrow( bool _bStart ) { if ( impl_isDesignModeListening_nofail() != _bStart ) @@ -1371,7 +1371,7 @@ namespace sdr { namespace contact { } } - //------------------------------------------------------------------------------ + void ViewObjectContactOfUnoControl_Impl::impl_switchPropertyListening_nothrow( bool _bStart ) { OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::impl_switchPropertyListening_nothrow: no control!" ); @@ -1392,7 +1392,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl_Impl::isPrintableControl() const { SdrUnoObj* pUnoObject( NULL ); @@ -1413,7 +1413,7 @@ namespace sdr { namespace contact { return bIsPrintable; } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1439,33 +1439,33 @@ namespace sdr { namespace contact { DBG_ASSERT( Source.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::disposing: Who's this?" ); } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) throw(RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) throw(RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; m_bControlIsVisible = true; } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; m_bControlIsVisible = false; } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1486,7 +1486,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1508,13 +1508,13 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) throw (RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1529,7 +1529,7 @@ namespace sdr { namespace contact { impl_dispose_nothrow( false ); } - //-------------------------------------------------------------------- + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1564,7 +1564,7 @@ namespace sdr { namespace contact { m_pAntiImpl->onControlChangedOrModified( ViewObjectContactOfUnoControl::ImplAccess() ); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl_Impl::setControlDesignMode( bool _bDesignMode ) const { if ( ( m_eControlDesignMode != eUnknown ) && ( _bDesignMode == impl_isControlDesignMode_nothrow() ) ) @@ -1590,7 +1590,7 @@ namespace sdr { namespace contact { //==================================================================== //= LazyControlCreationPrimitive2D //==================================================================== - //-------------------------------------------------------------------- + bool LazyControlCreationPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const { if ( !BufferedDecompositionPrimitive2D::operator==( rPrimitive ) ) @@ -1609,7 +1609,7 @@ namespace sdr { namespace contact { return true; } - //-------------------------------------------------------------------- + void LazyControlCreationPrimitive2D::getTransformation( const ViewContactOfUnoControl& _rVOC, ::basegfx::B2DHomMatrix& _out_Transformation ) { // Do use model data directly to create the correct geometry. Do NOT @@ -1635,7 +1635,7 @@ namespace sdr { namespace contact { _out_Transformation.set( 1, 2, aRange.getMinY() ); } - //-------------------------------------------------------------------- + ::basegfx::B2DRange LazyControlCreationPrimitive2D::getB2DRange( const ::drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/ ) const { ::basegfx::B2DRange aRange( 0.0, 0.0, 1.0, 1.0 ); @@ -1643,7 +1643,7 @@ namespace sdr { namespace contact { return aRange; } - //-------------------------------------------------------------------- + ::drawinglayer::primitive2d::Primitive2DSequence LazyControlCreationPrimitive2D::get2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const { #if OSL_DEBUG_LEVEL > 1 @@ -1656,7 +1656,7 @@ namespace sdr { namespace contact { return BufferedDecompositionPrimitive2D::get2DDecomposition( _rViewInformation ); } - //-------------------------------------------------------------------- + ::drawinglayer::primitive2d::Primitive2DSequence LazyControlCreationPrimitive2D::create2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const { #if OSL_DEBUG_LEVEL > 1 @@ -1697,14 +1697,14 @@ namespace sdr { namespace contact { return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1); } - //-------------------------------------------------------------------- + ImplPrimitive2DIDBlock( LazyControlCreationPrimitive2D, PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D ) //==================================================================== //= ViewObjectContactOfUnoControl //==================================================================== DBG_NAME( ViewObjectContactOfUnoControl ) - //-------------------------------------------------------------------- + ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) :ViewObjectContactOfSdrObj( _rObjectContact, _rViewContact ) ,m_pImpl( new ViewObjectContactOfUnoControl_Impl( this ) ) @@ -1712,7 +1712,7 @@ namespace sdr { namespace contact { DBG_CTOR( ViewObjectContactOfUnoControl, NULL ); } - //-------------------------------------------------------------------- + ViewObjectContactOfUnoControl::~ViewObjectContactOfUnoControl() { m_pImpl->dispose(); @@ -1721,7 +1721,7 @@ namespace sdr { namespace contact { DBG_DTOR( ViewObjectContactOfUnoControl, NULL ); } - //-------------------------------------------------------------------- + Reference< XControl > ViewObjectContactOfUnoControl::getControl() { SolarMutexGuard aSolarGuard; @@ -1729,7 +1729,7 @@ namespace sdr { namespace contact { return m_pImpl->getExistentControl().getControl(); } - //-------------------------------------------------------------------- + Reference< XControl > ViewObjectContactOfUnoControl::getTemporaryControlForWindow( const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject ) { @@ -1741,7 +1741,7 @@ namespace sdr { namespace contact { return aControl.getControl(); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl::ensureControlVisibility( bool _bVisible ) const { SolarMutexGuard aSolarGuard; @@ -1772,7 +1772,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl::setControlDesignMode( bool _bDesignMode ) const { SolarMutexGuard aSolarGuard; @@ -1787,7 +1787,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfUnoControl::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { if ( m_pImpl->isDisposed() ) @@ -1810,7 +1810,7 @@ namespace sdr { namespace contact { return ::drawinglayer::primitive2d::Primitive2DSequence( &xPrimitive, 1 ); } - //-------------------------------------------------------------------- + bool ViewObjectContactOfUnoControl::isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const { SolarMutexGuard aSolarGuard; @@ -1831,13 +1831,13 @@ namespace sdr { namespace contact { return ViewObjectContactOfSdrObj::isPrimitiveVisible( _rDisplayInfo ); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl::propertyChange() { impl_onControlChangedOrModified(); } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl::ActionChanged() { // call parent @@ -1863,7 +1863,7 @@ namespace sdr { namespace contact { } } - //-------------------------------------------------------------------- + void ViewObjectContactOfUnoControl::impl_onControlChangedOrModified() { // graphical invalidate at all views @@ -1880,20 +1880,20 @@ namespace sdr { namespace contact { //= UnoControlPrintOrPreviewContact //==================================================================== DBG_NAME( UnoControlPrintOrPreviewContact ) - //-------------------------------------------------------------------- + UnoControlPrintOrPreviewContact::UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) :ViewObjectContactOfUnoControl( _rObjectContact, _rViewContact ) { DBG_CTOR( UnoControlPrintOrPreviewContact, NULL ); } - //-------------------------------------------------------------------- + UnoControlPrintOrPreviewContact::~UnoControlPrintOrPreviewContact() { DBG_DTOR( UnoControlPrintOrPreviewContact, NULL ); } - //-------------------------------------------------------------------- + drawinglayer::primitive2d::Primitive2DSequence UnoControlPrintOrPreviewContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const { if ( !m_pImpl->isPrintableControl() ) diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 8a9c8a6b73e4..81c1a88a3a8c 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -41,13 +41,13 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId, { } -// ----------------------------------------------------------------------- + SvxInsertStatusBarControl::~SvxInsertStatusBarControl() { } -// ----------------------------------------------------------------------- + void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) @@ -69,7 +69,7 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, } } -// ----------------------------------------------------------------------- + void SvxInsertStatusBarControl::Click() { @@ -90,14 +90,14 @@ void SvxInsertStatusBarControl::Click() execute( aArgs ); } -// ----------------------------------------------------------------------- + void SvxInsertStatusBarControl::Paint( const UserDrawEvent& ) { DrawItemText_Impl(); } -// ----------------------------------------------------------------------- + void SvxInsertStatusBarControl::DrawItemText_Impl() { diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 542ec71e79a6..3d7c57764294 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -87,7 +87,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status mpImpl->maTimer.SetTimeoutHdl( LINK(this, SvxModifyControl, OnTimer) ); } -// ----------------------------------------------------------------------- + void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -113,7 +113,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, mpImpl->maTimer.Start(); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer ) { @@ -128,7 +128,7 @@ IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer ) return 0; } -// ----------------------------------------------------------------------- + void SvxModifyControl::_repaint() { @@ -136,7 +136,7 @@ void SvxModifyControl::_repaint() GetStatusBar().SetItemData( GetId(), 0 ); // force repaint } -// ----------------------------------------------------------------------- + namespace { diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 65f4d1385dcd..634badff3e49 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -45,7 +45,7 @@ #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -// ----------------------------------------------------------------------- + /* [Description] @@ -88,7 +88,7 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) return sMetric; } -// ----------------------------------------------------------------------- + SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem); @@ -107,7 +107,7 @@ private: virtual void Select(); }; -// ----------------------------------------------------------------------- + FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ), @@ -117,7 +117,7 @@ FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : CheckItem( nCheck ); } -// ----------------------------------------------------------------------- + void FunctionPopup_Impl::Select() { @@ -195,7 +195,7 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, addStatusListener( OUString( STR_FUNC )); // SID_PSZ_FUNCTION } -// ----------------------------------------------------------------------- + /* [Description] @@ -209,7 +209,7 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl() delete pImp; } -// ----------------------------------------------------------------------- + /* [Description] @@ -309,7 +309,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt GetStatusBar().SetItemText( GetId(), aText ); } -// ----------------------------------------------------------------------- + /* [Description] @@ -349,7 +349,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxStatusBarControl::Command( rCEvt ); } -// ----------------------------------------------------------------------- + /* [Description] diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 6f31d4842bd4..a56cd0af9d58 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -91,7 +91,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, GetStatusBar().SetItemText( GetId(), "" ); } -// ----------------------------------------------------------------------- + void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -107,7 +107,7 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, } } -// ----------------------------------------------------------------------- + sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) { @@ -139,7 +139,7 @@ sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) return sal_True; } -// ----------------------------------------------------------------------- + void SvxSelectionModeControl::Paint( const UserDrawEvent& rUsrEvt ) { diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 3a34edeab79c..30e23aa13541 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -52,7 +52,7 @@ private: virtual void Select(); }; -// ----------------------------------------------------------------------- + ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ) : PopupMenu(ResId(RID_SVXMNU_ZOOM, DIALOG_MGR())) @@ -75,7 +75,7 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ) EnableItem( aTable[nPos+1], false ); } -// ----------------------------------------------------------------------- + void ZoomPopup_Impl::Select() { @@ -108,7 +108,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, { } -// ----------------------------------------------------------------------- + void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -138,7 +138,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, } } -// ----------------------------------------------------------------------- + void SvxZoomStatusBarControl::Paint( const UserDrawEvent& ) { @@ -146,7 +146,7 @@ void SvxZoomStatusBarControl::Paint( const UserDrawEvent& ) GetStatusBar().SetItemText( GetId(), aStr ); } -// ----------------------------------------------------------------------- + void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt ) { diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 402807ab44ed..95aeda10f316 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -31,11 +31,11 @@ #include <set> -// ----------------------------------------------------------------------- + SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl, SvxZoomSliderItem ); -// ----------------------------------------------------------------------- + struct SvxZoomSliderControl::SvxZoomSliderControl_Impl { @@ -65,13 +65,13 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl mbOmitPaint( false ) {} }; -// ----------------------------------------------------------------------- + const long nSliderXOffset = 20; const long nSnappingEpsilon = 5; // snapping epsilon in pixels const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two adjacent snapping points -// ----------------------------------------------------------------------- + // nOffset referes to the origin of the control: // + ----------- - @@ -161,7 +161,7 @@ long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRet; } -// ----------------------------------------------------------------------- + SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ) : SfxStatusBarControl( _nSlotId, _nId, _rStb ), @@ -190,14 +190,14 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nI #endif } -// ----------------------------------------------------------------------- + SvxZoomSliderControl::~SvxZoomSliderControl() { delete mpImpl; } -// ----------------------------------------------------------------------- + void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { @@ -259,7 +259,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat GetStatusBar().SetItemData( GetId(), 0 ); // force repaint } -// ----------------------------------------------------------------------- + void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) { @@ -323,7 +323,7 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) pDev->SetFillColor( aOldFillColor ); } -// ----------------------------------------------------------------------- + sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) { @@ -382,7 +382,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) return sal_True; } -// ----------------------------------------------------------------------- + sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) { diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 1654fa68790d..403a8d1d9def 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -819,9 +819,9 @@ SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -//------------------------------------------------------------ + // class SdrPercentItem -//------------------------------------------------------------ + TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item); @@ -853,9 +853,9 @@ SfxItemPresentation SdrPercentItem::GetPresentation( return ePres; } -//------------------------------------------------------------ + // class SdrAngleItem -//------------------------------------------------------------ + TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item); @@ -942,9 +942,9 @@ SfxItemPresentation SdrAngleItem::GetPresentation( return ePres; } -//------------------------------------------------------------ + // class SdrMetricItem -//------------------------------------------------------------ + TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item); @@ -2038,9 +2038,9 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) return true; } -//------------------------------------------------------------ + // class SdrSignedPercentItem -//------------------------------------------------------------ + TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item ); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index e8349069302f..a93152a9a611 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -171,7 +171,7 @@ private: virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException ); }; -//-------------------------------------------------------------------- + SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj ) : mpObj( pObj ) { @@ -184,12 +184,12 @@ Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const Fraction( aLogicRect.GetHeight() ) * m_aScaleHeight ) ); return aLogicRect; } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException) { } -//-------------------------------------------------------------------- + void SdrLightEmbeddedClient_Impl::Release() { { @@ -200,7 +200,7 @@ void SdrLightEmbeddedClient_Impl::Release() release(); } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -216,7 +216,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star: } } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -224,7 +224,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::la GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj); } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException ) { // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl @@ -290,7 +290,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj } } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, @@ -317,7 +317,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject() xModifiable->setModified( sal_True ); } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisible*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -338,7 +338,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisibl } } -//-------------------------------------------------------------------- + uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComponent() throw ( uno::RuntimeException ) { @@ -351,7 +351,7 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp return xResult; } // XInplaceClient -//-------------------------------------------------------------------- + sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate() throw ( uno::RuntimeException ) { @@ -368,14 +368,14 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate() return bRet; } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -420,14 +420,14 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() } // for(sal_Int32 i = nCount-1 ; i >= 0;--i) } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -442,7 +442,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() } } -//-------------------------------------------------------------------- + uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -462,7 +462,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed return xMan; } -//-------------------------------------------------------------------- + uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl::getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -471,7 +471,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl: return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW ); } -//-------------------------------------------------------------------- + awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -490,7 +490,7 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement() return AWTRectangle( aLogicRect ); } -//-------------------------------------------------------------------- + awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -498,21 +498,21 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle() return getPlacement(); } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::scrollObject( const awt::Size& /*aOffset*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, @@ -571,7 +571,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl } } // XWindowSupplier -//-------------------------------------------------------------------- + uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow() throw ( uno::RuntimeException ) { @@ -608,7 +608,7 @@ public: bool Connect() { return GetRealObject() != NULL; } }; -// ----------------------------------------------------------------------------- + SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), @@ -617,13 +617,13 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): SetSynchron( sal_False ); } -// ----------------------------------------------------------------------------- + SdrEmbedObjectLink::~SdrEmbedObjectLink() { } -// ----------------------------------------------------------------------------- + ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( const OUString& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ ) @@ -660,7 +660,7 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() return SUCCESS; } -// ----------------------------------------------------------------------------- + void SdrEmbedObjectLink::Closed() { @@ -736,7 +736,7 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrOle2Obj(*this); } -// ----------------------------------------------------------------------------- + TYPEINIT1(SdrOle2Obj,SdrRectObj); DBG_NAME(SdrOle2Obj) @@ -750,7 +750,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false) bFrame=bFrame_; } -// ----------------------------------------------------------------------------- + SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_) : SdrRectObj(rNewRect) @@ -773,7 +773,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUStrin SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() )); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::Init() { @@ -786,7 +786,7 @@ void SdrOle2Obj::Init() xObjRef.Lock( true ); } -// ----------------------------------------------------------------------------- + OUString SdrOle2Obj::GetStyleString() { @@ -798,7 +798,7 @@ OUString SdrOle2Obj::GetStyleString() return strStyle; } -// ----------------------------------------------------------------------------- + SdrOle2Obj::~SdrOle2Obj() { @@ -829,25 +829,25 @@ SdrOle2Obj::~SdrOle2Obj() delete mpImpl; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetAspect( sal_Int64 nAspect ) { xObjRef.SetViewAspect( nAspect ); } -// ----------------------------------------------------------------------------- + bool SdrOle2Obj::isInplaceActive() const { return xObjRef.is() && embed::EmbedStates::INPLACE_ACTIVE == xObjRef->getCurrentState(); } -// ----------------------------------------------------------------------------- + bool SdrOle2Obj::isUiActive() const { return xObjRef.is() && embed::EmbedStates::UI_ACTIVE == xObjRef->getCurrentState(); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetGraphic_Impl(const Graphic* pGrf) { @@ -875,14 +875,14 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf) SetGraphic_Impl( pGrf ); } -// ----------------------------------------------------------------------------- + bool SdrOle2Obj::IsEmpty() const { return !(xObjRef.is()); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::Connect() { @@ -901,7 +901,7 @@ void SdrOle2Obj::Connect() AddListeners_Impl(); } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() { @@ -961,7 +961,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() return bResult; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::BreakFileLink_Impl() { @@ -994,7 +994,7 @@ void SdrOle2Obj::BreakFileLink_Impl() } } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::DisconnectFileLink_Impl() { @@ -1006,7 +1006,7 @@ void SdrOle2Obj::DisconnectFileLink_Impl() } } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::CheckFileLink_Impl() { @@ -1044,7 +1044,7 @@ void SdrOle2Obj::CheckFileLink_Impl() } } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::Reconnect_Impl() { @@ -1169,7 +1169,7 @@ void SdrOle2Obj::AddListeners_Impl() } } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::Disconnect() { @@ -1298,7 +1298,7 @@ void SdrOle2Obj::Disconnect_Impl() mpImpl->mbConnected = false; } -// ----------------------------------------------------------------------------- + SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const { @@ -1376,7 +1376,7 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const return 0; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetModel(SdrModel* pNewModel) { @@ -1452,7 +1452,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) AddListeners_Impl(); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetPage(SdrPage* pNewPage) { @@ -1488,7 +1488,7 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage) Connect(); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef ) { @@ -1528,7 +1528,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta BroadcastObjectChange(); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetClosedObj( bool bIsClosed ) { @@ -1537,7 +1537,7 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed ) bClosedObj = bIsClosed; } -// ----------------------------------------------------------------------------- + SdrObject* SdrOle2Obj::getFullDragClone() const { @@ -1545,7 +1545,7 @@ SdrObject* SdrOle2Obj::getFullDragClone() const return createSdrGrafObjReplacement(false, true); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetPersistName( const OUString& rPersistName ) { @@ -1565,14 +1565,14 @@ void SdrOle2Obj::AbandonObject() SetObjRef(0); } -// ----------------------------------------------------------------------------- + OUString SdrOle2Obj::GetPersistName() const { return mpImpl->aPersistName; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { @@ -1594,14 +1594,14 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = true; } -// ----------------------------------------------------------------------------- + sal_uInt16 SdrOle2Obj::GetObjIdentifier() const { return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2); } -// ----------------------------------------------------------------------------- + OUString SdrOle2Obj::TakeObjNameSingul() const { @@ -1619,14 +1619,14 @@ OUString SdrOle2Obj::TakeObjNameSingul() const return sName.makeStringAndClear(); } -// ----------------------------------------------------------------------------- + OUString SdrOle2Obj::TakeObjNamePlural() const { return ImpGetResStr(bFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2); } -// ----------------------------------------------------------------------------- + SdrOle2Obj* SdrOle2Obj::Clone() const { @@ -1693,7 +1693,7 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj) return *this; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::ImpSetVisAreaSize() { @@ -1828,7 +1828,7 @@ void SdrOle2Obj::ImpSetVisAreaSize() } } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { @@ -1849,7 +1849,7 @@ void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract ImpSetVisAreaSize(); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) { @@ -1859,7 +1859,7 @@ void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) ImpSetVisAreaSize(); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) { @@ -1877,7 +1877,7 @@ void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) } } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect) { @@ -1900,14 +1900,14 @@ void SdrOle2Obj::GetNewReplacement() xObjRef.UpdateReplacement(); } -// ----------------------------------------------------------------------------- + Size SdrOle2Obj::GetOrigObjSize( MapMode* pTargetMapMode ) const { return xObjRef.GetSize( pTargetMapMode ); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::NbcMove(const Size& rSize) { @@ -1917,7 +1917,7 @@ void SdrOle2Obj::NbcMove(const Size& rSize) ImpSetVisAreaSize(); } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { @@ -1951,7 +1951,7 @@ sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbedded return bResult; } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { @@ -1978,7 +1978,7 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb return bResult; } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::Unload() { @@ -2006,7 +2006,7 @@ sal_Bool SdrOle2Obj::Unload() return bUnloaded; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::GetObjRef_Impl() { @@ -2098,7 +2098,7 @@ uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef_NoInit() const return xObjRef.GetObject(); } -// ----------------------------------------------------------------------------- + uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const { @@ -2109,7 +2109,7 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const return uno::Reference< frame::XModel >(); } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::IsChart() const { @@ -2121,19 +2121,19 @@ sal_Bool SdrOle2Obj::IsChart() const return m_bChart; } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType ) { xObjRef.SetGraphic( aGraphic, aMediaType ); } -// ----------------------------------------------------------------------------- + void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const OUString& aMediaType ) { xObjRef.SetGraphicStream( xGrStream, aMediaType ); } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::IsCalc() const { if ( !xObjRef.is() ) @@ -2154,7 +2154,7 @@ sal_Bool SdrOle2Obj::IsCalc() const return sal_False; } -// ----------------------------------------------------------------------------- + uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const { uno::Reference< frame::XModel > xDoc; @@ -2163,7 +2163,7 @@ uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const return xDoc; } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ) { // TODO/LEAN: to avoid rounding errors scaling always uses the VisArea. @@ -2185,7 +2185,7 @@ sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScal return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdrOle2Obj::AddOwnLightClient() { // The Own Light Client must be registered in object only using this method! diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 9a34dea3e04f..202c79199024 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -534,7 +534,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >& } } -//------------------------------------------------------------------------ + uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const { uno::Reference< awt::XControl > xControl; @@ -558,7 +558,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, return xControl; } -//------------------------------------------------------------------------ + uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow( const Window& _rWindow, uno::Reference< awt::XControlContainer >& _inout_ControlContainer ) const { @@ -571,7 +571,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow( return xControl; } -//------------------------------------------------------------------------ + bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) const { ViewContact& rViewContact( GetViewContact() ); @@ -580,7 +580,7 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) return ( _out_rpContact != NULL ); } -//------------------------------------------------------------------------ + ::sdr::contact::ViewContact* SdrUnoObj::CreateObjectSpecificViewContact() { return new ::sdr::contact::ViewContactOfUnoControl( *this ); diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 24792d582da3..a872b91460d0 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -42,9 +42,9 @@ using namespace ::com::sun::star::container; namespace accessibility { -// -------------------------------------------------------------------- + // AccessibleCell -// -------------------------------------------------------------------- + AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo ) : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL ) @@ -57,14 +57,14 @@ AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::s pAccTable = dynamic_cast <AccessibleTableShape *> (rxParent.get()); } -// -------------------------------------------------------------------- + AccessibleCell::~AccessibleCell (void) { DBG_ASSERT( mpText == 0, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } -// -------------------------------------------------------------------- + void AccessibleCell::Init (void) { @@ -95,7 +95,7 @@ void AccessibleCell::Init (void) } } -// -------------------------------------------------------------------- + sal_Bool AccessibleCell::SetState (sal_Int16 aState) { @@ -115,7 +115,7 @@ sal_Bool AccessibleCell::SetState (sal_Int16 aState) return bStateHasChanged; } -// -------------------------------------------------------------------- + sal_Bool AccessibleCell::ResetState (sal_Int16 aState) { @@ -135,39 +135,39 @@ sal_Bool AccessibleCell::ResetState (sal_Int16 aState) return bStateHasChanged; } -//----------------------------------------------------------------------------- + bool AccessibleCell::operator== (const AccessibleCell& rAccessibleCell) { return this == &rAccessibleCell; } -//----------------------------------------------------------------------------- + // XInterface -//----------------------------------------------------------------------------- + Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) throw (RuntimeException) { return AccessibleCellBase::queryInterface( aType ); } -//----------------------------------------------------------------------------- + void SAL_CALL AccessibleCell::acquire( ) throw () { AccessibleCellBase::acquire(); } -//----------------------------------------------------------------------------- + void SAL_CALL AccessibleCell::release( ) throw () { AccessibleCellBase::release(); } -// -------------------------------------------------------------------- + // XAccessibleContext -// -------------------------------------------------------------------- + /** The children of this cell come from the paragraphs of text. */ @@ -178,7 +178,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun:: return mpText != NULL ? mpText->GetChildCount () : 0; } -// -------------------------------------------------------------------- + /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. @@ -192,7 +192,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI return mpText->GetChild (nIndex); } -// -------------------------------------------------------------------- + /** Return a copy of the state set. Possible states are: @@ -267,9 +267,9 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (v return xStateSet; } -// -------------------------------------------------------------------- + // XAccessibleComponent -// -------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleCell::containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException) { @@ -313,7 +313,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : return uno::Reference<XAccessible>(); } -// -------------------------------------------------------------------- + ::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException) { @@ -360,7 +360,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : return aBoundingBox; } -// -------------------------------------------------------------------- + ::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation(void) throw (RuntimeException) { @@ -369,7 +369,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : return ::com::sun::star::awt::Point(aBoundingBox.X, aBoundingBox.Y); } -// -------------------------------------------------------------------- + ::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen(void) throw(RuntimeException) { @@ -394,7 +394,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : return aLocation; } -// -------------------------------------------------------------------- + awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException) { @@ -403,28 +403,28 @@ awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException) return awt::Size (aBoundingBox.Width, aBoundingBox.Height); } -// -------------------------------------------------------------------- + void SAL_CALL AccessibleCell::addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException) { AccessibleComponentBase::addFocusListener( xListener ); } -// -------------------------------------------------------------------- + void SAL_CALL AccessibleCell::removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { AccessibleComponentBase::removeFocusListener( xListener ); } -// -------------------------------------------------------------------- + void SAL_CALL AccessibleCell::grabFocus (void) throw (::com::sun::star::uno::RuntimeException) { AccessibleComponentBase::grabFocus(); } -// -------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException) { @@ -435,7 +435,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException) return nColor; } -// -------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException) { @@ -446,9 +446,9 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException) return nColor; } -// -------------------------------------------------------------------- + // XAccessibleExtendedComponent -// -------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont (void) throw (::com::sun::star::uno::RuntimeException) { @@ -456,23 +456,23 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException) return AccessibleComponentBase::getFont(); } -// -------------------------------------------------------------------- + OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleComponentBase::getTitledBorderText(); } -// -------------------------------------------------------------------- + OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleComponentBase::getToolTipText(); } -// -------------------------------------------------------------------- + // XAccessibleEventBroadcaster -// -------------------------------------------------------------------- + void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { @@ -492,7 +492,7 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces } } -// -------------------------------------------------------------------- + void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { @@ -502,16 +502,16 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc mpText->RemoveEventListener (rxListener); } -// -------------------------------------------------------------------- + // XServiceInfo -// -------------------------------------------------------------------- + OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException) { return OUString("AccessibleCell"); } -// -------------------------------------------------------------------- + Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw (RuntimeException) { @@ -529,9 +529,9 @@ Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw return aServiceNames; } -// -------------------------------------------------------------------- + // IAccessibleViewForwarderListener -// -------------------------------------------------------------------- + void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAccessibleViewForwarder* /*pViewForwarder*/) { @@ -544,9 +544,9 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc mpText->UpdateChildren(); } -// -------------------------------------------------------------------- + // protected -// -------------------------------------------------------------------- + void AccessibleCell::disposing (void) { diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 1aef6422f66a..f36c949d51eb 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -61,9 +61,9 @@ struct hash typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; -//----------------------------------------------------------------------------- + // AccessibleTableShapeImpl -//----------------------------------------------------------------------------- + class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener > { @@ -91,7 +91,7 @@ public: Reference< AccessibleCell > getAccessibleCell (Reference< XCell > xCell); }; -//----------------------------------------------------------------------------- + AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo ) : mrShapeTreeInfo( rShapeTreeInfo ) @@ -100,7 +100,7 @@ AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rSh { } -//----------------------------------------------------------------------------- + void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, const Reference< XTable >& xTable ) { @@ -121,7 +121,7 @@ void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, } } -//----------------------------------------------------------------------------- + void AccessibleTableShapeImpl::dispose() { @@ -140,7 +140,7 @@ void AccessibleTableShapeImpl::dispose() mxAccessible.clear(); } -//----------------------------------------------------------------------------- + //get the cached AccessibleCell from XCell Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (Reference< XCell > xCell) { @@ -154,7 +154,7 @@ Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (Referen return Reference< AccessibleCell >(); } -//----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild( sal_Int32 nChildIndex ) throw(IndexOutOfBoundsException) { sal_Int32 nColumn = 0, nRow = 0; @@ -182,7 +182,7 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild( sal_Int32 } } -//----------------------------------------------------------------------------- + void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException ) { @@ -305,11 +305,11 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ { } -//----------------------------------------------------------------------------- + // AccessibleTableShape -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo) @@ -318,13 +318,13 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf { } -//----------------------------------------------------------------------------- + AccessibleTableShape::~AccessibleTableShape (void) { } -//----------------------------------------------------------------------------- + void AccessibleTableShape::Init() { @@ -343,7 +343,7 @@ void AccessibleTableShape::Init() AccessibleTableShape_Base::Init(); } -//----------------------------------------------------------------------------- + SvxTableController* AccessibleTableShape::getTableController() { @@ -354,9 +354,9 @@ SvxTableController* AccessibleTableShape::getTableController() return 0; } -//----------------------------------------------------------------------------- + // XInterface -//----------------------------------------------------------------------------- + Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException) { @@ -371,43 +371,43 @@ Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (Ru return AccessibleTableShape_Base::queryInterface( aType ); } -//----------------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::acquire( ) throw () { AccessibleTableShape_Base::acquire(); } -//----------------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::release( ) throw () { AccessibleTableShape_Base::release(); } -//----------------------------------------------------------------------------- + // XAccessible -//----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext(void) throw (RuntimeException) { return AccessibleShape::getAccessibleContext (); } -//----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException) { return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } -//----------------------------------------------------------------------------- + OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) { return OUString("TableShape"); } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException) { @@ -415,7 +415,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(Runtim return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0; } -//-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -424,20 +424,20 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_ return mxImpl->getAccessibleChild( i ); } -//-------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessibleRelationSet( ) throw (RuntimeException) { return AccessibleShape::getAccessibleRelationSet( ); } -//-------------------------------------------------------------------- + sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole (void) throw (RuntimeException) { return AccessibleRole::TABLE; } -//-------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::disposing (void) { @@ -447,9 +447,9 @@ void SAL_CALL AccessibleTableShape::disposing (void) AccessibleShape::disposing(); } -//-------------------------------------------------------------------- + // XAccessibleTable -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeException) { @@ -457,7 +457,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeE return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() : 0; } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (RuntimeException) { @@ -465,7 +465,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (Run return mxImpl->mxTable.is() ? mxImpl->mxTable->getColumnCount() : 0; } -//-------------------------------------------------------------------- + OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -473,7 +473,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 n return OUString(); } -//-------------------------------------------------------------------- + OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -482,7 +482,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3 return OUString(); } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -497,7 +497,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo return 1; } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -512,7 +512,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 return 1; } -//-------------------------------------------------------------------- + Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders( ) throw (RuntimeException) { @@ -529,7 +529,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea return xRet; } -//-------------------------------------------------------------------- + Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders( ) throw (RuntimeException) { @@ -546,7 +546,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn return xRet; } -//-------------------------------------------------------------------- + Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( ) throw (RuntimeException) { @@ -583,7 +583,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( return aRet; } -//-------------------------------------------------------------------- + Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns( ) throw (RuntimeException) { @@ -620,7 +620,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn return aRet; } -//-------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -634,7 +634,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow return sal_False; } -//-------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -648,7 +648,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC return sal_False; } -//-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -662,7 +662,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal return getAccessibleChild( nChildIndex ); } -//-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) throw (RuntimeException) { @@ -670,7 +670,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) return xRet; } -//-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) throw (RuntimeException) { @@ -678,7 +678,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) return xRet; } -//-------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -697,7 +697,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa return sal_False; } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -706,7 +706,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal return mxImpl->mxTable.is() ? (nRow * mxImpl->mxTable->getColumnCount() + nColumn) : 0; } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -716,7 +716,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex return nRow; } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -726,9 +726,9 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn return nColumn; } -//-------------------------------------------------------------------- + // XAccessibleSelection -//-------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { @@ -754,7 +754,7 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex } } -//-------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { @@ -765,7 +765,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh return isAccessibleSelected(aPos.mnRow, aPos.mnCol); } -//-------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException ) { @@ -775,7 +775,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeEx if( pController ) pController->clearSelection(); } -//-------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( RuntimeException ) { @@ -787,7 +787,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim pController->selectAll(); } -//-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException ) { @@ -807,7 +807,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw return 0; } -//-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException) { @@ -829,7 +829,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi return getAccessibleChild( nChildIndex ); } -//-------------------------------------------------------------------- + void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { @@ -857,7 +857,7 @@ void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildInd pController->setSelectedCells( aFirstPos, aLastPos ); } } -//-------------------------------------------------------------------- + //===== XAccessibleTableSelection ============================================ sal_Bool SAL_CALL AccessibleTableShape::selectRow( sal_Int32 row ) @@ -927,7 +927,7 @@ void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rn { mxImpl->getColumnAndRow(nChildIndex, rnColumn, rnRow); } -//-------------------------------------------------------------------- + // XSelectionChangeListener void SAL_CALL AccessibleTableShape::disposing (const EventObject& aEvent) @@ -995,7 +995,7 @@ AccessibleCell* AccessibleTableShape::GetActiveAccessibleCell() } return pAccCell; } -//-------------------------------------------------------------------- + //If current active cell is in editing, the focus state should be set to internal text sal_Bool AccessibleTableShape::SetState (sal_Int16 aState) { @@ -1009,7 +1009,7 @@ sal_Bool AccessibleTableShape::SetState (sal_Int16 aState) bStateHasChanged = AccessibleShape::SetState (aState); return bStateHasChanged; } -//-------------------------------------------------------------------- + //If current active cell is in editing, the focus state should be reset to internal text sal_Bool AccessibleTableShape::ResetState (sal_Int16 aState) { @@ -1023,12 +1023,12 @@ sal_Bool AccessibleTableShape::ResetState (sal_Int16 aState) bStateHasChanged = AccessibleShape::ResetState (aState); return bStateHasChanged; } -//-------------------------------------------------------------------- + sal_Bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState) { return AccessibleContextBase::SetState (aState); } -//-------------------------------------------------------------------- + sal_Bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState) { return AccessibleContextBase::ResetState (aState); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 865ac63edd8e..55f7b3878e08 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -52,7 +52,7 @@ #include "svx/xflbmtit.hxx" #include <svx/svdpool.hxx> -// ----------------------------------------------------------------------------- + using ::editeng::SvxBorderLine; using namespace ::com::sun::star::uno; @@ -64,7 +64,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::style; using namespace ::com::sun::star::container; -// ----------------------------------------------------------------------------- + static const SvxItemPropertySet* ImplGetSvxCellPropertySet() { @@ -331,9 +331,9 @@ namespace sdr namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // Cell -// ----------------------------------------------------------------------------- + rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) { @@ -346,7 +346,7 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* return xCell; } -// ----------------------------------------------------------------------------- + Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw() : SdrText( rTableObj, pOutlinerParaObject ) @@ -365,14 +365,14 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th SetModel( rTableObj.GetModel() ); } -// ----------------------------------------------------------------------------- + Cell::~Cell() throw() { dispose(); } -// ----------------------------------------------------------------------------- + void Cell::dispose() { @@ -398,7 +398,7 @@ void Cell::dispose() SetOutlinerParaObject( 0 ); } -// ----------------------------------------------------------------------------- + void Cell::SetModel(SdrModel* pNewModel) { @@ -429,7 +429,7 @@ void Cell::SetModel(SdrModel* pNewModel) } } -// ----------------------------------------------------------------------------- + void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) { @@ -442,7 +442,7 @@ void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) } } -// ----------------------------------------------------------------------------- + void Cell::mergeContent( const CellRef& xSourceCell ) { @@ -471,7 +471,7 @@ void Cell::mergeContent( const CellRef& xSourceCell ) } } -// ----------------------------------------------------------------------------- + void Cell::cloneFrom( const CellRef& xCell ) { @@ -510,7 +510,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) } } -// ----------------------------------------------------------------------------- + void Cell::setMerged() { @@ -521,7 +521,7 @@ void Cell::setMerged() } } -// ----------------------------------------------------------------------------- + void Cell::notifyModified() { @@ -529,9 +529,9 @@ void Cell::notifyModified() mxTable->setModified( sal_True ); } -// ----------------------------------------------------------------------------- + // SdrTextShape proxy -// ----------------------------------------------------------------------------- + bool Cell::IsTextEditActive() { @@ -549,7 +549,7 @@ bool Cell::IsTextEditActive() return isActive; } -// ----------------------------------------------------------------------------- + bool Cell::hasText() const { @@ -571,7 +571,7 @@ bool Cell::hasText() const return false; } -// ----------------------------------------------------------------------------- + OutlinerParaObject* Cell::GetEditOutlinerParaObject() const { @@ -581,7 +581,7 @@ OutlinerParaObject* Cell::GetEditOutlinerParaObject() const return 0; } -// ----------------------------------------------------------------------------- + void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr ) { @@ -595,7 +595,7 @@ void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAt } } -// ----------------------------------------------------------------------------- + const SfxItemSet& Cell::GetObjectItemSet() { @@ -632,14 +632,14 @@ SfxStyleSheet* Cell::GetStyleSheet() const return 0; } -// ----------------------------------------------------------------------------- + const Rectangle& Cell::GetCurrentBoundRect() const { return maCellRect; } -// ----------------------------------------------------------------------------- + void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const { @@ -649,14 +649,14 @@ void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const rAnchorRect.Bottom() = maCellRect.Bottom() - GetTextLowerDistance(); } -// ----------------------------------------------------------------------------- + const SfxItemSet& Cell::GetItemSet() const { return mpProperties->GetObjectItemSet(); } -// ----------------------------------------------------------------------------- + void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems) { @@ -667,14 +667,14 @@ void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearA } } -// ----------------------------------------------------------------------------- + sal_Int32 Cell::getMinimumWidth() { return GetTextLeftDistance() + GetTextRightDistance() + 100; } -// ----------------------------------------------------------------------------- + sal_Int32 Cell::getMinimumHeight() { @@ -714,49 +714,49 @@ sal_Int32 Cell::getMinimumHeight() return nMinimumHeight; } -// ----------------------------------------------------------------------------- + long Cell::GetTextLeftDistance() const { return ((SdrTextLeftDistItem&)(GetItemSet().Get(SDRATTR_TEXT_LEFTDIST))).GetValue(); } -// ----------------------------------------------------------------------------- + long Cell::GetTextRightDistance() const { return ((SdrTextRightDistItem&)(GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST))).GetValue(); } -// ----------------------------------------------------------------------------- + long Cell::GetTextUpperDistance() const { return ((SdrTextUpperDistItem&)(GetItemSet().Get(SDRATTR_TEXT_UPPERDIST))).GetValue(); } -// ----------------------------------------------------------------------------- + long Cell::GetTextLowerDistance() const { return ((SdrTextLowerDistItem&)(GetItemSet().Get(SDRATTR_TEXT_LOWERDIST))).GetValue(); } -// ----------------------------------------------------------------------------- + SdrTextVertAdjust Cell::GetTextVerticalAdjust() const { return ((SdrTextVertAdjustItem&)(GetItemSet().Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); } -// ----------------------------------------------------------------------------- + SdrTextHorzAdjust Cell::GetTextHorizontalAdjust() const { return ((SdrTextHorzAdjustItem&)(GetItemSet().Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); } -// ----------------------------------------------------------------------------- + void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) { @@ -767,7 +767,7 @@ void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT ); } -// ----------------------------------------------------------------------------- + void Cell::AddUndo() { @@ -779,7 +779,7 @@ void Cell::AddUndo() } } -// ----------------------------------------------------------------------------- + sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell ) { @@ -789,16 +789,16 @@ sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextPro return 0; } -// ----------------------------------------------------------------------------- + sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell& rNewCell ) { return CloneProperties(mpProperties,rNewObj,rNewCell); } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException) { @@ -821,23 +821,23 @@ Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException) return ::cppu::OWeakObject::queryInterface( rType ); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::acquire() throw () { ::cppu::OWeakObject::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::release() throw () { ::cppu::OWeakObject::release(); } -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException) { @@ -851,7 +851,7 @@ Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException) return aTypes; } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeException) { @@ -897,7 +897,7 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE return ::com::sun::star::awt::Size( getMinimumWidth(), getMinimumHeight() ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize() throw (RuntimeException, @@ -906,46 +906,46 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE return getMinimumSize(); } -// ----------------------------------------------------------------------------- + ::com::sun::star::awt::Size SAL_CALL Cell::calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (RuntimeException) { return aNewSize; } -// ----------------------------------------------------------------------------- + // XMergeableCell -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL Cell::getRowSpan() throw (RuntimeException) { return mnRowSpan; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL Cell::getColumnSpan() throw (RuntimeException) { return mnColSpan; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException) { return mbMerged; } -// ----------------------------------------------------------------------------- + // XCell -// ----------------------------------------------------------------------------- + OUString SAL_CALL Cell::getFormula( ) throw (RuntimeException) { return msFormula; } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeException) { @@ -955,14 +955,14 @@ void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeExcepti } } -// ----------------------------------------------------------------------------- + double SAL_CALL Cell::getValue( ) throw (RuntimeException) { return mfValue; } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException) { @@ -973,23 +973,23 @@ void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + CellContentType SAL_CALL Cell::getType() throw (RuntimeException) { return mnCellContentType; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException) { return mnError; } -// ----------------------------------------------------------------------------- + // XPropertySet -// ----------------------------------------------------------------------------- + Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) { @@ -1018,7 +1018,7 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE return mpPropSet->getPropertySetInfo(); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { @@ -1163,7 +1163,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -1247,33 +1247,33 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + // XMultiPropertySet -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { @@ -1304,7 +1304,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName } } -// ----------------------------------------------------------------------------- + Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { @@ -1338,27 +1338,27 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + // XPropertyState -// ----------------------------------------------------------------------------- + PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { @@ -1461,7 +1461,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) { @@ -1492,7 +1492,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { @@ -1534,7 +1534,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -1577,9 +1577,9 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + // XMultiPropertyStates -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setAllPropertiesToDefault() throw (RuntimeException, std::exception) @@ -1608,7 +1608,7 @@ void SAL_CALL Cell::setAllPropertiesToDefault() } } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, RuntimeException) { @@ -1619,7 +1619,7 @@ void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropert setPropertyToDefault( *pName++ ); } -// ----------------------------------------------------------------------------- + Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -1634,9 +1634,9 @@ Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& return aDefaults; } -// ----------------------------------------------------------------------------- + // XFastPropertySet -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { @@ -1645,7 +1645,7 @@ void SAL_CALL Cell::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + // TODO: Refactor this method! Any SAL_CALL Cell::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -1653,9 +1653,9 @@ Any SAL_CALL Cell::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPrope throw UnknownPropertyException(); } -// ----------------------------------------------------------------------------- + // XText -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, const Reference< XTextContent >& xContent, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException) { @@ -1663,7 +1663,7 @@ void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, co notifyModified(); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) throw (NoSuchElementException, RuntimeException) { @@ -1671,23 +1671,23 @@ void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent notifyModified(); } -// ----------------------------------------------------------------------------- + // XSimpleText -// ----------------------------------------------------------------------------- + Reference< XTextCursor > SAL_CALL Cell::createTextCursor( ) throw (RuntimeException) { return SvxUnoTextBase::createTextCursor(); } -// ----------------------------------------------------------------------------- + Reference< XTextCursor > SAL_CALL Cell::createTextCursorByRange( const Reference< XTextRange >& aTextPosition ) throw (RuntimeException) { return SvxUnoTextBase::createTextCursorByRange( aTextPosition ); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException) { @@ -1695,7 +1695,7 @@ void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const O notifyModified(); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException) { @@ -1703,30 +1703,30 @@ void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRang notifyModified(); } -// ----------------------------------------------------------------------------- + // XTextRange -// ----------------------------------------------------------------------------- + Reference< XText > SAL_CALL Cell::getText( ) throw (RuntimeException) { return SvxUnoTextBase::getText(); } -// ----------------------------------------------------------------------------- + Reference< XTextRange > SAL_CALL Cell::getStart( ) throw (RuntimeException) { return SvxUnoTextBase::getStart(); } -// ----------------------------------------------------------------------------- + Reference< XTextRange > SAL_CALL Cell::getEnd( ) throw (RuntimeException) { return SvxUnoTextBase::getEnd(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL Cell::getString( ) throw (RuntimeException) { @@ -1734,7 +1734,7 @@ OUString SAL_CALL Cell::getString( ) throw (RuntimeException) return SvxUnoTextBase::getString(); } -// ----------------------------------------------------------------------------- + void SAL_CALL Cell::setString( const OUString& aString ) throw (RuntimeException) { diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index bd3ad5818f0f..8bac871fddb4 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -26,7 +26,7 @@ #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -34,51 +34,51 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::table; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // CellCursor -// ----------------------------------------------------------------------------- + CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) : CellCursorBase( xTable, nLeft, nTop, nRight, nBottom ) { } -// ----------------------------------------------------------------------------- + CellCursor::~CellCursor() { } -// ----------------------------------------------------------------------------- + // XCellCursor -// ----------------------------------------------------------------------------- + Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { return CellRange::getCellByPosition( nColumn, nRow ); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException) { return CellRange::getCellRangeByPosition( nLeft, nTop, nRight, nBottom ); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) throw (RuntimeException) { return CellRange::getCellRangeByName( aRange ); } -// ----------------------------------------------------------------------------- + // XCellCursor -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::gotoStart( ) throw (RuntimeException) { @@ -86,7 +86,7 @@ void SAL_CALL CellCursor::gotoStart( ) throw (RuntimeException) mnBottom = mnTop; } -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException) { @@ -94,7 +94,7 @@ void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException) mnTop = mnBottom; } -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException) { @@ -123,7 +123,7 @@ void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException) mnTop = mnBottom; } -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException) { @@ -144,7 +144,7 @@ void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException) mnBottom = mnTop; } -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (RuntimeException) { @@ -160,9 +160,9 @@ void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRo } } -// ----------------------------------------------------------------------------- + // XMergeableCellCursor -// ----------------------------------------------------------------------------- + /** returns true and the merged cell positions if a merge is valid or false if a merge is not valid for that range */ @@ -243,7 +243,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd ) return false; } -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException) { @@ -278,7 +278,7 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException) pModel->SetChanged(); } -// ----------------------------------------------------------------------------- + void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< sal_Int32 >& rLeftOvers ) { @@ -382,7 +382,7 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< } } -// ----------------------------------------------------------------------------- + void CellCursor::split_horizontal( sal_Int32 nColumns ) { @@ -394,7 +394,7 @@ void CellCursor::split_horizontal( sal_Int32 nColumns ) split_column( nCol, nColumns, aLeftOvers ); } -// ----------------------------------------------------------------------------- + void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_Int32 >& rLeftOvers ) { @@ -498,7 +498,7 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In } } -// ----------------------------------------------------------------------------- + void CellCursor::split_vertical( sal_Int32 nRows ) { @@ -510,7 +510,7 @@ void CellCursor::split_vertical( sal_Int32 nRows ) split_row( nRow, nRows, aLeftOvers ); } -// ----------------------------------------------------------------------------- + void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (NoSupportException, IllegalArgumentException, RuntimeException) { @@ -549,7 +549,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No pModel->SetChanged(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException) { @@ -557,7 +557,7 @@ sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException) return GetMergedSelection( aStart, aEnd ) ? sal_True : sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL CellCursor::isUnmergeable( ) throw (RuntimeException) { @@ -574,7 +574,7 @@ sal_Bool SAL_CALL CellCursor::isUnmergeable( ) throw (RuntimeException) return sal_False; } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 2d04fd389d95..aba1110bb820 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -20,20 +20,20 @@ #include "cellrange.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // CellRange -// ----------------------------------------------------------------------------- + CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) : mxTable( xTable ) @@ -44,15 +44,15 @@ CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 n { } -// ----------------------------------------------------------------------------- + CellRange::~CellRange() { } -// ----------------------------------------------------------------------------- + // ICellRange -// ----------------------------------------------------------------------------- + sal_Int32 CellRange::getLeft() { @@ -79,16 +79,16 @@ Reference< XTable > CellRange::getTable() return mxTable.get(); } -// ----------------------------------------------------------------------------- + // XCellRange -// ----------------------------------------------------------------------------- + Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { return mxTable->getCellByPosition( mnLeft + nColumn, mnTop + nRow ); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -109,14 +109,14 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nL throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException) { return Reference< XCellRange >(); } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index a5bba34dec28..c11970c6df50 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -26,22 +26,22 @@ using namespace ::com::sun::star::lang; namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // FastPropertySetInfo -// ----------------------------------------------------------------------------- + FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps ) { addProperties( rProps ); } -// ----------------------------------------------------------------------------- + FastPropertySetInfo::~FastPropertySetInfo() { } -// ----------------------------------------------------------------------------- + void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) { @@ -57,7 +57,7 @@ void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) } } -// ----------------------------------------------------------------------------- + const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw (UnknownPropertyException ) { @@ -67,7 +67,7 @@ const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw return maProperties[(*aIter).second]; } -// ----------------------------------------------------------------------------- + const Property* FastPropertySetInfo::hasProperty( const OUString& aName ) { @@ -78,94 +78,94 @@ const Property* FastPropertySetInfo::hasProperty( const OUString& aName ) return &maProperties[(*aIter).second]; } -// ----------------------------------------------------------------------------- + // XPropertySetInfo -// ----------------------------------------------------------------------------- + Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() throw (RuntimeException) { return Sequence< Property >( &maProperties[0], maProperties.size() ); } -// ----------------------------------------------------------------------------- + Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException) { return getProperty( aName ); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException) { return hasProperty( aName ) != 0 ? sal_True : sal_False; } -// ----------------------------------------------------------------------------- + // FastPropertySet -// ----------------------------------------------------------------------------- + FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ) : mxInfo( xInfo ) { } -// ----------------------------------------------------------------------------- + FastPropertySet::~FastPropertySet() { } -// ----------------------------------------------------------------------------- + // XPropertySet -// ----------------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo( ) throw (RuntimeException) { return Reference< XPropertySetInfo >( mxInfo.get() ); } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { setFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle, aValue ); } -// ----------------------------------------------------------------------------- + Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { return getFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle ); } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + // XMultiPropertySet -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { @@ -189,7 +189,7 @@ void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aP } } -// ----------------------------------------------------------------------------- + Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { @@ -213,19 +213,19 @@ Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUS return aValues; } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index b1ec03c69360..4dd6a56a42df 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -57,7 +57,7 @@ #include "svx/xflftrit.hxx" #include "svx/xfltrit.hxx" -// ----------------------------------------------------------------------------- + using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; @@ -155,9 +155,9 @@ public: Rectangle maLogicRect; }; -//------------------------------------------------------------------------ + // TableStyleSettings -//------------------------------------------------------------------------ + TableStyleSettings::TableStyleSettings() : mbUseFirstRow(true) @@ -196,7 +196,7 @@ bool TableStyleSettings::operator==( const TableStyleSettings& rStyle ) const (mbUseColumnBanding == rStyle.mbUseColumnBanding); } -// ----------------------------------------------------------------------------- + class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener > { @@ -244,7 +244,7 @@ public: virtual bool isInUse(); }; -// ----------------------------------------------------------------------------- + SdrTableObjImpl::SdrTableObjImpl() : mpTableObj( 0 ) @@ -253,13 +253,13 @@ SdrTableObjImpl::SdrTableObjImpl() { } -// ----------------------------------------------------------------------------- + SdrTableObjImpl::~SdrTableObjImpl() { } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 nRows ) { @@ -273,7 +273,7 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 n mpTableObj->maLogicRect = mpTableObj->aRect; } -// ----------------------------------------------------------------------------- + SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) { @@ -311,7 +311,7 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) return *this; } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) { @@ -351,7 +351,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) update(); } -// ----------------------------------------------------------------------------- + bool SdrTableObjImpl::ApplyCellStyles() { @@ -449,7 +449,7 @@ bool SdrTableObjImpl::ApplyCellStyles() return bChanges; } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::dispose() { @@ -471,7 +471,7 @@ void SdrTableObjImpl::dispose() } } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset ) { @@ -551,9 +551,9 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset } } -// ----------------------------------------------------------------------------- + // XModifyListener -// ----------------------------------------------------------------------------- + void SAL_CALL SdrTableObjImpl::modified( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) { @@ -588,7 +588,7 @@ void SdrTableObjImpl::update() } } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::connectTableStyle() { @@ -603,7 +603,7 @@ void SdrTableObjImpl::connectTableStyle() } } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::disconnectTableStyle() { @@ -618,16 +618,16 @@ void SdrTableObjImpl::disconnectTableStyle() } } -// ----------------------------------------------------------------------------- + bool SdrTableObjImpl::isInUse() { return mpTableObj && mpTableObj->IsInserted(); } -// ----------------------------------------------------------------------------- + // XEventListener -// ----------------------------------------------------------------------------- + void SAL_CALL SdrTableObjImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException) { @@ -641,7 +641,7 @@ void SAL_CALL SdrTableObjImpl::disposing( const ::com::sun::star::lang::EventObj mpTableObj = 0; } -// ----------------------------------------------------------------------------- + CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const { @@ -657,21 +657,21 @@ CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const return xCell; } -// ----------------------------------------------------------------------------- + sal_Int32 SdrTableObjImpl::getColumnCount() const { return mxTable.is() ? mxTable->getColumnCount() : 0; } -// ----------------------------------------------------------------------------- + sal_Int32 SdrTableObjImpl::getRowCount() const { return mxTable.is() ? mxTable->getRowCount() : 0; } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHeight ) { @@ -682,7 +682,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe } } -// ----------------------------------------------------------------------------- + void SdrTableObjImpl::UpdateCells( Rectangle& rArea ) { @@ -694,29 +694,29 @@ void SdrTableObjImpl::UpdateCells( Rectangle& rArea ) } } -// ----------------------------------------------------------------------------- + // BaseProperties section -// ----------------------------------------------------------------------------- + sdr::properties::BaseProperties* SdrTableObj::CreateObjectSpecificProperties() { return new TableProperties(*this); } -// ----------------------------------------------------------------------------- + // DrawContact section -// ----------------------------------------------------------------------------- + sdr::contact::ViewContact* SdrTableObj::CreateObjectSpecificViewContact() { return new sdr::contact::ViewContactOfTableObj(*this); } -// -------------------------------------------------------------------- + TYPEINIT1(SdrTableObj,SdrTextObj); -// -------------------------------------------------------------------- + SdrTableObj::SdrTableObj(SdrModel* _pModel) { @@ -724,7 +724,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel) init( 1, 1 ); } -// -------------------------------------------------------------------- + SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows) : SdrTextObj( rNewRect ) @@ -741,7 +741,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int init( nColumns, nRows ); } -// -------------------------------------------------------------------- + void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows ) { @@ -752,7 +752,7 @@ void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows ) mpImpl->init( this, nColumns, nRows ); } -// -------------------------------------------------------------------- + SdrTableObj::~SdrTableObj() { @@ -760,30 +760,30 @@ SdrTableObj::~SdrTableObj() mpImpl->release(); } -// -------------------------------------------------------------------- + // table stuff -// -------------------------------------------------------------------- + Reference< XTable > SdrTableObj::getTable() const { return Reference< XTable >( mpImpl->mxTable.get() ); } -// -------------------------------------------------------------------- + bool SdrTableObj::isValid( const CellPos& rPos ) const { return (rPos.mnCol >= 0) && (rPos.mnCol < mpImpl->getColumnCount()) && (rPos.mnRow >= 0) && (rPos.mnRow < mpImpl->getRowCount()); } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getFirstCell() const { return CellPos( 0,0 ); } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getLastCell() const { @@ -796,7 +796,7 @@ CellPos SdrTableObj::getLastCell() const return aPos; } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const { @@ -812,7 +812,7 @@ CellPos SdrTableObj::getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const } } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getRightCell( const CellPos& rPos, bool bEdgeTravel ) const { @@ -828,7 +828,7 @@ CellPos SdrTableObj::getRightCell( const CellPos& rPos, bool bEdgeTravel ) cons } } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getUpCell( const CellPos& rPos, bool bEdgeTravel ) const { @@ -843,7 +843,7 @@ CellPos SdrTableObj::getUpCell( const CellPos& rPos, bool bEdgeTravel ) const } } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const { @@ -858,7 +858,7 @@ CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const } } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) const { @@ -886,7 +886,7 @@ CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) co return aPos; } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const { @@ -929,7 +929,7 @@ CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const return rPos; } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) const { @@ -959,7 +959,7 @@ CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) con return aPos; } -// -------------------------------------------------------------------- + CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const { @@ -1003,7 +1003,7 @@ CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const return rPos; } -// -------------------------------------------------------------------- + const TableStyleSettings& SdrTableObj::getTableStyleSettings() const { @@ -1018,7 +1018,7 @@ const TableStyleSettings& SdrTableObj::getTableStyleSettings() const } } -// -------------------------------------------------------------------- + void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) { @@ -1029,7 +1029,7 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) } } -// -------------------------------------------------------------------- + TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const { @@ -1157,7 +1157,7 @@ const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const return getActiveCell()->GetItemSet(); } -// -------------------------------------------------------------------- + void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle ) { @@ -1170,7 +1170,7 @@ void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle ) } } -// -------------------------------------------------------------------- + const Reference< XIndexAccess >& SdrTableObj::getTableStyle() const { @@ -1185,9 +1185,9 @@ const Reference< XIndexAccess >& SdrTableObj::getTableStyle() const } } -// -------------------------------------------------------------------- + // text stuff -// -------------------------------------------------------------------- + /** returns the currently active text. */ SdrText* SdrTableObj::getActiveText() const @@ -1195,7 +1195,7 @@ SdrText* SdrTableObj::getActiveText() const return dynamic_cast< SdrText* >( getActiveCell().get() ); } -// -------------------------------------------------------------------- + /** returns the nth available text. */ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const @@ -1214,7 +1214,7 @@ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const return 0; } -// -------------------------------------------------------------------- + /** returns the number of texts available for this object. */ sal_Int32 SdrTableObj::getTextCount() const @@ -1232,7 +1232,7 @@ sal_Int32 SdrTableObj::getTextCount() const } } -// -------------------------------------------------------------------- + /** changes the current active text */ void SdrTableObj::setActiveText( sal_Int32 nIndex ) @@ -1249,7 +1249,7 @@ void SdrTableObj::setActiveText( sal_Int32 nIndex ) } } -// -------------------------------------------------------------------- + /** returns the index of the text that contains the given point or -1 */ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const @@ -1264,7 +1264,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const return 0; } -// -------------------------------------------------------------------- + SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const { @@ -1275,7 +1275,7 @@ SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const } -// -------------------------------------------------------------------- + const TableLayouter& SdrTableObj::getTableLayouter() const { @@ -1283,35 +1283,35 @@ const TableLayouter& SdrTableObj::getTableLayouter() const return *(mpImpl->mpLayouter); } -// -------------------------------------------------------------------- + bool SdrTableObj::IsAutoGrowHeight() const { return true; } -// -------------------------------------------------------------------- + bool SdrTableObj::IsAutoGrowWidth() const { return true; } -// -------------------------------------------------------------------- + bool SdrTableObj::HasText() const { return true; } -// -------------------------------------------------------------------- + bool SdrTableObj::IsTextEditActive( const CellPos& rPos ) { return pEdtOutl && mpImpl && (rPos == mpImpl->maEditPos); } -// -------------------------------------------------------------------- + void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) { @@ -1328,7 +1328,7 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) } } -// -------------------------------------------------------------------- + void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { @@ -1355,21 +1355,21 @@ void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = false; } -// -------------------------------------------------------------------- + sal_uInt16 SdrTableObj::GetObjIdentifier() const { return static_cast<sal_uInt16>(OBJ_TABLE); } -// -------------------------------------------------------------------- + void SdrTableObj::SetPage(SdrPage* pNewPage) { SdrTextObj::SetPage(pNewPage); } -// -------------------------------------------------------------------- + void SdrTableObj::SetModel(SdrModel* pNewModel) { @@ -1391,7 +1391,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel) } } -// -------------------------------------------------------------------- + void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const { @@ -1399,7 +1399,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bo TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); } -// -------------------------------------------------------------------- + void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const { @@ -1434,7 +1434,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec // rOutliner.SetMinAutoPaperSize(Size(0, aAnkRect.GetHeight())); // } - // --- + // set text at outliner, maybe from edit outliner OutlinerParaObject* pPara= xCell->GetOutlinerParaObject(); @@ -1483,7 +1483,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec rTextRect=Rectangle(aTextPos,aTextSiz); } -// -------------------------------------------------------------------- + const CellRef& SdrTableObj::getActiveCell() const { @@ -1503,21 +1503,21 @@ const CellRef& SdrTableObj::getActiveCell() const } } -// -------------------------------------------------------------------- + sal_Int32 SdrTableObj::getRowCount() const { return mpImpl ? mpImpl->getRowCount() : 0; } -// -------------------------------------------------------------------- + sal_Int32 SdrTableObj::getColumnCount() const { return mpImpl ? mpImpl->getColumnCount() : 0; } -// -------------------------------------------------------------------- + void SdrTableObj::setActiveCell( const CellPos& rPos ) { @@ -1542,14 +1542,14 @@ void SdrTableObj::setActiveCell( const CellPos& rPos ) } } -// -------------------------------------------------------------------- + void SdrTableObj::getActiveCellPos( CellPos& rPos ) const { rPos = mpImpl->maEditPos; } -// -------------------------------------------------------------------- + void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect ) { @@ -1561,7 +1561,7 @@ void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect ) } } -// -------------------------------------------------------------------- + void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const { @@ -1569,7 +1569,7 @@ void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const TakeTextAnchorRect( mpImpl->maEditPos, rAnchorRect ); } -// -------------------------------------------------------------------- + void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRect ) const { @@ -1586,7 +1586,7 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec rAnchorRect=aAnkRect; } -// -------------------------------------------------------------------- + void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const { @@ -1594,7 +1594,7 @@ void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* TakeTextEditArea( mpImpl->maEditPos, pPaperMin, pPaperMax, pViewInit, pViewMin ); } -// -------------------------------------------------------------------- + void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin ) const { @@ -1651,7 +1651,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* if (pViewInit!=NULL) *pViewInit=aViewInit; } -// -------------------------------------------------------------------- + sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const { @@ -1679,14 +1679,14 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const return (sal_uInt16)eRet; } -// -------------------------------------------------------------------- + OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const { return SdrTextObj::GetEditOutlinerParaObject(); } -// -------------------------------------------------------------------- + struct ImplTableShadowPaintInfo { @@ -1706,7 +1706,7 @@ struct ImplTableShadowPaintInfo } }; -// -------------------------------------------------------------------- + OUString SdrTableObj::TakeObjNameSingul() const { @@ -1724,14 +1724,14 @@ OUString SdrTableObj::TakeObjNameSingul() const return sName.makeStringAndClear(); } -// -------------------------------------------------------------------- + OUString SdrTableObj::TakeObjNamePlural() const { return ImpGetResStr(STR_ObjNamePluralTable); } -// -------------------------------------------------------------------- + SdrTableObj* SdrTableObj::Clone() const { @@ -1764,55 +1764,55 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj) return *this; } -// -------------------------------------------------------------------- + basegfx::B2DPolyPolygon SdrTableObj::TakeXorPoly() const { return SdrTextObj::TakeXorPoly(); } -// -------------------------------------------------------------------- + basegfx::B2DPolyPolygon SdrTableObj::TakeContour() const { return SdrTextObj::TakeContour(); } -// -------------------------------------------------------------------- + const Rectangle& SdrTableObj::GetSnapRect() const { return aRect; } -// -------------------------------------------------------------------- + void SdrTableObj::NbcSetSnapRect(const Rectangle& rRect) { NbcSetLogicRect( rRect ); } -// -------------------------------------------------------------------- + const Rectangle& SdrTableObj::GetLogicRect() const { return maLogicRect; } -// -------------------------------------------------------------------- + void SdrTableObj::RecalcSnapRect() { } -// -------------------------------------------------------------------- + sal_uInt32 SdrTableObj::GetSnapPointCount() const { return SdrTextObj::GetSnapPointCount(); } -// -------------------------------------------------------------------- + Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const @@ -1820,7 +1820,7 @@ Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const return SdrTextObj::GetSnapPoint(i); } -// -------------------------------------------------------------------- + sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) { @@ -1862,7 +1862,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) return sal_True; } -// -------------------------------------------------------------------- + void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) { @@ -1909,7 +1909,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) mbInEditMode = sal_False; } -// -------------------------------------------------------------------- + OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const { @@ -1920,7 +1920,7 @@ OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const return 0; } -// -------------------------------------------------------------------- + void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) { @@ -1942,7 +1942,7 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) } } -// -------------------------------------------------------------------- + void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) { @@ -1956,7 +1956,7 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) } -// -------------------------------------------------------------------- + void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ ) { @@ -1965,7 +1965,7 @@ void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnl SetLogicRect( aAdjustRect ); } -// -------------------------------------------------------------------- + void SdrTableObj::NbcMove(const Size& rSiz) { @@ -1975,7 +1975,7 @@ void SdrTableObj::NbcMove(const Size& rSiz) mpImpl->UpdateCells( aRect ); } -// -------------------------------------------------------------------- + void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { @@ -1987,7 +1987,7 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac SetRectsDirty(); } -// -------------------------------------------------------------------- + bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { @@ -2007,7 +2007,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) return bRet; } -// -------------------------------------------------------------------- + bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { @@ -2028,14 +2028,14 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo } } -// -------------------------------------------------------------------- + void SdrTableObj::NbcReformatText() { NbcAdjustTextFrameWidthAndHeight(); } -// -------------------------------------------------------------------- + void SdrTableObj::ReformatText() { @@ -2048,7 +2048,7 @@ void SdrTableObj::ReformatText() SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } -// -------------------------------------------------------------------- + sal_Bool SdrTableObj::IsVerticalWriting() const { @@ -2056,7 +2056,7 @@ sal_Bool SdrTableObj::IsVerticalWriting() const return pModeItem && pModeItem->GetValue() == com::sun::star::text::WritingMode_TB_RL; } -// -------------------------------------------------------------------- + void SdrTableObj::SetVerticalWriting(sal_Bool bVertical ) { @@ -2067,7 +2067,7 @@ void SdrTableObj::SetVerticalWriting(sal_Bool bVertical ) } } -// -------------------------------------------------------------------- + WritingMode SdrTableObj::GetWritingMode() const { @@ -2094,7 +2094,7 @@ WritingMode SdrTableObj::GetWritingMode() const return eWritingMode; } -// -------------------------------------------------------------------- + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. @@ -2103,7 +2103,7 @@ sal_Bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx: return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon ); } -// -------------------------------------------------------------------- + // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has @@ -2113,21 +2113,21 @@ void SdrTableObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const SdrTextObj::TRSetBaseGeometry( rMatrix, rPolyPolygon ); } -// -------------------------------------------------------------------- + bool SdrTableObj::IsRealyEdited() const { return pEdtOutl && pEdtOutl->IsModified(); } -// -------------------------------------------------------------------- + bool SdrTableObj::IsFontwork() const { return false; } -// -------------------------------------------------------------------- + sal_uInt32 SdrTableObj::GetHdlCount() const { @@ -2141,7 +2141,7 @@ sal_uInt32 SdrTableObj::GetHdlCount() const return nCount; } -// -------------------------------------------------------------------- + void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const { @@ -2238,7 +2238,7 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this); } -// -------------------------------------------------------------------- + SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const { @@ -2391,7 +2391,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag //////////////////////////////////////////////////////////////////////////////////////////////////// // Create -// -------------------------------------------------------------------- + bool SdrTableObj::BegCreate(SdrDragStat& rStat) { @@ -2403,7 +2403,7 @@ bool SdrTableObj::BegCreate(SdrDragStat& rStat) return true; } -// -------------------------------------------------------------------- + bool SdrTableObj::MovCreate(SdrDragStat& rStat) { @@ -2417,7 +2417,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat) return true; } -// -------------------------------------------------------------------- + bool SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { @@ -2430,14 +2430,14 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/) { } -// -------------------------------------------------------------------- + bool SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) { return true; } -// -------------------------------------------------------------------- + basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) const { @@ -2451,28 +2451,28 @@ basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) co return aRetval; } -// -------------------------------------------------------------------- + Pointer SdrTableObj::GetCreatePointer() const { return Pointer(POINTER_CROSS); } -// -------------------------------------------------------------------- + void SdrTableObj::createCell( CellRef& xNewCell ) { xNewCell = Cell::create( *this, 0 ); } -// -------------------------------------------------------------------- + SdrObjGeoData *SdrTableObj::NewGeoData() const { return new TableObjectGeoData; } -// -------------------------------------------------------------------- + void SdrTableObj::SaveGeoData(SdrObjGeoData& rGeo) const { @@ -2482,7 +2482,7 @@ void SdrTableObj::SaveGeoData(SdrObjGeoData& rGeo) const ((TableObjectGeoData &) rGeo).maLogicRect = maLogicRect; } -// -------------------------------------------------------------------- + void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo) { @@ -2497,7 +2497,7 @@ void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo) ActionChanged(); } -// -------------------------------------------------------------------- + SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd ) { @@ -2556,7 +2556,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd return pNewTableObj; } -// -------------------------------------------------------------------- + void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn ) { @@ -2567,7 +2567,7 @@ void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColu } } -// -------------------------------------------------------------------- + void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) { @@ -2578,7 +2578,7 @@ void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) } } -// -------------------------------------------------------------------- + void SdrTableObj::SetChanged() { @@ -2590,7 +2590,7 @@ void SdrTableObj::SetChanged() ::SdrTextObj::SetChanged(); } -// -------------------------------------------------------------------- + void SdrTableObj::uno_lock() { @@ -2598,7 +2598,7 @@ void SdrTableObj::uno_lock() mpImpl->mxTable->lockBroadcasts(); } -// -------------------------------------------------------------------- + void SdrTableObj::uno_unlock() { @@ -2606,7 +2606,7 @@ void SdrTableObj::uno_unlock() mpImpl->mxTable->unlockBroadcasts(); } -// -------------------------------------------------------------------- + diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 5ab1030a7e96..c60dc3af72c1 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -25,7 +25,7 @@ #include "svx/svdmodel.hxx" #include "svx/svdotable.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -33,7 +33,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; using namespace ::com::sun::star::beans; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { @@ -42,9 +42,9 @@ const sal_Int32 Property_OptimalWidth = 1; const sal_Int32 Property_IsVisible = 2; const sal_Int32 Property_IsStartOfNewPage = 3; -// ----------------------------------------------------------------------------- + // TableRow -// ----------------------------------------------------------------------------- + TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn ) : TableColumnBase( getStaticPropertySetInfo() ) @@ -57,20 +57,20 @@ TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn ) { } -// ----------------------------------------------------------------------------- + TableColumn::~TableColumn() { } -// ----------------------------------------------------------------------------- + void TableColumn::dispose() { mxTableModel.clear(); } -// ----------------------------------------------------------------------------- + void TableColumn::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) { @@ -78,7 +78,7 @@ void TableColumn::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeE throw DisposedException(); } -// ----------------------------------------------------------------------------- + TableColumn& TableColumn::operator=( const TableColumn& r ) { @@ -92,9 +92,9 @@ TableColumn& TableColumn::operator=( const TableColumn& r ) return *this; } -// ----------------------------------------------------------------------------- + // XCellRange -// ----------------------------------------------------------------------------- + Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -105,7 +105,7 @@ Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, s return mxTableModel->getCellByPosition( mnColumn, nRow ); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -117,32 +117,32 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException) { return Reference< XCellRange >(); } -// ----------------------------------------------------------------------------- + // XNamed -// ----------------------------------------------------------------------------- + OUString SAL_CALL TableColumn::getName() throw (RuntimeException) { return maName; } -// ----------------------------------------------------------------------------- + void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeException) { maName = aName; } -// ----------------------------------------------------------------------------- + // XFastPropertySet -// ----------------------------------------------------------------------------- + void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException) { @@ -227,7 +227,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a delete pUndo; } -// ----------------------------------------------------------------------------- + Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -241,7 +241,7 @@ Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (Unkno } } -// ----------------------------------------------------------------------------- + rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { @@ -290,7 +290,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() return xInfo; } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 0dc240f6c9c5..a564896e2d62 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -23,41 +23,41 @@ #include "tablecolumns.hxx" #include "tablecolumn.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // TableColumns -// ----------------------------------------------------------------------------- + TableColumns::TableColumns( const TableModelRef& xTableModel ) : mxTableModel( xTableModel ) { } -// ----------------------------------------------------------------------------- + TableColumns::~TableColumns() { dispose(); } -// ----------------------------------------------------------------------------- + void TableColumns::dispose() { mxTableModel.clear(); } -// ----------------------------------------------------------------------------- + void TableColumns::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) { @@ -65,9 +65,9 @@ void TableColumns::throwIfDisposed() const throw (::com::sun::star::uno::Runtime throw DisposedException(); } -// ----------------------------------------------------------------------------- + // XTableRows -// ----------------------------------------------------------------------------- + void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException) { @@ -75,7 +75,7 @@ void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) mxTableModel->insertColumns( nIndex, nCount ); } -// ----------------------------------------------------------------------------- + void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException) { @@ -83,9 +83,9 @@ void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) mxTableModel->removeColumns( nIndex, nCount ); } -// ----------------------------------------------------------------------------- + // XIndexAccess -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException) { @@ -93,7 +93,7 @@ sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException) return mxTableModel->getColumnCount(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { @@ -105,9 +105,9 @@ Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBounds return Any( Reference< XCellRange >( mxTableModel->getColumn( Index ).get() ) ); } -// ----------------------------------------------------------------------------- + // XElementAccess -// ----------------------------------------------------------------------------- + Type SAL_CALL TableColumns::getElementType() throw (RuntimeException) { @@ -116,7 +116,7 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException) return cppu::UnoType<XCellRange>::get(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException) { @@ -125,7 +125,7 @@ sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException) return mxTableModel->getColumnCount() != 0; } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index f9a92b0bc8c8..431251cb8769 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -79,9 +79,9 @@ using namespace ::com::sun::star::style; namespace sdr { namespace table { -// -------------------------------------------------------------------- + // class SvxTableControllerModifyListener -// -------------------------------------------------------------------- + class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener > { @@ -98,9 +98,9 @@ public: SvxTableController* mpController; }; -// -------------------------------------------------------------------- + // XModifyListener -// -------------------------------------------------------------------- + void SAL_CALL SvxTableControllerModifyListener::modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { @@ -108,25 +108,25 @@ void SAL_CALL SvxTableControllerModifyListener::modified( const ::com::sun::star mpController->onTableModified(); } -// -------------------------------------------------------------------- + // XEventListener -// -------------------------------------------------------------------- + void SAL_CALL SvxTableControllerModifyListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { mpController = 0; } -// -------------------------------------------------------------------- + // class SvxTableController -// -------------------------------------------------------------------- + rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController ) { return SvxTableController::create( pView, pObj, xRefController ); } -// -------------------------------------------------------------------- + rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController ) { @@ -139,7 +139,7 @@ rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEdi return new SvxTableController( pView, pObj ); } -// -------------------------------------------------------------------- + SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject* pObj ) : mbCellSelectionMode(false) @@ -169,7 +169,7 @@ SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject* } } -// -------------------------------------------------------------------- + SvxTableController::~SvxTableController() { @@ -189,7 +189,7 @@ SvxTableController::~SvxTableController() } } -// -------------------------------------------------------------------- + const sal_uInt16 ACTION_NONE = 0; const sal_uInt16 ACTION_GOTO_FIRST_CELL = 1; @@ -244,9 +244,9 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, Window* pWindow ) return executeAction( nAction, ( rKEvt.GetKeyCode().IsShift() ) ? sal_True : sal_False, pWindow ); } -// -------------------------------------------------------------------- + // ::com::sun::star::awt::XMouseClickHandler: -// -------------------------------------------------------------------- + bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWindow ) { @@ -299,7 +299,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin return false; } -// -------------------------------------------------------------------- + bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin*/) { @@ -314,7 +314,7 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin return false; } -// -------------------------------------------------------------------- + bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, Window* pWindow ) { @@ -352,7 +352,7 @@ bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, Window* pWindow ) return false; } -// -------------------------------------------------------------------- + void SvxTableController::onSelectionHasChanged() { @@ -389,7 +389,7 @@ void SvxTableController::onSelectionHasChanged() } } -// -------------------------------------------------------------------- + void SvxTableController::GetState( SfxItemSet& rSet ) { @@ -489,7 +489,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) delete pSet; } -// -------------------------------------------------------------------- + void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) { @@ -621,7 +621,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) } } -// -------------------------------------------------------------------- + void SvxTableController::onDelete( sal_uInt16 nSId ) { @@ -680,7 +680,7 @@ void SvxTableController::onDelete( sal_uInt16 nSId ) } } -// -------------------------------------------------------------------- + void SvxTableController::onSelect( sal_uInt16 nSId ) { @@ -715,7 +715,7 @@ void SvxTableController::onSelect( sal_uInt16 nSId ) } } -// -------------------------------------------------------------------- + void SvxTableController::onFormatTable( SfxRequest& rReq ) { ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); @@ -769,7 +769,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) } } -// -------------------------------------------------------------------- + void SvxTableController::Execute( SfxRequest& rReq ) { @@ -1223,16 +1223,16 @@ bool SvxTableController::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRe return false; } -// -------------------------------------------------------------------- + // internals -// -------------------------------------------------------------------- + bool SvxTableController::checkTableObject() { return mxTableObj.is(); } -// -------------------------------------------------------------------- + sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* /*pWindow*/ ) { @@ -1531,7 +1531,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window return nAction != ACTION_HANDLED_BY_VIEW; } -// -------------------------------------------------------------------- + void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pWindow, sal_uInt16 nAction ) { @@ -1560,7 +1560,7 @@ void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pW } } -// -------------------------------------------------------------------- + const CellPos& SvxTableController::getSelectionStart() { @@ -1568,14 +1568,14 @@ const CellPos& SvxTableController::getSelectionStart() return maCursorFirstPos; } -// -------------------------------------------------------------------- + void SvxTableController::setSelectionStart( const CellPos& rPos ) { maCursorFirstPos = rPos; } -// -------------------------------------------------------------------- + const CellPos& SvxTableController::getSelectionEnd() { @@ -1583,7 +1583,7 @@ const CellPos& SvxTableController::getSelectionEnd() return maCursorLastPos; } -// -------------------------------------------------------------------- + void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ) { @@ -1613,7 +1613,7 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s -// -------------------------------------------------------------------- + void SvxTableController::checkCell( CellPos& rPos ) { @@ -1631,7 +1631,7 @@ void SvxTableController::checkCell( CellPos& rPos ) } } -// -------------------------------------------------------------------- + void SvxTableController::findMergeOrigin( CellPos& rPos ) { @@ -1649,7 +1649,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) } } -// -------------------------------------------------------------------- + void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) { @@ -1742,7 +1742,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const } } -// -------------------------------------------------------------------- + bool SvxTableController::StopTextEdit() { @@ -1759,7 +1759,7 @@ bool SvxTableController::StopTextEdit() } } -// -------------------------------------------------------------------- + void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast ) { @@ -1843,7 +1843,7 @@ void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast ) } } -// -------------------------------------------------------------------- + void SvxTableController::StartSelection( const CellPos& rPos ) { @@ -1853,7 +1853,7 @@ void SvxTableController::StartSelection( const CellPos& rPos ) mpView->MarkListHasChanged(); } -// -------------------------------------------------------------------- + void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& rEnd ) { @@ -1863,7 +1863,7 @@ void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& UpdateSelection( rEnd ); } -// -------------------------------------------------------------------- + void SvxTableController::UpdateSelection( const CellPos& rPos ) { @@ -1871,14 +1871,14 @@ void SvxTableController::UpdateSelection( const CellPos& rPos ) mpView->MarkListHasChanged(); } -// -------------------------------------------------------------------- + void SvxTableController::clearSelection() { RemoveSelection(); } -// -------------------------------------------------------------------- + void SvxTableController::selectAll() { @@ -1892,7 +1892,7 @@ void SvxTableController::selectAll() } } -// -------------------------------------------------------------------- + void SvxTableController::RemoveSelection() { @@ -1903,14 +1903,14 @@ void SvxTableController::RemoveSelection() } } -// -------------------------------------------------------------------- + void SvxTableController::onTableModified() { if( mnUpdateEvent == 0 ) mnUpdateEvent = Application::PostUserEvent( LINK( this, SvxTableController, UpdateHdl ) ); } -// -------------------------------------------------------------------- + void SvxTableController::updateSelectionOverlay() { @@ -1965,7 +1965,7 @@ void SvxTableController::updateSelectionOverlay() } } -// -------------------------------------------------------------------- + void SvxTableController::destroySelectionOverlay() { @@ -1976,7 +1976,7 @@ void SvxTableController::destroySelectionOverlay() } } -// -------------------------------------------------------------------- + void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const { @@ -2018,7 +2018,7 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl } } -// -------------------------------------------------------------------- + const sal_uInt16 CELL_BEFORE = 0x0001; const sal_uInt16 CELL_LEFT = 0x0002; @@ -2030,7 +2030,7 @@ const sal_uInt16 CELL_TOP = 0x0020; const sal_uInt16 CELL_BOTTOM = 0x0040; const sal_uInt16 CELL_LOWER = 0x0080; -// -------------------------------------------------------------------- + static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, sal_uInt16 nLine ) { @@ -2048,7 +2048,7 @@ static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine rNewFrame.SetLine( pNew, nLine ); } -// -------------------------------------------------------------------- + static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SvxBoxItem& rNewFrame ) { @@ -2106,7 +2106,7 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, } } -// -------------------------------------------------------------------- + static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Color& rColor ) { @@ -2119,7 +2119,7 @@ static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Col } } -// -------------------------------------------------------------------- + static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* pLineColorItem, SvxBoxItem& rNewFrame ) { @@ -2138,7 +2138,7 @@ static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* p ImplSetLineColor( rNewFrame, BOX_LINE_LEFT, aColor ); } -// -------------------------------------------------------------------- + static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* pBorderLineItem, SvxBoxItem& rNewFrame ) { @@ -2184,7 +2184,7 @@ static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* } } -// -------------------------------------------------------------------- + void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) { @@ -2273,7 +2273,7 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) } } -// -------------------------------------------------------------------- + void SvxTableController::UpdateTableShape() { @@ -2287,7 +2287,7 @@ void SvxTableController::UpdateTableShape() } -// -------------------------------------------------------------------- + void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll) { @@ -2339,7 +2339,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR } } -// -------------------------------------------------------------------- + bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { @@ -2369,7 +2369,7 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt } } -// -------------------------------------------------------------------- + bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { @@ -2381,7 +2381,7 @@ bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) return false; } -// -------------------------------------------------------------------- + bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) { @@ -2409,7 +2409,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) return false; } -// -------------------------------------------------------------------- + bool SvxTableController::PasteObjModel( const SdrModel& rModel ) { @@ -2429,7 +2429,7 @@ bool SvxTableController::PasteObjModel( const SdrModel& rModel ) return false; } -// -------------------------------------------------------------------- + bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj ) { @@ -2568,7 +2568,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxTableController, UpdateHdl) { diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 00e857bf459d..d5a08f1e4f85 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -49,7 +49,7 @@ #include <boost/bind.hpp> -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; @@ -178,9 +178,9 @@ public: TableDesignStyleVector maDesigns; }; -//------------------------------------------------------------------------ + // TableDesignStyle -//------------------------------------------------------------------------ + TableDesignStyle::TableDesignStyle() : TableDesignStyleBase(m_aMutex) @@ -253,38 +253,38 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException) return sal_False; } -// ---------------------------------------------------------- + OUString SAL_CALL TableDesignStyle::getParentStyle() throw (RuntimeException) { return OUString(); } -// ---------------------------------------------------------- + void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchElementException, RuntimeException) { } -// ---------------------------------------------------------- + // XNamed -// ---------------------------------------------------------- + OUString SAL_CALL TableDesignStyle::getName() throw (RuntimeException) { return msName; } -// ---------------------------------------------------------- + void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeException) { msName = rName; } -// ---------------------------------------------------------- + // XNameAccess -// ---------------------------------------------------------- + Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -299,7 +299,7 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl return Any( maCellStyles[(*iter).second] ); } -// ---------------------------------------------------------- + Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException) { @@ -316,7 +316,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE return aRet; } -// ---------------------------------------------------------- + sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(RuntimeException) { @@ -328,32 +328,32 @@ sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(Ru return ( iter != rMap.end() ) ? sal_True : sal_False; } -// ---------------------------------------------------------- + // XElementAccess -// ---------------------------------------------------------- + Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException) { return cppu::UnoType<XStyle>::get(); } -// ---------------------------------------------------------- + sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException) { return sal_True; } -// ---------------------------------------------------------- + // XIndexAccess -// ---------------------------------------------------------- + sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException) { return style_count; } -// ---------------------------------------------------------- + Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { @@ -365,9 +365,9 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou return Any( maCellStyles[Index] ); } -// ---------------------------------------------------------- + // XNameReplace -// ---------------------------------------------------------- + void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -405,9 +405,9 @@ void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& } } -// ---------------------------------------------------------- + // XComponent -// ---------------------------------------------------------- + void SAL_CALL TableDesignStyle::disposing() { @@ -415,9 +415,9 @@ void SAL_CALL TableDesignStyle::disposing() maCellStyles[nIndex].clear(); } -//------------------------------------------------------------------------ + // XModifyBroadcaster -//------------------------------------------------------------------------ + void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException) { @@ -434,14 +434,14 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe } } -//------------------------------------------------------------------------ + void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener ); } -//------------------------------------------------------------------------ + void TableDesignStyle::notifyModifyListener() { @@ -455,9 +455,9 @@ void TableDesignStyle::notifyModifyListener() } } -//------------------------------------------------------------------------ + // XModifyListener -//------------------------------------------------------------------------ + // if we get a modify hint from a style, notify all registered XModifyListener void SAL_CALL TableDesignStyle::modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) @@ -465,17 +465,17 @@ void SAL_CALL TableDesignStyle::modified( const ::com::sun::star::lang::EventObj notifyModifyListener(); } -//------------------------------------------------------------------------ + void SAL_CALL TableDesignStyle::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { } -//------------------------------------------------------------------------ + // TableStyle -//------------------------------------------------------------------------ -// ---------------------------------------------------------- + + // XServiceInfo OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException) { @@ -520,7 +520,7 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE throw NoSuchElementException(); } -// ---------------------------------------------------------- + Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException) { @@ -537,7 +537,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime return aRet; } -// ---------------------------------------------------------- + sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException) { @@ -552,16 +552,16 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(Ru return sal_False; } -// ---------------------------------------------------------- + // XElementAccess -// ---------------------------------------------------------- + Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException) { return cppu::UnoType<XStyle>::get(); } -// ---------------------------------------------------------- + sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException) { @@ -570,9 +570,9 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException) return maDesigns.empty() ? sal_False : sal_True; } -// ---------------------------------------------------------- + // XIndexAccess -// ---------------------------------------------------------- + sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException) { @@ -581,7 +581,7 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException) return sal::static_int_cast< sal_Int32 >( maDesigns.size() ); } -// ---------------------------------------------------------- + Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { @@ -593,9 +593,9 @@ Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBo throw IndexOutOfBoundsException(); } -// ---------------------------------------------------------- + // XNameContainer -// ---------------------------------------------------------- + void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { @@ -615,7 +615,7 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& maDesigns.push_back( xStyle ); } -// ---------------------------------------------------------- + void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -636,9 +636,9 @@ void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoS throw NoSuchElementException(); } -// ---------------------------------------------------------- + // XNameReplace -// ---------------------------------------------------------- + void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -663,9 +663,9 @@ void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any throw NoSuchElementException(); } -// ---------------------------------------------------------- + // XSingleServiceFactory -// ---------------------------------------------------------- + Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Exception, RuntimeException) { @@ -674,16 +674,16 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Excep return Reference< XInterface >( static_cast< XStyle* >( new TableDesignStyle ) ); } -// ---------------------------------------------------------- + Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >& ) throw(Exception, RuntimeException) { return createInstance(); } -// ---------------------------------------------------------- + // XComponent -// ---------------------------------------------------------- + void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException) { @@ -698,21 +698,21 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException) } } -// ---------------------------------------------------------- + void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >& ) throw (RuntimeException) { } -// ---------------------------------------------------------- + void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >& ) throw (RuntimeException) { } -// ---------------------------------------------------------- + // XPropertySet -// ---------------------------------------------------------- + Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (RuntimeException) { @@ -720,14 +720,14 @@ Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (Runti return Reference<XPropertySetInfo>(); } -// ---------------------------------------------------------- + void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -742,35 +742,35 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } } -// ---------------------------------------------------------- + void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// -------------------------------------------------------------------- + SVX_DLLPUBLIC Reference< XNameAccess > CreateTableDesignFamily() diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index d6457e7becc0..72ad4ff0d357 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -40,7 +40,7 @@ namespace sdr { namespace table { -// -------------------------------------------------------------------- + class OverlayTableEdge : public sdr::overlay::OverlayObject { @@ -56,7 +56,7 @@ public: virtual ~OverlayTableEdge(); }; -// -------------------------------------------------------------------- + TableEdgeHdl::TableEdgeHdl( const Point& rPnt, bool bHorizontal, sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nEdges ) : SdrHdl( rPnt, HDL_USER ) diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 55ed2d2247a8..d2ec7309792e 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -47,15 +47,15 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + static SvxBorderLine gEmptyBorder; -// ----------------------------------------------------------------------------- + TableLayouter::TableLayouter( const TableModelRef& xTableModel ) : mxTable( xTableModel ) @@ -63,14 +63,14 @@ TableLayouter::TableLayouter( const TableModelRef& xTableModel ) { } -// ----------------------------------------------------------------------------- + TableLayouter::~TableLayouter() { ClearBorderLayout(); } -// ----------------------------------------------------------------------------- + basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos ) const { @@ -115,7 +115,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos ) const return basegfx::B2ITuple( width, height ); } -// ----------------------------------------------------------------------------- + bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rArea ) const { @@ -153,7 +153,7 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr return false; } -// ----------------------------------------------------------------------------- + sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const { if( isValidRow(nRow) ) @@ -162,7 +162,7 @@ sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const return 0; } -// ----------------------------------------------------------------------------- + sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const { if( isValidColumn(nColumn) ) @@ -171,7 +171,7 @@ sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const return 0; } -// ----------------------------------------------------------------------------- + bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const { @@ -190,7 +190,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor return false; } -// ----------------------------------------------------------------------------- + /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const @@ -214,7 +214,7 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, return pLine; } -// ----------------------------------------------------------------------------- + sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { @@ -245,7 +245,7 @@ sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/ return nRet; } -// ----------------------------------------------------------------------------- + sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { @@ -300,7 +300,7 @@ sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, return nRet; } -// ----------------------------------------------------------------------------- + static bool checkMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 nMergedY, sal_Int32 nCellX, sal_Int32 nCellY, bool& bRunning ) { @@ -421,7 +421,7 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 return false; } -// ----------------------------------------------------------------------------- + sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) { @@ -436,7 +436,7 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) } } -// ----------------------------------------------------------------------------- + sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ) { @@ -506,13 +506,13 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu return nSize; } -// ----------------------------------------------------------------------------- + typedef std::vector< CellRef > MergeableCellVector; typedef std::vector< MergeableCellVector > MergeVector; typedef std::vector< sal_Int32 > Int32Vector; -// ----------------------------------------------------------------------------- + void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) { @@ -665,7 +665,7 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) updateCells( rArea ); } -// ----------------------------------------------------------------------------- + void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) { @@ -813,7 +813,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) updateCells( rArea ); } -// ----------------------------------------------------------------------------- + /** try to fit the table into the given rectangle. If the rectangle is to small, it will be grown to fit the table. */ @@ -846,7 +846,7 @@ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFi UpdateBorderLayout(); } -// ----------------------------------------------------------------------------- + void TableLayouter::updateCells( Rectangle& rRectangle ) { @@ -876,7 +876,7 @@ void TableLayouter::updateCells( Rectangle& rRectangle ) } } -// ----------------------------------------------------------------------------- + CellRef TableLayouter::getCell( const CellPos& rPos ) const { @@ -892,7 +892,7 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const return xCell; } -// ----------------------------------------------------------------------------- + bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { @@ -928,7 +928,7 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine } } -// ----------------------------------------------------------------------------- + void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine ) { @@ -951,7 +951,7 @@ void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, } } -// ----------------------------------------------------------------------------- + void TableLayouter::ClearBorderLayout() { @@ -959,7 +959,7 @@ void TableLayouter::ClearBorderLayout() ClearBorderLayout(maVerticalBorders); } -// ----------------------------------------------------------------------------- + void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) { @@ -982,7 +982,7 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) } } -// ----------------------------------------------------------------------------- + void TableLayouter::ResizeBorderLayout() { @@ -991,7 +991,7 @@ void TableLayouter::ResizeBorderLayout() ResizeBorderLayout(maVerticalBorders); } -// ----------------------------------------------------------------------------- + void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) { @@ -1008,7 +1008,7 @@ void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) } } -// ----------------------------------------------------------------------------- + void TableLayouter::UpdateBorderLayout() { @@ -1051,7 +1051,7 @@ void TableLayouter::UpdateBorderLayout() } } -// ----------------------------------------------------------------------------- + void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol ) { @@ -1090,7 +1090,7 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, } } -// ----------------------------------------------------------------------------- + void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow ) { diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 0bbb63d78131..65dbaa15973b 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -46,11 +46,11 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // removes the given range from a vector template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) @@ -84,7 +84,7 @@ template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIn } } -// ----------------------------------------------------------------------------- + /** inserts a range into a vector */ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) @@ -112,7 +112,7 @@ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVec return nIndex; } -// ----------------------------------------------------------------------------- + TableModel::TableModel( SdrTableObj* pTableObj ) : TableModelBase( m_aMutex ) @@ -158,13 +158,13 @@ TableModel::TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTabl } } -// ----------------------------------------------------------------------------- + TableModel::~TableModel() { } -// ----------------------------------------------------------------------------- + void TableModel::init( sal_Int32 nColumns, sal_Int32 nRows ) { @@ -187,44 +187,44 @@ void TableModel::init( sal_Int32 nColumns, sal_Int32 nRows ) } } -// ----------------------------------------------------------------------------- + // ICellRange -// ----------------------------------------------------------------------------- + sal_Int32 TableModel::getLeft() { return 0; } -// ----------------------------------------------------------------------------- + sal_Int32 TableModel::getTop() { return 0; } -// ----------------------------------------------------------------------------- + sal_Int32 TableModel::getRight() { return getColumnCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 TableModel::getBottom() { return getRowCount(); } -// ----------------------------------------------------------------------------- + Reference< XTable > TableModel::getTable() { return this; } -// ----------------------------------------------------------------------------- + void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -236,7 +236,7 @@ void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount ) setModified(sal_True); } -// ----------------------------------------------------------------------------- + void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) { @@ -253,7 +253,7 @@ void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) setModified(sal_True); } -// ----------------------------------------------------------------------------- + void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -269,7 +269,7 @@ void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) setModified(sal_True); } -// ----------------------------------------------------------------------------- + void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellVector& aCells ) { @@ -298,9 +298,9 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV setModified(sal_True); } -// ----------------------------------------------------------------------------- + // XTable -// ----------------------------------------------------------------------------- + Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException) { @@ -308,7 +308,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep return createCursorByRange( Reference< XCellRange >( this ) ); } -// ----------------------------------------------------------------------------- + Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException) { @@ -322,7 +322,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen return new CellCursor( xModel, pRange->getLeft(), pRange->getTop(), pRange->getRight(), pRange->getBottom() ); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException) { @@ -330,7 +330,7 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException) return getRowCountImpl(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException) { @@ -338,9 +338,9 @@ sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException) return getColumnCountImpl(); } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void TableModel::dispose() throw (RuntimeException) { @@ -348,23 +348,23 @@ void TableModel::dispose() throw (RuntimeException) TableModelBase::dispose(); } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) { TableModelBase::addEventListener( xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) { TableModelBase::removeEventListener( xListener ); } -// ----------------------------------------------------------------------------- + // XModifiable -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException) { @@ -372,7 +372,7 @@ sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException) return mbModified; } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException) { @@ -384,25 +384,25 @@ void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoE notifyModification(); } -// ----------------------------------------------------------------------------- + // XModifyBroadcaster -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException) { rBHelper.addListener( cppu::UnoType<XModifyListener>::get() , xListener ); } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener ); } -// ----------------------------------------------------------------------------- + // XColumnRowRange -// ----------------------------------------------------------------------------- + Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException) { @@ -413,7 +413,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep return mxTableColumns.get(); } -// ----------------------------------------------------------------------------- + Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException) { @@ -424,9 +424,9 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException) return mxTableRows.get(); } -// ----------------------------------------------------------------------------- + // XCellRange -// ----------------------------------------------------------------------------- + Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException) { @@ -439,7 +439,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -454,16 +454,16 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 n throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException) { return Reference< XCellRange >(); } -// ----------------------------------------------------------------------------- + // XPropertySet -// ----------------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw (RuntimeException) { @@ -471,52 +471,52 @@ Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw return xInfo; } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { return Any(); } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + // XFastPropertySet -// ----------------------------------------------------------------------------- + void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { } -// ----------------------------------------------------------------------------- + Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -524,23 +524,23 @@ Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw ( return aAny; } -// ----------------------------------------------------------------------------- + // internals -// ----------------------------------------------------------------------------- + sal_Int32 TableModel::getRowCountImpl() const { return static_cast< sal_Int32 >( maRows.size() ); } -// ----------------------------------------------------------------------------- + sal_Int32 TableModel::getColumnCountImpl() const { return static_cast< sal_Int32 >( maColumns.size() ); } -// ----------------------------------------------------------------------------- + void TableModel::disposing() { @@ -575,16 +575,16 @@ void TableModel::disposing() mpTableObj = 0; } -// ----------------------------------------------------------------------------- + // XBroadcaster -// ----------------------------------------------------------------------------- + void TableModel::lockBroadcasts() throw (RuntimeException) { ::SolarMutexGuard aGuard; ++mnNotifyLock; } -// ----------------------------------------------------------------------------- + void TableModel::unlockBroadcasts() throw (RuntimeException) { @@ -598,7 +598,7 @@ void TableModel::unlockBroadcasts() throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + void TableModel::notifyModification() { ::osl::MutexGuard guard( m_aMutex ); @@ -620,7 +620,7 @@ void TableModel::notifyModification() } } -// ----------------------------------------------------------------------------- + CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const { @@ -635,7 +635,7 @@ CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const } } -// ----------------------------------------------------------------------------- + CellRef TableModel::createCell() { @@ -645,7 +645,7 @@ CellRef TableModel::createCell() return xCell; } -// ----------------------------------------------------------------------------- + void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -726,7 +726,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } } -// ----------------------------------------------------------------------------- + void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -836,7 +836,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } } -// ----------------------------------------------------------------------------- + void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -899,7 +899,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) } } -// ----------------------------------------------------------------------------- + void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -995,7 +995,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } } -// ----------------------------------------------------------------------------- + TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsException) { @@ -1005,7 +1005,7 @@ TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsEx throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutOfBoundsException) { @@ -1015,7 +1015,7 @@ TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutO throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + /** deletes rows and columns that are completely merged. Must be called between BegUndo/EndUndo! */ void TableModel::optimize() @@ -1106,7 +1106,7 @@ void TableModel::optimize() setModified(sal_True); } -// ----------------------------------------------------------------------------- + void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan ) { @@ -1152,7 +1152,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_ } -// ----------------------------------------------------------------------------- + void TableModel::updateRows() { @@ -1164,7 +1164,7 @@ void TableModel::updateRows() } } -// ----------------------------------------------------------------------------- + void TableModel::updateColumns() { @@ -1176,7 +1176,7 @@ void TableModel::updateColumns() } } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index ab77a38b8997..c081ac13e020 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -26,7 +26,7 @@ #include "svx/svdmodel.hxx" #include "svx/svdotable.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -34,7 +34,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; using namespace ::com::sun::star::beans; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { @@ -43,9 +43,9 @@ const sal_Int32 Property_OptimalHeight = 1; const sal_Int32 Property_IsVisible = 2; const sal_Int32 Property_IsStartOfNewPage = 3; -// ----------------------------------------------------------------------------- + // TableRow -// ----------------------------------------------------------------------------- + TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 nColumns ) : TableRowBase( getStaticPropertySetInfo() ) @@ -67,13 +67,13 @@ TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 } } -// ----------------------------------------------------------------------------- + TableRow::~TableRow() { } -// ----------------------------------------------------------------------------- + void TableRow::dispose() { @@ -87,7 +87,7 @@ void TableRow::dispose() } } -// ----------------------------------------------------------------------------- + void TableRow::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) { @@ -95,7 +95,7 @@ void TableRow::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeExce throw DisposedException(); } -// ----------------------------------------------------------------------------- + TableRow& TableRow::operator=( const TableRow& r ) { @@ -109,7 +109,7 @@ TableRow& TableRow::operator=( const TableRow& r ) return *this; } -// ----------------------------------------------------------------------------- + void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter /* = 0 */ ) { @@ -129,7 +129,7 @@ void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::it } } -// ----------------------------------------------------------------------------- + void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { @@ -161,9 +161,9 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } } -// ----------------------------------------------------------------------------- + // XCellRange -// ----------------------------------------------------------------------------- + Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -174,7 +174,7 @@ Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_ return mxTableModel->getCellByPosition( nColumn, mnRow ); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -186,7 +186,7 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLe throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException) { @@ -194,25 +194,25 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& / return Reference< XCellRange >(); } -// ----------------------------------------------------------------------------- + // XNamed -// ----------------------------------------------------------------------------- + OUString SAL_CALL TableRow::getName() throw (RuntimeException) { return maName; } -// ----------------------------------------------------------------------------- + void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException) { maName = aName; } -// ----------------------------------------------------------------------------- + // XFastPropertySet -// ----------------------------------------------------------------------------- + void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException) { @@ -301,7 +301,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal delete pUndo; } -// ----------------------------------------------------------------------------- + Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -315,7 +315,7 @@ Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownP } } -// ----------------------------------------------------------------------------- + rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { @@ -364,7 +364,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() return xInfo; } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index 6bc90ed81f53..d1a5f802760a 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -24,41 +24,41 @@ #include "tablerow.hxx" #include "tablerows.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { -// ----------------------------------------------------------------------------- + // TableRows -// ----------------------------------------------------------------------------- + TableRows::TableRows( const TableModelRef& xTableModel ) : mxTableModel( xTableModel ) { } -// ----------------------------------------------------------------------------- + TableRows::~TableRows() { dispose(); } -// ----------------------------------------------------------------------------- + void TableRows::dispose() { mxTableModel.clear(); } -// ----------------------------------------------------------------------------- + void TableRows::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) { @@ -66,9 +66,9 @@ void TableRows::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeExc throw DisposedException(); } -// ----------------------------------------------------------------------------- + // XTableRows -// ----------------------------------------------------------------------------- + void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException) { @@ -76,7 +76,7 @@ void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr mxTableModel->insertRows( nIndex, nCount ); } -// ----------------------------------------------------------------------------- + void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException) { @@ -84,9 +84,9 @@ void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr mxTableModel->removeRows( nIndex, nCount ); } -// ----------------------------------------------------------------------------- + // XIndexAccess -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException) { @@ -94,7 +94,7 @@ sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException) return mxTableModel->getRowCount(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { @@ -102,9 +102,9 @@ Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsExc return Any( Reference< XCellRange >( static_cast< XCellRange* >( mxTableModel->getRow( Index ).get() ) ) ); } -// ----------------------------------------------------------------------------- + // XElementAccess -// ----------------------------------------------------------------------------- + Type SAL_CALL TableRows::getElementType() throw (RuntimeException) { @@ -112,7 +112,7 @@ Type SAL_CALL TableRows::getElementType() throw (RuntimeException) return cppu::UnoType<XCellRange>::get(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException) { @@ -120,7 +120,7 @@ sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException) return mxTableModel->getRowCount() != 0; } -// ----------------------------------------------------------------------------- + } } diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index aee0012abef3..d4d5d48e2b4e 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -28,12 +28,12 @@ #include "tablecolumn.hxx" -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; -// ----------------------------------------------------------------------------- + namespace sdr { namespace table { @@ -156,9 +156,9 @@ void CellUndo::getDataFromCell( Data& rData ) } } -// ----------------------------------------------------------------------------- + // class InsertRowUndo : public SdrUndoAction -// ----------------------------------------------------------------------------- + static void Dispose( RowVector& rRows ) { @@ -167,7 +167,7 @@ static void Dispose( RowVector& rRows ) (*aIter++)->dispose(); } -// ----------------------------------------------------------------------------- + InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, RowVector& aNewRows ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) @@ -178,7 +178,7 @@ InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row maRows.swap( aNewRows ); } -// ----------------------------------------------------------------------------- + InsertRowUndo::~InsertRowUndo() { @@ -186,7 +186,7 @@ InsertRowUndo::~InsertRowUndo() Dispose( maRows ); } -// ----------------------------------------------------------------------------- + void InsertRowUndo::Undo() { @@ -197,7 +197,7 @@ void InsertRowUndo::Undo() } } -// ----------------------------------------------------------------------------- + void InsertRowUndo::Redo() { @@ -208,9 +208,9 @@ void InsertRowUndo::Redo() } } -// ----------------------------------------------------------------------------- + // class RemoveRowUndo : public SdrUndoAction -// ----------------------------------------------------------------------------- + RemoveRowUndo::RemoveRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, RowVector& aRemovedRows ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) @@ -221,7 +221,7 @@ RemoveRowUndo::RemoveRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row maRows.swap( aRemovedRows ); } -// ----------------------------------------------------------------------------- + RemoveRowUndo::~RemoveRowUndo() { @@ -229,7 +229,7 @@ RemoveRowUndo::~RemoveRowUndo() Dispose( maRows ); } -// ----------------------------------------------------------------------------- + void RemoveRowUndo::Undo() { @@ -240,7 +240,7 @@ void RemoveRowUndo::Undo() } } -// ----------------------------------------------------------------------------- + void RemoveRowUndo::Redo() { @@ -251,9 +251,9 @@ void RemoveRowUndo::Redo() } } -// ----------------------------------------------------------------------------- + // class InsertColUndo : public SdrUndoAction -// ----------------------------------------------------------------------------- + static void Dispose( ColumnVector& rCols ) { @@ -262,7 +262,7 @@ static void Dispose( ColumnVector& rCols ) (*aIter++)->dispose(); } -// ----------------------------------------------------------------------------- + static void Dispose( CellVector& rCells ) { @@ -271,7 +271,7 @@ static void Dispose( CellVector& rCells ) (*aIter++)->dispose(); } -// ----------------------------------------------------------------------------- + InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, ColumnVector& aNewCols, CellVector& aCells ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) @@ -283,7 +283,7 @@ InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col maCells.swap( aCells ); } -// ----------------------------------------------------------------------------- + InsertColUndo::~InsertColUndo() { @@ -294,7 +294,7 @@ InsertColUndo::~InsertColUndo() } } -// ----------------------------------------------------------------------------- + void InsertColUndo::Undo() { @@ -305,7 +305,7 @@ void InsertColUndo::Undo() } } -// ----------------------------------------------------------------------------- + void InsertColUndo::Redo() { @@ -316,9 +316,9 @@ void InsertColUndo::Redo() } } -// ----------------------------------------------------------------------------- + // class RemoveColUndo : public SdrUndoAction -// ----------------------------------------------------------------------------- + RemoveColUndo::RemoveColUndo( const TableModelRef& xTable, sal_Int32 nIndex, ColumnVector& aNewCols, CellVector& aCells ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) @@ -330,7 +330,7 @@ RemoveColUndo::RemoveColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col maCells.swap( aCells ); } -// ----------------------------------------------------------------------------- + RemoveColUndo::~RemoveColUndo() { @@ -341,7 +341,7 @@ RemoveColUndo::~RemoveColUndo() } } -// ----------------------------------------------------------------------------- + void RemoveColUndo::Undo() { @@ -352,7 +352,7 @@ void RemoveColUndo::Undo() } } -// ----------------------------------------------------------------------------- + void RemoveColUndo::Redo() { @@ -363,9 +363,9 @@ void RemoveColUndo::Redo() } } -// ----------------------------------------------------------------------------- + // class TableColumnUndo : public SdrUndoAction -// ----------------------------------------------------------------------------- + TableColumnUndo::TableColumnUndo( const TableColumnRef& xCol ) : SdrUndoAction( *xCol->mxTableModel->getSdrTableObj()->GetModel() ) @@ -375,13 +375,13 @@ TableColumnUndo::TableColumnUndo( const TableColumnRef& xCol ) getData( maUndoData ); } -// ----------------------------------------------------------------------------- + TableColumnUndo::~TableColumnUndo() { } -// ----------------------------------------------------------------------------- + void TableColumnUndo::Undo() { @@ -393,14 +393,14 @@ void TableColumnUndo::Undo() setData( maUndoData ); } -// ----------------------------------------------------------------------------- + void TableColumnUndo::Redo() { setData( maRedoData ); } -// ----------------------------------------------------------------------------- + bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) { @@ -408,7 +408,7 @@ bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) return pNext && pNext->mxCol == mxCol; } -// ----------------------------------------------------------------------------- + void TableColumnUndo::setData( const Data& rData ) { @@ -420,7 +420,7 @@ void TableColumnUndo::setData( const Data& rData ) mxCol->maName = rData.maName; } -// ----------------------------------------------------------------------------- + void TableColumnUndo::getData( Data& rData ) { @@ -432,9 +432,9 @@ void TableColumnUndo::getData( Data& rData ) rData.maName = mxCol->maName; } -// ----------------------------------------------------------------------------- + // class TableRowUndo : public SdrUndoAction -// ----------------------------------------------------------------------------- + TableRowUndo::TableRowUndo( const TableRowRef& xRow ) : SdrUndoAction( *xRow->mxTableModel->getSdrTableObj()->GetModel() ) @@ -444,13 +444,13 @@ TableRowUndo::TableRowUndo( const TableRowRef& xRow ) getData( maUndoData ); } -// ----------------------------------------------------------------------------- + TableRowUndo::~TableRowUndo() { } -// ----------------------------------------------------------------------------- + void TableRowUndo::Undo() { @@ -462,14 +462,14 @@ void TableRowUndo::Undo() setData( maUndoData ); } -// ----------------------------------------------------------------------------- + void TableRowUndo::Redo() { setData( maRedoData ); } -// ----------------------------------------------------------------------------- + bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) { @@ -477,7 +477,7 @@ bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) return pNext && pNext->mxRow == mxRow; } -// ----------------------------------------------------------------------------- + void TableRowUndo::setData( const Data& rData ) { @@ -489,7 +489,7 @@ void TableRowUndo::setData( const Data& rData ) mxRow->maName = rData.maName; } -// ----------------------------------------------------------------------------- + void TableRowUndo::getData( Data& rData ) { @@ -501,7 +501,7 @@ void TableRowUndo::getData( Data& rData ) rData.maName = mxRow->maName; } -// ----------------------------------------------------------------------------- + TableStyleUndo::TableStyleUndo( const SdrTableObj& rTableObj ) : SdrUndoAction( *rTableObj.GetModel() ) diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index cce884f49765..a8946a934337 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -36,9 +36,9 @@ #include "svx/xexch.hxx" #include <vcl/svapp.hxx> -// ------------------------ + // - SvxColorValueSetData - -// ------------------------ + class SvxColorValueSetData : public TransferableHelper { @@ -58,14 +58,14 @@ public: maData( rSetItem ) {} }; -// ----------------------------------------------------------------------------- + void SvxColorValueSetData::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_XFA ); } -// ----------------------------------------------------------------------------- + sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { @@ -80,7 +80,7 @@ sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::Da return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor& ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index ae35c5c306b7..eb49b9e77f62 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -131,7 +131,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled ) { @@ -156,7 +156,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled enableEntry( 2, bEnabled ); } -// ----------------------------------------------------------------------- + void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bEnabled ) { @@ -166,7 +166,7 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE enableEntry( 1, bEnabled ); } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -200,7 +200,7 @@ void SAL_CALL ExtrusionDirectionWindow::statusChanged( } } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) { @@ -246,23 +246,23 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionDirectionControl::createPopupWindow( ::Window* pParent ) { return new ExtrusionDirectionWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -271,7 +271,7 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr @@ -280,14 +280,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstan return *new ExtrusionDirectionControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDirectionControl::getImplementationName( ) throw (RuntimeException) { return ExtrusionDirectionControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -352,7 +352,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( AddStatusListener( msMetricUnit ); } -// ----------------------------------------------------------------------- + void ExtrusionDepthWindow::implSetDepth( double fDepth ) { @@ -371,7 +371,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth ) } } -// ----------------------------------------------------------------------- + void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) { @@ -385,7 +385,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) }; } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -419,7 +419,7 @@ void SAL_CALL ExtrusionDepthWindow::statusChanged( } } -// ----------------------------------------------------------------------- + void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -437,7 +437,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) { @@ -500,7 +500,7 @@ ExtrusionDepthController::ExtrusionDepthController( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionDepthController::createPopupWindow( ::Window* pParent ) { @@ -508,16 +508,16 @@ ExtrusionDepthController::ExtrusionDepthController( } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDepthController_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { @@ -526,21 +526,21 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames( return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDepthController::getImplementationName( ) throw (RuntimeException) { return ExtrusionDepthController_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames( ) throw (RuntimeException) { @@ -550,7 +550,7 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames // #################################################################### -// ------------------------------------------------------------------------- + ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING )) @@ -613,7 +613,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr AddStatusListener( msExtrusionLightingIntensity ); } -// ----------------------------------------------------------------------- + void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled ) { @@ -627,7 +627,7 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled ) } } -// ----------------------------------------------------------------------- + void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) { @@ -656,7 +656,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) enableEntry( 3, bEnabled ); } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -690,7 +690,7 @@ void SAL_CALL ExtrusionLightingWindow::statusChanged( } } -// ----------------------------------------------------------------------- + void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -705,7 +705,7 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl ) { @@ -762,23 +762,23 @@ ExtrusionLightingControl::ExtrusionLightingControl( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionLightingControl::createPopupWindow( ::Window* pParent ) { return new ExtrusionLightingWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionLightingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -787,7 +787,7 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr @@ -796,14 +796,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstanc return *new ExtrusionLightingControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionLightingControl::getImplementationName( ) throw (RuntimeException) { return ExtrusionLightingControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -839,7 +839,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( AddStatusListener( msExtrusionSurface ); } -// ----------------------------------------------------------------------- + void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) { @@ -851,7 +851,7 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) } } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -872,7 +872,7 @@ void SAL_CALL ExtrusionSurfaceWindow::statusChanged( } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl) { @@ -907,23 +907,23 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionSurfaceControl::createPopupWindow( ::Window* pParent ) { return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -932,7 +932,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr @@ -941,14 +941,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance return *new ExtrusionSurfaceControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName( ) throw (RuntimeException) { return ExtrusionSurfaceControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -968,21 +968,21 @@ ExtrusionColorControl::ExtrusionColorControl( mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } -// ----------------------------------------------------------------------- + ExtrusionColorControl::~ExtrusionColorControl() { delete mpBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() { @@ -999,7 +999,7 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 92f095e75d2b..c99830464191 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -516,7 +516,7 @@ FillControl::FillControl( Window* pParent, WinBits nStyle ) : aDelayTimer.Start(); } -//------------------------------------------------------------------------ + FillControl::~FillControl() { @@ -524,7 +524,7 @@ FillControl::~FillControl() delete pLbFillAttr; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { @@ -535,7 +535,7 @@ IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) } IMPL_LINK_INLINE_END( FillControl, DelayHdl, Timer *, pTimer ) -//------------------------------------------------------------------------ + IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox ) { @@ -641,7 +641,7 @@ IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) { @@ -772,7 +772,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) return 0; } -//------------------------------------------------------------------------ + void FillControl::Resize() { diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ea0d92491451..c1c6365c3546 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -98,12 +98,12 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent fillFavorites( GALLERY_THEME_FONTWORK ); } -// ----------------------------------------------------------------------- + FontWorkGalleryDialog::~FontWorkGalleryDialog() { } -// ----------------------------------------------------------------------- + void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) { @@ -243,7 +243,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork() } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) { @@ -252,7 +252,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) { @@ -261,7 +261,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) return( 0L ); } -//------------------------------------------------------------------------ + SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem ); FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) @@ -271,20 +271,20 @@ FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + FontWorkShapeTypeControl::~FontWorkShapeTypeControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; //( aLastAction.getLength() == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT ); } -// ----------------------------------------------------------------------- + SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() { @@ -293,7 +293,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() return NULL; } -// ----------------------------------------------------------------------- + void FontWorkShapeTypeControl::Select( sal_Bool ) { @@ -354,7 +354,7 @@ FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rContr AddStatusListener( msFontworkAlignment ); } -// ----------------------------------------------------------------------- + void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled ) { @@ -366,7 +366,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled ) } } -// ----------------------------------------------------------------------- + void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) { @@ -385,7 +385,7 @@ void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateE } } -// ----------------------------------------------------------------------- + void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -401,7 +401,7 @@ void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl) { @@ -442,30 +442,30 @@ public: }; -// ----------------------------------------------------------------------- + FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) { } -// ----------------------------------------------------------------------- + ::Window* FontworkAlignmentControl::createPopupWindow( ::Window* pParent ) { return new FontworkAlignmentWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL FontworkAlignmentControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -474,21 +474,21 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames( return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL FontworkAlignmentControl::getImplementationName( ) throw (RuntimeException) { return FontworkAlignmentControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -517,7 +517,7 @@ private: }; -// ----------------------------------------------------------------------- + FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) @@ -545,7 +545,7 @@ FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxCont AddStatusListener( msFontworkKernCharacterPairs ); } -// ----------------------------------------------------------------------- + void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled ) { @@ -571,7 +571,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact } } -// ----------------------------------------------------------------------- + void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled ) { @@ -579,7 +579,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool b checkEntry( 6, bEnabled ); } -// ----------------------------------------------------------------------- + void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -611,7 +611,7 @@ void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::s } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl) { @@ -685,23 +685,23 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc { } -// ----------------------------------------------------------------------- + ::Window* FontworkCharacterSpacingControl::createPopupWindow( ::Window* pParent ) { return new FontworkCharacterSpacingWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -710,21 +710,21 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServic return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName( ) throw (RuntimeException) { return FontworkCharacterSpacingControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames( ) throw (RuntimeException) { diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 0af1446b99d3..2f87062297c8 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -51,14 +51,14 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot m_aDoubleClickTimer.SetTimeout(nDblClkTime); } -// ----------------------------------------------------------------------- + FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() { m_aDoubleClickTimer.Stop(); } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); @@ -68,7 +68,7 @@ void FormatPaintBrushToolBoxControl::impl_executePaintBrush() , aArgs ); } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::DoubleClick() { m_aDoubleClickTimer.Stop(); @@ -77,14 +77,14 @@ void FormatPaintBrushToolBoxControl::DoubleClick() this->impl_executePaintBrush(); } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::Click() { m_bPersistentCopy = false; m_aDoubleClickTimer.Start(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) { //there was no second click during waiting @@ -92,12 +92,12 @@ IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) return 0; } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::Select( sal_Bool ) { } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 01b221c05155..9591a1c9ae94 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -73,13 +73,13 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB aDelayTimer.Start(); } -// ----------------------------------------------------------------------- + SvxLineBox::~SvxLineBox() { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) { @@ -91,7 +91,7 @@ IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + void SvxLineBox::Select() { @@ -156,7 +156,7 @@ void SvxLineBox::Select() } } -// ----------------------------------------------------------------------- + bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { @@ -185,7 +185,7 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) return LineLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { @@ -212,7 +212,7 @@ bool SvxLineBox::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- + void SvxLineBox::ReleaseFocus_Impl() { @@ -288,13 +288,13 @@ SvxColorBox::SvxColorBox( } } -// ----------------------------------------------------------------------- + SvxColorBox::~SvxColorBox() { } -// ----------------------------------------------------------------------- + void SvxColorBox::Update( const XLineColorItem* pItem ) { @@ -335,7 +335,7 @@ void SvxColorBox::Update( const XLineColorItem* pItem ) SetNoSelection(); } -// ----------------------------------------------------------------------- + void SvxColorBox::Select() { @@ -361,7 +361,7 @@ void SvxColorBox::Select() } } -// ----------------------------------------------------------------------- + bool SvxColorBox::PreNotify( NotifyEvent& rNEvt ) { @@ -391,7 +391,7 @@ bool SvxColorBox::PreNotify( NotifyEvent& rNEvt ) return ColorLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxColorBox::Notify( NotifyEvent& rNEvt ) { @@ -430,7 +430,7 @@ void SvxColorBox::DataChanged( const DataChangedEvent& rDCEvt ) ColorLB::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void SvxColorBox::ReleaseFocus_Impl() { @@ -477,13 +477,13 @@ SvxMetricField::SvxMetricField( Show(); } -// ----------------------------------------------------------------------- + SvxMetricField::~SvxMetricField() { } -// ----------------------------------------------------------------------- + void SvxMetricField::Update( const XLineWidthItem* pItem ) { @@ -496,7 +496,7 @@ void SvxMetricField::Update( const XLineWidthItem* pItem ) SetText( "" ); } -// ----------------------------------------------------------------------- + void SvxMetricField::Modify() { @@ -514,7 +514,7 @@ void SvxMetricField::Modify() aArgs ); } -// ----------------------------------------------------------------------- + void SvxMetricField::ReleaseFocus_Impl() { @@ -526,7 +526,7 @@ void SvxMetricField::ReleaseFocus_Impl() } } -// ----------------------------------------------------------------------- + void SvxMetricField::Down() { @@ -538,21 +538,21 @@ void SvxMetricField::Down() MetricField::Down(); } -// ----------------------------------------------------------------------- + void SvxMetricField::Up() { MetricField::Up(); } -// ----------------------------------------------------------------------- + void SvxMetricField::SetCoreUnit( SfxMapUnit eUnit ) { ePoolUnit = eUnit; } -// ----------------------------------------------------------------------- + void SvxMetricField::RefreshDlgUnit() { @@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit() } } -// ----------------------------------------------------------------------- + bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) { @@ -576,7 +576,7 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) return MetricField::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxMetricField::Notify( NotifyEvent& rNEvt ) { @@ -650,13 +650,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillTypeBox(Window *pPar return new SvxFillTypeBox(pParent); } -// ----------------------------------------------------------------------- + SvxFillTypeBox::~SvxFillTypeBox() { } -// ----------------------------------------------------------------------- + bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) { @@ -677,7 +677,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) return FillTypeLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { @@ -708,7 +708,7 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- + void SvxFillTypeBox::ReleaseFocus_Impl() { @@ -743,13 +743,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillAttrBox(Window *pPar return new SvxFillAttrBox(pParent); } -// ----------------------------------------------------------------------- + SvxFillAttrBox::~SvxFillAttrBox() { } -// ----------------------------------------------------------------------- + bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) { @@ -761,7 +761,7 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) return FillAttrLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { @@ -792,14 +792,14 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- + void SvxFillAttrBox::Select() { FillAttrLB::Select(); } -// ----------------------------------------------------------------------- + void SvxFillAttrBox::ReleaseFocus_Impl() { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 07898e1023f5..1d5aa7688f54 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -98,7 +98,7 @@ private: const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(TableWindow, SelectHdl) { @@ -106,7 +106,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) @@ -154,20 +154,20 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri SetOutputSizePixel( Size( mnTableWidth + 3, mnTableHeight + 33 ) ); } -// ----------------------------------------------------------------------- + TableWindow::~TableWindow() { } -// ----------------------------------------------------------------------- + SfxPopupWindow* TableWindow::Clone() const { return new TableWindow( GetId(), maCommand, GetText(), rTbx, mxFrame ); } -// ----------------------------------------------------------------------- + void TableWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -181,7 +181,7 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt ) Update( nNewCol, nNewLine ); } -// ----------------------------------------------------------------------- + void TableWindow::KeyInput( const KeyEvent& rKEvt ) { @@ -255,7 +255,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) SfxPopupWindow::KeyInput(rKEvt); } -// ----------------------------------------------------------------------- + void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -263,7 +263,7 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } -// ----------------------------------------------------------------------- + void TableWindow::Paint( const Rectangle& ) { @@ -333,7 +333,7 @@ void TableWindow::Paint( const Rectangle& ) } } -// ----------------------------------------------------------------------- + void TableWindow::PopupModeEnd() { @@ -351,7 +351,7 @@ void TableWindow::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); } -// ----------------------------------------------------------------------- + void TableWindow::Update( long nNewCol, long nNewLine ) { @@ -369,7 +369,7 @@ void TableWindow::Update( long nNewCol, long nNewLine ) } } -// ----------------------------------------------------------------------- + void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) { @@ -391,7 +391,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) } } -// ----------------------------------------------------------------------- + void TableWindow::CloseAndShowTableDialog() { @@ -437,7 +437,7 @@ public: sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; } }; -// ----------------------------------------------------------------------- + ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), @@ -474,14 +474,14 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri StartCascading(); } -// ----------------------------------------------------------------------- + SfxPopupWindow* ColumnsWindow::Clone() const { return new ColumnsWindow( GetId(), maCommand, GetText(), rTbx, mxFrame ); } -// ----------------------------------------------------------------------- + void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -561,7 +561,7 @@ void ColumnsWindow::UpdateSize_Impl( long nNewCol ) } Update(); } -// ----------------------------------------------------------------------- + void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -622,7 +622,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) SfxPopupWindow::KeyInput(rKEvt); } -// ----------------------------------------------------------------------- + void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -633,7 +633,7 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } -// ----------------------------------------------------------------------- + void ColumnsWindow::Paint( const Rectangle& ) { @@ -689,7 +689,7 @@ void ColumnsWindow::Paint( const Rectangle& ) DrawRect( Rectangle( 0, 0, aSize.Width() - 1, aSize.Height() - nTextHeight + 1 ) ); } -// ----------------------------------------------------------------------- + void ColumnsWindow::PopupModeEnd() { @@ -724,20 +724,20 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + SvxTableToolBoxControl::~SvxTableToolBoxControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxTableToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow() { @@ -752,7 +752,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow() return 0; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() { @@ -761,7 +761,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() return 0; } -// ----------------------------------------------------------------------- + void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -790,20 +790,20 @@ SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxColumnsToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow() { @@ -818,7 +818,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow() return pWin; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading() { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 451e451eb2cc..29586d4f997a 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,13 +423,13 @@ SfxPopupWindow* SvxLineEndWindow::Clone() const return new SvxLineEndWindow( GetId(), mxFrame, GetText() ); } -// ----------------------------------------------------------------------- + SvxLineEndWindow::~SvxLineEndWindow() { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) { @@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::FillValueSet() { @@ -541,7 +541,7 @@ void SvxLineEndWindow::FillValueSet() } } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::Resize() { @@ -567,7 +567,7 @@ void SvxLineEndWindow::Resize() } } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::Resizing( Size& rNewSize ) { @@ -614,21 +614,21 @@ void SvxLineEndWindow::Resizing( Size& rNewSize ) rNewSize.Width() = nW; rNewSize.Height() = nH; } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::StartSelection() { aLineEndSet.StartSelection(); } -// ----------------------------------------------------------------------- + bool SvxLineEndWindow::Close() { return SfxPopupWindow::Close(); } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::StateChanged( sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState ) @@ -651,7 +651,7 @@ void SvxLineEndWindow::StateChanged( } } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::PopupModeEnd() { @@ -663,7 +663,7 @@ void SvxLineEndWindow::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::SetSize() { @@ -716,20 +716,20 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxLineEndToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() { @@ -744,7 +744,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() return pLineEndWin; } -// ----------------------------------------------------------------------- + void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b46c61c9d4fa..b282f8fb016f 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -88,7 +88,7 @@ #include <editeng/eerdll.hxx> #include <editeng/editrids.hrc> -// ------------------------------------------------------------------------ + #define MAX_MRU_FONTNAME_ENTRIES 5 #define LOGICAL_EDIT_HEIGHT 12 @@ -360,7 +360,7 @@ SvxStyleBox_Impl::~SvxStyleBox_Impl() { } -// ----------------------------------------------------------------------- + void SvxStyleBox_Impl::ReleaseFocus() { @@ -373,7 +373,7 @@ void SvxStyleBox_Impl::ReleaseFocus() m_xFrame->getContainerWindow()->setFocus(); } -// ----------------------------------------------------------------------- + void SvxStyleBox_Impl::Select() { @@ -463,14 +463,14 @@ void SvxStyleBox_Impl::Select() } } } -// ----------------------------------------------------------------------- + void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily ) { eStyleFamily = eNewFamily; } -// ----------------------------------------------------------------------- + bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -487,7 +487,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -707,7 +707,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) } } -//-------------------------------------------------------------------- + IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl ) { @@ -717,7 +717,7 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl ) return 0; } -// ----------------------------------------------------------------------- + static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) { @@ -819,7 +819,7 @@ SvxFontNameBox_Impl::~SvxFontNameBox_Impl() GetSubEdit()->RemoveEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont )); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::FillList() { @@ -860,7 +860,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent*, event return 0; } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem ) { @@ -877,7 +877,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem ) SetText( aCurName ); } -// ----------------------------------------------------------------------- + bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -891,7 +891,7 @@ bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) return FontNameBox::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -936,7 +936,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) return nHandled || FontNameBox::Notify( rNEvt ); } -// --------------------------------------------------------------------------- + void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -950,7 +950,7 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) FontNameBox::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::ReleaseFocus_Impl() { @@ -963,7 +963,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl() m_xFrame->getContainerWindow()->setFocus(); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::EnableControls_Impl() { @@ -982,7 +982,7 @@ void SvxFontNameBox_Impl::EnableControls_Impl() EnableWYSIWYG( bEnable ); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) { @@ -1164,7 +1164,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent(), mLastColor ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) { @@ -1216,28 +1216,28 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxColorWindow_Impl::Resize() { lcl_ResizeValueSet( *this, aColorSet); } -// ----------------------------------------------------------------------- + void SvxColorWindow_Impl::StartSelection() { aColorSet.StartSelection(); } -// ----------------------------------------------------------------------- + bool SvxColorWindow_Impl::Close() { return SfxPopupWindow::Close(); } -// ----------------------------------------------------------------------- + void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -1352,7 +1352,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) aFrameSet.SetItemImage( i, aImgList.GetImage( i ) ); } } -// ----------------------------------------------------------------------- + #define FRM_VALID_LEFT 0x01 #define FRM_VALID_RIGHT 0x02 @@ -1478,14 +1478,14 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxFrameWindow_Impl::Resize() { lcl_ResizeValueSet( *this, aFrameSet); } -// ----------------------------------------------------------------------- + void SvxFrameWindow_Impl::StateChanged( @@ -1528,14 +1528,14 @@ void SvxFrameWindow_Impl::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } -// ----------------------------------------------------------------------- + void SvxFrameWindow_Impl::StartSelection() { aFrameSet.StartSelection(); } -// ----------------------------------------------------------------------- + bool SvxFrameWindow_Impl::Close() { @@ -1611,7 +1611,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const return new SvxLineWindow_Impl( GetId(), GetFrame(), GetParent() ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) { @@ -1643,28 +1643,28 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxLineWindow_Impl::Resize() { m_aLineStyleLb.Resize(); } -// ----------------------------------------------------------------------- + bool SvxLineWindow_Impl::Close() { return SfxPopupWindow::Close(); } -// ----------------------------------------------------------------------- + Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() { return &m_aLineStyleLb; } -// ----------------------------------------------------------------------- + void SvxLineWindow_Impl::GetFocus() { @@ -1683,7 +1683,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) #endif } -// ----------------------------------------------------------------------- + //######################################################################## // Helper classes @@ -1702,7 +1702,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( { } -// ----------------------------------------------------------------------- + void SfxStyleControllerItem_Impl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -1862,13 +1862,13 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl( } } -// ----------------------------------------------------------------------- + SvxStyleToolBoxControl::~SvxStyleToolBoxControl() { delete pImpl; } -// ----------------------------------------------------------------------- + void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException) { @@ -1919,7 +1919,7 @@ throw (::com::sun::star::uno::RuntimeException) DELETEZ( pImpl ); } -// ----------------------------------------------------------------------- + void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException) { // Do nothing, we will start binding our listener when we are visible. @@ -1934,7 +1934,7 @@ void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException) } } -// ----------------------------------------------------------------------- + SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() { @@ -1952,7 +1952,7 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() return SFX_STYLE_FAMILY_PARA; } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::FillStyleBox() { @@ -2068,7 +2068,7 @@ void SvxStyleToolBoxControl::FillStyleBox() } } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName ) { @@ -2090,7 +2090,7 @@ void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName ) } } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::Update() { @@ -2111,7 +2111,7 @@ void SvxStyleToolBoxControl::Update() return; } - //-------------------------------------------------------------------- + const SfxTemplateItem* pItem = NULL; if ( nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1]) ) @@ -2141,7 +2141,7 @@ void SvxStyleToolBoxControl::Update() SelectStyle( pItem->GetStyleName() ); } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, const SfxTemplateItem* pItem ) @@ -2154,7 +2154,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, Update(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification) { @@ -2180,7 +2180,7 @@ IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification) return 0; } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::StateChanged( @@ -2220,7 +2220,7 @@ void SvxStyleToolBoxControl::StateChanged( Update(); } -// ----------------------------------------------------------------------- + Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -2253,7 +2253,7 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl( { } -// ----------------------------------------------------------------------- + void SvxFontNameToolBoxControl::StateChanged( @@ -2291,7 +2291,7 @@ void SvxFontNameToolBoxControl::StateChanged( rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); } -// ----------------------------------------------------------------------- + Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -2318,21 +2318,21 @@ SvxFontColorToolBoxControl::SvxFontColorToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SvxFontColorToolBoxControl::~SvxFontColorToolBoxControl() { delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFontColorToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow() { @@ -2352,7 +2352,7 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxFontColorToolBoxControl::StateChanged( @@ -2393,21 +2393,21 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } -// ----------------------------------------------------------------------- + SvxColorToolBoxControl::~SvxColorToolBoxControl() { delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() { @@ -2428,7 +2428,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxColorToolBoxControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) @@ -2501,21 +2501,21 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl( pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } -// ----------------------------------------------------------------------- + SvxColorExtToolBoxControl::~SvxColorExtToolBoxControl() { delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxColorExtToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONTIMEOUT; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow() { @@ -2551,7 +2551,7 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxColorExtToolBoxControl::StateChanged( @@ -2582,7 +2582,7 @@ void SvxColorExtToolBoxControl::StateChanged( } } -// ----------------------------------------------------------------------- + void SvxColorExtToolBoxControl::Select( sal_Bool ) { @@ -2643,14 +2643,14 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow() { @@ -2667,7 +2667,7 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow() return pFrameWin; } -// ----------------------------------------------------------------------- + void SvxFrameToolBoxControl::StateChanged( @@ -2697,14 +2697,14 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow() { @@ -2718,7 +2718,7 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow() return pLineWin; } -// ----------------------------------------------------------------------- + void SvxFrameLineStyleToolBoxControl::StateChanged( @@ -2749,7 +2749,7 @@ SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SvxFrameLineColorToolBoxControl::~SvxFrameLineColorToolBoxControl() { @@ -2757,14 +2757,14 @@ SvxFrameLineColorToolBoxControl::~SvxFrameLineColorToolBoxControl() delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFrameLineColorToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() { @@ -2783,7 +2783,7 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxFrameLineColorToolBoxControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) @@ -2815,13 +2815,13 @@ SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sa aDefaultText = rTbx.GetItemText( nId ); } -// ----------------------------------------------------------------------- + SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController() { } -// ----------------------------------------------------------------------- + void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -2847,7 +2847,7 @@ static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) rValueSet.SetPosSizePixel( Point(2,2), aSize ); } -// ----------------------------------------------------------------------- + static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { @@ -2857,7 +2857,7 @@ static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size rWin.SetOutputSizePixel( aSize ); } -// ----------------------------------------------------------------------------- + Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible() { FillList(); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index c2ad93a71096..62806157d50d 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -135,7 +135,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( SetText( "" ); } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::ReleaseFocus_Impl() { @@ -149,7 +149,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl() m_xFrame->getContainerWindow()->setFocus(); } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::Select() { @@ -173,7 +173,7 @@ void SvxFontSizeBox_Impl::Select() } } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) { @@ -195,7 +195,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) SaveValue(); } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescriptor& rCurrentFont ) { @@ -221,7 +221,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto m_aCurText = GetText(); // zum R"ucksetzen bei ESC merken } -// ----------------------------------------------------------------------- + bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -271,7 +271,7 @@ void SvxFontSizeBox_Impl::SetOptimalSize() SetDropDownSizePixel(aDropSize); } -// --------------------------------------------------------------------------- + void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 98cbbe0cdf28..a446d4e8dab0 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -239,7 +239,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) } -//----------------------------------------------------------------------------------------------------------- + // SearchToolbarControllersManager SearchToolbarControllersManager::SearchToolbarControllersManager() @@ -346,7 +346,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag return xStatusListener; } -//----------------------------------------------------------------------------------------------------------- + // FindTextToolbarController FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) return 0; } -//----------------------------------------------------------------------------------------------------------- + // class UpDownSearchToolboxController UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, Type eType ) @@ -597,7 +597,7 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe { } -//----------------------------------------------------------------------------------------------------------- + // MatchCaseToolboxController MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) @@ -695,7 +695,7 @@ void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::Featu { } -//----------------------------------------------------------------------------------------------------------- + // class FindAllToolboxController FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -782,7 +782,7 @@ void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::Feature { } -//----------------------------------------------------------------------------------------------------------- + // class ExitSearchToolboxController ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -880,7 +880,7 @@ void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::Feat { } -//----------------------------------------------------------------------------------------------------------- + // class SearchLabelToolboxController SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -962,7 +962,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController:: return VCLUnoHelper::GetInterface(pSL); } -//----------------------------------------------------------------------------------------------------------- + // class FindbarDispatcher FindbarDispatcher::FindbarDispatcher() diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 4c33fbb9bf26..b83be60f60ef 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -62,7 +62,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void ToolboxAccess::toggleToolbox() const { try @@ -94,7 +94,7 @@ namespace svx } } - //-------------------------------------------------------------------- + bool ToolboxAccess::isToolboxVisible() const { return ( m_xLayouter.is() && m_xLayouter->isElementVisible( m_sToolboxResName ) ); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 2396145eda09..f561fb9e7746 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -72,13 +72,13 @@ namespace svx } } - // ----------------------------------------------------------------------- + ToolboxButtonColorUpdater::~ToolboxButtonColorUpdater() { } - // ----------------------------------------------------------------------- + void ToolboxButtonColorUpdater::Update( const Color& rColor ) { diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 2453f4593d72..cac037a5fdb7 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -41,7 +41,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlDraw, SfxAllEnumItem); using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; -// ----------------------------------------------------------------------- + SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : @@ -54,7 +54,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) @@ -68,14 +68,14 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, GetId(), xLayoutMgr->isElementVisible( m_sToolboxName ) != sal_False ); } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxTbxCtlDraw::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + void SvxTbxCtlDraw::toggleToolbox() { @@ -99,7 +99,7 @@ void SvxTbxCtlDraw::toggleToolbox() } } -// ----------------------------------------------------------------------- + void SvxTbxCtlDraw::Select( sal_Bool ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 0e07e5105a5b..8743580b333d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -337,9 +337,9 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 return pItem; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + + DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index af28cbb6ddbd..44f731b69315 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -101,7 +101,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) throw(un //not implemented - fell free to do so, if you do need this } -//------------------------------------------------------------------------- + void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -122,7 +122,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno } } -//------------------------------------------------------------------------- + sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeException) { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; @@ -152,7 +152,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc return nRet; } -//------------------------------------------------------------------------- + // lang::XComponent void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeException) @@ -190,7 +190,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Refe m_aDisposeEventListeners.removeInterface( xListener ); } -//------------------------------------------------------------------------- + // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo( ) throw (uno::RuntimeException) diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 65c03157ce75..a17a5fad15bc 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -115,7 +115,7 @@ namespace svx using namespace ::svx; -// ------------- + NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { @@ -182,7 +182,7 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) return false; } -// ------------- + NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ) : mpWhichIds( pWhichIds ), mpPool( pPool ) diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 4f4266d11905..dfdb83596669 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -47,7 +47,7 @@ namespace { class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , css::frame::XSynchronousDispatch > // => XDispatch! { - //------------------------------------------- + // const, types, etcpp. private: @@ -59,7 +59,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo E_DO_RECOVERY, }; - //------------------------------------------- + // member private: @@ -75,19 +75,19 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo /** @short TODO */ css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short TODO */ RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext); - //--------------------------------------- + /** @short TODO */ virtual ~RecoveryUI(); - //--------------------------------------- + // css.lang.XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -99,12 +99,12 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); - //--------------------------------------- + virtual com::sun::star::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , @@ -118,7 +118,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo const css::util::URL& aURL ) throw(css::uno::RuntimeException); - //------------------------------------------- + // helper private: diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 2a401e7161fa..b208dfbfcb5c 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -92,13 +92,13 @@ namespace svx //==================================================================== //= PropertyValueProvider //==================================================================== - //-------------------------------------------------------------------- + OUString PropertyValueProvider::getPropertyName() const { return m_sPropertyName; } - //-------------------------------------------------------------------- + void PropertyValueProvider::getCurrentValue( Any& _out_rValue ) const { Reference< XPropertySet > xContextProps( const_cast< PropertyValueProvider* >( this )->m_rContext, UNO_QUERY_THROW ); @@ -108,18 +108,18 @@ namespace svx //==================================================================== //= PropertyChangeNotifier //==================================================================== - //-------------------------------------------------------------------- + PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex ) :m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) { } - //-------------------------------------------------------------------- + PropertyChangeNotifier::~PropertyChangeNotifier() { } - //-------------------------------------------------------------------- + void PropertyChangeNotifier::registerProvider( const ShapeProperty _eProperty, const PPropertyValueProvider _pProvider ) { ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); @@ -131,7 +131,7 @@ namespace svx m_pData->m_aProviders[ _eProperty ] = _pProvider; } - //-------------------------------------------------------------------- + void PropertyChangeNotifier::notifyPropertyChange( const ShapeProperty _eProperty ) const { ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); @@ -167,19 +167,19 @@ namespace svx } } - //-------------------------------------------------------------------- + void PropertyChangeNotifier::addPropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { m_pData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); } - //-------------------------------------------------------------------- + void PropertyChangeNotifier::removePropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { m_pData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); } - //-------------------------------------------------------------------- + void PropertyChangeNotifier::disposing() { EventObject aEvent; diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 90fc9905847a..627019725cc3 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -41,12 +41,12 @@ SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() SetShapeType( OUString( "com.sun.star.drawing.TableShape" ) ); } -//---------------------------------------------------------------------- + SvxTableShape::~SvxTableShape() throw() { } -//---------------------------------------------------------------------- + bool SvxTableShape::setPropertyValueImpl( const OUString& rName, diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 7a7abf07057d..5dd9ed6f136a 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -851,7 +851,7 @@ namespace { } } -//---------------------------------------------------------------------- + OUString UHashMap::getNameFromId(sal_uInt32 nId) { const UHashMapImpl &rMap = GetUHashImpl(); @@ -903,7 +903,7 @@ SvxUnoPropertyMapProvider& getSvxMapProvider() return theSvxMapProvider::get(); } -// --------------------------------------------------------------------- + SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { @@ -920,7 +920,7 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() delete aSetArr[i]; } -// --------------------------------------------------------------------- + const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index fc2285106307..bc4f6fafccd2 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -81,19 +81,19 @@ SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw( { } -//---------------------------------------------------------------------- + SvxShapeGroup::~SvxShapeGroup() throw() { } -//---------------------------------------------------------------------- + void SvxShapeGroup::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { SvxShape::Create( pNewObj, pNewPage ); mxPage = pNewPage; } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeGroup::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { @@ -144,7 +144,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() // ::com::sun::star::drawing::XShape -//---------------------------------------------------------------------- + OUString SAL_CALL SvxShapeGroup::getShapeType() throw( uno::RuntimeException ) { @@ -157,20 +157,20 @@ awt::Point SAL_CALL SvxShapeGroup::getPosition() throw(uno::RuntimeException) return SvxShape::getPosition(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno::RuntimeException) { SvxShape::setPosition(Position); } -//---------------------------------------------------------------------- + awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException) { return SvxShape::getSize(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize ) throw(beans::PropertyVetoException, uno::RuntimeException) { @@ -179,14 +179,14 @@ void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize ) // drawing::XShapeGroup -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeGroup::enterGroup( ) throw(uno::RuntimeException) { // Todo // pDrView->EnterMarkedGroup(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException) { // Todo @@ -241,7 +241,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap addUnoShape(xShape, 0xFFFF); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { @@ -314,7 +314,7 @@ void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >& // XIndexAccess -//---------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException ) { ::SolarMutexGuard aGuard; @@ -329,7 +329,7 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException ) return nRetval; } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -352,13 +352,13 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) // ::com::sun::star::container::XElementAccess -//---------------------------------------------------------------------- + uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException ) { return ::getCppuType(( const Reference< drawing::XShape >*)0); } -//---------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException ) { ::SolarMutexGuard aGuard; @@ -366,7 +366,7 @@ sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException ) return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0); } -//---------------------------------------------------------------------- + // ::com::sun::star::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames() @@ -384,12 +384,12 @@ SvxShapeConnector::SvxShapeConnector( SdrObject* pObj ) throw() : { } -//---------------------------------------------------------------------- + SvxShapeConnector::~SvxShapeConnector() throw() { } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) @@ -439,7 +439,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() // ::com::sun::star::drawing::XShape -//---------------------------------------------------------------------- + OUString SAL_CALL SvxShapeConnector::getShapeType() throw( uno::RuntimeException ) { @@ -452,27 +452,27 @@ awt::Point SAL_CALL SvxShapeConnector::getPosition() throw(uno::RuntimeException return SvxShapeText::getPosition(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw(uno::RuntimeException) { SvxShapeText::setPosition(Position); } -//---------------------------------------------------------------------- + awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException) { return SvxShapeText::getSize(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) throw(beans::PropertyVetoException, uno::RuntimeException) { SvxShapeText::setSize( rSize ); } -//---------------------------------------------------------------------- + // XConnectorShape @@ -490,7 +490,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC mpModel->SetChanged(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException ) { @@ -506,7 +506,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon mpModel->SetChanged(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& ) throw( uno::RuntimeException ) { @@ -519,7 +519,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing: mpModel->SetChanged(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& ) throw( uno::RuntimeException ) { @@ -532,9 +532,9 @@ void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::X mpModel->SetChanged(); } -//---------------------------------------------------------------------- + // ::com::sun::star::lang::XServiceInfo -//---------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames() throw( uno::RuntimeException ) { return SvxShapeText::getSupportedServiceNames(); @@ -552,13 +552,13 @@ SvxShapeControl::SvxShapeControl( SdrObject* pObj ) throw() : setShapeKind( OBJ_UNO ); } -//---------------------------------------------------------------------- + SvxShapeControl::~SvxShapeControl() throw() { DBG_DTOR(SvxShapeControl,NULL); } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeControl::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { @@ -606,7 +606,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() // ::com::sun::star::drawing::XShape -//---------------------------------------------------------------------- + OUString SAL_CALL SvxShapeControl::getShapeType() throw( uno::RuntimeException ) { @@ -619,27 +619,27 @@ awt::Point SAL_CALL SvxShapeControl::getPosition() throw(uno::RuntimeException) return SvxShapeText::getPosition(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(uno::RuntimeException) { SvxShapeText::setPosition(Position); } -//---------------------------------------------------------------------- + awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException) { return SvxShapeText::getSize(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize ) throw(beans::PropertyVetoException, uno::RuntimeException) { SvxShapeText::setSize( rSize ); } -//---------------------------------------------------------------------- + // XControlShape Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() @@ -656,7 +656,7 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() return xModel; } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl ) throw( uno::RuntimeException ) { @@ -1009,13 +1009,13 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aProperty * class SvxShapeDimensioning * ***********************************************************************/ -//---------------------------------------------------------------------- + SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_DIMENSIONING), getSvxMapProvider().GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) ) { } -//---------------------------------------------------------------------- + SvxShapeDimensioning::~SvxShapeDimensioning() throw() { } @@ -1030,13 +1030,13 @@ uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceName * * ***********************************************************************/ -//---------------------------------------------------------------------- + SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CIRCLE), getSvxMapProvider().GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { } -//---------------------------------------------------------------------- + SvxShapeCircle::~SvxShapeCircle() throw() { } @@ -1054,7 +1054,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th #include <svx/svdopath.hxx> -//---------------------------------------------------------------------- + SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew ) throw( com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException) : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) ) @@ -1062,7 +1062,7 @@ SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind { } -//---------------------------------------------------------------------- + SvxShapePolyPolygon::~SvxShapePolyPolygon() throw() { } @@ -1099,7 +1099,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c return aRetval; } -//---------------------------------------------------------------------- + bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1209,7 +1209,7 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo } } -//---------------------------------------------------------------------- + bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1281,13 +1281,13 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx return true; } -//---------------------------------------------------------------------- + drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw() { return mePolygonKind; } -//---------------------------------------------------------------------- + void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw() { ::SolarMutexGuard aGuard; @@ -1296,7 +1296,7 @@ void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw( ((SdrPathObj*)mpObj.get())->SetPathPoly(rNew); } -//---------------------------------------------------------------------- + basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw() { ::SolarMutexGuard aGuard; @@ -1322,19 +1322,19 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames ***********************************************************************/ #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/FlagSequence.hpp> -//---------------------------------------------------------------------- + SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pObj , drawing::PolygonKind eNew ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGONBEZIER), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()) ) , mePolygonKind( eNew ) { } -//---------------------------------------------------------------------- + SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() { } -//---------------------------------------------------------------------- + bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1377,7 +1377,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1416,13 +1416,13 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con return true; } -//---------------------------------------------------------------------- + drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw() { return mePolygonKind; } -//---------------------------------------------------------------------- + void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw() { ::SolarMutexGuard aGuard; @@ -1431,7 +1431,7 @@ void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) static_cast<SdrPathObj*>(mpObj.get())->SetPathPoly(rNew); } -//---------------------------------------------------------------------- + basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw() { ::SolarMutexGuard aGuard; @@ -1465,18 +1465,18 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic #include <toolkit/helper/vclunohelper.hxx> -//---------------------------------------------------------------------- + SvxGraphicObject::SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_GRAPHICOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer) { } -//---------------------------------------------------------------------- + SvxGraphicObject::~SvxGraphicObject() throw() { } -//---------------------------------------------------------------------- + bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1631,7 +1631,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte return true; } -//---------------------------------------------------------------------- + bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1746,19 +1746,19 @@ SvxCustomShape::SvxCustomShape( SdrObject* pObj ) throw() : { } -//---------------------------------------------------------------------- + SvxCustomShape::~SvxCustomShape() throw() { } -//---------------------------------------------------------------------- + void SvxCustomShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { SvxShapeText::Create( pNewObj, pNewPage ); } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) @@ -1785,7 +1785,7 @@ void SAL_CALL SvxCustomShape::release() throw ( ) SvxShapeText::release(); } -//---------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() throw (uno::RuntimeException) @@ -1806,7 +1806,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() // ::com::sun::star::drawing::XShape -//---------------------------------------------------------------------- + OUString SAL_CALL SvxCustomShape::getShapeType() throw( uno::RuntimeException ) { @@ -1895,29 +1895,29 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException) return SvxShape::getPosition(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxCustomShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException) { SvxShapeText::setPosition(Position); } -//---------------------------------------------------------------------- + awt::Size SAL_CALL SvxCustomShape::getSize() throw(uno::RuntimeException) { return SvxShapeText::getSize(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize ) throw(beans::PropertyVetoException, uno::RuntimeException) { SvxShapeText::setSize( rSize ); } -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- + + void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException) { @@ -1997,7 +1997,7 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP return SvxShape::getPropertyValueImpl( rName, pProperty, rValue ); } } -//---------------------------------------------------------------------- + void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 2f343d6208ba..3745fec1fa44 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -60,26 +60,26 @@ using namespace ::com::sun::star::container; * class Svx3DSceneObject * ***********************************************************************/ -//---------------------------------------------------------------------- + Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSCENEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) , mxPage( pDrawPage ) { } -//---------------------------------------------------------------------- + Svx3DSceneObject::~Svx3DSceneObject() throw() { } -//---------------------------------------------------------------------- + void Svx3DSceneObject::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { SvxShape::Create( pNewObj, pNewPage ); mxPage = pNewPage; } -//---------------------------------------------------------------------- + uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aAny; @@ -128,7 +128,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId() return theSvx3DSceneObjectImplementationId::get().getSeq(); } -//---------------------------------------------------------------------- + void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException) { @@ -157,7 +157,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape mpModel->SetChanged(); } -//---------------------------------------------------------------------- + void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { @@ -198,7 +198,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha } } -//---------------------------------------------------------------------- + sal_Int32 SAL_CALL Svx3DSceneObject::getCount() throw( uno::RuntimeException ) { @@ -211,7 +211,7 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount() return nRetval; } -//---------------------------------------------------------------------- + uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) @@ -234,7 +234,7 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) return aAny; } -//---------------------------------------------------------------------- + // ::com::sun::star::container::XElementAccess uno::Type SAL_CALL Svx3DSceneObject::getElementType() @@ -243,7 +243,7 @@ uno::Type SAL_CALL Svx3DSceneObject::getElementType() return ::getCppuType(( const Reference< drawing::XShape>*)0); } -//---------------------------------------------------------------------- + sal_Bool SAL_CALL Svx3DSceneObject::hasElements() throw( uno::RuntimeException ) { @@ -252,7 +252,7 @@ sal_Bool SAL_CALL Svx3DSceneObject::hasElements() return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0); } -//---------------------------------------------------------------------- + static bool ConvertHomogenMatrixToObject( E3dObject* pObject, const Any& rValue ) { @@ -305,7 +305,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue ) rValue <<= aHomMat; } -//---------------------------------------------------------------------- + #include <svx/svditer.hxx> struct ImpRememberTransAndRect @@ -424,7 +424,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool Svx3DSceneObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -482,18 +482,18 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() * * ***********************************************************************/ -//---------------------------------------------------------------------- + Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DCUBEOBJEKT), getSvxMapProvider().GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } -//---------------------------------------------------------------------- + Svx3DCubeObject::~Svx3DCubeObject() throw() { } -//---------------------------------------------------------------------- + bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -549,7 +549,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -613,18 +613,18 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() * * ***********************************************************************/ -//---------------------------------------------------------------------- + Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } -//---------------------------------------------------------------------- + Svx3DSphereObject::~Svx3DSphereObject() throw() { } -//---------------------------------------------------------------------- + bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -670,7 +670,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -729,13 +729,13 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() * * ***********************************************************************/ -//---------------------------------------------------------------------- + Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DLATHEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } -//---------------------------------------------------------------------- + Svx3DLatheObject::~Svx3DLatheObject() throw() { } @@ -828,7 +828,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& rValue <<= aRetval; } -//---------------------------------------------------------------------- + bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -876,7 +876,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) @@ -942,12 +942,12 @@ Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw() { } -//---------------------------------------------------------------------- + Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() { } -//---------------------------------------------------------------------- + bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -984,7 +984,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -1048,18 +1048,18 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( * * ***********************************************************************/ -//---------------------------------------------------------------------- + Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DPOLYGONOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ) { } -//---------------------------------------------------------------------- + Svx3DPolygonObject::~Svx3DPolygonObject() throw() { } -//---------------------------------------------------------------------- + bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1133,7 +1133,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index f0047142ca44..96ce7103a8e9 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -796,12 +796,12 @@ SvxMediaShape::SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw( SetShapeType( OUString( "com.sun.star.drawing.MediaShape" ) ); } -//---------------------------------------------------------------------- + SvxMediaShape::~SvxMediaShape() throw() { } -//---------------------------------------------------------------------- + bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -890,7 +890,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr throw IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 0fa267c60753..8b7b6766d3d7 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -163,7 +163,7 @@ protected: } }; -//---------------------------------------------------------------------- + class ShapeSizeProvider : public PropertyValueProvider { public: @@ -199,7 +199,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw() impl_construct(); } -//---------------------------------------------------------------------- + SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw() : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) @@ -214,7 +214,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, impl_construct(); } -//---------------------------------------------------------------------- + SvxShape::SvxShape() throw() : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) @@ -229,7 +229,7 @@ SvxShape::SvxShape() throw() impl_construct(); } -//---------------------------------------------------------------------- + SvxShape::~SvxShape() throw() { ::SolarMutexGuard aGuard; @@ -257,14 +257,14 @@ SvxShape::~SvxShape() throw() DBG_DTOR(SvxShape,NULL); } -//---------------------------------------------------------------------- + void SvxShape::TakeSdrObjectOwnership() { mpImpl->mbHasSdrObjectOwnership = true; } -//---------------------------------------------------------------------- + bool SvxShape::HasSdrObjectOwnership() const { @@ -275,28 +275,28 @@ bool SvxShape::HasSdrObjectOwnership() const return mpObj.is(); } -//---------------------------------------------------------------------- + void SvxShape::setShapeKind( sal_uInt32 nKind ) { mpImpl->mnObjId = nKind; } -//---------------------------------------------------------------------- + sal_uInt32 SvxShape::getShapeKind() const { return mpImpl->mnObjId; } -//---------------------------------------------------------------------- + void SvxShape::setMaster( SvxShapeMaster* pMaster ) { mpImpl->mpMaster = pMaster; } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException) { @@ -320,7 +320,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() t return theSvxShapeUnoTunnelId::get().getSeq(); } -//---------------------------------------------------------------------- + SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& xInt ) { uno::Reference< lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY ); @@ -330,7 +330,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& return NULL; } -//---------------------------------------------------------------------- + sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) \ { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -343,13 +343,13 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence } } -//---------------------------------------------------------------------- + ::svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier() { return mpImpl->maPropertyNotifier; } -//---------------------------------------------------------------------- + void SvxShape::impl_construct() { mpImpl->maPropertyNotifier.registerProvider( ::svx::eShapePosition, @@ -361,7 +361,7 @@ void SvxShape::impl_construct() impl_initFromSdrObject(); } -//---------------------------------------------------------------------- + void SvxShape::impl_initFromSdrObject() { DBG_TESTSOLARMUTEX(); @@ -416,7 +416,7 @@ void SvxShape::impl_initFromSdrObject() } } -//---------------------------------------------------------------------- + void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) { DBG_TESTSOLARMUTEX(); @@ -470,7 +470,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) } } -//---------------------------------------------------------------------- + void SvxShape::ChangeModel( SdrModel* pNewModel ) { @@ -504,7 +504,7 @@ void SvxShape::ChangeModel( SdrModel* pNewModel ) mpImpl->mpMaster->modelChanged( pNewModel ); } -//---------------------------------------------------------------------- + void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() { @@ -560,7 +560,7 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon } } -//---------------------------------------------------------------------- + void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() { DBG_TESTSOLARMUTEX(); @@ -616,7 +616,7 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) cons } } -//---------------------------------------------------------------------- + void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap ) { @@ -677,7 +677,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) } } -//---------------------------------------------------------------------- + uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw() { @@ -730,7 +730,7 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw return aAny; } -//---------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() throw (uno::RuntimeException) @@ -745,7 +745,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() } } -//---------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() throw(uno::RuntimeException) @@ -1024,7 +1024,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() } } -//---------------------------------------------------------------------- + uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() throw (uno::RuntimeException) @@ -1049,16 +1049,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() return pID->getImplementationId() ; } -//---------------------------------------------------------------------- + Reference< uno::XInterface > SvxShape_NewInstance() { return uno::Reference< uno::XInterface >(static_cast< OWeakObject* >( new SvxShape() ) ); } -//---------------------------------------------------------------------- + // SfxListener -//---------------------------------------------------------------------- + void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() { @@ -1115,7 +1115,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() // XShape -//---------------------------------------------------------------------- + // The "*LogicRectHack" functions also existed in sch, and those // duplicate symbols cause Bad Things To Happen (TM) #i9462#. // Prefixing with 'svx' and marking static to make sure name collisions @@ -1147,7 +1147,7 @@ static bool svx_needLogicRectHack( SdrObject* pObj ) return false; } -//---------------------------------------------------------------------- + static Rectangle svx_getLogicRectHack( SdrObject* pObj ) { @@ -1161,7 +1161,7 @@ static Rectangle svx_getLogicRectHack( SdrObject* pObj ) } } -//---------------------------------------------------------------------- + static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) { @@ -1175,7 +1175,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) } } -//---------------------------------------------------------------------- + awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException) { @@ -1199,7 +1199,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException) } } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1229,7 +1229,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run maPosition = Position; } -//---------------------------------------------------------------------- + awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1245,7 +1245,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException) return maSize; } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) throw(beans::PropertyVetoException, uno::RuntimeException) { @@ -1296,7 +1296,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) maSize = rSize; } -//---------------------------------------------------------------------- + // XNamed OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeException) @@ -1312,7 +1312,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce } } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { @@ -1329,7 +1329,7 @@ void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star: // XShapeDescriptor -//---------------------------------------------------------------------- + OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException) { if( !maShapeType.getLength() ) @@ -1340,7 +1340,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException) // XComponent -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1398,7 +1398,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException) } } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener ) throw(uno::RuntimeException) @@ -1406,7 +1406,7 @@ void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener mpImpl->maDisposeListeners.addInterface(xListener); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException) { @@ -1415,7 +1415,7 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen // XPropertySet -//---------------------------------------------------------------------- + Reference< beans::XPropertySetInfo > SAL_CALL SvxShape::getPropertySetInfo() throw(uno::RuntimeException) @@ -1436,7 +1436,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL return mpPropSet->getPropertySetInfo(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1444,7 +1444,7 @@ void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName mpImpl->maPropertyNotifier.addPropertyChangeListener( _propertyName, _listener ); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1452,21 +1452,21 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN mpImpl->maPropertyNotifier.removePropertyChangeListener( _propertyName, _listener ); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } -//---------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { @@ -1485,7 +1485,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN } } -//---------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) { @@ -1616,7 +1616,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN return sal_True; } -//---------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ) { @@ -1669,7 +1669,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN return sal_False; } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1800,7 +1800,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const } } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1811,7 +1811,7 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) return _getPropertyValue( PropertyName ); } -//---------------------------------------------------------------------- + uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1870,7 +1870,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) return aAny; } -//---------------------------------------------------------------------- + // XMultiPropertySet void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) @@ -1932,7 +1932,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence mpObj->SetMergedItemSetAndBroadcast( *mpImpl->mpItemSet ); } -//---------------------------------------------------------------------- + void SvxShape::endSetPropertyValues() { @@ -1944,7 +1944,7 @@ void SvxShape::endSetPropertyValues() } } -//---------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException) { @@ -2001,7 +2001,7 @@ void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno:: { } -//---------------------------------------------------------------------- + uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const { @@ -2082,7 +2082,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE return aAny; } -//---------------------------------------------------------------------- + // XPropertyState beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName ) @@ -2166,7 +2166,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope return eState; } -//---------------------------------------------------------------------- + bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -2612,7 +2612,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl throw lang::IllegalArgumentException(); } -//---------------------------------------------------------------------- + bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -3000,7 +3000,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl return true; } -//---------------------------------------------------------------------- + bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { @@ -3031,7 +3031,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty return true; } -//---------------------------------------------------------------------- + bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { @@ -3052,7 +3052,7 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp } } -//---------------------------------------------------------------------- + uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) @@ -3069,7 +3069,7 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons return aRet; } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) @@ -3102,7 +3102,7 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) mpModel->SetChanged(); } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3191,11 +3191,11 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( return uno::Sequence<uno::Any>( &ret[0], ret.size() ); } -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- + + // XServiceInfo -//---------------------------------------------------------------------- + OUString SAL_CALL SvxShape::getImplementationName() throw(uno::RuntimeException) { @@ -3839,7 +3839,7 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() return xGluePoints; } -//---------------------------------------------------------------------- + // XChild uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( ) @@ -3872,7 +3872,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( ) return xParent; } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& ) throw(lang::NoSupportException, uno::RuntimeException) @@ -3880,21 +3880,21 @@ void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com throw lang::NoSupportException(); } -//---------------------------------------------------------------------- + /** called from the XActionLockable interface methods on initial locking */ void SvxShape::lock() { } -//---------------------------------------------------------------------- + /** called from the XActionLockable interface methods on final unlock */ void SvxShape::unlock() { } -//---------------------------------------------------------------------- + // XActionLockable sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::RuntimeException) @@ -3904,7 +3904,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::Run return mnLockCount != 0; } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3917,7 +3917,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeE lock(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3930,7 +3930,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::Runti unlock(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException ) { @@ -3945,7 +3945,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::sta mnLockCount = (sal_uInt16)nLock; } -//---------------------------------------------------------------------- + sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3960,7 +3960,7 @@ sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (::com::sun::star::uno:: return nOldLocks; } -//---------------------------------------------------------------------- + /** since polygon shapes can change theire kind during editing, we have to recheck it here. @@ -4003,7 +4003,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw () SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) ); } -//---------------------------------------------------------------------- + SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw () : SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { @@ -4011,7 +4011,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* p SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) ); } -//---------------------------------------------------------------------- + SvxShapeText::~SvxShapeText() throw () { // check if only this instance is registered at the ranges @@ -4027,14 +4027,14 @@ void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) } // XInterface -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) { return SvxShape::queryInterface( rType ); } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -4046,41 +4046,41 @@ uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) return SvxUnoTextBase::queryAggregation( rType ); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeText::acquire() throw() { SvxShape::acquire(); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeText::release() throw() { SvxShape::release(); } // XServiceInfo -//---------------------------------------------------------------------- + OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException ) { static OUString aServiceName("SvxShapeText"); return aServiceName; } -//---------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() throw( uno::RuntimeException ) { return SvxShape::getSupportedServiceNames(); } -//---------------------------------------------------------------------- + sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { return SvxShape::supportsService(ServiceName); } // XTypeProvider -//---------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes() throw( uno::RuntimeException ) { @@ -4096,7 +4096,7 @@ sal_Int64 SAL_CALL SvxShapeText::getSomething( const ::com::sun::star::uno::Sequ return SvxUnoTextBase::getSomething( rId ); } -//---------------------------------------------------------------------- + uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId() throw( uno::RuntimeException ) { @@ -4120,7 +4120,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId() return pID->getImplementationId() ; } -//---------------------------------------------------------------------- + /** called from the XActionLockable interface methods on initial locking */ void SvxShapeText::lock() @@ -4130,7 +4130,7 @@ void SvxShapeText::lock() pEditSource->lock(); } -//---------------------------------------------------------------------- + /** called from the XActionLockable interface methods on final unlock */ void SvxShapeText::unlock() @@ -4262,9 +4262,9 @@ void SAL_CALL SvxShapeRect::release() throw() { OWeakAggObject::release(); } -//---------------------------------------------------------------------- + // XServiceInfo -//---------------------------------------------------------------------- + uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames(void) throw( uno::RuntimeException ) { return SvxShape::getSupportedServiceNames(); @@ -4284,7 +4284,7 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th return pShape ? pShape->GetSdrObject() : 0; } -//---------------------------------------------------------------------- + SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt ) { diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 925a88146d9b..e874d6c7c0df 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -87,7 +87,7 @@ SvxShapeCollection::SvxShapeCollection() throw() { } -//---------------------------------------------------------------------- + SvxShapeCollection::~SvxShapeCollection() throw() { } @@ -204,25 +204,25 @@ void SAL_CALL SvxShapeCollection::removeEventListener( const ::com::sun::star::u } // XShapes -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { maShapeContainer.addInterface( xShape ); } -//---------------------------------------------------------------------- + void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { maShapeContainer.removeInterface( xShape ); } -//---------------------------------------------------------------------- + sal_Int32 SAL_CALL SvxShapeCollection::getCount() throw( uno::RuntimeException ) { return maShapeContainer.getLength(); } -//---------------------------------------------------------------------- + uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index eb3dcb39cdc9..43a6a1ef63f3 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -53,9 +53,9 @@ using namespace ::rtl; using ::com::sun::star::uno::XInterface; -//------------------------------------------------------------------------ + // SvxTextEditSourceImpl -//------------------------------------------------------------------------ + /** @descr <p>This class essentially provides the text and view forwarders. If @@ -158,7 +158,7 @@ public: void UpdateOutliner(); }; -//------------------------------------------------------------------------ + SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText, XInterface* pOwner ) : maRefCount ( 0 ), @@ -196,7 +196,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText mpObject->AddObjectUser( *this ); } -//------------------------------------------------------------------------ + SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow ) : maRefCount ( 0 ), @@ -236,7 +236,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText mbShapeIsEditMode = IsEditMode(); } -//------------------------------------------------------------------------ + SvxTextEditSourceImpl::~SvxTextEditSourceImpl() { @@ -247,7 +247,7 @@ SvxTextEditSourceImpl::~SvxTextEditSourceImpl() dispose(); } -//------------------------------------------------------------------------ + void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) { @@ -256,7 +256,7 @@ void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) maTextRanges.push_back( pNewRange ); } -//------------------------------------------------------------------------ + void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) { @@ -264,21 +264,21 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) maTextRanges.remove( pOldRange ); } -//------------------------------------------------------------------------ + const SvxUnoTextRangeBaseList& SvxTextEditSourceImpl::getRanges() const { return maTextRanges; } -//------------------------------------------------------------------------ + void SAL_CALL SvxTextEditSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } -//------------------------------------------------------------------------ + void SAL_CALL SvxTextEditSourceImpl::release() { @@ -331,7 +331,7 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel ) } } -//------------------------------------------------------------------------ + void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { @@ -529,7 +529,7 @@ void SvxTextEditSourceImpl::dispose() mpWindow = 0; } -//------------------------------------------------------------------------ + void SvxTextEditSourceImpl::SetupOutliner() { @@ -552,7 +552,7 @@ void SvxTextEditSourceImpl::SetupOutliner() } } -//------------------------------------------------------------------------ + void SvxTextEditSourceImpl::UpdateOutliner() { @@ -575,7 +575,7 @@ void SvxTextEditSourceImpl::UpdateOutliner() } } -//------------------------------------------------------------------------ + @@ -713,7 +713,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() return mpTextForwarder; } -//------------------------------------------------------------------------ + SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() { @@ -731,7 +731,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() return mpTextForwarder; } -//------------------------------------------------------------------------ + SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() { @@ -765,7 +765,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() return GetBackgroundTextForwarder(); } -//------------------------------------------------------------------------ + SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder() { @@ -849,7 +849,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( sal_Bool bCre return mpViewForwarder; } -//------------------------------------------------------------------------ + void SvxTextEditSourceImpl::UpdateData() { @@ -1039,11 +1039,11 @@ IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify) return 0; } -//------------------------------------------------------------------------ -// -------------------------------------------------------------------- + + // SvxTextEditSource -// -------------------------------------------------------------------- + SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText, XInterface* pOwner ) { @@ -1051,14 +1051,14 @@ SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText, XInter mpImpl->acquire(); } -// -------------------------------------------------------------------- + SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rWindow ) { mpImpl = new SvxTextEditSourceImpl( rObj, pText, rView, rWindow ); mpImpl->acquire(); } -// -------------------------------------------------------------------- + SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl ) { @@ -1066,7 +1066,7 @@ SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl ) mpImpl->acquire(); } -//------------------------------------------------------------------------ + SvxTextEditSource::~SvxTextEditSource() { ::SolarMutexGuard aGuard; @@ -1074,31 +1074,31 @@ SvxTextEditSource::~SvxTextEditSource() mpImpl->release(); } -//------------------------------------------------------------------------ + SvxEditSource* SvxTextEditSource::Clone() const { return new SvxTextEditSource( mpImpl ); } -//------------------------------------------------------------------------ + SvxTextForwarder* SvxTextEditSource::GetTextForwarder() { return mpImpl->GetTextForwarder(); } -//------------------------------------------------------------------------ + SvxEditViewForwarder* SvxTextEditSource::GetEditViewForwarder( bool bCreate ) { return mpImpl->GetEditViewForwarder( bCreate ); } -//------------------------------------------------------------------------ + SvxViewForwarder* SvxTextEditSource::GetViewForwarder() { return this; } -//------------------------------------------------------------------------ + void SvxTextEditSource::UpdateData() { mpImpl->UpdateData(); diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 32e28f55fdbe..b0e6a4afffe9 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -47,9 +47,9 @@ using namespace ::com::sun::star; namespace unogallery { -// ----------------- + // - GalleryItem - -// ----------------- + GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObject& rObject ) : ::comphelper::PropertySetHelper( createPropertySetInfo() ), @@ -59,7 +59,7 @@ GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObjec mpTheme->implRegisterGalleryItem( *this ); } -// ------------------------------------------------------------------------------ + GalleryItem::~GalleryItem() throw() @@ -68,14 +68,14 @@ GalleryItem::~GalleryItem() mpTheme->implDeregisterGalleryItem( *this ); } -// ------------------------------------------------------------------------------ + bool GalleryItem::isValid() const { return( mpTheme != NULL ); } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -100,7 +100,7 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) return aAny; } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -108,7 +108,7 @@ uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) return OWeakAggObject::queryInterface( rType ); } -// ------------------------------------------------------------------------------ + void SAL_CALL GalleryItem::acquire() throw() @@ -116,7 +116,7 @@ void SAL_CALL GalleryItem::acquire() OWeakAggObject::acquire(); } -// ------------------------------------------------------------------------------ + void SAL_CALL GalleryItem::release() throw() @@ -124,7 +124,7 @@ void SAL_CALL GalleryItem::release() OWeakAggObject::release(); } -// ------------------------------------------------------------------------------ + OUString GalleryItem::getImplementationName_Static() throw() @@ -132,7 +132,7 @@ OUString GalleryItem::getImplementationName_Static() return OUString( "com.sun.star.comp.gallery.GalleryItem" ); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() throw() @@ -189,7 +189,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId() return theGalleryItemImplementationId::get().getSeq(); } -// ------------------------------------------------------------------------------ + sal_Int8 SAL_CALL GalleryItem::getType() throw (uno::RuntimeException) @@ -219,7 +219,7 @@ sal_Int8 SAL_CALL GalleryItem::getType() return nRet; } -// ------------------------------------------------------------------------------ + ::comphelper::PropertySetInfo* GalleryItem::createPropertySetInfo() { @@ -255,7 +255,7 @@ sal_Int8 SAL_CALL GalleryItem::getType() return pRet; } -// ------------------------------------------------------------------------------ + void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) throw( beans::UnknownPropertyException, @@ -302,7 +302,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt } } -// ------------------------------------------------------------------------------ + void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue ) throw( beans::UnknownPropertyException, @@ -408,14 +408,14 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } } -// ------------------------------------------------------------------------------ + const ::GalleryObject* GalleryItem::implGetObject() const { return mpGalleryObject; } -// ------------------------------------------------------------------------------ + void GalleryItem::implSetInvalid() { @@ -426,9 +426,9 @@ void GalleryItem::implSetInvalid() } } -// ----------------------- + // - GalleryDrawingModel - -// ----------------------- + GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc ) throw() : @@ -436,7 +436,7 @@ GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc ) { } -// ----------------------------------------------------------------------------- + GalleryDrawingModel::~GalleryDrawingModel() throw() @@ -444,7 +444,7 @@ GalleryDrawingModel::~GalleryDrawingModel() delete GetDoc(); } -// ----------------------------------------------------------------------------- + UNO3_GETIMPLEMENTATION_IMPL( GalleryDrawingModel ); diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 7017871b7519..24e441484fe3 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -38,9 +38,9 @@ using namespace ::com::sun::star; namespace unogallery { -// ----------------- + // - GalleryTheme - -// ----------------- + GalleryTheme::GalleryTheme( const OUString& rThemeName ) { @@ -51,7 +51,7 @@ GalleryTheme::GalleryTheme( const OUString& rThemeName ) StartListening( *mpGallery ); } -// ------------------------------------------------------------------------------ + GalleryTheme::~GalleryTheme() { @@ -70,7 +70,7 @@ GalleryTheme::~GalleryTheme() } } -// ------------------------------------------------------------------------------ + OUString GalleryTheme::getImplementationName_Static() throw() @@ -78,7 +78,7 @@ OUString GalleryTheme::getImplementationName_Static() return OUString( "com.sun.star.comp.gallery.GalleryTheme" ); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() throw() @@ -134,7 +134,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() return theGalleryThemeImplementationId::get().getSeq(); } -// ------------------------------------------------------------------------------ + uno::Type SAL_CALL GalleryTheme::getElementType() throw (uno::RuntimeException) @@ -142,7 +142,7 @@ uno::Type SAL_CALL GalleryTheme::getElementType() return ::getCppuType( (const uno::Reference< gallery::XGalleryItem >*) 0); } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL GalleryTheme::hasElements() throw (uno::RuntimeException) @@ -152,7 +152,7 @@ sal_Bool SAL_CALL GalleryTheme::hasElements() return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) ); } -// ------------------------------------------------------------------------------ + sal_Int32 SAL_CALL GalleryTheme::getCount() throw (uno::RuntimeException) @@ -162,7 +162,7 @@ sal_Int32 SAL_CALL GalleryTheme::getCount() return( mpTheme ? mpTheme->GetObjectCount() : 0 ); } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) @@ -188,7 +188,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) return aRet; } -// ------------------------------------------------------------------------------ + OUString SAL_CALL GalleryTheme::getName( ) throw (uno::RuntimeException) @@ -202,7 +202,7 @@ OUString SAL_CALL GalleryTheme::getName( ) return aRet; } -// ------------------------------------------------------------------------------ + void SAL_CALL GalleryTheme::update( ) throw (uno::RuntimeException) @@ -216,7 +216,7 @@ void SAL_CALL GalleryTheme::update( ) } } -// ------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( const OUString& rURL, ::sal_Int32 nIndex ) @@ -249,7 +249,7 @@ void SAL_CALL GalleryTheme::update( ) return nRet; } -// ------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) @@ -277,7 +277,7 @@ void SAL_CALL GalleryTheme::update( ) return nRet; } -// ------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex( const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex ) @@ -333,7 +333,7 @@ void SAL_CALL GalleryTheme::update( ) return nRet; } -// ------------------------------------------------------------------------------ + void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -349,7 +349,7 @@ void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) } } -// ------------------------------------------------------------------------------ + void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -386,7 +386,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// ------------------------------------------------------------------------------ + void GalleryTheme::implReleaseItems( GalleryObject* pObj ) { @@ -404,14 +404,14 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) } } -// ------------------------------------------------------------------------------ + ::GalleryTheme* GalleryTheme::implGetTheme() const { return mpTheme; } -// ------------------------------------------------------------------------------ + void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) { @@ -421,7 +421,7 @@ void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) maItemList.push_back( &rItem ); } -// ------------------------------------------------------------------------------ + void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem ) { diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index a94224673d22..280f8ad8f0bc 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -112,7 +112,7 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& } } -// ------------------------------------------------------------------------------ + uno::Type SAL_CALL GalleryThemeProvider::getElementType() throw (uno::RuntimeException) @@ -120,7 +120,7 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType() return ::getCppuType( (const uno::Reference< gallery::XGalleryTheme >*) 0); } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL GalleryThemeProvider::hasElements() throw (uno::RuntimeException) @@ -130,7 +130,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) ); } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) @@ -150,7 +150,7 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) return aRet; } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() throw (uno::RuntimeException) @@ -172,7 +172,7 @@ uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() return aSeq; } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) throw (uno::RuntimeException) @@ -187,7 +187,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) return( bRet ); } -// ------------------------------------------------------------------------------ + uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException) @@ -210,7 +210,7 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe return xRet; } -// ------------------------------------------------------------------------------ + void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException) diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 4f6ac4a37ecc..28663b1cc12c 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::lang; #define XML_EMBEDDEDOBJECT_URL_BASE "vnd.sun.star.EmbeddedObject:" #define XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE "vnd.sun.star.GraphicObject:" -// ----------------------------------------------------------------------------- + class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper1<XOutputStream> { diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index f57351088fd1..4f0270c5761f 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -175,7 +175,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu if ( xTargetModel.is() ) xTargetModel->lockControllers(); - // ------------------------------------- + pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ ); xGraphicResolver = pGraphicHelper; @@ -189,7 +189,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu xObjectResolver = pObjectHelper; } - // ------------------------------------- + if( 0 == nRet ) { diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 2980724d156b..856fe4a74c2f 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -793,7 +793,7 @@ private: DECL_LINK( implMenuHdl, Menu* ); }; -// ----------------------------------------------------------------------- + void MSViewerWorkWindow::onView() { @@ -870,7 +870,7 @@ PPTDocumentPtr MSViewerWorkWindow::Load() return pDocument; } -// ----------------------------------------------------------------------- + MSViewerWorkWindow::MSViewerWorkWindow() : WorkWindow( 0, WB_APP | WB_STDWORK | WB_3DLOOK ),mbSelectHdlGuard(false) @@ -909,7 +909,7 @@ MSViewerWorkWindow::MSViewerWorkWindow() : } } -// ----------------------------------------------------------------------- + static String GetAtomText( const Atom* pAtom ) { @@ -1035,7 +1035,7 @@ IMPL_LINK( MSViewerWorkWindow, implMenuHdl, Menu*, pMenu ) return 0; } -// ----------------------------------------------------------------------- + MSViewerWorkWindow::~MSViewerWorkWindow() { @@ -1050,7 +1050,7 @@ MSViewerWorkWindow::~MSViewerWorkWindow() delete mpMenuBar; } -// ----------------------------------------------------------------------- + void MSViewerWorkWindow::Resize() { @@ -1076,9 +1076,9 @@ void MSViewerWorkWindow::Resize() } } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + SAL_IMPLEMENT_MAIN() { |