[Libreoffice-commits] .: sd/source sot/source stoc/source svl/source svl/unx svtools/source
Takeshi Abe
tabe at kemper.freedesktop.org
Sat Jun 9 08:56:20 PDT 2012
sd/source/ui/annotations/annotationtag.cxx | 6 -
sd/source/ui/dlg/diactrl.cxx | 4 -
sd/source/ui/dlg/gluectrl.cxx | 6 -
sd/source/ui/func/smarttag.cxx | 16 ----
sd/source/ui/inc/prntopts.hxx | 9 --
sd/source/ui/inc/tbx_ww.hxx | 36 ---------
sd/source/ui/toolpanel/TitledControl.cxx | 5 -
sd/source/ui/unoidl/SdUnoSlideView.cxx | 39 ---------
sot/source/sdstor/stg.cxx | 20 -----
sot/source/sdstor/ucbstorage.cxx | 19 ----
stoc/source/defaultregistry/defaultregistry.cxx | 5 -
svl/source/passwordcontainer/passwordcontainer.cxx | 3
svl/unx/inc/convert.hxx | 8 --
svtools/source/config/test/test.cxx | 4 -
svtools/source/filter/sgvmain.cxx | 82 ---------------------
15 files changed, 262 deletions(-)
New commits:
commit 2ac4d8bf32ef72e22b1feaef300b604a50cdc6d2
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Jun 10 00:56:06 2012 +0900
nuke dead code
Change-Id: I666791b2a2bb817d59625868d5e2df1a9341b2ff
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index b8381c5..9c53d49 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -248,12 +248,6 @@ void AnnotationHdl::CreateB2dIAObject()
const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime());
pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 );
-/*
- (sal_uInt16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1,
- (sal_uInt16)(aBitmapEx.GetSizePixel().Height() - 1) >> 1,
- (sal_uInt16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1,
- (sal_uInt16)(aBitmapEx2.GetSizePixel().Height() - 1) >> 1);
-*/
}
else
{
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index a8e98ca..55cd02b 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -116,10 +116,6 @@ void SdPagesField::Modify()
SfxToolBoxControl::Dispatch( ::uno::Reference< ::frame::XDispatchProvider >( m_xFrame->getController(), ::uno::UNO_QUERY ),
".uno:PagesPerRow",
aArgs );
-/*
- rBindings.GetDispatcher()->Execute(
- SID_PAGES_PER_ROW, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L, 0L );
-*/
}
/*************************************************************************
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 70f7571..8eb2399 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -79,10 +79,8 @@ GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame )
{
String aStr; aStr += sal_Unicode('X');
Size aXSize( GetTextWidth( aStr ), GetTextHeight() );
- //SetPosPixel( Point( aSize.Width(), 0 ) );
SetSizePixel( Size( aXSize.Width() * 12, aXSize.Height() * 10 ) );
Fill();
- //SelectEntryPos( 0 );
Show();
}
@@ -118,10 +116,6 @@ void GlueEscDirLB::Select()
".uno:GlueEscapeDirection",
aArgs );
}
-/*
- SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GLUE_ESCDIR, SFX_CALLMODE_ASYNCHRON |
- SFX_CALLMODE_RECORD, &aItem, (void*) NULL, 0L );
-*/
}
/*************************************************************************
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index 2f6e3cd..e57c982 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/sd/source/ui/func/smarttag.cxx
@@ -458,22 +458,6 @@ bool SmartHdl::isMarkable() const
return false;
}
-// ====================================================================
-
-/*
-SmartProxyHdl::SmartProxyHdl( const SmartTagReference& xTag, SdrHdl* pProxyHdl )
-: SmartHdl( xTag, pProxyHdl->GetPos(), pProxyHdl->GetKind() )
-, mpProxyHdl( pProxyHdl )
-{
-}
-
-// --------------------------------------------------------------------
-
-SmartProxyHdl::~SmartProxyHdl()
-{
- delete mpProxyHdl;
-}
-*/
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 6526d4b..49808fe 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -35,15 +35,6 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
-/*
-enum PrintType
-{
- PT_DRAWING,
- PT_NOTES,
- PT_HANDOUT,
- PT_OUTLINE
-};
-*/
class SdModule;
class SdPrintOptions : public SfxTabPage
{
diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx
index 357ce59..33dfceb 100644
--- a/sd/source/ui/inc/tbx_ww.hxx
+++ b/sd/source/ui/inc/tbx_ww.hxx
@@ -33,42 +33,6 @@
#include <sdresid.hxx>
#include <sfx2/tbxctrl.hxx>
-//------------------------------------------------------------------------
-
-/*
-class SdPopupWindowTbx : public SfxPopupWindow
-{
-private:
- SfxToolBoxManager aTbx;
- SdResId aSdResIdWin;
- SdResId aSdResIdTbx;
- WindowAlign eTbxAlign;
- Link aSelectLink;
-
- DECL_LINK( TbxSelectHdl, ToolBox * );
-
-public:
- SdPopupWindowTbx( sal_uInt16 nId, WindowAlign eAlign,
- SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings );
- ~SdPopupWindowTbx();
-
- virtual SfxPopupWindow* Clone() const;
-
- virtual void PopupModeEnd();
-
- void StartSelection() { aTbx.GetToolBox().StartSelection(); }
- void Update();
-
-private:
-
- // Adapt the toolbox to whether CTL is active or not. If CTL is not
- // active then all toolbox items that describe CTL specific shapes are
- // deleted from it and its size is re-calculated.
- void AdaptToCTL (void);
-};
-*/
-//------------------------------------------------------------------------
-
class SdTbxControl : public SfxToolBoxControl
{
private:
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index eaafff8..4f83cef 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -297,11 +297,6 @@ void TitledControl::SetEnabledState(bool bFlag)
}
else
{
-/*
- GetParentNode()->GetControlContainer().SetExpansionState (
- this,
- ControlContainer::ES_EXPAND);
-*/
Enable();
}
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 99ef0b0..041398a 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -241,45 +241,6 @@ Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) throw
return aSeq;
}
-
-/*
-void SdUnoSlideView::FillPropertyTable (
- ::std::vector< ::com::sun::star::beans::Property>& )
-{
-}
-
-
-
-
-sal_Bool SAL_CALL SdUnoSlideView::convertFastPropertyValue(
- ::com::sun::star::uno::Any & ,
- ::com::sun::star::uno::Any & ,
- sal_Int32 ,
- const ::com::sun::star::uno::Any& )
- throw (::com::sun::star::lang::IllegalArgumentException)
-{
- return sal_False;
-}
-
-
-
-
-void SAL_CALL SdUnoSlideView::setFastPropertyValue_NoBroadcast(
- sal_Int32 ,
- const ::com::sun::star::uno::Any& )
- throw (::com::sun::star::uno::Exception)
-{
-}
-
-
-
-
-void SAL_CALL SdUnoSlideView::getFastPropertyValue( ::com::sun::star::uno::Any&, sal_Int32 ) const
-{
-}
-
-*/
-
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 1f8b5bd..9251228 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -556,11 +556,6 @@ void Storage::FillInfoList( SvStorageInfoList* pList ) const
BaseStorage* Storage::OpenUCBStorage( const String& rName, StreamMode m, sal_Bool bDirect )
{
OSL_FAIL("Not supported!");
-/*
- BaseStorage* pStorage = new Storage( pIo, NULL, m );
- SetError( ERRCODE_IO_NOTSUPPORTED );
- return pStorage;
- */
return OpenStorage( rName, m, bDirect );
}
@@ -717,14 +712,6 @@ sal_Bool Storage::CopyTo( const String& rElem, BaseStorage* pDest, const String&
StgDirEntry* pElem = pIo->pTOC->Find( *pEntry, rElem );
if( pElem )
{
- /*
- this lines are misterious !!! MM
- if( !pElem->IsContained( pDest->pEntry ) )
- {
- SetError( SVSTREAM_ACCESS_DENIED );
- return sal_False;
- }
- */
if( pElem->aEntry.GetType() == STG_STORAGE )
{
// copy the entire storage
@@ -789,13 +776,6 @@ sal_Bool Storage::CopyTo( BaseStorage* pDest ) const
return sal_False;
}
Storage* pThis = (Storage*) this;
- /*
- if( !pThis->pEntry->IsContained( pDest->pEntry ) )
- {
- SetError( SVSTREAM_ACCESS_DENIED );
- return sal_False;
- }
- */
pDest->SetClassId( GetClassId() );
pDest->SetDirty();
SvStorageInfoList aList;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 7fdd535..e8b809d 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1355,16 +1355,6 @@ sal_uLong UCBStorageStream::Read( void * pData, sal_uLong nSize )
sal_uLong UCBStorageStream::Write( const void* pData, sal_uLong nSize )
{
-/*
- // mba: does occur in writer !
- if ( pImp->m_bCommited )
- {
- OSL_FAIL("Writing while commit is in progress!" );
- return 0;
- }
-*/
- // pImp->m_bModified = sal_True;
- //return pImp->m_pStream->Write( pData, nSize );
return pImp->PutData( pData, nSize );
}
@@ -1389,15 +1379,6 @@ void UCBStorageStream::Flush()
sal_Bool UCBStorageStream::SetSize( sal_uLong nNewSize )
{
-/*
- if ( pImp->m_bCommited )
- {
- OSL_FAIL("Changing stream size while commit is in progress!" );
- return sal_False;
- }
-*/
- // pImp->m_bModified = sal_True;
- //return pImp->m_pStream->SetStreamSize( nNewSize );
pImp->SetSize( nNewSize );
return !pImp->GetError();
}
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index d7ff89d..e44cad2 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -1300,11 +1300,6 @@ void SAL_CALL NestedRegistryImpl::close( )
{
m_defaultReg->close();
}
-/*
- throw InvalidRegistryException(
- OUString("the 'close' method is not specified for a nested registry"),
- Reference< XInterface >() );
-*/
}
//*************************************************************************
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index fff6888..c15214c 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -363,9 +363,6 @@ void StorageItem::remove( const ::rtl::OUString& aURL, const ::rtl::OUString& aN
Sequence< ::rtl::OUString > sendSeq(1);
sendSeq[0] = createIndex( forIndex );
- // sendSeq[0] = ::rtl::OUString("Store/Passwordstorage['");
- // sendSeq[0] += createIndex( forIndex );
- // sendSeq[0] += ::rtl::OUString("']");
ConfigItem::ClearNodeElements( ::rtl::OUString("Store"), sendSeq );
}
diff --git a/svl/unx/inc/convert.hxx b/svl/unx/inc/convert.hxx
index 45251e4..bae389b 100644
--- a/svl/unx/inc/convert.hxx
+++ b/svl/unx/inc/convert.hxx
@@ -46,14 +46,6 @@ public:
static void Swap( Rectangle & rRect )
{ Swap( rRect.Top() ); Swap( rRect.Bottom() );
Swap( rRect.Left() ); Swap( rRect.Right() ); }
-/*
- static USHORT AnsiFloatSize() const { return 6; }
- static float AnsiToFloat( void * pAnsiFloat )
- { return 0; }
- static USHORT AnsiDoubleSize() const { return 12; }
- static double AnsiToDouble( void * pAnsiDouble )
- { return 0; }
-*/
};
#endif // _CONVERT_HXX
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index 2a63be2..0cf4c7e 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -64,10 +64,6 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
-/*
-#include <svtools/unoiface.hxx>
-#include <tools/urlobj.hxx>
-*/
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/svtools/source/filter/sgvmain.cxx b/svtools/source/filter/sgvmain.cxx
index 4e8aea6..886bf98 100644
--- a/svtools/source/filter/sgvmain.cxx
+++ b/svtools/source/filter/sgvmain.cxx
@@ -165,7 +165,6 @@ void DtHdOverSeek(SvStream& rInp)
sal_uLong FPos=rInp.Tell();
FPos+=(sal_uLong)DtHdSize;
rInp.Seek(FPos);
-// rInp.seekg(rInp.tellg()+(sal_uLong)DtHdSize);
}
@@ -236,7 +235,6 @@ SvStream& operator>>(SvStream& rInp, PolyType& rPoly)
SWAPOBJK (rPoly);
SWAPLINE (rPoly.L);
SWAPAREA (rPoly.F);
- // rPoly.EckP=OSL_SWAPDWORD(rPoly.EckP);
#endif
return rInp;
}
@@ -247,7 +245,6 @@ SvStream& operator>>(SvStream& rInp, SplnType& rSpln)
SWAPOBJK (rSpln);
SWAPLINE (rSpln.L);
SWAPAREA (rSpln.F);
- // rSpln.EckP=OSL_SWAPDWORD(rSpln.EckP);
#endif
return rInp;
}
@@ -278,8 +275,6 @@ SvStream& operator>>(SvStream& rInp, TextType& rText)
rText.DrehWink=OSL_SWAPWORD(rText.DrehWink);
rText.BoxSlant=OSL_SWAPWORD(rText.BoxSlant);
rText.BufSize =OSL_SWAPWORD(rText.BufSize );
- //rText.Buf =OSL_SWAPDWORD (rText.Buf );
- //rText.Ext =OSL_SWAPDWORD (rText.Ext );
SWAPPOINT(rText.FitSize);
rText.FitBreit=OSL_SWAPWORD(rText.FitBreit);
#endif
@@ -378,31 +373,6 @@ void SetLine(ObjLineType& rLine, OutputDevice& rOut)
void SetArea(ObjAreaType& rArea, OutputDevice& rOut)
{
-/*
- BrushStyle aStyle=BRUSH_SOLID;
- switch(rArea.FMuster & 0x00FF) {
- case 0: aStyle=BRUSH_NULL; break;
- case 1: aStyle=BRUSH_SOLID; break;
- case 2: case 4: case 6: case 8:
- case 10: case 12: case 14: case 16:
- case 43: case 45: aStyle=BRUSH_VERT; break;
- case 3: case 5: case 7: case 9:
- case 11: case 13: case 15: case 17:
- case 42: case 44: aStyle=BRUSH_HORZ; break;
- case 18: case 20: case 22: case 24:
- case 26: case 28: case 30: case 32:
- case 46: case 48: aStyle=BRUSH_UPDIAG; break;
- case 19: case 21: case 23: case 25:
- case 27: case 29: case 31: case 33:
- case 47: case 49: aStyle=BRUSH_DOWNDIAG; break;
- case 34: case 35: case 36: case 37: aStyle=BRUSH_CROSS; break;
- case 38: case 39: case 40: case 41: aStyle=BRUSH_DIAGCROSS; break;
- default: aStyle=BRUSH_DIAGCROSS; break;
- }
- Brush aBrush(Sgv2SvFarbe(rArea.FFarbe,rArea.FBFarbe,rArea.FIntens),aStyle);
- aBrush.SetTransparent((rArea.FMuster & 0x80) !=0L);
- SetBrush(aBrush,rOut);
-*/
if( 0 == ( rArea.FMuster & 0x00FF ) )
rOut.SetFillColor();
else
@@ -416,7 +386,6 @@ void SetArea(ObjAreaType& rArea, OutputDevice& rOut)
*************************************************************************/
void ObjkType::Draw(OutputDevice&)
{
-// ShowSDObjk(*this);
}
void Obj0Type::Draw(OutputDevice&) {}
@@ -517,13 +486,6 @@ void DrawSlideRect(sal_Int16 x1, sal_Int16 y1, sal_Int16 x2, sal_Int16 y2, ObjAr
b=Int1+sal_Int16((sal_Int32(Int2-Int1)*sal_Int32(i)) /sal_Int32(MaxR));
if (b!=b0) {
SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)b0,rOut);
- //if (i0>200 || (Col1 & $80)!=0 || (Col2 & $80)!=0) {
- // then begin { Fallunterscheidung fuer etwas bessere Performance }
- // s2:=i0-i+2;
- // SetPenSize(s2);
- // s2:=s2 div 2;
- // Circle(cx,cy,i0-s2,i0-s2);{}
- // else
rOut.DrawEllipse(Rectangle(cx-i0,cy-i0,cx+i0,cy+i0));
i0=i; b0=b;
}
@@ -1026,48 +988,4 @@ sal_Bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath
return(bRet);
}
-/*
-Bitmap Dither(sal_uInt8 Intens)
-{
- Bitmap aBmp;
- BmpInfoHeader Info;
-
-
-const dmatrix: array[0..7,0..7] of byte =
- (( 0, 48, 12, 60, 3, 51, 15, 63 ),
- ( 32, 16, 44, 28, 35, 19, 47, 31 ),
- ( 8, 56, 4, 52, 11, 59, 7, 55 ),
- ( 40, 24, 36, 20, 43, 27, 39, 23 ),
- ( 2, 50, 14, 62, 1, 49, 13, 61 ),
- ( 34, 18, 46, 30, 33, 17, 45, 29 ),
- ( 10, 58, 6, 54, 9, 57, 5, 53 ),
- ( 42, 26, 38, 22, 41, 25, 37, 21 ));
-
-
- cmatrix: array[0..7,0..7] of byte;
- dmatrixn,dmatrixi: array[0..7] of byte;
-
-
-procedure SetColorIntens(col0,col1,bal: integer);
-var cmatrix0: array[0..63] of byte absolute cmatrix;
- dmatrix0: array[0..63] of byte absolute dmatrix;
- n,i: integer;
- b,bit: byte;
-begin
-if col0=col1 then bal:=0;
-if bal<=32 then
- begin
- plotcolor0:=col0 and $1F; plotcolor1:=col1 and $1F;
- plotbal:=bal;
- end
-else
- begin
- plotcolor0:=col1 and $1F; plotcolor1:=col0 and $1F;
- plotbal:=64-bal;
- end;
-for n:=0 to 63 do
- if plotbal<=dmatrix0[n] then cmatrix0[n]:=col0 else cmatrix0[n]:=col1;
-end;
-*/
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list