subject:"\[Libreoffice\-commits\] core.git\: include\/toolkit"

[Libreoffice-commits] core.git: include/toolkit solenv/clang-format toolkit/inc toolkit/source

2023-05-09 Thread Noel Grandin (via logerrit)

 solenv/clang-format/excludelist   |3 +--
 toolkit/inc/helper/property.hxx   |4 +---
 toolkit/source/awt/animatedimagespeer.cxx |2 +-
 toolkit/source/awt/vclxcontainer.cxx  |2 +-
 toolkit/source/awt/vclxspinbutton.cxx |2 +-
 toolkit/source/awt/vclxtabpagecontainer.cxx   |2 +-
 toolkit/source/awt/vclxtoolkit.cxx|2 +-
 toolkit/source/awt/vclxwindow.cxx |2 +-
 toolkit/source/awt/vclxwindows.cxx|2 +-
 toolkit/source/controls/animatedimages.cxx|2 +-
 toolkit/source/controls/controlmodelcontainerbase.cxx |2 +-
 toolkit/source/controls/dialogcontrol.cxx |2 +-
 toolkit/source/controls/formattedcontrol.cxx  |2 +-
 toolkit/source/controls/geometrycontrolmodel.cxx  |2 +-
 toolkit/source/controls/grid/gridcontrol.cxx  |2 +-
 toolkit/source/controls/roadmapcontrol.cxx|2 +-
 toolkit/source/controls/svtxgridcontrol.cxx   |2 +-
 toolkit/source/controls/tabpagecontainer.cxx  |2 +-
 toolkit/source/controls/tabpagemodel.cxx  |2 +-
 toolkit/source/controls/tkscrollbar.cxx   |2 +-
 toolkit/source/controls/tkspinbutton.cxx  |2 +-
 toolkit/source/controls/tree/treecontrol.cxx  |2 +-
 toolkit/source/controls/tree/treecontrolpeer.cxx  |2 +-
 toolkit/source/controls/unocontrol.cxx|2 +-
 toolkit/source/controls/unocontrolbase.cxx|2 +-
 toolkit/source/controls/unocontrolcontainermodel.cxx  |2 +-
 toolkit/source/controls/unocontrolmodel.cxx   |2 +-
 toolkit/source/controls/unocontrols.cxx   |2 +-
 toolkit/source/helper/property.cxx|2 +-
 toolkit/source/helper/unopropertyarrayhelper.cxx  |2 +-
 30 files changed, 30 insertions(+), 33 deletions(-)

New commits:
commit cd52832249267a83f7207e6702a50af6e94c6654
Author: Noel Grandin 
AuthorDate: Tue May 9 09:03:35 2023 +0200
Commit: Noel Grandin 
CommitDate: Tue May 9 18:12:21 2023 +0200

move a toolkit header inside the module

It is only used inside the module, no need to be public

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

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index b0437ef47617..3453747854d3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5270,7 +5270,6 @@ include/framework/desktop.hxx
 include/framework/documentundoguard.hxx
 include/framework/framecontainer.hxx
 include/framework/framelistanalyzer.hxx
-include/framework/gate.hxx
 include/framework/generictoolbarcontroller.hxx
 include/framework/imutex.hxx
 include/framework/sfxhelperfunctions.hxx
@@ -6107,7 +6106,6 @@ include/toolkit/helper/accessiblefactory.hxx
 include/toolkit/helper/convert.hxx
 include/toolkit/helper/listenermultiplexer.hxx
 include/toolkit/helper/macros.hxx
-include/toolkit/helper/property.hxx
 include/toolkit/helper/vclunohelper.hxx
 include/tools/b3dtrans.hxx
 include/tools/bigint.hxx
@@ -13563,6 +13561,7 @@ toolkit/inc/controls/unocontrolcontainermodel.hxx
 toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/btndlg.hxx
 toolkit/inc/helper/imagealign.hxx
+toolkit/inc/helper/property.hxx
 toolkit/inc/helper/scrollabledialog.hxx
 toolkit/inc/helper/unopropertyarrayhelper.hxx
 toolkit/inc/helper/unowrapper.hxx
diff --git a/include/toolkit/helper/property.hxx 
b/toolkit/inc/helper/property.hxx
similarity index 99%
rename from include/toolkit/helper/property.hxx
rename to toolkit/inc/helper/property.hxx
index e082433dd364..013f73496482 100644
--- a/include/toolkit/helper/property.hxx
+++ b/toolkit/inc/helper/property.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
 #define INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
 
-#include 
-
 #include 
 #include 
 
