[Libreoffice-commits] .: binfilter/bf_sw

[Caolán McNamara]

 binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx |    7 ++++---
 binfilter/bf_sw/source/core/text/sw_porlay.cxx |    6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 94778992c3595cf1c12f3c07e72f3069e04f1b09
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 7 13:12:11 2011 +0100

    WaE: MacOSX compiler sees a few more

diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 247f3c9..f626a43 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -520,18 +520,19 @@ using namespace ::com::sun::star::util;
 /*M*/ #ifndef REMOTE_APPSERVER
 /*M*/ 
 /*M*/     // switch from blinking cursor to read-only-text-selection cursor
+/*M*/     static const long nNoBlinkTime = STYLE_CURSOR_NOBLINKTIME;
 /*M*/     long nBlinkTime = GetOut()->GetSettings().GetStyleSettings().
 /*M*/                       GetCursorBlinkTime();
 /*M*/ 
 /*M*/     if ( (IsCrsrReadonly() && GetViewOptions()->IsSelectionInReadonly()) ==
-/*M*/         ( nBlinkTime != STYLE_CURSOR_NOBLINKTIME ) )
+/*M*/         ( nBlinkTime != nNoBlinkTime ) )
 /*M*/     {
 /*M*/         // non blinking cursor in read only - text selection mode
 /*M*/         AllSettings aSettings = GetOut()->GetSettings();
 /*M*/         StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-/*M*/         long nNewBlinkTime = nBlinkTime == STYLE_CURSOR_NOBLINKTIME ?
+/*M*/         long nNewBlinkTime = nBlinkTime == nNoBlinkTime ?
 /*M*/                              500 :
-/*M*/                              STYLE_CURSOR_NOBLINKTIME;
+/*M*/                              nNoBlinkTime;
 /*M*/         aStyleSettings.SetCursorBlinkTime( nNewBlinkTime );
 /*M*/         aSettings.SetStyleSettings( aStyleSettings );
 /*M*/         GetOut()->SetSettings( aSettings );
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index e634aa3..8a21219 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -188,9 +188,9 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
 /*N*/ {
 /*N*/ 	const KSHORT nLineWidth = rInf.RealWidth();
 /*N*/ 
-/*N*/ 	KSHORT nFlyAscent;
-/*N*/ 	KSHORT nFlyHeight;
-/*N*/ 	KSHORT nFlyDescent;
+/*N*/ 	KSHORT nFlyAscent(0);
+/*N*/ 	KSHORT nFlyHeight(0);
+/*N*/ 	KSHORT nFlyDescent(0);
 /*N*/ 	sal_Bool bOnlyPostIts = sal_True;
 /*N*/ 	SetHanging( sal_False );
 /*N*/