summaryrefslogtreecommitdiffstats
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-26 22:26:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-29 09:56:05 +0100
commit012072ebd70a2180918864818f522944e46adf07 (patch)
treeba33e6c949b52aa7f61ef410f809c817fea5c328 /svx
parentcallcatcher: debug-only and unused code (diff)
downloadcore-012072ebd70a2180918864818f522944e46adf07.tar.gz
core-012072ebd70a2180918864818f522944e46adf07.zip
valgrind: various unused code
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/dlgctrl.hxx11
-rw-r--r--svx/inc/svx/svdograf.hxx1
-rw-r--r--svx/source/dialog/dlgctrl.cxx116
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx2
-rw-r--r--svx/source/svdraw/svdograf.cxx16
-rw-r--r--svx/workben/edittest.cxx30
6 files changed, 1 insertions, 175 deletions
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 75303629b64a..0ccda5df85f8 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -278,15 +278,12 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox
public:
HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
- HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
virtual void Fill( const XHatchList* pList );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
void Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL );
void Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
- void SelectEntryByList( const XHatchList* pList, const String& rStr,
- const XHatch& rXHatch, sal_uInt16 nDist = 0 );
private:
XHatchList* mpList;
@@ -332,8 +329,6 @@ public:
void Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL );
void Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
- void SelectEntryByList( const XBitmapList* pList, const String& rStr,
- const Bitmap& rBmp);
private:
VirtualDevice aVD;
@@ -359,16 +354,12 @@ private:
void SetVirtualDevice();
public:
- FillAttrLB( Window* pParent, ResId Id );
FillAttrLB( Window* pParent, WinBits aWB );
virtual void Fill( const XColorTable* pTab );
virtual void Fill( const XHatchList* pList );
virtual void Fill( const XGradientList* pList );
virtual void Fill( const XBitmapList* pList );
-
- void SelectEntryByList( const XBitmapList* pList, const String& rStr,
- const Bitmap& rBmp);
};
/*************************************************************************
@@ -402,8 +393,6 @@ public:
void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL );
void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
- void SelectEntryByList( const XDashList* pList, const String& rStr,
- const XDash& rDash, sal_uInt16 nDist = 0 );
void FillStyles();
};
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 88cf28d7f093..34e45837b8b5 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -98,7 +98,6 @@ protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
void ImpSetAttrToGrafInfo(); // Werte vom Pool kopieren
- void ImpSetGrafInfoToAttr(); // Werte in den Pool kopieren
GraphicAttr aGrafInfo;
Rectangle aCropRect; // Wenn aCropRect nicht Empty ist, dann enthaelt es den sichtbaren
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index c9e3373f08ed..1d6404c03dcc 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1031,14 +1031,6 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_Tr
EnableUserDraw( mbUserDraw );
}
-HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
-: ListBox( pParent, aWB ),
- mpList ( NULL ),
- mbUserDraw( bUserDraw )
-{
- EnableUserDraw( mbUserDraw );
-}
-
void HatchingLB::Fill( const XHatchList* pList )
{
mpList = (XHatchList*)pList;
@@ -1128,30 +1120,6 @@ void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
InsertEntry( pEntry->GetName(), nPos );
}
-/************************************************************************/
-
-void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
- const XHatch& rHatch, sal_uInt16 nDist )
-{
- long nCount = pList->Count();
- XHatchEntry* pEntry;
- sal_Bool bFound = sal_False;
- String aStr;
-
- long i;
- for( i = 0; i < nCount && !bFound; i++ )
- {
- pEntry = pList->GetHatch( i );
-
- aStr = pEntry->GetName();
-
- if( rStr == aStr && rHatch == pEntry->GetHatch() )
- bFound = sal_True;
- }
- if( bFound )
- SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
-}
-
// Fills the listbox (provisional) with strings
void FillAttrLB::Fill( const XHatchList* pList )
@@ -1477,41 +1445,8 @@ void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
InsertEntry( pEntry->GetName() );
}
-/************************************************************************/
-
-void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
- const Bitmap& )
-{
- long nCount = pList->Count();
- XBitmapEntry* pEntry;
- sal_Bool bFound = sal_False;
-
- long i;
- for( i = 0; i < nCount && !bFound; i++ )
- {
- pEntry = pList->GetBitmap( i );
-
- String aStr = pEntry->GetName();
-
- if( rStr == aStr )
- {
- bFound = sal_True;
- }
- }
- if( bFound )
- SelectEntryPos( (sal_uInt16) ( i - 1 ) );
-}
-
// FillAttrLB Constructor
-FillAttrLB::FillAttrLB( Window* pParent, ResId Id ) :
- ColorListBox( pParent, Id )
-{
- aVD.SetOutputSizePixel( Size( 32, 16 ) );
-}
-
-/************************************************************************/
-
FillAttrLB::FillAttrLB( Window* pParent, WinBits aWB ) :
ColorListBox( pParent, aWB )
{
@@ -1560,31 +1495,6 @@ void FillAttrLB::Fill( const XBitmapList* pList )
ListBox::SetUpdateMode( sal_True );
}
-/************************************************************************/
-
-void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
- const Bitmap& /*rBmp*/)
-{
- long nCount = pList->Count();
- XBitmapEntry* pEntry;
- sal_Bool bFound = sal_False;
-
- long i;
- for( i = 0; i < nCount && !bFound; i++ )
- {
- pEntry = pList->GetBitmap( i );
-
- String aStr = pEntry->GetName();
-
- if( rStr == aStr )
- {
- bFound = sal_True;
- }
- }
- if( bFound )
- SelectEntryPos( (sal_uInt16) ( i - 1 ) );
-}
-
// Fills the listbox (provisional) with strings
void FillTypeLB::Fill()
@@ -1667,32 +1577,6 @@ void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
InsertEntry( pEntry->GetName(), nPos );
}
-/************************************************************************/
-
-void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
- const XDash& rDash, sal_uInt16 nDist )
-{
- long nCount = pList->Count();
- XDashEntry* pEntry;
- sal_Bool bFound = sal_False;
- String aStr;
- XDash aDash;
-
- long i;
- for( i = 0; i < nCount && !bFound; i++ )
- {
- pEntry = pList->GetDash( i );
-
- aStr = pEntry->GetName();
- aDash = pEntry->GetDash();
-
- if( rStr == aStr && rDash == aDash )
- bFound = sal_True;
- }
- if( bFound )
- SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
-}
-
// Fills the listbox (provisional) with strings
void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart )
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index d72a8117afaa..2160138c2eb2 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -91,7 +91,7 @@ namespace sdr
// #i29367# Update GraphicAttr, too. This was formerly
// triggered by SdrGrafObj::Notify, which is no longer
// called nowadays. BTW: strictly speaking, the whole
- // ImpSetAttrToGrafInfo/ImpSetGrafInfoToAttr stuff could
+ // ImpSetAttrToGrafInfostuff could
// be dumped, when SdrGrafObj::aGrafInfo is removed and
// always created on the fly for repaint.
rObj.ImpSetAttrToGrafInfo();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 926e011110be..ff24d2a0fc1b 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1161,22 +1161,6 @@ void SdrGrafObj::ImpSetAttrToGrafInfo()
// -----------------------------------------------------------------------------
-void SdrGrafObj::ImpSetGrafInfoToAttr()
-{
- SetObjectItem( SdrGrafLuminanceItem( aGrafInfo.GetLuminance() ) );
- SetObjectItem( SdrGrafContrastItem( aGrafInfo.GetContrast() ) );
- SetObjectItem( SdrGrafRedItem( aGrafInfo.GetChannelR() ) );
- SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) );
- SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) );
- SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) );
- SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
- SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) );
- SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) );
- SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) );
-}
-
-// -----------------------------------------------------------------------------
-
void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly )
{
Size aSize;
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 966f56b594fa..fc0da685e23a 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -823,36 +823,6 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
break;
case TB_FONT2: pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
break;
-/*
- case TB_FONT:
- {
- FontDialog* pDlg = new FontDialog( this, WB_SVLOOK );
- pDlg->SetPrinter( pPrinter );
- Font aFont = pEditEngine->CreateFontFromItemSet( pEditView->GetAttribs() );
- MapMode aPntMode( MAP_POINT );
- MapMode aCurrent( aViewWin.GetMapMode() );
- Size aSz( aViewWin.LogicToLogic( aFont.GetSize(), &aCurrent, &aPntMode ) );
- aSz.Width() *= 10;
- aSz.Height() *= 10;
- aFont.SetSize( aSz );
- pDlg->SetSelectFont( aFont );
- if ( pDlg->Execute() )
- {
- Font aNewFont( pDlg->GetSelectFont() );
- aSz = aViewWin.LogicToLogic( aNewFont.GetSize(), &aPntMode, &aCurrent );
- aSz.Width() /= 10;
- aSz.Height() /= 10;
- aNewFont.SetSize( aSz );
-
- SfxItemSet aSet( pEditEngine->GetEmptyItemSet() );
-
- pEditEngine->SetFontInfoInItemSet( aSet, aNewFont );
- pEditView->SetAttribs( aSet );
- }
- delete pDlg;
- }
- break;
-*/
case TB_BOLD: if ( bChecked )
pNewItem = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT);
else