Kaydet (Commit) 14fb6ff9 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.3.220); FILE MERGED

2006/04/24 09:54:28 os 1.3.220.2: warnings removed
2006/04/20 14:49:56 cl 1.3.220.1: warning free code changes
üst 70459e05
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: postattr.cxx,v $ * $RCSfile: postattr.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 23:39:05 $ * last change: $Author: hr $ $Date: 2006-06-19 16:14:33 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
// include --------------------------------------------------------------- // include ---------------------------------------------------------------
#pragma hdrstop
#define _SVX_POSTATTR_CXX #define _SVX_POSTATTR_CXX
#define ITEMID_AUTHOR 0 #define ITEMID_AUTHOR 0
#define ITEMID_DATE 0 #define ITEMID_DATE 0
...@@ -53,16 +51,16 @@ TYPEINIT1_AUTOFACTORY(SvxPostItTextItem, SfxStringItem); ...@@ -53,16 +51,16 @@ TYPEINIT1_AUTOFACTORY(SvxPostItTextItem, SfxStringItem);
// class SvxPostItAuthorItem --------------------------------------------- // class SvxPostItAuthorItem ---------------------------------------------
SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 nWhich ) SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich )
{ {
SetWhich( nWhich ); SetWhich( _nWhich );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvxPostItAuthorItem::SvxPostItAuthorItem( const XubString& rAuthor, SvxPostItAuthorItem::SvxPostItAuthorItem( const XubString& rAuthor,
sal_uInt16 nWhich ) : sal_uInt16 _nWhich ) :
SfxStringItem( nWhich, rAuthor ) SfxStringItem( _nWhich, rAuthor )
{ {
} }
...@@ -71,8 +69,8 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const XubString& rAuthor, ...@@ -71,8 +69,8 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const XubString& rAuthor,
SfxItemPresentation SvxPostItAuthorItem::GetPresentation SfxItemPresentation SvxPostItAuthorItem::GetPresentation
( (
SfxItemPresentation ePres, SfxItemPresentation ePres,
SfxMapUnit eCoreUnit, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit ePresUnit, SfxMapUnit /*ePresUnit*/,
XubString& rText, const IntlWrapper * XubString& rText, const IntlWrapper *
) const ) const
{ {
...@@ -88,6 +86,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation ...@@ -88,6 +86,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation
rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE); rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE);
rText += GetValue(); rText += GetValue();
return SFX_ITEM_PRESENTATION_COMPLETE; return SFX_ITEM_PRESENTATION_COMPLETE;
default: ;//prevent warning
} }
return SFX_ITEM_PRESENTATION_NONE; return SFX_ITEM_PRESENTATION_NONE;
} }
...@@ -101,16 +100,16 @@ SfxPoolItem* __EXPORT SvxPostItAuthorItem::Clone( SfxItemPool * ) const ...@@ -101,16 +100,16 @@ SfxPoolItem* __EXPORT SvxPostItAuthorItem::Clone( SfxItemPool * ) const
// class SvxPostItDateItem ----------------------------------------------- // class SvxPostItDateItem -----------------------------------------------
SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 nWhich ) SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich )
{ {
SetWhich( nWhich ); SetWhich( _nWhich );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvxPostItDateItem::SvxPostItDateItem( const XubString& rDate, sal_uInt16 nWhich ) : SvxPostItDateItem::SvxPostItDateItem( const XubString& rDate, sal_uInt16 _nWhich ) :
SfxStringItem( nWhich, rDate ) SfxStringItem( _nWhich, rDate )
{ {
} }
...@@ -119,8 +118,8 @@ SvxPostItDateItem::SvxPostItDateItem( const XubString& rDate, sal_uInt16 nWhich ...@@ -119,8 +118,8 @@ SvxPostItDateItem::SvxPostItDateItem( const XubString& rDate, sal_uInt16 nWhich
SfxItemPresentation SvxPostItDateItem::GetPresentation SfxItemPresentation SvxPostItDateItem::GetPresentation
( (
SfxItemPresentation ePres, SfxItemPresentation ePres,
SfxMapUnit eCoreUnit, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit ePresUnit, SfxMapUnit /*ePresUnit*/,
XubString& rText, const IntlWrapper * XubString& rText, const IntlWrapper *
) const ) const
{ {
...@@ -136,6 +135,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation ...@@ -136,6 +135,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation
rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE); rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE);
rText += GetValue(); rText += GetValue();
return SFX_ITEM_PRESENTATION_COMPLETE; return SFX_ITEM_PRESENTATION_COMPLETE;
default: ;//prevent warning
} }
return SFX_ITEM_PRESENTATION_NONE; return SFX_ITEM_PRESENTATION_NONE;
} }
...@@ -149,16 +149,16 @@ SfxPoolItem* __EXPORT SvxPostItDateItem::Clone( SfxItemPool * ) const ...@@ -149,16 +149,16 @@ SfxPoolItem* __EXPORT SvxPostItDateItem::Clone( SfxItemPool * ) const
// class SvxPostItTextItem ----------------------------------------------- // class SvxPostItTextItem -----------------------------------------------
SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 nWhich ) SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich )
{ {
SetWhich( nWhich ); SetWhich( _nWhich );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvxPostItTextItem::SvxPostItTextItem( const XubString& rText, sal_uInt16 nWhich ) : SvxPostItTextItem::SvxPostItTextItem( const XubString& rText, sal_uInt16 _nWhich ) :
SfxStringItem( nWhich, rText ) SfxStringItem( _nWhich, rText )
{ {
} }
...@@ -167,8 +167,8 @@ SvxPostItTextItem::SvxPostItTextItem( const XubString& rText, sal_uInt16 nWhich ...@@ -167,8 +167,8 @@ SvxPostItTextItem::SvxPostItTextItem( const XubString& rText, sal_uInt16 nWhich
SfxItemPresentation SvxPostItTextItem::GetPresentation SfxItemPresentation SvxPostItTextItem::GetPresentation
( (
SfxItemPresentation ePres, SfxItemPresentation ePres,
SfxMapUnit eCoreUnit, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit ePresUnit, SfxMapUnit /*ePresUnit*/,
XubString& rText, const IntlWrapper * XubString& rText, const IntlWrapper *
) const ) const
{ {
...@@ -184,6 +184,7 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation ...@@ -184,6 +184,7 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation
rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE); rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE);
rText += GetValue(); rText += GetValue();
return SFX_ITEM_PRESENTATION_COMPLETE; return SFX_ITEM_PRESENTATION_COMPLETE;
default: ;//prevent warning
} }
return SFX_ITEM_PRESENTATION_NONE; return SFX_ITEM_PRESENTATION_NONE;
} }
......
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