summaryrefslogtreecommitdiff
path: root/sw/source/core/graphic
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2013-05-05 18:39:59 +0200
committerPhilipp Riemer <ruderphilipp@gmail.com>2013-05-05 20:33:13 +0200
commit24c3a58a0782f81eed3902c3aa16868229d24628 (patch)
tree67903c8449294379c319d0e4f7121e5f5d3d0be6 /sw/source/core/graphic
parent6ecf802cc7ff72784fd0160295180f74d32b59ad (diff)
fdo#62475 - remove ASCII art in sw/source/core/graphic
Change-Id: Ie37dbb1c0c5d01c958d168d15ec5285c36bbf28d
Diffstat (limited to 'sw/source/core/graphic')
-rw-r--r--sw/source/core/graphic/grfatr.cxx45
-rw-r--r--sw/source/core/graphic/ndgrf.cxx18
2 files changed, 16 insertions, 47 deletions
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 4169f2fcdeae..b5f2d2e5a003 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -43,9 +43,7 @@ using namespace ::com::sun::star;
TYPEINIT1_AUTOFACTORY(SwCropGrf, SfxPoolItem)
TYPEINIT1_AUTOFACTORY(SwGammaGrf, SfxPoolItem)
-/******************************************************************************
- * Implementierung class SwMirrorGrf
- ******************************************************************************/
+// SwMirrorGrf
SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const
{
@@ -69,12 +67,14 @@ static sal_Bool lcl_IsHoriOnEvenPages(int nEnum, sal_Bool bToggle)
nEnum == RES_MIRROR_GRAPH_BOTH;
return bEnum != bToggle;
}
+
static sal_Bool lcl_IsHoriOnOddPages(int nEnum)
{
sal_Bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
nEnum == RES_MIRROR_GRAPH_BOTH;
return bEnum;
}
+
bool SwMirrorGrf::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bRet = true;
@@ -149,10 +149,7 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-
-/******************************************************************************
- * Implementierung class SwCropGrf
- ******************************************************************************/
+// SwCropGrf
SwCropGrf::SwCropGrf()
: SvxGrfCrop( RES_GRFATR_CROPGRF )
@@ -167,21 +164,19 @@ SfxPoolItem* SwCropGrf::Clone( SfxItemPool* ) const
return new SwCropGrf( *this );
}
-// ------------------------------------------------------------------
+// SwRotationGrf
SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const
{
return new SwRotationGrf( GetValue(), aUnrotatedSize );
}
-
int SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const
{
return SfxUInt16Item::operator==( rCmp ) &&
GetUnrotatedSize() == ((SwRotationGrf&)rCmp).GetUnrotatedSize();
}
-
bool SwRotationGrf::QueryValue( uno::Any& rVal, sal_uInt8 ) const
{
// SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
@@ -206,48 +201,40 @@ bool SwRotationGrf::PutValue( const uno::Any& rVal, sal_uInt8 )
return false;
}
-// ------------------------------------------------------------------
+// Sw___Grf::Clone(..)
SfxPoolItem* SwLuminanceGrf::Clone( SfxItemPool * ) const
{
return new SwLuminanceGrf( *this );
}
-// ------------------------------------------------------------------
-
SfxPoolItem* SwContrastGrf::Clone( SfxItemPool * ) const
{
return new SwContrastGrf( *this );
}
-// ------------------------------------------------------------------
-
SfxPoolItem* SwChannelRGrf::Clone( SfxItemPool * ) const
{
return new SwChannelRGrf( *this );
}
-// ------------------------------------------------------------------
-
SfxPoolItem* SwChannelGGrf::Clone( SfxItemPool * ) const
{
return new SwChannelGGrf( *this );
}
-// ------------------------------------------------------------------
-
SfxPoolItem* SwChannelBGrf::Clone( SfxItemPool * ) const
{
return new SwChannelBGrf( *this );
}
-// ------------------------------------------------------------------
-
SfxPoolItem* SwGammaGrf::Clone( SfxItemPool * ) const
{
return new SwGammaGrf( *this );
}
+// SwGammaGrf
+
int SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const
{
return SfxPoolItem::operator==( rCmp ) &&
@@ -265,20 +252,20 @@ bool SwGammaGrf::PutValue( const uno::Any& rVal, sal_uInt8 )
return rVal >>= nValue;
}
-// ------------------------------------------------------------------
+// Sw___Grf::Clone(..) cont'd
SfxPoolItem* SwInvertGrf::Clone( SfxItemPool * ) const
{
return new SwInvertGrf( *this );
}
-// ------------------------------------------------------------------
-
SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool * ) const
{
return new SwTransparencyGrf( *this );
}
-// ------------------------------------------------------------------
+
+// SwTransparencyGrf
+
bool SwTransparencyGrf::QueryValue( uno::Any& rVal,
sal_uInt8 ) const
{
@@ -288,7 +275,7 @@ bool SwTransparencyGrf::QueryValue( uno::Any& rVal,
rVal <<= nRet;
return true;
}
-// ------------------------------------------------------------------
+
bool SwTransparencyGrf::PutValue( const uno::Any& rVal,
sal_uInt8 )
{
@@ -309,13 +296,15 @@ bool SwTransparencyGrf::PutValue( const uno::Any& rVal,
return true;
}
-// ------------------------------------------------------------------
+// Sw___Grf::Clone(..) cont'd
SfxPoolItem* SwDrawModeGrf::Clone( SfxItemPool * ) const
{
return new SwDrawModeGrf( *this );
}
+// SwDrawModeGrf
+
sal_uInt16 SwDrawModeGrf::GetValueCount() const
{
return GRAPHICDRAWMODE_WATERMARK + 1;
@@ -341,6 +330,4 @@ bool SwDrawModeGrf::PutValue( const uno::Any& rVal,
return false;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 0c15ce703c5a..51797e71e60b 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -55,9 +55,6 @@
using namespace com::sun::star;
-// --------------------
-// SwGrfNode
-// --------------------
SwGrfNode::SwGrfNode(
const SwNodeIndex & rWhere,
const String& rGrfName, const String& rFltName,
@@ -99,8 +96,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
// Konstruktor fuer den SW/G-Reader. Dieser ctor wird verwendet,
// wenn eine gelinkte Grafik gelesen wird. Sie liest diese NICHT ein.
-
-
SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
const String& rGrfName, const String& rFltName,
SwGrfFmtColl *pGrfColl,
@@ -311,7 +306,6 @@ sal_Bool SwGrfNode::ReRead(
return bReadGrf;
}
-
SwGrfNode::~SwGrfNode()
{
delete mpReplacementGraphic;
@@ -429,7 +423,6 @@ SwCntntNode *SwGrfNode::SplitCntntNode( const SwPosition & )
return this;
}
-
SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
const String& rGrfName,
const String& rFltName,
@@ -459,7 +452,6 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
return new SwGrfNode( rWhere, rGrfObj, pGrfColl, pAutoAttr );
}
-
Size SwGrfNode::GetTwipSize() const
{
return nGrfSize;
@@ -576,7 +568,6 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
return nRet;
}
-
short SwGrfNode::SwapOut()
{
if( maGrfObj.GetType() != GRAPHIC_DEFAULT &&
@@ -599,7 +590,6 @@ short SwGrfNode::SwapOut()
return 1;
}
-
bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const
{
bool bRet = false;
@@ -626,10 +616,8 @@ bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const
return bRet;
}
-
// Eine Grafik Undo-faehig machen. Falls sie sich bereits in
// einem Storage befindet, muss sie geladen werden.
-
sal_Bool SwGrfNode::SavePersistentData()
{
if( refLink.Is() )
@@ -660,7 +648,6 @@ sal_Bool SwGrfNode::SavePersistentData()
return (sal_Bool) SwapOut();
}
-
sal_Bool SwGrfNode::RestorePersistentData()
{
if( refLink.Is() )
@@ -674,7 +661,6 @@ sal_Bool SwGrfNode::RestorePersistentData()
return sal_True;
}
-
void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName )
{
refLink = new SwBaseLink( sfx2::LINKUPDATE_ONCALL, FORMAT_GDIMETAFILE, this );
@@ -707,7 +693,6 @@ void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName )
maGrfObj.SetLink( rGrfName );
}
-
void SwGrfNode::ReleaseLink()
{
if( refLink.Is() )
@@ -907,7 +892,6 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
return pStrm;
}
-
// #i53025# - stream couldn't be in a 3.1 - 5.2 storage any more.
// Thus, removing corresponding code.
void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
@@ -1074,7 +1058,6 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
return (long)pRet;
}
-
// alle QuickDraw-Bitmaps eines speziellen Docs loeschen
void DelAllGrfCacheEntries( SwDoc* pDoc )
{
@@ -1164,7 +1147,6 @@ sal_Bool SwGrfNode::IsTransparent() const
return bRet;
}
-
sal_Bool SwGrfNode::IsSelected() const
{
sal_Bool bRet = sal_False;