From ooo-commits-return-12114-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org Tue Jul 10 08:50:20 2012 Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7D61AC495 for ; Tue, 10 Jul 2012 08:50:20 +0000 (UTC) Received: (qmail 19617 invoked by uid 500); 10 Jul 2012 08:50:20 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 19571 invoked by uid 500); 10 Jul 2012 08:50:20 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 19458 invoked by uid 99); 10 Jul 2012 08:50:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jul 2012 08:50:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jul 2012 08:50:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 29D7A2388847; Tue, 10 Jul 2012 08:49:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1359527 - /incubator/ooo/trunk/main/solenv/bin/modules/installer/windows/component.pm Date: Tue, 10 Jul 2012 08:49:57 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120710084957.29D7A2388847@eris.apache.org> Author: af Date: Tue Jul 10 08:49:56 2012 New Revision: 1359527 URL: http://svn.apache.org/viewvc?rev=1359527&view=rev Log: #i119948# Instruct windows installer to use refcounting on fonts. Reported by: DaLi Liu Patch by: qiuhuaidong Review by: DaLi Liu and Andre Fischer Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/windows/component.pm Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/windows/component.pm URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/windows/component.pm?rev=1359527&r1=1359526&r2=1359527&view=diff ============================================================================== --- incubator/ooo/trunk/main/solenv/bin/modules/installer/windows/component.pm (original) +++ incubator/ooo/trunk/main/solenv/bin/modules/installer/windows/component.pm Tue Jul 10 08:49:56 2012 @@ -223,7 +223,7 @@ sub get_file_component_attributes if ( $localstyles =~ /\bFONT\b/ ) { - $attributes = 16; # font files will not be deinstalled + $attributes = 8; # font files will be deinstalled if the ref count is 0 } if ( $localstyles =~ /\bASSEMBLY\b/ )