[Libreoffice-commits] core.git: 3 commits - accessibility/Library_acc.mk include/toolkit Makefile.in toolkit/Library_tk.mk toolkit/source xmloff/inc xmloff/source
Noel Grandin
noel at peralex.com
Mon Jul 7 23:57:48 PDT 2014
Makefile.in | 7 ++++-
accessibility/Library_acc.mk | 1
include/toolkit/helper/accessiblefactory.hxx | 6 ++--
toolkit/Library_tk.mk | 1
toolkit/source/helper/accessibilityclient.cxx | 25 ------------------
xmloff/inc/forms/property_handler.hxx | 3 +-
xmloff/source/forms/handler/property_handler_base.cxx | 13 ---------
xmloff/source/forms/handler/property_handler_base.hxx | 14 ----------
8 files changed, 14 insertions(+), 56 deletions(-)
New commits:
commit ea91310384f2f677abc8e85ece54e71fba26ed0c
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 7 10:55:06 2014 +0200
use SimpleReferenceObject in accessibility
to replace hand-rolled version
Change-Id: I9dd8d02024702972722b43f2654db91eb3da3794
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index a2b66cd..4b5a10b 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,acc,\
cppu \
cppuhelper \
sal \
+ salhelper \
i18nlangtag \
sot \
svl \
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 6428a10..bcd3dce 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
#include <com/sun/star/uno/Reference.hxx>
-
#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessible;
@@ -58,7 +58,7 @@ namespace toolkit
//= IAccessibleFactory
- class IAccessibleFactory : public ::rtl::IReference
+ class IAccessibleFactory : public salhelper::SimpleReferenceObject
{
public:
/** creates an accessible context for a button window
@@ -122,7 +122,7 @@ namespace toolkit
createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar ) = 0;
protected:
- ~IAccessibleFactory() {}
+ virtual ~IAccessibleFactory() {}
};
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 9c2410e..5a219e0 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,tk,\
cppu \
cppuhelper \
sal \
+ salhelper \
i18nlangtag \
tl \
utl \
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 41ad0a2..7dc3794 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -58,14 +58,7 @@ namespace toolkit
protected:
virtual ~AccessibleDummyFactory();
- private:
- oslInterlockedCount m_refCount;
-
public:
- // IReference
- virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
- virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
// IAccessibleFactory
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
createAccessibleContext( VCLXButton* /*_pXWindow*/ ) SAL_OVERRIDE
@@ -131,7 +124,6 @@ namespace toolkit
AccessibleDummyFactory::AccessibleDummyFactory()
- : m_refCount(0)
{
}
@@ -141,23 +133,6 @@ namespace toolkit
}
- oslInterlockedCount SAL_CALL AccessibleDummyFactory::acquire()
- {
- return osl_atomic_increment( &m_refCount );
- }
-
-
- oslInterlockedCount SAL_CALL AccessibleDummyFactory::release()
- {
- if ( 0 == osl_atomic_decrement( &m_refCount ) )
- {
- delete this;
- return 0;
- }
- return m_refCount;
- }
-
-
//= AccessibilityClient
commit 623893427221bdab2f5c7339dd152e371132d83e
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 7 09:52:35 2014 +0200
use SimpleReferenceObject in xmloff module
to replace hand-rolled version
Change-Id: I36d4ce14d0c0c8a4b224a240c6e25c8df99b78aa
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index 25ce31c..48658f1 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <map>
#include <vector>
@@ -35,7 +36,7 @@ namespace xmloff
typedef ::std::map< PropertyId, ::com::sun::star::uno::Any > PropertyValues;
//= IPropertyHandler
- class IPropertyHandler : public ::rtl::IReference
+ class IPropertyHandler : public ::salhelper::SimpleReferenceObject
{
public:
/** retrieves the XML attribute value for the given property values
diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx
index e92b16b..ea8f16b 100644
--- a/xmloff/source/forms/handler/property_handler_base.cxx
+++ b/xmloff/source/forms/handler/property_handler_base.cxx
@@ -27,19 +27,6 @@ namespace xmloff
{
}
- oslInterlockedCount SAL_CALL PropertyHandlerBase::acquire()
- {
- return osl_atomic_increment( &m_refCount );
- }
-
- oslInterlockedCount SAL_CALL PropertyHandlerBase::release()
- {
- oslInterlockedCount decremented = osl_atomic_decrement( &m_refCount );
- if ( 0 == decremented )
- delete this;
- return decremented;
- }
-
} // namespace xmloff
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
index 48f380f..0cf4d0d 100644
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -22,8 +22,6 @@
#include "forms/property_handler.hxx"
-#include <osl/interlck.h>
-
namespace xmloff
{
@@ -31,19 +29,9 @@ namespace xmloff
class PropertyHandlerBase : public IPropertyHandler
{
protected:
- PropertyHandlerBase()
- :m_refCount( 0 )
- {
- }
+ PropertyHandlerBase() {}
virtual ~PropertyHandlerBase();
-
- // IReference
- virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
- virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
- private:
- oslInterlockedCount m_refCount;
};
} // namespace xmloff
commit 065d6cc3f3a139e24eb43422344e22b836063a86
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 7 14:29:05 2014 +0200
create a new top-level makefile target "clean.internal"
so I can clean just the non-external stuff when re-running my
clang plugins
Change-Id: I251ceba7e57454a91da5b1082192bb2d211e5406
diff --git a/Makefile.in b/Makefile.in
index 79ee758..381e270 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo internal.clean
MAKECMDGOALS?=all
build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -80,6 +80,11 @@ endef
gbuild_modules := $(patsubst $(SRCDIR)/%/,%,$(dir $(wildcard $(SRCDIR)/*/Module_*.mk $(SRCDIR)/external/*/Module_*.mk)))
+gbuild_internal_modules := $(filter-out odk external,$(patsubst $(SRCDIR)/%/,%,$(dir $(wildcard $(SRCDIR)/*/Module_*.mk))))
+
+internal.clean: $(addsuffix .clean,$(gbuild_internal_modules))
+
+
$(eval $(call gb_Top_GbuildModulesRules,$(gbuild_modules)))
gbuild_TARGETS := AllLangHelp \
More information about the Libreoffice-commits
mailing list