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 259D38F31 for ; Sat, 17 Sep 2011 22:44:25 +0000 (UTC) Received: (qmail 4172 invoked by uid 500); 17 Sep 2011 22:44:25 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 4137 invoked by uid 500); 17 Sep 2011 22:44:25 -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 4130 invoked by uid 99); 17 Sep 2011 22:44:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Sep 2011 22:44:25 +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; Sat, 17 Sep 2011 22:44:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 669282388AA9; Sat, 17 Sep 2011 22:44:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1172133 - in /incubator/ooo/trunk/main/sd/source/ui: slidesorter/view/SlsButtonBar.cxx view/Outliner.cxx Date: Sat, 17 Sep 2011 22:44:01 -0000 To: ooo-commits@incubator.apache.org From: mst@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110917224401.669282388AA9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mst Date: Sat Sep 17 22:44:00 2011 New Revision: 1172133 URL: http://svn.apache.org/viewvc?rev=1172133&view=rev Log: slidesorter1: #i116014# Fixed some minor compilation problems. # HG changeset patch # User Andre Fischer # Date 1302596156 -7200 # Node ID 53201f3ec8c74141923d041a951ae220f5efaa02 # Parent 6a7a8a3a4618b52b16c5fe48bea1fcae6aab7483 Modified: incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx incubator/ooo/trunk/main/sd/source/ui/view/Outliner.cxx Modified: incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx?rev=1172133&r1=1172132&r2=1172133&view=diff ============================================================================== --- incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx (original) +++ incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx Sat Sep 17 22:44:00 2011 @@ -1463,8 +1463,8 @@ void StartShowButton::ProcessClick (cons // StartWithActualPage to make the slide show use the // specified first page. const DocumentType eType (mrSlideSorter.GetModel().GetDocument()->GetDocumentType()); - const BOOL bSavedState (SD_MOD()->GetSdOptions(eType)->IsStartWithActualPage()); - SD_MOD()->GetSdOptions(eType)->SetStartWithActualPage(FALSE); + const sal_Bool bSavedState (SD_MOD()->GetSdOptions(eType)->IsStartWithActualPage()); + SD_MOD()->GetSdOptions(eType)->SetStartWithActualPage(sal_False); xPresentation->startWithArguments(aProperties); Modified: incubator/ooo/trunk/main/sd/source/ui/view/Outliner.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/view/Outliner.cxx?rev=1172133&r1=1172132&r2=1172133&view=diff ============================================================================== --- incubator/ooo/trunk/main/sd/source/ui/view/Outliner.cxx (original) +++ incubator/ooo/trunk/main/sd/source/ui/view/Outliner.cxx Sat Sep 17 22:44:00 2011 @@ -526,7 +526,7 @@ bool Outliner::StartSearchAndReplace (co Initialize ( ! mpSearchItem->GetBackward()); - sal_uInt16 nCommand = mpSearchItem->GetCommand(); + const sal_uInt16 nCommand (mpSearchItem->GetCommand()); if (nCommand == SVX_SEARCHCMD_REPLACE_ALL) bEndOfSearch = SearchAndReplaceAll (); else