diff options
24 files changed, 41 insertions, 257 deletions
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index bf6499ca8f42..b1a38fa52482 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1213,16 +1213,6 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) nBulletId = rParagraphObj.nBulletId; } -::com::sun::star::awt::Size ParagraphObj::ImplMapSize( const ::com::sun::star::awt::Size& rSize ) -{ - Size aSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) ); - if ( !aSize.Width() ) - aSize.Width()++; - if ( !aSize.Height() ) - aSize.Height()++; - return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() ); -} - sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ) { mnTextSize = 0; diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 6a0c9fdbc059..24f180047a73 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -181,7 +181,6 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph void ImplConstruct( ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& rSize ); void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False ); void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False ); diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx index c29fe770f757..d844c0236a6e 100644 --- a/svtools/inc/svtools/taskbar.hxx +++ b/svtools/inc/svtools/taskbar.hxx @@ -300,7 +300,6 @@ private: sal_Bool mbDummy2; #ifdef _TASKBAR_CXX - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( sal_uInt16 nItemId ) const; SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, sal_Bool& rFieldRect ) const; SVT_DLLPRIVATE sal_Bool ImplUpdateClock(); SVT_DLLPRIVATE sal_Bool ImplUpdateFlashItems(); diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 08f2a25b4b2f..8c0b033bf243 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -174,21 +174,6 @@ IMPL_LINK( TaskStatusBar, ImplTimerHdl, Timer*, EMPTYARG ) // ----------------------------------------------------------------------- -ImplTaskSBFldItem* TaskStatusBar::ImplGetFieldItem( sal_uInt16 nItemId ) const -{ - if ( !mpFieldItemList ) - return NULL; - - for ( size_t i = 0, n = mpFieldItemList->size(); i < n; ++i ) { - if ( (*mpFieldItemList)[ i ]->mnId == nItemId ) { - return (*mpFieldItemList)[ i ]; - } - } - return NULL; -} - -// ----------------------------------------------------------------------- - ImplTaskSBFldItem* TaskStatusBar::ImplGetFieldItem( const Point& rPos, sal_Bool& rFieldRect ) const { if ( GetItemId( rPos ) == TASKSTATUSBAR_STATUSFIELDID ) diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 778925a60c44..829fae083d34 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -496,23 +496,6 @@ Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru return aPropertyValue; } -void SVTXGridControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) -{ - PushPropertyIds( rIds, - BASEPROPERTY_GRID_SHOWROWHEADER, - BASEPROPERTY_GRID_SHOWCOLUMNHEADER, - BASEPROPERTY_GRID_DATAMODEL, - BASEPROPERTY_GRID_COLUMNMODEL, - BASEPROPERTY_GRID_SELECTIONMODE, - BASEPROPERTY_GRID_HEADER_BACKGROUND, - BASEPROPERTY_GRID_HEADER_TEXT_COLOR, - BASEPROPERTY_GRID_LINE_COLOR, - BASEPROPERTY_GRID_ROW_BACKGROUND_COLORS, - 0 - ); - VCLXWindow::ImplGetPropertyIds( rIds, true ); -} - //---------------------------------------------------------------------------------------------------------------------- void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException) { diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index 6e4eb807667e..60c3a3acf5d2 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -104,7 +104,6 @@ public: void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 4d5f7bf7c313..2dc845d8f087 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -115,7 +115,6 @@ private: void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); sal_Bool ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); - void ImplRead(); void ImplWrite(); const GalleryObject* ImplGetGalleryObject( size_t nPos ) const { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index e239fbd659e3..2926a812846e 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -213,19 +213,6 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry ) // ------------------------------------------------------------------------ -void GalleryTheme::ImplRead() -{ - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); - - if( pIStm ) - { - *pIStm >> *this; - delete pIStm; - } -} - -// ------------------------------------------------------------------------ - void GalleryTheme::ImplWrite() { if( IsModified() ) diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 9fe62ed49e33..6d7085cdbf1f 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -1492,8 +1492,10 @@ void SwRTFParser::ReadShapeObject() if (bshpTxt) { SdrOutliner& rOutliner=pDoc->GetDrawModel()->GetDrawOutliner(pStroke); rOutliner.Clear(); - ByteString bs(shpTxt, RTL_TEXTENCODING_ASCII_US); - SvMemoryStream aStream((sal_Char*)bs.GetBuffer(), bs.Len(), STREAM_READ); + rtl::OString bs(rtl::OUStringToOString(shpTxt, + RTL_TEXTENCODING_ASCII_US)); + SvMemoryStream aStream(const_cast<sal_Char*>(bs.getStr()), + bs.getLength(), STREAM_READ); rOutliner.Read(aStream, String::CreateFromAscii(""), EE_FORMAT_RTF); OutlinerParaObject* pParaObject=rOutliner.CreateParaObject(); pStroke->NbcSetOutlinerParaObject(pParaObject); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 02251d16dffd..a379900a0298 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -62,7 +62,7 @@ #include <svx/xmleohlp.hxx> #include <comphelper/genericpropertyset.hxx> #include <rtl/logfile.hxx> - +#include <rtl/strbuf.hxx> #include <sfx2/frame.hxx> #include <unotools/ucbstreamhelper.hxx> #include <swerror.h> @@ -194,9 +194,10 @@ sal_Int32 ReadThroughComponent( #ifdef TIMELOG // if we do profiling, we want to know the stream - ByteString aString( (String)rStreamName, RTL_TEXTENCODING_ASCII_US ); + rtl::OString aString(rtl::OUStringToOString(rStreamName, + RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_TRACE_AUTHOR1( "sw", LOGFILE_AUTHOR, - "ReadThroughComponent : parsing \"%s\"", aString.GetBuffer() ); + "ReadThroughComponent : parsing \"%s\"", aString.getStr() ); #endif // finally, parser the stream @@ -228,9 +229,11 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - ByteString aError( "SAX parse exception caught while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "SAX parse exception caught while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif String sErr( String::CreateFromInt32( r.LineNumber )); @@ -262,9 +265,11 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - ByteString aError( "SAX exception caught while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "SAX exception caught while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif return ERR_SWG_READ_ERROR; @@ -273,9 +278,11 @@ sal_Int32 ReadThroughComponent( { (void)r; #if OSL_DEBUG_LEVEL > 1 - ByteString aError( "Zip exception caught while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "Zip exception caught while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif return ERRCODE_IO_BROKENPACKAGE; } @@ -283,9 +290,11 @@ sal_Int32 ReadThroughComponent( { (void)r; #if OSL_DEBUG_LEVEL > 1 - ByteString aError( "IO exception caught while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "IO exception caught while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif return ERR_SWG_READ_ERROR; } @@ -293,9 +302,11 @@ sal_Int32 ReadThroughComponent( { (void)r; #if OSL_DEBUG_LEVEL > 1 - ByteString aError( "uno exception caught while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "uno exception caught while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif return ERR_SWG_READ_ERROR; } diff --git a/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx index 253aaba9963f..1e01ac0c0247 100644 --- a/unotools/inc/unotools/eventcfg.hxx +++ b/unotools/inc/unotools/eventcfg.hxx @@ -83,7 +83,6 @@ public: GlobalEventConfig_Impl( ); ~GlobalEventConfig_Impl( ); - void EstablishFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); void Commit(); diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 4e7aec4d7342..007b244bdb80 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -205,20 +205,6 @@ void GlobalEventConfig_Impl::Commit() } //***************************************************************************************************************** -// public method -//***************************************************************************************************************** -void GlobalEventConfig_Impl::EstablishFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) -{ - // check if frame already exists inside list - // ignore double registrations - // every frame must be notified one times only! - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xWeak(xFrame); - FrameVector::const_iterator pIt = ::std::find(m_lFrames.begin(), m_lFrames.end(), xWeak); - if (pIt == m_lFrames.end()) - m_lFrames.push_back(xWeak); -} - -//***************************************************************************************************************** // private method //***************************************************************************************************************** void GlobalEventConfig_Impl::initBindingInfo() diff --git a/unusedcode.easy b/unusedcode.easy index c4e7bf6ca6ab..3a9a734d5070 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -13,37 +13,37 @@ CIccCmm::IsInGamut(float*) CIccCmm::ToInternalEncoding(icColorSpaceSignature, float*, unsigned char const*) CIccCmm::ToInternalEncoding(icColorSpaceSignature, float*, unsigned short const*) CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*) -CIccIO::ReadLine(void*, long) +CIccIO::ReadLine(void*, int) CIccInfo::GetSpotShapeName(icSpotShape) CIccMBB::NewCLUT(unsigned char*, unsigned char) -CIccMemIO::Alloc(unsigned long, bool) +CIccMemIO::Alloc(unsigned int, bool) CIccMpeCLUT::SetCLUT(CIccCLUT*) CIccMpeCreator::DoGetElementSigName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, icElemTypeSignature) CIccMpeCurveSet::SetCurve(int, CIccCurveSetCurve*) CIccMruCmm::Attach(CIccCmm*, unsigned char) CIccNamedColorCmm::CIccNamedColorCmm(icColorSpaceSignature, icColorSpaceSignature, bool) CIccNamedColorCmm::SetLastXformDest(icColorSpaceSignature) -CIccProfile::DeleteTag(unsigned long) +CIccProfile::DeleteTag(unsigned int) CIccProfile::GetSpaceSamples() const CIccProfileIdDesc::CIccProfileIdDesc(CIccProfile&) CIccProfileIdDesc::CIccProfileIdDesc(icProfileID, CIccTagMultiLocalizedUnicode) CIccSegmentedCurve::Insert(CIccCurveSegment*) CIccTagCurve::SetGamma(float) -CIccTagFixedNum<long, (icTagTypeSignature)1936077618>::GetSize() const -CIccTagFixedNum<unsigned long, (icTagTypeSignature)1969632050>::GetSize() const +CIccTagFixedNum<int, (icTagTypeSignature)1936077618>::GetSize() const +CIccTagFixedNum<unsigned int, (icTagTypeSignature)1969632050>::GetSize() const CIccTagMultiLocalizedUnicode::SetText(unsigned short const*, unsigned short, unsigned short) CIccTagMultiProcessElement::GetElement(int) CIccTagNamedColor2::FindRootColor(char const*) CIccTagNamedColor2::Lab4ToLab2(float*, float const*) CIccTagNamedColor2::NegClip(float) CIccTagNum<unsigned char, (icTagTypeSignature)1969827896>::GetSize() const -CIccTagNum<unsigned long long, (icTagTypeSignature)1969829428>::GetSize() const -CIccTagNum<unsigned long, (icTagTypeSignature)1969828658>::GetSize() const +CIccTagNum<unsigned int, (icTagTypeSignature)1969828658>::GetSize() const +CIccTagNum<unsigned long, (icTagTypeSignature)1969829428>::GetSize() const CIccTagNum<unsigned short, (icTagTypeSignature)1969828150>::GetSize() const CIccTagProfileSequenceId::AddProfileDescription(CIccProfileIdDesc const&) CIccTagProfileSequenceId::GetFirst() CIccTagProfileSequenceId::GetLast() -CIccTagProfileSequenceId::ParseMem(unsigned char*, unsigned long) +CIccTagProfileSequenceId::ParseMem(unsigned char*, unsigned int) CIccTagResponseCurveSet16::GetFirstCurves() CIccTagResponseCurveSet16::GetNextCurves() CIccTagResponseCurveSet16::NewResponseCurves(icMeasurementUnitSig) @@ -104,7 +104,6 @@ DdeService::DdeService(String const&) DdeTopic::RemoveItem(DdeItem const&) DffPropSet::SetPropertyValue(unsigned int, unsigned int) const Dialog::Dialog(Window*, ResId const&) -Dialog::ImplCenterDialog() Dialog::IsStartedModal() const DirEntry::GetDevice() const DlgEdObj::LinkStubOnCreate(void*, void*) @@ -205,13 +204,11 @@ GalleryExplorer::GetObjCount(unsigned long) GalleryExplorer::GetVCDrawModel(FmFormModel&) const GalleryExplorer::InsertGraphicObj(unsigned long, Graphic const&) GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&) -GalleryTheme::ImplRead() GraphCtrl::GraphCtrl(Window*, long) Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point const&, Size const&) Graphic::GetGraphicsCompressMode(SvStream&) Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*) Graphic::WriteEmbedded(SvStream&) -GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long) GraphicReader::IsPreviewModeEnabled() const GroupTable::SkipCurrentGroup() HTMLControls::Insert(HTMLControl const*&, unsigned short&) @@ -241,8 +238,6 @@ ImpBitmap::ImplDestroy() ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyState>&) ImpEditEngine::Repeat(EditView*) ImpEditView::CalcSelectedRegion() -ImpLabelList::ImplFirst() -ImpLabelList::ImplNext() ImpSvMEdit::SetInsertMode(unsigned char) ImpSvMEdit::SetTextWindowOffset(Point const&) ImpSvlData::~ImpSvlData() @@ -399,7 +394,6 @@ ParaPortion::DbgCheckTextPortions() ParaPortionList::DbgCheck(EditDoc&) ParagraphList::GetVisPos(Paragraph*) const ParagraphList::PrevVisible(Paragraph*) const -ParagraphObj::ImplMapSize(com::sun::star::awt::Size const&) ParagraphObj::ParagraphObj(ParagraphObj&) PathDialog::SetPath(Edit const&) PatternBox::GetString(unsigned short) const @@ -434,7 +428,6 @@ SVGExport::IsUseGradient() const SVGExport::popClip() SVGExport::pushClip(basegfx::B2DPolyPolygon const&) SVGFilter::implImport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) -SVTXGridControl::ImplGetPropertyIds(std::list<unsigned short, std::allocator<unsigned short> >&) SalColormap::SalColormap(BitmapPalette const&) SalColormap::SetPalette(BitmapPalette const&) SalDisplay::IsLocal() @@ -1409,7 +1402,6 @@ 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*) TTProfiler::Dec(unsigned long) -TaskStatusBar::ImplGetFieldItem(unsigned short) const TaskStatusFieldItem::TaskStatusFieldItem() TempFile::IsValid() const TextObj::TextObj(TextObj&) diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx index 516dfacfad8a..7c9653e1f200 100644 --- a/vcl/inc/vcl/canvastools.hxx +++ b/vcl/inc/vcl/canvastools.hxx @@ -180,7 +180,6 @@ namespace vcl ::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); Size VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); - Point VCL_DLLPUBLIC pointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); // geometry::Integer ::com::sun::star::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx index 50d766f5565c..0603052e8651 100644 --- a/vcl/inc/vcl/cvtgrf.hxx +++ b/vcl/inc/vcl/cvtgrf.hxx @@ -48,10 +48,6 @@ private: ConvertData* mpConvertData; public: - SAL_DLLPRIVATE sal_uLong ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, - void** ppOutBuffer, sal_uLong nOutFormat ); - -public: GraphicConverter(); ~GraphicConverter(); diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 7b8c3ac032f2..bb4179914387 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -68,7 +68,6 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplDialogRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplCenterDialog(); public: SAL_DLLPRIVATE sal_Bool IsInClose() const { return mbInClose; } diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 6d3b60777120..a17c00f4e798 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -56,82 +56,6 @@ GraphicConverter::~GraphicConverter() // ------------------------------------------------------------------------ -sal_uLong GraphicConverter::ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, - void** ppOutBuffer, sal_uLong nOutFormat ) -{ - sal_uLong nRetBufSize = 0UL; - - if( ( nInFormat != nOutFormat ) && pInBuffer ) - { - if( ( nInFormat == CVT_SVM ) || ( nInFormat == CVT_BMP ) ) - { - SvMemoryStream aIStm; - Graphic aGraphic; - - aIStm.SetBuffer( (char*) pInBuffer, nInBufSize, sal_False, nInBufSize ); - aIStm >> aGraphic; - - if( !aIStm.GetError() ) - { - SvMemoryStream aOStm( 64535, 64535 ); - - mpConvertData = new ConvertData( aGraphic, aOStm, nOutFormat ); - - if( maFilterHdl.IsSet() && maFilterHdl.Call( mpConvertData ) ) - { - nRetBufSize = aOStm.Seek( STREAM_SEEK_TO_END ); - *ppOutBuffer = (void*) aOStm.GetData(); - aOStm.ObjectOwnsMemory( sal_False ); - } - - delete mpConvertData; - mpConvertData = NULL; - } - } - else if( ( nOutFormat == CVT_SVM ) || ( nOutFormat == CVT_BMP ) ) - { - SvMemoryStream aIStm; - - aIStm.SetBuffer( (char*) pInBuffer, nInBufSize, sal_False, nInBufSize ); - mpConvertData = new ConvertData( Graphic(), aIStm, nInFormat ); - - if( maFilterHdl.IsSet() && maFilterHdl.Call( mpConvertData ) ) - { - SvMemoryStream aOStm( 645535, 64535 ); - Graphic& rGraphic = mpConvertData->maGraphic; - - if( ( rGraphic.GetType() == GRAPHIC_BITMAP ) && ( CVT_SVM == nOutFormat ) ) - { - GDIMetaFile aMtf; - - aMtf.SetPrefSize( rGraphic.GetPrefSize() ); - aMtf.SetPrefMapMode( rGraphic.GetPrefMapMode() ); - aMtf.AddAction( new MetaBmpExScaleAction( Point(), aMtf.GetPrefSize(), rGraphic.GetBitmapEx() ) ); - rGraphic = aMtf; - } - else if( ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE ) && ( CVT_BMP == nOutFormat ) ) - rGraphic = rGraphic.GetBitmapEx(); - - aOStm << rGraphic; - - if( !aOStm.GetError() ) - { - nRetBufSize = aOStm.Seek( STREAM_SEEK_TO_END ); - *ppOutBuffer = (void*) aOStm.GetData(); - aOStm.ObjectOwnsMemory( sal_False ); - } - } - - delete mpConvertData; - mpConvertData = NULL; - } - } - - return nRetBufSize; -} - -// ------------------------------------------------------------------------ - sal_uLong GraphicConverter::Import( SvStream& rIStm, Graphic& rGraphic, sal_uLong nFormat ) { GraphicConverter* pCvt = ImplGetSVData()->maGDIData.mpGrfConverter; diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index bdbca9d4067d..fffde0472b75 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -169,8 +169,6 @@ public: void ImplInsert( ImpLabel* p ) { aList.push_back( p ); } - ImpLabel* ImplFirst(); - ImpLabel* ImplNext(); ImpLabel* ImplGetLabel( size_t nPos ) const; ImpLabel* ImplRemove( size_t nPos ); @@ -197,19 +195,6 @@ ImpLabelList::~ImpLabelList() } // ------------------------------------------------------------------------ -ImpLabel* ImpLabelList::ImplFirst() -{ - nListPos = 0; - return ( aList.empty() ) ? NULL : aList[ nListPos ]; -} - -// ------------------------------------------------------------------------ -ImpLabel* ImpLabelList::ImplNext() -{ - return ( nListPos + 1 < aList.size() ) ? aList[ ++nListPos ] : NULL; -} - -// ------------------------------------------------------------------------ ImpLabel* ImpLabelList::ImplGetLabel( size_t nPos ) const { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 23d3cb4e9748..a56ea83d8910 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -8559,11 +8559,6 @@ void PDFWriterImpl::beginRedirect( SvStream* pStream, const Rectangle& rTargetRe m_aCurrentPDFState.m_aFillColor = Color( COL_TRANSPARENT ); } -Rectangle PDFWriterImpl::getRedirectTargetRect() const -{ - return m_aOutputStreams.empty() ? Rectangle() : m_aOutputStreams.front().m_aTargetRect; -} - SvStream* PDFWriterImpl::endRedirect() { SvStream* pStream = NULL; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 4397d7c5c0c4..65fc682b3b75 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -995,8 +995,6 @@ i12626 void beginCompression(); void endCompression(); void beginRedirect( SvStream* pStream, const Rectangle& ); - // returns an empty rect if no redirection is happending - Rectangle getRedirectTargetRect() const; SvStream* endRedirect(); void endPage(); diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index cddc1b513d1a..85da67a773c5 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -404,12 +404,6 @@ namespace vcl static_cast<long>(rSize.Height + .5) ); } - Point pointFromRealPoint2D( const geometry::RealPoint2D& rPoint ) - { - return Point( static_cast<long>(rPoint.X + .5), - static_cast<long>(rPoint.Y + .5) ); - } - ::Size sizeFromB2DSize( const ::basegfx::B2DVector& rVec ) { return ::Size( FRound( rVec.getX() ), diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 5c4c786a1f39..e057c4e06f1d 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -385,35 +385,6 @@ void Dialog::ImplInitSettings() // ----------------------------------------------------------------------- -void Dialog::ImplCenterDialog() -{ - Rectangle aDeskRect = ImplGetFrameWindow()->GetDesktopRectPixel(); - Point aDeskPos = aDeskRect.TopLeft(); - Size aDeskSize = aDeskRect.GetSize(); - Size aWinSize = GetSizePixel(); - Window *pWindow = this; - while ( pWindow->mpWindowImpl->mpBorderWindow ) - pWindow = pWindow->mpWindowImpl->mpBorderWindow; - Point aWinPos( ((aDeskSize.Width() - aWinSize.Width()) / 2) + aDeskPos.X(), - ((aDeskSize.Height() - aWinSize.Height()) / 2) + aDeskPos.Y() ); - - // Pruefen, ob Dialogbox ausserhalb des Desks liegt - if ( (aWinPos.X() + aWinSize.Width()) > (aDeskPos.X()+aDeskSize.Width()) ) - aWinPos.X() = aDeskPos.X()+aDeskSize.Width() - aWinSize.Width(); - if ( (aWinPos.Y()+aWinSize.Height()) > (aDeskPos.Y()+aDeskSize.Height()) ) - aWinPos.Y() = aDeskPos.Y()+aDeskSize.Height() - aWinSize.Height(); - // Linke Ecke bevorzugen, da Titelbar oben ist - if ( aWinPos.X() < aDeskPos.X() ) - aWinPos.X() = aDeskPos.X(); - if ( aWinPos.Y() < aDeskPos.Y() ) - aWinPos.Y() = aDeskPos.Y(); - - //SetPosPixel( aWinPos ); - SetPosPixel( pWindow->ScreenToOutputPixel( aWinPos ) ); -} - -// ----------------------------------------------------------------------- - Dialog::Dialog( WindowType nType ) : SystemWindow( nType ) { @@ -517,8 +488,6 @@ void Dialog::StateChanged( StateChangedType nType ) if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) ImplWindowAutoMnemonic( this ); - //if ( IsDefaultPos() && !mpWindowImpl->mbFrame ) - // ImplCenterDialog(); if ( !HasChildPathFocus() || HasFocus() ) GrabFocusToFirstControl(); if ( !(GetStyle() & WB_CLOSEABLE) ) diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 77c54eefe100..8b68b1d5d5b3 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -1161,11 +1161,6 @@ XMLShapePropertySetMapper::XMLShapePropertySetMapper(const UniReference< XMLProp { } -XMLShapePropertySetMapper::XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef, sal_uInt16 nOffset) -: XMLPropertySetMapper( &aXMLSDProperties[nOffset], rFactoryRef ) -{ -} - XMLShapePropertySetMapper::~XMLShapePropertySetMapper() { } diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 80b6e17d507a..47187822f2b4 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -254,7 +254,6 @@ class XMLShapePropertySetMapper : public XMLPropertySetMapper { public: XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef); - XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef, sal_uInt16 nOffset); ~XMLShapePropertySetMapper(); }; |