[Libreoffice-commits] core.git: include/vcl svx/source unusedcode.easy vcl/source
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Thu Jul 25 00:20:54 PDT 2013
include/vcl/bmpacc.hxx | 3
svx/source/sidebar/ColorPanel.cxx | 28 -------
svx/source/sidebar/ColorPanel.hxx | 2
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 14 ---
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx | 1
svx/source/sidebar/debug/ColorPanel.cxx | 28 -------
svx/source/sidebar/debug/ColorPanel.hxx | 2
svx/source/sidebar/debug/ContextPanel.cxx | 15 ---
svx/source/sidebar/debug/ContextPanel.hxx | 3
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 10 --
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 1
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 14 ---
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 1
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 7 -
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 1
unusedcode.easy | 8 --
vcl/source/gdi/bmpacc3.cxx | 47 ------------
17 files changed, 185 deletions(-)
New commits:
commit 6b0ea724538e2abbbdad7e8633e1c03a5e747427
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Wed Jul 24 11:06:48 2013 -0300
Remove some unused code form unusedcode.easy
Change-Id: Ib9f0bc7416c7f05684802ba2bb5f014a340fb2e8
Reviewed-on: https://gerrit.libreoffice.org/5068
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
index f3f5301..a57377d 100644
--- a/include/vcl/bmpacc.hxx
+++ b/include/vcl/bmpacc.hxx
@@ -196,10 +196,7 @@ public:
void DrawRect( const Rectangle& rRect );
void FillPolygon( const Polygon& rPoly );
- void DrawPolygon( const Polygon& rPoly );
-
void FillPolyPolygon( const PolyPolygon& rPoly );
- void DrawPolyPolygon( const PolyPolygon& rPolyPoly );
private:
diff --git a/svx/source/sidebar/ColorPanel.cxx b/svx/source/sidebar/ColorPanel.cxx
index 92874c0..8eda421 100644
--- a/svx/source/sidebar/ColorPanel.cxx
+++ b/svx/source/sidebar/ColorPanel.cxx
@@ -50,34 +50,6 @@ ColorPanel::~ColorPanel (void)
{
}
-
-
-
-sal_Int32 ColorPanel::GetPreferredHeight (sal_Int32 nWidth)
-{
- sal_Int32 nPreferredHeight = 0;
- if (GetItemCount()>0)
- {
- Image aImage = GetItemImage(GetItemId(0));
- Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel());
- if (nWidth>0 && aItemSize.Width()>0)
- {
- int nColumnCount = nWidth / aItemSize.Width();
- if (nColumnCount <= 0)
- nColumnCount = 1;
- else if (nColumnCount > 4)
- nColumnCount = 4;
- int nRowCount = (GetItemCount() + nColumnCount-1)
- / nColumnCount;
- nPreferredHeight = nRowCount * aItemSize.Height();
- }
- }
- return nPreferredHeight;
-}
-
-
-
-
void ColorPanel::Resize (void)
{
::Window::Resize();
diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx
index 4168dff..79b781c 100644
--- a/svx/source/sidebar/ColorPanel.hxx
+++ b/svx/source/sidebar/ColorPanel.hxx
@@ -49,8 +49,6 @@ private:
*/
int CalculateRowCount (const Size& rItemSize, int nColumnCount);
void Fill (void);
-
- sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
};
} } // end of namespace ::svx::sidebar
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 92ebdee..8f1dd82 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -111,20 +111,6 @@ AreaTransparencyGradientControl::~AreaTransparencyGradientControl (void)
{
}
-
-
-
-void AreaTransparencyGradientControl::ToGetFocus()
-{
- if(maMtrTrgrCenterX.IsVisible())
- maMtrTrgrCenterX.GrabFocus();
- else
- maMtrTrgrAngle.GrabFocus();
-}
-
-
-
-
void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGradientItem)
{
InitStatus(pGradientItem);
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
index 5d31d44..4b1e4ab 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
@@ -37,7 +37,6 @@ public:
AreaPropertyPanel& rPanel);
virtual ~AreaTransparencyGradientControl (void);
- void ToGetFocus();
void Rearrange(XFillFloatTransparenceItem* pGradientItem);
void InitStatus(XFillFloatTransparenceItem* pGradientItem);
void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol );
diff --git a/svx/source/sidebar/debug/ColorPanel.cxx b/svx/source/sidebar/debug/ColorPanel.cxx
index 94d082f..26485f3 100644
--- a/svx/source/sidebar/debug/ColorPanel.cxx
+++ b/svx/source/sidebar/debug/ColorPanel.cxx
@@ -48,34 +48,6 @@ ColorPanel::~ColorPanel (void)
{
}
-
-
-
-sal_Int32 ColorPanel::GetPreferredHeight (sal_Int32 nWidth)
-{
- sal_Int32 nPreferredHeight = 0;
- if (GetItemCount()>0)
- {
- Image aImage = GetItemImage(GetItemId(0));
- Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel());
- if (nWidth>0 && aItemSize.Width()>0)
- {
- int nColumnCount = nWidth / aItemSize.Width();
- if (nColumnCount <= 0)
- nColumnCount = 1;
- else if (nColumnCount > 4)
- nColumnCount = 4;
- int nRowCount = (GetItemCount() + nColumnCount-1)
- / nColumnCount;
- nPreferredHeight = nRowCount * aItemSize.Height();
- }
- }
- return nPreferredHeight;
-}
-
-
-
-
void ColorPanel::Resize (void)
{
::Window::Resize();
diff --git a/svx/source/sidebar/debug/ColorPanel.hxx b/svx/source/sidebar/debug/ColorPanel.hxx
index 2a53e24..6caa1b2 100644
--- a/svx/source/sidebar/debug/ColorPanel.hxx
+++ b/svx/source/sidebar/debug/ColorPanel.hxx
@@ -46,8 +46,6 @@ private:
*/
int CalculateRowCount (const Size& rItemSize, int nColumnCount);
void Fill (void);
-
- sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
};
} } // end of namespace ::svx::sidebar
diff --git a/svx/source/sidebar/debug/ContextPanel.cxx b/svx/source/sidebar/debug/ContextPanel.cxx
index 0a39a70..b8dbb5f 100644
--- a/svx/source/sidebar/debug/ContextPanel.cxx
+++ b/svx/source/sidebar/debug/ContextPanel.cxx
@@ -40,25 +40,10 @@ ContextPanel::~ContextPanel (void)
{
}
-
-
-
-sal_Int32 ContextPanel::GetPreferredHeight (sal_Int32 /*nWidth*/)
-{
- const sal_Int32 nHeight (maContextName.GetPosPixel().Y() + maContextName.GetSizePixel().Height() + 5);
- return nHeight;
-}
-
-
-
-
void ContextPanel::HandleContextChange (const sfx2::sidebar::EnumContext aContext)
{
maApplicationName.SetText(aContext.GetApplicationName());
maContextName.SetText(aContext.GetContextName());
}
-
-
-
} } // end of namespace ::svx::sidebar
diff --git a/svx/source/sidebar/debug/ContextPanel.hxx b/svx/source/sidebar/debug/ContextPanel.hxx
index 7115a35..d7a91c2 100644
--- a/svx/source/sidebar/debug/ContextPanel.hxx
+++ b/svx/source/sidebar/debug/ContextPanel.hxx
@@ -36,9 +36,6 @@ public:
ContextPanel (::Window* pParent);
virtual ~ContextPanel (void);
- // From Window
- sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
-
// From IContextChangeReceiverInterface
virtual void HandleContextChange (const ::sfx2::sidebar::EnumContext aContext);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 83e2a60..9574ea3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -633,16 +633,6 @@ IMPL_LINK( ParaPropertyPanel, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
return 0;
}
-void ParaPropertyPanel::ShowMenu (void)
-{
- if (mpBindings != NULL)
- {
- SfxDispatcher* pDispatcher = mpBindings->GetDispatcher();
- if (pDispatcher != NULL)
- pDispatcher->Execute(SID_PARA_DLG, SFX_CALLMODE_ASYNCHRON);
- }
-}
-
void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState)
{
if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxColorItem))
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 0544850..5577ef4 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -80,7 +80,6 @@ public:
const SfxPoolItem* pState,
const bool bIsEnabled);
- void ShowMenu (void);
sal_uInt16 GetBulletTypeIndex(){ return mnBulletTypeIndex; }
sal_uInt16 GetNumTypeIndex(){ return mnNumTypeIndex; }
FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 75a8d45..7525bda 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -119,20 +119,6 @@ PosSizePropertyPanel::~PosSizePropertyPanel()
{
}
-
-
-void PosSizePropertyPanel::ShowMenu (void)
-{
- if (mpBindings != NULL)
- {
- SfxDispatcher* pDispatcher = mpBindings->GetDispatcher();
- if (pDispatcher != NULL)
- pDispatcher->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_ASYNCHRON);
- }
-}
-
-
-
namespace
{
bool hasText(const SdrView& rSdrView)
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 9ec72cb..4c3b662 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -66,7 +66,6 @@ public:
const bool bIsEnabled);
SfxBindings* GetBindings();
- void ShowMenu (void);
private:
//Position
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 96371ce..c7b3e22 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -137,13 +137,6 @@ void TextCharacterSpacingControl::initial()
maVSSpacing.StartSelection();
maVSSpacing.Show();
}
-void TextCharacterSpacingControl::ToGetFocus()
-{
- if(!mbVS)
- maLBKerning.GrabFocus();
- else
- maVSSpacing.GrabFocus();
-}
void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, long nKerning)
{
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index 2e0aef9..f876f79 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -46,7 +46,6 @@ public:
svx::sidebar::TextPropertyPanel& rPanel,
SfxBindings* pBindings);
virtual ~TextCharacterSpacingControl();
- void ToGetFocus();
void Rearrange(bool bLBAvailable,bool bAvailable, long nKerning);
//virtual void Paint(const Rectangle& rect);
diff --git a/unusedcode.easy b/unusedcode.easy
index 61de0f8..d95c992 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,8 +4,6 @@
(anonymous namespace)::StringTokenizer::getNextToken()
(anonymous namespace)::VBATest::testMiscOLEStuff()
AffineMatrixItem::GetAffineMatrix2D() const
-BitmapWriteAccess::DrawPolyPolygon(PolyPolygon const&)
-BitmapWriteAccess::DrawPolygon(Polygon const&)
DbgRegisterNamedUserChannel(rtl::OUString const&, void (*)(char const*))
EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&)
FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool)
@@ -195,10 +193,7 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::F
svx::DialControl::GetLinkedField() const
svx::DialControl::GetModifyHdl() const
svx::sidebar::AreaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
-svx::sidebar::AreaTransparencyGradientControl::ToGetFocus()
svx::sidebar::BulletsTypeMgr::BulletsTypeMgr(unsigned short, SfxItemSet const*)
-svx::sidebar::ColorPanel::GetPreferredHeight(int)
-svx::sidebar::ContextPanel::GetPreferredHeight(int)
svx::sidebar::GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(unsigned short, SfxItemSet const*)
svx::sidebar::LinePropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
svx::sidebar::LineWidthControl::GetValueSet()
@@ -210,9 +205,6 @@ svx::sidebar::NumberingTypeMgr::NumberingTypeMgr(unsigned short, SfxItemSet cons
svx::sidebar::OutlineTypeMgr::OutlineTypeMgr(unsigned short, SfxItemSet const*)
svx::sidebar::ParaPropertyPanel::InitImageList(boost::scoped_ptr<ToolBox>&, ImageList&, ImageList&)
svx::sidebar::ParaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
-svx::sidebar::ParaPropertyPanel::ShowMenu()
-svx::sidebar::PosSizePropertyPanel::ShowMenu()
-svx::sidebar::TextCharacterSpacingControl::ToGetFocus()
unoidl::UnoidlProvider::getConstant(unsigned int) const
utl::ConfigItem::getUniqueSetElementName(rtl::OUString const&, rtl::OUString&)
utl::toISO8601(com::sun::star::util::Time const&)
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 8d327ae..6523967 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -285,27 +285,6 @@ void BitmapWriteAccess::FillPolygon( const Polygon& rPoly )
}
}
-// ------------------------------------------------------------------
-
-void BitmapWriteAccess::DrawPolygon( const Polygon& rPoly )
-{
- if( mpFillColor )
- FillPolygon( rPoly );
-
- if( mpLineColor && ( !mpFillColor || ( *mpFillColor != *mpLineColor ) ) )
- {
- const sal_uInt16 nSize = rPoly.GetSize();
-
- for( sal_uInt16 i = 0, nSize1 = nSize - 1; i < nSize1; i++ )
- DrawLine( rPoly[ i ], rPoly[ i + 1 ] );
-
- if( rPoly[ nSize - 1 ] != rPoly[ 0 ] )
- DrawLine( rPoly[ nSize - 1 ], rPoly[ 0 ] );
- }
-}
-
-// ------------------------------------------------------------------
-
void BitmapWriteAccess::FillPolyPolygon( const PolyPolygon& rPolyPoly )
{
const sal_uInt16 nCount = rPolyPoly.Count();
@@ -346,30 +325,4 @@ void BitmapWriteAccess::FillPolyPolygon( const PolyPolygon& rPolyPoly )
}
}
-// ------------------------------------------------------------------
-
-void BitmapWriteAccess::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
-{
- if( mpFillColor )
- FillPolyPolygon( rPolyPoly );
-
- if( mpLineColor && ( !mpFillColor || ( *mpFillColor != *mpLineColor ) ) )
- {
- for( sal_uInt16 n = 0, nCount = rPolyPoly.Count(); n < nCount; )
- {
- const Polygon& rPoly = rPolyPoly[ n++ ];
- const sal_uInt16 nSize = rPoly.GetSize();
-
- if( nSize )
- {
- for( sal_uInt16 i = 0, nSize1 = nSize - 1; i < nSize1; i++ )
- DrawLine( rPoly[ i ], rPoly[ i + 1 ] );
-
- if( rPoly[ nSize - 1 ] != rPoly[ 0 ] )
- DrawLine( rPoly[ nSize - 1 ], rPoly[ 0 ] );
- }
- }
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list