[Libreoffice-commits] core.git: include/toolkit toolkit/source

2023-04-12 Thread Noel Grandin (via logerrit) 
 include/toolkit/controls/unocontrolmodel.hxx |1 +
 toolkit/source/controls/unocontrolmodel.cxx  |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit 0c5c1e831aaf139379134fee63797f02ca5a75e5
Author: Noel Grandin 
AuthorDate: Wed Apr 12 12:18:52 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 12 14:18:35 2023 +0200

Revert "remove unnecessary UnoControlModel::setPropertyValues"

This reverts commit 19c18c94085f7a70e536a914ed978fc54b5625b9.

Because it breaks the MRI extension, I was wrong, it does not
do quite the same thing as its superclass method.

Change-Id: I65bfb4264615dea5f6d0f2fb7b989352e7e83ee1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150274
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/controls/unocontrolmodel.hxx 
b/include/toolkit/controls/unocontrolmodel.hxx
index 9a0e2b9de168..35c14fdece7f 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -161,6 +161,7 @@ public:
 
 // css::beans::XMultiPropertySet
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL 
getPropertySetInfo(  ) override;
+void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& 
PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) override;
 protected:
 // override setValue methods to handle properties of FontDescriptor
 // css::beans::XFastPropertySet
diff --git a/toolkit/source/controls/unocontrolmodel.cxx 
b/toolkit/source/controls/unocontrolmodel.cxx
index 8cb7b3a526f9..4aaf9908ade9 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1248,6 +1248,12 @@ css::uno::Reference< css::beans::XPropertySetInfo > 
UnoControlModel::getProperty
 return css::uno::Reference< css::beans::XPropertySetInfo >();
 }
 
+void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& 
rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values )
+{
+std::unique_lock aGuard( m_aMutex );
+setPropertyValuesImpl(aGuard, rPropertyNames, Values);
+}
+
 void UnoControlModel::setPropertyValuesImpl( std::unique_lock& 
rGuard, const css::uno::Sequence< OUString >& rPropertyNames, const 
css::uno::Sequence< css::uno::Any >& Values )
 {
 sal_Int32 nProps = rPropertyNames.getLength();

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2023-01-13 Thread Noel Grandin (via logerrit) 
 include/toolkit/controls/unocontrolmodel.hxx |   10 ++
 toolkit/source/controls/unocontrolmodel.cxx  |   13 -
 2 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit 678747f95083be6f3e4d184e6258e49086952f45
Author: Noel Grandin 
AuthorDate: Thu Jan 12 15:59:22 2023 +0200
Commit: Noel Grandin 
CommitDate: Sat Jan 14 06:36:58 2023 +

XUnoTunnel->dynamic_cast in UnoControlModel

Change-Id: I0d8a65aa16583fcb6c8201589b2d356da0be5cac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145482
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/controls/unocontrolmodel.hxx 
b/include/toolkit/controls/unocontrolmodel.hxx
index fb22dc3e4383..fb32aa5b0860 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -33,7 +32,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -47,12 +46,11 @@ typedef std::map 
ImplPropertyTable;
 
 
 
-typedef ::cppu::WeakAggImplHelper7  <   css::awt::XControlModel
+typedef ::cppu::WeakAggImplHelper6  <   css::awt::XControlModel
 ,   css::beans::XPropertyState
 ,   css::io::XPersistObject
 ,   css::lang::XComponent
 ,   css::lang::XServiceInfo
-,   css::lang::XUnoTunnel
 ,   css::util::XCloneable
 >   UnoControlModel_Base;
 
@@ -130,10 +128,6 @@ public:
 // css::uno::XAggregation
 css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) 
override;
 
-// css::lang::XUnoTunnel
-static const css::uno::Sequence< sal_Int8 >&   getUnoTunnelId() noexcept;
-sal_Int64   SAL_CALL 
getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
-
 // css::util::XCloneable
 css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() 
override;
 
diff --git a/toolkit/source/controls/unocontrolmodel.cxx 
b/toolkit/source/controls/unocontrolmodel.cxx
index 983ea89459ee..3147164332bd 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -420,19 +420,6 @@ css::uno::Any UnoControlModel::queryAggregation( const 
css::uno::Type & rType )
 return aRet;
 }
 
-// css::lang::XUnoTunnel
-
-const css::uno::Sequence< sal_Int8 >& UnoControlModel::getUnoTunnelId() 
noexcept
-{
-static const comphelper::UnoIdInit theUnoControlModelUnoTunnelId;
-return theUnoControlModelUnoTunnelId.getSeq();
-}
-
-sal_Int64 UnoControlModel::getSomething( const css::uno::Sequence< sal_Int8 >& 
rIdentifier )
-{
-return comphelper::getSomethingImpl(rIdentifier, this);
-}
-
 // XInterface
 IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base )

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2023-01-09 Thread Stephan Bergmann (via logerrit) 
 include/toolkit/awt/vclxaccessiblecomponent.hxx |   10 --
 toolkit/source/awt/vclxaccessiblecomponent.cxx  |   14 +++---
 2 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit a58abb4296c50228ebd5510e50363072e9a96774
Author: Stephan Bergmann 
AuthorDate: Mon Jan 9 11:43:36 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 9 15:15:41 2023 +

Clean up VCLXAccessibleComponent::getAccessibleParent

...after 21e0d8162a0e683558c4d042ce688fc9a6833809 "loplugin:unusedfields" 
had
dropped the base class
OAccessibleImplementationAccess::implGetForeignControlledParent

Change-Id: I753aad41baaa0ac1d1f7eb0a6084993df5a58d5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145197
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx 
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 7c299edf6d65..b69f62b6871f 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -117,16 +117,6 @@ public:
 protected:
 // base class overridables
 css::awt::Rectangle implGetBounds(  ) override;