@@ -234,7 +232,7 @@ namespace com::sun::star::uno {
 #define PROPERTY_ALIGN_RIGHT2
 
 
-TOOLKIT_DLLPUBLIC sal_uInt16GetPropertyId( const OUString& 
rPropertyName );
+sal_uInt16GetPropertyId( const OUString& rPropertyName );
 const css::uno::Type*  GetPropertyType( sal_uInt16 nPropertyId );
 const OUString&GetPropertyName( sal_uInt16 nPropertyId );
 sal_Int16   GetPropertyAttribs( sal_uInt16 nPropertyId 
);
diff --git a/toolkit/source/awt/animatedimagespeer.cxx 
b/toolkit/source/awt/animatedimagespeer.cxx
index adb89c2c962b..ac2dca5603be 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -19,7 +19,7 @@
 
 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/toolkit/source/awt/vclxcontainer.cxx

[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

2023-04-01 Thread Noel Grandin (via logerrit)

 include/toolkit/controls/unocontrol.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6726fef6910559000f6fb5dc17647c455b944adc
Author: Noel Grandin 
AuthorDate: Sat Apr 1 14:59:26 2023 +0200
Commit: Noel Grandin 
CommitDate: Sat Apr 1 18:09:50 2023 +0200

pack the UnoControlComponentInfos struct

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

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index 350aa39f26e8..999a5ed7852d 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -42,11 +42,11 @@
 
 struct UnoControlComponentInfos
 {
-boolbVisible;
-boolbEnable;
-tools::LongnX, nY, nWidth, nHeight;
-sal_uInt16  nFlags;
+tools::Long nX, nY, nWidth, nHeight;
 float   nZoomX, nZoomY;
+sal_uInt16  nFlags;
+boolbVisible;
+boolbEnable;
 
 UnoControlComponentInfos()
 {

[Libreoffice-commits] core.git: include/toolkit solenv/clang-format toolkit/inc toolkit/source

2023-03-08 Thread Noel Grandin (via logerrit)

 include/toolkit/controls/unocontrolmodel.hxx   |7 +--
 include/toolkit/helper/mutexandbroadcasthelper.hxx |   44 -
 solenv/clang-format/excludelist|1 
 toolkit/inc/awt/vclxprinter.hxx|4 -
 toolkit/source/awt/vclxprinter.cxx |   30 +++---
 toolkit/source/controls/animatedimages.cxx |   10 ++--
 toolkit/source/controls/tree/treedatamodel.cxx |   16 +++
 toolkit/source/controls/unocontrolmodel.cxx|6 +-
 8 files changed, 36 insertions(+), 82 deletions(-)

New commits:
commit c405820c8e7195e331539e11c5a1ea14596f62a1
Author: Noel Grandin 
AuthorDate: Tue Mar 7 16:19:36 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Mar 8 12:38:51 2023 +

deduplicate MutexAndBroadcastHelper

there are two very similar classes, standardise on the one in
include/comphelper

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

diff --git a/include/toolkit/controls/unocontrolmodel.hxx 
b/include/toolkit/controls/unocontrolmodel.hxx
index fb32aa5b0860..a3f0516e8157 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 #include 
@@ -55,7 +55,7 @@ typedef ::cppu::WeakAggImplHelper6  <   
css::awt::XControlModel
 >   UnoControlModel_Base;
 
 class UnoControlModel :public UnoControlModel_Base
-,public MutexAndBroadcastHelper
+,public 
comphelper::OMutexAndBroadcastHelper
 ,public ::cppu::OPropertySetHelper
 {
 private:
@@ -105,8 +105,7 @@ protected:
 #ifdef _MSC_VER
 UnoControlModel() //do not use! needed by MSVC at compile time to satisfy 
WeakAggImplHelper7
 : UnoControlModel_Base()
-, MutexAndBroadcastHelper()
-, OPropertySetHelper( BrdcstHelper )
+, OPropertySetHelper( m_aBHelper )
 , maDisposeListeners( *this )
 , m_xContext( css::uno::Reference< css::uno::XComponentContext >() )
 {
diff --git a/include/toolkit/helper/mutexandbroadcasthelper.hxx 
b/include/toolkit/helper/mutexandbroadcasthelper.hxx
deleted file mode 100644
index 4cc98e6a9304..
--- a/include/toolkit/helper/mutexandbroadcasthelper.hxx
+++ /dev/null
@@ -1,44 +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_HELPER_MUTEXANDBROADCASTHELPER_HXX
-#define INCLUDED_TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
-
-#include 
-
-
-// Helper class with Mutex and BroadcastHelper, because they must be
-// initialized before calling the OPropertySetHelper-CTOR
-
-class MutexAndBroadcastHelper
-{
-public:
-MutexAndBroadcastHelper() : BrdcstHelper( Mutex ) {}
-
-::osl::MutexMutex;
-::cppu::OBroadcastHelperBrdcstHelper;
-
-::osl::Mutex&   GetMutex() { return Mutex; }
-::cppu::OBroadcastHelper&   GetBroadcastHelper() { return BrdcstHelper; }
-};
-
-#endif  // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index f0f0773d7fef..96dc3df02583 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6110,7 +6110,6 @@ include/toolkit/helper/accessiblefactory.hxx
 include/toolkit/helper/convert.hxx
 include/toolkit/helper/listenermultiplexer.hxx
 include/toolkit/helper/macros.hxx
-include/toolkit/helper/mutexandbroadcasthelper.hxx
 include/toolkit/helper/property.hxx
 include/toolkit/helper/vclunohelper.hxx
 include/tools/b3dtrans.hxx
diff --git a/toolkit/inc/awt/vclxprinter.hxx b/toolkit/inc/awt/vclxprinter.hxx
index 41a74044bfba..e5440f38aac4 100644
--- a/toolkit/inc/awt/vclxprinter.hxx
+++ b/toolkit/inc/awt/vclxprinter.hxx
@@ -25,7 +25,7 @@
 #include 
 #include

[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

2023-01-12 Thread Stephan Bergmann (via logerrit)

 include/toolkit/awt/vclxaccessiblecomponent.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d66a97d5622bfc7c8d68452eb5a3c2378b0b1820
Author: Stephan Bergmann 
AuthorDate: Thu Jan 12 08:29:24 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 12 09:50:49 2023 +

loplugin:crosscast (clang-cl)

> winaccessibility/source/service/AccTopWindowListener.cxx(47,36): error: 
suspicious dynamic cross cast from 'css::accessibility::XAccessible *' to 
'VCLXAccessibleComponent *' [loplugin:crosscast]
> else if (auto pvclxcomponent = 
dynamic_cast(pAccessible))
>
^~~

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

diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx 
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index aaf322c6477f..24003d5500f5 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -44,7 +44,7 @@ class AccessibleRelationSetHelper;
 typedef ::cppu::ImplHelper1<
 css::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
 
-class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
+class TOOLKIT_DLLPUBLIC SAL_LOPLUGIN_ANNOTATE("crosscast") 
VCLXAccessibleComponent
 :public comphelper::OAccessibleExtendedComponentHelper
 ,public VCLXAccessibleComponent_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 include/unotools include/vbahelper toolkit/inc ucb/source unotools/source

2022-12-01 Thread Noel Grandin (via logerrit)

 include/toolkit/awt/vclxwindows.hxx   |4 +---
 include/unotools/eventlisteneradapter.hxx |2 --
 include/vbahelper/vbadialogbase.hxx   |3 +--
 toolkit/inc/helper/msgbox.hxx |3 +--
 ucb/source/cacher/dynamicresultsetwrapper.hxx |1 -
 ucb/source/ucp/webdav-curl/DAVSession.hxx |3 +--
 unotools/source/ucbhelper/XTempFile.hxx   |2 +-
 7 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 224fc966096e9fc52d8e41fbae211e3999edd945
Author: Noel Grandin 
AuthorDate: Thu Dec 1 15:41:29 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 1 21:28:53 2022 +0100

loplugin:unusedfields make some fields private

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index 677186367a87..bffddf6fd63e 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -437,11 +437,9 @@ public:
 
 class SVTXFormattedField : public VCLXSpinField
 {
-protected:
 rtl::Reference m_xCurrentSupplier;
 boolbIsStandardSupplier;
-
-sal_Int32   nKeyToSetDelayed;
+sal_Int32   nKeyToSetDelayed;
 
 public:
 SVTXFormattedField();
diff --git a/include/unotools/eventlisteneradapter.hxx 
b/include/unotools/eventlisteneradapter.hxx
index 92fbe212c586..f3d9ede9cd45 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -40,11 +40,9 @@ namespace utl
 {
 friend class OEventListenerImpl;
 
-private:
 OEventListenerAdapter( const OEventListenerAdapter& _rSource ) = 
delete;
 const OEventListenerAdapter& operator=( const OEventListenerAdapter& 
_rSource ) = delete;
 
-protected:
 std::unique_ptr  m_pImpl;
 
 protected:
diff --git a/include/vbahelper/vbadialogbase.hxx 
b/include/vbahelper/vbadialogbase.hxx
index 751429cd4531..e56a27e08282 100644
--- a/include/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
@@ -45,9 +45,8 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > 
VbaDialogBase_BASE;
 
 class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
 {
-protected:
 sal_Int32 mnIndex;
-css::uno::Reference< css::frame::XModel > m_xModel;
+css::uno::Reference< css::frame::XModel > m_xModel;
 public:
 VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, 
const css::uno::Reference< css::uno::XComponentContext >& xContext, 
css::uno::Reference< css::frame::XModel > xModel, sal_Int32 nIndex 
):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), 
m_xModel(std::move( xModel )) {}
 
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 9259719ce3a2..7c2b26ee1e89 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -53,10 +53,9 @@ class MessBox : public ButtonDialog
 Image maImage;
 bool mbHelpBtn;
 MessBoxStyle mnMessBoxStyle;
-
-protected:
 OUString maMessText;
 
+protected:
 void ImplInitButtons();
 void ImplPosControls();
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx 
b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 8f9c0473f072..c6a363cff796 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -149,7 +149,6 @@ class DynamicResultSetWrapperListener
 : public cppu::OWeakObject
 , public css::ucb::XDynamicResultSetListener
 {
-protected:
 DynamicResultSetWrapper*m_pOwner;
 osl::Mutex  m_aMutex;
 
diff --git a/ucb/source/ucp/webdav-curl/DAVSession.hxx 
b/ucb/source/ucp/webdav-curl/DAVSession.hxx
index 6a4b65cdc41c..b73ceb561357 100644
--- a/ucb/source/ucp/webdav-curl/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-curl/DAVSession.hxx
@@ -177,14 +177,13 @@ public:
 virtual void abort() = 0;
 
 protected:
-rtl::Reference< DAVSessionFactory > m_xFactory;
-
 explicit DAVSession( rtl::Reference< DAVSessionFactory > xFactory )
 : m_xFactory(std::move( xFactory )), m_nRefCount( 0 ) {}
 
 virtual ~DAVSession() {}
 
 private:
+rtl::Reference< DAVSessionFactory > m_xFactory;
 DAVSessionFactory::Map::iterator m_aContainerIt;
 oslInterlockedCount m_nRefCount;
 
diff --git a/unotools/source/ucbhelper/XTempFile.hxx 
b/unotools/source/ucbhelper/XTempFile.hxx
index b439068d99ac..2b0ec33cb42a 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -48,7 +48,6 @@ typedef ::cppu::WeakImplHelper< css::io::XTempFile
 
 class OTempFileService : public OTempFileBase
 {
-protected:
 std::optional mpTempFile;
 std::mutex maMutex;
 SvStream* mpStream;
@@ -56,6 +55,7 @@ protected:
 bool

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

2022-12-01 Thread Stephan Bergmann (via logerrit)

 include/toolkit/awt/vclxwindows.hxx  |  109 +
 toolkit/inc/awt/vclxcontainer.hxx|   17 
 toolkit/inc/awt/vclxsystemdependentwindow.hxx|   15 
 toolkit/inc/awt/vclxtopwindow.hxx|   19 -
 toolkit/inc/awt/vclxwindows.hxx  |  169 +
 toolkit/source/awt/vclxcontainer.cxx |   26 -
 toolkit/source/awt/vclxsystemdependentwindow.cxx |   24 -
 toolkit/source/awt/vclxtopwindow.cxx |   24 -
 toolkit/source/awt/vclxwindows.cxx   |  429 ---
 9 files changed, 54 insertions(+), 778 deletions(-)

New commits:
commit 4e26dbf214df8a9f76791dd3fc3b52f146e5f12e
Author: Stephan Bergmann 
AuthorDate: Thu Dec 1 13:59:43 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 1 15:40:25 2022 +0100

Use cppuhelper::ImplInheritanceHelper for toolkit VCLX window classes

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index e67f6b619a15..677186367a87 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -131,9 +130,10 @@ public:
 
 //  class VCLXCheckBox
 
-class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public css::awt::XCheckBox,
-public css::awt::XButton,
-public VCLXGraphicControl
+class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public 
cppu::ImplInheritanceHelper<
+VCLXGraphicControl,
+css::awt::XCheckBox,
+css::awt::XButton>
 {
 private:
 ActionListenerMultiplexer   maActionListeners;
@@ -146,15 +146,6 @@ private:
 public:
 VCLXCheckBox();
 
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() noexcept 
override  { OWeakObject::acquire(); }
-voidSAL_CALL release() noexcept 
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::lang::XComponent
 void SAL_CALL dispose(  ) override;
@@ -188,9 +179,10 @@ public:
 
 //  class VCLXRadioButton
 
-class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public css::awt::XRadioButton,
-public css::awt::XButton,
-public VCLXGraphicControl
+class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public 
cppu::ImplInheritanceHelper<
+VCLXGraphicControl,
+css::awt::XRadioButton,
+css::awt::XButton>
 {
 private:
 ItemListenerMultiplexer maItemListeners;
@@ -204,15 +196,6 @@ private:
 public:
 VCLXRadioButton();
 
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() noexcept 
override  { OWeakObject::acquire(); }
-voidSAL_CALL release() noexcept 
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::lang::XComponent
 void SAL_CALL dispose(  ) override;
 
@@ -244,8 +227,7 @@ public:
 
 //  class VCLXFixedHyperlink
 class VCLXFixedHyperlink final :
-public css::awt::XFixedHyperlink,
-public VCLXWindow
+public cppu::ImplInheritanceHelper
 {
 private:
 ActionListenerMultiplexer   maActionListeners;
@@ -259,18 +241,9 @@ public:
 VCLXFixedHyperlink();
 virtual ~VCLXFixedHyperlink() override;
 
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() noexcept 
override  { OWeakObject::acquire(); }
-voidSAL_CALL release() noexcept 
override  { OWeakObject::release(); }
-
 // css::lang::XComponent
 void SAL_CALL dispose(  ) 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::XFixedHyperlink
 void SAL_CALL setText( const OUString& Text ) override;
 OUString

[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

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

2021-11-27 Thread Noel Grandin (via logerrit)

 include/toolkit/controls/unocontrol.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 218adeb2afb0fb22b7e3ea34ab7b98f7a2f6acce
Author: Noel Grandin 
AuthorDate: Mon Nov 22 21:35:26 2021 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 27 12:10:21 2021 +0100

use more OInterfaceContainerHelper3 in UnoControl

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

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index ff6c74608614..e2ed655d180e 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -87,7 +88,7 @@ protected:
 MouseListenerMultiplexermaMouseListeners;
 MouseMotionListenerMultiplexer  maMouseMotionListeners;
 PaintListenerMultiplexermaPaintListeners;
-::comphelper::OInterfaceContainerHelper2   maModeChangeListeners;
+::comphelper::OInterfaceContainerHelper3 
maModeChangeListeners;
 
 css::uno::Reference< css::uno::XInterface >   mxContext;
 css::uno::Reference< css::awt::XControlModel >mxModel;

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

2021-07-28 Thread Michael Weghorn (via logerrit)

 include/toolkit/awt/vclxwindows.hxx |  118 
 toolkit/inc/awt/vclxwindows.hxx |  116 ---
 2 files changed, 118 insertions(+), 116 deletions(-)

New commits:
commit 9ceb47ce712157019ca06ee11c66515ea7cc16ec
Author: Michael Weghorn 
AuthorDate: Wed Jul 28 09:27:23 2021 +0200
Commit: Michael Weghorn 
CommitDate: Wed Jul 28 15:44:38 2021 +0200

Move SVTXNumericField and parents to public toolkit header

This is in preparation for the creation of a new accessibility
class for 'SVTXNumericField'.

Change-Id: I41e04c71b951832e4e264a271a3d66be7b6d6ce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119589
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index 38c3a1a4a268..99f8fea450fa 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,6 +39,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -460,6 +462,122 @@ public:
 };
 
 
+//  class VCLXSpinField
+class VCLXSpinField : public css::awt::XSpinField, public VCLXEdit
+{
+private:
+SpinListenerMultiplexer maSpinListeners;
+
+protected:
+voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent 
) override;
+
+public:
+VCLXSpinField();
+
+// css::uno::XInterface
+css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
+voidSAL_CALL acquire() noexcept 
override  { OWeakObject::acquire(); }
+voidSAL_CALL release() noexcept 
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::XSpinField
+void SAL_CALL addSpinListener( const css::uno::Reference< 
css::awt::XSpinListener >& l ) override;
+void SAL_CALL removeSpinListener( const css::uno::Reference< 
css::awt::XSpinListener >& l ) override;
+void SAL_CALL up(  ) override;
+void SAL_CALL down(  ) override;
+void SAL_CALL first(  ) override;
+void SAL_CALL last(  ) override;
+void SAL_CALL enableRepeat( sal_Bool bRepeat ) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+};
+
+class SVTXFormattedField : public VCLXSpinField
+{
+protected:
+rtl::Reference m_xCurrentSupplier;
+boolbIsStandardSupplier;
+
+sal_Int32   nKeyToSetDelayed;
+
+public:
+SVTXFormattedField();
+virtual ~SVTXFormattedField() override;
+
+// css::awt::XVclWindowPeer
+void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
+css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) 
override;
+
+protected:
+voidsetFormatsSupplier(const css::uno::Reference< 
css::util::XNumberFormatsSupplier > & xSupplier);
+sal_Int32   getFormatKey() const;
+voidsetFormatKey(sal_Int32 nKey);
+
+voidSetValue(const css::uno::Any& rValue);
+css::uno::Any  GetValue() const;
+
+voidSetTreatAsNumber(bool bSet);
+boolGetTreatAsNumber() const;
+
+voidSetDefaultValue(const css::uno::Any& rValue);
+css::uno::Any  GetDefaultValue() const;
+
+voidSetMinValue(const css::uno::Any& rValue);
+css::uno::Any  GetMinValue() const;
+
+voidSetMaxValue(const css::uno::Any& rValue);
+css::uno::Any  GetMaxValue() const;
+
+voidNotifyTextListeners();
+css::uno::Any  convertEffectiveValue(const css::uno::Any& rValue);
+
+virtual voidSetWindow( const VclPtr< vcl::Window > &_pWindow) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+};
+
+class SVTXNumericField final : public css::awt::XNumericField, public 
SVTXFormattedField
+{
+public:
+SVTXNumericField();
+virtual ~SVTXNumericField() override;
+
+// css::uno::XInterface
+css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
+void   SAL_CALL acquire() noexcept override  { 
SVTXFormattedField::acquire(); }
+void   SAL_CALL release() noexcept override  { 
SVTXFormattedField::release(); }
+
+// css::lang::XTypeProvider
+css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+css::uno::Sequence< sal_Int8

[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;
 
+

[Libreoffice-commits] core.git: include/toolkit solenv/clang-format toolkit/inc toolkit/source

2021-04-12 Thread Caolán McNamara (via logerrit)

 include/toolkit/awt/vclxwindows.hxx   |  811 -
 solenv/clang-format/excludelist   |1 
 toolkit/inc/awt/vclxwindows.hxx   |  815 ++
 toolkit/source/awt/vclxtoolkit.cxx|1 
 toolkit/source/awt/vclxwindows.cxx|1 
 toolkit/source/controls/dialogcontrol.cxx |1 
 toolkit/source/controls/svmedit.cxx   |2 
 toolkit/source/controls/unocontrols.cxx   |2 
 toolkit/source/helper/unowrapper.cxx  |1 
 9 files changed, 823 insertions(+), 812 deletions(-)

New commits:
commit 7a762ad0c69011b1e77098395e171393046330ed
Author: Caolán McNamara 
AuthorDate: Sun Apr 11 18:59:13 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 12 09:46:23 2021 +0200

VCLXMultiPage can be in private headers

and similar

VCLXFormattedSpinField can drop SAL_DLLPUBLIC_RTTI

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index 1ac704320171..c3e71d97900d 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -17,60 +17,35 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
+#pragma once
 
 #include 
 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 
-#include 
-
 #include 
-#include 
 #include 
 
-#include 
-
 #include 
 
-class FormatterBase;
-class TabControl;
-class TabPage;
-class Edit;
-
 //  class VCLXGraphicControl
 //deriving from VCLXWindow, drawing the graphic which exists as "Graphic" 
at the model
 
-
 class VCLXGraphicControl : public VCLXWindow
 {
 private:
@@ -152,32 +127,6 @@ public:
 virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
 };
 
-
-//  class VCLXImageControl
-
-class VCLXImageControl final : public VCLXGraphicControl
-{
-public:
-VCLXImageControl();
-virtual ~VCLXImageControl() override;
-
-// css::awt::XLayoutConstrains
-css::awt::Size SAL_CALL getMinimumSize(  ) override;
-css::awt::Size SAL_CALL getPreferredSize(  ) override;
-css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) 
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 >  );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
-
-private:
-virtual voidImplSetNewImage() override;
-};
-
-
 //  class VCLXCheckBox
 
 class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public css::awt::XCheckBox,
@@ -291,187 +240,7 @@ public:
 
 };
 
-
-//  class VCLXMessageBox
-
-class VCLXMessageBox final : public css::awt::XMessageBox,
-public VCLXTopWindow
-{
-public:
-VCLXMessageBox();
-virtual ~VCLXMessageBox() 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::XMessageBox
-void SAL_CALL setCaptionText( const OUString& aText ) override;
-OUString SAL_CALL getCaptionText(  ) override;
-void SAL_CALL setMessageText( const OUString& aText ) override;
-OUString SAL_CALL getMessageText(  ) override;
-sal_Int16 SAL_CALL execute(  ) override;
-
-// css::awt::XLayoutConstrains
-css::awt::Size SAL_CALL getMinimumSize() override;
-
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override;
-};
-
-
-//  class VCLXFrame
-
-class VCLXFrame final : public VCLXContainer
-{
-voidProcessWindowEvent( const VclWindowEvent& 
rVclWindowEvent ) override;
-
-public:
-VCLXFrame();
-virtual ~VCLXFrame() override;
-
-// css::uno::XInterface
-void

[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

2020-08-18 Thread Andrea Gelmini (via logerrit)

 include/toolkit/awt/vclxwindows.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 12bb15fce78dc27fe046cecf6984c4f45b364e51
Author: Andrea Gelmini 
AuthorDate: Tue Aug 18 14:44:10 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 18 20:03:21 2020 +0200

Removed duplicated includes

Change-Id: I61861d87449f83cb3a1efe8a2cf0345864c2f1db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100918
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index ba13cd2f7da1..492df058e3e6 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -48,8 +48,6 @@
 #include 
 #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 solenv/clang-format svtools/inc svtools/Library_svt.mk svtools/source toolkit/inc toolkit/Library_tk.mk toolkit/source

2020-08-18 Thread Caolán McNamara (via logerrit)

 include/toolkit/awt/vclxwindows.hxx |   67 +
 solenv/clang-format/excludelist |4 
 svtools/Library_svt.mk  |1 
 svtools/source/inc/unoiface.hxx |   67 -
 svtools/source/uno/unoiface.cxx |  411 
 toolkit/Library_tk.mk   |1 
 toolkit/inc/controls/svmedit.hxx|5 
 toolkit/source/awt/vclxtoolkit.cxx  |5 
 toolkit/source/awt/vclxwindows.cxx  |  369 
 toolkit/source/controls/svmedit.cxx |4 
 10 files changed, 448 insertions(+), 486 deletions(-)

New commits:
commit 643d62d6033033df82a40fa3da754cb107d53e80
Author: Caolán McNamara 
AuthorDate: Mon Aug 17 19:54:19 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 18 12:40:27 2020 +0200

move VCLXMultiLineEdit and MultiLineEdit to toolkit

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index d9a11b66f6f0..ba13cd2f7da1 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -47,6 +47,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -58,6 +61,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 class FormatterBase;
@@ -1363,6 +1368,68 @@ public:
 virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
 };
 
+class VCLXMultiLineEdit :   public css::awt::XTextComponent,
+public css::awt::XTextArea,
+public css::awt::XTextLayoutConstrains,
+public VCLXWindow
+{
+private:
+TextListenerMultiplexer maTextListeners;
+LineEnd meLineEndType;
+
+protected:
+voidProcessWindowEvent( const VclWindowEvent& 
rVclWindowEvent ) override;
+
+public:
+VCLXMultiLineEdit();
+virtual ~VCLXMultiLineEdit() override;
+
+// css::uno::XInterface
+css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
+void   SAL_CALL acquire() throw() override  { 
VCLXWindow::acquire(); }
+void   SAL_CALL release() throw() override  { 
VCLXWindow::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::XTextComponent
+void SAL_CALL addTextListener( const css::uno::Reference< 
css::awt::XTextListener >& l ) override;
+void SAL_CALL removeTextListener( const css::uno::Reference< 
css::awt::XTextListener >& l ) override;
+void SAL_CALL setText( const OUString& aText ) override;
+void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& 
Text ) override;
+OUString SAL_CALL getText(  ) override;
+OUString SAL_CALL getSelectedText(  ) override;
+void SAL_CALL setSelection( const css::awt::Selection& aSelection ) 
override;
+css::awt::Selection SAL_CALL getSelection(  ) override;
+sal_Bool SAL_CALL isEditable(  ) override;
+void SAL_CALL setEditable( sal_Bool bEditable ) override;
+void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+sal_Int16 SAL_CALL getMaxTextLen(  ) override;
+
+//XTextArea
+OUString SAL_CALL getTextLines(  ) override;
+
+// css::awt::XLayoutConstrains
+css::awt::Size SAL_CALL getMinimumSize(  ) override;
+css::awt::Size SAL_CALL getPreferredSize(  ) override;
+css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) 
override;
+
+// css::awt::XTextLayoutConstrains
+css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines 
) override;
+void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) 
override;
+
+// css::awt::XVclWindowPeer
+void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
+css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) 
override;
+
+// css::awt::XWindow
+void SAL_CALL setFocus(  ) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+};
+
 #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 72626c886579..93532dfb4d12 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12956,7 +12956,6 @@ svl/source/undo/undo.cxx
 svl/source/uno/pathservice.cxx

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

2020-07-31 Thread Stephan Bergmann (via logerrit)

 include/toolkit/awt/vclxwindows.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 400edb0b7721600fedfae87bb209d6879f4a3f81
Author: Stephan Bergmann 
AuthorDate: Thu Jul 30 23:50:08 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 31 08:16:27 2020 +0200

ASan/UBSan build still needs VCLXEdit RTTI

...after 0c311bfbf67441823f8b3916db963e2680e9eb43 "make some classes 
private":

> warn:sal.osl:729320:729320:sal/osl/unx/module.cxx:162: 
dlopen(instdir/program/libacclo.so, 1): instdir/program/libacclo.so: undefined 
symbol: _ZTI8VCLXEdit
> 
warn:legacy.osl:729320:729320:toolkit/source/helper/accessibilityclient.cxx:183:
 AccessibilityClient::ensureInitialized: could not load the library, or not 
retrieve the needed symbol!
> cppunittester: include/com/sun/star/uno/Reference.h:381: interface_type 
*com::sun::star::uno::Reference::operator->()
 const [interface_type = com::sun::star::accessibility::XAccessibleContext]: 
Assertion `_pInterface != NULL' failed.

during CppunitTest_sw_accessible_relation_set, with

> $ find workdir/CxxObject/accessibility/source -name \*.o -exec bash -c 
'nm "$0" | grep -F _ZTI8VCLXEdit && echo "^ $0"' {} \;
>  U _ZTI8VCLXEdit
> ^ workdir/CxxObject/accessibility/source/standard/vclxaccessibleedit.o

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index 7549e3e9c146..d9a11b66f6f0 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -623,7 +623,7 @@ public:
 
 //  class VCLXEdit
 
-class VCLXEdit :  public css::awt::XTextComponent,
+class SAL_DLLPUBLIC_RTTI VCLXEdit :  public css::awt::XTextComponent,
 public css::awt::XTextEditField,
 public css::awt::XTextLayoutConstrains,
 public VCLXWindow
___
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 >  ) 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 >  );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) 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 >  ) 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 >  )
-{
-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/inc toolkit/source

2020-05-18 Thread Michael Weghorn (via logerrit)

 include/toolkit/controls/unocontrol.hxx  |2 +-
 toolkit/inc/awt/vclxtabpagecontainer.hxx |5 +
 toolkit/inc/controls/tabpagecontainer.hxx|3 +++
 toolkit/source/awt/vclxtabpagecontainer.cxx  |   23 +++
 toolkit/source/controls/tabpagecontainer.cxx |9 +
 5 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 92289c5f121499959b6f5edf859e5f34b5b96a78
Author: Michael Weghorn 
AuthorDate: Mon May 18 10:51:14 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 18 16:28:22 2020 +0200

tdf#133142 UnoControlTabPageContainer: Handle tab property changes

In the model, changing a tab page's title or enabled/disabled
status is done via methods 'XTabPageModel.setTitle' and
'XTabPageModel.setEnabled'.

Changes to the title and enabled/disabled status are
propagated to the tab page container containing the
tab page (s.a. 25c692c2a94ab83c2c859ac5ab334b62ac8b825e
("ControlModelContainerBase: Use property for enabled status",
2020-05-15)).

Make 'VCLXTabPageContainer' derive from 'XPropertiesChangeListener'
and implement the 'propertiesChange' method defined in that
interface to handle property changes for the tab pages and have
'UnoControlTabPageContainer' forward 'PropertyChangeEvent's
to its peer so they can be handled there.

This way, changes for those tab page properties via UNO
are now properly updated in the UI as well.

Change-Id: I6fa1fadf781575c4ad1d066aed9c3a651b10869d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94402
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index cc83a6b7a934..a406a22bc5e8 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -218,7 +218,7 @@ public:
 // XStyleSettingsSupplier
 virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL 
getStyleSettings() override;
 
-private:
+protected:
 // css::beans::XPropertiesChangeListener
 void SAL_CALL propertiesChange( const css::uno::Sequence< 
css::beans::PropertyChangeEvent >& evt ) override;
 };
diff --git a/toolkit/inc/awt/vclxtabpagecontainer.hxx 
b/toolkit/inc/awt/vclxtabpagecontainer.hxx
index fee096cc04ba..54fe0e0503aa 100644
--- a/toolkit/inc/awt/vclxtabpagecontainer.hxx
+++ b/toolkit/inc/awt/vclxtabpagecontainer.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -28,6 +29,7 @@
 
 typedef cppu::ImplInheritanceHelper< VCLXContainer,
  css::awt::tab::XTabPageContainer,
+ css::beans::XPropertiesChangeListener,
  css::container::XContainerListener
> VCLXTabPageContainer_Base;
 class VCLXTabPageContainer final : public VCLXTabPageContainer_Base
@@ -56,6 +58,9 @@ public:
 virtual void SAL_CALL elementRemoved( const 
css::container::ContainerEvent& Event ) override;
 virtual void SAL_CALL elementReplaced( const 
css::container::ContainerEvent& Event ) override;
 
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence< 
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
 // css::awt::XVclWindowPeer
 void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
 private:
diff --git a/toolkit/inc/controls/tabpagecontainer.hxx 
b/toolkit/inc/controls/tabpagecontainer.hxx
index 9873ad3272b1..e00c0bd89e58 100644
--- a/toolkit/inc/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/controls/tabpagecontainer.hxx
@@ -111,6 +111,9 @@ public:
 virtual void SAL_CALL addTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
override;
 virtual void SAL_CALL removeTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
override;
 
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence< 
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
 virtual void SAL_CALL addControl( const OUString& Name, const 
css::uno::Reference< css::awt::XControl >& Control ) override;
 // css::lang::XServiceInfo
 DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, 
"com.sun.star.awt.tab.UnoControlTabPageContainer" )
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 0bfacc695136..bc5d19964d2e 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -208,4 +209,26 @@ void SAL_CALL

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

2020-02-18 Thread Caolán McNamara (via logerrit)

 include/toolkit/awt/vclxwindows.hxx |  125 
 svtools/inc/pch/precompiled_svt.hxx |3 
 svtools/source/inc/unoiface.hxx |  128 
 svtools/source/uno/unoiface.cxx | 1003 
 toolkit/source/awt/vclxtoolkit.cxx  |   37 -
 toolkit/source/awt/vclxwindows.cxx  |  987 +++
 6 files changed, 1135 insertions(+), 1148 deletions(-)

New commits:
commit 2c484d1f383970672f3062d84201109a064c5a36
Author: Caolán McNamara 
AuthorDate: Mon Feb 17 15:07:34 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 18 09:54:06 2020 +0100

move SVTXFormattedField, SVTXCurrencyField, SVTXNumericField to toolkit

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index e470b5e3a46e..dd03843c4908 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -51,10 +51,13 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
 
+#include 
 #include 
 
 class FormatterBase;
@@ -1276,6 +1279,128 @@ public:
 virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
 };
 
+class SVTXFormattedField : public VCLXSpinField
+{
+protected:
+rtl::Reference m_xCurrentSupplier;
+boolbIsStandardSupplier;
+
+sal_Int32   nKeyToSetDelayed;
+
+public:
+SVTXFormattedField();
+virtual ~SVTXFormattedField() override;
+
+// css::awt::XVclWindowPeer
+void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
+css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) 
override;
+
+protected:
+voidsetFormatsSupplier(const css::uno::Reference< 
css::util::XNumberFormatsSupplier > & xSupplier);
+sal_Int32   getFormatKey() const;
+voidsetFormatKey(sal_Int32 nKey);
+
+voidSetValue(const css::uno::Any& rValue);
+css::uno::Any  GetValue() const;
+
+voidSetTreatAsNumber(bool bSet);
+boolGetTreatAsNumber() const;
+
+voidSetDefaultValue(const css::uno::Any& rValue);
+css::uno::Any  GetDefaultValue() const;
+
+voidSetMinValue(const css::uno::Any& rValue);
+css::uno::Any  GetMinValue() const;
+
+voidSetMaxValue(const css::uno::Any& rValue);
+css::uno::Any  GetMaxValue() const;
+
+voidNotifyTextListeners();
+css::uno::Any  convertEffectiveValue(const css::uno::Any& rValue);
+
+virtual voidSetWindow( const VclPtr< vcl::Window > &_pWindow) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+};
+
+class SVTXCurrencyField : public css::awt::XCurrencyField, public 
SVTXFormattedField
+{
+public:
+SVTXCurrencyField();
+virtual ~SVTXCurrencyField() override;
+
+// css::uno::XInterface
+css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
+void   SAL_CALL acquire() throw() override  { 
SVTXFormattedField::acquire(); }
+void   SAL_CALL release() throw() override  { 
SVTXFormattedField::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::XVclWindowPeer
+void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
+css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) 
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;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+};
+
+class

[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 >  );
 virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) 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::getTypes() );
-

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

2019-11-04 Thread Caolán McNamara (via logerrit)

 include/toolkit/awt/vclxwindows.hxx |   43 +
 svtools/source/inc/unoiface.hxx |   42 -
 svtools/source/uno/unoiface.cxx |  267 
 toolkit/source/awt/vclxtoolkit.cxx  |6 
 toolkit/source/awt/vclxwindows.cxx  |  251 +
 5 files changed, 300 insertions(+), 309 deletions(-)

New commits:
commit fe2c63e494ea66042406ad71234ebe076dec07dc
Author: Caolán McNamara 
AuthorDate: Mon Nov 4 12:04:59 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Nov 4 16:13:56 2019 +0100

move VCLXProgressBar to toolkit

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

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index 6dd518296356..0a5d0a7b79b2 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1186,6 +1187,48 @@ public:
 
 };
 
+//  class VCLXProgressBar
+class VCLXProgressBar final : public css::awt::XProgressBar
+, public VCLXWindow
+{
+private:
+sal_Int32   m_nValue;
+sal_Int32   m_nValueMin;
+sal_Int32   m_nValueMax;
+
+voidImplUpdateValue();
+
+public:
+VCLXProgressBar();
+virtual ~VCLXProgressBar() override;
+
+// css::uno::XInterface
+css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
+void   SAL_CALL acquire() throw() override  { 
VCLXWindow::acquire(); }
+void   SAL_CALL release() throw() override  { 
VCLXWindow::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::XProgressBar
+void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
+void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
+void SAL_CALL setValue( sal_Int32 nValue ) override;
+void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) override;
+sal_Int32 SAL_CALL getValue() 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 >  );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+};
+
+
+
+
 #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 079c68af4394..01a70610cd04 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -289,47 +288,6 @@ public:
 };
 
 
-//  class VCLXProgressBar
-
-class VCLXProgressBar final : public css::awt::XProgressBar,
-public VCLXWindow
-{
-private:
-sal_Int32   m_nValue;
-sal_Int32   m_nValueMin;
-sal_Int32   m_nValueMax;
-
-voidImplUpdateValue();
-
-public:
-VCLXProgressBar();
-virtual ~VCLXProgressBar() override;
-
-// css::uno::XInterface
-css::uno::Any  SAL_CALL queryInterface( const 
css::uno::Type & rType ) override;
-void   SAL_CALL acquire() throw() override  { 
VCLXWindow::acquire(); }
-void   SAL_CALL release() throw() override  { 
VCLXWindow::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::XProgressBar
-void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
-void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
-void SAL_CALL setValue( sal_Int32 nValue ) override;
-void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) override;
-sal_Int32 SAL_CALL getValue() 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 >  );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
-};
-
-
 //  class SVTXDateField
 
 class SVTXDateField

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

2019-10-30 Thread Noel Grandin (via logerrit)

 include/toolkit/awt/animatedimagespeer.hxx |8 -
 include/toolkit/awt/vclxgraphics.hxx   |2 
 include/toolkit/awt/vclxmenu.hxx   |4 
 include/toolkit/awt/vclxprinter.hxx|6 -
 include/toolkit/awt/vclxspinbutton.hxx |5 
 include/toolkit/awt/vclxsystemdependentwindow.hxx  |2 
 include/toolkit/awt/vclxtabpagecontainer.hxx   |6 -
 include/toolkit/awt/vclxwindows.hxx|   59 ---
 include/toolkit/controls/controlmodelcontainerbase.hxx |2 
 include/toolkit/controls/dialogcontrol.hxx |   26 ++---
 include/toolkit/controls/eventcontainer.hxx|2 
 include/toolkit/controls/formattedcontrol.hxx  |2 
 include/toolkit/controls/geometrycontrolmodel.hxx  |5 
 include/toolkit/controls/roadmapcontrol.hxx|6 -
 include/toolkit/controls/tabpagecontainer.hxx  |9 -
 include/toolkit/controls/tabpagemodel.hxx  |5 
 include/toolkit/controls/tkscrollbar.hxx   |5 
 include/toolkit/controls/unocontrolcontainermodel.hxx  |3 
 include/toolkit/controls/unocontrols.hxx   |   87 ++---
 include/toolkit/helper/macros.hxx  |4 
 20 files changed, 102 insertions(+), 146 deletions(-)

New commits:
commit 6d830c6e26b89a441c11731165eb4d9e0f0d3881
Author: Noel Grandin 
AuthorDate: Wed Oct 30 09:40:47 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 30 10:24:42 2019 +0100

loplugin:finalclasses framework

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

diff --git a/include/toolkit/awt/animatedimagespeer.hxx 
b/include/toolkit/awt/animatedimagespeer.hxx
index ebe1e41d1611..ee1747394ca6 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -43,12 +43,12 @@ namespace toolkit
  css::util::XModifyListener
> AnimatedImagesPeer_Base;
 
-class AnimatedImagesPeer:public AnimatedImagesPeer_Base
+class AnimatedImagesPeer final : public AnimatedImagesPeer_Base
 {
 public:
 AnimatedImagesPeer();
 
-protected:
+private:
 virtual ~AnimatedImagesPeer() override;
 
 public:
@@ -75,15 +75,13 @@ namespace toolkit
 // XComponent
 void SAL_CALL dispose(  ) override;
 
-protected:
+private:
 void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) 
override;
 
-private:
 /** updates our images with the ones from the given XAnimatedImages 
component
 */
 voidimpl_updateImages_nolck( const css::uno::Reference< 
css::uno::XInterface >& i_animatedImages );
 
-private:
 AnimatedImagesPeer(const AnimatedImagesPeer&) = delete;
 AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) = delete;
 
diff --git a/include/toolkit/awt/vclxgraphics.hxx 
b/include/toolkit/awt/vclxgraphics.hxx
index 85464ae37e56..264843dae6ae 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -54,7 +54,7 @@ namespace o3tl
 //  class VCLXGraphics
 
 
-class VCLXGraphics : public cppu::WeakImplHelper<
+class VCLXGraphics final : public cppu::WeakImplHelper<
 css::awt::XGraphics2,
 css::lang::XUnoTunnel>
 {
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 61f5b7385604..34f5d8f2a58a 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -143,14 +143,14 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  
) override;
 };
 
-class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu
+class TOOLKIT_DLLPUBLIC VCLXMenuBar final : public VCLXMenu
 {
 public:
 VCLXMenuBar();
 VCLXMenuBar( MenuBar* pMenuBar );
 };
 
-class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
+class TOOLKIT_DLLPUBLIC VCLXPopupMenu final : public VCLXMenu
 {
 public:
 VCLXPopupMenu();
diff --git a/include/toolkit/awt/vclxprinter.hxx 
b/include/toolkit/awt/vclxprinter.hxx
index a22f52432136..81aebf443c6e 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -106,7 +106,7 @@ public:
 typedef ::cppu::ImplInheritanceHelper  <   VCLXPrinterPropertySet
 ,   css::awt::XPrinter
 >   VCLXPrinter_Base;
-class VCLXPrinter:  public VCLXPrinter_Base
+class VCLXPrinter final : public VCLXPrinter_Base
 {
 std::shared_ptrmxListener;
 JobSetup  maInitJobSetup;
@@ -145,7 +145,7 @@ public:
 typedef ::cppu::ImplInheritanceHelper  <   VCLXPrinterPropertySet

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

2019-10-08 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 offapi/com offapi/UnoApi_offapi.mk toolkit/source

2019-05-19 Thread brinzing (via logerrit)

 include/toolkit/awt/vclxprinter.hxx |7 ++--
 offapi/UnoApi_offapi.mk |1 
 offapi/com/sun/star/awt/PrinterServer.idl   |2 -
 offapi/com/sun/star/awt/XPrinterServer2.idl |   49 
 toolkit/source/awt/vclxprinter.cxx  |7 +++-
 5 files changed, 61 insertions(+), 5 deletions(-)

New commits:
commit 0f55127195a897ca7b13c25ded2208476dba3a08
Author: brinzing 
AuthorDate: Fri May 10 20:12:35 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Sun May 19 20:35:50 2019 +0200

tdf#125207 [API CHANGE] extend css.awt.PrinterServer: XPrinterServer2

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

diff --git a/include/toolkit/awt/vclxprinter.hxx 
b/include/toolkit/awt/vclxprinter.hxx
index 60fb105b77d9..a22f52432136 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -22,7 +22,7 @@
 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -175,14 +175,15 @@ public:
 //  class VCLXPrinterServer
 
 
-typedef ::cppu::WeakImplHelper <   css::awt::XPrinterServer,
+typedef ::cppu::WeakImplHelper <   css::awt::XPrinterServer2,
css::lang::XServiceInfo
 >   VCLXPrinterServer_Base;
 class VCLXPrinterServer : public VCLXPrinterServer_Base
 {
 public:
-// css::awt::XPrinterServer
+// css::awt::XPrinterServer2
 css::uno::Sequence< OUString > SAL_CALL getPrinterNames(  ) override;
+OUString SAL_CALL getDefaultPrinterName() override;
 css::uno::Reference< css::awt::XPrinter > SAL_CALL createPrinter( const 
OUString& printerName ) override;
 css::uno::Reference< css::awt::XInfoPrinter > SAL_CALL createInfoPrinter( 
const OUString& printerName ) override;
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4c79c9d04328..c86e7d5a7800 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1856,6 +1856,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt,\
XPrinter \
XPrinterPropertySet \
XPrinterServer \
+   XPrinterServer2 \
XProgressBar \
XProgressMonitor \
XRadioButton \
diff --git a/offapi/com/sun/star/awt/PrinterServer.idl 
b/offapi/com/sun/star/awt/PrinterServer.idl
index 3725eeefcc8d..063e75bc1d3f 100644
--- a/offapi/com/sun/star/awt/PrinterServer.idl
+++ b/offapi/com/sun/star/awt/PrinterServer.idl
@@ -18,7 +18,7 @@ module com {  module sun {  module star {  module awt {
 
 @since LibreOffice 4.1
  */
-service PrinterServer: com::sun::star::awt::XPrinterServer;
+service PrinterServer: com::sun::star::awt::XPrinterServer2;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XPrinterServer2.idl 
b/offapi/com/sun/star/awt/XPrinterServer2.idl
new file mode 100644
index ..8ceb54fcfa50
--- /dev/null
+++ b/offapi/com/sun/star/awt/XPrinterServer2.idl
@@ -0,0 +1,49 @@
+/* -*- 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 __com_sun_star_awt_XPrinterServer2_idl__
+#define __com_sun_star_awt_XPrinterServer2_idl__
+
+#include 
+
+ module com {  module sun {  module star {  module awt {
+
+/**
+  extends printer server interface
+
+  @since LibreOffice 6.3
+*/
+
+interface XPrinterServer2: ::com::sun::star::awt::XPrinterServer
+{
+
+/** returns the current default printer name
+
+ @returns
+ current default printer name
+ */
+string getDefaultPrinterName();
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxprinter.cxx 
b/toolkit/source/awt/vclxprinter.cxx
index 6d78cdce558c..2897d3bafdb0 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -328,7 +328,7 @@ css::uno::Reference< css::awt::XDevice > 
VCLXInfoPrinter::createDevice(  )
 //class VCLXPrinterServer
 //
 
-// css::awt::XPrinterServer
+// css::awt::XPrinterServer2

[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( _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

[Libreoffice-commits] core.git: include/toolkit solenv/clang-format toolkit/inc toolkit/source

2018-10-06 Thread Libreoffice Gerrit user

 solenv/clang-format/blacklist   |2 +-
 toolkit/source/awt/scrollabledialog.cxx |2 +-
 toolkit/source/awt/vclxcontainer.cxx|2 +-
 toolkit/source/awt/vclxtoolkit.cxx  |2 +-
 toolkit/source/awt/vclxwindows.cxx  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fca8704954c9e38719ac0158ba66edd8d85522ed
Author: Caolán McNamara 
AuthorDate: Sat Oct 6 16:08:50 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 6 20:54:55 2018 +0200

make scrollabledialog.hxx a private header

Change-Id: I16c68436c35568867677c33f70ef48287bc9e8ac
Reviewed-on: https://gerrit.libreoffice.org/61470
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 22ca1d639ca1..16dc194b4dce 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7659,7 +7659,6 @@ include/test/util/xsearchable.hxx
 include/test/xmldiff.hxx
 include/test/xmltesttools.hxx
 include/toolkit/awt/animatedimagespeer.hxx
-include/toolkit/awt/scrollabledialog.hxx
 include/toolkit/awt/vclxaccessiblecomponent.hxx
 include/toolkit/awt/vclxbitmap.hxx
 include/toolkit/awt/vclxcontainer.hxx
@@ -16674,6 +16673,7 @@ toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/imagealign.hxx
 toolkit/inc/helper/tkresmgr.hxx
 toolkit/inc/helper/btndlg.hxx
+toolkit/inc/helper/scrollabledialog.hxx
 toolkit/inc/helper/unopropertyarrayhelper.hxx
 toolkit/inc/helper/unowrapper.hxx
 toolkit/source/awt/animatedimagespeer.cxx
diff --git a/include/toolkit/awt/scrollabledialog.hxx 
b/toolkit/inc/helper/scrollabledialog.hxx
similarity index 100%
rename from include/toolkit/awt/scrollabledialog.hxx
rename to toolkit/inc/helper/scrollabledialog.hxx
diff --git a/toolkit/source/awt/scrollabledialog.cxx 
b/toolkit/source/awt/scrollabledialog.cxx
index 3751ad5f29b9..fe0da4118e3f 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/toolkit/source/awt/vclxcontainer.cxx 
b/toolkit/source/awt/vclxcontainer.cxx
index 27be3f5e6c98..708f2e6ed420 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 737bdc529554..d65bf794dc88 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -124,10 +124,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
+#include 
 #include 
 
 #if defined(_WIN32)
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 504dfa8e8a78..f56d8b224056 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -18,7 +18,7 @@
  */
 
 #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

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/inc toolkit/source

2018-09-27 Thread Libreoffice Gerrit user

 include/toolkit/controls/eventcontainer.hxx  |2 +-
 toolkit/inc/helper/msgbox.hxx|2 +-
 toolkit/source/awt/asynccallback.cxx |2 +-
 toolkit/source/awt/stylesettings.cxx |2 +-
 toolkit/source/awt/vclxtoolkit.cxx   |   10 +-
 toolkit/source/awt/vclxwindow.cxx|2 +-
 toolkit/source/controls/geometrycontrolmodel.cxx |2 +-
 toolkit/source/controls/unocontrol.cxx   |2 +-
 toolkit/source/controls/unocontrolcontainer.cxx  |2 +-
 toolkit/source/helper/vclunohelper.cxx   |6 +++---
 10 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 175834ce6a3ba707a6d34aa8de7351574381f481
Author: Noel Grandin 
AuthorDate: Wed Sep 26 13:52:39 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:30:01 2018 +0200

loplugin:constfields in toolkit

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

diff --git a/include/toolkit/controls/eventcontainer.hxx 
b/include/toolkit/controls/eventcontainer.hxx
index 65d0418bdc27..cc1d20493e4c 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -38,7 +38,7 @@ class ScriptEventContainer : public ::cppu::WeakImplHelper<
 {
 std::unordered_map< OUString, css::uno::Any>
mHashMap;
-css::uno::Type mType;
+css::uno::Type const mType;
 
 ContainerListenerMultiplexer maContainerListeners;
 
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 0fc7631d93de..f353b2ff9d57 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -50,7 +50,7 @@ class MessBox : public ButtonDialog
 VclPtr mpFixedImage;
 Image maImage;
 bool mbHelpBtn;
-MessBoxStyle mnMessBoxStyle;
+MessBoxStyle const mnMessBoxStyle;
 
 protected:
 OUString maMessText;
diff --git a/toolkit/source/awt/asynccallback.cxx 
b/toolkit/source/awt/asynccallback.cxx
index e9cc75f5f462..c37b20930a71 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -57,7 +57,7 @@ private:
 xCallback( rCallback ), aData( rAny ) {}
 
 css::uno::Reference< css::awt::XCallback > xCallback;
-css::uno::Any  aData;
+css::uno::Any constaData;
 };
 
 DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void );
diff --git a/toolkit/source/awt/stylesettings.cxx 
b/toolkit/source/awt/stylesettings.cxx
index 556fa8040371..22cce1247cc6 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -87,7 +87,7 @@ namespace toolkit
 }
 
 private:
-SolarMutexGuard  m_aGuard;
+SolarMutexGuard const  m_aGuard;
 };
 
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 5e7c9e823c39..737bdc529554 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -415,7 +415,7 @@ public:
 delete this;
 }
 
-sal_Int32 m_nPauseMilliseconds;
+sal_Int32 const m_nPauseMilliseconds;
 };
 
 class VCLXToolkitMutexHelper
@@ -439,8 +439,8 @@ class VCLXToolkit : public VCLXToolkitMutexHelper,
 ::comphelper::OInterfaceContainerHelper2 m_aTopWindowListeners;
 ::comphelper::OInterfaceContainerHelper2 m_aKeyHandlers;
 ::comphelper::OInterfaceContainerHelper2 m_aFocusListeners;
-::Link m_aEventListenerLink;
-::Link m_aKeyListenerLink;
+::Link const m_aEventListenerLink;
+::Link const m_aKeyListenerLink;
 bool m_bEventListener;
 bool m_bKeyListener;
 
@@ -801,9 +801,9 @@ WindowType ImplGetComponentType( const OUString& 
rServiceName )
 
 struct MessageBoxTypeInfo
 {
-css::awt::MessageBoxType eType;
+css::awt::MessageBoxType const eType;
 const sal_Char  *pName;
-sal_Int32nLen;
+sal_Int32 const  nLen;
 };
 
 static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index 9edf3ed9086c..eb3df832c972 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -118,7 +118,7 @@ public:
 boolmbDisposing : 1;
 boolmbDesignMode: 1;
 boolmbSynthesizingVCLEvent  : 1;
-boolmbWithDefaultProps  : 1;
+bool const  mbWithDefaultProps  : 1;
 
 sal_uLong   mnListenerLockLevel;
 sal_Int16   mnWritingMode;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx 
b/toolkit/source/controls/geometrycontrolmodel.cxx
index

[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 svtools/source toolkit/source vcl/source

2018-02-08 Thread Maxim Monastirsky

 include/toolkit/awt/vclxwindow.hxx   |   17 
 svtools/source/control/toolbarmenu.cxx   |2 
 svtools/source/uno/popupwindowcontroller.cxx |3 -
 toolkit/source/awt/vclxwindow.cxx|   46 --
 toolkit/source/controls/unocontrol.cxx   |   55 +++
 vcl/source/window/menubarwindow.cxx  |7 +++
 vcl/source/window/window.cxx |2 
 7 files changed, 57 insertions(+), 75 deletions(-)

New commits:
commit 3ecf542af410536d64d217c71002799bbe48b9c3
Author: Maxim Monastirsky 
Date:   Sun Jan 28 00:54:23 2018 +0200

Different approach for tdf#115227

This reverts the previous attempt of commit
250ad9311a613d9b4e1cf5cf5fdaf33d9b326220 ("tdf#115227 svtools:
suppress UNO notifications for color selectors"), in favor of
a different fix. The advantage of this new approach is that
is doesn't affect events other than activate/deativate, and that
it covers more cases: Toolbar popups even if not based on
svtools::ToolbarPopup, or if closed by clicking outside them,
font name/size and paragraph style toolbar controls, notebookbar,
context and main menus (for the non gtk3 native case, the gtk3
native menus left for a future investigation). For now, keep this
logic inside toolkit, but ideally it should be in vcl (after
reviewing vcl internal listeners).

One side effect that I noticed after this change, is that there is
a deactivation/activation pair which suppressed when e.g. opening a
new document from the start center. But I'm not sure if that's a
problem, given that the focus state of the top window as a whole
wasn't changed, only its contents, and there are other APIs to track
activation of document components. This happens because the source
and the target windows of those events are the same, and we need to
suppress this case to fix the font name/size style controls, and also
the color picker after 27473d1c0f8ba3006262001cbefff33f639a19ac
("tdf#114935 Move the focus back to the document"). Otherwise we'll
need to find another way to move the focus to the document w/o
triggering listeners.

Another case that will see a change in behavior, is document event
listeners in dbaccess, as the Focus/UnFocus events there are based
on top window activation/deactivation. However, I think it's a good
change, as currently just opening of a toolbar popup or main/context
menus there triggers those document events, making them useless.

I would like to also mention here, that in fact those top window
activation events never really worked as tdf#115227 expects them, as
the superfluous events for at least the font name/size, style and
color toolbar buttons existed already in OOo. The behavior of the
color buttons changed in LO for a few years, but regressed again in
the work on a real focus grabbing for floating windows starting with
commit dd46727b99d4bb5135451aa7e5e1bdb197373843 ("Resolves; tdf#87120
no keyboard navigation inside floating windows"). That work also
introduced superfluous events when using menus.

And a note about the change in menubarwindow.cxx: When a menubar
popup is closed it's deleted using the lazydelete mechanism, which
reparents the popup window, so it doesn't appear anymore in the
hierarchy of the document window. Moreover, I suspect that at some
point the lazydelete thing will be replaced by a VclPtr mechanism,
which might break this even further, so the event won't appear as
coming from the popup window (which might be already disposed at
this stage). So instead, temporarily set the menubar window as the
current focus window, so the activation will appear as if it was
coming from the menu bar window itself.

Change-Id: I292232adfcbd1a31d66ce394cd2f1bf42a013ecb
Reviewed-on: https://gerrit.libreoffice.org/48746
Reviewed-by: Maxim Monastirsky 
Tested-by: Jenkins 

diff --git a/include/toolkit/awt/vclxwindow.hxx 
b/include/toolkit/awt/vclxwindow.hxx
index 3c925a59143b..27be3e102d32 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -233,23 +233,6 @@ public:
 virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL 
getStyleSettings() override;
 };
 
-class TOOLKIT_DLLPUBLIC VclListenerLock
-{
-private:
-VCLXWindow* m_pLockWindow;
-
-public:
-explicit VclListenerLock(VCLXWindow* _pLockWindow);
-/**
- * @param bSystemWindow - if pVclWindow or its first system window parent
- * is locked.
- */
-explicit VclListenerLock(vcl::Window* pVclWindow, bool bSystemWindow);
-~VclListenerLock();
-VclListenerLock(const VclListenerLock&) = delete;
-VclListenerLock& operator=(const VclListenerLock&) = delete;
-};
-
 #endif //

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

2018-01-25 Thread Miklos Vajna

 include/toolkit/awt/vclxwindow.hxx   |   17 
 svtools/source/control/toolbarmenu.cxx   |2 
 svtools/source/uno/popupwindowcontroller.cxx |3 +
 toolkit/source/controls/unocontrol.cxx   |   55 +++
 4 files changed, 61 insertions(+), 16 deletions(-)

New commits:
commit 250ad9311a613d9b4e1cf5cf5fdaf33d9b326220
Author: Miklos Vajna 
Date:   Thu Jan 25 12:21:12 2018 +0100

tdf#115227 svtools: suppress UNO notifications for color selectors

This is nominally a regression from commit
43bc3031483d172eccd72c3804e2d4fc2ef37de4 (unify color selectors,
2016-10-28), but that just changed the Writer color picker to behave the
same way as the Impress one.

The Impress one started to emit these events with
daeed90f4586eb9533041fb89bee163a5193596c (re-base on ALv2 code.
Includes:, 2012-11-15), to fix i#118707, improving accessibility.

That means either the focus changes and then accessibility is happy or
the focus does not change and then the UNO API client only gets events
when the user actually switches to an other window.

Fix the problem with suppressing UNO-level notifications for the
problematic events, by moving the existing VclListenerLock to a public
header and using it at two more places in svtools.

This should address not just color selectors, but in general other
toolbar menus / popup windows.

Change-Id: If427708c5b9fe4fa49cb8f00ec04b32cb28eb391
Reviewed-on: https://gerrit.libreoffice.org/48570
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/include/toolkit/awt/vclxwindow.hxx 
b/include/toolkit/awt/vclxwindow.hxx
index 27be3e102d32..3c925a59143b 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -233,6 +233,23 @@ public:
 virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL 
getStyleSettings() override;
 };
 
+class TOOLKIT_DLLPUBLIC VclListenerLock
+{
+private:
+VCLXWindow* m_pLockWindow;
+
+public:
+explicit VclListenerLock(VCLXWindow* _pLockWindow);
+/**
+ * @param bSystemWindow - if pVclWindow or its first system window parent
+ * is locked.
+ */
+explicit VclListenerLock(vcl::Window* pVclWindow, bool bSystemWindow);
+~VclListenerLock();
+VclListenerLock(const VclListenerLock&) = delete;
+VclListenerLock& operator=(const VclListenerLock&) = delete;
+};
+
 #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index eb0c3dcc9b03..d4b69b1a747b 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "toolbarmenuimp.hxx"
 
 using namespace ::com::sun::star::uno;
@@ -1486,6 +1487,7 @@ bool ToolbarPopup::IsInPopupMode()
 
 void ToolbarPopup::EndPopupMode()
 {
+VclListenerLock aLock(this, /*bSystemWindow=*/true);
 GetDockingManager()->EndPopupMode(this);
 }
 
diff --git a/svtools/source/uno/popupwindowcontroller.cxx 
b/svtools/source/uno/popupwindowcontroller.cxx
index 51f2b6e10f42..19276a45854f 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -213,6 +214,8 @@ Reference< awt::XWindow > SAL_CALL 
PopupWindowController::createPopupWindow()
 
 pWin->EnableDocking();
 mxImpl->SetPopupWindow(pWin,pToolBox);
+
+VclListenerLock aLock(pWin, /*bSystemWindow=*/true);
 vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, 
eFloatFlags );
 }
 }
diff --git a/toolkit/source/controls/unocontrol.cxx 
b/toolkit/source/controls/unocontrol.cxx
index 6c8435791883..2f41e3f367d4 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -94,27 +94,50 @@ static Sequence< OUString> lcl_ImplGetPropertyNames( const 
Reference< XMultiProp
 return aNames;
 }
 
-
-class VclListenerLock
+namespace
 {
-private:
-VCLXWindow*  m_pLockWindow;
-
-public:
-explicit VclListenerLock( VCLXWindow* _pLockWindow )
-: m_pLockWindow( _pLockWindow )
+VCLXWindow* GetParentSystemWindow(vcl::Window* pWindow)
+{
+while (pWindow)
 {
-if ( m_pLockWindow )
-m_pLockWindow->suspendVclEventListening( );
+if (pWindow->IsSystemWindow())
+break;
+
+pWindow = pWindow->GetParent();
 }
-~VclListenerLock()
+
+uno::Reference xWindow = VCLUnoHelper::GetInterface(pWindow);
+return VCLXWindow::GetImplementation(xWindow);
+}
+}
+
+VclListenerLock::VclListenerLock(VCLXWindow* _pLockWindow)
+: m_pLockWindow(_pLockWindow)
+{
+if

[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
---

[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;
-

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

2017-10-20 Thread Noel Grandin

 include/toolkit/awt/vclxbitmap.hxx|4 -
 include/toolkit/awt/vclxfont.hxx  |4 -
 include/toolkit/awt/vclxpointer.hxx   |4 -
 include/toolkit/awt/vclxregion.hxx|4 -
 include/toolkit/controls/accessiblecontrolcontext.hxx |   43 +++
 include/toolkit/controls/formattedcontrol.hxx |   49 --
 include/toolkit/controls/roadmapentry.hxx |   17 +-
 include/toolkit/controls/stdtabcontroller.hxx |3 -
 include/toolkit/controls/stdtabcontrollermodel.hxx|4 -
 include/toolkit/controls/unocontrols.hxx  |5 -
 include/tools/b3dtrans.hxx|   18 +++---
 include/tools/color.hxx   |3 -
 toolkit/inc/helper/unopropertyarrayhelper.hxx |4 -
 13 files changed, 66 insertions(+), 96 deletions(-)

New commits:
commit 22fa30c2f6aa541f6b1db002d276459d137490c8
Author: Noel Grandin 
Date:   Fri Oct 20 13:44:12 2017 +0200

loplugin:finalclasses in toolkit,tools

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

diff --git a/include/toolkit/awt/vclxbitmap.hxx 
b/include/toolkit/awt/vclxbitmap.hxx
index 891a8b42b536..cc83653e751a 100644
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
@@ -32,17 +32,15 @@
 //  class VCLXBitmap
 
 
-class VCLXBitmap :  public css::awt::XBitmap,
+class VCLXBitmap final : public css::awt::XBitmap,
 public css::awt::XDisplayBitmap,
 public css::lang::XTypeProvider,
 public css::lang::XUnoTunnel,
 public ::cppu::OWeakObject
 {
-private:
 ::osl::MutexmaMutex;
 BitmapExmaBitmap;
 
-protected:
 ::osl::Mutex&   GetMutex() { return maMutex; }
 
 
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 080f9feacc64..9b12b496a21b 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -34,19 +34,17 @@
 //  class VCLXFont
 
 
-class TOOLKIT_DLLPUBLIC VCLXFont :  public css::awt::XFont2,
+class TOOLKIT_DLLPUBLIC VCLXFont final : public css::awt::XFont2,
 public css::lang::XTypeProvider,
 public css::lang::XUnoTunnel,
 public ::cppu::OWeakObject
 {
-private:
 ::osl::MutexmaMutex;
 css::uno::Reference< css::awt::XDevice> mxDevice;
 vcl::Font   maFont;
 std::unique_ptr
 mpFontMetric;
 
-protected:
 boolImplAssertValidFontMetric();
 ::osl::Mutex&   GetMutex() { return maMutex; }
 
diff --git a/include/toolkit/awt/vclxpointer.hxx 
b/include/toolkit/awt/vclxpointer.hxx
index 23bcb1c122a0..951efeb7457c 100644
--- a/include/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
@@ -33,14 +33,12 @@
 //  class VCLXPointer
 
 
-class VCLXPointer: public cppu::WeakImplHelper<
+class VCLXPointer final : public cppu::WeakImplHelper<
 css::awt::XPointer, css::lang::XUnoTunnel, css::lang::XServiceInfo>
 {
-private:
 ::osl::MutexmaMutex;
 Pointer maPointer;
 
-protected:
 ::osl::Mutex&   GetMutex() { return maMutex; }
 
 public:
diff --git a/include/toolkit/awt/vclxregion.hxx 
b/include/toolkit/awt/vclxregion.hxx
index 86dc44d4eaca..82ec095be43a 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -33,16 +33,14 @@
 //  class VCLXRegion
 
 
-class VCLXRegion :  public css::awt::XRegion,
+class VCLXRegion final : public css::awt::XRegion,
 public css::lang::XTypeProvider,
 public css::lang::XUnoTunnel,
 public ::cppu::OWeakObject
 {
-private:
 ::osl::MutexmaMutex;
 vcl::Region  maRegion;
 
-protected:
 ::osl::Mutex&   GetMutex() { return maMutex; }
 
 public:
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx 
b/include/toolkit/controls/accessiblecontrolcontext.hxx
index cbd304a1334d..180fd538551c 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -47,31 +47,11 @@ namespace toolkit
 control model, and a weak reference to the control. The reference to 
the model is freed when the model
 is being disposed.
 */
-class OAccessibleControlContext
+class OAccessibleControlContext final
 :public ::comphelper::OAccessibleImplementationAccess
 ,public OAccessibleControlContext_Base
 ,public OAccessibleControlContext_IBase
 {
-private:
-css::uno::Reference< css::beans::XPropertySet >
-m_xControlModel;// the model of the

[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

[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 >  )
 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 include/ucbhelper

2017-06-12 Thread Jochen Nitschke

 include/toolkit/helper/macros.hxx |   14 ++
 include/ucbhelper/macros.hxx  |   15 ---
 2 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit 0b8c2c72c988488895d74d1bb36e60378283a4da
Author: Jochen Nitschke 
Date:   Sun Jun 11 13:37:46 2017 +0200

replace double checked locking patterns in getTypes macros

with thread safe local statics

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

diff --git a/include/toolkit/helper/macros.hxx 
b/include/toolkit/helper/macros.hxx
index ab9b0f4b3739..25c3e3d4c33f 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -60,22 +60,12 @@ css::uno::Sequence< sal_Int8 > 
ClassName::getImplementationId() \
 IMPL_IMPLEMENTATION_ID( ClassName ) \
 css::uno::Sequence< css::uno::Type > ClassName::getTypes() \
 { \
-static ::cppu::OTypeCollection* pCollection = nullptr; \
-if( !pCollection ) \
-{ \
-::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); 
\
-if( !pCollection ) \
-{ \
-static ::cppu::OTypeCollection collection( \
+static ::cppu::OTypeCollection collection( \
 cppu::UnoType::get(),
 
-
 #define IMPL_XTYPEPROVIDER_END \
 ); \
-pCollection =  \
-} \
-} \
-return (*pCollection).getTypes(); \
+return collection.getTypes(); \
 }
 
 
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 09dca56d5750..6be773977867 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -48,20 +48,13 @@ Class::getImplementationId()  \
 css::uno::Sequence< css::uno::Type > SAL_CALL \
 Class::getTypes()  \
 {   \
-static cppu::OTypeCollection* pCollection = nullptr;   
\
-  if ( !pCollection ) \
-  {   \
-osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );\
-if ( !pCollection ) \
-{   \
-static cppu::OTypeCollection collection(
+static cppu::OTypeCollection collection(
+
 
 #define GETTYPES_IMPL_END   \
 );  \
-pCollection =   \
-}   \
-}   \
-return (*pCollection).getTypes();   \
+\
+return collection.getTypes();   \
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-05-05 Thread Noel Grandin

 include/toolkit/controls/roadmapcontrol.hxx |2 +-
 include/vbahelper/vbahelper.hxx |2 +-
 include/vbahelper/vbashapes.hxx |2 +-
 sc/source/ui/vba/vbaapplication.cxx |2 +-
 sc/source/ui/vba/vbaaxes.cxx|4 ++--
 sc/source/ui/vba/vbapagebreak.cxx   |2 +-
 sc/source/ui/vba/vbapagebreaks.cxx  |2 +-
 sc/source/ui/vba/vbapagesetup.cxx   |8 
 sc/source/ui/vba/vbawindow.cxx  |2 +-
 sc/source/ui/vba/vbaworksheet.cxx   |2 +-
 sw/source/ui/vba/vbaparagraphformat.cxx |   18 +-
 sw/source/ui/vba/vbarange.cxx   |2 +-
 sw/source/ui/vba/vbarows.cxx|2 +-
 sw/source/ui/vba/vbaview.cxx|6 +++---
 sw/source/ui/vba/vbawrapformat.cxx  |2 +-
 toolkit/source/controls/roadmapcontrol.cxx  |6 +++---
 ucb/source/sorter/sortdynres.cxx|6 +++---
 ucb/source/sorter/sortdynres.hxx|2 +-
 ucb/source/ucp/file/bc.cxx  |5 ++---
 ucb/source/ucp/file/bc.hxx  |3 +--
 ucb/source/ucp/ftp/ftpdirp.cxx  |2 +-
 ucb/source/ucp/ftp/ftpdirp.hxx  |2 +-
 vbahelper/source/vbahelper/vbahelper.cxx|2 +-
 vbahelper/source/vbahelper/vbapagesetupbase.cxx |2 +-
 vbahelper/source/vbahelper/vbashape.cxx |4 ++--
 vbahelper/source/vbahelper/vbashapes.cxx|6 +++---
 26 files changed, 48 insertions(+), 50 deletions(-)

New commits:
commit e3a44cbb1d01a1fe5e6321b29e215f4a13ddee6a
Author: Noel Grandin 
Date:   Fri May 5 09:04:23 2017 +0200

loplugin:checkunusedparams in toolkit..vbahelper

the extra argument on the runtimeexception method was only ever passed
an "OUString()"

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

diff --git a/include/toolkit/controls/roadmapcontrol.hxx 
b/include/toolkit/controls/roadmapcontrol.hxx
index b2f5399561ab..47feb933ddd6 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -81,7 +81,7 @@ namespace toolkit
 
 voidMakeRMItemValidation( sal_Int32 
Index, const css::uno::Reference< XInterface >& xRoadmapItem );
 css::container::ContainerEvent  GetContainerEvent(sal_Int32 Index, 
const css::uno::Reference< XInterface >& );
-voidSetRMItemDefaultProperties( const 
sal_Int32 Index, const css::uno::Reference< XInterface >& );
+voidSetRMItemDefaultProperties( const 
css::uno::Reference< XInterface >& );
 static sal_Int16GetCurrentItemID( const 
css::uno::Reference< css::beans::XPropertySet >& xPropertySet );
 sal_Int32   GetUniqueID();
 
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 2f27dc88f0a2..4d44a6968206 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -271,7 +271,7 @@ public:
 static void basicexception( const css::uno::Exception& ex );
 
 /// @throws css::script::BasicErrorException
-static void runtimeexception( int err,  const OUString& additionalArgument 
);
+static void runtimeexception( int err );
 };
 
 } // vba
diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index 118ac007c270..c70876891a18 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -72,7 +72,7 @@ protected:
 /// @throws css::uno::RuntimeException
 css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 
nLineWidth, sal_Int32 nLineHeight, const css::uno::Any& rRange );
 /// @throws css::uno::RuntimeException
-css::uno::Any AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 
_nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight );
+css::uno::Any AddTextboxInWriter( sal_Int32 _nLeft, sal_Int32 _nTop, 
sal_Int32 _nWidth, sal_Int32 _nHeight );
 OUString createName( const OUString& sName );
 //TODO helperapi using a writer document
 //css::awt::Point calculateTopLeftMargin( css::uno::Reference< 
ov::XHelperInterface > xDocument );
diff --git a/sc/source/ui/vba/vbaapplication.cxx 
b/sc/source/ui/vba/vbaapplication.cxx
index e4b17f1016cd..5c500d62f137 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -878,7 +878,7 @@ OUString ScVbaApplication::getOfficePath( const OUString& 
_sPathType )
 }
 catch (const uno::Exception&)
 {
-DebugHelper::runtimeexception(ERRCODE_BASIC_METHOD_FAILED,

[Libreoffice-commits] core.git: include/toolkit odk/examples officecfg/registry

2017-03-12 Thread dennisroczek

 include/toolkit/controls/dialogcontrol.hxx  |  
  6 +++---
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx |  
  2 +-
 officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs|  
  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ff414feabe5bb5b7504cd02c70fa4e708ca557c0
Author: dennisroczek 
Date:   Sun Mar 12 11:16:15 2017 +

fix typo: ambigous --> ambiguous

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

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 11b72c5..d166f30 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -85,7 +85,7 @@ public:
 // XModifyListener
 virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) 
override;
 
-// resolve some ambigous methods
+// resolve some ambiguous methods
 virtual css::uno::Reference SAL_CALL getPeer() 
override
 { return UnoDialogControl_Base::ControlContainerBase::getPeer(); }
 virtual void SAL_CALL addWindowListener(const 
css::uno::Reference& p1) override
@@ -181,7 +181,7 @@ public:
 // XNamedContainer
 void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& 
aElement ) override;
 
-// Override the method of parent Class
+// Override the method of parent class
 virtual sal_Bool SAL_CALL getGroupControl(  ) override;
 protected:
 virtual css::uno::Any  ImplGetDefaultValue( sal_uInt16 nPropId ) 
const override;
@@ -254,7 +254,7 @@ public:
 virtual OUString SAL_CALL getServiceName() override;
 virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL 
getPropertySetInfo(  ) override;
 
-// Override the method of parent Class
+// Override the method of parent class
 virtual sal_Bool SAL_CALL getGroupControl(  ) override;
 protected:
 virtual css::uno::Any  ImplGetDefaultValue( sal_uInt16 nPropId ) 
const override;
diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
index 23b2483..846295b 100644
--- 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
+++ 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
@@ -57,7 +57,7 @@ namespace connectivity
 // a constructor, which is required for returning objects:
 OResultSetMetaData(OConnection* _pConnection) : 
m_pConnection(_pConnection){}
 
-/// Avoid ambigous cast error from the compiler.
+/// Avoid ambiguous cast error from the compiler.
 inline operator ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSetMetaData > () throw()
 { return this; }
 
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs 
b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
index 0f59d8b..ee7df8a 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
@@ -64,7 +64,7 @@
   
   
 
-  In case of ambigous registrations (e.g. for extensions doc/txt)
+  In case of ambiguous registrations (e.g. for extensions 
doc/txt)
   it specify the preferred type.
 
 false
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-19 Thread Noel Grandin

 include/toolkit/awt/vclxfont.hxx  |3 ++-
 include/tools/simplerm.hxx|4 +++-
 sot/source/sdstor/stgcache.cxx|3 +--
 sot/source/sdstor/stgcache.hxx|5 +++--
 sot/source/sdstor/stgole.cxx  |3 +--
 sot/source/sdstor/stgole.hxx  |2 +-
 sot/source/sdstor/stgstrms.cxx|7 +++
 sot/source/sdstor/stgstrms.hxx|2 +-
 stoc/source/corereflection/base.hxx   |   10 ++
 stoc/source/corereflection/crcomp.cxx |3 +--
 stoc/source/corereflection/crenum.cxx |3 +--
 stoc/source/inspect/introspection.cxx |9 +++--
 toolkit/source/awt/vclxfont.cxx   |6 ++
 toolkit/source/awt/vclxwindow.cxx |   10 +-
 tools/source/rc/resmgr.cxx|   11 +--
 15 files changed, 38 insertions(+), 43 deletions(-)

New commits:
commit 0415cb335b953b9c10075fa524d7707db4aa55e5
Author: Noel Grandin 
Date:   Wed Jan 18 13:57:55 2017 +0200

new loplugin: useuniqueptr: sot..tools

Change-Id: Ided435d016ae28e7c3f2726e41eedd981572ae10
Reviewed-on: https://gerrit.libreoffice.org/33263
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index d9550e7..ebc09e7 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -42,7 +42,8 @@ private:
 ::osl::MutexmaMutex;
 css::uno::Reference< css::awt::XDevice> mxDevice;
 vcl::Font   maFont;
-FontMetric* mpFontMetric;
+std::unique_ptr
+mpFontMetric;
 
 protected:
 boolImplAssertValidFontMetric();
diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx
index 28d008e..79e267a 100644
--- a/include/tools/simplerm.hxx
+++ b/include/tools/simplerm.hxx
@@ -27,13 +27,15 @@
 #include 
 #include 
 #include 
+#include 
 
 class InternalResMgr;
 
 class TOOLS_DLLPUBLIC SimpleResMgr final
 {
 osl::Mutex  m_aAccessSafety;
-InternalResMgr* m_pResImpl;
+std::unique_ptr
+m_pResImpl;
 
 public:
 /** creates a new SimpleResManager
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 2ee2c28..409e472 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -44,12 +44,11 @@ StgPage::StgPage( short nSize, sal_Int32 nPage )
 OSL_ENSURE( mnSize >= 512, "Unexpected page size is provided!" );
 // We will write this data to a permanent file later
 // best to clear if first.
-memset( mpData, 0, mnSize );
+memset( mpData.get(), 0, mnSize );
 }
 
 StgPage::~StgPage()
 {
-delete [] mpData;
 }
 
 rtl::Reference< StgPage > StgPage::Create( short nData, sal_Int32 nPage )
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 5a1ec38..5964902 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -96,7 +96,8 @@ public:
 class StgPage : public salhelper::SimpleReferenceObject
 {
 const sal_Int32 mnPage;// page index
-sal_uInt8*  mpData;// nSize bytes
+std::unique_ptr
+mpData;// nSize bytes
 short   mnSize;// size of this page
  StgPage( short nData, sal_Int32 nPage );
 virtual ~StgPage() override;
@@ -106,7 +107,7 @@ public:
 static rtl::Reference< StgPage > Create( short nData, sal_Int32 nPage );
 
 sal_Int32 GetPage()  { return mnPage; }
-void* GetData()  { return mpData; }
+void* GetData()  { return mpData.get(); }
 short GetSize()  { return mnSize; }
 
 public:
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 9adfcac..acec452 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -36,7 +36,7 @@ StgInternalStream::StgInternalStream( BaseStorage& rStg, 
const OUString& rName,
 StreamMode nMode = bWr
  ? StreamMode::WRITE | StreamMode::SHARE_DENYALL
  : StreamMode::READ | StreamMode::SHARE_DENYWRITE | 
StreamMode::NOCREATE;
-m_pStrm = rStg.OpenStream( rName, nMode );
+m_pStrm.reset( rStg.OpenStream( rName, nMode ) );
 
 // set the error code right here in the stream
 SetError( rStg.GetError() );
@@ -45,7 +45,6 @@ StgInternalStream::StgInternalStream( BaseStorage& rStg, 
const OUString& rName,
 
 StgInternalStream::~StgInternalStream()
 {
-delete m_pStrm;
 }
 
 std::size_t StgInternalStream::GetData(void* pData, std::size_t nSize)
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index cfe09b1..0bdf503 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -27,7 +27,7 @@
 
 class StgInternalStream : public SvStream
 {
-BaseStorageStream* m_pStrm;
+

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

2016-12-06 Thread Jochen Nitschke

 include/toolkit/awt/animatedimagespeer.hxx   |   12 +--
 include/toolkit/awt/vclxtabpagecontainer.hxx |   10 -
 include/toolkit/awt/vclxwindow.hxx   |   24 +++---
 include/toolkit/awt/vclxwindows.hxx  |   29 +--
 include/toolkit/controls/roadmapentry.hxx|5 +---
 5 files changed, 39 insertions(+), 41 deletions(-)

New commits:
commit 43de0518bc1f0b7aa8d57132a11cae6fa411680f
Author: Jochen Nitschke 
Date:   Tue Dec 6 19:35:55 2016 +0100

tdf#88206 replace cppu::WeakImplHelper* in toolkit

Change-Id: I89713755023ea003559cc76fb77eb97de2135cae
Reviewed-on: https://gerrit.libreoffice.org/31696
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/toolkit/awt/animatedimagespeer.hxx 
b/include/toolkit/awt/animatedimagespeer.hxx
index c2bccd99..f328fce 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 
@@ -36,11 +36,11 @@ namespace toolkit
 //= AnimatedImagesPeer
 
 struct AnimatedImagesPeer_Data;
-typedef ::cppu::ImplInheritanceHelper3  <   VCLXWindow
-,   css::awt::XAnimation
-,   
css::container::XContainerListener
-,   css::util::XModifyListener
->   AnimatedImagesPeer_Base;
+typedef cppu::ImplInheritanceHelper< VCLXWindow,
+ css::awt::XAnimation,
+ css::container::XContainerListener,
+ css::util::XModifyListener
+   > AnimatedImagesPeer_Base;
 
 class AnimatedImagesPeer:public AnimatedImagesPeer_Base
 {
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx 
b/include/toolkit/awt/vclxtabpagecontainer.hxx
index d36f325..0e80537 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -29,15 +29,15 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 #include 
 
 
-typedef ::cppu::ImplInheritanceHelper2  VCLXTabPageContainer_Base;
+typedef cppu::ImplInheritanceHelper< VCLXContainer,
+ css::awt::tab::XTabPageContainer,
+ css::container::XContainerListener
+   > VCLXTabPageContainer_Base;
 class VCLXTabPageContainer : public VCLXTabPageContainer_Base
 {
 public:
diff --git a/include/toolkit/awt/vclxwindow.hxx 
b/include/toolkit/awt/vclxwindow.hxx
index 611e1da..7ee6ed5 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -36,8 +36,8 @@
 #include 
 #include 
 
+#include 
 #include 
-#include 
 #include 
 
 #include 
@@ -61,17 +61,17 @@ namespace toolkit
 
 class UnoPropertyArrayHelper;
 class VCLXWindowImpl;
-typedef ::cppu::ImplInheritanceHelper9  <   VCLXDevice
-,   css::awt::XWindow2
-,   css::awt::XVclWindowPeer
-,   css::awt::XLayoutConstrains
-,   css::awt::XView
-,   css::awt::XDockableWindow
-,   css::accessibility::XAccessible
-,   css::lang::XEventListener
-,   css::beans::XPropertySetInfo
-,   css::awt::XStyleSettingsSupplier
->   VCLXWindow_Base;
+typedef cppu::ImplInheritanceHelper< VCLXDevice,
+ css::awt::XWindow2,
+ css::awt::XVclWindowPeer,
+ css::awt::XLayoutConstrains,
+ css::awt::XView,
+ css::awt::XDockableWindow,
+ css::accessibility::XAccessible,
+ css::lang::XEventListener,
+ css::beans::XPropertySetInfo,
+ css::awt::XStyleSettingsSupplier
+   > VCLXWindow_Base;
 
 class TOOLKIT_DLLPUBLIC VCLXWindow : public VCLXWindow_Base
 {
diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx

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

2016-10-26 Thread Noel Grandin

 include/toolkit/awt/vclxtabpagecontainer.hxx   |3 +--
 include/toolkit/awt/vclxwindows.hxx|6 ++
 include/tools/pstm.hxx |2 --
 include/tools/urlobj.hxx   |9 ++---
 toolkit/source/awt/vclxtabpagecontainer.cxx|2 +-
 toolkit/source/awt/vclxwindows.cxx |4 ++--
 toolkit/source/controls/tree/treedatamodel.cxx |8 +---
 tools/source/fsys/urlobj.cxx   |6 +++---
 tools/source/ref/pstm.cxx  |5 -
 9 files changed, 12 insertions(+), 33 deletions(-)

New commits:
commit e5c1e15eda804463c9021664e868979b019c203e
Author: Noel Grandin 
Date:   Tue Oct 25 14:54:03 2016 +0200

loplugin:expandablemethods in toolkit..tools

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

diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx 
b/include/toolkit/awt/vclxtabpagecontainer.hxx
index 77f2dab..d36f325 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -60,8 +60,7 @@ public:
 virtual void SAL_CALL addTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
throw (css::uno::RuntimeException, std::exception) override;
 virtual void SAL_CALL removeTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
throw (css::uno::RuntimeException, std::exception) override;
 
-static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override;
 
 virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) 
throw (css::uno::RuntimeException, std::exception) override;
 virtual void SAL_CALL elementInserted( const 
css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, 
std::exception) override;
diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index 996a0ba..a9d7c84 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -361,8 +361,7 @@ public:
 // css::awt::XLayoutConstrains
 css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, 
std::exception) override;
 
-static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override;
 };
 
 
@@ -433,8 +432,7 @@ public:
 // css::awt::XDevice,
 css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, 
std::exception) override;
 
-static void ImplGetPropertyIds( std::vector< sal_uInt16 >  );
-virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override 
{ return ImplGetPropertyIds( aIds ); }
+virtual voidGetPropertyIds( std::vector< sal_uInt16 >  ) override;
 
 // css::awt::XVclWindowPeer
 void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) 
override;
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index a15a656..1693ae7 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -153,8 +153,6 @@ public:
 SvPersistStream( SvClassManager &, SvStream * pStream 
);
 virtual ~SvPersistStream() override;
 
-voidClearStream();
-
 SvPersistBase * GetObject( Index nIdx ) const;
 Index   GetIndex( SvPersistBase * ) const;
 
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index e364466..d5d489e 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -906,10 +906,9 @@ public:
  */
 OUString GetFileExtension() const;
 
-inline bool Append(OUString const & rTheSegment,
+bool Append(OUString const & rTheSegment,
EncodeMechanism eMechanism = WAS_ENCODED,
-   rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
-{ return appendSegment(rTheSegment, eMechanism, eCharset); }
+   rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
 
 void CutLastName();
 
@@ -1095,10 +1094,6 @@ private:
 
 TOOLS_DLLPRIVATE bool checkHierarchical() const;
 
-bool appendSegment(
-OUString const & rTheSegment,
-EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
-
 TOOLS_DLLPRIVATE SubString getSegment(
 sal_Int32 nIndex, bool bIgnoreFinalSlash) const;
 
diff --git

[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,

[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/UnoApi_offapi.mk toolkit/source

2015-10-16 Thread Matthew J . Francis

 include/toolkit/helper/vclunohelper.hxx   |4 +
 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/awt/XToolkitRobot.idl |   40 
 toolkit/source/awt/vclxtoolkit.cxx|   99 ++
 toolkit/source/helper/vclunohelper.cxx|   20 ++
 5 files changed, 164 insertions(+)

New commits:
commit 59c38539bcabf3a5c949745ff8f501ed7c98a528
Author: Matthew J. Francis 
Date:   Sat Oct 3 04:31:48 2015 +0800

Allow injection of keyboard and mouse events through UNO

Change-Id: I3d139c6378f5274be1e7bfd88f72d1576c13243d
Reviewed-on: https://gerrit.libreoffice.org/19321
Reviewed-by: Matthew Francis 
Tested-by: Matthew Francis 

diff --git a/include/toolkit/helper/vclunohelper.hxx 
b/include/toolkit/helper/vclunohelper.hxx
index 0b3e944..a03e896 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -145,11 +145,15 @@ public:
 const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >& _rxContext
 );
 
+static ::MouseEvent createVCLMouseEvent( const 
::com::sun::star::awt::MouseEvent& _rAwtEvent );
+
 static ::com::sun::star::awt::KeyEvent
 createKeyEvent(
 const ::KeyEvent& _rVclEvent,
 const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >& _rxContext
 );
+
+static ::KeyEvent createVCLKeyEvent( const 
::com::sun::star::awt::KeyEvent& _rAwtEvent );
 };
 
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0ede4c2..c8880078ed 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1889,6 +1889,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt,\
XToolkit \
XToolkit2 \
XToolkitExperimental \
+   XToolkitRobot \
XTopWindow \
XTopWindow2 \
XTopWindowListener \
diff --git a/offapi/com/sun/star/awt/XToolkitRobot.idl 
b/offapi/com/sun/star/awt/XToolkitRobot.idl
new file mode 100644
index 000..a7b430d
--- /dev/null
+++ b/offapi/com/sun/star/awt/XToolkitRobot.idl
@@ -0,0 +1,40 @@
+/* -*- 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/.
+ */
+
+#ifndef __com_sun_star_awt_XToolkitRobot_idl__
+#define __com_sun_star_awt_XToolkitRobot_idl__
+
+#include 
+#include 
+
+module com {  module sun {  module star {  module awt {
+
+/** Allows injection of keyboard and mouse events
+ */
+
+interface XToolkitRobot
+{
+
+void keyPress( [in] com::sun::star::awt::KeyEvent aKeyEvent );
+
+void keyRelease( [in] com::sun::star::awt::KeyEvent aKeyEvent );
+
+void mousePress( [in] com::sun::star::awt::MouseEvent aMouseEvent );
+
+void mouseRelease( [in] com::sun::star::awt::MouseEvent aMouseEvent );
+
+void mouseMove( [in] com::sun::star::awt::MouseEvent aMouseEvent );
+
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 31ed8c4..f97be03 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -149,6 +150,7 @@ protected:
 class VCLXToolkit : public VCLXToolkitMutexHelper,
 public cppu::WeakComponentImplHelper<
 css::awt::XToolkitExperimental,
+css::awt::XToolkitRobot,
 css::lang::XServiceInfo >
 {
 css::uno::Reference< css::datatransfer::clipboard::XClipboard > 
mxClipboard;
@@ -277,6 +279,23 @@ public:
 // css::awt::XReschedule:
 virtual void SAL_CALL reschedule()
 throw (css::uno::RuntimeException, std::exception) override;
+
+// css:awt:XToolkitRobot
+virtual void SAL_CALL keyPress( const css::awt::KeyEvent & aKeyEvent )
+throw (css::uno::RuntimeException, std::exception) override;
+
+virtual void SAL_CALL keyRelease( const css::awt::KeyEvent & aKeyEvent )
+throw (css::uno::RuntimeException, std::exception) override;
+
+virtual void SAL_CALL mousePress( const css::awt::MouseEvent & aMouseEvent 
)
+throw (css::uno::RuntimeException, std::exception) override;
+
+virtual void SAL_CALL mouseRelease( const css::awt::MouseEvent & 
aMouseEvent )
+throw (css::uno::RuntimeException, std::exception) override;
+
+virtual void SAL_CALL mouseMove( const css::awt::MouseEvent & aMouseEvent )
+throw (css::uno::RuntimeException, std::exception) override;
+
 };
 
 WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt16 nCompType )

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

2015-07-14 Thread Noel Grandin

 include/toolkit/awt/scrollabledialog.hxx   |8 
 include/toolkit/awt/vclxgraphics.hxx   |2 --
 include/toolkit/awt/vclxregion.hxx |1 -
 include/toolkit/awt/vclxtopwindow.hxx  |3 +--
 include/toolkit/controls/controlmodelcontainerbase.hxx |1 -
 include/toolkit/controls/unocontrols.hxx   |2 --
 package/source/zipapi/MemoryByteGrabber.hxx|   15 ---
 toolkit/inc/helper/unowrapper.hxx  |   16 
 8 files changed, 1 insertion(+), 47 deletions(-)

New commits:
commit a792aa2c48490e43f7460c7418048d32dc891a62
Author: Noel Grandin n...@peralex.com
Date:   Tue Jul 14 10:25:32 2015 +0200

loplugin:unusedmethods toolkit,package

Change-Id: I83618cd2fd12fb0c1691dc7255fc7192e68649cd
Reviewed-on: https://gerrit.libreoffice.org/17031
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com

diff --git a/include/toolkit/awt/scrollabledialog.hxx 
b/include/toolkit/awt/scrollabledialog.hxx
index a085e65..42b70fe 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -31,13 +31,9 @@ namespace toolkit
 public:
 virtual ~ScrollableInterface() {}
 virtual voidSetScrollWidth( long nWidth ) = 0;
-virtual longGetScrollWidth() = 0;
 virtual voidSetScrollHeight( long nHeight ) = 0;
-virtual longGetScrollHeight() = 0;
 virtual voidSetScrollLeft( long nLeft ) = 0;
-virtual longGetScrollLeft() = 0;
 virtual voidSetScrollTop( long Top ) = 0;
-virtual longGetScrollTop() = 0;
 };
 
   template  class T 
@@ -61,13 +57,9 @@ namespace toolkit
 virtual ~ScrollableWrapper();
 virtual void dispose() SAL_OVERRIDE;
 virtual voidSetScrollWidth( long nWidth ) SAL_OVERRIDE;
-virtual longGetScrollWidth() SAL_OVERRIDE { return 
maScrollArea.Width(); }
 virtual voidSetScrollHeight( long nHeight ) SAL_OVERRIDE;
-virtual longGetScrollHeight() SAL_OVERRIDE { return 
maScrollArea.Height(); }
 virtual voidSetScrollLeft( long nLeft ) SAL_OVERRIDE;
-virtual longGetScrollLeft() SAL_OVERRIDE { return mnScrollPos.X(); 
}
 virtual voidSetScrollTop( long Top ) SAL_OVERRIDE;
-virtual longGetScrollTop() SAL_OVERRIDE { return mnScrollPos.Y() ; 
}
 
 void setScrollVisibility( ScrollBarVisibility rState );
 DECL_LINK( ScrollBarHdl, ScrollBar* );
diff --git a/include/toolkit/awt/vclxgraphics.hxx 
b/include/toolkit/awt/vclxgraphics.hxx
index fdd3d40..547e096 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -84,8 +84,6 @@ public:
 voidSetOutputDevice( OutputDevice* pOutDev );
 OutputDevice*   GetOutputDevice() const { return mpOutputDevice; }
 
-const vcl::Font  GetFont() const { return maFont; }
-
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any  SAL_CALL queryInterface( const 
::com::sun::star::uno::Type  rType ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 voidSAL_CALL acquire() throw() 
SAL_OVERRIDE  { OWeakObject::acquire(); }
diff --git a/include/toolkit/awt/vclxregion.hxx 
b/include/toolkit/awt/vclxregion.hxx
index 1206a4f..599b9b7 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -49,7 +49,6 @@ public:
 VCLXRegion();
 virtual ~VCLXRegion();
 
-voidSetRegion( const vcl::Region rRegion )  { maRegion = 
rRegion; }
 const vcl::Region   GetRegion() const   { return 
maRegion; }
 
 // ::com::sun::star::uno::XInterface
diff --git a/include/toolkit/awt/vclxtopwindow.hxx 
b/include/toolkit/awt/vclxtopwindow.hxx
index a8b5e2b..890d731 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -42,9 +42,8 @@ private:
 const bool  m_bWHWND;
 
 protected:
-  ::com::sun::star::uno::Reference ::com::sun::star::awt::XMenuBar 
mxMenuBar;
+::com::sun::star::uno::Reference ::com::sun::star::awt::XMenuBar 
mxMenuBar;
 
-bool isSystemDependentWindowPeer() const { return m_bWHWND; }
 
 virtual vcl::Window* GetWindowImpl() = 0;
 virtual ::cppu::OInterfaceContainerHelper GetTopWindowListenersImpl() = 0;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx 
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 0d44bc3..091a7e2 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -216,7 +216,6 @@ typedef ::cppu::AggImplInheritanceHelper3
UnoControlContainer
 
 class ControlContainerBase : public ContainerControl_IBase

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

2014-09-17 Thread Julien Nabet

 include/toolkit/controls/geometrycontrolmodel.hxx |2 +-
 sc/source/core/data/dpoutput.cxx  |2 +-
 svx/source/form/fmobj.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 40825c4369696b4f491d093d4f0218278ab5f140
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Sep 17 20:15:27 2014 +0200

Typo: excatly-exactly

Change-Id: Ica1e1399bc4a9b9ca61d09cf26e8c47e2368f644

diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx 
b/include/toolkit/controls/geometrycontrolmodel.hxx
index 903441d..3ed7791 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -96,7 +96,7 @@ namespace com { namespace sun { namespace star {
 
 /**
 @param _rxAggregateInstance
-is the object to be aggregated. Must be acquired excatly once 
(by the reference object given).br/
+is the object to be aggregated. Must be acquired exactly once 
(by the reference object given).br/
 Will be reset to NULL upon leaving
 */
 OGeometryControlModel_Base(::com::sun::star::uno::Reference 
::com::sun::star::util::XCloneable  _rxAggregateInstance);
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index eaa8fea..a110a74 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1130,7 +1130,7 @@ void ScDPOutput::Output()
 
 if (nColCount == 1  nRowCount  0  nColFieldCount == 0)
 {
-// the table contains excatly one data field and no column fields.
+// the table contains exactly one data field and no column fields.
 // Display data description at top right corner.
 ScSetStringParam aParam;
 aParam.setTextInput();
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 8b5a49e..9d92835 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -355,7 +355,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
 
 ensureModelEnv(xSourceContainer, m_xEnvironmentHistory);
 m_aEventsHistory = aEvts;
-// if we we're clone there was a call to operator=, so aEvts are 
excatly the events we need here ...
+// if we we're clone there was a call to operator=, so aEvts are 
exactly the events we need here ...
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-07 Thread Michael Stahl

 include/toolkit/helper/listenermultiplexer.hxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bb182b47ca7362b05c03d583d3547643d9a99562
Author: Michael Stahl mst...@redhat.com
Date:   Thu Aug 7 21:18:56 2014 +0200

toolkit: export some ListenerMultiplexer types

These are used from svx and apparently some (buggy?) toolchains fail with
fmgridif.cxx:: undefined reference to `non-virtual thunk
 to WindowListenerMultiplexer::acquire()'

Change-Id: Iea0a6eab1ad7f69e4a732f763bc8dbc16bf1be1c

diff --git a/include/toolkit/helper/listenermultiplexer.hxx 
b/include/toolkit/helper/listenermultiplexer.hxx
index a3de5ff..61fdbdc 100644
--- a/include/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
@@ -83,7 +83,7 @@ DECL_LISTENERMULTIPLEXER_END
 
 //  class FocusListenerMultiplexer
 
-DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, 
::com::sun::star::awt::XFocusListener )
+DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, 
::com::sun::star::awt::XFocusListener )
 void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 DECL_LISTENERMULTIPLEXER_END
@@ -92,7 +92,7 @@ DECL_LISTENERMULTIPLEXER_END
 
 //  class WindowListenerMultiplexer
 
-DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, 
::com::sun::star::awt::XWindowListener )
+DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, 
::com::sun::star::awt::XWindowListener )
 void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -112,7 +112,7 @@ DECL_LISTENERMULTIPLEXER_END
 
 //  class KeyListenerMultiplexer
 
-DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, 
::com::sun::star::awt::XKeyListener )
+DECL_LISTENERMULTIPLEXER_START_DLLPUB( KeyListenerMultiplexer, 
::com::sun::star::awt::XKeyListener )
 void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 DECL_LISTENERMULTIPLEXER_END
@@ -130,7 +130,7 @@ DECL_LISTENERMULTIPLEXER_END
 
 //  class MouseMotionListenerMultiplexer
 
-DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, 
::com::sun::star::awt::XMouseMotionListener )
+DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseMotionListenerMultiplexer, 
::com::sun::star::awt::XMouseMotionListener )
 void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 DECL_LISTENERMULTIPLEXER_END
