Skip to content

C
core
Kaydet (Commit) 958eea38 authored tarafından Kurt Zenker's avatar Kurt Zenker
Dosyalara gözat
Seçenekler

INTEGRATION: CWS pchfix04 (1.2.46); FILE MERGED 

2007/05/03 15:37:00 hjs 1.2.46.1: #i73604# - fix after resync
üst c5253598
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 83 deletions
svx/inc/svx/adjitem.hxx
Dosyayı görüntüle @ 958eea38
......@@ -4,9 +4,9 @@
*
* $RCSfile: adjitem.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: vg $ $Date: 2007-04-11 15:38:00 $
* last change: $Author: kz $ $Date: 2007-05-10 14:21:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -86,8 +86,8 @@ class SVX_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
public:
TYPEINFO();
SvxAdjustItem( const SvxAdjust eAdjst = SVX_ADJUST_LEFT,
const USHORT nId = ITEMID_ADJUST );
SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
const USHORT nId );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
......
svx/inc/svx/akrnitem.hxx
Dosyayı görüntüle @ 958eea38
......@@ -4,9 +4,9 @@
*
* $RCSfile: akrnitem.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: vg $ $Date: 2007-04-11 15:38:12 $
* last change: $Author: kz $ $Date: 2007-05-10 14:22:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -66,8 +66,8 @@ class SVX_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
public:
TYPEINFO();
SvxAutoKernItem( const BOOL bAutoKern = FALSE,
const USHORT nId = ITEMID_AUTOKERN );
SvxAutoKernItem( const BOOL bAutoKern /*= FALSE*/,
const USHORT nId );
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
......
svx/inc/svx/algitem.hxx
Dosyayı görüntüle @ 958eea38
......@@ -4,9 +4,9 @@
*
* $RCSfile: algitem.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: vg $ $Date: 2007-04-11 15:38:23 $
* last change: $Author: kz $ $Date: 2007-05-10 14:22:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -57,16 +57,18 @@ class SvStream;
//------------------------------------------------------------------------
#ifdef ITEMID_HORJUSTIFY
class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem
{
public:
TYPEINFO();
SvxHorJustifyItem( const USHORT nId );
SvxHorJustifyItem(
const SvxCellHorJustify eJustify = SVX_HOR_JUSTIFY_STANDARD,
const USHORT nId = ITEMID_HORJUSTIFY );
const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/,
const USHORT nId );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
......@@ -88,20 +90,20 @@ public:
}
};
#endif
//------------------------------------------------------------------------
#ifdef ITEMID_VERJUSTIFY
class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem
{
public:
TYPEINFO();
SvxVerJustifyItem( const USHORT nId );
SvxVerJustifyItem(
const SvxCellVerJustify eJustify = SVX_VER_JUSTIFY_STANDARD,
const USHORT nId = ITEMID_VERJUSTIFY );
const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/,
const USHORT nId );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
......@@ -123,24 +125,21 @@ public:
}
};
#endif
//------------------------------------------------------------------------
#ifdef ITEMID_ORIENTATION
class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem
{
public:
TYPEINFO();
SvxOrientationItem(
const SvxCellOrientation eOrientation = SVX_ORIENTATION_STANDARD,
const USHORT nId = ITEMID_ORIENTATION );
const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/,
const USHORT nId );
SvxOrientationItem(
INT32 nRotation, BOOL bStacked,
const USHORT nId = ITEMID_ORIENTATION );
const USHORT nId );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
......@@ -169,12 +168,8 @@ public:
void SetFromRotation( INT32 nRotation, BOOL bStacked );
};
#endif
//------------------------------------------------------------------------
#ifdef ITEMID_MARGIN
class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
{
INT16 nLeftMargin;
......@@ -183,10 +178,10 @@ class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
INT16 nBottomMargin;
public:
TYPEINFO();
SvxMarginItem( const USHORT nId = ITEMID_MARGIN );
SvxMarginItem( INT16 nLeft, INT16 nTop = 0,
INT16 nRight = 0, INT16 nBottom = 0,
const USHORT nId = ITEMID_MARGIN );
SvxMarginItem( const USHORT nId );
SvxMarginItem( INT16 nLeft, INT16 nTop /*= 0*/,
INT16 nRight /*= 0*/, INT16 nBottom /*= 0*/,
const USHORT nId );
SvxMarginItem( const SvxMarginItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
......@@ -223,5 +218,3 @@ public:
#endif
#endif
svx/inc/svx/blnkitem.hxx
Dosyayı görüntüle @ 958eea38
......@@ -4,9 +4,9 @@
*
* $RCSfile: blnkitem.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: vg $ $Date: 2007-04-11 15:38:34 $
* last change: $Author: kz $ $Date: 2007-05-10 14:22:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
public:
TYPEINFO();
SvxBlinkItem( const BOOL bBlink = FALSE, const USHORT nId = ITEMID_BLINK );
SvxBlinkItem( const BOOL bBlink /*= FALSE*/, const USHORT nId );
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
......
svx/inc/svx/boxitem.hxx
Dosyayı görüntüle @ 958eea38
......@@ -4,9 +4,9 @@
*
* $RCSfile: boxitem.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: vg $ $Date: 2007-04-11 15:39:23 $
* last change: $Author: kz $ $Date: 2007-05-10 14:22:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -81,7 +81,7 @@ class SVX_DLLPUBLIC SvxBoxItem : public SfxPoolItem
public:
TYPEINFO();
SvxBoxItem( const USHORT nId = ITEMID_BOX );
SvxBoxItem( const USHORT nId );
SvxBoxItem( const SvxBoxItem &rCpy );
~SvxBoxItem();
SvxBoxItem &operator=( const SvxBoxItem& rBox );
......@@ -154,7 +154,6 @@ horizontalen und vertikalen innerern Linien transportiert.
#define VALID_DISTANCE 0x40
#define VALID_DISABLE 0x80
#ifdef ITEMID_BOXINFO
class SVX_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
{
SvxBorderLine* pHori; //innere horizontale Linie
......@@ -191,7 +190,7 @@ class SVX_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
public:
TYPEINFO();
SvxBoxInfoItem( const USHORT nId = ITEMID_BOXINFO );
SvxBoxInfoItem( const USHORT nId );
SvxBoxInfoItem( const SvxBoxInfoItem &rCpy );
~SvxBoxInfoItem();
SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy );
......@@ -241,5 +240,3 @@ public:
};
#endif
#endif
svx/inc/svx/brkitem.hxx
Dosyayı görüntüle @ 958eea38
......@@ -4,9 +4,9 @@
*
* $RCSfile: brkitem.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: vg $ $Date: 2007-04-11 15:39:36 $
* last change: $Author: kz $ $Date: 2007-05-10 14:22:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -70,11 +70,8 @@ class SVX_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
public:
TYPEINFO();
inline SvxFmtBreakItem( const SvxBreak eBrk = SVX_BREAK_NONE,
#if SUPD<372
const BOOL bAuto = FALSE,
#endif
const USHORT nWhich = ITEMID_FMTBREAK );
inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
const USHORT nWhich );
inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
......@@ -101,39 +98,8 @@ public:
const SvxBreak GetBreak() const { return SvxBreak( GetValue() ); }
void SetBreak( const SvxBreak eNew )
{ SetValue( (USHORT)eNew ); }
#if SUPD<372
BOOL IsAuto() const { return bAuto; }
private:
BOOL bAuto; //Fuer automatische Breaks, wirkt auf das Verhalten bei
//Backspace und Delete. Wird nie veraendert, nicht const
//wg. dem Zuweisungsoperator.
SVX_DLLPRIVATE void SetAuto( const BOOL bNew ) { bAuto = bNew; }
#endif
};
#if SUPD<372
inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
const BOOL bA,
const USHORT nWhich ) :
SfxEnumItem( nWhich, (USHORT)eBreak ),
bAuto( bA )
{}
inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
SfxEnumItem( rBreak ),
bAuto( rBreak.IsAuto() )
{}
inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
const SvxFmtBreakItem& rBreak )
{
SetValue( rBreak.GetValue() );
SetAuto( rBreak.IsAuto() );
return *this;
}
#else
inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
const USHORT _nWhich ) :
......@@ -153,5 +119,3 @@ inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment