diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-04 22:41:25 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-05 10:02:57 +0100 |
commit | db1b7178dde8daa8660becf35acf8362b5f4bd7e (patch) | |
tree | 902efefff371fcc0d9dfd42f0bacda289070f3c5 | |
parent | convert deprecated ConvertToUnicode to rtl::OUString (diff) | |
download | core-db1b7178dde8daa8660becf35acf8362b5f4bd7e.tar.gz core-db1b7178dde8daa8660becf35acf8362b5f4bd7e.zip |
callcatcher: unused methods
23 files changed, 0 insertions, 471 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 424b7dfa1088..c89fa538b3f2 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -314,13 +314,6 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer ) // --------------------------------------------------------------------- -const Pointer& MediaWindowImpl::getPointer() const -{ - return GetPointer(); -} - -// --------------------------------------------------------------------- - void MediaWindowImpl::Resize() { uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 23ad2db0ab4f..6767b860d914 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -107,7 +107,6 @@ namespace avmedia void setPosSize( const Rectangle& rRect ); void setPointer( const Pointer& rPointer ); - const Pointer& getPointer() const; protected: diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index 287a0b3bbda0..415bf7af4116 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -74,7 +74,6 @@ private: String aErrStr; public: - BasicError(); BasicError( const BasicError& rErr ); BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr ); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 97970fef4321..3837b0003721 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -446,14 +446,6 @@ BasicError* BasicErrorManager::GetNextError() } -//===================================================================== - -BasicError::BasicError() -{ - nErrorId = 0; - nReason = 0; -} - BasicError::BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr ) : aErrStr( rErrStr ) { diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx index a8730f46b378..1084ea1fbdd8 100644 --- a/editeng/inc/editeng/numitem.hxx +++ b/editeng/inc/editeng/numitem.hxx @@ -171,7 +171,6 @@ public: SvxNumberFormat( sal_Int16 nNumberingType, SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION ); SvxNumberFormat(const SvxNumberFormat& rFormat); - SvxNumberFormat(SvStream &rStream); virtual ~SvxNumberFormat(); diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index afaebcfb4a00..eb15ca51c5de 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -198,112 +198,6 @@ SvxNumberFormat::~SvxNumberFormat() delete pBulletFont; } -SvxNumberFormat::SvxNumberFormat(SvStream &rStream) -: mePositionAndSpaceMode( LABEL_WIDTH_AND_POSITION ), - meLabelFollowedBy( LISTTAB ), - mnListtabPos( 0 ), - mnFirstLineIndent( 0 ), - mnIndentAt( 0 ) -{ - - sal_uInt16 nVersion; - rStream >> nVersion; - - sal_uInt16 nUSHORT; - rStream >> nUSHORT; - SetNumberingType((sal_Int16)nUSHORT); - rStream >> nUSHORT; - eNumAdjust = (SvxAdjust)nUSHORT; - rStream >> nUSHORT; - nInclUpperLevels = (sal_uInt8)nUSHORT; - rStream >> nUSHORT; - nStart = nUSHORT; - rStream >> nUSHORT; - cBullet = nUSHORT; - - short nShort; - rStream >> nShort; - nFirstLineOffset = nShort; - rStream >> nShort; - nAbsLSpace = nShort; - rStream >> nShort; - nLSpace = nShort; - - rStream >> nShort; - nCharTextDistance = nShort; - rtl_TextEncoding eEnc = gsl_getSystemTextEncoding(); - rStream.ReadByteString(sPrefix, eEnc); - rStream.ReadByteString(sSuffix, eEnc); - rStream.ReadByteString(sCharStyleName, eEnc); - rStream >> nUSHORT; - if(nUSHORT) - { - SvxBrushItem aHelper(0); - pGraphicBrush = (SvxBrushItem*) aHelper.Create( rStream, BRUSH_GRAPHIC_VERSION ); - } - else - pGraphicBrush = 0; - - rStream >> nUSHORT; - eVertOrient = (sal_Int16)nUSHORT; - - rStream >> nUSHORT; - if(nUSHORT) - { - pBulletFont = new Font; - rStream >> *pBulletFont; - if(!pBulletFont->GetCharSet()) - pBulletFont->SetCharSet(rStream.GetStreamCharSet()); - } - else - pBulletFont = 0; - rStream >> aGraphicSize; - - rStream >> nBulletColor; - rStream >> nUSHORT; - nBulletRelSize = nUSHORT; - rStream >> nUSHORT; - SetShowSymbol((sal_Bool)nUSHORT); - - if( nVersion < NUMITEM_VERSION_03 ) - cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet, - (pBulletFont&&pBulletFont->GetCharSet()) ? pBulletFont->GetCharSet() - : RTL_TEXTENCODING_SYMBOL ); - if(pBulletFont) - { - sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50; - if(bConvertBulletFont) - { - - FontToSubsFontConverter pConverter = - CreateFontToSubsFontConverter(pBulletFont->GetName(), - FONTTOSUBSFONT_IMPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS); - if(pConverter) - { - cBullet = ConvertFontToSubsFontChar(pConverter, cBullet); - String sFontName = GetFontToSubsFontName(pConverter); - pBulletFont->SetName(sFontName); - DestroyFontToSubsFontConverter(pConverter); - } - } - } - - if( NUMITEM_VERSION_04 <= nVersion ) - { - rStream >> nUSHORT; - mePositionAndSpaceMode = (SvxNumPositionAndSpaceMode) nUSHORT; - rStream >> nUSHORT; - meLabelFollowedBy = ( SvxNumLabelFollowedBy ) nUSHORT; - long nLong; - rStream >> nLong; - mnListtabPos = nLong; - rStream >> nLong; - mnFirstLineIndent = nLong; - rStream >> nLong; - mnIndentAt = nLong; - } -} - SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter) { if(pConverter && pBulletFont) diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx index 080def952a3c..cb515ad5f772 100644 --- a/framework/inc/framework/statusbarconfiguration.hxx +++ b/framework/inc/framework/statusbarconfiguration.hxx @@ -64,14 +64,6 @@ class FWE_DLLPUBLIC StatusBarConfiguration public: static sal_Bool LoadStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rInStream, StatusBarDescriptor& aItems ); - - static sal_Bool StoreStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rOutStream, const StatusBarDescriptor& aItems ); - - static sal_Bool LoadStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration ); diff --git a/framework/inc/uielement/panelwindow.hxx b/framework/inc/uielement/panelwindow.hxx index 324d1a38c5b0..ff3db6b433fa 100644 --- a/framework/inc/uielement/panelwindow.hxx +++ b/framework/inc/uielement/panelwindow.hxx @@ -51,11 +51,6 @@ class PanelWindow : public DockingWindow PanelWindow( Window* pParent, WinBits nWinBits =0); virtual ~PanelWindow(); - const ::rtl::OUString& getResourceURL() const; - void setResourceURL(const ::rtl::OUString& rResourceURL); - Window* getContentWindow() const; - void setContentWindow( Window* pContentWindow ); - virtual void Command ( const CommandEvent& rCEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 11627487cd2c..4e1b58316880 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -347,7 +347,6 @@ class AddonsOptions_Impl : public ConfigItem void InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ); ::rtl::OUString GeneratePrefixURL(); - Sequence< ::rtl::OUString > GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootName ) const; Sequence< ::rtl::OUString > GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const; @@ -1541,24 +1540,6 @@ sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bB return bResult; } -//***************************************************************************************************************** -// private methods -//***************************************************************************************************************** -Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootNode ) const -{ - Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_MERGE_MENUBAR ); - - // Create property names dependent from the root node name - lResult[ OFFSET_MERGEMENU_MERGEPOINT ] = ::rtl::OUString( aPropertyRootNode + m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGEPOINT ] ); - lResult[ OFFSET_MERGEMENU_MERGECOMMAND ] = ::rtl::OUString( aPropertyRootNode + m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGECOMMAND ] ); - lResult[ OFFSET_MERGEMENU_MERGECOMMANDPARAMETER ] = ::rtl::OUString( aPropertyRootNode + m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGECOMMANDPARAMETER ] ); - lResult[ OFFSET_MERGEMENU_MERGEFALLBACK ] = ::rtl::OUString( aPropertyRootNode + m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGEFALLBACK ] ); - lResult[ OFFSET_MERGEMENU_MERGECONTEXT ] = ::rtl::OUString( aPropertyRootNode + m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGECONTEXT ] ); - lResult[ OFFSET_MERGEMENU_MENUITEMS ] = ::rtl::OUString( aPropertyRootNode + m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] ); - - return lResult; -} - Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const { Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_MENUITEM ); diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 52643d238172..613e45710622 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -81,22 +81,6 @@ static Reference< XDocumentHandler > GetSaxWriter( } sal_Bool StatusBarConfiguration::LoadStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, - SvStream&, StatusBarDescriptor& ) -{ - // obsolete - only support linkage of binary filters! - return sal_True; -} - -sal_Bool StatusBarConfiguration::StoreStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, - SvStream&, const StatusBarDescriptor& ) -{ - // obsolete - only support linkage of binary filters! - return sal_True; -} - -sal_Bool StatusBarConfiguration::LoadStatusBar( const Reference< XMultiServiceFactory >& xServiceFactory, const Reference< XInputStream >& xInputStream, const Reference< XIndexContainer >& rStatusbarConfiguration ) diff --git a/framework/source/uielement/panelwindow.cxx b/framework/source/uielement/panelwindow.cxx index 61e1d3095eb0..e24fbc3d8ee0 100644 --- a/framework/source/uielement/panelwindow.cxx +++ b/framework/source/uielement/panelwindow.cxx @@ -21,32 +21,6 @@ PanelWindow::~PanelWindow() { } -const ::rtl::OUString& PanelWindow::getResourceURL() const -{ - return m_aResourceURL; -} - -void PanelWindow::setResourceURL(const ::rtl::OUString& rResourceURL) -{ - m_aResourceURL = rResourceURL; -} - -Window* PanelWindow::getContentWindow() const -{ - return m_pContentWindow; -} - -void PanelWindow::setContentWindow( Window* pContentWindow ) -{ - m_pContentWindow = pContentWindow; - if ( m_pContentWindow != NULL ) - { - m_pContentWindow->SetParent(this); - m_pContentWindow->SetSizePixel( GetOutputSizePixel() ); - m_pContentWindow->Show(); - } -} - void PanelWindow::Command( const CommandEvent& rCEvt ) { if ( m_aCommandHandler.IsSet() ) diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 63be1de6b2f6..060af28b087f 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -165,7 +165,6 @@ public: SfxResourceManager& GetResourceManager() const; ResMgr* GetSfxResManager(); static ResMgr* CreateResManager( const char *pPrefix ); - SimpleResMgr* CreateSimpleResManager(); // DDE long DdeExecute( const String& rCmd ); diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index d218c922a961..af6ba04bfc49 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -129,7 +129,6 @@ public: const SfxItemSet* pSet=0, sal_Bool bRoot = sal_False ); - SfxMedium( const SfxMedium &rMedium, sal_Bool bCreateTemporary = sal_False ); SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); ~SfxMedium(); @@ -153,7 +152,6 @@ public: const String& GetOrigURL() const; SfxItemSet * GetItemSet() const; - void SetItemSet(SfxItemSet *pSet); void Close(); void CloseAndRelease(); void ReOpen(); @@ -167,8 +165,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const; const String& GetPhysicalName() const; - void SetTemporary( sal_Bool bTemp ); - sal_Bool IsTemporary() const; sal_Bool IsRemote(); sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; } void StartDownload(); @@ -227,7 +223,6 @@ public: ::rtl::OUString SwitchDocumentToTempFile(); sal_Bool SwitchDocumentToFile( ::rtl::OUString aURL ); - ::rtl::OUString GetCharset(); void SetCharset( ::rtl::OUString ); ::rtl::OUString GetBaseURL( bool bForSaving=false ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 67168a53e63b..1c552ca756e7 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -511,18 +511,6 @@ ResMgr* SfxApplication::CreateResManager( const char *pPrefix ) return ResMgr::CreateResMgr(pPrefix); } -//--------------------------------------------------------------------- - -SimpleResMgr* SfxApplication::CreateSimpleResManager() -{ - SimpleResMgr *pRet; - const AllSettings& rAllSettings = Application::GetSettings(); - ::com::sun::star::lang::Locale aLocale = rAllSettings.GetUILocale(); - pRet = new SimpleResMgr( CREATEVERSIONRESMGR_NAME(sfx), aLocale ); - - return pRet; -} - //-------------------------------------------------------------------- ResMgr* SfxApplication::GetSfxResManager() diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 3fb13be672bc..5f925b0485b4 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2486,28 +2486,6 @@ SfxMedium::SfxMedium() { Init_Impl(); } -//------------------------------------------------------------------ - -SfxMedium::SfxMedium( const SfxMedium& rMedium, sal_Bool bTemporary ) -: SvRefBase(), - IMPL_CTOR( sal_True, // bRoot, pURLObj - rMedium.pURLObj ? new INetURLObject(*rMedium.pURLObj) : 0 ), - pImp(new SfxMedium_Impl( this )) -{ - bDirect = rMedium.IsDirect(); - nStorOpenMode = rMedium.GetOpenMode(); - if ( !bTemporary ) - aName = rMedium.aName; - - pImp->bIsTemp = bTemporary; - DBG_ASSERT( ! rMedium.pImp->bIsTemp, "Temporary Medium may not be copied" ); - aLogicName = rMedium.aLogicName; - pSet = rMedium.GetItemSet() ? new SfxItemSet(*rMedium.GetItemSet()) : 0; - pFilter = rMedium.pFilter; - Init_Impl(); - if( bTemporary ) - CreateTempFile( sal_True ); -} //------------------------------------------------------------------ @@ -2795,18 +2773,6 @@ void SfxMedium::SetPhysicalName_Impl( const String& rNameP ) } //------------------------------------------------------------------ -void SfxMedium::SetTemporary( sal_Bool bTemp ) -{ - pImp->bIsTemp = bTemp; -} - -//------------------------------------------------------------------ -sal_Bool SfxMedium::IsTemporary() const -{ - return pImp->bIsTemp; -} - -//------------------------------------------------------------------ sal_Bool SfxMedium::Exists( sal_Bool /*bForceSession*/ ) { @@ -2989,13 +2955,6 @@ SfxMedium::~SfxMedium() delete pImp; } -//------------------------------------------------------------------ -void SfxMedium::SetItemSet(SfxItemSet *pNewSet) -{ - delete pSet; - pSet = pNewSet; -} - //---------------------------------------------------------------- const INetURLObject& SfxMedium::GetURLObject() const { @@ -3429,40 +3388,6 @@ void SfxMedium::CreateTempFileNoCopy() CloseStorage(); } -::rtl::OUString SfxMedium::GetCharset() -{ - if( !pImp->bIsCharsetInitialized ) - { - // Set an error in case there is no content? - if ( GetContent().is() ) - { - pImp->bIsCharsetInitialized = sal_True; - - try - { - Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ); - ::rtl::OUString aField; - aAny >>= aField; - - String sType, sSubType; - INetContentTypeParameterList aParameters; - - if (INetContentTypes::parse(aField, sType, sSubType, &aParameters)) - { - const INetContentTypeParameter * pCharset = aParameters.find("charset"); - if (pCharset != 0) - pImp->aCharset = pCharset->m_sValue; - } - } - catch ( const ::com::sun::star::uno::Exception& ) - { - } - } - } - - return pImp->aCharset; -} - void SfxMedium::SetCharset( ::rtl::OUString aChs ) { pImp->bIsCharsetInitialized = sal_True; diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index 3c3f7cb626e3..b2352103d566 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -130,8 +130,6 @@ public: void SetUpdateLink( const Link& rLink ) { aUpdateLink = rLink; } const Link& GetUpdateLink() const { return aUpdateLink; } - static String GetStringFromDouble( const double& rDouble ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index d92fb91d9054..156655a0c5b3 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -85,8 +85,6 @@ public: // Konstruktion eines Textrahmens SdrRectObj(SdrObjKind eNewTextKind); SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); - // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen - SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual ~SdrRectObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index 8ffe18b2c08b..25a57c94f087 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -85,7 +85,6 @@ protected: public: XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 ); XPolygon( const XPolygon& rXPoly ); - XPolygon( const Polygon& rPoly ); XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 ); XPolygon( const Point& rCenter, long nRx, long nRy, sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, @@ -125,10 +124,7 @@ public: void Translate(const Point& rTrans); void Rotate(const Point& rCenter, double fSin, double fCos); void Scale(double fSx, double fSy); - void SlantX(long nYRef, double fSin, double fCos); - void SlantY(long nXRef, double fSin, double fCos); void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); - void Rotate20 (); // #116512# convert to basegfx::B2DPolygon and return basegfx::B2DPolygon getB2DPolygon() const; @@ -182,7 +178,6 @@ public: sal_Bool operator!=( const XPolyPolygon& rXPolyPoly ) const; // Transformationen - void Rotate(const Point& rCenter, double fSin, double fCos); void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); // #116512# convert to basegfx::B2DPolyPolygon and return diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index b35979d12790..8224b616d682 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -208,7 +208,6 @@ protected: sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 ); - XPropertyTable( SvStream& rIn ); void Clear(); public: @@ -265,7 +264,6 @@ protected: const String& rPath, XOutdevItemPool* pXPool = NULL ); - XPropertyList( SvStream& rIn ); void Clear(); public: diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index f4b98e26fcfb..a9e1d883ff09 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -758,15 +758,6 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) eObjKind = OBJ_NONE; } -String GraphCtrl::GetStringFromDouble( const double& rDouble ) -{ - sal_Unicode cSep = - SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0); - String aStr( ::rtl::math::doubleToUString( rDouble, - rtl_math_StringFormat_F, 2, cSep )); - return aStr; -} - IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer ) { if ( aUpdateLink.IsSet() ) diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index a234ec12c0b8..9108eda86bf1 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -105,15 +105,6 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) bClosedObj=sal_True; } -SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) -: SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat) -{ - DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || - eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, - "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht"); - bClosedObj=sal_True; -} - SdrRectObj::~SdrRectObj() { } diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 661a285ba267..0a40750abf3c 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -276,29 +276,6 @@ XPolygon::XPolygon( const XPolygon& rXPoly ) |* |* XPolygon::XPolygon() |* -|* XPolygon aus einem Standardpolygon erstellen -|* -*************************************************************************/ - -XPolygon::XPolygon( const Polygon& rPoly ) -{ - DBG_CTOR(XPolygon,NULL); - - sal_uInt16 nSize = rPoly.GetSize(); - pImpXPolygon = new ImpXPolygon( nSize ); - pImpXPolygon->nPoints = nSize; - - for( sal_uInt16 i = 0; i < nSize; i++ ) - { - pImpXPolygon->pPointAry[i] = rPoly[i]; - pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i ); - } -} - -/************************************************************************* -|* -|* XPolygon::XPolygon() -|* |* Rechteck (auch mit abgerundeten Ecken) als Bezierpolygon erzeugen |* *************************************************************************/ @@ -1099,56 +1076,6 @@ void XPolygon::Scale(double fSx, double fSy) /************************************************************************* |* -|* XPolygon::SlantX() -|* -|* XPolygon in X-Richtung um einen beliebigen Winkel kippen, -|* bezogen auf eine Referenz-Y-Koordinate -|* -*************************************************************************/ - -void XPolygon::SlantX(long nYRef, double fSin, double fCos) -{ - pImpXPolygon->CheckPointDelete(); - CheckReference(); - - sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - - for (sal_uInt16 i = 0; i < nPntCnt; i++) - { - Point& rPnt = pImpXPolygon->pPointAry[i]; - long nDy = rPnt.Y() - nYRef; - rPnt.X() += (long)(fSin * nDy); - rPnt.Y() = nYRef + (long)(fCos * nDy); - } -} - -/************************************************************************* -|* -|* XPolygon::SlantY() -|* -|* XPolygon in Y-Richtung um einen beliebigen Winkel kippen, -|* bezogen auf eine Referenz-X-Koordinate -|* -*************************************************************************/ - -void XPolygon::SlantY(long nXRef, double fSin, double fCos) -{ - pImpXPolygon->CheckPointDelete(); - CheckReference(); - - sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - - for (sal_uInt16 i = 0; i < nPntCnt; i++) - { - Point& rPnt = pImpXPolygon->pPointAry[i]; - long nDx = rPnt.X() - nXRef; - rPnt.X() = nXRef + (long)(fCos * nDx); - rPnt.Y() -= (long)(fSin * nDx); - } -} - -/************************************************************************* -|* |* XPolygon::Distort() |* |* XPolygon verzerren, indem die Koordinaten relativ zu einem @@ -1211,45 +1138,6 @@ void XPolygon::Distort(const Rectangle& rRefRect, } } -/************************************************************************* -|* -|* Bestimme den linken, unteren Punkt des Polygons und richte das -|* Polygon so aus, dass dieser Punkt auf dem Index 0 liegt -|* -\************************************************************************/ - -void XPolygon::Rotate20() -{ - pImpXPolygon->CheckPointDelete(); - CheckReference(); - - double fMinY = pImpXPolygon->pPointAry->Y(); - double fMinX = pImpXPolygon->pPointAry->X(); - long nPntCnt = pImpXPolygon->nPoints; - long nIndex0 = 0; - - for (long nPoints = 1; nPoints < nPntCnt; ++nPoints) - { - const Point &rPnt = pImpXPolygon->pPointAry[nPoints]; - - if ( (rPnt.X() < fMinX) || (fMinX == rPnt.X() && fMinY >= rPnt.Y()) ) - { - fMinX = rPnt.X(); - fMinY = rPnt.Y(); - nIndex0 = nPoints; - } - } - - if (nIndex0 < nPntCnt) - { - Point *pTemp = new Point [nIndex0]; - memcpy (pTemp, pImpXPolygon->pPointAry, nIndex0 * sizeof (Point)); - memcpy (pImpXPolygon->pPointAry, &pImpXPolygon->pPointAry [nIndex0], (nPntCnt - nIndex0) * sizeof (Point)); - memcpy (&pImpXPolygon->pPointAry [nIndex0], pTemp, nIndex0 * sizeof (Point)); - delete[] pTemp; - } -} - basegfx::B2DPolygon XPolygon::getB2DPolygon() const { // #i74631# use tools Polygon class for conversion to not have the code doubled @@ -1587,23 +1475,6 @@ sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const /************************************************************************* |* -|* XPolyPolygon::Rotate() -|* -|* Alle Polygone um den Punkt rCenter drehen, Sinus und Cosinus -|* muessen uebergeben werden -|* -*************************************************************************/ - -void XPolyPolygon::Rotate(const Point& rCenter, double fSin, double fCos) -{ - CheckReference(); - - for (size_t i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList[ i ]->Rotate(rCenter, fSin, fCos); -} - -/************************************************************************* -|* |* XPolygon::Distort() |* |* XPolygon verzerren, indem die Koordinaten relativ zu einem diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 705485feeef7..b34cf777edb5 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -80,17 +80,6 @@ XPropertyTable::XPropertyTable( /************************************************************************* |* -|* XPropertyTable::XPropertyTable( SvStraem& ) -|* -*************************************************************************/ - -XPropertyTable::XPropertyTable( SvStream& /*rIn*/) : - pBmpTable ( NULL ) -{ -} - -/************************************************************************* -|* |* XPropertyTable::~XPropertyTable() |* *************************************************************************/ @@ -311,17 +300,6 @@ XPropertyList::XPropertyList( /************************************************************************* |* -|* XPropertyList::XPropertyList( SvStraem& ) -|* -*************************************************************************/ - -XPropertyList::XPropertyList( SvStream& /*rIn*/) : - pBmpList ( NULL ) -{ -} - -/************************************************************************* -|* |* XPropertyList::~XPropertyList() |* *************************************************************************/ |