@@ -138,7 +138,7 @@ DECL_LISTENERMULTIPLEXER_END
 
 //  class PaintListenerMultiplexer
 
-DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, 
::com::sun::star::awt::XPaintListener )
+DECL_LISTENERMULTIPLEXER_START_DLLPUB( PaintListenerMultiplexer, 
::com::sun::star::awt::XPaintListener )
 void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent e ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 DECL_LISTENERMULTIPLEXER_END
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-19 Thread Thomas Arnhold

 include/toolkit/awt/xsimpleanimation.hxx   |   70 
 include/toolkit/awt/xthrobber.hxx  |   73 -
 include/toolkit/controls/tksimpleanimation.hxx |   95 ---
 include/toolkit/controls/tkthrobber.hxx|  103 -
 4 files changed, 341 deletions(-)

New commits:
commit 07cb96a163e1551ca1357ab9e648eb24d39f8ba2
Author: Thomas Arnhold tho...@arnhold.org
Date:   Tue May 20 02:53:05 2014 +0200

remove unused header files

Change-Id: If7ec1ff0a78f9cde5ac926e92377de4720c828b2

diff --git a/include/toolkit/awt/xsimpleanimation.hxx 
b/include/toolkit/awt/xsimpleanimation.hxx
deleted file mode 100644
index b41b81d..000
--- a/include/toolkit/awt/xsimpleanimation.hxx
+++ /dev/null
@@ -1,70 +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_XSIMPLEANIMATION_HXX
-#define INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
-
-#include toolkit/awt/vclxwindow.hxx
-#include toolkit/helper/listenermultiplexer.hxx
-#include cppuhelper/implbase1.hxx
-#include comphelper/uno3.hxx
-#include com/sun/star/awt/XSimpleAnimation.hpp
-
-#include boost/scoped_ptr.hpp
-
-
-namespace toolkit
-{
-
-
-
-//= XSimpleAnimation
-
-typedef ::cppu::ImplInheritanceHelper1 VCLXWindow
-,   
::com::sun::star::awt::XSimpleAnimation
-   XSimpleAnimation_Base;
-
-class XSimpleAnimation : public XSimpleAnimation_Base
-{
-public:
-XSimpleAnimation();
-
-protected:
-~XSimpleAnimation();
-
-// XSimpleAnimation
-virtual void SAL_CALL start() throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL stop() throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setImageList( const 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference 
::com::sun::star::graphic::XGraphic   ImageList )
-throw 
(::com::sun::star::uno::RuntimeException);
-// VclWindowPeer
-virtual void SAL_CALL setProperty( const OUString PropertyName, const 
::com::sun::star::uno::Any Value ) 
throw(::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const 
OUString PropertyName ) throw(::com::sun::star::uno::RuntimeException);
-
-private:
-XSimpleAnimation( const XSimpleAnimation );// never 
implemented
-XSimpleAnimation operator=( const XSimpleAnimation ); // never 
implemented
-};
-
-
-} // namespacetoolkit
-
-
-#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/xthrobber.hxx 
b/include/toolkit/awt/xthrobber.hxx
deleted file mode 100644
index fd2959b..000
--- a/include/toolkit/awt/xthrobber.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_XTHROBBER_HXX
-#define INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
-
-#include toolkit/awt/vclxwindow.hxx
-#include toolkit/helper/listenermultiplexer.hxx
-#include cppuhelper/implbase1.hxx
-#include comphelper/uno3.hxx

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