-
-private:
-/** we may be reparented (if external components use 
OAccessibleImplementationAccess base class),
-so this method here returns the parent in the VCL world, in opposite 
to the parent
-an external component gave us
-@precond
-the caller must ensure thread safety, i.e. our mutex must be locked
-*/
-css::uno::Reference< css::accessibility::XAccessible >
-getVclParent() const;
 };
 
 /* --
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx 
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index aef0eb1c3852..666ba75bde6a 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -553,8 +553,10 @@ uno::Reference< accessibility::XAccessible > 
VCLXAccessibleComponent::getAccessi
 return xAcc;
 }
 
-uno::Reference< accessibility::XAccessible > 
VCLXAccessibleComponent::getVclParent() const
+uno::Reference< accessibility::XAccessible > 
VCLXAccessibleComponent::getAccessibleParent(  )
 {
+OExternalLockGuard aGuard( this );
+
 uno::Reference< accessibility::XAccessible > xAcc;
 if ( GetWindow() )
 {
@@ -565,16 +567,6 @@ uno::Reference< accessibility::XAccessible > 
VCLXAccessibleComponent::getVclPare
 return xAcc;
 }
 
-uno::Reference< accessibility::XAccessible > 
VCLXAccessibleComponent::getAccessibleParent(  )
-{
-OExternalLockGuard aGuard( this );
-
-// we do _not_ have a foreign-controlled parent -> default to our VCL 
parent
-uno::Reference< accessibility::XAccessible > xAcc = getVclParent();
-
-return xAcc;
-}
-
 sal_Int64 VCLXAccessibleComponent::getAccessibleIndexInParent(  )
 {
 OExternalLockGuard aGuard( this );

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2021-12-16 Thread Noel Grandin (via logerrit) 
 include/toolkit/awt/vclxmenu.hxx |5 --
 toolkit/source/awt/vclxmenu.cxx  |   92 +++
 2 files changed, 48 insertions(+), 49 deletions(-)

New commits:
commit b37f9fbf05e16eb58eae40c6d900a4b9da2972db
Author: Noel Grandin 
AuthorDate: Thu Dec 16 19:24:42 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 17 07:27:19 2021 +0100

osl::Mutex->std::mutex in VCLXMenu

Change-Id: I93883f5cd8f5f83f33eded87d995f95dbfd7989b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126989
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index b77c4d65124e..5c848975d837 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -32,7 +32,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -59,14 +59,13 @@ class TOOLKIT_DLLPUBLIC VCLXMenu :  public 
css::awt::XMenuBar,
 public ::cppu::OWeakObject
 {
 private:
-::osl::MutexmaMutex;
+std::mutex  maMutex;
 VclPtrmpMenu;
 MenuListenerMultiplexer maMenuListeners;
 PopupMenuRefListmaPopupMenuRefs;
 sal_Int16   mnDefaultItem;
 
 protected:
-::osl::Mutex&   GetMutex() { return maMutex; }
 
 DECL_DLLPRIVATE_LINK( MenuEventListener, VclMenuEvent&, void );
 
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 56b0bb49a6ca..01e275aacf82 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -167,9 +167,9 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, 
rMenuEvent, void )
 
 OUString SAL_CALL VCLXMenu::getImplementationName(  )
 {
-::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 const bool bIsPopupMenu = IsPopupMenu();
-aGuard.clear();
+aGuard.unlock();
 
 OUString implName( "stardiv.Toolkit." );
 if ( bIsPopupMenu )
@@ -182,9 +182,9 @@ OUString SAL_CALL VCLXMenu::getImplementationName(  )
 
 css::uno::Sequence< OUString > SAL_CALL VCLXMenu::getSupportedServiceNames(  )
 {
-::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 const bool bIsPopupMenu = IsPopupMenu();
-aGuard.clear();
+aGuard.unlock();
 
 if ( bIsPopupMenu )
 return css::uno::Sequence{
@@ -204,9 +204,9 @@ sal_Bool SAL_CALL VCLXMenu::supportsService(const OUString& 
rServiceName )
 css::uno::Any VCLXMenu::queryInterface(
 const css::uno::Type & rType )
 {
-::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 const bool bIsPopupMenu = IsPopupMenu();
-aGuard.clear();
+aGuard.unlock();
 
 css::uno::Any aRet;
 
@@ -233,9 +233,9 @@ UNO3_GETIMPLEMENTATION_IMPL( VCLXMenu );
 
 css::uno::Sequence< css::uno::Type > VCLXMenu::getTypes()
 {
-::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 const bool bIsPopupMenu = IsPopupMenu();
-aGuard.clear();
+aGuard.unlock();
 
 if ( bIsPopupMenu )
 {
@@ -264,7 +264,7 @@ css::uno::Sequence< sal_Int8 > 
VCLXMenu::getImplementationId()
 void VCLXMenu::addMenuListener(
 const css::uno::Reference< css::awt::XMenuListener >& rxListener )
 {
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 
 maMenuListeners.addInterface( rxListener );
 }
@@ -272,7 +272,7 @@ void VCLXMenu::addMenuListener(
 void VCLXMenu::removeMenuListener(
 const css::uno::Reference< css::awt::XMenuListener >& rxListener )
 {
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 
 maMenuListeners.removeInterface( rxListener );
 }
@@ -284,7 +284,7 @@ void VCLXMenu::insertItem(
 sal_Int16 nPos )
 {
 SolarMutexGuard aSolarGuard;
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 
 if ( mpMenu )
 mpMenu->InsertItem(nItemId, aText, 
static_cast(nItemStyle), OString(), nPos);
@@ -295,7 +295,7 @@ void VCLXMenu::removeItem(
 sal_Int16 nCount )
 {
 SolarMutexGuard aSolarGuard;
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 
 if (!mpMenu)
 return;
@@ -313,7 +313,7 @@ void VCLXMenu::removeItem(
 sal_Int16 VCLXMenu::getItemCount(  )
 {
 SolarMutexGuard aSolarGuard;
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 
 return mpMenu ? mpMenu->GetItemCount() : 0;
 }
@@ -322,7 +322,7 @@ sal_Int16 VCLXMenu::getItemId(
 sal_Int16 nPos )
 {
 SolarMutexGuard aSolarGuard;
-::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+std::unique_lock aGuard( maMutex );
 
 return mpMenu ? mpMenu->GetItemId( nPos ) : 0;
 }
@@ -331,7 +331,

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2021-05-14 Thread Noel Grandin (via logerrit) 
 include/toolkit/awt/vclxwindow.hxx   |2 +
 toolkit/source/awt/vclxcontainer.cxx |6 ++-
 toolkit/source/awt/vclxtopwindow.cxx |6 ++-
 toolkit/source/awt/vclxwindow.cxx|   60 ++-
 4 files changed, 48 insertions(+), 26 deletions(-)

New commits:
commit ec996f7fc26601a6b5bf2ea12890316905662e40
Author: Noel Grandin 
AuthorDate: Fri May 14 13:03:25 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri May 14 18:34:47 2021 +0200

tdf#142255 Crash when trying to insert a shape

regression from
commit 5aa60be574ece81b27c8f63e6e809871c694dba0
fix leak in VCLXWindow
it's too dangerous to dump the Impl during dispose(), because if I do,
the Impl is removed while we are iterating over listeners.

So just be check mbIsDisposing more heavily to prevent new references to
the VCLXWindow being added after it is disposed.

Change-Id: Ibb00a289440d24f531072ef5809613d5e8a0a98f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115598
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxwindow.hxx 
b/include/toolkit/awt/vclxwindow.hxx
index 289d242a297b..5e5ac617a26a 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -133,6 +133,8 @@ public:
 
 voidnotifyWindowRemoved( vcl::Window const & _rWindow );
 
+bool IsDisposed();
+
 // css::lang::XUnoTunnel
 UNO3_GETIMPLEMENTATION_DECL(VCLXWindow)
 
diff --git a/toolkit/source/awt/vclxcontainer.cxx 
b/toolkit/source/awt/vclxcontainer.cxx
index 932c31b38234..e070c3239ab7 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -73,14 +73,16 @@ void VCLXContainer::addVclContainerListener( const 
css::uno::Reference< css::awt
 {
 SolarMutexGuard aGuard;
 
-GetContainerListeners().addInterface( rxListener );
+if (!IsDisposed())
+GetContainerListeners().addInterface( rxListener );
 }
 
 void VCLXContainer::removeVclContainerListener( const css::uno::Reference< 
css::awt::XVclContainerListener >& rxListener )
 {
 SolarMutexGuard aGuard;
 
-GetContainerListeners().removeInterface( rxListener );
+if (!IsDisposed())
+GetContainerListeners().removeInterface( rxListener );
 }
 
 css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > 
VCLXContainer::getWindows(  )
diff --git a/toolkit/source/awt/vclxtopwindow.cxx 
b/toolkit/source/awt/vclxtopwindow.cxx
index 3a986a0f6d9e..010659a06985 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -92,14 +92,16 @@ void VCLXTopWindow::addTopWindowListener( const 
css::uno::Reference< css::awt::X
 {
 SolarMutexGuard aGuard;
 
-GetTopWindowListeners().addInterface( rxListener );
+if (!IsDisposed())
+GetTopWindowListeners().addInterface( rxListener );
 }
 
 void VCLXTopWindow::removeTopWindowListener( const css::uno::Reference< 
css::awt::XTopWindowListener >& rxListener )
 {
 SolarMutexGuard aGuard;
 
-GetTopWindowListeners().removeInterface( rxListener );
+if (!IsDisposed())
+GetTopWindowListeners().removeInterface( rxListener );
 }
 
 void VCLXTopWindow::toFront(  )
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index 616d93fe834d..2a90325ef9a3 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -328,7 +328,7 @@ VCLXWindow::VCLXWindow( bool _bWithDefaultProps )
 
 VCLXWindow::~VCLXWindow()
 {
-assert(!mpImpl && "forgot to call dispose()");
+assert(mpImpl->mbDisposing && "forgot to call dispose()");
 }
 
 
@@ -374,7 +374,7 @@ void VCLXWindow::resumeVclEventListening( )
 
 void VCLXWindow::notifyWindowRemoved( vcl::Window const & _rWindow )
 {
-if ( mpImpl && mpImpl->getContainerListeners().getLength() )
+if ( mpImpl->getContainerListeners().getLength() )
 {
 awt::VclContainerEvent aEvent;
 aEvent.Source = *this;
@@ -385,7 +385,7 @@ void VCLXWindow::notifyWindowRemoved( vcl::Window const & 
_rWindow )
 
 IMPL_LINK( VCLXWindow, WindowEventListener, VclWindowEvent&, rEvent, void )
 {
-if ( mpImpl->mnListenerLockLevel )
+if ( mpImpl->mbDisposing || mpImpl->mnListenerLockLevel )
 return;
 
 DBG_ASSERT( rEvent.GetWindow() && GetWindow(), "Window???" );
@@ -861,6 +861,8 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& 
rVclWindowEvent )
 uno::Reference< accessibility::XAccessibleContext > 
VCLXWindow::CreateAccessibleContext()
 {
 SolarMutexGuard aGuard;
+if (mpImpl->mbDisposing)
+return nullptr;
 return getAccessibleFactory().createAccessibleContext( this );
 }
 
@@ -899,16 +901,13 @@ void VCLXWindow::dispose(  )
 {
 SolarMutexGuard aGuard;
 
-if (!mpImpl)
-return;
-
 if ( mpImpl->mbDisposing )
 return;
 
-mpImpl->mxViewGraphics = nullptr;
-
 mpImpl->mbDisposing = true;
 
+mpImpl->mxViewGr

[Libreoffice-commits] core.git: include/toolkit toolkit/source vbahelper/source

2021-04-08 Thread Caolán McNamara (via logerrit) 
 include/toolkit/helper/vclunohelper.hxx |8 +---
 toolkit/source/helper/vclunohelper.cxx  |   26 ++
 vbahelper/source/msforms/vbacontrol.cxx |   16 ++--
 3 files changed, 29 insertions(+), 21 deletions(-)

New commits:
commit 396dfdd2164d095e4ec182956b31aca8c3908655
Author: Caolán McNamara 
AuthorDate: Wed Apr 7 21:27:44 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 8 13:23:04 2021 +0200

move set/get Pointer to VCLUnoHelper

Change-Id: I7dadc7bc881e0b892720b3eb89fdc60c8d87c541
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113776
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/include/toolkit/helper/vclunohelper.hxx 
b/include/toolkit/helper/vclunohelper.hxx
index 75af557dc801..a4e1a061ee80 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -60,13 +60,13 @@ namespace com::sun::star::awt {
 }
 
 
+enum class PointerStyle;
+
 class FontMetric;
 class OutputDevice;
 class MouseEvent;
 class KeyEvent;
 
-
-
 class TOOLKIT_DLLPUBLIC VCLUnoHelper
 {
 public:
@@ -148,8 +148,10 @@ public:
 );
 
 static ::KeyEvent createVCLKeyEvent( const css::awt::KeyEvent& _rAwtEvent 
);
-};
 
+static ::PointerStyle getMousePointer(const 
css::uno::Reference& rWindowPeer);
+static void setMousePointer(const 
css::uno::Reference& rWindowPeer, ::PointerStyle 
mousepointer);
+};
 
 #endif // INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
 
diff --git a/toolkit/source/helper/vclunohelper.cxx 
b/toolkit/source/helper/vclunohelper.cxx
index 3ef71e8aab07..3a7cc7446c1f 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -18,10 +18,13 @@
  */
 
 #include 
+#include 
 #include 
-#include 
-#include 
+#include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -42,13 +45,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
 #include 
 #include 
-#include 
 
 using namespace ::com::sun::star;
 
@@ -587,4 +588,21 @@ awt::KeyEvent VCLUnoHelper::createKeyEvent( const 
::KeyEvent& _rVclEvent, const
 
 }
 
+::PointerStyle VCLUnoHelper::getMousePointer(const 
css::uno::Reference& rWindowPeer)
+{
+::PointerStyle eType = ::PointerStyle::Arrow; // default ?
+VclPtr pWindow = VCLUnoHelper::GetWindow(rWindowPeer);
+if (pWindow)
+eType = pWindow->GetPointer();
+return eType;
+}
+
+void VCLUnoHelper::setMousePointer(const 
css::uno::Reference& rWindowPeer, ::PointerStyle 
ePointer)
+{
+VclPtr pWindow = VCLUnoHelper::GetWindow(rWindowPeer);
+if (!pWindow)
+return;
+pWindow->SetPointer(ePointer);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/msforms/vbacontrol.cxx 
b/vbahelper/source/msforms/vbacontrol.cxx
index 66165d9c7ba7..050d27a19823 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -55,7 +55,6 @@
 #include "vbasystemaxcontrol.hxx"
 #include "vbaimage.hxx"
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -494,24 +493,13 @@ static PointerStyle lcl_msoPointerToLOPointer( 
tools::Long msoPointerStyle )
 ::sal_Int32 SAL_CALL
 ScVbaControl::getMousePointer()
 {
-PointerStyle eType = PointerStyle::Arrow; // default ?
-VclPtr pWindow = VCLUnoHelper::GetWindow( getWindowPeer() );
-if ( pWindow )
-{
-eType = pWindow->GetPointer();
-}
-return lcl_loPointerToMsoPointer( eType );
+return 
lcl_loPointerToMsoPointer(VCLUnoHelper::getMousePointer(getWindowPeer()));
 }
 
 void SAL_CALL
 ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer )
 {
-VclPtr pWindow = VCLUnoHelper::GetWindow( getWindowPeer() );
-if ( pWindow )
-{
-PointerStyle aPointer = lcl_msoPointerToLOPointer( _mousepointer );
-pWindow->SetPointer( aPointer );
-}
+VCLUnoHelper::setMousePointer(getWindowPeer(), 
lcl_msoPointerToLOPointer(_mousepointer));
 }
 
 void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2020-07-20 Thread Caolán McNamara (via logerrit) 
 include/toolkit/awt/vclxwindows.hxx |   50 
 toolkit/source/awt/vclxwindows.cxx  |  366 
 2 files changed, 416 deletions(-)

