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 E055F75FA for ; Thu, 6 Oct 2011 14:55:45 +0000 (UTC) Received: (qmail 15681 invoked by uid 500); 6 Oct 2011 14:55:45 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 15662 invoked by uid 500); 6 Oct 2011 14:55:45 -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 15655 invoked by uid 99); 6 Oct 2011 14:55:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 14:55:45 +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; Thu, 06 Oct 2011 14:55:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CA52923889E3; Thu, 6 Oct 2011 14:55:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1179654 - /incubator/ooo/trunk/main/svx/source/sdr/properties/attributeproperties.cxx Date: Thu, 06 Oct 2011 14:55:24 -0000 To: ooo-commits@incubator.apache.org From: jsc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111006145524.CA52923889E3@eris.apache.org> Author: jsc Date: Thu Oct 6 14:55:24 2011 New Revision: 1179654 URL: http://svn.apache.org/viewvc?rev=1179654&view=rev Log: 118414: applied patch, added forcing that SfxItemSet inside AttributeProperties::SetModel, thanks to ALG Modified: incubator/ooo/trunk/main/svx/source/sdr/properties/attributeproperties.cxx Modified: incubator/ooo/trunk/main/svx/source/sdr/properties/attributeproperties.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/properties/attributeproperties.cxx?rev=1179654&r1=1179653&r2=1179654&view=diff ============================================================================== --- incubator/ooo/trunk/main/svx/source/sdr/properties/attributeproperties.cxx (original) +++ incubator/ooo/trunk/main/svx/source/sdr/properties/attributeproperties.cxx Thu Oct 6 14:55:24 2011 @@ -482,9 +482,10 @@ namespace sdr } // each object gets the default Style if there is none set yet. - if(mpItemSet && !GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) + if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) { - SetStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True); + GetObjectItemSet(); // #118414# force ItemSet to allow style to be set + SetStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True); } } }