2014-04-19 Thread Tor Lillqvist

 include/toolkit/helper/accessibilityclient.hxx|   57 ---
 include/toolkit/helper/imagealign.hxx |   53 ---
 include/toolkit/helper/tkresmgr.hxx   |   35 ---
 include/toolkit/helper/unopropertyarrayhelper.hxx |   57 ---
 include/toolkit/helper/unowrapper.hxx |   86 --
 toolkit/Library_tk.mk |1 
 toolkit/inc/helper/accessibilityclient.hxx|   57 +++
 toolkit/inc/helper/imagealign.hxx |   53 +++
 toolkit/inc/helper/tkresmgr.hxx   |   35 +++
 toolkit/inc/helper/unopropertyarrayhelper.hxx |   57 +++
 toolkit/inc/helper/unowrapper.hxx |   86 ++
 toolkit/source/awt/vclxtabpagecontainer.cxx   |3 
 toolkit/source/awt/vclxtoolkit.cxx|3 
 toolkit/source/awt/vclxwindow.cxx |5 -
 toolkit/source/awt/vclxwindows.cxx|8 +
 toolkit/source/controls/animatedimages.cxx|3 
 toolkit/source/controls/controlmodelcontainerbase.cxx |5 -
 toolkit/source/controls/dialogcontrol.cxx |3 
 toolkit/source/controls/formattedcontrol.cxx  |2 
 toolkit/source/controls/grid/gridcontrol.cxx  |3 
 toolkit/source/controls/roadmapcontrol.cxx|2 
 toolkit/source/controls/tabpagecontainer.cxx  |3 
 toolkit/source/controls/tabpagemodel.cxx  |3 
 toolkit/source/controls/tkscrollbar.cxx   |3 
 toolkit/source/controls/tkspinbutton.cxx  |3 
 toolkit/source/controls/tree/treecontrol.cxx  |3 
 toolkit/source/controls/unocontrolcontainermodel.cxx  |2 
 toolkit/source/controls/unocontrols.cxx   |5 -
 toolkit/source/helper/accessibilityclient.cxx |3 
 toolkit/source/helper/imagealign.cxx  |2 
 toolkit/source/helper/tkresmgr.cxx|3 
 toolkit/source/helper/unopropertyarrayhelper.cxx  |2 
 toolkit/source/helper/unowrapper.cxx  |3 
 33 files changed, 333 insertions(+), 316 deletions(-)

New commits:
commit 1a043545906f2b272fe80ecfa992b599284b9432
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Apr 19 11:24:35 2014 +0300

Move headers that are private to toolkit there, then

Change-Id: I12df9dc88960a6f78e85ab2f604782d1a4f9faf6

diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 0fca554..a8fbeb5 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_external,tk,boost_headers))
 
 $(eval $(call gb_Library_set_include,tk,\
 $$(INCLUDE) \
+-I$(SRCDIR)/toolkit/inc \
 -I$(SRCDIR)/toolkit/source \
 ))
 
diff --git a/include/toolkit/helper/accessibilityclient.hxx 
b/toolkit/inc/helper/accessibilityclient.hxx
similarity index 100%
rename from include/toolkit/helper/accessibilityclient.hxx
rename to toolkit/inc/helper/accessibilityclient.hxx
diff --git a/include/toolkit/helper/imagealign.hxx 
b/toolkit/inc/helper/imagealign.hxx
similarity index 100%
rename from include/toolkit/helper/imagealign.hxx
rename to toolkit/inc/helper/imagealign.hxx
diff --git a/include/toolkit/helper/tkresmgr.hxx 
b/toolkit/inc/helper/tkresmgr.hxx
similarity index 100%
rename from include/toolkit/helper/tkresmgr.hxx
rename to toolkit/inc/helper/tkresmgr.hxx
diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx 
b/toolkit/inc/helper/unopropertyarrayhelper.hxx
similarity index 100%
rename from include/toolkit/helper/unopropertyarrayhelper.hxx
rename to toolkit/inc/helper/unopropertyarrayhelper.hxx
diff --git a/include/toolkit/helper/unowrapper.hxx 
b/toolkit/inc/helper/unowrapper.hxx
similarity index 98%
rename from include/toolkit/helper/unowrapper.hxx
rename to toolkit/inc/helper/unowrapper.hxx
index b5aaa28..e62075d 100644
--- a/include/toolkit/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -24,11 +24,11 @@
 #include com/sun/star/awt/XGraphics.hpp
 #include com/sun/star/awt/XWindowPeer.hpp
 #include com/sun/star/accessibility/XAccessible.hpp