New commits:
commit c777c283faef8c82a73005a74c448670928bcadf
Author: Caolán McNamara 
AuthorDate: Sun Jul 19 20:36:36 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jul 20 11:36:40 2020 +0200

drop unused VCLXCurrencyField

Change-Id: Ia2a44d64d4458c15e074522b022388e1da170e27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99014
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index af85219b7ef6..587cdded66f4 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -1085,55 +1085,7 @@ public:
 virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override 
{ return ImplGetPropertyIds( aIds ); }
 };
 
-
-//  class VCLXCurrencyField
-
-class VCLXCurrencyField final : public css::awt::XCurrencyField,
-public VCLXFormattedSpinField
-{
-public:
-VCLXCurrencyField();
-virtual ~VCLXCurrencyField() override;
-
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() throw() 
override  { OWeakObject::acquire(); }
-voidSAL_CALL release() throw() 
override  { OWeakObject::release(); }
-
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() override;
-
-
-// css::awt::XCurrencyField
-void SAL_CALL setValue( double Value ) override;
-double SAL_CALL getValue(  ) override;
-void SAL_CALL setMin( double Value ) override;
-double SAL_CALL getMin(  ) override;
-void SAL_CALL setMax( double Value ) override;
-double SAL_CALL getMax(  ) override;
-void SAL_CALL setFirst( double Value ) override;
-double SAL_CALL getFirst(  ) override;
-void SAL_CALL setLast( double Value ) override;
-double SAL_CALL getLast(  ) override;
-void SAL_CALL setSpinSize( double Value ) override;
-double SAL_CALL getSpinSize(  ) override;
-void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
-sal_Int16 SAL_CALL getDecimalDigits(  ) override;
-void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
-sal_Bool SAL_CALL isStrictFormat(  ) override;
-
-// css::awt::VclWindowPeer
-void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
-css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) 
override;
-
-static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override 
{ return ImplGetPropertyIds( aIds ); }
-};
-
-
 //  class VCLXPatternField
-
 class VCLXPatternField final :  public css::awt::XPatternField,
 public VCLXFormattedSpinField
 {
@@ -1167,9 +1119,7 @@ public:
 virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override 
{ return ImplGetPropertyIds( aIds ); }
 };
 
-
 //  class VCLXToolBox
-
 class VCLXToolBox final : public VCLXWindow
 {
 virtual css::uno::Reference< css::accessibility::XAccessibleContext >
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 40c897b9db60..8baa6433e29a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6004,372 +6004,6 @@ css::uno::Any VCLXMetricField::getProperty( const 
OUString& PropertyName )
 return aProp;
 }
 
-
-
-
-void VCLXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
-{
-PushPropertyIds( rIds,
- BASEPROPERTY_ALIGN,
- BASEPROPERTY_BACKGROUNDCOLOR,
- BASEPROPERTY_BORDER,
- BASEPROPERTY_BORDERCOLOR,
- BASEPROPERTY_CURRENCYSYMBOL,
- BASEPROPERTY_CURSYM_POSITION,
- BASEPROPERTY_DECIMALACCURACY,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
- BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
- BASEPROPERTY_NUMSHOWTHOUSANDSEP,
- BASEPROPERTY_PRINTABLE,
- BASEPROPERTY_READONLY,
- BASEPROPERTY_REPEAT,
- BASEPROPERTY_REPEAT_DELAY,
- BASEPROPERTY_SPIN,
- BASEPROPERTY_STRICTFORMAT,
- BASEPROPERTY_TABSTOP,
-

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2020-06-21 Thread Caolán McNamara (via logerrit) 
 include/toolkit/awt/vclxwindows.hxx |1 -
 toolkit/source/awt/vclxwindows.cxx  |1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 090528707ce5c4f3db344e0106d997a26ed8831e
Author: Caolán McNamara 
AuthorDate: Sat Jun 20 16:14:43 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jun 21 17:59:13 2020 +0200

don't include vcl/fmtfield.hxx from public hxx

Change-Id: I99077c7fe204ab86eef2c5d7dce1a902d7d10df9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96781
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index af60b504f8f4..42d3bf95f9f2 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 class FormatterBase;
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index fd47e1d2275e..e0d14698ab62 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2019-11-29 Thread Noel Grandin (via logerrit) 
 include/toolkit/awt/vclxtopwindow.hxx |   58 ++
 toolkit/source/awt/vclxtopwindow.cxx  |   87 ++
 2 files changed, 44 insertions(+), 101 deletions(-)

New commits:
commit 2d594080628d66649e5f01455adb50e3d49cb195
Author: Noel Grandin 
AuthorDate: Fri Nov 29 10:03:10 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 30 07:05:02 2019 +0100

merge classes VCLXTopWindow_Base and VCLXTopWindow

Change-Id: I4c0718d2947449fa076b0afd3046587c73784558
Reviewed-on: https://gerrit.libreoffice.org/84035
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxtopwindow.hxx 
b/include/toolkit/awt/vclxtopwindow.hxx
index 188f128f793e..9db6e7d51d24 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -24,33 +24,32 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 
 namespace com { namespace sun { namespace star { namespace awt { class 
XMenuBar; } } } }
 
-typedef ::cppu::ImplHelper1 <   css::awt::XTopWindow2
+typedef ::cppu::ImplHelper2 <   css::awt::XTopWindow2, 
css::awt::XSystemDependentWindowPeer
 >   VCLXTopWindow_XBase;
-typedef ::cppu::ImplHelper1 <   css::awt::XSystemDependentWindowPeer
->   VCLXTopWindow_SBase;
 
-class VCLXTopWindow_Base  :public VCLXTopWindow_XBase
-,public VCLXTopWindow_SBase
-{
-protected:
-virtual vcl::Window* GetWindowImpl() = 0;
-virtual ::comphelper::OInterfaceContainerHelper2& 
GetTopWindowListenersImpl() = 0;
-
-VCLXTopWindow_Base();
+//  class VCLXTopWindow
 
+class VCLXTopWindow: public VCLXTopWindow_XBase,
+ public VCLXContainer
+{
 public:
-virtual ~VCLXTopWindow_Base();
+VCLXTopWindow();
+virtual ~VCLXTopWindow() override;
+
+// css::uno::XInterface
+css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) 
override;
+void SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
+void SAL_CALL release() throw() override  { OWeakObject::release(); }
 
-// XInterface equivalents
-css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) 
override;
-// XTypeProvider equivalents
-css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+// css::lang::XTypeProvider
+css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+css::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() override;
 
 // css::awt::XSystemDependentWindowPeer
 css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 
>& ProcessId, sal_Int16 SystemType ) override;
@@ -69,31 +68,6 @@ public:
 virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) override;
 virtual ::sal_Int32 SAL_CALL getDisplay() override;
 virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) override;
-};
-
-
-//  class VCLXTopWindow
-
-
-class VCLXTopWindow: public VCLXTopWindow_Base,
- public VCLXContainer
-{
-protected:
-virtual vcl::Window* GetWindowImpl() override;
-virtual ::comphelper::OInterfaceContainerHelper2& 
GetTopWindowListenersImpl() override;
-
-public:
-VCLXTopWindow();
-virtual ~VCLXTopWindow() override;
-
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) 
override;
-voidSAL_CALL acquire() throw() override  { 
OWeakObject::acquire(); }
-voidSAL_CALL release() throw() override  { 
OWeakObject::release(); }
-
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() override;
 
 static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
 virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override 
{ return ImplGetPropertyIds( aIds ); }
diff --git a/toolkit/source/awt/vclxtopwindow.cxx 
b/toolkit/source/awt/vclxtopwindow.cxx
index f612851a8236..544cc60622ae 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -46,38 +46,14 @@ using ::com::sun::star::uno::Type;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::lang::IndexOutOfBoundsException;
 
-VCLXTopWindow_Base::VCLXTopWindow_Base()
-{
-}
-
-VCLXTopWindow_Base::~VCLXTopWindow_Base()
-{
-}
-
-Any VCLXTopWindow_Base::queryInterface( const Type & rType )
-{
-css::uno::Any aRet( VCLXTopWindow_XBase::queryInterface( rType ) );
-
-if (!aRet.hasValue())
-aRet = VCLXTopWindow_SBase::queryInterface( rType );
-
-return aRet;
-}
 
