autodoc/source/ary/cpp/namechain.cxx | 4 - autodoc/source/display/html/easywri.cxx | 2 autodoc/source/display/inc/toolkit/outputstack.hxx | 2 autodoc/source/parser/cpp/sownstck.hxx | 4 - autodoc/source/parser_i/idl/distrib.cxx | 2 autodoc/source/parser_i/idl/pe_excp.cxx | 2 autodoc/source/parser_i/idl/pe_iface.cxx | 2 autodoc/source/parser_i/idl/pe_servi.cxx | 2 autodoc/source/parser_i/idl/pe_singl.cxx | 2 autodoc/source/parser_i/idl/pe_struc.cxx | 2 instsetoo_native/util/openoffice.lst | 44 --------------------- solenv/bin/modules/installer/windows/directory.pm | 5 -- 12 files changed, 12 insertions(+), 61 deletions(-)
New commits: commit 28bfac1cfd0d53afb4104ec71cfdab0c9de00e91 Author: Andre Fischer <a...@apache.org> Date: Thu Nov 21 09:27:16 2013 +0000 123729: Removed more (now unused) references to building URE. diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 3b0bb5d..0d82994 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -239,48 +239,6 @@ Apache_OpenOffice_Dev } } -URE -{ - Settings - { - downloadname URE_{productversion}_{os}_install_{languages} - variables - { - FULLPRODUCTNAME URE - PRODUCTNAME URE - PRODUCTVERSION 4.1.0 - PACKAGEVERSION 4.1 - PACKAGEREVISION 1 - PRODUCTEXTENSION - LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION - LICENSENAME ALv2 - SETSTATICPATH 1 - NOVERSIONINDIRNAME 1 - PCPFILENAME ure.pcp - POOLPRODUCT 0 - GLOBALFILEGID gid_File_Dl_Cppu - DOWNLOADBANNER urebanner.bmp - DOWNLOADBITMAP urebitmap.bmp - DOWNLOADSETUPICO ooosetup.ico - DONTUSESTARTMENUFOLDER 1 - RELATIVE_PATHES_IN_DDF 1 - NOLANGUAGESELECTIONPRODUCT 1 - AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE - STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/ - STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://templates.openoffice.org - STARTCENTER_LAYOUT_STYLE 0 - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst - PACKAGEMAP package_names_ext.txt - DICT_REPO_URL http://extensions.openoffice.org/dictionaries - } - active 1 - compression 5 - script ure - include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS - } -} Apache_OpenOffice_SDK { @@ -307,7 +265,6 @@ Apache_OpenOffice_SDK NO_README_IN_ROOTDIR 1 LICENSENAME ALv2 IGNOREDIRECTORYLAYER 1 - NOVERSIONINDIRNAME 0 NOSPACEINDIRECTORYNAME 1 NOLANGUAGESELECTIONPRODUCT 1 CHANGETARGETDIR 1 @@ -362,7 +319,6 @@ Apache_OpenOffice_Dev_SDK NO_README_IN_ROOTDIR 1 LICENSENAME ALv2 IGNOREDIRECTORYLAYER 1 - NOVERSIONINDIRNAME 0 NOSPACEINDIRECTORYNAME 1 NOLANGUAGESELECTIONPRODUCT 1 CHANGETARGETDIR 1 diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 5c9e5c7..e1ee953 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -468,11 +468,6 @@ sub add_root_directories $productkey = $productkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; $realproductkey = $realproductkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; } - if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} ) - { - $productkey = $productname; - $realproductkey = $realproductname; - } if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} ) { $productkey =~ s/\ /\_/g; commit 0a9937223c150bd685460b0baa0c9803e0a1db39 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Nov 21 08:11:47 2013 +0000 #122853# replace slist size>0 with not empty diff --git a/autodoc/source/ary/cpp/namechain.cxx b/autodoc/source/ary/cpp/namechain.cxx index 9a8df2e..549a5c8 100644 --- a/autodoc/source/ary/cpp/namechain.cxx +++ b/autodoc/source/ary/cpp/namechain.cxx @@ -129,7 +129,7 @@ NameChain::Add_Segment( const char * i_sSeg ) List_TplParameter & NameChain::Templatize_LastSegment() { - csv_assert( aSegments.size() > 0 ); + csv_assert( ! aSegments.empty() ); return aSegments.back().AddTemplate(); } @@ -158,7 +158,7 @@ NameChain::Compare( const NameChain & i_rChain ) const const String & NameChain::LastSegment() const { - if ( aSegments.size() > 0 ) + if ( ! aSegments.empty() ) return aSegments.back().Name(); return String::Null_(); } diff --git a/autodoc/source/display/html/easywri.cxx b/autodoc/source/display/html/easywri.cxx index ee9a58d..e6e4c43 100644 --- a/autodoc/source/display/html/easywri.cxx +++ b/autodoc/source/display/html/easywri.cxx @@ -53,7 +53,7 @@ EasyWriter::Finish_OutputNode() csi::xml::Element & EasyWriter::Out() { - csv_assert( aCurDestination.size() > 0); + csv_assert( ! aCurDestination.empty() ); return *aCurDestination.top(); } diff --git a/autodoc/source/display/inc/toolkit/outputstack.hxx b/autodoc/source/display/inc/toolkit/outputstack.hxx index e43bcd9..ab7309a 100644 --- a/autodoc/source/display/inc/toolkit/outputstack.hxx +++ b/autodoc/source/display/inc/toolkit/outputstack.hxx @@ -57,7 +57,7 @@ class OutputStack inline csi::xml::Element & OutputStack::Out() const { - csv_assert( aCurDestination.size() > 0 ); + csv_assert( ! aCurDestination.empty() ); return *aCurDestination.top(); } diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx index ca3a1fa..d0abb22 100644 --- a/autodoc/source/parser/cpp/sownstck.hxx +++ b/autodoc/source/parser/cpp/sownstck.hxx @@ -113,7 +113,7 @@ inline ary::cpp::Namespace & ContextForAry:: S_OwnerStack::CurNamespace() const { - csv_assert( aStack_Namespaces.size() > 0 ); + csv_assert( ! aStack_Namespaces.empty() ); return *aStack_Namespaces.top(); } @@ -204,7 +204,7 @@ inline void ContextForAry:: S_OwnerStack::SetCurProtection( ary::cpp::E_Protection i_eProtection ) { - csv_assert( aStack_Classes.size() > 0 ); + csv_assert( ! aStack_Classes.empty() ); aStack_Classes.top().second = i_eProtection; } diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx index ee1a7ef..392331a 100644 --- a/autodoc/source/parser_i/idl/distrib.cxx +++ b/autodoc/source/parser_i/idl/distrib.cxx @@ -129,7 +129,7 @@ if (DEBUG_ShowTokens()) UnoIDL_PE & TokenDistributor::ProcessingData::CurEnvironment() const { - csv_assert(aEnvironments.size() > 0); + csv_assert(!aEnvironments.empty()); csv_assert(aEnvironments.back().first != 0); return *aEnvironments.back().first; diff --git a/autodoc/source/parser_i/idl/pe_excp.cxx b/autodoc/source/parser_i/idl/pe_excp.cxx index bfb2b82..6ee4120 100644 --- a/autodoc/source/parser_i/idl/pe_excp.cxx +++ b/autodoc/source/parser_i/idl/pe_excp.cxx @@ -83,7 +83,7 @@ PE_Exception::TransferData() { if (NOT Work().bIsPreDeclaration) { - csv_assert(Work().sData_Name.size() > 0); + csv_assert(! Work().sData_Name.empty()); csv_assert(Work().nCurStruct.IsValid()); } Stati().pCurStatus = &Stati().aNone; diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx index d7f6369..64e0b91 100644 --- a/autodoc/source/parser_i/idl/pe_iface.cxx +++ b/autodoc/source/parser_i/idl/pe_iface.cxx @@ -395,7 +395,7 @@ PE_Interface::TransferData() { if (NOT bIsPreDeclaration) { - csv_assert(sData_Name.size() > 0); + csv_assert(!sData_Name.empty()); csv_assert(nCurInterface.IsValid()); } else diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx index 8801ed6..2de2044 100644 --- a/autodoc/source/parser_i/idl/pe_servi.cxx +++ b/autodoc/source/parser_i/idl/pe_servi.cxx @@ -304,7 +304,7 @@ PE_Service::TransferData() { if (NOT bIsPreDeclaration) { - csv_assert(sData_Name.size() > 0); + csv_assert(! sData_Name.empty()); csv_assert( (pCurService != 0) != (pCurSiService != 0) ); } diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx index 4856e7f..262eaa2 100644 --- a/autodoc/source/parser_i/idl/pe_singl.cxx +++ b/autodoc/source/parser_i/idl/pe_singl.cxx @@ -225,7 +225,7 @@ PE_Singleton::TransferData() { if (NOT bIsPreDeclaration) { - csv_assert(sData_Name.size() > 0); + csv_assert(! sData_Name.empty()); csv_assert( (pCurSingleton != 0) != (pCurSiSingleton != 0) ); } diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx index 455596d..9ba039a 100644 --- a/autodoc/source/parser_i/idl/pe_struc.cxx +++ b/autodoc/source/parser_i/idl/pe_struc.cxx @@ -82,7 +82,7 @@ PE_Struct::TransferData() { if (NOT Work().bIsPreDeclaration) { - csv_assert(Work().sData_Name.size() > 0); + csv_assert(! Work().sData_Name.empty()); csv_assert(Work().nCurStruct.IsValid()); } Stati().pCurStatus = &Stati().aNone;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits