mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed dead code

Browse Source 
Change-Id: Ic70d66befc90450aeb276d53f6da7e81aef85478
This commit is contained in:
Takeshi Abe
2012-05-29 00:10:42 +09:00
parent 1a5aae96bd
commit 3ac9b7af76
8 changed files with 0 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
cppuhelper/source/propshlp.cxx
View File

@@ -1057,65 +1057,10 @@ void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool bEnable )
m_pReserved->m_bFireEvents = bEnable; m_pReserved->m_bFireEvents = bEnable;
} }
#ifdef xdvnsdfln
// XPropertyState
PropertyState OPropertySetHelper::getPropertyState( const OUString& PropertyName )
{
PropertyState aState;
return aState;
}
// XPropertyState
Sequence< PropertyState > OPropertySetHelper::getPropertyStates( const Sequence< OUString >& PropertyNames )
{
ULONG nNames = PropertyNames.getLength();
Sequence< PropertyState > aStates( nNames );
return aStates;
}
void OPropertySetHelper::setPropertyToDefault( const OUString& aPropertyName )
{
setPropertyValue( aPropertyName, Any() );
}
Any OPropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) const
{
return Any();
}
void OPropertySetHelper::addPropertyStateChangeListener( const OUString& aPropertyName, const XPropertyStateChangeListenerRef& Listener )
{
}
void OPropertySetHelper::removePropertyStateChangeListener( const OUString& aPropertyName, const XPropertyStateChangeListenerRef& Listener )
{
}
#endif
//======================================================================== //========================================================================
//== OPropertyArrayHelper ================================================ //== OPropertyArrayHelper ================================================
//======================================================================== //========================================================================
//========================================================================
// static OUString makeOUString( sal_Char *p )
// {
// sal_Int32 nLen = strlen(p);
// sal_Unicode *pw = new sal_Unicode[nLen];
// for( int i = 0 ; i < nLen ; i ++ ) {
// // Only ascii strings allowed with this helper !
// OSL_ASSERT( p[i] < 127 );
// pw[i] = p[i];
// }
// OUString ow( pw , nLen );
// delete pw;
// return ow;
// }
extern "C" { extern "C" {
static int compare_Property_Impl( const void *arg1, const void *arg2 ) static int compare_Property_Impl( const void *arg1, const void *arg2 )
@@ -1222,18 +1167,6 @@ sal_Bool OPropertyArrayHelper::fillPropertyMembersByHandle
//======================================================================== //========================================================================
Sequence< Property > OPropertyArrayHelper::getProperties(void) Sequence< Property > OPropertyArrayHelper::getProperties(void)
{ {
/*if( aInfos.getLength() != nElements )
{
((OPropertyArrayHelper *)this)->aInfos.realloc( nElements );
Property * pProps = ((OPropertyArrayHelper *)this)->aInfos.getArray();
for( sal_Int32 i = 0; i < nElements; i++ )
{
pProps[i].Name = pProperties[i].Name;
pProps[i].Handle = pProperties[i].Handle;
pProps[i].Type = pProperties[i].Type;
pProps[i].Attributes = pProperties[i].Attributes;
}
}*/
return aInfos; return aInfos;
} }
@@ -1248,13 +1181,6 @@ Property OPropertyArrayHelper::getPropertyByName(const OUString& aPropertyName)
if( !pR ) { if( !pR ) {
throw UnknownPropertyException(); throw UnknownPropertyException();
} }
/*Property aProp;
aProp.Name = pR->Name;
aProp.Handle = pR->Handle;
aProp.Type = pR->Type;
aProp.Attributes = pR->Attributes;
return aProp;*/
return *pR; return *pR;
} }

21
sw/source/filter/rtf/rtftbl.cxx
View File