-Sequence< Type > VCLXTopWindow_Base::getTypes()
-{
-Sequence< Type > aTypes( VCLXTopWindow_XBase::getTypes() );
-aTypes = ::comphelper::concatSequences( aTypes, 
VCLXTopWindow_SBase::getType

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2019-10-07 Thread Noel Grandin (via logerrit) 
 include/toolkit/awt/vclxbitmap.hxx |   21 +
 toolkit/source/awt/vclxbitmap.cxx  |   25 -
 2 files changed, 5 insertions(+), 41 deletions(-)

New commits:
commit e1771399490fe0d2c40fb250f03c362128916223
Author: Noel Grandin 
AuthorDate: Mon Oct 7 14:22:47 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 08:25:24 2019 +0200

use cppu::WeakImplHelper in VCLXBitmap

Change-Id: I789646591caca8ee164d32e07b050b862f627973
Reviewed-on: https://gerrit.libreoffice.org/80385
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxbitmap.hxx 
b/include/toolkit/awt/vclxbitmap.hxx
index 22b339f96194..d2ff89c2845c 100644
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -33,11 +33,10 @@
 //  class VCLXBitmap
 
 
-class VCLXBitmap final : public css::awt::XBitmap,
-public css::awt::XDisplayBitmap,
-public css::lang::XTypeProvider,
-public css::lang::XUnoTunnel,
-public ::cppu::OWeakObject
+class VCLXBitmap final : public cppu::WeakImplHelper<
+css::awt::XBitmap,
+css::awt::XDisplayBitmap,
+css::lang::XUnoTunnel>
 {
 ::osl::MutexmaMutex;
 BitmapExmaBitmap;
@@ -49,19 +48,9 @@ public:
 voidSetBitmap( const BitmapEx& rBmp )   { maBitmap = rBmp; }
 const BitmapEx& GetBitmap() const   { return maBitmap; }
 
-
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() throw() 
override  { OWeakObject::acquire(); }
-voidSAL_CALL release() throw() 
override  { OWeakObject::release(); }
-
 // css::lang::XUnoTunnel
 UNO3_GETIMPLEMENTATION_DECL(VCLXBitmap)
 
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() override;
-
 // css::awt::XBitmap
 css::awt::Size SAL_CALL getSize() override;
 css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() override;
diff --git a/toolkit/source/awt/vclxbitmap.cxx 
b/toolkit/source/awt/vclxbitmap.cxx
index 4155027dbc77..bfd95f791404 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.cxx
@@ -28,34 +28,9 @@
 //  class VCLXBitmap
 
 
-// css::uno::XInterface
-css::uno::Any VCLXBitmap::queryInterface( const css::uno::Type & rType )
-{
-css::uno::Any aRet = ::cppu::queryInterface( rType,
-static_cast< css::awt::XBitmap* 
>(this),
-static_cast< css::awt::XDisplayBitmap* 
>(this),
-static_cast< css::lang::XUnoTunnel* 
>(this),
-static_cast< css::lang::XTypeProvider* 
>(this) );
-return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
 // css::lang::XUnoTunnel
 UNO3_GETIMPLEMENTATION_IMPL( VCLXBitmap );
 
-IMPL_IMPLEMENTATION_ID( VCLXBitmap )
-
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type > VCLXBitmap::getTypes()
-{
-static const css::uno::Sequence< css::uno::Type > aTypeList {
-cppu::UnoType::get(),
-cppu::UnoType::get(),
-cppu::UnoType::get()
-};
-return aTypeList;
-}
-
-
 // css::awt::XBitmap
 css::awt::Size VCLXBitmap::getSize()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2019-10-07 Thread Noel Grandin (via logerrit) 
 include/toolkit/awt/vclxgraphics.hxx |   18 --
 toolkit/source/awt/vclxgraphics.cxx  |   23 ---
 2 files changed, 4 insertions(+), 37 deletions(-)

New commits:
commit 09e0e415e1fe1821a2ee5b12dab9b20fd7c46641
Author: Noel Grandin 
AuthorDate: Mon Oct 7 14:29:16 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 7 22:02:32 2019 +0200

use cppu::WeakImplHelper in VCLXGraphics

Change-Id: If862818ef3eb534493ac61d5071ec1adf590ebf2
Reviewed-on: https://gerrit.libreoffice.org/80388
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxgraphics.hxx 
b/include/toolkit/awt/vclxgraphics.hxx
index 1482bad16b3e..85464ae37e56 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -54,10 +54,9 @@ namespace o3tl
 //  class VCLXGraphics
 
 
-class VCLXGraphics :public css::awt::XGraphics2,
-public css::lang::XTypeProvider,
-public css::lang::XUnoTunnel,
-public ::cppu::OWeakObject
+class VCLXGraphics : public cppu::WeakImplHelper<
+css::awt::XGraphics2,
+css::lang::XUnoTunnel>
 {
 private:
 // used to return same reference on each call to getDevice()
@@ -84,18 +83,9 @@ public:
 voidSetOutputDevice( OutputDevice* pOutDev );
 OutputDevice*   GetOutputDevice() const { return mpOutputDevice; }
 
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() throw() 
override  { OWeakObject::acquire(); }
-voidSAL_CALL release() throw() 
override  { OWeakObject::release(); }
-
 // css::lang::XUnoTunnel
 UNO3_GETIMPLEMENTATION_DECL(VCLXGraphics)
 
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() override;
-
 // css::awt::XGraphics Attributes
 virtual css::uno::Reference< css::awt::XDevice > SAL_CALL getDevice() 
override;
 virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) override;
diff --git a/toolkit/source/awt/vclxgraphics.cxx 
b/toolkit/source/awt/vclxgraphics.cxx
index c5a27d244538..12f586a9a454 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -37,32 +37,9 @@ using namespace com::sun::star;
 
 //  class VCLXGraphics
 
-
-// uno::XInterface
-uno::Any VCLXGraphics::queryInterface( const uno::Type & rType )
-{
-uno::Any aRet = ::cppu::queryInterface( rType,
-static_cast< css::awt::XGraphics* 
>(this),
-static_cast< css::lang::XTypeProvider* 
>(this),
-static_cast< css::lang::XUnoTunnel* 
>(this) );
-return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
 // lang::XUnoTunnel
 UNO3_GETIMPLEMENTATION_IMPL( VCLXGraphics );
 
-IMPL_IMPLEMENTATION_ID( VCLXGraphics )
-
-// lang::XTypeProvider
-css::uno::Sequence< css::uno::Type > VCLXGraphics::getTypes()
-{
-static const css::uno::Sequence< css::uno::Type > aTypeList {
-cppu::UnoType::get(),
-cppu::UnoType::get()
-};
-return aTypeList;
-}
-
 VCLXGraphics::VCLXGraphics()
 : mpOutputDevice(nullptr)
 , meRasterOp(RasterOp::OverPaint)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2019-02-21 Thread Libreoffice Gerrit user 
 include/toolkit/awt/vclxtopwindow.hxx |3 ---
 toolkit/source/awt/vclxtopwindow.cxx  |1 -
 toolkit/source/awt/vclxwindow.cxx |   10 ++
 3 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 4c349c7b2fa422f17354b1db7231ffe4d15d3b44
Author: Noel Grandin 
AuthorDate: Thu Feb 21 16:05:23 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 22 08:23:47 2019 +0100

loplugin:unusedfields in toolkit

Change-Id: Ida146892e786aa05cd9b94cd647a1c5849ecc2ce
Reviewed-on: https://gerrit.libreoffice.org/68162
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxtopwindow.hxx 
b/include/toolkit/awt/vclxtopwindow.hxx
index b018b20335f9..08777e280cee 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -39,9 +39,6 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow_Base  :public 
VCLXTopWindow_XBase
 ,public VCLXTopWindow_SBase
 {
 protected:
-css::uno::Reference< css::awt::XMenuBar> mxMenuBar;
-
-
 virtual vcl::Window* GetWindowImpl() = 0;
 virtual ::comphelper::OInterfaceContainerHelper2& 
GetTopWindowListenersImpl() = 0;
 
diff --git a/toolkit/source/awt/vclxtopwindow.cxx 
b/toolkit/source/awt/vclxtopwindow.cxx
index 69330da50fa6..fd78b543768f 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -159,7 +159,6 @@ void VCLXTopWindow_Base::setMenuBar( const 
css::uno::Reference< css::awt::XMenuB
 pSystemWindow->SetMenuBar( static_cast( 
pMenu->GetMenu() ));
 }
 }
-mxMenuBar = rxMenu;
 }
 
 
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index f956569d0079..55a61ac36307 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -132,8 +132,6 @@ public:
 std::unique_ptr
 mpPropHelper;
 
-css::uno::Reference< css::awt::XPointer >
-mxPointer;
 css::uno::Reference< css::accessibility::XAccessibleContext >
 mxAccessibleContext;
 css::uno::Reference< css::awt::XGraphics >
@@ -1147,12 +1145,8 @@ void VCLXWindow::setPointer( const css::uno::Reference< 
css::awt::XPointer >& rx
 SolarMutexGuard aGuard;
 
 VCLXPointer* pPointer = VCLXPointer::GetImplementation( rxPointer );
-if ( pPointer )
-{
-mpImpl->mxPointer = rxPointer;
-if ( GetWindow() )
-GetWindow()->SetPointer( pPointer->GetPointer() );
-}
+if ( pPointer && GetWindow() )
+GetWindow()->SetPointer( pPointer->GetPointer() );
 }
 
 void VCLXWindow::setBackground( sal_Int32 nColor )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2019-01-23 Thread Libreoffice Gerrit user 
 include/toolkit/controls/unocontrolmodel.hxx |   13 +---
 toolkit/source/controls/tkscrollbar.cxx  |2 -
 toolkit/source/controls/unocontrols.cxx  |   28 +--
 3 files changed, 21 insertions(+), 22 deletions(-)

New commits:
commit cfda0e43b7c31d31bb4a93e04afa10cd563318d5
Author: Stephan Bergmann 
AuthorDate: Wed Jan 23 11:31:28 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 23 13:25:53 2019 +0100

Replace macro with template

Change-Id: I0b444eae51b65caf740e625e65137ff9ff8ce4da
Reviewed-on: https://gerrit.libreoffice.org/66782
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/toolkit/controls/unocontrolmodel.hxx 
b/include/toolkit/controls/unocontrolmodel.hxx
index aa358a927246..28f834b220df 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -98,6 +98,12 @@ protected:
 sal_Int32 _nSecondHandle/// second handle, 
which should supersede _nFirstHandle in the sequence
 );
 
+template void UNO_CONTROL_MODEL_REGISTER_PROPERTIES() {
+std::vector< sal_uInt16 > aIds;
+T::ImplGetPropertyIds( aIds );
+ImplRegisterProperties( aIds );
+}
+
 protected:
 #ifdef _MSC_VER
 UnoControlModel() //do not use! needed by MSVC at compile time to satisfy 
WeakAggImplHelper7
@@ -173,13 +179,6 @@ public:
 void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& 
PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) override;
 };
 
-#define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \
-do { \
-std::vector< sal_uInt16 > aIds; \
-a::ImplGetPropertyIds( aIds ); \
-ImplRegisterProperties( aIds ); \
-} while (false)
-
 #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/tkscrollbar.cxx 
b/toolkit/source/controls/tkscrollbar.cxx
index fef9117e0e00..d28872057a2f 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -41,7 +41,7 @@ namespace toolkit
 UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< 
uno::XComponentContext >& i_factory )
 :UnoControlModel( i_factory )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 }
 
 
diff --git a/toolkit/source/controls/unocontrols.cxx 
b/toolkit/source/controls/unocontrols.cxx
index f9aac462f571..6c01ea0736be 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -107,7 +107,7 @@ ImageHelper::getGraphicFromURL_nothrow( const OUString& 
_rURL )
 UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext 
>& rxContext )
 :UnoControlModel( rxContext )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 }
 
 OUString UnoControlEditModel::getServiceName( )
@@ -676,7 +676,7 @@ void SAL_CALL 
GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
 UnoControlButtonModel::UnoControlButtonModel( const Reference< 
XComponentContext >& rxContext )
 :GraphicControlModel( rxContext )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 
 osl_atomic_increment( &m_refCount );
 {
@@ -909,7 +909,7 @@ UnoControlImageControlModel::UnoControlImageControlModel( 
const Reference< XComp
 :GraphicControlModel( rxContext )
 ,mbAdjustingImageScaleMode( false )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 }
 
 OUString UnoControlImageControlModel::getServiceName()
@@ -1079,7 +1079,7 @@ stardiv_Toolkit_UnoImageControlControl_get_implementation(
 UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< 
XComponentContext >& rxContext )
 :GraphicControlModel( rxContext )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 }
 
 OUString UnoControlRadioButtonModel::getServiceName()
@@ -1321,7 +1321,7 @@ stardiv_Toolkit_UnoRadioButtonControl_get_implementation(
 UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< 
XComponentContext >& rxContext )
 :GraphicControlModel( rxContext )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 }
 
 OUString UnoControlCheckBoxModel::getServiceName()
@@ -1535,7 +1535,7 @@ stardiv_Toolkit_UnoCheckBoxControl_get_implementation(
 UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< 
XComponentContext >& rxContext )
 :UnoControlModel( rxContext )
 {
-UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
+UNO_CONTROL_MODEL_REGISTER_PROPERTIES();
 }
 
 OUString UnoControlFixedH

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2018-09-27 Thread Libreoffice Gerrit user 
 include/toolkit/controls/unocontrol.hxx |2 +-
 toolkit/source/controls/unocontrol.cxx  |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f7a065f8cb3270a3fae382325e87dbec5e9a16fa
