[ooo-build-commit] Branch 'ooo/master' - 2 commits - cppu/inc offapi/com offapi/util rdbmaker/inc rdbmaker/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Aug 6 19:54:03 PDT 2009


 cppu/inc/uno/lbnames.h                                     |    7 -
 offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl    |    2 
 offapi/com/sun/star/deployment/XPackage.idl                |   22 ++++-
 offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl |   54 +++++++++++++
 offapi/com/sun/star/deployment/ui/makefile.mk              |    5 -
 offapi/util/checknewapi.pl                                 |   10 +-
 offapi/util/makefile.mk                                    |    3 
 rdbmaker/inc/codemaker/dependency.hxx                      |    1 
 rdbmaker/inc/codemaker/global.hxx                          |    4 
 rdbmaker/source/codemaker/dependency.cxx                   |   29 ------
 10 files changed, 87 insertions(+), 50 deletions(-)

New commits:
commit f4e618822b39336502c8ceea05e4248d8036d8d9
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Aug 6 09:32:55 2009 +0000

    CWS-TOOLING: integrate CWS extmgr01
    2009-07-28 15:37:52 +0200 dv  r274410 : #i103856# Create dialog before using it
    2009-07-27 15:24:42 +0200 dv  r274368 : #i103831# Made selectEntry virtual so the correct function will be used from the listbox with buttons
    2009-07-27 14:17:08 +0200 dv  r274366 : #i103831# Made selectEntry virtual so the correct function will be used from the listbox with buttons
    2009-07-07 08:23:17 +0200 dv  r273765 : #i102666# Extension check on startup after office update -> fixed repaint problem
    2009-07-06 11:28:28 +0200 dv  r273729 : #i102666# Extension check on startup after office update -> fixed Mac OS X issues
    2009-07-02 15:01:35 +0200 dv  r273654 : #i102666# Extension check on startup after office update -> set last checked to never when aborting
    2009-07-01 12:18:52 +0200 dv  r273564 : Removed unused variable
    2009-07-01 07:25:01 +0200 dv  r273542 : #i102666# Extension check on startup after office update -> better layout
    2009-06-30 14:56:16 +0200 dv  r273506 : #i102666# Extension check on startup after office update -> mark incompatible extensions in extension manager
    2009-06-30 12:43:55 +0200 dv  r273502 : CWS-TOOLING: rebase CWS extmgr01 to trunk at 273468 (milestone: DEV300:m51)
    2009-06-29 13:26:54 +0200 dv  r273469 : Now with newline at the end
    2009-06-29 11:54:07 +0200 dv  r273462 : #i102666# Extension check on startup after office update -> exit button of dialog disables extensions, too
    2009-06-26 16:26:02 +0200 dv  r273428 : #i102666# Extension check on startup after office update -> better progress handling
    2009-06-26 14:50:34 +0200 dv  r273417 : fixed crash when shutting down while initial waiting
    2009-06-26 14:46:40 +0200 dv  r273416 : #i102666# Extension check on startup after office update
    2009-06-24 07:30:57 +0200 dv  r273306 : #i102666# Extension check on startup after update
    2009-06-11 12:03:10 +0200 dv  r272863 : #i102666# Extension check on startup after update
    2009-06-11 11:59:29 +0200 dv  r272862 : #i102666# Extension check on startup after update
    2009-06-09 15:50:05 +0200 dv  r272773 : CWS-TOOLING: rebase CWS extmgr01 to trunk at 272291 (milestone: DEV300:m49)

diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index b769471..5ed4e09 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPackage.idl,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -102,6 +99,25 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException);
   
