[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svtools binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Nov 19 17:42:41 PST 2010
binfilter/bf_sd/source/ui/view/sd_frmview.cxx | 46 ++---
binfilter/bf_svtools/source/config/svt_colorcfg.cxx | 17 --
binfilter/bf_svx/source/items/svx_textitem.cxx | 164 ++++++++++----------
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 99 +++++-------
binfilter/inc/bf_svx/dlgutil.hxx | 3
5 files changed, 159 insertions(+), 170 deletions(-)
New commits:
commit c49274028ab3a6f163721df9584661c037965c81
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Nov 19 17:42:23 2010 -0800
Some minor HC fixes for binfilter
diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index ec7fa44..f15a98e 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -102,11 +102,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView )
eHandoutEditMode = EM_MASTERPAGE;
bLayerMode = FALSE;
SetEliminatePolyPoints(FALSE);
-
- {
- bool bUseContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
- nDrawMode = bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR;
- }
+ nDrawMode = OUTPUT_DRAWMODE_COLOR;
nPreviewDrawMode = nDrawMode;
bShowPreviewInPageMode = FALSE;
bShowPreviewInMasterPageMode = TRUE;
@@ -368,7 +364,7 @@ EditMode FrameView::GetViewShEditMode(PageKind eKind)
static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
{
OUStringBuffer aLines;
-
+
const USHORT nCount = rHelpLines.GetCount();
for( USHORT nHlpLine = 0; nHlpLine < nCount; nHlpLine++ )
{
@@ -492,11 +488,11 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
const sal_Unicode * pStr = rLines.getStr();
SdrHelpLine aNewHelpLine;
::rtl::OUStringBuffer sBuffer;
-
+
while( *pStr )
{
Point aPoint;
-
+
switch( *pStr )
{
case (sal_Unicode)'P':
@@ -512,16 +508,16 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
DBG_ERROR( "syntax error in snap lines settings string" );
return;
}
-
+
pStr++;
-
+
while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') )
{
sBuffer.append( *pStr++ );
}
-
+
sal_Int32 nValue = sBuffer.makeStringAndClear().toInt32();
-
+
if( aNewHelpLine.GetKind() == SDRHELPLINE_HORIZONTAL )
{
aPoint.Y() = nValue;
@@ -529,22 +525,22 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
else
{
aPoint.X() = nValue;
-
+
if( aNewHelpLine.GetKind() == SDRHELPLINE_POINT )
{
if( *pStr++ != ',' )
return;
-
+
while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') )
{
sBuffer.append( *pStr++ );
}
-
+
aPoint.Y() = sBuffer.makeStringAndClear().toInt32();
-
+
}
}
-
+
aNewHelpLine.SetPos( aPoint );
rHelpLines.Insert( aNewHelpLine );
}
@@ -559,13 +555,13 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
sal_Int32 nInt32;
sal_Int16 nInt16;
::rtl::OUString aString;
-
+
sal_Int32 aSnapGridWidthXNum = GetSnapGridWidthX().GetNumerator();
sal_Int32 aSnapGridWidthXDom = GetSnapGridWidthX().GetDenominator();
-
+
sal_Int32 aSnapGridWidthYNum = GetSnapGridWidthY().GetNumerator();
sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator();
-
+
const ::com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
{
@@ -732,7 +728,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
SetVisArea( aVisArea );
}
}
-
+
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridIsVisible ) ) )
{
if( pValue->Value >>= bBool )
@@ -740,7 +736,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
SetGridVisible( bBool );
}
}
-
+
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToGrid ) ) )
{
if( pValue->Value >>= bBool )
@@ -929,10 +925,10 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
SetLockedLayers( aSetOfBytes );
}
}
-
+
const Fraction aSnapGridWidthX( aSnapGridWidthXNum, aSnapGridWidthXDom );
const Fraction aSnapGridWidthY( aSnapGridWidthYNum, aSnapGridWidthYDom );
-
+
SetSnapGridWidth( aSnapGridWidthX, aSnapGridWidthY );
}
}
diff --git a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx
index a2e11e0..c9e5c37 100644
--- a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx
+++ b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,10 +57,10 @@ namespace binfilter
static const sal_Char cColor[] = "/Color";
static const sal_Char cColorSchemes[] = "ColorSchemes/";
sal_Int32 nColorRefCount_Impl = 0;
-namespace
+namespace
{
- struct ColorMutex_Impl
- : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
+ struct ColorMutex_Impl
+ : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
}
ColorConfig_Impl* ColorConfig::m_pImpl = NULL;
@@ -460,17 +460,14 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
case SPELL :
case DRAWDRAWING :
- case SMARTTAGS :
+ case SMARTTAGS :
{
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- aRet = rStyleSettings.GetHighContrastMode() ?
- rStyleSettings.GetDialogTextColor().GetColor() : aAutoColors[eEntry];
+ aRet = aAutoColors[eEntry];
}
break;
case DRAWFILL :
- aRet = /*rStyleSettings.GetHighContrastMode() ?
- rStyleSettings.OutlineMode??? : */ aAutoColors[eEntry];
+ aRet = aAutoColors[eEntry];
break;
case FONTCOLOR :
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 03b2468..6dd7120 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -179,7 +179,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
/*N*/ SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) :
-/*N*/
+/*N*/
/*N*/ SfxPoolItem( rItem ),
/*N*/ pFontList( rItem.GetFontList() )
/*N*/ {
@@ -217,9 +217,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
/*N*/ const XubString& aStName, const FontPitch eFontPitch,
/*N*/ const rtl_TextEncoding eFontTextEncoding, const USHORT nId ) :
-/*N*/
+/*N*/
/*N*/ SfxPoolItem( nId ),
-/*N*/
+/*N*/
/*N*/ aFamilyName(aName),
/*N*/ aStyleName(aStName)
/*N*/ {
@@ -273,7 +273,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ break;
/*N*/ case MID_FONT_FAMILY :
/*N*/ {
-/*N*/ sal_Int16 nFamily;
+/*N*/ sal_Int16 nFamily(0);
/*N*/ if(!(rVal >>= nFamily))
/*N*/ return sal_False;
/*N*/ eFamily = (FontFamily)nFamily;
@@ -281,7 +281,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ break;
/*N*/ case MID_FONT_CHAR_SET :
/*N*/ {
-/*N*/ sal_Int16 nSet;
+/*N*/ sal_Int16 nSet(0);
/*N*/ if(!(rVal >>= nSet))
/*N*/ return sal_False;
/*N*/ eTextEncoding = (rtl_TextEncoding)nSet;
@@ -289,7 +289,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ break;
/*N*/ case MID_FONT_PITCH :
/*N*/ {
-/*N*/ sal_Int16 nPitch;
+/*N*/ sal_Int16 nPitch(0);
/*N*/ if(!(rVal >>= nPitch))
/*N*/ return sal_False;
/*N*/ ePitch = (FontPitch)nPitch;
@@ -304,13 +304,13 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ int SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
/*N*/ {
/*N*/ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-/*N*/
+/*N*/
/*N*/ const SvxFontItem& rItem = (const SvxFontItem&)rAttr;
-/*N*/
+/*N*/
/*N*/ int bRet = ( eFamily == rItem.eFamily &&
/*N*/ aFamilyName == rItem.aFamilyName &&
/*N*/ aStyleName == rItem.aStyleName );
-/*N*/
+/*N*/
/*N*/ if ( bRet )
/*N*/ {
/*N*/ if ( ePitch != rItem.ePitch || eTextEncoding != rItem.eTextEncoding )
@@ -336,19 +336,19 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ BOOL bToBats =
/*N*/ GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) ||
/*N*/ GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 );
-/*N*/
+/*N*/
/*N*/ // #90477# rStrm << (BYTE) GetFamily()
/*N*/ // << (BYTE) GetPitch()
/*N*/ // << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) );
/*N*/ rStrm << (BYTE) GetFamily() << (BYTE) GetPitch()
/*N*/ << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
-/*N*/
+/*N*/
/*N*/ String aStoreFamilyName( GetFamilyName() );
/*N*/ if( bToBats )
/*N*/ aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US );
/*N*/ rStrm.WriteByteString(aStoreFamilyName);
/*N*/ rStrm.WriteByteString(GetStyleName());
-/*N*/
+/*N*/
/*N*/ // #96441# Kach for EditEngine, only set while creating clipboard stream.
/*N*/ if ( bEnableStoreUnicodeNames )
/*N*/ {
@@ -357,7 +357,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE );
/*N*/ rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return rStrm;
/*N*/ }
@@ -370,20 +370,20 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ rStrm >> _eFamily;
/*N*/ rStrm >> eFontPitch;
/*N*/ rStrm >> eFontTextEncoding;
-/*N*/
+/*N*/
/*N*/ // UNICODE: rStrm >> aName;
/*N*/ rStrm.ReadByteString(aName);
-/*N*/
+/*N*/
/*N*/ // UNICODE: rStrm >> aStyle;
/*N*/ rStrm.ReadByteString(aStyle);
-/*N*/
+/*N*/
/*N*/ // Task 91008/90471: set the "correct" textencoding
/*N*/ eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
-/*N*/
+/*N*/
/*N*/ // irgendwann wandelte sich der StarBats vom ANSI- zum SYMBOL-Font
/*N*/ if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") )
/*N*/ eFontTextEncoding = RTL_TEXTENCODING_SYMBOL;
-/*N*/
+/*N*/
/*N*/ // Check if we have stored unicode
/*N*/ ULONG nStreamPos = rStrm.Tell();
/*N*/ sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
@@ -397,9 +397,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ rStrm.Seek( nStreamPos );
/*N*/ }
-/*N*/
-/*N*/
-/*N*/
+/*N*/
+/*N*/
+/*N*/
/*N*/ return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle,
/*N*/ (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() );
/*N*/ }
@@ -487,10 +487,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*?*/ awt::FontSlant eSlant;
/*?*/ if(!(rVal >>= eSlant))
/*?*/ {
-/*?*/ sal_Int32 nValue;
+/*?*/ sal_Int32 nValue(0);
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
-/*?*/
+/*?*/
/*?*/ eSlant = (awt::FontSlant)nValue;
/*N*/ }
/*N*/ SetValue((USHORT)eSlant);
@@ -612,10 +612,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ break;
/*N*/ case MID_WEIGHT:
/*N*/ {
-/*N*/ double fValue;
+/*N*/ double fValue(0);
/*N*/ if(!(rVal >>= fValue))
/*N*/ {
-/*?*/ sal_Int32 nValue;
+/*?*/ sal_Int32 nValue(0);
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ fValue = (float)nValue;
@@ -649,7 +649,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
/*N*/ {
/*N*/ rStrm << (USHORT)GetHeight();
-/*N*/
+/*N*/
/*N*/ if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
/*N*/ rStrm << GetProp() << (USHORT)GetPropUnit();
/*N*/ else
@@ -670,9 +670,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ USHORT nVersion ) const
/*N*/ {
/*N*/ USHORT nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
-/*N*/
+/*N*/
/*N*/ rStrm >> nsize;
-/*N*/
+/*N*/
/*N*/ if( FONTHEIGHT_16_VERSION <= nVersion )
/*N*/ rStrm >> nprop;
/*N*/ else
@@ -681,10 +681,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*?*/ rStrm >> nP;
/*?*/ nprop = (USHORT)nP;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( FONTHEIGHT_UNIT_VERSION <= nVersion )
/*N*/ rStrm >> nPropUnit;
-/*N*/
+/*N*/
/*N*/ SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() );
/*N*/ pItem->SetProp( nprop, (SfxMapUnit)nPropUnit );
/*N*/ return pItem;
@@ -707,7 +707,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ // In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird
/*N*/ // gesteuert, ob der Wert im Item 1/100mm oder Twips sind.
-/*N*/
+/*N*/
/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
@@ -746,7 +746,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*?*/ fRet /= 20.;
/*?*/ break;
/*?*/ case SFX_MAPUNIT_POINT:
-/*?*/
+/*?*/
/*?*/ break;
/*?*/ case SFX_MAPUNIT_TWIP:
/*?*/ fRet /= 20.;
@@ -795,7 +795,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
break;
/*N*/ }
/*N*/ nRet -= nDiff;
-/*N*/
+/*N*/
/*N*/ return nRet;
/*N*/ }
@@ -812,17 +812,17 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ ePropUnit = SFX_MAPUNIT_RELATIVE;
/*N*/ nProp = 100;
-/*N*/ double fPoint;
+/*N*/ double fPoint(0);
/*N*/ if(!(rVal >>= fPoint))
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ fPoint = (float)nValue;
/*N*/ }
/*N*/ if(fPoint < 0. || fPoint > 10000.)
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips
/*N*/ if (!bConvert)
/*N*/ nHeight = UTWIP_TO_MM100(nHeight); // umrechnen, wenn das Item 1/100mm enthaelt
@@ -830,12 +830,12 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ break;
/*N*/ case MID_FONTHEIGHT_PROP:
/*N*/ {
-/*N*/ sal_Int16 nNew;
+/*N*/ sal_Int16 nNew(0);
/*N*/ if(!(rVal >>= nNew))
/*N*/ return sal_True;
-/*N*/
+/*N*/
/*N*/ nHeight = lcl_GetRealHeight_Impl(nHeight, nProp, ePropUnit, bConvert);
-/*N*/
+/*N*/
/*N*/ nHeight *= nNew;
/*N*/ nHeight /= 100;
/*N*/ nProp = nNew;
@@ -845,10 +845,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ case MID_FONTHEIGHT_DIFF:
/*N*/ {
/*?*/ nHeight = lcl_GetRealHeight_Impl(nHeight, nProp, ePropUnit, bConvert);
-/*?*/ float fValue;
+/*?*/ float fValue(0);
/*?*/ if(!(rVal >>= fValue))
/*?*/ {
-/*?*/ sal_Int32 nValue;
+/*?*/ sal_Int32 nValue(0);
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ fValue = (float)nValue;
@@ -885,7 +885,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ SfxMapUnit eUnit )
/*N*/ {
/*N*/ DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
-/*N*/
+/*N*/
/*N*/ #ifndef SVX_LIGHT
/*N*/ if( SFX_MAPUNIT_RELATIVE != eUnit )
nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRIP008 /*N*/ nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit,
@@ -896,7 +896,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 );
/*N*/ else
/*N*/ nHeight = nNewHeight;
-/*N*/
+/*N*/
/*N*/ nProp = nNewProp;
/*N*/ ePropUnit = eUnit;
/*N*/ }
@@ -987,7 +987,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ break;
/*N*/ }
/*N*/ return sal_True;
-/*N*/
+/*N*/
/*N*/ }
/*-----------------13.03.98 16:28-------------------
@@ -1004,7 +1004,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ break;
/*N*/ case MID_UNDERLINE:
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ if(!(rVal >>= nValue))
/*N*/ bRet = sal_False;
/*N*/ else
@@ -1013,7 +1013,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ break;
/*N*/ case MID_UL_COLOR:
/*N*/ {
-/*?*/ sal_Int32 nCol;
+/*?*/ sal_Int32 nCol(0);
/*?*/ if( !( rVal >>= nCol ) )
/*?*/ bRet = sal_False;
/*?*/ else
@@ -1125,7 +1125,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ break;
/*N*/ case MID_CROSS_OUT:
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue(0);
/*N*/ if(!(rVal >>= nValue))
/*N*/ return sal_False;
/*N*/ SetValue((sal_Int16)nValue);
@@ -1355,7 +1355,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
/*N*/ {
/*N*/ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-/*N*/
+/*N*/
/*N*/ return mColor == ( (const SvxColorItem&)rAttr ).mColor;
/*N*/ }
@@ -1371,10 +1371,10 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_Int32 nColor;
+/*N*/ sal_Int32 nColor(0);
/*N*/ if(!(rVal >>= nColor))
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ mColor.SetColor( nColor );
/*N*/ return sal_True;
/*N*/ }
@@ -1419,7 +1419,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
/*N*/ SvxColorItem( nId ),
-/*N*/
+/*N*/
/*N*/ eFrom( RTL_TEXTENCODING_DONTKNOW )
/*N*/ {
/*N*/ }
@@ -1430,7 +1430,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ const rtl_TextEncoding _eFrom,
/*N*/ const USHORT nId ) :
/*N*/ SvxColorItem( rCol, nId ),
-/*N*/
+/*N*/
/*N*/ eFrom( _eFrom )
/*N*/ {
/*N*/ }
@@ -1499,7 +1499,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
-/*N*/ short nValue;
+/*N*/ short nValue(0);
/*N*/ rStrm >> nValue;
/*N*/ return new SvxKerningItem( nValue, Which() );
/*N*/ }
@@ -1520,7 +1520,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
/*N*/ bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
/*N*/ {
-/*N*/ sal_Int16 nVal;
+/*N*/ sal_Int16 nVal(0);
/*N*/ if(!(rVal >>= nVal))
/*N*/ return sal_False;
/*N*/ if(nMemberId & CONVERT_TWIPS)
@@ -1595,17 +1595,17 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
-/*N*/ sal_uInt16 nVal;
+/*N*/ sal_uInt16 nVal(0);
/*N*/ if(!(rVal >>= nVal))
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ switch( nVal )
/*N*/ {
/*N*/ case style::CaseMap::NONE : nVal = SVX_CASEMAP_NOT_MAPPED ; break;
-/*N*/ case style::CaseMap::UPPERCASE: nVal = SVX_CASEMAP_VERSALIEN ; break;
-/*?*/ case style::CaseMap::LOWERCASE: nVal = SVX_CASEMAP_GEMEINE ; break;
-/*N*/ case style::CaseMap::TITLE : nVal = SVX_CASEMAP_TITEL ; break;
-/*N*/ case style::CaseMap::SMALLCAPS: nVal = SVX_CASEMAP_KAPITAELCHEN; break;
+/*N*/ case style::CaseMap::UPPERCASE: nVal = SVX_CASEMAP_VERSALIEN ; break;
+/*?*/ case style::CaseMap::LOWERCASE: nVal = SVX_CASEMAP_GEMEINE ; break;
+/*N*/ case style::CaseMap::TITLE : nVal = SVX_CASEMAP_TITEL ; break;
+/*N*/ case style::CaseMap::SMALLCAPS: nVal = SVX_CASEMAP_KAPITAELCHEN; break;
/*N*/ }
/*N*/ SetValue(nVal);
/*N*/ return sal_True;
@@ -1615,7 +1615,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
/*N*/ SfxEnumItemInterface( nId ),
-/*N*/
+/*N*/
/*N*/ nEsc ( 0 ),
/*N*/ nProp ( 100 )
/*N*/ {
@@ -1640,7 +1640,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ int SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const
/*N*/ {
/*N*/ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-/*N*/
+/*N*/
/*N*/ return( nEsc == ((SvxEscapementItem&)rAttr).nEsc &&
/*N*/ nProp == ((SvxEscapementItem&)rAttr).nProp );
/*N*/ }
@@ -1738,7 +1738,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ {
/*N*/ case MID_ESC:
/*N*/ {
-/*N*/ sal_Int16 nVal;
+/*N*/ sal_Int16 nVal(0);
/*N*/ if( (rVal >>= nVal) && (Abs(nVal) <= 101))
/*N*/ nEsc = nVal;
/*N*/ else
@@ -1747,7 +1747,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ break;
/*N*/ case MID_ESC_HEIGHT:
/*N*/ {
-/*N*/ sal_Int8 nVal;
+/*N*/ sal_Int8 nVal(0);
/*N*/ if( (rVal >>= nVal) && (nVal <= 100))
/*N*/ nProp = nVal;
/*N*/ else
@@ -1808,7 +1808,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
-/*N*/ USHORT nValue;
+/*N*/ USHORT nValue(0);
/*N*/ rStrm >> nValue;
/*N*/ return new SvxLanguageItem( (LanguageType)nValue, Which() );
/*N*/ }
@@ -1846,10 +1846,10 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ {
/*N*/ case MID_LANG_INT: // for basic conversions!
/*N*/ {
-/*?*/ sal_Int32 nValue;
+/*?*/ sal_Int32 nValue(0);
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
-/*?*/
+/*?*/
/*?*/ SetValue((sal_Int16)nValue);
/*N*/ }
/*N*/ break;
@@ -1858,7 +1858,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ lang::Locale aLocale;
/*N*/ if(!(rVal >>= aLocale))
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ if (aLocale.Language.getLength() || aLocale.Country.getLength())
/*N*/ SetValue(MsLangId::convertIsoNamesToLanguage( aLocale.Language, aLocale.Country ));
/*N*/ else
@@ -1994,7 +1994,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, USHORT ) const
/*N*/ {
-/*N*/ sal_uInt16 nValue;
+/*N*/ sal_uInt16 nValue(0);
/*N*/ rStrm >> nValue;
/*N*/ return new SvxEmphasisMarkItem( (FontEmphasisMark)nValue, Which() );
/*N*/ }
@@ -2068,7 +2068,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SOFFICE_FILEFORMAT_40==nFFVer ||
/*N*/ SOFFICE_FILEFORMAT_50==nFFVer,
/*N*/ "SvxEmphasisMarkItem: Gibt es ein neues Fileformat?" );
-/*N*/
+/*N*/
/*N*/ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
/*N*/ }
@@ -2225,7 +2225,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SOFFICE_FILEFORMAT_40==nFFVer ||
/*N*/ SOFFICE_FILEFORMAT_50==nFFVer,
/*N*/ "SvxTwoLinesItem: Gibt es ein neues Fileformat?" );
-/*N*/
+/*N*/
/*N*/ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
/*N*/ }
@@ -2335,7 +2335,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ else
/*NBFF*/ bRet = sal_False;
/*NBFF*/ break;
-/*NBFF*/
+/*NBFF*/
/*NBFF*/ case MID_FITTOLINE:
/*NBFF*/ SetFitToLine( Any2Bool( rVal ) );
/*NBFF*/ break;
@@ -2373,7 +2373,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ sal_uInt16 nVal;
/*N*/ rStrm >> nVal;
/*N*/ SvxCharScaleWidthItem* pItem = new SvxCharScaleWidthItem( nVal, Which() );
-/*N*/
+/*N*/
/*N*/ if ( Which() == EE_CHAR_FONTWIDTH )
/*N*/ {
/*N*/ // #87271#: Was a SvxFontWidthItem in 5.2
@@ -2387,7 +2387,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ else
/*N*/ rStrm.SeekRel( -2*(long)sizeof(sal_uInt16) );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return pItem;
/*N*/ }
@@ -2417,13 +2417,13 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ {
/*N*/ // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
/*N*/ // where we still want this to be a sal_Int16
-/*N*/ sal_Int16 nValue;
+/*N*/ sal_Int16 nValue(0);
/*N*/ if (rVal >>= nValue)
/*N*/ {
/*N*/ SetValue( (UINT16) nValue );
/*N*/ return TRUE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ DBG_ERROR( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
/*N*/ return FALSE;
/*N*/ }
@@ -2496,12 +2496,12 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*?*/ case SFX_ITEM_PRESENTATION_NONE:
/*?*/ rText.Erase();
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SFX_ITEM_PRESENTATION_NAMELESS:
/*?*/ case SFX_ITEM_PRESENTATION_COMPLETE:
/*?*/ rText = GetValueTextByPos( GetValue() );
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ default:
/*?*/ eRet = SFX_ITEM_PRESENTATION_NONE;
/*?*/ }
@@ -2572,7 +2572,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex )
/*N*/ {
/*N*/ const USHORT nItemCnt = 3;
-/*N*/
+/*N*/
/*N*/ static struct
/*N*/ {
/*N*/ USHORT nFontType;
@@ -2584,9 +2584,9 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
/*N*/ { DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA }
/*N*/ };
-/*N*/
+/*N*/
/*N*/ SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
-/*N*/
+/*N*/
/*N*/ for ( USHORT n = 0; n < nItemCnt; ++n )
/*N*/ {
/*N*/ Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index 1d1811c..2a9ee16 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -191,43 +191,43 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ if( bListDirty )
/*N*/ {
/*N*/ bListDirty = FALSE;
-/*N*/
+/*N*/
/*N*/ INetURLObject aURL( aPath );
-/*N*/
+/*N*/
/*N*/ if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
/*N*/ {
/*N*/ DBG_ASSERT( !aPath.Len(), "invalid URL" );
/*N*/ return FALSE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aURL.Append( aName );
-/*N*/
+/*N*/
/*N*/ if( !aURL.getExtension().getLength() )
/*N*/ aURL.setExtension( rtl::OUString( pszExtHatch, 3 ) );
-/*N*/
+/*N*/
/*N*/ // check if file exists, SfxMedium shows an errorbox else
/*N*/ {
/*N*/ ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler > xHandler;
/*N*/ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler );
-/*N*/
+/*N*/
/*N*/ sal_Bool bOk = pIStm && ( pIStm->GetError() == 0);
-/*N*/
+/*N*/
/*N*/ if( pIStm )
/*N*/ delete pIStm;
-/*N*/
+/*N*/
/*N*/ if( !bOk )
/*N*/ return sal_False;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ {
/*N*/ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE );
/*N*/ SvStream* pStream = aMedium.GetInStream();
/*N*/ if( !pStream )
/*N*/ return( FALSE );
-/*N*/
+/*N*/
/*N*/ char aCheck[6];
/*N*/ pStream->Read( aCheck, 6 );
-/*N*/
+/*N*/
/*N*/ // Handelt es sich um die gew"unschte Tabelle?
/*N*/ if( memcmp( aCheck, aChckHatch, sizeof( aChckHatch ) ) == 0 ||
/*N*/ memcmp( aCheck, aChckHatch0, sizeof( aChckHatch0 ) ) == 0 )
@@ -239,9 +239,9 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ }
-/*N*/
+/*N*/
/*N*/ uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY );
/*N*/ return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
/*N*/ }
@@ -279,7 +279,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
/*N*/ xub_StrLen nLen;
-/*N*/
+/*N*/
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
/*N*/ Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),XHATCH_SINGLE,100, 0),aStr));
@@ -287,7 +287,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED ),XHATCH_DOUBLE, 80,450),aStr));
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
/*N*/ Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120, 0),aStr));
-/*N*/
+/*N*/
/*N*/ return( TRUE );
/*N*/ }
@@ -299,7 +299,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
/*N*/ DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
-/*N*/
+/*N*/
/*N*/ if( pBmp )
/*N*/ pBmpList->Insert( pBmp, i );
/*N*/ }
@@ -307,7 +307,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ if( pVD ) { delete pVD; pVD = NULL; }
/*N*/ if( pXOut ) { delete pXOut; pXOut = NULL; }
/*N*/ if( pXFSet ){ delete pXFSet; pXFSet = NULL; }
-/*N*/
+/*N*/
/*N*/ return( TRUE );
/*N*/ }
@@ -316,7 +316,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete )
/*N*/ {
/*N*/ Point aZero;
-/*N*/
+/*N*/
/*N*/ if( !pVD ) // und pXOut und pXFSet
/*N*/ {
/*N*/ pVD = new VirtualDevice;
@@ -324,51 +324,48 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ //pVD->SetMapMode( MAP_100TH_MM );
/*N*/ //pVD->SetOutputSize( pVD->PixelToLogic( Size( BITMAP_WIDTH, BITMAP_HEIGHT ) ) );
/*N*/ pVD->SetOutputSizePixel( Size( BITMAP_WIDTH, BITMAP_HEIGHT ) );
-/*N*/
+/*N*/
/*N*/ pXOut = new XOutputDevice( pVD );
/*N*/ DBG_ASSERT( pVD, "XHatchList: Konnte kein XOutDevice erzeugen!" );
-/*N*/
+/*N*/
/*N*/ pXFSet = new XFillAttrSetItem( pXPool );
/*N*/ DBG_ASSERT( pVD, "XHatchList: Konnte kein XFillAttrSetItem erzeugen!" );
/*N*/ }
-/*N*/
-/*N*/ if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() != 0 )
-/*N*/ pVD->SetDrawMode( OUTPUT_DRAWMODE_CONTRAST );
-/*N*/ else
-/*N*/ pVD->SetDrawMode( OUTPUT_DRAWMODE_COLOR );
-/*N*/
+/*N*/
+/*N*/ pVD->SetDrawMode( OUTPUT_DRAWMODE_COLOR );
+/*N*/
/*N*/ // Damit die Schraffuren mit Rahmen angezeigt werden:
/*N*/ // MapMode-Aenderungen (100th mm <--> Pixel)
/*N*/ Size aPixelSize = pVD->GetOutputSizePixel();
/*N*/ pVD->SetMapMode( MAP_PIXEL );
-/*N*/
+/*N*/
/*N*/ pXFSet->GetItemSet().Put( XFillStyleItem( XFILL_SOLID ) );
/*N*/ pXFSet->GetItemSet().Put( XFillColorItem( String(), RGB_Color( COL_WHITE ) ) );
-/*N*/
+/*N*/
/*N*/ //-/ pXOut->SetFillAttr( *pXFSet );
/*N*/ pXOut->SetFillAttr( pXFSet->GetItemSet() );
-/*N*/
+/*N*/
/*N*/ // #73550#
/*N*/ pXOut->OverrideLineColor( Color( COL_BLACK ) );
-/*N*/
+/*N*/
/*N*/ pXOut->DrawRect( Rectangle( aZero, aPixelSize ) );
-/*N*/
+/*N*/
/*N*/ pVD->SetMapMode( MAP_100TH_MM );
/*N*/ Size aVDSize = pVD->GetOutputSize();
/*N*/ // 1 Pixel (Rahmen) abziehen
/*N*/ aVDSize.Width() -= (long) ( aVDSize.Width() / aPixelSize.Width() + 1 );
/*N*/ aVDSize.Height() -= (long) ( aVDSize.Height() / aPixelSize.Height() + 1 );
-/*N*/
+/*N*/
/*N*/ pXFSet->GetItemSet().Put( XFillStyleItem( XFILL_HATCH ) );
/*N*/ pXFSet->GetItemSet().Put( XFillHatchItem( String(), Get( nIndex )->GetHatch() ) );
//-/ pXOut->SetFillAttr( *pXFSet );
/*N*/ pXOut->SetFillAttr( pXFSet->GetItemSet() );
-/*N*/
+/*N*/
/*N*/ pXOut->DrawRect( Rectangle( aZero, aVDSize ) );
-/*N*/
+/*N*/
/*N*/ Bitmap* pBitmap = new Bitmap( pVD->GetBitmap( aZero, pVD->GetOutputSize() ) );
-/*N*/
+/*N*/
/*N*/ // Loeschen, da JOE den Pool vorm Dtor entfernt!
/*N*/ if( bDelete )
/*N*/ {
@@ -376,7 +373,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ if( pXOut ) { delete pXOut; pXOut = NULL; }
/*N*/ if( pXFSet ){ delete pXFSet; pXFSet = NULL; }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return( pBitmap );
/*N*/ }
@@ -385,7 +382,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XubString& XHatchList::ConvertName( XubString& rStrName )
/*N*/ {
/*N*/ BOOL bFound = FALSE;
-/*N*/
+/*N*/
/*N*/ for( USHORT i=0; i<(RID_SVXSTR_HATCH_DEF_END-RID_SVXSTR_HATCH_DEF_START+1) && !bFound; i++ )
/*N*/ {
/*N*/ XubString aStrDefName = SVX_RESSTR( RID_SVXSTR_HATCH_DEF_START + i );
@@ -395,7 +392,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ bFound = TRUE;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return rStrName;
/*N*/ }
@@ -405,14 +402,14 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ {
/*N*/ // Lesen
/*N*/ rIn.SetStreamCharSet( RTL_TEXTENCODING_IBM_850 );
-/*N*/
+/*N*/
/*N*/ delete pBmpList;
/*N*/ pBmpList = new List( 16, 16 );
-/*N*/
+/*N*/
/*N*/ XHatchEntry* pEntry = NULL;
/*N*/ long nCount;
/*N*/ XubString aName;
-/*N*/
+/*N*/
/*N*/ long nStyle;
/*N*/ USHORT nRed;
/*N*/ USHORT nGreen;
@@ -420,16 +417,16 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ long nDistance;
/*N*/ long nAngle;
/*N*/ Color aColor;
-/*N*/
+/*N*/
/*N*/ rIn >> nCount;
-/*N*/
+/*N*/
/*N*/ if( nCount >= 0 ) // Alte Tabellen (bis 3.00)
/*N*/ {
/*N*/ for( long nIndex = 0; nIndex < nCount; nIndex++ )
/*N*/ {
/*N*/ // UNICODE:rIn >> aName;
/*N*/ rIn.ReadByteString(aName);
-/*N*/
+/*N*/
/*N*/ aName = ConvertName( aName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
@@ -437,7 +434,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nBlue;
/*N*/ rIn >> nDistance;
/*N*/ rIn >> nAngle;
-/*N*/
+/*N*/
/*N*/ aColor = Color( (BYTE) ( nRed >> 8 ),
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
@@ -449,15 +446,15 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ else // ab 3.00a
/*N*/ {
/*N*/ rIn >> nCount;
-/*N*/
+/*N*/
/*N*/ for( long nIndex = 0; nIndex < nCount; nIndex++ )
/*N*/ {
/*N*/ // Versionsverwaltung
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
-/*N*/
+/*N*/
/*N*/ // UNICODE: rIn >> aName;
/*N*/ rIn.ReadByteString(aName);
-/*N*/
+/*N*/
/*N*/ aName = ConvertName( aName );
/*N*/ rIn >> nStyle;
/*N*/ rIn >> nRed;
@@ -465,12 +462,12 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nBlue;
/*N*/ rIn >> nDistance;
/*N*/ rIn >> nAngle;
-/*N*/
+/*N*/
/*N*/ if (aIOC.GetVersion() > 0)
/*N*/ {
/*N*/ // lesen neuer Daten ...
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aColor = Color( (BYTE) ( nRed >> 8 ),
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
diff --git a/binfilter/inc/bf_svx/dlgutil.hxx b/binfilter/inc/bf_svx/dlgutil.hxx
index 641c89d..c3dbb89 100644
--- a/binfilter/inc/bf_svx/dlgutil.hxx
+++ b/binfilter/inc/bf_svx/dlgutil.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,6 @@ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
// replacement of the SfxIniManager
#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT)
-#define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT)
}//end of namespace binfilter
#endif
More information about the Libreoffice-commits
mailing list