diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /svx/source | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svx/source')
331 files changed, 0 insertions, 2216 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 6d7954c8dd09..3bfb1e860a01 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -18,8 +18,6 @@ */ - - // Global header @@ -31,11 +29,9 @@ #include <svx/svdpool.hxx> - // Project-local header - #include "AccessibleEmptyEditSource.hxx" #include <svx/unoshtxt.hxx> @@ -215,7 +211,6 @@ namespace accessibility } - // Implementing AccessibleEmptyEditSource @@ -338,5 +333,4 @@ 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 6faa1b547396..40cb52efac3a 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -75,14 +75,12 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB } - AccFrameSelector::~AccFrameSelector() { RemoveFrameSelEventListener(); } - void AccFrameSelector::RemoveFrameSelEventListener() { if ( mpFrameSel ) @@ -92,7 +90,6 @@ void AccFrameSelector::RemoveFrameSelEventListener() } - Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) throw (RuntimeException, std::exception) { @@ -100,7 +97,6 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) } - sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -305,7 +301,6 @@ css::awt::Rectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std } - css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -325,7 +320,6 @@ css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std:: } - css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -346,7 +340,6 @@ css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeExceptio } - css::awt::Size AccFrameSelector::getSize( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -487,7 +480,6 @@ void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) } - IMPL_LINK_TYPED( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void ) { vcl::Window* pWindow = rEvent.GetWindow(); @@ -499,7 +491,6 @@ IMPL_LINK_TYPED( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, } - void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -532,7 +523,6 @@ void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } - void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, const Any& _rOldValue, const Any& _rNewValue ) { @@ -545,7 +535,6 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, } - void AccFrameSelector::Invalidate() { RemoveFrameSelEventListener(); @@ -558,7 +547,6 @@ void AccFrameSelector::Invalidate() } - } } diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index c75bad34685c..49cdd0e21ddd 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -39,8 +39,6 @@ AccessibleGraphicShape::AccessibleGraphicShape ( } - - AccessibleGraphicShape::~AccessibleGraphicShape() { } @@ -55,8 +53,6 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() } - - sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() throw (css::uno::RuntimeException, std::exception) { @@ -64,8 +60,6 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() } - - sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() throw (css::uno::RuntimeException, std::exception) { @@ -85,7 +79,6 @@ css::uno::Any SAL_CALL } - void SAL_CALL AccessibleGraphicShape::acquire() throw () @@ -94,7 +87,6 @@ void SAL_CALL } - void SAL_CALL AccessibleGraphicShape::release() throw () @@ -111,8 +103,6 @@ OUString SAL_CALL } - - css::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) @@ -148,8 +138,6 @@ uno::Sequence<uno::Type> SAL_CALL } - - /// Create the base name of this object, i.e. the name without appended number. OUString AccessibleGraphicShape::CreateAccessibleBaseName() diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 4577ccf6bb1a..e41fa8f1af61 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -39,8 +39,6 @@ AccessibleOLEShape::AccessibleOLEShape ( } - - AccessibleOLEShape::~AccessibleOLEShape() { } @@ -53,8 +51,6 @@ sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount() } - - sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -62,8 +58,6 @@ sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) } - - OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) @@ -72,8 +66,6 @@ OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 } - - Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) @@ -94,7 +86,6 @@ css::uno::Any SAL_CALL } - void SAL_CALL AccessibleOLEShape::acquire() throw () @@ -103,7 +94,6 @@ void SAL_CALL } - void SAL_CALL AccessibleOLEShape::release() throw () @@ -120,8 +110,6 @@ OUString SAL_CALL } - - css::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index a352e2b88e68..fd4a9bff049b 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -192,8 +192,6 @@ void AccessibleShape::Init() } - - void AccessibleShape::UpdateStates() { ::utl::AccessibleStateSetHelper* pStateSet = @@ -269,8 +267,6 @@ bool AccessibleShape::SetState (sal_Int16 aState) } - - bool AccessibleShape::ResetState (sal_Int16 aState) { bool bStateHasChanged = false; @@ -290,8 +286,6 @@ bool AccessibleShape::ResetState (sal_Int16 aState) } - - bool AccessibleShape::GetState (sal_Int16 aState) { if (aState == AccessibleStateType::FOCUSED && mpText != nullptr) @@ -347,8 +341,6 @@ sal_Int32 SAL_CALL } - - /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ @@ -540,8 +532,6 @@ uno::Reference<XAccessible > SAL_CALL } - - awt::Rectangle SAL_CALL AccessibleShape::getBounds() throw (css::uno::RuntimeException, std::exception) { @@ -655,8 +645,6 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds() } - - awt::Point SAL_CALL AccessibleShape::getLocation() throw (css::uno::RuntimeException, std::exception) { @@ -666,8 +654,6 @@ awt::Point SAL_CALL AccessibleShape::getLocation() } - - awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) { @@ -691,8 +677,6 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() } - - awt::Size SAL_CALL AccessibleShape::getSize() throw (uno::RuntimeException, std::exception) { @@ -702,8 +686,6 @@ awt::Size SAL_CALL AccessibleShape::getSize() } - - sal_Int32 SAL_CALL AccessibleShape::getForeground() throw (css::uno::RuntimeException, std::exception) { @@ -728,8 +710,6 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground() } - - sal_Int32 SAL_CALL AccessibleShape::getBackground() throw (css::uno::RuntimeException, std::exception) { @@ -787,8 +767,6 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener ( } - - void SAL_CALL AccessibleShape::removeAccessibleEventListener ( const Reference<XAccessibleEventListener >& rxListener) throw (uno::RuntimeException, std::exception) @@ -820,8 +798,6 @@ css::uno::Any SAL_CALL } - - void SAL_CALL AccessibleShape::acquire() throw () @@ -830,8 +806,6 @@ void SAL_CALL } - - void SAL_CALL AccessibleShape::release() throw () @@ -962,8 +936,6 @@ OUString SAL_CALL } - - uno::Sequence<OUString> SAL_CALL AccessibleShape::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) @@ -1250,11 +1222,6 @@ OUString } - - - - - // protected void AccessibleShape::disposing() { @@ -1314,8 +1281,6 @@ sal_Int32 SAL_CALL } - - void AccessibleShape::UpdateNameAndDescription() { // Ignore missing title, name, or description. There are fallbacks for diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index bc681c08324d..a83ac75b11c2 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -36,8 +36,6 @@ AccessibleShapeInfo::AccessibleShapeInfo ( } - - AccessibleShapeInfo::AccessibleShapeInfo ( const css::uno::Reference<css::drawing::XShape>& rxShape, const css::uno::Reference<css::accessibility::XAccessible>& rxParent, diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 1576ecf72c01..66521432973e 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -37,8 +37,6 @@ AccessibleShapeTreeInfo::AccessibleShapeTreeInfo() } - - AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo& rInfo) : mxDocumentWindow (rInfo.mxDocumentWindow), mxModelBroadcaster (rInfo.mxModelBroadcaster), @@ -51,8 +49,6 @@ AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo& } - - AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleShapeTreeInfo& rInfo) { if ( this != &rInfo ) @@ -68,8 +64,6 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha } - - AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() { SolarMutexGuard g; @@ -77,8 +71,6 @@ AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() } - - void AccessibleShapeTreeInfo::SetDocumentWindow ( const Reference<XAccessibleComponent>& rxDocumentWindow) { @@ -93,24 +85,12 @@ void AccessibleShapeTreeInfo::SetModelBroadcaster ( } - - - - - - void AccessibleShapeTreeInfo::SetSdrView (SdrView* pView) { mpView = pView; } - - - - - - void AccessibleShapeTreeInfo::SetController ( const Reference<frame::XController>& rxController) { @@ -118,34 +98,18 @@ void AccessibleShapeTreeInfo::SetController ( } - - - - - - void AccessibleShapeTreeInfo::SetWindow (vcl::Window* pWindow) { mpWindow = pWindow; } - - - - - - void AccessibleShapeTreeInfo::SetViewForwarder (const IAccessibleViewForwarder* pViewForwarder) { mpViewForwarder = pViewForwarder; } - - - - } // end of namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index 3f683bce1310..72bc10adc988 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -88,7 +88,6 @@ OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (Runt } - Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "VCLXAccessibleSvxFindReplaceDialog" }; diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 05ace5f490f3..4adc293c1b9f 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -37,7 +37,6 @@ namespace accessibility // EventQueue implementation - AccessibleTextEventQueue::AccessibleTextEventQueue() { } @@ -89,5 +88,4 @@ 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 f8a724a69cf3..7d811b54fe51 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <memory> #include <utility> @@ -50,7 +47,6 @@ #include <sfx2/viewsh.hxx> - // Project-local header @@ -1641,7 +1637,6 @@ namespace accessibility } - // AccessibleTextHelper implementation (simply forwards to impl) AccessibleTextHelper::AccessibleTextHelper( ::std::unique_ptr< SvxEditSource > && pEditSource ) : @@ -1902,5 +1897,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index be9dae16dc8a..1caeea682580 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -44,8 +44,6 @@ ChildrenManager::ChildrenManager ( } - - ChildrenManager::~ChildrenManager() { if (mpImpl != nullptr) diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 7c1e4491b75d..62925b936ea7 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -71,8 +71,6 @@ ChildrenManagerImpl::ChildrenManagerImpl ( } - - ChildrenManagerImpl::~ChildrenManagerImpl() { DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, @@ -80,8 +78,6 @@ ChildrenManagerImpl::~ChildrenManagerImpl() } - - void ChildrenManagerImpl::Init() { // Register as view::XSelectionChangeListener. @@ -104,8 +100,6 @@ void ChildrenManagerImpl::Init() } - - long ChildrenManagerImpl::GetChildCount() const throw () { return maVisibleChildren.size(); @@ -144,8 +138,6 @@ uno::Reference<XAccessible> } - - /** Return the requested accessible child object. Create it if it is not yet in the cache. */ @@ -186,8 +178,6 @@ uno::Reference<XAccessible> } - - uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape) throw (uno::RuntimeException) @@ -202,8 +192,6 @@ uno::Reference<XAccessible> } - - /** Find all shapes among the specified shapes that lie fully or partially inside the visible area. Put those shapes into the cleared cache. The corresponding accessible objects will be created on demand. @@ -349,8 +337,6 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes ( } - - void ChildrenManagerImpl::RemoveNonVisibleChildren ( const ChildDescriptorListType& rNewChildList, ChildDescriptorListType& rOldChildList) @@ -383,8 +369,6 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren ( } - - void ChildrenManagerImpl::MergeAccessibilityInformation ( ChildDescriptorListType& raNewChildList) { @@ -409,8 +393,6 @@ void ChildrenManagerImpl::MergeAccessibilityInformation ( } - - void ChildrenManagerImpl::SendVisibleAreaEvents ( ChildDescriptorListType& raNewChildList) { @@ -429,8 +411,6 @@ void ChildrenManagerImpl::SendVisibleAreaEvents ( } - - void ChildrenManagerImpl::CreateAccessibilityObjects ( ChildDescriptorListType& raNewChildList) { @@ -454,8 +434,6 @@ void ChildrenManagerImpl::CreateAccessibilityObjects ( } - - void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape) { if (rxShape.is()) @@ -504,8 +482,6 @@ void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape) } - - void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape) { if (rxShape.is()) @@ -535,16 +511,12 @@ void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape } - - void ChildrenManagerImpl::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList) { mxShapeList = xShapeList; } - - void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibility::XAccessible> const & shape) { assert(shape.is()); @@ -552,8 +524,6 @@ void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibi } - - void ChildrenManagerImpl::ClearAccessibleShapeList() { // Copy the list of (visible) shapes to local lists and clear the @@ -598,8 +568,6 @@ void ChildrenManagerImpl::ClearAccessibleShapeList() } - - /** If the broadcasters change at which this object is registered then unregister at old and register at new broadcasters. */ @@ -716,8 +684,6 @@ void SAL_CALL } - - void ChildrenManagerImpl::impl_dispose() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); @@ -762,7 +728,6 @@ void ChildrenManagerImpl::impl_dispose() } - void SAL_CALL ChildrenManagerImpl::disposing() { impl_dispose(); @@ -1044,16 +1009,12 @@ void ChildrenManagerImpl::UpdateSelection() } - - bool ChildrenManagerImpl::HasFocus() { return mpFocusedShape != nullptr; } - - void ChildrenManagerImpl::RemoveFocus() { if (mpFocusedShape != nullptr) @@ -1064,7 +1025,6 @@ void ChildrenManagerImpl::RemoveFocus() } - void ChildrenManagerImpl::RegisterAsDisposeListener ( const Reference<drawing::XShape>& xShape) { @@ -1075,8 +1035,6 @@ void ChildrenManagerImpl::RegisterAsDisposeListener ( } - - void ChildrenManagerImpl::UnregisterAsDisposeListener ( const Reference<drawing::XShape>& xShape) { @@ -1096,8 +1054,6 @@ ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) } - - ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShape) : mxShape (nullptr), mxAccessibleShape (rxAccessibleShape), @@ -1110,15 +1066,11 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap } - - ChildDescriptor::~ChildDescriptor() { } - - AccessibleShape* ChildDescriptor::GetAccessibleShape() const { return static_cast<AccessibleShape*> (mxAccessibleShape.get()); @@ -1132,9 +1084,6 @@ void ChildDescriptor::setIndexAtAccessibleShape(sal_Int32 _nIndex) } - - - void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent) { if (mxAccessibleShape.is()) diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index a5feea3f82ed..1983e9faffdd 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -436,8 +436,6 @@ private: }; - - /** A child descriptor holds a reference to a UNO shape and the corresponding accessible object. There are two use cases: <ol><li>The accessible object is only created on demand and is then @@ -522,7 +520,6 @@ public: }; - } // end of namespace accessibility #endif diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 9b2ad6bc067c..518a7961ea09 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -62,15 +62,11 @@ DescriptionGenerator::DescriptionGenerator ( } - - DescriptionGenerator::~DescriptionGenerator() { } - - void DescriptionGenerator::Initialize (sal_Int32 nResourceId) { // Get the string from the resource for the specified id. @@ -85,8 +81,6 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId) } - - void DescriptionGenerator::Initialize (const OUString& sPrefix) { msDescription = sPrefix; @@ -123,8 +117,6 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix) } - - OUString DescriptionGenerator::operator() (void) { msDescription.append('.'); @@ -132,8 +124,6 @@ OUString DescriptionGenerator::operator() (void) } - - void DescriptionGenerator::AddProperty ( const OUString& sPropertyName, PropertyType aType, @@ -149,8 +139,6 @@ void DescriptionGenerator::AddProperty ( } - - void DescriptionGenerator::AddProperty (const OUString& sPropertyName, PropertyType aType, const OUString& sLocalizedName, long nWhichId) { @@ -192,16 +180,12 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, } - - void DescriptionGenerator::AppendString (const OUString& sString) { msDescription.append (sString); } - - void DescriptionGenerator::AddLineProperties() { AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR); @@ -211,8 +195,6 @@ void DescriptionGenerator::AddLineProperties() } - - /** The fill style is described by the property "FillStyle". Depending on its value a hatch-, gradient-, or bitmap name is appended. */ @@ -222,8 +204,6 @@ void DescriptionGenerator::AddFillProperties() } - - void DescriptionGenerator::Add3DProperties() { AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR, @@ -233,8 +213,6 @@ void DescriptionGenerator::Add3DProperties() } - - void DescriptionGenerator::AddTextProperties() { AddProperty ("CharColor", DescriptionGenerator::COLOR); @@ -242,8 +220,6 @@ void DescriptionGenerator::AddTextProperties() } - - /** Search for the given color in the global color table. If found append its name to the description. Otherwise append its RGB tuple. */ @@ -272,8 +248,6 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName, } - - void DescriptionGenerator::AddInteger (const OUString& sPropertyName, const OUString& sLocalizedName) { @@ -297,8 +271,6 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName, } - - void DescriptionGenerator::AddString (const OUString& sPropertyName, const OUString& sLocalizedName, long nWhichId) { @@ -332,8 +304,6 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName, } - - void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, const OUString& sLocalizedName) { diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0aa17dbce2df..2e4462dc9137 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -120,7 +120,6 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( } - /** on destruction, this component is disposed and all dispose listeners are called, except if this component was already disposed */ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext() @@ -129,7 +128,6 @@ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext() } - /** returns the XAccessible interface for a given SdrObject. Multiple calls for the same SdrObject return the same XAccessible. */ @@ -189,7 +187,6 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -220,7 +217,6 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt } - awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() @@ -234,7 +230,6 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim } - awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() @@ -243,7 +238,6 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE } - awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBoxOnScreen() @@ -252,7 +246,6 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( } - awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() @@ -272,7 +265,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro } - /** returns the SdrObject at index nIndex from the model of this graph */ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException ) @@ -289,7 +281,6 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) } - /** sends an AccessibleEventObject to all added XAccessibleEventListeners */ void SvxGraphCtrlAccessibleContext::CommitChange ( sal_Int16 nEventId, @@ -313,7 +304,6 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { @@ -323,14 +313,12 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } - sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -362,14 +350,12 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() t } - sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } - OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -377,7 +363,6 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() thro } - OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -385,7 +370,6 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( Runt } - /** Return empty reference to indicate that the relation set is not supported. */ @@ -395,7 +379,6 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA } - Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -420,7 +403,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce } - lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -450,7 +432,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R } - void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) { @@ -545,7 +526,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI } - sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -557,7 +537,6 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ } - void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -569,7 +548,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R } - void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -581,7 +559,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw } - sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -594,7 +571,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { @@ -613,7 +589,6 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce } - void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -650,7 +625,6 @@ void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) th } - /** Replace the model, page, and view pointers by the ones provided (explicitly and implicitly). */ @@ -680,9 +654,6 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( } - - - void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() { ::SolarMutexGuard aGuard; @@ -719,7 +690,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() } - Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -734,7 +704,6 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( Runtime } - /** Calculate the relative coordinates of the bounding box as difference between the absolute coordinates of the bounding boxes of this control and its parent in the accessibility tree. @@ -825,7 +794,6 @@ Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const } - Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const { if( mpControl ) @@ -840,7 +808,6 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const } - Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const { if( mpControl ) @@ -850,5 +817,4 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 2c88a7724b25..eba8907424d7 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -52,8 +52,6 @@ AccessibleShape* } - - ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of @@ -75,8 +73,6 @@ ShapeTypeHandler& ShapeTypeHandler::Instance() } - - /** The given service name is first transformed into a slot id that identifies the place of the type descriptor. From that descriptor the shape type id is returned. @@ -93,7 +89,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const OUString& aServiceName) const } - /** Extract the specified shape's service name and forward the request to the appropriate method. */ @@ -107,8 +102,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const uno::Reference<drawing::XShape>& } - - /** This factory method determines the type descriptor for the type of the given shape, then calls the descriptor's create function, and finally initializes the new object. @@ -128,8 +121,6 @@ rtl::Reference<AccessibleShape> } - - /** Create the single instance of this class and initialize its list of type descriptors with an entry of an unknown type. */ @@ -145,8 +136,6 @@ ShapeTypeHandler::ShapeTypeHandler() } - - ShapeTypeHandler::~ShapeTypeHandler() { // Because this class is a singleton and the only instance, whose @@ -158,8 +147,6 @@ ShapeTypeHandler::~ShapeTypeHandler() } - - void ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount, ShapeTypeDescriptor aDescriptorList[]) { @@ -189,8 +176,6 @@ void ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount, } - - long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const { tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName)); @@ -201,8 +186,6 @@ long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const } - - // Extract the given shape's service name and forward request to appropriate // method. long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape) const diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 452c9302d5db..c9a2777ebfe1 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -40,7 +40,6 @@ namespace svx using namespace ::com::sun::star::accessibility; - SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock()) ,mpParent( pParent ) ,m_pTable(nullptr) @@ -53,7 +52,6 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : } - SvxShowCharSetVirtualAcc::~SvxShowCharSetVirtualAcc() { ensureDisposed(); @@ -224,8 +222,6 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing() } - - SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) : mrParent( rParent ) ,mnId( _nPos ) @@ -245,7 +241,6 @@ SvxShowCharSetItem::~SvxShowCharSetItem() } - uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessible() { if( !m_xAcc.is() ) @@ -258,7 +253,6 @@ uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessi } - void SvxShowCharSetItem::ClearAccessible() { if ( m_xAcc.is() ) @@ -269,9 +263,6 @@ void SvxShowCharSetItem::ClearAccessible() } - - - SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock()) ,m_pParent( _pParent ) { @@ -283,7 +274,6 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc } - SvxShowCharSetAcc::~SvxShowCharSetAcc() { ensureDisposed(); @@ -354,7 +344,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -376,7 +365,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -386,7 +374,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge } - sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -394,7 +381,6 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() } - OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -403,7 +389,6 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() } - OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -413,7 +398,6 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() } - uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -421,7 +405,6 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha } - uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -598,10 +581,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex } - - - - SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock()) ,mpParent( pParent ) { @@ -614,7 +593,6 @@ SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OA } - SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc() { ensureDisposed(); @@ -632,7 +610,6 @@ void SvxShowCharSetItemAcc::ParentDestroyed() } - sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -640,7 +617,6 @@ sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -648,7 +624,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -658,7 +633,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc } - sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -666,7 +640,6 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() } - OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -694,7 +667,6 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() } - OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -714,7 +686,6 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() } - uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -722,7 +693,6 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha } - uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -759,14 +729,12 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe } - sal_Int32 SvxShowCharSetItemAcc::getAccessibleActionCount() throw (RuntimeException, std::exception) { return 1; } - sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -780,7 +748,6 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (I } - OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( nIndex == 0 ) @@ -789,7 +756,6 @@ OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nInde } - Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if( nIndex == 0 ) @@ -798,7 +764,6 @@ Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::ge } - void SAL_CALL SvxShowCharSetItemAcc::grabFocus() throw (uno::RuntimeException, std::exception) { @@ -890,9 +855,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException, } - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index b25774e763c4..69288d85e542 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -708,10 +708,6 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::Dispos } - - - - SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference<XAccessible>& rxParent, const vcl::Window& rParentWindow, @@ -916,8 +912,6 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( cons } - - void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) { @@ -979,7 +973,6 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (R } - sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -995,7 +988,6 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex } - OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1007,7 +999,6 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_ } - Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index af43b228bee0..9a2f31b42349 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -88,7 +88,6 @@ namespace { - // EXPRESSION NODES @@ -761,11 +760,9 @@ public: }; - // FUNCTION PARSER - typedef const sal_Char* StringIteratorT; struct ParserContext @@ -1158,7 +1155,6 @@ const ParserContextSharedPtr& getParserContext() namespace EnhancedCustomShape { - ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index d3e66f06d8ce..230f489f8062 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -22,7 +22,6 @@ #include "svx/unoapi.hxx" - EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ) : mnIndex ( nIndex ), mxCustomShape ( xCustomShape ) @@ -30,20 +29,17 @@ EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css:: } - EnhancedCustomShapeHandle::~EnhancedCustomShapeHandle() { } - void SAL_CALL EnhancedCustomShapeHandle::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL EnhancedCustomShapeHandle::release() throw() { OWeakObject::release(); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 5433cbd035df..a2455646741a 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -38,7 +38,6 @@ #define OWN_CALLMODE SfxCallMode::ASYNCHRON | SfxCallMode::RECORD - #define TEST_COLS() \ { \ nR = aCol.GetRed(); nG = aCol.GetGreen(); nB = aCol.GetBlue(); \ @@ -156,7 +155,6 @@ void MaskSet::onEditColor() } - class MaskData { VclPtr<SvxBmpMask> pMask; @@ -179,7 +177,6 @@ public: }; - MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : pMask ( pBmpMask ), @@ -232,7 +229,6 @@ IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) } - IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) { CheckBox* pCbx = static_cast<CheckBox*>(pButton); @@ -294,7 +290,6 @@ IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) } - IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) { ColorLB* pLb = static_cast<ColorLB*>(&rControl); @@ -306,7 +301,6 @@ IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) } - IMPL_LINK_NOARG_TYPED(MaskData, ExecHdl, Button*, void) { SfxBoolItem aBItem( SID_BMPMASK_EXEC, true ); @@ -605,7 +599,6 @@ void SvxBmpMask::SetExecState( bool bEnable ) } - sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols ) { sal_uInt16 nCount = 0; @@ -642,7 +635,6 @@ sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uI } - Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) { Bitmap aBitmap( rBitmap ); @@ -659,7 +651,6 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) } - BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& rColor, const long nTol ) { EnterWait(); @@ -677,7 +668,6 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& } - Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) { Animation aAnimation( rAnimation ); @@ -698,7 +688,6 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) } - GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) { GDIMetaFile aMtf; @@ -955,7 +944,6 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } - BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color& rColor ) { if( rBmpEx.IsTransparent() ) @@ -969,7 +957,6 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color } - Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor ) { Animation aAnimation( rAnim ); @@ -986,7 +973,6 @@ Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Colo } - GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const Color& rColor ) { ScopedVclPtrInstance< VirtualDevice > pVDev; @@ -1020,7 +1006,6 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C } - Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { Graphic aGraphic( rGraphic ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index c4fe0028b7bd..61519208f610 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -101,7 +101,6 @@ void SvxShowCharSet::GetFocus() } - void SvxShowCharSet::LoseFocus() { Control::LoseFocus(); @@ -109,7 +108,6 @@ void SvxShowCharSet::LoseFocus() } - void SvxShowCharSet::StateChanged(StateChangedType nType) { if (nType == StateChangedType::ControlForeground) @@ -124,7 +122,6 @@ void SvxShowCharSet::StateChanged(StateChangedType nType) } - void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) @@ -140,7 +137,6 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) } - void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -162,7 +158,6 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) } - void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) { if ( bDrag && rMEvt.IsLeft() ) @@ -176,7 +171,6 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) } - void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && bDrag ) @@ -200,7 +194,6 @@ void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) } - void SvxShowCharSet::Command( const CommandEvent& rCEvt ) { if( !HandleScrollCommand( rCEvt, nullptr, aVscrollSB.get() ) ) @@ -208,21 +201,18 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) } - sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) { return _nPos / COLUMN_COUNT ; } - sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) { return _nPos % COLUMN_COUNT ; } - int SvxShowCharSet::FirstInView() const { int nIndex = 0; @@ -232,7 +222,6 @@ int SvxShowCharSet::FirstInView() const } - int SvxShowCharSet::LastInView() const { sal_uIntPtr nIndex = FirstInView(); @@ -244,7 +233,6 @@ int SvxShowCharSet::LastInView() const } - inline Point SvxShowCharSet::MapIndexToPixel( int nIndex ) const { const int nBase = FirstInView(); @@ -261,7 +249,6 @@ int SvxShowCharSet::PixelToMapIndex( const Point& point) const } - void SvxShowCharSet::KeyInput(const KeyEvent& rKEvt) { vcl::KeyCode aCode = rKEvt.GetKeyCode(); @@ -330,7 +317,6 @@ void SvxShowCharSet::KeyInput(const KeyEvent& rKEvt) } - void SvxShowCharSet::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { InitSettings(rRenderContext); @@ -496,7 +482,6 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, } - void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); @@ -531,7 +516,6 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext) } - sal_UCS4 SvxShowCharSet::GetSelectCharacter() const { if( nSelectedIndex >= 0 ) @@ -540,7 +524,6 @@ sal_UCS4 SvxShowCharSet::GetSelectCharacter() const } - void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext) { if (!mbRecalculateFont) @@ -589,7 +572,6 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext) } - void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) { if( !aVscrollSB ) @@ -663,7 +645,6 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) } - void SvxShowCharSet::OutputIndex( int nNewIndex ) { SelectIndex( nNewIndex, true ); @@ -672,7 +653,6 @@ void SvxShowCharSet::OutputIndex( int nNewIndex ) } - void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) { if (mxFontCharMap == nullptr) @@ -692,7 +672,6 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) } - IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) { if( nSelectedIndex < FirstInView() ) @@ -718,7 +697,6 @@ IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) } - SvxShowCharSet::~SvxShowCharSet() { disposeOnce(); @@ -767,7 +745,6 @@ svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) } - sal_Int32 SvxShowCharSet::getMaxCharCount() const { return mxFontCharMap->GetCharCount(); diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 0faa72feb39e..ae321b006820 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -71,7 +71,6 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos, } - void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) { if ( nPos < GetEntryCount() ) @@ -79,7 +78,6 @@ void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) } - void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) { if ( nPos < GetEntryCount() ) @@ -87,7 +85,6 @@ void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) } - sal_uLong SvxCheckListBox::GetSelectEntryPos() const { SvTreeListEntry* pEntry = GetCurEntry(); @@ -98,7 +95,6 @@ sal_uLong SvxCheckListBox::GetSelectEntryPos() const } - OUString SvxCheckListBox::GetText( sal_uLong nPos ) const { SvTreeListEntry* pEntry = GetEntry( nPos ); @@ -109,7 +105,6 @@ OUString SvxCheckListBox::GetText( sal_uLong nPos ) const } - sal_uLong SvxCheckListBox::GetCheckedEntryCount() const { sal_uLong nCheckCount = 0; @@ -124,7 +119,6 @@ sal_uLong SvxCheckListBox::GetCheckedEntryCount() const } - void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, bool bCheck ) { if ( nPos < GetEntryCount() ) @@ -134,7 +128,6 @@ void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, bool bCheck ) } - bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const { if ( nPos < GetEntryCount() ) @@ -144,7 +137,6 @@ bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const } - void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData ) { void* pOld = nullptr; @@ -158,7 +150,6 @@ void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData ) } - void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const { if ( nPos < GetEntryCount() ) @@ -168,7 +159,6 @@ void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const } - void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) { if ( pEntry ) @@ -181,7 +171,6 @@ void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) } - void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -221,7 +210,6 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) } - void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) { const vcl::KeyCode& rKey = rKEvt.GetKeyCode(); @@ -243,7 +231,6 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) } - SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { return SvTreeListBox::InsertEntry( rText, pParent, bChildrenOnDemand, nPos, pUserData, eButtonKind ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index c1f7eba13e61..7067ab718163 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -218,7 +218,6 @@ void DialControlBmp::DrawBackground() } - DialControl::DialControl_Impl::DialControl_Impl ( vcl::Window& rParent ) : mxBmpEnabled(VclPtr<DialControlBmp>::Create(rParent)), mxBmpDisabled(VclPtr<DialControlBmp>::Create(rParent)), @@ -259,7 +258,6 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) } - DialControl::DialControl( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ), mpImpl( new DialControl_Impl( *this ) ) @@ -437,8 +435,6 @@ void DialControl::LinkedFieldModifyHdl() } - - void DialControl::SaveValue() { mpImpl->mnInitialAngle = mpImpl->mnAngle; @@ -559,7 +555,6 @@ void DialControlWrapper::SetControlValue( sal_Int32 nValue ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 7bbc18f6cf2a..b44c07861015 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -243,7 +243,6 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) } - #define RADIUS_LAMP_PREVIEW_SIZE (4500.0) #define RADIUS_LAMP_SMALL (600.0) #define RADIUS_LAMP_BIG (1000.0) diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 20f70ec86a26..2916f4c1382e 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -123,7 +123,6 @@ void SvxRectCtl::Resize() } - void SvxRectCtl::Resize_Impl() { aSize = GetOutputSize(); @@ -367,7 +366,6 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) } - void SvxRectCtl::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::ControlForeground ) @@ -379,7 +377,6 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) } - void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) @@ -1763,7 +1760,6 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitma } - void SvxPreviewBase::InitSettings(bool bForeground, bool bBackground) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -1988,7 +1984,6 @@ void SvxXLinePreview::dispose() } - void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s) { mpGraphic = p; @@ -1996,7 +1991,6 @@ void SvxXLinePreview::SetSymbol(Graphic* p,const Size& s) } - void SvxXLinePreview::ResizeSymbol(const Size& s) { if ( s != maSymbolSize ) @@ -2007,7 +2001,6 @@ void SvxXLinePreview::ResizeSymbol(const Size& s) } - void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet) { // Set ItemSet at objects @@ -2023,7 +2016,6 @@ void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet) } - void SvxXLinePreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { LocalPrePaint(rRenderContext); diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 330925d4938c..f97ad97c71c2 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -27,7 +27,6 @@ #include <sfx2/objsh.hxx> - FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index aa55415b7fe9..141bbf9d809a 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -425,7 +425,6 @@ void FontPrevWin_Impl::DrawPrev(vcl::RenderContext& rRenderContext, Printer* _pP } - bool FontPrevWin_Impl::SetFontWidthScale(sal_uInt16 nScale) { if (mnFontWidthScale != nScale) diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 12c5c2fd81d1..30a521a5afeb 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -77,8 +77,6 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt } - - SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , maStdFont(GetFont()) @@ -149,5 +147,4 @@ void SvxFontListBox::InitEntry( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 3938701e9967..79c64c029ef2 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -43,7 +43,6 @@ namespace svx { namespace frame { - namespace { typedef std::vector< Point > PointVec; @@ -171,7 +170,6 @@ struct DiagBordersResult }; - /** A helper struct containing two points of a line. */ struct LinePoints @@ -187,7 +185,6 @@ struct LinePoints }; - /** Rounds and casts a double value to a long value. */ inline long lclD2L( double fValue ) { @@ -344,7 +341,6 @@ inline long lclGetBehindEnd( const Style& rBorder ) // Linking functions - // Linking of single horizontal line ends. /** Calculates X offsets for the left end of a single horizontal frame border. @@ -612,8 +608,6 @@ void lclLinkVerFrameBorder( } - - // Linking of diagonal frame borders. /** Calculates clipping offsets for a top-left to bottom-right frame border. @@ -697,7 +691,6 @@ void lclLinkDiagFrameBorders( // Drawing functions - // Simple helper functions /** Converts sub units to OutputDevice map units. */ @@ -752,7 +745,6 @@ void lclSetColorToOutDev( OutputDevice& rDev, const Color& rColor, const Color* } - // Drawing of horizontal frame borders. /** Draws a horizontal thin or thick line into the passed output device. @@ -1119,7 +1111,6 @@ void lclDrawDiagFrameBorders( } - } // namespace @@ -1311,7 +1302,6 @@ double GetHorDiagAngle( long nWidth, long nHeight ) } - long GetTLDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ) { return lclD2L( nVerOffs / tan( fAngle ) + nDiagOffs / sin( fAngle ) ); @@ -1333,7 +1323,6 @@ long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ) } - bool CheckFrameBorderConnectable( const Style& rLBorder, const Style& rRBorder, const Style& rTFromTL, const Style& rTFromT, const Style& rTFromTR, const Style& rBFromBL, const Style& rBFromB, const Style& rBFromBR ) @@ -1489,7 +1478,6 @@ void DrawHorFrameBorder( OutputDevice& rDev, } - void DrawVerFrameBorder( OutputDevice& rDev, const Point& rTPos, const Point& rBPos, const Style& rBorder, const DiagStyle& rTFromBL, const Style& rTFromL, const Style& rTFromT, const Style& rTFromR, const DiagStyle& rTFromBR, @@ -1507,7 +1495,6 @@ void DrawVerFrameBorder( OutputDevice& rDev, } - void DrawDiagFrameBorders( OutputDevice& rDev, const Rectangle& rRect, const Style& rTLBR, const Style& rBLTR, const Style& rTLFromB, const Style& rTLFromR, const Style& rBRFromT, const Style& rBRFromL, @@ -1524,7 +1511,6 @@ void DrawDiagFrameBorders( } - } } diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 615970dbcfc5..548ba97c5df9 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -85,8 +85,6 @@ void Cell::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ) } - - void lclRecalcCoordVec( LongVec& rCoords, const LongVec& rSizes ) { DBG_ASSERT( rCoords.size() == rSizes.size() + 1, "lclRecalcCoordVec - inconsistent vectors" ); @@ -112,7 +110,6 @@ void lclSetMergedRange( CellVec& rCells, size_t nWidth, size_t nFirstCol, size_t } - static const Style OBJ_STYLE_NONE; static const Cell OBJ_CELL_NONE; @@ -333,7 +330,6 @@ double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) cons } - class MergedCellIterator { public: @@ -355,7 +351,6 @@ private: }; - MergedCellIterator::MergedCellIterator( const Array& rArray, size_t nCol, size_t nRow ) { DBG_ASSERT( rArray.IsMerged( nCol, nRow ), "svx::frame::MergedCellIterator::MergedCellIterator - not in merged range" ); @@ -376,7 +371,6 @@ MergedCellIterator& MergedCellIterator::operator++() } - #define DBG_FRAME_CHECK( cond, funcname, error ) DBG_ASSERT( cond, "svx::frame::Array::" funcname " - " error ) #define DBG_FRAME_CHECK_COL( col, funcname ) DBG_FRAME_CHECK( (col) < GetColCount(), funcname, "invalid column index" ) #define DBG_FRAME_CHECK_ROW( row, funcname ) DBG_FRAME_CHECK( (row) < GetRowCount(), funcname, "invalid row index" ) @@ -385,13 +379,11 @@ MergedCellIterator& MergedCellIterator::operator++() #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() { Initialize( 0, 0 ); @@ -1327,13 +1319,11 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const } - #undef ORIGCELL #undef CELLACC #undef CELL - #undef DBG_FRAME_CHECK_ROW_1 #undef DBG_FRAME_CHECK_COL_1 #undef DBG_FRAME_CHECK_COLROW @@ -1342,7 +1332,6 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const #undef DBG_FRAME_CHECK - } } diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index bc2239f70942..49093a93d391 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -81,7 +81,6 @@ SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const } - FrameDirListBoxWrapper::FrameDirListBoxWrapper( FrameDirListBox& rListBox ) : SingleControlWrapperType( rListBox ) { @@ -109,7 +108,6 @@ void FrameDirListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 0c7583f8bf61..7a67870b548e 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1247,7 +1247,6 @@ Size FrameSelector::GetOptimalSize() const } - template< typename Cont, typename Iter, typename Pred > FrameBorderIterBase< Cont, Iter, Pred >::FrameBorderIterBase( container_type& rCont ) : maIt( rCont.begin() ), @@ -1264,7 +1263,6 @@ FrameBorderIterBase< Cont, Iter, Pred >& FrameBorderIterBase< Cont, Iter, Pred > } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 049cdb67bf30..e86e8010af7d 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -30,8 +30,6 @@ #include <memory> - - sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) { const Graphic& rGraphic = rFilterObject.GetGraphic(); @@ -275,7 +273,6 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } - void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) { if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER ) ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index b6092da8607a..1096ea891ce5 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -121,14 +121,12 @@ VclPtr<SfxTabPage> SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet } - VclPtr<SfxTabPage> SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxFooterPage>::Create( pParent, *rSet ); } - SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) @@ -137,7 +135,6 @@ SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : } - SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) @@ -200,7 +197,6 @@ SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 n } - SvxHFPage::~SvxHFPage() { disposeOnce(); @@ -229,7 +225,6 @@ void SvxHFPage::dispose() } - bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) { const sal_uInt16 nWSize = GetWhich(SID_ATTR_PAGE_SIZE); diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 591d67d45003..072b43afe607 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -22,8 +22,6 @@ #define INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX - - class IMapOwnData { public: diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index fdd7550a41fd..caeead2d34af 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -756,8 +756,6 @@ IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) } - - sal_Int32 SvxLanguageComboBox::SaveEditedAsEntry() { if (meEditedAndValid != EDITED_VALID) diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index fb10253e2461..848949e8e9d1 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -206,7 +206,6 @@ VclPtr<SfxTabPage> SvxGridTabPage::Create( vcl::Window* pParent, const SfxItemSe } - bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) @@ -233,7 +232,6 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) } - void SvxGridTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pAttr = nullptr; @@ -260,7 +258,6 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) } - void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = nullptr; @@ -334,7 +331,6 @@ IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) { bAttrModified = true; diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 1bae8481e15e..3c40a1589d47 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -28,7 +28,6 @@ namespace svx { - struct OrientationHelper_Impl { typedef std::pair< VclPtr<vcl::Window>, TriState > WindowPair; @@ -53,7 +52,6 @@ struct OrientationHelper_Impl }; - OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox& rCbStacked ) : mrCtrlDial( rCtrlDial ), mrCbStacked( rCbStacked ), @@ -103,7 +101,6 @@ IMPL_LINK_NOARG_TYPED(OrientationHelper_Impl, ClickHdl, Button*, void) } - OrientationHelper::OrientationHelper( DialControl& rCtrlDial, NumericField& rNfRotation, CheckBox& rCbStacked ) : mpImpl( new OrientationHelper_Impl( rCtrlDial, rCbStacked ) ) { @@ -153,7 +150,6 @@ void OrientationHelper::EnableStackedTriState( bool bEnable ) } - OrientStackedWrapper::OrientStackedWrapper( OrientationHelper& rOrientHlp ) : SingleControlWrapperType( rOrientHlp ) { @@ -181,7 +177,6 @@ void OrientStackedWrapper::SetControlValue( bool bValue ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 079c994e8d13..2f727e93fe47 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -402,7 +402,6 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, } - void SvxPageWindow::SetBorder(const SvxBoxItem& rNew) { delete pBorder; @@ -410,7 +409,6 @@ void SvxPageWindow::SetBorder(const SvxBoxItem& rNew) } - void SvxPageWindow::SetHdBorder(const SvxBoxItem& rNew) { delete pHdBorder; diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 8455f7fcdb92..6a1430dcabae 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -50,7 +50,6 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, EditModifyHdl, Edit&, void) { if ( !bEmpty ) @@ -66,7 +65,6 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, EditModifyHdl, Edit&, void) } - SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") , aOldPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_OLD_PASSWD)) diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 96267d955761..59cd731a80f5 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -85,7 +85,6 @@ void SvxRelativeField::Modify() } - void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep ) { @@ -97,7 +96,6 @@ void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, } - void SvxRelativeField::SetRelative( bool bNewRelative ) { Selection aSelection = GetSelection(); diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 35b0435209f2..06ad0da4a9db 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -20,10 +20,6 @@ #include <svl/rectitem.hxx> - - - - #include <svx/dialogs.hrc> #include <svx/ruler.hxx> @@ -42,7 +38,6 @@ SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindin } - void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 9fbdcf49c73d..c5f8987dce60 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -149,7 +149,6 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) : {} - void SvxLongLRSpaceItem::SetLeft(long lArgLeft) { mlLeft = lArgLeft; @@ -276,7 +275,6 @@ SvxLongULSpaceItem::SvxLongULSpaceItem() : {} - void SvxLongULSpaceItem::SetUpper(long lArgLeft) { mlLeft = lArgLeft; @@ -784,10 +782,6 @@ bool SvxObjectItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) } - - - - void SvxObjectItem::SetStartX(long lValue) { nStartX = lValue; diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 3bc463b0f30d..421623684396 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -39,7 +39,6 @@ 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 64f037bf7a80..d0424bcf8b53 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -79,7 +79,6 @@ using namespace com::sun::star; using namespace comphelper; - #define REMEMBER_SIZE 10 #define MODIFY_SEARCH 0x00000001 @@ -166,14 +165,12 @@ SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) : } - SearchAttrItemList::~SearchAttrItemList() { Clear(); } - void SearchAttrItemList::Put( const SfxItemSet& rSet ) { if ( !rSet.Count() ) @@ -209,7 +206,6 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) } - SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) { SfxItemPool* pPool = rSet.GetPool(); @@ -223,7 +219,6 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) } - void SearchAttrItemList::Clear() { for ( size_t i = 0; i < size(); ++i ) @@ -233,7 +228,6 @@ void SearchAttrItemList::Clear() } - // Deletes the pointer to the items void SearchAttrItemList::Remove(size_t nPos, size_t nLen) { @@ -343,7 +337,6 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi } - SvxSearchDialog::~SvxSearchDialog() { disposeOnce(); @@ -545,7 +538,6 @@ void SvxSearchDialog::Construct_Impl() } - bool SvxSearchDialog::Close() { // remember strings speichern @@ -577,7 +569,6 @@ bool SvxSearchDialog::Close() } - sal_Int32 SvxSearchDialog::GetTransliterationFlags() const { if (!m_pMatchCaseCB->IsChecked()) @@ -597,7 +588,6 @@ void SvxSearchDialog::SetSaveToModule(bool b) } - void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) { nTransliterationFlags = nSettings; @@ -608,7 +598,6 @@ void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) } - void SvxSearchDialog::Activate() { // apply possible transliteration changes of the SvxSearchItem member @@ -621,7 +610,6 @@ void SvxSearchDialog::Activate() } - void SvxSearchDialog::InitControls_Impl() { // CaseSensitives AutoComplete @@ -747,7 +735,6 @@ void SvxSearchDialog::ShowOptionalControls_Impl() } - namespace { class ToggleSaveToModule @@ -1049,7 +1036,6 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) } - void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, const SfxItemSet* pRSet ) { @@ -1109,7 +1095,6 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, } - IMPL_LINK_TYPED( SvxSearchDialog, LBSelectHdl_Impl, ListBox&, rCtrl, void ) { ClickHdl_Impl(&rCtrl); @@ -1238,7 +1223,6 @@ void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) } - IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr ); @@ -1402,7 +1386,6 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) } - IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) { if ( !bSet ) @@ -1443,7 +1426,6 @@ IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) { if ( pImpl->bSaveToModule ) @@ -1530,7 +1512,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) } - void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) { if ( rStr.isEmpty() ) @@ -1559,7 +1540,6 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) } - void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) { OUString aOldSrch( m_pSearchTmplLB->GetSelectEntry() ); @@ -1599,7 +1579,6 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) } - void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) { if ( nFlags == nOptions ) @@ -1715,7 +1694,6 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) } - void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) { if (m_pSearchBtn == pCtrl && ( SearchOptionFlags::SEARCH & nOptions ) ) @@ -1805,7 +1783,6 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) } - void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) { if ( pItem ) @@ -1818,7 +1795,6 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) } - IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) { sal_Int32 nTxtLen = m_pSearchAttrText->GetText().getLength(); @@ -1878,14 +1854,12 @@ IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, LoseFocusHdl_Impl, Control&, void) { SaveToModule_Impl(); } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) { SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -1977,7 +1951,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); @@ -2017,7 +1990,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) { if ( !pSearchList || !pImpl->pRanges ) @@ -2034,7 +2006,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) { SfxViewShell* pViewShell = SfxViewShell::Current(); @@ -2054,7 +2025,6 @@ IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) } - OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, bool bSrchFlag ) const { @@ -2123,7 +2093,6 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, } - void SvxSearchDialog::PaintAttrText_Impl() { OUString aDesc; @@ -2145,7 +2114,6 @@ void SvxSearchDialog::PaintAttrText_Impl() } - void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) { if ( m_pSearchLB == pCtrl ) @@ -2183,7 +2151,6 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) } - void SvxSearchDialog::SaveToModule_Impl() { if ( !pSearchItem ) @@ -2263,7 +2230,6 @@ css::uno::Reference< css::awt::XWindowPeer > SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG); - SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) @@ -2285,8 +2251,6 @@ SvxSearchDialogWrapper::~SvxSearchDialogWrapper () } - - SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 4e540c36edda..6b2b319fade8 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -22,7 +22,6 @@ #include <svx/strarray.hxx> - SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : ResStringArray( SVX_RES( nResId ) ) @@ -31,21 +30,17 @@ SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : } - SvxStringArray::SvxStringArray( const ResId& rResId ) : ResStringArray( rResId ) { } - - SvxStringArray::~SvxStringArray() { } - const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const { if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 6d6ff38f9dca..b91442bc7b42 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -77,7 +77,6 @@ sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const } - void SvxTextEncodingBox::FillFromTextEncodingTable( bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags ) @@ -127,7 +126,6 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( } - void SvxTextEncodingBox::FillFromDbTextEncodingMap( bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags ) @@ -187,7 +185,6 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( } - void SvxTextEncodingBox::FillWithMimeAndSelectBest() { FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME ); @@ -196,7 +193,6 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() } - void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, const OUString& rEntry, sal_Int32 nPos ) { @@ -205,7 +201,6 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, } - void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_Int32 nPos ) { const OUString& rEntry = m_pEncTable->GetTextString( nEnc ); @@ -216,7 +211,6 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_In } - rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { sal_Int32 nPos = GetSelectEntryPos(); @@ -228,7 +222,6 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const } - void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, bool bSelect ) { sal_Int32 nAt = EncodingToPos_Impl( nEnc ); diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 0240d1992ba5..4da766fa9ef6 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -43,7 +43,6 @@ const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc } - rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const { sal_uInt32 nCount = Count(); diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index e37e7a17b48d..0db7d98613ba 100644 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx @@ -24,7 +24,6 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> - E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pObject) : mpScene(nullptr), mpViewInformation3D(nullptr) diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 84f71a4d4105..26f371ea174f 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -46,15 +46,12 @@ sdr::contact::ViewContact* E3dExtrudeObj::CreateObjectSpecificViewContact() } - sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dExtrudeProperties(*this); } - - // Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side // surfaces rectangles from the passed PolyPolygon diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 10c780b61bfe..edaec94b8ab1 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2174,7 +2174,6 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) } - IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) { @@ -2441,7 +2440,6 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) } - IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) { SvColorDialog aColorDlg( this ); @@ -2594,7 +2592,6 @@ IMPL_LINK_TYPED( Svx3DWin, ModifyHdl, Edit&, rField, void ) } - void Svx3DWin::ClickLight(PushButton& rBtn) { sal_uInt16 nLightSource = GetLightSource( &rBtn ); @@ -2622,7 +2619,6 @@ void Svx3DWin::ClickLight(PushButton& rBtn) } - IMPL_LINK_NOARG_TYPED(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) { const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 1362642e7b83..cf9b9127682e 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -29,11 +29,9 @@ #include <com/sun/star/uno/Sequence.h> - using namespace com::sun::star; - class ImplPairDephAndObject { private: @@ -57,7 +55,6 @@ public: }; - void getAllHit3DObjectWithRelativePoint( const basegfx::B3DPoint& rFront, const basegfx::B3DPoint& rBack, @@ -96,7 +93,6 @@ void getAllHit3DObjectWithRelativePoint( } - E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInformation3D& o_rViewInformation3D, const E3dCompoundObject& rCandidate) { // Search for root scene (outmost scene) of the 3d object since e.g. in chart, multiple scenes may @@ -158,7 +154,6 @@ E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInf } - void getAllHit3DObjectsSortedFrontToBack( const basegfx::B2DPoint& rPoint, const E3dScene& rScene, @@ -235,7 +230,6 @@ void getAllHit3DObjectsSortedFrontToBack( } - bool checkHitSingle3DObject( const basegfx::B2DPoint& rPoint, const E3dCompoundObject& rCandidate) diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index 7e7aedbe372f..19db8ee885f4 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -30,7 +30,6 @@ #include <svx/scene3d.hxx> - namespace drawinglayer { namespace processor3d diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx index 698af3d4e6f2..559f49714c4c 100644 --- a/svx/source/engine3d/helperminimaldepth3d.hxx +++ b/svx/source/engine3d/helperminimaldepth3d.hxx @@ -45,7 +45,6 @@ class E3dCompoundObject; double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject); - #endif // INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index bc4e87f0970a..186e922e7177 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -44,15 +44,12 @@ sdr::contact::ViewContact* E3dLatheObj::CreateObjectSpecificViewContact() } - sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dLatheProperties(*this); } - - // Constructor from 3D polygon, scale is the conversion factor for the coordinates E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D) diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 66ef3b7d1bf6..91fa02ca747a 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -78,7 +78,6 @@ #include <svx/e3dsceneupdater.hxx> - using namespace com::sun::star; @@ -172,15 +171,12 @@ SdrObject* E3dObjList::RemoveObject(size_t nObjNum) } - sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() { return new sdr::properties::E3dProperties(*this); } - - E3dObject::E3dObject() : maSubList(), maLocalBoundVol(), @@ -772,8 +768,6 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti } - - E3dCompoundObject::E3dCompoundObject() : E3dObject(), aMaterialAmbientColor(), diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index df5d6a45bea1..1a39932674bc 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b3dpolygontools.hxx> - // DrawContact section sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index e0224f462bd7..f34bbe8ff16a 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -48,7 +48,6 @@ #include <svx/svdmodel.hxx> - class ImpRemap3DDepth { sal_uInt32 mnOrdNum; @@ -181,8 +180,6 @@ sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() } - - E3dScene::E3dScene() : E3dObject(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index b7d6cc935245..17a776e91172 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -42,16 +42,12 @@ sdr::contact::ViewContact* E3dSphereObj::CreateObjectSpecificViewContact() } - sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dSphereProperties(*this); } - - - // Build Sphere from polygon facets in latitude and longitude E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize) diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index 6345748396a2..a17f4ccb7b82 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/drawing/ShadeMode.hpp> - - using namespace ::com::sun::star; // #i28528# @@ -89,7 +87,6 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) {} - Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) {} diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 206284248cb9..f6a54f41f491 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -71,7 +71,6 @@ using namespace com::sun::star; #define ITEMVALUE(ItemSet,Id,Cast) (static_cast<const Cast&>((ItemSet).Get(Id))).GetValue() - // Migrate Marking class Impl3DMirrorConstructOverlay diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 265f89498fdb..88f888aaed25 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -677,5 +677,4 @@ namespace svx } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 699d17a378f7..59d0bbcef3bf 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -51,7 +51,6 @@ namespace svx } - SotClipboardFormatId OComponentTransferable::getDescriptorFormatId(bool _bExtractForm) { static SotClipboardFormatId s_nReportFormat = static_cast<SotClipboardFormatId>(-1); @@ -143,5 +142,4 @@ namespace svx } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 507df1631cdc..10899e920301 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -78,7 +78,6 @@ using ::com::sun::star::sdb::XRowSetSupplier; using ::com::sun::star::awt::XVclWindowPeer; - css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) { css::awt::FontDescriptor aFD; @@ -283,7 +282,6 @@ void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( Run } - void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( RuntimeException, std::exception ) { ContainerEvent aMulti( e ); @@ -328,7 +326,6 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even //= FmXGridControl - Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) throw (css::uno::Exception) { @@ -1514,7 +1511,6 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) } - void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException, std::exception ) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 45ebd249bbd0..20ea0634a083 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -528,7 +528,6 @@ void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _ //= cell controls - DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ ) :OPropertyChangeListener(m_aMutex) ,m_pModelChangeBroadcaster(nullptr) @@ -3127,8 +3126,6 @@ IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) } - - FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl ) :OComponentHelper(m_aMutex) ,m_pColumn(pColumn) @@ -4321,7 +4318,6 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind } - IMPL_LINK_NOARG_TYPED(FmXListBoxCell, OnDoubleClick, ListBox&, void) { if (m_pBox) diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 56e68c269f8e..3333f797771d 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -144,8 +144,6 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS } - - namespace { diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index c7b1d1caa1f0..3f67bc63f832 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -402,5 +402,4 @@ namespace svx } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e28f9bf3814e..53b5f50de11c 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2234,11 +2234,9 @@ namespace svxform } - // class NavigatorFrameManager - SFX_IMPL_DOCKINGWINDOW( DataNavigatorManager, SID_FM_SHOW_DATANAVIGATOR ) diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index fe88160c9457..184be709c7de 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -47,6 +47,4 @@ namespace svxform { namespace charset_helper } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 2e4bf31643a7..0e06a4e803ff 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -141,7 +141,6 @@ Image FmFilterData::GetImage() const } - FmParentData::~FmParentData() { for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin(); @@ -150,7 +149,6 @@ FmParentData::~FmParentData() } - Image FmFormItem::GetImage() const { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); @@ -158,7 +156,6 @@ Image FmFormItem::GetImage() const } - FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const { for ( ::std::vector< FmFilterData* >::const_iterator i = m_aChildren.begin(); @@ -182,7 +179,6 @@ Image FmFilterItems::GetImage() const } - FmFilterItem::FmFilterItem( FmFilterItems* pParent, const OUString& aFieldName, const OUString& aText, @@ -1255,7 +1251,6 @@ IMPL_LINK_NOARG_TYPED(FmFilterNavigator, OnDropActionTimer, Timer *, void) } - sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) { Point aDropPos = rEvt.maPosPixel; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index bb63fed3b326..ec6aabfee384 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -47,7 +47,6 @@ using namespace ::svxform; } - // Encapsulation violation: We *know* that // SvxUnoDrawMSFactory::createInstanceWithArguments() always throws. diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index a61abcfb923d..ec8c171c8f42 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -74,7 +74,6 @@ namespace svxform using namespace ::com::sun::star::sdbc; - namespace { diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 58428a6ced0a..0880968c309e 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -28,7 +28,6 @@ #include <tools/diagnose_ex.h> - namespace svxform { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 53bb185cbe8c..316f951c5dcb 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -82,7 +82,6 @@ FmNavInsertedHint::~FmNavInsertedHint() } - // class FmNavInsertedHint FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData* pAffectedEntryData ) @@ -599,11 +598,9 @@ namespace svxform } - // class NavigatorFrameManager - SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER ) diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index e8f319c5380e..aed2077ddac6 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -26,7 +26,6 @@ // class FmInterfaceItem - bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -54,6 +53,4 @@ SfxPoolItem* FmInterfaceItem::Create( SvStream& /*rStrm*/, sal_uInt16 ) const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 4f8e5e363dd3..115dfa0d739c 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -235,5 +235,4 @@ IMPL_STATIC_LINK_TYPED( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 41a1aef3b029..cf4d5919a6fd 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -53,7 +53,6 @@ using com::sun::star::container::XChild; using com::sun::star::container::XNameContainer; - FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage) :SdrPage(rModel, bMasterPage) ,m_pImpl( new FmFormPageImpl( *this ) ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 264e83a8c83b..6c3fc9a9bc9e 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3970,7 +3970,6 @@ bool FmXFormShell::HasControlFocus() const } - SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint) :IndexAccessIterator(xStartingPoint) { @@ -4015,8 +4014,6 @@ bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*x } - - SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem); @@ -4091,5 +4088,4 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index caf0bd2be212..2b4abd434bf5 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star::beans; using namespace ::svxform; - // = FmSearchThread void FmSearchThread::run() @@ -660,7 +659,6 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString } - FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index ed77e61673eb..97a8b9984e3f 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -183,7 +183,6 @@ namespace svx }; - FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IFocusObserver* _pObserver ) :m_pObserver( _pObserver ) ,m_xWindow( _rxControl, UNO_QUERY ) diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 8db5d5346f65..40c90dcf5882 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -299,7 +299,6 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) } - FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< css::lang::XComponent>& _rxObject, sal_Int16 _nId) :m_xObject(_rxObject) ,m_pListener(_pListener) @@ -347,7 +346,6 @@ void FmXDisposeMultiplexer::dispose() } - sal_Int16 getControlTypeByObject(const Reference< css::lang::XServiceInfo>& _rxObject) { // ask for the persistent service name diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 0be8b170021d..e07570a14778 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -164,7 +164,6 @@ struct PropertySetInfo typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache; - OUString static_STR_UNDO_PROPERTY; @@ -827,7 +826,6 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & } - void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" ); @@ -963,7 +961,6 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement } - FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyChangeEvent& evt) :SdrUndoAction(rNewMod) ,xObj(evt.Source, UNO_QUERY) @@ -978,7 +975,6 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC } - void FmUndoPropertyAction::Undo() { FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv(); @@ -1028,7 +1024,6 @@ OUString FmUndoPropertyAction::GetComment() const } - FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod, Action _eAction, const Reference< XIndexContainer > & xCont, @@ -1072,7 +1067,6 @@ FmUndoContainerAction::~FmUndoContainerAction() } - void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xElem ) { Reference< XComponent > xComp( xElem, UNO_QUERY ); @@ -1216,7 +1210,6 @@ FmUndoModelReplaceAction::~FmUndoModelReplaceAction() } - void FmUndoModelReplaceAction::DisposeElement( const css::uno::Reference< css::awt::XControlModel>& xReplaced ) { Reference< XComponent > xComp(xReplaced, UNO_QUERY); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index d3ff3b1ef636..5c84e2ac1303 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -79,9 +79,6 @@ using namespace ::svxform; using namespace ::svx; - - - FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut ) :E3dView(pModel,pOut) { diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 5d8895abaef4..efa5b3892bb5 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -2380,7 +2380,6 @@ void FormController::stopListening() } - Reference< XControl > FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,bool _bRemove,bool _bOverWrite) const { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 29d6d8711e86..e7a628b715cf 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1362,7 +1362,6 @@ namespace svxform } - // insert form GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, true ); @@ -1548,7 +1547,6 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnClipboardAction, OLocalExchange&, void) { if ( !m_aControlExchange.isClipboardOwner() ) @@ -2178,5 +2176,4 @@ namespace svxform } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index f949bd35019f..05d6c73bd798 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -219,7 +219,6 @@ namespace svxform } - void NavigatorTreeModel::SetModified( bool bMod ) { if( !m_pFormShell ) return; @@ -965,5 +964,4 @@ namespace svxform } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 3d6e58b62235..8665ab4639c0 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -50,5 +50,4 @@ namespace svxform } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index c2ba42afd83a..db01e9ad1a1e 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -398,7 +398,6 @@ void FmFieldWin::Resize() Size aOutputSize( GetOutputSizePixel() ); - // adapt size of css::form::ListBox Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); Size aLBSize( aOutputSize ); diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index a0a880a7fca1..8357be0caa9c 100644 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -24,7 +24,6 @@ #include <memory> - GalleryCodec::GalleryCodec( SvStream& rIOStm ) : rStm( rIOStm ) { diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index cfbb7dcfe7fb..5f9913852c34 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1312,7 +1312,6 @@ OUString GalleryBrowser2::GetFilterName() const } - IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) { ImplUpdateInfoBar(); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index ba65baa2719a..6aebc63df639 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; - GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) : m_bDestDirRelative(false) , pParent(pGallery) diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 49439a74f800..42a76a65742a 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -46,7 +46,6 @@ class FrameSelector; namespace a11y { - class AccFrameSelector : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, @@ -126,7 +125,6 @@ private: }; - } } diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 79fd3987e60c..2169e9688452 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -113,7 +113,6 @@ namespace svx }; - typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible, css::accessibility::XAccessibleTable > OAccessibleHelper_Base; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 531c67661efc..c22b00800d6a 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -59,7 +59,6 @@ class FmFormShell; - namespace svxform { @@ -306,7 +305,6 @@ namespace svxform }; - typedef std::vector< VclPtr<XFormsPage> > PageList; typedef ::rtl::Reference < DataListener > DataListener_ref; diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 4ebaff8eb0e6..7fb6dcbd6bcc 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -28,7 +28,6 @@ namespace svxform { - //= DelayedEvent /** small class which encapsulates posting a Link instance as ApplicationUserEvent diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 42ba89a242ad..f0ed25cfc09d 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -190,7 +190,6 @@ protected: }; - class OFilterItemExchange : public OLocalExchange { ::std::vector<FmFilterItem*> m_aDraggedEntries; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 8440b999767d..6bdad805813d 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -39,8 +39,6 @@ namespace svxform { - - typedef ::std::set< SvTreeListEntry* > ListBoxEntrySet; @@ -231,7 +229,6 @@ namespace svxform }; - inline bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats ) { return hasFormat( _rFormats, getFieldExchangeFormatId() ); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index c3d225123c28..7ea2e9829e2d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -257,7 +257,6 @@ public: }; - class FmControlData : public FmEntryData { css::uno::Reference< css::form::XFormComponent > m_xFormComponent; @@ -285,8 +284,6 @@ public: }; - - namespace svxform { diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 9167569f4c06..7e3dbd3b128f 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -55,7 +55,6 @@ inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy } - #endif // INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index de9841d4f218..bca6f69bcd9a 100644 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx @@ -30,7 +30,6 @@ namespace svxform { - //= IFormScriptingEnvironment /** describes the interface implemented by a component which handles scripting requirements diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 77d60fa08479..d4010f7385db 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -303,7 +303,6 @@ private: }; - #endif // INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index d5abe6b48026..a6dacd4527ce 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -93,7 +93,6 @@ private: }; - typedef std::vector< FrameBorder* > FrameBorderPtrVec; struct FrameSelectorImpl : public Resource @@ -222,7 +221,6 @@ struct FrameSelectorImpl : public Resource }; - /** Dummy predicate for frame border iterators to use all borders in a container. */ struct FrameBorderDummy_Pred { diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 9394d47a12d8..4bf1706cf737 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -337,7 +337,6 @@ private: }; - inline bool DbCellControl::isValuePropertyLocked() const { return m_bAccessingValueProperty; diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index db7c8a51beb0..4d0d5a796943 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -30,7 +30,6 @@ namespace svxform { - //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service class DataColumn diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index cb9e351755b4..c81eacc88787 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -50,9 +50,6 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, } - - - bool SvxSmartTagItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= comphelper::InitPropertySequence( { @@ -74,7 +71,6 @@ bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId } - bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -91,21 +87,18 @@ bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const } - 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 { return nullptr; diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 54720b99e83e..ec1f4e47e9f9 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -57,7 +57,6 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons } - bool SvxOrientationItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -70,7 +69,6 @@ bool SvxOrientationItem::GetPresentation } - bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { table::CellOrientation eUno = table::CellOrientation_STANDARD; @@ -109,7 +107,6 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } - OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); @@ -117,14 +114,12 @@ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) } - SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const { return new SvxOrientationItem( *this ); } - SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt16 nVal; @@ -133,14 +128,12 @@ SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const } - sal_uInt16 SvxOrientationItem::GetValueCount() const { return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 } - bool SvxOrientationItem::IsStacked() const { return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED; @@ -184,7 +177,6 @@ SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) : } - SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop, sal_Int16 nRight, @@ -200,8 +192,6 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, } - - SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : SfxPoolItem( rItem.Which() ) @@ -213,7 +203,6 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : } - bool SvxMarginItem::GetPresentation ( SfxItemPresentation ePres, @@ -262,7 +251,6 @@ bool SvxMarginItem::GetPresentation } - bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -274,14 +262,12 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const { return new SvxMarginItem(*this); } - SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_Int16 nLeft; @@ -296,7 +282,6 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const } - SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { rStream.WriteInt16( nLeftMargin ); @@ -307,8 +292,6 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) } - - bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -336,7 +319,6 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); @@ -367,28 +349,24 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - void SvxMarginItem::SetLeftMargin( sal_Int16 nLeft ) { nLeftMargin = nLeft; } - void SvxMarginItem::SetTopMargin( sal_Int16 nTop ) { nTopMargin = nTop; } - void SvxMarginItem::SetRightMargin( sal_Int16 nRight ) { nRightMargin = nRight; } - void SvxMarginItem::SetBottomMargin( sal_Int16 nBottom ) { nBottomMargin = nBottom; diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 0815388e96a4..429e2834dc48 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; - SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);} SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : @@ -40,21 +39,18 @@ 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 { return new SvxChartStyleItem(rIn, Which()); @@ -66,14 +62,12 @@ 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 { return new SvxChartDataDescrItem(rIn, Which()); @@ -86,28 +80,24 @@ 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( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required @@ -132,7 +122,6 @@ bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMember } - bool SvxChartTextOrderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // the order of the two enums is not equal, so a mapping is required @@ -173,14 +162,12 @@ 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 { return new SvxChartTextOrientItem(rIn, Which()); @@ -193,7 +180,6 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : } - SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : SfxPoolItem(rItem), fVal(rItem.fVal) @@ -201,14 +187,12 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : } - OUString SvxDoubleItem::GetValueText() const { return rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' ); } - bool SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString& rText, @@ -226,21 +210,18 @@ bool SvxDoubleItem::GetPresentation } - bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const { return static_cast<const SvxDoubleItem&>(rItem).fVal == fVal; } - SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxDoubleItem(*this); } - SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const { double _fVal; @@ -272,28 +253,24 @@ 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 { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) @@ -308,28 +285,24 @@ 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 { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) @@ -344,28 +317,24 @@ 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 { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 213189d8028a..a0aec77420b3 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -111,7 +111,6 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) : } - bool SvxGradientListItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -159,7 +158,6 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) : } - bool SvxHatchListItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index f853012e2516..9e623dcfcbee 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; - SvxB3DVectorItem::SvxB3DVectorItem() { } @@ -35,7 +34,6 @@ SvxB3DVectorItem::~SvxB3DVectorItem() } - SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) : SfxPoolItem( _nWhich ), aVal( rVal ) @@ -43,7 +41,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector } - SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -51,7 +48,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : } - bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -59,14 +55,12 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const } - SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const { return new SvxB3DVectorItem( *this ); } - SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const { basegfx::B3DVector aStr; @@ -78,7 +72,6 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/ } - SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { @@ -92,7 +85,6 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ } - bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { assert(!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ())); @@ -109,7 +101,6 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) con } - bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { drawing::Direction3D aDirection; @@ -126,7 +117,6 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } - sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0; diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 51d0cf7f1ba8..212cded5d461 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/Sequence.hxx> - SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; } SvxGalleryItem::SvxGalleryItem() diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 4e485f04f052..b033f8fe8bbb 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -80,7 +80,6 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const } - bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -149,6 +148,4 @@ bool SvxGrfCrop::GetPresentation( } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 8b8f1852f35f..5ff6e27ca847 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -25,8 +25,6 @@ #include "svx/hlnkitem.hxx" - - SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(0);} #define HYPERLINKFF_MARKER 0x599401FE diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index b7be0282428b..12dc40982188 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -38,9 +38,6 @@ const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789; - - - SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -61,7 +58,6 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma } - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -93,7 +89,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -130,7 +125,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } - SvxNumberFormatShell::~SvxNumberFormatShell() { /* @@ -153,14 +147,12 @@ SvxNumberFormatShell::~SvxNumberFormatShell() } - size_t SvxNumberFormatShell::GetUpdateDataCount() const { return aDelList.size(); } - void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ) { const size_t nListSize = aDelList.size(); @@ -173,7 +165,6 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt3 } - void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, short& rFmtSelPos, std::vector<OUString>& rFmtEntries ) @@ -190,7 +181,6 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, } - void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, short& rFmtSelPos, std::vector<OUString>& rFmtEntries ) @@ -203,7 +193,6 @@ void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, } - void SvxNumberFormatShell::FormatChanged( sal_uInt16 nFmtLbPos, OUString& rPreviewStr, Color*& rpFontColor ) @@ -299,7 +288,6 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos, } - bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, sal_uInt16& rCatLbSelPos, short& rFmtSelPos, @@ -335,7 +323,6 @@ bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, } - void SvxNumberFormatShell::MakeFormat( OUString& rFormat, bool bThousand, bool bNegRed, sal_uInt16 nPrecision, sal_uInt16 nLeadingZeroes, @@ -418,7 +405,6 @@ void SvxNumberFormatShell::GetOptions( const OUString& rFormat, } - void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, OUString& rPreviewStr, Color*& rpFontColor ) @@ -453,7 +439,6 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, } - bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) { sal_uInt32 nFound = pFormatter->GetEntryKey( rFmtString, eCurLanguage ); @@ -479,7 +464,6 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) } - bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pAt /* = NULL */ ) { bool bRes=false; @@ -508,8 +492,6 @@ bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pA } - - void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, LanguageType& rLangType, sal_uInt16& nFmtLbSelPos, @@ -534,7 +516,6 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, eCurLanguage )); - CategoryToPos_Impl( nCurCategory, nCatLbPos ); rLangType = eCurLanguage; @@ -547,7 +528,6 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, } - short SvxNumberFormatShell::FillEntryList_Impl( std::vector<OUString>& rList ) { /* Erstellen einer aktuellen Liste von Format-Eintraegen. @@ -1101,8 +1081,6 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, } - - void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor ) { rpColor = nullptr; @@ -1122,28 +1100,24 @@ 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(); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 630218127468..31c3374bb601 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -20,8 +20,6 @@ #include <svx/numinf.hxx> - - #define INIT(pNum,eVal,nDouble,rStr) \ SfxPoolItem ( nId ), \ \ @@ -40,7 +38,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const sal_uInt16 nId ) : @@ -50,7 +47,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const OUString& rVal, const sal_uInt16 nId ) : @@ -60,7 +56,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const sal_uInt16 nId ) : @@ -70,7 +65,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const OUString& rValueStr, const sal_uInt16 nId ) : @@ -83,7 +77,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, #undef INIT - SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : SfxPoolItem( rItem.Which() ), @@ -106,14 +99,12 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : } - SvxNumberInfoItem::~SvxNumberInfoItem() { delete [] pDelFormatArr; } - bool SvxNumberInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -127,7 +118,6 @@ bool SvxNumberInfoItem::GetPresentation } - bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); @@ -161,7 +151,6 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const { return new SvxNumberInfoItem( *this ); @@ -176,14 +165,12 @@ SfxPoolItem* SvxNumberInfoItem::Create( SvStream& /*rStream*/, sal_uInt16 ) cons } - 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 ee99635b0840..1f40e9498c2c 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -82,7 +82,6 @@ inline OUString GetUsageText( const sal_uInt16 eU ) } - bool SvxPageItem::GetPresentation ( SfxItemPresentation ePres, @@ -220,7 +219,6 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt8 eType; @@ -243,7 +241,6 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const } - SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; @@ -278,7 +275,6 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const } - bool SvxSetItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 97cc424b3f70..1741b8f3f580 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -23,8 +23,6 @@ #include <svx/dialmgr.hxx> - - SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); } SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); } SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); } @@ -35,7 +33,6 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich ) } - SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rAuthor ) @@ -43,7 +40,6 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, } - bool SvxPostItAuthorItem::GetPresentation ( SfxItemPresentation ePres, @@ -66,7 +62,6 @@ bool SvxPostItAuthorItem::GetPresentation } - SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const { return new SvxPostItAuthorItem( *this ); @@ -78,7 +73,6 @@ SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich ) } - SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rDate ) @@ -86,7 +80,6 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich } - bool SvxPostItDateItem::GetPresentation ( SfxItemPresentation ePres, @@ -109,7 +102,6 @@ bool SvxPostItDateItem::GetPresentation } - SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const { return new SvxPostItDateItem( *this ); @@ -121,7 +113,6 @@ SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich ) } - SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rText ) @@ -129,7 +120,6 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich } - bool SvxPostItTextItem::GetPresentation ( SfxItemPresentation ePres, @@ -152,7 +142,6 @@ bool SvxPostItTextItem::GetPresentation } - SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { return new SvxPostItTextItem( *this ); diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index c3fa82b4bd50..11c76c6aceb7 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -138,5 +138,4 @@ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index ea349097cd44..986348466f47 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -26,7 +26,6 @@ #include <osl/diagnose.h> - SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; } #define VIEWLAYOUT_PARAM_COLUMNS "Columns" @@ -34,7 +33,6 @@ SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; #define VIEWLAYOUT_PARAMS 2 - SvxViewLayoutItem::SvxViewLayoutItem ( sal_uInt16 nColumns, @@ -47,7 +45,6 @@ SvxViewLayoutItem::SvxViewLayoutItem } - SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), mbBookMode( rOrig.IsBookMode() ) @@ -55,34 +52,29 @@ 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 nullptr; } - SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } - bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 6b8cb85617a7..a4db8d27b872 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> - - SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; } #define ZOOMSLIDER_PARAM_CURRENTZOOM "Columns" @@ -36,14 +34,12 @@ SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; #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() ) , maValues( rOrig.maValues ) @@ -53,34 +49,29 @@ 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 nullptr; } - SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } - bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index f514f8061dcf..fe6a91cf922b 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ ); @@ -141,6 +140,4 @@ void SvxClipBoardControl::DelPopup() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 38b1b763e5ca..ea92075faff7 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -32,7 +32,6 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem); - /* [Beschreibung] Ctor; setzt den Select-Handler am Men"u und tr"agt das Men"u @@ -55,7 +54,6 @@ SvxFontMenuControl::SvxFontMenuControl } - /* [Beschreibung] F"ullt das Men"u mit den aktuellen Fonts aus der Fontlist @@ -77,7 +75,6 @@ void SvxFontMenuControl::FillMenu() } - /* [Beschreibung] Statusbenachrichtigung; @@ -109,7 +106,6 @@ void SvxFontMenuControl::StateChanged( } - /* [Beschreibung] Statusbenachrichtigung "uber Bindings; bei DOCCHANGED @@ -126,7 +122,6 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - /* [Beschreibung] Select-Handler des Men"us; der Name des selektierten Fonts diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index cb5a7bf2033a..f4bc31e581f0 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -41,7 +41,6 @@ SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem); - /* [Beschreibung] Select-Handler des Men"us; die aktuelle Fontgr"o\se @@ -65,7 +64,6 @@ IMPL_LINK_TYPED( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen, void ) } - /* [Beschreibung] Statusbenachrichtigung; @@ -149,7 +147,6 @@ void SvxFontSizeMenuControl::StateChanged( } - /* [Beschreibung] Ctor; setzt den Select-Handler am Men"u und tr"agt Men"u @@ -173,7 +170,6 @@ SvxFontSizeMenuControl::SvxFontSizeMenuControl } - /* [Beschreibung] Dtor; gibt das Men"u frei. @@ -185,5 +181,4 @@ SvxFontSizeMenuControl::~SvxFontSizeMenuControl() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 145b47a47dbb..e0868ea5cb46 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -27,7 +27,6 @@ #include <comphelper/lok.hxx> - namespace sdr { namespace animation diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index 10d79563b3ef..830056fa0993 100644 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/animation/animationstate.hxx> - namespace sdr { namespace animation diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 8ecad40b6dd4..7d53ec205d3b 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -21,7 +21,6 @@ #include <sdr/attribute/sdrfilltextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 3b92f642b53b..5c8330e0597d 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -140,7 +140,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index 9f52a9d747b5..22022e8f432c 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index 4268c8bff26c..fb232e3c677a 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index 44b084a2e76a..fd4f12ff3293 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/attribute/sdrshadowtextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 4b9f2f41ee91..fd6fc102ae61 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -20,7 +20,6 @@ #include <svx/sdr/contact/displayinfo.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 808efb39617e..d5f07348f078 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -27,8 +27,6 @@ namespace sdr { namespace contact { - - SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) : ::avmedia::MediaWindow( pParent, false ), mrViewObjectContactOfSdrMediaObj( rViewObjContact ) @@ -36,13 +34,11 @@ SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMedi } - SdrMediaWindow::~SdrMediaWindow() { } - void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -58,7 +54,6 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) } - void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -73,7 +68,6 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) } - void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -88,7 +82,6 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) } - void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -98,7 +91,6 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) } - void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -108,7 +100,6 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) } - void SdrMediaWindow::Command( const CommandEvent& rCEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -123,7 +114,6 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt ) } - sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -143,7 +133,6 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } - sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -163,7 +152,6 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } - void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx index 4995ecdc8309..a92c407965f0 100644 --- a/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/svx/source/sdr/contact/sdrmediawindow.hxx @@ -25,8 +25,6 @@ namespace sdr { namespace contact { - - class ViewObjectContactOfSdrMediaObj; class SdrMediaWindow : public ::avmedia::MediaWindow diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index 7fdfb1b358a0..637f3042b5f3 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index 23f5ab5b21ed..679fcc552b3d 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -37,7 +37,6 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index ccb35bac3f4e..7e595c16b02e 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -27,7 +27,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 11ca3f9c22d7..65290881c63f 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 4909e6de2daa..3cccfca79db4 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -30,7 +30,6 @@ #include <svx/sxmtpitm.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 20dcb4092964..edc84c09a5f3 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -30,7 +30,6 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index ccb9214cf42f..4a4a9e9e7d00 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -30,11 +30,9 @@ #include <basegfx/tools/canvastools.hxx> - using namespace com::sun::star; - namespace { // Helper method to recursively travel the DrawHierarchy for 3D objects contained in @@ -54,7 +52,6 @@ namespace } // end of anonymous namespace - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index c7822b97bb67..7b04b17a30ba 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -66,7 +66,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 427a0d1f4de1..d67210f3b6e2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index f26c658b03c7..feb15fd44b42 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -31,7 +31,6 @@ #include <comphelper/sequence.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index cdc5cc2a4112..1c095b02af69 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -59,7 +59,6 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() } - vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const { vcl::Window* pRetval = nullptr; @@ -77,7 +76,6 @@ vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const } - Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const { Size aRet; @@ -89,7 +87,6 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const } - void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const { if( mpMediaWindow ) @@ -117,7 +114,6 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte } - void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem ) { if( mpMediaWindow ) @@ -133,7 +129,6 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte } - }} // end of namespace sdr::contact /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 50625289caff..ebc36b8e4f0b 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -42,7 +42,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace event @@ -116,7 +115,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace event diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 7df3b388a4ce..46ff77d897ce 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -24,7 +24,6 @@ #include <sdr/overlay/overlaytools.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index a89fdd15478a..4a563a95b5f1 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -24,7 +24,6 @@ #include <sdr/overlay/overlaytools.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index 264ceff75aa2..a581a7f92930 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index e9e19efacd28..63a1c88ff016 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -24,7 +24,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 582a95b644c4..af1a866c892d 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -27,7 +27,6 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index a044338da6c2..f162c2b7c80b 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 9b62afe406d9..6b3def9d6f9c 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -31,7 +31,6 @@ #include <vcl/dibtools.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 929fb6b0b06d..c4d8f07555b6 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> - namespace sdr { namespace overlay @@ -184,7 +183,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index 499074facd1e..1c281cafe732 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index 4929b2bf9755..f8e44ceb7978 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 59136639cffd..1fbfff195446 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -29,7 +29,6 @@ #include <vcl/settings.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index ad1cbd67baec..8439c29d8128 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -27,7 +27,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index bab9366054c2..ace91aae19bd 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -31,7 +31,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 37a14f61f2c8..0ecaa301f5b8 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -213,7 +213,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -286,7 +285,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -420,7 +418,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -538,7 +535,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 4f887cd39695..3cd98e349af7 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -28,7 +28,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 7bd9d28014c5..808bb9e176d7 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -208,7 +208,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index b5684a70a52b..434290324386 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -25,11 +25,9 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 94ba4ead36d6..4fc1c970dbe4 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 4e637502dfe2..22ce86064292 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -26,11 +26,9 @@ #include <drawinglayer/attribute/sdrlineattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 67081e899083..afe99c384e20 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -46,12 +46,10 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> - class TransparencePrimitive2D; using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 730a62c4dbd6..6fbcb8a168ee 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -28,11 +28,9 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -143,7 +141,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 9bba956d247f..c9cf3f59b9a8 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index bbe103930a47..ce032ab4454e 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -25,11 +25,9 @@ #include <basegfx/polygon/b2dpolygon.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index bab4e7394cc7..4f571d33e9b1 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -29,7 +29,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 51b22c0b20a4..8abcd06555b2 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -25,11 +25,9 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index a1e9b29a7228..22b3a061a410 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/polygon/b2dpolygon.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 5b62780d99a5..0e1606697598 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -33,11 +33,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> - using namespace com::sun::star; - namespace { sal_Int16 getPageNumber(const uno::Reference< drawing::XDrawPage >& rxDrawPage) @@ -85,7 +83,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive2d @@ -246,7 +243,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -299,7 +295,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -355,7 +350,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -432,7 +426,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 16acdb1021c7..d8434d62db20 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/attribute/sdrobjectattribute3d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index ea0ffce344cd..a9955c21df14 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -43,7 +43,6 @@ #include <svl/smplhint.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index b1fd15c9b737..85cd0099311c 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -25,7 +25,6 @@ #include <svx/svdocapt.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index af9aaf623365..1da3816b498a 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -27,7 +27,6 @@ #include <svx/sxciaitm.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 122034324811..7ab5fc431ebf 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -25,7 +25,6 @@ #include <svx/svdoedge.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 3dd95d1ea784..ac387cc747f5 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -27,7 +27,6 @@ #include <svl/smplhint.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index faac610e4043..eed59766cd2f 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -30,7 +30,6 @@ #include <editeng/eeitem.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 0361ab6e9d30..c454a6b9a2f5 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -23,7 +23,6 @@ #include <svx/scene3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index f17414c99d1a..c511471a4f1c 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -22,7 +22,6 @@ #include <svx/extrud3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 83f3f0190efa..b8847d061eab 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -22,7 +22,6 @@ #include <svx/lathe3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 8b8ffde8dde8..fd49afc1c13f 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -23,7 +23,6 @@ #include <svx/obj3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index f4f30c0aca1f..6190b4bcbaa0 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -22,7 +22,6 @@ #include <svx/sphere3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 8dac8e14558e..09a0f7cab5a7 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -26,7 +26,6 @@ #include <svx/sdgcpitm.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index f902c05aef6f..6e7e82890f9c 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -27,7 +27,6 @@ #include <svx/svdpage.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 6a34946099f2..bef396c1ec41 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -90,7 +90,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index 585b28eb65b0..634ca771b441 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -24,7 +24,6 @@ #include <svx/xlineit0.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index bf93438fc2ff..c1d9c381737f 100644 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx @@ -21,7 +21,6 @@ #include <svx/svdorect.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 3a70fa51b94c..53f40f4b3bbb 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -51,8 +51,6 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( } - - void ContextChangeEventMultiplexer::NotifyContextChange ( SfxViewShell* pViewShell, const ::sfx2::sidebar::EnumContext::Context eContext) @@ -62,8 +60,6 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( } - - ::rtl::OUString ContextChangeEventMultiplexer::GetModuleName ( const css::uno::Reference<css::frame::XFrame>& rxFrame) { diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 10cfb3c606fb..c5ef64750cb2 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -44,8 +44,6 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent) } - - EmptyPanel::~EmptyPanel() { disposeOnce(); diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 004d33b9fe6c..0fb9d00076b8 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -97,15 +97,11 @@ PanelFactory::PanelFactory() } - - PanelFactory::~PanelFactory() { } - - Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index 2e05c379162f..a4c6dbf4d007 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -90,8 +90,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark } - - EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( const SdrMarkList& rMarkList, const ViewType eViewType) @@ -198,8 +196,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( } - - EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt16 nObjectId) { switch (nObjectId) @@ -245,8 +241,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt } - - EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( const sal_uInt16 nObjectId, const ViewType eViewType) @@ -311,8 +305,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( } - - sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkList) { const size_t nMarkCount (rMarkList.GetMarkCount()); @@ -338,8 +330,6 @@ sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkL } - - sal_uInt16 SelectionAnalyzer::GetObjectTypeFromGroup (const SdrObject* pObj) { SdrObjList* pObjList = pObj->GetSubList(); @@ -393,8 +383,6 @@ sal_uInt16 SelectionAnalyzer::GetObjectTypeFromGroup (const SdrObject* pObj) } - - sal_uInt16 SelectionAnalyzer::GetObjectTypeFromMark (const SdrMarkList& rMarkList) { const size_t nMarkCount (rMarkList.GetMarkCount()); @@ -444,8 +432,6 @@ sal_uInt16 SelectionAnalyzer::GetObjectTypeFromMark (const SdrMarkList& rMarkLi } - - bool SelectionAnalyzer::IsShapeType (const sal_uInt16 nType) { switch (nType) @@ -478,8 +464,6 @@ bool SelectionAnalyzer::IsShapeType (const sal_uInt16 nType) } - - bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 nType) { switch(nType) @@ -496,7 +480,6 @@ bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 nType) } - } } // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index 2c852ac21001..2cc8cc9b9a84 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -45,15 +45,11 @@ SelectionChangeHandler::SelectionChangeHandler ( } - - SelectionChangeHandler::~SelectionChangeHandler() { } - - void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject&) throw (uno::RuntimeException, std::exception) { @@ -70,16 +66,12 @@ void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject& } - - void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&) throw (uno::RuntimeException, std::exception) { } - - void SAL_CALL SelectionChangeHandler::disposing() throw (uno::RuntimeException) { @@ -88,8 +80,6 @@ void SAL_CALL SelectionChangeHandler::disposing() } - - void SelectionChangeHandler::Connect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); @@ -101,8 +91,6 @@ void SelectionChangeHandler::Connect() } - - void SelectionChangeHandler::Disconnect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index cecea95d8c5a..5d2878fb0637 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -95,7 +95,6 @@ private: } } // end of namespace svx::sidebar - #endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 09ab4ef3e49c..d8fe13bca084 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -38,7 +38,6 @@ using ::sfx2::sidebar::Theme; namespace svx { namespace sidebar { - GraphicPropertyPanel::GraphicPropertyPanel( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -144,10 +143,6 @@ void GraphicPropertyPanel::Initialize() } - - - - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) { const sal_Int16 nBright = mpMtrBrightness->GetValue(); @@ -156,7 +151,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) { const sal_Int16 nContrast = mpMtrContrast->GetValue(); @@ -165,7 +159,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) { const sal_Int16 nTrans = mpMtrTrans->GetValue(); @@ -174,7 +167,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) { const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos(); @@ -183,7 +175,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) { const sal_Int16 nRed = mpMtrRed->GetValue(); @@ -192,7 +183,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) { const sal_Int16 nGreen = mpMtrGreen->GetValue(); @@ -201,7 +191,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) { const sal_Int16 nBlue = mpMtrBlue->GetValue(); @@ -210,7 +199,6 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void) { const sal_Int32 nGamma = mpMtrGamma->GetValue(); @@ -219,7 +207,6 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void) } - VclPtr<vcl::Window> GraphicPropertyPanel::Create ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -239,14 +226,12 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create ( } - void GraphicPropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) { } - void GraphicPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -453,12 +438,6 @@ void GraphicPropertyPanel::NotifyItemUpdate( } - - - - - - // namespace close }} // end of namespace svx::sidebar diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index f2486c3cfade..164fbc03d32a 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -86,8 +86,6 @@ void InsertPropertyPanel::dispose() } - - IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEvent, void) { // We will be getting a lot of window events (well, basically all diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index e198505a0aa9..026fb8c55aaa 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -51,7 +51,6 @@ const char USERITEM_NAME[] = "FitItem"; namespace svx { namespace sidebar { - PosSizePropertyPanel::PosSizePropertyPanel( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -181,7 +180,6 @@ namespace } // end of anonymous namespace - void PosSizePropertyPanel::Initialize() { //Position : Horizontal / Vertical @@ -251,7 +249,6 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create ( } - void PosSizePropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) { @@ -330,7 +327,6 @@ void PosSizePropertyPanel::HandleContextChange( } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && @@ -353,7 +349,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && @@ -376,21 +371,18 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) { executePosX(); } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) { executePosY(); } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) { if ( mpCbxScale->IsChecked() ) @@ -405,7 +397,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); @@ -451,7 +442,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) { sal_Int32 nTmp = mpDial->GetRotation(); @@ -467,7 +457,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) } - IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) { const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId())); @@ -487,7 +476,6 @@ IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) } - void PosSizePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -816,11 +804,6 @@ void PosSizePropertyPanel::NotifyItemUpdate( } - - - - - void PosSizePropertyPanel::executeSize() { if ( mpMtrWidth->IsValueModified() || mpMtrHeight->IsValueModified()) @@ -866,7 +849,6 @@ void PosSizePropertyPanel::executeSize() } - void PosSizePropertyPanel::executePosX() { if ( mpMtrPosX->IsValueModified()) @@ -891,7 +873,6 @@ void PosSizePropertyPanel::executePosX() } - void PosSizePropertyPanel::executePosY() { if ( mpMtrPosY->IsValueModified() ) @@ -914,7 +895,6 @@ void PosSizePropertyPanel::executePosY() } - void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState ) { bool bPosXBlank = false; @@ -953,7 +933,6 @@ void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* } - FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ) { FieldUnit eUnit = FUNIT_NONE; @@ -988,7 +967,6 @@ FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPo } - void PosSizePropertyPanel::DisableControls() { if( mbPositionProtected ) diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 81e01f9b871e..5aa420116325 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -186,7 +186,6 @@ private: } } // end of namespace svx::sidebar - #endif // INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 139c267a64ba..23f5cbaae7d1 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -26,7 +26,6 @@ #include <svx/dlgctrl.hxx> - namespace svx { namespace sidebar { class ShadowPropertyPanel diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index ba03dd5335b1..1ab29dcda1bf 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -132,7 +132,6 @@ IMPL_LINK_NOARG_TYPED(Popup, PopupModeEndHandler, FloatingWindow*, void) } - } } // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 72a1baac0b56..b11a8324f903 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -81,7 +81,6 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status } - void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -107,7 +106,6 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, } - IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) { if (pTimer == nullptr) @@ -120,7 +118,6 @@ IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) } - void SvxModifyControl::_repaint() { if ( GetStatusBar().AreItemsVisible() ) @@ -169,5 +166,4 @@ void SvxModifyControl::Click() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index dc8a766bfdeb..861efa122a1a 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -45,7 +45,6 @@ #include <comphelper/processfactory.hxx> - /* [Description] Function used to create a text representation of @@ -88,7 +87,6 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) } - SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem); class FunctionPopup_Impl : public PopupMenu @@ -105,7 +103,6 @@ private: }; - FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ), nSelected( 0 ) @@ -115,7 +112,6 @@ FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : } - void FunctionPopup_Impl::Select() { nSelected = GetCurItemId(); @@ -188,7 +184,6 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, } - /* [Description] Dtor(): @@ -202,7 +197,6 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl() } - /* [Description] SID_PSZ_FUNCTION activates the popup menu for Calc: @@ -302,7 +296,6 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt } - /* [Description] execute popup menu, when the status enables this @@ -342,7 +335,6 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) } - /* [Description] Depending on the type to be shown, the value us shown. First the diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 586d628a49f8..b68dd7961884 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -89,7 +89,6 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, } - void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -105,7 +104,6 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, } - bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) { SelectionTypePopup aPop( mnState ); @@ -135,7 +133,6 @@ bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) } - void SvxSelectionModeControl::Paint( const UserDrawEvent& rUsrEvt ) { const Rectangle aControlRect = getControlRect(); diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index a477eebac098..88714ebfc06a 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -52,7 +52,6 @@ private: }; - ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, SvxZoomEnableFlags nValueSet ) : PopupMenu(ResId(RID_SVXMNU_ZOOM, DIALOG_MGR())) , nZoom(nZ) @@ -75,7 +74,6 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, SvxZoomEnableFlags nValueSet ) } - void ZoomPopup_Impl::Select() { nCurId = GetCurItemId(); diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index ac9804db37ef..e9cbb38a1c0c 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -179,7 +179,6 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons } - void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst) { diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index faad745a0578..ec3a4d21dba0 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -90,7 +90,6 @@ SdrObject* SdrObjectPrimitiveHit( } - SdrObject* SdrObjListPrimitiveHit( const SdrObjList& rList, const Point& rPnt, @@ -114,7 +113,6 @@ SdrObject* SdrObjListPrimitiveHit( } - bool ViewObjectContactPrimitiveHit( const sdr::contact::ViewObjectContact& rVOC, const basegfx::B2DPoint& rHitPosition, diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 9b8f4aa3790d..642c86769d12 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -38,7 +38,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - using namespace ::com::sun::star; struct SdrPageWindow::Impl @@ -303,7 +302,6 @@ namespace #endif // CLIPPER_TEST - void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector ) { // set Redirector diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index c35207e1049d..c18bfa5f3a46 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -186,7 +186,6 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio } - void SdrPaintWindow::impCreateOverlayManager() { // not yet one created? diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index 374cb8f05f7c..4d020c8f0779 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -20,7 +20,6 @@ #include <svx/sdrundomanager.hxx> - SdrUndoManager::SdrUndoManager(sal_uInt16 nMaxUndoActionCount) : EditUndoManager(nMaxUndoActionCount) , maEndTextEditHdl() diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index a93510abbf7a..3b9d4601156d 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -625,7 +625,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) // FractionItem - SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): SfxPoolItem(nId) { @@ -695,7 +694,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const // ScaleItem - bool SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const @@ -736,7 +734,6 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const // OnOffItem - SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrOnOffItem(Which(),GetValue()); @@ -802,7 +799,6 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, // class SdrPercentItem - SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrPercentItem(Which(),GetValue()); @@ -835,7 +831,6 @@ bool SdrPercentItem::GetPresentation( // class SdrAngleItem - SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrAngleItem(Which(),GetValue()); @@ -923,7 +918,6 @@ bool SdrAngleItem::GetPresentation( // class SdrMetricItem - SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMetricItem(Which(),GetValue()); @@ -972,7 +966,6 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, // items of the legend object - SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } @@ -1970,7 +1963,6 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) // class SdrSignedPercentItem - SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrSignedPercentItem( Which(), GetValue() ); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 0e4719f83807..90ee92ffe465 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -118,7 +118,6 @@ ImplConnectMarkerOverlay::~ImplConnectMarkerOverlay() } - class ImpSdrCreateViewExtraData { // The OverlayObjects for XOR replacement @@ -179,11 +178,9 @@ void ImpSdrCreateViewExtraData::HideOverlay() } - // CreateView - void SdrCreateView::ImpClearConnectMarker() { if(mpCoMaOverlay) @@ -875,7 +872,6 @@ void SdrCreateView::HideCreateObj() } - bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(pAktCreate) diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b1e8db07e9b2..db4f68822412 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -74,7 +74,6 @@ #include <vector> - SdrDragEntry::SdrDragEntry() : mbAddToTransparent(false) { @@ -85,7 +84,6 @@ SdrDragEntry::~SdrDragEntry() } - SdrDragEntryPolyPolygon::SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon) : SdrDragEntry(), maOriginalPolyPolygon(rOriginalPolyPolygon) @@ -138,7 +136,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPolyPolygon::createP } - SdrDragEntrySdrObject::SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) : SdrDragEntry(), maOriginal(rOriginal), @@ -205,7 +202,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntrySdrObject::createPri } - SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rSequence, bool bAddToTransparent) @@ -231,7 +227,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPrimitive2DSequence: } - SdrDragEntryPointGlueDrag::SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag) : maPositions(rPositions), mbIsPointDrag(bIsPointDrag) @@ -301,8 +296,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPointGlueDrag::creat } - - void SdrDragMethod::resetSdrDragEntries() { // clear entries; creation is on demand @@ -962,8 +955,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragMethod::AddConnectorOverl } - - SdrDragMovHdl::SdrDragMovHdl(SdrDragView& rNewView) : SdrDragMethod(rNewView) { @@ -1177,8 +1168,6 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const } - - SdrDragObjOwn::SdrDragObjOwn(SdrDragView& rNewView) : SdrDragMethod(rNewView), mpClone(nullptr) @@ -1483,8 +1472,6 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const } - - void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) { // for SdrDragMove, use current Primitive2DContainer of SdrObject visualization @@ -1761,8 +1748,6 @@ Pointer SdrDragMove::GetSdrDragPointer() const } - - SdrDragResize::SdrDragResize(SdrDragView& rNewView) : SdrDragMethod(rNewView), aXFact(1,1), @@ -2097,8 +2082,6 @@ Pointer SdrDragResize::GetSdrDragPointer() const } - - void SdrDragRotate::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { rTarget.Rotate(DragStat().GetRef1(), nAngle, sin(nAngle*nPi180), cos(nAngle*nPi180)); @@ -2233,8 +2216,6 @@ Pointer SdrDragRotate::GetSdrDragPointer() const } - - SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1) : SdrDragMethod(rNewView), aFact(1,1), @@ -2514,8 +2495,6 @@ Pointer SdrDragShear::GetSdrDragPointer() const } - - void SdrDragMirror::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { if(bMirrored) @@ -2644,8 +2623,6 @@ Pointer SdrDragMirror::GetSdrDragPointer() const } - - SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad) : SdrDragMethod(rNewView), pIAOHandle(nullptr), @@ -2804,8 +2781,6 @@ Pointer SdrDragGradient::GetSdrDragPointer() const } - - SdrDragCrook::SdrDragCrook(SdrDragView& rNewView) : SdrDragMethod(rNewView), aFact(1,1), @@ -3440,8 +3415,6 @@ Pointer SdrDragCrook::GetSdrDragPointer() const } - - SdrDragDistort::SdrDragDistort(SdrDragView& rNewView) : SdrDragMethod(rNewView), nPolyPt(0), @@ -3593,8 +3566,6 @@ void SdrDragDistort::applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPol } - - SdrDragCrop::SdrDragCrop(SdrDragView& rNewView) : SdrDragObjOwn(rNewView) { diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 88dc38a92243..acc28ac97c0c 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -44,11 +44,9 @@ using namespace sdr; - // DragView - void SdrDragView::ImpClearVars() { mbFramDrag=false; @@ -200,7 +198,6 @@ bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, bool bTR ) const } - bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { return false; @@ -831,7 +828,6 @@ void SdrDragView::HideDragObj() } - void SdrDragView::SetNoDragXorPolys(bool bOn) { if (IsNoDragXorPolys()!=bOn) diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index ab122e9dbd93..b3f97e6c595d 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -103,7 +103,6 @@ SdrEditView::~SdrEditView() } - void SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos) { SdrLayerAdmin& rLA=mpModel->GetLayerAdmin(); @@ -282,7 +281,6 @@ void SdrEditView::DeleteLayer(const OUString& rName) } - void SdrEditView::EndUndo() { // #i13033# @@ -660,7 +658,6 @@ void SdrEditView::CheckPossibilities() } - void SdrEditView::ForceMarkedObjToAnotherPage() { bool bFlg=false; @@ -958,7 +955,6 @@ void SdrEditView::CopyMarkedObj() } - bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions) { if (nOptions & SdrInsertFlags::SETDEFLAYER) { @@ -1033,7 +1029,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO } - bool SdrEditView::IsUndoEnabled() const { return mpModel->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 961e084b125d..20fa36595097 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -63,11 +63,9 @@ #include <svx/xlnwtit.hxx> - // EditView - void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); @@ -704,7 +702,6 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto } - void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bReplaceAll*/) { // bReplaceAll has no effect here @@ -1239,7 +1236,6 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe } - bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(GetMarkedObjectCount()) @@ -1283,7 +1279,6 @@ bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHard } - SfxItemSet SdrEditView::GetGeoAttrFromMarked() const { SfxItemSet aRetSet(mpModel->GetItemPool(), // SID_ATTR_TRANSFORM_... from s:svxids.hrc @@ -1748,7 +1743,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } - bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable ForcePossibilities(); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f2c0fcaadef2..f9a3d7a039a3 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -103,7 +103,6 @@ SdrObjEditView::~SdrObjEditView() } - bool SdrObjEditView::IsAction() const { return IsMacroObj() || SdrGlueEditView::IsAction(); @@ -1185,7 +1184,6 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const } - OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const { if (pWin==nullptr) return nullptr; @@ -1484,7 +1482,6 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) } - bool SdrObjEditView::ImpIsTextEditAllSelected() const { bool bRet=false; @@ -1793,7 +1790,6 @@ bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveH } - void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWindow) { SdrGlueEditView::AddWindowToPaintView(pNewWin, pWindow); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index cc4fa7e16103..d79f6d25de68 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -255,7 +255,6 @@ IMPL_LINK_NOARG_TYPED(OLEObjCache, UnloadCheckHdl, Timer*, void) } - void SdrLinkList::Clear() { aList.clear(); @@ -298,7 +297,6 @@ void SdrLinkList::RemoveLink(const Link<SdrObjFactory*,void>& rLink) } - bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { drawing::FillStyle eFill=static_cast<const XFillStyleItem&>(rSet.Get(XATTR_FILLSTYLE)).GetValue(); @@ -550,7 +548,6 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange } - SvdProgressInfo::SvdProgressInfo( const Link<void*,bool>&_rLink ) { maLink = _rLink; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 0067d86f80cd..b9736b2e0ede 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1112,7 +1112,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) } - void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) { // #i73407# reformulation to use new B2DPolygon classes @@ -1163,7 +1162,6 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) } - void ImpSdrGDIMetaFileImport::DoAction(MetaLineColorAction& rAct) { rAct.Execute(mpVD); @@ -1198,7 +1196,6 @@ void ImpSdrGDIMetaFileImport::MapScaling() } - void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rMtf, sal_uLong& a) // GDIMetaFile* pMtf ) { bool aSkipComment = false; diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 3b603b332ce3..12d74a1e7667 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -30,7 +30,6 @@ #include <svx/svdobj.hxx> - SdrGlueEditView::SdrGlueEditView(SdrModel* pModel1, OutputDevice* pOut): SdrPolyEditView(pModel1,pOut) { @@ -41,7 +40,6 @@ SdrGlueEditView::~SdrGlueEditView() } - void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const size_t nMarkCount=GetMarkedObjectCount(); @@ -85,7 +83,6 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co } - static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); @@ -129,7 +126,6 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, boo } - static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); @@ -166,7 +162,6 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn) } - static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { SdrAlign& nRet=*const_cast<SdrAlign *>(static_cast<SdrAlign const *>(pnRet)); @@ -266,7 +261,6 @@ void SdrGlueEditView::DeleteMarkedGluePoints() } - void SdrGlueEditView::ImpCopyMarkedGluePoints() { const bool bUndo = IsUndoEnabled(); @@ -316,7 +310,6 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() } - void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const size_t nMarkCount=GetMarkedObjectCount(); @@ -352,7 +345,6 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo } - static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { rPt.X()+=static_cast<const Size*>(p1)->Width(); @@ -372,7 +364,6 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy) } - static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/) { ResizePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); @@ -391,7 +382,6 @@ void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& } - static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/) { RotatePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 4ec986e7f336..946b26dd7966 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -276,7 +276,6 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO } - void SdrGluePointList::Clear() { sal_uInt16 nCount=GetCount(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 058f7bdd67e4..36340c67a252 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -268,7 +268,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal } - SdrHdl::SdrHdl(): pObj(nullptr), pPV(nullptr), @@ -1308,7 +1307,6 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool } - SdrHdlLine::~SdrHdlLine() {} void SdrHdlLine::CreateB2dIAObject() @@ -1364,7 +1362,6 @@ Pointer SdrHdlLine::GetPointer() const } - SdrHdlBezWgt::~SdrHdlBezWgt() {} void SdrHdlBezWgt::CreateB2dIAObject() @@ -1421,7 +1418,6 @@ void SdrHdlBezWgt::CreateB2dIAObject() } - E3dVolumeMarker::E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly) { aWireframePoly = rWireframePoly; @@ -1467,7 +1463,6 @@ void E3dVolumeMarker::CreateB2dIAObject() } - ImpEdgeHdl::~ImpEdgeHdl() { } @@ -1592,7 +1587,6 @@ bool ImpEdgeHdl::IsHorzDrag() const } - ImpMeasureHdl::~ImpMeasureHdl() { } @@ -1668,7 +1662,6 @@ Pointer ImpMeasureHdl::GetPointer() const } - ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) : SdrHdl(rRect.TopLeft(),HDL_MOVE), maRect(rRect) @@ -1729,7 +1722,6 @@ void ImpTextframeHdl::CreateB2dIAObject() } - static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) { SdrHdlKind eKind1=lhs->GetKind(); @@ -1874,7 +1866,6 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 } - void SdrHdlList::TravelFocusHdl(bool bForward) { // security correction @@ -2051,7 +2042,6 @@ void SdrHdlList::ResetFocusHdl() } - SdrHdlList::SdrHdlList(SdrMarkView* pV) : mnFocusIndex(SAL_MAX_SIZE), pView(pV), @@ -2247,14 +2237,12 @@ SdrCropHdl::SdrCropHdl( } - BitmapEx SdrCropHdl::GetHandlesBitmap() { return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); } - BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) { int nPixelSize = 0, nX = 0, nY = 0, nOffset = 0; @@ -2296,7 +2284,6 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) } - void SdrCropHdl::CreateB2dIAObject() { // first throw away old one diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 0204b580e7c7..851016e8cc33 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -26,7 +26,6 @@ #include <vcl/lineinfo.hxx> - Pointer SdrHelpLine::GetPointer() const { switch (eKind) { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index fc2ad8828119..48299e9acaa8 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -18,8 +18,6 @@ */ - - #include <svx/svdmark.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> @@ -220,7 +218,6 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) } - void SdrMarkList::ForceSort() const { if(!mbSorted) @@ -747,7 +744,6 @@ bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const } - namespace sdr { ViewSelection::ViewSelection() diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d992ab27a368..8096a1dc1e2e 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -97,7 +97,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - struct SdrModelImpl { SfxUndoManager* mpUndoManager; @@ -105,7 +104,6 @@ struct SdrModelImpl }; - void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper, bool bUseExtColorTable, bool bLoadRefCounts) { @@ -338,7 +336,6 @@ void SdrModel::SetReadOnly(bool bYes) } - void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nCount) { if (nCount<1) nCount=1; @@ -1557,7 +1554,6 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) } - void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, bool bUndo, bool bMoveNoCopy) @@ -1857,7 +1853,6 @@ void SdrModel::setLock( bool bLock ) } - void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ) { assert(pNewModel != nullptr); @@ -1914,7 +1909,6 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe } - void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { if( mpForbiddenCharactersTable ) @@ -2100,7 +2094,6 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() } - SdrHint::SdrHint(SdrHintKind eNewHint) : mpPage(nullptr), mpObj(nullptr), @@ -2132,6 +2125,4 @@ void SdrHint::SetKind(SdrHintKind eNewKind) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 03fca1e23467..82129509957d 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -121,11 +121,9 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition } - // MarkView - void SdrMarkView::ImpClearVars() { meDragMode=SDRDRAG_MOVE; @@ -211,7 +209,6 @@ void SdrMarkView::ModelHasChanged() } - bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); @@ -282,7 +279,6 @@ void SdrMarkView::TakeActionRect(Rectangle& rRect) const } - void SdrMarkView::ClearPageView() { UnmarkAllObj(); @@ -313,7 +309,6 @@ void SdrMarkView::HideSdrPage() } - bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark) { BrkAction(); @@ -372,7 +367,6 @@ void SdrMarkView::BrkMarkObj() } - bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark) { if(HasMarkablePoints()) @@ -438,7 +432,6 @@ void SdrMarkView::BrkMarkPoints() } - bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark) { if(HasMarkableGluePoints()) @@ -1318,7 +1311,6 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) } - bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { if (pObj) @@ -2020,7 +2012,6 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const } - void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, ImpTakeDescriptionOptions nOpt) const { rStr = ImpGetResStr(nStrCacheID); @@ -2046,7 +2037,6 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } - void SdrMarkView::EnterMarkedGroup() { // We enter only the first group found (in only one PageView), because @@ -2074,7 +2064,6 @@ void SdrMarkView::EnterMarkedGroup() } - void SdrMarkView::MarkListHasChanged() { GetMarkedObjectListWriteAccess().SetNameDirty(); @@ -2097,7 +2086,6 @@ void SdrMarkView::MarkListHasChanged() } - void SdrMarkView::SetMoveOutside(bool bOn) { maHdlList.SetMoveOutside(bOn); diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index beb13620e84d..298a12a1295a 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -374,7 +374,6 @@ void SdrMarkView::UndirtyMrkPnt() const } - bool SdrMarkView::HasMarkableGluePoints() const { bool bRet=false; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1038d3f3fd9c..80dd6fd6cac1 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -405,7 +405,6 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS } - Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const { if (mxCustomShapeEngine.is()) @@ -1410,7 +1409,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } - void SdrObjCustomShape::RecalcSnapRect() { SdrTextObj::RecalcSnapRect(); @@ -1728,7 +1726,6 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nAngle, double tn, boo } - SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const { sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# @@ -1756,7 +1753,6 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const } - // #i38892# void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() { @@ -1879,7 +1875,6 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } - sal_uInt32 SdrObjCustomShape::GetHdlCount() const { const sal_uInt32 nBasicHdlCount(SdrTextObj::GetHdlCount()); @@ -1920,7 +1915,6 @@ SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const } - bool SdrObjCustomShape::hasSpecialDrag() const { return true; @@ -2142,7 +2136,6 @@ bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag) } - void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) { Rectangle aRect1; @@ -2220,7 +2213,6 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r } - // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape bool SdrObjCustomShape::IsAutoGrowHeight() const diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index e6102e9e21b4..ffcb005cb7ca 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -80,8 +80,6 @@ sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties() } - - SdrAttrObj::SdrAttrObj() { } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3c13f3de3734..5d2c35b85eee 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -141,8 +141,6 @@ using namespace ::com::sun::star; - - SdrObjUserCall::~SdrObjUserCall() { } @@ -159,7 +157,6 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() : bDown(false) {} - SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) : nInventor(nInv), nIdentifier(nId), @@ -288,15 +285,12 @@ void SdrObject::ActionChanged() const } - void SdrObject::SetBoundRectDirty() { aOutRect = Rectangle(); } - - SdrObject::SdrObject() : mpImpl(new Impl), mpProperties(nullptr) @@ -831,16 +825,12 @@ sal_uInt32 SdrObject::GetNavigationPosition() } - - void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition) { mnNavigationPosition = nNewPosition; } - - // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and sometimes problematic (inside a bigger object change you will get // non-useful BoundRects sometimes) I rename that method from GetBoundRect() to @@ -1288,7 +1278,6 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const } - bool SdrObject::hasSpecialDrag() const { return false; @@ -1870,7 +1859,6 @@ bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const } - SdrObjGeoData* SdrObject::NewGeoData() const { return new SdrObjGeoData; @@ -2362,7 +2350,6 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const } - void extractLineContourFromPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rxSequence, basegfx::B2DPolygonVector& rExtractedHairlines, @@ -2389,7 +2376,6 @@ void extractLineContourFromPrimitive2DSequence( } - SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) { bool bNoChange(true); @@ -2554,21 +2540,12 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas } - - - - void SdrObject::SetMarkProtect(bool bProt) { bMarkProt = bProt; } - - - - - void SdrObject::SetEmptyPresObj(bool bEpt) { bEmptyPresObj = bEpt; @@ -2581,8 +2558,6 @@ void SdrObject::SetNotVisibleAsMaster(bool bFlg) } - - // convert this path object to contour object, even when it is a group SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const { @@ -2623,7 +2598,6 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) } - SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const { SdrObject* pRet = DoConvertToPolyObj(bBezier, true); @@ -2645,14 +2619,12 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const } - SdrObject* SdrObject::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return nullptr; } - void SdrObject::SetInserted(bool bIns) { if (bIns!=IsInserted()) { @@ -2720,7 +2692,6 @@ void SdrObject::SetVisible(bool bVisible) } - sal_uInt16 SdrObject::GetUserDataCount() const { if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return 0; @@ -2966,7 +2937,6 @@ void SdrObject::notifyShapePropertyChange( const svx::ShapeProperty _eProperty ) } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index b23d0e9159b9..dfd94564165a 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -61,7 +61,6 @@ #include <svx/xpool.hxx> - enum EscDir {LKS,RTS,OBN,UNT}; class ImpCaptParams @@ -192,8 +191,6 @@ sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact() } - - SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // default size: 3 points = 2 lines @@ -307,7 +304,6 @@ SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrCaptionObj::hasSpecialDrag() const { return true; @@ -419,7 +415,6 @@ OUString SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const { const SfxItemSet& rSet = GetObjectItemSet(); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 9db693604359..3862ec002aec 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -105,8 +105,6 @@ sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact() } - - SdrCircObj::SdrCircObj(SdrObjKind eNewKind) { nStartAngle=0; @@ -466,7 +464,6 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrCircObj::hasSpecialDrag() const { return true; @@ -612,7 +609,6 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - void ImpCircUser::SetCreateParams(SdrDragStat& rStat) { rStat.TakeCreateRect(aR); @@ -1064,7 +1060,6 @@ void SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } - void SdrCircObj::ImpSetAttrToCircInfo() { const SfxItemSet& rSet = GetObjectItemSet(); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index aa064ce6d339..1b768d3921e9 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -49,7 +49,6 @@ #include <svx/xpool.hxx> - SdrObjConnection::~SdrObjConnection() { } @@ -164,7 +163,6 @@ sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact() } - SdrEdgeObj::SdrEdgeObj() : SdrTextObj(), nNotifyingCount(0), @@ -1809,7 +1807,6 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrEdgeObj::hasSpecialDrag() const { return true; @@ -1960,7 +1957,6 @@ OUString SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const { basegfx::B2DPolygon aResult; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9ffba232f3d0..1ffb9dc1bbdb 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -640,7 +640,6 @@ bool SdrGrafObj::IsLinkedGraphic() const } - void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 7cbaf43f1dce..4bbd9b518377 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -67,8 +67,6 @@ sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() } - - SdrObjGroup::SdrObjGroup() { pSub=new SdrObjList(nullptr,nullptr); @@ -714,7 +712,6 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt) } - void SdrObjGroup::NbcSetRelativePos(const Point& rPnt) { Point aRelPos0(GetSnapRect().TopLeft()-aAnchor); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 9b2fbd29645f..8e69c8d998b2 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -72,7 +72,6 @@ #include <unotools/syslocale.hxx> - SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {} @@ -210,8 +209,6 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() } - - SdrMeasureObj::SdrMeasureObj(): bTextDirty(false) { @@ -796,7 +793,6 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrMeasureObj::hasSpecialDrag() const { return true; @@ -967,7 +963,6 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c } - bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho8Possible(); diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 229c0f18fc62..2f36bfd460a2 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; - // Note: the temp file is read only, until it is deleted! // It may be shared between multiple documents in case of copy/paste, // hence the shared_ptr. @@ -77,8 +76,6 @@ struct SdrMediaObj::Impl }; - - SdrMediaObj::SdrMediaObj() : SdrRectObj() , m_xImpl( new Impl() ) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 9cb32791a195..6d4ab3dd650f 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -589,7 +589,6 @@ void SdrLightEmbeddedClient_Impl::setWindow(const uno::Reference< awt::XWindow > } - class SdrEmbedObjectLink : public sfx2::SvBaseLink { SdrOle2Obj* pObj; @@ -606,7 +605,6 @@ public: }; - SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SVXB ), pObj(pObject) @@ -615,13 +613,11 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): } - SdrEmbedObjectLink::~SdrEmbedObjectLink() { } - ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( const OUString& /*rMimeType*/, const css::uno::Any & /*rValue*/ ) { @@ -658,7 +654,6 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() } - void SdrEmbedObjectLink::Closed() { pObj->BreakFileLink_Impl(); @@ -666,7 +661,6 @@ void SdrEmbedObjectLink::Closed() } - class SdrOle2ObjImpl { public: @@ -741,7 +735,6 @@ public: }; - // Predicate determining whether the given OLE is an internal math // object static bool ImplIsMathObj( const uno::Reference < embed::XEmbeddedObject >& rObjRef ) @@ -781,8 +774,6 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() } - - SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) : mpImpl(new SdrOle2ObjImpl(bFrame_)) { @@ -812,7 +803,6 @@ OUString SdrOle2Obj::GetStyleString() } - SdrOle2Obj::~SdrOle2Obj() { mpImpl->mbInDestruction = true; @@ -899,7 +889,6 @@ bool SdrOle2Obj::IsEmpty() const } - void SdrOle2Obj::Connect() { if( IsEmptyPresObj() ) @@ -918,7 +907,6 @@ void SdrOle2Obj::Connect() } - bool SdrOle2Obj::UpdateLinkURL_Impl() { bool bResult = false; @@ -978,7 +966,6 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() } - void SdrOle2Obj::BreakFileLink_Impl() { uno::Reference<document::XStorageBasedDocument> xDoc; @@ -1011,7 +998,6 @@ void SdrOle2Obj::BreakFileLink_Impl() } - void SdrOle2Obj::DisconnectFileLink_Impl() { sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : nullptr; @@ -1023,7 +1009,6 @@ void SdrOle2Obj::DisconnectFileLink_Impl() } - void SdrOle2Obj::CheckFileLink_Impl() { if (pModel && mpImpl->mxObjRef.GetObject().is() && !mpImpl->mpObjectLink) @@ -1061,7 +1046,6 @@ void SdrOle2Obj::CheckFileLink_Impl() } - void SdrOle2Obj::Reconnect_Impl() { DBG_ASSERT( mpImpl->mbConnected, "Assigned unconnected object?!" ); @@ -1186,7 +1170,6 @@ void SdrOle2Obj::AddListeners_Impl() } - void SdrOle2Obj::Disconnect() { if( IsEmptyPresObj() ) @@ -1315,7 +1298,6 @@ void SdrOle2Obj::Disconnect_Impl() } - SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const { const Graphic* pOLEGraphic = GetGraphic(); @@ -1393,7 +1375,6 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const } - void SdrOle2Obj::SetModel(SdrModel* pNewModel) { ::comphelper::IEmbeddedHelper* pDestPers = pNewModel ? pNewModel->GetPersist() : nullptr; @@ -1469,7 +1450,6 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) } - void SdrOle2Obj::SetPage(SdrPage* pNewPage) { bool bRemove=pNewPage==nullptr && pPage!=nullptr; @@ -1505,7 +1485,6 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage) } - void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObject >& rNewObjRef ) { DBG_ASSERT( !rNewObjRef.is() || !mpImpl->mxObjRef.GetObject().is(), "SetObjRef called on already initialized object!"); @@ -1545,7 +1524,6 @@ void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObj } - void SdrOle2Obj::SetClosedObj( bool bIsClosed ) { // TODO/LATER: do we still need this hack? @@ -1554,7 +1532,6 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed ) } - SdrObject* SdrOle2Obj::getFullDragClone() const { // #i118485# use central replacement generator @@ -1562,7 +1539,6 @@ SdrObject* SdrOle2Obj::getFullDragClone() const } - void SdrOle2Obj::SetPersistName( const OUString& rPersistName ) { DBG_ASSERT( mpImpl->aPersistName.isEmpty(), "Persist name changed!"); @@ -1582,14 +1558,12 @@ void SdrOle2Obj::AbandonObject() } - OUString SdrOle2Obj::GetPersistName() const { return mpImpl->aPersistName; } - void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { // #i118485# Allowing much more attributes for OLEs @@ -1611,14 +1585,12 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const } - sal_uInt16 SdrOle2Obj::GetObjIdentifier() const { return mpImpl->mbFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2); } - OUString SdrOle2Obj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(mpImpl->mbFrame ? STR_ObjNameSingulFrame : STR_ObjNameSingulOLE2)); @@ -1636,7 +1608,6 @@ OUString SdrOle2Obj::TakeObjNameSingul() const } - OUString SdrOle2Obj::TakeObjNamePlural() const { return ImpGetResStr(mpImpl->mbFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2); @@ -1846,7 +1817,6 @@ void SdrOle2Obj::ImpSetVisAreaSize() } - void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { if( pModel && !pModel->isLocked() ) @@ -1867,7 +1837,6 @@ void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } - void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) { SdrRectObj::SetGeoData(rGeo); @@ -1877,7 +1846,6 @@ void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) } - void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) { SdrRectObj::NbcSetSnapRect(rRect); @@ -1895,7 +1863,6 @@ void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) } - void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect) { SdrRectObj::NbcSetLogicRect(rRect); @@ -1918,7 +1885,6 @@ void SdrOle2Obj::GetNewReplacement() } - Size SdrOle2Obj::GetOrigObjSize( MapMode* pTargetMapMode ) const { return mpImpl->mxObjRef.GetSize( pTargetMapMode ); @@ -1938,7 +1904,6 @@ void SdrOle2Obj::NbcMove(const Size& rSize) } - bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { uno::Reference<embed::XEmbedPersist2> xPersist(xObj, uno::UNO_QUERY); @@ -1980,7 +1945,6 @@ bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObje } - bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { bool bResult = false; @@ -2007,7 +1971,6 @@ bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, s } - bool SdrOle2Obj::Unload() { if (!mpImpl->mxObjRef.is()) @@ -2024,7 +1987,6 @@ bool SdrOle2Obj::Unload() } - void SdrOle2Obj::GetObjRef_Impl() { if ( !mpImpl->mxObjRef.is() && !mpImpl->aPersistName.isEmpty() && pModel && pModel->GetPersist() ) @@ -2116,7 +2078,6 @@ uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef_NoInit() const } - uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const { GetObjRef(); @@ -2127,7 +2088,6 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const } - bool SdrOle2Obj::IsChart() const { if (!mpImpl->mbTypeAsked) @@ -2247,14 +2207,12 @@ bool SdrOle2Obj::AddOwnLightClient() } - Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() { return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr()))); } - void SdrOle2Obj::SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow) { if ( mpImpl->mxObjRef.is() && mpImpl->pLightClient ) diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 1b3f0edc36e0..02f2dfcbceaf 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -65,8 +65,6 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) } - - SdrPageObj::SdrPageObj(SdrPage* pNewPage) : mpShownPage(pNewPage) { diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 174f58c9d01d..e18b68b0c77d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2852,7 +2852,6 @@ void SdrPathObj::impDeleteDAC() const } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 56a491229705..b1692206c6b5 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -62,8 +62,6 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() } - - SdrRectObj::SdrRectObj() : mpXPoly(nullptr) { @@ -382,7 +380,6 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrRectObj::hasSpecialDrag() const { return true; @@ -473,7 +470,6 @@ OUString SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - basegfx::B2DPolyPolygon SdrRectObj::TakeCreatePoly(const SdrDragStat& rDrag) const { Rectangle aRect1; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 64bb308c320e..05b629a8fd8b 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -81,8 +81,6 @@ sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact() } - - SdrTextObj::SdrTextObj() : SdrAttrObj(), mpText(nullptr), @@ -1397,7 +1395,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint } - OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const { SdrText* pText = getActiveText(); @@ -1635,7 +1632,6 @@ void SdrTextObj::SetVerticalWriting(bool bVertical) } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear @@ -2208,7 +2204,6 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) } - // The concept of the text object: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attributes/Variations: @@ -2272,5 +2267,4 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // - and many more... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index bb9d04fefba0..cc5f37de2dd9 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -58,7 +58,6 @@ #include <sdr/attribute/sdrformtextoutlineattribute.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 70993e660b3f..dd99dd42ff37 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -63,7 +63,6 @@ SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrTextObj::hasSpecialDrag() const { return true; diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index b48855ead024..fb8ba7e101d2 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -284,7 +284,6 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) } - SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const { SdrObject* pRetval = nullptr; @@ -407,7 +406,6 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const } - SdrObject* SdrTextObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { if(bAddText) diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index a13c042c6945..eac5c32e9484 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -57,7 +57,6 @@ using namespace sdr::contact; // Defines - // Helper class SdrControlEventListenerImpl #include <com/sun/star/lang/XEventListener.hpp> @@ -335,7 +334,6 @@ void SdrUnoObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti } - bool SdrUnoObj::hasSpecialDrag() const { // no special drag; we have no rounding rect and diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 9c16a472a3f8..587363daf1dc 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -30,7 +30,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const { return rRefObj.GetProperties(); @@ -44,8 +43,6 @@ sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact() } - - SdrVirtObj::SdrVirtObj(SdrObject& rNewObj): rRefObj(rNewObj) { @@ -60,7 +57,6 @@ SdrVirtObj::~SdrVirtObj() } - const SdrObject& SdrVirtObj::GetReferencedObj() const { return rRefObj; @@ -86,7 +82,6 @@ void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos) } - void SdrVirtObj::SetModel(SdrModel* pNewModel) { SdrObject::SetModel(pNewModel); @@ -189,7 +184,6 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeXorPoly() const } - sal_uInt32 SdrVirtObj::GetHdlCount() const { return rRefObj.GetHdlCount(); @@ -259,7 +253,6 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const } - bool SdrVirtObj::hasSpecialDrag() const { return rRefObj.hasSpecialDrag(); @@ -314,7 +307,6 @@ OUString SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - bool SdrVirtObj::BegCreate(SdrDragStat& rStat) { return rRefObj.BegCreate(rStat); @@ -347,7 +339,6 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeCreatePoly(const SdrDragStat& rDrag) con } - void SdrVirtObj::NbcMove(const Size& rSiz) { MovePoint(aAnchor,rSiz); @@ -379,7 +370,6 @@ void SdrVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea } - void SdrVirtObj::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { @@ -430,7 +420,6 @@ void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) } - void SdrVirtObj::RecalcSnapRect() { aSnapRect=rRefObj.GetSnapRect(); @@ -465,7 +454,6 @@ void SdrVirtObj::NbcSetSnapRect(const Rectangle& rRect) } - const Rectangle& SdrVirtObj::GetLogicRect() const { const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect! @@ -492,7 +480,6 @@ void SdrVirtObj::NbcSetLogicRect(const Rectangle& rRect) } - long SdrVirtObj::GetRotateAngle() const { return rRefObj.GetRotateAngle(); @@ -504,7 +491,6 @@ long SdrVirtObj::GetShearAngle(bool bVertical) const } - sal_uInt32 SdrVirtObj::GetSnapPointCount() const { return rRefObj.GetSnapPointCount(); @@ -541,7 +527,6 @@ void SdrVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) } - SdrObjGeoData* SdrVirtObj::NewGeoData() const { return rRefObj.NewGeoData(); @@ -559,7 +544,6 @@ void SdrVirtObj::RestGeoData(const SdrObjGeoData& rGeo) } - SdrObjGeoData* SdrVirtObj::GetGeoData() const { return rRefObj.GetGeoData(); @@ -574,7 +558,6 @@ void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo) } - void SdrVirtObj::NbcReformatText() { rRefObj.NbcReformatText(); @@ -586,7 +569,6 @@ void SdrVirtObj::ReformatText() } - bool SdrVirtObj::HasMacro() const { return rRefObj.HasMacro(); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 870186ffc75f..e6d961b3a87e 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -68,7 +68,6 @@ public: }; - static const sal_Int32 InitialObjectContainerCapacity (64); @@ -679,8 +678,6 @@ size_t SdrObjList::GetObjCount() const } - - SdrObject* SdrObjList::GetObj(size_t nNum) const { if (nNum >= maList.size()) @@ -693,8 +690,6 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const } - - bool SdrObjList::IsReadOnly() const { bool bRet = false; @@ -760,16 +755,12 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) } - - bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder.get() != nullptr; } - - void SdrObjList::SetObjectNavigationPosition ( SdrObject& rObject, const sal_uInt32 nNewPosition) @@ -824,8 +815,6 @@ void SdrObjList::SetObjectNavigationPosition ( } - - SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigationPosition) const { if (HasObjectNavigationOrder()) @@ -854,8 +843,6 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat } - - void SdrObjList::ClearObjectNavigationOrder() { mxNavigationOrder.reset(); @@ -863,8 +850,6 @@ void SdrObjList::ClearObjectNavigationOrder() } - - bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) @@ -885,8 +870,6 @@ bool SdrObjList::RecalcNavigationPositions() } - - void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAccess>& rxOrder) { if (rxOrder.is()) @@ -914,8 +897,6 @@ void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAcces } - - void SdrObjList::InsertObjectIntoContainer ( SdrObject& rObject, const sal_uInt32 nInsertPosition) @@ -942,8 +923,6 @@ void SdrObjList::InsertObjectIntoContainer ( } - - void SdrObjList::ReplaceObjectInContainer ( SdrObject& rNewObject, const sal_uInt32 nObjectPosition) @@ -979,8 +958,6 @@ void SdrObjList::ReplaceObjectInContainer ( } - - void SdrObjList::RemoveObjectFromContainer ( const sal_uInt32 nObjectPosition) { @@ -1024,9 +1001,6 @@ void SdrObjList::dumpAsXml(xmlTextWriterPtr pWriter) const } - - - void SdrPageGridFrameList::Clear() { sal_uInt16 nCount=GetCount(); @@ -1196,8 +1170,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) } - - SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) : SdrObjList(&rNewModel, this), mpViewContact(nullptr), @@ -1544,7 +1516,6 @@ void SdrPage::SetModel(SdrModel* pNewModel) } - // #i68775# React on PageNum changes (from Model in most cases) void SdrPage::SetPageNum(sal_uInt16 nNew) { diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 5b40fe096fc0..93788cf0dcec 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -135,7 +135,6 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) } - SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) : mrView(rNewView), // col_auto color lets the view takes the default SvxColorConfig entry @@ -265,7 +264,6 @@ void SdrPageView::InvalidateAllWin() } - void SdrPageView::PrePaint() { const sal_uInt32 nCount(PageWindowCount()); @@ -416,7 +414,6 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const } - void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { if (GetPage()==nullptr) @@ -959,5 +956,4 @@ void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 2f620569d2fd..ee86bbb0ac7a 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -119,16 +119,12 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const } - SvxViewHint::SvxViewHint (HintType eHintType) : meHintType(eHintType) { } - - - BitmapEx convertMetafileToBitmapEx( const GDIMetaFile& rMtf, const basegfx::B2DRange& rTargetRange, @@ -154,9 +150,6 @@ BitmapEx convertMetafileToBitmapEx( } - - - void SdrPaintView::ImpClearVars() { #ifdef DBG_UTIL @@ -247,7 +240,6 @@ SdrPaintView::~SdrPaintView() } - void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { //If the stylesheet has been destroyed @@ -333,7 +325,6 @@ void SdrPaintView::ModelHasChanged() } - bool SdrPaintView::IsAction() const { return false; @@ -373,7 +364,6 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const } - sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { if (nMinMov>=0) return sal_uInt16(nMinMov); @@ -417,7 +407,6 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin) } - void SdrPaintView::ClearPageView() { BrkAction(); @@ -769,7 +758,6 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFo } - SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect) { // #i74769# use BeginCompleteRedraw() as common base @@ -853,7 +841,6 @@ vcl::Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl } - void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) { if(mpPageView) @@ -876,7 +863,6 @@ void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) } - bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; @@ -1117,7 +1103,6 @@ bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHar } - #ifdef DBG_UTIL void SdrPaintView::ShowItemBrowser(bool bShow) { diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 2dfd64ee2cf8..5eaa83060647 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -36,7 +36,6 @@ using namespace sdr; - void SdrPolyEditView::ImpResetPolyPossibilityFlags() { eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE; @@ -612,7 +611,6 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* } - static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { MovePoint(rPt,*static_cast<const Size*>(p1)); diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 2964d00e9b36..40a8563247d8 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -208,7 +208,6 @@ SdrSnapView::~SdrSnapView() } - bool SdrSnapView::IsAction() const { return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction(); @@ -260,7 +259,6 @@ void SdrSnapView::TakeActionRect(Rectangle& rRect) const } - Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const { Point aPt(rPnt); @@ -447,7 +445,6 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } - void SdrSnapView::BegSetPageOrg(const Point& rPnt) { BrkAction(); @@ -497,7 +494,6 @@ void SdrSnapView::BrkSetPageOrg() } - bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { rpPV=nullptr; diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index c25d34ceed05..53b5685ea593 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -285,7 +285,6 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen } - void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; @@ -356,7 +355,6 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, } - void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { sal_uInt16 nPolyCount=rPoly.Count(); @@ -382,7 +380,6 @@ void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rR } - long GetAngle(const Point& rPnt) { long a=0; @@ -447,7 +444,6 @@ long GetLen(const Point& rPnt) } - void GeoStat::RecalcSinCos() { if (nRotationAngle==0) { @@ -471,7 +467,6 @@ void GeoStat::RecalcTan() } - tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo) { tools::Polygon aPol(5); @@ -527,7 +522,6 @@ void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo) } - void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); @@ -558,7 +552,6 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho) } - long BigMulDiv(long nVal, long nMul, long nDiv) { BigInt aVal(nVal); @@ -660,7 +653,6 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) }; - // 1 mile = 8 furlong = 63.360" = 1.609.344,0mm // 1 furlong = 10 chains = 7.920" = 201.168,0mm // 1 chain = 4 poles = 792" = 20.116,8mm @@ -1050,6 +1042,4 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b3cf6ae637fa..b33fadc0161b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -56,8 +56,6 @@ static void ImplUnmarkObject( SdrObject* pObj ) } - - SdrUndoAction::~SdrUndoAction() {} bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const @@ -96,7 +94,6 @@ OUString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod) : SdrUndoAction(rNewMod), aBuf(), @@ -553,7 +550,6 @@ OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoMoveObj::~SdrUndoMoveObj() {} void SdrUndoMoveObj::Undo() @@ -597,7 +593,6 @@ OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) : SdrUndoObj(rNewObj) , pUndoGeo(nullptr) @@ -677,7 +672,6 @@ OUString SdrUndoGeoObj::GetComment() const } - SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) : SdrUndoObj(rNewObj) , bOwner(false) @@ -762,7 +756,6 @@ SdrUndoRemoveObj::~SdrUndoRemoveObj() } - void SdrUndoInsertObj::Undo() { // Trigger PageChangeCall @@ -851,7 +844,6 @@ OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - void SdrUndoNewObj::Undo() { SdrUndoInsertObj::Undo(); @@ -971,7 +963,6 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew) } - OUString SdrUndoCopyObj::GetComment() const { OUString aStr; @@ -1002,7 +993,6 @@ void SdrUndoObjectLayerChange::Redo() } - SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) : SdrUndoObj(rNewObj) , nOldOrdNum(nOldOrdNum1) @@ -1046,7 +1036,6 @@ OUString SdrUndoObjOrdNum::GetComment() const } - SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) , pOldText(nullptr) @@ -1305,7 +1294,6 @@ SdrUndoLayer::~SdrUndoLayer() } - void SdrUndoNewLayer::Undo() { DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction."); @@ -1327,7 +1315,6 @@ OUString SdrUndoNewLayer::GetComment() const } - void SdrUndoDelLayer::Undo() { DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer does not belong to UndoAction."); @@ -1349,7 +1336,6 @@ OUString SdrUndoDelLayer::GetComment() const } - void SdrUndoMoveLayer::Undo() { SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNeuPos); @@ -1433,7 +1419,6 @@ void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } - SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg) : SdrUndoPage(rNewPg) , bItsMine(false) @@ -1450,7 +1435,6 @@ SdrUndoPageList::~SdrUndoPageList() } - SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) : SdrUndoPageList(rNewPg) , pUndoGroup(nullptr) @@ -1533,7 +1517,6 @@ bool SdrUndoDelPage::CanSdrRepeat(SdrView& /*rView*/) const } - void SdrUndoNewPage::Undo() { ImpRemovePage(nPageNum); @@ -1556,7 +1539,6 @@ OUString SdrUndoNewPage::GetComment() const } - OUString SdrUndoCopyPage::GetComment() const { OUString aStr; @@ -1582,7 +1564,6 @@ bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const } - void SdrUndoSetPageNum::Undo() { ImpMovePage(nNewPageNum,nOldPageNum); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 3c20ccaabf5b..e1dbaa3a30d5 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -51,7 +51,6 @@ #include <drawinglayer/processor2d/contourextractor2d.hxx> - SdrViewEvent::SdrViewEvent() : pHdl(nullptr), pObj(nullptr), @@ -152,7 +151,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay() } - SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) : SdrCreateView(pModel1,pOut), bNoExtendedMouseDispatcher(false), diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index 3cdfc2c1b57f..a34a9e510689 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -28,7 +28,6 @@ #include <svx/sdrpaintwindow.hxx> - void SdrViewIter::ImpInitVars() { mnListenerNum = 0L; @@ -38,7 +37,6 @@ void SdrViewIter::ImpInitVars() } - SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) { mpPage = pPage; @@ -49,7 +47,6 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) } - SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) { mpObject = pObject; @@ -67,7 +64,6 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) } - bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const { if(!mpPage) @@ -167,7 +163,6 @@ SdrView* SdrViewIter::ImpFindView() } - SdrView* SdrViewIter::FirstView() { ImpInitVars(); @@ -175,7 +170,6 @@ SdrView* SdrViewIter::FirstView() } - SdrView* SdrViewIter::NextView() { mnListenerNum++; diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 2cf6bee83511..51d91c1cb19c 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -521,7 +521,6 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const } - GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) const { GDIMetaFile aMtf; @@ -583,7 +582,6 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) co } - Graphic SdrExchangeView::GetAllMarkedGraphic() const { Graphic aRet; @@ -600,7 +598,6 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const } - Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pObj ) { Graphic aRet; @@ -668,7 +665,6 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* } - ::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const { SortMarkedObjects(); @@ -706,7 +702,6 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* } - void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const { ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects()); @@ -722,7 +717,6 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const } - SdrModel* SdrExchangeView::GetMarkedObjModel() const { // Sorting the MarkList here might be problematic in the future, so @@ -775,7 +769,6 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const } - bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::Cut: Not supported any more." ); @@ -783,7 +776,6 @@ bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) } - bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Yank: Not supported any more." ); @@ -791,7 +783,6 @@ bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) } - bool SdrExchangeView::Paste(vcl::Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." ); diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx index 23bd8f54a0a3..798720563f9a 100644 --- a/svx/source/svdraw/textchaincursor.cxx +++ b/svx/source/svdraw/textchaincursor.cxx @@ -164,7 +164,6 @@ void TextChainCursorManager::HandleCursorEvent( SdrTextObj *pPrevLink = mpTextObj->GetPrevLinkInChain(); - switch ( aCurEvt ) { case CursorChainingEvent::UNCHANGED: // Set same selection as before the chaining (which is saved as PostChainingSel) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 8059d978093c..12c6ddedf408 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -58,14 +58,12 @@ AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::X } - AccessibleCell::~AccessibleCell() { DBG_ASSERT( mpText == nullptr, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } - void AccessibleCell::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView(); @@ -96,7 +94,6 @@ void AccessibleCell::Init() } - bool AccessibleCell::SetState (sal_Int16 aState) { bool bStateHasChanged = false; @@ -116,7 +113,6 @@ bool AccessibleCell::SetState (sal_Int16 aState) } - bool AccessibleCell::ResetState (sal_Int16 aState) { bool bStateHasChanged = false; @@ -136,7 +132,6 @@ bool AccessibleCell::ResetState (sal_Int16 aState) } - // XInterface @@ -146,14 +141,12 @@ Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) throw (RuntimeE } - void SAL_CALL AccessibleCell::acquire( ) throw () { AccessibleCellBase::acquire(); } - void SAL_CALL AccessibleCell::release( ) throw () { AccessibleCellBase::release(); @@ -173,7 +166,6 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::Ru } - /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ @@ -187,7 +179,6 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI } - /** Return a copy of the state set. Possible states are: ENABLED @@ -308,7 +299,6 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const c } - css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -355,7 +345,6 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, } - css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -364,7 +353,6 @@ css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, } - css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) { ThrowIfDisposed (); @@ -389,7 +377,6 @@ css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeExce } - awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -398,28 +385,24 @@ awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::excep } - void SAL_CALL AccessibleCell::addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& xListener) throw (css::uno::RuntimeException) { AccessibleComponentBase::addFocusListener( xListener ); } - void SAL_CALL AccessibleCell::removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) { AccessibleComponentBase::removeFocusListener( xListener ); } - void SAL_CALL AccessibleCell::grabFocus() throw (css::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); } - sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -430,7 +413,6 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std: } - sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -451,14 +433,12 @@ css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont() throw } - OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getTitledBorderText(); } - OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getToolTipText(); @@ -487,7 +467,6 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces } - void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -506,7 +485,6 @@ OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeExceptio } - Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 1c7676598885..71cbe1022151 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -89,7 +89,6 @@ public: }; - AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo ) : mrShapeTreeInfo( rShapeTreeInfo ) , mRowCount(0) @@ -98,7 +97,6 @@ AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rSh } - void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, const Reference< XTable >& xTable ) { mxAccessible = xAccessible; @@ -119,7 +117,6 @@ void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, } - void AccessibleTableShapeImpl::dispose() { if( mxTable.is() ) @@ -202,7 +199,6 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 } - void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException ) { rnRow = 0; @@ -332,13 +328,11 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf } - AccessibleTableShape::~AccessibleTableShape() { } - void AccessibleTableShape::Init() { try @@ -357,7 +351,6 @@ void AccessibleTableShape::Init() } - SvxTableController* AccessibleTableShape::getTableController() { SdrView* pView = maShapeTreeInfo.GetSdrView (); @@ -385,14 +378,12 @@ Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (Ru } - void SAL_CALL AccessibleTableShape::acquire( ) throw () { AccessibleTableShape_Base::acquire(); } - void SAL_CALL AccessibleTableShape::release( ) throw () { AccessibleTableShape_Base::release(); @@ -414,14 +405,12 @@ OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeEx } - OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException) { return OUString("TableShape"); } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -444,14 +433,12 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessible } - sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::TABLE; } - void SAL_CALL AccessibleTableShape::disposing() { mxImpl->dispose(); @@ -471,7 +458,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeE } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -479,7 +465,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (Run } - OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { checkCellPosition( 0, nRow ); @@ -487,7 +472,6 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 n } - OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -496,7 +480,6 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3 } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -511,7 +494,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -526,7 +508,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 } - Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders( ) throw (RuntimeException, std::exception) { Reference< XAccessibleTable > xRet; @@ -543,7 +524,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea } - Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders( ) throw (RuntimeException, std::exception) { Reference< XAccessibleTable > xRet; @@ -560,7 +540,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn } - Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( ) throw (RuntimeException, std::exception) { sal_Int32 nRow = getAccessibleRowCount(); @@ -597,7 +576,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( } - Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns( ) throw (RuntimeException, std::exception) { sal_Int32 nColumn = getAccessibleColumnCount(); @@ -634,7 +612,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -648,7 +625,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -662,7 +638,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -676,7 +651,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) throw (RuntimeException, std::exception) { Reference< XAccessible > xRet; @@ -684,7 +658,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) throw (RuntimeException, std::exception) { Reference< XAccessible > xRet; @@ -692,7 +665,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -711,7 +683,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -720,7 +691,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -730,7 +700,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -768,7 +737,6 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -779,7 +747,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh } - void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -801,7 +768,6 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim } - sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -821,7 +787,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -843,7 +808,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi } - void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 1946a8179bfb..bd936d8e8572 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -54,7 +54,6 @@ #include <svx/svdpool.hxx> - using ::editeng::SvxBorderLine; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -66,7 +65,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::container; - static const SvxItemPropertySet* ImplGetSvxCellPropertySet() { // Propertymap fuer einen Outliner Text @@ -359,7 +357,6 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* } - Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException) : SdrText( rTableObj, pOutlinerParaObject ) , SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) @@ -378,14 +375,12 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th } - Cell::~Cell() throw() { dispose(); } - void Cell::dispose() { if( mxTable.is() ) @@ -411,7 +406,6 @@ void Cell::dispose() } - void Cell::SetModel(SdrModel* pNewModel) { SvxTextEditSource* pTextEditSource = dynamic_cast< SvxTextEditSource* >( GetEditSource() ); @@ -442,7 +436,6 @@ void Cell::SetModel(SdrModel* pNewModel) } - void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) { if ((mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || mbMerged) @@ -455,7 +448,6 @@ void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) } - void Cell::mergeContent( const CellRef& xSourceCell ) { SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -484,7 +476,6 @@ void Cell::mergeContent( const CellRef& xSourceCell ) } - void Cell::cloneFrom( const CellRef& xCell ) { if( xCell.is() ) @@ -523,7 +514,6 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) } - void Cell::setMerged() { if( !mbMerged ) @@ -534,7 +524,6 @@ void Cell::setMerged() } - void Cell::copyFormatFrom( const CellRef& xSourceCell ) { if( xSourceCell.is() && mpProperties ) @@ -554,7 +543,6 @@ void Cell::copyFormatFrom( const CellRef& xSourceCell ) } - void Cell::notifyModified() { if( mxTable.is() ) @@ -592,7 +580,6 @@ bool Cell::IsTextEditActive() } - bool Cell::hasText() const { OutlinerParaObject* pParaObj = GetOutlinerParaObject(); @@ -614,7 +601,6 @@ bool Cell::hasText() const } - OutlinerParaObject* Cell::GetEditOutlinerParaObject() const { SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -624,7 +610,6 @@ OutlinerParaObject* Cell::GetEditOutlinerParaObject() const } - void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) { // only allow cell styles for cells @@ -638,7 +623,6 @@ void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) } - const SfxItemSet& Cell::GetObjectItemSet() { if( mpProperties ) @@ -683,14 +667,12 @@ void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const } - const SfxItemSet& Cell::GetItemSet() const { return mpProperties->GetObjectItemSet(); } - void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems) { if( mpProperties ) @@ -701,14 +683,12 @@ void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllIt } - sal_Int32 Cell::getMinimumWidth() { return GetTextLeftDistance() + GetTextRightDistance() + 100; } - sal_Int32 Cell::getMinimumHeight() { if( !mpProperties ) @@ -748,49 +728,42 @@ sal_Int32 Cell::getMinimumHeight() } - long Cell::GetTextLeftDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_LEFTDIST)).GetValue(); } - long Cell::GetTextRightDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST)).GetValue(); } - long Cell::GetTextUpperDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_UPPERDIST)).GetValue(); } - long Cell::GetTextLowerDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_LOWERDIST)).GetValue(); } - SdrTextVertAdjust Cell::GetTextVerticalAdjust() const { return static_cast<const SdrTextVertAdjustItem&>(GetItemSet().Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); } - SdrTextHorzAdjust Cell::GetTextHorizontalAdjust() const { return static_cast<const SdrTextHorzAdjustItem&>(GetItemSet().Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); } - void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) { SdrText::SetOutlinerParaObject( pTextObject ); @@ -801,7 +774,6 @@ void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) } - void Cell::AddUndo() { SdrObject& rObj = GetObject(); @@ -813,7 +785,6 @@ void Cell::AddUndo() } - sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell ) { if( pProperties ) @@ -823,7 +794,6 @@ sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextPro } - sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell& rNewCell ) { return CloneProperties(mpProperties,rNewObj,rNewCell); @@ -855,14 +825,12 @@ Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException, } - void SAL_CALL Cell::acquire() throw () { ::cppu::OWeakObject::acquire(); } - void SAL_CALL Cell::release() throw () { ::cppu::OWeakObject::release(); @@ -885,7 +853,6 @@ Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException, std::excep } - Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -900,7 +867,6 @@ css::awt::Size SAL_CALL Cell::getMinimumSize() } - css::awt::Size SAL_CALL Cell::getPreferredSize() throw (RuntimeException, std::exception) @@ -909,7 +875,6 @@ css::awt::Size SAL_CALL Cell::getPreferredSize() } - css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) throw (RuntimeException, std::exception) { return aNewSize; @@ -925,14 +890,12 @@ sal_Int32 SAL_CALL Cell::getRowSpan() throw (RuntimeException, std::exception) } - sal_Int32 SAL_CALL Cell::getColumnSpan() throw (RuntimeException, std::exception) { return mnColSpan; } - sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException, std::exception) { return mbMerged; @@ -948,7 +911,6 @@ OUString SAL_CALL Cell::getFormula( ) throw (RuntimeException, std::exception) } - void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeException, std::exception) { if( msFormula != aFormula ) @@ -958,14 +920,12 @@ void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeExcepti } - double SAL_CALL Cell::getValue( ) throw (RuntimeException, std::exception) { return mfValue; } - void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exception) { if( mfValue != nValue ) @@ -976,14 +936,12 @@ void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exce } - CellContentType SAL_CALL Cell::getType() throw (RuntimeException, std::exception) { return mnCellContentType; } - sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException, std::exception) { return mnError; @@ -1021,7 +979,6 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE } - void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1166,7 +1123,6 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& } - Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1250,25 +1206,21 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow } - void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -1307,7 +1259,6 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName } - Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; @@ -1341,19 +1292,16 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP } - void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } - void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } - void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } @@ -1465,7 +1413,6 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th } - Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1496,7 +1443,6 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt } - void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1538,7 +1484,6 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U } - Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1612,7 +1557,6 @@ void SAL_CALL Cell::setAllPropertiesToDefault() } - void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) { sal_Int32 nCount = aPropertyNames.getLength(); @@ -1623,7 +1567,6 @@ void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropert } - Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { sal_Int32 nCount = aPropertyNames.getLength(); @@ -1648,7 +1591,6 @@ void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, co } - void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) throw (NoSuchElementException, RuntimeException, std::exception) { SvxUnoTextBase::removeTextContent( xContent ); @@ -1665,14 +1607,12 @@ Reference< XTextCursor > SAL_CALL Cell::createTextCursor( ) throw (RuntimeExcep } - Reference< XTextCursor > SAL_CALL Cell::createTextCursorByRange( const Reference< XTextRange >& aTextPosition ) throw (RuntimeException, std::exception) { return SvxUnoTextBase::createTextCursorByRange( aTextPosition ); } - void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException, std::exception) { SvxUnoTextBase::insertString( xRange, aString, bAbsorb ); @@ -1680,7 +1620,6 @@ void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const O } - void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException, std::exception) { SvxUnoTextBase::insertControlCharacter( xRange, nControlCharacter, bAbsorb ); @@ -1697,21 +1636,18 @@ Reference< XText > SAL_CALL Cell::getText( ) throw (RuntimeException, std::exce } - Reference< XTextRange > SAL_CALL Cell::getStart( ) throw (RuntimeException, std::exception) { return SvxUnoTextBase::getStart(); } - Reference< XTextRange > SAL_CALL Cell::getEnd( ) throw (RuntimeException, std::exception) { return SvxUnoTextBase::getEnd(); } - OUString SAL_CALL Cell::getString( ) throw (RuntimeException, std::exception) { maSelection.nStartPara = EE_PARA_MAX_COUNT; @@ -1719,7 +1655,6 @@ OUString SAL_CALL Cell::getString( ) throw (RuntimeException, std::exception) } - void SAL_CALL Cell::setString( const OUString& aString ) throw (RuntimeException, std::exception) { SvxUnoTextBase::setString( aString ); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 38ebe42ad80f..7a3352b2887d 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -33,7 +33,6 @@ #include "svx/svdtext.hxx" - class SfxItemSet; class OutlinerParaObject; class SdrObject; @@ -43,11 +42,9 @@ namespace sdr { namespace properties { } } - namespace sdr { namespace table { - class SVX_DLLPUBLIC Cell : public SdrText, public SvxUnoTextBase, public css::table::XMergeableCell, @@ -229,7 +226,6 @@ private: }; - } } #endif diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 04620251ad21..f1fd2570e5de 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -27,7 +27,6 @@ #include "svdglob.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -35,7 +34,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::table; - namespace sdr { namespace table { CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) @@ -44,7 +42,6 @@ CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 } - CellCursor::~CellCursor() { } @@ -59,14 +56,12 @@ Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sa } - Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return CellRange::getCellRangeByPosition( nLeft, nTop, nRight, nBottom ); } - Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) throw (RuntimeException, std::exception) { return CellRange::getCellRangeByName( aRange ); @@ -83,7 +78,6 @@ void SAL_CALL CellCursor::gotoStart( ) throw (RuntimeException, std::exception) } - void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException, std::exception) { mnLeft = mnRight; @@ -91,7 +85,6 @@ void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException, std::exception) } - void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException, std::exception) { if( mxTable.is() ) @@ -120,7 +113,6 @@ void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException, std::exception) } - void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException, std::exception) { if( mxTable.is() ) @@ -141,7 +133,6 @@ void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException, std::excepti } - void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (RuntimeException, std::exception) { if( mxTable.is() ) @@ -240,7 +231,6 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd ) } - void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, std::exception) { CellPos aStart, aEnd; @@ -275,7 +265,6 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, } - void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< sal_Int32 >& rLeftOvers ) { const sal_Int32 nRowCount = mxTable->getRowCount(); @@ -379,7 +368,6 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< } - void CellCursor::split_horizontal( sal_Int32 nColumns ) { const sal_Int32 nRowCount = mxTable->getRowCount(); @@ -391,7 +379,6 @@ void CellCursor::split_horizontal( sal_Int32 nColumns ) } - void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_Int32 >& rLeftOvers ) { const sal_Int32 nColCount = mxTable->getColumnCount(); @@ -495,7 +482,6 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In } - void CellCursor::split_vertical( sal_Int32 nRows ) { const sal_Int32 nColCount = mxTable->getColumnCount(); @@ -507,7 +493,6 @@ void CellCursor::split_vertical( sal_Int32 nRows ) } - void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (NoSupportException, IllegalArgumentException, RuntimeException, std::exception) { if( (nColumns < 0) || (nRows < 0) ) @@ -546,7 +531,6 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No } - sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exception) { CellPos aStart, aEnd; @@ -554,7 +538,6 @@ sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exce } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index d17d4173b6f3..2c4430a35255 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -26,7 +26,6 @@ #include "cellrange.hxx" - namespace sdr { namespace table { struct CellPos; diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index f0adfa3f8db1..1f7dc02416ff 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -21,14 +21,12 @@ #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( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) @@ -41,7 +39,6 @@ CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 n } - CellRange::~CellRange() { } @@ -85,7 +82,6 @@ Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal } - Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( (nLeft >= 0 ) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop) ) @@ -106,14 +102,12 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nL } - Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { return Reference< XCellRange >(); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 455adc5678b7..8f76b6f96752 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -26,7 +26,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { class CellRange : public ::cppu::WeakAggImplHelper1< css::table::XCellRange >, public ICellRange diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 81bbc8b2bdb7..36b2ec78e407 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -32,13 +32,11 @@ FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps ) } - FastPropertySetInfo::~FastPropertySetInfo() { } - void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) { sal_uInt32 nIndex = maProperties.size(); @@ -54,7 +52,6 @@ void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) } - const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw (UnknownPropertyException ) { PropertyMap::iterator aIter( maMap.find( aName ) ); @@ -64,7 +61,6 @@ const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw } - const Property* FastPropertySetInfo::hasProperty( const OUString& aName ) { PropertyMap::iterator aIter( maMap.find( aName ) ); @@ -84,14 +80,12 @@ Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() throw (Runtim } - Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) { return getProperty( aName ); } - sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException, std::exception) { return hasProperty( aName ) != nullptr; @@ -103,7 +97,6 @@ FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& x } - FastPropertySet::~FastPropertySet() { } @@ -118,39 +111,33 @@ Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo( ) t } - void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { setFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle, aValue ); } - Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return getFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle ); } - void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -182,7 +169,6 @@ void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aP } - Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) { sal_Int32 nCount = aPropertyNames.getLength(); @@ -206,19 +192,16 @@ Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUS } - void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 2288201c2311..5a27fbf25d7f 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -58,7 +58,6 @@ private: }; - class FastPropertySet : public ::cppu::WeakAggImplHelper3< css::beans::XPropertySet, css::beans::XMultiPropertySet, css::beans::XFastPropertySet > { public: diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index b54e4150543b..6692ef7020fb 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -194,7 +194,6 @@ bool TableStyleSettings::operator==( const TableStyleSettings& rStyle ) const } - class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper< css::util::XModifyListener > { public: @@ -265,7 +264,6 @@ SdrTableObjImpl::SdrTableObjImpl() } - SdrTableObjImpl::~SdrTableObjImpl() { if( lastLayoutTable == this ) @@ -273,7 +271,6 @@ SdrTableObjImpl::~SdrTableObjImpl() } - void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 nRows ) { mpTableObj = pTable; @@ -287,7 +284,6 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 n } - SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) { if (this != &rSource) @@ -325,7 +321,6 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) } - void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) { // try to find new table style @@ -365,7 +360,6 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) } - void SdrTableObjImpl::ApplyCellStyles() { if( !mxTable.is() || !mxTableStyle.is() ) @@ -458,7 +452,6 @@ void SdrTableObjImpl::ApplyCellStyles() } - void SdrTableObjImpl::dispose() { disconnectTableStyle(); @@ -480,7 +473,6 @@ void SdrTableObjImpl::dispose() } - void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset ) { if( (nEdge >= 0) && mxTable.is()) try @@ -597,7 +589,6 @@ void SdrTableObjImpl::update() } - void SdrTableObjImpl::connectTableStyle() { if( mxTableStyle.is() ) @@ -612,7 +603,6 @@ void SdrTableObjImpl::connectTableStyle() } - void SdrTableObjImpl::disconnectTableStyle() { if( mxTableStyle.is() ) @@ -627,7 +617,6 @@ void SdrTableObjImpl::disconnectTableStyle() } - bool SdrTableObjImpl::isInUse() { return mpTableObj && mpTableObj->IsInserted(); @@ -650,7 +639,6 @@ void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source } - CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const { CellRef xCell; @@ -666,14 +654,12 @@ CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const } - sal_Int32 SdrTableObjImpl::getColumnCount() const { return mxTable.is() ? mxTable->getColumnCount() : 0; } - sal_Int32 SdrTableObjImpl::getRowCount() const { return mxTable.is() ? mxTable->getRowCount() : 0; @@ -742,10 +728,6 @@ sdr::contact::ViewContact* SdrTableObj::CreateObjectSpecificViewContact() } - - - - SdrTableObj::SdrTableObj(SdrModel* _pModel) { pModel = _pModel; @@ -753,7 +735,6 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel) } - SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows) : SdrTextObj( rNewRect ) , maLogicRect( rNewRect ) @@ -770,7 +751,6 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int } - void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows ) { bClosedObj = true; @@ -781,7 +761,6 @@ void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows ) } - SdrTableObj::~SdrTableObj() { mpImpl->dispose(); @@ -798,21 +777,18 @@ Reference< XTable > SdrTableObj::getTable() const } - 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() { return CellPos( 0,0 ); } - CellPos SdrTableObj::getLastCell() const { CellPos aPos; @@ -825,7 +801,6 @@ CellPos SdrTableObj::getLastCell() const } - CellPos SdrTableObj::getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const { switch( GetWritingMode() ) @@ -841,7 +816,6 @@ CellPos SdrTableObj::getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const } - CellPos SdrTableObj::getRightCell( const CellPos& rPos, bool bEdgeTravel ) const { switch( GetWritingMode() ) @@ -857,7 +831,6 @@ CellPos SdrTableObj::getRightCell( const CellPos& rPos, bool bEdgeTravel ) cons } - CellPos SdrTableObj::getUpCell( const CellPos& rPos, bool bEdgeTravel ) const { switch( GetWritingMode() ) @@ -872,7 +845,6 @@ CellPos SdrTableObj::getUpCell( const CellPos& rPos, bool bEdgeTravel ) const } - CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const { switch( GetWritingMode() ) @@ -887,7 +859,6 @@ CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const } - CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) const { CellPos aPos( rPos ); @@ -915,7 +886,6 @@ CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) co } - CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const { CellPos aPos( rPos ); @@ -958,7 +928,6 @@ CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const } - CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) const { CellPos aPos( rPos ); @@ -988,7 +957,6 @@ CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) con } - CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const { CellPos aPos( rPos ); @@ -1032,7 +1000,6 @@ CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const } - const TableStyleSettings& SdrTableObj::getTableStyleSettings() const { if( mpImpl ) @@ -1047,7 +1014,6 @@ const TableStyleSettings& SdrTableObj::getTableStyleSettings() const } - void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) { if( mpImpl ) @@ -1058,7 +1024,6 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) } - TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const { if( !mpImpl || !mpImpl->mxTable.is() ) @@ -1186,7 +1151,6 @@ const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const } - void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle ) { if( mpImpl && (mpImpl->mxTableStyle != xTableStyle) ) @@ -1199,7 +1163,6 @@ void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle ) } - const Reference< XIndexAccess >& SdrTableObj::getTableStyle() const { if( mpImpl ) @@ -1224,7 +1187,6 @@ SdrText* SdrTableObj::getActiveText() const } - /** returns the nth available text. */ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const { @@ -1243,7 +1205,6 @@ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const } - /** returns the number of texts available for this object. */ sal_Int32 SdrTableObj::getTextCount() const { @@ -1261,7 +1222,6 @@ sal_Int32 SdrTableObj::getTextCount() const } - /** changes the current active text */ void SdrTableObj::setActiveText( sal_Int32 nIndex ) { @@ -1278,7 +1238,6 @@ 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 { @@ -1327,7 +1286,6 @@ bool SdrTableObj::IsTextEditActive( const CellPos& rPos ) } - void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) { if( (pEditStatus->GetStatusWord() & EditStatusFlags::TEXTHEIGHTCHANGED) && mpImpl && mpImpl->mpLayouter ) @@ -1344,7 +1302,6 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) } - void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bResizeFreeAllowed=true; @@ -1371,21 +1328,18 @@ void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const } - 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) { SdrModel* pOldModel = GetModel(); @@ -1407,7 +1361,6 @@ void SdrTableObj::SetModel(SdrModel* pNewModel) } - void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const { if( mpImpl ) @@ -1415,7 +1368,6 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bo } - void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const { if( !mpImpl ) @@ -1450,7 +1402,6 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec // } - // set text at outliner, maybe from edit outliner OutlinerParaObject* pPara= xCell->GetOutlinerParaObject(); if (pEdtOutl && !bNoEditText && mpImpl->mxActiveCell == xCell ) @@ -1499,7 +1450,6 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec } - const CellRef& SdrTableObj::getActiveCell() const { if( mpImpl ) @@ -1519,14 +1469,12 @@ const CellRef& SdrTableObj::getActiveCell() const } - sal_Int32 SdrTableObj::getColumnCount() const { return mpImpl ? mpImpl->getColumnCount() : 0; } - void SdrTableObj::setActiveCell( const CellPos& rPos ) { if( mpImpl && mpImpl->mxTable.is() ) try @@ -1551,14 +1499,12 @@ void SdrTableObj::setActiveCell( const CellPos& rPos ) } - void SdrTableObj::getActiveCellPos( CellPos& rPos ) const { rPos = mpImpl->maEditPos; } - void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect ) { if( mpImpl ) @@ -1570,7 +1516,6 @@ void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect ) } - void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const { if( mpImpl ) @@ -1578,7 +1523,6 @@ void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const } - void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRect ) const { Rectangle aAnkRect(maRect); @@ -1595,7 +1539,6 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec } - void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const { if( mpImpl ) @@ -1603,7 +1546,6 @@ void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* } - void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin ) const { Size aPaperMin,aPaperMax; @@ -1660,7 +1602,6 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* } - sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const { EVAnchorMode eRet=ANCHOR_TOP_LEFT; @@ -1688,7 +1629,6 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const } - OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const { return SdrTextObj::GetEditOutlinerParaObject(); @@ -1711,14 +1651,12 @@ OUString SdrTableObj::TakeObjNameSingul() const } - OUString SdrTableObj::TakeObjNamePlural() const { return ImpGetResStr(STR_ObjNamePluralTable); } - SdrTableObj* SdrTableObj::Clone() const { return CloneHelper< SdrTableObj >(); @@ -1751,63 +1689,53 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj) } - basegfx::B2DPolyPolygon SdrTableObj::TakeXorPoly() const { return SdrTextObj::TakeXorPoly(); } - basegfx::B2DPolyPolygon SdrTableObj::TakeContour() const { return SdrTextObj::TakeContour(); } - const Rectangle& SdrTableObj::GetSnapRect() const { return maRect; } - 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 { return SdrTextObj::GetSnapPoint(i); } - bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) { if( pEdtOutl != nullptr ) @@ -1849,7 +1777,6 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) } - void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) { if(rOutl.IsModified()) @@ -1896,7 +1823,6 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) } - OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const { CellRef xCell( getActiveCell() ); @@ -1907,7 +1833,6 @@ OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const } - void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) { CellRef xCell( getActiveCell() ); @@ -1929,7 +1854,6 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) } - void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) { maLogicRect=rRect; @@ -1942,8 +1866,6 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) } - - void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ ) { Rectangle aAdjustRect( rMaxRect ); @@ -1952,7 +1874,6 @@ void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnl } - void SdrTableObj::NbcMove(const Size& rSiz) { MoveRect(maLogicRect,rSiz); @@ -1962,7 +1883,6 @@ void SdrTableObj::NbcMove(const Size& rSiz) } - void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { Rectangle aOldRect( maLogicRect ); @@ -1974,7 +1894,6 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac } - bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNeuRect(maLogicRect); @@ -1994,7 +1913,6 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) } - bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { if((pModel == nullptr) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) @@ -2015,14 +1933,12 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo } - void SdrTableObj::NbcReformatText() { NbcAdjustTextFrameWidthAndHeight(); } - void SdrTableObj::ReformatText() { Rectangle aBoundRect0; @@ -2035,7 +1951,6 @@ void SdrTableObj::ReformatText() } - bool SdrTableObj::IsVerticalWriting() const { const SvxWritingModeItem* pModeItem = dynamic_cast< const SvxWritingModeItem* >( &GetObjectItem( SDRATTR_TEXTDIRECTION ) ); @@ -2043,7 +1958,6 @@ bool SdrTableObj::IsVerticalWriting() const } - void SdrTableObj::SetVerticalWriting(bool bVertical ) { if( bVertical != IsVerticalWriting() ) @@ -2054,7 +1968,6 @@ void SdrTableObj::SetVerticalWriting(bool bVertical ) } - WritingMode SdrTableObj::GetWritingMode() const { SfxStyleSheet* pStyle = GetStyleSheet(); @@ -2081,7 +1994,6 @@ WritingMode SdrTableObj::GetWritingMode() const } - // 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. bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon ) const @@ -2378,7 +2290,6 @@ bool SdrTableObj::BegCreate(SdrDragStat& rStat) } - bool SdrTableObj::MovCreate(SdrDragStat& rStat) { Rectangle aRect1; @@ -2392,7 +2303,6 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat) } - bool SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { rStat.TakeCreateRect(maRect); @@ -2405,14 +2315,12 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/) } - bool SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) { return true; } - basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) const { Rectangle aRect1; @@ -2426,28 +2334,24 @@ basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) co } - Pointer SdrTableObj::GetCreatePointer() const { return Pointer(PointerStyle::Cross); } - void SdrTableObj::createCell( CellRef& xNewCell ) { xNewCell = Cell::create( *this, nullptr ); } - SdrObjGeoData *SdrTableObj::NewGeoData() const { return new TableObjectGeoData; } - void SdrTableObj::SaveGeoData(SdrObjGeoData& rGeo) const { DBG_ASSERT( dynamic_cast< TableObjectGeoData* >( &rGeo ), "svx::SdrTableObj::SaveGeoData(), illegal geo data!" ); @@ -2457,7 +2361,6 @@ void SdrTableObj::SaveGeoData(SdrObjGeoData& rGeo) const } - void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo) { DBG_ASSERT( dynamic_cast< const TableObjectGeoData* >( &rGeo ), "svx::SdrTableObj::SaveGeoData(), illegal geo data!" ); @@ -2472,7 +2375,6 @@ void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo) } - SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd ) { const sal_Int32 nColumns = rEnd.mnCol - rStart.mnCol + 1; @@ -2531,7 +2433,6 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd } - void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn ) { if( mpImpl && mpImpl->mpLayouter ) @@ -2542,7 +2443,6 @@ void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColu } - void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) { if( mpImpl && mpImpl->mpLayouter ) @@ -2553,7 +2453,6 @@ void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ) } - void SdrTableObj::SetChanged() { if( mpImpl ) @@ -2565,7 +2464,6 @@ void SdrTableObj::SetChanged() } - void SdrTableObj::uno_lock() { if( mpImpl && mpImpl->mxTable.is() ) @@ -2573,7 +2471,6 @@ void SdrTableObj::uno_lock() } - void SdrTableObj::uno_unlock() { if( mpImpl && mpImpl->mxTable.is() ) @@ -2581,9 +2478,6 @@ void SdrTableObj::uno_unlock() } - - - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 8f48aad20184..f10f43b8b103 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -26,7 +26,6 @@ #include "svx/svdotable.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -34,7 +33,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::beans; - namespace sdr { namespace table { const sal_Int32 Property_Width = 0; @@ -58,20 +56,17 @@ TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn ) } - TableColumn::~TableColumn() { } - void TableColumn::dispose() { mxTableModel.clear(); } - void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -79,7 +74,6 @@ void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException) } - TableColumn& TableColumn::operator=( const TableColumn& r ) { mnWidth = r.mnWidth; @@ -106,7 +100,6 @@ Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, s } - Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throwIfDisposed(); @@ -118,7 +111,6 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 } - Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { return Reference< XCellRange >(); @@ -134,7 +126,6 @@ OUString SAL_CALL TableColumn::getName() throw (RuntimeException, std::exception } - void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeException, std::exception) { maName = aName; @@ -232,7 +223,6 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a } - Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { switch( nHandle ) @@ -246,7 +236,6 @@ Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (Unkno } - rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { static rtl::Reference< FastPropertySetInfo > xInfo; @@ -295,7 +284,6 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 2f9b3cc7cd5c..9c81c69d718c 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -28,7 +28,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableColumnBase; diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 10f0184dcfeb..eaf01178c979 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -24,14 +24,12 @@ #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( const TableModelRef& xTableModel ) @@ -40,21 +38,18 @@ TableColumns::TableColumns( const TableModelRef& xTableModel ) } - TableColumns::~TableColumns() { dispose(); } - void TableColumns::dispose() { mxTableModel.clear(); } - void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -72,7 +67,6 @@ void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) } - void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -90,7 +84,6 @@ sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException, std::except } - Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { throwIfDisposed(); @@ -113,7 +106,6 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException, std::excep } - sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -122,7 +114,6 @@ sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException, std::exce } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 8c350e2e5876..0da242abd16a 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -26,7 +26,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { class TableColumns : public ::cppu::WeakAggImplHelper1< css::table::XTableColumns > diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 199499f0cb0b..0d1015482554 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -129,7 +129,6 @@ rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView } - rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController ) { if( xRefController.is() ) @@ -142,7 +141,6 @@ rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEdi } - SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject* pObj ) : mbCellSelectionMode(false) , mbLeftButtonDown(false) @@ -192,7 +190,6 @@ SvxTableController::~SvxTableController() } - const sal_uInt16 ACTION_NONE = 0; const sal_uInt16 ACTION_GOTO_FIRST_CELL = 1; const sal_uInt16 ACTION_GOTO_FIRST_COLUMN = 2; @@ -334,7 +331,6 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* } - bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* /*pWin*/) { if( !checkTableObject() ) @@ -349,7 +345,6 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* / } - bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWindow ) { if( !checkTableObject() ) @@ -381,7 +376,6 @@ bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWind } - void SvxTableController::onSelectionHasChanged() { bool bSelected = false; @@ -418,7 +412,6 @@ void SvxTableController::onSelectionHasChanged() } - void SvxTableController::GetState( SfxItemSet& rSet ) { if( !mxTable.is() || !mxTableObj.is() || !mxTableObj->GetModel() ) @@ -517,7 +510,6 @@ void SvxTableController::GetState( SfxItemSet& rSet ) } - void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) { sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); @@ -794,7 +786,6 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) } - void SvxTableController::onDelete( sal_uInt16 nSId ) { sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); @@ -853,7 +844,6 @@ void SvxTableController::onDelete( sal_uInt16 nSId ) } - void SvxTableController::onSelect( sal_uInt16 nSId ) { if( mxTable.is() ) @@ -1441,7 +1431,6 @@ bool SvxTableController::checkTableObject() } - sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* /*pWindow*/ ) { const bool bMod1 = rKEvt.GetKeyCode().IsMod1(); // ctrl @@ -1740,7 +1729,6 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W } - void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Window* pWindow, sal_uInt16 nAction ) { if( mxTableObj.is() && static_cast<SdrTableObj*>(mxTableObj.get())->IsTextEditActive() ) @@ -1769,7 +1757,6 @@ void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Windo } - const CellPos& SvxTableController::getSelectionStart() { checkCell( maCursorFirstPos ); @@ -1777,14 +1764,12 @@ const CellPos& SvxTableController::getSelectionStart() } - void SvxTableController::setSelectionStart( const CellPos& rPos ) { maCursorFirstPos = rPos; } - const CellPos& SvxTableController::getSelectionEnd() { checkCell( maCursorLastPos ); @@ -1792,7 +1777,6 @@ const CellPos& SvxTableController::getSelectionEnd() } - void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ) { if( mxTable.is() ) try @@ -1820,9 +1804,6 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s } - - - void SvxTableController::checkCell( CellPos& rPos ) { if( mxTable.is() ) try @@ -1840,7 +1821,6 @@ void SvxTableController::checkCell( CellPos& rPos ) } - void SvxTableController::findMergeOrigin( CellPos& rPos ) { if( mxTable.is() ) try @@ -1858,7 +1838,6 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) } - void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) { SdrPageView* pPV = mpView->GetSdrPageView(); @@ -1951,7 +1930,6 @@ void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, co } - void SvxTableController::StopTextEdit() { if(mpView->IsTextEdit()) @@ -1963,7 +1941,6 @@ void SvxTableController::StopTextEdit() } - void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast ) { if( mbCellSelectionMode ) @@ -2047,7 +2024,6 @@ void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast ) } - void SvxTableController::StartSelection( const CellPos& rPos ) { StopTextEdit(); @@ -2057,7 +2033,6 @@ void SvxTableController::StartSelection( const CellPos& rPos ) } - void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& rEnd ) { StopTextEdit(); @@ -2067,7 +2042,6 @@ void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& } - void SvxTableController::UpdateSelection( const CellPos& rPos ) { maCursorLastPos = rPos; @@ -2075,14 +2049,12 @@ void SvxTableController::UpdateSelection( const CellPos& rPos ) } - void SvxTableController::clearSelection() { RemoveSelection(); } - void SvxTableController::selectAll() { if( mxTable.is() ) @@ -2096,7 +2068,6 @@ void SvxTableController::selectAll() } - void SvxTableController::RemoveSelection() { if( mbCellSelectionMode ) @@ -2107,7 +2078,6 @@ void SvxTableController::RemoveSelection() } - void SvxTableController::onTableModified() { if( mnUpdateEvent == nullptr ) @@ -2190,7 +2160,6 @@ void SvxTableController::updateSelectionOverlay() } - void SvxTableController::destroySelectionOverlay() { if( mpSelectionOverlay ) @@ -2209,7 +2178,6 @@ void SvxTableController::destroySelectionOverlay() } - void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const { if( mxTable.is() ) @@ -2251,7 +2219,6 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl } - const sal_uInt16 CELL_BEFORE = 0x0001; const sal_uInt16 CELL_LEFT = 0x0002; const sal_uInt16 CELL_RIGHT = 0x0004; @@ -2263,7 +2230,6 @@ const sal_uInt16 CELL_BOTTOM = 0x0040; const sal_uInt16 CELL_LOWER = 0x0080; - static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, SvxBoxItemLine nLine ) { if( pNew ) @@ -2281,7 +2247,6 @@ static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine } - static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SvxBoxItem& rNewFrame ) { if( (nCellFlags & (CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 ) @@ -2339,7 +2304,6 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, } - static void ImplSetLineColor( SvxBoxItem& rNewFrame, SvxBoxItemLine nLine, const Color& rColor ) { const SvxBorderLine* pSourceLine = rNewFrame.GetLine( nLine ); @@ -2352,7 +2316,6 @@ static void ImplSetLineColor( SvxBoxItem& rNewFrame, SvxBoxItemLine nLine, const } - static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* pLineColorItem, SvxBoxItem& rNewFrame ) { const Color aColor( pLineColorItem->GetValue() ); @@ -2371,7 +2334,6 @@ static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* p } - static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* pBorderLineItem, SvxBoxItem& rNewFrame ) { if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 ) @@ -2417,7 +2379,6 @@ static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* } - void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) { if( mxTable.is() ) @@ -2506,7 +2467,6 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) } - void SvxTableController::UpdateTableShape() { SdrObject* pTableObj = mxTableObj.get(); @@ -2519,8 +2479,6 @@ void SvxTableController::UpdateTableShape() } - - void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll) { if( mxTable.is() ) @@ -2572,7 +2530,6 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR } - bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if( mxTableObj.is() && hasSelectedCells() ) @@ -2602,7 +2559,6 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt } - bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { if( mbCellSelectionMode || mpView->IsTextEdit() ) @@ -2614,7 +2570,6 @@ bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) } - bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) { if( mxTableObj.is() && mbCellSelectionMode && pNewPage ) try @@ -2642,7 +2597,6 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) } - bool SvxTableController::PasteObjModel( const SdrModel& rModel ) { if( mxTableObj.is() && mpView && (rModel.GetPageCount() >= 1) ) @@ -2662,7 +2616,6 @@ bool SvxTableController::PasteObjModel( const SdrModel& rModel ) } - bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj ) { if( !pPasteTableObj ) @@ -2800,8 +2753,6 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo } - - IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void) { mnUpdateEvent = nullptr; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 22fe8ff4e722..7713071b5e13 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -248,14 +248,12 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exce } - OUString SAL_CALL TableDesignStyle::getParentStyle() throw (RuntimeException, std::exception) { return OUString(); } - void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchElementException, RuntimeException, std::exception) { } @@ -270,7 +268,6 @@ OUString SAL_CALL TableDesignStyle::getName() throw (RuntimeException, std::exce } - void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeException, std::exception) { msName = rName; @@ -294,7 +291,6 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl } - Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -303,7 +299,6 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE } - sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -324,7 +319,6 @@ Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException, std::ex } - sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::exception) { return sal_True; @@ -340,7 +334,6 @@ sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException, std::exc } - Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -421,14 +414,12 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe } - void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener ); } - void TableDesignStyle::notifyModifyListener() { MutexGuard aGuard( rBHelper.rMutex ); @@ -454,7 +445,6 @@ void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& ) throw } - void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { } @@ -463,7 +453,6 @@ void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw // TableStyle - // XServiceInfo OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException, std::exception) { @@ -509,7 +498,6 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE } - Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -526,7 +514,6 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime } - sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -550,7 +537,6 @@ Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException, std::e } - sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -570,7 +556,6 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException, std::ex } - Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -604,7 +589,6 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& } - void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -663,7 +647,6 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Excep } - Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >& ) throw(Exception, RuntimeException, std::exception) { return createInstance(); @@ -687,13 +670,11 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException, std::excep } - void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) { } - void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) { } @@ -709,14 +690,12 @@ Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (Runti } - void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { if ( PropertyName == "DisplayName" ) @@ -731,36 +710,30 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } - void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - - Reference< XNameAccess > CreateTableDesignFamily() { return new TableDesignFamily(); diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index ca9954ea4819..0b8b3d341f9f 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -41,7 +41,6 @@ namespace sdr { namespace table { - class OverlayTableEdge : public sdr::overlay::OverlayObject { protected: @@ -57,7 +56,6 @@ public: }; - TableEdgeHdl::TableEdgeHdl( const Point& rPnt, bool bHorizontal, sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nEdges ) : SdrHdl( rPnt, HDL_USER ) , mbHorizontal( bHorizontal ) @@ -200,7 +198,6 @@ void TableEdgeHdl::CreateB2dIAObject() } - OverlayTableEdge::OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ) : OverlayObject(Color(COL_GRAY)) , maPolyPolygon( rPolyPolygon ) @@ -245,7 +242,6 @@ drawinglayer::primitive2d::Primitive2DContainer OverlayTableEdge::createOverlayO } - TableBorderHdl::TableBorderHdl( const Rectangle& rRect, bool bAnimate) diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index 07ff615be994..16b159732825 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -25,7 +25,6 @@ #include <svx/svdhdl.hxx> - namespace sdr { namespace table { enum TableEdgeState { Empty, Invisible, Visible }; diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 1df137851e40..4eb2ea1e289b 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -48,15 +48,12 @@ 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 ) , msSize( "Size" ) @@ -64,14 +61,12 @@ TableLayouter::TableLayouter( const TableModelRef& xTableModel ) } - TableLayouter::~TableLayouter() { ClearBorderLayout(); } - basegfx::B2ITuple TableLayouter::getCellSize( const CellRef& xCell, const CellPos& rPos ) const { sal_Int32 width = 0; @@ -115,7 +110,6 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellRef& xCell, const CellPo } - bool TableLayouter::getCellArea( const CellRef& xCell, const CellPos& rPos, basegfx::B2IRectangle& rArea ) const { try @@ -170,7 +164,6 @@ sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const } - bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const { const BorderLineMap& rMap = bHorizontal ? maHorizontalBorders : maVerticalBorders; @@ -189,7 +182,6 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor } - /** 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 { @@ -213,7 +205,6 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, } - sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { sal_Int32 nRet = 0; @@ -244,7 +235,6 @@ sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/ } - sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { sal_Int32 nRet = 0; @@ -299,7 +289,6 @@ sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, } - static bool checkMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 nMergedY, sal_Int32 nCellX, sal_Int32 nCellY, bool& bRunning ) { Reference< XMergeableCell > xCell( xTable->getCellByPosition( nCellX, nCellY ), UNO_QUERY ); @@ -420,7 +409,6 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 } - sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) { if( isValidColumn( nColumn ) ) @@ -435,7 +423,6 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) } - sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ) { // break loops after 100 runs to avoid freezing office due to developer error @@ -505,13 +492,11 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu } - typedef std::vector< CellRef > MergeableCellVector; typedef std::vector< MergeableCellVector > MergeVector; typedef std::vector< sal_Int32 > Int32Vector; - void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); @@ -664,7 +649,6 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) } - void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); @@ -822,7 +806,6 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) } - /** try to fit the table into the given rectangle. If the rectangle is to small, it will be grown to fit the table. */ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFitHeight ) @@ -855,7 +838,6 @@ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFi } - void TableLayouter::updateCells( Rectangle& rRectangle ) { const sal_Int32 nColCount = getColumnCount(); @@ -886,7 +868,6 @@ void TableLayouter::updateCells( Rectangle& rRectangle ) } - CellRef TableLayouter::getCell( const CellPos& rPos ) const { CellRef xCell; @@ -902,7 +883,6 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const } - bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { if (!pThis || ((pThis == &gEmptyBorder) && (pOther != nullptr))) @@ -938,7 +918,6 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine } - void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine ) { if( pLine == nullptr ) @@ -961,7 +940,6 @@ void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, } - void TableLayouter::ClearBorderLayout() { ClearBorderLayout(maHorizontalBorders); @@ -969,7 +947,6 @@ void TableLayouter::ClearBorderLayout() } - void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) { const sal_Int32 nColCount = rMap.size(); @@ -992,7 +969,6 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) } - void TableLayouter::ResizeBorderLayout() { ClearBorderLayout(); @@ -1001,7 +977,6 @@ void TableLayouter::ResizeBorderLayout() } - void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) { const sal_Int32 nColCount = getColumnCount() + 1; @@ -1018,7 +993,6 @@ void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) } - void TableLayouter::UpdateBorderLayout() { // make sure old border layout is cleared and border maps have correct size @@ -1061,7 +1035,6 @@ void TableLayouter::UpdateBorderLayout() } - void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol ) { if( mxTable.is() ) try @@ -1100,7 +1073,6 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, } - void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow ) { if( mxTable.is() ) try diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 82b84685eb1d..b38345588a54 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -34,7 +34,6 @@ class Rectangle; - namespace editeng { class SvxBorderLine; } diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index c81572018a34..6d1f5a793322 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -47,11 +47,9 @@ 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 ) { @@ -85,7 +83,6 @@ 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 ) { @@ -113,7 +110,6 @@ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVec } - TableModel::TableModel( SdrTableObj* pTableObj ) : TableModelBase( m_aMutex ) , mpTableObj( pTableObj ) @@ -159,13 +155,11 @@ TableModel::TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTabl } - TableModel::~TableModel() { } - void TableModel::init( sal_Int32 nColumns, sal_Int32 nRows ) { if( nRows < 20 ) @@ -197,35 +191,30 @@ sal_Int32 TableModel::getLeft() } - 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 ) { TableModelNotifyGuard aGuard( this ); @@ -237,7 +226,6 @@ void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) { TableModelNotifyGuard aGuard( this ); @@ -254,7 +242,6 @@ void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) } - void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) { TableModelNotifyGuard aGuard( this ); @@ -270,7 +257,6 @@ void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellVector& aCells ) { TableModelNotifyGuard aGuard( this ); @@ -309,7 +295,6 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep } - Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -323,7 +308,6 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen } - sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -331,7 +315,6 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException, std::excep } - sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -349,14 +332,12 @@ void TableModel::dispose() throw (RuntimeException, std::exception) } - void SAL_CALL TableModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { TableModelBase::addEventListener( xListener ); } - void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { TableModelBase::removeEventListener( xListener ); @@ -373,7 +354,6 @@ sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException, std::excep } - void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException, std::exception) { { @@ -394,7 +374,6 @@ void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& } - void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener ); @@ -414,7 +393,6 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep } - Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -440,7 +418,6 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa } - Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -455,7 +432,6 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 n } - Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { return Reference< XCellRange >(); @@ -472,38 +448,32 @@ Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw } - void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { } - Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return Any(); } - void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -517,7 +487,6 @@ void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const A } - Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Any aAny; @@ -534,14 +503,12 @@ sal_Int32 TableModel::getRowCountImpl() const } - sal_Int32 TableModel::getColumnCountImpl() const { return static_cast< sal_Int32 >( maColumns.size() ); } - void TableModel::disposing() { if( !maRows.empty() ) @@ -621,7 +588,6 @@ void TableModel::notifyModification() } - CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const { if( ((nRow >= 0) && (nRow < getRowCountImpl())) && (nCol >= 0) && (nCol < getColumnCountImpl()) ) @@ -636,7 +602,6 @@ CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const } - CellRef TableModel::createCell() { CellRef xCell; @@ -646,7 +611,6 @@ CellRef TableModel::createCell() } - void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) { if( nCount && mpTableObj ) @@ -727,7 +691,6 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { sal_Int32 nColCount = getColumnCountImpl(); @@ -837,7 +800,6 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) { if( nCount && mpTableObj ) @@ -900,7 +862,6 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) { sal_Int32 nRowCount = getRowCountImpl(); @@ -996,7 +957,6 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } - TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsException) { if( (nRow >= 0) && (nRow < getRowCountImpl()) ) @@ -1006,7 +966,6 @@ TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsEx } - TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutOfBoundsException) { if( (nColumn >= 0) && (nColumn < getColumnCountImpl()) ) @@ -1016,7 +975,6 @@ TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutO } - /** deletes rows and columns that are completely merged. Must be called between BegUndo/EndUndo! */ void TableModel::optimize() { @@ -1107,7 +1065,6 @@ void TableModel::optimize() } - void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan ) { SdrModel* pModel = mpTableObj->GetModel(); diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 32d59735e805..4779f8828f95 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -31,7 +31,6 @@ #include "celltypes.hxx" - namespace sdr { namespace table { class SdrTableObj; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index d86f7e9186b4..3226a91b467f 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -27,7 +27,6 @@ #include "svx/svdotable.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -35,7 +34,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::beans; - namespace sdr { namespace table { const sal_Int32 Property_Height = 0; @@ -64,13 +62,11 @@ TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 } - TableRow::~TableRow() { } - void TableRow::dispose() { mxTableModel.clear(); @@ -84,7 +80,6 @@ void TableRow::dispose() } - void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -92,7 +87,6 @@ void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException) } - TableRow& TableRow::operator=( const TableRow& r ) { mnHeight = r.mnHeight; @@ -106,7 +100,6 @@ TableRow& TableRow::operator=( const TableRow& r ) } - void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter /* = 0 */ ) { throwIfDisposed(); @@ -126,7 +119,6 @@ void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::it } - void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { throwIfDisposed(); @@ -171,7 +163,6 @@ Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_ } - Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throwIfDisposed(); @@ -183,7 +174,6 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLe } - Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -200,7 +190,6 @@ OUString SAL_CALL TableRow::getName() throw (RuntimeException, std::exception) } - void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException, std::exception) { maName = aName; @@ -302,7 +291,6 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal } - Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { switch( nHandle ) @@ -316,7 +304,6 @@ Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownP } - rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { static rtl::Reference< FastPropertySetInfo > xInfo; @@ -365,8 +352,6 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() } - - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index cc8c23618435..77d654f23297 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -28,7 +28,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableRowBase; diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index fdbd19c94ebb..e816f7efe53c 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -25,14 +25,12 @@ #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( const TableModelRef& xTableModel ) @@ -41,21 +39,18 @@ TableRows::TableRows( const TableModelRef& xTableModel ) } - TableRows::~TableRows() { dispose(); } - void TableRows::dispose() { mxTableModel.clear(); } - void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -73,7 +68,6 @@ void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr } - void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -91,7 +85,6 @@ sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException, std::exception } - Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { throwIfDisposed(); @@ -109,7 +102,6 @@ Type SAL_CALL TableRows::getElementType() throw (RuntimeException, std::exceptio } - sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -117,7 +109,6 @@ sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException, std::excepti } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index d9bb4fed942b..a9b6fc19e8c6 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -26,7 +26,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { class TableRows : public ::cppu::WeakAggImplHelper1< css::table::XTableRows > diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 250675e67d48..baa7e6c29456 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -28,13 +28,10 @@ #include "tablecolumn.hxx" - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; - namespace sdr { namespace table { CellUndo::CellUndo( const SdrObjectWeakRef& xObjRef, const CellRef& xCell ) @@ -173,7 +170,6 @@ static void Dispose( RowVector& rRows ) } - InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, RowVector& aNewRows ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) , mxTable( xTable ) @@ -184,7 +180,6 @@ InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row } - InsertRowUndo::~InsertRowUndo() { if( !mbUndo ) @@ -192,7 +187,6 @@ InsertRowUndo::~InsertRowUndo() } - void InsertRowUndo::Undo() { if( mxTable.is() ) @@ -203,7 +197,6 @@ void InsertRowUndo::Undo() } - void InsertRowUndo::Redo() { if( mxTable.is() ) @@ -227,7 +220,6 @@ RemoveRowUndo::RemoveRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row } - RemoveRowUndo::~RemoveRowUndo() { if( mbUndo ) @@ -235,7 +227,6 @@ RemoveRowUndo::~RemoveRowUndo() } - void RemoveRowUndo::Undo() { if( mxTable.is() ) @@ -246,7 +237,6 @@ void RemoveRowUndo::Undo() } - void RemoveRowUndo::Redo() { if( mxTable.is() ) @@ -268,7 +258,6 @@ static void Dispose( ColumnVector& rCols ) } - static void Dispose( CellVector& rCells ) { CellVector::iterator aIter( rCells.begin() ); @@ -277,7 +266,6 @@ static void Dispose( CellVector& rCells ) } - InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, ColumnVector& aNewCols, CellVector& aCells ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) , mxTable( xTable ) @@ -289,7 +277,6 @@ InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col } - InsertColUndo::~InsertColUndo() { if( !mbUndo ) @@ -300,7 +287,6 @@ InsertColUndo::~InsertColUndo() } - void InsertColUndo::Undo() { if( mxTable.is() ) @@ -311,7 +297,6 @@ void InsertColUndo::Undo() } - void InsertColUndo::Redo() { if( mxTable.is() ) @@ -336,7 +321,6 @@ RemoveColUndo::RemoveColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col } - RemoveColUndo::~RemoveColUndo() { if( mbUndo ) @@ -347,7 +331,6 @@ RemoveColUndo::~RemoveColUndo() } - void RemoveColUndo::Undo() { if( mxTable.is() ) @@ -358,7 +341,6 @@ void RemoveColUndo::Undo() } - void RemoveColUndo::Redo() { if( mxTable.is() ) @@ -381,13 +363,11 @@ TableColumnUndo::TableColumnUndo( const TableColumnRef& xCol ) } - TableColumnUndo::~TableColumnUndo() { } - void TableColumnUndo::Undo() { if( !mbHasRedoData ) @@ -399,14 +379,12 @@ void TableColumnUndo::Undo() } - void TableColumnUndo::Redo() { setData( maRedoData ); } - bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) { TableColumnUndo* pNext = dynamic_cast< TableColumnUndo* >( pNextAction ); @@ -414,7 +392,6 @@ bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) } - void TableColumnUndo::setData( const Data& rData ) { mxCol->mnColumn = rData.mnColumn; @@ -426,7 +403,6 @@ void TableColumnUndo::setData( const Data& rData ) } - void TableColumnUndo::getData( Data& rData ) { rData.mnColumn = mxCol->mnColumn; @@ -450,13 +426,11 @@ TableRowUndo::TableRowUndo( const TableRowRef& xRow ) } - TableRowUndo::~TableRowUndo() { } - void TableRowUndo::Undo() { if( !mbHasRedoData ) @@ -468,14 +442,12 @@ void TableRowUndo::Undo() } - void TableRowUndo::Redo() { setData( maRedoData ); } - bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) { TableRowUndo* pNext = dynamic_cast< TableRowUndo* >( pNextAction ); @@ -483,7 +455,6 @@ bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) } - void TableRowUndo::setData( const Data& rData ) { mxRow->mnRow = rData.mnRow; @@ -495,7 +466,6 @@ void TableRowUndo::setData( const Data& rData ) } - void TableRowUndo::getData( Data& rData ) { rData.mnRow = mxRow->mnRow; @@ -507,7 +477,6 @@ void TableRowUndo::getData( Data& rData ) } - TableStyleUndo::TableStyleUndo( const SdrTableObj& rTableObj ) : SdrUndoAction( *rTableObj.GetModel() ) , mxObjRef( const_cast< sdr::table::SdrTableObj*>( &rTableObj ) ) diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index dca50c82e603..36e5158534ed 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -37,7 +37,6 @@ namespace sdr { namespace properties { class OutlinerParaObject; - namespace sdr { namespace table { class CellUndo : public SdrUndoAction, public sdr::ObjectUser @@ -92,7 +91,6 @@ private: }; - class InsertRowUndo : public SdrUndoAction { public: @@ -110,7 +108,6 @@ private: }; - class RemoveRowUndo : public SdrUndoAction { public: @@ -128,7 +125,6 @@ private: }; - class InsertColUndo : public SdrUndoAction { public: @@ -147,7 +143,6 @@ private: }; - class RemoveColUndo : public SdrUndoAction { public: @@ -166,7 +161,6 @@ private: }; - class TableColumnUndo : public SdrUndoAction { public: @@ -207,7 +201,6 @@ private: }; - class TableRowUndo : public SdrUndoAction { public: diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 2540bfe9c2fb..4e4a9f8e3a93 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -42,12 +42,10 @@ #include "tablelayouter.hxx" - using editeng::SvxBorderLine; using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -148,7 +146,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -471,7 +468,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace sdr { namespace contact diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 859fe9b06d44..87521a9c402b 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -127,7 +127,6 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) } - void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled ) { if( mpDirectionSet ) @@ -152,7 +151,6 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled } - void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bEnabled ) { checkEntry( 0, (nProjection == 0) && bEnabled ); @@ -162,7 +160,6 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE } - void ExtrusionDirectionWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) @@ -196,7 +193,6 @@ void ExtrusionDirectionWindow::statusChanged( } - IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); @@ -244,7 +240,6 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( } - VclPtr<vcl::Window> ExtrusionDirectionControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionDirectionWindow>::Create( *this, m_xFrame, pParent ); @@ -271,7 +266,6 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -279,7 +273,6 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) @@ -288,14 +281,12 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstan } - OUString SAL_CALL ExtrusionDirectionControl::getImplementationName( ) throw (RuntimeException, std::exception) { return ExtrusionDirectionControl_getImplementationName(); } - Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return ExtrusionDirectionControl_getSupportedServiceNames(); @@ -379,7 +370,6 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth ) } - void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) { meUnit = eUnit; @@ -393,7 +383,6 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) } - void ExtrusionDepthWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) @@ -487,7 +476,6 @@ ExtrusionDepthController::ExtrusionDepthController( } - VclPtr<vcl::Window> ExtrusionDepthController::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionDepthWindow>::Create( *this, m_xFrame, pParent ); @@ -514,7 +502,6 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -522,7 +509,6 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames( } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); @@ -648,7 +634,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) } - void ExtrusionLightingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) @@ -682,7 +667,6 @@ void ExtrusionLightingWindow::statusChanged( } - void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { ToolbarMenu::DataChanged( rDCEvt ); @@ -697,7 +681,6 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } - IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); @@ -749,7 +732,6 @@ void ExtrusionLightingWindow::SelectHdl(void* pControl) } - ExtrusionLightingControl::ExtrusionLightingControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, @@ -760,7 +742,6 @@ ExtrusionLightingControl::ExtrusionLightingControl( } - VclPtr<vcl::Window> ExtrusionLightingControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionLightingWindow>::Create( *this, m_xFrame, pParent ); @@ -787,7 +768,6 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -795,7 +775,6 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) @@ -804,14 +783,12 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstanc } - OUString SAL_CALL ExtrusionLightingControl::getImplementationName( ) throw (RuntimeException, std::exception) { return ExtrusionLightingControl_getImplementationName(); } - Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return ExtrusionLightingControl_getSupportedServiceNames(); @@ -871,7 +848,6 @@ void ExtrusionSurfaceWindow::statusChanged( } - IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) { if ( IsInPopupMode() ) @@ -891,7 +867,6 @@ IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) } - ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< XComponentContext >& rxContext ) @@ -904,7 +879,6 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( } - VclPtr<vcl::Window> ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionSurfaceWindow>::Create( *this, m_xFrame, pParent ); @@ -931,7 +905,6 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -939,7 +912,6 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) @@ -948,14 +920,12 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance } - OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName( ) throw (RuntimeException, std::exception) { return ExtrusionSurfaceControl_getImplementationName(); } - Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return ExtrusionSurfaceControl_getSupportedServiceNames(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 084fe7d09ba4..6d90ec2168ab 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -34,7 +34,6 @@ class ValueSet; - namespace svx { class ExtrusionDirectionWindow : public svtools::ToolbarMenu @@ -65,7 +64,6 @@ private: }; - class ExtrusionDirectionControl : public svt::PopupWindowController { public: @@ -132,7 +130,6 @@ public: }; - class ExtrusionLightingWindow : public svtools::ToolbarMenu { private: @@ -168,7 +165,6 @@ public: }; - class ExtrusionLightingControl : public svt::PopupWindowController { public: @@ -188,7 +184,6 @@ public: }; - class ExtrusionSurfaceWindow : public svtools::ToolbarMenu { private: @@ -210,7 +205,6 @@ public: }; - class ExtrusionSurfaceControl : public svt::PopupWindowController { public: @@ -230,7 +224,6 @@ public: }; - } #endif diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index d92e3e57f65d..28cd5274fec0 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -229,7 +229,6 @@ void FontWorkGalleryDialog::insertSelectedFontwork() } - IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) { insertSelectedFontwork(); @@ -237,7 +236,6 @@ IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) { insertSelectedFontwork(); @@ -245,7 +243,6 @@ IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, } - class FontworkAlignmentWindow : public ToolbarMenu { public: @@ -357,15 +354,12 @@ public: }; - - FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) { } - VclPtr<vcl::Window> FontworkAlignmentControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<FontworkAlignmentWindow>::Create( *this, m_xFrame, pParent ); @@ -392,7 +386,6 @@ OUString SAL_CALL FontworkAlignmentControl_getImplementationName() } - Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -400,21 +393,18 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames( } - 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, std::exception) { return FontworkAlignmentControl_getImplementationName(); } - Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return FontworkAlignmentControl_getSupportedServiceNames(); @@ -488,7 +478,6 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact } - void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnabled ) { enableEntry( 6, bEnabled ); @@ -496,7 +485,6 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnab } - void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) ) @@ -528,7 +516,6 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta } - IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) { if ( IsInPopupMode() ) @@ -600,7 +587,6 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc } - VclPtr<vcl::Window> FontworkCharacterSpacingControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<FontworkCharacterSpacingWindow>::Create( *this, m_xFrame, pParent ); @@ -627,7 +613,6 @@ OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() } - Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -635,21 +620,18 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServic } - 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, std::exception) { return FontworkCharacterSpacingControl_getImplementationName(); } - Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return FontworkCharacterSpacingControl_getSupportedServiceNames(); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 63a388ccf779..250273190957 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -47,7 +47,6 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot } - FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() { m_aDoubleClickTimer.Stop(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 5bc35bcbee25..8dd2ed669fd9 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -69,7 +69,6 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, } - IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) { if ( GetEntryCount() == 0 ) @@ -80,7 +79,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) } - void SvxLineBox::Select() { // Call the parent's Select() member to trigger accessibility events. @@ -145,7 +143,6 @@ void SvxLineBox::Select() } - bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { MouseNotifyEvent nType = rNEvt.GetType(); @@ -176,7 +173,6 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) } - bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = LineLB::Notify( rNEvt ); @@ -203,7 +199,6 @@ bool SvxLineBox::Notify( NotifyEvent& rNEvt ) } - void SvxLineBox::ReleaseFocus_Impl() { if(!bRelease) @@ -271,7 +266,6 @@ SvxMetricField::SvxMetricField( } - void SvxMetricField::Update( const XLineWidthItem* pItem ) { if ( pItem ) @@ -284,7 +278,6 @@ void SvxMetricField::Update( const XLineWidthItem* pItem ) } - void SvxMetricField::Modify() { MetricField::Modify(); @@ -302,7 +295,6 @@ void SvxMetricField::Modify() } - void SvxMetricField::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) @@ -349,7 +341,6 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) } - bool SvxMetricField::Notify( NotifyEvent& rNEvt ) { bool bHandled = MetricField::Notify( rNEvt ); @@ -438,7 +429,6 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) } - bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = FillTypeLB::Notify( rNEvt ); @@ -472,7 +462,6 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) } - void SvxFillTypeBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) @@ -508,7 +497,6 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) } - bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = FillAttrLB::Notify( rNEvt ); @@ -539,14 +527,12 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) } - void SvxFillAttrBox::Select() { FillAttrLB::Select(); } - void SvxFillAttrBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 6f63ff9d894e..74d355e0973d 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -95,14 +95,12 @@ const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; - IMPL_LINK_NOARG_TYPED(TableWindow, SelectHdl, Button*, void) { CloseAndShowTableDialog(); } - TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ) @@ -149,7 +147,6 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri } - TableWindow::~TableWindow() { disposeOnce(); @@ -174,7 +171,6 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt ) } - void TableWindow::KeyInput( const KeyEvent& rKEvt ) { bool bHandled = false; @@ -248,7 +244,6 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) } - void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseButtonUp( rMEvt ); @@ -256,7 +251,6 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) } - void TableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { const long nSelectionWidth = mnTablePosX + nCol * mnTableCellWidth; @@ -331,7 +325,6 @@ void TableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void TableWindow::PopupModeEnd() { if ( !IsPopupModeCanceled() && nCol && nLine ) @@ -349,7 +342,6 @@ void TableWindow::PopupModeEnd() } - void TableWindow::Update( long nNewCol, long nNewLine ) { if ( nNewCol < 0 || nNewCol > TABLE_CELLS_HORIZ ) @@ -367,7 +359,6 @@ void TableWindow::Update( long nNewCol, long nNewLine ) } - void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) { Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY ); @@ -385,7 +376,6 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) } - void TableWindow::CloseAndShowTableDialog() { // close the toolbar tool @@ -425,7 +415,6 @@ public: }; - ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), bInitialKeyInput(true), @@ -461,7 +450,6 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri } - void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseMove( rMEvt ); @@ -602,7 +590,6 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) } - void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseButtonUp( rMEvt ); @@ -613,7 +600,6 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) } - void ColumnsWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { long i; @@ -674,7 +660,6 @@ void ColumnsWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void ColumnsWindow::PopupModeEnd() { if ( !IsPopupModeCanceled() && nCol ) @@ -703,13 +688,11 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n } - SvxTableToolBoxControl::~SvxTableToolBoxControl() { } - VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow() { if ( bEnabled ) @@ -750,13 +733,11 @@ SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt } - SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl() { } - VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow() { ColumnsWindow* pWin = nullptr; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index c617a7c8b08b..e5e83d60f42a 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -216,7 +216,6 @@ IMPL_LINK_NOARG_TYPED(SvxListBoxControl, SelectHdl, ListBox&, void) } - SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem ); SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 9efab7a52054..6b7fc9d1ce5d 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -63,7 +63,6 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, } - SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() { delete pStyleItem; @@ -71,7 +70,6 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() } - void SvxLineStyleToolBoxControl::StateChanged ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) @@ -114,7 +112,6 @@ void SvxLineStyleToolBoxControl::StateChanged ( } - void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) { if ( pState && bUpdate ) @@ -182,7 +179,6 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) } - VclPtr<vcl::Window> SvxLineStyleToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr<SvxLineBox>::Create( pParent, m_xFrame ).get(); @@ -196,13 +192,11 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( } - SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl() { } - void SvxLineWidthToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -243,7 +237,6 @@ void SvxLineWidthToolBoxControl::StateChanged( } - VclPtr<vcl::Window> SvxLineWidthToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr<SvxMetricField>::Create( pParent, m_xFrame ).get(); @@ -386,7 +379,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) } - void SvxLineEndWindow::FillValueSet() { if( pLineEndList.is() ) @@ -437,7 +429,6 @@ void SvxLineEndWindow::FillValueSet() } - void SvxLineEndWindow::Resize() { // since we change the size inside this call, check if we @@ -463,7 +454,6 @@ void SvxLineEndWindow::Resize() } - void SvxLineEndWindow::Resizing( Size& rNewSize ) { Size aBitmapSize = aBmpSize; // -> Member @@ -517,14 +507,12 @@ void SvxLineEndWindow::StartSelection() } - bool SvxLineEndWindow::Close() { return SfxPopupWindow::Close(); } - void SvxLineEndWindow::StateChanged( sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState ) { @@ -547,7 +535,6 @@ void SvxLineEndWindow::StateChanged( } - void SvxLineEndWindow::PopupModeEnd() { if ( IsVisible() ) @@ -559,7 +546,6 @@ void SvxLineEndWindow::PopupModeEnd() } - void SvxLineEndWindow::SetSize() { //if( !bPopupMode ) @@ -606,13 +592,11 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt } - SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl() { } - VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow() { SvxLineEndWindow* pLineEndWin = @@ -627,7 +611,6 @@ VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow() } - void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { sal_uInt16 nId = GetId(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index fa1416489350..a7a8a3fa85aa 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -860,7 +860,6 @@ Color SvxStyleBox_Impl::TestColorsVisible(const Color &FontCol, const Color &Bac } - static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) { bool bChanged = false; @@ -2906,7 +2905,6 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, } - static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { Size aSize = rValueSet.CalcWindowSizePixel( aItemSize ); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 9d9bb13037b7..692cefdfebdc 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -138,7 +138,6 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl() } - void SvxFontSizeBox_Impl::Select() { FontSizeBox::Select(); @@ -162,7 +161,6 @@ void SvxFontSizeBox_Impl::Select() } - void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) { if ( !bErase ) @@ -184,7 +182,6 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) } - void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFont ) { // Sizes-Liste auff"ullen @@ -210,7 +207,6 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo } - bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 84f73df3e8c6..432e5ec1aefa 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; - SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { @@ -64,7 +63,6 @@ void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any } - void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -78,7 +76,6 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, } - void SvxTbxCtlDraw::toggleToolbox() { Reference< XLayoutManager > xLayoutMgr = getLayoutManager(); @@ -102,7 +99,6 @@ void SvxTbxCtlDraw::toggleToolbox() } - void SvxTbxCtlDraw::Select(sal_uInt16 /*nSelectModifier*/) { toggleToolbox(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index e9bc94fe4867..6fb476bb6e2d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -340,9 +340,6 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 } - - - DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType , bool bNewEntry ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index a0e2e15bc6e3..09de3f803e91 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -36,7 +36,6 @@ namespace textconversiondlgs { - struct DictionaryEntry { DictionaryEntry( const OUString& rTerm, const OUString& rMapping diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index a55b0e52b545..6687cc4ce8a0 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -37,7 +37,6 @@ namespace textconversiondlgs { - /** This class provides the chinese translation dialog as an uno component. It can be created via lang::XMultiComponentFactory::createInstanceWithContext diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 826fb1521437..7290c127d7e7 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -29,7 +29,6 @@ namespace textconversiondlgs { - /** */ class ChineseDictionaryDialog; diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index cef93f16b146..d69f682b8854 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -109,7 +109,6 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const } - void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 183164370308..32dca96a0de0 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -91,7 +91,6 @@ namespace svx } - class NamespaceIteratorImpl { private: @@ -116,7 +115,6 @@ namespace svx using namespace ::svx; - NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { mpPool = pPool; @@ -183,7 +181,6 @@ bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) } - NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ) : mpWhichIds( pWhichIds ), mpPool( pPool ) { diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 1067674f17ec..6ff4621b2635 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -242,7 +242,6 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) } - class SvxUnoXColorTable : public SvxUnoXPropertyTable { public: @@ -304,7 +303,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( } - class SvxUnoXLineEndTable : public SvxUnoXPropertyTable { public: @@ -377,7 +375,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceName } - class SvxUnoXDashTable : public SvxUnoXPropertyTable { public: @@ -458,7 +455,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( } - class SvxUnoXHatchTable : public SvxUnoXPropertyTable { public: @@ -534,7 +530,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( } - class SvxUnoXGradientTable : public SvxUnoXPropertyTable { public: @@ -622,7 +617,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNam } - class SvxUnoXBitmapTable : public SvxUnoXPropertyTable { public: diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index b28773d83738..4c9ffc8e937b 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -176,7 +176,6 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& } - static OUString GetCrashConfigDir() { @@ -196,7 +195,6 @@ static OUString GetCrashConfigDir() } - #if defined(WNT) #define LCKFILE "crashdat.lck" #else @@ -211,7 +209,6 @@ static OUString GetUnsentURL() } - static bool delete_pending_crash() { OUString aUnsentURL = GetUnsentURL(); diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 316887c22a70..9b3367d1ba65 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -87,8 +87,6 @@ public: }; - - class SvxTableShape : public SvxShape { protected: diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 4a3c961b14f6..d21db1a3ce6a 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -26,8 +26,6 @@ #include <svx/svdpool.hxx> - - using namespace ::osl; using namespace ::cppu; using namespace sdr::table; @@ -49,7 +47,6 @@ SvxTableShape::~SvxTableShape() throw() } - bool SvxTableShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index cc7ce2f0e6fc..e3c1c48bbde7 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -93,5 +93,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrMo } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index fc1b394851c8..2e565a428de4 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -92,5 +92,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( S } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 4d182766ea31..eed5c1c9425b 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -90,5 +90,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrM } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 29f5d6c78dc6..456ae108c559 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -735,5 +735,4 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 29355e1d1b81..aea0bd644884 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -437,5 +437,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( Sdr } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 704e2e8e6f93..ee6635a88b37 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -899,7 +899,6 @@ SvxUnoPropertyMapProvider& getSvxMapProvider() } - SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { for(sal_uInt16 i=0;i<SVXMAP_END; i++) @@ -916,7 +915,6 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() } - const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" ); @@ -1272,7 +1270,6 @@ static const sal_uInt16 SvxUnoColorNameResId[] = }; - bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception) { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't @@ -1368,7 +1365,6 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA } - comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw() { SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 26e18ae690f6..dc01e0f6c96d 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -153,7 +153,6 @@ void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno } - awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException, std::exception) { return SvxShape::getSize(); @@ -378,7 +377,6 @@ SvxShapeConnector::~SvxShapeConnector() throw() } - uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { @@ -441,7 +439,6 @@ void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw } - awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getSize(); @@ -455,7 +452,6 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) } - // XConnectorShape void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException, std::exception ) @@ -595,7 +591,6 @@ void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(u } - awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getSize(); @@ -1056,7 +1051,6 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c } - bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1165,7 +1159,6 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo } - bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, @@ -1241,8 +1234,6 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } - - void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1287,7 +1278,6 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() } - bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1330,7 +1320,6 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con } - bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1369,8 +1358,6 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } - - void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1657,7 +1644,6 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte } - SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CAPTION), getSvxMapProvider().GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -1678,14 +1664,12 @@ 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, std::exception) { @@ -1712,7 +1696,6 @@ void SAL_CALL SvxCustomShape::release() throw ( ) } - uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() throw (uno::RuntimeException, std::exception) { @@ -1822,7 +1805,6 @@ void SAL_CALL SvxCustomShape::setPosition( const awt::Point& Position ) throw(un } - awt::Size SAL_CALL SvxCustomShape::getSize() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getSize(); @@ -1836,8 +1818,6 @@ void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize ) } - - void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 09a7c6579f3b..9f5128f7789c 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -202,7 +202,6 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount() } - uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -243,7 +242,6 @@ sal_Bool SAL_CALL Svx3DSceneObject::hasElements() } - static bool ConvertHomogenMatrixToObject( E3dObject* pObject, const Any& rValue ) { drawing::HomogenMatrix m; @@ -415,7 +413,6 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte } - bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) throw (css::beans::UnknownPropertyException, @@ -539,7 +536,6 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem } - bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) @@ -608,7 +604,6 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() } - bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -654,7 +649,6 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt } - bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) @@ -806,7 +800,6 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& } - bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -920,7 +913,6 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() } - bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -957,7 +949,6 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI } - bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 23dc42862f19..ea4669fc8872 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -570,7 +570,6 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) } - SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -643,7 +642,6 @@ bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } - SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -716,7 +714,6 @@ bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } - SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -931,7 +928,6 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } - bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 58dbc2d09ff1..f341bf45a666 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -241,14 +241,12 @@ SvxShape::~SvxShape() throw() } - void SvxShape::TakeSdrObjectOwnership() { mpImpl->mbHasSdrObjectOwnership = true; } - bool SvxShape::HasSdrObjectOwnership() const { if ( !mpImpl->mbHasSdrObjectOwnership ) @@ -259,28 +257,24 @@ bool SvxShape::HasSdrObjectOwnership() const } - 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, std::exception) { if( mpImpl->mpMaster ) @@ -454,7 +448,6 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) } - void SvxShape::ChangeModel( SdrModel* pNewModel ) { DBG_TESTSOLARMUTEX(); @@ -488,7 +481,6 @@ void SvxShape::ChangeModel( SdrModel* pNewModel ) } - void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() { DBG_TESTSOLARMUTEX(); @@ -725,7 +717,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() } - uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() throw(uno::RuntimeException) { @@ -1004,7 +995,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() } - uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() throw (uno::RuntimeException, std::exception) { @@ -1099,7 +1089,6 @@ static bool svx_needLogicRectHack( SdrObject* pObj ) } - static Rectangle svx_getLogicRectHack( SdrObject* pObj ) { if(svx_needLogicRectHack(pObj)) @@ -1113,7 +1102,6 @@ static Rectangle svx_getLogicRectHack( SdrObject* pObj ) } - static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) { if(svx_needLogicRectHack(pObj)) @@ -1127,7 +1115,6 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) } - awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1248,7 +1235,6 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) } - // XNamed OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::exception) { @@ -1264,7 +1250,6 @@ OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::e } - void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1350,7 +1335,6 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) } - void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener ) throw(uno::RuntimeException, std::exception) { @@ -1358,7 +1342,6 @@ void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener } - void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) { mpImpl->maDisposeListeners.removeInterface(aListener); @@ -1367,7 +1350,6 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen // XPropertySet - Reference< beans::XPropertySetInfo > SAL_CALL SvxShape::getPropertySetInfo() throw(uno::RuntimeException, std::exception) { @@ -1388,7 +1370,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } - void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1396,7 +1377,6 @@ void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName } - void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1404,21 +1384,18 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN } - void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { 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, std::exception) { OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } - bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { SfxItemSet aSet( mpModel->GetItemPool(), (sal_uInt16)nWID, (sal_uInt16)nWID ); @@ -1437,7 +1414,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName } - bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) { // check if an item with the given name and which id is inside the models @@ -1568,7 +1544,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, } - bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ) { OUString aName = SvxUnogetInternalNameForItem((sal_Int16)nWID, rName); @@ -1619,7 +1594,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, } - void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -1747,7 +1721,6 @@ 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, std::exception) { @@ -1758,7 +1731,6 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) } - uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1817,7 +1789,6 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) } - // XMultiPropertySet void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { @@ -1879,7 +1850,6 @@ void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& } - void SvxShape::endSetPropertyValues() { mbIsMultiPropertyCall = false; @@ -1891,7 +1861,6 @@ void SvxShape::endSetPropertyValues() } - css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -1948,7 +1917,6 @@ void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUS } - uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const { DBG_TESTSOLARMUTEX(); @@ -2029,7 +1997,6 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE } - // XPropertyState beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) @@ -2555,7 +2522,6 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } - bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) @@ -2943,7 +2909,6 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } - bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) @@ -2974,7 +2939,6 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty } - bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) @@ -2995,7 +2959,6 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp } - uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { @@ -3012,7 +2975,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons } - void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { @@ -3045,7 +3007,6 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) } - uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -3134,8 +3095,6 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( } - - // XServiceInfo OUString SAL_CALL SvxShape::getImplementationName() @@ -3817,21 +3776,18 @@ void SAL_CALL SvxShape::setParent( const css::uno::Reference< css::uno::XInterfa } - /** 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 (css::uno::RuntimeException, std::exception) { @@ -3841,7 +3797,6 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException } - void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3854,7 +3809,6 @@ void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std } - void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3867,7 +3821,6 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, } - void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -3882,7 +3835,6 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::Runti } - sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3897,7 +3849,6 @@ sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeExcept } - /** since polygon shapes can change theire kind during editing, we have to recheck it here. Circle shapes also change theire kind, but theire all treated equal @@ -3968,7 +3919,6 @@ uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType ) } - uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -3980,7 +3930,6 @@ uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) } - void SAL_CALL SvxShapeText::acquire() throw() { SvxShape::acquire(); @@ -4036,7 +3985,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId() } - /** called from the XActionLockable interface methods on initial locking */ void SvxShapeText::lock() { @@ -4046,7 +3994,6 @@ void SvxShapeText::lock() } - /** called from the XActionLockable interface methods on final unlock */ void SvxShapeText::unlock() { @@ -4194,7 +4141,6 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th } - SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt ) { SvxShape* pSvxShape = SvxShape::getImplementation( xInt ); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index c776fa98f956..fcf13a7132d9 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -158,7 +158,6 @@ public: }; - SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText ) : maRefCount ( 0 ), mpObject ( pObject ), @@ -195,7 +194,6 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText } - SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ) : maRefCount ( 0 ), mpObject ( &rObject ), @@ -234,7 +232,6 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText } - SvxTextEditSourceImpl::~SvxTextEditSourceImpl() { DBG_ASSERT( !mbIsLocked, "text edit source was not unlocked before dispose!" ); @@ -245,7 +242,6 @@ SvxTextEditSourceImpl::~SvxTextEditSourceImpl() } - void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) { if( pNewRange ) @@ -254,7 +250,6 @@ void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) } - void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) { if( pOldRange ) @@ -262,17 +257,12 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) } - - - - void SAL_CALL SvxTextEditSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } - void SAL_CALL SvxTextEditSourceImpl::release() { if( ! osl_atomic_decrement( &maRefCount ) ) @@ -324,7 +314,6 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel ) } - void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // #i105988 keep reference to this object @@ -522,7 +511,6 @@ void SvxTextEditSourceImpl::dispose() } - void SvxTextEditSourceImpl::SetupOutliner() { // only for UAA edit source: setup outliner equivalently as in @@ -544,7 +532,6 @@ void SvxTextEditSourceImpl::SetupOutliner() } - void SvxTextEditSourceImpl::UpdateOutliner() { // only for UAA edit source: update outliner equivalently as in @@ -566,9 +553,6 @@ void SvxTextEditSourceImpl::UpdateOutliner() } - - - SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() { bool bCreated = false; @@ -704,7 +688,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() } - SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() { if( !mpTextForwarder && HasView() ) @@ -722,7 +705,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() } - SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() { if( mbDestroyed || mpObject == nullptr ) @@ -756,7 +738,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() } - SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder() { if( mpView->GetTextEditOutlinerView() && mpObject ) @@ -840,7 +821,6 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate } - void SvxTextEditSourceImpl::UpdateData() { // if we have a view and in edit mode, we're working with the @@ -1039,7 +1019,6 @@ SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& } - SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl ) { mpImpl = pImpl; diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 0986195da6ad..74623d32b5cd 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -92,5 +92,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstan } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index cb6c65df63b4..2b4e23d455d7 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star; namespace unogallery { - - GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObject& rObject ) : ::comphelper::PropertySetHelper( createPropertySetInfo() ), mpTheme( &rTheme ), @@ -60,7 +58,6 @@ GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObjec } - GalleryItem::~GalleryItem() throw() { @@ -69,14 +66,12 @@ GalleryItem::~GalleryItem() } - bool GalleryItem::isValid() const { return( mpTheme != nullptr ); } - uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -101,7 +96,6 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) } - uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -109,7 +103,6 @@ uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) } - void SAL_CALL GalleryItem::acquire() throw() { @@ -117,7 +110,6 @@ void SAL_CALL GalleryItem::acquire() } - void SAL_CALL GalleryItem::release() throw() { @@ -125,7 +117,6 @@ void SAL_CALL GalleryItem::release() } - OUString GalleryItem::getImplementationName_Static() throw() { @@ -133,7 +124,6 @@ OUString GalleryItem::getImplementationName_Static() } - uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() throw() { @@ -182,7 +172,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId() } - sal_Int8 SAL_CALL GalleryItem::getType() throw (uno::RuntimeException, std::exception) { @@ -212,7 +201,6 @@ sal_Int8 SAL_CALL GalleryItem::getType() } - ::comphelper::PropertySetInfo* GalleryItem::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -399,10 +387,6 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } - - - - void GalleryItem::implSetInvalid() { if( mpTheme ) @@ -413,8 +397,6 @@ void GalleryItem::implSetInvalid() } - - GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc ) throw() : SvxUnoDrawingModel( pDoc ) @@ -422,7 +404,6 @@ GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc ) } - GalleryDrawingModel::~GalleryDrawingModel() throw() { @@ -430,7 +411,6 @@ GalleryDrawingModel::~GalleryDrawingModel() } - UNO3_GETIMPLEMENTATION_IMPL( GalleryDrawingModel ); } diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index ddbc014a4122..cff54f697438 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -34,8 +34,6 @@ namespace unogallery { class GalleryTheme; } namespace unogallery { - - class GalleryItem : public ::cppu::OWeakAggObject, public css::lang::XServiceInfo, public css::lang::XTypeProvider, @@ -99,8 +97,6 @@ private: }; - - class GalleryDrawingModel : public SvxUnoDrawingModel { public: diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index fcd614a5b5ff..325721d0ed43 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -39,8 +39,6 @@ using namespace ::com::sun::star; namespace unogallery { - - GalleryTheme::GalleryTheme( const OUString& rThemeName ) { mpGallery = ::Gallery::GetGalleryInstance(); @@ -51,7 +49,6 @@ GalleryTheme::GalleryTheme( const OUString& rThemeName ) } - GalleryTheme::~GalleryTheme() { const SolarMutexGuard aGuard; @@ -70,7 +67,6 @@ GalleryTheme::~GalleryTheme() } - OUString GalleryTheme::getImplementationName_Static() throw() { @@ -78,7 +74,6 @@ OUString GalleryTheme::getImplementationName_Static() } - uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() throw() { @@ -126,7 +121,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() } - uno::Type SAL_CALL GalleryTheme::getElementType() throw (uno::RuntimeException, std::exception) { @@ -134,7 +128,6 @@ uno::Type SAL_CALL GalleryTheme::getElementType() } - sal_Bool SAL_CALL GalleryTheme::hasElements() throw (uno::RuntimeException, std::exception) { @@ -144,7 +137,6 @@ sal_Bool SAL_CALL GalleryTheme::hasElements() } - sal_Int32 SAL_CALL GalleryTheme::getCount() throw (uno::RuntimeException, std::exception) { @@ -154,7 +146,6 @@ sal_Int32 SAL_CALL GalleryTheme::getCount() } - uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -180,7 +171,6 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) } - OUString SAL_CALL GalleryTheme::getName( ) throw (uno::RuntimeException, std::exception) { @@ -194,7 +184,6 @@ OUString SAL_CALL GalleryTheme::getName( ) } - void SAL_CALL GalleryTheme::update( ) throw (uno::RuntimeException, std::exception) { @@ -208,7 +197,6 @@ void SAL_CALL GalleryTheme::update( ) } - ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( const OUString& rURL, ::sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -241,7 +229,6 @@ void SAL_CALL GalleryTheme::update( ) } - ::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -269,7 +256,6 @@ void SAL_CALL GalleryTheme::update( ) } - ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex( const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -325,7 +311,6 @@ void SAL_CALL GalleryTheme::update( ) } - void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -341,7 +326,6 @@ void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) } - void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SolarMutexGuard aGuard; @@ -378,7 +362,6 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - void GalleryTheme::implReleaseItems( GalleryObject* pObj ) { const SolarMutexGuard aGuard; @@ -396,10 +379,6 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) } - - - - void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) { const SolarMutexGuard aGuard; @@ -409,7 +388,6 @@ void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) } - void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem ) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 8f92b0cf4b04..ca7fc3afdf73 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -35,8 +35,6 @@ namespace unogallery { class GalleryItem; } namespace unogallery { - - class GalleryTheme : public ::cppu::WeakImplHelper< css::gallery::XGalleryTheme, css::lang::XServiceInfo >, diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index ed6ad415cd71..b21978ae047c 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -108,7 +108,6 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& } - uno::Type SAL_CALL GalleryThemeProvider::getElementType() throw (uno::RuntimeException, std::exception) { @@ -116,7 +115,6 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType() } - sal_Bool SAL_CALL GalleryThemeProvider::hasElements() throw (uno::RuntimeException, std::exception) { @@ -126,7 +124,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() } - uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -146,7 +143,6 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) } - uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() throw (uno::RuntimeException, std::exception) { @@ -168,7 +164,6 @@ uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() } - sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) throw (uno::RuntimeException, std::exception) { @@ -183,7 +178,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) } - uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException, std::exception) { @@ -206,7 +200,6 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe } - void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception) { diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 990afadfc434..dfd84e36f47b 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::lang; #define XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE "vnd.sun.star.GraphicObject:" - class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream> { ::osl::Mutex maMutex; diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index f1c7b8311ae8..c83c7b613978 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -176,7 +176,6 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr xTargetModel->lockControllers(); - pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ ); xGraphicResolver = pGraphicHelper; @@ -190,7 +189,6 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr } - if( 0 == nRet ) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index b0bf41d663aa..27d2b1a810c7 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -142,7 +142,6 @@ private: }; - SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileName, @@ -422,13 +421,11 @@ void SvxXMLXTableExportComponent::_ExportMasterStyles() {} void SvxXMLXTableExportComponent::_ExportContent() {} - SvxXMLTableEntryExporter::~SvxXMLTableEntryExporter() { } - SvxXMLColorEntryExporter::SvxXMLColorEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ) { @@ -453,7 +450,6 @@ void SvxXMLColorEntryExporter::exportEntry( const OUString& rStrName, const Any& } - SvxXMLLineEndEntryExporter::SvxXMLLineEndEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maMarkerStyle( rExport ) { @@ -469,7 +465,6 @@ void SvxXMLLineEndEntryExporter::exportEntry( const OUString& rStrName, const An } - SvxXMLDashEntryExporter::SvxXMLDashEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maDashStyle( rExport ) { @@ -485,7 +480,6 @@ void SvxXMLDashEntryExporter::exportEntry( const OUString& rStrName, const Any& } - SvxXMLHatchEntryExporter::SvxXMLHatchEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maHatchStyle( rExport ) { @@ -501,7 +495,6 @@ void SvxXMLHatchEntryExporter::exportEntry( const OUString& rStrName, const Any& } - SvxXMLGradientEntryExporter::SvxXMLGradientEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maGradientStyle( rExport ) { @@ -517,7 +510,6 @@ void SvxXMLGradientEntryExporter::exportEntry( const OUString& rStrName, const A } - SvxXMLBitmapEntryExporter::SvxXMLBitmapEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ) { diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index db53d1e07b9b..0183888ac50f 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -74,11 +74,9 @@ sal_Char const sXML_np__ooo[] = "__ooo"; sal_Char const sXML_np__xlink[] = "__xlink"; - enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, stice_dash, stice_hatch, stice_gradient, stice_bitmap }; - class SvxXMLTableImportContext : public SvXMLImportContext { public: @@ -103,7 +101,6 @@ private: }; - SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ), mbOOoFormat( bOOoFormat ) @@ -322,7 +319,6 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r } - SvxXMLXTableImport::SvxXMLXTableImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, const uno::Reference< XNameContainer > & rTable, diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 16b93cc2b5f5..3e80ccec62dc 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3519,7 +3519,6 @@ SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) } - /// fill attribute set item XFillAttrSetItem::XFillAttrSetItem( SfxItemSet* pItemSet ) : SfxSetItem( XATTRSET_FILL, pItemSet) |