[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 6 commits - download.lst icu/icu4c.10129.wintz.patch icu/makefile.mk libmspub/ExternalPackage_libmspub.mk libwpd/ExternalPackage_libwpd.mk svx/source writerfilter/source

Lionel Elie Mamane lionel at mamane.lu
Thu May 23 08:21:40 PDT 2013


 download.lst                                      |    6 
 icu/icu4c.10129.wintz.patch                       |   26 +
 icu/makefile.mk                                   |    1 
 libmspub/ExternalPackage_libmspub.mk              |    6 
 libwpd/ExternalPackage_libwpd.mk                  |   22 
 svx/source/form/fmscriptingenv.cxx                |  554 +++++++++++++++++++++-
 svx/source/form/fmtextcontrolshell.cxx            |    5 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 
 8 files changed, 589 insertions(+), 44 deletions(-)

New commits:
commit 6cf7b8d25dd69fcade6d2302818836b2e808dbd9
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun May 12 00:35:31 2013 +0200

    fdo#63695 revert hackish fix to i#51621
    
    Change-Id: I688a659207c4b95cc98ff5dc5c5622d4592b3f89
    (cherry picked from commit 7fd1cc18130464a9f09cb7a866e88c4d52e4716d)
    Reviewed-on: https://gerrit.libreoffice.org/3864
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index a4551af..47e5e7d 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1271,8 +1271,9 @@ namespace svx
         // shells too much (In theory, nearly every slot could have an own shell then).
         //
         // #i51621# / 2005-08-19 / frank.schoenheit at sun.com
-        bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty();
-        if ( m_aControlActivationHandler.IsSet() && bHaveAnyServeableSlots )
+        // bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty();
+        // LEM: not calling m_aControlActivatonHandler causes fdo#63695, so disable this hack for now.
+        if ( m_aControlActivationHandler.IsSet() /* && bHaveAnyServeableSlots */ )
             m_aControlActivationHandler.Call( NULL );
 
         m_bNeedClipboardInvalidation = true;
commit bbc86883542897e15d226cea9bdad29d1f8fb584
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Tue May 14 14:59:31 2013 +0200

    fdo#64249: make sure we have matching start/end level for table in shapes
    
    Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
    (cherry picked from commit 9ceda3013a6b7e60e0e56ba540e217fd36a34a0f)
    Reviewed-on: https://gerrit.libreoffice.org/3907
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 94a535f..39f1977 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1650,6 +1650,10 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
     if (m_aTextAppendStack.empty())
         return;
     uno::Reference<text::XTextAppend> xTextAppend = m_aTextAppendStack.top().xTextAppend;
+
+    appendTableManager( );
+    appendTableHandler( );
+    getTableManager().startLevel();
     try
     {
         uno::Reference< lang::XServiceInfo > xSInfo( xShape, uno::UNO_QUERY_THROW );
@@ -1708,10 +1712,6 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
             xProps->setPropertyValue( rPropNameSupplier.GetName( PROP_ANCHOR_TYPE ), bIsGraphic  ?  uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny( text::TextContentAnchorType_AT_PARAGRAPH ) );
         }
         }
-
-        appendTableManager( );
-        appendTableHandler( );
-        getTableManager().startLevel();
     }
     catch ( const uno::Exception& e )
     {
@@ -1723,11 +1723,10 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
 
 void DomainMapper_Impl::PopShapeContext()
 {
+    getTableManager().endLevel();
+    popTableManager();
     if ( m_aAnchoredStack.size() > 0 )
     {
-        getTableManager().endLevel();
-        popTableManager();
-
         // For OLE object replacement shape, the text append context was already removed
         // or the OLE object couldn't be inserted.
         if ( !m_aAnchoredStack.top().bToRemove )
commit a9050d447ecff8cf3124a08eba6bd5cf4ab656e4
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri May 10 23:34:00 2013 +0200

    fdo#63398 hardcode former list of oneway method
    
    adapt to disappearance of oneway qualifier for method
    by hardcoding list of methods that were oneway.
    
    Autogenerated by the following script:
    SKIP=1; git log -p -1   90eac3e69749a9227c4b6902b1f3cef1e338c6d1 | while read f0 f1 f2 f3 f4; do if [[ "$f0" == "---" ]]; then if printf '%s' "$f1" | egrep -q '^a/(off|udk)api/.*\.idl$'; then LISTENER=$(printf '%s' "$f1" | sed  -re 's@^a/(udk|off)api/@@' -e 's|/|.|g' -e 's@\.idl$@@'); SKIP=0; else SKIP=1; fi; elif [[ "$SKIP" -eq 0 ]] && [[ "$f1" == '[oneway]' ]]; then printf $'(pair<OUString,OUString>("%s","%s"))
    ' "$LISTENER" $(echo -n "$f3" | sed -r -e 's@\(.*@@'); fi; done
    
    This is rather atrocious, but ensures the behaviour is exactly the
    same as before.
    
    Left to do:
    
    remove methods that are irrelevant here
    (that is, impl_allowAsynchronousCall_nothrow will never be called
     with them as argument)
    
    (cherry picked from commit 9dfc3807dbff1a40f487d020446265bb85d0ac16)
    
    Conflicts:
    	svx/source/form/fmscriptingenv.cxx
    
    Change-Id: If4fea164a2fe727048645cd853a9850e59469ba5
    Reviewed-on: https://gerrit.libreoffice.org/3863
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index c6bf945..e8cf061 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -40,6 +40,10 @@
 #include <basic/basmgr.hxx>
 
 #include <boost/shared_ptr.hpp>
+#include <boost/assign/list_of.hpp>
+#include <utility>
+using std::pair;
+#include <set>
 
 //........................................................................
 namespace svxform
@@ -195,24 +199,538 @@ namespace svxform
     //--------------------------------------------------------------------
     bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const
     {
-        bool bAllowAsynchronousCall = false;
-        try
-        {
-            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-            Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW );
-
-            ::rtl::OUString sMethodDescription( _rListenerType );
-            sMethodDescription += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "::" ));
-            sMethodDescription += _rMethodName;
-
-            Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW );
-            bAllowAsynchronousCall = xMethod->isOneway();
-        }
-        catch( const Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-        }
-        return bAllowAsynchronousCall;
+        // This used to be implemented as:
+        // is (_rListenerType + "::" + _rMethodName) a oneway function?
+        // since we got rid of the notion of oneway, this is the list
+        // of oneway methods, autogenerated by postprocessing of
+        // commitdiff 90eac3e69749a9227c4b6902b1f3cef1e338c6d1
+        static std::set< pair< OUString, OUString > > delayed_event_listeners =
+            boost::assign::list_of
+            (pair<OUString,OUString>("com.sun.star.accessibility.XAccessibleComponent","grabFocus"))
+            (pair<OUString,OUString>("com.sun.star.accessibility.XAccessibleEventBroadcaster","addAccessibleEventListener"))
+            (pair<OUString,OUString>("com.sun.star.accessibility.XAccessibleEventBroadcaster","removeAccessibleEventListener"))
+            (pair<OUString,OUString>("com.sun.star.accessibility.XAccessibleSelection","clearAccessibleSelection"))
+            (pair<OUString,OUString>("com.sun.star.accessibility.XAccessibleSelection","selectAllAccessibleChildren"))
+            (pair<OUString,OUString>("com.sun.star.awt.XActionListener","actionPerformed"))
+            (pair<OUString,OUString>("com.sun.star.awt.XActivateListener","windowActivated"))
+            (pair<OUString,OUString>("com.sun.star.awt.XActivateListener","windowDeactivated"))
+            (pair<OUString,OUString>("com.sun.star.awt.XAdjustmentListener","adjustmentValueChanged"))
+            (pair<OUString,OUString>("com.sun.star.awt.XButton","addActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XButton","removeActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XButton","setLabel"))
+            (pair<OUString,OUString>("com.sun.star.awt.XButton","setActionCommand"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCheckBox","addItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCheckBox","removeItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCheckBox","setState"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCheckBox","setLabel"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCheckBox","enableTriState"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","addItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","removeItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","addActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","removeActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","addItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","addItems"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","removeItems"))
+            (pair<OUString,OUString>("com.sun.star.awt.XComboBox","setDropDownLineCount"))
+            (pair<OUString,OUString>("com.sun.star.awt.XControl","setContext"))
+            (pair<OUString,OUString>("com.sun.star.awt.XControl","createPeer"))
+            (pair<OUString,OUString>("com.sun.star.awt.XControl","setDesignMode"))
+            (pair<OUString,OUString>("com.sun.star.awt.XControlContainer","setStatusText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XControlContainer","addControl"))
+            (pair<OUString,OUString>("com.sun.star.awt.XControlContainer","removeControl"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setValue"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setMin"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setMax"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setFirst"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setLast"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setSpinSize"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setDecimalDigits"))
+            (pair<OUString,OUString>("com.sun.star.awt.XCurrencyField","setStrictFormat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setDate"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setMin"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setMax"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setFirst"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setLast"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setLongFormat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDateField","setStrictFormat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDialog","setTitle"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDisplayConnection","addEventHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDisplayConnection","removeEventHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDisplayConnection","addErrorHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XDisplayConnection","removeErrorHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","addTopWindowListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","removeTopWindowListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","addKeyHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","removeKeyHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","addFocusListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","removeFocusListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","fireFocusGained"))
+            (pair<OUString,OUString>("com.sun.star.awt.XExtendedToolkit","fireFocusLost"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFileDialog","setPath"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFileDialog","setFilters"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFileDialog","setCurrentFilter"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedHyperlink","setText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedHyperlink","setURL"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedHyperlink","setAlignment"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedHyperlink","addActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedHyperlink","removeActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedText","setText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFixedText","setAlignment"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFocusListener","focusGained"))
+            (pair<OUString,OUString>("com.sun.star.awt.XFocusListener","focusLost"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setFont"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","selectFont"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setTextColor"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setTextFillColor"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setLineColor"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setFillColor"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setRasterOp"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","setClipRegion"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","intersectClipRegion"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","push"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","pop"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","copy"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","draw"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawPixel"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawLine"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawRect"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawRoundedRect"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawPolyLine"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawPolygon"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawPolyPolygon"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawEllipse"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawArc"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawPie"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawChord"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawGradient"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XGraphics","drawTextArray"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageButton","addActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageButton","removeActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageButton","setActionCommand"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageConsumer","init"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageConsumer","setColorModel"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageConsumer","setPixelsByBytes"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageConsumer","setPixelsByLongs"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageConsumer","complete"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageProducer","addConsumer"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageProducer","removeConsumer"))
+            (pair<OUString,OUString>("com.sun.star.awt.XImageProducer","startProduction"))
+            (pair<OUString,OUString>("com.sun.star.awt.XItemEventBroadcaster","addItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XItemEventBroadcaster","removeItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XItemListener","itemStateChanged"))
+            (pair<OUString,OUString>("com.sun.star.awt.XKeyListener","keyPressed"))
+            (pair<OUString,OUString>("com.sun.star.awt.XKeyListener","keyReleased"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","addItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","removeItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","addActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","removeActionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","addItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","addItems"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","removeItems"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","selectItemPos"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","selectItemsPos"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","selectItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","setMultipleMode"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","setDropDownLineCount"))
+            (pair<OUString,OUString>("com.sun.star.awt.XListBox","makeVisible"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","addMenuListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","removeMenuListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","insertItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","removeItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","enableItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","setItemText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenu","setPopupMenu"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenuListener","highlight"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenuListener","select"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenuListener","activate"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMenuListener","deactivate"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMessageBox","setCaptionText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMessageBox","setMessageText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMouseListener","mousePressed"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMouseListener","mouseReleased"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMouseListener","mouseEntered"))
+            (pair<OUString,OUString>("com.sun.star.awt.XMouseListener","mouseExited"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setValue"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setMin"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setMax"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setFirst"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setLast"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setSpinSize"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setDecimalDigits"))
+            (pair<OUString,OUString>("com.sun.star.awt.XNumericField","setStrictFormat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPaintListener","windowPaint"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPatternField","setMasks"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPatternField","setString"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPatternField","setStrictFormat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPointer","setType"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPopupMenu","insertSeparator"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPopupMenu","setDefaultItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XPopupMenu","checkItem"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressBar","setForegroundColor"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressBar","setBackgroundColor"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressBar","setRange"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressBar","setValue"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressMonitor","addText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressMonitor","removeText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XProgressMonitor","updateText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRadioButton","addItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRadioButton","removeItemListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRadioButton","setState"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRadioButton","setLabel"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","clear"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","move"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","unionRectangle"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","intersectRectangle"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","excludeRectangle"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","xOrRectangle"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","unionRegion"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","intersectRegion"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","excludeRegion"))
+            (pair<OUString,OUString>("com.sun.star.awt.XRegion","xOrRegion"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","addAdjustmentListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","removeAdjustmentListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setValue"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setValues"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setMaximum"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setLineIncrement"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setBlockIncrement"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setVisibleSize"))
+            (pair<OUString,OUString>("com.sun.star.awt.XScrollBar","setOrientation"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","addSpinListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","removeSpinListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","up"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","down"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","first"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","last"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinField","enableRepeat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinListener","up"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinListener","down"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinListener","first"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinListener","last"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","addAdjustmentListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","removeAdjustmentListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","setValue"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","setValues"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","setMinimum"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","setMaximum"))
+            (pair<OUString,OUString>("com.sun.star.awt.XSpinValue","setSpinIncrement"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabController","setModel"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabController","setContainer"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabController","autoTabOrder"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabController","activateTabOrder"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabController","activateFirst"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabController","activateLast"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabControllerModel","setGroupControl"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabControllerModel","setControlModels"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTabControllerModel","setGroup"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","addTextListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","removeTextListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","setText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","insertText"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","setSelection"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","setEditable"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextComponent","setMaxTextLen"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextEditField","setEchoChar"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTextListener","textChanged"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTimeField","setTime"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTimeField","setMin"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTimeField","setMax"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTimeField","setFirst"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTimeField","setLast"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTimeField","setStrictFormat"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindow","addTopWindowListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindow","removeTopWindowListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindow","toFront"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindow","toBack"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindow","setMenuBar"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowOpened"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowClosing"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowClosed"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowMinimized"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowNormalized"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowActivated"))
+            (pair<OUString,OUString>("com.sun.star.awt.XTopWindowListener","windowDeactivated"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUnoControlContainer","setTabControllers"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUnoControlContainer","addTabController"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUnoControlContainer","removeTabController"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUserInputInterception","addKeyHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUserInputInterception","removeKeyHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUserInputInterception","addMouseClickHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XUserInputInterception","removeMouseClickHandler"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainer","addVclContainerListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainer","removeVclContainerListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainerListener","windowAdded"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainerListener","windowRemoved"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainerPeer","enableDialogControl"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainerPeer","setTabOrder"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclContainerPeer","setGroup"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclWindowPeer","setDesignMode"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclWindowPeer","enableClipSiblings"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclWindowPeer","setForeground"))
+            (pair<OUString,OUString>("com.sun.star.awt.XVclWindowPeer","setControlFont"))
+            (pair<OUString,OUString>("com.sun.star.awt.XView","draw"))
+            (pair<OUString,OUString>("com.sun.star.awt.XView","setZoom"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","setPosSize"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","setVisible"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","setEnable"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","setFocus"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","addWindowListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","removeWindowListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","addFocusListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","removeFocusListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","addKeyListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","removeKeyListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","addMouseListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","removeMouseListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","addMouseMotionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","removeMouseMotionListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","addPaintListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindow","removePaintListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowListener","windowResized"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowListener","windowMoved"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowListener","windowShown"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowListener","windowHidden"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowListener2","windowEnabled"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowListener2","windowDisabled"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowPeer","setPointer"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowPeer","setBackground"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowPeer","invalidate"))
+            (pair<OUString,OUString>("com.sun.star.awt.XWindowPeer","invalidateRect"))
+            (pair<OUString,OUString>("com.sun.star.awt.grid.XGridSelectionListener","selectionChanged"))
+            (pair<OUString,OUString>("com.sun.star.awt.tab.XTabPageContainer","addTabPageContainerListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.tab.XTabPageContainer","removeTabPageContainerListener"))
+            (pair<OUString,OUString>("com.sun.star.awt.tab.XTabPageContainerListener","tabPageActivated"))
+            (pair<OUString,OUString>("com.sun.star.configuration.backend.XBackendChangesNotifier","addChangesListener"))
+            (pair<OUString,OUString>("com.sun.star.configuration.backend.XBackendChangesNotifier","removeChangesListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.clipboard.XClipboard","setContents"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.clipboard.XClipboardListener","changedContents"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.clipboard.XClipboardNotifier","addClipboardListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.clipboard.XClipboardNotifier","removeClipboardListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.clipboard.XClipboardOwner","lostOwnership"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XAutoscroll","autoscroll"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragGestureListener","dragGestureRecognized"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragGestureRecognizer","addDragGestureListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragGestureRecognizer","removeDragGestureListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSource","startDrag"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceContext","setCursor"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceContext","setImage"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceContext","transferablesFlavorsChanged"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceListener","dragDropEnd"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceListener","dragEnter"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceListener","dragExit"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceListener","dragOver"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDragSourceListener","dropActionChanged"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTarget","addDropTargetListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTarget","removeDropTargetListener"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTarget","setDefaultActions"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetDragContext","acceptDrag"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetDragContext","rejectDrag"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetDropContext","acceptDrop"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetDropContext","rejectDrop"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetDropContext","dropComplete"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetListener","dragEnter"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetListener","dragExit"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetListener","dragOver"))
+            (pair<OUString,OUString>("com.sun.star.datatransfer.dnd.XDropTargetListener","dropActionChanged"))
+            (pair<OUString,OUString>("com.sun.star.document.XEventBroadcaster","addEventListener"))
+            (pair<OUString,OUString>("com.sun.star.document.XEventBroadcaster","removeEventListener"))
+            (pair<OUString,OUString>("com.sun.star.document.XEventListener","notifyEvent"))
+            (pair<OUString,OUString>("com.sun.star.document.XStorageChangeListener","notifyStorageChange"))
+            (pair<OUString,OUString>("com.sun.star.drawing.XControlShape","setControl"))
+            (pair<OUString,OUString>("com.sun.star.form.XApproveActionBroadcaster","addApproveActionListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XApproveActionBroadcaster","removeApproveActionListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XBoundControl","setLock"))
+            (pair<OUString,OUString>("com.sun.star.form.XChangeBroadcaster","addChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XChangeBroadcaster","removeChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XChangeListener","changed"))
+            (pair<OUString,OUString>("com.sun.star.form.XConfirmDeleteBroadcaster","addConfirmDeleteListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XConfirmDeleteBroadcaster","removeConfirmDeleteListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XDatabaseParameterBroadcaster","addParameterListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XDatabaseParameterBroadcaster","removeParameterListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XDatabaseParameterBroadcaster2","addDatabaseParameterListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XDatabaseParameterBroadcaster2","removeDatabaseParameterListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XErrorBroadcaster","addErrorListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XErrorBroadcaster","removeErrorListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XFormController","addActivateListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XFormController","removeActivateListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XFormControllerListener","formActivated"))
+            (pair<OUString,OUString>("com.sun.star.form.XFormControllerListener","formDeactivated"))
+            (pair<OUString,OUString>("com.sun.star.form.XGrid","setCurrentColumnPosition"))
+            (pair<OUString,OUString>("com.sun.star.form.XGridPeer","setColumns"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadListener","loaded"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadListener","unloading"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadListener","unloaded"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadListener","reloading"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadListener","reloaded"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadable","load"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadable","unload"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadable","reload"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadable","addLoadListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XLoadable","removeLoadListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XPositioningListener","positioned"))
+            (pair<OUString,OUString>("com.sun.star.form.XReset","reset"))
+            (pair<OUString,OUString>("com.sun.star.form.XReset","addResetListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XReset","removeResetListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XResetListener","resetted"))
+            (pair<OUString,OUString>("com.sun.star.form.XSubmit","submit"))
+            (pair<OUString,OUString>("com.sun.star.form.XSubmit","addSubmitListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XSubmit","removeSubmitListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XUpdateBroadcaster","addUpdateListener"))
+            (pair<OUString,OUString>("com.sun.star.form.XUpdateBroadcaster","removeUpdateListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XBrowseHistoryRegistry","updateViewData"))
+            (pair<OUString,OUString>("com.sun.star.frame.XBrowseHistoryRegistry","createNewEntry"))
+            (pair<OUString,OUString>("com.sun.star.frame.XConfigManager","addPropertyChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XConfigManager","removePropertyChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XConfigManager","flush"))
+            (pair<OUString,OUString>("com.sun.star.frame.XDesktop","addTerminateListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XDesktop","removeTerminateListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XDispatch","dispatch"))
+            (pair<OUString,OUString>("com.sun.star.frame.XDispatch","addStatusListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XDispatch","removeStatusListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XDocumentTemplates","update"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrame","setCreator"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrame","setName"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrame","activate"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrame","deactivate"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrame","addFrameActionListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrame","removeFrameActionListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrameActionListener","frameAction"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrameLoader","load"))
+            (pair<OUString,OUString>("com.sun.star.frame.XFrameLoader","cancel"))
+            (pair<OUString,OUString>("com.sun.star.frame.XLoadEventListener","loadFinished"))
+            (pair<OUString,OUString>("com.sun.star.frame.XLoadEventListener","loadCancelled"))
+            (pair<OUString,OUString>("com.sun.star.frame.XModel","connectController"))
+            (pair<OUString,OUString>("com.sun.star.frame.XModel","disconnectController"))
+            (pair<OUString,OUString>("com.sun.star.frame.XModel","lockControllers"))
+            (pair<OUString,OUString>("com.sun.star.frame.XModel","unlockControllers"))
+            (pair<OUString,OUString>("com.sun.star.frame.XNotifyingDispatch","dispatchWithNotification"))
+            (pair<OUString,OUString>("com.sun.star.frame.XRecordableDispatch","dispatchAndRecord"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerClient","addSessionManagerListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerClient","removeSessionManagerListener"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerClient","queryInteraction"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerClient","interactionDone"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerClient","saveDone"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerListener","doSave"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerListener","approveInteraction"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerListener","shutdownCanceled"))
+            (pair<OUString,OUString>("com.sun.star.frame.XSessionManagerListener2","doQuit"))
+            (pair<OUString,OUString>("com.sun.star.frame.XStatusListener","statusChanged"))
+            (pair<OUString,OUString>("com.sun.star.frame.XTask","tileWindows"))
+            (pair<OUString,OUString>("com.sun.star.frame.XTask","arrangeWindowsVertical"))
+            (pair<OUString,OUString>("com.sun.star.frame.XTask","arrangeWindowsHorizontal"))
+            (pair<OUString,OUString>("com.sun.star.frame.XWindowArranger","arrange"))
+            (pair<OUString,OUString>("com.sun.star.inspection.XPropertyControlContext","activateNextControl"))
+            (pair<OUString,OUString>("com.sun.star.inspection.XPropertyControlObserver","focusGained"))
+            (pair<OUString,OUString>("com.sun.star.inspection.XPropertyControlObserver","valueChanged"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XCloseSessionListener","sessionClosed"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XMenuProxy","addMenuProxyListener"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XMenuProxy","removeMenuProxyListener"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstance","start"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstance","stop"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstance","destroy"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstance","createWindow"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstance","newStream"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstance","newURL"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstanceNotifySink","notifyURL"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstancePeer","showStatusMessage"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstancePeer","enableScripting"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstancePeer","newStream"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstancePeer","getURL"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginInstancePeer","postURL"))
+            (pair<OUString,OUString>("com.sun.star.mozilla.XPluginWindowPeer","setChildWindow"))
+            (pair<OUString,OUString>("com.sun.star.script.vba.XVBACompatibility","addVBAScriptListener"))
+            (pair<OUString,OUString>("com.sun.star.script.vba.XVBACompatibility","removeVBAScriptListener"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XDatabaseAccess","addDatabaseAccessListener"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XDatabaseAccess","removeDatabaseAccessListener"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XDatabaseAccessListener","connectionChanged"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XDatabaseAccessListener","connectionClosing"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XRowSetApproveBroadcaster","addRowSetApproveListener"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XRowSetApproveBroadcaster","removeRowSetApproveListener"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XRowSetChangeListener","onRowSetChanged"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XRowSetSupplier","setRowSet"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XRowsChangeListener","rowsChanged"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XSQLErrorBroadcaster","addSQLErrorListener"))
+            (pair<OUString,OUString>("com.sun.star.sdb.XSQLErrorBroadcaster","removeSQLErrorListener"))
+            (pair<OUString,OUString>("com.sun.star.sdbc.XRowSet","addRowSetListener"))
+            (pair<OUString,OUString>("com.sun.star.sdbc.XRowSet","removeRowSetListener"))
+            (pair<OUString,OUString>("com.sun.star.sdbc.XRowSetListener","cursorMoved"))
+            (pair<OUString,OUString>("com.sun.star.sdbc.XRowSetListener","rowChanged"))
+            (pair<OUString,OUString>("com.sun.star.sdbc.XRowSetListener","rowSetChanged"))
+            (pair<OUString,OUString>("com.sun.star.sheet.XCalculatable","enableAutomaticCalculation"))
+            (pair<OUString,OUString>("com.sun.star.sheet.XVolatileResult","addResultListener"))
+            (pair<OUString,OUString>("com.sun.star.sheet.XVolatileResult","removeResultListener"))
+            (pair<OUString,OUString>("com.sun.star.task.XJobExecutor","trigger"))
+            (pair<OUString,OUString>("com.sun.star.task.XStatusIndicator","start"))
+            (pair<OUString,OUString>("com.sun.star.task.XStatusIndicator","end"))
+            (pair<OUString,OUString>("com.sun.star.task.XStatusIndicator","setText"))
+            (pair<OUString,OUString>("com.sun.star.task.XStatusIndicator","setValue"))
+            (pair<OUString,OUString>("com.sun.star.task.XStatusIndicator","reset"))
+            (pair<OUString,OUString>("com.sun.star.text.XSimpleText","insertString"))
+            (pair<OUString,OUString>("com.sun.star.text.XTextCursor","collapseToStart"))
+            (pair<OUString,OUString>("com.sun.star.text.XTextCursor","collapseToEnd"))
+            (pair<OUString,OUString>("com.sun.star.text.XTextRange","setString"))
+            (pair<OUString,OUString>("com.sun.star.text.XTextViewCursor","setVisible"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XCommandProcessor","abort"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XCommandProcessor2","releaseCommandIdentifier"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XContent","addContentEventListener"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XContent","removeContentEventListener"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XContentProviderManager","deregisterContentProvider"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XContentTransmitter","transmit"))
+            (pair<OUString,OUString>("com.sun.star.ucb.XPropertySetRegistry","removePropertySet"))
+            (pair<OUString,OUString>("com.sun.star.ui.XUIConfigurationListener","elementInserted"))
+            (pair<OUString,OUString>("com.sun.star.ui.XUIConfigurationListener","elementRemoved"))
+            (pair<OUString,OUString>("com.sun.star.ui.XUIConfigurationListener","elementReplaced"))
+            (pair<OUString,OUString>("com.sun.star.ui.dialogs.XFilePickerNotifier","addFilePickerListener"))
+            (pair<OUString,OUString>("com.sun.star.ui.dialogs.XFilePickerNotifier","removeFilePickerListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XBroadcaster","lockBroadcasts"))
+            (pair<OUString,OUString>("com.sun.star.util.XBroadcaster","unlockBroadcasts"))
+            (pair<OUString,OUString>("com.sun.star.util.XChangesListener","changesOccurred"))
+            (pair<OUString,OUString>("com.sun.star.util.XChangesNotifier","addChangesListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XChangesNotifier","removeChangesListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XCloseBroadcaster","addCloseListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XCloseBroadcaster","removeCloseListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XFlushable","addFlushListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XFlushable","removeFlushListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XModeChangeListener","modeChanged"))
+            (pair<OUString,OUString>("com.sun.star.util.XModifyBroadcaster","addModifyListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XModifyBroadcaster","removeModifyListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XRefreshable","addRefreshListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XRefreshable","removeRefreshListener"))
+            (pair<OUString,OUString>("com.sun.star.util.XSearchDescriptor","setSearchString"))
+            (pair<OUString,OUString>("com.sun.star.view.XPrintJobBroadcaster","addPrintJobListener"))
+            (pair<OUString,OUString>("com.sun.star.view.XPrintJobBroadcaster","removePrintJobListener"))
+            (pair<OUString,OUString>("com.sun.star.view.XPrintJobListener","printJobEvent"))
+            (pair<OUString,OUString>("com.sun.star.view.XPrintableBroadcaster","addPrintableListener"))
+            (pair<OUString,OUString>("com.sun.star.view.XPrintableBroadcaster","removePrintableListener"))
+            (pair<OUString,OUString>("com.sun.star.view.XPrintableListener","stateChanged"))
+            (pair<OUString,OUString>("com.sun.star.view.XSelectionChangeListener","selectionChanged"))
+            (pair<OUString,OUString>("com.sun.star.beans.XMultiPropertySet","addPropertiesChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.beans.XMultiPropertySet","removePropertiesChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.beans.XMultiPropertySet","firePropertiesChangeEvent"))
+            (pair<OUString,OUString>("com.sun.star.beans.XPropertiesChangeNotifier","addPropertiesChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.beans.XPropertiesChangeNotifier","removePropertiesChangeListener"))
+            (pair<OUString,OUString>("com.sun.star.container.XContainer","addContainerListener"))
+            (pair<OUString,OUString>("com.sun.star.container.XContainer","removeContainerListener"))
+            (pair<OUString,OUString>("com.sun.star.container.XContainerListener","elementInserted"))
+            (pair<OUString,OUString>("com.sun.star.container.XContainerListener","elementRemoved"))
+            (pair<OUString,OUString>("com.sun.star.container.XContainerListener","elementReplaced"))
+            (pair<OUString,OUString>("com.sun.star.container.XNamed","setName"))
+            (pair<OUString,OUString>("com.sun.star.io.XDataExporter","exportData"))
+            (pair<OUString,OUString>("com.sun.star.io.XDataExporter","cancel"))
+            (pair<OUString,OUString>("com.sun.star.io.XDataImporter","importData"))
+            (pair<OUString,OUString>("com.sun.star.io.XDataImporter","cancel"))
+            (pair<OUString,OUString>("com.sun.star.io.XDataTransferEventListener","finished"))
+            (pair<OUString,OUString>("com.sun.star.io.XDataTransferEventListener","cancelled"))
+            (pair<OUString,OUString>("com.sun.star.lang.XConnectionPointContainer","advise"))
+            (pair<OUString,OUString>("com.sun.star.lang.XConnectionPointContainer","unadvise"))
+            (pair<OUString,OUString>("com.sun.star.script.XAllListener","firing"))
+            (pair<OUString,OUString>("com.sun.star.uno.XInterface","acquire"))
+            (pair<OUString,OUString>("com.sun.star.uno.XInterface","release"))
+            (pair<OUString,OUString>("com.sun.star.uno.XReference","dispose"));
+
+        pair<OUString,OUString> k(_rListenerType, _rMethodName);
+        return delayed_event_listeners.find(k) != delayed_event_listeners.end();
     }
 
     //--------------------------------------------------------------------
commit a3141e682d326b993b249ec2665262c4ca824f3c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 14 12:23:41 2013 +0200

    Uploading libwpd 0.9.8 release
    
    (cherry picked from commit 9febe2cc5000046bf49b973efb3970013a5b84e1)
    
    Conflicts:
    	download.lst
    
    Change-Id: I03a9a06058a8fbde736b3d897918e8eea8c2a1d6
    Reviewed-on: https://gerrit.libreoffice.org/3903
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index c93f9ec..cf4e219 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-export WPD_TARBALL := e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
+export WPD_TARBALL := 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2
 export WPG_TARBALL := 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
 export WPS_TARBALL := d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
 export XPDF_TARBALL := 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index f2375d1..ed104aa 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -10,20 +10,20 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
-	src/lib/libwpd.h \
-	src/lib/WPDocument.h \
-	src/lib/WPXBinaryData.h \
-	src/lib/WPXDocumentInterface.h \
-	src/lib/WPXProperty.h \
-	src/lib/WPXPropertyList.h \
-	src/lib/WPXString.h \
-	src/lib/WPXPropertyListVector.h \
+	inc/libwpd/libwpd.h \
+	inc/libwpd/WPDocument.h \
+	inc/libwpd/WPXBinaryData.h \
+	inc/libwpd/WPXDocumentInterface.h \
+	inc/libwpd/WPXProperty.h \
+	inc/libwpd/WPXPropertyList.h \
+	inc/libwpd/WPXString.h \
+	inc/libwpd/WPXPropertyListVector.h \
 ))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\
-	src/lib/libwpd-stream.h \
-	src/lib/WPXStream.h \
-	src/lib/WPXStreamImplementation.h \
+	inc/libwpd-stream/libwpd-stream.h \
+	inc/libwpd-stream/WPXStream.h \
+	inc/libwpd-stream/WPXStreamImplementation.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
commit ce5ffee1cbe53f62b97ddcfa94a59477aa518a06
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon May 13 17:42:48 2013 +0200

    Uploading libmspub-0.0.6
    
    (cherry picked from commit ce4f51c714d5aa6f2f44cc7de89596f8e72cb600)
    
    Conflicts:
    	download.lst
    
    Change-Id: Ie432d747e4b32a95380f86c73b1a106f6a5903f6
    Reviewed-on: https://gerrit.libreoffice.org/3899
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 0763d61..c93f9ec 100644
--- a/download.lst
+++ b/download.lst
@@ -1,7 +1,7 @@
 CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
 export CDR_TARBALL := libcdr-0.0.13.tar.bz2
-MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
-export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
+MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
+export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
 export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
 
diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk
index 83a0c87..8893a59 100644
--- a/libmspub/ExternalPackage_libmspub.mk
+++ b/libmspub/ExternalPackage_libmspub.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,mspub))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmspub,\
-	src/lib/libmspub.h \
-	src/lib/MSPUBDocument.h \
-	src/lib/MSPUBStringVector.h \
+	inc/libmspub/libmspub.h \
+	inc/libmspub/MSPUBDocument.h \
+	inc/libmspub/MSPUBStringVector.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub))
commit e733777969b090ba9b81f0fa507d34487b23f150
Author: Isamu Mogi <saturday6c at gmail.com>
Date:   Mon May 6 11:16:10 2013 +0000

    fdo#59850: Resolves invalid date changing by ICU's timezone detection bug.
    
    This is a backport of 263ab3f14bbb8cea9f5a1b8ea7496f6a23e6c547 .
    
    Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
    of which the outcome should be monitored.
    
    u_strFromWCS() returns a wrong destination length for u_austrncpy() if
    apiTZI.StandardName is multibyte string. Therefore apiStdName will be incomplete
    string, and timezone detection (using apiStdName) returns invalid result. This
    will fix destination length for u_austrncpy() enough to write multibyte string.
    
    Change-Id: I0aa7da85aec41c61b04f76fb4cd5148f4d389991
    Reviewed-on: https://gerrit.libreoffice.org/3798
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/icu/icu4c.10129.wintz.patch b/icu/icu4c.10129.wintz.patch
new file mode 100644
index 0000000..d365f5e
--- /dev/null
+++ b/icu/icu4c.10129.wintz.patch
@@ -0,0 +1,26 @@
+
+# Fix for fdo#59850
+# Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
+# of which the outcome should be monitored.
+
+--- misc/icu/source/common/wintz.c	2012-04-05 20:46:14.000000000 +0000
++++ misc/build/icu/source/common/wintz.c	2013-05-03 13:00:47.188384300 +0000
+@@ -255,7 +255,6 @@
+     char apiStdName[MAX_LENGTH_ID];
+ 	char regStdName[MAX_LENGTH_ID];
+     char tmpid[MAX_LENGTH_ID];
+-    int32_t apiStdLength = 0;
+     int32_t len;
+ 
+     LONG result;
+@@ -278,8 +277,8 @@
+ 
+     /* Convert the wchar_t* standard name to char* */
+     uprv_memset(apiStdName, 0, sizeof(apiStdName));
+-    u_strFromWCS(apiStd, MAX_LENGTH_ID, &apiStdLength, apiTZI.StandardName, -1, &status);
+-    u_austrncpy(apiStdName, apiStd, apiStdLength);
++    u_strFromWCS(apiStd, MAX_LENGTH_ID, NULL, apiTZI.StandardName, -1, &status);
++    u_austrncpy(apiStdName, apiStd, sizeof(apiStdName) - 1);
+ 
+     tmpid[0] = 0;
+ 
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 98708df..1f6e8e8 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu
 #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31
 
 PATCH_FILES=\
+    icu4c.10129.wintz.patch \
     icu4c.9948.mlym-crash.patch \
     icu4c-bsd.patch \
     icu4c-build.patch \


More information about the Libreoffice-commits mailing list