diff options
Diffstat (limited to 'svx/source')
204 files changed, 1512 insertions, 1585 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index a6cb01783966..a9215eb20c0c 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -125,7 +125,7 @@ AccessibleControlShape::AccessibleControlShape ( osl_atomic_decrement( &m_refCount ); } -AccessibleControlShape::~AccessibleControlShape (void) +AccessibleControlShape::~AccessibleControlShape() { m_pChildManager->release(); m_pChildManager = NULL; @@ -279,12 +279,12 @@ void AccessibleControlShape::Init() } } -Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext() throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::grabFocus() throw (RuntimeException, std::exception) { if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) ) { @@ -300,12 +300,12 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, } } -OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleControlShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } -OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeException) { OUString sName; @@ -329,7 +329,7 @@ OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeEx OUString - AccessibleControlShape::CreateAccessibleDescription (void) + AccessibleControlShape::CreateAccessibleDescription() throw (RuntimeException) { DescriptionGenerator aDG (mxShape); @@ -608,7 +608,7 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib return xSet; } -OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleName() throw (RuntimeException) { ensureControlModelAccess(); @@ -640,7 +640,7 @@ OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeExcep return sName; } -void SAL_CALL AccessibleControlShape::disposing (void) +void SAL_CALL AccessibleControlShape::disposing() { // ensure we're not listening m_bListeningForName = ensureListeningState( m_bListeningForName, false, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) ); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index bd39f4b4975c..a688a8a0995f 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -41,12 +41,12 @@ AccessibleGraphicShape::AccessibleGraphicShape ( -AccessibleGraphicShape::~AccessibleGraphicShape (void) +AccessibleGraphicShape::~AccessibleGraphicShape() { } // XAccessibleImage -OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) +OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_pShape) @@ -57,7 +57,7 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) -sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) +sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Height; @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) -sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth (void) +sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Width; @@ -87,7 +87,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleGraphicShape::acquire (void) + AccessibleGraphicShape::acquire() throw () { AccessibleShape::acquire (); @@ -96,7 +96,7 @@ void SAL_CALL void SAL_CALL - AccessibleGraphicShape::release (void) + AccessibleGraphicShape::release() throw () { AccessibleShape::release (); @@ -104,7 +104,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL - AccessibleGraphicShape::getImplementationName (void) + AccessibleGraphicShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleGraphicShape"); @@ -114,7 +114,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleGraphicShape::getSupportedServiceNames (void) + AccessibleGraphicShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -132,7 +132,7 @@ OUString SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleGraphicShape::getTypes (void) + AccessibleGraphicShape::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... @@ -152,7 +152,7 @@ uno::Sequence<uno::Type> SAL_CALL /// Create the base name of this object, i.e. the name without appended number. OUString - AccessibleGraphicShape::CreateAccessibleBaseName (void) + AccessibleGraphicShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -174,7 +174,7 @@ OUString return sName; } -OUString AccessibleGraphicShape::CreateAccessibleDescription (void) +OUString AccessibleGraphicShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { //Don't use the same information for accessible name and accessible description. @@ -187,7 +187,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription (void) } // Return this object's role. -sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 9e5c27f80b20..3c4bbac8387a 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -41,12 +41,12 @@ AccessibleOLEShape::AccessibleOLEShape ( -AccessibleOLEShape::~AccessibleOLEShape (void) +AccessibleOLEShape::~AccessibleOLEShape() { } // XAccessibleAction -sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount (void) +sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { return 0; @@ -96,7 +96,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleOLEShape::acquire (void) + AccessibleOLEShape::acquire() throw () { AccessibleShape::acquire (); @@ -105,7 +105,7 @@ void SAL_CALL void SAL_CALL - AccessibleOLEShape::release (void) + AccessibleOLEShape::release() throw () { AccessibleShape::release (); @@ -113,7 +113,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL - AccessibleOLEShape::getImplementationName (void) + AccessibleOLEShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOLEShape"); @@ -123,7 +123,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleOLEShape::getSupportedServiceNames (void) + AccessibleOLEShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -141,7 +141,7 @@ OUString SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleOLEShape::getTypes (void) + AccessibleOLEShape::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... @@ -173,7 +173,7 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() /// Set this object's name if is different to the current name. OUString - AccessibleOLEShape::CreateAccessibleBaseName (void) + AccessibleOLEShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -207,7 +207,7 @@ OUString OUString - AccessibleOLEShape::CreateAccessibleDescription (void) + AccessibleOLEShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { return CreateAccessibleName (); diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 45ce17b92747..2f9c3741a50e 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -114,7 +114,7 @@ AccessibleShape::AccessibleShape ( UpdateNameAndDescription(); } -AccessibleShape::~AccessibleShape (void) +AccessibleShape::~AccessibleShape() { delete mpChildrenManager; delete mpText; @@ -125,7 +125,7 @@ AccessibleShape::~AccessibleShape (void) // broadcasters would still hold a strong reference to this object. } -void AccessibleShape::Init (void) +void AccessibleShape::Init() { // Update the OPAQUE and SELECTED shape. UpdateStates (); @@ -194,7 +194,7 @@ void AccessibleShape::Init (void) -void AccessibleShape::UpdateStates (void) +void AccessibleShape::UpdateStates() { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); @@ -313,7 +313,7 @@ bool AccessibleShape::GetState (sal_Int16 aState) } // OverWrite the parent's getAccessibleName method -OUString SAL_CALL AccessibleShape::getAccessibleName (void) +OUString SAL_CALL AccessibleShape::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -323,7 +323,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleName (void) return CreateAccessibleName(); } -OUString SAL_CALL AccessibleShape::getAccessibleDescription (void) +OUString SAL_CALL AccessibleShape::getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -391,7 +391,7 @@ uno::Reference<XAccessible> SAL_CALL } uno::Reference<XAccessibleRelationSet> SAL_CALL - AccessibleShape::getAccessibleRelationSet (void) + AccessibleShape::getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -418,7 +418,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL VISIBLE */ uno::Reference<XAccessibleStateSet> SAL_CALL - AccessibleShape::getAccessibleStateSet (void) + AccessibleShape::getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -552,7 +552,7 @@ uno::Reference<XAccessible > SAL_CALL -awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) +awt::Rectangle SAL_CALL AccessibleShape::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -667,7 +667,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) -awt::Point SAL_CALL AccessibleShape::getLocation (void) +awt::Point SAL_CALL AccessibleShape::getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -678,7 +678,7 @@ awt::Point SAL_CALL AccessibleShape::getLocation (void) -awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -703,7 +703,7 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) -awt::Size SAL_CALL AccessibleShape::getSize (void) +awt::Size SAL_CALL AccessibleShape::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -714,7 +714,7 @@ awt::Size SAL_CALL AccessibleShape::getSize (void) -sal_Int32 SAL_CALL AccessibleShape::getForeground (void) +sal_Int32 SAL_CALL AccessibleShape::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -740,7 +740,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void) -sal_Int32 SAL_CALL AccessibleShape::getBackground (void) +sal_Int32 SAL_CALL AccessibleShape::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -833,7 +833,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleShape::acquire (void) + AccessibleShape::acquire() throw () { AccessibleContextBase::acquire (); @@ -843,7 +843,7 @@ void SAL_CALL void SAL_CALL - AccessibleShape::release (void) + AccessibleShape::release() throw () { AccessibleContextBase::release (); @@ -965,7 +965,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() // XServiceInfo OUString SAL_CALL - AccessibleShape::getImplementationName (void) + AccessibleShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleShape"); @@ -975,7 +975,7 @@ OUString SAL_CALL uno::Sequence<OUString> SAL_CALL - AccessibleShape::getSupportedServiceNames (void) + AccessibleShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -993,7 +993,7 @@ uno::Sequence<OUString> SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleShape::getTypes (void) + AccessibleShape::getTypes() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -1146,14 +1146,14 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, // protected internal // Set this object's name if is different to the current name. -OUString AccessibleShape::CreateAccessibleBaseName (void) +OUString AccessibleShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { return ShapeTypeHandler::CreateAccessibleBaseName( mxShape ); } -OUString AccessibleShape::CreateAccessibleName (void) +OUString AccessibleShape::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { return GetFullAccessibleName(this); @@ -1196,7 +1196,7 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) } OUString - AccessibleShape::CreateAccessibleDescription (void) + AccessibleShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { DescriptionGenerator aDG (mxShape); @@ -1266,7 +1266,7 @@ OUString // protected -void AccessibleShape::disposing (void) +void AccessibleShape::disposing() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -1311,7 +1311,7 @@ void AccessibleShape::disposing (void) } sal_Int32 SAL_CALL - AccessibleShape::getAccessibleIndexInParent (void) + AccessibleShape::getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -1326,7 +1326,7 @@ sal_Int32 SAL_CALL -void AccessibleShape::UpdateNameAndDescription (void) +void AccessibleShape::UpdateNameAndDescription() { // Ignore missing title, name, or description. There are fallbacks for // them. @@ -1359,7 +1359,7 @@ void AccessibleShape::UpdateNameAndDescription (void) } // Return this object's role. -sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ; diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index ef9f09c58d09..d2e324c80217 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -64,7 +64,7 @@ AccessibleShapeInfo::AccessibleShapeInfo (const AccessibleShapeInfo &rOther) } -AccessibleShapeInfo::~AccessibleShapeInfo (void) +AccessibleShapeInfo::~AccessibleShapeInfo() { // empty. } diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 39e5511b23e0..416dfa63a273 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -27,7 +27,7 @@ using ::com::sun::star::uno::Reference; namespace accessibility { -AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (void) +AccessibleShapeTreeInfo::AccessibleShapeTreeInfo() : mpView (NULL), mpWindow (NULL), mpViewForwarder (NULL) @@ -69,7 +69,7 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha -AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo (void) +AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() { //empty } @@ -84,26 +84,6 @@ void AccessibleShapeTreeInfo::SetDocumentWindow ( mxDocumentWindow = rxDocumentWindow; } - - - - - - - -void AccessibleShapeTreeInfo::SetControllerBroadcaster ( - const uno::Reference<document::XEventBroadcaster>& rxControllerBroadcaster) -{ - mxModelBroadcaster = rxControllerBroadcaster; -} - - - - - - - - void AccessibleShapeTreeInfo::SetModelBroadcaster ( const Reference<document::XEventBroadcaster>& rxModelBroadcaster) { diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 134f17ff1821..ada8b29df564 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -46,7 +46,7 @@ ChildrenManager::ChildrenManager ( -ChildrenManager::~ChildrenManager (void) +ChildrenManager::~ChildrenManager() { if (mpImpl != NULL) mpImpl->dispose(); @@ -55,7 +55,7 @@ ChildrenManager::~ChildrenManager (void) OSL_TRACE ("~ChildrenManager"); } -long ChildrenManager::GetChildCount (void) const throw () +long ChildrenManager::GetChildCount() const throw () { assert(mpImpl != NULL); return mpImpl->GetChildCount(); @@ -104,7 +104,7 @@ void ChildrenManager::AddAccessibleShape (css::uno::Reference<css::accessibility mpImpl->AddAccessibleShape (shape); } -void ChildrenManager::ClearAccessibleShapeList (void) +void ChildrenManager::ClearAccessibleShapeList() { assert(mpImpl != NULL); mpImpl->ClearAccessibleShapeList (); @@ -116,19 +116,19 @@ void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo) mpImpl->SetInfo (rShapeTreeInfo); } -void ChildrenManager::UpdateSelection (void) +void ChildrenManager::UpdateSelection() { assert(mpImpl != NULL); mpImpl->UpdateSelection (); } -bool ChildrenManager::HasFocus (void) +bool ChildrenManager::HasFocus() { assert(mpImpl != NULL); return mpImpl->HasFocus (); } -void ChildrenManager::RemoveFocus (void) +void ChildrenManager::RemoveFocus() { assert(mpImpl != NULL); mpImpl->RemoveFocus (); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 869c5dd4acfc..4cea26f20bf6 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -73,7 +73,7 @@ ChildrenManagerImpl::ChildrenManagerImpl ( -ChildrenManagerImpl::~ChildrenManagerImpl (void) +ChildrenManagerImpl::~ChildrenManagerImpl() { DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, "~AccessibleDrawDocumentView: object has not been disposed"); @@ -82,7 +82,7 @@ ChildrenManagerImpl::~ChildrenManagerImpl (void) -void ChildrenManagerImpl::Init (void) +void ChildrenManagerImpl::Init() { // Register as view::XSelectionChangeListener. Reference<frame::XController> xController(maShapeTreeInfo.GetController()); @@ -106,7 +106,7 @@ void ChildrenManagerImpl::Init (void) -long ChildrenManagerImpl::GetChildCount (void) const throw () +long ChildrenManagerImpl::GetChildCount() const throw () { return maVisibleChildren.size(); } @@ -558,7 +558,7 @@ void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibi -void ChildrenManagerImpl::ClearAccessibleShapeList (void) +void ChildrenManagerImpl::ClearAccessibleShapeList() { // Copy the list of (visible) shapes to local lists and clear the // originals. @@ -723,7 +723,7 @@ void SAL_CALL -void ChildrenManagerImpl::impl_dispose (void) +void ChildrenManagerImpl::impl_dispose() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); // Remove from broadcasters. @@ -768,7 +768,7 @@ void ChildrenManagerImpl::impl_dispose (void) -void SAL_CALL ChildrenManagerImpl::disposing (void) +void SAL_CALL ChildrenManagerImpl::disposing() { impl_dispose(); } @@ -886,7 +886,7 @@ uno::Reference<XAccessible> unfocused. If the controller's frame is not active then all shapes are unfocused. */ -void ChildrenManagerImpl::UpdateSelection (void) +void ChildrenManagerImpl::UpdateSelection() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); Reference<view::XSelectionSupplier> xSelectionSupplier ( @@ -1054,7 +1054,7 @@ void ChildrenManagerImpl::UpdateSelection (void) -bool ChildrenManagerImpl::HasFocus (void) +bool ChildrenManagerImpl::HasFocus() { return mpFocusedShape != NULL; } @@ -1062,7 +1062,7 @@ bool ChildrenManagerImpl::HasFocus (void) -void ChildrenManagerImpl::RemoveFocus (void) +void ChildrenManagerImpl::RemoveFocus() { if (mpFocusedShape != NULL) { @@ -1120,14 +1120,14 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap -ChildDescriptor::~ChildDescriptor (void) +ChildDescriptor::~ChildDescriptor() { } -AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const +AccessibleShape* ChildDescriptor::GetAccessibleShape() const { return static_cast<AccessibleShape*> (mxAccessibleShape.get()); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 93769e05f2e9..1e0ec534a98e 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -107,18 +107,18 @@ public: /** If there still are managed children these are disposed and released. */ - virtual ~ChildrenManagerImpl (void); + virtual ~ChildrenManagerImpl(); /** Do that part of the initialization that you can not or should not do in the constructor like registering at broadcasters. */ - void Init (void); + void Init(); /** Return the number of currently visible accessible children. @return If there are no children a 0 is returned. */ - long GetChildCount (void) const throw (); + long GetChildCount() const throw (); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> GetChildShape(long nIndex) @@ -214,7 +214,7 @@ public: /** Clear the lists of accessible shapes and that of visible accessible shapes. The list of UNO shapes is not modified. */ - void ClearAccessibleShapeList (void); + void ClearAccessibleShapeList(); /** Set a new event shape tree info. Call this method to inform the children manager of a change of the info bundle. @@ -227,7 +227,7 @@ public: according to the given selection. This includes setting <em>and</em> resetting the states. */ - void UpdateSelection (void); + void UpdateSelection(); /** Return whether one of the shapes managed by this object has currently the focus. @@ -235,13 +235,13 @@ public: Returns <true/> when there is a shape that has the focus and <false/> when there is no such shape. */ - bool HasFocus (void); + bool HasFocus(); /** When there is a shape that currently has the focus, i.e. <member>HasFocus()</member> returns <true/> then remove the focus from that shape. Otherwise nothing changes. */ - void RemoveFocus (void); + void RemoveFocus(); // lang::XEventListener virtual void SAL_CALL @@ -352,9 +352,9 @@ protected: /** This method is called from the component helper base class while disposing. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - void impl_dispose (void); + void impl_dispose(); private: /** Names of new accessible objects are disambiguated with this index. @@ -487,7 +487,7 @@ public: shape is empty or it can not be transformed into a pointer to the desired class. */ - AccessibleShape* GetAccessibleShape (void) const; + AccessibleShape* GetAccessibleShape() const; /** set the index _nIndex at the accessible shape @param _nIndex @@ -515,7 +515,7 @@ public: explicit ChildDescriptor (const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxAccessibleShape); - ~ChildDescriptor (void); + ~ChildDescriptor(); /** Dispose the accessible object of this descriptor. If that object does not exist then do nothing. diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 9b19877512b0..ebb3fe34f809 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -64,7 +64,7 @@ DescriptionGenerator::DescriptionGenerator ( -DescriptionGenerator::~DescriptionGenerator (void) +DescriptionGenerator::~DescriptionGenerator() { } @@ -202,7 +202,7 @@ void DescriptionGenerator::AppendString (const OUString& sString) -void DescriptionGenerator::AddLineProperties (void) +void DescriptionGenerator::AddLineProperties() { AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR); AddProperty ("LineDashName", DescriptionGenerator::STRING, @@ -216,7 +216,7 @@ void DescriptionGenerator::AddLineProperties (void) /** The fill style is described by the property "FillStyle". Depending on its value a hatch-, gradient-, or bitmap name is appended. */ -void DescriptionGenerator::AddFillProperties (void) +void DescriptionGenerator::AddFillProperties() { AddProperty ("FillStyle", DescriptionGenerator::FILL_STYLE, SIP_XA_FILLSTYLE); } @@ -224,7 +224,7 @@ void DescriptionGenerator::AddFillProperties (void) -void DescriptionGenerator::Add3DProperties (void) +void DescriptionGenerator::Add3DProperties() { AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR, RID_SVXSTR_A11Y_3D_MATERIAL_COLOR); @@ -235,7 +235,7 @@ void DescriptionGenerator::Add3DProperties (void) -void DescriptionGenerator::AddTextProperties (void) +void DescriptionGenerator::AddTextProperties() { AddProperty ("CharColor", DescriptionGenerator::COLOR); AddFillProperties (); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 238a351d99d0..85164cb10923 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -116,7 +116,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( maTreeInfo.SetSdrView( mpView ); maTreeInfo.SetWindow( mpControl ); - maTreeInfo.SetViewForwarder( const_cast<SvxGraphCtrlAccessibleContext*>(this) ); + maTreeInfo.SetViewForwarder( this ); } @@ -175,7 +175,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -264,7 +264,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept } // XAccessibleContext -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -327,14 +327,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. @@ -366,14 +366,14 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( vo -sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msDescription; @@ -381,7 +381,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msName; @@ -392,14 +392,14 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -424,7 +424,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce -lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -484,7 +484,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException mpControl->GrabFocus(); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { svtools::ColorConfig aColorConfig; @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -500,7 +500,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) } // XServiceInfo -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ); } @@ -510,7 +510,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aSNs( 3 ); @@ -522,13 +522,13 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService } // XTypeProvider -Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } // XServiceName -OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException, std::exception ) +OUString SvxGraphCtrlAccessibleContext::getServiceName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleContext" ); } @@ -725,7 +725,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -744,7 +744,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R between the absolute coordinates of the bounding boxes of this control and its parent in the accessibility tree. */ -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -816,14 +816,14 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } // IAccessibleViewforwarder -bool SvxGraphCtrlAccessibleContext::IsValid (void) const +bool SvxGraphCtrlAccessibleContext::IsValid() const { return true; } -Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const +Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const { Rectangle aVisArea; diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 44fa312551d5..2581573e4993 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -54,7 +54,7 @@ AccessibleShape* -ShapeTypeHandler& ShapeTypeHandler::Instance (void) +ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of // the shape type handler is instantiated. @@ -133,7 +133,7 @@ AccessibleShape* /** Create the single instance of this class and initialize its list of type descriptors with an entry of an unknown type. */ -ShapeTypeHandler::ShapeTypeHandler (void) +ShapeTypeHandler::ShapeTypeHandler() : maShapeTypeDescriptorList (1) { // Make sure that at least the UNKNOWN entry is present. @@ -147,7 +147,7 @@ ShapeTypeHandler::ShapeTypeHandler (void) -ShapeTypeHandler::~ShapeTypeHandler (void) +ShapeTypeHandler::~ShapeTypeHandler() { // Because this class is a singleton and the only instance, whose // destructor has just been called, is pointed to from instance, diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 1f1346a8e27e..261c7fd6527e 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -84,7 +84,7 @@ AccessibleShape* CreateSvxAccessibleShape ( } } -void RegisterDrawShapeTypes (void) +void RegisterDrawShapeTypes() { /** List of shape type descriptors corresponding to the <type>SvxShapeTypes</type> enum. diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index b52d8d8051f4..e3466fc11580 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -526,7 +526,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) OExternalLockGuard aGuard( this ); ensureAlive(); Sequence< sal_Int32 > aSel(1); - aSel[0] = m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()); + aSel[0] = SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()); return aSel; } @@ -535,7 +535,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( OExternalLockGuard aGuard( this ); ensureAlive(); Sequence< sal_Int32 > aSel(1); - aSel[0] = m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()); + aSel[0] = SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()); return aSel; } @@ -543,14 +543,14 @@ sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) t { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; + return SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; } sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; + return SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; } Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) @@ -590,14 +590,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); + return SvxShowCharSet::GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); + return SvxShowCharSet::GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 0498e6acac62..5357656db43b 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -583,7 +583,7 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild() } // XAccessible -uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -652,7 +652,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return 0; } @@ -663,29 +663,29 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessible throw lang::IndexOutOfBoundsException(); } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::CHECK_BOX; } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); @@ -694,12 +694,12 @@ OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( R /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -730,7 +730,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc return pStateSetHelper; } -lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -778,7 +778,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u } // XServiceInfo -OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxPixelCtlAccessibleChild" ) ); } @@ -788,7 +788,7 @@ sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& r return cppu::supportsService( this, rServiceName ); } -Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames() throw( RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); @@ -824,13 +824,13 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing() } } -void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -840,7 +840,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( Runt return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 0fd553d8aa68..2c87389ff5e2 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -181,7 +181,7 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext() } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -244,7 +244,7 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -291,12 +291,12 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil return xChild; } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -322,18 +322,18 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void return -1; } -sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription + " Please use arrow key to selection."; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -342,7 +342,7 @@ OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; @@ -369,7 +369,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -393,7 +393,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -469,7 +469,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) } // XServiceInfo -OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } @@ -479,14 +479,14 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -683,7 +683,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() } } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -693,7 +693,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( Run return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() ); } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -703,7 +703,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeExce return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() ); } -void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); @@ -746,7 +746,7 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext() } // XAccessible -Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -810,7 +810,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return 0; } @@ -820,28 +820,28 @@ Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibl throw lang::IndexOutOfBoundsException(); } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::RADIO_BUTTON; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -850,7 +850,7 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) th /** Return empty reference to indicate that the relation set is not supported. */ -Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; @@ -865,7 +865,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -891,7 +891,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); if( mxParent.is() ) @@ -1022,7 +1022,7 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib } // XServiceInfo -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } @@ -1032,14 +1032,14 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUStr return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -1069,13 +1069,13 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing() } } -void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1085,7 +1085,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen( void ) throw return Rectangle( mrParentWindow.OutputToScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index d0f99093ebd9..bb15fca328a3 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -113,9 +113,8 @@ void ExternalToolEdit::Edit(GraphicObject const*const pGraphicObject) OUString aTempFileBase; OUString aTempFileName; - oslFileHandle pHandle; osl::FileBase::RC rc = - osl::FileBase::createTempFile(0, &pHandle, &aTempFileBase); + osl::FileBase::createTempFile(nullptr, nullptr, &aTempFileBase); if (osl::FileBase::E_None != rc) { SAL_WARN("svx", "ExternalToolEdit::Edit: cannot create temp file"); diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 04df8dddad1f..7f580d80ffe2 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -43,11 +43,11 @@ SpellDialogChildWindow::SpellDialogChildWindow ( SetHideNotDelete(true); } -SpellDialogChildWindow::~SpellDialogChildWindow (void) +SpellDialogChildWindow::~SpellDialogChildWindow() { } -SfxBindings& SpellDialogChildWindow::GetBindings (void) const +SfxBindings& SpellDialogChildWindow::GetBindings() const { OSL_ASSERT (m_pAbstractSpellDialog != NULL); return m_pAbstractSpellDialog->GetBindings(); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 52b9cd191d1f..8588f9862428 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -25,8 +25,6 @@ #include <sfx2/dispatch.hxx> #include <svtools/colrdlg.hxx> -#define BMPMASK_PRIVATE - #include <svx/dialmgr.hxx> #include <svx/bmpmask.hxx> #include <svx/dialogs.hrc> @@ -1150,7 +1148,7 @@ bool SvxBmpMask::IsEyedropping() const /** Set an accessible name for the source color check boxes. Without this the lengthy description is read. */ -void SvxBmpMask::SetAccessibleNames (void) +void SvxBmpMask::SetAccessibleNames() { OUString sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString()); OUString sSourceColorN; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index bc295383b0fc..1d4799c7cc07 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -327,7 +327,7 @@ bool SvxSuperContourDlg::Close() bRet = false; } - return( bRet ? SfxFloatingWindow::Close() : sal_False ); + return bRet && SfxFloatingWindow::Close(); } // Enabled or disabled all Controls diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 60cfe9d7ce16..9071e536139a 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -196,21 +196,21 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) -sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const +sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) { return _nPos / COLUMN_COUNT ; } -sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const +sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) { return _nPos % COLUMN_COUNT ; } -int SvxShowCharSet::FirstInView( void ) const +int SvxShowCharSet::FirstInView() const { int nIndex = 0; if( aVscrollSB->IsVisible() ) @@ -220,7 +220,7 @@ int SvxShowCharSet::FirstInView( void ) const -int SvxShowCharSet::LastInView( void ) const +int SvxShowCharSet::LastInView() const { sal_uIntPtr nIndex = FirstInView(); nIndex += ROW_COUNT * COLUMN_COUNT - 1; diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 3b35c5a29a45..53fc5635c587 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -37,8 +37,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; -#include <stdio.h> - CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ) : ModalDialog ( pParent, "CompressGraphicDialog", "svx/ui/compressgraphicdialog.ui" ), m_pGraphicObj ( pGraphicObj ), diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 432f7b91aba7..68c78423c9e6 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -27,6 +27,21 @@ #define CONT_RESID(nId) ResId( nId, DIALOG_MGR() ) +class SvxSuperContourDlg; + +class SvxContourDlgItem : public SfxControllerItem +{ + SvxSuperContourDlg& rDlg; + +protected: + + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + +public: + + SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); +}; + class SvxSuperContourDlg : public SvxContourDlg { using SvxContourDlg::GetPolyPolygon; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 14a00184fab7..40973ace77b5 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -341,7 +341,7 @@ SvTreeListEntry* SvxRedlinTable::CreateEntry() const void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind) { - if (nTreeFlags & TREEFLAG_CHKBTN) + if (nTreeFlags & SvTreeFlags::CHKBTN) { pEntry->AddItem(new SvLBoxButton(pEntry, eButtonKind, 0, pCheckButtonData)); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 92d1cdbcd732..5ab4213297ce 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::accessibility; // Control for display and selection of the corner points and // mid point of an object -Bitmap& SvxRectCtl::GetRectBitmap( void ) +Bitmap& SvxRectCtl::GetRectBitmap() { if( !pBitmap ) InitRectBitmap(); @@ -168,7 +168,7 @@ void SvxRectCtl::Resize_Impl() } -void SvxRectCtl::InitRectBitmap( void ) +void SvxRectCtl::InitRectBitmap() { delete pBitmap; @@ -681,12 +681,12 @@ void SvxRectCtl::SetState( CTL_STATE nState ) static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP); } -sal_uInt8 SvxRectCtl::GetNumOfChildren( void ) const +sal_uInt8 SvxRectCtl::GetNumOfChildren() const { return ( eCS == CS_ANGLE )? 8 : 9; } -Rectangle SvxRectCtl::CalculateFocusRectangle( void ) const +Rectangle SvxRectCtl::CalculateFocusRectangle() const { Size aDstBtnSize( PixelToLogic( Size( 15, 15 ) ) ); return Rectangle( aPtNew - Point( aDstBtnSize.Width() >> 1, aDstBtnSize.Height() >> 1 ), aDstBtnSize ); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 10da7e2ef5f9..feb6a20466fc 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -844,7 +844,7 @@ void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) -void SvxFontPrevWindow::AutoCorrectFontColor( void ) +void SvxFontPrevWindow::AutoCorrectFontColor() { Color aFontColor( GetTextColor() ); diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 5ae4c21b651d..d36bc4291d44 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -136,7 +136,7 @@ void SvxFontListBox::InitEntry( { if( mbUseFont ) { - if( nTreeFlags & TREEFLAG_CHKBTN ) + if( nTreeFlags & SvTreeFlags::CHKBTN ) pEntry->AddItem( new SvLBoxButton( pEntry, eButtonKind, 0, pCheckButtonData ) ); pEntry->AddItem( new SvLBoxContextBmp(pEntry, 0, rCollImg, rExpImg, true) ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index de077863ae0b..9802a4427311 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -1058,7 +1058,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) RangeHdl( 0 ); } -int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index eed946a4d865..1d606ce45a72 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -265,7 +265,7 @@ bool SvxIMapDlg::Close() bRet = false; } - return( bRet ? SfxModelessDialog::Close() : sal_False ); + return bRet && SfxModelessDialog::Close(); } // Enabled or disable all Controls diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 06f7ed005389..1b7fed9b042f 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -455,7 +455,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const return pObj; } -IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const +IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) { IMapObject* pIMapObj = NULL; diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 9969c564dda2..4209190be843 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -125,7 +125,7 @@ protected: void ClearTargetList(); SdrObject* CreateObj( const IMapObject* pIMapObj ); - IMapObject* GetIMapObj( const SdrObject* pSdrObj ) const; + static IMapObject* GetIMapObj( const SdrObject* pSdrObj ); SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; void UpdateInfo( bool bNewObj ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 403f03eaabd4..f9527185afd8 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -269,13 +269,13 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList, ((nLangList & LANG_LIST_ALL) != 0 || ((nLangList & LANG_LIST_WESTERN) != 0 && (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == - SCRIPTTYPE_LATIN)) || + SvtScriptType::LATIN)) || ((nLangList & LANG_LIST_CTL) != 0 && (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == - SCRIPTTYPE_COMPLEX)) || + SvtScriptType::COMPLEX)) || ((nLangList & LANG_LIST_CJK) != 0 && (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == - SCRIPTTYPE_ASIAN)) || + SvtScriptType::ASIAN)) || ((nLangList & LANG_LIST_FBD_CHARS) != 0 && MsLangId::hasForbiddenCharacters(nLangType)) || ((nLangList & LANG_LIST_SPELL_AVAIL) != 0 && @@ -347,8 +347,8 @@ sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType, if ( xSpell.is() ) m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() ); } - bFound = m_pSpellUsedLang ? - lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : false; + bFound = m_pSpellUsedLang && + lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ); nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound ); } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index c11ebb0169e3..c82ac45ded8e 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -305,7 +305,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) } -int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index d87ddabb5826..4822c1be155f 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -62,14 +62,14 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_ATTR_LONG_LRSPACE: { const SvxLongLRSpaceItem *pItem = PTR_CAST(SvxLongLRSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxLRSpaceItem expected"); rRuler.UpdateFrame(pItem); break; } case SID_ATTR_LONG_ULSPACE: { const SvxLongULSpaceItem *pItem = PTR_CAST(SvxLongULSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxULSpaceItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxULSpaceItem expected"); rRuler.UpdateFrame(pItem); break; } @@ -77,7 +77,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_ATTR_TABSTOP: { const SvxTabStopItem *pItem = PTR_CAST(SvxTabStopItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxTabStopItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxTabStopItem expected"); rRuler.Update(pItem); break; } @@ -85,7 +85,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_ATTR_PARA_LRSPACE: { const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxLRSpaceItem expected"); rRuler.UpdatePara(pItem); break; } @@ -95,7 +95,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_RULER_ROWS_VERTICAL: { const SvxColumnItem *pItem = PTR_CAST(SvxColumnItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxColumnItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxColumnItem expected"); #ifdef DBG_UTIL if(pItem) { @@ -114,35 +114,35 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, case SID_RULER_PAGE_POS: { // Position page, page width const SvxPagePosSizeItem *pItem = PTR_CAST(SvxPagePosSizeItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxPagePosSizeItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxPagePosSizeItem expected"); rRuler.Update(pItem); break; } case SID_RULER_OBJECT: { // Object selection const SvxObjectItem *pItem = PTR_CAST(SvxObjectItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxObjectItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxObjectItem expected"); rRuler.Update(pItem); break; } case SID_RULER_PROTECT: { const SvxProtectItem *pItem = PTR_CAST(SvxProtectItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxProtectItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxProtectItem expected"); rRuler.Update(pItem); break; } case SID_RULER_BORDER_DISTANCE: { const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxLRSpaceItem expected"); rRuler.UpdateParaBorder(pItem); } break; case SID_RULER_TEXT_RIGHT_TO_LEFT : { const SfxBoolItem *pItem = PTR_CAST(SfxBoolItem, pState); - DBG_ASSERT(pState? 0 != pItem: true, "SfxBoolItem expected"); + DBG_ASSERT(pState == nullptr || pItem != nullptr, "SfxBoolItem expected"); rRuler.UpdateTextRTL(pItem); } break; diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 301959fb8e4e..29d0ae7c9e39 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -744,7 +744,7 @@ void SvxRubyDialog::AssertOneEntry() -void SvxRubyDialog::UpdateColors( void ) +void SvxRubyDialog::UpdateColors() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); svtools::ColorConfig aColorConfig; diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index e26a85a8bff3..460ebad2a0d1 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -55,7 +55,7 @@ void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, else if ( SID_SEARCH_OPTIONS == nSID ) { DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" ); - sal_uInt16 nFlags = (sal_uInt16) static_cast<const SfxUInt16Item*>(pState)->GetValue(); + SearchOptionFlags nFlags = (SearchOptionFlags) static_cast<const SfxUInt16Item*>(pState)->GetValue(); rSrchDlg.EnableControls_Impl( nFlags ); } else if ( SID_SEARCH_ITEM == nSID ) @@ -65,7 +65,7 @@ void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, } } else if ( SID_SEARCH_OPTIONS == nSID || SID_SEARCH_ITEM == nSID ) - rSrchDlg.EnableControls_Impl( 0 ); + rSrchDlg.EnableControls_Impl( SearchOptionFlags::NONE ); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 9c5c98f6d535..7f022235614a 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -255,7 +255,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi , bWriter(false) , bSearch(true) , bFormat(false) - , nOptions(USHRT_MAX) + , nOptions(SearchOptionFlags::ALL) , bSet(false) , bReadOnly(false) , bConstruct(true) @@ -416,7 +416,7 @@ void SvxSearchDialog::Construct_Impl() pImpl->aSelectionTimer.SetTimeout( 500 ); pImpl->aSelectionTimer.SetTimeoutHdl( LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) ); - EnableControls_Impl( 0 ); + EnableControls_Impl( SearchOptionFlags::NONE ); // Store old Text from m_pWordBtn aCalcStr += "#"; @@ -813,23 +813,24 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) m_pColumnsBtn->SetClickHdl( aLink ); m_pAllSheetsCB->SetClickHdl( aLink ); + sal_uIntPtr nModifyFlagCheck(nModifyFlag); switch ( pSearchItem->GetCellType() ) { - case SVX_SEARCHIN_FORMULA: - if ( ( nModifyFlag & MODIFY_FORMULAS ) == 0 ) - m_pCalcSearchInLB->SelectEntryPos( SVX_SEARCHIN_FORMULA ); + case SvxSearchCellType::FORMULA: + nModifyFlagCheck = MODIFY_FORMULAS; break; - case SVX_SEARCHIN_VALUE: - if ( ( nModifyFlag & MODIFY_VALUES ) == 0 ) - m_pCalcSearchInLB->SelectEntryPos( SVX_SEARCHIN_VALUE ); + case SvxSearchCellType::VALUE: + nModifyFlagCheck = MODIFY_VALUES; break; - case SVX_SEARCHIN_NOTE: - if ( ( nModifyFlag & MODIFY_CALC_NOTES ) == 0 ) - m_pCalcSearchInLB->SelectEntryPos( SVX_SEARCHIN_NOTE ); + case SvxSearchCellType::NOTE: + nModifyFlagCheck = MODIFY_CALC_NOTES; break; } + if ( (nModifyFlag & nModifyFlagCheck) == 0 ) + m_pCalcSearchInLB->SelectEntryPos( static_cast<sal_Int32>(pSearchItem->GetCellType()) ); + m_pWordBtn->SetText( aCalcStr.getToken( 0, '#' ) ); if ( pSearchItem->GetRowDirection() && @@ -1283,7 +1284,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) if ( !bWriter ) { if ( m_pCalcSearchInLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) - pSearchItem->SetCellType( m_pCalcSearchInLB->GetSelectEntryPos() ); + pSearchItem->SetCellType( static_cast<SvxSearchCellType>(m_pCalcSearchInLB->GetSelectEntryPos()) ); pSearchItem->SetRowDirection( m_pRowsBtn->IsChecked() ); pSearchItem->SetAllTables( m_pAllSheetsCB->IsChecked() ); @@ -1591,14 +1592,14 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) -void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) +void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) { if ( nFlags == nOptions ) return; else nOptions = nFlags; - if ( !nOptions ) + if ( nOptions == SearchOptionFlags::NONE ) { if ( IsVisible() ) { @@ -1610,21 +1611,21 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) Show(); bool bNoSearch = true; - bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0; + bool bEnableSearch = bool( SearchOptionFlags::SEARCH & nOptions ); m_pSearchBtn->Enable(bEnableSearch); if( bEnableSearch ) bNoSearch = false; - if ( ( SEARCH_OPTIONS_SEARCH_ALL & nOptions ) != 0 ) + if ( ( SearchOptionFlags::SEARCHALL & nOptions ) ) { m_pSearchAllBtn->Enable(); bNoSearch = false; } else m_pSearchAllBtn->Disable(); - if ( ( SEARCH_OPTIONS_REPLACE & nOptions ) != 0 ) + if ( ( SearchOptionFlags::REPLACE & nOptions ) ) { m_pReplaceBtn->Enable(); m_pReplaceFrame->get_label_widget()->Enable(); @@ -1639,7 +1640,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) m_pReplaceLB->Disable(); m_pReplaceTmplLB->Disable(); } - if ( ( SEARCH_OPTIONS_REPLACE_ALL & nOptions ) != 0 ) + if ( ( SearchOptionFlags::REPLACE_ALL & nOptions ) ) { m_pReplaceAllBtn->Enable(); bNoSearch = false; @@ -1652,31 +1653,31 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) m_pSearchLB->Enable( !bNoSearch ); m_pNotesBtn->Enable(); - if ( ( SEARCH_OPTIONS_WHOLE_WORDS & nOptions ) != 0 ) + if ( ( SearchOptionFlags::WHOLE_WORDS & nOptions ) ) m_pWordBtn->Enable(); else m_pWordBtn->Disable(); - if ( ( SEARCH_OPTIONS_BACKWARDS & nOptions ) != 0 ) + if ( ( SearchOptionFlags::BACKWARDS & nOptions ) ) m_pBackwardsBtn->Enable(); else m_pBackwardsBtn->Disable(); - if ( ( SEARCH_OPTIONS_REG_EXP & nOptions ) != 0 ) + if ( ( SearchOptionFlags::REG_EXP & nOptions ) ) m_pRegExpBtn->Enable(); else m_pRegExpBtn->Disable(); - if ( ( SEARCH_OPTIONS_EXACT & nOptions ) != 0 ) + if ( ( SearchOptionFlags::EXACT & nOptions ) ) m_pMatchCaseCB->Enable(); else m_pMatchCaseCB->Disable(); - if ( ( SEARCH_OPTIONS_SELECTION & nOptions ) != 0 ) + if ( ( SearchOptionFlags::SELECTION & nOptions ) ) m_pSelectionBtn->Enable(); else m_pSelectionBtn->Disable(); - if ( ( SEARCH_OPTIONS_FAMILIES & nOptions ) != 0 ) + if ( ( SearchOptionFlags::FAMILIES & nOptions ) ) m_pLayoutBtn->Enable(); else m_pLayoutBtn->Disable(); - if ( ( SEARCH_OPTIONS_FORMAT & nOptions ) != 0 ) + if ( ( SearchOptionFlags::FORMAT & nOptions ) ) { m_pAttributeBtn->Enable(); m_pFormatBtn->Enable(); @@ -1689,7 +1690,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) m_pNoFormatBtn->Disable(); } - if ( ( SEARCH_OPTIONS_SIMILARITY & nOptions ) != 0 ) + if ( ( SearchOptionFlags::SIMILARITY & nOptions ) ) { m_pSimilarityBox->Enable(); m_pSimilarityBtn->Enable(); @@ -1709,35 +1710,35 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) { - if (m_pSearchBtn == pCtrl && ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0) + if (m_pSearchBtn == pCtrl && ( SearchOptionFlags::SEARCH & nOptions ) ) { m_pComponentFrame->Enable(); m_pSearchBtn->Enable(); return; } if ( m_pSearchAllBtn == pCtrl && - ( SEARCH_OPTIONS_SEARCH_ALL & nOptions ) != 0 ) + ( SearchOptionFlags::SEARCHALL & nOptions ) ) { m_pSearchAllBtn->Enable( true ); return; } - if ( m_pReplaceBtn == pCtrl && ( SEARCH_OPTIONS_REPLACE & nOptions ) != 0 ) + if ( m_pReplaceBtn == pCtrl && ( SearchOptionFlags::REPLACE & nOptions ) ) { m_pReplaceBtn->Enable(); return; } if ( m_pReplaceAllBtn == pCtrl && - ( SEARCH_OPTIONS_REPLACE_ALL & nOptions ) != 0 ) + ( SearchOptionFlags::REPLACE_ALL & nOptions ) ) { m_pReplaceAllBtn->Enable(); return; } - if ( m_pWordBtn == pCtrl && ( SEARCH_OPTIONS_WHOLE_WORDS & nOptions ) != 0 ) + if ( m_pWordBtn == pCtrl && ( SearchOptionFlags::WHOLE_WORDS & nOptions ) ) { m_pWordBtn->Enable(); return; } - if ( m_pBackwardsBtn == pCtrl && ( SEARCH_OPTIONS_BACKWARDS & nOptions ) != 0 ) + if ( m_pBackwardsBtn == pCtrl && ( SearchOptionFlags::BACKWARDS & nOptions ) ) { m_pBackwardsBtn->Enable(); return; @@ -1747,46 +1748,46 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) m_pNotesBtn->Enable(); return; } - if ( m_pRegExpBtn == pCtrl && ( SEARCH_OPTIONS_REG_EXP & nOptions ) != 0 + if ( m_pRegExpBtn == pCtrl && ( SearchOptionFlags::REG_EXP & nOptions ) && !m_pSimilarityBox->IsChecked()) { m_pRegExpBtn->Enable(); return; } - if ( m_pMatchCaseCB == pCtrl && ( SEARCH_OPTIONS_EXACT & nOptions ) != 0 ) + if ( m_pMatchCaseCB == pCtrl && ( SearchOptionFlags::EXACT & nOptions ) ) { if (!m_pJapOptionsCB->IsChecked()) m_pMatchCaseCB->Enable(); return; } - if ( m_pSelectionBtn == pCtrl && ( SEARCH_OPTIONS_SELECTION & nOptions ) != 0 ) + if ( m_pSelectionBtn == pCtrl && ( SearchOptionFlags::SELECTION & nOptions ) ) { m_pSelectionBtn->Enable(); return; } - if ( m_pLayoutBtn == pCtrl && ( SEARCH_OPTIONS_FAMILIES & nOptions ) != 0 ) + if ( m_pLayoutBtn == pCtrl && ( SearchOptionFlags::FAMILIES & nOptions ) ) { m_pLayoutBtn->Enable(); return; } if ( m_pAttributeBtn == pCtrl - && ( SEARCH_OPTIONS_FORMAT & nOptions ) != 0 + && ( SearchOptionFlags::FORMAT & nOptions ) && pSearchList ) { m_pAttributeBtn->Enable( pImpl->bFocusOnSearch ); } - if ( m_pFormatBtn == pCtrl && ( SEARCH_OPTIONS_FORMAT & nOptions ) != 0 ) + if ( m_pFormatBtn == pCtrl && ( SearchOptionFlags::FORMAT & nOptions ) ) { m_pFormatBtn->Enable(); return; } - if ( m_pNoFormatBtn == pCtrl && ( SEARCH_OPTIONS_FORMAT & nOptions ) != 0 ) + if ( m_pNoFormatBtn == pCtrl && ( SearchOptionFlags::FORMAT & nOptions ) ) { m_pNoFormatBtn->Enable(); return; } if ( m_pSimilarityBox == pCtrl && - ( SEARCH_OPTIONS_SIMILARITY & nOptions ) != 0 ) + ( SearchOptionFlags::SIMILARITY & nOptions ) ) { m_pSimilarityBox->Enable(); @@ -2232,7 +2233,7 @@ void SvxSearchDialog::SaveToModule_Impl() if ( !bWriter ) { if ( m_pCalcSearchInLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) - pSearchItem->SetCellType( m_pCalcSearchInLB->GetSelectEntryPos() ); + pSearchItem->SetCellType( static_cast<SvxSearchCellType>(m_pCalcSearchInLB->GetSelectEntryPos()) ); pSearchItem->SetRowDirection( m_pRowsBtn->IsChecked() ); pSearchItem->SetAllTables( m_pAllSheetsCB->IsChecked() ); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 94ccd8cfc576..7eed4e891f07 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -514,7 +514,9 @@ void SvxRuler::UpdateFrame() lLogicNullOffset = mxColumnItem.get() ? mxColumnItem->GetLeft(): mxLRSpaceItem->GetLeft(); if(bAppSetNullOffset) + { lAppNullOffset += lLogicNullOffset - nOld; + } if(!bAppSetNullOffset || lAppNullOffset == LONG_MAX) { @@ -547,7 +549,9 @@ void SvxRuler::UpdateFrame() lLogicNullOffset = mxColumnItem.get() ? mxColumnItem->GetLeft() : mxULSpaceItem->GetUpper(); if(bAppSetNullOffset) + { lAppNullOffset += lLogicNullOffset - nOld; + } if(!bAppSetNullOffset || lAppNullOffset == LONG_MAX) { @@ -1034,6 +1038,8 @@ void SvxRuler::Update(const SvxPagePosSizeItem *pItem) // new value of page attr void SvxRuler::SetDefTabDist(long inDefTabDist) // New distance for DefaultTabs in App-Metrics { + if (lAppNullOffset == LONG_MAX) + UpdateFrame(); // hack: try to get lAppNullOffset initialized /* New distance is set for DefaultTabs */ lDefTabDist = inDefTabDist; UpdateTabs(); @@ -2058,7 +2064,9 @@ void SvxRuler::ApplyMargins() } if(bAppSetNullOffset) + { lAppNullOffset += lLogicNullOffset - lOldNull; + } long nRight; if(mxRulerImpl->lMaxRightLogic != -1 @@ -2092,7 +2100,9 @@ void SvxRuler::ApplyMargins() ConvertVPosLogic(GetFrameLeft()) - lAppNullOffset, mxULSpaceItem->GetUpper())); if(bAppSetNullOffset) + { lAppNullOffset += lLogicNullOffset - lOldNull; + } mxULSpaceItem->SetLower( PixelVAdjust( std::max((long)0, mxPagePosItem->GetHeight() - @@ -2350,7 +2360,7 @@ void SvxRuler::ApplyBorders() #endif // DEBUGLIN SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY, - nDragType & DRAG_OBJECT_ACTLINE_ONLY ? sal_True : sal_False); + (nDragType & DRAG_OBJECT_ACTLINE_ONLY) != 0); sal_uInt16 nColId = mxRulerImpl->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) : (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL); @@ -2628,7 +2638,7 @@ void SvxRuler::Click() bool SvxRuler::CalcLimits ( long& nMax1, // minimum value to be set long& nMax2, // minimum value to be set - bool ) const + bool ) { /* Default implementation of the virtual function; the application can be @@ -3023,7 +3033,7 @@ void SvxRuler::CalcMinMax() { if(mxObjectItem->HasLimits()) { - if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True)) + if(CalcLimits(nMaxLeft, nMaxRight, (nIdx & 1) == 0)) { nMaxLeft = ConvertPosPixel(nMaxLeft); nMaxRight = ConvertPosPixel(nMaxRight); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 4cc31515198a..964899b8c45a 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -62,7 +62,7 @@ Size SvxSwFrameExample::GetOptimalSize() const return LogicToPixel(Size(52, 86), MapMode(MAP_APPFONT)); } -void SvxSwFrameExample::InitColors_Impl( void ) +void SvxSwFrameExample::InitColors_Impl() { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); m_aBgCol = Color( rSettings.GetWindowColor() ); @@ -685,7 +685,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor); // Frame View - bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans; + bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) || bTrans; DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor ); } diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 1b43822bd566..bc16ac104620 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -144,9 +144,8 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( #else rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(rtl_TextEncodingInfo); - svxform::ODataAccessCharsetHelper aCSH; ::std::vector< rtl_TextEncoding > aEncs; - sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs ); + sal_Int32 nCount = svxform::charset_helper::getSupportedTextEncodings( aEncs ); for ( sal_Int32 j=0; j<nCount; j++ ) { bool bInsert = true; diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 9805fb54e589..2876b4d0b6b9 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -380,14 +380,7 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj) void E3dScene::StructureChanged() { E3dObject::StructureChanged(); - - if(!GetModel() || !GetModel()->isLocked()) - { - // #i123539# optimization for 3D chart object generation: do not reset - // already calculated scene projection data every time an object gets - // initialized - SetRectsDirty(); - } + SetRectsDirty(); ImpCleanup3DDepthMapper(); } diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index f59c25c5cd88..743b60d41a12 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -67,7 +67,7 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint() // Calculate View transformations matrix -void Viewport3D::MakeTransform(void) +void Viewport3D::MakeTransform() { if ( !bTfValid ) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index bd8baf20b71c..0d90129f74d8 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -86,6 +86,7 @@ using namespace ::com::sun::star::container; using namespace ::cppu; using namespace ::svxform; using namespace ::svx; +using namespace ::dbtools; OUString FieldServiceFromId(sal_Int32 nID) { @@ -281,7 +282,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) try { OUString sSignificantSource( sDatasource.isEmpty() ? sDatabaseLocation : sDatasource ); - xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(), OUString(), + xConnection = getConnection_withFeedback(sSignificantSource, OUString(), OUString(), static_cast<FmGridControl*>(GetParent())->getContext() ); } catch(NoSuchElementException&) @@ -393,7 +394,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) try { // need number formats - Reference< XNumberFormatsSupplier > xSupplier = OStaticDataAccessTools().getNumberFormats(xConnection, true); + Reference< XNumberFormatsSupplier > xSupplier = getNumberFormats(xConnection, true); Reference< XNumberFormats > xNumberFormats; if (xSupplier.is()) xNumberFormats = xSupplier->getNumberFormats(); @@ -548,7 +549,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) FormControlFactory aControlFactory; aControlFactory.initializeControlModel( DocumentClassification::classifyHostDocument( xCols ), xCol ); - aControlFactory.initializeFieldDependentProperties( xField, xCol, xNumberFormats ); + FormControlFactory::initializeFieldDependentProperties( xField, xCol, xNumberFormats ); xCol->setPropertyValue(FM_PROP_CONTROLSOURCE, makeAny(sFieldName)); if ( xSecondCol.is() ) @@ -919,7 +920,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe // ein paar Properties hinueberretten Reference< XPropertySet > xReplaced( xCols->getByIndex( nPos ), UNO_QUERY ); - OStaticDataAccessTools().TransferFormComponentProperties( + TransferFormComponentProperties( xReplaced, xNewCol, Application::GetSettings().GetUILanguageTag().getLocale() ); xCols->replaceByIndex( nPos, makeAny( xNewCol ) ); @@ -961,7 +962,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe if ( eInspectorAction != eNone ) { FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect ); - SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True ); + SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction != eCloseInspector ); pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON, &aIFaceItem, &aShowItem, 0L ); @@ -1431,14 +1432,14 @@ void FmGridControl::markColumn(sal_uInt16 nId) // deselektieren if (m_nMarkedColumnId != BROWSER_INVALIDID) { - HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HIB_FLAT; + HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HeaderBarItemBits::FLAT; GetHeaderBar()->SetItemBits(m_nMarkedColumnId, aBits); } if (nId != BROWSER_INVALIDID) { - HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(nId) | HIB_FLAT; + HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(nId) | HeaderBarItemBits::FLAT; GetHeaderBar()->SetItemBits(nId, aBits); } m_nMarkedColumnId = nId; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 938292bdf8c3..341b4f652012 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1012,29 +1012,6 @@ void FmXGridPeer::GridListenerDelegator::columnChanged() m_pPeer->columnChanged(); } -Sequence< Type> SAL_CALL FmXGridPeer::getTypes( ) throw(RuntimeException, std::exception) -{ - return comphelper::concatSequences( VCLXWindow::getTypes(), FmXGridPeer_BASE::getTypes() ); -} - - -Sequence<sal_Int8> SAL_CALL FmXGridPeer::getImplementationId( ) throw(RuntimeException, std::exception) -{ - return css::uno::Sequence<sal_Int8>(); -} - - -Any SAL_CALL FmXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) -{ - Any aReturn = FmXGridPeer_BASE::queryInterface(_rType); - - if (!aReturn.hasValue()) - aReturn = VCLXWindow::queryInterface( _rType ); - - return aReturn; -} - - void FmXGridPeer::selectionChanged() { EventObject aSource; @@ -1811,7 +1788,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep Reference< XIndexAccess > xColumnsByIndex( xColumnsByName, UNO_QUERY ); if ( xColumnsByIndex.is() ) - pGrid->InitColumnByField( pCol, xNewColumn, xColumnsByName, xColumnsByIndex ); + FmGridControl::InitColumnByField( pCol, xNewColumn, xColumnsByName, xColumnsByIndex ); else // the simple version, applies when the grid is not yet connected to a data source pCol->setModel(xNewColumn); @@ -2460,8 +2437,8 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn) void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception ) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); - sal_Int32 nOldFlags = pGrid->GetBrowserFlags(); - pGrid->SetBrowserFlags(nOldFlags | EBBF_NOROWPICTURE); + EditBrowseBoxFlags nOldFlags = pGrid->GetBrowserFlags(); + pGrid->SetBrowserFlags(nOldFlags | EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT); VCLXWindow::draw(x, y); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index f2fbe0abf589..07dca8d9beca 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -65,12 +65,12 @@ #include <vcl/settings.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> +#include <connectivity/sqlnode.hxx> #include <math.h> #include <stdio.h> using namespace ::connectivity; -using namespace ::connectivity::simple; using namespace ::svxform; using namespace ::comphelper; using namespace ::svt; @@ -1802,9 +1802,8 @@ OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::X if ( !rpFormatter.get() ) { - DBToolsObjectFactory aFactory; - rpFormatter = aFactory.createFormattedColumnValue( - m_xContext, getCursor(), Reference< XPropertySet >( _rxField, UNO_QUERY ) ); + rpFormatter = ::std::unique_ptr< FormattedColumnValue> ( + new FormattedColumnValue(m_xContext, getCursor(), Reference< XPropertySet >( _rxField, UNO_QUERY ) ) ); OSL_ENSURE( rpFormatter.get(), "DbPatternField::Init: no value formatter!" ); } else @@ -2909,8 +2908,8 @@ bool DbFilterField::commitControl() OUString aErrorMsg; Reference< XNumberFormatter > xNumberFormatter(m_rColumn.GetParent().getNumberFormatter()); - ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(aErrorMsg, aNewText,xNumberFormatter, m_rColumn.GetField()); - if (xParseNode.is()) + std::shared_ptr< OSQLParseNode > pParseNode = predicateTree(aErrorMsg, aNewText,xNumberFormatter, m_rColumn.GetField()); + if (pParseNode != nullptr) { OUString aPreparedText; @@ -2920,7 +2919,7 @@ bool DbFilterField::commitControl() Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY); Reference< XConnection > xConnection(getConnection(xDataSourceRowSet)); - xParseNode->parseNodeToPredicateStr(aPreparedText, + pParseNode->parseNodeToPredicateStr(aPreparedText, xConnection, xNumberFormatter, m_rColumn.GetField(), @@ -3709,7 +3708,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception } -OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3732,7 +3731,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection( void ) throw( RuntimeException, std::exception ) +::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3744,7 +3743,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4652,7 +4651,7 @@ OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::excepti } -OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std::exception ) { return getText(); } @@ -4663,13 +4662,13 @@ void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selectio } -::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection( void ) throw( RuntimeException, std::exception ) +::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception ) { return ::com::sun::star::awt::Selection(); } -sal_Bool SAL_CALL FmXFilterCell::isEditable( void ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception ) { return sal_True; } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8245f1ab1125..f8fb4b43dc79 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -21,7 +21,6 @@ #include "fmhelp.hrc" #include <svx/gridctrl.hxx> #include "gridcell.hxx" -#include "svx/dbtoolsclient.hxx" #include "svx/fmtools.hxx" #include <svtools/stringtransfer.hxx> #include <connectivity/dbtools.hxx> @@ -78,13 +77,13 @@ using namespace com::sun::star::accessibility; #define ROWSTATUS(row) (!row.Is() ? "NULL" : row->GetStatus() == GRS_CLEAN ? "CLEAN" : row->GetStatus() == GRS_MODIFIED ? "MODIFIED" : row->GetStatus() == GRS_DELETED ? "DELETED" : "INVALID") #define DEFAULT_BROWSE_MODE \ - BROWSER_COLUMNSELECTION \ - | BROWSER_MULTISELECTION \ - | BROWSER_KEEPSELECTION \ - | BROWSER_TRACKING_TIPS \ - | BROWSER_HLINESFULL \ - | BROWSER_VLINESFULL \ - | BROWSER_HEADERBAR_NEW \ + BrowserMode::COLUMNSELECTION \ + | BrowserMode::MULTISELECTION \ + | BrowserMode::KEEPHIGHLIGHT \ + | BrowserMode::TRACKING_TIPS \ + | BrowserMode::HLINES \ + | BrowserMode::VLINES \ + | BrowserMode::HEADERBAR_NEW \ class RowSetEventListener : public ::cppu::WeakImplHelper1<XRowsChangeListener> { @@ -886,7 +885,7 @@ DbGridControl::DbGridControl( Reference< XComponentContext > _rxContext, vcl::Window* pParent, WinBits nBits) - :DbGridControl_Base(pParent, EBBF_NONE, nBits, DEFAULT_BROWSE_MODE ) + :DbGridControl_Base(pParent, EditBrowseBoxFlags::NONE, nBits, DEFAULT_BROWSE_MODE ) ,m_xContext(_rxContext) ,m_aBar(VclPtr<DbGridControl::NavigationBar>::Create(this)) ,m_nAsynAdjustEvent(0) @@ -1173,26 +1172,26 @@ namespace if ( !_bNavigationBar ) { - _rMode &= ~BROWSER_AUTO_HSCROLL; + _rMode &= ~BrowserMode::AUTO_HSCROLL; } if ( _bHideScrollbars ) { - _rMode |= ( BROWSER_NO_HSCROLL | BROWSER_NO_VSCROLL ); - _rMode &= ~( BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL ); + _rMode |= ( BrowserMode::NO_HSCROLL | BrowserMode::NO_VSCROLL ); + _rMode &= ~BrowserMode( BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL ); } else { - _rMode |= ( BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL ); - _rMode &= ~( BROWSER_NO_HSCROLL | BROWSER_NO_VSCROLL ); + _rMode |= ( BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL ); + _rMode &= ~BrowserMode( BrowserMode::NO_HSCROLL | BrowserMode::NO_VSCROLL ); } // note: if we have a navigation bar, we always have a AUTO_HSCROLL. In particular, // _bHideScrollbars is ignored then if ( _bNavigationBar ) { - _rMode |= BROWSER_AUTO_HSCROLL; - _rMode &= ~BROWSER_NO_HSCROLL; + _rMode |= BrowserMode::AUTO_HSCROLL; + _rMode &= ~BrowserMode::NO_HSCROLL; } return nOldMode != _rMode; @@ -1265,15 +1264,15 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) // the 'update' option only affects our BrowserMode (with or w/o focus rect) BrowserMode nNewMode = m_nMode; - if ((m_nMode & BROWSER_CURSOR_WO_FOCUS) == 0) + if (!(m_nMode & BrowserMode::CURSOR_WO_FOCUS)) { if (nOpt & OPT_UPDATE) - nNewMode |= BROWSER_HIDECURSOR; + nNewMode |= BrowserMode::HIDECURSOR; else - nNewMode &= ~BROWSER_HIDECURSOR; + nNewMode &= ~BrowserMode::HIDECURSOR; } else - nNewMode &= ~BROWSER_HIDECURSOR; + nNewMode &= ~BrowserMode::HIDECURSOR; // should not be necessary if EnablePermanentCursor is used to change the cursor behaviour, but to be sure ... if (nNewMode != m_nMode) @@ -1331,17 +1330,17 @@ void DbGridControl::EnablePermanentCursor(bool bEnable) if (bEnable) { - m_nMode &= ~BROWSER_HIDECURSOR; // without this BROWSER_CURSOR_WO_FOCUS won't have any affect - m_nMode |= BROWSER_CURSOR_WO_FOCUS; + m_nMode &= ~BrowserMode::HIDECURSOR; // without this BrowserMode::CURSOR_WO_FOCUS won't have any affect + m_nMode |= BrowserMode::CURSOR_WO_FOCUS; } else { if (m_nOptions & OPT_UPDATE) - m_nMode |= BROWSER_HIDECURSOR; // no cursor at all + m_nMode |= BrowserMode::HIDECURSOR; // no cursor at all else - m_nMode &= ~BROWSER_HIDECURSOR; // at least the "non-permanent" cursor + m_nMode &= ~BrowserMode::HIDECURSOR; // at least the "non-permanent" cursor - m_nMode &= ~BROWSER_CURSOR_WO_FOCUS; + m_nMode &= ~BrowserMode::CURSOR_WO_FOCUS; } SetMode(m_nMode); @@ -1353,7 +1352,7 @@ void DbGridControl::EnablePermanentCursor(bool bEnable) bool DbGridControl::IsPermanentCursorEnabled() const { - return ((m_nMode & BROWSER_CURSOR_WO_FOCUS) != 0) && ((m_nMode & BROWSER_HIDECURSOR) == 0); + return (m_nMode & BrowserMode::CURSOR_WO_FOCUS) && !(m_nMode & BrowserMode::HIDECURSOR); } void DbGridControl::refreshController(sal_uInt16 _nColId, GrantControlAccess /*_aAccess*/) @@ -1496,20 +1495,20 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt if ( bPermanentCursor ) { - m_nMode |= BROWSER_CURSOR_WO_FOCUS; - m_nMode &= ~BROWSER_HIDECURSOR; + m_nMode |= BrowserMode::CURSOR_WO_FOCUS; + m_nMode &= ~BrowserMode::HIDECURSOR; } else { // updates are allowed -> no focus rectangle if ( m_nOptions & OPT_UPDATE ) - m_nMode |= BROWSER_HIDECURSOR; + m_nMode |= BrowserMode::HIDECURSOR; } if ( m_bMultiSelection ) - m_nMode |= BROWSER_MULTISELECTION; + m_nMode |= BrowserMode::MULTISELECTION; else - m_nMode &= ~BROWSER_MULTISELECTION; + m_nMode &= ~BrowserMode::MULTISELECTION; adjustModeForScrollbars( m_nMode, m_bNavigationBar, m_bHideScrollbars ); @@ -2002,7 +2001,7 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI if (pColumn) { Rectangle aArea(rRect); - if ((GetMode() & BROWSER_CURSOR_WO_FOCUS) == BROWSER_CURSOR_WO_FOCUS) + if ((GetMode() & BrowserMode::CURSOR_WO_FOCUS) == BrowserMode::CURSOR_WO_FOCUS) { aArea.Top() += 1; aArea.Bottom() -= 1; @@ -3384,7 +3383,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) OUString aName; pColumn->getModel()->getPropertyValue(FM_PROP_LABEL) >>= aName; - InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE, nNewViewPos); + InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE, nNewViewPos); pColumn->m_bHidden = false; ActivateCell(); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 7aec4e8ff624..75e63f556b4d 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -137,7 +137,7 @@ namespace svxform EnableContextMenuHandling(); if ( DGTInstance == m_eGroup ) - SetDragDropMode( SV_DRAGDROP_CTRL_MOVE |SV_DRAGDROP_CTRL_COPY | SV_DRAGDROP_APP_COPY ); + SetDragDropMode( DragDropMode::CTRL_MOVE |DragDropMode::CTRL_COPY | DragDropMode::APP_COPY ); } DataTreeListBox::~DataTreeListBox() @@ -782,7 +782,7 @@ namespace svxform m_pNaviWin->DisableNotify( false ); EnableMenuItems( NULL ); if ( bIsDocModified ) - m_pNaviWin->SetDocModified(); + svxform::DataNavigatorWindow::SetDocModified(); return bHandled; } @@ -1284,7 +1284,7 @@ namespace svxform if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) ) { bEnableEdit = true; - bEnableRemove = ( bSubmitChild != true ); + bEnableRemove = !bSubmitChild; if ( DGTInstance == m_eGroup && !m_pItemList->GetParent( pEntry ) ) bEnableRemove = false; if ( pNode->m_xNode.is() ) @@ -2930,7 +2930,7 @@ namespace svxform sHeader += "\t"; sHeader += get<FixedText>("url")->GetText(); m_pNamespacesList->InsertHeaderEntry( - sHeader, HEADERBAR_APPEND, HIB_LEFT /*| HIB_FIXEDPOS | HIB_FIXED*/ ); + sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT /*| HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED*/ ); m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) ); Link aLink = LINK( this, NamespaceItemDialog, ClickHdl ); diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index f401592e9644..aa26c27aaaac 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -19,24 +19,31 @@ #include "svx/dbcharsethelper.hxx" +#include <connectivity/dbtools.hxx> +#include <connectivity/dbcharset.hxx> -namespace svxform -{ - - ODataAccessCharsetHelper::ODataAccessCharsetHelper( ) - { - } +using namespace ::dbtools; +namespace svxform { namespace charset_helper +{ - bool ODataAccessCharsetHelper::ensureLoaded() const + sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) { - if ( !ODbtoolsClient::ensureLoaded() ) - return false; - m_xCharsetHelper = getFactory()->createCharsetHelper( ); - return m_xCharsetHelper.is(); + OCharsetMap aCharsetInfo; + _rEncs.clear(); + + OCharsetMap::const_iterator aLoop = aCharsetInfo.begin(); + OCharsetMap::const_iterator aLoopEnd = aCharsetInfo.end(); + while (aLoop != aLoopEnd) + { + _rEncs.push_back( (*aLoop).getEncoding() ); + ++aLoop; + } + + return _rEncs.size(); } - +} // namespace charset_helper } // namespace svxform diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx deleted file mode 100644 index 7306e62b4330..000000000000 --- a/svx/source/form/dbtoolsclient.cxx +++ /dev/null @@ -1,310 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XDataSource.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/sdb/SQLContext.hpp> -#include "svx/dbtoolsclient.hxx" -#include <osl/diagnose.h> -#include <rtl/instance.hxx> -#include <connectivity/formattedcolumnvalue.hxx> - - -namespace svxform -{ - - - using namespace ::connectivity::simple; - using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::util; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::sdb; - using namespace ::com::sun::star::container; - - - //= ODbtoolsClient - - - namespace - { - struct theODbtoolsClientMutex : public rtl::Static< osl::Mutex, theODbtoolsClientMutex> {}; - } - - sal_Int32 ODbtoolsClient::s_nClients = 0; - oslModule ODbtoolsClient::s_hDbtoolsModule = NULL; - createDataAccessToolsFactoryFunction - ODbtoolsClient::s_pFactoryCreationFunc = NULL; - - - ODbtoolsClient::ODbtoolsClient() - { - m_bCreateAlready = false; - } - - - bool ODbtoolsClient::ensureLoaded() const - { - if ( !m_bCreateAlready ) - { - m_bCreateAlready = true; - - registerClient(); - if ( s_pFactoryCreationFunc ) - { // loading the lib succeeded - void* pUntypedFactory = (*s_pFactoryCreationFunc)(); - IDataAccessToolsFactory* pDBTFactory = static_cast< IDataAccessToolsFactory* >( pUntypedFactory ); - OSL_ENSURE( pDBTFactory, "ODbtoolsClient::ODbtoolsClient: no factory returned!" ); - if ( pDBTFactory ) - { - m_xDataAccessFactory = pDBTFactory; - // by definition, the factory was acquired once - m_xDataAccessFactory->release(); - } - } - } - return m_xDataAccessFactory.is(); - } - - - ODbtoolsClient::~ODbtoolsClient() - { - // clear the factory _before_ revoking the client - // (the revocation may unload the DBT lib) - m_xDataAccessFactory = NULL; - // revoke the client - if ( m_bCreateAlready ) - revokeClient(); - } - -#if HAVE_FEATURE_DESKTOP -#ifndef DISABLE_DYNLOADING - extern "C" { static void SAL_CALL thisModule() {} } -#else - extern "C" void * createDataAccessToolsFactory(); -#endif -#endif - - void ODbtoolsClient::registerClient() - { - ::osl::MutexGuard aGuard(theODbtoolsClientMutex::get()); - if (1 == ++s_nClients) - { - OSL_ENSURE(NULL == s_hDbtoolsModule, "ODbtoolsClient::registerClient: inconsistence: already have a module!"); - OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!"); - -#if HAVE_FEATURE_DESKTOP -#ifndef DISABLE_DYNLOADING - - // load the dbtools library - s_hDbtoolsModule = osl_loadModuleRelative( - &thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0); - OSL_ENSURE(NULL != s_hDbtoolsModule, "ODbtoolsClient::registerClient: could not load the dbtools library!"); - if (NULL != s_hDbtoolsModule) - { - // get the symbol for the method creating the factory - const OUString sFactoryCreationFunc( "createDataAccessToolsFactory" ); - // reinterpret_cast<createDataAccessToolsFactoryFunction> - s_pFactoryCreationFunc = reinterpret_cast<createDataAccessToolsFactoryFunction>( - osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData)); - - if (NULL == s_pFactoryCreationFunc) - { // did not find the symbol - OSL_FAIL("ODbtoolsClient::registerClient: could not find the symbol for creating the factory!"); - osl_unloadModule(s_hDbtoolsModule); - s_hDbtoolsModule = NULL; - } - } -#else - s_pFactoryCreationFunc = createDataAccessToolsFactory; -#endif -#endif - } - } - - - void ODbtoolsClient::revokeClient() - { - ::osl::MutexGuard aGuard(theODbtoolsClientMutex::get()); - if (0 == --s_nClients) - { -#ifndef DISABLE_DYNLOADING - s_pFactoryCreationFunc = NULL; - if (s_hDbtoolsModule) - osl_unloadModule(s_hDbtoolsModule); -#endif - s_hDbtoolsModule = NULL; - } - - OSL_ENSURE(s_nClients >= 0,"Illegall call of revokeClient()"); - } - - OStaticDataAccessTools::OStaticDataAccessTools() - { - } - - - - bool OStaticDataAccessTools::ensureLoaded() const - { - if ( !ODbtoolsClient::ensureLoaded() ) - return false; - m_xDataAccessTools = getFactory()->getDataAccessTools(); - return m_xDataAccessTools.is(); - } - - - Reference< XNumberFormatsSupplier > OStaticDataAccessTools::getNumberFormats(const Reference< XConnection>& _rxConn, bool _bAllowDefault) const - { - Reference< XNumberFormatsSupplier > xReturn; - if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->getNumberFormats(_rxConn, _bAllowDefault); - return xReturn; - } - - - sal_Int32 OStaticDataAccessTools::getDefaultNumberFormat( const Reference< XPropertySet >& _xColumn, const Reference< XNumberFormatTypes >& _xTypes, const css::lang::Locale& _rLocale ) - { - sal_Int32 nReturn = 0; - if ( ensureLoaded() ) - nReturn = m_xDataAccessTools->getDefaultNumberFormat( _xColumn, _xTypes, _rLocale ); - return nReturn; - } - - - Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName, - const OUString& _rUser, const OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const - { - Reference< XConnection > xReturn; - if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext); - return xReturn; - } - - - Reference< XConnection > OStaticDataAccessTools::connectRowset( const Reference< XRowSet >& _rxRowSet, - const Reference< XComponentContext >& _rxContext, bool _bSetAsActiveConnection ) const - { - Reference< XConnection > xReturn; - if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->connectRowset( _rxRowSet, _rxContext, _bSetAsActiveConnection ); - return xReturn; - } - - - Reference< XConnection > OStaticDataAccessTools::getRowSetConnection(const Reference< XRowSet >& _rxRowSet) const - { - Reference< XConnection > xReturn; - if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->getRowSetConnection(_rxRowSet); - return xReturn; - } - - void OStaticDataAccessTools::TransferFormComponentProperties(const Reference< XPropertySet>& _rxOld, - const Reference< XPropertySet>& _rxNew, const css::lang::Locale& _rLocale) const - { - if ( ensureLoaded() ) - m_xDataAccessTools->TransferFormComponentProperties(_rxOld, _rxNew, _rLocale); - } - - Reference< XDataSource > OStaticDataAccessTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const - { - Reference< XDataSource > xReturn; - if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->getDataSource(_rsRegisteredName,_rxContext); - return xReturn; - } - - bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const - { - bool bRet = false; - if ( ensureLoaded() ) - bRet = m_xDataAccessTools->canInsert( _rxCursorSet ); - return bRet; - } - - bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const - { - bool bRet = false; - if ( ensureLoaded() ) - bRet = m_xDataAccessTools->canUpdate( _rxCursorSet ); - return bRet; - } - - - Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const OUString& _rCommand, - Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) - { - Reference< XNameAccess > aFields; - if ( ensureLoaded() ) - aFields = m_xDataAccessTools->getFieldsByCommandDescriptor( _rxConnection, _nCommandType, - _rCommand, _rxKeepFieldsAlive, _pErrorInfo ); - - return aFields; - } - - - bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection ) - { - bool bReturn = false; - if ( ensureLoaded() ) - bReturn = m_xDataAccessTools->isEmbeddedInDatabase( _rxComponent, _rxActualConnection ); - return bReturn; - } - - - bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent ) - { - bool bReturn = false; - if ( ensureLoaded() ) - { - Reference< XConnection > xDummy; - bReturn = m_xDataAccessTools->isEmbeddedInDatabase( _rxComponent, xDummy ); - } - return bReturn; - } - - DBToolsObjectFactory::DBToolsObjectFactory() - { - } - - - DBToolsObjectFactory::~DBToolsObjectFactory() - { - } - - - ::std::unique_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( - const Reference<XComponentContext>& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn ) - { - ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue; - if ( ensureLoaded() ) - pValue = getFactory()->createFormattedColumnValue( _rContext, _rxRowSet, _rxColumn ); - return pValue; - } - - -} // namespace svxform - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index d0812222e270..3d76bfdcb10d 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -38,6 +38,7 @@ #include <comphelper/string.hxx> #include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> +#include <connectivity/sqlnode.hxx> #include <cppuhelper/implbase1.hxx> #include <fmservs.hxx> #include <fmshimp.hxx> @@ -66,9 +67,8 @@ // das ist die Basis, mit der beide Angaben multipliziert werden (in ms) using namespace ::svxform; -using namespace ::connectivity::simple; using namespace ::connectivity; - +using namespace ::dbtools; namespace svxform @@ -302,7 +302,7 @@ public: void AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd ); - void setText(sal_Int32 nPos, + static void setText(sal_Int32 nPos, const FmFilterItem* pFilterItem, const OUString& rText); }; @@ -807,7 +807,7 @@ void FmFilterModel::Remove(FmFilterData* pData) { ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1; FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos ); - m_pAdapter->setText( nPos, pFilterItem, OUString() ); + FmFilterAdapter::setText( nPos, pFilterItem, OUString() ); Remove( removePos ); } } @@ -837,7 +837,7 @@ void FmFilterModel::Remove(FmFilterData* pData) sal_Int32 nParentPos = j - rParentParentItems.begin(); // EmptyText removes the filter - m_pAdapter->setText(nParentPos, pFilterItem, OUString()); + FmFilterAdapter::setText(nParentPos, pFilterItem, OUString()); Remove( i ); } } @@ -865,13 +865,12 @@ bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& { Reference< XFormController > xFormController( pFormItem->GetController() ); // obtain the connection of the form belonging to the controller - OStaticDataAccessTools aStaticTools; Reference< XRowSet > xRowSet( xFormController->getModel(), UNO_QUERY_THROW ); - Reference< XConnection > xConnection( aStaticTools.getRowSetConnection( xRowSet ) ); + Reference< XConnection > xConnection( getConnection( xRowSet ) ); // obtain a number formatter for this connection // TODO: shouldn't this be cached? - Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats( xConnection, true ); + Reference< XNumberFormatsSupplier > xFormatSupplier = getNumberFormats( xConnection, true ); Reference< XNumberFormatter > xFormatter( NumberFormatter::create( comphelper::getProcessComponentContext() ), UNO_QUERY_THROW ); xFormatter->attachNumberFormatsSupplier( xFormatSupplier ); @@ -881,14 +880,14 @@ bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& // parse the given text as filter predicate OUString aErr, aTxt( rText ); - ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( aErr, aTxt, xFormatter, xField ); + std::shared_ptr< OSQLParseNode > pParseNode = predicateTree( aErr, aTxt, xFormatter, xField ); rErrorMsg = aErr; rText = aTxt; - if ( xParseNode.is() ) + if ( pParseNode != nullptr ) { OUString aPreparedText; Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - xParseNode->parseNodeToPredicateStr( + pParseNode->parseNodeToPredicateStr( aPreparedText, xConnection, xFormatter, xField, OUString(), aAppLocale, '.', getParseContext() ); rText = aPreparedText; return true; @@ -915,7 +914,7 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText) ::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent()); sal_Int32 nParentPos = i - rItems.begin(); - m_pAdapter->setText(nParentPos, pItem, rText); + FmFilterAdapter::setText(nParentPos, pItem, rText); if (rText.isEmpty()) Remove(pItem); @@ -1142,7 +1141,7 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) EnableInplaceEditing( true ); SetSelectionMode(MULTIPLE_SELECTION); - SetDragDropMode(0xFFFF); + SetDragDropMode(DragDropMode::ALL); m_aDropActionTimer.SetTimeoutHdl(LINK(this, FmFilterNavigator, OnDropActionTimer)); } diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index e9e8a8ffc57b..447ad5a65b91 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -61,7 +61,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH SAL_WNOUNREACHABLE_CODE_POP -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { static const OUString aSvxComponentServiceNameList[] = { diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index cc8440aeb50f..ade7433a9217 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -19,7 +19,6 @@ #include "fmdocumentclassification.hxx" -#include "svx/dbtoolsclient.hxx" #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index edcf75f3b60d..73bbae161c87 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -92,7 +92,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier -::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xForms; @@ -104,7 +104,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier2 -sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { bool bHas = false; FmFormPage* pFormPage = PTR_CAST( FmFormPage, GetSdrPage() ); @@ -114,7 +114,7 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru } // ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 8c481a077bc8..0ce45b66c130 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -431,7 +431,8 @@ namespace sReturn = sCurrentIndex; // travel up - if (::comphelper::query_interface(Reference< XInterface >(xParent),xChild)) + xChild.set(xParent, css::uno::UNO_QUERY); + if (xChild.is()) xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); } @@ -652,7 +653,7 @@ bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) xFormToInsertInto.set( xParentForm, UNO_QUERY_THROW ); } - rPage.GetImpl().setUniqueName( xContent, xParentForm ); + FmFormPageImpl::setUniqueName( xContent, xParentForm ); if ( xFormToInsertInto.is() ) xFormToInsertInto->insertByIndex( xFormToInsertInto->getCount(), makeAny( xContent ) ); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 7c7edd7a3111..463ad07e6b09 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -28,7 +28,6 @@ #include "formcontrolfactory.hxx" #include "svx/svditer.hxx" #include "svx/fmresids.hrc" -#include "svx/dbtoolsclient.hxx" #include "treevisitor.hxx" #include <com/sun/star/sdb/CommandType.hpp> @@ -49,6 +48,7 @@ #include <comphelper/uno3.hxx> #include <comphelper/types.hxx> #include <unotools/streamwrap.hxx> +#include <connectivity/dbtools.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -63,6 +63,7 @@ using ::com::sun::star::container::XMap; using ::com::sun::star::container::EnumerableMap; using ::com::sun::star::drawing::XControlShape; using namespace ::svxform; +using namespace ::dbtools; FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage ) @@ -79,7 +80,7 @@ namespace class FormComponentInfo { public: - size_t childCount( const Reference< XInterface >& _component ) const + static size_t childCount( const Reference< XInterface >& _component ) { Reference< XIndexAccess > xContainer( _component, UNO_QUERY ); if ( xContainer.is() ) @@ -87,7 +88,7 @@ namespace return 0; } - Reference< XInterface > getChild( const Reference< XInterface >& _component, size_t _index ) const + static Reference< XInterface > getChild( const Reference< XInterface >& _component, size_t _index ) { Reference< XIndexAccess > xContainer( _component, UNO_QUERY_THROW ); return Reference< XInterface >( xContainer->getByIndex( _index ), UNO_QUERY ); @@ -103,24 +104,22 @@ namespace { } - size_t childCount( const FormComponentPair& _components ) const + static size_t childCount( const FormComponentPair& _components ) { - size_t lhsCount = m_aComponentInfo.childCount( _components.first ); - size_t rhsCount = m_aComponentInfo.childCount( _components.second ); + size_t lhsCount = FormComponentInfo::childCount( _components.first ); + size_t rhsCount = FormComponentInfo::childCount( _components.second ); if ( lhsCount != rhsCount ) throw RuntimeException( "Found inconsistent form component hierarchies (1)!" ); return lhsCount; } - FormComponentPair getChild( const FormComponentPair& _components, size_t _index ) const + static FormComponentPair getChild( const FormComponentPair& _components, size_t _index ) { return FormComponentPair( - m_aComponentInfo.getChild( _components.first, _index ), - m_aComponentInfo.getChild( _components.second, _index ) + FormComponentInfo::getChild( _components.first, _index ), + FormComponentInfo::getChild( _components.second, _index ) ); } - private: - FormComponentInfo m_aComponentInfo; }; typedef ::std::map< Reference< XControlModel >, Reference< XControlModel >, ::comphelper::OInterfaceCompare< XControlModel > > MapControlModels; @@ -575,7 +574,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( Reference< XConnection > xFormConnection; xFormProps->getPropertyValue( FM_PROP_ACTIVE_CONNECTION ) >>= xFormConnection; if ( !xFormConnection.is() ) - OStaticDataAccessTools().isEmbeddedInDatabase( xFormProps, xFormConnection ); + isEmbeddedInDatabase( xFormProps, xFormConnection ); if (xFormConnection.is()) { Reference< XChild > xConnAsChild(xFormConnection, UNO_QUERY); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 70a9480a615d..0d27ca92e242 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -112,7 +112,7 @@ namespace svxform @return <TRUE/> if and only if the method is declared <code>oneway</code>, i.e. can be called asynchronously */ - bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const; + static bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ); /** determines whether the instance is already disposed */ @@ -178,7 +178,7 @@ namespace svxform } - bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const + bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) { // This used to be implemented as: // is (_rListenerType + "::" + _rMethodName) a oneway function? @@ -947,7 +947,7 @@ namespace svxform if ( sMacroLocation.isEmpty() ) { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic - if ( SfxGetpApp()->GetBasicManager()->HasMacro( sScriptCode ) ) + if ( SfxApplication::GetBasicManager()->HasMacro( sScriptCode ) ) sMacroLocation = "application"; else sMacroLocation = "document"; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index c4714155e1a2..7a7f73817718 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -615,7 +615,7 @@ void FmFormShell::Execute(SfxRequest &rReq) { // PropertyBrowser anzeigen SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem == nullptr || pShowItem->GetValue(); InterfaceBag aOnlyTheForm; aOnlyTheForm.insert( Reference< XInterface >( GetImpl()->getCurrentForm(), UNO_QUERY ) ); @@ -629,7 +629,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_CTL_PROPERTIES: { SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem == nullptr || pShowItem->GetValue(); OSL_ENSURE( GetImpl()->onlyControlsAreMarked(), "FmFormShell::Execute: ControlProperties should be disabled!" ); if ( bShow ) @@ -1378,7 +1378,7 @@ namespace } -::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const +::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) { ::std::unique_ptr< ::svx::ISdrObjectFilter > pFilter; @@ -1432,7 +1432,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod } -Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const +Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) { const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView ); if ( !pFormView ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 120bfb174e75..3b13e0402c15 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -268,6 +268,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::script; using namespace ::svxform; using namespace ::svx; +using namespace ::dbtools; //= helper @@ -653,10 +654,10 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) m_xAttachedFrame = _pViewFrame->GetFrame().GetFrameInterface(); // to prevent deletion of this we acquire our refcounter once - ::comphelper::increment(FmXFormShell_BASE::m_refCount); + osl_atomic_increment(&m_refCount); // correct the refcounter - ::comphelper::decrement(FmXFormShell_BASE::m_refCount); + osl_atomic_decrement(&m_refCount); // cache the current configuration settings we're interested in implAdjustConfigCache(); @@ -742,21 +743,6 @@ bool FmXFormShell::IsReadonlyDoc() const return true; } - -Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException, std::exception ) -{ - return FmXFormShell_BASE::queryInterface(type); -} - -Sequence< Type > SAL_CALL FmXFormShell::getTypes( ) throw(RuntimeException, std::exception) -{ - return FmXFormShell_BASE::getTypes(); -} - -Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException, std::exception) -{ - return css::uno::Sequence<sal_Int8>(); -} // EventListener void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( RuntimeException, std::exception ) @@ -1627,7 +1613,7 @@ bool FmXFormShell::GetY2KState(sal_uInt16& n) Reference< XRowSet> xDB(xForm, UNO_QUERY); DBG_ASSERT(xDB.is(), "FmXFormShell::GetY2KState : current form has no dbform-interface !"); - Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(OStaticDataAccessTools().getRowSetConnection(xDB), false)); + Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(getConnection(xDB), false)); if (xSupplier.is()) { Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings()); @@ -1658,7 +1644,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) Reference< XRowSet > xActiveRowSet( xActiveForm, UNO_QUERY ); if ( xActiveRowSet.is() ) { - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xActiveRowSet ), false ) ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xActiveRowSet ), false ) ); if (xSupplier.is()) { Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings()); @@ -1698,7 +1684,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) Reference< XRowSet> xElementAsRowSet( xCurrentElement, UNO_QUERY ); if ( xElementAsRowSet.is() ) { - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xElementAsRowSet ), false ) ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xElementAsRowSet ), false ) ); if (!xSupplier.is()) continue; @@ -2106,7 +2092,7 @@ void FmXFormShell::startListening() return; Reference< XRowSet> xDatabaseForm(m_xActiveForm, UNO_QUERY); - if (xDatabaseForm.is() && getRowSetConnection(xDatabaseForm).is()) + if (xDatabaseForm.is() && getConnection(xDatabaseForm).is()) { Reference< XPropertySet> xActiveFormSet(m_xActiveForm, UNO_QUERY); if (xActiveFormSet.is()) @@ -2747,8 +2733,8 @@ bool FmXFormShell::IsPropBrwOpen() const if ( impl_checkDisposed() ) return false; - return( ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() ) ? - m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : sal_False ); + return m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() + && m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES); } @@ -3826,7 +3812,7 @@ namespace try { Reference< XConnection > xConn; - if ( OStaticDataAccessTools().isEmbeddedInDatabase( _rxLoadable.get(), xConn ) ) + if ( isEmbeddedInDatabase( _rxLoadable.get(), xConn ) ) return true; // is there already a active connection diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index f5ef9eb7d34b..f5f86da6cb94 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -423,7 +423,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(bool _bSearchForNull // der aktuell zu vergleichende Inhalt iterFieldLoop->xContents->getString(); // needed for wasNull - bFound = (_bSearchForNull ? 1 : 0) == iterFieldLoop->xContents->wasNull(); + bFound = _bSearchForNull == bool(iterFieldLoop->xContents->wasNull()); if (bFound) break; diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 4b7bfadd3b4c..40217b7a71e4 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -21,7 +21,6 @@ #include "fmprop.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" -#include "svx/dbtoolsclient.hxx" #include "svx/fmglob.hxx" #include <com/sun/star/awt/LineEndFormat.hpp> @@ -96,7 +95,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::task; using namespace ::com::sun::star::form; using namespace ::svxform; -using namespace ::connectivity::simple; namespace diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 131481633058..cbd32ba352a5 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -24,7 +24,6 @@ #include <sal/macros.h> #include "fmundo.hxx" #include "fmpgeimp.hxx" -#include "svx/dbtoolsclient.hxx" #include "svx/svditer.hxx" #include "fmobj.hxx" #include "fmprop.hrc" @@ -42,6 +41,7 @@ #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include "svx/fmtools.hxx" #include <svl/macitem.hxx> @@ -54,6 +54,7 @@ #include <osl/mutex.hxx> #include <comphelper/property.hxx> #include <comphelper/uno3.hxx> +#include <connectivity/dbtools.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -65,7 +66,9 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::util; using namespace ::com::sun::star::reflection; using namespace ::com::sun::star::form::binding; +using namespace ::com::sun::star::sdbc; using namespace ::svxform; +using namespace ::dbtools; #include <com/sun/star/script/XScriptListener.hpp> @@ -425,7 +428,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj) nPos = xNewParent->getCount(); } - rPage.GetImpl().setUniqueName( xContent, xForm ); + FmFormPageImpl::setUniqueName( xContent, xForm ); xNewParent->insertByIndex( nPos, makeAny( xContent ) ); Reference< XEventAttacherManager > xManager( xNewParent, UNO_QUERY_THROW ); @@ -945,11 +948,14 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement Reference< XForm > xForm( _rxElement, UNO_QUERY ); Reference< XPropertySet > xFormProperties( xForm, UNO_QUERY ); if ( xFormProperties.is() ) - if ( !::svxform::OStaticDataAccessTools().isEmbeddedInDatabase( _rxElement ) ) + { + Reference< XConnection > xDummy; + if ( !isEmbeddedInDatabase( _rxElement, xDummy ) ) // (if there is a connection in the context of the component, setting // a new connection would be vetoed, anyway) // #i34196# xFormProperties->setPropertyValue( FM_PROP_ACTIVE_CONNECTION, Any() ); + } } Reference< XIndexContainer > xContainer( _rxElement, UNO_QUERY ); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b7331257feb9..b4900cee83a4 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -299,7 +299,7 @@ void FmFormView::ChangeDesignMode(bool bDesign) else { // set the auto focus to the first control (if indicated by the model to do so) - bool bForceControlFocus = pModel ? pModel->GetAutoControlFocus() : sal_False; + bool bForceControlFocus = pModel && pModel->GetAutoControlFocus(); if (bForceControlFocus) pImpl->AutoFocus(); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index c90075277c2f..2b0b410d21fb 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -84,12 +84,14 @@ #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> #include <osl/mutex.hxx> +#include <connectivity/dbtools.hxx> #include <algorithm> using namespace ::comphelper; using namespace ::svx; using namespace ::svxform; +using namespace ::dbtools; using namespace ::com::sun::star; using ::com::sun::star::uno::Exception; @@ -229,18 +231,18 @@ void FormViewPageWindowAdapter::dispose() m_aControllerList.clear(); } -sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() throw( RuntimeException, std::exception ) { return getCount() != 0; } -Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException, std::exception ) +Type SAL_CALL FormViewPageWindowAdapter::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); } // XIndexAccess -sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() throw( RuntimeException, std::exception ) { return m_aControllerList.size(); } @@ -692,7 +694,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) // only database forms are to be activated Reference< XRowSet > xForm(xController->getModel(), UNO_QUERY); - if ( !xForm.is() || !OStaticDataAccessTools().getRowSetConnection( xForm ).is() ) + if ( !xForm.is() || !getConnection( xForm ).is() ) continue; Reference< XPropertySet > xFormSet( xForm, UNO_QUERY ); @@ -1101,7 +1103,7 @@ namespace rPage.GetImpl().findPlaceInFormComponentHierarchy( xFormComponent, _rxDataSource, _rDataSourceName, _rCommand, _nCommandType ), UNO_SET_THROW ); - rPage.GetImpl().setUniqueName( xFormComponent, xTargetForm ); + FmFormPageImpl::setUniqueName( xFormComponent, xTargetForm ); Reference< XIndexContainer > xFormAsContainer( xTargetForm, UNO_QUERY_THROW ); xFormAsContainer->insertByIndex( xFormAsContainer->getCount(), makeAny( xFormComponent ) ); @@ -1152,11 +1154,11 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript // obtain the data source if ( !xDataSource.is() ) - xDataSource = OStaticDataAccessTools().getDataSource( sDataSource, comphelper::getProcessComponentContext() ); + xDataSource = getDataSource( sDataSource, comphelper::getProcessComponentContext() ); // and the connection, if necessary if ( !xConnection.is() ) - xConnection.reset( OStaticDataAccessTools().getConnection_withFeedback( + xConnection.reset( getConnection_withFeedback( sDataSource, OUString(), OUString(), @@ -1184,7 +1186,6 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript return NULL; } - OStaticDataAccessTools aDBATools; Reference< XComponent > xKeepFieldsAlive; // go try @@ -1192,7 +1193,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript // determine the table/query field which we should create a control for Reference< XPropertySet > xField; - Reference< XNameAccess > xFields = aDBATools.getFieldsByCommandDescriptor( + Reference< XNameAccess > xFields = getFieldsByCommandDescriptor( xConnection, nCommandType, sCommand, xKeepFieldsAlive ); if (xFields.is() && xFields->hasByName(sFieldName)) @@ -1200,7 +1201,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript if ( !xField.is() ) return NULL; - Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, false ), UNO_SET_THROW ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection, false ), UNO_SET_THROW ); Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW ); OUString sLabelPostfix; @@ -1646,8 +1647,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO if ( _rxField.is() ) { - FormControlFactory aControlFactory; - aControlFactory.initializeFieldDependentProperties( _rxField, xControlSet, _rxNumberFormats ); + FormControlFactory::initializeFieldDependentProperties( _rxField, xControlSet, _rxNumberFormats ); } _rpLabel = pLabel.release(); diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 17b7613ea000..5827999cfc39 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -18,7 +18,6 @@ */ -#include "svx/dbtoolsclient.hxx" #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" #include "fmprop.hrc" @@ -46,9 +45,11 @@ #include <unotools/syslocale.hxx> #include <tools/gen.hxx> #include <tools/diagnose_ex.h> +#include <connectivity/dbtools.hxx> #include <set> +using namespace ::dbtools; namespace svxform { @@ -212,7 +213,7 @@ namespace svxform Reference< XPropertySet > xDsProperties; if ( !sDataSourceName.isEmpty() ) - xDsProperties.set(OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext ), css::uno::UNO_QUERY); + xDsProperties.set(getDataSource( sDataSourceName, _rContext ), css::uno::UNO_QUERY); if ( xDsProperties.is() ) xDsProperties->getPropertyValue("Info") >>= aInfo; } @@ -573,7 +574,7 @@ namespace svxform } else { - nFormatKey = OStaticDataAccessTools().getDefaultNumberFormat( + nFormatKey = getDefaultNumberFormat( _rxDatabaseField, Reference< XNumberFormatTypes >( _rxNumberFormats, UNO_QUERY ), SvtSysLocale().GetLanguageTag().getLocale() diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 94dd18139c27..5efd2607b49d 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -71,12 +71,13 @@ #include <comphelper/propagg.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/flagguard.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <connectivity/IParseContext.hxx> +#include <connectivity/dbtools.hxx> +#include <connectivity/sqlparse.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> @@ -93,7 +94,7 @@ using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::connectivity; -using namespace ::connectivity::simple; +using namespace ::dbtools; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL @@ -568,13 +569,13 @@ FormController::FormController(const Reference< css::uno::XComponentContext > & ,m_bSuspendFilterTextListening( false ) { - ::comphelper::increment(m_refCount); + osl_atomic_increment(&m_refCount); { m_xTabController = TabController::create( m_xComponentContext ); m_xAggregate = Reference< XAggregation >( m_xTabController, UNO_QUERY_THROW ); m_xAggregate->setDelegator( *this ); } - ::comphelper::decrement(m_refCount); + osl_atomic_decrement(&m_refCount); m_aTabActivationIdle.SetPriority( SchedulerPriority::LOWEST ); m_aTabActivationIdle.SetIdleHdl( LINK( this, FormController, OnActivateTabOrder ) ); @@ -666,7 +667,7 @@ OUString SAL_CALL FormController::getImplementationName() throw( RuntimeExceptio return OUString("org.openoffice.comp.svx.FormController"); } -Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( RuntimeException, std::exception ) { // service names which are supported only, but cannot be used to created an // instance at a service factory @@ -693,7 +694,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime } -Sequence< OUString> FormController::getSupportedServiceNames_Static(void) +Sequence< OUString> FormController::getSupportedServiceNames_Static() { static Sequence< OUString> aServices; if (!aServices.getLength()) @@ -788,12 +789,11 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons case FM_ATTR_FILTER: { OUStringBuffer aFilter; - OStaticDataAccessTools aStaticTools; - Reference<XConnection> xConnection(aStaticTools.getRowSetConnection(Reference< XRowSet>(m_xModelAsIndex, UNO_QUERY))); + Reference<XConnection> xConnection(getConnection(Reference< XRowSet>(m_xModelAsIndex, UNO_QUERY))); if (xConnection.is()) { Reference< XDatabaseMetaData> xMetaData(xConnection->getMetaData()); - Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats( xConnection, true ) ); + Reference< XNumberFormatsSupplier> xFormatSupplier( getNumberFormats( xConnection, true ) ); Reference< XNumberFormatter> xFormatter = NumberFormatter::create(m_xComponentContext); xFormatter->attachNumberFormatsSupplier(xFormatSupplier); @@ -821,13 +821,13 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons OUString sFilterValue( condition->second ); OUString sErrorMsg, sCriteria; - const ::rtl::Reference< ISQLParseNode > xParseNode = + const std::shared_ptr< OSQLParseNode > pParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); - OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" ); - if ( xParseNode.is() ) + OSL_ENSURE( pParseNode != nullptr, "FormController::getFastPropertyValue: could not parse the field value predicate!" ); + if ( pParseNode != nullptr ) { // don't use a parse context here, we need it unlocalized - xParseNode->parseNodeToStr( sCriteria, xConnection, NULL ); + pParseNode->parseNodeToStr( sCriteria, xConnection, NULL ); if ( condition != rRow.begin() ) aRowFilter.appendAscii( " AND " ); aRowFilter.append( sCriteria ); @@ -1065,14 +1065,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In // XElementAccess -sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::hasElements() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return !m_aChildren.empty(); } -Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std::exception ) +Type SAL_CALL FormController::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); @@ -1080,7 +1080,7 @@ Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std // XEnumerationAccess -Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) throw( RuntimeException, std::exception ) +Reference< XEnumeration > SAL_CALL FormController::createEnumeration() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return new ::comphelper::OEnumerationByIndex(this); @@ -1088,7 +1088,7 @@ Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) thro // XIndexAccess -sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormController::getCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aChildren.size(); @@ -1150,7 +1150,7 @@ void FormController::disposeAllFeaturesAndDispatchers() } -void FormController::disposing(void) +void FormController::disposing() { EventObject aEvt( *this ); @@ -1616,8 +1616,8 @@ bool FormController::determineLockState() const if (m_bFiltering || !xResultSet.is() || !isRowSetAlive(xResultSet)) return true; else - return (m_bCanInsert && m_bCurrentRecordNew) ? sal_False - : xResultSet->isBeforeFirst() || xResultSet->isAfterLast() || xResultSet->rowDeleted() || !m_bCanUpdate; + return !(m_bCanInsert && m_bCurrentRecordNew) + && (xResultSet->isBeforeFirst() || xResultSet->isAfterLast() || xResultSet->rowDeleted() || !m_bCanUpdate); } // FocusListener @@ -2108,7 +2108,7 @@ Reference< XControlContainer > FormController::getContainer() throw( RuntimeExc } -Sequence< Reference< XControl > > FormController::getControls(void) throw( RuntimeException, std::exception ) +Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2179,7 +2179,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl) // a.) wenn der ganze Datensatz gesperrt ist // b.) wenn das zugehoerige Feld gespeert ist Reference< XBoundControl > xBound(xControl, UNO_QUERY); - if (xBound.is() && (( (bLocked && (bLocked ? 1 : 0) != xBound->getLock()) || + if (xBound.is() && (( (bLocked && bLocked != bool(xBound->getLock())) || !bLocked))) // beim entlocken immer einzelne Felder ueberprüfen { // gibt es eine Datenquelle @@ -2557,8 +2557,7 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException, ::osl::MutexGuard aGuard( m_aMutex ); Reference< XRowSet > xForm(rEvent.Source, UNO_QUERY); // do we have a connected data source - OStaticDataAccessTools aStaticTools; - if (xForm.is() && aStaticTools.getRowSetConnection(xForm).is()) + if (xForm.is() && getConnection(xForm).is()) { Reference< XPropertySet > xSet(xForm, UNO_QUERY); if (xSet.is()) @@ -2567,8 +2566,8 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException, sal_Int32 aVal2 = 0; ::cppu::enum2int(aVal2,aVal); m_bCycle = !aVal.hasValue() || aVal2 == TabulatorCycle_RECORDS; - m_bCanUpdate = aStaticTools.canUpdate(xSet); - m_bCanInsert = aStaticTools.canInsert(xSet); + m_bCanUpdate = canUpdate(xSet); + m_bCanInsert = canInsert(xSet); m_bCurrentRecordModified = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISMODIFIED)); m_bCurrentRecordNew = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISNEW)); @@ -2957,7 +2956,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw } -Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( RuntimeException, std::exception ) +Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3054,7 +3053,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); // create the composer Reference< XRowSet > xForm(m_xModelAsIndex, UNO_QUERY); - Reference< XConnection > xConnection(OStaticDataAccessTools().getRowSetConnection(xForm)); + Reference< XConnection > xConnection(getConnection(xForm)); if (xForm.is()) { try @@ -3103,15 +3102,14 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) ::comphelper::UStringMixEqual aCompare(xMetaData->storesMixedCaseQuotedIdentifiers()); // need to parse criteria localized - OStaticDataAccessTools aStaticTools; - Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats(xConnection, true)); + Reference< XNumberFormatsSupplier> xFormatSupplier( getNumberFormats(xConnection, true)); Reference< XNumberFormatter> xFormatter = NumberFormatter::create(m_xComponentContext); xFormatter->attachNumberFormatsSupplier(xFormatSupplier); Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetUILocaleDataWrapper() ); /* FIXME: casting this to sal_Char is plain wrong and of course only * works for ASCII separators, but - * xParseNode->parseNodeToPredicateStr() expects a sal_Char. Fix it + * pParseNode->parseNodeToPredicateStr() expects a sal_Char. Fix it * there. */ sal_Char cDecimalSeparator = (sal_Char)rLocaleWrapper.getNumDecimalSep()[0]; SAL_WARN_IF( (sal_Unicode)cDecimalSeparator != rLocaleWrapper.getNumDecimalSep()[0], @@ -3182,7 +3180,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) { OUString aCompText = aRow[(*iter).xText]; aCompText += " "; - OString aVal = m_xParser->getContext().getIntlKeywordAscii(IParseContext::KEY_AND); + OString aVal = m_pParser->getContext().getIntlKeywordAscii(IParseContext::KEY_AND); aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); aCompText += " "; aCompText += ::comphelper::getString(pRefValues[j].Value); @@ -3192,11 +3190,11 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) { OUString sPredicate,sErrorMsg; pRefValues[j].Value >>= sPredicate; - ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(sErrorMsg, sPredicate, xFormatter, xField); - if ( xParseNode.is() ) + std::shared_ptr< OSQLParseNode > pParseNode = predicateTree(sErrorMsg, sPredicate, xFormatter, xField); + if ( pParseNode != nullptr ) { OUString sCriteria; - xParseNode->parseNodeToPredicateStr( sCriteria + pParseNode->parseNodeToPredicateStr( sCriteria ,xConnection ,xFormatter ,xField @@ -3233,8 +3231,7 @@ void FormController::startFiltering() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - OStaticDataAccessTools aStaticTools; - Reference< XConnection > xConnection( aStaticTools.getRowSetConnection( Reference< XRowSet >( m_xModelAsIndex, UNO_QUERY ) ) ); + Reference< XConnection > xConnection( getConnection( Reference< XRowSet >( m_xModelAsIndex, UNO_QUERY ) ) ); if ( !xConnection.is() ) // nothing to do - can't filter a form which is not connected return; @@ -3256,7 +3253,7 @@ void FormController::startFiltering() // the control we have to activate after replacement Reference< XDatabaseMetaData > xMetaData(xConnection->getMetaData()); - Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats(xConnection, true); + Reference< XNumberFormatsSupplier > xFormatSupplier = getNumberFormats(xConnection, true); Reference< XNumberFormatter > xFormatter = NumberFormatter::create(m_xComponentContext); xFormatter->attachNumberFormatsSupplier(xFormatSupplier); @@ -3481,7 +3478,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru } -OUString SAL_CALL FormController::getMode(void) throw( RuntimeException, std::exception ) +OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3490,7 +3487,7 @@ OUString SAL_CALL FormController::getMode(void) throw( RuntimeException, std::ex } -Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3911,7 +3908,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& // the request ParametersRequest aRequest; aRequest.Parameters = aEvent.Parameters; - aRequest.Connection = OStaticDataAccessTools().getRowSetConnection(Reference< XRowSet >(aEvent.Source, UNO_QUERY)); + aRequest.Connection = getConnection(Reference< XRowSet >(aEvent.Source, UNO_QUERY)); OInteractionRequest* pParamRequest = new OInteractionRequest(makeAny(aRequest)); Reference< XInteractionRequest > xParamRequest(pParamRequest); // some knittings diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 157a7507fba8..318fa8e116cd 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -52,7 +52,7 @@ namespace svxform { ::osl::MutexGuard aGuard( *m_pMutex ); - ::comphelper::increment(m_refCount); + osl_atomic_increment(&m_refCount); if (_rxToIntercept.is()) { _rxToIntercept->registerDispatchProviderInterceptor((XDispatchProviderInterceptor*)this); @@ -65,7 +65,7 @@ namespace svxform m_bListening = true; } } - ::comphelper::decrement(m_refCount); + osl_atomic_decrement(&m_refCount); } @@ -122,7 +122,7 @@ namespace svxform } - Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider(void) throw( RuntimeException, std::exception ) + Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xMasterDispatcher; diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b022b22cc9e8..b82b82bb1288 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -143,7 +143,7 @@ namespace svxform m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) ); - SetDragDropMode(0xFFFF); + SetDragDropMode(DragDropMode::ALL); EnableInplaceEditing( true ); SetSelectionMode(MULTIPLE_SELECTION); @@ -1266,7 +1266,7 @@ namespace svxform if ( pEntry ) { m_aCutEntries.insert( pEntry ); - pEntry->SetFlags( pEntry->GetFlags() | SV_ENTRYFLAG_SEMITRANSPARENT ); + pEntry->SetFlags( pEntry->GetFlags() | SvTLEntryFlags::SEMITRANSPARENT ); InvalidateEntry( pEntry ); } } @@ -1404,11 +1404,7 @@ namespace svxform // set name - FmFormView* pFormView = GetNavModel()->GetFormShell()->GetFormView(); - SdrPageView* pPageView = pFormView->GetSdrPageView(); - FmFormPage* pPage = static_cast<FmFormPage*>(pPageView->GetPage()); - - OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); + OUString sName = FmFormPageImpl::setUniqueName( xNewComponent, xParentForm ); pNewFormControlData->SetText( sName ); @@ -1471,7 +1467,7 @@ namespace svxform GrabFocus(); FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData()); - bool bRes = GetNavModel()->Rename( pEntryData, rNewText); + bool bRes = NavigatorTreeModel::Rename( pEntryData, rNewText); if( !bRes ) { m_pEditEntry = pEntry; @@ -1570,7 +1566,7 @@ namespace svxform if ( !pEntry ) continue; - pEntry->SetFlags( pEntry->GetFlags() & ~SV_ENTRYFLAG_SEMITRANSPARENT ); + pEntry->SetFlags( pEntry->GetFlags() & ~SvTLEntryFlags::SEMITRANSPARENT ); InvalidateEntry( pEntry ); } ListBoxEntrySet aEmpty; diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index f9c40e850f49..bb8d7d458199 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -20,28 +20,33 @@ #include "sqlparserclient.hxx" #include "svx/ParseContext.hxx" +#include <connectivity/dbtools.hxx> +#include <connectivity/sqlparse.hxx> + +using namespace ::dbtools; +using namespace ::connectivity; namespace svxform { - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext) + : m_pParser(new OSQLParser(rxContext, getParseContext())) { m_xContext = rxContext; } - bool OSQLParserClient::ensureLoaded() const + std::shared_ptr< ::connectivity::OSQLParseNode > OSQLParserClient::predicateTree( + OUString& _rErrorMessage, + const OUString& _rStatement, + const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField + ) const { - if ( !ODbtoolsClient::ensureLoaded() ) - return false; - m_xParser = getFactory()->createSQLParser(m_xContext,getParseContext()); - return m_xParser.is(); + return std::shared_ptr< OSQLParseNode >(m_pParser->predicateTree(_rErrorMessage, _rStatement, _rxFormatter, _rxField)); } - } // namespace svxform diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index b77ada083613..acf428e32f9d 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -36,7 +36,6 @@ #include "fmhelp.hrc" #include <svx/fmshell.hxx> #include "fmshimp.hxx" -#include "svx/dbtoolsclient.hxx" #include <svx/fmpage.hxx> #include "fmpgeimp.hxx" @@ -70,6 +69,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star; using namespace ::svxform; using namespace ::svx; +using namespace ::dbtools; namespace { @@ -334,9 +334,8 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su m_nObjectType = ::comphelper::getINT32(xSet->getPropertyValue(FM_PROP_COMMANDTYPE)); // get the connection of the form - OStaticDataAccessTools aTools; m_aConnection.reset( - aTools.connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext(), true ), + connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext(), true ), SharedConnection::NoTakeOwnership ); // TODO: When incompatible changes (such as extending the "virtualdbtools" interface by ensureRowSetConnection) diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 3caead135599..6b4bdb5bfd72 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -133,7 +133,7 @@ namespace svxform ::cppu::IPropertyArrayHelper& OAddConditionDialog::getInfoHelper() { - return *const_cast< OAddConditionDialog* >( this )->getArrayHelper(); + return *getArrayHelper(); } diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index 87e95aeb35f4..ff694bdd7a28 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -80,7 +80,7 @@ void GalleryControl::dispose() vcl::Window::dispose(); } -void GalleryControl::InitSettings (void) +void GalleryControl::InitSettings() { SetBackground( Wallpaper( GALLERY_DLG_COLOR ) ); SetControlBackground( GALLERY_DLG_COLOR ); @@ -104,7 +104,7 @@ void GalleryControl::InitSettings (void) mpBrowser2->SetBackground(aBackground); } -void GalleryControl::Resize (void) +void GalleryControl::Resize() { // call parent Window::Resize(); @@ -214,13 +214,13 @@ bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) return bRet; } -void GalleryControl::GetFocus (void) +void GalleryControl::GetFocus() { Window::GetFocus(); mpBrowser1->GrabFocus(); } -void GalleryControl::ThemeSelectionHasChanged (void) +void GalleryControl::ThemeSelectionHasChanged() { mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); } diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx index cd8121ad1625..f6857f84abd1 100644 --- a/svx/source/gallery2/GallerySplitter.cxx +++ b/svx/source/gallery2/GallerySplitter.cxx @@ -22,7 +22,7 @@ GallerySplitter::GallerySplitter( vcl::Window* pParent, WinBits nStyle, - const ::boost::function<void(void)>& rDataChangeFunctor) + const ::boost::function<void()>& rDataChangeFunctor) : Splitter(pParent, nStyle) , maDataChangeFunctor(rDataChangeFunctor) { diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx index f5c787d6b8f5..179ffbe99205 100644 --- a/svx/source/gallery2/GallerySplitter.hxx +++ b/svx/source/gallery2/GallerySplitter.hxx @@ -28,13 +28,13 @@ public: GallerySplitter( vcl::Window* pParent, WinBits nStyle, - const ::boost::function<void(void)>& rDataChangeFunctor); + const ::boost::function<void()>& rDataChangeFunctor); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - ::boost::function<void(void)> maDataChangeFunctor; + ::boost::function<void()> maDataChangeFunctor; }; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 78e12a5c5cbe..48cbfc6338cd 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -108,7 +108,7 @@ GalleryBrowser1::GalleryBrowser1( vcl::Window* pParent, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, - const ::boost::function<void(void)>& rThemeSlectionHandler) + const ::boost::function<void()>& rThemeSlectionHandler) : Control ( pParent, WB_TABSTOP ), maNewTheme ( VclPtr<GalleryButton>::Create(this, WB_3DLOOK) ), diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index bda3bdcbbae8..562b2fab7110 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -92,11 +92,11 @@ private: Image aImgImported; ::boost::function<sal_Bool(const KeyEvent&,Window*)> maKeyInputHandler; - ::boost::function<void(void)> maThemeSlectionHandler; + ::boost::function<void()> maThemeSlectionHandler; void ImplAdjustControls(); - sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); - void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ); + sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); + static void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ); void ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec); void ImplExecute( sal_uInt16 nId ); void ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew ); @@ -123,7 +123,7 @@ public: vcl::Window* pParent, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, - const ::boost::function<void(void)>& rThemeSlectionHandler); + const ::boost::function<void()>& rThemeSlectionHandler); virtual ~GalleryBrowser1(); virtual void dispose() SAL_OVERRIDE; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 5c8cbc6d3b27..4fadfb888cce 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -118,7 +118,7 @@ private: typedef std::map< int, CommandInfo > CommandInfoMap; CommandInfoMap m_aCommandInfo; - void Execute( const CommandInfo &rCmdInfo, + static void Execute( const CommandInfo &rCmdInfo, const css::uno::Sequence< css::beans::PropertyValue > &rArguments ); DECL_LINK( MenuSelectHdl, Menu* pMenu ); @@ -295,7 +295,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos // update status css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider( - mpBrowser->GetFrame(), css::uno::UNO_QUERY ); + GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY ); css::uno::Reference< css::util::XURLTransformer > xTransformer( mpBrowser->GetURLTransformer() ); for ( CommandInfoMap::iterator it = m_aCommandInfo.begin(); @@ -793,7 +793,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->Hide(); mpPreview->SetGraphic( Graphic() ); - mpPreview->PreviewMedia( INetURLObject() ); + GalleryPreview::PreviewMedia( INetURLObject() ); mpIconView->Show(); @@ -811,7 +811,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->Hide(); mpPreview->SetGraphic( Graphic() ); - mpPreview->PreviewMedia( INetURLObject() ); + GalleryPreview::PreviewMedia( INetURLObject() ); mpListView->Show(); @@ -843,7 +843,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->Show(); if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND ) - mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); + GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); maViewBox->EnableItem( TBX_ID_ICON, false ); maViewBox->EnableItem( TBX_ID_LIST, false ); @@ -916,7 +916,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) mpPreview->SetGraphic( aGraphic ); if( SGA_OBJ_SOUND == mpCurTheme->GetObjectKind( nPos ) ) - mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); + GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); mpPreview->Invalidate(); } @@ -1027,7 +1027,7 @@ void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId ) } css::uno::Reference< css::frame::XFrame > -GalleryBrowser2::GetFrame() const +GalleryBrowser2::GetFrame() { css::uno::Reference< css::frame::XFrame > xFrame; SfxViewFrame* pCurrentViewFrame = SfxViewFrame::Current(); @@ -1195,7 +1195,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) } } - mpCurTheme->ReleaseObject( pObj ); + GalleryTheme::ReleaseObject( pObj ); } } } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 9b643a70bbe2..3b21ddf2f796 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -341,7 +341,7 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) aItemTextTitle = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GALLERY_ITEM_TITLE); mpTheme->SetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aSize, aItemTextTitle, aItemTextPath); - mpTheme->ReleaseObject(pObj); + GalleryTheme::ReleaseObject(pObj); } } @@ -422,7 +422,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme InitSettings(); - SetMode( BROWSER_AUTO_VSCROLL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_HSCROLL ); + SetMode( BrowserMode::AUTO_VSCROLL | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::AUTO_HSCROLL ); SetDataRowHeight( 28 ); InsertDataColumn( GALLERY_BRWBOX_TITLE, GAL_RESSTR(RID_SVXSTR_GALLERY_TITLE), 256 ); } @@ -458,7 +458,7 @@ OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 /*nColumnId*/) cons if( pObj ) { sRet = GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_TITLE ); - mpTheme->ReleaseObject( pObj ); + GalleryTheme::ReleaseObject( pObj ); } } @@ -526,7 +526,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa aItemTextPath = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GALLERY_ITEM_PATH); mpTheme->SetPreviewBitmapExAndStrings(mnCurRow, aBitmapEx, aSize, aItemTextTitle, aItemTextPath); - mpTheme->ReleaseObject(pObj); + GalleryTheme::ReleaseObject(pObj); } } diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 7ff42eeca8c6..7b9058a85835 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -99,7 +99,7 @@ bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< { OUString aTitle( pObj->GetTitle() ); rList.push_back( aTitle ); - pTheme->ReleaseObject( pObj ); + GalleryTheme::ReleaseObject( pObj ); } } pGal->ReleaseTheme( pTheme, aListener ); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 55801bfebacd..c9bdb8aebaf8 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -107,7 +107,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, aName = rName; } -INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL ) const +INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL ) { INetURLObject aURL( rURL ); diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 3565465e47c1..873bbdab54c8 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -174,7 +174,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( GetObjKind() ); - rOut.WriteUChar( bIsThumbBmp ); + rOut.WriteBool( bIsThumbBmp ); if( bIsThumbBmp ) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 69f3771eda3b..263af9ffeebb 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1346,7 +1346,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const << m_aDestDir << "' in '" << aPath << "'"); } - rOStm.WriteUChar( bRel ); + rOStm.WriteBool( bRel ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( pObj->eObjKind ); } @@ -1358,7 +1358,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const const long nReservePos = rOStm.Tell(); boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 )); - rOStm.WriteUInt32( GetId() ).WriteUChar( IsThemeNameFromResource() ); // From version 2 and up + rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up pCompat.reset(); diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index accef9c952c3..f2aa23c9f2df 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -99,7 +99,7 @@ public: // XAccessible /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -110,23 +110,23 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; // virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} // virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} @@ -135,15 +135,15 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -155,7 +155,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleViewforwarder - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; @@ -183,10 +183,10 @@ protected: When the object is already disposed then a <type>DisposedException</type> is thrown. */ - Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen() throw (::com::sun::star::uno::RuntimeException); /// Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBox() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index b2b605d8de09..00b2efb57ea9 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -131,7 +131,7 @@ namespace svxform virtual ~DataTreeListBox(); virtual void dispose() SAL_OVERRIDE; - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) SAL_OVERRIDE; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; @@ -316,7 +316,7 @@ namespace svxform inline XPropertySet_t GetBindingForNode( const XNode_t &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); } inline OUString GetServiceNameForNode( const XNode_t &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); } - inline XFormsUIHelper1_ref GetXFormsHelper( void ) const { return m_xUIHelper; } + inline XFormsUIHelper1_ref GetXFormsHelper() const { return m_xUIHelper; } }; @@ -376,7 +376,7 @@ namespace svxform virtual ~DataNavigatorWindow(); virtual void dispose() SAL_OVERRIDE; - void SetDocModified(); + static void SetDocModified(); void NotifyChanges( bool _bLoadAll = false ); void AddContainerBroadcaster( const XContainer_ref& xContainer ); void AddEventBroadcaster( const XEventTarget_ref& xTarget ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 966a0f892fee..947aad93b902 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -185,7 +185,7 @@ public: void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController); void Remove(FmFilterData* pFilterItem); - void AppendFilterItems( FmFormItem& _rItem ); + static void AppendFilterItems( FmFormItem& _rItem ); void EnsureEmptyFilterRows( FmParentData& _rItem ); protected: diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 187cd750f8ba..0e6f0b1696d2 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -381,7 +381,7 @@ namespace svxform bool bAlterModel = false ); void Remove( FmEntryData* pEntryData, bool bAlterModel = false ); - bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); + static bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); void Clear(); void SetModified( bool bMod=true ); @@ -392,7 +392,7 @@ namespace svxform FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true ); FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs=true ); FmEntryDataList* GetRootList() const { return m_pRootList; } - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); + static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -481,7 +481,7 @@ namespace svxform void UnlockSelectionHandling() { --m_nSelectLock; } bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; } - bool IsHiddenControl(FmEntryData* pEntryData); + static bool IsHiddenControl(FmEntryData* pEntryData); DECL_LINK( OnEdit, void* ); DECL_LINK( OnDropActionTimer, void* ); @@ -509,8 +509,8 @@ namespace svxform void MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark ); void UnmarkAllViewObj(); - bool IsFormEntry( SvTreeListEntry* pEntry ); - bool IsFormComponentEntry( SvTreeListEntry* pEntry ); + static bool IsFormEntry( SvTreeListEntry* pEntry ); + static bool IsFormComponentEntry( SvTreeListEntry* pEntry ); OUString GenerateName( FmEntryData* pEntryData ); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 17b5644ee484..a3d52c147b8b 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -116,7 +116,7 @@ protected: ); public: - OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); + static OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); void formObjectInserted( const FmFormObj& _object ); void formObjectRemoved( const FmFormObj& _object ); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index b274ae4cce8f..70aadfab6f38 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -55,7 +55,6 @@ #include <cppuhelper/compbase4.hxx> #include <cppuhelper/compbase6.hxx> #include <unotools/configitem.hxx> -#include "svx/dbtoolsclient.hxx" #include "formcontrolling.hxx" #include "fmdocumentclassification.hxx" @@ -146,7 +145,6 @@ class FmFormView; class FmFormObj; class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE ,public FmXFormShell_CFGBASE - ,public ::svxform::OStaticDataAccessTools ,public ::svx::IControllerFeatureInvalidation { friend class FmFormView; @@ -257,17 +255,9 @@ public: public: SAL_DLLPRIVATE FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame); - // UNO Anbindung - DECLARE_UNO3_DEFAULTS(FmXFormShell, FmXFormShell_BASE) - SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - protected: SAL_DLLPRIVATE virtual ~FmXFormShell(); -// XTypeProvider - SAL_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // EventListener SAL_DLLPRIVATE virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 241ecaf380ce..e00e532a5f91 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -171,7 +171,7 @@ namespace svx ); /// creates SfxPoolItes for all features in the given set, and puts them into the given SfxAllItemSet - void transferFeatureStatesToItemSet( + static void transferFeatureStatesToItemSet( ControlFeatures& _rDispatchers, SfxAllItemSet& _rSet, bool _bTranslateLatin = false diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 7d36fe55ff09..7c6e1af05e5c 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -144,7 +144,7 @@ public: // UNO Anbindung // SMART_UNO_DECLARATION(FmXUndoEnvironment, ::cppu::OWeakObject); // virtual sal_Bool queryInterface(UsrUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>&); - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(void); + // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(); void Lock() { osl_atomic_increment( &m_Locks ); } void UnLock() { osl_atomic_decrement( &m_Locks ); } @@ -197,8 +197,8 @@ public: void Inserted(SdrObject* pObj); void Removed(SdrObject* pObj); - void Inserted(FmFormObj* pObj); - void Removed(FmFormObj* pObj); + static void Inserted(FmFormObj* pObj); + static void Removed(FmFormObj* pObj); }; diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 470a4ef8700e..0952008b2464 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -76,7 +76,7 @@ namespace svxform const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); - void initializeFieldDependentProperties( + static void initializeFieldDependentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatabaseField, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index c71b40b91899..0cd8dc66e40c 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -77,11 +77,7 @@ #include <vcl/timer.hxx> #include <vcl/idle.hxx> -#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22 -#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22 -#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 22 -#include <comphelper/implbase_var.hxx> -#endif +#include <cppuhelper/compbase.hxx> struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , bool> { @@ -103,7 +99,7 @@ namespace svxform class ControlBorderManager; struct FmFieldInfo; - typedef ::comphelper::WeakComponentImplHelper22 < ::com::sun::star::form::runtime::XFormController + typedef cppu::WeakComponentImplHelper < ::com::sun::star::form::runtime::XFormController , ::com::sun::star::form::runtime::XFilterController , ::com::sun::star::awt::XFocusListener , ::com::sun::star::form::XLoadListener @@ -230,7 +226,7 @@ namespace svxform virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -266,11 +262,11 @@ namespace svxform virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XContainerListener virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -286,12 +282,12 @@ namespace svxform // XModeSelector virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XModifyBroadcaster @@ -331,7 +327,7 @@ namespace svxform // XFormController virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; @@ -342,7 +338,7 @@ namespace svxform virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _interactionHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabController - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -398,7 +394,7 @@ namespace svxform // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResetListener virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -409,7 +405,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // method for registration - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 1f0cd9554b49..bd379ce49d40 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -49,6 +49,9 @@ class DbCellControl; class Edit; class FmXGridCell; +namespace dbtools { + class FormattedColumnValue; +} class FmMutexHelper { diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 02cea4f5e026..37bd498c6031 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -106,7 +106,7 @@ namespace svxform inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); // XColumnUpdate - inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline void updateNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 635c6797d21f..85924e4696b0 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -20,46 +20,42 @@ #ifndef INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX #define INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX -#include "svx/dbtoolsclient.hxx" #include "svx/ParseContext.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +namespace com { namespace sun { namespace star { +namespace util { + class XNumberFormatter; +} +namespace beans { + class XPropertySet; +} } } } + +namespace connectivity { + class OSQLParser; + class OSQLParseNode; +} namespace svxform { - - - //= OSQLParserClient - class SVX_DLLPUBLIC OSQLParserClient : public ODbtoolsClient - ,public ::svxform::OParseContextClient + class SVX_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; protected: - mutable ::rtl::Reference< ::connectivity::simple::ISQLParser > m_xParser; + mutable std::shared_ptr< ::connectivity::OSQLParser > m_pParser; - protected: OSQLParserClient( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); - virtual bool ensureLoaded() const SAL_OVERRIDE; - protected: - inline ::rtl::Reference< ::connectivity::simple::ISQLParseNode > predicateTree( + std::shared_ptr< ::connectivity::OSQLParseNode > predicateTree( OUString& _rErrorMessage, const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField - ) const - { - ::rtl::Reference< ::connectivity::simple::ISQLParseNode > xReturn; - if ( ensureLoaded() ) - xReturn = m_xParser->predicateTree(_rErrorMessage, _rStatement, _rxFormatter, _rxField); - return xReturn; - } + ) const; }; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 089904adbe95..b87cd5299be9 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -138,16 +138,16 @@ public: void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); virtual void SAL_CALL disposing() SAL_OVERRIDE; - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); void CheckChild(); @@ -245,9 +245,9 @@ public: void LoseFocus(); /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; @@ -255,22 +255,22 @@ public: void NotifyChild(long nIndex, bool bSelect, bool bCheck); }; -inline bool SvxPixelCtlAccessible::IsAlive( void ) const +inline bool SvxPixelCtlAccessible::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessible::IsNotAlive( void ) const +inline bool SvxPixelCtlAccessible::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessibleChild::IsAlive( void ) const +inline bool SvxPixelCtlAccessibleChild::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const +inline bool SvxPixelCtlAccessibleChild::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 871016352b0b..6f9407d88835 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -84,7 +84,7 @@ protected: public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL @@ -118,35 +118,35 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild( sal_Int32 nIndex ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; @@ -163,17 +163,17 @@ public: // XServiceInfo virtual OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL @@ -233,10 +233,10 @@ public: protected: /// @Return the object's current bounding box relative to the desktop. - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); /// Calls all Listener to tell they the change. void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); @@ -244,13 +244,13 @@ protected: virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); private: /** Description of this object. This is not a constant because it can @@ -282,12 +282,12 @@ private: bool mbAngleMode; }; -inline bool SvxRectCtlAccessibleContext::IsAlive( void ) const +inline bool SvxRectCtlAccessibleContext::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxRectCtlAccessibleContext::IsNotAlive( void ) const +inline bool SvxRectCtlAccessibleContext::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } @@ -316,7 +316,7 @@ protected: public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL @@ -347,35 +347,35 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; // XAccessibleEventBroadcaster @@ -409,17 +409,17 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // internal /// Sets the checked status @@ -427,22 +427,22 @@ public: void FireFocusEvent(); protected: - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); /// Mutex guarding this object. ::osl::Mutex maMutex; @@ -480,12 +480,12 @@ private: bool mbIsChecked; }; -inline bool SvxRectCtlChildAccessibleContext::IsAlive( void ) const +inline bool SvxRectCtlChildAccessibleContext::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxRectCtlChildAccessibleContext::IsNotAlive( void ) const +inline bool SvxRectCtlChildAccessibleContext::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 77c17dcf31ee..d973a04fe9db 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -28,7 +28,7 @@ #include <comphelper/propmultiplex.hxx> #include <svtools/transfer.hxx> -#include "svx/dbtoolsclient.hxx" +#include <connectivity/dbtools.hxx> class FmFieldWin; @@ -71,12 +71,11 @@ public: class FmFieldWin :public SfxFloatingWindow ,public SfxControllerItem ,public ::comphelper::OPropertyChangeListener - ,public ::svxform::OStaticDataAccessTools { ::osl::Mutex m_aMutex; VclPtr<FmFieldWinListBox> pListBox; FmFieldWinData* pData; - ::svxform::SharedConnection + ::dbtools::SharedConnection m_aConnection; OUString m_aDatabaseName, m_aObjectName; @@ -104,7 +103,7 @@ public: void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; const OUString& GetDatabaseName() const { return m_aDatabaseName; } - ::svxform::SharedConnection GetConnection() const { return m_aConnection; } + ::dbtools::SharedConnection GetConnection() const { return m_aConnection; } const OUString& GetObjectName() const { return m_aObjectName; } sal_Int32 GetObjectType() const { return m_nObjectType; } diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index ed3e67748d4a..0a1577d1fbe7 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -109,7 +109,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ -OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const +OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal); diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 1ebbdeaa8e9a..b92e9469fea3 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -246,7 +246,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) con // UNICODE: rStrm << aDescName; rStrm.WriteUniOrByteString(aDescName, rStrm.GetStreamCharSet()); - rStrm.WriteUChar( eNumType ).WriteUChar( bLandscape ).WriteUInt16( eUse ); + rStrm.WriteUChar( eNumType ).WriteBool( bLandscape ).WriteUInt16( eUse ); return rStrm; } diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 77ed1cc8a23d..1fd832f7f2e6 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -153,7 +153,7 @@ sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const { if(!HasEventHandler()) { - const_cast< ObjectContact* >(this)->mpEventHandler = const_cast< ObjectContact* >(this)->CreateEventHandler(); + const_cast< ObjectContact* >(this)->mpEventHandler = sdr::contact::ObjectContact::CreateEventHandler(); DBG_ASSERT(mpEventHandler, "ObjectContact::GetEventHandler(): Got no EventHandler (!)"); } diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 9ead73a18c88..f91fa5e05579 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -544,7 +544,8 @@ ViewContact& ViewContactOfSdrPage::GetViewContact(sal_uInt32 nIndex) const case 7: return (ViewContact&)maViewContactOfHelplinesBack; case 8: return (ViewContact&)maViewContactOfPageHierarchy; case 9: return (ViewContact&)maViewContactOfGridFront; - default: return (ViewContact&)maViewContactOfHelplinesFront; + case 10: case 11: return (ViewContact&)maViewContactOfHelplinesFront; + default: assert(false);return (ViewContact&)maViewContactOfHelplinesFront; } } diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 1a8eeb0d42b9..00499829e0fb 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -63,7 +63,7 @@ namespace sdr return drawinglayer::primitive2d::Primitive2DSequence(); } - sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) const + sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) { if(nBlinkTime < 25) { diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index ec40017226b0..385de990fca4 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -93,7 +93,7 @@ namespace drawinglayer // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments // for slideshow. This uses TextHierarchyBlockPrimitive2D to mark a text block. // ATM there is only one text block per SdrObject, this may get more in the future - Primitive2DSequence SdrTextPrimitive2D::encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) const + Primitive2DSequence SdrTextPrimitive2D::encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) { Primitive2DReference xReference(new TextHierarchyBlockPrimitive2D(rCandidate)); Primitive2DSequence xRetval(&xReference, 1); diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 51a71598e842..c4609c4fad79 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -531,19 +531,19 @@ namespace sdr switch(pStyleHint->GetHint()) { - case SFX_STYLESHEET_CREATED : + case SfxStyleSheetHintId::CREATED : { // cannot happen, nothing to do break; } - case SFX_STYLESHEET_MODIFIED : - case SFX_STYLESHEET_CHANGED : + case SfxStyleSheetHintId::MODIFIED : + case SfxStyleSheetHintId::CHANGED : { // notify change break; } - case SFX_STYLESHEET_ERASED : - case SFX_STYLESHEET_INDESTRUCTION : + case SfxStyleSheetHintId::ERASED : + case SfxStyleSheetHintId::INDESTRUCTION : { // Style needs to be exchanged SfxStyleSheet* pNewStSh = 0L; diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 2c8b111136ad..3dd95d1ea784 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -219,8 +219,8 @@ namespace sdr { switch( pStyleHint->GetHint() ) { - case SFX_STYLESHEET_MODIFIED : - case SFX_STYLESHEET_CHANGED : + case SfxStyleSheetHintId::MODIFIED : + case SfxStyleSheetHintId::CHANGED : bRemoveRenderGeometry = true; break; }; diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index a62fb35fcfc7..7bb4e4af908b 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -600,7 +600,7 @@ namespace sdr const SfxStyleSheetHintExtended* pExtendedHint = dynamic_cast<const SfxStyleSheetHintExtended*>(&rHint); if(pExtendedHint - && SFX_STYLESHEET_MODIFIED == pExtendedHint->GetHint()) + && SfxStyleSheetHintId::MODIFIED == pExtendedHint->GetHint()) { OUString aOldName(pExtendedHint->GetOldName()); OUString aNewName(pExtendedHint->GetStyleSheet()->GetName()); diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx index d4dc6980c71f..b41b12672d05 100644 --- a/svx/source/sidebar/ColorPanel.hxx +++ b/svx/source/sidebar/ColorPanel.hxx @@ -34,10 +34,10 @@ class ColorPanel { public: ColorPanel (vcl::Window* pParent); - virtual ~ColorPanel (void); + virtual ~ColorPanel(); // From vcl::Window - virtual void Resize (void); + virtual void Resize(); virtual void DataChanged (const DataChangedEvent& rEvent); private: @@ -48,7 +48,7 @@ private: items. */ int CalculateRowCount (const Size& rItemSize, int nColumnCount); - void Fill (void); + void Fill(); }; } } // end of namespace ::svx::sidebar diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index caca1f3f5810..c39eb4ba2355 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -58,7 +58,7 @@ void EmptyPanel::dispose() } -void EmptyPanel::Resize (void) +void EmptyPanel::Resize() { const Size aSize (GetSizePixel()); maMessageControl->SetSizePixel(aSize); diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 9e80936f0cb5..bab0a12df7be 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -65,8 +65,8 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - PanelFactory (void); - virtual ~PanelFactory (void); + PanelFactory(); + virtual ~PanelFactory(); // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( @@ -90,7 +90,7 @@ public: { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; -PanelFactory::PanelFactory (void) +PanelFactory::PanelFactory() : PanelFactoryInterfaceBase(m_aMutex) { } @@ -98,7 +98,7 @@ PanelFactory::PanelFactory (void) -PanelFactory::~PanelFactory (void) +PanelFactory::~PanelFactory() { } diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index bf62a1dc2314..b25011fd6586 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -33,7 +33,7 @@ using namespace sfx2::sidebar; namespace svx { namespace sidebar { SelectionChangeHandler::SelectionChangeHandler ( - const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, + const boost::function<rtl::OUString()>& rSelectionChangeCallback, const Reference<frame::XController>& rxController, const EnumContext::Context eDefaultContext) : SelectionChangeHandlerInterfaceBase(m_aMutex), @@ -47,7 +47,7 @@ SelectionChangeHandler::SelectionChangeHandler ( -SelectionChangeHandler::~SelectionChangeHandler (void) +SelectionChangeHandler::~SelectionChangeHandler() { } @@ -80,7 +80,7 @@ void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&) -void SAL_CALL SelectionChangeHandler::disposing (void) +void SAL_CALL SelectionChangeHandler::disposing() throw (uno::RuntimeException) { if (mbIsConnected) @@ -90,7 +90,7 @@ void SAL_CALL SelectionChangeHandler::disposing (void) -void SelectionChangeHandler::Connect (void) +void SelectionChangeHandler::Connect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); if (xSupplier.is()) @@ -103,7 +103,7 @@ void SelectionChangeHandler::Connect (void) -void SelectionChangeHandler::Disconnect (void) +void SelectionChangeHandler::Disconnect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); if (xSupplier.is()) diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 64f8c2f1bdd4..6e2294b56e1d 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -513,7 +513,7 @@ VclPtr<PopupControl> AreaPropertyPanel::CreateTransparencyGradientControl (Popup -void AreaPropertyPanel::SetupIcons(void) +void AreaPropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { @@ -1285,7 +1285,7 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient) -sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex (void) const +sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex() const { return mpLBTransType->GetSelectEntryPos(); } diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index f4c93218dbfc..14af720d76bd 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -82,7 +82,7 @@ public: XGradient GetGradient (const css::awt::GradientStyle eStyle) const; void SetGradient (const XGradient& rGradient); - sal_Int32 GetSelectedTransparencyTypeIndex (void) const; + sal_Int32 GetSelectedTransparencyTypeIndex() const; // constructor/destuctor AreaPropertyPanel( @@ -156,7 +156,7 @@ private: VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent); DECL_LINK( ClickTrGrHdl_Impl, ToolBox* ); - void SetupIcons(void); + static void SetupIcons(); void Initialize(); void Update(); void ImpUpdateTransparencies(); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 528ccfbedd26..9d31ad746ade 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -106,8 +106,6 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl ( } - - AreaTransparencyGradientControl::~AreaTransparencyGradientControl() { disposeOnce(); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 5a1971ad4e68..6a132b69a2d8 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -32,7 +32,7 @@ AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( { } -AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup (void) +AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup() { } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx index 5d6ac9e8ec7c..ebbd1987bc2e 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx @@ -36,7 +36,7 @@ public : AreaTransparencyGradientPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~AreaTransparencyGradientPopup (void); + virtual ~AreaTransparencyGradientPopup(); void Rearrange (XFillFloatTransparenceItem* pItem); }; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 3b144644e615..6b8a3d11d68d 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -228,7 +228,7 @@ IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG) -void GraphicPropertyPanel::SetupIcons(void) +void GraphicPropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index c60f77793616..83024d3f028e 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -102,7 +102,7 @@ private: DECL_LINK( BlueHdl, void*); DECL_LINK( GammaHdl, void*); - void SetupIcons(void); + static void SetupIcons(); void Initialize(); }; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index da3dc6efdfac..590759bd7568 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -72,9 +72,6 @@ InsertPropertyPanel::InsertPropertyPanel ( pTopWindow->AddChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); } - - - InsertPropertyPanel::~InsertPropertyPanel() { disposeOnce(); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 37d7402fef0c..004fef29dc0b 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -286,7 +286,7 @@ void LinePropertyPanel::Initialize() mpLBCapStyle->SetAccessibleName(OUString("Cap Style")); } -void LinePropertyPanel::SetupIcons(void) +void LinePropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { @@ -786,7 +786,7 @@ VclPtr<PopupControl> LinePropertyPanel::CreateLineWidthPopupControl (PopupContai return VclPtrInstance<LineWidthControl>(pParent, *this); } -void LinePropertyPanel::EndLineWidthPopupMode (void) +void LinePropertyPanel::EndLineWidthPopupMode() { maLineWidthPopup.Hide(); } diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 24fa30d4c7b2..33a9b7675abe 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -83,7 +83,7 @@ public: void SetWidthIcon(int n); void SetWidthIcon(); - void EndLineWidthPopupMode (void); + void EndLineWidthPopupMode(); // constructor/destuctor LinePropertyPanel( @@ -145,7 +145,7 @@ private: /// bitfield bool mbWidthValuable : 1; - void SetupIcons(void); + static void SetupIcons(); void Initialize(); void FillLineEndList(); void FillLineStyleList(); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 07663bd89e44..fd986ee94f54 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -61,9 +61,6 @@ LineWidthControl::LineWidthControl ( mpBindings = mrLinePropertyPanel.GetBindings(); } - - - LineWidthControl::~LineWidthControl() { disposeOnce(); diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 5e587821b21a..686850e327e2 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -38,7 +38,7 @@ LineWidthPopup::LineWidthPopup ( SetPopupModeEndHandler(::boost::bind(&LineWidthPopup::PopupModeEndCallback, this)); } -LineWidthPopup::~LineWidthPopup (void) +LineWidthPopup::~LineWidthPopup() { } @@ -51,7 +51,7 @@ void LineWidthPopup::SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMa pControl->SetWidthSelect(lValue, bValuable, eMapUnit); } -void LineWidthPopup::PopupModeEndCallback (void) +void LineWidthPopup::PopupModeEndCallback() { LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); if (pControl != NULL) diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx index 8cbe0e5ee960..7a2fe7b5c8f4 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/svx/source/sidebar/line/LineWidthPopup.hxx @@ -35,12 +35,12 @@ public : LineWidthPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~LineWidthPopup (void); + virtual ~LineWidthPopup(); void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit); private: - void PopupModeEndCallback (void); + void PopupModeEndCallback(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 7b807bdf8ff4..838e1c749114 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -830,8 +830,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[0]->nIndex = 0+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[0]->nIndexDefault = 2; //index in the tab page display,decrease 1 to the index within arr pActualBullets[0]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[0]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[0]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[0]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[0]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[0]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[0]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->eType = eNBType::BULLETS; @@ -842,8 +842,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[1]->nIndex = 1+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[1]->nIndexDefault = 3; //index in the tab page display,decrease 1 to the index within arr pActualBullets[1]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[1]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[1]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[1]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[1]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[1]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[1]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->eType = eNBType::BULLETS; @@ -854,8 +854,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[2]->nIndex = 2+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[2]->nIndexDefault = 4; //index in the tab page display,decrease 1 to the index within arr pActualBullets[2]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[2]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[2]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[2]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[2]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[2]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[2]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->eType = eNBType::BULLETS; @@ -866,8 +866,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[3]->nIndex = 3+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[3]->nIndexDefault = 5; //index in the tab page display,decrease 1 to the index within arr pActualBullets[3]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[3]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[3]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[3]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[3]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[3]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[3]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->eType = eNBType::BULLETS; @@ -878,8 +878,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[4]->nIndex = 4+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[4]->nIndexDefault = 6; //index in the tab page display,decrease 1 to the index within arr pActualBullets[4]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[4]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[4]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[4]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[4]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[4]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[4]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->eType = eNBType::BULLETS; @@ -890,8 +890,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[5]->nIndex = 5+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[5]->nIndexDefault = 8; //index in the tab page display,decrease 1 to the index within arr pActualBullets[5]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[5]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[5]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[5]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[5]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[5]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[5]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->eType = eNBType::BULLETS; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index d5609eb195e3..cd2422ef2bf1 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -57,7 +57,7 @@ private: void ExecuteLineSpace(); /// Set one particular value. - void SetLineSpace(SvxLineSpacingItem& rLineSpace, int eSpace, long lValue = 0); + static void SetLineSpace(SvxLineSpacingItem& rLineSpace, int eSpace, long lValue = 0); /// For the buttons - set the values, and close the popup. void ExecuteLineSpacing(sal_uInt16 aEntry); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index e74ad60b53ad..db3241acfc04 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -658,7 +658,7 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt mpTbxIndent_IncDec->EnableItem( nSID == SID_INC_INDENT ? nIdIncrIndent : nIdDecrIndent, - ( pState && eState == SfxItemState::UNKNOWN ) ? sal_True : sal_False ); + pState && eState == SfxItemState::UNKNOWN ); } } diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index fd866a1d23ee..2a0ac3b0165c 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -64,7 +64,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); + static FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); ParaPropertyPanel ( vcl::Window* pParent, diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 3d64e9636526..1c459d47d1ba 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -233,7 +233,7 @@ void PosSizePropertyPanel::Initialize() -void PosSizePropertyPanel::SetupIcons(void) +void PosSizePropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 8ff88813a521..1225ce07694a 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -158,14 +158,14 @@ private: DECL_LINK( RotationHdl, void * ); DECL_LINK( FlipHdl, ToolBox * ); - void SetupIcons(void); + static void SetupIcons(); void Initialize(); void executePosX(); void executePosY(); void executeSize(); void MetricState( SfxItemState eState, const SfxPoolItem* pState ); - FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); + static FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); void DisableControls(); void SetPosXYMinMax(); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index cc623434c423..e063245d9007 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -34,7 +34,7 @@ TextCharacterSpacingPopup::TextCharacterSpacingPopup ( SetPopupModeEndHandler(::boost::bind(&TextCharacterSpacingPopup::PopupModeEndCallback, this)); } -TextCharacterSpacingPopup::~TextCharacterSpacingPopup (void) +TextCharacterSpacingPopup::~TextCharacterSpacingPopup() { } @@ -47,7 +47,7 @@ void TextCharacterSpacingPopup::Rearrange (bool bLBAvailable,bool bAvailable, lo pControl->Rearrange(bLBAvailable,bAvailable,nKerning); } -void TextCharacterSpacingPopup::PopupModeEndCallback (void) +void TextCharacterSpacingPopup::PopupModeEndCallback() { ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index 0c4331f479c7..b93e4fc52b15 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -32,11 +32,11 @@ public : TextCharacterSpacingPopup ( vcl::Window* pParent, const ::boost::function<VclPtr<PopupControl>(PopupContainer*)>& rControlCreator); - virtual ~TextCharacterSpacingPopup (void); + virtual ~TextCharacterSpacingPopup(); void Rearrange (bool bLBAvailable,bool bAvailable, long nKerning); private: - void PopupModeEndCallback (void); + void PopupModeEndCallback(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 35a9aca940d3..b6d9e09a803b 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -184,12 +184,12 @@ void TextPropertyPanel::DataChanged (const DataChangedEvent& /*rEvent*/) SetupToolboxItems(); } -void TextPropertyPanel::EndSpacingPopupMode (void) +void TextPropertyPanel::EndSpacingPopupMode() { maCharSpacePopup.Hide(); } -void TextPropertyPanel::EndUnderlinePopupMode (void) +void TextPropertyPanel::EndUnderlinePopupMode() { maUnderlinePopup.Hide(); } @@ -210,7 +210,7 @@ void TextPropertyPanel::InitToolBoxSpacing() mpToolBoxSpacing->SetSelectHdl( aLink ); } -void TextPropertyPanel::SetupToolboxItems (void) +void TextPropertyPanel::SetupToolboxItems() { maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_UNDERLINE)); maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, mpToolBoxSpacing->GetItemId(UNO_SPACING)); diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index a5abc475bbb5..583300dc4b70 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -59,8 +59,8 @@ public: ::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;} long GetSelFontSize(); - void EndSpacingPopupMode (void); - void EndUnderlinePopupMode (void); + void EndSpacingPopupMode(); + void EndUnderlinePopupMode(); Color& GetUnderlineColor() { return meUnderlineColor;} @@ -111,7 +111,7 @@ private: DECL_LINK(SpacingClickHdl, ToolBox*); DECL_LINK(UnderlineClickHdl, ToolBox* ); - void SetupToolboxItems (void); + void SetupToolboxItems(); void InitToolBoxFont(); void InitToolBoxSpacing(); }; diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 0aab2b4e58a9..f9ce1bc4e674 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -32,7 +32,7 @@ TextUnderlinePopup::TextUnderlinePopup ( { } -TextUnderlinePopup::~TextUnderlinePopup (void) +TextUnderlinePopup::~TextUnderlinePopup() { } diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index ce4caa0b28f9..0643d927abb0 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -32,7 +32,7 @@ public : TextUnderlinePopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~TextUnderlinePopup (void); + virtual ~TextUnderlinePopup(); void Rearrange (FontUnderline eLine); }; diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 9cf7ebeb8cfe..c1a04c3bc177 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -40,7 +40,7 @@ Popup::Popup ( OSL_ASSERT(maControlCreator); } -Popup::~Popup (void) +Popup::~Popup() { mxControl.reset(); mxContainer.reset(); @@ -77,21 +77,21 @@ void Popup::Show (ToolBox& rToolBox) } } -void Popup::Hide (void) +void Popup::Hide() { if (mxContainer) if (mxContainer->IsInPopupMode()) mxContainer->EndPopupMode(); } -void Popup::SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback) +void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback) { maPopupModeEndCallback = rCallback; if (mxContainer) mxContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler)); } -void Popup::ProvideContainerAndControl (void) +void Popup::ProvideContainerAndControl() { if ( ! (mxContainer && mxControl) && mpParent != nullptr @@ -101,7 +101,7 @@ void Popup::ProvideContainerAndControl (void) } } -void Popup::CreateContainerAndControl (void) +void Popup::CreateContainerAndControl() { mxContainer.reset(VclPtr<PopupContainer>::Create(mpParent)); mxContainer->SetAccessibleName(msAccessibleName); diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index f4ed82042d1b..660798090a72 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -35,9 +35,6 @@ PopupControl::PopupControl ( SetBackground(Theme::GetWallpaper(Theme::Paint_DropDownBackground)); } - - - void PopupControl::Paint (const Rectangle& rBox) { Control::Paint(rBox); diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 85fb3242ebf0..d6d96b6f4dbc 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -41,7 +41,6 @@ ValueSetWithTextControl::ValueSetWithTextControl( SetColCount( 1 ); } - void ValueSetWithTextControl::AddItem( const Image& rItemImage, const Image* pSelectedItemImage, diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 4a83066f7f06..f49c25584738 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -43,7 +43,7 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl { Point maPos; Size maSize; - sal_uInt16 mnState; + SignatureState mnState; Image maImage; Image maImageBroken; Image maImageNotValidated; @@ -54,7 +54,7 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 :SfxStatusBarControl( _nSlotId, _nId, _rStb ) ,mpImpl( new XmlSecStatusBarControl_Impl ) { - mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; + mpImpl->mnState = SignatureState::UNKNOWN; mpImpl->maImage = Image( SVX_RES( RID_SVXBMP_SIGNET ) ); mpImpl->maImageBroken = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN ) ); @@ -87,16 +87,16 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons { if( SfxItemState::DEFAULT != eState ) { - mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; + mpImpl->mnState = SignatureState::UNKNOWN; } else if( pState->ISA( SfxUInt16Item ) ) { - mpImpl->mnState = static_cast<const SfxUInt16Item*>(pState)->GetValue(); + mpImpl->mnState = static_cast<SignatureState>(static_cast<const SfxUInt16Item*>(pState)->GetValue()); } else { SAL_WARN( "svx.stbcrtls", "+XmlSecStatusBarControl::StateChanged(): invalid item type" ); - mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; + mpImpl->mnState = SignatureState::UNKNOWN; } if( GetStatusBar().AreItemsVisible() ) // necessary ? @@ -105,13 +105,13 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons GetStatusBar().SetItemText( GetId(), "" ); // necessary ? sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG; - if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK ) + if ( mpImpl->mnState == SignatureState::OK ) nResId = RID_SVXSTR_XMLSEC_SIG_OK; - else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN ) + else if ( mpImpl->mnState == SignatureState::BROKEN ) nResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK; - else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED ) + else if ( mpImpl->mnState == SignatureState::NOTVALIDATED ) nResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY; - else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK ) + else if ( mpImpl->mnState == SignatureState::PARTIAL_OK ) nResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG; GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( nResId ) ); @@ -153,18 +153,18 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) long yOffset = (aRect.GetHeight() - mpImpl->maImage.GetSizePixel().Height()) / 2; - if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK ) + if( mpImpl->mnState == SignatureState::OK ) { aRect.Top() += yOffset; pDev->DrawImage( aRect.TopLeft(), mpImpl->maImage ); } - else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN ) + else if( mpImpl->mnState == SignatureState::BROKEN ) { aRect.Top() += yOffset; pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageBroken ); } - else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED - || mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK) + else if( mpImpl->mnState == SignatureState::NOTVALIDATED + || mpImpl->mnState == SignatureState::PARTIAL_OK) { aRect.Top() += yOffset; pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageNotValidated ); diff --git a/svx/source/styles/CommonStyleManager.cxx b/svx/source/styles/CommonStyleManager.cxx new file mode 100644 index 000000000000..d452ba49748a --- /dev/null +++ b/svx/source/styles/CommonStyleManager.cxx @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#include <svx/CommonStyleManager.hxx> +#include <svx/CommonStylePreviewRenderer.hxx> + +namespace svx +{ + +sfx2::StylePreviewRenderer* CommonStyleManager::CreateStylePreviewRenderer( + OutputDevice& rOutputDev, OUString const & rName, + SfxStyleFamily eFamily, long nMaxHeight) +{ + SfxStyleSheetBasePool* pPool = mrShell.GetStyleSheetPool(); + if (!pPool) + return nullptr; + + pPool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL); + SfxStyleSheetBase* pStyle = nullptr; + pStyle = pPool->First(); + + while (pStyle) + { + if (rName == pStyle->GetName()) + return new CommonStylePreviewRenderer(mrShell, rOutputDev, pStyle, nMaxHeight); + pStyle = pPool->Next(); + } + + return nullptr; +} + +} // end svx namespace + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx new file mode 100644 index 000000000000..9ef4ffdc64d2 --- /dev/null +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -0,0 +1,209 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#include <svx/CommonStylePreviewRenderer.hxx> + +#include <sfx2/objsh.hxx> +#include <svl/style.hxx> +#include <svl/itemset.hxx> + +#include <com/sun/star/drawing/FillStyle.hpp> +#include <svx/xdef.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xflclit.hxx> +#include <svx/xcolit.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/charreliefitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/flstitem.hxx> +#include <editeng/lineitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/svxfont.hxx> +#include <editeng/cmapitem.hxx> + +#include <editeng/editids.hrc> + +using namespace css; + +namespace svx +{ + +CommonStylePreviewRenderer::CommonStylePreviewRenderer( + const SfxObjectShell& rShell, OutputDevice& rOutputDev, + SfxStyleSheetBase* pStyle, long nMaxHeight) + : StylePreviewRenderer(rShell, rOutputDev, pStyle, nMaxHeight) + , maFont() + , maFontColor(COL_AUTO) + , maBackgroundColor(COL_AUTO) + , maPixelSize() + , maStyleName(mpStyle->GetName()) +{ +} + +CommonStylePreviewRenderer::~CommonStylePreviewRenderer() +{} + +bool CommonStylePreviewRenderer::recalculate() +{ + const SfxItemSet& aItemSet = mpStyle->GetItemSet(); + + maFont = SvxFont(); + + const SfxPoolItem* pItem; + + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_WEIGHT)) != nullptr) + { + maFont.SetWeight(static_cast<const SvxWeightItem*>(pItem)->GetWeight()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_POSTURE)) != nullptr) + { + maFont.SetItalic(static_cast<const SvxPostureItem*>(pItem)->GetPosture()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_CONTOUR)) != nullptr) + { + maFont.SetOutline(static_cast< const SvxContourItem*>(pItem)->GetValue()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_SHADOWED)) != nullptr) + { + maFont.SetShadow(static_cast<const SvxShadowedItem*>(pItem)->GetValue()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_RELIEF)) != nullptr) + { + maFont.SetRelief(static_cast<FontRelief>(static_cast<const SvxCharReliefItem*>(pItem)->GetValue())); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_UNDERLINE)) != nullptr) + { + maFont.SetUnderline(static_cast< const SvxUnderlineItem*>(pItem)->GetLineStyle()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr) + { + maFont.SetOverline(static_cast<FontUnderline>(static_cast<const SvxOverlineItem*>(pItem)->GetValue())); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_STRIKEOUT)) != nullptr) + { + maFont.SetStrikeout(static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_CASEMAP)) != nullptr) + { + maFont.SetCaseMap(static_cast<const SvxCaseMapItem*>(pItem)->GetCaseMap()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_EMPHASISMARK)) != nullptr) + { + maFont.SetEmphasisMark(static_cast<const SvxEmphasisMarkItem*>(pItem)->GetEmphasisMark()); + } + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_COLOR)) != nullptr) + { + maFontColor = Color(static_cast<const SvxColorItem*>(pItem)->GetValue()); + } + + if (mpStyle->GetFamily() == SFX_STYLE_FAMILY_PARA) + { + if ((pItem = aItemSet.GetItem(XATTR_FILLSTYLE)) != nullptr) + { + sal_uInt16 aFillStyle = static_cast<const XFillStyleItem*>(pItem)->GetValue(); + if (aFillStyle == drawing::FillStyle_SOLID) + { + if ((pItem = aItemSet.GetItem(XATTR_FILLCOLOR)) != nullptr) + { + maBackgroundColor = Color(static_cast<const XFillColorItem*>(pItem)->GetColorValue()); + } + } + } + } + + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_FONT)) != nullptr) + { + const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(pItem); + maFont.SetName(pFontItem->GetFamilyName()); + maFont.SetStyleName(pFontItem->GetStyleName()); + } + else + { + return false; + } + + if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_FONTHEIGHT)) != nullptr) + { + const SvxFontHeightItem* pFontHeightItem = static_cast<const SvxFontHeightItem*>(pItem); + Size aFontSize(0, pFontHeightItem->GetHeight()); + maPixelSize = Size(mrOutputDev.LogicToPixel(aFontSize, mrShell.GetMapUnit())); + maFont.SetSize(maPixelSize); + + vcl::Font aOldFont(mrOutputDev.GetFont()); + + mrOutputDev.SetFont(maFont); + Rectangle aTextRect; + mrOutputDev.GetTextBoundRect(aTextRect, mpStyle->GetName()); + if (aTextRect.Bottom() > mnMaxHeight) + { + double ratio = double(mnMaxHeight) / aTextRect.Bottom(); + maPixelSize.Width() *= ratio; + maPixelSize.Height() *= ratio; + maFont.SetSize(maPixelSize); + } + mrOutputDev.SetFont(aOldFont); + } + else + { + return false; + } + + return true; +} + +Size CommonStylePreviewRenderer::getRenderSize() +{ + maPixelSize = maFont.GetTxtSize(&mrOutputDev, maStyleName); + if (maPixelSize.Height() > mnMaxHeight) + maPixelSize.Height() = mnMaxHeight; + return maPixelSize; +} + +bool CommonStylePreviewRenderer::render(const Rectangle& aRectangle) +{ + // setup the device & draw + vcl::Font aOldFont(mrOutputDev.GetFont()); + Color aOldColor(mrOutputDev.GetTextColor()); + Color aOldFillColor(mrOutputDev.GetFillColor()); + + if (maBackgroundColor != COL_AUTO) + { + mrOutputDev.SetFillColor(maBackgroundColor); + mrOutputDev.DrawRect(aRectangle); + } + + mrOutputDev.SetFont(maFont); + if (maFontColor != COL_AUTO) + mrOutputDev.SetTextColor(maFontColor); + + Point aFontDrawPosition = aRectangle.TopLeft(); + if (aRectangle.GetHeight() > maPixelSize.Height()) + aFontDrawPosition.Y() += ( aRectangle.GetHeight() - maPixelSize.Height() ) / 2; + + mrOutputDev.DrawText(aFontDrawPosition, maStyleName); + + mrOutputDev.SetFillColor(aOldFillColor); + mrOutputDev.SetTextColor(aOldColor); + mrOutputDev.SetFont(aOldFont); + + return true; +} + +} // end svx namespace + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx index d5b29116fa10..d8efa391b680 100644 --- a/svx/source/svdraw/gradtrns.hxx +++ b/svx/source/svdraw/gradtrns.hxx @@ -45,9 +45,9 @@ class GradTransformer public: GradTransformer() {} - void GradToVec(GradTransGradient& rG, GradTransVector& rV, + static void GradToVec(GradTransGradient& rG, GradTransVector& rV, const SdrObject* pObj); - void VecToGrad(GradTransVector& rV, GradTransGradient& rG, + static void VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst); }; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 3380f21e4984..408a694623dc 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -117,7 +117,7 @@ SdrItemPool::SdrItemPool( // init the non-persistent items for(sal_uInt16 i(SDRATTR_NOTPERSIST_FIRST); i <= SDRATTR_NOTPERSIST_LAST; i++) { - mpLocalItemInfos[i - SDRATTR_START]._nFlags=0; + mpLocalItemInfos[i - SDRATTR_START]._nFlags = SfxItemPoolFlags::NONE; } // init own PoolDefaults @@ -1405,7 +1405,7 @@ SvStream& SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVer if ( nItemVersion ) { bool bValue = GetValue(); - rOut.WriteUChar( bValue ); + rOut.WriteBool( bValue ); } return rOut; } diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index 3c0f109954b0..f6ed475da790 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -89,7 +89,7 @@ void SdrDragStat::PrevPoint() } } -Point SdrDragStat::KorregPos(const Point& rNow, const Point& /*rPrev*/) const +Point SdrDragStat::KorregPos(const Point& rNow, const Point& /*rPrev*/) { Point aRet(rNow); return aRet; diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 3541cd018ce1..a1ae7ca6f7b1 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1687,9 +1687,9 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) { const SdrMark* pM=rML.GetMark(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - const size_t nPtAnz=pPts==NULL ? 0 : pPts->size(); + const size_t nPointCount=pPts==NULL ? 0 : pPts->size(); - if (nPtAnz!=0) + if (nPointCount!=0) { const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -1808,7 +1808,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const if(!bEqual) rStr += "x="; - getSdrDragView().GetModel()->TakePercentStr(aXFact, aStr); + SdrModel::TakePercentStr(aXFact, aStr); rStr += aStr; } @@ -1818,7 +1818,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const rStr += " "; rStr += "y="; - getSdrDragView().GetModel()->TakePercentStr(aYFact, aStr); + SdrModel::TakePercentStr(aYFact, aStr); rStr += aStr; } @@ -2134,7 +2134,7 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const } OUString aStr; - getSdrDragView().GetModel()->TakeAngleStr(nTmpAngle, aStr); + SdrModel::TakeAngleStr(nTmpAngle, aStr); rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) @@ -2270,7 +2270,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const nTmpAngle = NormAngle180(nTmpAngle); OUString aStr; - getSdrDragView().GetModel()->TakeAngleStr(nTmpAngle, aStr); + SdrModel::TakeAngleStr(nTmpAngle, aStr); rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) @@ -2856,7 +2856,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const nVal = std::abs(nVal); OUString aStr; - getSdrDragView().GetModel()->TakeAngleStr(nVal, aStr); + SdrModel::TakeAngleStr(nVal, aStr); rStr += aStr + ")"; } @@ -2993,17 +2993,17 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) if (pPV->HasMarkedObjPageView()) { - sal_uInt16 nPolyAnz=aTempPolyPoly.Count(); + sal_uInt16 nPolyCount=aTempPolyPoly.Count(); if (!bContortion && !getSdrDragView().IsNoDragXorPolys()) { sal_uInt16 n1st=0,nLast=0; Point aC(aCenter); - while (n1st<nPolyAnz) + while (n1st<nPolyCount) { nLast=n1st; - while (nLast<nPolyAnz && aTempPolyPoly[nLast].GetPointCount()!=0) nLast++; + while (nLast<nPolyCount && aTempPolyPoly[nLast].GetPointCount()!=0) nLast++; Rectangle aBound(aTempPolyPoly[n1st].GetBoundRect()); sal_uInt16 i; @@ -3063,19 +3063,19 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) { sal_uInt16 i,j; - for (j=0; j<nPolyAnz; j++) + for (j=0; j<nPolyCount; j++) { XPolygon& aPol=aTempPolyPoly[j]; - sal_uInt16 nPtAnz=aPol.GetPointCount(); + sal_uInt16 nPointCount=aPol.GetPointCount(); i=0; - while (i<nPtAnz) + while (i<nPointCount) { Point* pPnt=&aPol[i]; Point* pC1=NULL; Point* pC2=NULL; - if (i+1<nPtAnz && aPol.IsControl(i)) + if (i+1<nPointCount && aPol.IsControl(i)) { // control point on the left pC1=pPnt; i++; @@ -3084,7 +3084,7 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) i++; - if (i<nPtAnz && aPol.IsControl(i)) + if (i<nPointCount && aPol.IsControl(i)) { // control point on the right pC2=&aPol[i]; i++; @@ -3356,7 +3356,7 @@ void SdrDragCrook::applyCurrentTransformationToSdrObject(SdrObject& rTarget) const Rectangle aLocalMarkRect(getSdrDragView().GetMarkedObjRect()); const bool bLocalRotate(!bContortion && eMode == SDRCROOK_ROTATE && getSdrDragView().IsRotateAllowed(false)); - getSdrDragView().ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect); + SdrEditView::ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect); } } } @@ -3595,7 +3595,7 @@ void SdrDragDistort::applyCurrentTransformationToSdrObject(SdrObject& rTarget) if (bDoDistort) { - getSdrDragView().ImpDistortObj(&rTarget, aMarkRect, aDistortedRect, !bContortion); + SdrEditView::ImpDistortObj(&rTarget, aMarkRect, aDistortedRect, !bContortion); } } diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index f40c7e31ce21..26e4b32da9ee 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -527,11 +527,11 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount()) { // for PolyObj's, but NOT for SdrPathObj's, e.g. the measurement object - sal_uInt32 nPtAnz(pO->GetPointCount()); - XPolygon aXP((sal_uInt16)nPtAnz); + sal_uInt32 nPointCount(pO->GetPointCount()); + XPolygon aXP((sal_uInt16)nPointCount); sal_uInt32 nPtNum; - for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++) + for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) { Point aPt(pO->GetPoint(nPtNum)); aXP[(sal_uInt16)nPtNum]=aPt; @@ -544,7 +544,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa case SDRCROOK_STRETCH: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break; } - for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++) + for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) { // broadcasting could be optimized here, but for the // current two points of the measurement object, it's fine @@ -641,11 +641,11 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol else if(pO->IsPolyObj()) { // e. g. for the measurement object - sal_uInt32 nPtAnz(pO->GetPointCount()); - XPolygon aXP((sal_uInt16)nPtAnz); + sal_uInt32 nPointCount(pO->GetPointCount()); + XPolygon aXP((sal_uInt16)nPointCount); sal_uInt32 nPtNum; - for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++) + for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) { Point aPt(pO->GetPoint(nPtNum)); aXP[(sal_uInt16)nPtNum]=aPt; @@ -653,7 +653,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol aXP.Distort(rRef, rDistortedRect); - for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++) + for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) { // broadcasting could be optimized here, but for the // current two points of the measurement object it's fine diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index bb56746f45e9..e2fd8d2df57b 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -563,7 +563,7 @@ void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) } } -bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const +bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) { // new condition IsLine() to be able to combine simple Lines bool bIsLine(false); @@ -581,7 +581,7 @@ bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const return (aInfo.bCanConvToPath || aInfo.bCanConvToPoly || bIsLine); } -bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const +bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) { SdrObjList* pOL = pObj->GetSubList(); @@ -611,7 +611,7 @@ bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const return true; } -basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const +basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) { basegfx::B2DPolyPolygon aRetval; const SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); @@ -660,7 +660,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, b return aRetval; } -basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const +basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) { SdrObjList* pOL = pObj->GetSubList(); @@ -683,7 +683,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bo } } -basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) const +basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) { const sal_uInt32 nPolyCount(rPolyPolygon.count()); @@ -1348,7 +1348,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) // Dismantle -bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bMakeLines) const +bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bMakeLines) { bool bCan(false); const sal_uInt32 nPolygonCount(rPpolyPolygon.count()); @@ -1373,7 +1373,7 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, return bCan; } -bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const +bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) { bool bOtherObjs(false); // true=objects other than PathObj's existent bool bMin1PolyPoly(false); // true=at least 1 tools::PolyPolygon with more than one Polygon existent diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f46b07d9c0a2..0d4ee090e7d6 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1403,9 +1403,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible() } } -sal_uInt16 SdrObjEditView::GetScriptType() const +SvtScriptType SdrObjEditView::GetScriptType() const { - sal_uInt16 nScriptType = 0; + SvtScriptType nScriptType = SvtScriptType::NONE; if( IsTextEdit() ) { @@ -1430,8 +1430,8 @@ sal_uInt16 SdrObjEditView::GetScriptType() const } } - if( nScriptType == 0 ) - nScriptType = SCRIPTTYPE_LATIN; + if( nScriptType == SvtScriptType::NONE ) + nScriptType = SvtScriptType::LATIN; return nScriptType; } @@ -1923,7 +1923,7 @@ sal_uInt16 SdrObjEditView::GetSelectionLevel() const return nLevel; } -bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const +bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) { if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor ) return false; diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index a4c62ebda45e..32e8b24389cd 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -412,7 +412,7 @@ SdrOutliner* SdrMakeOutliner(sal_uInt16 nOutlinerMode, SdrModel& rModel) pOutl->SetEditTextObjectPool( pPool ); pOutl->SetStyleSheetPool( static_cast<SfxStyleSheetPool*>(rModel.GetStyleSheetPool())); pOutl->SetDefTab(rModel.GetDefaultTabulator()); - pOutl->SetForbiddenCharsTable(rModel.GetForbiddenCharsTable()); + Outliner::SetForbiddenCharsTable(rModel.GetForbiddenCharsTable()); pOutl->SetAsianCompressionMode(rModel.GetCharCompressType()); pOutl->SetKernAsianPunctuation(rModel.IsKernAsianPunctuation()); pOutl->SetAddExtLeading(rModel.IsAddExtLeading()); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index fb7843f9dd5d..0a6974e72084 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -561,7 +561,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale) aPoly, maClip, true, - aPoly.isClosed() ? false : true)); + !aPoly.isClosed())); const basegfx::B2DRange aNewRange(aNewPoly.getB2DRange()); if(!aNewRange.isEmpty()) diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index fbdfaef5cc73..c7c32f4619e2 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -131,12 +131,12 @@ protected: void DoAction(MetaMaskScaleAction& rAct); void DoAction(MetaMaskScalePartAction& rAct); void DoAction(MetaGradientAction& rAct); - void DoAction(MetaWallpaperAction& rAct); + static void DoAction(MetaWallpaperAction& rAct); void DoAction(MetaTransparentAction& rAct); - void DoAction(MetaEPSAction& rAct); + static void DoAction(MetaEPSAction& rAct); void DoAction(MetaRefPointAction& rAct) { rAct.Execute(mpVD); } void DoAction(MetaTextLineColorAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } - void DoAction(MetaTextLineAction& rAct); + static void DoAction(MetaTextLineAction& rAct); void DoAction(MetaFloatTransparentAction& rAct); void DoAction(MetaGradientExAction& rAct); void DoAction(MetaLayoutModeAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; } diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index af3d31ea38e2..82b2adc07401 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -49,8 +49,8 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size(); - if (nPtAnz!=0) { + sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + if (nPointCount!=0) { SdrGluePointList* pGPL=NULL; if (bConst) { const SdrGluePointList* pConstGPL=pObj->GetGluePointList(); @@ -233,8 +233,8 @@ void SdrGlueEditView::DeleteMarkedGluePoints() SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size(); - if (nPtAnz!=0) + sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + if (nPointCount!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); if (pGPL!=NULL) @@ -279,8 +279,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() SdrObject* pObj=pM->GetMarkedSdrObj(); SdrUShortCont* pPts=pM->GetMarkedGluePoints(); SdrGluePointList* pGPL=pObj->ForceGluePointList(); - sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size(); - if (nPtAnz!=0 && pGPL!=NULL) + sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + if (nPointCount!=0 && pGPL!=NULL) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); @@ -322,8 +322,8 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size(); - if (nPtAnz!=0) { + sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + if (nPointCount!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); if (pGPL!=NULL) { diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index bc69407a219a..9018d6844e86 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -149,7 +149,7 @@ void SdrGluePoint::SetAlignAngle(long nAngle) else if (nAngle<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM; } -long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const +long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) { switch (nEsc) { case SDRESC_RIGHT : return 0; @@ -160,7 +160,7 @@ long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const return 0; } -sal_uInt16 SdrGluePoint::EscAngleToDir(long nAngle) const +sal_uInt16 SdrGluePoint::EscAngleToDir(long nAngle) { nAngle=NormAngle360(nAngle); if (nAngle>=31500 || nAngle<4500) diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index d6248ff9cb45..348cf2d37bd9 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -639,7 +639,7 @@ void SdrHdl::CreateB2dIAObject() } } -BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const +BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) { BitmapMarkerKind eRetval(eKnd); @@ -1262,7 +1262,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool aOldGradTransGradient.aGradient = static_cast<const XFillFloatTransparenceItem&>(rSet.Get(XATTR_FILLFLOATTRANSPARENCE)).GetGradientValue(); // transform vector data to gradient - aGradTransformer.VecToGrad(aGradTransVector, aGradTransGradient, aOldGradTransGradient, _pObj, bMoveSingleHandle, bMoveFirstHandle); + GradTransformer::VecToGrad(aGradTransVector, aGradTransGradient, aOldGradTransGradient, _pObj, bMoveSingleHandle, bMoveFirstHandle); if(bSetItemOnObject) { @@ -1293,7 +1293,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool } // back transformation, set values on pIAOHandle - aGradTransformer.GradToVec(aGradTransGradient, aGradTransVector, _pObj); + GradTransformer::GradToVec(aGradTransGradient, aGradTransVector, _pObj); SetPos(Point(FRound(aGradTransVector.maPositionA.getX()), FRound(aGradTransVector.maPositionA.getY()))); Set2ndPos(Point(FRound(aGradTransVector.maPositionB.getX()), FRound(aGradTransVector.maPositionB.getY()))); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 261d11945818..cddf3dfa9954 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -202,7 +202,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) // - _SdrItemBrowserControl - -#define MYBROWSEMODE (BROWSER_THUMBDRAGGING|BROWSER_KEEPHIGHLIGHT|BROWSER_NO_HSCROLL|BROWSER_HIDECURSOR) +#define MYBROWSEMODE (BrowserMode::THUMBDRAGGING|BrowserMode::KEEPHIGHLIGHT|BrowserMode::NO_HSCROLL|BrowserMode::HIDECURSOR) _SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits): BrowseBox(pParent,nBits,MYBROWSEMODE), @@ -494,7 +494,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) bool bRet = false; ImpItemListRow* pEntry=ImpGetEntry(nPos); if (pEntry!=NULL && !pEntry->bComment) { - SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); + SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT)); pEditControl=VclPtr<ImpItemEdit>::Create(&GetDataWindow(),this,0); Rectangle aRect(GetFieldRectPixel(nPos, ITEMBROWSER_VALUECOL_ID, false)); aRect.Left()+=2; // little offset for the Edit, so it's exact to the pixel @@ -907,7 +907,7 @@ sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet) { - SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); + SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT)); if (pSet!=NULL) { sal_uInt16 nEntryNum=0; SfxWhichIter aIter(*pSet); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 2f7366b6933a..eb0f00ee6582 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -778,7 +778,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit ) } pOutliner->SetRefDevice(GetRefDevice()); - pOutliner->SetForbiddenCharsTable(GetForbiddenCharsTable()); + Outliner::SetForbiddenCharsTable(GetForbiddenCharsTable()); pOutliner->SetAsianCompressionMode( mnCharCompressType ); pOutliner->SetKernAsianPunctuation( IsKernAsianPunctuation() ); pOutliner->SetAddExtLeading( IsAddExtLeading() ); @@ -1324,7 +1324,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I rStr = aBuf.makeStringAndClear(); } -void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) const +void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) { bool bNeg = nAngle < 0; @@ -1355,7 +1355,7 @@ void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) const rStr = aBuf.makeStringAndClear(); } -void SdrModel::TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar) const +void SdrModel::TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar) { sal_Int32 nMul(rVal.GetNumerator()); sal_Int32 nDiv(rVal.GetDenominator()); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index cfc0cb9e5e31..a747bc69889a 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1003,7 +1003,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) GradTransGradient aGradTransGradient; aGradTransGradient.aGradient = static_cast<const XFillFloatTransparenceItem&>(rSet.Get(XATTR_FILLFLOATTRANSPARENCE)).GetGradientValue(); - aGradTransformer.GradToVec(aGradTransGradient, aGradTransVector, pObj); + GradTransformer::GradToVec(aGradTransGradient, aGradTransVector, pObj); // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); @@ -1045,7 +1045,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) Size aHdlSize(15, 15); aGradTransGradient.aGradient = static_cast<const XFillGradientItem&>(rSet.Get(XATTR_FILLGRADIENT)).GetGradientValue(); - aGradTransformer.GradToVec(aGradTransGradient, aGradTransVector, pObj); + GradTransformer::GradToVec(aGradTransGradient, aGradTransVector, pObj); // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); @@ -1474,8 +1474,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) E3dScene* pScene = NULL; SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit; bool bRemap = pObjHit->ISA(E3dCompoundObject) - ? static_cast<E3dCompoundObject*>(pObjHit)->IsAOrdNumRemapCandidate(pScene) - : false; + && static_cast<E3dCompoundObject*>(pObjHit)->IsAOrdNumRemapCandidate(pScene); if(bPrev) { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 238166b932a8..5080b71d2bb2 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -492,7 +492,7 @@ bool SdrObjCustomShape::UseNoFillStyle() const const Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny ) *pAny >>= sShapeType; - bRet = IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) ) == false; + bRet = !IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) ); return bRet; } @@ -1588,12 +1588,12 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co if ( ( ( xFact.GetNumerator() < 0 ) && ( xFact.GetDenominator() > 0 ) ) || ( ( xFact.GetNumerator() > 0 ) && ( xFact.GetDenominator() < 0 ) ) ) { - SetMirroredX( IsMirroredX() == false ); + SetMirroredX( !IsMirroredX() ); } if ( ( ( yFact.GetNumerator() < 0 ) && ( yFact.GetDenominator() > 0 ) ) || ( ( yFact.GetNumerator() > 0 ) && ( yFact.GetDenominator() < 0 ) ) ) { - SetMirroredY( IsMirroredY() == false ); + SetMirroredY( !IsMirroredY() ); } } @@ -3108,8 +3108,8 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); Point aRef2( aRef1.X(), aRef1.Y() + 1000 ); sal_uInt16 i; - sal_uInt16 nPntAnz=aPol.GetSize(); - for (i=0; i<nPntAnz; i++) + sal_uInt16 nPointCount=aPol.GetSize(); + for (i=0; i<nPointCount; i++) { MirrorPoint(aPol[i],aRef1,aRef2); } @@ -3130,8 +3130,8 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); Point aRef2( aRef1.X() + 1000, aRef1.Y() ); sal_uInt16 i; - sal_uInt16 nPntAnz=aPol.GetSize(); - for (i=0; i<nPntAnz; i++) + sal_uInt16 nPointCount=aPol.GetSize(); + for (i=0; i<nPointCount; i++) { MirrorPoint(aPol[i],aRef1,aRef2); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2108dab7b940..e829dffac9d0 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -412,7 +412,7 @@ void SdrObject::Free( SdrObject*& _rpObject ) delete pObject; } -SdrObjPlusData* SdrObject::NewPlusData() const +SdrObjPlusData* SdrObject::NewPlusData() { return new SdrObjPlusData; } @@ -686,7 +686,7 @@ void SdrObject::SetName(const OUString& rStr) { bUndo = true; SdrUndoAction* pUndoAction = - GetModel()->GetSdrUndoFactory().CreateUndoObjectStrAttr( + SdrUndoFactory::CreateUndoObjectStrAttr( *this, SdrUndoObjStrAttr::OBJ_NAME, GetName(), @@ -730,7 +730,7 @@ void SdrObject::SetTitle(const OUString& rStr) { bUndo = true; SdrUndoAction* pUndoAction = - GetModel()->GetSdrUndoFactory().CreateUndoObjectStrAttr( + SdrUndoFactory::CreateUndoObjectStrAttr( *this, SdrUndoObjStrAttr::OBJ_TITLE, GetTitle(), @@ -774,7 +774,7 @@ void SdrObject::SetDescription(const OUString& rStr) { bUndo = true; SdrUndoAction* pUndoAction = - GetModel()->GetSdrUndoFactory().CreateUndoObjectStrAttr( + SdrUndoFactory::CreateUndoObjectStrAttr( *this, SdrUndoObjStrAttr::OBJ_DESCRIPTION, GetDescription(), @@ -840,7 +840,7 @@ void SdrObject::SetGrabBagItem(const com::sun::star::uno::Any& rVal) BroadcastObjectChange(); } -sal_uInt32 SdrObject::GetNavigationPosition (void) +sal_uInt32 SdrObject::GetNavigationPosition() { if (pObjList!=NULL && pObjList->RecalcNavigationPositions()) { @@ -1085,7 +1085,7 @@ OUString SdrObject::GetAngleStr(long nAngle, bool bNoDegChar) const { OUString aStr; if (pModel!=NULL) { - pModel->TakeAngleStr(nAngle,aStr,bNoDegChar); + SdrModel::TakeAngleStr(nAngle,aStr,bNoDegChar); } return aStr; } @@ -2407,7 +2407,7 @@ void extractLineContourFromPrimitive2DSequence( -SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const +SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) { bool bNoChange(true); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index e62175d690ce..0434d6918a2a 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -569,16 +569,16 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const OUString aStr; ImpTakeDescriptionStr(STR_ViewCreateObj, aStr); OUStringBuffer aBuf(aStr); - const sal_uInt32 nPntAnz(rDrag.GetPointAnz()); + const sal_uInt32 nPointCount(rDrag.GetPointAnz()); - if(OBJ_CIRC != meCircleKind && nPntAnz > 2) + if(OBJ_CIRC != meCircleKind && nPointCount > 2) { const ImpCircUser* pU = static_cast<const ImpCircUser*>(rDrag.GetUser()); sal_Int32 nAngle; aBuf.appendAscii(" ("); - if(3 == nPntAnz) + if(3 == nPointCount) { nAngle = pU->nStart; } @@ -1148,7 +1148,7 @@ void SdrCircObj::ImpSetCircInfoToAttr() SdrObject* SdrCircObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { - const bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True); + const bool bFill(meCircleKind != OBJ_CARC); const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, maRect, nStartAngle, nEndAngle)); SdrObject* pRet = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aCircPolygon), bFill, bBezier); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 27f476321ad2..8bfc8e16d4cd 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -413,18 +413,18 @@ bool SdrEdgeObj::IsNode() const SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const { Point aPt; - sal_uInt16 nPntAnz=pEdgeTrack->GetPointCount(); - if (nPntAnz>0) + sal_uInt16 nPointCount=pEdgeTrack->GetPointCount(); + if (nPointCount>0) { Point aOfs = GetSnapRect().Center(); if (nNum==2 && GetConnectedNode(true)==NULL) aPt=(*pEdgeTrack)[0]; - else if (nNum==3 && GetConnectedNode(false)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1]; + else if (nNum==3 && GetConnectedNode(false)==NULL) aPt=(*pEdgeTrack)[nPointCount-1]; else { - if ((nPntAnz & 1) ==1) { - aPt=(*pEdgeTrack)[nPntAnz/2]; + if ((nPointCount & 1) ==1) { + aPt=(*pEdgeTrack)[nPointCount/2]; } else { - Point aPt1((*pEdgeTrack)[nPntAnz/2-1]); - Point aPt2((*pEdgeTrack)[nPntAnz/2]); + Point aPt1((*pEdgeTrack)[nPointCount/2-1]); + Point aPt2((*pEdgeTrack)[nPointCount/2]); aPt1+=aPt2; aPt1.X()/=2; aPt1.Y()/=2; @@ -493,12 +493,12 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const { bool bRet = false; const SdrObjConnection& rCon=GetConnection(bTail1); - sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); - if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) { + sal_uInt16 nPointCount=pEdgeTrack->GetPointCount(); + if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPointCount!=0) { const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList(); sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); sal_uInt16 nGesAnz=nConAnz+8; - Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]); + Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPointCount-1)]); for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) { if (i<nConAnz) { // UserDefined bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj); @@ -516,15 +516,15 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt) { - sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); - if (nPtAnz==0) { + sal_uInt16 nPointCount=pEdgeTrack->GetPointCount(); + if (nPointCount==0) { (*pEdgeTrack)[0]=rPt; (*pEdgeTrack)[1]=rPt; - } else if (nPtAnz==1) { + } else if (nPointCount==1) { if (!bTail1) (*pEdgeTrack)[1]=rPt; else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; } } else { - if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt; + if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPointCount-1)]=rPt; else (*pEdgeTrack)[0]=rPt; } ImpRecalcEdgeTrack(); @@ -599,7 +599,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() } } -sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const +sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) { if (pObj==NULL) return SDRESC_ALL; Rectangle aR(pObj->GetSnapRect()); @@ -637,7 +637,7 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const } } -XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const +XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) { XPolygon aXP; aXP.Insert(XPOLY_APPEND,rStPt,XPOLY_NORMAL); @@ -1266,16 +1266,16 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec nNum--; aXP1.Insert(XPOLY_APPEND,aXP2[nNum],XPOLY_NORMAL); } - sal_uInt16 nPntAnz=aXP1.GetPointCount(); + sal_uInt16 nPointCount=aXP1.GetPointCount(); char cForm=0; if (bInfo || pnQuality!=NULL) { cForm='?'; - if (nPntAnz==2) cForm='I'; - else if (nPntAnz==3) cForm='L'; - else if (nPntAnz==4) { // Z or U + if (nPointCount==2) cForm='I'; + else if (nPointCount==3) cForm='L'; + else if (nPointCount==4) { // Z or U if (nAngle1==nAngle2) cForm='U'; else cForm='Z'; - } else if (nPntAnz==6) { // S or C or ... + } else if (nPointCount==6) { // S or C or ... if (nAngle1!=nAngle2) { // For type S, line 2 has the same direction as line 4. // For type C, the opposite is true. @@ -1315,7 +1315,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec sal_uIntPtr nQual0=nQual; // prevent overruns bool bOverflow = false; Point aPt0(aXP1[0]); - for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) { + for (sal_uInt16 nPntNum=1; nPntNum<nPointCount; nPntNum++) { Point aPt1b(aXP1[nPntNum]); nQual+=std::abs(aPt1b.X()-aPt0.X())+std::abs(aPt1b.Y()-aPt0.Y()); if (nQual<nQual0) bOverflow = true; @@ -1323,7 +1323,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aPt0=aPt1b; } - sal_uInt16 nTmp=nPntAnz; + sal_uInt16 nTmp=nPointCount; if (cForm=='Z') { nTmp=2; // Z shape with good quality (nTmp=2 instead of 4) sal_uIntPtr n1=std::abs(aXP1[1].X()-aXP1[0].X())+std::abs(aXP1[1].Y()-aXP1[0].Y()); @@ -1344,9 +1344,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec nQual+=(sal_uIntPtr)nTmp*0x01000000; if (nQual<nQual0 || nTmp>15) bOverflow = true; } - if (nPntAnz>=2) { // check exit angle again + if (nPointCount>=2) { // check exit angle again Point aP1(aXP1[1]); aP1-=aXP1[0]; - Point aP2(aXP1[nPntAnz-2]); aP2-=aXP1[nPntAnz-1]; + Point aP2(aXP1[nPointCount-2]); aP2-=aXP1[nPointCount-1]; long nAng1=0; if (aP1.X()<0) nAng1=18000; if (aP1.Y()>0) nAng1=27000; if (aP1.Y()<0) nAng1=9000; if (aP1.X()!=0 && aP1.Y()!=0) nAng1=1; // slant?! long nAng2=0; if (aP2.X()<0) nAng2=18000; if (aP2.Y()>0) nAng2=27000; @@ -1361,14 +1361,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aBewareRect1=rBewareRect1; aBewareRect2=rBewareRect2; - for (sal_uInt16 i=0; i<nPntAnz; i++) { + for (sal_uInt16 i=0; i<nPointCount; i++) { Point aPt1b(aXP1[i]); bool b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() && aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom(); bool b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() && aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom(); sal_uInt16 nInt0=nIntersections; - if (i==0 || i==nPntAnz-1) { + if (i==0 || i==nPointCount-1) { if (b1 && b2) nIntersections++; } else { if (b1) nIntersections++; @@ -1394,7 +1394,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } aPt0=aPt1b; } - if (nPntAnz<=1) nIntersections++; + if (nPointCount<=1) nIntersections++; nQual0=nQual; nQual+=(sal_uIntPtr)nIntersections*0x10000000; if (nQual<nQual0 || nIntersections>15) bOverflow = true; @@ -1455,37 +1455,37 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } // make the connector a bezier curve, if appropriate - if (eKind==SDREDGE_BEZIER && nPntAnz>2) { + if (eKind==SDREDGE_BEZIER && nPointCount>2) { Point* pPt1=&aXP1[0]; Point* pPt2=&aXP1[1]; - Point* pPt3=&aXP1[nPntAnz-2]; - Point* pPt4=&aXP1[nPntAnz-1]; + Point* pPt3=&aXP1[nPointCount-2]; + Point* pPt4=&aXP1[nPointCount-1]; long dx1=pPt2->X()-pPt1->X(); long dy1=pPt2->Y()-pPt1->Y(); long dx2=pPt3->X()-pPt4->X(); long dy2=pPt3->Y()-pPt4->Y(); - if (cForm=='L') { // nPntAnz==3 + if (cForm=='L') { // nPointCount==3 aXP1.SetFlags(1,XPOLY_CONTROL); Point aPt3(*pPt2); aXP1.Insert(2,aPt3,XPOLY_CONTROL); - nPntAnz=aXP1.GetPointCount(); + nPointCount=aXP1.GetPointCount(); pPt2=&aXP1[1]; - pPt3=&aXP1[nPntAnz-2]; + pPt3=&aXP1[nPointCount-2]; pPt2->X()-=dx1/3; pPt2->Y()-=dy1/3; pPt3->X()-=dx2/3; pPt3->Y()-=dy2/3; - } else if (nPntAnz>=4 && nPntAnz<=6) { // Z or U or ... + } else if (nPointCount>=4 && nPointCount<=6) { // Z or U or ... // To all others, the end points of the original lines become control - // points for now. Thus, we need to do some more work for nPntAnz>4! + // points for now. Thus, we need to do some more work for nPointCount>4! aXP1.SetFlags(1,XPOLY_CONTROL); - aXP1.SetFlags(nPntAnz-2,XPOLY_CONTROL); + aXP1.SetFlags(nPointCount-2,XPOLY_CONTROL); // distance x1.5 pPt2->X()+=dx1/2; pPt2->Y()+=dy1/2; pPt3->X()+=dx2/2; pPt3->Y()+=dy2/2; - if (nPntAnz==5) { + if (nPointCount==5) { // add a control point before and after center Point aCenter(aXP1[2]); long dx1b=aCenter.X()-aXP1[1].X(); @@ -1502,7 +1502,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aXP1[4].X()-=dx2b/2; aXP1[4].Y()-=dy2b/2; } - if (nPntAnz==6) { + if (nPointCount==6) { Point aPt1b(aXP1[2]); Point aPt2b(aXP1[3]); aXP1.Insert(2,aPt1b,XPOLY_CONTROL); @@ -1719,20 +1719,20 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const { SdrEdgeKind eKind=static_cast<const SdrEdgeKindItem&>(GetObjectItem(SDRATTR_EDGEKIND)).GetValue(); sal_uInt32 nHdlAnz(0L); - sal_uInt32 nPntAnz(pEdgeTrack->GetPointCount()); + sal_uInt32 nPointCount(pEdgeTrack->GetPointCount()); - if(nPntAnz) + if(nPointCount) { nHdlAnz = 2L; - if ((eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) && nPntAnz >= 4L) + if ((eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) && nPointCount >= 4L) { sal_uInt32 nO1(aEdgeInfo.nObj1Lines > 0L ? aEdgeInfo.nObj1Lines - 1L : 0L); sal_uInt32 nO2(aEdgeInfo.nObj2Lines > 0L ? aEdgeInfo.nObj2Lines - 1L : 0L); sal_uInt32 nM(aEdgeInfo.nMiddleLine != 0xFFFF ? 1L : 0L); nHdlAnz += nO1 + nO2 + nM; } - else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L) + else if (eKind==SDREDGE_THREELINES && nPointCount == 4L) { if(GetConnectedNode(true)) nHdlAnz++; @@ -1748,13 +1748,13 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const { SdrHdl* pHdl=NULL; - sal_uInt32 nPntAnz(pEdgeTrack->GetPointCount()); - if (nPntAnz!=0) { + sal_uInt32 nPointCount(pEdgeTrack->GetPointCount()); + if (nPointCount!=0) { if (nHdlNum==0) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY); if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(true); } else if (nHdlNum==1) { - pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY); + pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPointCount-1)],HDL_POLY); if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(true); } else { SdrEdgeKind eKind=static_cast<const SdrEdgeKindItem&>(GetObjectItem(SDRATTR_EDGEKIND)).GetValue(); @@ -1772,7 +1772,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const } else { nNum=nNum-nO1; if (nNum<nO2) { - nPt=nPntAnz-3-nNum; + nPt=nPointCount-3-nNum; if (nNum==0) static_cast<ImpEdgeHdl*>(pHdl)->SetLineCode(OBJ2LINE2); if (nNum==1) static_cast<ImpEdgeHdl*>(pHdl)->SetLineCode(OBJ2LINE3); } else { @@ -2298,8 +2298,8 @@ void SdrEdgeObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs) if(!bCon2 && pEdgeTrack) { - sal_uInt16 nPntAnz = pEdgeTrack->GetPointCount(); - RotatePoint((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],rRef,sn,cs); + sal_uInt16 nPointCount = pEdgeTrack->GetPointCount(); + RotatePoint((*pEdgeTrack)[sal_uInt16(nPointCount-1)],rRef,sn,cs); ImpDirtyEdgeTrack(); } } @@ -2329,8 +2329,8 @@ void SdrEdgeObj::NbcMirror(const Point& rRef1, const Point& rRef2) if(!bCon2 && pEdgeTrack) { - sal_uInt16 nPntAnz = pEdgeTrack->GetPointCount(); - MirrorPoint((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],rRef1,rRef2); + sal_uInt16 nPointCount = pEdgeTrack->GetPointCount(); + MirrorPoint((*pEdgeTrack)[sal_uInt16(nPointCount-1)],rRef1,rRef2); ImpDirtyEdgeTrack(); } } @@ -2360,8 +2360,8 @@ void SdrEdgeObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea if(!bCon2 && pEdgeTrack) { - sal_uInt16 nPntAnz = pEdgeTrack->GetPointCount(); - ShearPoint((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],rRef,tn,bVShear); + sal_uInt16 nPointCount = pEdgeTrack->GetPointCount(); + ShearPoint((*pEdgeTrack)[sal_uInt16(nPointCount-1)],rRef,tn,bVShear); ImpDirtyEdgeTrack(); } } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index a0c519d97555..9e1f49112780 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -131,9 +131,9 @@ class SdrGraphicUpdater : public ::osl::Thread { public: SdrGraphicUpdater( const OUString& rFileName, const OUString& rFilterName, SdrGraphicLink& ); - virtual ~SdrGraphicUpdater( void ); + virtual ~SdrGraphicUpdater(); - void SAL_CALL Terminate( void ); + void SAL_CALL Terminate(); bool GraphicLinkChanged( const OUString& rFileName ){ return maFileName != rFileName; }; @@ -142,12 +142,12 @@ protected: /** is called from the inherited create method and acts as the main function of this thread. */ - virtual void SAL_CALL run(void) SAL_OVERRIDE; + virtual void SAL_CALL run() SAL_OVERRIDE; /** Called after the thread is terminated via the terminate method. Used to kill the thread by calling delete on this. */ - virtual void SAL_CALL onTerminated(void) SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; private: @@ -167,7 +167,7 @@ SdrGraphicUpdater::SdrGraphicUpdater( const OUString& rFileName, const OUString& create(); } -SdrGraphicUpdater::~SdrGraphicUpdater( void ) +SdrGraphicUpdater::~SdrGraphicUpdater() { } @@ -176,12 +176,12 @@ void SdrGraphicUpdater::Terminate() mbIsTerminated = true; } -void SAL_CALL SdrGraphicUpdater::onTerminated(void) +void SAL_CALL SdrGraphicUpdater::onTerminated() { delete this; } -void SAL_CALL SdrGraphicUpdater::run(void) +void SAL_CALL SdrGraphicUpdater::run() { osl_setThreadName("SdrGraphicUpdater"); @@ -226,7 +226,7 @@ void SdrGraphicLink::RemoveGraphicUpdater() if( pLinkManager && rValue.hasValue() ) { - pLinkManager->GetDisplayNames( this, 0, &rGrafObj.aFileName, 0, &rGrafObj.aFilterName ); + sfx2::LinkManager::GetDisplayNames( this, 0, &rGrafObj.aFileName, 0, &rGrafObj.aFilterName ); Graphic aGraphic; if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic )) diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 531f2b4e9de8..be529e4fa46e 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -544,7 +544,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& } } -basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) const +basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) { basegfx::B2DPolyPolygon aRetval; basegfx::B2DPolygon aPartPolyA; diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 7a26f78b729b..403646b6f10e 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -930,7 +930,7 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() if ( pLinkManager ) { OUString aNewLinkURL; - pLinkManager->GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL, 0, 0 ); if ( !aNewLinkURL.equalsIgnoreAsciiCase( mpImpl->maLinkURL ) ) { const_cast<SdrOle2Obj*>(this)->GetObjRef_Impl(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index efd6a03fb692..262223694d50 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -80,7 +80,7 @@ struct ImpSdrPathDragData : public SdrDragStatUserData bool bClosed; // closed object? sal_uInt16 nPoly; // number of the polygon in the PolyPolygon sal_uInt16 nPnt; // number of point in the above polygon - sal_uInt16 nPntAnz; // number of points of the polygon + sal_uInt16 nPointCount; // number of points of the polygon sal_uInt16 nPntMax; // maximum index bool bBegPnt; // dragged point is first point of a Polyline bool bEndPnt; // dragged point is finishing point of a Polyline @@ -119,7 +119,7 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl , bClosed(false) , nPoly(0) , nPnt(0) - , nPntAnz(0) + , nPointCount(0) , nPntMax(0) , bBegPnt(false) , bEndPnt(false) @@ -171,14 +171,14 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl nPoly=(sal_uInt16)rHdl.GetPolyNum(); // number of the polygon in the PolyPolygon nPnt=(sal_uInt16)rHdl.GetPointNum(); // number of points in the above polygon const XPolygon aTmpXP(rPO.GetPathPoly().getB2DPolygon(nPoly)); - nPntAnz=aTmpXP.GetPointCount(); // number of point of the polygon - if (nPntAnz==0 || (bClosed && nPntAnz==1)) return; // minimum of 1 points for Lines, minimum of 2 points for Polygon - nPntMax=nPntAnz-1; // maximum index + nPointCount=aTmpXP.GetPointCount(); // number of point of the polygon + if (nPointCount==0 || (bClosed && nPointCount==1)) return; // minimum of 1 points for Lines, minimum of 2 points for Polygon + nPntMax=nPointCount-1; // maximum index bBegPnt=!bClosed && nPnt==0; // dragged point is first point of a Polyline bEndPnt=!bClosed && nPnt==nPntMax; // dragged point is finishing point of a Polyline - if (bClosed && nPntAnz<=3) { // if polygon is only a line - bBegPnt=(nPntAnz<3) || nPnt==0; - bEndPnt=(nPntAnz<3) || nPnt==nPntMax-1; + if (bClosed && nPointCount<=3) { // if polygon is only a line + bBegPnt=(nPointCount<3) || nPnt==0; + bEndPnt=(nPointCount<3) || nPnt==nPntMax-1; } nPrevPnt=nPnt; // index of previous point nNextPnt=nPnt; // index of next point @@ -269,11 +269,11 @@ public: XPolygon GetFormPoly() const; bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; - XPolygon GetCurvePoly() const { return XPolygon(); } + static XPolygon GetCurvePoly() { return XPolygon(); } bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; bool CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); - Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView) const; + static Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView); XPolygon GetLinePoly() const; bool CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetRectPoly() const; @@ -387,7 +387,7 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const } } -Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, SdrView* pView) const +Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, SdrView* pView) { long x=aCsr.X(),x1=x,x2=x; long y=aCsr.Y(),y1=y,y2=y; @@ -529,14 +529,14 @@ public: Pointer GetCreatePointer() const; // helping stuff - bool IsClosed(SdrObjKind eKind) const { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; } - bool IsFreeHand(SdrObjKind eKind) const { return eKind==OBJ_FREELINE || eKind==OBJ_FREEFILL; } - bool IsBezier(SdrObjKind eKind) const { return eKind==OBJ_PATHLINE || eKind==OBJ_PATHFILL; } + static bool IsClosed(SdrObjKind eKind) { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; } + static bool IsFreeHand(SdrObjKind eKind) { return eKind==OBJ_FREELINE || eKind==OBJ_FREEFILL; } + static bool IsBezier(SdrObjKind eKind) { return eKind==OBJ_PATHLINE || eKind==OBJ_PATHFILL; } bool IsCreating() const { return mbCreating; } // get the polygon basegfx::B2DPolyPolygon TakeObjectPolyPolygon(const SdrDragStat& rDrag) const; - basegfx::B2DPolyPolygon TakeDragPolyPolygon(const SdrDragStat& rDrag) const; + static basegfx::B2DPolyPolygon TakeDragPolyPolygon(const SdrDragStat& rDrag); basegfx::B2DPolyPolygon getModifiedPolyPolygon() const { return aPathPolygon.getB2DPolyPolygon(); } }; @@ -685,11 +685,11 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // its neighboring points Point aNeuPos1,aNeuPos2; // new alternative for aPos bool bPnt1 = false, bPnt2 = false; // are these valid alternatives? - if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // minimum of 2 points for lines + if (!bClosed && mpSdrPathDragData->nPointCount>=2) { // minimum of 2 points for lines if (!bBegPnt) nPnt1=nPrevPnt; if (!bEndPnt) nPnt2=nNextPnt; } - if (bClosed && mpSdrPathDragData->nPntAnz>=3) { // minimum of 3 points for polygon + if (bClosed && mpSdrPathDragData->nPointCount>=3) { // minimum of 3 points for polygon nPnt1=nPrevPnt; nPnt2=nNextPnt; } @@ -957,7 +957,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag if(pU->bCircle) { - mrSdrPathObject.GetModel()->TakeAngleStr(std::abs(pU->nCircRelAngle), aMetr); + SdrModel::TakeAngleStr(std::abs(pU->nCircRelAngle), aMetr); aStr += aMetr; aStr += " r="; mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, true); @@ -981,7 +981,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aNow)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } @@ -1049,11 +1049,11 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag { sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum()); const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()]; - sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount()); + sal_uInt16 nPointCount((sal_uInt16)rXPoly.GetPointCount()); bool bClose(IsClosed(meObjectKind)); if(bClose) - nPntAnz--; + nPointCount--; if(pHdl->IsPlusHdl()) { @@ -1074,17 +1074,17 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aNow)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } - else if(nPntAnz > 1) + else if(nPointCount > 1) { - sal_uInt16 nPntMax(nPntAnz - 1); + sal_uInt16 nPntMax(nPointCount - 1); bool bIsClosed(IsClosed(meObjectKind)); bool bPt1(nPntNum > 0); bool bPt2(nPntNum < nPntMax); - if(bIsClosed && nPntAnz > 2) + if(bIsClosed && nPointCount > 2) { bPt1 = true; bPt2 = true; @@ -1120,7 +1120,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aPt)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } @@ -1141,7 +1141,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aPt)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } } @@ -1176,7 +1176,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra } // copy certain data locally to use less code and have faster access times bool bClosed =mpSdrPathDragData->bClosed ; // closed object? - sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ; // number of points + sal_uInt16 nPointCount = mpSdrPathDragData->nPointCount; // number of points sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // number of points in the polygon bool bBegPnt =mpSdrPathDragData->bBegPnt ; // dragged point is the first point of a Polyline bool bEndPnt =mpSdrPathDragData->bEndPnt ; // dragged point is the last point of a Polyline @@ -1249,7 +1249,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra if (bEndPnt) aXPoly.Remove(aXPoly.GetPointCount()-1,1); } if (bClosed) { // "pear problem": 2 lines, 1 curve, everything smoothed, a point between both lines is dragged - if (aXPoly.GetPointCount()>nPntAnz && aXPoly.IsControl(1)) { + if (aXPoly.GetPointCount()>nPointCount && aXPoly.IsControl(1)) { sal_uInt16 a=aXPoly.GetPointCount(); aXPoly[a-2]=aXPoly[2]; aXPoly.SetFlags(a-2,aXPoly.GetFlags(2)); aXPoly[a-1]=aXPoly[3]; aXPoly.SetFlags(a-1,aXPoly.GetFlags(3)); @@ -1451,11 +1451,11 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) nActPoint--; } if (pU->IsFormFlag()) { - sal_uInt16 nPtAnz0=rXPoly.GetPointCount(); + sal_uInt16 nPointCount0=rXPoly.GetPointCount(); rXPoly.Remove(nActPoint-1,2); // remove last two points and replace by form rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly()); - sal_uInt16 nPtAnz1=rXPoly.GetPointCount(); - for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // to make BckAction work + sal_uInt16 nPointCount1=rXPoly.GetPointCount(); + for (sal_uInt16 i=nPointCount0+1; i<nPointCount1-1; i++) { // to make BckAction work if (!rXPoly.IsControl(i)) rStat.NextPoint(); } nActPoint=rXPoly.GetPointCount()-1; @@ -1476,31 +1476,31 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } - sal_uInt16 nPolyAnz=aPathPolygon.Count(); - if (nPolyAnz!=0) { + sal_uInt16 nPolyCount=aPathPolygon.Count(); + if (nPolyCount!=0) { // delete last point, if necessary if (eCmd==SDRCREATE_FORCEEND) { - XPolygon& rXP=aPathPolygon[nPolyAnz-1]; - sal_uInt16 nPtAnz=rXP.GetPointCount(); - if (nPtAnz>=2) { - if (!rXP.IsControl(nPtAnz-2)) { - if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) { - rXP.Remove(nPtAnz-1,1); + XPolygon& rXP=aPathPolygon[nPolyCount-1]; + sal_uInt16 nPointCount=rXP.GetPointCount(); + if (nPointCount>=2) { + if (!rXP.IsControl(nPointCount-2)) { + if (rXP[nPointCount-1]==rXP[nPointCount-2]) { + rXP.Remove(nPointCount-1,1); } } else { - if (rXP[nPtAnz-3]==rXP[nPtAnz-2]) { - rXP.Remove(nPtAnz-3,3); + if (rXP[nPointCount-3]==rXP[nPointCount-2]) { + rXP.Remove(nPointCount-3,3); } } } } - for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) { + for (sal_uInt16 nPolyNum=nPolyCount; nPolyNum>0;) { nPolyNum--; XPolygon& rXP=aPathPolygon[nPolyNum]; - sal_uInt16 nPtAnz=rXP.GetPointCount(); + sal_uInt16 nPointCount=rXP.GetPointCount(); // delete polygons with too few points - if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) { - if (nPtAnz<2) aPathPolygon.Remove(nPolyNum); + if (nPolyNum<nPolyCount-1 || eCmd==SDRCREATE_FORCEEND) { + if (nPointCount<2) aPathPolygon.Remove(nPolyNum); } } } @@ -1605,7 +1605,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr return aRetval; } -basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDragStat& rDrag) const +basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDragStat& rDrag) { basegfx::B2DPolyPolygon aRetval; SdrView* pView = rDrag.GetView(); @@ -2308,7 +2308,7 @@ basegfx::B2DPolyPolygon SdrPathObj::TakeCreatePoly(const SdrDragStat& rDrag) con if(mpDAC) { aRetval = mpDAC->TakeObjectPolyPolygon(rDrag); - aRetval.append(mpDAC->TakeDragPolyPolygon(rDrag)); + aRetval.append(ImpPathForDragAndCreate::TakeDragPolyPolygon(rDrag)); } return aRetval; @@ -2333,7 +2333,7 @@ basegfx::B2DPolyPolygon SdrPathObj::getDragPolyPolygon(const SdrDragStat& rDrag) if(mpDAC) { - aRetval = mpDAC->TakeDragPolyPolygon(rDrag); + aRetval = ImpPathForDragAndCreate::TakeDragPolyPolygon(rDrag); } return aRetval; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 4f5dc1510a67..43c1aa31c855 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -412,7 +412,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons return eRet; } // defaults: TOP for text frame, CENTER for captions of drawing objects -void SdrTextObj::ImpJustifyRect(Rectangle& rRect) const +void SdrTextObj::ImpJustifyRect(Rectangle& rRect) { if (!rRect.IsEmpty()) { rRect.Justify(); @@ -878,7 +878,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const return pPara; } -void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const +void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) { OutputDevice* pOut = rOutliner.GetRefDevice(); bool bNoStretching(false); @@ -1793,20 +1793,20 @@ long SdrTextObj::GetMaxTextFrameWidth() const bool SdrTextObj::IsFontwork() const { - return (bTextFrame) ? false // Default is FALSE - : static_cast<const XFormTextStyleItem&>(GetObjectItemSet().Get(XATTR_FORMTXTSTYLE)).GetValue() != XFT_NONE; + return !bTextFrame // Default is FALSE + && static_cast<const XFormTextStyleItem&>(GetObjectItemSet().Get(XATTR_FORMTXTSTYLE)).GetValue() != XFT_NONE; } bool SdrTextObj::IsHideContour() const { - return (bTextFrame) ? false // Default is: no, don't HideContour; HideContour not together with TextFrames - : static_cast<const XFormTextHideFormItem&>(GetObjectItemSet().Get(XATTR_FORMTXTHIDEFORM)).GetValue(); + return !bTextFrame // Default is: no, don't HideContour; HideContour not together with TextFrames + && static_cast<const XFormTextHideFormItem&>(GetObjectItemSet().Get(XATTR_FORMTXTHIDEFORM)).GetValue(); } bool SdrTextObj::IsContourTextFrame() const { - return (bTextFrame) ? false // ContourFrame not together with normal TextFrames - : static_cast<const SdrOnOffItem&>(GetObjectItemSet().Get(SDRATTR_TEXT_CONTOURFRAME)).GetValue(); + return !bTextFrame // ContourFrame not together with normal TextFrames + && static_cast<const SdrOnOffItem&>(GetObjectItemSet().Get(SDRATTR_TEXT_CONTOURFRAME)).GetValue(); } long SdrTextObj::GetTextLeftDistance() const diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 8041b3dd4add..84ef3242fd46 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -97,9 +97,9 @@ namespace DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo* ); DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo* ); - bool impIsUnderlineAbove(const vcl::Font& rFont) const; + static bool impIsUnderlineAbove(const vcl::Font& rFont); void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo); - drawinglayer::primitive2d::BasePrimitive2D* impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) const; + static drawinglayer::primitive2d::BasePrimitive2D* impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo); void impFlushTextPortionPrimitivesToLinePrimitives(); void impFlushLinePrimitivesToParagraphPrimitives(); void impHandleDrawPortionInfo(const DrawPortionInfo& rInfo); @@ -159,7 +159,7 @@ namespace drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(); }; - bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) const + bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) { if(!rFont.IsVertical()) { @@ -452,7 +452,7 @@ namespace } } - drawinglayer::primitive2d::BasePrimitive2D* impTextBreakupHandler::impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) const + drawinglayer::primitive2d::BasePrimitive2D* impTextBreakupHandler::impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) { if(rInfo.mpFieldData) { diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 61b5f8acf1e9..6d053e47ddb3 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -92,7 +92,7 @@ namespace maFont(rInfo.mrFont), maDblDXArray(), maLocale(rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale()), - mbRTL(rInfo.mrFont.IsVertical() ? sal_False : rInfo.IsRTL()) + mbRTL(!rInfo.mrFont.IsVertical() && rInfo.IsRTL()) { if(mnTextLength && rInfo.mpDXArray) { @@ -214,7 +214,7 @@ namespace std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& mrShadowDecomposition; // destination primitive list for shadow Reference < com::sun::star::i18n::XBreakIterator > mxBreak; // break iterator - double getParagraphTextLength(const ::std::vector< const impPathTextPortion* >& rTextPortions) + static double getParagraphTextLength(const ::std::vector< const impPathTextPortion* >& rTextPortions) { drawinglayer::primitive2d::TextLayouterDevice aTextLayouter; double fRetval(0.0); diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 27d97a259b85..c0913d2ce7bd 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -81,7 +81,7 @@ void ImpSdrObjTextLink::Closed() { OUString aFile; OUString aFilter; - pLinkManager->GetDisplayNames( this, 0,&aFile, 0, &aFilter ); + sfx2::LinkManager::GetDisplayNames( this, 0,&aFile, 0, &aFilter ); if( pData->aFileName != aFile || pData->aFilterName != aFilter ) diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index a2be884b8a4c..fca3331358c8 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -258,8 +258,8 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) } Polygon aPol(Rect2Poly(maRect,aGeo)); sal_uInt16 i; - sal_uInt16 nPntAnz=aPol.GetSize(); - for (i=0; i<nPntAnz; i++) { + sal_uInt16 nPointCount=aPol.GetSize(); + for (i=0; i<nPointCount; i++) { MirrorPoint(aPol[i],rRef1,rRef2); } // turn polygon and move it a little diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 590f847a62cb..6c35b7128752 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -320,7 +320,7 @@ void SdrObjList::SetRectsDirty() if (pUpList!=NULL) pUpList->SetRectsDirty(); } -void SdrObjList::impChildInserted(SdrObject& rChild) const +void SdrObjList::impChildInserted(SdrObject& rChild) { sdr::contact::ViewContact* pParent = rChild.GetViewContact().GetParentContact(); @@ -763,7 +763,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) -bool SdrObjList::HasObjectNavigationOrder (void) const +bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder.get() != NULL; } @@ -857,7 +857,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat -void SdrObjList::ClearObjectNavigationOrder (void) +void SdrObjList::ClearObjectNavigationOrder() { mxNavigationOrder.reset(); mbIsNavigationOrderDirty = true; @@ -866,7 +866,7 @@ void SdrObjList::ClearObjectNavigationOrder (void) -bool SdrObjList::RecalcNavigationPositions (void) +bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) { diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 911527d961aa..59c0fbb36d8a 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -190,7 +190,7 @@ void SdrPaintView::ImpClearVars() bRestoreColors=true; pDefaultStyleSheet=NULL; bSomeObjChgdFlag=false; - nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD; + nGraphicManagerDrawMode = GraphicManagerDrawFlags::STANDARD; aComeBackIdle.SetPriority(SchedulerPriority::REPAINT); aComeBackIdle.SetIdleHdl(LINK(this,SdrPaintView,ImpComeBackHdl)); @@ -573,7 +573,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s static bool bTimesInited(false); static sal_uInt32 nRepeatCount(10L); static double fLastTimes[REMEMBERED_TIMES_COUNT]; - const sal_uInt32 nStartTime(tools::Time::GetSystemTicks()); + const sal_uInt64 nStartTime(tools::Time::GetSystemTicks()); sal_uInt32 count(1L); sal_uInt32 a; @@ -647,8 +647,8 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s if(bDoTimerTest) { - const sal_uInt32 nStopTime(tools::Time::GetSystemTicks()); - const sal_uInt32 nNeededTime(nStopTime - nStartTime); + const sal_uInt64 nStopTime(tools::Time::GetSystemTicks()); + const sal_uInt64 nNeededTime(nStopTime - nStartTime); const double fTimePerPaint((double)nNeededTime / (double)nRepeatCount); if(!bTimesInited) @@ -680,7 +680,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s const double fAverageTimePerPaint(fAddedTimes / (double)REMEMBERED_TIMES_COUNT); fprintf(stderr, "-----------(start result)----------\n"); - fprintf(stderr, "StartTime : %u, StopTime: %u, NeededTime: %u, TimePerPaint: %f\n", nStartTime, nStopTime, nNeededTime, fTimePerPaint); + fprintf(stderr, "StartTime : %" SAL_PRIuUINT64 ", StopTime: %" SAL_PRIuUINT64 ", NeededTime: %" SAL_PRIuUINT64 ", TimePerPaint: %f\n", nStartTime, nStopTime, nNeededTime, fTimePerPaint); fprintf(stderr, "Remembered times: "); for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++) diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 7a33186a843b..9d559ff5af4f 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -391,7 +391,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints() if(nNewPt0Idx) { // correction necessary? - DBG_ASSERT(bKorregFlag==false,"Multiple index corrections at SdrPolyEditView::RipUp()."); + DBG_ASSERT(!bKorregFlag,"Multiple index corrections at SdrPolyEditView::RipUp()."); if(!bKorregFlag) { bKorregFlag = true; @@ -588,9 +588,9 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size(); + sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj); - if (nPtAnz!=0 && pPath!=NULL) + if (nPointCount!=0 && pPath!=NULL) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 488d6c66d601..476b4be808e4 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -367,24 +367,24 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - sal_uInt16 nPolyAnz=rPoly.Count(); - for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyCount=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyCount; nPolyNum++) { CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - sal_uInt16 nPolyAnz=rPoly.Count(); - for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyCount=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyCount; nPolyNum++) { CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle& rRefRect) { - sal_uInt16 nPolyAnz=rPoly.Count(); - for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyCount=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyCount; nPolyNum++) { CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect); } } diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 12bf4203b9d4..74665329c8a6 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1456,7 +1456,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) const +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) { rStr = ImpGetResStr(nStrCacheID); } @@ -1736,32 +1736,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ); + return new SdrUndoAttrObj( rObject, bStyleSheet1, bSaveText ); } SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoRemoveObj( rObject, bOrdNumDirect ); } SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoInsertObj( rObject, bOrdNumDirect ); } SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoDelObj( rObject, bOrdNumDirect ); } SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoNewObj( rObject, bOrdNumDirect ); } SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoCopyObj( rObject, bOrdNumDirect ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) @@ -1771,7 +1771,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index e04614eb363e..3770c656a2a2 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -59,14 +59,14 @@ AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::s -AccessibleCell::~AccessibleCell (void) +AccessibleCell::~AccessibleCell() { DBG_ASSERT( mpText == 0, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } -void AccessibleCell::Init (void) +void AccessibleCell::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView(); const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); @@ -198,7 +198,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI SHOWING VISIBLE */ -Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (void) throw (RuntimeException, std::exception) +Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -313,7 +313,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException, std::exception) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -360,7 +360,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation(void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed (); ::com::sun::star::awt::Rectangle aBoundingBox(getBounds()); @@ -369,7 +369,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen(void) throw(RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) { ThrowIfDisposed (); @@ -394,7 +394,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException, std::exception) +awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -417,14 +417,14 @@ void SAL_CALL AccessibleCell::removeFocusListener (const ::com::sun::star::uno:: -void SAL_CALL AccessibleCell::grabFocus (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleCell::grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); } -sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -435,7 +435,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException, -sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -448,7 +448,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, // XAccessibleExtendedComponent -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) { //todo return AccessibleComponentBase::getFont(); @@ -456,14 +456,14 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, -OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getTitledBorderText(); } -OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getToolTipText(); } @@ -504,14 +504,14 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc // XServiceInfo -OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeException, std::exception) { return OUString("AccessibleCell"); } -Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw (RuntimeException, std::exception) +Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -545,7 +545,7 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc // protected -void AccessibleCell::disposing (void) +void AccessibleCell::disposing() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -572,7 +572,7 @@ void AccessibleCell::disposing (void) AccessibleContextBase::dispose (); } -sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { ThrowIfDisposed (); return mnIndexInParent; @@ -615,7 +615,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) return aBuf.makeStringAndClear(); } -OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; @@ -646,7 +646,7 @@ void AccessibleCell::UpdateChildren() +If this is correct, we also don't need sdr::table::CellRef getCellRef(), UpdateChildren(), getCellName( sal_Int32 nCol, sal_Int32 nRow ) above + -OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 86d31e9d38d1..dca0e54d79cc 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -52,9 +52,9 @@ class AccessibleCell : boost::noncopyable, public AccessibleCellBase, public Acc { public: AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleCell (void); + virtual ~AccessibleCell(); - void Init (void); + void Init(); bool operator== (const AccessibleCell& rAccessibleCell); @@ -67,40 +67,40 @@ public: virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); - OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); + static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(const ::com::sun::star::awt::Point& aPoint) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // IAccessibleViewForwarderListener virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; @@ -126,7 +126,7 @@ protected: sdr::table::CellRef mxCell; /// This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; AccessibleTableShape *pAccTable; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 1cb7685b2004..862c39f58507 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -311,7 +311,7 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf -AccessibleTableShape::~AccessibleTableShape (void) +AccessibleTableShape::~AccessibleTableShape() { } @@ -380,20 +380,20 @@ void SAL_CALL AccessibleTableShape::release( ) throw () // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext() throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } -OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException) { return OUString("TableShape"); } @@ -423,14 +423,14 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessible -sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::TABLE; } -void SAL_CALL AccessibleTableShape::disposing (void) +void SAL_CALL AccessibleTableShape::disposing() { mxImpl->dispose(); @@ -1037,13 +1037,13 @@ AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pT mbRow = bRow; } -AccessibleTableHeaderShape::~AccessibleTableHeaderShape (void) +AccessibleTableHeaderShape::~AccessibleTableHeaderShape() { mpTable = NULL; } // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext() throw (RuntimeException, std::exception) { return this; } @@ -1059,43 +1059,43 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild return mpTable->getAccessibleChild( i ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent (void) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent() throw (RuntimeException, std::exception) { Reference< XAccessible > XParent; return XParent; } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { return -1; } -sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole() throw (RuntimeException, std::exception) { return mpTable->getAccessibleRole(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription (void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription() throw (RuntimeException, std::exception) { return mpTable->getAccessibleDescription(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName (void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName() throw (RuntimeException, std::exception) { return mpTable->getAccessibleName(); } -Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet (void) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet() throw (RuntimeException, std::exception) { return mpTable->getAccessibleStateSet(); } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet (void) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet() throw (RuntimeException, std::exception) { return mpTable->getAccessibleRelationSet(); } -Locale SAL_CALL AccessibleTableHeaderShape::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL AccessibleTableHeaderShape::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return mpTable->getLocale(); } @@ -1111,37 +1111,37 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoi return mpTable->getAccessibleAtPoint( aPoint ); } -::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception) { return mpTable->getBounds(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception) { return mpTable->getLocation(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception) { return mpTable->getLocationOnScreen(); } -::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception) { return mpTable->getSize(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground() throw (RuntimeException, std::exception) { return mpTable->getForeground(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground() throw (RuntimeException, std::exception) { return mpTable->getBackground(); } -void SAL_CALL AccessibleTableHeaderShape::grabFocus (void) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleTableHeaderShape::grabFocus() throw (RuntimeException, std::exception) { mpTable->grabFocus(); } diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index c88b4bd2005d..11aedb88cacf 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -994,7 +994,7 @@ sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException, std::exception) Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) { - Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) ); + Any aAny( SvxItemPropertySet_getPropertyValue( pMap, aSet ) ); if( pMap->aType != aAny.getValueType() ) { @@ -1150,7 +1150,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& if( aSet.GetItemState( pMap->nWID ) == SfxItemState::SET ) { - SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rValue, aSet ); + SvxItemPropertySet_setPropertyValue( pMap, rValue, aSet ); } } } diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index f2b4692a327a..c949cc6b9012 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -519,7 +519,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset //Todo: Implement Dragging functionality for leftmost edge of table. if( (nEdge >= 0) && (nEdge <= getColumnCount()) ) { - const bool bRTL = !mpTableObj? false: (mpTableObj->GetWritingMode() == WritingMode_RL_TB); + const bool bRTL = mpTableObj != nullptr && (mpTableObj->GetWritingMode() == WritingMode_RL_TB); sal_Int32 nWidth; if(bRTL) { @@ -814,7 +814,7 @@ bool SdrTableObj::isValid( const CellPos& rPos ) const -CellPos SdrTableObj::getFirstCell() const +CellPos SdrTableObj::getFirstCell() { return CellPos( 0,0 ); } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 9a2dd80e9fb8..9848f65e8692 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -241,7 +241,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow sal_uInt16 nAction = getKeyboardAction( rKEvt, pWindow ); - return executeAction( nAction, ( rKEvt.GetKeyCode().IsShift() ) ? sal_True : sal_False, pWindow ); + return executeAction( nAction, rKEvt.GetKeyCode().IsShift(), pWindow ); } @@ -399,7 +399,7 @@ void SvxTableController::onSelectionHasChanged() /* fdo#46186 Selecting the table means selecting the entire cells */ if (!hasSelectedCells() && pTableObj) { - maCursorFirstPos = pTableObj->getFirstCell(); + maCursorFirstPos = SdrTableObj::getFirstCell(); maCursorLastPos = pTableObj->getLastCell(); mbCellSelectionMode=true; } @@ -1460,7 +1460,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Wi if( !bMod1 && !bMod2 && !bTextEdit ) { // when not already editing, return starts text edit - setSelectionStart( pTableObj->getFirstCell() ); + setSelectionStart( SdrTableObj::getFirstCell() ); nAction = ACTION_EDIT_CELL; } break; @@ -1483,7 +1483,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Wi else { // f2 with no selection and no text edit starts text edit - setSelectionStart( pTableObj->getFirstCell() ); + setSelectionStart( SdrTableObj::getFirstCell() ); nAction = ACTION_EDIT_CELL; } break; @@ -1621,7 +1621,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W { case ACTION_GOTO_FIRST_CELL: { - gotoCell( pTableObj->getFirstCell(), bSelect, pWindow, nAction ); + gotoCell( SdrTableObj::getFirstCell(), bSelect, pWindow, nAction ); break; } @@ -1645,7 +1645,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W case ACTION_GOTO_FIRST_COLUMN: { - CellPos aPos( pTableObj->getFirstCell().mnCol, getSelectionEnd().mnRow ); + CellPos aPos( SdrTableObj::getFirstCell().mnCol, getSelectionEnd().mnRow ); gotoCell( aPos, bSelect, pWindow, nAction ); break; } @@ -1659,7 +1659,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W case ACTION_GOTO_FIRST_ROW: { - CellPos aPos( getSelectionEnd().mnCol, pTableObj->getFirstCell().mnRow ); + CellPos aPos( getSelectionEnd().mnCol, SdrTableObj::getFirstCell().mnRow ); gotoCell( aPos, bSelect, pWindow, nAction ); break; } @@ -2765,7 +2765,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo xCell->SetMergedItemSetAndBroadcast(aAttr, bReplaceAll); SdrText* pText = static_cast< SdrText* >( xCell.get() ); - mpView->ApplyFormatPaintBrushToText( rFormatSet, *pTableObj, pText, bNoCharacterFormats, bNoParagraphFormats ); + SdrObjEditView::ApplyFormatPaintBrushToText( rFormatSet, *pTableObj, pText, bNoCharacterFormats, bNoParagraphFormats ); } } } diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index f60fc3ef62cb..642128bbf2e9 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -111,7 +111,7 @@ private: inline bool isValid( const CellPos& rPos ) const { return isValidColumn( rPos.mnCol ) && isValidRow( rPos.mnRow ); } void ClearBorderLayout(); - void ClearBorderLayout(BorderLineMap& rMap); + static void ClearBorderLayout(BorderLineMap& rMap); void ResizeBorderLayout(); void ResizeBorderLayout( BorderLineMap& rMap ); @@ -130,7 +130,7 @@ private: }; typedef std::vector< Layout > LayoutVector; - sal_Int32 distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ); + static sal_Int32 distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ); TableModelRef mxTable; LayoutVector maRows; diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index caf0570e2306..a241d615c8e0 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -415,7 +415,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo ) // ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True ); break; case RTF_BRDRDEF: - static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True ); + static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, true ); break; } } diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index e1bc89c12385..baecf497ec28 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -40,21 +40,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl:: return new SvxColorValueSet(pParent, nWinBits); } -sal_uInt32 SvxColorValueSet::getMaxRowCount() const +sal_uInt32 SvxColorValueSet::getMaxRowCount() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); return rStyleSettings.GetColorValueSetMaximumRowCount(); } -sal_uInt32 SvxColorValueSet::getEntryEdgeLength() const +sal_uInt32 SvxColorValueSet::getEntryEdgeLength() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); return rStyleSettings.GetListBoxPreviewDefaultPixelSize().Height() + 1; } -sal_uInt32 SvxColorValueSet::getColumnCount() const +sal_uInt32 SvxColorValueSet::getColumnCount() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index c3a3402c4037..23c743ca9d4e 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -230,10 +230,10 @@ SvxColorDockingWindow::SvxColorDockingWindow } } - aItemSize = aColorSet->CalcItemSizePixel(Size(aColorSet->getEntryEdgeLength(), aColorSet->getEntryEdgeLength())); - aItemSize.Width() = aItemSize.Width() + aColorSet->getEntryEdgeLength(); + aItemSize = aColorSet->CalcItemSizePixel(Size(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength())); + aItemSize.Width() = aItemSize.Width() + SvxColorValueSet::getEntryEdgeLength(); aItemSize.Width() /= 2; - aItemSize.Height() = aItemSize.Height() + aColorSet->getEntryEdgeLength(); + aItemSize.Height() = aItemSize.Height() + SvxColorValueSet::getEntryEdgeLength(); aItemSize.Height() /= 2; SetSize(); @@ -274,7 +274,7 @@ void SvxColorDockingWindow::FillValueSet() aColorSet->Clear(); // create the first entry for 'invisible/none' - const Size aColorSize(aColorSet->getEntryEdgeLength(), aColorSet->getEntryEdgeLength()); + const Size aColorSize(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength()); long nPtX = aColorSize.Width() - 1; long nPtY = aColorSize.Height() - 1; ScopedVclPtrInstance< VirtualDevice > pVD; @@ -491,7 +491,7 @@ void SvxColorDockingWindow::Resize() -void SvxColorDockingWindow::GetFocus (void) +void SvxColorDockingWindow::GetFocus() { SfxDockingWindow::GetFocus(); // Grab the focus to the color value set so that it can be controlled diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 2bcccfa2b978..4bea14d66947 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -40,7 +40,7 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot , m_bPersistentCopy(false) , m_aDoubleClickTimer() { - sal_uIntPtr nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime(); + sal_uInt64 nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime(); m_aDoubleClickTimer.SetTimeoutHdl( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) ); m_aDoubleClickTimer.SetTimeout(nDblClkTime); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 26aebdeabf31..5cc2a78736a2 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -321,7 +321,7 @@ private: virtual void Select() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void ImplReleaseFocus(); + static void ImplReleaseFocus(); public: ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& rFrame ); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 3b15a2a2877e..09008172a790 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -51,8 +51,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -#define LOGICAL_EDIT_HEIGHT 12 - SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : LineLB( pParent, nBits ), nCurPos ( 0 ), @@ -229,8 +227,6 @@ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); - Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); - SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); } LineLB::DataChanged( rDCEvt ); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 82be0ad0e714..5f303bc76b98 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -599,7 +599,7 @@ void SvxLineEndWindow::SetSize() //SetMinOutputSizePixel( aSize ); } -void SvxLineEndWindow::GetFocus (void) +void SvxLineEndWindow::GetFocus() { SfxPopupWindow::GetFocus(); // Grab the focus to the line ends value set so that it can be controlled diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 0e94807a483e..94dd822d5b1c 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -93,7 +93,6 @@ #include <svx/xflclit.hxx> #define MAX_MRU_FONTNAME_ENTRIES 5 -#define LOGICAL_EDIT_HEIGHT 12 // don't make more than 15 entries visible at once #define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 ) @@ -124,7 +123,7 @@ public: virtual void dispose() SAL_OVERRIDE; void SetFamily( SfxStyleFamily eNewFamily ); - inline bool IsVisible() { return bVisible; } + bool IsVisible() const { return bVisible; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -133,10 +132,12 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - inline void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; } + void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; } void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } + void CalcOptimalExtraUserWidth(); + protected: virtual void Select() SAL_OVERRIDE; @@ -158,7 +159,10 @@ private: PopupMenu m_aMenu; void ReleaseFocus(); - Color TestColorsVisible(const Color &FontCol, const Color &BackCol); + static Color TestColorsVisible(const Color &FontCol, const Color &BackCol); + void UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString &rStyleName); + void SetupEntry(sal_uInt16 nItem, const Rectangle& rRect, OutputDevice *pDevice, const OUString &rStyleName, bool bIsNotSelected); + bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight); DECL_LINK( MenuSelectHdl, Menu * ); }; @@ -189,6 +193,8 @@ private: } DECL_DLLPRIVATE_LINK( CheckAndMarkUnknownFont, VclWindowEvent* ); + void SetOptimalSize(); + protected: virtual void Select() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -300,6 +306,9 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleToolBoxControl& rControl; }; +#define BUTTON_WIDTH 20 +#define ITEM_HEIGHT 30 + SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, @@ -327,7 +336,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT ); EnableAutocomplete( true ); EnableUserDraw( true ); - SetUserItemSize( Size( 0, 30 ) ); + SetUserItemSize( Size( 0, ITEM_HEIGHT ) ); } SvxStyleBox_Impl::~SvxStyleBox_Impl() @@ -534,8 +543,6 @@ void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); - Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); - SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); } ComboBox::DataChanged( rDCEvt ); @@ -559,18 +566,51 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange ) } } -void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) +bool SvxStyleBox_Impl::AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight) { - sal_uInt16 nItem = rUDEvt.GetItemId(); + if (rTextRect.Bottom() > nHeight) + { + // the text does not fit, adjust the font size + double ratio = static_cast< double >( nHeight ) / rTextRect.Bottom(); + vcl::Font aFont(pDevice->GetFont()); + Size aPixelSize(aFont.GetSize()); + aPixelSize.Width() *= ratio; + aPixelSize.Height() *= ratio; + aFont.SetSize(aPixelSize); + pDevice->SetFont(aFont); + return true; + } + return false; +} - if ( nItem == 0 || nItem == GetEntryCount() - 1 ) +void SvxStyleBox_Impl::UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString &rStyleName) +{ + OutputDevice *pDevice = rUDEvt.GetDevice(); + + // IMG_TXT_DISTANCE in ilstbox.hxx is 6, then 1 is added as + // nBorder, and we are adding 1 in order to look better when + // italics is present + const int nLeftDistance = 8; + + Rectangle aTextRect; + pDevice->GetTextBoundRect(aTextRect, rStyleName); + + Point aPos( rUDEvt.GetRect().TopLeft() ); + aPos.X() += nLeftDistance; + + if (!AdjustFontForItemHeight(pDevice, aTextRect, rUDEvt.GetRect().GetHeight())) + aPos.Y() += ( rUDEvt.GetRect().GetHeight() - aTextRect.Bottom() ) / 2; + + pDevice->DrawText(aPos, rStyleName); +} + +void SvxStyleBox_Impl::SetupEntry(sal_uInt16 nItem, const Rectangle& rRect, OutputDevice* pDevice, const OUString& rStyleName, bool bIsNotSelected) +{ + if (nItem == 0 || nItem == GetEntryCount() - 1) { - Rectangle aRect(rUDEvt.GetRect()); - unsigned int nId = (aRect.getY() / aRect.GetSize().Height()); + unsigned int nId = (rRect.getY() / rRect.GetSize().Height()); if(nId < MAX_STYLES_ENTRIES && m_pButtons[nId]) m_pButtons[nId]->Hide(); - // draw the non-style entries, ie. "Clear Formatting" or "More..." - DrawEntry( rUDEvt, true, true ); } else { @@ -578,23 +618,16 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) SfxStyleSheetBasePool* pPool = pShell->GetStyleSheetPool(); SfxStyleSheetBase* pStyle = NULL; - OUString aStyleName( GetEntry( nItem ) ); - if ( pPool ) { pPool->SetSearchMask( eStyleFamily, SFXSTYLEBIT_ALL ); pStyle = pPool->First(); - while ( pStyle && OUString( pStyle->GetName() ) != aStyleName ) + while (pStyle && pStyle->GetName() != rStyleName) pStyle = pPool->Next(); } - if ( !pStyle ) - { - // cannot find the style for whatever reason - DrawEntry( rUDEvt, true, true ); - } - else + if (pStyle ) { const SfxItemSet& aItemSet = pStyle->GetItemSet(); @@ -603,8 +636,6 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) if ( pFontItem && pFontHeightItem ) { - OutputDevice *pDevice = rUDEvt.GetDevice(); - Size aFontSize( 0, pFontHeightItem->GetHeight() ); Size aPixelSize( pDevice->LogicToPixel( aFontSize, pShell->GetMapUnit() ) ); @@ -656,25 +687,21 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) // setup the device & draw vcl::Font aOldFont( pDevice->GetFont() ); - Color aOldColor( pDevice->GetTextColor() ); - Color aOldFillColor( pDevice->GetFillColor() ); Color aFontCol = COL_AUTO, aBackCol = COL_AUTO; pDevice->SetFont( aFont ); - bool IsNotSelected = rUDEvt.GetItemId() != GetSelectEntryPos(); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_COLOR ); // text color, when nothing is selected - if ( (NULL != pItem) && IsNotSelected) + if ( (NULL != pItem) && bIsNotSelected) aFontCol = Color( static_cast< const SvxColorItem* >( pItem )->GetValue() ); sal_uInt16 style = drawing::FillStyle_NONE; // which kind of Fill style is selected pItem = aItemSet.GetItem( XATTR_FILLSTYLE ); // only when ok and not selected - if ( (NULL != pItem) && IsNotSelected) + if ( (NULL != pItem) && bIsNotSelected) style = static_cast< const XFillStyleItem* >( pItem )->GetValue(); switch(style) @@ -689,13 +716,13 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) if ( aBackCol != COL_AUTO ) { pDevice->SetFillColor( aBackCol ); - pDevice->DrawRect( rUDEvt.GetRect() ); + pDevice->DrawRect(rRect); } } break; //TODO Draw the other background styles: gradient, hatching and bitmap - } + } // when the font and background color are too similar, adjust the Font-Color if( (aFontCol != COL_AUTO) || (aBackCol != COL_AUTO) ) @@ -706,65 +733,89 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) pDevice->SetTextColor( aFontCol ); // handle the push-button - if (IsNotSelected) + if (bIsNotSelected) { - Rectangle aRect(rUDEvt.GetRect()); - unsigned int nId = (aRect.getY() / aRect.GetSize().Height()); + unsigned int nId = (rRect.getY() / rRect.GetSize().Height()); if(nId < MAX_STYLES_ENTRIES && m_pButtons[nId]) m_pButtons[nId]->Hide(); } else { - Rectangle aRect(rUDEvt.GetRect()); - unsigned int nId = (aRect.getY() / aRect.GetSize().Height()); + unsigned int nId = (rRect.getY() / rRect.GetSize().Height()); if(nId < MAX_STYLES_ENTRIES) { if(m_pButtons[nId] == nullptr) { m_pButtons[nId] = VclPtr<MenuButton>::Create(static_cast<vcl::Window*>(pDevice), WB_FLATBUTTON | WB_NOPOINTERFOCUS); - m_pButtons[nId]->SetSizePixel(Size(20, aRect.GetSize().Height())); + m_pButtons[nId]->SetSizePixel(Size(BUTTON_WIDTH, rRect.GetSize().Height())); m_pButtons[nId]->SetPopupMenu(&m_aMenu); } - m_pButtons[nId]->SetPosPixel(Point(aRect.GetWidth() - 20, aRect.getY())); + m_pButtons[nId]->SetPosPixel(Point(rRect.GetWidth() - BUTTON_WIDTH, rRect.getY())); m_pButtons[nId]->Show(); } } + } + } + } +} - // IMG_TXT_DISTANCE in ilstbox.hxx is 6, then 1 is added as - // nBorder, and we are adding 1 in order to look better when - // italics is present - const int nLeftDistance = 8; +void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) +{ + sal_uInt16 nItem = rUDEvt.GetItemId(); + OUString aStyleName( GetEntry( nItem ) ); - Rectangle aTextRect; - pDevice->GetTextBoundRect( aTextRect, aStyleName ); + OutputDevice *pDevice = rUDEvt.GetDevice(); + pDevice->Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); - Point aPos( rUDEvt.GetRect().TopLeft() ); - aPos.X() += nLeftDistance; - if ( aTextRect.Bottom() > rUDEvt.GetRect().GetHeight() ) - { - // the text does not fit, adjust the font size - double ratio = static_cast< double >( rUDEvt.GetRect().GetHeight() ) / aTextRect.Bottom(); - aPixelSize.Width() *= ratio; - aPixelSize.Height() *= ratio; - aFont.SetSize( aPixelSize ); - pDevice->SetFont( aFont ); - } - else - aPos.Y() += ( rUDEvt.GetRect().GetHeight() - aTextRect.Bottom() ) / 2; + const Rectangle& rRect(rUDEvt.GetRect()); + bool bIsNotSelected = rUDEvt.GetItemId() != GetSelectEntryPos(); - pDevice->DrawText( aPos, aStyleName ); + SetupEntry(nItem, rRect, pDevice, aStyleName, bIsNotSelected); - pDevice->SetFillColor( aOldFillColor ); - pDevice->SetTextColor( aOldColor ); - pDevice->SetFont( aOldFont ); + UserDrawEntry(rUDEvt, aStyleName); - // draw separator, if present - DrawEntry( rUDEvt, false, false ); - } - else - DrawEntry( rUDEvt, true, true ); + pDevice->Pop(); + // draw separator, if present + DrawEntry( rUDEvt, false, false ); +} + +void SvxStyleBox_Impl::CalcOptimalExtraUserWidth() +{ + long nMaxNormalFontWidth = 0; + sal_Int32 nEntryCount = GetEntryCount(); + for (sal_Int32 i = 0; i < nEntryCount; ++i) + { + OUString sStyleName(GetEntry(i)); + Rectangle aTextRectForDefaultFont; + GetTextBoundRect(aTextRectForDefaultFont, sStyleName); + + const long nWidth = aTextRectForDefaultFont.GetWidth(); + + nMaxNormalFontWidth = std::max(nWidth, nMaxNormalFontWidth); + } + + long nMaxUserDrawFontWidth = nMaxNormalFontWidth; + for (sal_Int32 i = 1; i < nEntryCount-1; ++i) + { + OUString sStyleName(GetEntry(i)); + + Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); + SetupEntry(i, Rectangle(0, 0, RECT_MAX, ITEM_HEIGHT), this, sStyleName, false); + Rectangle aTextRectForActualFont; + GetTextBoundRect(aTextRectForActualFont, sStyleName); + if (AdjustFontForItemHeight(this, aTextRectForActualFont, ITEM_HEIGHT)) + { + //Font didn't fit, so it was changed, refetch with final font size + GetTextBoundRect(aTextRectForActualFont, sStyleName); } + Pop(); + + const long nWidth = aTextRectForActualFont.GetWidth() + BUTTON_WIDTH; + + nMaxUserDrawFontWidth = std::max(nWidth, nMaxUserDrawFontWidth); } + + SetUserItemSize(Size(nMaxUserDrawFontWidth - nMaxNormalFontWidth, ITEM_HEIGHT)); } // test is the color between Font- and background-color to be identify @@ -873,10 +924,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< m_xFrame (_xFrame), mbEndPreview(false) { - Size aSize(LogicToPixel(aLogicalSize, MAP_APPFONT)); - set_width_request(aSize.Width()); - set_height_request(aSize.Height()); - SetSizePixel(aSize); + SetOptimalSize(); EnableControls_Impl(); GetSubEdit()->AddEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont )); } @@ -1001,14 +1049,20 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) return nHandled || FontNameBox::Notify( rNEvt ); } +void SvxFontNameBox_Impl::SetOptimalSize() +{ + Size aSize(LogicToPixel(aLogicalSize, MAP_APPFONT)); + set_width_request(aSize.Width()); + set_height_request(aSize.Height()); + SetSizePixel(aSize); +} + void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { - SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); - Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); - SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); + SetOptimalSize(); } else if ( ( rDCEvt.GetType() == DataChangedEventType::FONTS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) ) @@ -1059,8 +1113,17 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) // or select if ( rUDEvt.GetItemId() == rUDEvt.GetStyle() ) { + OUString fontName(GetText()); + if (IsInDropDown()) + { + /* + * when in dropdown mode the selected item should be + * used and not the current selection + */ + fontName = GetEntry(rUDEvt.GetItemId()); + } Sequence< PropertyValue > aArgs( 1 ); - vcl::FontInfo aInfo( pFontList->Get( GetEntry( rUDEvt.GetItemId() ), + vcl::FontInfo aInfo( pFontList->Get( fontName, aCurFont.GetWeight(), aCurFont.GetItalic() ) ); @@ -1917,7 +1980,7 @@ struct SvxStyleToolBoxControl::Impl bool bSpecModeWriter; bool bSpecModeCalc; - inline Impl( void ) + inline Impl() :aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) ) ,aMore ( SVX_RESSTR( RID_SVXSTR_MORE_STYLES ) ) ,bSpecModeWriter ( false ) @@ -2128,7 +2191,7 @@ void SvxStyleToolBoxControl::FillStyleBox() if ( pStyleSheetPool && pBox && nActFamily!=0xffff ) { const SfxStyleFamily eFamily = GetActFamily(); - sal_uInt16 nCount = pStyleSheetPool->Count(); + sal_uInt16 nCount = pStyleSheetPool->Count(); SfxStyleSheetBase* pStyle = NULL; bool bDoFill = false; @@ -2228,6 +2291,8 @@ void SvxStyleToolBoxControl::FillStyleBox() sal_uInt16 nLines = static_cast<sal_uInt16>( std::min( pBox->GetEntryCount(), static_cast<sal_Int32>(MAX_STYLES_ENTRIES))); pBox->SetDropDownLineCount( nLines ); + + pBox->CalcOptimalExtraUserWidth(); } } } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 21b2e98fc30e..eb25ce945b3f 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -38,8 +38,6 @@ #include <boost/scoped_ptr.hpp> -#define LOGICAL_EDIT_HEIGHT 12 - using namespace ::com::sun::star; namespace { @@ -132,8 +130,6 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( SetText( "" ); } - - void SvxFontSizeBox_Impl::ReleaseFocus_Impl() { if ( !m_bRelease ) @@ -263,13 +259,8 @@ void SvxFontSizeBox_Impl::SetOptimalSize() Size aPrefSize(LogicToPixel(m_aLogicalSize, MAP_APPFONT)); aPrefSize.Width() = get_preferred_size().Width(); SetSizePixel(aPrefSize); - Size aDropSize(LogicToPixel(Size(0, LOGICAL_EDIT_HEIGHT), MAP_APPFONT)); - aDropSize.Width() = aPrefSize.Width(); - SetDropDownSizePixel(aDropSize); } - - void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 13029b6f1b24..ff4dc5e53050 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -48,7 +48,7 @@ namespace svx , maCurColor(COL_TRANSPARENT) { DBG_ASSERT(pToolBox, "ToolBox not found :-("); - mbWasHiContrastMode = pToolBox ? pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() : false; + mbWasHiContrastMode = pToolBox && pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); switch (mnSlotId) { case SID_ATTR_CHAR_COLOR: diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index dbe36200fd5e..6993716536d7 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -47,7 +47,7 @@ namespace textconversiondlgs using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define HEADER_BAR_BITS ( HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_FIXED | HIB_FIXEDPOS ) +#define HEADER_BAR_BITS ( HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS ) DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) @@ -331,7 +331,7 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 { sal_uInt16 nCount = pEntry->ItemCount(); nColumn++; - if( nTreeFlags & TREEFLAG_CHKBTN ) + if( nTreeFlags & SvTreeFlags::CHKBTN ) nColumn++; if( nColumn < nCount ) pItem = pEntry->GetItem( nColumn ); @@ -419,7 +419,7 @@ void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& long nWidth3 = m_pLB_Property->get_preferred_size().Width(); HeaderBarItemBits nBits = HEADER_BAR_BITS; - rHeaderBar.InsertItem( 1, aColumn1, nWidth1, nBits | HIB_UPARROW ); + rHeaderBar.InsertItem( 1, aColumn1, nWidth1, nBits | HeaderBarItemBits::UPARROW ); rHeaderBar.InsertItem( 2, aColumn2, nWidth2, nBits ); rHeaderBar.InsertItem( 3, aColumn3, nWidth3, nBits ); @@ -828,18 +828,18 @@ IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar) { sal_uInt16 nId = pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = pHeaderBar->GetItemBits(nId); - if( nBits & HIB_CLICKABLE ) + if( nBits & HeaderBarItemBits::CLICKABLE ) { //set new arrow positions in headerbar pHeaderBar->SetItemBits( getActiveDictionary().getSortColumn()+1, HEADER_BAR_BITS ); - if( nBits & HIB_UPARROW ) - pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HIB_DOWNARROW ); + if( nBits & HeaderBarItemBits::UPARROW ) + pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HeaderBarItemBits::DOWNARROW ); else - pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HIB_UPARROW ); + pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HeaderBarItemBits::UPARROW ); //sort lists nBits = pHeaderBar->GetItemBits(nId); - bool bSortAtoZ = nBits & HIB_UPARROW; + bool bSortAtoZ = bool(nBits & HeaderBarItemBits::UPARROW); getActiveDictionary().sortByColumn(nId-1,bSortAtoZ); getReverseDictionary().sortByColumn(nId-1,bSortAtoZ); } diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index 4a2ec1d3c0c8..d10aab649ee0 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -50,19 +50,8 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI const sal_uInt8 nTransparency(rBrush.GetColor().GetTransparency()); - if(0xff != nTransparency) - { - // we have a color fill - const Color aColor(rBrush.GetColor().GetRGBColor()); - - rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); - rToSet.Put(XFillColorItem(OUString(), aColor)); - - // #125189# nTransparency is in range [0..254], convert to [0..100] which is used in - // XFillTransparenceItem (caution with the range which is in an *item-specific* range) - rToSet.Put(XFillTransparenceItem((((sal_Int32)nTransparency * 100) + 127) / 254)); - } - else if(GPOS_NONE != rBrush.GetGraphicPos()) + // tdf#89478 check for image first + if (GPOS_NONE != rBrush.GetGraphicPos()) { // we have a graphic fill, set fill style rToSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); @@ -131,6 +120,18 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI rToSet.Put(XFillTransparenceItem(nGraphicTransparency)); } } + else if (0xff != nTransparency) + { + // we have a color fill + const Color aColor(rBrush.GetColor().GetRGBColor()); + + rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); + rToSet.Put(XFillColorItem(OUString(), aColor)); + + // #125189# nTransparency is in range [0..254], convert to [0..100] which is used in + // XFillTransparenceItem (caution with the range which is in an *item-specific* range) + rToSet.Put(XFillTransparenceItem((((sal_Int32)nTransparency * 100) + 127) / 254)); + } else { // GPOS_NONE == rBrush.GetGraphicPos() && 0xff == rBrush.GetColor().GetTransparency(), diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index d9b6fb731366..97e93817f94b 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -559,7 +559,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS return pNewObj; } -void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw() +void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw() { sal_uInt32 nTempType = UHashMap::getId( aName ); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 8b86a690a8f1..ccd5515e69d9 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1761,8 +1761,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); Point aRef2( aRef1.X(), aRef1.Y() + 1000 ); sal_uInt16 i; - sal_uInt16 nPntAnz=aPol.GetSize(); - for (i=0; i<nPntAnz; i++) + sal_uInt16 nPointCount=aPol.GetSize(); + for (i=0; i<nPointCount; i++) { MirrorPoint(aPol[i],aRef1,aRef2); } @@ -1783,8 +1783,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); Point aRef2( aRef1.X() + 1000, aRef1.Y() ); sal_uInt16 i; - sal_uInt16 nPntAnz=aPol.GetSize(); - for (i=0; i<nPntAnz; i++) + sal_uInt16 nPointCount=aPol.GetSize(); + for (i=0; i<nPointCount; i++) { MirrorPoint(aPol[i],aRef1,aRef2); } @@ -1876,7 +1876,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c pObject->NbcMirror( aTop, aBottom ); // NbcMirroring is flipping the current mirror state, // so we have to set the correct state again - static_cast<SdrObjCustomShape*>(pObject)->SetMirroredX( bMirroredX ? sal_False : sal_True ); + static_cast<SdrObjCustomShape*>(pObject)->SetMirroredX( !bMirroredX ); } if ( bNeedsMirrorY ) { @@ -1885,7 +1885,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c pObject->NbcMirror( aLeft, aRight ); // NbcMirroring is flipping the current mirror state, // so we have to set the correct state again - static_cast<SdrObjCustomShape*>(pObject)->SetMirroredY( bMirroredY ? sal_False : sal_True ); + static_cast<SdrObjCustomShape*>(pObject)->SetMirroredY( !bMirroredY ); } if( pListCopy ) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index e93ae4010d2b..1c37eabbb299 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -632,7 +632,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& if(SfxItemPool::IsWhich(pEntry->nWID)) rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID)); // set - SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet); + SvxItemPropertySet_setPropertyValue(pEntry, *pUsrAny, rSet); } } } @@ -1725,7 +1725,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if( pSet->GetItemState( pMap->nWID ) == SfxItemState::SET ) { - SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rVal, *pSet ); + SvxItemPropertySet_setPropertyValue( pMap, rVal, *pSet ); } } @@ -2007,7 +2007,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE default: { // get value form ItemSet - aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( pMap, aSet ); if( pMap->aType != aAny.getValueType() ) { @@ -4183,7 +4183,7 @@ void SAL_CALL SvxShapeRect::release() throw() // XServiceInfo -uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return SvxShape::getSupportedServiceNames(); } @@ -4210,23 +4210,23 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Refer return pSvxShape ? pSvxShape->GetSdrObject() : 0; } -uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) +uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) { if(!pMap || !pMap->nWID) return uno::Any(); // Check is for items that store either metric values if thei are positiv or percentage if thei are negativ. bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); - return rPropSet.getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues ); + return SvxItemPropertySet::getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues ); } -void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) +void SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) { if(!pMap || !pMap->nWID) return; bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); - rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues ); + SvxItemPropertySet::setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index d4172b1efdc4..0cc0b43c5f9e 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -112,7 +112,7 @@ private: void SetupOutliner(); - bool HasView() const { return mpView ? true : false; } + bool HasView() const { return mpView != nullptr; } bool IsEditMode() const { SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); @@ -237,7 +237,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText SvxTextEditSourceImpl::~SvxTextEditSourceImpl() { - DBG_ASSERT( mbIsLocked == false, "text edit source was not unlocked before dispose!" ); + DBG_ASSERT( !mbIsLocked, "text edit source was not unlocked before dispose!" ); if( mpObject ) mpObject->RemoveObjectUser( *this ); @@ -921,7 +921,7 @@ void SvxTextEditSourceImpl::unlock() bool SvxTextEditSourceImpl::IsValid() const { - return mpView && mpWindow ? sal_True : sal_False; + return mpView && mpWindow; } Rectangle SvxTextEditSourceImpl::GetVisArea() diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index adda2244cf57..e6cf941a8487 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -333,7 +333,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( pObj ) { *pValue <<= OUString( pObj->GetTitle() ); - pGalTheme->ReleaseObject( pObj ); + ::GalleryTheme::ReleaseObject( pObj ); } } } @@ -357,7 +357,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt aThumbnail = pObj->GetThumbMtf(); *pValue <<= aThumbnail.GetXGraphic(); - pGalTheme->ReleaseObject( pObj ); + ::GalleryTheme::ReleaseObject( pObj ); } } } diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index a0e0b1e3a95c..9b57dafd3bdd 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -85,7 +85,7 @@ protected: protected: - ::comphelper::PropertySetInfo* createPropertySetInfo(); + static ::comphelper::PropertySetInfo* createPropertySetInfo(); private: diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 37bbcc387189..7259401f2052 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -739,7 +739,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto { mxRootStorage = rXMLStorage; meCreateMode = eCreateMode; - mbDirect = ( ( GRAPHICHELPER_MODE_READ == meCreateMode ) ? bDirect : sal_True ); + mbDirect = meCreateMode != GRAPHICHELPER_MODE_READ || bDirect; } SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage, diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 73316ec1a6cb..acbb94fff80d 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -101,7 +101,7 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) return *this; } -int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const +bool XOBitmap::operator==( const XOBitmap& rXOBitmap ) const { if( eType != rXOBitmap.eType || aGraphicObject != rXOBitmap.aGraphicObject || @@ -110,7 +110,7 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const aBckgrColor != rXOBitmap.aBckgrColor || bGraphicDirty != rXOBitmap.bGraphicDirty ) { - return sal_False; + return false; } if( pPixelArray && rXOBitmap.pPixelArray ) @@ -119,10 +119,10 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const for( sal_uInt16 i = 0; i < nCount; i++ ) { if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) ) - return sal_False; + return false; } } - return sal_True; + return true; } Bitmap XOBitmap::GetBitmap() const diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 765cb8074c1f..1cbaff05599e 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -119,7 +119,7 @@ XOutdevItemPool::XOutdevItemPool( for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++) { mpLocalItemInfos[i - XATTR_START]._nSID = 0; - mpLocalItemInfos[i - XATTR_START]._nFlags = SFX_ITEM_POOLABLE; + mpLocalItemInfos[i - XATTR_START]._nFlags = SfxItemPoolFlags::POOLABLE; } mpLocalItemInfos[XATTR_LINESTYLE -XATTR_START]._nSID = SID_ATTR_LINE_STYLE; diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 34e519dfb69b..4bfe888cca34 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -193,7 +193,7 @@ Bitmap XDashList::GetBitmapForUISolidLine() const { if(maBitmapSolidLine.IsEmpty()) { - const_cast< XDashList* >(this)->maBitmapSolidLine = const_cast< XDashList* >(this)->ImpCreateBitmapForXDash(0); + const_cast< XDashList* >(this)->maBitmapSolidLine = XDashList::ImpCreateBitmapForXDash(0); } return maBitmapSolidLine; |