diff options
-rw-r--r-- | cppuhelper/source/propshlp.cxx | 74 | ||||
-rw-r--r-- | sw/source/filter/rtf/rtftbl.cxx | 21 | ||||
-rw-r--r-- | sw/source/filter/ww1/w1filter.cxx | 19 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 34 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/invert50.h | 19 | ||||
-rw-r--r-- | writerfilter/source/doctok/Dff.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8DocumentImpl.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/resourcemodel/resourcemodel.cxx | 2 |
8 files changed, 0 insertions, 173 deletions
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 082341941cb0..ce8ff96253ac 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -1057,65 +1057,10 @@ void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool 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 ================================================ //======================================================================== -//======================================================================== - -// 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" { static int compare_Property_Impl( const void *arg1, const void *arg2 ) @@ -1222,18 +1167,6 @@ sal_Bool OPropertyArrayHelper::fillPropertyMembersByHandle //======================================================================== 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; } @@ -1248,13 +1181,6 @@ Property OPropertyArrayHelper::getPropertyByName(const OUString& aPropertyName) if( !pR ) { throw UnknownPropertyException(); } - - /*Property aProp; - aProp.Name = pR->Name; - aProp.Handle = pR->Handle; - aProp.Type = pR->Type; - aProp.Attributes = pR->Attributes; - return aProp;*/ return *pR; } diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index 86c315424dea..1aa7071765e0 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -70,7 +70,6 @@ struct Row static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) { -#if 1 SvxBoxItem aBox((const SvxBoxItem&)rSet.Get(RES_BOX, false)); aBox.SetDistance( static_cast< sal_uInt16 >(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist), BOX_LINE_LEFT); @@ -85,26 +84,6 @@ static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) BOX_LINE_BOTTOM); 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, diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 0cd32f4cc85d..0a7af7d57800 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -1842,7 +1842,6 @@ void Ww1Picture::WriteBmp(SvStream& rOut) } OSL_ENSURE(padx*maxy/2==nSize, "Ww1Picture"); sal_uInt16 j; -#if 1 { sal_uInt8* pBuf = new sal_uInt8[padx]; for (j=0;nSize>0&&j<maxy;j++) @@ -1868,24 +1867,6 @@ void Ww1Picture::WriteBmp(SvStream& rOut) } 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"); #undef wLong #undef wShort diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 50c182018d10..aaf3b9cad1c6 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -1768,24 +1768,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // OSL_FAIL( // "Content::setPropertyValues - PROPPATCH failed!" ); -#if 1 cancelCommandExecution( e, xEnv ); // 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; case DAVException::DAV_LOCKED: -#if 1 aException <<= ucb::InteractiveLockingLockedException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")), @@ -3034,23 +3017,6 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) task::InteractionClassification_ERROR, aURL, 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; case DAVException::DAV_LOCKED_SELF: diff --git a/vcl/inc/unx/x11_cursors/invert50.h b/vcl/inc/unx/x11_cursors/invert50.h index b1f4c1e86d18..bd38daf89caf 100644 --- a/vcl/inc/unx/x11_cursors/invert50.h +++ b/vcl/inc/unx/x11_cursors/invert50.h @@ -28,7 +28,6 @@ #define invert50_width 32 #define invert50_height 32 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, @@ -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, -#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: */ diff --git a/writerfilter/source/doctok/Dff.cxx b/writerfilter/source/doctok/Dff.cxx index 41a948255470..d4f415221140 100644 --- a/writerfilter/source/doctok/Dff.cxx +++ b/writerfilter/source/doctok/Dff.cxx @@ -201,13 +201,11 @@ void DffRecord::resolve(Properties & rHandler) resolveLocal(rHandler); -#if 1 WW8BinaryObjReference::Pointer_t pBinObjRef (new WW8BinaryObjReference(this, 0, getCount())); WW8Sprm aSprm(pBinObjRef); rHandler.sprm(aSprm); -#endif } sal_uInt32 DffRecord::getShapeType() diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx index fd628568c586..cf31023accb9 100644 --- a/writerfilter/source/doctok/WW8DocumentImpl.cxx +++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx @@ -1549,7 +1549,6 @@ void WW8DocumentImpl::resolve(Stream & rStream) { if (! bSubDocument) { -#if 1 output.addItem("<substream-names>"); output.addItem(mpStream->getSubStreamNames()); output.addItem("</substream-names>"); @@ -1563,7 +1562,6 @@ void WW8DocumentImpl::resolve(Stream & rStream) { mpSummaryInformationStream->dump(output); } -#endif writerfilter::Reference<Properties>::Pointer_t pFib (new WW8Fib(*mpFib)); diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx index 765806e58f54..017fa667d8bf 100644 --- a/writerfilter/source/resourcemodel/resourcemodel.cxx +++ b/writerfilter/source/resourcemodel/resourcemodel.cxx @@ -556,11 +556,9 @@ void WW8BinaryObjHandler::data (const sal_uInt8 * buf, size_t length, writerfilter::Reference<Properties>::Pointer_t /*pRef*/) { -#if 1 SubSequence<sal_uInt8> aSeq(buf, length); aSeq.dump(output); -#endif } } |