diff options
| -rw-r--r-- | cppu/inc/uno/lbnames.h | 7 | ||||
| -rw-r--r-- | offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl | 2 | ||||
| -rwxr-xr-x | offapi/util/checknewapi.pl | 10 | ||||
| -rw-r--r-- | offapi/util/makefile.mk | 3 | ||||
| -rw-r--r-- | rdbmaker/inc/codemaker/dependency.hxx | 1 | ||||
| -rw-r--r-- | rdbmaker/inc/codemaker/global.hxx | 4 | ||||
| -rw-r--r-- | rdbmaker/source/codemaker/dependency.cxx | 29 |
7 files changed, 11 insertions, 45 deletions
diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index 27a6f1094a0a..481180fda953 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 81e98b301954..8ea308f69a6f 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 9c810d695461..e3141cda0737 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 6e4a41503a56..52b63249839a 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 c0fff9da7c7d..648564d8f50b 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 df1f588f5ffc..26133477dfa0 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 091b379aa298..692184a8be3f 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) |