-#include toolkit/helper/accessibilityclient.hxx
 
 #include vcl/unowrap.hxx
 #include vcl/window.hxx
 
+#include helper/accessibilityclient.hxx
 
 //  class UnoWrapper
 
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 9894fbc..a876693 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -26,9 +26,10 @@
 #include vcl/svapp.hxx
 #include toolkit/helper/property.hxx
 #include toolkit/helper/vclunohelper.hxx
-#include toolkit/helper/tkresmgr.hxx
 #include cppuhelper/typeprovider.hxx
 
+#include helper/tkresmgr.hxx
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff

[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 sberg...@redhat.com
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 toolkit/dllapi.h
-#include com/sun/star/beans/PropertyValues.hpp
-#include com/sun/star/beans/XPropertySet.hpp
-#include com/sun/star/beans/PropertyValue.hpp
-#include com/sun/star/beans/PropertyState.hpp
-#include com/sun/star/beans/XPropertySetInfo.hpp
-#include toolkit/awt/vclxwindow.hxx
-#include toolkit/controls/unocontrolmodel.hxx
-#include com/sun/star/awt/tab/XTabPageModel.hpp
-#include com/sun/star/awt/tab/XTabPage.hpp
-#include cppuhelper/implbase1.hxx
-//  
-typedef ::cppu::AggImplInheritanceHelper1 UnoControlModel,
-
::com::sun::star::awt::tab::XTabPageModel
-  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

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

2014-01-22 Thread Zolnai Tamás

 include/toolkit/controls/dialogcontrol.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4aa04075fbfcecd33a5c257e69d0c5858fcfb973
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Jan 22 13:09:20 2014 +0100

Fix service name of UnoFrameControl

Change-Id: Ic213a8ac35ba7364408c52e436f052b4684be2f1

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 569edaa..f606720 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -328,7 +328,7 @@ public:
 OUString GetComponentServiceName();
 
 // ::com::sun::star::lang::XServiceInfo
-DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, 
szServiceName_UnoPageControl )
+DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, 
szServiceName_UnoFrameControl )
 };
 
 #endif // INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[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 j...@apache.org
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 
SequenceAny rArgument
 ReferenceXPropertySet 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-commits] core.git: include/toolkit

