summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/SmartTagItem.cxx15
-rw-r--r--svx/source/items/algitem.cxx351
-rw-r--r--svx/source/items/chrtitem.cxx22
-rw-r--r--svx/source/items/clipfmtitem.cxx12
-rw-r--r--svx/source/items/customshapeitem.cxx24
-rw-r--r--svx/source/items/drawitem.cxx63
-rw-r--r--svx/source/items/e3ditem.cxx13
-rw-r--r--svx/source/items/grfitem.cxx12
-rw-r--r--svx/source/items/hlnkitem.cxx57
-rw-r--r--svx/source/items/numfmtsh.cxx12
-rw-r--r--svx/source/items/numinf.cxx2
-rw-r--r--svx/source/items/ofaitem.cxx3
-rw-r--r--svx/source/items/pageitem.cxx12
-rw-r--r--svx/source/items/postattr.cxx8
-rw-r--r--svx/source/items/rotmodit.cxx60
-rw-r--r--svx/source/items/svxempty.cxx2
-rw-r--r--svx/source/items/svxerr.cxx2
-rw-r--r--svx/source/items/viewlayoutitem.cxx28
-rw-r--r--svx/source/items/zoomitem.cxx29
-rw-r--r--svx/source/items/zoomslideritem.cxx38
20 files changed, 211 insertions, 554 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 5dfdcac382..526b04977c 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-// include ---------------------------------------------------------------
-
#include <svx/SmartTagItem.hxx>
-#ifndef _COM_SUN_STAR_SMARTTAGS_XSMARTTAGPROPERTIES_HPP_
#include <com/sun/star/container/XStringKeyMap.hpp>
-#endif
//#include <svl/memberid.hrc>
@@ -72,14 +69,14 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
// -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
+bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
{
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
+bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
{
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
@@ -121,3 +118,5 @@ SfxPoolItem* SvxSmartTagItem::Create(SvStream& , USHORT) const
{
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index ac96e23927..6cd41d513b 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,16 +34,12 @@
#include <tools/stream.hxx>
#include <com/sun/star/table/BorderLine.hpp>
-#include <com/sun/star/table/CellVertJustify.hpp>
#include <com/sun/star/table/ShadowLocation.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/table/CellContentType.hpp>
#include <com/sun/star/table/TableOrientation.hpp>
-#include <com/sun/star/table/CellHoriJustify.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hpp>
-#include "com/sun/star/style/VerticalAlignment.hpp"
#include <com/sun/star/util/SortField.hpp>
#include <com/sun/star/util/SortFieldType.hpp>
#include <com/sun/star/table/CellOrientation.hpp>
@@ -63,334 +60,9 @@ using namespace ::com::sun::star;
// STATIC DATA -----------------------------------------------------------
//TYPEINIT1_AUTOFACTORY( SvxHorJustifyItem, SfxEnumItem );
-TYPEINIT1_FACTORY( SvxHorJustifyItem, SfxEnumItem, new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0))
-TYPEINIT1_FACTORY( SvxVerJustifyItem, SfxEnumItem, new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) );
TYPEINIT1_FACTORY( SvxOrientationItem, SfxEnumItem, new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) );
TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
-// class SvxHorJustifyItem -----------------------------------------------
-
-
-SvxHorJustifyItem::SvxHorJustifyItem( const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)SVX_HOR_JUSTIFY_STANDARD )
-{
-}
-
-SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
- const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eJustify )
-{
-}
-
-//------------------------------------------------------------------------
-
-SfxItemPresentation SvxHorJustifyItem::GetPresentation
-(
- SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- XubString& rText, const IntlWrapper *) const
-{
- switch ( ePres )
- {
- case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
- return SFX_ITEM_PRESENTATION_NONE;
- case SFX_ITEM_PRESENTATION_NAMELESS:
- case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = GetValueText( GetValue() );
- return SFX_ITEM_PRESENTATION_COMPLETE;
- default: ; //prevent warning
- }
- return SFX_ITEM_PRESENTATION_NONE;
-}
-
-//------------------------------------------------------------------------
-
-sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
-{
-// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
- nMemberId &= ~CONVERT_TWIPS;
- switch ( nMemberId )
- {
- case MID_HORJUST_HORJUST:
- {
- table::CellHoriJustify eUno = table::CellHoriJustify_STANDARD;
- switch ( (SvxCellHorJustify)GetValue() )
- {
- case SVX_HOR_JUSTIFY_STANDARD: eUno = table::CellHoriJustify_STANDARD; break;
- case SVX_HOR_JUSTIFY_LEFT: eUno = table::CellHoriJustify_LEFT; break;
- case SVX_HOR_JUSTIFY_CENTER: eUno = table::CellHoriJustify_CENTER; break;
- case SVX_HOR_JUSTIFY_RIGHT: eUno = table::CellHoriJustify_RIGHT; break;
- case SVX_HOR_JUSTIFY_BLOCK: eUno = table::CellHoriJustify_BLOCK; break;
- case SVX_HOR_JUSTIFY_REPEAT: eUno = table::CellHoriJustify_REPEAT; break;
- }
- rVal <<= eUno;
- }
- break;
- case MID_HORJUST_ADJUST:
- {
- // ParagraphAdjust values, as in SvxAdjustItem
- // (same value for ParaAdjust and ParaLastLineAdjust)
-
- sal_Int16 nAdjust = style::ParagraphAdjust_LEFT;
- switch ( (SvxCellHorJustify)GetValue() )
- {
- // ParagraphAdjust_LEFT is used for STANDARD and REPEAT
- case SVX_HOR_JUSTIFY_STANDARD:
- case SVX_HOR_JUSTIFY_REPEAT:
- case SVX_HOR_JUSTIFY_LEFT: nAdjust = style::ParagraphAdjust_LEFT; break;
- case SVX_HOR_JUSTIFY_CENTER: nAdjust = style::ParagraphAdjust_CENTER; break;
- case SVX_HOR_JUSTIFY_RIGHT: nAdjust = style::ParagraphAdjust_RIGHT; break;
- case SVX_HOR_JUSTIFY_BLOCK: nAdjust = style::ParagraphAdjust_BLOCK; break;
- }
- rVal <<= nAdjust; // as sal_Int16
- }
- break;
- }
- return sal_True;
-}
-
-sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
-{
-// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
- nMemberId &= ~CONVERT_TWIPS;
- switch ( nMemberId )
- {
- case MID_HORJUST_HORJUST:
- {
- table::CellHoriJustify eUno;
- if(!(rVal >>= eUno))
- {
- sal_Int32 nValue = 0;
- if(!(rVal >>= nValue))
- return sal_False;
- eUno = (table::CellHoriJustify)nValue;
- }
- SvxCellHorJustify eSvx = SVX_HOR_JUSTIFY_STANDARD;
- switch (eUno)
- {
- case table::CellHoriJustify_STANDARD: eSvx = SVX_HOR_JUSTIFY_STANDARD; break;
- case table::CellHoriJustify_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break;
- case table::CellHoriJustify_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break;
- case table::CellHoriJustify_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break;
- case table::CellHoriJustify_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break;
- case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break;
- default: ; //prevent warning
- }
- SetValue( (USHORT)eSvx );
- }
- break;
- case MID_HORJUST_ADJUST:
- {
- // property contains ParagraphAdjust values as sal_Int16
- sal_Int16 nVal = sal_Int16();
- if(!(rVal >>= nVal))
- return sal_False;
-
- SvxCellHorJustify eSvx = SVX_HOR_JUSTIFY_STANDARD;
- switch (nVal)
- {
- // STRETCH is treated as BLOCK
- case style::ParagraphAdjust_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break;
- case style::ParagraphAdjust_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break;
- case style::ParagraphAdjust_STRETCH:
- case style::ParagraphAdjust_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break;
- case style::ParagraphAdjust_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break;
- }
- SetValue( (USHORT)eSvx );
- }
- }
- return sal_True;
-}
-
-//------------------------------------------------------------------------
-
-XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const
-{
- DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" );
- return SVX_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal);
-}
-
-//------------------------------------------------------------------------
-
-SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
-{
- return new SvxHorJustifyItem( *this );
-}
-
-//------------------------------------------------------------------------
-
-SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const
-{
- USHORT nVal;
- rStream >> nVal;
- return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() );
-}
-//------------------------------------------------------------------------
-
-USHORT SvxHorJustifyItem::GetValueCount() const
-{
- return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1
-}
-
-// class SvxVerJustifyItem -----------------------------------------------
-
-SvxVerJustifyItem::SvxVerJustifyItem( const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)SVX_VER_JUSTIFY_STANDARD )
-{
-}
-
-SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
- const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eJustify )
-{
-}
-
-//------------------------------------------------------------------------
-
-SfxItemPresentation SvxVerJustifyItem::GetPresentation
-(
- SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- XubString& rText,
- const IntlWrapper * ) const
-{
- switch ( ePres )
- {
- case SFX_ITEM_PRESENTATION_NONE:
- rText.Erase();
- return SFX_ITEM_PRESENTATION_NONE;
- case SFX_ITEM_PRESENTATION_NAMELESS:
- case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = GetValueText( GetValue() );
- return SFX_ITEM_PRESENTATION_COMPLETE;
- default: ; //prevent warning
- }
- return SFX_ITEM_PRESENTATION_NONE;
-}
-
-//------------------------------------------------------------------------
-
-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
-{
- nMemberId &= ~CONVERT_TWIPS;
- switch ( nMemberId )
- {
- case MID_HORJUST_ADJUST:
- {
- style::VerticalAlignment eUno = style::VerticalAlignment_TOP;
- switch ( (SvxCellVerJustify)GetValue() )
- {
- case SVX_VER_JUSTIFY_TOP: eUno = style::VerticalAlignment_TOP; break;
- case SVX_VER_JUSTIFY_CENTER: eUno = style::VerticalAlignment_MIDDLE; break;
- case SVX_VER_JUSTIFY_BOTTOM: eUno = style::VerticalAlignment_BOTTOM; break;
- default: ; //prevent warning
- }
- rVal <<= eUno;
- break;
- }
- default:
- {
- table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
- switch ( (SvxCellVerJustify)GetValue() )
- {
- case SVX_VER_JUSTIFY_STANDARD: eUno = table::CellVertJustify_STANDARD; break;
- case SVX_VER_JUSTIFY_TOP: eUno = table::CellVertJustify_TOP; break;
- case SVX_VER_JUSTIFY_CENTER: eUno = table::CellVertJustify_CENTER; break;
- case SVX_VER_JUSTIFY_BOTTOM: eUno = table::CellVertJustify_BOTTOM; break;
- default: ; //prevent warning
- }
- rVal <<= eUno;
- break;
- }
- }
- return sal_True;
-}
-
-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
-{
- nMemberId &= ~CONVERT_TWIPS;
- switch ( nMemberId )
- {
- case MID_HORJUST_ADJUST:
- {
- // property contains ParagraphAdjust values as sal_Int16
- style::VerticalAlignment nVal = style::VerticalAlignment_TOP;
- if(!(rVal >>= nVal))
- return sal_False;
-
- SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD;
- switch (nVal)
- {
- case style::VerticalAlignment_TOP: eSvx = SVX_VER_JUSTIFY_TOP; break;
- case style::VerticalAlignment_MIDDLE: eSvx = SVX_VER_JUSTIFY_CENTER; break;
- case style::VerticalAlignment_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break;
- default:;
- }
- SetValue( (USHORT)eSvx );
- break;
- }
- default:
- {
- table::CellVertJustify eUno;
- if(!(rVal >>= eUno))
- {
- sal_Int32 nValue = 0;
- if(!(rVal >>= nValue))
- return sal_False;
- eUno = (table::CellVertJustify)nValue;
- }
-
- SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD;
- switch (eUno)
- {
- case table::CellVertJustify_STANDARD: eSvx = SVX_VER_JUSTIFY_STANDARD; break;
- case table::CellVertJustify_TOP: eSvx = SVX_VER_JUSTIFY_TOP; break;
- case table::CellVertJustify_CENTER: eSvx = SVX_VER_JUSTIFY_CENTER; break;
- case table::CellVertJustify_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break;
- default: ; //prevent warning
- }
- SetValue( (USHORT)eSvx );
- break;
- }
- }
-
- return sal_True;
-}
-
-//------------------------------------------------------------------------
-
-XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const
-{
- DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
- return SVX_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal);
-}
-
-//------------------------------------------------------------------------
-
-SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
-{
- return new SvxVerJustifyItem( *this );
-}
-
-//------------------------------------------------------------------------
-
-SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const
-{
- USHORT nVal;
- rStream >> nVal;
- return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() );
-}
-
-//------------------------------------------------------------------------
-
-USHORT SvxVerJustifyItem::GetValueCount() const
-{
- return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1
-}
-
// class SvxOrientationItem ----------------------------------------------
SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
@@ -430,7 +102,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
table::CellOrientation eUno = table::CellOrientation_STANDARD;
switch ( (SvxCellOrientation)GetValue() )
@@ -441,10 +113,10 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) co
case SVX_ORIENTATION_STACKED: eUno = table::CellOrientation_STACKED; break;
}
rVal <<= eUno;
- return sal_True;
+ return true;
}
-sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
table::CellOrientation eOrient;
if(!(rVal >>= eOrient))
@@ -464,7 +136,7 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
default: ; //prevent warning
}
SetValue( (USHORT)eSvx );
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -673,7 +345,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -694,14 +366,14 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
default:
DBG_ERROR("unknown MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
@@ -725,9 +397,9 @@ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
default:
DBG_ERROR("unknown MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -763,3 +435,4 @@ sal_Bool SvxMarginItem::SetBottomMargin( sal_Int16 nBottom )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index f910e6010c..1103ef63a0 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
// include ---------------------------------------------------------------
#include <tools/stream.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX
#include <basic/sbxvar.hxx>
-#endif
#if defined UNX && !defined LINUX
#include <wchar.h>
#endif
@@ -193,7 +192,7 @@ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -213,12 +212,12 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BY
rVal <<= eAO;
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -229,7 +228,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
// also try an int (for Basic)
sal_Int32 nAO = 0;
if(!(rVal >>= nAO))
- return sal_False;
+ return false;
eAO = static_cast< ::com::sun::star::chart::ChartAxisArrangeOrderType >( nAO );
}
@@ -244,12 +243,12 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
case ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO:
eOrder = CHTXTORDER_AUTO; break;
default:
- return sal_False;
+ return false;
}
SetValue( (USHORT)eOrder );
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -395,14 +394,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= fVal;
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
return rVal >>= fVal;
}
@@ -536,3 +535,4 @@ USHORT SvxChartRegressItem::GetVersion (USHORT nFileFormatVersion) const
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index b98c9f3f0a..42a4d10792 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,7 +79,7 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem()
delete pImpl;
}
-BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
USHORT nCount = Count();
@@ -93,10 +94,10 @@ BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMe
}
rVal <<= aClipFormats;
- return TRUE;
+ return true;
}
-sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
::com::sun::star::frame::status::ClipboardFormats aClipFormats;
if ( rVal >>= aClipFormats )
@@ -108,10 +109,10 @@ sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal,
for ( USHORT n=0; n < nCount; n++ )
AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
@@ -178,3 +179,4 @@ const String& SvxClipboardFmtItem::GetClipbrdFormatName( USHORT nPos ) const
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index b91c50d4cf..b498fcc1ce 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -292,7 +293,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( SvStream& /*rIn*/, sal_u
}
}
-int __EXPORT SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const
+int SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const
{
int bRet = SfxPoolItem::operator==( rCmp );
if ( bRet )
@@ -300,7 +301,7 @@ int __EXPORT SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) c
return bRet;
}
-SfxItemPresentation __EXPORT SdrCustomShapeGeometryItem::GetPresentation(
+SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation(
SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
{
@@ -315,12 +316,12 @@ SfxItemPresentation __EXPORT SdrCustomShapeGeometryItem::GetPresentation(
return ePresentation;
}
-SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
+SfxPoolItem* SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
{
return new SdrCustomShapeGeometryItem( rIn, nItemVersion );
}
-SvStream& __EXPORT SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
+SvStream& SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
if ( nItemVersion )
{
@@ -329,7 +330,7 @@ SvStream& __EXPORT SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16
return rOut;
}
-SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
{
SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( GetGeometry() );
// SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( *this );
@@ -345,7 +346,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/
}
#ifdef SDR_ISPOOLABLE
-int __EXPORT SdrCustomShapeGeometryItem::IsPoolable() const
+int SdrCustomShapeGeometryItem::IsPoolable() const
{
USHORT nId=Which();
return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
@@ -355,17 +356,17 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi
{
return 1;
}
-sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= aPropSeq;
- return sal_True;
+ return true;
}
-sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
if ( ! ( rVal >>= aPropSeq ) )
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeometry() const
{
@@ -384,3 +385,4 @@ SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem( const String
: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, rVal )
{}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 0104692ba6..1d0e219379 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,19 +105,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pColorTable );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -125,10 +126,10 @@ sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValue )
{
pColorTable = (XColorTable *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//==================================================================
@@ -188,19 +189,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pGradientList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -209,10 +210,10 @@ sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BY
if ( rVal >>= aValue )
{
pGradientList = (XGradientList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//==================================================================
@@ -272,19 +273,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pHatchList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -293,10 +294,10 @@ sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValue )
{
pHatchList = (XHatchList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//==================================================================
@@ -356,19 +357,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -377,10 +378,10 @@ sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValue )
{
pBitmapList = (XBitmapList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -442,18 +443,18 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
sal_Int64 aValue = sal_Int64( (ULONG)pDashList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -461,10 +462,10 @@ sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /
if ( rVal >>= aValue )
{
pDashList = (XDashList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
@@ -531,18 +532,18 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -550,8 +551,10 @@ sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
if ( rVal >>= aValue )
{
pLineEndList = (XLineEndList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 067c3c2774..64b6219402 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,7 +134,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co
// -----------------------------------------------------------------------
-sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
drawing::Direction3D aDirection;
@@ -143,21 +144,21 @@ sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
aDirection.DirectionZ = aVal.getZ();
rVal <<= aDirection;
- return( sal_True );
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::Direction3D aDirection;
if(!(rVal >>= aDirection))
- return sal_False;
+ return false;
aVal.setX(aDirection.DirectionX);
aVal.setY(aDirection.DirectionY);
aVal.setZ(aDirection.DirectionZ);
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -168,3 +169,5 @@ USHORT SvxB3DVectorItem::GetVersion (USHORT nFileFormatVersion) const
}
// eof
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 0d055de333..3ac7188349 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,7 +118,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
-BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -137,17 +138,17 @@ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= aRet;
- return sal_True;
+ return true;
}
-BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
text::GraphicCrop aVal;
if(!(rVal >>= aVal))
- return sal_False;
+ return false;
if( bConvert )
{
aVal.Right = MM100_TO_TWIP(aVal.Right );
@@ -160,7 +161,7 @@ BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
nRight = aVal.Right ;
nTop = aVal.Top ;
nBottom = aVal.Bottom;
- return sal_True;
+ return true;
}
SfxItemPresentation SvxGrfCrop::GetPresentation(
@@ -195,3 +196,4 @@ SfxItemPresentation SvxGrfCrop::GetPresentation(
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 8fbb46a2a0..f046145859 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,18 +32,10 @@
// include ---------------------------------------------------------------
#define _SVX_HLNKITEM_CXX
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <tools/stream.hxx>
-
-#ifndef _MEMBERID_HRC
-#include <svx/memberid.hrc>
-#endif
-
-#ifndef __SBX_SBXVARIABLE_HXX
+#include <svl/memberid.hrc>
#include <basic/sbxvar.hxx>
-#endif
#include "svx/hlnkitem.hxx"
@@ -52,10 +45,6 @@ TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0));
// class SvxHyperlinkItem ------------------------------------------------
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
#define HYPERLINKFF_MARKER 0x599401FE
SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
@@ -137,10 +126,6 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
return rStrm;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
SvxHyperlinkItem* pNew = new SvxHyperlinkItem( Which() );
@@ -215,10 +200,6 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer
return pNew;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
SfxPoolItem(rHyperlinkItem)
{
@@ -236,10 +217,6 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
};
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, String& rName, String& rURL,
String& rTarget, String& rIntName, SvxLinkInsertMode eTyp,
sal_uInt16 nEvents, SvxMacroTableDtor *pMacroTbl ):
@@ -257,19 +234,11 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, String& rName, String& r
pMacroTable=NULL;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const
{
return new SvxHyperlinkItem( *this );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
@@ -312,11 +281,6 @@ int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
return sal_True;
}
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SvxHyperlinkItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
{
if( nEvent < EVENT_SFX_START )
@@ -348,10 +312,6 @@ void SvxHyperlinkItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
pMacroTable->Insert( nEvent, new SvxMacro( rMacro ) );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
{
if ( pMacroTable )
@@ -360,7 +320,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
pMacroTable = new SvxMacroTableDtor ( rTbl );
}
-BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -382,13 +342,13 @@ BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
rVal <<= (sal_Int32) eType;
break;
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
-BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -422,9 +382,10 @@ BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMem
eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
break;
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index cd1926f34c..b1b5c5298e 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -372,14 +373,14 @@ void SvxNumberFormatShell::MakeFormat( String& rFormat,
if(aCurrencyFormatList.Count()>nCurrencyPos)
{
xub_StrLen rErrPos=0;
- sal_uInt16 rCatLbSelPos=0;
- short rFmtSelPos=0;
SvStrings aFmtEList;
sal_uInt32 nFound = pFormatter->TestNewString( *aCurrencyFormatList[nCurrencyPos], eCurLanguage );
if ( nFound == NUMBERFORMAT_ENTRY_NOT_FOUND )
{
+ sal_uInt16 rCatLbSelPos=0;
+ short rFmtSelPos=0;
AddFormat( *aCurrencyFormatList[nCurrencyPos],rErrPos,rCatLbSelPos,
rFmtSelPos,aFmtEList);
}
@@ -1604,9 +1605,6 @@ void SvxNumberFormatShell::GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bF
aStr += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[i]->GetLanguage()));
pStr = new XubString(aStr);
-#if 0
- fprintf( stderr, "currency entry: %s\n", ByteString( *pStr, RTL_TEXTENCODING_UTF8).GetBuffer());
-#endif
for(j=nStart;j<rList.Count();j++)
{
const StringPtr pTestStr=rList[j];
@@ -1731,10 +1729,9 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat( const String& rFmtString )
sal_uInt16 nPos=FindCurrencyTableEntry(rFmtString, bTestBanking);
- sal_uInt16 nStart=0;
-
if(nPos!=(sal_uInt16)-1)
{
+ sal_uInt16 nStart=0;
if(bTestBanking && aCurCurrencyList.Count()>nPos)
{
nStart=nCount;
@@ -1867,3 +1864,4 @@ sal_Bool SvxNumberFormatShell::IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,co
return bFlag;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 7b1161389c..ca769b2802 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -248,3 +249,4 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData,
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 2d3e7ccfb1..1c28b8b699 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE n
return sal_False;
}
*/
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 2a4846d093..d57303465f 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,7 +165,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
}
//------------------------------------------------------------------------
-sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -198,10 +199,10 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
-sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
switch( nMemberId )
{
@@ -209,7 +210,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
- return sal_False;
+ return false;
eNumType = (SvxNumType)nValue;
}
@@ -239,7 +240,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
break;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -336,3 +337,4 @@ SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index c85e30e72c..21b27d7fb3 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,7 +87,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation
// -----------------------------------------------------------------------
-SfxPoolItem* __EXPORT SvxPostItAuthorItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const
{
return new SvxPostItAuthorItem( *this );
}
@@ -135,7 +136,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation
// -----------------------------------------------------------------------
-SfxPoolItem* __EXPORT SvxPostItDateItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const
{
return new SvxPostItDateItem( *this );
}
@@ -184,9 +185,10 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation
// -----------------------------------------------------------------------
-SfxPoolItem* __EXPORT SvxPostItTextItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const
{
return new SvxPostItTextItem( *this );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 7cde5e3f4d..4dda59ba1c 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,14 +30,13 @@
#include "precompiled_svx.hxx"
#include <tools/stream.hxx>
#include <com/sun/star/table/BorderLine.hpp>
-#include <com/sun/star/table/CellVertJustify.hpp>
+#include <com/sun/star/table/CellVertJustify2.hpp>
#include <com/sun/star/table/ShadowLocation.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/table/CellContentType.hpp>
#include <com/sun/star/table/TableOrientation.hpp>
-#include <com/sun/star/table/CellHoriJustify.hpp>
#include <com/sun/star/util/SortField.hpp>
#include <com/sun/star/util/SortFieldType.hpp>
#include <com/sun/star/table/CellOrientation.hpp>
@@ -66,18 +66,18 @@ SvxRotateModeItem::SvxRotateModeItem( const SvxRotateModeItem& rItem )
{
}
-__EXPORT SvxRotateModeItem::~SvxRotateModeItem()
+SvxRotateModeItem::~SvxRotateModeItem()
{
}
-SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
{
USHORT nVal;
rStream >> nVal;
return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() );
}
-SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation(
+SfxItemPresentation SvxRotateModeItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
String& rText, const IntlWrapper * ) const
@@ -100,7 +100,7 @@ SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation(
return ePres;
}
-String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
+String SvxRotateModeItem::GetValueText( USHORT nVal ) const
{
String aText;
@@ -119,60 +119,56 @@ String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
return aText;
}
-USHORT __EXPORT SvxRotateModeItem::GetValueCount() const
+USHORT SvxRotateModeItem::GetValueCount() const
{
return 4; // STANDARD, TOP, CENTER, BOTTOM
}
-SfxPoolItem* __EXPORT SvxRotateModeItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const
{
return new SvxRotateModeItem( *this );
}
-USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
+USHORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
{
return 0;
}
-// QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
-
-sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
- table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
+ sal_Int32 nUno = table::CellVertJustify2::STANDARD;
switch ( (SvxRotateMode)GetValue() )
{
- case SVX_ROTATE_MODE_STANDARD: eUno = table::CellVertJustify_STANDARD; break;
- case SVX_ROTATE_MODE_TOP: eUno = table::CellVertJustify_TOP; break;
- case SVX_ROTATE_MODE_CENTER: eUno = table::CellVertJustify_CENTER; break;
- case SVX_ROTATE_MODE_BOTTOM: eUno = table::CellVertJustify_BOTTOM; break;
+ case SVX_ROTATE_MODE_STANDARD: nUno = table::CellVertJustify2::STANDARD; break;
+ case SVX_ROTATE_MODE_TOP: nUno = table::CellVertJustify2::TOP; break;
+ case SVX_ROTATE_MODE_CENTER: nUno = table::CellVertJustify2::CENTER; break;
+ case SVX_ROTATE_MODE_BOTTOM: nUno = table::CellVertJustify2::BOTTOM; break;
}
- rVal <<= eUno;
- return sal_True;
+ rVal <<= nUno;
+ return true;
}
-sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
- table::CellVertJustify eUno;
- if(!(rVal >>= eUno))
+ sal_Int32 nUno(0);
+ if(!(rVal >>= nUno))
{
- sal_Int32 nValue = 0;
- if(!(rVal >>= nValue))
- return sal_False;
- eUno = (table::CellVertJustify)nValue;
+ nUno = table::CellVertJustify2::STANDARD;
}
SvxRotateMode eSvx = SVX_ROTATE_MODE_STANDARD;
- switch (eUno)
+ switch (nUno)
{
- case table::CellVertJustify_STANDARD: eSvx = SVX_ROTATE_MODE_STANDARD; break;
- case table::CellVertJustify_TOP: eSvx = SVX_ROTATE_MODE_TOP; break;
- case table::CellVertJustify_CENTER: eSvx = SVX_ROTATE_MODE_CENTER; break;
- case table::CellVertJustify_BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break;
+ case table::CellVertJustify2::STANDARD: eSvx = SVX_ROTATE_MODE_STANDARD; break;
+ case table::CellVertJustify2::TOP: eSvx = SVX_ROTATE_MODE_TOP; break;
+ case table::CellVertJustify2::CENTER: eSvx = SVX_ROTATE_MODE_CENTER; break;
+ case table::CellVertJustify2::BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break;
default: ;//prevent warning
}
SetValue( (USHORT)eSvx );
- return sal_True;
+ return true;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx
index f6d743e1da..8a574d2e8e 100644
--- a/svx/source/items/svxempty.cxx
+++ b/svx/source/items/svxempty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ static String aImplSVXEmptySStr;
String& rImplEmptySStr = aImplSVXEmptySStr;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index c89ac12a5a..37b02b906d 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,4 @@ void SvxErrorHandler::Get()
new SvxErrorHandler;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index df95820581..42b1143c49 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,7 +112,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
mbBookMode == rItem.IsBookMode() );
}
-sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -131,13 +132,13 @@ sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
case MID_VIEWLAYOUT_BOOKMODE: rVal <<= (sal_Bool) mbBookMode; break;
default:
DBG_ERROR("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -170,11 +171,11 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
{
SetValue( (UINT16)nColumns );
mbBookMode = bBookMode;
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
case MID_VIEWLAYOUT_COLUMNS:
@@ -183,10 +184,10 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= nVal )
{
SetValue( (UINT16)nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_VIEWLAYOUT_BOOKMODE:
@@ -194,18 +195,19 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Bool bBookMode = sal_False;
if ( rVal >>= bBookMode )
{
- mbBookMode = bBookMode;
- return sal_True;
+ mbBookMode = bBookMode;
+ return true;
}
else
- return sal_False;
+ return false;
}
default:
DBG_ERROR("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index 309ffd91de..4ebf2df20f 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
#include <tools/stream.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX
#include <basic/sbxvar.hxx>
-#endif
#include <svx/zoomitem.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -117,7 +116,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
eType == rItem.GetType() );
}
-sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -141,13 +140,13 @@ sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId
case MID_TYPE: rVal <<= (sal_Int16) eType; break;
default:
DBG_ERROR("svx::SvxZoomItem::QueryValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -187,11 +186,11 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
SetValue( (UINT16)nValueTmp );
nValueSet = nValueSetTmp;
eType = SvxZoomType( nTypeTmp );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
case MID_VALUE:
@@ -200,10 +199,10 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
if ( rVal >>= nVal )
{
SetValue( (UINT16)nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_VALUESET:
@@ -216,16 +215,18 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
nValueSet = (sal_Int16) nVal;
else if ( nMemberId == MID_TYPE )
eType = SvxZoomType( (sal_Int16) nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
default:
DBG_ERROR("svx::SvxZoomItem::PutValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 73ed5a76ca..79fa3c79ce 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,7 +109,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
}
-sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -128,7 +129,7 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
}
break;
- case MID_ZOOMSLIDER_CURRENTZOOM :
+ case MID_ZOOMSLIDER_CURRENTZOOM :
{
rVal <<= (sal_Int32) GetValue();
}
@@ -150,13 +151,13 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
break;
default:
DBG_ERROR("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -197,7 +198,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
++nConvertedCount;
}
}
-
+
if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
{
SetValue( (UINT16)nCurrentZoom );
@@ -205,11 +206,11 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_CURRENTZOOM:
@@ -218,10 +219,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= nVal )
{
SetValue( (UINT16)nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_SNAPPINGPOINTS:
@@ -230,10 +231,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValues )
{
maValues = aValues;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_MINZOOM:
{
@@ -241,10 +242,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if( rVal >>= nVal )
{
mnMinZoom = (UINT16)nVal;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_MAXZOOM:
{
@@ -252,17 +253,17 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if( rVal >>= nVal )
{
mnMaxZoom = (UINT16)nVal;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
default:
DBG_ERROR("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew )
@@ -278,3 +279,4 @@ const com::sun::star::uno::Sequence < sal_Int32 >& SvxZoomSliderItem::GetSnappin
return maValues;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 09:27:14 +0000