Modified: openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx (original) +++ openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx Wed Mar 19 10:14:42 2014 @@ -71,6 +71,12 @@ SidebarDockingWindow::~SidebarDockingWin void SidebarDockingWindow::DoDispose (void) { + Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY); + mpSidebarController.clear(); + if (xComponent.is()) + { + xComponent->dispose(); + } }
Modified: openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx (original) +++ openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx Wed Mar 19 10:14:42 2014 @@ -198,7 +198,7 @@ void TabBar::Layout (void) Theme::GetInteger(Theme::Int_TabItemHeight)); // Place the menu button and the separator. - if (mpMenuButton != NULL) + if( bool(mpMenuButton)) { mpMenuButton->SetPosSizePixel( Point(nX,nY), Modified: openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx (original) +++ openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx Wed Mar 19 10:14:42 2014 @@ -494,7 +494,7 @@ namespace /* private */ { </RecentFiles> */ -extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& mime_type) +extern "C" void SAL_DLLPUBLIC_EXPORT add_to_recently_used_file_list( const rtl::OUString& file_url, const rtl::OUString& mime_type) { try { Modified: openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx Wed Mar 19 10:14:42 2014 @@ -157,7 +157,7 @@ namespace slideshow } } - return mpSprite; + return (mpSprite.get() != NULL); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) Modified: openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx Wed Mar 19 10:14:42 2014 @@ -154,7 +154,7 @@ void BaseContainerNode::showState() cons for( std::size_t i=0; i<maChildren.size(); ++i ) { BaseNodeSharedPtr pNode = - boost::shared_dynamic_cast<BaseNode>(maChildren[i]); + boost::dynamic_pointer_cast<BaseNode>(maChildren[i]); VERBOSE_TRACE( "Node connection: n0x%X -> n0x%X", (const char*)this+debugGetCurrentOffset(), Modified: openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx Wed Mar 19 10:14:42 2014 @@ -184,7 +184,7 @@ namespace slideshow } } - return io_rCacheEntry.mpRenderer; + return (io_rCacheEntry.mpRenderer.get() != NULL); } bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, Modified: openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapesubset.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapesubset.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapesubset.cxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapesubset.cxx Wed Mar 19 10:14:42 2014 @@ -110,7 +110,7 @@ namespace slideshow maTreeNode ); } - return mpSubsetShape; + return (mpSubsetShape.get() != NULL); } void ShapeSubset::disableSubsetShape() Modified: openoffice/branches/alg_writerframes/main/slideshow/source/engine/slide/slideanimations.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/slide/slideanimations.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/engine/slide/slideanimations.cxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/engine/slide/slideanimations.cxx Wed Mar 19 10:14:42 2014 @@ -80,7 +80,7 @@ namespace slideshow SHOW_NODE_TREE( mpRootNode ); - return mpRootNode; + return (mpRootNode.get() != NULL); } bool SlideAnimations::isAnimated() const Modified: openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayer.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayer.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayer.hxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayer.hxx Wed Mar 19 10:14:42 2014 @@ -471,7 +471,7 @@ namespace slideshow // ShapeAttributeLayer(const ShapeAttributeLayer&); // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); - bool haveChild() const { return mpChild; } + bool haveChild() const { return (mpChild.get() != NULL); } void updateStateIds(); template< typename T > T calcValue( const T& rCurrValue, Modified: openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayerholder.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayerholder.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayerholder.hxx (original) +++ openoffice/branches/alg_writerframes/main/slideshow/source/inc/shapeattributelayerholder.hxx Wed Mar 19 10:14:42 2014 @@ -87,7 +87,7 @@ namespace slideshow if( mpShape ) mpAttributeLayer = mpShape->createAttributeLayer(); - return mpAttributeLayer; + return (mpAttributeLayer.get() != NULL); } ShapeAttributeLayerSharedPtr get() const Modified: openoffice/branches/alg_writerframes/main/solenv/bin/make_installer.pl URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/make_installer.pl?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/make_installer.pl (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/make_installer.pl Wed Mar 19 10:14:42 2014 @@ -1493,6 +1493,8 @@ if ( $installer::globals::iswindowsbuild #################################################################### if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /OpenOffice_Dev/)) { $installer::globals::devsnapshotbuild = 1; } +if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /Apache_OpenOffice_Beta/)) { $installer::globals::betabuild = 1; } + ##################################################################### # Including additional inc files for variable settings, if defined ##################################################################### @@ -1576,7 +1578,10 @@ if (( ! $allvariableshashref->{'XPDINSTA if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); } if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); } -if (($installer::globals::devsnapshotbuild)) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); } +if ($installer::globals::devsnapshotbuild) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); } +if ($installer::globals::betabuild) { installer::scriptitems::use_beta_copy_scpaction($scpactionsinproductarrayref); } + +if ($installer::globals::betabuild && $installer::globals::languagepack) { installer::scriptitems::use_langbeta_copy_scpaction($scpactionsinproductarrayref); } # $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref); @@ -1711,16 +1716,37 @@ for (;1;last) if ($installer::globals::is_release && $installer::globals::iswindowsbuild) { - $installer::logger::Info->printf("preparing MSI object for source version %s\n", - $installer::globals::source_version); - my $source_version_string = join( - "", - installer::patch::Version::StringToNumberArray($installer::globals::source_version)); - $installer::globals::source_msi = installer::patch::Msi->FindAndCreate( - $installer::globals::source_version, - 0, - $$languagestringref, - $installer::globals::product); + my $releases = installer::patch::ReleasesList::Instance()->{$installer::globals::source_version}; + if ( ! defined $releases) + { + $installer::logger::Info->printf( + "there is no recorded information about previous version %s\n", + $installer::globals::source_version); + $installer::logger::Info->printf(" reverting to non-release build\n"); + $installer::globals::is_release = 0; + } + elsif ( ! defined $releases->{'msi'}->{installer::languages::get_normalized_language($$languagestringref)}) + { + $installer::logger::Info->printf( + "there is no recorded information about language '%s' in previous version %s\n", + $$languagestringref, + $installer::globals::source_version); + $installer::logger::Info->printf(" reverting to non-release build\n"); + $installer::globals::is_release = 0; + } + else + { + $installer::logger::Info->printf("preparing MSI object for source version %s\n", + $installer::globals::source_version); + my $source_version_string = join( + "", + installer::patch::Version::StringToNumberArray($installer::globals::source_version)); + $installer::globals::source_msi = installer::patch::Msi->FindAndCreate( + $installer::globals::source_version, + 0, + $$languagestringref, + $installer::globals::product); + } } ############################################################ Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/download.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/download.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/download.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/download.pm Wed Mar 19 10:14:42 2014 @@ -669,11 +669,6 @@ sub get_install_type $type = $type . "-arc"; } - if (( $allvariables->{'WITHJREPRODUCT'} ) && ( $allvariables->{'WITHJREPRODUCT'} == 1 )) - { - $type = $type . "-wJRE"; - } - } return $type; @@ -689,8 +684,6 @@ sub get_downloadname_addon if ( $installer::globals::islinuxdebbuild ) { $addon = $addon . "_deb"; } - if ( $installer::globals::product =~ /_wJRE\s*$/ ) { $addon = "_wJRE"; } - return $addon; } @@ -829,13 +822,16 @@ sub resolve_variables_in_downloadname # Typical name: soa-{productversion}-{extension}-bin-{os}-{languages} - my $productversion = $allvariables->{'PRODUCTVERSION'} // ""; + my $productversion = $allvariables->{'PRODUCTVERSION'}; + $productversion = "" unless defined $productversion; $downloadname =~ s/\{productversion\}/$productversion/; - my $packageversion = $allvariables->{'PACKAGEVERSION'} // ""; + my $packageversion = $allvariables->{'PACKAGEVERSION'}; + $packageversion = "" unless defined $packageversion; $downloadname =~ s/\{packageversion\}/$packageversion/; - my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'} // ""; + my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; + $extension = "" unless defined $extension; $extension = lc($extension); $downloadname =~ s/\{extension\}/$extension/; @@ -1047,11 +1043,12 @@ sub put_setup_ico_into_template sub put_publisher_into_template ($$) { - my ($templatefile, $variables) = @_; + my ($templatefile, $variables) = @_; - my $publisher = $variables->{'OOOVENDOR'} // ""; + my $publisher = $variables->{'OOOVENDOR'}; + $publisher = "" unless defined $publisher; - replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher); + replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher); } ################################################################## @@ -1060,11 +1057,12 @@ sub put_publisher_into_template ($$) sub put_website_into_template ($$) { - my ($templatefile, $variables) = @_; + my ($templatefile, $variables) = @_; - my $website = $variables->{'STARTCENTER_INFO_URL'} // ""; + my $website = $variables->{'STARTCENTER_INFO_URL'}; + $website = "" unless defined $website; - replace_one_variable($templatefile, "WEBSITEPLACEHOLDER", $website); + replace_one_variable($templatefile, "WEBSITEPLACEHOLDER", $website); } ################################################################## Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/globals.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/globals.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/globals.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/globals.pm Wed Mar 19 10:14:42 2014 @@ -156,7 +156,7 @@ BEGIN $fontsfoldername = "Fonts"; $fontsdirparent = ""; $fontsdirhostname = "truetype"; - $fontsdirname = $fontsdirhostname; + $fontsdirname = ""; $officefolder = "OfficeFolder"; $officemenufolder = "OfficeMenuFolder"; $startupfolder = "StartupFolder"; @@ -334,6 +334,7 @@ BEGIN $addchildprojects = 0; $languagepack = 0; $devsnapshotbuild = 0; + $betabuild = 0; $tab = 0; $patch = 0; $patchincludepath = ""; Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/parameter.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/parameter.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/parameter.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/parameter.pm Wed Mar 19 10:14:42 2014 @@ -285,7 +285,7 @@ sub setglobalvariables } } - if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ )) + if( $installer::globals::compiler =~ /unxmac/ ) { $installer::globals::ismacbuild = 1; Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/scriptitems.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/scriptitems.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/scriptitems.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/scriptitems.pm Wed Mar 19 10:14:42 2014 @@ -763,6 +763,36 @@ sub use_patch_hostname } ################################################################################ +# Using beta copy action for beta builds +################################################################################ + +sub use_beta_copy_scpaction +{ + my ($scpactionsref) = @_; + + for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ ) + { + my $onescpaction = ${$scpactionsref}[$i]; + if (( $onescpaction->{'BetaCopy'} ) && ( $onescpaction->{'BetaCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'BetaCopy'}; } + } +} + +################################################################################ +# Using langpack beta copy action for language packs +################################################################################ + +sub use_langbeta_copy_scpaction +{ + my ($scpactionsref) = @_; + + for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ ) + { + my $onescpaction = ${$scpactionsref}[$i]; + if (( $onescpaction->{'LangBetaCopy'} ) && ( $onescpaction->{'LangBetaCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'LangBetaCopy'}; } + } +} + +################################################################################ # Using langpack copy action for language packs ################################################################################ Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/systemactions.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/systemactions.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/systemactions.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/systemactions.pm Wed Mar 19 10:14:42 2014 @@ -490,7 +490,7 @@ sub copy_one_file } else { - $infoline = "ERROR: Could not copy $source to $dest\n"; + $infoline = "ERROR: Could not copy #$source# to $dest\n"; $returnvalue = 0; } Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/component.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/component.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/component.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/component.pm Wed Mar 19 10:14:42 2014 @@ -104,64 +104,65 @@ sub get_file_component_directory_for_fil { my ($onefile, $dirref) = @_; - my $localstyles = $onefile->{'Styles'} // ""; - - if ( $localstyles =~ /\bFONT\b/ ) # special handling for font files - { - return $installer::globals::fontsfolder; - } - - my $destdir = ""; - - if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; } + my $localstyles = $onefile->{'Styles'}; + $localstyles = "" unless defined $localstyles; + + if ( $localstyles =~ /\bFONT\b/ ) # special handling for font files + { + return $installer::globals::fontsfolder; + } + + my $destdir = ""; + + if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; } - if ( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) # special handling for shellnew files - { - return $installer::globals::templatefolder; - } + if ( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) # special handling for shellnew files + { + return $installer::globals::templatefolder; + } - my $destination = $onefile->{'destination'}; - - installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination); + my $destination = $onefile->{'destination'}; + + installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination); - $destination =~ s/\Q$installer::globals::separator\E\s*$//; + $destination =~ s/\Q$installer::globals::separator\E\s*$//; - # This path has to be defined in the directory collection at "HostName" + # This path has to be defined in the directory collection at "HostName" my $uniquedir = undef; - if ($destination eq "") # files in the installation root - { - $uniquedir = "INSTALLLOCATION"; - } - else - { - my $found = 0; + if ($destination eq "") # files in the installation root + { + $uniquedir = "INSTALLLOCATION"; + } + else + { + my $found = 0; foreach my $directory (@$dirref) - { - if ($directory->{'HostName'} eq $destination) - { - $found = 1; + { + if ($directory->{'HostName'} eq $destination) + { + $found = 1; $uniquedir = $directory->{'uniquename'}; - last; - } - } + last; + } + } - if ( ! $found) - { - installer::exiter::exit_program( + if ( ! $found) + { + installer::exiter::exit_program( "ERROR: Did not find destination $destination in directory collection", "get_file_component_directory"); - } + } - if ( $uniquedir eq $installer::globals::officeinstalldirectory ) - { - $uniquedir = "INSTALLLOCATION"; - } + if ( $uniquedir eq $installer::globals::officeinstalldirectory ) + { + $uniquedir = "INSTALLLOCATION"; } + } - $onefile->{'uniquedirname'} = $uniquedir; # saving it in the file collection + $onefile->{'uniquedirname'} = $uniquedir; # saving it in the file collection - return $uniquedir + return $uniquedir } ############################################################## Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/directory.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/directory.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/directory.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/directory.pm Wed Mar 19 10:14:42 2014 @@ -366,7 +366,8 @@ sub create_unique_directorynames ($) { next if defined $directory->{'uniquename'}; - my $styles = $directory->{'Styles'} // ""; + my $styles = $directory->{'Styles'}; + $styles = "" unless defined $styles; my ($originaluniquename, $uniquename) = get_unique_name( $directory->{'HostName'}, Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/feature.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/feature.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/feature.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/feature.pm Wed Mar 19 10:14:42 2014 @@ -372,7 +372,8 @@ sub prepare_feature_table ($$$) foreach my $onefeature (@$modules) { # Java and Ada only, if the correct settings are set - my $styles = $onefeature->{'Styles'} // ""; + my $styles = $onefeature->{'Styles'}; + $styles = "" unless defined $styles; if (( $styles =~ /\bJAVAMODULE\b/ ) && ( ! ($variables->{'JAVAPRODUCT'} ))) { next; } # Controlling the language! Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/msiglobal.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/msiglobal.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/msiglobal.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/msiglobal.pm Wed Mar 19 10:14:42 2014 @@ -169,7 +169,8 @@ sub generate_cab_file_list ($$$$) write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); foreach my $onefile (@sorted_files) { - my $styles = $onefile->{'Styles'} // ""; + my $styles = $onefile->{'Styles'}; + $styles = "" unless defined $styles; if ($styles =~ /\bDONT_PACK\b/) { $installer::logger::Lang->printf(" excluding '%s' from ddf\n", $onefile->{'uniquename'}); @@ -1511,7 +1512,11 @@ sub get_source_codes ($) { my ($languagesref) = @_; - if ( ! defined $installer::globals::source_version) + if ( ! $installer::globals::is_release) + { + return (undef, undef); + } + elsif ( ! defined $installer::globals::source_version) { $installer::logger::Lang->printf("no source version defined\n"); return (undef, undef); Modified: openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/registry.pm URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/registry.pm?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/registry.pm (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/modules/installer/windows/registry.pm Wed Mar 19 10:14:42 2014 @@ -84,7 +84,8 @@ sub get_registry_component_name # Previously that was the full version number as provided by 'PRODUCTVERSION'. # But MSI patches introduce the restriction that component names must not change. # Use just the major version number. - my $version = $allvariables->{"BRANDPACKAGEVERSION"} // ""; + my $version = $allvariables->{"BRANDPACKAGEVERSION"}; + $version = "" unless defined $version; $addon .= $version; $addon = lc($addon); $addon =~ s/ //g; @@ -386,7 +387,8 @@ sub prepare_registry_table ($$$) $registry{'Component_'} = $component_name; # Collecting all components with DONT_DELETE style - my $style = $oneregistry->{'Styles'} // ""; + my $style = $oneregistry->{'Styles'}; + $style = "" unless defined $style; $registry{'styles'} = $style; if ( $style =~ /\bDONT_DELETE\b/ ) Modified: openoffice/branches/alg_writerframes/main/solenv/bin/patch_tool.pl URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/patch_tool.pl?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/patch_tool.pl (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/patch_tool.pl Wed Mar 19 10:14:42 2014 @@ -1549,7 +1549,14 @@ sub CreatePcp ($$$$$$%) # Create filenames. my $pcp_filename = File::Spec->catfile($msp_path, "openoffice.pcp"); - my $msp_filename = File::Spec->catfile($msp_path, "openoffice.msp"); + # Create basename to include product name and source and target version. + # Hard code platform because that is the only platform supported at the moment. + my $msp_basename = sprintf("%s_%s-%s_Win_x86_patch_%s.msp", + $context->{'product-name'}, + $source_msi->{'version'}, + $target_msi->{'version'}, + $context->{'language'}); + my $msp_filename = File::Spec->catfile($msp_path, $msp_basename); # Setup msp path and filename. unlink($pcp_filename) if -f $pcp_filename; Modified: openoffice/branches/alg_writerframes/main/solenv/bin/release_prepare.pl URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/release_prepare.pl?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/release_prepare.pl (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/release_prepare.pl Wed Mar 19 10:14:42 2014 @@ -115,17 +115,31 @@ sub ProcessLanguage ($$$$$) $installer::logger::Info->printf("%s\n", $language); $installer::logger::Info->increase_indentation(); - # For every language we need - # 1. have downloadable installation set available (download if missing) - # 2. unpack it to get access to .cab and .msi - # 3. unpack .cab so that msimsp.exe can be run - - installer::patch::InstallationSet::ProvideUnpackedCab( - $version, - $is_current_version, - $language, - $package_format, - $product_name); + if ( ! defined installer::patch::ReleasesList::Instance() + ->{$version} + ->{$package_format} + ->{$language}) + { + $installer::logger::Info->printf( + "there is no recorded information about language '%s' in version '%s'\n", + $language, + $version); + $installer::logger::Info->printf(" skipping\n"); + } + else + { + # For every language we need + # 1. have downloadable installation set available (download if missing) + # 2. unpack it to get access to .cab and .msi + # 3. unpack .cab so that msimsp.exe can be run + + installer::patch::InstallationSet::ProvideUnpackedCab( + $version, + $is_current_version, + $language, + $package_format, + $product_name); + } $installer::logger::Info->decrease_indentation(); } Modified: openoffice/branches/alg_writerframes/main/solenv/bin/srcrelease.xml URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/bin/srcrelease.xml?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/bin/srcrelease.xml (original) +++ openoffice/branches/alg_writerframes/main/solenv/bin/srcrelease.xml Wed Mar 19 10:14:42 2014 @@ -27,7 +27,7 @@ <property name="out.dir" value="."/> <property name="aoo.name" value="apache-openoffice"/> <property name="aoo.short.name" value="aoo"/> - <property name="aoo.ver" value="4.0.0"/> + <property name="aoo.ver" value="4.1.0"/> <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" /> <property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/> Modified: openoffice/branches/alg_writerframes/main/solenv/gbuild/platform/macosx.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/gbuild/platform/macosx.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/gbuild/platform/macosx.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/gbuild/platform/macosx.mk Wed Mar 19 10:14:42 2014 @@ -22,7 +22,8 @@ GUI := UNX -COM := GCC +COM := S5ABI +COMID := s5abi #COM := S5ABI #COMID := s5abi @@ -58,19 +59,21 @@ gb_OSDEFS := \ gb_COMPILERDEFS := \ -D$(COM) \ -DHAVE_GCC_VISIBILITY_FEATURE \ - -DCPPU_ENV=gcc3 \ + -DCPPU_ENV=$(COMID) \ -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \ ifeq ($(CPUNAME),POWERPC) gb_CPUDEFS := -DPOWERPC -DPPC -else +else ifeq ($(CPUNAME),INTEL) gb_CPUDEFS := -DX86 +else ifeq ($(CPUNAME),X86_64) +gb_CPUDEFS := -DX86_64 endif ifeq ($(strip $(SYSBASE)),) -gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk + gb_SDKDIR := $(MACOSX_SDK_PATH) else -gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk + gb_SDKDIR := $(SYSBASE)/MacOSX$(MACOSX_DEPLOYMENT_TARGET).sdk endif @@ -98,16 +101,20 @@ gb_CXXFLAGS := \ -fno-common \ -fno-strict-aliasing \ -fsigned-char \ - -malign-natural \ - -pipe \ - #-Wshadow \ break in compiler headers already - #-fsigned-char \ might be removed? - #-malign-natural \ might be removed? + -pipe + +ifneq ($(COM),GCC) + gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/ +endif # these are to get g++ to switch to Objective-C++ mode # (see toolkit module for a case where it is necessary to do it this way) gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions +ifneq ($(MACOSX_DEPLOYMENT_TARGET),) + gb_CXXFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_$(subst .,_,$(MACOSX_DEPLOYMENT_TARGET)) +endif + ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) gb_CFLAGS_WERROR := -Werror gb_CXXFLAGS_WERROR := -Werror @@ -115,12 +122,15 @@ endif gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ - -fexceptions \ - -fno-enforce-eh-specs \ + -fexceptions + +ifeq ($(COM),GCC) + gb_LinkTarget_EXCEPTIONFLAGS += -fno-enforce-eh-specs +endif gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ - -fno-exceptions \ + -fno-exceptions gb_LinkTarget_LDFLAGS := \ -Wl,-syslibroot,$(gb_SDKDIR) \ @@ -302,7 +312,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamicli gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .dylib -gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) +gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) Modified: openoffice/branches/alg_writerframes/main/solenv/inc/_tg_app.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/_tg_app.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/_tg_app.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/_tg_app.mk Wed Mar 19 10:14:42 2014 @@ -19,7 +19,7 @@ # # ************************************************************* -CC_PATH*="" +CC_PATH*="$(CC_PATH)" # unroll begin Modified: openoffice/branches/alg_writerframes/main/solenv/inc/libs.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/libs.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/libs.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/libs.mk Wed Mar 19 10:14:42 2014 @@ -125,7 +125,6 @@ RMCXTLIB=-lrmcxt .ENDIF # "$(GUI)$(COM)"=="WNTGCC" BTSTRPLIB=-lbtstrp BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX) -SOLDEPLIB=-lsoldep$(DLLPOSTFIX) TRANSEXLIB=-ltransex OTXLIB=-lotx_ind OSXLIB=-losx @@ -393,7 +392,6 @@ FWELIB=ifwe.lib FWILIB=ifwi.lib BTSTRPLIB=btstrp.lib BTSTRPDTLIB=bootstrpdt.lib -SOLDEPLIB=soldep.lib TRANSEXLIB=transex.lib ICOLIB=icom.lib SVTOOLLIB=svtool.lib Modified: openoffice/branches/alg_writerframes/main/solenv/inc/minor.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/minor.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/minor.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/minor.mk Wed Mar 19 10:14:42 2014 @@ -19,7 +19,7 @@ # # ************************************************************* RSCVERSION=410 -RSCREVISION=410m1(Build:9750) -BUILD=9750 -LAST_MINOR=m1 +RSCREVISION=410m14(Build:9760) +BUILD=9760 +LAST_MINOR=m14 SOURCEVERSION=AOO410 Modified: openoffice/branches/alg_writerframes/main/solenv/inc/tg_app.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/tg_app.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/tg_app.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/tg_app.mk Wed Mar 19 10:14:42 2014 @@ -19,7 +19,7 @@ # #************************************************************** -CC_PATH*="" +CC_PATH*="$(CC_PATH)" ####################################################### # instructions for linking Modified: openoffice/branches/alg_writerframes/main/solenv/inc/tg_compv.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/tg_compv.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/tg_compv.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/tg_compv.mk Wed Mar 19 10:14:42 2014 @@ -35,9 +35,11 @@ CFLAGSVERSION=-dumpversion CFLAGSVERSION_CMD=-dumpversion CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk #CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1 $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk -.ENDIF - -.IF "$(COM)"=="MSC" +.ELIF "$(COM)"=="CLANG" +CFLAGSVERSION=--version +CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//" +CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -e"s/\.//" +.ELIF "$(COM)"=="MSC" CFLAGSVERSION= CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk CFLAGSNUMVERSION_CMD= $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk Modified: openoffice/branches/alg_writerframes/main/solenv/inc/unxlng.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/unxlng.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/unxlng.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/unxlng.mk Wed Mar 19 10:14:42 2014 @@ -128,8 +128,7 @@ CFLAGSWERRCC=-Werror # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := # switches for dynamic and static linking STATIC = -Wl,-Bstatic Modified: openoffice/branches/alg_writerframes/main/solenv/inc/unxmacc.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/unxmacc.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/unxmacc.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/unxmacc.mk Wed Mar 19 10:14:42 2014 @@ -36,14 +36,12 @@ LINKOUTPUT_FILTER= # compiling STLport sources too, either internally or externally. CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1 -# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build result -# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro) -# http://developer.apple.com/technotes/tn2002/tn2064.html -# done in setsolar/configure now. left here for documentation -#MACOSX_DEPLOYMENT_TARGET=10.7 -#.EXPORT: MACOSX_DEPLOYMENT_TARGET +.IF "$(MACOSX_DEPLOYMENT_TARGET)" != "" + CDEFS += -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_$(subst,.,_ $(MACOSX_DEPLOYMENT_TARGET)) +.ENDIF + CDEFS+=-DQUARTZ -EXTRA_CDEFS*=-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk +EXTRA_CDEFS*=-isysroot $(MACOSX_SDK_PATH) # Name of library where static data members are initialized # STATICLIBNAME=static$(DLLPOSTFIX) @@ -169,9 +167,7 @@ LINK*=$(CXX) LINKC*=$(CC) ###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress -# assure backwards-compatibility -###EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -EXTRA_LINKFLAGS*=-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk +EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) # Very long install_names are needed so that install_name_tool -change later on # does not complain that "larger updated load commands do not fit:" LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)' @@ -184,13 +180,8 @@ LINKFLAGSRUNPATH_BOXT= LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)' LINKFLAGS=$(LINKFLAGSDEFS) -# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line -.IF "$(GUIBASE)" == "aqua" - LINKFLAGS+=-lobjc - # Sometimes we still use files that would be in a GUIBASE="unx" specific directory - # because they really aren't GUIBASE specific, so we've got to account for that here. - INCGUI+= -I$(PRJ)/unx/inc -.ENDIF +LINKFLAGS+=-lobjc +LINKFLAGS+=-lc++ #special settings form environment LINKFLAGS+=$(EXTRA_LINKFLAGS) @@ -224,8 +215,6 @@ LINKVERSIONMAPFLAG=-Wl,-map -Wl, SONAME_SWITCH=-Wl,-h -### STDLIBCPP=-stdlib=libc++ -STDLIBCPP=-lc++ STDOBJVCL=$(L)/salmain.o STDOBJGUI= @@ -233,17 +222,10 @@ STDSLOGUI= STDOBJCUI= STDSLOCUI= -.IF "$(GUIBASE)" == "aqua" - STDLIBCUIMT=CPPRUNTIME -lm - STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm - STDSHLCUIMT=-lpthread CPPRUNTIME -lm - STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa -lpthread CPPRUNTIME -lm -.ELSE - STDLIBCUIMT= CPPRUNTIME -lm - STDLIBGUIMT=-lX11 -lpthread CPPRUNTIME -lm - STDSHLCUIMT=-lpthread CPPRUNTIME -lm - STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework CoreFoundation -.ENDIF +#STDLIBCUIMT=CPPRUNTIME -lm +#STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm +STDSHLCUIMT=-lpthread CPPRUNTIME -lm +STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa -lpthread CPPRUNTIME -lm LIBMGR=ar LIBFLAGS=-r Modified: openoffice/branches/alg_writerframes/main/solenv/inc/unxmaccx.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/unxmaccx.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/unxmaccx.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/unxmaccx.mk Wed Mar 19 10:14:42 2014 @@ -22,6 +22,7 @@ # Mac OSX specific defines PROCESSOR_DEFINES=-DX86_64 +BUILD64=1 DLLPOSTFIX= Modified: openoffice/branches/alg_writerframes/main/solenv/inc/unxsoli4.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/unxsoli4.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/unxsoli4.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/unxsoli4.mk Wed Mar 19 10:14:42 2014 @@ -102,8 +102,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o Modified: openoffice/branches/alg_writerframes/main/solenv/inc/unxsols4.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/unxsols4.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/unxsols4.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/unxsols4.mk Wed Mar 19 10:14:42 2014 @@ -108,8 +108,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o Modified: openoffice/branches/alg_writerframes/main/solenv/inc/unxsolu4.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/unxsolu4.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/unxsolu4.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/unxsolu4.mk Wed Mar 19 10:14:42 2014 @@ -107,8 +107,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o Modified: openoffice/branches/alg_writerframes/main/solenv/inc/wntgcci.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/wntgcci.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/wntgcci.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/wntgcci.mk Wed Mar 19 10:14:42 2014 @@ -94,7 +94,6 @@ MODULES_WITH_WARNINGS := \ extensions \ lingu \ r_tools \ - soldep \ starmath \ sw \ xmlsecurity Modified: openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci10.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci10.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci10.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci10.mk Wed Mar 19 10:14:42 2014 @@ -202,8 +202,7 @@ CFLAGSWERRCC=-WX # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): MODULES_WITH_WARNINGS := \ - lingucomponent \ - soldep + lingucomponent CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 Modified: openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci11.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci11.mk?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci11.mk (original) +++ openoffice/branches/alg_writerframes/main/solenv/inc/wntmsci11.mk Wed Mar 19 10:14:42 2014 @@ -216,8 +216,7 @@ CFLAGSWERRCC=-WX # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 .IF "$(COMEX)" == "11" Modified: openoffice/branches/alg_writerframes/main/sot/source/base/exchange.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sot/source/base/exchange.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff ============================================================================== --- openoffice/branches/alg_writerframes/main/sot/source/base/exchange.cxx (original) +++ openoffice/branches/alg_writerframes/main/sot/source/base/exchange.cxx Wed Mar 19 10:14:42 2014 @@ -207,7 +207,7 @@ namespace /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - /*141 SOT_FORMATSTR_ID_PNG*/ { "image/png", "Windows Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, + /*141 SOT_FORMATSTR_ID_PNG*/ { "image/png", "PNG Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, }; return &aInstance[0]; }