Author: Andrea Gelmini 
AuthorDate: Wed Sep 26 18:06:14 2018 +0200
Commit: Julien Nabet 
CommitDate: Fri Sep 28 04:32:09 2018 +0200

Fix mbRefeshingPeer -> mbRefreshingPeer

It passed "make check" on Linux.

Change-Id: Ia28f23b78b467fc70431fa4a7ed41ae2f3a4c5fd
Reviewed-on: https://gerrit.libreoffice.org/61046
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index 29dd824f88bc..7bc020140686 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -103,7 +103,7 @@ protected:
 maAccessibleContext;/// our most 
recent XAccessibleContext instance
 
 boolmbDisposePeer;
-boolmbRefeshingPeer;
+boolmbRefreshingPeer;
 boolmbCreatingPeer;
 boolmbCreatingCompatiblePeer;
 boolmbDesignMode;
diff --git a/toolkit/source/controls/unocontrol.cxx 
b/toolkit/source/controls/unocontrol.cxx
index 9432f67b78ec..28dac1716889 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -140,7 +140,7 @@ UnoControl::UnoControl() :
 , mpData( new UnoControl_Data )
 {
 mbDisposePeer = true;
-mbRefeshingPeer = false;
+mbRefreshingPeer = false;
 mbCreatingPeer = false;
 mbCreatingCompatiblePeer = false;
 mbDesignMode = false;
@@ -499,7 +499,7 @@ void UnoControl::ImplModelPropertiesChanged( const 
Sequence< PropertyChangeEvent
 }
 
 sal_uInt16 nPType = GetPropertyId( pEvents->PropertyName );
-if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && 
!mbCreatingPeer )
+if ( mbDesignMode && mbDisposePeer && !mbRefreshingPeer && 
!mbCreatingPeer )
 {
 // if we're in design mode, then some properties can change which
 // require creating a *new* peer (since these properties cannot
@@ -620,10 +620,10 @@ void UnoControl::ImplModelPropertiesChanged( const 
Sequence< PropertyChangeEvent
 getPeer()->dispose();
 mxPeer.clear();
 mxVclWindowPeer = nullptr;
-mbRefeshingPeer = true;
+mbRefreshingPeer = true;
 Reference< XWindowPeer >xP( xParent, UNO_QUERY );
 xThis->createPeer( Reference< XToolkit > (), xP );
-mbRefeshingPeer = false;
+mbRefreshingPeer = false;
 aPeerPropertiesToSet.clear();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2018-07-27 Thread Libreoffice Gerrit user 
 include/toolkit/controls/dialogcontrol.hxx   |   15 +++
 toolkit/source/controls/spinningprogress.cxx |5 +
 2 files changed, 20 insertions(+)

New commits:
commit c5fcb476ac8eab18152a7f6d0487daa56231fcf8
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 11:22:07 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 09:33:41 2018 +0200

toolkit: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.

Change-Id: Ib10659fbd430b96edbad67e779ce4c12b7eeaa5d
Reviewed-on: https://gerrit.libreoffice.org/58054
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 970226416253..df643f47f450 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -170,6 +170,11 @@ public:
 UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext 
>& rxContext );
 virtual ~UnoMultiPageModel() override;
 
+UnoMultiPageModel(UnoMultiPageModel const &) = default;
+UnoMultiPageModel(UnoMultiPageModel &&) = default;
+UnoMultiPageModel & operator =(UnoMultiPageModel const &) = default;
+UnoMultiPageModel & operator =(UnoMultiPageModel &&) = default;
+
 rtl::Reference Clone() const override;
 
 DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, 
ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" )
@@ -244,6 +249,11 @@ public:
 UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 virtual ~UnoPageModel() override;
 
+UnoPageModel(UnoPageModel const &) = default;
+UnoPageModel(UnoPageModel &&) = default;
+UnoPageModel & operator =(UnoPageModel const &) = default;
+UnoPageModel & operator =(UnoPageModel &&) = default;
+
 rtl::Reference Clone() const override;
 
 DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, 
"com.sun.star.awt.UnoPageModel" )
@@ -277,6 +287,11 @@ public:
 UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 virtual ~UnoFrameModel() override;
 
+UnoFrameModel(UnoFrameModel const &) = default;
+UnoFrameModel(UnoFrameModel &&) = default;
+UnoFrameModel & operator =(UnoFrameModel const &) = default;
+UnoFrameModel & operator =(UnoFrameModel &&) = default;
+
 rtl::Reference Clone() const override;
 
 DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, 
"com.sun.star.awt.UnoFrameModel" )
diff --git a/toolkit/source/controls/spinningprogress.cxx 
b/toolkit/source/controls/spinningprogress.cxx
index 096de0c98bfd..4792b98fae27 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -34,6 +34,11 @@ class SpinningProgressControlModel : public 
SpinningProgressControlModel_Base
 public:
 explicit SpinningProgressControlModel( css::uno::Reference< 
css::uno::XComponentContext > const & i_factory );
 
+SpinningProgressControlModel(SpinningProgressControlModel const &) = 
default;
+SpinningProgressControlModel(SpinningProgressControlModel &&) = default;
+SpinningProgressControlModel & operator =(SpinningProgressControlModel 
const &) = default;
+SpinningProgressControlModel & operator =(SpinningProgressControlModel &&) 
= default;
+
 virtual rtl::Reference Clone() const override;
 
 // XPropertySet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2018-03-15 Thread Tomaž Vajngerl 
 include/toolkit/controls/unocontrols.hxx  |2 --
 toolkit/source/controls/dialogcontrol.cxx |   13 ++---
 toolkit/source/controls/unocontrols.cxx   |   10 +-
 3 files changed, 3 insertions(+), 22 deletions(-)

New commits:
commit 4bbf37b7ed83491efdfa9cb12cd434f67a1764ae
Author: Tomaž Vajngerl 
Date:   Thu Mar 15 21:14:29 2018 +0900

drop support for GraphicObject URLs in toolkit

Change-Id: I86d18232b8fcb34272d3cc04f65a7dc72248591a
Reviewed-on: https://gerrit.libreoffice.org/51328
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/toolkit/controls/unocontrols.hxx 
b/include/toolkit/controls/unocontrols.hxx
index 7da16557cde3..e758cf6e01a8 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -60,8 +60,6 @@
 
 #include 
 
-#define UNO_NAME_GRAPHOBJ_URLPREFIX 
"vnd.sun.star.GraphicObject:"
-
 class ImageHelper
 {
 public:
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 8f32a6fcd9b0..a20b22ad81c9 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -413,11 +413,7 @@ void UnoDialogControl::PrepareWindowDescriptor( 
css::awt::WindowDescriptor& rDes
 if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
 ( !aImageURL.isEmpty() ))
 {
-OUString absoluteUrl = aImageURL;
-if ( !aImageURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) )
-absoluteUrl = getPhysicalLocation( ImplGetPropertyValue( 
PROPERTY_DIALOGSOURCEURL ),
- uno::makeAny( aImageURL ) );
-
+OUString absoluteUrl = 
getPhysicalLocation(ImplGetPropertyValue(PROPERTY_DIALOGSOURCEURL), 
uno::makeAny(aImageURL));
 xGraphic = ImageHelper::getGraphicFromURL_nothrow( absoluteUrl );
 ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), true 
);
 }
@@ -632,12 +628,7 @@ void UnoDialogControl::ImplModelPropertiesChanged( const 
Sequence< PropertyChang
 if (( ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL 
) ) >>= aImageURL ) &&
 ( !aImageURL.isEmpty() ))
 {
-OUString absoluteUrl = aImageURL;
-if ( !aImageURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) )
-
-absoluteUrl = getPhysicalLocation( ImplGetPropertyValue( 
GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL )),
- uno::makeAny(aImageURL));
-
+OUString absoluteUrl = 
getPhysicalLocation(ImplGetPropertyValue(GetPropertyName(BASEPROPERTY_DIALOGSOURCEURL)),
 uno::makeAny(aImageURL));
 xGraphic = ImageHelper::getGraphicFromURL_nothrow( absoluteUrl 
);
 }
 ImplSetPropertyValue(  GetPropertyName( BASEPROPERTY_GRAPHIC), 
uno::makeAny( xGraphic ), true );
diff --git a/toolkit/source/controls/unocontrols.cxx 
b/toolkit/source/controls/unocontrols.cxx
index 98b4b8c0b52a..ea98a4d4512d 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -74,15 +74,7 @@ using namespace ::toolkit;
 uno::Reference< graphic::XGraphic >
 ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< 
graphic::XGraphicObject >& xOutGraphicObj, const OUString& _rURL )
 {
-if ( _rURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) )
-{
-// graphic manager uniqueid
-OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
-xOutGraphicObj = graphic::GraphicObject::createWithId( 
::comphelper::getProcessComponentContext(), sID );
-}
-else // linked
-xOutGraphicObj = nullptr; // release the GraphicObject
-
+xOutGraphicObj = nullptr;
 return ImageHelper::getGraphicFromURL_nothrow( _rURL );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2017-12-16 Thread Jochen Nitschke 
 include/toolkit/controls/dialogcontrol.hxx   |3 ---
 toolkit/source/controls/dialogcontrol.cxx|   15 ---
 toolkit/source/controls/spinningprogress.cxx |7 ---
 toolkit/source/controls/tkspinbutton.cxx |1 -
 toolkit/source/controls/tree/treecontrol.cxx |5 -
 toolkit/source/controls/tree/treecontrol.hxx |1 -
 6 files changed, 32 deletions(-)

New commits:
commit aeab23841d3c883b4ea2b8e3143eabd5ac440276
Author: Jochen Nitschke 
Date:   Sat Dec 16 11:35:16 2017 +0100

clang-tidy modernize-use-equals-default in toolkit

Change-Id: I3c46fd48130dcec081de1f7807405f252ec247e0
Reviewed-on: https://gerrit.libreoffice.org/46593
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 2316613e4a4b..e1bc04f1e63f 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -169,7 +169,6 @@ class UnoMultiPageModel : public ControlModelContainerBase
 public:
 UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext 
>& rxContext );
 virtual ~UnoMultiPageModel() override;
-UnoMultiPageModel( const UnoMultiPageModel& rModel );
 
 UnoControlModel*Clone() const override;
 
@@ -244,7 +243,6 @@ class UnoPageModel : public ControlModelContainerBase
 public:
 UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 virtual ~UnoPageModel() override;
-UnoPageModel( const UnoPageModel& rModel );
 
 UnoControlModel*Clone() const override;
 
@@ -278,7 +276,6 @@ class UnoFrameModel : public ControlModelContainerBase
 public:
 UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 virtual ~UnoFrameModel() override;
-UnoFrameModel( const UnoFrameModel& rModel );
 
 UnoControlModel*Clone() const override;
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 04b70d6d686b..a4cb2fab7ebb 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -868,11 +868,6 @@ UnoMultiPageModel::UnoMultiPageModel( const Reference< 
XComponentContext >& rxCo
 ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES, uno::makeAny( 
xNameCont ) );
 }
 
-UnoMultiPageModel::UnoMultiPageModel( const UnoMultiPageModel& rModel )
-: ControlModelContainerBase( rModel )
-{
-}
-
 UnoMultiPageModel::~UnoMultiPageModel()
 {
 }
@@ -986,11 +981,6 @@ UnoPageModel::UnoPageModel( const Reference< 
XComponentContext >& rxContext ) :
 ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES, uno::makeAny( 
xNameCont ) );
 }
 
-UnoPageModel::UnoPageModel( const UnoPageModel& rModel )
-: ControlModelContainerBase( rModel )
-{
-}
-
 UnoPageModel::~UnoPageModel()
 {
 }
@@ -1145,11 +1135,6 @@ UnoFrameModel::UnoFrameModel(  const Reference< 
XComponentContext >& rxContext )
 ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES, uno::makeAny( 
xNameCont ) );
 }
 
-UnoFrameModel::UnoFrameModel( const UnoFrameModel& rModel )
-: ControlModelContainerBase( rModel )
-{
-}
-
 UnoFrameModel::~UnoFrameModel()
 {
 }
diff --git a/toolkit/source/controls/spinningprogress.cxx 
b/toolkit/source/controls/spinningprogress.cxx
index 3cf094f9f5dd..41c746b48205 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -33,7 +33,6 @@ class SpinningProgressControlModel : public 
SpinningProgressControlModel_Base
 {
 public:
 explicit SpinningProgressControlModel( css::uno::Reference< 
css::uno::XComponentContext > const & i_factory );
-SpinningProgressControlModel( const SpinningProgressControlModel& 
i_copySource );
 
 virtual UnoControlModel* Clone() const override;
 
@@ -79,12 +78,6 @@ protected:
 }
 
 
-SpinningProgressControlModel::SpinningProgressControlModel( const 
SpinningProgressControlModel& i_copySource )
-:SpinningProgressControlModel_Base( i_copySource )
-{
-}
-
-
 SpinningProgressControlModel::~SpinningProgressControlModel()
 {
 }
diff --git a/toolkit/source/controls/tkspinbutton.cxx 
b/toolkit/source/controls/tkspinbutton.cxx
index b1fc40aa6826..e4200d3fd04a 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -47,7 +47,6 @@ protected:
 
 public:
 explicit UnoSpinButtonModel( const css::uno::Reference< 
css::uno::XComponentContext >& i_factory );
-UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( 
rModel ) {}
 
 UnoControlModel*Clone() const override { return new 
UnoSpinButtonModel( *this ); }
 
diff --git a/toolkit/source/controls/tree/treecontrol.cxx 
b/toolkit/source/controls/tree/treecontrol.cxx
index 4292b6c42932..816b177e7536 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treec

[Libreoffice-commits] core.git: include/toolkit toolkit/source unotools/source

2017-12-13 Thread Noel Grandin 
 include/toolkit/controls/unocontrol.hxx  |3 ++-
 include/toolkit/controls/unocontrolcontainer.hxx |3 ++-
 toolkit/source/controls/unocontrol.cxx   |1 -
 toolkit/source/controls/unocontrolcontainer.cxx  |8 +++-
 unotools/source/config/saveopt.cxx   |   18 --
 5 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 78a6ce17f06fbe13b806fd563e85a4fe60d3bcfc
Author: Noel Grandin 
Date:   Wed Dec 13 15:47:02 2017 +0200

DELETEZ->std::unique_ptr in toolkit,unotools

Change-Id: I2263e233ae03575e53ab4e7894a7507423afd32e
Reviewed-on: https://gerrit.libreoffice.org/46397
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index 9080d918304e..29dd824f88bc 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 struct UnoControlComponentInfos
@@ -108,7 +109,7 @@ protected:
 boolmbDesignMode;
 
 UnoControlComponentInfosmaComponentInfos;
-UnoControl_Data*mpData;
+std::unique_ptrmpData;
 
 ::osl::Mutex&  
 GetMutex() { return maMutex; }
 
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx 
b/include/toolkit/controls/unocontrolcontainer.hxx
index ca2a5a54555b..816632d418db 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -32,6 +32,7 @@
 #include 
 
 #include 
+#include 
 
 class UnoControlHolderList;
 
@@ -48,7 +49,7 @@ typedef ::cppu::AggImplInheritanceHelper4   <   UnoControlBase
 class UnoControlContainer : public UnoControlContainer_Base
 {
 private:
-UnoControlHolderList*   mpControls;
+std::unique_ptr   mpControls;
 css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >
maTabControllers;
 ContainerListenerMultiplexermaCListeners;
 
diff --git a/toolkit/source/controls/unocontrol.cxx 
b/toolkit/source/controls/unocontrol.cxx
index f07ff4d64251..6c8435791883 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -150,7 +150,6 @@ UnoControl::UnoControl() :
 
 UnoControl::~UnoControl()
 {
-DELETEZ( mpData );
 }
 
 OUString UnoControl::GetComponentServiceName()
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx 
b/toolkit/source/controls/unocontrolcontainer.cxx
index 0a992812f7d8..5b533dddb22a 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -381,7 +381,7 @@ UnoControlContainer::UnoControlContainer()
 :UnoControlContainer_Base()
 ,maCListeners( *this )
 {
-mpControls = new UnoControlHolderList;
+mpControls.reset(new UnoControlHolderList);
 }
 
 UnoControlContainer::UnoControlContainer(const uno::Reference< 
awt::XWindowPeer >& xP )
@@ -390,12 +390,11 @@ UnoControlContainer::UnoControlContainer(const 
uno::Reference< awt::XWindowPeer
 {
 setPeer( xP );
 mbDisposePeer = false;
-mpControls = new UnoControlHolderList;
+mpControls.reset(new UnoControlHolderList);
 }
 
 UnoControlContainer::~UnoControlContainer()
 {
-DELETEZ( mpControls );
 }
 
 void UnoControlContainer::ImplActivateTabControllers()
@@ -433,8 +432,7 @@ void UnoControlContainer::dispose(  )
 
 
 // Delete all structures
-DELETEZ( mpControls );
-mpControls = new UnoControlHolderList;
+mpControls.reset(new UnoControlHolderList);
 
 UnoControlBase::dispose();
 }
diff --git a/unotools/source/config/saveopt.cxx 
b/unotools/source/config/saveopt.cxx
index cdb66c6fabe4..35b721702f21 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -45,11 +45,11 @@ class SvtLoadOptions_Impl;
 
 struct SvtLoadSaveOptions_Impl
 {
-SvtSaveOptions_Impl* pSaveOpt;
-SvtLoadOptions_Impl* pLoadOpt;
+std::unique_ptr pSaveOpt;
+std::unique_ptr pLoadOpt;
 };
 
-static SvtLoadSaveOptions_Impl* pOptions = nullptr;
+static std::unique_ptr pOptions;
 static sal_Int32   nRefCount = 0;
 
 class SvtSaveOptions_Impl : public utl::ConfigItem
@@ -802,14 +802,14 @@ SvtSaveOptions::SvtSaveOptions()
 ::osl::MutexGuard aGuard( LocalSingleton::get() );
 if ( !pOptions )
 {
-pOptions = new SvtLoadSaveOptions_Impl;
-pOptions->pSaveOpt = new SvtSaveOptions_Impl;
-pOptions->pLoadOpt = new SvtLoadOptions_Impl;
+pOptions.reset(new SvtLoadSaveOptions_Impl);
+pOptions->pSaveOpt.reset(new SvtSaveOptions_Impl);
+pOptions->pLoadOpt.reset( new SvtLoadOptions_Impl);
 
 ItemHolder1::holdConfigItem(EItem::SaveOptions);
}
++nRefCount;
-pImp = pOptions;
+pImp = pOptions.get();
 }
 
 SvtSaveOptions::~SvtSaveOptions()

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2017-10-09 Thread Julien Nabet 
 include/toolkit/controls/controlmodelcontainerbase.hxx |8 ++---
 toolkit/source/controls/controlmodelcontainerbase.cxx  |   24 -
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit af7b62ea9e54dba4923b004ef921a20c83c2a836
Author: Julien Nabet 
Date:   Mon Oct 9 21:04:19 2017 +0200

Replace lists by vectors in controlmodelcontainerbase (toolkit)

Change-Id: I614433b16501812a80c9d4f78abb499f96fecd26
Reviewed-on: https://gerrit.libreoffice.org/43293
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx 
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 3c92013a4f4d..aba3ff1362a0 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //  class ControlModelContainerBase
 
@@ -66,7 +66,7 @@ public:
 typedef ::std::pair< css::uno::Reference< css::awt::XControlModel >, 
OUString >
 UnoControlModelHolder;
 private:
-typedef ::std::list< UnoControlModelHolder >
UnoControlModelHolderList;
+typedef ::std::vector< UnoControlModelHolder >
UnoControlModelHolderVector;
 
 public:
 // for grouping control models (XTabControllerModel::getGroupXXX)
@@ -81,7 +81,7 @@ public:
 protected:
 ContainerListenerMultiplexermaContainerListeners;
 ::comphelper::OInterfaceContainerHelper2   maChangeListeners;
-UnoControlModelHolderList   maModels;
+UnoControlModelHolderVector   maModels;
 
 AllGroups   maGroups;
 boolmbGroupsUpToDate;
@@ -96,7 +96,7 @@ protected:
 css::uno::Any  ImplGetDefaultValue( sal_uInt16 nPropId ) const 
override;
 ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper() override;
 
-UnoControlModelHolderList::iterator ImplFindElement( const 
OUString& rName );
+UnoControlModelHolderVector::iterator ImplFindElement( const 
OUString& rName );
 
 /// @throws css::lang::IllegalArgumentException
 /// @throws css::container::ElementExistException
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 291894605b49..c4ae5a7cf6a9 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -133,11 +133,11 @@ public:
 struct CloneControlModel
 {
 private:
-ControlModelContainerBase::UnoControlModelHolderList&   m_rTargetList;
+ControlModelContainerBase::UnoControlModelHolderVector&   m_rTargetVector;
 
 public:
-explicit CloneControlModel( 
ControlModelContainerBase::UnoControlModelHolderList& _rTargetList )
-:m_rTargetList( _rTargetList )
+explicit CloneControlModel( 
ControlModelContainerBase::UnoControlModelHolderVector& _rTargetVector )
+:m_rTargetVector( _rTargetVector )
 {
 }
 
@@ -147,7 +147,7 @@ public:
 Reference< XCloneable > xCloneSource( _rSource.first, UNO_QUERY );
 Reference< XControlModel > xClone( xCloneSource->createClone(), 
UNO_QUERY );
 // add to target list
-m_rTargetList.emplace_back( xClone, _rSource.second );
+m_rTargetVector.emplace_back( xClone, _rSource.second );
 }
 };
 
@@ -312,7 +312,7 @@ UnoControlModel* ControlModelContainerBase::Clone() const
 return pClone;
 }
 
-ControlModelContainerBase::UnoControlModelHolderList::iterator 
ControlModelContainerBase::ImplFindElement( const OUString& rName )
+ControlModelContainerBase::UnoControlModelHolderVector::iterator 
ControlModelContainerBase::ImplFindElement( const OUString& rName )
 {
 return ::std::find_if( maModels.begin(), maModels.end(), FindControlModel( 
rName ) );
 }
@@ -480,7 +480,7 @@ void ControlModelContainerBase::replaceByName( const 
OUString& aName, const Any&
 if ( !xNewModel.is() )
 lcl_throwIllegalArgumentException();
 
-UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName );
+UnoControlModelHolderVector::iterator aElementPos = ImplFindElement( aName 
);
 if ( maModels.end() == aElementPos )
 lcl_throwNoSuchElementException();
 // Dialog behaviour is to have all containee names unique (MSO Userform is 
the same)
@@ -519,7 +519,7 @@ void ControlModelContainerBase::replaceByName( const 
OUString& aName, const Any&
 
 Any ControlModelContainerBase::getByName( const OUString& aName )
 {
-UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName );
+UnoControlModelHolderVector::iterator aElementPos = ImplFindElement( aName 
);
 if ( maModels.end() == aElementPos )
 lcl_throwNoSuchElementException();
 
@@ -579,7 +579,7 @@ void ControlModelContainerBase::insertByName( const 
OUString& aName, con

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2017-09-01 Thread Caolán McNamara 
 include/toolkit/awt/vclxtopwindow.hxx |7 ++-
 toolkit/source/awt/vclxtoolkit.cxx|4 ++--
 toolkit/source/awt/vclxtopwindow.cxx  |   12 
 3 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 3814952f0be80afddcfda7f0e65bb602ed75438c
Author: Caolán McNamara 
Date:   Fri Sep 1 12:06:23 2017 +0100

support XSystemDependentWindowPeer for all toplevel windows

Change-Id: Id79fba6956e2a97a10dcec1cab883d3665ef1628
Reviewed-on: https://gerrit.libreoffice.org/41806
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/toolkit/awt/vclxtopwindow.hxx 
b/include/toolkit/awt/vclxtopwindow.hxx
index c56269b4bab5..cc8746ba6ec6 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -37,9 +37,6 @@ typedef ::cppu::ImplHelper1 <   
css::awt::XSystemDependentWindowPeer
 class TOOLKIT_DLLPUBLIC VCLXTopWindow_Base  :public VCLXTopWindow_XBase
 ,public VCLXTopWindow_SBase
 {
-private:
-const bool  m_bWHWND;
-
 protected:
 css::uno::Reference< css::awt::XMenuBar> mxMenuBar;
 
@@ -47,7 +44,7 @@ protected:
 virtual vcl::Window* GetWindowImpl() = 0;
 virtual ::comphelper::OInterfaceContainerHelper2& 
GetTopWindowListenersImpl() = 0;
 
-VCLXTopWindow_Base( const bool _bSupportSystemWindowPeer );
+VCLXTopWindow_Base();
 
 public:
 virtual ~VCLXTopWindow_Base();
@@ -88,7 +85,7 @@ protected:
 virtual ::comphelper::OInterfaceContainerHelper2& 
GetTopWindowListenersImpl() override;
 
 public:
-VCLXTopWindow(bool bWHWND = false);
+VCLXTopWindow();
 virtual ~VCLXTopWindow() override;
 
 // css::uno::XInterface
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 866eb2a4cc2c..9076ae37f259 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1163,7 +1163,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 pNewWindow = VclPtr::Create( pParent, 
nWinBits );
 }
 
-*ppNewComp = new VCLXTopWindow( pNewWindow->GetType() == 
WindowType::WORKWINDOW );
+*ppNewComp = new VCLXTopWindow();
 }
 else if ( rDescriptor.Type == css::awt::WindowClass_CONTAINER )
 {
@@ -1406,7 +1406,7 @@ css::uno::Reference< css::awt::XWindowPeer > 
VCLXToolkit::createSystemChild( con
 css::uno::Reference< css::awt::XWindowPeer > xPeer;
 if ( pChildWindow )
 {
-VCLXTopWindow* pPeer = new VCLXTopWindow(true);
+VCLXTopWindow* pPeer = new VCLXTopWindow;
 SolarMutexGuard aGuard;
 pPeer->SetWindow( pChildWindow );
 xPeer = pPeer;
diff --git a/toolkit/source/awt/vclxtopwindow.cxx 
b/toolkit/source/awt/vclxtopwindow.cxx
index 784ff17b3373..fbd00b907937 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -49,8 +49,7 @@ using ::com::sun::star::uno::Type;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::lang::IndexOutOfBoundsException;
 
-VCLXTopWindow_Base::VCLXTopWindow_Base( const bool _bSupportSystemWindowPeer )
-:m_bWHWND( _bSupportSystemWindowPeer )
+VCLXTopWindow_Base::VCLXTopWindow_Base()
 {
 }
 
@@ -62,8 +61,7 @@ Any VCLXTopWindow_Base::queryInterface( const Type & rType )
 {
 css::uno::Any aRet( VCLXTopWindow_XBase::queryInterface( rType ) );
 
-// do not expose XSystemDependentWindowPeer if we do not have a system 
window handle
-if ( !aRet.hasValue() && m_bWHWND )
+if (!aRet.hasValue())
 aRet = VCLXTopWindow_SBase::queryInterface( rType );
 
 return aRet;
@@ -72,8 +70,7 @@ Any VCLXTopWindow_Base::queryInterface( const Type & rType )
 Sequence< Type > VCLXTopWindow_Base::getTypes()
 {
 Sequence< Type > aTypes( VCLXTopWindow_XBase::getTypes() );
-if ( m_bWHWND )
-aTypes = ::comphelper::concatSequences( aTypes, 
VCLXTopWindow_SBase::getTypes() );
+aTypes = ::comphelper::concatSequences( aTypes, 
VCLXTopWindow_SBase::getTypes() );
 return aTypes;
 }
 
@@ -249,8 +246,7 @@ void VCLXTopWindow::ImplGetPropertyIds( std::vector< 
sal_uInt16 > &rIds )
 VCLXContainer::ImplGetPropertyIds( rIds );
 }
 
-VCLXTopWindow::VCLXTopWindow(bool bWHWND)
-: VCLXTopWindow_Base( bWHWND )
+VCLXTopWindow::VCLXTopWindow()
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2017-08-18 Thread Andrea Gelmini 
 include/toolkit/controls/controlmodelcontainerbase.hxx |2 +-
 toolkit/source/controls/controlmodelcontainerbase.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 827f98644d4af44432f02fa66196c238ba6886d6
Author: Andrea Gelmini 
Date:   Fri Aug 18 13:47:39 2017 +0200

Fix typos

Change-Id: Ic9cbc4a05fa28c63ab2f5a773aa2f9e87757609a
Reviewed-on: https://gerrit.libreoffice.org/41285
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx 
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index b4b8221fe18c..3c92013a4f4d 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -114,7 +114,7 @@ public:
 void SAL_CALL addContainerListener( const css::uno::Reference< 
css::container::XContainerListener >& xListener ) override;
 void SAL_CALL removeContainerListener( const css::uno::Reference< 
css::container::XContainerListener >& xListener ) override;
 
-// css::container::XElementAcces
+// css::container::XElementAccess
 css::uno::Type SAL_CALL getElementType(  ) override;
 sal_Bool SAL_CALL hasElements(  ) override;
 
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 523410a1ef13..223d888cae10 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -458,7 +458,7 @@ void ControlModelContainerBase::removeContainerListener( 
const Reference< XConta
 maContainerListeners.removeInterface( l );
 }
 
-// XElementAcces
+// XElementAccess
 Type ControlModelContainerBase::getElementType()
 {
 Type aType = cppu::UnoType::get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2016-04-04 Thread Noel Grandin 
 include/toolkit/controls/eventcontainer.hxx |2 +-
 toolkit/source/controls/eventcontainer.cxx  |   18 --
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit fd4b1fb453c11f8789674afc324d04ac9fb7be67
Author: Noel Grandin 
Date:   Sun Apr 3 17:11:42 2016 +0200

sequence->vector in toolkit

Change-Id: Ia042eea672bb7535192132ae0b133d1745dc8cde
Reviewed-on: https://gerrit.libreoffice.org/23759
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/toolkit/controls/eventcontainer.hxx 
b/include/toolkit/controls/eventcontainer.hxx
index 7590e57..acc74cb 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -50,7 +50,7 @@ class NameContainer_Impl : public NameContainerHelper
 {
 NameContainerNameMap mHashMap;
 css::uno::Sequence< OUString > mNames;
-css::uno::Sequence< css::uno::Any > mValues;
+std::vector< css::uno::Any > mValues;
 sal_Int32 mnElementCount;
 css::uno::Type mType;
 
diff --git a/toolkit/source/controls/eventcontainer.cxx 
b/toolkit/source/controls/eventcontainer.cxx
index 64c7d8a..8b495da 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -64,7 +64,7 @@ Any NameContainer_Impl::getByName( const OUString& aName )
 throw NoSuchElementException();
 }
 sal_Int32 iHashResult = (*aIt).second;
-Any aRetAny = mValues.getConstArray()[ iHashResult ];
+Any aRetAny = mValues[ iHashResult ];
 return aRetAny;
 }
 
@@ -97,8 +97,8 @@ void NameContainer_Impl::replaceByName( const OUString& 
aName, const Any& aEleme
 throw NoSuchElementException();
 }
 sal_Int32 iHashResult = (*aIt).second;
-Any aOldElement = mValues.getConstArray()[ iHashResult ];
-mValues.getArray()[ iHashResult ] = aElement;
+Any aOldElement = mValues[ iHashResult ];
+mValues[ iHashResult ] = aElement;
 
 // Fire event
 ContainerEvent aEvent;
@@ -126,9 +126,9 @@ void NameContainer_Impl::insertByName( const OUString& 
aName, const Any& aElemen
 
 sal_Int32 nCount = mNames.getLength();
 mNames.realloc( nCount + 1 );
-mValues.realloc( nCount + 1 );
+mValues.resize( nCount + 1 );
 mNames.getArray()[ nCount ] = aName;
-mValues.getArray()[ nCount ] = aElement;
+mValues[ nCount ] = aElement;
 mHashMap[ aName ] = nCount;
 
 // Fire event
@@ -149,7 +149,7 @@ void NameContainer_Impl::removeByName( const OUString& Name 
)
 }
 
 sal_Int32 iHashResult = (*aIt).second;
-Any aOldElement = mValues.getConstArray()[ iHashResult ];
+Any aOldElement = mValues[ iHashResult ];
 
 // Fire event
 ContainerEvent aEvent;
@@ -163,14 +163,12 @@ void NameContainer_Impl::removeByName( const OUString& 
Name )
 if( iLast != iHashResult )
 {
 OUString* pNames = mNames.getArray();
-Any* pValues = mValues.getArray();
 pNames[ iHashResult ] = pNames[ iLast ];
-pValues[ iHashResult ] = pValues[ iLast ];
+mValues[ iHashResult ] = mValues[ iLast ];
 mHashMap[ pNames[ iHashResult ] ] = iHashResult;
 }
 mNames.realloc( iLast );
-mValues.realloc( iLast );
-
+mValues.resize( iLast );
 }
 
 // Methods XContainer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2016-01-05 Thread Michael Meeks 
 include/toolkit/awt/vclxaccessiblecomponent.hxx |   15 ++---
 toolkit/source/awt/vclxaccessiblecomponent.cxx  |   67 
 2 files changed, 43 insertions(+), 39 deletions(-)

New commits:
commit 7576f273257531a2228668cb215b137169b7ae54
Author: Michael Meeks 
Date:   Mon Jan 4 21:28:59 2016 +

tdf#94715 - ensure we remove ourselves from the same event source.

Seemingly event removal was not occuring; also clean up historic
duplication of UNO and C++ references using rtl::Reference.

Change-Id: I56dfb76501929886f70495804670f8c4f70e796b
Reviewed-on: https://gerrit.libreoffice.org/21088
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx 
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index b1fda89..7025540 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -63,15 +63,16 @@ class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
 ,public VCLXAccessibleComponent_BASE
 {
 private:
-css::uno::Reference< css::awt::XWindow> mxWindow;
-VCLXWindow* mpVCLXindow;
+rtl::Reference  m_xVCLXWindow;
+VclPtr m_xEventSource;
 
 VCLExternalSolarLock*   m_pSolarLock;
 
-protected:
- DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
- DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void );
+DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
+DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void );
+voidDisconnectEvents();
 
+protected:
 virtual voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent 
);
 virtual voidProcessWindowChildEvent( const VclWindowEvent& 
rVclWindowEvent );
 virtual voidFillAccessibleRelationSet( 
utl::AccessibleRelationSetHelper& rRelationSet );
@@ -80,10 +81,10 @@ protected:
 virtual css::uno::Reference< css::accessibility::XAccessible > 
GetChildAccessible( const VclWindowEvent& rVclWindowEvent );
 
 public:
-VCLXAccessibleComponent( VCLXWindow* pVCLXindow );
+VCLXAccessibleComponent( VCLXWindow* pVCLXWindow );
 virtual ~VCLXAccessibleComponent();
 
-VCLXWindow*GetVCLXWindow() const { return mpVCLXindow; }
+VCLXWindow*GetVCLXWindow() const;
 VclPtr GetWindow() const;
 template< class derived_type > VclPtr< derived_type > GetAs() const {
 return VclPtr< derived_type >( static_cast< derived_type * >( 
GetWindow().get() ) ); }
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx 
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index a037109..bc9c5fa 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -42,35 +42,45 @@
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
-VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
+VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXWindow )
 : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
 , OAccessibleImplementationAccess( )
 {
-mpVCLXindow = pVCLXindow;
-mxWindow = pVCLXindow;
+m_xVCLXWindow = pVCLXWindow;
 
 m_pSolarLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) );
 