@@ -70,7 +70,6 @@ struct Row
static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) static void SetRowBorder(SfxItemSet& rSet, const Row &rRow)
{ {
#if 1
SvxBoxItem aBox((const SvxBoxItem&)rSet.Get(RES_BOX, false)); SvxBoxItem aBox((const SvxBoxItem&)rSet.Get(RES_BOX, false));
aBox.SetDistance( static_cast< sal_uInt16 >(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist), aBox.SetDistance( static_cast< sal_uInt16 >(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist),
BOX_LINE_LEFT); BOX_LINE_LEFT);
@@ -85,26 +84,6 @@ static void SetRowBorder(SfxItemSet& rSet, const Row &rRow)
BOX_LINE_BOTTOM); BOX_LINE_BOTTOM);
rSet.Put(aBox); rSet.Put(aBox);
#else
const SfxPoolItem* pItem;
if (SFX_ITEM_SET == rSet.GetItemState(RES_BOX, sal_False, &pItem))
{
SvxBoxItem aBox( *(SvxBoxItem*)pItem );
aBox.SetDistance(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist,
BOX_LINE_LEFT);
aBox.SetDistance(rRow.mbUseRightRowPad ? rRow.mnRightRowPad : rRow.mnBrdDist,
BOX_LINE_RIGHT);
aBox.SetDistance(rRow.mbUseTopRowPad ? rRow.mnTopRowPad : 0,
BOX_LINE_TOP);
aBox.SetDistance(rRow.mbUseBottomRowPad ? rRow.mnBottomRowPad : 0,
BOX_LINE_BOTTOM);
rSet.Put(aBox);
}
#endif
} }
void rtfSections::PrependedInlineNode(const SwPosition &rPos, void rtfSections::PrependedInlineNode(const SwPosition &rPos,

19
sw/source/filter/ww1/w1filter.cxx
View File

@@ -1842,7 +1842,6 @@ void Ww1Picture::WriteBmp(SvStream& rOut)
} }
OSL_ENSURE(padx*maxy/2==nSize, "Ww1Picture"); OSL_ENSURE(padx*maxy/2==nSize, "Ww1Picture");
sal_uInt16 j; sal_uInt16 j;
#if 1
{ {
sal_uInt8* pBuf = new sal_uInt8[padx]; sal_uInt8* pBuf = new sal_uInt8[padx];
for (j=0;nSize>0&&j<maxy;j++) for (j=0;nSize>0&&j<maxy;j++)
@@ -1868,24 +1867,6 @@ void Ww1Picture::WriteBmp(SvStream& rOut)
} }
delete [] pBuf; delete [] pBuf;
} }
#else
for (j=0;nSize>0&&j<maxy;j++)
{
for (i=0;nSize>0&&i<maxx;i+=2)
{
wByte(*p>>4);
wByte(*p&0xf);
p++;
nSize -= sizeof(sal_uInt8);
}
for (;i<padx;i+=2)
{
wByte(0);
p++;
nSize -= sizeof(sal_uInt8);
}
}
#endif
OSL_ENSURE(nSize==0, "Ww1Picture"); OSL_ENSURE(nSize==0, "Ww1Picture");
#undef wLong #undef wLong
#undef wShort #undef wShort

34
ucb/source/ucp/webdav/webdavcontent.cxx
View File

@@ -1768,24 +1768,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{ {
// OSL_FAIL( // "Content::setPropertyValues - PROPPATCH failed!" ); // OSL_FAIL( // "Content::setPropertyValues - PROPPATCH failed!" );
#if 1
cancelCommandExecution( e, xEnv ); cancelCommandExecution( e, xEnv );
// unreachable // unreachable
#else
// Note: PROPPATCH either sets ALL property values OR NOTHING.
std::vector< sal_Int32 >::const_iterator it
= aProppatchPropsPositions.begin();
std::vector< sal_Int32 >::const_iterator end
= aProppatchPropsPositions.end();
while ( it != end )
{
// Set error.
aRet[ (*it) ] <<= MapDAVException( e, sal_True );
++it;
}
#endif
} }
} }
@@ -3026,7 +3010,6 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
break; break;
case DAVException::DAV_LOCKED: case DAVException::DAV_LOCKED:
#if 1
aException <<= aException <<=
ucb::InteractiveLockingLockedException( ucb::InteractiveLockingLockedException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")),
@@ -3034,23 +3017,6 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
task::InteractionClassification_ERROR, task::InteractionClassification_ERROR,
aURL, aURL,
sal_False ); // not SelfOwned sal_False ); // not SelfOwned
#else
{
uno::Sequence< uno::Any > aArgs( 1 );
aArgs[ 0 ] <<= beans::PropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
uno::makeAny(aURL),
beans::PropertyState_DIRECT_VALUE);
aException <<=
ucb::InteractiveAugmentedIOException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")),
static_cast< cppu::OWeakObject * >( this ),
task::InteractionClassification_ERROR,
ucb::IOErrorCode_LOCKING_VIOLATION,
aArgs );
}
#endif
break; break;
case DAVException::DAV_LOCKED_SELF: case DAVException::DAV_LOCKED_SELF:

19
vcl/inc/unx/x11_cursors/invert50.h
View File

@@ -28,7 +28,6 @@
#define invert50_width 32 #define invert50_width 32
#define invert50_height 32 #define invert50_height 32
static unsigned char invert50_bits[] = { static unsigned char invert50_bits[] = {
#if 1
0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
@@ -45,24 +44,6 @@ static unsigned char invert50_bits[] = {
0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
#else
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
#endif
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
writerfilter/source/doctok/Dff.cxx
View File

@@ -201,13 +201,11 @@ void DffRecord::resolve(Properties & rHandler)
resolveLocal(rHandler); resolveLocal(rHandler);
#if 1
WW8BinaryObjReference::Pointer_t pBinObjRef WW8BinaryObjReference::Pointer_t pBinObjRef
(new WW8BinaryObjReference(this, 0, getCount())); (new WW8BinaryObjReference(this, 0, getCount()));
WW8Sprm aSprm(pBinObjRef); WW8Sprm aSprm(pBinObjRef);
rHandler.sprm(aSprm); rHandler.sprm(aSprm);
#endif
} }
sal_uInt32 DffRecord::getShapeType() sal_uInt32 DffRecord::getShapeType()

2
writerfilter/source/doctok/WW8DocumentImpl.cxx
View File

@@ -1549,7 +1549,6 @@ void WW8DocumentImpl::resolve(Stream & rStream)
{ {
if (! bSubDocument) if (! bSubDocument)
{ {
#if 1
output.addItem("<substream-names>"); output.addItem("<substream-names>");
output.addItem(mpStream->getSubStreamNames()); output.addItem(mpStream->getSubStreamNames());
output.addItem("</substream-names>"); output.addItem("</substream-names>");
@@ -1563,7 +1562,6 @@ void WW8DocumentImpl::resolve(Stream & rStream)
{ {
mpSummaryInformationStream->dump(output); mpSummaryInformationStream->dump(output);
} }
#endif
writerfilter::Reference<Properties>::Pointer_t pFib writerfilter::Reference<Properties>::Pointer_t pFib
(new WW8Fib(*mpFib)); (new WW8Fib(*mpFib));

2
writerfilter/source/resourcemodel/resourcemodel.cxx
View File

@@ -556,11 +556,9 @@ void WW8BinaryObjHandler::data
(const sal_uInt8 * buf, size_t length, (const sal_uInt8 * buf, size_t length,
writerfilter::Reference<Properties>::Pointer_t /*pRef*/) writerfilter::Reference<Properties>::Pointer_t /*pRef*/)
{ {
#if 1
SubSequence<sal_uInt8> aSeq(buf, length); SubSequence<sal_uInt8> aSeq(buf, length);
aSeq.dump(output); aSeq.dump(output);
#endif
} }
} }