2013-10-15 Thread Stephan Bergmann

 include/toolkit/controls/unocontrols.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0d168764e0299f48ce56970092c990fd44355f8a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Oct 15 11:19:24 2013 +0200

Remove unused macro

Change-Id: I7e421004c5d9bd7682bca9b748442ce21c017823

diff --git a/include/toolkit/controls/unocontrols.hxx 
b/include/toolkit/controls/unocontrols.hxx
index c8a5d7a..1397cad 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -61,7 +61,6 @@
 #include boost/optional.hpp
 
 #define UNO_NAME_GRAPHOBJ_URLPREFIX 
vnd.sun.star.GraphicObject:
-#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  vnd.sun.star.Package:
 
 class ImageHelper
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/type_reference qadevOOo/tests svx/source toolkit/source vcl/source xmloff/source

2013-08-02 Thread Lionel Elie Mamane

 include/toolkit/awt/vclxwindows.hxx  |   20 +++---
 include/toolkit/controls/unocontrolbase.hxx  |3 +
 include/toolkit/controls/unocontrols.hxx |   20 +++---
 include/toolkit/helper/property.hxx  |6 +-
 offapi/com/sun/star/awt/XTimeField.idl   |   26 
 offapi/type_reference/offapi.rdb |binary
 qadevOOo/tests/java/ifc/awt/_XTimeField.java |4 -
 svx/source/fmcomp/gridcell.cxx   |8 +-
 svx/source/form/fmobjfac.cxx |2 
 toolkit/source/awt/vclxwindows.cxx   |   42 +++---
 toolkit/source/controls/unocontrolbase.cxx   |   55 --
 toolkit/source/controls/unocontrolmodel.cxx  |4 -
 toolkit/source/controls/unocontrols.cxx  |   26 
 toolkit/source/helper/property.cxx   |6 +-
 vcl/source/control/field2.cxx|   67 ---
 xmloff/source/forms/handler/vcl_time_handler.cxx |8 +-
 16 files changed, 151 insertions(+), 146 deletions(-)

New commits:
commit ed904af8665f6f7590fedd4ad608018f78c686c1
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Jul 28 16:08:26 2013 +0200

fdo#67235 adapt form control code to time nanosecond API change

