rpms/openoffice.org/FC-4 openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.3, 1.4 openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 30 09:28:23 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29789
Modified Files:
openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch
Log Message:
grumble
openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
config_office/configure.in | 20 ++
config_office/set_soenv.in | 1
source/cxxhelp/provider/makefile.mk | 0
source/cxxhelp/provider/urlparameter.cxx | 0
util/makefile.mk | 0
xmlhelp/source/cxxhelp/provider/makefile.mk | 6
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 220 +++++++++++++++++++----
xmlhelp/util/makefile.mk | 13 +
8 files changed, 222 insertions(+), 38 deletions(-)
Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 30 Nov 2005 08:43:20 -0000 1.3
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 30 Nov 2005 09:28:19 -0000 1.4
@@ -44,14 +44,14 @@
diff -u config_office.orig/set_soenv.in config_office/set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in 2005-08-30 15:45:40.000000000 +0100
+++ openoffice.org/config_office/set_soenv.in 2005-08-30 15:50:51.000000000 +0100
-@@ -1767,6 +1767,7 @@
- ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
- ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
- ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
-+ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
+@@ -1765,6 +1765,7 @@
+ ToFile( "DB_JAR", "@DB_JAR@", "e" );
ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );
ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" );
++ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
+ ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
+ ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
Index: source/cxxhelp/provider/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v
openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch:
framework/inc/interaction/preventduplicateinteraction.hxx | 4 ++--
inc/interaction/preventduplicateinteraction.hxx | 0
2 files changed, 2 insertions(+), 2 deletions(-)
Index: openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch 30 Nov 2005 08:43:20 -0000 1.1
+++ openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch 30 Nov 2005 09:28:19 -0000 1.2
@@ -1,98 +1,24 @@
-Index: appopen.cxx
+Index: inc/interaction/preventduplicateinteraction.hxx
===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/appopen.cxx,v
-retrieving revision 1.96.32.2
-retrieving revision 1.96.32.4
-diff -u -r1.96.32.2 -r1.96.32.4
---- openoffice.org.orig/sfx2/source/appl/appopen.cxx 26 Aug 2005 08:53:54 -0000 1.96.32.2
-+++ openoffice.org/sfx2/source/appl/appopen.cxx 27 Sep 2005 07:56:24 -0000 1.96.32.4
-@@ -116,6 +116,9 @@
- #ifndef _COM_SUN_STAR_TASK_XINTERACTIONREQUEST_HPP_
- #include <com/sun/star/task/XInteractionRequest.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_TASK_ERRORCODEREQUEST_HPP_
-+#include <com/sun/star/task/ErrorCodeRequest.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
- #include <com/sun/star/beans/XPropertySet.hpp>
- #endif
-@@ -154,7 +157,9 @@
- #ifndef _SFXECODE_HXX
- #include <svtools/sfxecode.hxx>
- #endif
--
-+#ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
-+#include <framework/preventduplicateinteraction.hxx>
-+#endif
- #include <svtools/ehdl.hxx>
- #include <basic/sbxobj.hxx>
- #include <svtools/urihelper.hxx>
-@@ -222,6 +227,8 @@
- using namespace ::cppu;
- using namespace ::sfx2;
+RCS file: /cvs/framework/framework/inc/interaction/preventduplicateinteraction.hxx,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 preventduplicateinteraction.hxx
+--- openoffice.org.orig/framework/inc/interaction/preventduplicateinteraction.hxx 11 Nov 2005 12:03:33 -0000 1.2
++++ openoffice.org/framework/inc/interaction/preventduplicateinteraction.hxx 30 Nov 2005 09:44:21 -0000
+@@ -122,14 +122,14 @@ namespace framework{
+ On the other side there exists some interactions, which allow a retry.
+ So this helper allow to set a list of interactions combined with a retry value.
+ */
+-struct ThreadHelpBase
++struct ThreadHelpBaseTwo
+ {
+ public:
+ mutable ::osl::Mutex m_aLock;
+ };
-+namespace css = ::com::sun::star;
-+
- //=========================================================================
-
- class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
-@@ -1086,6 +1093,32 @@
- if ( nSID == SID_OPENTEMPLATE )
- rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) );
-
-+ // This helper wraps an existing (or may new created InteractionHandler)
-+ // intercept all incoming interactions and provide usefull informations
-+ // later if the following transaction was finished.
-+
-+ ::framework::PreventDuplicateInteraction* pHandler = new ::framework::PreventDuplicateInteraction(::comphelper::getProcessServiceFactory());
-+ css::uno::Reference< css::task::XInteractionHandler > xHandler (static_cast< css::task::XInteractionHandler* >(pHandler), css::uno::UNO_QUERY);
-+ css::uno::Reference< css::task::XInteractionHandler > xWrappedHandler;
-+
-+ // wrap existing handler or create new UUI handler
-+ SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
-+ if (pInteractionItem)
-+ {
-+ pInteractionItem->GetValue() >>= xWrappedHandler;
-+ rReq.RemoveItem( SID_INTERACTIONHANDLER );
-+ }
-+ if (xWrappedHandler.is())
-+ pHandler->setHandler(xWrappedHandler);
-+ else
-+ pHandler->useDefaultUUIHandler();
-+ rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHandler)) );
-+
-+ // define rules for this handler
-+ css::uno::Type aInteraction = ::getCppuType(static_cast< css::task::ErrorCodeRequest* >(0));
-+ ::framework::PreventDuplicateInteraction::InteractionInfo aRule (aInteraction, 1);
-+ pHandler->addInteractionRule(aRule);
-+
- for ( USHORT i = 0; i < pURLList->Count(); ++i )
- {
- String aURL = *(pURLList->GetObject(i));
-@@ -1096,7 +1129,25 @@
- // geladen wird
- // TODO/LATER: use URLList argument and always remove one document after another, each step in asychronous execution, until finished
- // but only if reschedule is a problem
-- GetDispatcher_Impl()->Execute( SID_OPENDOC, rReq.IsSynchronCall() ? SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_ASYNCHRON, *rReq.GetArgs() );
-+ GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, *rReq.GetArgs() );
-+
-+ // check for special interaction "NO MORE DOCUMENTS ALLOWED" and
-+ // break loop then. Otherwise we risk showing the same interaction more then once.
-+ if ( pHandler->getInteractionInfo(aInteraction, &aRule) )
-+ {
-+ if (aRule.m_nCallCount > 0)
-+ {
-+ if (aRule.m_xRequest.is())
-+ {
-+ css::task::ErrorCodeRequest aRequest;
-+ if (aRule.m_xRequest->getRequest() >>= aRequest)
-+ {
-+ if (aRequest.ErrCode == ERRCODE_SFX_NOMOREDOCUMENTSALLOWED)
-+ break;
-+ }
-+ }
-+ }
-+ }
- }
-
- delete pURLList;
+ class PreventDuplicateInteraction : public ::cppu::WeakImplHelper1< css::task::XInteractionHandler >
+- , private ThreadHelpBase
++ , private ThreadHelpBaseTwo
+ {
+ //_____________________________________
+ // structs, types etcp.
More information about the fedora-cvs-commits
mailing list