diff options
54 files changed, 23 insertions, 1269 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index b8aa9e87ecb5..8d5aab9d5f29 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -274,7 +274,6 @@ private: protected: virtual void Resize(); virtual void Paint( const Rectangle& rRect ); - DECL_LINK( ButtonHdl, ImageButton * ); public: StackWindow( Window* pParent ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 9b3ca10bba0c..52f9752fbe17 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1542,16 +1542,6 @@ void StackWindow::Resize() Invalidate(); } - - -IMPL_LINK_INLINE_START( StackWindow, ButtonHdl, ImageButton *, /*pButton*/ ) -{ - return 0; -} -IMPL_LINK_INLINE_END( StackWindow, ButtonHdl, ImageButton *, pButton ) - - - void StackWindow::UpdateCalls() { aTreeListBox.SetUpdateMode( sal_False ); diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index e98fe2cf4f96..346dbf7b8221 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -116,7 +116,6 @@ public: const String& GetComment() const { return aComment; } virtual void SetSource( const String& r ); void SetSource32( const ::rtl::OUString& r ); - void SetComment( const String& r ); virtual sal_Bool Compile(); sal_Bool Disassemble( String& rText ); diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index 1b3ee5e82843..4efb5ecf6618 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -125,7 +125,6 @@ public: SbModule* MakeModule32( const String& rName, const ::rtl::OUString& rSrc ); SbModule* MakeModule32( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, const ::rtl::OUString& rSrc ); sal_Bool Compile( SbModule* ); - sal_Bool Disassemble( SbModule*, String& rText ); static void Stop(); static void Error( SbError ); static void Error( SbError, const String& rMsg ); @@ -136,8 +135,6 @@ public: // #66536 make additional message accessible by RTL function Error static String GetErrorMsg(); static xub_StrLen GetErl(); - // Highlighting - void Highlight( const String& rSrc, SbTextPortions& rList ); virtual SbxVariable* Find( const String&, SbxClassType ); virtual sal_Bool Call( const String&, SbxArray* = NULL ); @@ -150,9 +147,6 @@ public: void DeInitAllModules( void ); void ClearAllModuleVars( void ); - // #43011 For TestTool; deletes global vars - void ClearGlobalVars( void ); - // Calls for error and break handler static sal_uInt16 GetLine(); static sal_uInt16 GetCol1(); diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx index 80644f0da7a6..363da1bbabe1 100644 --- a/basic/inc/basic/sbxmeth.hxx +++ b/basic/inc/basic/sbxmeth.hxx @@ -45,7 +45,6 @@ public: SbxMethod( const SbxMethod& r ); ~SbxMethod(); SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r ); return *this; } - sal_Bool Run( SbxValues* pValues = NULL ); virtual SbxClassType GetClass() const; }; diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx index 653437ed8745..0360ad52ba27 100644 --- a/basic/inc/basic/sbxobj.hxx +++ b/basic/inc/basic/sbxobj.hxx @@ -72,7 +72,6 @@ public: // Default-Property SbxProperty* GetDfltProperty(); void SetDfltProperty( const String& r ); - void SetDfltProperty( SbxProperty* ); // Search for an element virtual SbxVariable* FindUserData( sal_uInt32 nUserData ); virtual SbxVariable* Find( const String&, SbxClassType ); diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index edcef852050b..35789b21057c 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -260,12 +260,6 @@ sal_Bool PropertySetInfoImpl::hasPropertyByName(const ::rtl::OUString& Name) thr } -//============================================================================ - -SbPropertySetInfo::SbPropertySetInfo() -{ -} - //---------------------------------------------------------------------------- SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals ) @@ -307,71 +301,6 @@ sal_Bool SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name) return aImpl.hasPropertyByName( Name ); } - -//---------------------------------------------------------------------------- - -SbPropertyContainer::SbPropertyContainer() -{ -} - -//---------------------------------------------------------------------------- - -SbPropertyContainer::~SbPropertyContainer() -{ -} - -//---------------------------------------------------------------------------- -void SbPropertyContainer::addProperty(const ::rtl::OUString& Name, - sal_Int16 Attributes, - const Any& DefaultValue) - throw( PropertyExistException, IllegalTypeException, - IllegalArgumentException, RuntimeException ) -{ - (void)Name; - (void)Attributes; - (void)DefaultValue; -} - -//---------------------------------------------------------------------------- -void SbPropertyContainer::removeProperty(const ::rtl::OUString& Name) - throw( UnknownPropertyException, RuntimeException ) -{ - (void)Name; -} - -//---------------------------------------------------------------------------- -// XPropertySetInfo -Sequence< Property > SbPropertyContainer::getProperties(void) throw () -{ - return aImpl.getProperties(); -} - -Property SbPropertyContainer::getPropertyByName(const ::rtl::OUString& Name) - throw( RuntimeException ) -{ - return aImpl.getPropertyByName( Name ); -} - -sal_Bool SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name) - throw( RuntimeException ) -{ - return aImpl.hasPropertyByName( Name ); -} - -//---------------------------------------------------------------------------- - -Sequence< PropertyValue > SbPropertyContainer::getPropertyValues(void) -{ - return Sequence<PropertyValue>(); -} - -//---------------------------------------------------------------------------- - -void SbPropertyContainer::setPropertyValues(const Sequence< PropertyValue >& PropertyValues_) -{ - (void)PropertyValues_; -} - //---------------------------------------------------------------------------- void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index ce37b301b5cb..0256f885d61e 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1127,14 +1127,6 @@ sal_Bool StarBASIC::Compile( SbModule* pMod ) return pMod ? pMod->Compile() : sal_False; } -sal_Bool StarBASIC::Disassemble( SbModule* pMod, String& rText ) -{ - rText.Erase(); - if( pMod ) - pMod->Disassemble( rText ); - return sal_Bool( rText.Len() != 0 ); -} - void StarBASIC::Clear() { while( pModules->Count() ) @@ -1290,19 +1282,6 @@ void StarBASIC::DeInitAllModules( void ) } } -// #43011 For TestTool, to delete global vars -void StarBASIC::ClearGlobalVars( void ) -{ - SbxArrayRef xProps( GetProperties() ); - sal_uInt16 nPropCount = xProps->Count(); - for ( sal_uInt16 nProp = 0 ; nProp < nPropCount ; ++nProp ) - { - SbxBase* pVar = xProps->Get( nProp ); - pVar->Clear(); - } - SetModified( sal_True ); -} - // This implementation at first searches within the runtime library, // then it looks for an element within one module. This moudle can be // a public var or an entrypoint. If it is not found and we look for a diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 85a84350efd8..e65924526e2f 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -445,8 +445,6 @@ TYPEINIT1(SbJScriptMethod,SbMethod) TYPEINIT1(SbObjModule,SbModule) TYPEINIT1(SbUserFormModule,SbObjModule) -typedef std::vector<HighlightPortion> HighlightPortions; - uno::Reference< frame::XModel > getDocumentModel( StarBASIC* pb ) { uno::Reference< frame::XModel > xModel; @@ -994,12 +992,6 @@ void SbModule::SetSource32( const ::rtl::OUString& r ) EndDefinitions( sal_True ); } -void SbModule::SetComment( const String& r ) -{ - aComment = r; - SetModified( sal_True ); -} - SbMethod* SbModule::GetFunctionForLine( sal_uInt16 nLine ) { for( sal_uInt16 i = 0; i < pMethods->Count(); i++ ) diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 1b4122ea7d1e..19d6484f7be6 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -957,16 +957,4 @@ sal_Bool SbModule::Compile() return bRet; } -/************************************************************************** -* -* Syntax-Highlighting -* -**************************************************************************/ - -void StarBASIC::Highlight( const String& rSrc, SbTextPortions& rList ) -{ - SbiTokenizer aTok( rSrc ); - aTok.Hilite( rList ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 1497bbc0df9d..0c27c32d27f6 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -107,7 +107,6 @@ typedef ::cppu::WeakImplHelper1< NS_BEANS::XPropertySetInfo > SbPropertySetInfoH class PropertySetInfoImpl { friend class SbPropertySetInfo; - friend class SbPropertyContainer; NS_UNO::Sequence< NS_BEANS::Property > _aProps; @@ -130,7 +129,6 @@ class SbPropertySetInfo: public SbPropertySetInfoHelper PropertySetInfoImpl aImpl; public: - SbPropertySetInfo(); SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals ); virtual ~SbPropertySetInfo(); @@ -143,39 +141,6 @@ public: throw( NS_UNO::RuntimeException ); }; -//========================================================================== - -typedef ::cppu::WeakImplHelper2< NS_BEANS::XPropertySetInfo, NS_BEANS::XPropertyContainer > SbPropertyContainerHelper; - -class SbPropertyContainer: public SbPropertyContainerHelper -{ - PropertySetInfoImpl aImpl; - -public: - SbPropertyContainer(); - virtual ~SbPropertyContainer(); - - // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, - sal_Int16 Attributes, - const NS_UNO::Any& DefaultValue) - throw( NS_BEANS::PropertyExistException, NS_BEANS::IllegalTypeException, - NS_LANG::IllegalArgumentException, NS_UNO::RuntimeException ); - virtual void SAL_CALL removeProperty(const ::rtl::OUString& Name) - throw( NS_BEANS::UnknownPropertyException, NS_UNO::RuntimeException ); - - // XPropertySetInfo - virtual NS_UNO::Sequence< NS_BEANS::Property > SAL_CALL getProperties(void) throw(); - virtual NS_BEANS::Property SAL_CALL getPropertyByName(const ::rtl::OUString& Name) - throw( NS_UNO::RuntimeException ); - virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& Name) - throw( NS_UNO::RuntimeException ); - - // XPropertyAccess - virtual NS_UNO::Sequence< NS_BEANS::PropertyValue > SAL_CALL getPropertyValues(void); - virtual void SAL_CALL setPropertyValues(const NS_UNO::Sequence< NS_BEANS::PropertyValue >& PropertyValues_); -}; - //========================================================================= class StarBASIC; diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 10d24262569d..7a30bf8b0a03 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -323,21 +323,6 @@ void SbxObject::SetDfltProperty( const XubString& rName ) SetModified( sal_True ); } -void SbxObject::SetDfltProperty( SbxProperty* p ) -{ - if( p ) - { - sal_uInt16 n; - SbxArray* pArray = FindVar( p, n ); - pArray->Put( p, n ); - if( p->GetParent() != this ) - p->SetParent( this ); - Broadcast( SBX_HINT_OBJECTCHANGED ); - } - pDfltProp = p; - SetModified( sal_True ); -} - // Search of a already available variable. If she was located, // the index will be set, elsewise will be delivered the Count of the Array. // In any case it will be delivered the correct Array. @@ -904,15 +889,6 @@ SbxMethod::~SbxMethod() { } -sal_Bool SbxMethod::Run( SbxValues* pValues ) -{ - SbxValues aRes; - if( !pValues ) - pValues = &aRes; - pValues->eType = SbxVARIANT; - return Get( *pValues ); -} - SbxClassType SbxMethod::GetClass() const { return SbxCLASS_METHOD; diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 50fafd397947..275a7ec28acd 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -90,52 +90,7 @@ public: return nRet; } }; -class OwnSplitWindow : public SplitWindow -{ -public: - OwnSplitWindow(Window* pParent) : SplitWindow(pParent,WB_DIALOGCONTROL){SetBackground( );} - - virtual void Split() - { - SplitWindow::Split(); - setItemSizes(); - } - void setItemSizes() - { - const long nOutWidth = GetOutputSizePixel().Width(); - long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); - nTaskPaneMinSplitSize = static_cast<long>(nTaskPaneMinSplitSize*100/nOutWidth); - if ( !nTaskPaneMinSplitSize ) - nTaskPaneMinSplitSize = START_SIZE_TASKPANE; - - const long nReportMinSplitSize = static_cast<long>(12000/nOutWidth); - - long nReportSize = GetItemSize( REPORT_ID ); - long nTaskPaneSize = GetItemSize( TASKPANE_ID ); - - sal_Bool bMod = sal_False; - if( nReportSize < nReportMinSplitSize ) - { - nReportSize = nReportMinSplitSize; - nTaskPaneSize = 99 - nReportMinSplitSize; - bMod = sal_True; - } - else if( nTaskPaneSize < nTaskPaneMinSplitSize ) - { - nTaskPaneSize = nTaskPaneMinSplitSize; - nReportSize = 99 - nTaskPaneMinSplitSize; - - bMod = sal_True; - } - - if( bMod ) - { - SetItemSize( REPORT_ID, nReportSize ); - SetItemSize( TASKPANE_ID, nTaskPaneSize ); - } - } -}; //================================================================== // class ODesignView //================================================================== diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 14f4f17bcf66..64d26b1991dd 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -188,17 +188,14 @@ class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog public: SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId ); SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 ); - SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const String& rInfoURL ); virtual ~SfxSingleTabDialog(); - void SetPage( TabPage* pNewPage ); void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 ); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } OKButton* GetOKButton() const { return pOKBtn; } CancelButton* GetCancelButton() const { return pCancelBtn; } - void SetInfoLink( const Link& rLink ); private: GetTabPageRanges fnGetRanges; diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index a96f54055b0a..3b3835b6ac41 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -226,10 +226,6 @@ public: // XDialogClosedListener methods virtual void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ); - // retrieves the top-most file picker - i.e. the instance which is currently beeing executed - static ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePicker > - GetTopMostFilePicker( ); - /** sets help ids for the controls in the dialog @param _pControlId Pointer to a 0-terminated array of control ids. They must be recruited from the diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index cf7f89f050cb..49429e40a4a4 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -778,31 +778,6 @@ SfxSingleTabDialog::SfxSingleTabDialog // ----------------------------------------------------------------------- -SfxSingleTabDialog::SfxSingleTabDialog -( - Window* pParent, - sal_uInt16 nUniqueId, - const String& rInfoURL -) - -/* [Description] - - Constructor of the general base class for SingleTab-Dialoge; - ID for the ini-file is handed over. -*/ - -: SfxModalDialog( pParent, nUniqueId, WinBits( WB_STDMODAL | WB_3DLOOK ) ), - - pOKBtn ( NULL ), - pCancelBtn ( NULL ), - pHelpBtn ( NULL ), - pImpl ( new SingleTabDlgImpl ) -{ - pImpl->m_sInfoURL = rInfoURL; -} - -// ----------------------------------------------------------------------- - SfxSingleTabDialog::~SfxSingleTabDialog() { delete pOKBtn; @@ -817,78 +792,6 @@ SfxSingleTabDialog::~SfxSingleTabDialog() // ----------------------------------------------------------------------- -void SfxSingleTabDialog::SetPage( TabPage* pNewPage ) -{ - if ( !pImpl->m_pLine ) - pImpl->m_pLine = new FixedLine( this ); - - if ( !pOKBtn ) - { - pOKBtn = new OKButton( this, WB_DEFBUTTON ); - pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) ); - } - - if ( pImpl->m_sInfoURL.Len() > 0 && !pImpl->m_pInfoImage ) - { - pImpl->m_pInfoImage = new ::svt::FixedHyperlinkImage( this ); - Image aInfoImage = Image( SfxResId( IMG_INFO ) ); - Size aImageSize = aInfoImage.GetSizePixel(); - aImageSize.Width() += 4; - aImageSize.Height() += 4; - pImpl->m_pInfoImage->SetSizePixel( aImageSize ); - pImpl->m_pInfoImage->SetImage( aInfoImage ); - pImpl->m_pInfoImage->SetURL( pImpl->m_sInfoURL ); - pImpl->m_pInfoImage->SetClickHdl( pImpl->m_aInfoLink ); - } - - if ( pImpl->m_pTabPage ) - delete pImpl->m_pTabPage; - if ( pImpl->m_pSfxPage ) - delete pImpl->m_pSfxPage; - pImpl->m_pTabPage = pNewPage; - - if ( pImpl->m_pTabPage ) - { - // Adjust size and position. - pImpl->m_pTabPage->SetPosPixel( Point() ); - Size aOutSz( pImpl->m_pTabPage->GetSizePixel() ); - Size aOffSz = LogicToPixel( Size( RSC_SP_CTRL_X, RSC_SP_CTRL_Y ), MAP_APPFONT ); - Size aFLSz = LogicToPixel( Size( aOutSz.Width(), RSC_CD_FIXEDLINE_HEIGHT ) ); - Size aBtnSz = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ), MAP_APPFONT ); - - Point aPnt( 0, aOutSz.Height() ); - pImpl->m_pLine->SetPosSizePixel( aPnt, aFLSz ); - aPnt.X() = aOutSz.Width() - aOffSz.Width() - aBtnSz.Width(); - aPnt.Y() += aFLSz.Height() + ( aOffSz.Height() / 2 ); - pOKBtn->SetPosSizePixel( aPnt, aBtnSz ); - - if ( pImpl->m_pInfoImage ) - { - aPnt.X() = aOffSz.Width(); - long nDelta = ( pImpl->m_pInfoImage->GetSizePixel().Height() - aBtnSz.Height() ) / 2; - aPnt.Y() -= nDelta; - pImpl->m_pInfoImage->SetPosPixel( aPnt ); - pImpl->m_pInfoImage->Show(); - } - - aOutSz.Height() += aFLSz.Height() + ( aOffSz.Height() / 2 ) + aBtnSz.Height() + aOffSz.Height(); - SetOutputSizePixel( aOutSz ); - - pImpl->m_pLine->Show(); - pOKBtn->Show(); - pImpl->m_pTabPage->Show(); - - // Set TabPage text in the Dialog - SetText( pImpl->m_pTabPage->GetText() ); - - // Dialog recieves the HelpId of TabPage - SetHelpId( pImpl->m_pTabPage->GetHelpId() ); - SetUniqueId( pImpl->m_pTabPage->GetUniqueId() ); - } -} - -// ----------------------------------------------------------------------- - void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc ) /* [Description] @@ -956,11 +859,4 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage, } } -// ----------------------------------------------------------------------- - -void SfxSingleTabDialog::SetInfoLink( const Link& rLink ) -{ - pImpl->m_aInfoLink = rLink; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx index 22cfb86c116b..065917932132 100644 --- a/sot/inc/sot/sotdata.hxx +++ b/sot/inc/sot/sotdata.hxx @@ -51,8 +51,12 @@ struct SotData_Impl sal_uInt32 nSvObjCount; std::list<SotObject*> aObjectList; SotFactoryList * pFactoryList; + SotFactory * pSotObjectFactory; + SotFactory * pSotStorageStreamFactory; + SotFactory * pSotStorageFactory; tDataFlavorList* pDataFlavorList; SotData_Impl(); + ~SotData_Impl(); }; SOT_DLLPUBLIC SotData_Impl* SOTDATA(); diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 15ac9b97d825..1a7e80805ad9 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -48,17 +48,25 @@ SotData_Impl::SotData_Impl() : nSvObjCount( 0 ) , pFactoryList( NULL ) + , pSotObjectFactory( NULL ) + , pSotStorageStreamFactory( NULL ) + , pSotStorageFactory( NULL ) , pDataFlavorList( NULL ) { } +SotData_Impl::~SotData_Impl() +{ + delete pDataFlavorList; + delete pFactoryList; +} + /************************************************************************* |* SOTDATA() |* |* Beschreibung *************************************************************************/ namespace { struct ImplData : public rtl::Static<SotData_Impl, ImplData> {}; } - SotData_Impl * SOTDATA() { return &ImplData::get(); diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk index 7e72d1cedca0..6b869a02e267 100644 --- a/svl/Package_inc.mk +++ b/svl/Package_inc.mk @@ -91,7 +91,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx)) diff --git a/svl/inc/svl/pickerhistory.hxx b/svl/inc/svl/pickerhistory.hxx deleted file mode 100644 index 45f9ab15c33b..000000000000 --- a/svl/inc/svl/pickerhistory.hxx +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_PICKERHISTORY_HXX -#define SVTOOLS_PICKERHISTORY_HXX - -#include "svl/svldllapi.h" -#include <com/sun/star/uno/XInterface.hpp> - -//......................................................................... -namespace svt -{ -//......................................................................... - - // -------------------------------------------------------------------- - SVL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - GetTopMostFolderPicker( ); - - SVL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - GetTopMostFilePicker( ); - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // SVTOOLS_PICKERHISTORY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx index 00a09806a7ed..f4b8b1bddc95 100644 --- a/svl/source/filepicker/pickerhistory.cxx +++ b/svl/source/filepicker/pickerhistory.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <svl/pickerhistory.hxx> #include <svl/pickerhistoryaccess.hxx> #include <cppuhelper/weakref.hxx> #include <vector> @@ -108,18 +107,6 @@ namespace svt } //--------------------------------------------------------------------- - Reference< XInterface > GetTopMostFolderPicker( ) - { - return implGetTopMostPicker( getFolderPickerHistory() ); - } - - //--------------------------------------------------------------------- - Reference< XInterface > GetTopMostFilePicker( ) - { - return implGetTopMostPicker( getFilePickerHistory() ); - } - - //--------------------------------------------------------------------- void addFolderPicker( const Reference< XInterface >& _rxPicker ) { implPushBackPicker( getFolderPickerHistory(), _rxPicker ); diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx index 64b2255df46b..d25219a32efb 100644 --- a/svtools/inc/svtools/filedlg.hxx +++ b/svtools/inc/svtools/filedlg.hxx @@ -83,14 +83,8 @@ public: virtual void FileSelect(); virtual void FilterSelect(); - void SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; } const UniString& GetDefaultExt() const { return aDfltExt; } UniString GetFilterType( sal_uInt16 nPos ) const; - - void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } - const Link& GetFileSelectHdl() const { return aFileHdlLink; } - void SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; } - const Link& GetFilterSelectHdl() const { return aFilterHdlLink; } }; #endif // _FILEDLG_HXX diff --git a/svtools/inc/svtools/fixedhyper.hxx b/svtools/inc/svtools/fixedhyper.hxx index 6c34526dbb0b..b12a83917ceb 100644 --- a/svtools/inc/svtools/fixedhyper.hxx +++ b/svtools/inc/svtools/fixedhyper.hxx @@ -173,7 +173,6 @@ namespace svt With ResId or WinBits. */ - FixedHyperlinkImage( Window* pParent, const ResId& rId ); FixedHyperlinkImage( Window* pParent, WinBits nWinStyle = 0 ); /** dtor diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx index 5f9be67ab60b..53a7b987bcda 100644 --- a/svtools/inc/svtools/roadmap.hxx +++ b/svtools/inc/svtools/roadmap.hxx @@ -71,10 +71,8 @@ namespace svt void SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True ); void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); - sal_Bool IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const; void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); - ::rtl::OUString GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex = 0 ); void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); void SetRoadmapInteractive( sal_Bool _bInteractive ); @@ -85,7 +83,6 @@ namespace svt ItemIndex GetItemCount() const; ItemId GetItemID( ItemIndex _nIndex ) const; - ItemIndex GetItemIndex( ItemId _nID ) const; void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx index 144a6902b124..9d2ed86f8892 100644 --- a/svtools/inc/svtools/taskbar.hxx +++ b/svtools/inc/svtools/taskbar.hxx @@ -54,12 +54,6 @@ typedef ::std::vector< ImplTaskSBFldItem* > ImplTaskSBItemList; TaskToolBox =========== -StartUpdateTask()/UpdateTask()/EndUpdateTask() -Diese muessen gerufen werden, wenn die Task upgedatet werden muessen. -Dann muss StartUpdateTask() gerufen werden, dann UpdateTask() fuer alle -Task's und danach EndUpdateTask() wo dann die TaskButtons entsprechend -neu angeordnet werden. - ActivateTask() Handler der gerufen wird, wenn ein Task aktiviert werden muss. @@ -203,11 +197,6 @@ public: virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); - void StartUpdateTask(); - void UpdateTask( const Image& rImage, const String& rText, - sal_Bool bActive = sal_False ); - void EndUpdateTask(); - const Point& GetContextMenuPos() const { return maContextMenuPos; } sal_Bool IsMinActivate() const { return mbMinActivate; } @@ -317,9 +306,6 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void InsertStatusField( long nOffset = STATUSBAR_OFFSET, - sal_uInt16 nPos = STATUSBAR_APPEND, - sal_uInt16 nFlags = TASKSTATUSFIELD_CLOCK ); void RemoveStatusField() { maTimer.Stop(); RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); } sal_uInt16 GetFieldFlags() const { return mnFieldFlags; } @@ -403,56 +389,6 @@ public: const Link& GetTaskResizeHdl() const { return maTaskResizeHdl; } }; -// ----------------------- -// - WindowArrange-Types - -// ----------------------- - -#define WINDOWARRANGE_TILE 1 -#define WINDOWARRANGE_HORZ 2 -#define WINDOWARRANGE_VERT 3 -#define WINDOWARRANGE_CASCADE 4 - -class ImplWindowArrangeList; - -// ----------------------- -// - class WindowArrange - -// ----------------------- - -typedef ::std::vector< Window* > WindowList_impl; - -class SVT_DLLPUBLIC WindowArrange -{ -private: - WindowList_impl maWinList; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplHorz( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplVert( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplCascade( const Rectangle& rRect ); -#endif - -public: - WindowArrange(); - ~WindowArrange(); - - void AddWindow( Window* pWindow, size_t nPos = size_t(-1) ) - { - if ( nPos < maWinList.size() ) { - maWinList.insert( maWinList.begin() + nPos, pWindow ); - } else { - maWinList.push_back( pWindow ); - } - } - - void RemoveAllWindows() - { - maWinList.clear(); - } - - void Arrange( sal_uInt16 nType, const Rectangle& rRect ); -}; - #endif // _TASKBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index a9eff0a6f001..1e0c2669a819 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -372,7 +372,6 @@ public: { return (sal_Bool)(pEntry->pParent!=pRootItem); } sal_Bool IsChild( SvListEntry* pParent, SvListEntry* pChild ) const; - sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const; SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const; SvListEntry* GetEntry( sal_uLong nRootPos ) const; SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx index c50303e33715..6d07b14dfee4 100644 --- a/svtools/inc/svtools/ttprops.hxx +++ b/svtools/inc/svtools/ttprops.hxx @@ -76,19 +76,14 @@ public: , nPropertyVersion( 0 ) {} - sal_Bool GetSlots(); - /// ExecuteFunction sal_uInt16 mnSID; SfxPoolItem** mppArgs; sal_uInt16 mnMode; - sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs = NULL, sal_uInt16 nMode = 0 ); /// Img Bitmap *mpBmp; - static SvtResId GetSvtResId( sal_uInt16 nId ); - sal_uLong nSidOpenUrl; sal_uLong nSidFileName; sal_uLong nSidNewDocDirect; diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 6b34f512b176..f4a081f0441c 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1378,23 +1378,11 @@ void SvTreeList::SetListPositions( SvTreeEntryList* pList ) } } - void SvTreeList::InvalidateEntry( SvListEntry* pEntry ) { Broadcast( LISTACTION_INVALIDATE_ENTRY, pEntry ); } -sal_Bool SvTreeList::IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const -{ - if ( !pParent ) - pParent = pRootItem; - sal_Bool bIsChild = sal_False; - if ( pParent->pChildren ) - bIsChild = (sal_Bool)(pParent->pChildren->GetPos(pChild) != ULONG_MAX); - return bIsChild; -} - - void lcl_CheckList( SvTreeEntryList* pList ) { SvListEntry* pEntry = (SvListEntry*)(pList->First()); diff --git a/svtools/source/control/fixedhyper.cxx b/svtools/source/control/fixedhyper.cxx index 46b6fce13299..2fa3fd553c05 100644 --- a/svtools/source/control/fixedhyper.cxx +++ b/svtools/source/control/fixedhyper.cxx @@ -136,14 +136,6 @@ void FixedHyperlink::SetDescription( const String& rNewDescription ) m_nTextLen = GetCtrlTextWidth( GetText() ); } -// class FixedHyperlinkImage --------------------------------------------- - -FixedHyperlinkImage::FixedHyperlinkImage( Window* pParent, const ResId& rResId ) : - FixedImage( pParent, rResId ) -{ - Initialize(); -} - FixedHyperlinkImage::FixedHyperlinkImage( Window* pParent, WinBits nWinStyle ) : FixedImage( pParent, nWinStyle ) { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 5765366261bb..4460ccc911e8 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -407,23 +407,6 @@ namespace svt } //--------------------------------------------------------------------- - RoadmapTypes::ItemIndex ORoadmap::GetItemIndex( ItemId _nID ) const - { - ItemId nLocID = 0; - const HL_Vector& rItems = m_pImpl->getHyperLabels(); - for ( HL_Vector::const_iterator i = rItems.begin(); - i < rItems.end(); - ++i - ) - { - nLocID = (*i)->GetID(); - if ( nLocID == _nID ) - return ItemIndex( i - rItems.begin() ); - } - return -1; - } - - //--------------------------------------------------------------------- void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ) { InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled ); @@ -448,13 +431,6 @@ namespace svt } //--------------------------------------------------------------------- - sal_Bool ORoadmap::IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex ) const - { - const RoadmapItem* _pLabelItem = GetByID( _nItemId, _nStartIndex ); - return _pLabelItem ? _pLabelItem->IsEnabled() : sal_False; - } - - //--------------------------------------------------------------------- void ORoadmap::EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex ); @@ -482,17 +458,6 @@ namespace svt } //--------------------------------------------------------------------- - - ::rtl::OUString ORoadmap::GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex ) - { - RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); - if ( pItem != NULL ) - return pItem->GetLabel(); - else - return ::rtl::OUString(); - } - - //--------------------------------------------------------------------- void ORoadmap::ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index c31608ef766d..deb6f4ca1623 100644 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -274,67 +274,4 @@ void TaskToolBox::ImplFormatTaskToolBox() } } -// ----------------------------------------------------------------------- - -void TaskToolBox::StartUpdateTask() -{ - mnOldItemCount = mpItemList->size(); - mnUpdatePos = 0; - mnUpdateNewPos = TOOLBOX_ITEM_NOTFOUND; - mnNewActivePos = 0xFFFE; -} - -// ----------------------------------------------------------------------- - -void TaskToolBox::UpdateTask( const Image& rImage, const String& rText, - sal_Bool bActive ) -{ - ImplTaskItem* pItem = ( mnUpdatePos < mpItemList->size() ) ? (*mpItemList)[ mnUpdatePos ] : NULL; - if ( pItem ) - { - if ( (pItem->maText != rText) || (pItem->maImage != rImage) ) - { - // Eintraege aus der Liste entfernen - while ( mpItemList->size() > mnUpdatePos ) { - delete mpItemList->back(); - mpItemList->pop_back(); - } - pItem = NULL; - } - } - - if ( !pItem ) - { - if ( mnUpdatePos < mnUpdateNewPos ) - mnUpdateNewPos = mnUpdatePos; - - pItem = new ImplTaskItem; - pItem->maImage = rImage; - pItem->maText = rText; - mpItemList->push_back( pItem ); - } - - if ( bActive ) - mnNewActivePos = mnUpdatePos; - - mnUpdatePos++; -} - -// ----------------------------------------------------------------------- - -void TaskToolBox::EndUpdateTask() -{ - if ( mnUpdateNewPos == TOOLBOX_ITEM_NOTFOUND ) - { - // Eintraege aus der Liste entfernen - while ( mpItemList->size() > mnUpdatePos ) { - delete mpItemList->back(); - mpItemList->pop_back(); - } - mnUpdateNewPos = mnUpdatePos; - } - - ImplFormatTaskToolBox(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx index 315ce373804a..4dc0d5526aae 100644 --- a/svtools/source/control/taskmisc.cxx +++ b/svtools/source/control/taskmisc.cxx @@ -55,313 +55,4 @@ void TaskButtonBar::RequestHelp( const HelpEvent& rHEvt ) ToolBox::RequestHelp( rHEvt ); } -// ======================================================================= - -WindowArrange::WindowArrange() -{ -} - -// ----------------------------------------------------------------------- - -WindowArrange::~WindowArrange() -{ - maWinList.clear(); -} - -// ----------------------------------------------------------------------- - -static sal_uInt16 ImplCeilSqareRoot( sal_uInt16 nVal ) -{ - sal_uInt16 i; - - // Ueberlauf verhindern - if ( nVal > 0xFE * 0xFE ) - return 0xFE; - - for ( i=0; i*i < nVal; i++ ) - {} - - return i; -} - -// ----------------------------------------------------------------------- - -static void ImplPosSizeWindow( Window* pWindow, - long nX, long nY, long nWidth, long nHeight ) -{ - if ( nWidth < 32 ) - nWidth = 32; - if ( nHeight < 24 ) - nHeight = 24; - pWindow->SetPosSizePixel( nX, nY, nWidth, nHeight ); -} - -// ----------------------------------------------------------------------- - -void WindowArrange::ImplTile( const Rectangle& rRect ) -{ - size_t nCount = maWinList.size(); - if ( nCount < 3 ) - { - ImplVert( rRect ); - return; - } - - sal_uInt16 i; - sal_uInt16 j; - sal_uInt16 nCols; - sal_uInt16 nRows; - sal_uInt16 nActRows; - sal_uInt16 nOffset; - long nOverWidth; - long nOverHeight; - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectY = nY; - long nRectWidth = nWidth; - long nRectHeight = nHeight; - long nTempWidth; - long nTempHeight; - - nCols = ImplCeilSqareRoot( nCount ); - nOffset = (nCols*nCols) - nCount; - if ( nOffset >= nCols ) - { - nRows = nCols -1; - nOffset = nOffset - nCols; - } - else - nRows = nCols; - - nWidth /= nCols; - if ( nWidth < 1 ) - nWidth = 1; - nOverWidth = nRectWidth-(nWidth*nCols); - - WindowList_impl::iterator it = maWinList.begin(); - for ( i = 0; i < nCols; i++ ) - { - if ( i < nOffset ) - nActRows = nRows - 1; - else - nActRows = nRows; - - nTempWidth = nWidth; - if ( nOverWidth > 0 ) - { - nTempWidth++; - nOverWidth--; - } - - nHeight = nRectHeight / nActRows; - if ( nHeight < 1 ) - nHeight = 1; - nOverHeight = nRectHeight-(nHeight*nActRows); - for ( j = 0; j < nActRows; j++ ) - { - // Ueberhang verteilen - nTempHeight = nHeight; - if ( nOverHeight > 0 ) - { - nTempHeight++; - nOverHeight--; - } - ImplPosSizeWindow( *it, nX, nY, nTempWidth, nTempHeight ); - nY += nTempHeight; - - if ( ++it == maWinList.end() ) - break; - } - - nX += nWidth; - nY = nRectY; - - if ( it == maWinList.end() ) - break; - } -} - -// ----------------------------------------------------------------------- - -void WindowArrange::ImplHorz( const Rectangle& rRect ) -{ - size_t nCount = maWinList.size(); - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectHeight = nHeight; - long nOver; - long nTempHeight; - Window* pWindow; - - nHeight /= nCount; - if ( nHeight < 1 ) - nHeight = 1; - nOver = nRectHeight - (nCount*nHeight); - for( size_t index = 0; index < nCount; ++index ) - { - pWindow = maWinList[ index ]; - nTempHeight = nHeight; - if ( nOver > 0 ) - { - nTempHeight++; - nOver--; - } - ImplPosSizeWindow( pWindow, nX, nY, nWidth, nTempHeight ); - nY += nTempHeight; - } -} - -// ----------------------------------------------------------------------- - -void WindowArrange::ImplVert( const Rectangle& rRect ) -{ - size_t nCount = maWinList.size(); - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectWidth = nWidth; - long nOver; - long nTempWidth; - Window* pWindow; - - nWidth /= nCount; - if ( nWidth < 1 ) - nWidth = 1; - nOver = nRectWidth - (nCount*nWidth); - for( size_t index = 0; index < nCount; ++index ) - { - pWindow = maWinList[ index ]; - nTempWidth = nWidth; - if ( nOver > 0 ) - { - nTempWidth++; - nOver--; - } - ImplPosSizeWindow( pWindow, nX, nY, nTempWidth, nHeight ); - nX += nTempWidth; - } -} - -// ----------------------------------------------------------------------- - -void WindowArrange::ImplCascade( const Rectangle& rRect ) -{ - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectWidth = nWidth; - long nRectHeight = nHeight; - long nOff; - long nCascadeWins; - sal_Int32 nLeftBorder; - sal_Int32 nTopBorder; - sal_Int32 nRightBorder; - sal_Int32 nBottomBorder; - long nStartOverWidth; - long nStartOverHeight; - long nOverWidth = 0; - long nOverHeight = 0; - long nTempX; - long nTempY; - long nTempWidth; - long nTempHeight; - long i; - Window* pWindow; - Window* pTempWindow; - - // Border-Fenster suchen um den Versatz zu ermitteln - pTempWindow = maWinList.front(); - pTempWindow->GetBorder( nLeftBorder, nTopBorder, nRightBorder, nBottomBorder ); - while ( !nTopBorder ) - { - Window* pBrdWin = pTempWindow->GetWindow( WINDOW_REALPARENT ); - if ( !pBrdWin || (pBrdWin->GetWindow( WINDOW_CLIENT ) != pTempWindow) ) - break; - pTempWindow = pBrdWin; - pTempWindow->GetBorder( nLeftBorder, nTopBorder, nRightBorder, nBottomBorder ); - } - if ( !nTopBorder ) - nTopBorder = 22; - nOff = nTopBorder; - - nCascadeWins = nRectHeight / 3 / nOff; - if ( !nCascadeWins ) - nCascadeWins = 1; - nWidth -= nCascadeWins*nOff; - nHeight -= nCascadeWins*nOff; - if ( nWidth < 1 ) - nWidth = 1; - if ( nHeight < 1 ) - nHeight = 1; - - nStartOverWidth = nRectWidth-(nWidth+(nCascadeWins*nOff)); - nStartOverHeight = nRectHeight-(nHeight+(nCascadeWins*nOff)); - - i = 0; - for( size_t index = 0, count = maWinList.size(); index < count; ++index ) - { - pWindow = maWinList[ index ]; - if ( !i ) - { - nOverWidth = nStartOverWidth; - nOverHeight = nStartOverHeight; - } - - // Position - nTempX = nX + (i*nOff); - nTempY = nY + (i*nOff); - - // Ueberhang verteilen - nTempWidth = nWidth; - if ( nOverWidth > 0 ) - { - nTempWidth++; - nOverWidth--; - } - nTempHeight = nHeight; - if ( nOverHeight > 0 ) - { - nTempHeight++; - nOverHeight--; - } - - ImplPosSizeWindow( pWindow, nTempX, nTempY, nTempWidth, nTempHeight ); - - if ( i < nCascadeWins ) - i++; - else - i = 0; - } -} - -// ----------------------------------------------------------------------- - -void WindowArrange::Arrange( sal_uInt16 nType, const Rectangle& rRect ) -{ - if ( maWinList.empty() ) - return; - - switch ( nType ) - { - case WINDOWARRANGE_TILE: - ImplTile( rRect ); - break; - case WINDOWARRANGE_HORZ: - ImplHorz( rRect ); - break; - case WINDOWARRANGE_VERT: - ImplVert( rRect ); - break; - case WINDOWARRANGE_CASCADE: - ImplCascade( rRect ); - break; - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 20b731bcc2da..594163e50333 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -522,13 +522,4 @@ void TaskStatusBar::UserDraw( const UserDrawEvent& rUDEvt ) StatusBar::UserDraw( rUDEvt ); } -// ----------------------------------------------------------------------- - -void TaskStatusBar::InsertStatusField( long, sal_uInt16, - sal_uInt16 nFlags ) -{ - mnFieldFlags = nFlags; - ImplUpdateField( sal_False ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/plugapp/ttprops.cxx b/svtools/source/plugapp/ttprops.cxx index 2d65d6df4e73..6efb3679997c 100644 --- a/svtools/source/plugapp/ttprops.cxx +++ b/svtools/source/plugapp/ttprops.cxx @@ -45,26 +45,4 @@ sal_Bool TTProperties::RequestProperty( sal_uInt16 nRequest ) return sal_True; } - -sal_Bool TTProperties::GetSlots() -{ - RequestProperty( TT_PR_SLOTS ); - return HasSlots(); -} - -sal_uInt16 TTProperties::ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs, sal_uInt16 nMode ) -{ - mnSID = nSID; - mppArgs = ppArgs; - mnMode = nMode; - RequestProperty( TT_PR_DISPATCHER ); - mppArgs = NULL; - return nActualPR; -} - -SvtResId TTProperties::GetSvtResId( sal_uInt16 nId ) -{ - return SvtResId( nId ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx index 1c904b824447..478f7653291e 100644 --- a/tools/inc/tools/config.hxx +++ b/tools/inc/tools/config.hxx @@ -60,8 +60,6 @@ public: ~Config(); const XubString& GetPathName() const { return maFileName; } - static XubString GetDefDirectory(); - static XubString GetConfigName( const XubString& rPath, const XubString& rBaseName ); void SetGroup(const rtl::OString& rGroup); const rtl::OString& GetGroup() const { return maGroupName; } diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index f4d01cd3d95d..33cb5e13ceb5 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -201,7 +201,6 @@ public: Time TimeModified() const { return aTimeModified; } Date DateAccessed() const { return aDateAccessed; } Time TimeAccessed() const { return aTimeAccessed; } - sal_Bool IsYounger( const FileStat& rIsOlder ) const; static sal_uIntPtr SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO = sal_True ); static sal_Bool GetReadOnlyFlag( const DirEntry &rEntry ); diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx index e71fca848829..28e8477e0db9 100644 --- a/tools/inc/tools/time.hxx +++ b/tools/inc/tools/time.hxx @@ -115,7 +115,6 @@ public: static Time GetUTCOffset(); static sal_uIntPtr GetSystemTicks(); // Elapsed time - static sal_uIntPtr GetProcessTicks(); // CPU time void ConvertToUTC() { *this -= Time::GetUTCOffset(); } void ConvertToLocalTime() { *this += Time::GetUTCOffset(); } diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 015ab374760c..4a377e2b226e 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -373,31 +373,4 @@ sal_uIntPtr Time::GetSystemTicks() #endif } -// ----------------------------------------------------------------------- - -sal_uIntPtr Time::GetProcessTicks() -{ -#if defined WNT - return (sal_uIntPtr)GetTickCount(); -#else - static sal_uIntPtr nImplTicksPerSecond = 0; - static double dImplTicksPerSecond; - static double dImplTicksULONGMAX; - sal_uIntPtr nTicks = (sal_uIntPtr)clock(); - - if ( !nImplTicksPerSecond ) - { - nImplTicksPerSecond = CLOCKS_PER_SEC; - dImplTicksPerSecond = nImplTicksPerSecond; - dImplTicksULONGMAX = (double)(sal_uIntPtr)ULONG_MAX; - } - - double fTicks = nTicks; - fTicks *= 1000; - fTicks /= dImplTicksPerSecond; - fTicks = fmod (fTicks, dImplTicksULONGMAX); - return (sal_uIntPtr)fTicks; -#endif -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx index cd631299d4bd..3752aad6d222 100644 --- a/tools/source/fsys/fstat.cxx +++ b/tools/source/fsys/fstat.cxx @@ -98,26 +98,6 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess ) /************************************************************************* |* -|* FileStat::IsYounger() -|* -*************************************************************************/ - -// sal_True wenn die Instanz j"unger als rIsOlder ist. -// sal_False wenn die Instanz "alter oder gleich alt wie rIsOlder ist. - -sal_Bool FileStat::IsYounger( const FileStat& rIsOlder ) const -{ - if ( aDateModified > rIsOlder.aDateModified ) - return sal_True; - if ( ( aDateModified == rIsOlder.aDateModified ) && - ( aTimeModified > rIsOlder.aTimeModified ) ) - return sal_True; - - return sal_False; -} - -/************************************************************************* -|* |* FileStat::IsKind() |* *************************************************************************/ diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 253b3bcb7498..ed21da9cefd0 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -200,54 +200,6 @@ static sal_Bool ImplSysWriteConfig( const XubString& rFileName, // ----------------------------------------------------------------------- -static String ImplMakeConfigName( const XubString* pFileName, - const XubString* pPathName ) -{ - ::rtl::OUString aFileName; - ::rtl::OUString aPathName; - if ( pFileName ) - { -#ifdef UNX - aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." )); - aFileName += *pFileName; - aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" )); -#else - aFileName = *pFileName; - aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" )); -#endif - } - else - { -#ifdef UNX - aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".sversionrc" )); -#else - aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sversion.ini" )); -#endif - } - - // #88208# in case pPathName is set but empty and pFileName is set - // and not empty just return the filename; on the default case - // prepend default path as usual - if ( pPathName && pPathName->Len() ) - aPathName = toUncPath( *pPathName ); - else if( pPathName && pFileName && pFileName->Len() ) - return aFileName; - else - { - oslSecurity aSec = osl_getCurrentSecurity(); - osl_getConfigDir( aSec, &aPathName.pData ); - osl_freeSecurityHandle( aSec ); - } - - ::rtl::OUString aName( aPathName ); - aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )); - aName += aFileName; - - return aName; -} - -// ----------------------------------------------------------------------- - namespace { rtl::OString makeOString(const sal_uInt8* p, sal_uInt64 n) @@ -793,26 +745,6 @@ Config::~Config() // ----------------------------------------------------------------------- -String Config::GetDefDirectory() -{ - ::rtl::OUString aDefConfig; - oslSecurity aSec = osl_getCurrentSecurity(); - osl_getConfigDir( aSec, &aDefConfig.pData ); - osl_freeSecurityHandle( aSec ); - - return aDefConfig; -} - -// ----------------------------------------------------------------------- - -XubString Config::GetConfigName( const XubString& rPath, - const XubString& rBaseName ) -{ - return ImplMakeConfigName( &rBaseName, &rPath ); -} - -// ----------------------------------------------------------------------- - void Config::SetGroup(const rtl::OString& rGroup) { // Wenn neue Gruppe gesetzt wird, muss beim naechsten mal die diff --git a/unusedcode.easy b/unusedcode.easy index b6db1940d385..2164932ed2d7 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,4 @@ (anonymous namespace)::getState(std::__debug::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&) AtomDocument::AtomDocument(AtomPubSession*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >) AtomFolder::AtomFolder(AtomPubSession*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >) AtomPubSession::getCollectionUrl(Collection::Type) @@ -51,11 +50,6 @@ CIccTagResponseCurveSet16::GetFirstCurves() CIccTagResponseCurveSet16::GetNextCurves() CIccTagResponseCurveSet16::NewResponseCurves(icMeasurementUnitSig) CIccTagResponseCurveSet16::SetNumChannels(unsigned short) -CNames::Insert(CNames const*, unsigned short, unsigned short) -CNames::Insert(ControlItem const*&, unsigned short&) -CNames::Insert(ControlItem const**, unsigned short) -CNames::Remove(ControlItem const*&, unsigned short) -CNames::Remove(unsigned short, unsigned short) CalendarWrapper::setFirstDayOfWeek(short) CalendarWrapper::setMinimumNumberOfDaysForFirstWeek(short) CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) @@ -66,11 +60,6 @@ CharPosArray::Replace(int const*, unsigned short, unsigned short) CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*) Color::IncreaseContrast(unsigned char) ComboBox::SetTopEntry(unsigned short) -CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short) -CommunicationLinkList::Insert(CommunicationLink const*&, unsigned short&) -CommunicationLinkList::Insert(CommunicationLink const**, unsigned short) -CommunicationLinkList::Insert(CommunicationLinkList const*, unsigned short, unsigned short) -CommunicationLinkList::Remove(CommunicationLink const*&, unsigned short) Control::GetLineCount() const CurrencyBox::GetValue(unsigned short) const CurrencyBox::GetValuePos(long) const @@ -106,7 +95,9 @@ ElementCollector::setSecurityId(int) ExtraKernInfo::HasKernPairs() const FieldEntry::GetBookmarkType() FileControl::SetButtonText(String const&) +FileDialog::FileDialog(Window*, long) FileList::GetFormat() +FileStat::FileStat() FileStat::FileStat(void const*, void const*) FileStream::FileStream(rtl::OString const&, FileAccessMode) FixedBorder::FixedBorder(Window*, long) @@ -209,6 +200,7 @@ MachineSettings::CopyData() MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>) Matrix3d::Inverse() const Matrix3d::Matrix3d() +MenuBar::MenuBar(ResId const&) MergeData::~MergeData() MergeDataFile::Dump() MessBox::MessBox(unsigned short) @@ -300,11 +292,11 @@ SalI18N_InputContext::SetPreeditState(int) SanExtensionImpl::extractCertExt() SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) -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) @@ -572,13 +564,9 @@ SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) SourceTreeIterator::EndExecute() SpanStyleManager::get(WPXString const&) const SpinButton::SpinButton(Window*, ResId const&) -SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char) -SplitWindow::GetItemWindow(unsigned short) const -SplitWindow::SetItemBackground(unsigned short, Wallpaper const&) SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short) SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short) SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*) -StackWindow::LinkStubButtonHdl(void*, void*) StatusBar::CopyItems(StatusBar const&) StatusBar::GetItemBits(unsigned short) const StatusBar::GetItemData(unsigned short) const @@ -1044,12 +1032,11 @@ 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*) -TTProfiler::Dec(unsigned long) +TaskBar::TaskBar(Window*, long) TaskStatusFieldItem::TaskStatusFieldItem() TempFile::IsValid() const TextObj::TextObj(TextObj&) TextObj::Write(SvStream*) -ToolBox::GetToolbarLayoutMode() TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) UCBStorage::IsStorageFile(String const&) UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&) @@ -1938,6 +1925,9 @@ graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigne jfw_plugin::VendorBase::createInstance() jfw_plugin::VendorBase::getJavaExePaths(int*) jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&) +libcdr::CDRDocument::generateSVG(WPXInputStream*, WPXString&) +libcdr::CDRInternalStream::CDRInternalStream(unsigned char const*, unsigned long) +libcdr::readDouble(WPXInputStream*) libcmis::SessionFactory::getRepositories(std::__debug::map<int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<int>, std::allocator<std::pair<int const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >) libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&) libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat) @@ -2232,6 +2222,7 @@ std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector() std::__cxx1998::vector<SotFactory*, std::allocator<SotFactory*> >::~vector() std::__cxx1998::vector<com::sun::star::datatransfer::DataFlavor*, std::allocator<com::sun::star::datatransfer::DataFlavor*> >::~vector() svgi::(anonymous namespace)::appendChar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char) +svt::table::TableControl::GoTo(int, int) svx::SvxShowCharSetItem::~SvxShowCharSetItem() svxform::DataNavigatorManager::GetChildWindowId() svxform::FmFilterNavigatorWinMgr::GetChildWindowId() diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx index 5c0348c8199d..dcd1ef467b05 100644 --- a/vcl/inc/vcl/btndlg.hxx +++ b/vcl/inc/vcl/btndlg.hxx @@ -97,7 +97,6 @@ public: void AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 ); void RemoveButton( sal_uInt16 nId ); void Clear(); - sal_uInt16 GetButtonCount() const; sal_uInt16 GetButtonId( sal_uInt16 nButton ) const; PushButton* GetPushButton( sal_uInt16 nId ) const; void SetButtonText( sal_uInt16 nId, const XubString& rText ); diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 97c34f340c63..65a7696448cf 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -131,7 +131,6 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); public: - ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS ); ModelessDialog( Window* pParent, const ResId& rResId ); }; diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index bd6f9a761834..167ca138c0f5 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -309,8 +309,6 @@ public: virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); - void SetPin( sal_Bool bPin ); sal_Bool IsPined() const; diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx index 851f75ff4c1e..be20f39fcb20 100644 --- a/vcl/inc/vcl/splitwin.hxx +++ b/vcl/inc/vcl/splitwin.hxx @@ -182,8 +182,6 @@ public: void RemoveItem( sal_uInt16 nId, sal_Bool bHide = sal_True ); void Clear(); - void SetItemBackground( sal_uInt16 nSetId, const Wallpaper& rWallpaper ); - void SplitItem( sal_uInt16 nId, long nNewSize, sal_Bool bPropSmall = sal_False, sal_Bool bPropGreat = sal_False ); @@ -201,7 +199,6 @@ public: /** Return the current size limits for the specified item. */ long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const; - Window* GetItemWindow( sal_uInt16 nId ) const; sal_uInt16 GetSet( sal_uInt16 nId ) const; sal_uInt16 GetItemId( Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; @@ -220,13 +217,6 @@ public: void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } long GetMaxSizePixel() const { return mnMaxSize; } - static Size CalcWindowSizePixel( const Size& rSize, - WindowAlign eAlign, - WinBits nWinStyle, - sal_Bool bExtra = sal_False ); - Size CalcWindowSizePixel( const Size& rSize ) - { return CalcWindowSizePixel( rSize, meAlign, mnWinStyle, (mbAutoHide || mbFadeOut) ); } - Size CalcLayoutSizePixel( const Size& aNewSize ); void ShowAutoHideButton( sal_Bool bShow = sal_True ); @@ -242,8 +232,6 @@ public: void SetAutoHideState( sal_Bool bAutoHide ); sal_Bool GetAutoHideState() const { return mbAutoHideIn; } - Rectangle GetAutoHideRect() const; - void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } const Link& GetStartSplitHdl() const { return maStartSplitHdl; } void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 8b39005b3fb5..287d069ec4e7 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -428,7 +428,6 @@ public: // Used to enable/disable scrolling one page at a time for toolbar void SetPageScroll( sal_Bool b ); - void SetNextToolBox( const XubString& rStr ); const XubString& GetNextToolBox() const { return maNextToolBoxStr; } sal_uInt16 GetItemCount() const; @@ -439,7 +438,6 @@ public: sal_uInt16 GetItemId( const Point& rPos ) const; Rectangle GetItemRect( sal_uInt16 nItemId ) const; Rectangle GetItemPosRect( sal_uInt16 nPos ) const; - Rectangle GetItemPosDropDownRect( sal_uInt16 nPos ) const; // retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown) Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const; @@ -613,7 +611,6 @@ public: void ChangeHighlight( sal_uInt16 nPos ); void SetImageListProvider(vcl::IImageListProvider* _pProvider); - ToolBoxLayoutMode GetToolbarLayoutMode(); void SetToolbarLayoutMode( ToolBoxLayoutMode eLayout ); }; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 4c3386f79b0e..33544997f55f 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -938,7 +938,6 @@ public: void SetUniqueId( const rtl::OString& ); const rtl::OString& GetUniqueId() const; - const rtl::OString& GetUniqueOrHelpId() const; Window* FindWindow( const Point& rPos ) const; diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index ae851c0ea5d4..d97cabb124bf 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -362,11 +362,6 @@ void ButtonDialog::Clear() mbFormat = sal_True; } -sal_uInt16 ButtonDialog::GetButtonCount() const -{ - return (sal_uInt16)maItemList.size(); -} - sal_uInt16 ButtonDialog::GetButtonId( sal_uInt16 nButton ) const { if ( nButton < maItemList.size() ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index b2505b6db965..22d510b63b59 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -973,15 +973,6 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal pDev->Pop(); } - -// ======================================================================= - -ModelessDialog::ModelessDialog( Window* pParent, WinBits nStyle ) : - Dialog( WINDOW_MODELESSDIALOG ) -{ - ImplInit( pParent, nStyle ); -} - // ----------------------------------------------------------------------- ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) : diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 27527fc6336e..9596bfb63acd 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -789,21 +789,6 @@ void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -void DockingWindow::ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible ) -{ - if ( mpFloatWin ) - mpFloatWin->ShowTitleButton( nButton, bVisible ); - else - { - if ( nButton == TITLE_BUTTON_DOCKING ) - mbDockBtn = bVisible; - else /* if ( nButton == TITLE_BUTTON_HIDE ) */ - mbHideBtn = bVisible; - } -} - -// ----------------------------------------------------------------------- - void DockingWindow::SetFloatingMode( sal_Bool bFloatMode ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index bd2744280eb5..7d13123cc6f5 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2950,46 +2950,6 @@ void SplitWindow::Clear() // ----------------------------------------------------------------------- -void SplitWindow::SetItemBackground( sal_uInt16 nSetId, const Wallpaper& rWallpaper ) -{ - ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); - - if ( pSet ) - { - sal_Bool bUpdate = sal_True; - - if ( rWallpaper.GetStyle() == WALLPAPER_NULL ) - { - if ( pSet->mpWallpaper ) - { - delete pSet->mpWallpaper; - pSet->mpWallpaper = NULL; - } - else - bUpdate = sal_False; - } - else - { - // Ab jetzt muss immer invalidiert werden - mbInvalidate = sal_True; - - if ( !pSet->mpWallpaper ) - pSet->mpWallpaper = new Wallpaper( rWallpaper ); - else - *(pSet->mpWallpaper) = rWallpaper; - } - - // Beim MainSet koennen wir den Background umsetzen - if ( pSet == mpMainSet ) - ImplInitSettings(); - - if ( bUpdate ) - ImplUpdateSet( pSet ); - } -} - -// ----------------------------------------------------------------------- - void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize, sal_Bool bPropSmall, sal_Bool bPropGreat ) { @@ -3332,19 +3292,6 @@ void SplitWindow::SetItemSizeRange (sal_uInt16 nId, const Range aRange) // ----------------------------------------------------------------------- -Window* SplitWindow::GetItemWindow( sal_uInt16 nId ) const -{ - sal_uInt16 nPos; - ImplSplitSet* pSet = ImplFindItem( mpBaseSet, nId, nPos ); - - if ( pSet ) - return pSet->mpItems[nPos].mpWindow; - else - return NULL; -} - -// ----------------------------------------------------------------------- - sal_uInt16 SplitWindow::GetSet( sal_uInt16 nId ) const { sal_uInt16 nPos; @@ -3481,40 +3428,6 @@ void SplitWindow::SetAlign( WindowAlign eNewAlign ) // ----------------------------------------------------------------------- -Size SplitWindow::CalcWindowSizePixel( const Size& rSize, WindowAlign eAlign, - WinBits nWinStyle, sal_Bool bExtra ) -{ - long nLeft; - long nTop; - long nRight; - long nBottom; - Size aSize = rSize; - - ImplCalcBorder( eAlign, sal_False, nLeft, nTop, nRight, nBottom ); - aSize.Width() += nLeft+nRight; - aSize.Height() += nTop+nBottom; - - if ( nWinStyle & WB_SIZEABLE ) - { - if ( (eAlign == WINDOWALIGN_TOP) || (eAlign == WINDOWALIGN_BOTTOM) ) - { - aSize.Height() += SPLITWIN_SPLITSIZE-2; - if ( bExtra ) - aSize.Height() += SPLITWIN_SPLITSIZEEXLN; - } - else - { - aSize.Width() += SPLITWIN_SPLITSIZE-2; - if ( bExtra ) - aSize.Width() += SPLITWIN_SPLITSIZEEXLN; - } - } - - return aSize; -} - -// ----------------------------------------------------------------------- - void SplitWindow::ShowAutoHideButton( sal_Bool bShow ) { mbAutoHide = bShow; @@ -3564,13 +3477,4 @@ long SplitWindow::GetFadeInSize() const return n+SPLITWIN_SPLITSIZE+SPLITWIN_SPLITSIZEEX-2; } -// ----------------------------------------------------------------------- - -Rectangle SplitWindow::GetAutoHideRect() const -{ - Rectangle aRect; - ImplGetAutoHideRect( aRect, sal_True ); - return aRect; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index af88334a0ce3..36b42e0035e2 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -6016,11 +6016,6 @@ void ToolBox::ImplDisableFlatButtons() #endif } -ToolBoxLayoutMode ToolBox::GetToolbarLayoutMode() -{ - return meLayoutMode; -} - void ToolBox::SetToolbarLayoutMode( ToolBoxLayoutMode eLayout ) { if ( meLayoutMode != eLayout ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 53339e758417..067156b6131f 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -986,16 +986,6 @@ void ToolBox::SetPageScroll( sal_Bool b ) // ----------------------------------------------------------------------- -void ToolBox::SetNextToolBox( const XubString& rStr ) -{ - sal_Bool bCalcNew = (!maNextToolBoxStr.Len() != !rStr.Len()); - maNextToolBoxStr = rStr; - if ( bCalcNew ) - ImplInvalidate( sal_True, sal_False ); -} - -// ----------------------------------------------------------------------- - sal_uInt16 ToolBox::GetItemCount() const { return (sal_uInt16)mpData->m_aItems.size(); @@ -1162,19 +1152,6 @@ Rectangle ToolBox::GetItemPosRect( sal_uInt16 nPos ) const // ----------------------------------------------------------------------- -Rectangle ToolBox::GetItemPosDropDownRect( sal_uInt16 nPos ) const -{ - if ( mbCalc || mbFormat ) - ((ToolBox*)this)->ImplFormat(); - - if ( nPos < mpData->m_aItems.size() ) - return mpData->m_aItems[nPos].GetDropDownRect( mbHorz ); - else - return Rectangle(); -} - -// ----------------------------------------------------------------------- - sal_Bool ToolBox::ImplHasExternalMenubutton() { // check if the borderwindow (i.e. the decoration) provides the menu button diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index ba20a05fb54f..943411ccb151 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1336,11 +1336,6 @@ const rtl::OString& Window::GetUniqueId() const return mpWindowImpl->maUniqId; } -const rtl::OString& Window::GetUniqueOrHelpId() const -{ - return mpWindowImpl->maUniqId.getLength() ? mpWindowImpl->maUniqId : mpWindowImpl->maHelpId; -} - // --------- old inline methods --------------- Window* Window::ImplGetWindow() |