diff options
23 files changed, 11 insertions, 603 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index b54d2f4c0d4d..9a0b4f96e62f 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -137,7 +137,6 @@ friend class SfxHelp; sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); sal_Bool _FillState( const SfxSlotServer &rServer, SfxItemSet &rState, const SfxSlot *pRealSlot ); - const SfxPoolItem* _Execute( const SfxSlotServer &rServer ); void _Execute( SfxShell &rShell, const SfxSlot &rSlot, SfxRequest &rReq, SfxCallMode eCall = SFX_CALLMODE_STANDARD); @@ -156,7 +155,6 @@ public: virtual ~SfxDispatcher(); - const SfxPoolItem* Execute( const SfxExecuteItem& rItem ); virtual sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs=0, sal_uInt16 nMode=0 ); sal_uInt16 ExecuteFunction( sal_uInt16 nSID, const SfxItemSet& rArgs , sal_uInt16 nMode=0 ); @@ -187,7 +185,6 @@ public: sal_uInt16 nModi, const SfxItemSet &rArgs ); - sal_uInt16 GetSlotId( const String& rCommand ); const SfxSlot* GetSlot( const String& rCommand ); sal_Bool IsActive( const SfxShell& rShell ); @@ -208,9 +205,6 @@ public: Window *pWin = 0, const Point *pPosPixel = 0 ); static void ExecutePopup( sal_uInt16 nConfigId = 0, Window *pWin = 0, const Point *pPosPixel = 0 ); - static void ExecutePopup( sal_uInt16 nConfigId, - Window *pWin, const Point *pPosPixel, - const SfxPoolItem *pArg1, ... ); sal_Bool IsAppDispatcher() const; sal_Bool IsFlushed() const; @@ -232,11 +226,9 @@ public: void SetDisableFlags( sal_uInt32 nFlags ); sal_uInt32 GetDisableFlags() const; - SAL_DLLPRIVATE sal_Bool HasSlot_Impl( sal_uInt16 ); SAL_DLLPRIVATE void SetMenu_Impl(); SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc. SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const; - SAL_DLLPRIVATE void DebugOutput_Impl() const; SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True ); SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True ); @@ -244,7 +236,6 @@ public: SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const; SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const; SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn ); - SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn ); SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const; SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell ); SAL_DLLPRIVATE void DoParentActivate_Impl(); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 1bd4c1373ec1..ef669db60e60 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1121,14 +1121,6 @@ sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, const SfxItemSet& r return nRet; } -sal_uInt16 SfxDispatcher::GetSlotId( const String& rCommand ) -{ - const SfxSlot *pSlot = GetSlot( rCommand ); - if ( pSlot ) - return pSlot->GetSlotId(); - return 0; -} - const SfxSlot* SfxDispatcher::GetSlot( const String& rCommand ) { // Count the number of Shells on the linked Dispatcher @@ -1210,21 +1202,6 @@ SfxExecuteItem::SfxExecuteItem( } //-------------------------------------------------------------------- -const SfxPoolItem* SfxDispatcher::Execute( const SfxExecuteItem& rItem ) -{ - const SfxPoolItem** pPtr = new const SfxPoolItem*[ rItem.Count() + 1 ]; - for( sal_uInt16 nPos = rItem.Count(); nPos--; ) - pPtr[ nPos ] = rItem.GetObject( nPos ); - pPtr[ rItem.Count() ] = 0; - const SfxPoolItem* pRet = Execute( - rItem.GetSlot(), rItem.GetCallMode(), pPtr, rItem.GetModifier() ); - - delete [] (SfxPoolItem**)pPtr; - - return pRet; -} - -//-------------------------------------------------------------------- const SfxPoolItem* SfxDispatcher::Execute( sal_uInt16 nSlot, SfxCallMode nCall, @@ -2287,94 +2264,6 @@ sal_Bool SfxDispatcher::_FindServer return sal_False; } -sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot ) -{ - Flush(); - sal_uInt16 nTotCount = pImp->aStack.Count(); - - if ( pImp->pParent && !pImp->pParent->pImp->pFrame ) - { - // the last frame also uses the AppDispatcher - nTotCount = nTotCount + pImp->aStack.Count(); - } - - if (nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) - { - // Verb-Slot? - for ( sal_uInt16 nShell = 0;; ++nShell ) - { - SfxShell *pSh = GetShell(nShell); - if ( pSh == NULL ) - return false; - if ( pSh->ISA(SfxViewShell) ) - return true; - } - } - - // SID check against set filter - sal_uInt16 nSlotEnableMode=0; - if ( pImp->pFrame ) - { - nSlotEnableMode = IsSlotEnabledByFilter_Impl( nSlot ); - if ( 0 == nSlotEnableMode ) - return sal_False; - } - - // In Quiet-Mode only Parent-Dispatcher - if ( pImp->bQuiet ) - return sal_False; - - sal_Bool bReadOnly = ( 2 != nSlotEnableMode && pImp->bReadOnly ); - - for ( sal_uInt16 i=0 ; i < nTotCount; ++i ) - { - SfxShell *pObjShell = GetShell(i); - SfxInterface *pIFace = pObjShell->GetInterface(); - const SfxSlot *pSlot = pIFace->GetSlot(nSlot); - if ( pSlot && pSlot->nDisableFlags && ( pSlot->nDisableFlags & pObjShell->GetDisableFlags() ) != 0 ) - return sal_False; - - if ( pSlot && !( pSlot->nFlags & SFX_SLOT_READONLYDOC ) && bReadOnly ) - return sal_False; - - if ( pSlot ) - { - // Slot belongs to Container? - bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER); - bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive(); - - // Shell belongs to Server? - // AppDispatcher or IPFrame-Dispatcher - bool bIsServerShell = !pImp->pFrame || bIsInPlace; - - // Of course ShellServer-Slots are also executable even when it is - // excecuted on a container dispatcher without a IPClient - if ( !bIsServerShell ) - { - SfxViewShell *pViewSh = pImp->pFrame->GetViewShell(); - bIsServerShell = !pViewSh || !pViewSh->GetUIActiveClient(); - } - - // Shell belongs to Container? - // AppDispatcher or no IPFrameDispatcher - bool bIsContainerShell = !pImp->pFrame || !bIsInPlace; - - // Shell and Slot match - if ( !( ( bIsContainerSlot && bIsContainerShell ) || - ( !bIsContainerSlot && bIsServerShell ) ) ) - pSlot = 0; - } - - if ( pSlot && !IsAllowed( nSlot ) ) - pSlot = NULL; - - if ( pSlot ) - return sal_True; - } - - return sal_False; -} - //-------------------------------------------------------------------- sal_Bool SfxDispatcher::_FillState ( @@ -2459,61 +2348,6 @@ sal_Bool SfxDispatcher::_FillState return sal_False; } -//-------------------------------------------------------------------- -const SfxPoolItem* SfxDispatcher::_Execute( const SfxSlotServer &rSvr ) - -/* [Description] - - This method performs a request for a cached <Slot-Server>. -*/ - -{ - const SfxSlot *pSlot = rSvr.GetSlot(); - if ( IsLocked( pSlot->GetSlotId() ) ) - return 0; - - if ( pSlot ) - { - Flush(); - - if ( pSlot->IsMode(SFX_SLOT_ASYNCHRON) ) - //! ignore rSvr - { - SfxShell *pShell = GetShell( rSvr.GetShellLevel() ); - SfxDispatcher *pDispat = this; - while ( pDispat ) - { - sal_uInt16 nShellCount = pDispat->pImp->aStack.Count(); - for ( sal_uInt16 n=0; n<nShellCount; n++ ) - if ( pShell == pDispat->pImp->aStack.Top(n) ) - { - pDispat->pImp->xPoster->Post( - new SfxRequest( pSlot->GetSlotId(), - SFX_CALLMODE_RECORD, pShell->GetPool() ) ); - return 0; - } - } - } - else - { - // Determine the object and call the Message of this object - SfxShell *pSh = GetShell(rSvr.GetShellLevel()); - SfxRequest aReq( pSlot->GetSlotId(), SFX_CALLMODE_RECORD, pSh->GetPool() ); - if ( Call_Impl( *pSh, *pSlot, aReq, sal_True ) ) // Bindings always recording - return aReq.GetReturnValue(); - } - } - return 0; -} - -//---------------------------------------------------------------------- -void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, - Window *pWin, const Point *pPos, - const SfxPoolItem *, ... ) -{ - ExecutePopup( nConfigId, pWin, pPos ); -} - SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SFX_APP()->GetDispatcher_Impl(); @@ -2608,31 +2442,6 @@ sal_uInt32 SfxDispatcher::GetObjectBarId( sal_uInt16 nPos ) const return pImp->aObjBars[nPos].nResId; } -//-------------------------------------------------------------------- -void SfxDispatcher::DebugOutput_Impl() const -{ -#ifdef DBG_UTIL - - sal_uInt16 nOld = (sal_uInt16) DbgGetData()->nTraceOut; - DbgGetData()->nTraceOut = DBG_OUT_FILE; - - if (bFlushed) - OSL_TRACE("Flushed"); - if (pImp->bUpdated) - OSL_TRACE("updated"); - - for ( sal_uInt16 nShell = pImp->aStack.Count(); nShell > 0; --nShell ) - { - SfxShell *pShell = GetShell(nShell-1); - const SfxInterface *pIFace = pShell->GetInterface(); - OSL_TRACE("%s", pIFace->GetClassName()); - } - - DbgGetData()->nTraceOut = nOld; - -#endif -} - void SfxDispatcher::LockUI_Impl( sal_Bool bLock ) { sal_Bool bWasLocked = pImp->bUILocked; @@ -2697,21 +2506,6 @@ void SfxDispatcher::SetQuietMode_Impl( sal_Bool bOn ) pBindings->InvalidateAll(sal_True); } -//------------------------------------------------------------------------- -void SfxDispatcher::SetModalMode_Impl( sal_Bool bOn ) - -/* [Description] - - With 'Bon' only slots of the parent dispatcher are found. -*/ - -{ - pImp->bModal = bOn; - SfxBindings* pBindings = GetBindings(); - if ( pBindings ) - pBindings->InvalidateAll(sal_True); -} - void SfxDispatcher::SetExecuteMode( sal_uInt16 nMode ) { pImp->nStandardMode = nMode; diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index 7621ff051f0b..cc03777c248a 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -158,7 +158,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -177,7 +177,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -212,7 +212,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ - -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ + -MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index d8f17db1d9cc..8351d166c49d 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -214,7 +214,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -232,7 +232,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -249,7 +249,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ - -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ + -MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index d82c12112689..d7b750ae16ed 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -210,7 +210,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -229,7 +229,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -251,7 +251,7 @@ $(call gb_Helper_abbreviate_dirs,\ # -c $(3) \ # -o $(1) \ # -MMD -MT $(1) \ - # -MF $(4) \ + # -MP -MF $(4) \ # -I$(dir $(3)) \ # $(INCLUDE)) endef diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index edb98f3db0d5..787811219ee8 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -48,7 +48,6 @@ public: SfxAllEnumItem(); SfxAllEnumItem( sal_uInt16 nWhich); SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal ); - SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal, const XubString &rText ); SfxAllEnumItem( sal_uInt16 nWhich, SvStream &rStream ); SfxAllEnumItem( const SfxAllEnumItem & ); ~SfxAllEnumItem(); @@ -56,7 +55,6 @@ public: void InsertValue( sal_uInt16 nValue ); void InsertValue( sal_uInt16 nValue, const XubString &rText ); void RemoveValue( sal_uInt16 nValue ); - void RemoveAllValues(); sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const; diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index e81c67d2d041..4b10e716e569 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -60,15 +60,6 @@ SfxAllEnumItem::SfxAllEnumItem() : { } -SfxAllEnumItem::SfxAllEnumItem( sal_uInt16 which, sal_uInt16 nVal, const XubString &rText ): - SfxEnumItem(which, nVal), - pValues( 0 ), - pDisabledValues( 0 ) -{ - DBG_CTOR(SfxAllEnumItem, 0); - InsertValue( nVal, rText ); -} - // ----------------------------------------------------------------------- SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal): @@ -292,16 +283,4 @@ void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue ) pValues->Remove( nPos ); } -// ----------------------------------------------------------------------- - - -void SfxAllEnumItem::RemoveAllValues() -{ - DBG_CHKTHIS(SfxAllEnumItem, 0); - if ( pValues ) - pValues->DeleteAndDestroy( 0, pValues->Count() ); -} - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 3d19efe97de7..eeb42903a649 100644 --- a/svx/inc/svx/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx @@ -41,7 +41,6 @@ namespace svx { class SVX_DLLPUBLIC WrapField : public NumericField { public: - explicit WrapField( Window* pParent, WinBits nWinStyle ); explicit WrapField( Window* pParent, const ResId& rResId ); protected: diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 1ba6f31b2b1c..904761ca6692 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -32,13 +32,6 @@ namespace svx { -// ============================================================================ - -WrapField::WrapField( Window* pParent, WinBits nWinStyle ) : - NumericField( pParent, nWinStyle ) -{ -} - WrapField::WrapField( Window* pParent, const ResId& rResId ) : NumericField( pParent, rResId ) { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 63fa854d291f..96af909eb63b 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -124,53 +124,6 @@ namespace svxform } } - //------------------------------------------------------------------------ - sal_Bool isModelShapeMarked( FmEntryData* _pEntry, const MapModelToShape& _rModelMap, SdrMarkView* _pView ) - { - DBG_ASSERT( _pEntry && _pView, "isModelShapeMarked: invalid arguments!" ); - if ( !_pEntry || !_pView ) - return sal_False; - - DBG_ASSERT( _pEntry->GetElement().get() == Reference< XInterface >( _pEntry->GetElement(), UNO_QUERY ).get(), - "isModelShapeMarked: element of the FmEntryData is not normalized!" ); - // normalization of the XInterface is a prerequisite for properly finding it in the map - - sal_Bool bIsMarked = sal_False; - - MapModelToShape::const_iterator aPos = _rModelMap.find( _pEntry->GetElement() ); - if ( _rModelMap.end() != aPos ) - { // there is a shape for this model .... - bIsMarked = _pView->IsObjMarked( aPos->second ); - if ( !bIsMarked ) - { - // IsObjMarked does not step down grouped objects, so the sal_False we - // have is not really reliable (while a sal_True would have been) - // Okay, travel the mark list, and see if there is a group marked, and our shape - // is a part of this group - sal_uInt32 nMarked = _pView->GetMarkedObjectList().GetMarkCount(); - for ( sal_uInt32 i = 0; (i<nMarked ) && !bIsMarked; ++i ) - { - SdrMark* pMark = _pView->GetMarkedObjectList().GetMark( i ); - SdrObject* pObj = pMark ? pMark->GetMarkedSdrObj() : NULL; - if ( pObj && pObj->IsGroupObject() ) - { // the i-th marked shape is a group shape - SdrObjListIter aIter( *pObj ); - while ( aIter.IsMore() ) - { - if ( aIter.Next() == aPos->second ) - { - bIsMarked = sal_True; - break; - } - } - } - } - } - } - - return bIsMarked; - } - //======================================================================== // class NavigatorTree //======================================================================== diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 5332f2353366..de6b1ff245e1 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -426,34 +426,6 @@ void ContentProperties::addProperties( } //========================================================================= -void ContentProperties::addProperties( const ContentProperties & rProps ) -{ - PropertyValueMap::const_iterator it = rProps.m_xProps->begin(); - const PropertyValueMap::const_iterator end = rProps.m_xProps->end(); - - while ( it != end ) - { - addProperty( - (*it).first, (*it).second.value(), (*it).second.isCaseSensitive() ); - ++it; - } -} - -//========================================================================= -void ContentProperties::addProperties( - const std::vector< DAVPropertyValue > & rProps ) -{ - std::vector< DAVPropertyValue >::const_iterator it = rProps.begin(); - const std::vector< DAVPropertyValue >::const_iterator end = rProps.end(); - - while ( it != end ) - { - addProperty( (*it) ); - ++it; - } -} - -//========================================================================= void ContentProperties::addProperty( const DAVPropertyValue & rProp ) { addProperty( rProp.Name, rProp.Value, rProp.IsCaseSensitive ); diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index bf9af15f6b8f..4f64c016823a 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -160,12 +160,6 @@ public: void addProperties( const std::vector< rtl::OUString > & rProps, const ContentProperties & rContentProps ); - // overwrites probably existing entries. - void addProperties( const ContentProperties & rProps ); - - // overwrites probably existing entries. - void addProperties( const std::vector< DAVPropertyValue > & rProps ); - // overwrites probably existing entry. void addProperty( const rtl::OUString & rName, const com::sun::star::uno::Any & rValue, diff --git a/unotools/inc/unotools/datetime.hxx b/unotools/inc/unotools/datetime.hxx index 282d6df3a63f..40f2a977589f 100644 --- a/unotools/inc/unotools/datetime.hxx +++ b/unotools/inc/unotools/datetime.hxx @@ -47,9 +47,6 @@ namespace utl namespace starutil = ::com::sun::star::util; - UNOTOOLS_DLLPUBLIC void typeConvert(const Time& _rTime, starutil::Time& _rOut); - UNOTOOLS_DLLPUBLIC void typeConvert(const starutil::Time& _rTime, Time& _rOut); - UNOTOOLS_DLLPUBLIC void typeConvert(const Date& _rDate, starutil::Date& _rOut); UNOTOOLS_DLLPUBLIC void typeConvert(const starutil::Date& _rDate, Date& _rOut); diff --git a/unotools/inc/unotools/regoptions.hxx b/unotools/inc/unotools/regoptions.hxx index 0303ca300e91..639e08ad836c 100644 --- a/unotools/inc/unotools/regoptions.hxx +++ b/unotools/inc/unotools/regoptions.hxx @@ -58,9 +58,6 @@ namespace utl // retrieves the URL which should be used for online registration String getRegistrationURL( ) const; - // checks if the menu item which can be used to trigger the online registration should be available - sal_Bool allowMenu( ) const; - enum DialogPermission { // the registration dialog shall be executed .... dpDisabled, // ... never - it has been disabled @@ -105,12 +102,6 @@ namespace utl done implicitly when you call <method>activateReminder</method>.</p> */ void activateReminder( sal_Int32 _nDaysFromNow ); - - /** removes the reminder - - <p>If this method is called, the reminder for the dialog will be removed. - */ - void removeReminder(); }; //........................................................................ diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index 44af28b17ecc..be94ea41bf4d 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.hxx @@ -61,24 +61,17 @@ namespace utl static ::com::sun::star::uno::Sequence< ::rtl::OUString > GetFolderContents( const String& rFolder, sal_Bool bFolder, sal_Bool bSorted = sal_False ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > GetResultSet( const String& rURL ); - static sal_Bool CopyTo( const String& rSource, const String& rDest ); - static sal_Bool MoveTo( const String& rSource, const String& rDest, sal_Int32 nNameClash = com::sun::star::ucb::NameClash::ERROR ); - - static sal_Bool CanMakeFolder( const String& rFolder ); static sal_Bool MakeFolder( const String& rFolder, sal_Bool bNewOnly = sal_False ); static sal_Bool MakeFolder( ::ucbhelper::Content& rParent, const String& rTitle, ::ucbhelper::Content& rNewFolder, sal_Bool bNewOnly = sal_False ); - static sal_Bool HasParentFolder( const String& rFolder ); static sal_uLong GetSize( const String& rContent ); static sal_Bool IsYounger( const String& rIsYoung, const String& rIsOlder ); static sal_Bool Exists( const String& rContent ); - static sal_Bool FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim = ';', sal_Bool bAllowWildCards = sal_True ); static sal_Bool Find( const String& rFolder, const String& rName, String& rFile, sal_Bool bAllowWildCards = sal_False ); static sal_Bool IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() ); static sal_Bool EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL ); diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index d3c53e882fec..141296d8e1e9 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.hxx @@ -174,7 +174,6 @@ public: // calling this method delegates the responsibility to call closeinput to the caller! NS_UNO::Reference < NS_IO::XInputStream > getInputStream(); - NS_UNO::Reference < NS_IO::XStream > getStream(); #if _SOLAR__PRIVATE sal_Bool setInputStream_Impl( const NS_UNO::Reference < NS_IO::XInputStream > &rxInputStream, diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx index 6207c5544429..cb6134a3d097 100644 --- a/unotools/source/config/regoptions.cxx +++ b/unotools/source/config/regoptions.cxx @@ -182,7 +182,6 @@ namespace utl static void revokeClient( ); inline sal_Bool hasURL( ) const { return ( 0 != m_sRegistrationURL.Len() ); } - inline sal_Bool allowMenu( ) const { return hasURL() && m_bShowMenuItem; } inline String getRegistrationURL( ) const { return m_sRegistrationURL; } RegOptions::DialogPermission getDialogPermission( ) const; @@ -467,29 +466,6 @@ namespace utl const_cast< RegOptions* >( this )->ensureImpl( ); m_pImpl->activateReminder( _nDaysFromNow ); } - - //-------------------------------------------------------------------- - sal_Bool RegOptions::allowMenu( ) const - { - /// we cache this setting, 'cause it is needed very often - static sal_Bool bKnowMenuPermission = sal_False; - static sal_Bool bAllowMenu = sal_False; - - if ( !bKnowMenuPermission ) - { - const_cast< RegOptions* >( this )->ensureImpl( ); - bAllowMenu = m_pImpl->allowMenu(); - bKnowMenuPermission = sal_True; - } - return bAllowMenu; - } - - //-------------------------------------------------------------------- - void RegOptions::removeReminder() - { - const_cast< RegOptions* >( this )->ensureImpl( ); - m_pImpl->removeReminder(); - } //........................................................................ } // namespace utl //........................................................................ diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 428cc05f3cb3..98cfcffa31d5 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -36,23 +36,6 @@ //......................................................................... namespace utl { -//......................................................................... - -//------------------------------------------------------------------ -void typeConvert(const Time& _rTime, starutil::Time& _rOut) -{ - _rOut.Hours = _rTime.GetHour(); - _rOut.Minutes = _rTime.GetMin(); - _rOut.Seconds = _rTime.GetSec(); - _rOut.HundredthSeconds = _rTime.Get100Sec(); -} - -//------------------------------------------------------------------ -void typeConvert(const starutil::Time& _rTime, Time& _rOut) -{ - _rOut = Time(_rTime.Hours, _rTime.Minutes, _rTime.Seconds, _rTime.HundredthSeconds); -} - //------------------------------------------------------------------ void typeConvert(const Date& _rDate, starutil::Date& _rOut) { diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 513a8e0672ce..5636886558cd 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -387,128 +387,6 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder // ----------------------------------------------------------------------- -Sequence < OUString > UCBContentHelper::GetResultSet( const String& rURL ) -{ - StringList_Impl* pList = NULL; - try - { - Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - uno::Reference< XResultSet > xResultSet; - uno::Reference< com::sun::star::ucb::XDynamicResultSet > xDynResultSet; - Sequence< OUString > aProps(3); - OUString* pProps = aProps.getArray(); - pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); - pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")); - // TODO: can be optimized, property never used: - pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); - - try - { - xDynResultSet = aCnt.createDynamicCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ); - if ( xDynResultSet.is() ) - xResultSet = xDynResultSet->getStaticResultSet(); - } - catch( ::com::sun::star::ucb::CommandAbortedException& ) - { - } - catch( ::com::sun::star::uno::Exception& ) - { - } - - if ( xResultSet.is() ) - { - pList = new StringList_Impl; - uno::Reference< com::sun::star::sdbc::XRow > xRow( xResultSet, UNO_QUERY ); - uno::Reference< com::sun::star::ucb::XContentAccess > xContentAccess( xResultSet, UNO_QUERY ); - - try - { - while ( xResultSet->next() ) - { - String aTitle( xRow->getString(1) ); - String aType( xRow->getString(2) ); - String aRow = aTitle; - aRow += '\t'; - aRow += aType; - aRow += '\t'; - aRow += String( xContentAccess->queryContentIdentifierString() ); - OUString* pRow = new OUString( aRow ); - pList->push_back( pRow ); - } - } - catch( ::com::sun::star::ucb::CommandAbortedException& ) - { - } - catch( ::com::sun::star::uno::Exception& ) - { - } - } - } - catch( ::com::sun::star::uno::Exception& ) - { - } - - if ( pList ) - { - size_t nCount = pList->size(); - Sequence < OUString > aRet( nCount ); - OUString* pRet = aRet.getArray(); - for ( size_t i = 0; i < nCount; ++i ) - { - OUString* pEntry = (*pList)[ i ]; - pRet[i] = *( pEntry ); - delete pEntry; - } - delete pList; - return aRet; - } - else - return Sequence < OUString > (); -} - -// ----------------------------------------------------------------------- - -sal_Bool UCBContentHelper::CopyTo( const String& rSource, const String& rDest ) -{ - return Transfer_Impl( rSource, rDest, sal_False, NameClash::ERROR ); -} - -// ----------------------------------------------------------------------- - -sal_Bool UCBContentHelper::MoveTo( const String& rSource, const String& rDest, sal_Int32 nNameClash ) -{ - return Transfer_Impl( rSource, rDest, sal_True, nNameClash ); -} - -// ----------------------------------------------------------------------- - -sal_Bool UCBContentHelper::CanMakeFolder( const String& rFolder ) -{ - try - { - Content aCnt( rFolder, uno::Reference< XCommandEnvironment > () ); - Sequence< ContentInfo > aInfo = aCnt.queryCreatableContentsInfo(); - sal_Int32 nCount = aInfo.getLength(); - if ( nCount == 0 ) - return sal_False; - - for ( sal_Int32 i = 0; i < nCount; ++i ) - { - // Simply look for the first KIND_FOLDER... - const ContentInfo & rCurr = aInfo[i]; - if ( rCurr.Attributes & ContentInfoAttribute::KIND_FOLDER ) - return sal_True; - } - } - catch( ::com::sun::star::ucb::CommandAbortedException& ) {} - catch( RuntimeException& ) {} - catch( Exception& ) {} - - return sal_False; -} - -// ----------------------------------------------------------------------- - sal_Bool UCBContentHelper::MakeFolder( const String& rFolder, sal_Bool bNewOnly ) { INetURLObject aURL( rFolder ); @@ -600,35 +478,6 @@ sal_Bool UCBContentHelper::MakeFolder( Content& aCnt, const String& aTitle, Cont // ----------------------------------------------------------------------- -sal_Bool UCBContentHelper::HasParentFolder( const String& rFolder ) -{ - sal_Bool bRet = sal_False; - try - { - Content aCnt( rFolder, uno::Reference< XCommandEnvironment > () ); - uno::Reference< XChild > xChild( aCnt.get(), UNO_QUERY ); - if ( xChild.is() ) - { - uno::Reference< XContent > xParent( xChild->getParent(), UNO_QUERY ); - if ( xParent.is() ) - { - String aParentURL = String( xParent->getIdentifier()->getContentIdentifier() ); - bRet = ( aParentURL.Len() > 0 && aParentURL != rFolder ); - } - } - } - catch( ::com::sun::star::ucb::CommandAbortedException& ) - { - } - catch( ::com::sun::star::uno::Exception& ) - { - } - - return bRet; -} - -// ----------------------------------------------------------------------- - sal_uLong UCBContentHelper::GetSize( const String& rContent ) { sal_uLong nSize = 0; @@ -762,21 +611,6 @@ sal_Bool UCBContentHelper::Exists( const String& rURL ) } // ----------------------------------------------------------------------- -sal_Bool UCBContentHelper::FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim, sal_Bool bAllowWildCards ) -{ - // extract the single folder names from the path variable and try to find the file in one of these folders - sal_uInt16 nTokenCount = rPath.GetTokenCount( cDelim ); - for ( sal_uInt16 nToken = 0; nToken < nTokenCount; ++nToken ) - { - String aPath = rPath.GetToken( nToken, cDelim ); - if ( Find( aPath, rName, rFile, bAllowWildCards ) ) - return sal_True; - } - - return sal_False; -} - -// ----------------------------------------------------------------------- sal_Bool UCBContentHelper::IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rSubfolderCandidate, const uno::Reference< ::com::sun::star::ucb::XContentProvider >& xProv ) { sal_Bool bResult = sal_False; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 5393cb972813..b9b75ce3049a 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1296,15 +1296,6 @@ Reference < XInputStream > UcbLockBytes::getInputStream() return m_xInputStream; } -Reference < XStream > UcbLockBytes::getStream() -{ - osl::MutexGuard aGuard( m_aMutex ); - Reference < XStream > xStream( m_xSeekable, UNO_QUERY ); - if ( xStream.is() ) - m_bDontClose = sal_True; - return xStream; -} - //---------------------------------------------------------------------------- sal_Bool UcbLockBytes::setStream_Impl( const Reference<XStream>& aStream ) diff --git a/unusedcode.easy b/unusedcode.easy index 9677554dfcfb..51b9ff7e25a5 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -874,8 +874,6 @@ SetOfByte::GetClearBit(unsigned short) const SetOfByte::GetClearCount() const SetOfByte::GetSetBit(unsigned short) const SetOfByte::IsFull() const -SfxAllEnumItem::RemoveAllValues() -SfxAllEnumItem::SfxAllEnumItem(unsigned short, unsigned short, String const&) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxApplication::DdeGetData(String const&, String const&, com::sun::star::uno::Any&) SfxApplication::DdeSetData(String const&, String const&, com::sun::star::uno::Any const&) @@ -892,13 +890,6 @@ SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short) SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short, DateTime const&) SfxControllerItem::GetCoreMetric() const SfxControllerItem::UpdateSlot() -SfxDispatcher::DebugOutput_Impl() const -SfxDispatcher::Execute(SfxExecuteItem const&) -SfxDispatcher::ExecutePopup(unsigned short, Window*, Point const*, SfxPoolItem const*, ...) -SfxDispatcher::GetSlotId(String const&) -SfxDispatcher::HasSlot_Impl(unsigned short) -SfxDispatcher::SetModalMode_Impl(unsigned char) -SfxDispatcher::_Execute(SfxSlotServer const&) SfxDockingWrapper::GetChildWindowId() SfxEnumMenu::SfxEnumMenu(unsigned short, SfxBindings*, SfxEnumItem const&) SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short) @@ -3514,7 +3505,6 @@ svx::OrientationHelper::OrientationHelper(svx::DialControl&, CheckBox&) svx::SearchToolbarControllersManager::~SearchToolbarControllersManager() svx::SvxShowCharSetItem::~SvxShowCharSetItem() svx::ToolboxButtonColorUpdater::DrawChar(VirtualDevice&, Color const&) -svx::WrapField::WrapField(Window*, long) svx::frame::Cell::MirrorSelfY(bool, bool) svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*) svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, Color const*) @@ -3537,7 +3527,6 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const&, unsigned short&) svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short) svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray const*, unsigned short, unsigned short) svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const&, unsigned short) -svxform::isModelShapeMarked(FmEntryData*, std::map<com::sun::star::uno::Reference<com::sun::star::uno::XInterface>, SdrObject*, comphelper::OInterfaceCompare<com::sun::star::uno::XInterface>, std::allocator<std::pair<com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const, SdrObject*> > > const&, SdrMarkView*) sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const&, unsigned short&) sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const*, unsigned short) sw::util::AuthorInfos::Insert(sw::util::AuthorInfos const*, unsigned short, unsigned short) @@ -3614,18 +3603,7 @@ utl::PropertySetHelper::PropertySetHelper(utl::PropertySetInfo*) utl::PropertySetInfo::PropertySetInfo() utl::PropertySetInfo::add(utl::PropertyMapEntry*) utl::PropertySetInfo::remove(rtl::OUString const&) -utl::RegOptions::allowMenu() const -utl::RegOptions::removeReminder() utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const -utl::UCBContentHelper::CanMakeFolder(String const&) -utl::UCBContentHelper::CopyTo(String const&, String const&) -utl::UCBContentHelper::FindInPath(String const&, String const&, String&, char, unsigned char) -utl::UCBContentHelper::GetResultSet(String const&) -utl::UCBContentHelper::HasParentFolder(String const&) -utl::UCBContentHelper::MoveTo(String const&, String const&, int) -utl::UcbLockBytes::getStream() -utl::typeConvert(Time const&, com::sun::star::util::Time&) -utl::typeConvert(com::sun::star::util::Time const&, Time&) vbahelper::CollectionBase::CollectionBase(com::sun::star::uno::Type const&) vbahelper::CollectionBase::getAnyItemOrThis(com::sun::star::uno::Any const&) vbahelper::CollectionBase::initElements(std::vector<com::sun::star::beans::NamedValue, std::allocator<com::sun::star::beans::NamedValue> > const&, vbahelper::CollectionBase::ContainerType) @@ -3679,9 +3657,6 @@ vcl::PrinterOptionsHelper::setValue(rtl::OUString const&, com::sun::star::uno::A vcl::RenderGraphic::RenderGraphic(boost::shared_array<unsigned char> const&, unsigned int, rtl::OUString const&) vcl::RowOrColumn::remove(Window*) vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&) -vcl::WindowPropertySet::WindowPropertySet(Window*, bool) -vcl::WindowPropertySet::getPropertySet() const -vcl::WindowPropertySet::~WindowPropertySet() vcl::unotools::b2IPointFromPoint(Point const&) vcl::unotools::b2IRectangleFromRectangle(Rectangle const&) vcl::unotools::b2ISizeFromSize(Size const&) @@ -3696,8 +3671,6 @@ vcl::unotools::rectangle2DFromRectangle(Rectangle const&) vcl::unotools::rectangleFromRealRectangle2D(com::sun::star::geometry::RealRectangle2D const&) vcl::unotools::sizeFromB2ISize(basegfx::B2IVector const&) void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&) -webdav_ucp::ContentProperties::addProperties(std::vector<webdav_ucp::DAVPropertyValue, std::allocator<webdav_ucp::DAVPropertyValue> > const&) -webdav_ucp::ContentProperties::addProperties(webdav_ucp::ContentProperties const&) writerfilter::LoggedResourcesHelper::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) writerfilter::LoggedResourcesHelper::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int) writerfilter::LoggedResourcesHelper::chars(rtl::OUString const&) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index c69e14323183..52f7b461b12f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -263,7 +263,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/window/window4 \ vcl/source/window/window \ vcl/source/window/winproc \ - vcl/source/window/wpropset \ vcl/source/window/wrkwin \ )) diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk index a973a0353ec9..977d1ba45db8 100644 --- a/vcl/Package_inc.mk +++ b/vcl/Package_inc.mk @@ -163,7 +163,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/virdev.hxx,vcl/virdev.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/waitobj.hxx,vcl/waitobj.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wall.hxx,vcl/wall.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx)) -$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wpropset.hxx,vcl/wpropset.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx)) # vim: set noet sw=4 ts=4: |