[Libreoffice-commits] .: 6 commits - comphelper/inc comphelper/source connectivity/inc cppuhelper/inc cppuhelper/source moz/extractfiles.mk moz/makefile.mk moz/seamonkey-source-1.1.14.patch officecfg/registry solenv/inc
Lionel Elie Mamane
lmamane at kemper.freedesktop.org
Wed Sep 7 02:27:52 PDT 2011
comphelper/inc/comphelper/propstate.hxx | 4
comphelper/source/property/propstate.cxx | 4
connectivity/inc/connectivity/dbmetadata.hxx | 2
cppuhelper/inc/cppuhelper/propshlp.hxx | 67 +++-
cppuhelper/source/gcc3.map | 15 -
cppuhelper/source/msvc_win32_intel.map | 5
cppuhelper/source/propshlp.cxx | 42 ++
moz/extractfiles.mk | 14
moz/makefile.mk | 2
moz/seamonkey-source-1.1.14.patch | 141 ++++++++++
officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs | 2
solenv/inc/tg_ext.mk | 8
12 files changed, 253 insertions(+), 53 deletions(-)
New commits:
commit 1ecbb35482d3ff318a680e0bd4dbf84568f8d1cd
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Wed Sep 7 11:15:16 2011 +0200
typo
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index a29bf76..5768729 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -208,7 +208,7 @@
</info>
<prop oor:name="CreateLocalDatabase" oor:type="xs:boolean">
<info>
- <desc>Specifies that the user is able to creatte new local database documents in the "Create Database" wizard.</desc>
+ <desc>Specifies that the user is able to create new local database documents in the "Create Database" wizard.</desc>
</info>
<value>true</value>
</prop>
commit ca3df6a1b18c146c86ff9ec8d7e3d993873586e3
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Wed Sep 7 11:14:46 2011 +0200
shouldEscapeDateTime() controls ODBC syntax for date literals, not ## format
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 6300652..e1a7bfc 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -145,7 +145,7 @@ namespace dbtools
*/
bool generateASBeforeCorrelationName() const;
- /** should date time be escaped like '2001-01-01' => #2001-01-01#
+ /** should date time be escaped like '2001-01-01' => {D '2001-01-01' }
*/
bool shouldEscapeDateTime() const;
commit be8d553b9bde0dc5791b9a153dbc0128a34e39d7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Wed Sep 7 11:12:38 2011 +0200
use MKDIRHIER instead of MKDIR to avoid bogus error messages
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index 57b53a8..1a8b80d 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -279,14 +279,14 @@ extract_mozab_files: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) \
$(MISC)$/build$/so_moz_lib_files
make_temp_dir:
- @@-$(MKDIR) $(RUNTIME_DIR)
- @@-$(MKDIR) $(RUNTIME_DIR)$/components
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults$/pref
- @@-$(MKDIR) $(LIB_DIR)
- @@-$(MKDIR) $(INCLUDE_DIR)
+ @@-$(MKDIRHIER) $(RUNTIME_DIR)
+ @@-$(MKDIRHIER) $(RUNTIME_DIR)$/components
+ @@-$(MKDIRHIER) $(RUNTIME_DIR)$/defaults
+ @@-$(MKDIRHIER) $(RUNTIME_DIR)$/defaults$/pref
+ @@-$(MKDIRHIER) $(LIB_DIR)
+ @@-$(MKDIRHIER) $(INCLUDE_DIR)
.IF "$(OS)"=="SOLARIS"
- @@-$(MKDIR) $(RUNTIME_DIR)$/res
+ @@-$(MKDIRHIER) $(RUNTIME_DIR)$/res
.ENDIF
$(OUT)$/bin$/mozruntime.zip: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a421777..2afebe5 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -226,7 +226,7 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
.IF "$(CONFIGURE_ACTION)" == "none" || "$(CONFIGURE_ACTION)"==""
$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
.ELSE # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
- $(COMMAND_ECHO)-$(MKDIR) $(P_CONFIGURE_DIR)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(P_CONFIGURE_DIR)
$(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE)
$(COMMAND_ECHO)mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
.ENDIF # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
@@ -237,7 +237,7 @@ $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
.IF "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
.ELSE # "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
- $(COMMAND_ECHO)-$(MKDIR) $(P_BUILD_DIR)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(P_BUILD_DIR)
$(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE)
.ENDIF # "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
@@ -246,8 +246,8 @@ $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
.IF "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"==""
$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
.ELSE # "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"==""
- $(COMMAND_ECHO)-$(MKDIR) $(P_INSTALL_DIR)
- $(COMMAND_ECHO)-$(MKDIR) $(P_INSTALL_TARGET_DIR)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(P_INSTALL_DIR)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(P_INSTALL_TARGET_DIR)
$(COMMAND_ECHO)cd $(P_INSTALL_DIR) && $(INSTALL_ACTION) $(INSTALL_FLAGS) && $(TOUCH) $(INSTALL_FLAG_FILE)
$(COMMAND_ECHO)mv $(P_INSTALL_DIR)/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
.ENDIF # "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"==""
commit 34a3046698890676d492d46dfb628d51eb823395
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Wed Sep 7 11:11:18 2011 +0200
moz ldap libraries: don't need LIBDIR to exist
diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
index db62e8b..248ee65 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -6352,3 +6352,144 @@
+PROCESS_MAP_FILE = grep -v ';-' $< | \
+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in 2006-02-03 15:44:41.000000000 +0100
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in 2011-09-07 10:45:16.000000000 +0200
+@@ -89,12 +89,9 @@
+ -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBIUTIL)
++export:: $(OBJDEST) $(OBJS) $(LIBIUTIL)
+
+-$(LIBDIR):
+- $(MKDIR) $(LIBDIR)
+-
+-$(LIBIUTIL): $(OBJS) $(LIBDIR)
++$(LIBIUTIL): $(OBJS)
+ @echo ======= making $(LIBIUTIL)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in 2006-02-03 15:44:41.000000000 +0100
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in 2011-09-07 10:45:02.000000000 +0200
+@@ -79,12 +79,9 @@
+ -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLBER)
++export:: $(OBJDEST) $(OBJS) $(LIBLBER)
+
+-$(LIBDIR):
+- $(MKDIR) $(LIBDIR)
+-
+-$(LIBLBER): $(OBJS) $(LIBDIR)
++$(LIBLBER): $(OBJS)
+ @echo ======= making $(LIBLBER)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2011-09-07 10:53:57.000000000 +0200
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2011-09-07 10:44:45.000000000 +0200
+@@ -279,13 +279,13 @@
+ < Version.c > $@)
+
+ # Set the default sources for the export target
+-EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(LIBLDAP) $(DLLLDAP)
++EXPDEPS = $(OBJDIR_NAME) $(OBJS) $(LIBLDAP) $(DLLLDAP)
+ # Remove the LIB source if on win32 and using MSVC
+ # This avoids problems with -jX builds where 'link' will make both the
+ # .dll and .lib files in one pass
+ ifeq ($(OS_ARCH), WINNT)
+ ifeq ($(LD),link)
+-EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(DLLLDAP)
++EXPDEPS = $(OBJDIR_NAME) $(OBJS) $(DLLLDAP)
+ endif
+ endif
+
+@@ -294,10 +294,7 @@
+ ltest:: $(LIBLDAP) test.o
+ $(LINK_EXE) test.o
+
+-$(LIBDIR):
+- $(MKDIR) $(LIBDIR)
+-
+-$(LIBLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
++$(LIBLDAP): $(OBJS) $(LDAP_EXPORT_DEFS)
+ @echo ======= making $(LIBLDAP)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+@@ -314,7 +311,7 @@
+ endif
+ endif
+
+-$(DLLLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
++$(DLLLDAP): $(OBJS) $(LDAP_EXPORT_DEFS)
+ @echo ======= making $(DLLLDAP)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in 2006-02-03 15:44:49.000000000 +0100
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in 2011-09-07 10:44:15.000000000 +0200
+@@ -77,12 +77,9 @@
+ -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export:: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLDIF)
++export:: $(OBJDEST) $(OBJS) $(LIBLDIF)
+
+-$(LIBDIR):
+- $(MKDIR) $(LIBDIR)
+-
+-$(LIBLDIF): $(OBJS) $(LIBDIR)
++$(LIBLDIF): $(OBJS)
+ @echo ======= making $(LIBLDIF)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2011-09-07 10:53:57.000000000 +0200
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2011-09-07 10:43:59.000000000 +0200
+@@ -201,12 +201,9 @@
+ -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export:: $(OBJDEST) $(LIBDIR) $(OBJS) $(DLLPRLDAP)
++export:: $(OBJDEST) $(OBJS) $(DLLPRLDAP)
+
+-$(LIBDIR):
+- $(MKDIR) $(LIBDIR)
+-
+-$(LIBPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
++$(LIBPRLDAP): $(OBJS) $(PRLDAP_EXPORT_DEFS)
+ @echo ======= making $(LIBPRLDAP)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+@@ -219,7 +216,7 @@
+ $(LINK_LIB) $(EXTRA_LIBS)
+ endif
+
+-$(DLLPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
++$(DLLPRLDAP): $(OBJS) $(PRLDAP_EXPORT_DEFS)
+ @echo ======= making $(DLLPRLDAP)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 2011-09-07 10:53:57.000000000 +0200
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 2011-09-07 10:42:48.000000000 +0200
+@@ -214,19 +214,16 @@
+ -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export:: $(OBJDEST) $(LIBDIR) $(OBJS) $(DLLSSLDAP)
++export:: $(OBJDEST) $(OBJS) $(DLLSSLDAP)
+
+-$(LIBDIR):
+- $(MKDIR) $(LIBDIR)
+-
+-$(LIBSSLDAP): $(OBJS) $(LIBDIR) $(SSLDAP_EXPORT_DEFS)
++$(LIBSSLDAP): $(OBJS) $(SSLDAP_EXPORT_DEFS)
+ @echo ======= making $(LIBSSLDAP)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+ endif
+ $(LINK_LIB) $(EXTRA_LIBS)
+
+-$(DLLSSLDAP): $(OBJS) $(LIBDIR) $(SSLDAP_EXPORT_DEFS)
++$(DLLSSLDAP): $(OBJS) $(SSLDAP_EXPORT_DEFS)
+ @echo ======= making $(DLLSSLDAP)
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
commit d37a57326a4c9a545ee55f42049883d39ba38eac
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Wed Sep 7 11:10:37 2011 +0200
moz: do not try to get into non-existent directory and ignore error
diff --git a/moz/makefile.mk b/moz/makefile.mk
index f41743e..94e942f 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -184,7 +184,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch
CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
-BUILD_ACTION:=cd mozilla/X_objdir/xpcom ; $(GNUMAKE) -j$(EXTMAXPROCESS)
+BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
.IF "$(GUI)"=="UNX"
.IF "$(COMNAME)"=="sunpro5"
commit 5c64fd7ce04ff82edb2989d862bd660c9b9492a5
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Fri Sep 2 14:57:30 2011 +0200
Restore ABI compatibility with LO 3.4 and earlier
Factor out ABI-breaking changes to OPropertySetHelper into a derived
class OPropertySetHelper2.
Only gcc3.map is up-to-date.
diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx
index 2c8f06f..b99f75f 100644
--- a/comphelper/inc/comphelper/propstate.hxx
+++ b/comphelper/inc/comphelper/propstate.hxx
@@ -54,11 +54,11 @@ namespace comphelper
//= OPropertyStateHelper
//==================================================================
/// helper class for implementing property states
- class COMPHELPER_DLLPUBLIC OPropertyStateHelper :public ::cppu::OPropertySetHelper
+ class COMPHELPER_DLLPUBLIC OPropertyStateHelper :public ::cppu::OPropertySetHelper2
,public ::com::sun::star::beans::XPropertyState
{
public:
- OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp):OPropertySetHelper(rBHlp) { }
+ OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp):OPropertySetHelper2(rBHlp) { }
OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp,
::cppu::IEventNotificationHook *i_pFireEvents);
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index ec621cb..3859f6a 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -57,7 +57,7 @@ namespace comphelper
//---------------------------------------------------------------------
::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException)
{
- ::com::sun::star::uno::Any aReturn = OPropertySetHelper::queryInterface(_rType);
+ ::com::sun::star::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType);
// our own ifaces
if ( !aReturn.hasValue() )
aReturn = ::cppu::queryInterface(_rType, static_cast< ::com::sun::star::beans::XPropertyState*>(this));
@@ -82,7 +82,7 @@ namespace comphelper
OPropertyStateHelper::OPropertyStateHelper(
::cppu::OBroadcastHelper& rBHlp,
::cppu::IEventNotificationHook *i_pFireEvents)
- : ::cppu::OPropertySetHelper(rBHlp, i_pFireEvents) { }
+ : ::cppu::OPropertySetHelper2(rBHlp, i_pFireEvents) { }
OPropertyStateHelper::~OPropertyStateHelper() {}
diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index 670ce03..f8237da 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -351,8 +351,7 @@ public:
*/
class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet,
public ::com::sun::star::beans::XFastPropertySet,
- public ::com::sun::star::beans::XPropertySet,
- public ::com::sun::star::beans::XPropertySetOption
+ public ::com::sun::star::beans::XPropertySet
{
public:
/**
@@ -372,11 +371,12 @@ public:
of this object. Stored in the variable rBHelper.
@param bIgnoreRuntimeExceptionsWhileFiring
- indicates whether occuring RuntimeExceptions will be
- ignored when firing notifications (vetoableChange((),
- propertyChange()) to listeners.
+ indicates whether occurring RuntimeExceptions will be
+ ignored when firing notifications
+ (vetoableChange(), propertyChange())
+ to listeners.
PropertyVetoExceptions may still be thrown.
- This flag is useful in a inter-process scenarios when
+ This flag is useful in an inter-process scenario when
remote bridges may break down
(firing DisposedExceptions).
*/
@@ -395,11 +395,12 @@ public:
additional event notifier
@param bIgnoreRuntimeExceptionsWhileFiring
- indicates whether occuring RuntimeExceptions will be
- ignored when firing notifications (vetoableChange((),
- propertyChange()) to listeners.
+ indicates whether occurring RuntimeExceptions will be
+ ignored when firing notifications
+ (vetoableChange(), propertyChange())
+ to listeners.
PropertyVetoExceptions may still be thrown.
- This flag is useful in a inter-process scenarios when
+ This flag is useful in an inter-process scenario when
remote bridges may break down
(firing DisposedExceptions).
*/
@@ -412,7 +413,7 @@ public:
Only returns a reference to XMultiPropertySet, XFastPropertySet, XPropertySet and
XEventListener.
*/
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
throw (::com::sun::star::uno::RuntimeException);
/** eases implementing XTypeProvider::getTypes, returns the types of XMultiPropertySet, XFastPropertySet, XPropertySet
@@ -506,10 +507,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > & Listener )
throw(::com::sun::star::uno::RuntimeException);
- // XPropertySetOption
- virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable )
- throw(::com::sun::star::uno::RuntimeException);
-
/**
The property sequence is created in the call. The interface isn't used after the call.
*/
@@ -637,8 +634,6 @@ protected:
*/
OMultiTypeInterfaceContainerHelperInt32 aVetoableLC;
- bool m_bFireEvent;
-
class Impl;
/** reserved for future use. finally, the future has arrived...
@@ -676,6 +671,44 @@ public:
#pragma warning(pop)
#endif
+/**
+ OPropertySetHelper plus XPropertySetOption
+ */
+class OPropertySetHelper2 : public OPropertySetHelper,
+ public ::com::sun::star::beans::XPropertySetOption
+{
+public:
+ /** Constructor.
+
+ See OPropertySetHelper constructors documentation
+ */
+ explicit OPropertySetHelper2(
+ OBroadcastHelper & rBHelper,
+ IEventNotificationHook *i_pFireEvents = NULL,
+ bool bIgnoreRuntimeExceptionsWhileFiring = false);
+
+ // XInterface
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
+ throw (::com::sun::star::uno::RuntimeException);
+
+ // XPropertySetOption
+ virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable )
+ throw(::com::sun::star::uno::RuntimeException);
+
+
+
+private:
+ OPropertySetHelper2( const OPropertySetHelper & ) SAL_THROW( () );
+ OPropertySetHelper2 & operator = ( const OPropertySetHelper & ) SAL_THROW( () );
+
+public:
+// Suppress warning about virtual functions but non-virtual destructor:
+ /**
+ You must call disposing before destruction.
+ */
+ virtual ~OPropertySetHelper2() SAL_THROW( () );
+};
+
} // end namespace cppuhelper
#endif //
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index fd5877b..f499461 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -260,7 +260,6 @@ _ZThn*_N4cppu16OComponentHelper7releaseEv;
_ZThn*_N4cppu18OPropertySetHelper14queryInterfaceERKN3com3sun4star3uno4TypeE;
_ZThn*_N4cppu18OPropertySetHelper20getFastPropertyValueE?;
_ZThn*_N4cppu18OPropertySetHelper20setFastPropertyValueE?RKN3com3sun4star3uno3AnyE;
-_ZThn*_N4cppu18OPropertySetHelper14queryInterfaceERKN3com3sun4star3uno4TypeE;
_ZThn*_N4cppu18OPropertySetHelper16getPropertyValueERKN3rtl8OUStringE;
_ZThn*_N4cppu18OPropertySetHelper16setPropertyValueERKN3rtl8OUStringERKN3com3sun4star3uno3AnyE;
_ZThn*_N4cppu18OPropertySetHelper25addPropertyChangeListenerERKN3rtl8OUStringERKN3com3sun4star3uno9ReferenceINS7_5beans23XPropertyChangeListenerEEE;
@@ -392,6 +391,16 @@ UDK_3.7 { # OOo 3.4
UDK_3.8 { # LibO 3.5
global:
- _ZN4cppu18OPropertySetHelper32enableChangeListenerNotificationEh;
- _ZThn*_N4cppu18OPropertySetHelper32enableChangeListenerNotificationEh;
+ ## class OPropertySetHelper2
+ # constructors
+ _ZN4cppu19OPropertySetHelper2C1ERNS_19OBroadcastHelperVarINS_34OMultiTypeInterfaceContainerHelperEN3com3sun4star3uno4TypeEEEPNS_22IEventNotificationHookEb;
+ _ZN4cppu19OPropertySetHelper2C2ERNS_19OBroadcastHelperVarINS_34OMultiTypeInterfaceContainerHelperEN3com3sun4star3uno4TypeEEEPNS_22IEventNotificationHookEb;
+ # destructors
+ _ZN4cppu19OPropertySetHelper2D0Ev;
+ _ZN4cppu19OPropertySetHelper2D1Ev;
+ _ZN4cppu19OPropertySetHelper2D2Ev;
+ # queryInterface
+ _ZN4cppu19OPropertySetHelper214queryInterfaceERKN3com3sun4star3uno4TypeE;
+ # enableChangeListenerNotification
+ _ZN4cppu19OPropertySetHelper232enableChangeListenerNotificationEh;
} UDK_3.7;
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
index bd30b1b..6409275 100644
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
@@ -287,6 +287,7 @@ UDK_3.7 { # OOo 3.4
UDK_3.8 { # LibO 3.5
global:
- ?enableChangeListenerNotification at OPropertySetHelper@cppu@@UAAXE at Z;
- ??_7OPropertySetHelper at cppu@@6BXPropertySetOption at beans@star at sun@com@@@;
+ ?queryInterface at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+ ?enableChangeListenerNotification at OPropertySetHelper2@cppu@@UAAXE at Z;
+ ??_7OPropertySetHelper2 at cppu@@6BXPropertySetOption at beans@star at sun@com@@@;
} UDK_3.7;
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 7878062..2a71f00 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -152,11 +152,13 @@ public:
IEventNotificationHook *i_pFireEvents
)
:m_bIgnoreRuntimeExceptionsWhileFiring( i_bIgnoreRuntimeExceptionsWhileFiring )
+ ,m_bFireEvents(true)
,m_pFireEvents( i_pFireEvents )
{
}
bool m_bIgnoreRuntimeExceptionsWhileFiring;
+ bool m_bFireEvents;
class IEventNotificationHook * const m_pFireEvents;
::std::vector< sal_Int32 > m_handles;
@@ -173,7 +175,6 @@ OPropertySetHelper::OPropertySetHelper(
: rBHelper( rBHelper_ ),
aBoundLC( rBHelper_.rMutex ),
aVetoableLC( rBHelper_.rMutex ),
- m_bFireEvent(true),
m_pReserved( new Impl(false, 0) )
{
}
@@ -183,7 +184,6 @@ OPropertySetHelper::OPropertySetHelper(
: rBHelper( rBHelper_ ),
aBoundLC( rBHelper_.rMutex ),
aVetoableLC( rBHelper_.rMutex ),
- m_bFireEvent(true),
m_pReserved( new Impl( bIgnoreRuntimeExceptionsWhileFiring, 0 ) )
{
}
@@ -194,35 +194,50 @@ OPropertySetHelper::OPropertySetHelper(
: rBHelper( rBHelper_ ),
aBoundLC( rBHelper_.rMutex ),
aVetoableLC( rBHelper_.rMutex ),
- m_bFireEvent(true),
m_pReserved(
new Impl( bIgnoreRuntimeExceptionsWhileFiring, i_pFireEvents) )
{
}
+OPropertySetHelper2::OPropertySetHelper2(
+ OBroadcastHelper & irBHelper,
+ IEventNotificationHook *i_pFireEvents,
+ bool bIgnoreRuntimeExceptionsWhileFiring)
+ :OPropertySetHelper( irBHelper, i_pFireEvents, bIgnoreRuntimeExceptionsWhileFiring )
+{
+}
+
/**
* You must call disposing before.
*/
OPropertySetHelper::~OPropertySetHelper() SAL_THROW( () )
{
}
+OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW( () )
+{
+}
-/**
- * These method is called from queryInterface, if no delegator is set.
- * Otherwise this method is called from the delegator.
- */
-// XAggregation
+// XInterface
Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rType )
throw (RuntimeException)
{
return ::cppu::queryInterface(
rType,
static_cast< XPropertySet * >( this ),
- static_cast< XPropertySetOption * >( this ),
static_cast< XMultiPropertySet * >( this ),
static_cast< XFastPropertySet * >( this ) );
}
+Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rType )
+ throw (RuntimeException)
+{
+ Any cnd(cppu::queryInterface(rType, static_cast< XPropertySetOption * >(this)));
+ if ( cnd.hasValue() )
+ return cnd;
+ else
+ return OPropertySetHelper::queryInterface(rType);
+}
+
/**
* called from the derivee's XTypeProvider::getTypes implementation
*/
@@ -631,10 +646,11 @@ void OPropertySetHelper::fire
sal_Bool bVetoable
)
{
- if (!m_bFireEvent)
+ OSL_ENSURE( m_pReserved.get(), "No OPropertySetHelper::Impl" );
+
+ if (! m_pReserved->m_bFireEvents)
return;
- OSL_ENSURE( m_pReserved.get(), "No OPropertySetHelper::Impl" );
if (m_pReserved->m_pFireEvents) {
m_pReserved->m_pFireEvents->fireEvents(
pnHandles, nHandles, bVetoable,
@@ -1037,10 +1053,10 @@ void OPropertySetHelper::firePropertiesChangeEvent(
delete [] pHandles;
}
-void OPropertySetHelper::enableChangeListenerNotification( sal_Bool bEnable )
+void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool bEnable )
throw(::com::sun::star::uno::RuntimeException)
{
- m_bFireEvent = bEnable;
+ m_pReserved->m_bFireEvents = bEnable;
}
#ifdef xdvnsdfln
More information about the Libreoffice-commits
mailing list