-DBG_ASSERT( pVCLXindow->GetWindow(), "VCLXAccessibleComponent - no 
window!" );
-if ( pVCLXindow->GetWindow() )
+DBG_ASSERT( pVCLXWindow->GetWindow(), "VCLXAccessibleComponent - no 
window!" );
+m_xEventSource = pVCLXWindow->GetWindow();
+if ( m_xEventSource )
 {
-  pVCLXindow->GetWindow()->AddEventListener( LINK( this, 
VCLXAccessibleComponent, WindowEventListener ) );
-  pVCLXindow->GetWindow()->AddChildEventListener( LINK( this, 
VCLXAccessibleComponent, WindowChildEventListener ) );
+m_xEventSource->AddEventListener( LINK( this, VCLXAccessibleComponent, 
WindowEventListener ) );
+m_xEventSource->AddChildEventListener( LINK( this, 
VCLXAccessibleComponent, WindowChildEventListener ) );
 }
 
 // announce the XAccessible of our creator to the base class
-lateInit( pVCLXindow );
+lateInit( pVCLXWindow );
 }
 
-VCLXAccessibleComponent::~VCLXAccessibleComponent()
+VCLXWindow* VCLXAccessibleComponent::GetVCLXWindow() const
 {
-ensureDisposed();
+return m_xVCLXWindow.get();
+}
 
-if ( mpVCLXindow && mpVCLXindow->GetWindow() )
+void VCLXAccessibleComponent::DisconnectEvents()
+{
+if ( m_xEventSource )
 {
-mpVCLXindow->GetWindow()->RemoveEventListener( LINK( this, 
VCLXAccessibleComponent, WindowEventListener ) );
-mpVCLXindow->GetWindow()->RemoveChildEventListener( LINK( this, 
VCLXAccessibleComponent, WindowChildEventListener ) );
+m_xEventSource->RemoveEventListener( LINK( this, 
VCLXAccessibleComponent, WindowEventListener ) );
+m_xEventSource->RemoveChildEventListener( LINK( this, 
VCLXAcce

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2014-02-27 Thread Stephan Bergmann 
 include/toolkit/awt/vclxtabpagemodel.hxx |   73 
 toolkit/source/awt/vclxtabpagemodel.cxx  |  141 ---
 toolkit/source/awt/vclxtoolkit.cxx   |1 
 3 files changed, 215 deletions(-)

New commits:
commit a463234e8893b349f99bef899e71709f3ab82cd6
Author: Stephan Bergmann 
Date:   Thu Feb 27 10:24:53 2014 +0100

Remove unused VCLXTabPageModel

Unused since 265043a935781633f204b1ddfede5f454b8555fe "tabcontrol: #i113362#
impl tabcontrol in awt" and not even built since
0a966b904bd6fd570d2fb09825810aceed4e00e8 "tabcontrol: fix some compile 
errors."

Change-Id: Ida6fde85207288a0b4e09cee767bd004f9384d99

diff --git a/include/toolkit/awt/vclxtabpagemodel.hxx 
b/include/toolkit/awt/vclxtabpagemodel.hxx
deleted file mode 100644
index d128e99..000
--- a/include/toolkit/awt/vclxtabpagemodel.hxx
+++ /dev/null
@@ -1,73 +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 .
- */
-
-#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-//  
-typedef ::cppu::AggImplInheritanceHelper1  VCLXTabPageModel_Base;
-class VCLXTabPageModel : public VCLXTabPageModel_Base
-{
-public:
-VCLXTabPageModel();
-VCLXTabPageModel( const VCLXTabPageModel& rModel ) : 
VCLXTabPageModel_Base( rModel ) {;}
-~VCLXTabPageModel();
-
-// ::com::sun::star::awt::XView
-void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) 
throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::awt::XDevice,
-::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() 
throw(::com::sun::star::uno::RuntimeException);
-
-UnoControlModel*Clone() const { return new VCLXTabPageModel( *this ); }
-
-// ::com::sun::star::beans::XMultiPropertySet
-::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
throw(::com::sun::star::uno::RuntimeException);
-// ::com::sun::star::awt::XVclWindowPeer
-void SAL_CALL setProperty( const OUString& PropertyName, const 
::com::sun::star::uno::Any& Value ) 
throw(::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::awt::tab::XTabPageModel
-virtual ::sal_Int16 SAL_CALL getTabPageID() throw 
(::com::sun::star::uno::RuntimeException);
-virtual ::sal_Bool SAL_CALL getEnabled() throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw 
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getTitle() throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setTitle( const OUString& _title ) throw 
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getImageURL() throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw 
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getToolTip() throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw 
(::com::sun::star::uno::RuntimeException);
-protected:
-::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-};
-#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx 
b/toolkit/source/awt/vclxtabpagemodel.cxx
deleted file mode 100644
index f84e475..000
--- a/toolkit/source/awt/vclxtabpagemodel.cxx
+++ /dev/null
@@ -1,141 +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

[Libreoffice-commits] core.git: include/toolkit toolkit/source

2013-12-20 Thread Jürgen Schmidt 
 include/toolkit/controls/controlmodelcontainerbase.hxx |5 ++---
 toolkit/source/awt/vclxtabpagecontainer.cxx|1 +
 toolkit/source/controls/controlmodelcontainerbase.cxx  |2 +-
 toolkit/source/controls/tabpagemodel.cxx   |4 
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 1c80f3ab5c6dde9ff9399885390d4e6d9013be57
Author: Jürgen Schmidt 
Date:   Fri Dec 20 12:40:17 2013 +

Resolves: #i120358# apply patch to support properties from tab model

Patch By: hanya
Review By: jsc

(cherry picked from commit aa098b9e612b30a916cd4ce002133d499d7f711a)

Conflicts:
include/toolkit/controls/controlmodelcontainerbase.hxx

Change-Id: I4c038c08d24ceceba606154573abbb1cd41cf7cb

diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx 
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index ce9949a..ed4eddb 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -84,11 +84,10 @@ protected:
 AllGroups   maGroups;
 sal_BoolmbGroupsUpToDate;
 
-boolm_bEnabled;
-OUString m_sTitle;
+sal_Bool m_bEnabled;
 OUString m_sImageURL;
 OUString m_sTooltip;
-sal_Int16   m_nTabPageId;
+sal_Int16m_nTabPageId;
 
 voidClone_Impl(ControlModelContainerBase& _rClone) const;
 protected:
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 12d7af6..154e373 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -188,6 +188,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const 
::com::sun::star::con
 pTabCtrl->SetHelpText(nPageID,xP->getToolTip());
 
pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
 pTabCtrl->SelectTabPage(nPageID);
+pTabCtrl->EnablePage(nPageID,xP->getEnabled());
 m_aTabPages.push_back(xTabPage);
 }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 6f16744..586af4a 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -215,6 +215,7 @@ ControlModelContainerBase::ControlModelContainerBase( const 
Reference< XComponen
 ,maContainerListeners( *this )
 ,maChangeListeners ( GetMutex() )
 ,mbGroupsUpToDate( sal_False )
+,m_bEnabled( sal_True )
 {
 }
 
@@ -801,7 +802,6 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() 
throw (::com::sun::star:
 OUString sTitle;
 xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle;
 return sTitle;
-//return m_sTitle;
 }
 void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) 
throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index c3ca455..ec12abb 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -70,8 +70,6 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< 
XComponentContext > c
 ImplRegisterProperty( BASEPROPERTY_TITLE );
 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
 ImplRegisterProperty( BASEPROPERTY_HELPURL );
-ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
-ImplRegisterProperty( BASEPROPERTY_ENABLED );
 }
 
 OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException)
@@ -156,9 +154,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const 
Sequence& rArgument
 Reference xThis(*this,UNO_QUERY);
 
xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver));
 
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)));
-
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL)));
 
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT)));
-
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED)));
 
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists