diff options
27 files changed, 10 insertions, 657 deletions
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx index 920e5ad0eef5..729aa508cd35 100644 --- a/basic/source/app/brkpnts.cxx +++ b/basic/source/app/brkpnts.cxx @@ -70,16 +70,6 @@ BreakpointWindow::BreakpointWindow( Window *pParent ) Show(); } - -void BreakpointWindow::Reset() -{ - for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i ) - delete BreakpointList[ i ]; - BreakpointList.clear(); - - pModule->ClearAllBP(); -} - void BreakpointWindow::SetModule( SbModule *pMod ) { pModule = pMod; @@ -160,19 +150,6 @@ void BreakpointWindow::InsertBreakpoint( sal_uInt32 nLine ) #endif } - -Breakpoint* BreakpointWindow::FindBreakpoint( sal_uInt32 nLine ) -{ - for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i ) - { - Breakpoint* pBP = BreakpointList[ i ]; - if ( pBP->nLine == nLine ) - return pBP; - } - return NULL; -} - - void BreakpointWindow::AdjustBreakpoints( sal_uInt32 nLine, bool bInserted ) { if ( nLine == 0 ) //TODO: nLine == TEXT_PARA_ALL+1 @@ -281,24 +258,6 @@ void BreakpointWindow::Paint( const Rectangle& ) ShowMarker( sal_True ); } - -Breakpoint* BreakpointWindow::FindBreakpoint( const Point& rMousePos ) -{ - sal_Int32 nLineHeight = GetTextHeight(); - sal_Int32 nYPos = rMousePos.Y() + nCurYOffset; - - for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i ) - { - Breakpoint* pBrk = BreakpointList[ i ]; - sal_Int32 nLine = pBrk->nLine-1; - sal_Int32 nY = nLine * nLineHeight; - if ( ( nYPos > nY ) && ( nYPos < ( nY + nLineHeight ) ) ) - return pBrk; - } - return NULL; -} - - void BreakpointWindow::ToggleBreakpoint( sal_uInt32 nLine ) { bool Removed = false; @@ -366,17 +325,6 @@ void BreakpointWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } - -void BreakpointWindow::SetMarkerPos( sal_uInt32 nLine, bool bError ) -{ - ShowMarker( false ); // Remove old one - nMarkerPos = nLine; - bErrorMarker = bError; - ShowMarker( true ); // Draw new one - Update(); -} - - void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { (void) nFlags; /* avoid warning about unused parameter */ diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx index 5ea60c8e7608..dc4d4471a4af 100644 --- a/basic/source/app/brkpnts.hxx +++ b/basic/source/app/brkpnts.hxx @@ -42,8 +42,6 @@ using Window::Scroll; public: BreakpointWindow( Window *pParent ); - void Reset(); - void SetModule( SbModule *pMod ); void SetBPsInModule(); @@ -64,13 +62,10 @@ private: protected: virtual void Paint( const Rectangle& ); - Breakpoint* FindBreakpoint( const Point& rMousePos ); - Breakpoint* FindBreakpoint( sal_uInt32 nLine ); void ShowMarker( bool bShow ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); public: - void SetMarkerPos( sal_uInt32 nLine, bool bErrorMarker = false ); virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 ); long& GetCurYOffset() { return nCurYOffset; } }; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 8ad732bcd06f..14c45f58cbc4 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -487,52 +487,6 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) InfoBox(0, String( RTL_CONSTASCII_USTRINGPARAM( "D:\\DEBUG.LOG !" ) ) ).Execute(); } -rtl::OString EditDbg::GetPortionInfo( ParaPortion* pPPortion ) -{ - sal_uInt16 z; - - rtl::OStringBuffer aDebStr(RTL_CONSTASCII_STRINGPARAM("Paragraph Length = ")); - aDebStr.append(static_cast<sal_Int32>(pPPortion->GetNode()->Len())); - - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\nCharacter attribute:")); - for ( z = 0; z < pPPortion->GetNode()->GetCharAttribs().Count(); z++ ) - { - EditCharAttrib* pAttr = pPPortion->GetNode()->GetCharAttribs().GetAttribs().GetObject( z ); - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\n ")); - aDebStr.append(static_cast<sal_Int32>(pAttr->GetItem()->Which())); - aDebStr.append('\t'); - aDebStr.append(static_cast<sal_Int32>(pAttr->GetStart())); - aDebStr.append('\t'); - aDebStr.append(static_cast<sal_Int32>(pAttr->GetEnd())); - } - - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\nText portions:")); - sal_uInt16 n = 0; - for ( z = 0; z < pPPortion->GetTextPortions().Count(); z++ ) - { - TextPortion* pPortion = pPPortion->GetTextPortions().GetObject( z ); - aDebStr.append(' '); - aDebStr.append(static_cast<sal_Int32>(pPortion->GetLen())); - aDebStr.append('('); - aDebStr.append(static_cast<sal_Int32>(pPortion->GetSize().Width())); - aDebStr.append(')'); - aDebStr.append(';'); - n = n + pPortion->GetLen(); - } - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\nTotal length: ")); - aDebStr.append(static_cast<sal_Int32>(n)); - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\nSorted after Start:")); - for ( sal_uInt16 x = 0; x < pPPortion->GetNode()->GetCharAttribs().Count(); x++ ) - { - EditCharAttrib* pCurAttrib = pPPortion->GetNode()->GetCharAttribs().GetAttribs().GetObject( x ); - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\nStart: ")); - aDebStr.append(static_cast<sal_Int32>(pCurAttrib->GetStart())); - aDebStr.append(RTL_CONSTASCII_STRINGPARAM("\tEnd: ")); - aDebStr.append(static_cast<sal_Int32>(pCurAttrib->GetEnd())); - } - return aDebStr.makeStringAndClear(); -} - sal_Bool ParaPortion::DbgCheckTextPortions() { // check, if Portion length ok: diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx index 7154dfdb06e5..46e76f7130e4 100644 --- a/editeng/source/editeng/editdbg.hxx +++ b/editeng/source/editeng/editdbg.hxx @@ -48,7 +48,6 @@ class EditDbg { public: static void ShowEditEngineData( EditEngine* pEditEngine, sal_Bool bInfoBox = sal_True ); - static rtl::OString GetPortionInfo( ParaPortion* pPPortion ); static ByteString GetUndoDebStr( EditUndoList* pUndoList ); }; diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index e074e11e4200..fc0638b3e6f5 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -141,19 +141,6 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName, return BenErr_OK; } -BenError -LtcBenContainer::NewObject(pCBenObject * ppBenObject) -{ - pCBenIDListElmt pPrev; - if (FindID(&cObjects, cNextAvailObjectID, &pPrev) != NULL) - return BenErr_DuplicateObjectID; - - *ppBenObject = new CBenObject(this, cNextAvailObjectID, pPrev); - - ++cNextAvailObjectID; - return BenErr_OK; -} - pCBenObject LtcBenContainer::GetNextObject(pCBenObject pCurrObject) { @@ -378,55 +365,6 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p return BenErr_OK; } -#include <tools/globname.hxx> - -//////////////////////////////////////////////////////////////////// -//classs AswEntry -AswEntry::AswEntry() -{ - Init(); -} -void AswEntry::Init() -{ - memset( this, 0, sizeof (AswEntry)); -} -void AswEntry::SetName( const String& rName ) -{ - int i; - for( i = 0; i < rName.Len() && i < 68; i++ ) - nName[ i ] = rName.GetChar( i ); - while( i < 68 ) - nName[ i++ ] = 0; -} -void AswEntry::GetName(String & rName) const -{ - rName = nName; -} -void AswEntry::Store( void* pTo ) -{ - SvMemoryStream r( (sal_Char *)pTo, ASWENTRY_SIZE, STREAM_WRITE ); - for( short i = 0; i < 68; i++ ) - r << nName[ i ]; // 00 name as WCHAR - r<< nMtime[ 0 ] // 42 entry type - << nMtime[ 1 ] // 43 0 or 1 (tree balance?) - << nCtime[ 0 ] // 44 left node entry - << nCtime[ 1 ] // 48 right node entry - << nAtime[ 0 ] // 44 left node entry - << nAtime[ 1 ]; // 48 right node entry - r.Write(&aClsId ,16); // 50 class ID (optional) - r<< nStatebits // 60 state flags(?) - << nType - << nObjectIDRef // 64 modification time - << nMversion // 6C creation and access time - << nLversion // 6C creation and access time - << nReserved[ 0 ] // 74 starting block (either direct or translated) - << nReserved[ 1 ]; // 78 file size -} -void AswEntry::SetClassId( const ClsId& r ) -{ - memcpy( &aClsId, &r, sizeof( ClsId ) ); -} -/////////////////////////////////////////////////////////////////// }// end namespace OpenStormBento /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/benobj.cxx b/lotuswordpro/source/filter/benobj.cxx index fb9f9394791e..1a159cb92166 100644 --- a/lotuswordpro/source/filter/benobj.cxx +++ b/lotuswordpro/source/filter/benobj.cxx @@ -64,24 +64,12 @@ CBenObject::IsNamedObject() } pCBenProperty -CBenObject::GetNextProperty(pCBenProperty pCurrProperty) -{ - return (pCBenProperty) cProperties.GetNextOrNULL(pCurrProperty); -} - -pCBenProperty CBenObject::UseProperty(BenObjectID PropertyID) { pCBenIDListElmt pPrev; return (pCBenProperty) FindID(&cProperties, PropertyID, &pPrev); } -void -CBenObject::DeleteProperty(pCBenProperty pProperty) -{ - delete pProperty; -} - pCBenValue CBenObject::UseValue(BenObjectID PropertyID) { @@ -91,41 +79,6 @@ CBenObject::UseValue(BenObjectID PropertyID) return pProperty->UseValue(); } -pCBenValue -CBenObject::UseValueWithPropertyName(const char * sPropertyName) -{ - pCBenPropertyName pPropertyName; - if (GetContainer()->RegisterPropertyName(sPropertyName, &pPropertyName) - != BenErr_OK) - return NULL; - - return UseValue(pPropertyName->GetID()); -} - -pCBenValue -CBenObject::UseSingleValue() -{ - if (cProperties.IsEmpty() || cProperties.ContainsAtLeastTwoItems()) - return NULL; - pCBenProperty pProperty = (pCBenProperty) cProperties.GetFirst(); - return pProperty->UseValue(); -} - -BenError -CBenObject::NewValue(BenObjectID PropertyID, BenObjectID TypeID, pCBenValue * - ppValue) -{ - pCBenIDListElmt pPrevProperty; - pCBenProperty pProperty = (pCBenProperty) FindID(&cProperties, - PropertyID, &pPrevProperty); - if (pProperty != NULL) - return BenErr_PropertyAlreadyExists; - - pProperty = new CBenProperty(this, PropertyID, TypeID, pPrevProperty); - *ppValue = pProperty->UseValue(); - - return BenErr_OK; -} }// end namespace OpenStormBento /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index e2b4379780ae..7512d6bdd956 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -83,43 +83,6 @@ namespace OpenStormBento #define BEN_LABEL_SIZE 24 #define BEN_MAGIC_BYTES "\xA4""CM""\xA5""Hdr""\xD7" -//For Ole2DirectoryStruct, Add by 10/24/2005 -#define BEN_STGTY_STORAGE 1 -#define BEN_STGTY_STREAM 2 -#define ASWENTRY_SIZE 204 -struct ClsId -{ - sal_Int32 n1; - sal_Int16 n2, n3; - sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; -}; -class AswEntry //total length: 204 -{ - sal_uInt16 nName[ 68 ]; //Name of IStorage or IStream referenced by this entry, length = 136 - sal_Int32 nMtime[ 2 ]; - sal_Int32 nCtime[ 2 ]; - sal_Int32 nAtime[ 2 ]; - ClsId aClsId; //CLSID from OLE 2 IStorage::SetClass call - sal_uInt32 nStatebits; //State bits from OLE 2 IStorage::SetStateBits call - sal_uInt32 nType; // STGTY_STORAGE: 1 or STGTY_STREAM:2, - sal_uInt32 nObjectIDRef; //Persistent Bento reference to Bento object for this IStorage or IStream - sal_uInt32 nMversion; - sal_uInt32 nLversion; - sal_uInt32 nReserved[2]; //skip 16 char -public: - AswEntry(); - void Init(); // initialize the data - void SetName( const String& ); // store a name (ASCII, up to 32 chars) - void GetName( String& rName ) const; - void Store( void* ); - sal_uInt32 GetType() const { return nType; } - void SetType( sal_uInt32 t ) { nType = t;} - const ClsId& GetClassId() const { return aClsId;} - void SetClassId( const ClsId& ); - void SetObjectID(sal_uInt32 id) { nObjectIDRef = id;} - sal_uInt32 GetObjectID() const { return nObjectIDRef;} -}; -//End by enum BenError { @@ -155,24 +118,6 @@ enum BenError // subclass of UtStream (custom handler), can define own error codes-- // those should start at 200 }; -/* - * These two functions are useless in SODC - * -inline UtError BenToUtError(BenError Err) -{ - if (Err == 0 || Err >= 100) - return (UtError) Err; - else return UtErr_Fail; -} - -inline BenError UtToBenError(UtError Err) -{ UT_ASSERT(Err == 0 || Err >= 100); return (BenError) Err; } -enum BenSeekMode { - BenSeek_FromStart = 1, - BenSeek_FromCurr = 2, - BenSeek_FromEnd = 3 -}; -*/ UtDefClassP(LtcBenContainer); UtDefClassP(CBenIDListElmt); @@ -269,7 +214,6 @@ public: pCBenObject GetNextObject(pCBenObject pCurrObject); pCBenObject FindNextObjectWithProperty(pCBenObject pCurrObject, BenObjectID PropertyID); - BenError BEN_EXPORT NewObject(pCBenObject * ppBenObject); public: // Internal methods LtcBenContainer(LwpSvStream * pStream); @@ -306,19 +250,11 @@ private: // Data class CBenObject : public CBenIDListElmt { public: - pCBenProperty GetNextProperty(pCBenProperty pCurrProperty); pCBenProperty UseProperty(BenObjectID PropertyID); - void DeleteProperty(pCBenProperty pProperty); pCBenValue UseValue(BenObjectID PropertyID); - pCBenValue UseSingleValue(); - // Inefficient to use this method if will use property multiple times-- - // instead register property and call UseProperty with property ID - pCBenValue UseValueWithPropertyName(const char * sPropertyName); virtual UtBool IsNamedObject(); pLtcBenContainer GetContainer() { return cpContainer; } BenObjectID GetObjectID() { return GetID(); } - BenError BEN_EXPORT NewValue(BenObjectID PropertyID, BenObjectID TypeID, - pCBenValue * ppValue); public: // Internal methods CBenObject(pLtcBenContainer pContainer, BenObjectID ObjectID, pCBenIDListElmt pPrev) : CBenIDListElmt(ObjectID, pPrev) @@ -337,11 +273,6 @@ public: BenError ReadValueData(BenDataPtr pBuffer, unsigned long Offset, unsigned long MaxSize, unsigned long * pAmtRead); - BenError BEN_EXPORT WriteValueData(BenConstDataPtr pBuffer, - unsigned long Offset, unsigned long Size); - BenError BEN_EXPORT WriteValueData(BenConstDataPtr pBuffer, - unsigned long Offset, unsigned long Size, unsigned long * pAmtWritten); - pCBenProperty BEN_EXPORT GetProperty() { return cpProperty; } public: // Internal methods diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx index de1fc1248304..06f45fe26cd2 100644 --- a/lotuswordpro/source/filter/benval.cxx +++ b/lotuswordpro/source/filter/benval.cxx @@ -132,21 +132,6 @@ CBenValue::ReadValueData(BenDataPtr pReadBuffer, unsigned long Offset, return BenErr_OK; } -BenError -CBenValue::WriteValueData(BenConstDataPtr /*pWriteBuffer*/, unsigned long /*Offset*/, - unsigned long /*Amt*/, unsigned long * /*pAmtWritten*/) -{ - return BenErr_OK; -} - -BenError -CBenValue::WriteValueData(BenConstDataPtr pWriteBuffer, unsigned long Offset, - unsigned long Amt) -{ - unsigned long AmtWritten; - return WriteValueData(pWriteBuffer, Offset, Amt, &AmtWritten); -} - }//end namespace OpenStormBento /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 84aaf24adcc6..42d376bcf15b 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -468,17 +468,6 @@ CBenTOCReader::GetByte(BenByte * pByte) } BenError -CBenTOCReader::GetWord(BenWord * pWord) -{ - if (! CanGetData(2)) - return BenErr_ReadPastEndOfTOC; - - *pWord = UtGetIntelWord(cpTOC + cCurr); - cCurr += 2; - return BenErr_OK; -} - -BenError CBenTOCReader::GetDWord(BenDWord * pDWord) { if (! CanGetData(4)) diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx index e0b68f3f4a99..9c60ad4660ee 100644 --- a/lotuswordpro/source/filter/tocread.hxx +++ b/lotuswordpro/source/filter/tocread.hxx @@ -74,7 +74,6 @@ private: // Methods BenError ReadSegment(pCBenValue pValue, BenByte * pLookAhead); UtBool CanGetData(unsigned long Amt); BenError GetByte(BenByte * pByte); - BenError GetWord(BenWord * pWord); BenError GetDWord(BenDWord * pDWord); BenByte GetCode(); BenError GetData(BenDataPtr pBuffer, unsigned long Amt); diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx index 7cc90c0326bb..82d3798878db 100644 --- a/sfx2/inc/sfx2/imgmgr.hxx +++ b/sfx2/inc/sfx2/imgmgr.hxx @@ -52,8 +52,6 @@ public: void RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF); void ReleaseToolBox( ToolBox *pBox ); - void SetImagesForceSize( ToolBox& rToolBox, bool bLarge ); - Image GetImage( sal_uInt16 nId, bool bLarge ) const; Image GetImage( sal_uInt16 nId) const; Image SeekImage( sal_uInt16 nId, bool bLarge ) const; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index dd2e5a8384d0..df6f09d76322 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -343,16 +343,6 @@ IMPL_LINK( DropListBox_Impl, OnAsyncExecuteDrop, SvLBoxEntry*, EMPTYARG ) return 0; } - -IMPL_LINK( DropListBox_Impl, OnAsyncExecuteError, void*, NOTINTERESTEDIN ) -{ - (void)NOTINTERESTEDIN; // unused - ErrorHandler::HandleError( ERRCODE_IO_WRONGFORMAT ); - - return 0; -} - - long DropListBox_Impl::Notify( NotifyEvent& rNEvt ) { long nRet = 0; diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 461c5b82321a..45e00a25a8e8 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -67,7 +67,6 @@ class DropListBox_Impl : public SvTreeListBox { private: DECL_LINK( OnAsyncExecuteDrop, SvLBoxEntry* ); - DECL_LINK( OnAsyncExecuteError, void* ); protected: SfxCommonTemplateDialog_Impl* pDialog; diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index c9faccf1802d..90261f512f49 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -400,31 +400,4 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox ) } } -void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, bool bLarge ) -{ - ImageList* pImageList = pImp->GetImageList( bLarge ); - - sal_uInt16 nCount = rToolBox.GetItemCount(); - for (sal_uInt16 n=0; n<nCount; n++) - { - sal_uInt16 nId = rToolBox.GetItemId(n); - switch ( rToolBox.GetItemType(n) ) - { - case TOOLBOXITEM_BUTTON: - { - if ( pImageList && pImageList->HasImageAtPos( nId ) ) - rToolBox.SetItemImage( nId, pImageList->GetImage( nId )); - else - rToolBox.SetItemImage( nId, Image() ); - } - - case TOOLBOXITEM_SEPARATOR: - case TOOLBOXITEM_SPACE: - case TOOLBOXITEM_BREAK: - default: - break; - } - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx index d2c45867844d..1ab5be9ce7a6 100644 --- a/svtools/inc/svtools/FilterConfigItem.hxx +++ b/svtools/inc/svtools/FilterConfigItem.hxx @@ -85,7 +85,6 @@ class SVT_DLLPUBLIC FilterConfigItem // and always stores into the FilterData sequence void WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue ); void WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue ); - void WriteString( const ::rtl::OUString& rKey, const ::rtl::OUString& rString ); void WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const; diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx index 10428c6a2456..bbe40a0604c0 100644 --- a/svtools/source/filter/FilterConfigItem.cxx +++ b/svtools/source/filter/FilterConfigItem.cxx @@ -439,40 +439,6 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } -void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewValue ) -{ - PropertyValue aString; - aString.Name = rKey; - aString.Value <<= rNewValue; - WritePropertyValue( aFilterData, aString ); - - if ( xPropSet.is() ) - { - Any aAny; - - if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) - { - OUString aOldValue; - if ( aAny >>= aOldValue ) - { - if ( aOldValue != rNewValue ) - { - aAny <<= rNewValue; - try - { - xPropSet->setPropertyValue( rKey, aAny ); - bModified = sal_True; - } - catch ( ::com::sun::star::uno::Exception& ) - { - OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); - } - } - } - } - } -} - void FilterConfigItem::WriteAny( const OUString& rKey, const Any& rNewAny ) { PropertyValue aPropValue; diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index 2aae76db878d..ee64c7f12edf 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -205,9 +205,6 @@ public: static sal_uIntPtr SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO = sal_True ); static sal_Bool GetReadOnlyFlag( const DirEntry &rEntry ); - - static void SetDateTime( const String& rFileName, - const DateTime& rNewDateTime ); }; // ------------ diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 6f53f3f8a52b..0ddeef0f2d60 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -253,9 +253,6 @@ public: ByteString& ConvertLineEnd() { return ConvertLineEnd( GetSystemLineEnd() ); } - sal_Bool IsLowerAscii() const; - sal_Bool IsUpperAscii() const; - ByteString& ToLowerAscii(); ByteString& ToUpperAscii(); diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx index c0a9c8ce5eba..e633d1bbc444 100644 --- a/tools/source/fsys/fstat.cxx +++ b/tools/source/fsys/fstat.cxx @@ -210,86 +210,4 @@ sal_uIntPtr FileStat::SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO ) #endif } -/************************************************************************* -|* -|* FileStat::SetDateTime -|* -*************************************************************************/ -#if defined WNT - -void FileStat::SetDateTime( const String& rFileName, - const DateTime& rNewDateTime ) -{ - ByteString aFileName(rFileName, osl_getThreadTextEncoding()); - - Date aNewDate = rNewDateTime; - Time aNewTime = rNewDateTime; - - TIME_ZONE_INFORMATION aTZI; - DWORD dwTZI = GetTimeZoneInformation( &aTZI ); - - if ( dwTZI != (DWORD)-1 && dwTZI != TIME_ZONE_ID_UNKNOWN ) - { - // 1. Korrektur der Zeitzone - LONG nDiff = aTZI.Bias; - Time aOldTime = aNewTime; // alte Zeit merken - - // 2. evt. Korrektur Sommer-/Winterzeit - if ( dwTZI == TIME_ZONE_ID_DAYLIGHT ) - nDiff += aTZI.DaylightBias; - - Time aDiff( abs( nDiff / 60 /*Min -> Std*/ ), 0 ); - - if ( nDiff > 0 ) - { - aNewTime += aDiff; // Stundenkorrektur - - // bei "Uberlauf korrigieren - if ( aNewTime >= Time( 24, 0 ) ) - aNewTime -= Time( 24, 0 ); - - // Tages"uberlauf? - if ( aOldTime == Time( 0, 0 ) || // 00:00 -> 01:00 - aNewTime < aOldTime ) // 23:00 -> 00:00 | 01:00 ... - aNewDate++; - } - else if ( nDiff < 0 ) - { - aNewTime -= aDiff; // Stundenkorrektur - - // negative Zeit (-1:00) korrigieren: 23:00 - if (aNewTime < Time( 0, 0 ) ) - aNewTime += Time( 24, 0 ); - - // Tagesunterlauf ? - if ( aOldTime == Time( 0, 0 ) || // 00:00 -> 23:00 - aNewTime > aOldTime ) // 01:00 -> 23:00 | 22:00 ... - aNewDate--; - } - } - - - SYSTEMTIME aTime; - aTime.wYear = aNewDate.GetYear(); - aTime.wMonth = aNewDate.GetMonth(); - aTime.wDayOfWeek = 0; - aTime.wDay = aNewDate.GetDay(); - aTime.wHour = aNewTime.GetHour(); - aTime.wMinute = aNewTime.GetMin(); - aTime.wSecond = aNewTime.GetSec(); - aTime.wMilliseconds = 0; - FILETIME aFileTime; - SystemTimeToFileTime( &aTime, &aFileTime ); - - HANDLE hFile = CreateFile( aFileName.GetBuffer(), GENERIC_WRITE, 0, 0, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); - - if ( hFile != INVALID_HANDLE_VALUE ) - { - SetFileTime( hFile, &aFileTime, &aFileTime, &aFileTime ); - CloseHandle( hFile ); - } -} -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 34d4b5b5a2e5..736730339a5a 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -472,42 +472,4 @@ const char *TempDirImpl( char *pBuf ) return pBuf; } -/************************************************************************* -|* -|* FileStat::SetDateTime -|* -*************************************************************************/ - -void FileStat::SetDateTime( const String& rFileName, - const DateTime& rNewDateTime ) -{ - tm times; - - times.tm_year = rNewDateTime.GetYear() - 1900; // 1997 -> 97 - times.tm_mon = rNewDateTime.GetMonth() - 1; // 0 == Januar! - times.tm_mday = rNewDateTime.GetDay(); - - times.tm_hour = rNewDateTime.GetHour(); - times.tm_min = rNewDateTime.GetMin(); - times.tm_sec = rNewDateTime.GetSec(); - - times.tm_wday = 0; - times.tm_yday = 0; -#ifdef SOLARIS - times.tm_isdst = -1; -#else - times.tm_isdst = 0; -#endif - - time_t time = mktime (×); - - if (time != (time_t) -1) - { - struct utimbuf u_time; - u_time.actime = time; - u_time.modtime = time; - utime(rtl::OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr(), &u_time); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx index f24f4ea90f44..ec74b249fd0f 100644 --- a/tools/source/string/tstring.cxx +++ b/tools/source/string/tstring.cxx @@ -88,48 +88,6 @@ xub_StrLen ImplStringLen( const sal_Unicode* pStr ) #include <strimp.cxx> #include <strcvt.cxx> -// ----------------------------------------------------------------------- - -sal_Bool ByteString::IsLowerAscii() const -{ - DBG_CHKTHIS( ByteString, DbgCheckByteString ); - - sal_Int32 nIndex = 0; - sal_Int32 nLen = mpData->mnLen; - const sal_Char* pStr = mpData->maStr; - while ( nIndex < nLen ) - { - if ( (*pStr >= 65) && (*pStr <= 90) ) - return sal_False; - - ++pStr, - ++nIndex; - } - - return sal_True; -} - -// ----------------------------------------------------------------------- - -sal_Bool ByteString::IsUpperAscii() const -{ - DBG_CHKTHIS( ByteString, DbgCheckByteString ); - - sal_Int32 nIndex = 0; - sal_Int32 nLen = mpData->mnLen; - const sal_Char* pStr = mpData->maStr; - while ( nIndex < nLen ) - { - if ( (*pStr >= 97) && (*pStr <= 122) ) - return sal_False; - - ++pStr, - ++nIndex; - } - - return sal_True; -} - void STRING::SearchAndReplaceAll( const STRCODE* pCharStr, const STRING& rRepStr ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 4ea66c92e006..c5d3af5e8b27 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -362,7 +362,6 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem ::rtl::OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const; ::rtl::OUString GetFactoryShortName ( SvtModuleOptions::EFactory eFactory ) const; ::rtl::OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryWindowAttributes( SvtModuleOptions::EFactory eFactory ) const; ::rtl::OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const; ::rtl::OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const; sal_Bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const; @@ -371,8 +370,6 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem SvtModuleOptions::EFactory& eFactory ); void SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , const ::rtl::OUString& sTemplate ); - void SetFactoryWindowAttributes( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sAttributes); void SetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory , const ::rtl::OUString& sFilter ); void MakeReadonlyStatesAvailable(); @@ -702,19 +699,6 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryWindowAttributes( SvtModuleOptions::EFactory eFactory ) const -{ - ::rtl::OUString sAttributes; - - if( eFactory>=0 && eFactory<FACTORYCOUNT ) - { - sAttributes = m_lFactories[eFactory].getWindowAttributes(); - } - - return sAttributes; -} - -//***************************************************************************************************************** ::rtl::OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. @@ -799,17 +783,6 @@ void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions:: } //***************************************************************************************************************** -void SvtModuleOptions_Impl::SetFactoryWindowAttributes( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sAttributes) -{ - if( eFactory>=0 && eFactory<FACTORYCOUNT ) - { - m_lFactories[eFactory].setWindowAttributes( sAttributes ); - SetModified(); - } -} - -//***************************************************************************************************************** void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory, const ::rtl::OUString& sFilter ) { diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx index cd1ce9c25b75..e6addfcdc9ed 100644 --- a/unotools/source/config/startoptions.cxx +++ b/unotools/source/config/startoptions.cxx @@ -138,8 +138,6 @@ class SvtStartOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsIntroEnabled ( ) const ; - void EnableIntro ( sal_Bool bState ) ; OUString GetConnectionURL( ) const ; void SetConnectionURL( const OUString& sURL ) ; @@ -298,23 +296,6 @@ void SvtStartOptions_Impl::Commit() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtStartOptions_Impl::IsIntroEnabled() const -{ - return m_bShowIntro; -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void SvtStartOptions_Impl::EnableIntro( sal_Bool bState ) -{ - m_bShowIntro = bState; - SetModified(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** OUString SvtStartOptions_Impl::GetConnectionURL() const { return m_sConnectionURL; diff --git a/unusedcode.easy b/unusedcode.easy index 0379760f1e32..255c8915e281 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,7 @@ (anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&) (anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&) +BasicPrinter::BasicPrinter() +BitmapPalette::IsGreyPalette() const BufferNode::childAt(int) const CAT::Inverse() const CAT::makeChromaticAdaptationTag() const @@ -103,8 +105,6 @@ Dialog::ImplCenterDialog() Dialog::IsStartedModal() const DirEntry::GetDevice() const DlgEdObj::LinkStubOnCreate(void*, void*) -DockingWindow::ShowTitleButton(unsigned short, unsigned char) -DropListBox_Impl::LinkStubOnAsyncExecuteError(void*, void*) EECharAttribArray::Insert(EECharAttribArray const*, unsigned short, unsigned short, unsigned short) EECharAttribArray::Replace(EECharAttrib const&, unsigned short) EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short) @@ -158,14 +158,8 @@ ExtraKernInfo::HasKernPairs() const FieldEntry::GetBookmarkType() FileControl::ResetButtonText() FileControl::SetButtonText(String const&) -FileDialog::GetCurFilter() const -FileDialog::GetFilterCount() const -FileDialog::GetFilterName(unsigned short) const FileList::GetFormat() -FileStat::FileStat() FileStat::FileStat(void const*, void const*) -FileStat::IsYounger(FileStat const&) const -FileStat::SetDateTime(String const&, DateTime const&) FileStream::FileStream(rtl::OString const&, FileAccessMode) FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&) FixedBitmap::GetModeBitmap() const @@ -373,16 +367,6 @@ OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short) OUStringsSort_Impl::Remove(unsigned short, unsigned short) Octree::AddColor(BitmapColor const&) Octree::Octree(unsigned long) -OpenStormBento::AswEntry::AswEntry() -OpenStormBento::AswEntry::GetName(String&) const -OpenStormBento::AswEntry::SetClassId(OpenStormBento::ClsId const&) -OpenStormBento::AswEntry::SetName(String const&) -OpenStormBento::AswEntry::Store(void*) -OpenStormBento::CBenObject::DeleteProperty(OpenStormBento::CBenProperty*) -OpenStormBento::CBenObject::GetNextProperty(OpenStormBento::CBenProperty*) -OpenStormBento::CBenObject::UseSingleValue() -OpenStormBento::CBenObject::UseValueWithPropertyName(char const*) -OpenStormBento::CBenTOCReader::GetWord(unsigned short*) OutlinerView::AdjustDepth(Paragraph*, short, unsigned char) OutlinerView::AdjustHeight(Paragraph*, long, unsigned char) OutlinerView::Collapse(Paragraph*) @@ -475,10 +459,8 @@ SbMethod::GetLocals() SbPropertyContainer::SbPropertyContainer() SbPropertySetInfo::SbPropertySetInfo() SbTextPortions::Insert(SbTextPortions const*, unsigned short, unsigned short, unsigned short) -SbTextPortions::Remove(unsigned short, unsigned short) SbTextPortions::Replace(SbTextPortion const&, unsigned short) SbTextPortions::Replace(SbTextPortion const*, unsigned short, unsigned short) -SbTextPortions::SbTextPortions(unsigned short, unsigned char) SbTextPortions::_ForEach(unsigned short, unsigned short, unsigned char (*)(SbTextPortion const&, void*), void*) SbiBuffer::Add(void const*, unsigned short) SbiBuffer::Align(int) @@ -512,7 +494,6 @@ SbxDimArray::GetRef32(int const*) SbxDimArray::Offset(SbxArray*) SbxDimArray::Put(SbxVariable*, SbxArray*) SbxInfo::AddParam(SbxParamInfo const&) -SbxMethod::Run(SbxValues*) SbxObject::GarbageCollection(unsigned long) SbxObject::SetPos(SbxVariable*, unsigned short) SbxObject::VCPtrInsert(SbxVariable*) @@ -595,7 +576,6 @@ ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rt ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&) ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&, formula::FormulaGrammar::Grammar) ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) -ScOutputData::DrawEditAsianVertical(ScOutputData::DrawEditParam&) ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const ScPivotParam::ClearPivotArrays() ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short) @@ -934,9 +914,6 @@ SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short) SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*) StackWindow::LinkStubButtonHdl(void*, void*) StandardErrorInfo::StandardErrorInfo(unsigned long, unsigned long, unsigned short) -StarBASIC::ClearGlobalVars() -StarBASIC::Disassemble(SbModule*, String&) -StarBASIC::Highlight(String const&, SbTextPortions&) StatusBar::CopyItems(StatusBar const&) StatusBar::GetItemBits(unsigned short) const StatusBar::GetItemData(unsigned short) const @@ -1006,7 +983,6 @@ SvStringsSortDtor::Insert(SvStringsSortDtor const*, unsigned short, unsigned sho SvStringsSortDtor::Remove(String* const&, unsigned short) SvStringsSortDtor::Remove(unsigned short, unsigned short) SvTabListBox::GetTabJustify(unsigned short) const -SvTreeList::IsInChildList(SvListEntry*, SvListEntry*) const SvULongs::Replace(unsigned long const&, unsigned short) SvULongs::Replace(unsigned long const*, unsigned short, unsigned short) SvULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) @@ -1471,16 +1447,10 @@ TEWritingDirectionInfos::Insert(TEWritingDirectionInfos const*, unsigned short, TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const&, unsigned short) TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned short, unsigned short) TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(TEWritingDirectionInfo const&, void*), void*) -TTBasic::CreateMyBasic() TTProfiler::Dec(unsigned long) TTProperties::Img(Bitmap*) -TaskBar::TaskBar(Window*, long) TaskStatusBar::ImplGetFieldItem(unsigned short) const -TaskStatusBar::InsertStatusField(long, unsigned short, unsigned short) TaskStatusFieldItem::TaskStatusFieldItem() -TaskToolBox::EndUpdateTask() -TaskToolBox::StartUpdateTask() -TaskToolBox::UpdateTask(Image const&, String const&, unsigned char) TempFile::IsValid() const TextObj::TextObj(TextObj&) TextObj::Write(SvStream*) @@ -1538,9 +1508,6 @@ WinMtfOutput::DrawLine(Point const&, Point const&) WinMtfOutput::GetTextLayoutMode() const WinMtfOutput::SetFont(Font const&) Window::PostUserEvent(unsigned long&, unsigned long, void*) -WindowArrange::Arrange(unsigned short, Rectangle const&) -WindowArrange::WindowArrange() -WindowArrange::~WindowArrange() WrongRanges::Insert(WrongRanges const*, unsigned short, unsigned short, unsigned short) WrongRanges::Replace(WrongRange const&, unsigned short) WrongRanges::Replace(WrongRange const*, unsigned short, unsigned short) @@ -2402,6 +2369,7 @@ comphelper::createEventAttacherManager(com::sun::star::uno::Reference<com::sun:: comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&) comphelper::getPathToSystemRegistry() comphelper::getPathToUserRegistry() +comphelper::string::isalnumAsciiString(rtl::OUString const&) comphelper::string::searchAndReplaceAllAsciiWithAscii(rtl::OUString const&, char const*, char const*, int) connectivity::OKeyValue::OKeyValue() connectivity::ORowSetValue::setFromDouble(double const&, int) @@ -3245,6 +3213,11 @@ test::OfficeConnection::~OfficeConnection() test::getTestArgument(rtl::OUString const&, rtl::OUString*) toolkit::registerServices(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, char const*, char const*, char const*) tools::SolarMutex::GetSolarMutex() +ucbhelper::Content::createDynamicCursor(com::sun::star::uno::Sequence<int> const&, ucbhelper::ResultSetInclude) +ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequence<int> const&) +ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, ucbhelper::Content&) +ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&) +ucbhelper::SimpleCertificateValidationRequest::getResponse() const unicode::getCharType(unsigned short) unicode::isBase(unsigned short) unicode::isPunctuation(unsigned short) @@ -3346,10 +3319,8 @@ writerfilter::LoggedResourcesHelper::chars(std::basic_string<char, std::char_tra writerfilter::LoggedResourcesHelper::endElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) writerfilter::LoggedResourcesHelper::setPrefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) writerfilter::LoggedResourcesHelper::startElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) -writerfilter::TagLogger::element(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) -writerfilter::TagLogger::propertySet(boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >, boost::shared_ptr<writerfilter::IdToString>) -writerfilter::TagLogger::setFileName(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) -writerfilter::TagLogger::startDocument() +writerfilter::PropertySetDumpHandler::PropertySetDumpHandler(writerfilter::TagLogger*, boost::shared_ptr<writerfilter::IdToString>) +writerfilter::TagLogger::endDocument() writerfilter::TagLogger::unoPropertySet(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>) writerfilter::TagLogger::~TagLogger() writerfilter::XPathLogger::XPathLogger() diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index 3912f19e778a..769a61cd9212 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -144,8 +144,6 @@ public: void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; const Bitmap& GetBitmap() const { return maBitmap; } - sal_Bool SetModeBitmap( const Bitmap& rBitmap ); - const Bitmap& GetModeBitmap( ) const; }; // -------------- diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx index ec8ed99c93bb..c52f825a3fde 100644 --- a/vcl/inc/vcl/imgctrl.hxx +++ b/vcl/inc/vcl/imgctrl.hxx @@ -59,9 +59,6 @@ public: protected: void ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const; -private: - sal_Bool SetModeBitmap( const BitmapEx& rBitmap ); - const BitmapEx& GetModeBitmap( ) const; }; #endif // _SV_IMGCTRL_HXX diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 514589d0660b..84ceb1495e8a 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -901,21 +901,6 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) StateChanged( STATE_CHANGE_DATA ); } -// ----------------------------------------------------------------------- - -sal_Bool FixedBitmap::SetModeBitmap( const Bitmap& rBitmap ) -{ - SetBitmap( rBitmap ); - return sal_True; -} - -// ----------------------------------------------------------------------- - -const Bitmap& FixedBitmap::GetModeBitmap( ) const -{ - return maBitmap; -} - // ======================================================================= void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) |