[Libreoffice-commits] .: svtools/inc svtools/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Jul 24 06:48:35 PDT 2011
svtools/inc/svtools/optionsdrawinglayer.hxx | 34 ----
svtools/source/config/optionsdrawinglayer.cxx | 177 --------------------------
2 files changed, 8 insertions(+), 203 deletions(-)
New commits:
commit 010bc6e42d4273069f478e88a9392b6c57b96feb
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jul 24 06:45:19 2011 -0700
unusedcode.easy: Class SvtOptionsDrawinglayer cleanup
diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index c8badca..2c699a2 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.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
@@ -129,27 +129,15 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
Color GetStripeColorB() const;
sal_uInt16 GetStripeLength() const;
- void SetOverlayBuffer( sal_Bool bState );
- void SetPaintBuffer( sal_Bool bState );
- void SetStripeColorA( Color aColor );
- void SetStripeColorB( Color aColor );
- void SetStripeLength( sal_uInt16 nLength );
-
// #i73602#
sal_Bool IsOverlayBuffer_Calc() const;
sal_Bool IsOverlayBuffer_Writer() const;
sal_Bool IsOverlayBuffer_DrawImpress() const;
- void SetOverlayBuffer_Calc( sal_Bool bState );
- void SetOverlayBuffer_Writer( sal_Bool bState );
- void SetOverlayBuffer_DrawImpress( sal_Bool bState );
// #i74769#, #i75172#
sal_Bool IsPaintBuffer_Calc() const;
sal_Bool IsPaintBuffer_Writer() const;
sal_Bool IsPaintBuffer_DrawImpress() const;
- void SetPaintBuffer_Calc( sal_Bool bState );
- void SetPaintBuffer_Writer( sal_Bool bState );
- void SetPaintBuffer_DrawImpress( sal_Bool bState );
// #i4219#
sal_uInt32 GetMaximumPaperWidth() const;
@@ -158,16 +146,9 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
sal_uInt32 GetMaximumPaperRightMargin() const;
sal_uInt32 GetMaximumPaperTopMargin() const;
sal_uInt32 GetMaximumPaperBottomMargin() const;
-
- void SetMaximumPaperWidth(sal_uInt32 nNew);
- void SetMaximumPaperHeight(sal_uInt32 nNew);
- void SetMaximumPaperLeftMargin(sal_uInt32 nNew);
- void SetMaximumPaperRightMargin(sal_uInt32 nNew);
- void SetMaximumPaperTopMargin(sal_uInt32 nNew);
- void SetMaximumPaperBottomMargin(sal_uInt32 nNew);
-
- // #i95644# helper to check if AA is allowed on this system. Currently, for WIN its disabled
- // and OutDevSupport_TransparentRect is checked (this hits XRenderExtension, e.g.
+
+ // #i95644# helper to check if AA is allowed on this system. Currently, for WIN its disabled
+ // and OutDevSupport_TransparentRect is checked (this hits XRenderExtension, e.g.
// currently for SunRay as long as not supported there)
sal_Bool IsAAPossibleOnThisSystem() const;
@@ -181,12 +162,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
sal_uInt32 GetQuadraticFormControlRenderLimit() const;
void SetAntiAliasing( sal_Bool bState );
- void SetSnapHorVerLinesToDiscrete( sal_Bool bState );
- void SetSolidDragCreate( sal_Bool bState );
- void SetRenderDecoratedTextDirect( sal_Bool bState );
- void SetRenderSimpleTextDirect( sal_Bool bState );
- void SetQuadratic3DRenderLimit(sal_uInt32 nNew);
- void SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
// #i97672# selection settings
sal_Bool IsTransparentSelection() const;
@@ -195,7 +170,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
void SetTransparentSelection( sal_Bool bState );
void SetTransparentSelectionPercent( sal_uInt16 nPercent );
- void SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
//-------------------------------------------------------------------------------------------------------------
// private methods
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 30851e1..6e7c935 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.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
@@ -581,13 +581,13 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
seqValues[nProperty] >>= m_bTransparentSelection;
}
break;
-
+
case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT:
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelectionPercent\"?" );
seqValues[nProperty] >>= m_nTransparentSelectionPercent;
}
-
+
case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT:
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SelectionMaximumLuminancePercent\"?" );
@@ -1222,7 +1222,7 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
PROPERTYNAME_RENDERSIMPLETEXTDIRECT,
PROPERTYNAME_QUADRATIC3DRENDERLIMIT,
PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT,
-
+
// #i97672# selection settings
PROPERTYNAME_TRANSPARENTSELECTION,
PROPERTYNAME_TRANSPARENTSELECTIONPERCENT,
@@ -1397,126 +1397,6 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const
return m_pDataContainer->GetMaximumPaperBottomMargin();
}
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetOverlayBuffer( bState );
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetPaintBuffer( bState );
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetStripeColorA( aColor );
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetStripeColorB( aColor );
-}
-
-//*****************************************************************************************************************
-// public method
-//*****************************************************************************************************************
-void SvtOptionsDrawinglayer::SetStripeLength( sal_uInt16 nLength )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetStripeLength( nLength );
-}
-
-// #i73602#
-void SvtOptionsDrawinglayer::SetOverlayBuffer_Calc( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetOverlayBuffer_Calc( bState );
-}
-
-void SvtOptionsDrawinglayer::SetOverlayBuffer_Writer( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetOverlayBuffer_Writer( bState );
-}
-
-void SvtOptionsDrawinglayer::SetOverlayBuffer_DrawImpress( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetOverlayBuffer_DrawImpress( bState );
-}
-
-// #i74769#, #i75172#
-void SvtOptionsDrawinglayer::SetPaintBuffer_Calc( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetPaintBuffer_Calc( bState );
-}
-
-void SvtOptionsDrawinglayer::SetPaintBuffer_Writer( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetPaintBuffer_Writer( bState );
-}
-
-void SvtOptionsDrawinglayer::SetPaintBuffer_DrawImpress( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetPaintBuffer_DrawImpress( bState );
-}
-
-// #i4219#
-void SvtOptionsDrawinglayer::SetMaximumPaperWidth( sal_uInt32 nNew )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMaximumPaperWidth( nNew );
-}
-
-void SvtOptionsDrawinglayer::SetMaximumPaperHeight( sal_uInt32 nNew )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMaximumPaperHeight( nNew );
-}
-
-void SvtOptionsDrawinglayer::SetMaximumPaperLeftMargin( sal_uInt32 nNew )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMaximumPaperLeftMargin( nNew );
-}
-
-void SvtOptionsDrawinglayer::SetMaximumPaperRightMargin( sal_uInt32 nNew )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMaximumPaperRightMargin( nNew );
-}
-
-void SvtOptionsDrawinglayer::SetMaximumPaperTopMargin( sal_uInt32 nNew )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMaximumPaperTopMargin( nNew );
-}
-
-void SvtOptionsDrawinglayer::SetMaximumPaperBottomMargin( sal_uInt32 nNew )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMaximumPaperBottomMargin( nNew );
-}
-
// helper
sal_Bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const
{
@@ -1572,42 +1452,6 @@ void SvtOptionsDrawinglayer::SetAntiAliasing( sal_Bool bState )
m_pDataContainer->SetAntiAliasing( bState );
}
-void SvtOptionsDrawinglayer::SetSnapHorVerLinesToDiscrete( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetSnapHorVerLinesToDiscrete( bState );
-}
-
-void SvtOptionsDrawinglayer::SetSolidDragCreate( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetSolidDragCreate( bState );
-}
-
-void SvtOptionsDrawinglayer::SetRenderDecoratedTextDirect( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetRenderDecoratedTextDirect( bState );
-}
-
-void SvtOptionsDrawinglayer::SetRenderSimpleTextDirect( sal_Bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetRenderSimpleTextDirect( bState );
-}
-
-void SvtOptionsDrawinglayer::SetQuadratic3DRenderLimit(sal_uInt32 nNew)
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetQuadratic3DRenderLimit( nNew );
-}
-
-void SvtOptionsDrawinglayer::SetQuadraticFormControlRenderLimit(sal_uInt32 nNew)
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetQuadraticFormControlRenderLimit( nNew );
-}
-
// #i97672# selection settings
sal_Bool SvtOptionsDrawinglayer::IsTransparentSelection() const
{
@@ -1672,19 +1516,6 @@ sal_uInt16 SvtOptionsDrawinglayer::GetSelectionMaximumLuminancePercent() const
return aRetval;
}
-void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
-
- // crop to range [0% .. 100%]
- if(nPercent > 90)
- {
- nPercent = 90;
- }
-
- m_pDataContainer->SetSelectionMaximumLuminancePercent( nPercent );
-}
-
namespace
{
class theOptionsDrawinglayerMutex : public rtl::Static<osl::Mutex, theOptionsDrawinglayerMutex>{};
More information about the Libreoffice-commits
mailing list