+    /** checks if the dependencies for this package are still satisfied
+
+        After updateing the OpenOffice.org, some dependencies for packages might
+        no longer be satisfied.
+        
+        @since OOo 3.2.0
+
+        @param xCmdEnv
+               command environment for error handling and other interaction.
+
+        @return
+            true - all dependencies are satisfied
+            false - at least one dependency failed.
+     */
+    boolean checkDependencies(
+        [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
+        raises (DeploymentException,
+                com::sun::star::ucb::CommandFailedException);
+  
 
     /** determines whether the package is currently is registered, i.e.
         whether it is active.
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
new file mode 100644
index 0000000..d4af1c0
--- /dev/null
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#if ! defined INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#define INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+
+#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
+#include <com/sun/star/awt/XWindow.idl>
+
+
+module com { module sun { module star { module deployment { module ui {
+
+/** The <type>UpdateRequiredDialog</type> is used to show a list of extensions not compatible with this office version.
+    
+    @since OOo 3.2.0
+*/
+service UpdateRequiredDialog : com::sun::star::ui::dialogs::XExecutableDialog
+{
+    /** Create a GUI using the specific parent window and focus on the
+        given context.
+        
+        @param xParent
+               parent window
+    */
+    create();
+};
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/deployment/ui/makefile.mk b/offapi/com/sun/star/deployment/ui/makefile.mk
index d91d200..f733c76 100644
--- a/offapi/com/sun/star/deployment/ui/makefile.mk
+++ b/offapi/com/sun/star/deployment/ui/makefile.mk
@@ -39,8 +39,9 @@ PACKAGE = com$/sun$/star$/deployment$/ui
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 IDLFILES = \
-        PackageManagerDialog.idl \
-    LicenseDialog.idl
+    PackageManagerDialog.idl \
+    LicenseDialog.idl \
+    UpdateRequiredDialog.idl
 
 .INCLUDE : target.mk
 .INCLUDE : $(PRJ)$/util$/target.pmk
commit 298bb79db32f60a70696bc1bef23b1add052d3ce
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Aug 6 07:01:05 2009 +0000

    CWS-TOOLING: integrate CWS jsc320
    2009-07-31 11:40:04 +0200 jsc  r274518 : #103926# apply patch
    2009-07-16 17:17:01 +0200 jsc  r274063 : #i103311# check new Solaris compiler version ox5100
    2009-07-07 17:20:41 +0200 jsc  r273811 : cleanup
    2009-07-07 15:21:26 +0200 jsc  r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
    2009-07-07 15:07:05 +0200 jsc  r273798 : #i98322# correct link
    2009-07-07 09:43:57 +0200 jsc  r273773 : #i98322# correct link path
    2009-07-06 15:49:07 +0200 jsc  r273749 : #i98322# correct typo
    2009-07-06 14:17:27 +0200 jsc  r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
    2009-07-03 13:54:58 +0200 jsc  r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
    2009-07-02 13:12:02 +0200 jsc  r273643 : #i103260# improve fix by using EXECPOST variable
    2009-07-02 13:11:30 +0200 jsc  r273642 : #i103260# improve fix by using EXECPOST variable
    2009-07-02 13:05:35 +0200 jsc  r273640 : #i103260# correct typo for windows
    2009-07-02 13:01:34 +0200 jsc  r273639 : #i103260# provide regview with path as argument
    2009-07-01 07:18:01 +0200 jsc  r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk at 273468 (milestone: DEV300:m51)
    2009-06-30 08:01:13 +0200 jsc  r273485 : #98322# include import purpenvhelper lib under windows
    2009-06-10 15:07:29 +0200 jsc  r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk at 272291 (milestone: DEV300:m49)
    2009-05-27 09:36:23 +0200 jsc  r272329 : #i98322# create link for purpenvhelper library in SDK
    2009-05-27 09:35:41 +0200 jsc  r272328 : #i98322# create link for purpenvhelpr library in SDK
    2009-05-14 16:19:41 +0200 jsc  r271900 : increase version number in SDK header image
    2009-05-14 16:11:05 +0200 jsc  r271899 : #i101408# new version 3.2
    2009-05-14 15:33:47 +0200 jsc  r271894 : #i99163# apply patch to correct wrong tags for autodoc
    2009-05-14 14:49:58 +0200 jsc  r271889 : #i99707# apply patch to remove unused code

diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h
index f187e5d..4b2eb94 100644
--- a/cppu/inc/uno/lbnames.h
+++ b/cppu/inc/uno/lbnames.h
@@ -46,12 +46,9 @@
 #endif /* (_MSC_VER < 1000) */
 /* sunpro cc */
 #elif defined (__SUNPRO_CC)
-#if (__SUNPRO_CC < 0x500)
-#error "sunpro cc must be at least 5.x"
-provoking error here, because PP ignores #error
-#elif (__SUNPRO_CC < 0x600)
+#if ((__SUNPRO_CC >= 0x5000 && __SUNPRO_CC < 0x6000) || (__SUNPRO_CC >= 0x500 && __SUNPRO_CC < 0x600))
 #define	TMP_CPPU_ENV sunpro5
-#else
+#elif
 #error "sunpro cc version must be 5.x"
 provoking error here, because PP ignores #error
 #endif /* defined (__SUNPRO_CC) */
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index 7d9c6da..2937b92 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -62,7 +62,7 @@ interface XTreeDataModelListener: com::sun::star::lang::XEventListener
         Example: the name of a file has changed, but it is in the same location in the file system.
 
         To indicate the root has changed, <member>TreeDataModelEvent::Nodes</member> will contain
-        the root node and and <member>TreeDataModelEvent::ParentNode</member will be empty.
+        the root node and <member>TreeDataModelEvent::ParentNode</member> will be empty.
     */
     void treeNodesChanged( [in] TreeDataModelEvent Event );
 
diff --git a/offapi/util/checknewapi.pl b/offapi/util/checknewapi.pl
index 6bdb38c..bcfd662 100755
--- a/offapi/util/checknewapi.pl
+++ b/offapi/util/checknewapi.pl
@@ -6,23 +6,25 @@
 # Copyright (c) 2005 Sun Microsystems, Inc.
 #
 
-if($#ARGV != 2)
+if($#ARGV != 3)
 {
-    die "usage: checknewapi <new_type_library> <reference_type_library> <buildinfodescr>\n";
+    die "usage: checknewapi <new_type_library> <reference_type_library> <buildinfodescr> <fullpath_regview>\n";
 }
 
 -e "$ARGV[0]" || die "ERROR: type library \"$ARGV[0]\" does not exist\n";
 -e "$ARGV[1]" || die "ERROR: reference type library \"$ARGV[1]\" does not exist\n";
+-e "$ARGV[3]" || die "ERROR: invalid path to the regview tool \"$ARGV[3]\", please specify the full qualified path\n";
 
 # debug flag
 $DEBUG = 0;
 
 $main::buildinfo = "$ARGV[2]";
+$main::regview = "$ARGV[3]";
 %{$main::reftypes} = ();
 %{$main::currenttypes} = ();
 %{$main::removedtypes} = ();
 
-open ( FILEIN, "regview \"$ARGV[0]\" |" ) || die "could not use content of current typelibrary \"$ARGV[0]\", regview doesn't work\n";
+open ( FILEIN, "$main::regview \"$ARGV[0]\" |" ) || die "could not use content of current typelibrary \"$ARGV[0]\", regview doesn't work\n";
 
 if ($DEBUG == 1)
 {
@@ -74,7 +76,7 @@ while (<FILEIN>)
 close( FILEIN );
 close( CURRENT );
 
-open ( FILEIN, "regview \"$ARGV[1]\" |" ) || die "could not use content of reference type library \"$ARGV[1]\", regview doesn't work\n";
+open ( FILEIN, "$main::regview \"$ARGV[1]\" |" ) || die "could not use content of reference type library \"$ARGV[1]\", regview doesn't work\n";
 
 if ($DEBUG == 1)
 {
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 6e4a415..52b6324 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -152,6 +152,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
 
 UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
 
+REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)
 
 # --- Targets ------------------------------------------------------
 
@@ -183,6 +184,6 @@ $(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
 #JSC: new target to prepare some UNO type statistics, the ouput will be later used
 #     for versioning of UNO cli type libraries
 $(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
-    $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+    $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@
 
 .INCLUDE :  target.mk
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index eb71acb..54f9a48 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -154,7 +154,6 @@ public:
 
     sal_Bool 		insert(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
     TypeUsingSet	getDependencies(const ::rtl::OString& type);
-    sal_Bool 		lookupDependency(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
     sal_Bool		hasDependencies(const ::rtl::OString& type);
 
     void		setGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);
diff --git a/rdbmaker/inc/codemaker/global.hxx b/rdbmaker/inc/codemaker/global.hxx
index 5879626..dce729f 100644
--- a/rdbmaker/inc/codemaker/global.hxx
+++ b/rdbmaker/inc/codemaker/global.hxx
@@ -75,10 +75,6 @@ typedef ::std::set< ::rtl::OString, LessString > 	StringSet;
 ::rtl::OString makeTempName();
 
 const ::rtl::OString inGlobalSet(const ::rtl::OUString & r);
-inline const ::rtl::OString inGlobalSet(sal_Char* p)
-{
-    return inGlobalSet( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(p) ) );
-}
 
 ::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName);
 
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index e5b5139..c3d61e2 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -100,35 +100,6 @@ TypeUsingSet TypeDependency::getDependencies(const OString& type)
     return TypeUsingSet();
 }	
 
-sal_Bool TypeDependency::lookupDependency(const OString& type, const OString& depend, sal_uInt16 use)
-{
-    sal_Bool ret =  sal_False;
-    
-    if (type.getLength() > 0 && depend.getLength() > 0)
-    {
-        if (m_pImpl->m_dependencies.count(type) > 0)
-        {
-            TypeUsingSet::const_iterator iter = m_pImpl->m_dependencies[type].begin();
-
-            while (iter != m_pImpl->m_dependencies[type].end())
-            {
-                if (depend == (*iter).m_type &&
-                    (use & (*iter).m_use))
-                {
-                    ret = sal_True;
-                    break;					
-                }
-                iter++;
-            }
-        } else
-        {
-            ret = sal_False;
-        }
-    }
-    
-    return ret;
-}	
-
 sal_Bool TypeDependency::hasDependencies(const OString& type)
 {
     if (type.getLength() > 0)


More information about the ooo-build-commit mailing list