Conflicts:
offapi/type_reference/offapi.rdb

Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805
Reviewed-on: https://gerrit.libreoffice.org/5149
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/include/toolkit/awt/vclxwindows.hxx 
b/include/toolkit/awt/vclxwindows.hxx
index f822b0c..a3a9f1b 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -1019,16 +1019,16 @@ public:
 ::com::sun::star::uno::Sequence sal_Int8  SAL_CALL 
getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
 // ::com::sun::star::awt::XTimeField
-void SAL_CALL setTime( sal_Int32 Time ) 
throw(::com::sun::star::uno::RuntimeException);
-sal_Int32 SAL_CALL getTime(  ) 
throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setMin( sal_Int32 Time ) 
throw(::com::sun::star::uno::RuntimeException);
-sal_Int32 SAL_CALL getMin(  ) 
throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setMax( sal_Int32 Time ) 
throw(::com::sun::star::uno::RuntimeException);
-sal_Int32 SAL_CALL getMax(  ) 
throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setFirst( sal_Int32 Time ) 
throw(::com::sun::star::uno::RuntimeException);
-sal_Int32 SAL_CALL getFirst(  ) 
throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setLast( sal_Int32 Time ) 
throw(::com::sun::star::uno::RuntimeException);
-sal_Int32 SAL_CALL getLast(  ) 
throw(::com::sun::star::uno::RuntimeException);
+void SAL_CALL setTime( sal_Int64 Time ) 
throw(::com::sun::star::uno::RuntimeException);
+sal_Int64 SAL_CALL getTime(  ) 
throw(::com::sun::star::uno::RuntimeException);
+void SAL_CALL setMin( sal_Int64 Time ) 
throw(::com::sun::star::uno::RuntimeException);
+sal_Int64 SAL_CALL getMin(  ) 
throw(::com::sun::star::uno::RuntimeException);
+void SAL_CALL setMax( sal_Int64 Time ) 
throw(::com::sun::star::uno::RuntimeException);
+sal_Int64 SAL_CALL getMax(  ) 
throw(::com::sun::star::uno::RuntimeException);
+void SAL_CALL setFirst( sal_Int64 Time ) 
throw(::com::sun::star::uno::RuntimeException);
+sal_Int64 SAL_CALL getFirst(  ) 
throw(::com::sun::star::uno::RuntimeException);
+void SAL_CALL setLast( sal_Int64 Time ) 
throw(::com::sun::star::uno::RuntimeException);
+sal_Int64 SAL_CALL getLast(  ) 
throw(::com::sun::star::uno::RuntimeException);
 void SAL_CALL setEmpty(  ) throw(::com::sun::star::uno::RuntimeException);
 sal_Bool SAL_CALL isEmpty(  ) 
throw(::com::sun::star::uno::RuntimeException);
 void SAL_CALL setStrictFormat( sal_Bool bStrict ) 
throw(::com::sun::star::uno::RuntimeException);
diff --git a/include/toolkit/controls/unocontrolbase.hxx 
b/include/toolkit/controls/unocontrolbase.hxx
index 30f1bf6..1fa03a8 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -39,9 +39,12 @@ protected:
 voidImplSetPropertyValues( const 
::com::sun::star::uno::Sequence OUString  aPropertyNames, const 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any  aValues, 
sal_Bool bUpdateThis );
 ::com::sun::star::uno::Any  ImplGetPropertyValue( const OUString 
aPropertyName );
 
+template typename T T ImplGetPropertyValuePOD( sal_uInt16 nProp );
+template typename T T ImplGetPropertyValueClass( sal_uInt16 nProp );
 sal_BoolImplGetPropertyValue_BOOL( sal_uInt16 nProp );
 sal_Int16   ImplGetPropertyValue_INT16( sal_uInt16 nProp );
 sal_Int32   ImplGetPropertyValue_INT32( sal_uInt16 nProp );
+sal_Int64

[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc toolkit/Library_tk.mk toolkit/qa toolkit/source toolkit/util

2013-07-05 Thread Ariel Constenla-Haile

 include/toolkit/helper/servicenames.hxx
  |2 
 offapi/UnoApi_offapi.mk
  |3 
 offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl  
  |   48 --
 offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl 
  |   47 --
 offapi/com/sun/star/awt/WindowDescriptor.idl   
  |1 
 offapi/com/sun/star/awt/XSimpleAnimation.idl   
  |   45 --
 
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv 
 |   36 -
 
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv
 |   29 -
 toolkit/Library_tk.mk  
  |2 
 toolkit/qa/unoapi/knownissues.xcl  
  |   11 
 toolkit/qa/unoapi/toolkit.sce  
  |2 
 toolkit/source/awt/vclxtoolkit.cxx 
  |   11 
 toolkit/source/awt/xsimpleanimation.cxx
  |  142 ---
 toolkit/source/controls/tksimpleanimation.cxx  
  |  183 --
 toolkit/source/helper/registerservices.cxx 
  |5 
 toolkit/source/helper/servicenames.cxx 
  |2 
 toolkit/util/tk.component  
  |8 
 17 files changed, 1 insertion(+), 576 deletions(-)

New commits:
commit 303096c50c850b05a158a1a429c9fd5d0251a892
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Thu Dec 20 03:56:35 2012 +

Related: #i121514# Remove deprecated UnoControlSimpleAnimation

(cherry picked from commit 514bb6777e001d02dbd9be63fc7a6187560aad63)

Conflicts:
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
offapi/com/sun/star/awt/XSimpleAnimation.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/controls/tksimpleanimation.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/util/toolkit.xml

Change-Id: If7f8de62713e28434e28975026cf8e5c66c831aa

diff --git a/include/toolkit/helper/servicenames.hxx 
b/include/toolkit/helper/servicenames.hxx
index 32b964a..fffdc16 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -97,8 +97,6 @@ extern const sal_Char szServiceName_DefaultGridColumnModel[];
 extern const sal_Char szServiceName_GridColumn[];
 extern const sal_Char szServiceName_SortableGridDataModel[];
 
-extern const sal_Char szServiceName_UnoSimpleAnimationControl[], 
szServiceName2_UnoSimpleAnimationControl[];
-extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], 
szServiceName2_UnoSimpleAnimationControlModel[];
 extern const sal_Char szServiceName_AnimatedImagesControl[];
 extern const sal_Char szServiceName_AnimatedImagesControlModel[];
 extern const sal_Char szServiceName_SpinningProgressControlModel[];
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index ad51c73..c743345 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -573,8 +573,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
UnoControlRoadmapModel \
UnoControlScrollBar \
UnoControlScrollBarModel \
-   UnoControlSimpleAnimation \
-   UnoControlSimpleAnimationModel \
UnoControlSpinButton \
UnoControlSpinButtonModel \
UnoControlTimeField \
@@ -1853,7 +1851,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
XRequestCallback \
XReschedule \
XScrollBar \
-   XSimpleAnimation \
XSimpleTabController \
XSpinField \
XSpinListener \
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl 
b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
deleted file mode 100644
index 94bcf2f..000
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ /dev/null
@@ -1,48 +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

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

2013-05-23 Thread Noel Grandin

 include/toolkit/controls/dialogcontrol.hxx   |3 ---
 offapi/com/sun/star/awt/XUnoControlDialogModel.idl   |3 ---
 offapi/com/sun/star/resource/XStringResourceManager.idl  |2 +-
 offapi/com/sun/star/resource/XStringResourceResolver.idl |2 +-
 scripting/source/dlgprov/dlgprov.cxx |6 +-
 toolkit/source/controls/dialogcontrol.cxx|8 
 6 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 2ce6828bbbf6ba181bb2276adeec279e74151ef6
Author: Noel Grandin n...@peralex.com
Date:   Thu May 23 16:38:15 2013 +0200

fix awt::UnoControlModelDialog crash

...in commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654,
Convert awt::UnoControlDialogModel to new style
I added an attribute ResourceResolver because some of the client
code was setting it using the property interface.

It turns out that this was a bad idea because the ResourceResolver
property is doing some very interesting stuff, so revert that part
of the change.

Change-Id: I62b890e60164e005867ced49c3e407a49ed09441
Reviewed-on: https://gerrit.libreoffice.org/4013
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index f92652a..a749c24 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -166,9 +166,6 @@ public:
{ return getPropertyString(ImageURL); }
 virtual void SAL_CALL setImageURL(const rtl::OUString p1) 
throw(::com::sun::star::uno::RuntimeException)
{ setPropertyString(ImageURL, p1); }
-virtual 
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager
 SAL_CALL getResourceResolver() throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setResourceResolver(const 
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager
 p1) throw(::com::sun::star::uno::RuntimeException)
-{ setPropertyValue( ResourceResolver, css::uno::Any(p1) ); }
 virtual com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor() 
throw(::com::sun::star::uno::RuntimeException);
 virtual void SAL_CALL setFontDescriptor(const 
com::sun::star::awt::FontDescriptor p1) 
throw(::com::sun::star::uno::RuntimeException)
 { setPropertyValue( FontDescriptor, css::uno::Any(p1) ); }
diff --git a/offapi/com/sun/star/awt/XUnoControlDialogModel.idl 
b/offapi/com/sun/star/awt/XUnoControlDialogModel.idl
index 81cd2b1..9032a37 100644
--- a/offapi/com/sun/star/awt/XUnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/XUnoControlDialogModel.idl
@@ -28,7 +28,6 @@
 #include com/sun/star/lang/XMultiServiceFactory.idl
 #include com/sun/star/util/Color.idl
 #include com/sun/star/graphic/XGraphic.idl
-#include com/sun/star/resource/XStringResourceManager.idl
 
 
 module com {  module sun {  module star {  module awt {
@@ -67,8 +66,6 @@ published interface XUnoControlDialogModel
 
 [attribute] string DialogSourceURL;
 
-[attribute] com::sun::star::resource::XStringResourceManager 
ResourceResolver;
-
 /** specifies the text that is displayed in the caption bar of the dialog.
  */
 [attribute] string Title;
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl 
b/offapi/com/sun/star/resource/XStringResourceManager.idl
index 423bedf..ad9a8f3 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module resource {
 localized dialogs.
 
 */
-published interface XStringResourceManager: 
com::sun::star::resource::XStringResourceResolver
+interface XStringResourceManager: 
com::sun::star::resource::XStringResourceResolver
 {
 /**
 Returns the resource's read only state
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl 
b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index 49bd841..d236f0d 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module resource {
 But also changing the locale at runtime can be supported in this way.
 
 */
-published interface XStringResourceResolver: 
com::sun::star::util::XModifyBroadcaster
+interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 {
 /**
 Resolves the passed ResoureID for the current locale. This
diff --git a/scripting/source/dlgprov/dlgprov.cxx 
b/scripting/source/dlgprov/dlgprov.cxx
index 8722a47..8c645a3 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -88,6 +88,8 @@ namespace dlgprov
 {
 //.
 
+static OUString

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

2013-05-22 Thread Stephan Bergmann

 include/toolkit/controls/dialogcontrol.hxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 697a007c61b9cabceb9767fad87cd5822b300452
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 12:32:46 2013 +0200

Fix exception specifications

Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 812bb3d..f92652a 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -178,21 +178,21 @@ public:
 
 
 // overrides to resolve ambiguity
-virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const 
rtl::OUString p1) throw (::com::sun::star::uno::RuntimeException)
+virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const 
rtl::OUString p1) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::getPropertyValue(p1); }
-virtual void SAL_CALL setPropertyValue(const OUString p1, const 
com::sun::star::uno::Any p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL setPropertyValue(const OUString p1, const 
com::sun::star::uno::Any p2) throw 
(com::sun::star::beans::UnknownPropertyException, 
com::sun::star::beans::PropertyVetoException, 
com::sun::star::lang::IllegalArgumentException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::setPropertyValue(p1, 
p2); }
-virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::addPropertyChangeListener(p1,
 p2); }
-virtual void SAL_CALL removePropertyChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL removePropertyChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::removePropertyChangeListener(p1,
 p2); }
-virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::addVetoableChangeListener(p1,
 p2); }
-virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::removeVetoableChangeListener(p1,
 p2); }
-virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstance(const OUString p1) throw 
(::com::sun::star::uno::RuntimeException)
+virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstance(const OUString p1) throw 
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::createInstance(p1); }
-virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstanceWithArguments(const OUString p1, const 
com::sun::star::uno::Sequencecom::sun::star::uno::Any p2) throw 
(::com::sun::star::uno::RuntimeException)
+virtual

[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/UnoApi_offapi.mk toolkit/source

2013-05-18 Thread Caolán McNamara

 include/toolkit/awt/vclxprinter.hxx   |   24 
 offapi/UnoApi_offapi.mk   |1 +
 offapi/com/sun/star/awt/PrinterServer.idl |   28 
 toolkit/source/awt/vclxprinter.cxx|   13 -
 4 files changed, 37 insertions(+), 29 deletions(-)

New commits:
commit 5ade04867f280b18dfbfb7e60568ed58b32d6bbc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sat May 18 12:38:01 2013 +0100

Resolves: #i87883# add a PrinterServer.idl and fix impl

Change-Id: Id351109616737f916d7f4c2715347daa23367281

diff --git a/include/toolkit/awt/vclxprinter.hxx 
b/include/toolkit/awt/vclxprinter.hxx
index ca14b2d..a3aca63 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -25,11 +25,15 @@
 #include com/sun/star/awt/XPrinter.hpp
 #include com/sun/star/awt/XPrinterServer.hpp
 #include com/sun/star/awt/XInfoPrinter.hpp
+#include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/lang/XTypeProvider.hpp
+#include cppuhelper/implbase2.hxx
 #include cppuhelper/weak.hxx
 #include osl/mutex.hxx
 
+#include toolkit/helper/macros.hxx
 #include toolkit/helper/mutexandbroadcasthelper.hxx
+#include toolkit/helper/servicenames.hxx
 #include cppuhelper/propshlp.hxx
 
 #include vcl/oldprintadaptor.hxx
@@ -190,29 +194,17 @@ public:
 //  class VCLXPrinterServer
 //  
 
-class VCLXPrinterServer :   public ::com::sun::star::awt::XPrinterServer,
-public ::com::sun::star::lang::XTypeProvider,
-public ::cppu::OWeakObject
+class VCLXPrinterServer : public 
::cppu::WeakImplHelper2com::sun::star::awt::XPrinterServer,
+com::sun::star::lang::XServiceInfo
 {
 public:
-
-// ::com::sun::star::uno::XInterface
-::com::sun::star::uno::Any  SAL_CALL queryInterface( const 
::com::sun::star::uno::Type  rType ) 
throw(::com::sun::star::uno::RuntimeException);
-voidSAL_CALL acquire() throw()  { 
OWeakObject::acquire(); }
-voidSAL_CALL release() throw()  { 
OWeakObject::release(); }
-
-// ::com::sun::star::lang::XTypeProvider
-::com::sun::star::uno::Sequence ::com::sun::star::uno::Type   SAL_CALL 
getTypes() throw(::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence sal_Int8  SAL_CALL 
getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-
 // ::com::sun::star::awt::XPrinterServer
 ::com::sun::star::uno::Sequence OUString  SAL_CALL getPrinterNames(  ) 
throw(::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference ::com::sun::star::awt::XPrinter  
SAL_CALL createPrinter( const OUString printerName ) 
throw(::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference ::com::sun::star::awt::XInfoPrinter  
SAL_CALL createInfoPrinter( const OUString printerName ) 
throw(::com::sun::star::uno::RuntimeException);
-};
-
-
 
+DECLIMPL_SERVICEINFO(VCLXPrinterServer, szServiceName2_PrinterServer);
+};
 
 #endif // _TOOLKIT_AWT_VCLXPRINTER_HXX_
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b73b86a..a3772e0 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1744,6 +1744,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
PopupMenuDirection \
PosSize \
PrinterException \
+   PrinterServer \
PushButtonType \
RasterOperation \
Rectangle \
diff --git a/offapi/com/sun/star/awt/PrinterServer.idl 
b/offapi/com/sun/star/awt/PrinterServer.idl
new file mode 100644
index 000..e323939
--- /dev/null
+++ b/offapi/com/sun/star/awt/PrinterServer.idl
@@ -0,0 +1,28 @@
+/* -*- 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/.
+ */
+
+#ifndef __com_sun_star_awt_PrinterServer_idl__
+#define __com_sun_star_awt_PrinterServer_idl__
+
+#include com/sun/star/awt/XPrinterServer.idl
+
+module com {  module sun {  module star {  module awt {
+
+/** mechanism to discover and manage printers
+ */
+service PrinterServer
+{
+interface com::sun::star::awt::XPrinterServer;
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxprinter.cxx 
b/toolkit/source/awt/vclxprinter.cxx
index a682157..60ef231 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -406,19 +406,6 @@ IMPL_XTYPEPROVIDER_END
 //  class VCLXPrinterServer
 //  
 
-// ::com::sun::star::uno::XInterface

66 matches

Mail list logo