diff options
Diffstat (limited to 'svx')
37 files changed, 8 insertions, 497 deletions
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 2d023b551eae..f3c9c3b13314 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -64,7 +64,6 @@ namespace drawinglayer const ::basegfx::B2DPolygon& getTail() const { return maTail; } double getCornerRadiusX() const { return mfCornerRadiusX; } double getCornerRadiusY() const { return mfCornerRadiusY; } - bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); } // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index ce160a28abdb..be6140d2c0cf 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -90,12 +90,6 @@ namespace drawinglayer bool bCloseSegment, bool bCloseUsingCenter); - // data access - double getStartAngle() const { return mfStartAngle; } - double getEndAngle() const { return mfEndAngle; } - bool getCloseSegment() const { return mbCloseSegment; } - bool getCloseUsingCenter() const { return mbCloseUsingCenter; } - // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 5c57140897bd..729b680c160f 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -62,7 +62,6 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } double getCornerRadiusX() const { return mfCornerRadiusX; } double getCornerRadiusY() const { return mfCornerRadiusY; } - bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); } bool getForceFillForHitTest() const { return mbForceFillForHitTest; } // compare operator diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 0a436533b97e..9c51bb421cbc 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -91,9 +91,7 @@ public: const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } OUString GetNewEntryValue() const { return pEditControl->GetText(); } void SetEntryChangedHdl(const Link<>& rLink) { aEntryChangedHdl=rLink; } - const Link<>& GetEntryChangedHdl() const { return aEntryChangedHdl; } void SetSetDirtyHdl(const Link<>& rLink) { aSetDirtyHdl=rLink; } - const Link<>& GetSetDirtyHdl() const { return aSetDirtyHdl; } }; #define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE) @@ -107,7 +105,6 @@ public: virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; - void Clear() { aBrowse->Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse->SetAttributes(pAttr,p2ndSet); } _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); } }; @@ -126,10 +123,8 @@ private: public: SdrItemBrowser(SdrView& rView); void ForceParent(); - void SetView(SdrView& rView) { pView=&rView; ForceParent(); SetDirty(); } void SetDirty(); void Undirty(); - void ForceUndirty() { if (bDirty) Undirty(); } }; #endif // INCLUDED_SVX_INC_SVDIBROW_HXX diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index a833682f5442..21193684901e 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -816,13 +816,6 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } // IAccessibleViewforwarder -bool SvxGraphCtrlAccessibleContext::IsValid() const -{ - return true; -} - - - Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const { Rectangle aVisArea; @@ -863,22 +856,4 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const -Point SvxGraphCtrlAccessibleContext::PixelToLogic (const Point& rPoint) const -{ - if( mpControl ) - return mpControl->PixelToLogic (rPoint); - else - return rPoint; -} - - - -Size SvxGraphCtrlAccessibleContext::PixelToLogic (const Size& rSize) const -{ - if( mpControl ) - return mpControl->PixelToLogic (rSize); - else - return rSize; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index b63b3b4c189a..d06e136e8ea1 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -104,12 +104,11 @@ public: void SetExecState( bool bEnable ); void SetGraphic( const Graphic& rGraphic ); - void SetGraphicLinked( bool bLinked ) { bGraphicLinked = bLinked; } const Graphic& GetGraphic() const { return aGraphic; } bool IsGraphicChanged() const { return nGrfChanged > 0UL; } void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ); - tools::PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true ); + tools::PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true ); void SetEditingObject( void* pObj ) { pCheckObj = pObj; } const void* GetEditingObject() const { return pCheckObj; } diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 675ffd371939..664fc86698d8 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -45,8 +45,6 @@ protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void CreatePolyPolygon(); - public: ContourWindow(vcl::Window* pParent, WinBits nBits); @@ -55,14 +53,12 @@ public: const tools::PolyPolygon& GetPolyPolygon(); void SetPipetteMode( const bool bPipette ) { bPipetteMode = bPipette; } - bool IsPipetteMode() const { return bPipetteMode; } const Color& GetPipetteColor() const { return aPipetteColor; } bool IsClickValid() const { return bClickValid; } bool IsContourChanged() const; void SetWorkplaceMode( const bool bWorkplace ) { bWorkplaceMode = bWorkplace; } - bool IsWorkplaceMode() const { return bWorkplaceMode; } const Rectangle& GetWorkRect() const { return aWorkRect; } void SetPipetteHdl( const Link<>& rLink ) { aPipetteLink = rLink; } diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index fa53b9579b6f..e772f875228f 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -84,7 +84,6 @@ public: virtual SdrObjUserData* Clone( SdrObject * ) const SAL_OVERRIDE { return new IMapUserData( *this ); } - void SetObject( const IMapObjectPtr& rIMapObj ) { mpObj = rIMapObj; } const IMapObjectPtr GetObject() const { return mpObj; } void ReplaceObject( const IMapObjectPtr& pNewIMapObject ) { mpObj = pNewIMapObject; } }; @@ -101,7 +100,6 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper mxDocumentFrame; DECL_LINK( MenuSelectHdl, Menu* ); - DECL_LINK( MouseTimerHdl, Timer* ); protected: @@ -119,11 +117,8 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - void CreateImageMap(); void ReplaceImageMap( const ImageMap& rNewImageMap, bool bScaleToGraphic ); - void ClearTargetList(); - SdrObject* CreateObj( const IMapObject* pIMapObj ); static IMapObject* GetIMapObj( const SdrObject* pSdrObj ); SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; @@ -146,10 +141,8 @@ public: void DoPropertyDialog(); void SetInfoLink( const Link<>& rLink ) { aInfoLink = rLink; } - const Link<>& GetInfoLink() const { return aInfoLink; } void SetTargetList( TargetList& rTargetList ); - const TargetList& GetTargetList() const { return aTargetList; } const NotifyInfo& GetInfo() const { return aInfo; } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 18b18aee6a05..39550b7217bf 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1283,23 +1283,6 @@ inline long SvxRuler::GetFrameLeft() const Ruler::GetNullOffset(); } -inline void SvxRuler::SetFrameLeft(long lFrameLeft) -{ - /* Set Left margin in Pixels */ - bool bProtectColumns = - mxRulerImpl->aProtectItem.IsSizeProtected() || - mxRulerImpl->aProtectItem.IsPosProtected(); - if(bAppSetNullOffset) - { - SetMargin1(lFrameLeft - ConvertSizePixel(lLogicNullOffset), - bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE); - } - else - { - Ruler::SetNullOffset(lFrameLeft); - } -} - long SvxRuler::GetFirstLineIndent() const { /* Get First-line indent in pixels */ diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 39868ffb1a55..f700bd1c23ae 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -70,7 +70,6 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage ) :m_rPage( _rPage ) ,m_bFirstActivation( true ) ,m_bAttemptedFormCreation( false ) - ,m_bInFind( false ) { } diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index a98122243570..db8bfcbcce0b 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -49,230 +49,6 @@ namespace svxform } } - // Reference< XPropertySet> - Reference< XPropertySetInfo> DataColumn::getPropertySetInfo() const throw( RuntimeException ) - { - return m_xPropertySet->getPropertySetInfo(); - } - - void DataColumn::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->setPropertyValue(aPropertyName, aValue); - } - - Any DataColumn::getPropertyValue(const OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - return m_xPropertySet->getPropertyValue(PropertyName); - } - - void DataColumn::addPropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener); - } - - void DataColumn::removePropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener); - } - - void DataColumn::addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->addVetoableChangeListener(PropertyName, aListener); - } - - void DataColumn::removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener); - } - - // XColumn - bool DataColumn::wasNull() throw( SQLException, RuntimeException ) - { - return m_xColumn->wasNull(); - } - - OUString DataColumn::getString() throw( SQLException, RuntimeException ) - { - return m_xColumn->getString(); - } - - bool DataColumn::getBoolean() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBoolean(); - } - - sal_Int8 DataColumn::getByte() throw( SQLException, RuntimeException ) - { - return m_xColumn->getByte(); - } - - sal_Int16 DataColumn::getShort() throw( SQLException, RuntimeException ) - { - return m_xColumn->getShort(); - } - - sal_Int32 DataColumn::getInt() throw( SQLException, RuntimeException ) - { - return m_xColumn->getInt(); - } - - sal_Int64 DataColumn::getLong() throw( SQLException, RuntimeException ) - { - return m_xColumn->getLong(); - } - - float DataColumn::getFloat() throw( SQLException, RuntimeException ) - { - return m_xColumn->getFloat(); - } - - double DataColumn::getDouble() throw( SQLException, RuntimeException ) - { - return m_xColumn->getDouble(); - } - - Sequence< sal_Int8 > DataColumn::getBytes() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBytes(); - } - - com::sun::star::util::Date DataColumn::getDate() throw( SQLException, RuntimeException ) - { - return m_xColumn->getDate(); - } - - com::sun::star::util::Time DataColumn::getTime() throw( SQLException, RuntimeException ) - { - return m_xColumn->getTime(); - } - - com::sun::star::util::DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException ) - { - return m_xColumn->getTimestamp(); - } - - Reference< XInputStream> DataColumn::getBinaryStream() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBinaryStream(); - } - - Reference< XInputStream> DataColumn::getCharacterStream() throw( SQLException, RuntimeException ) - { - return m_xColumn->getCharacterStream(); - } - - Any DataColumn::getObject(const Reference< XNameAccess>& typeMap) throw( SQLException, RuntimeException ) - { - return m_xColumn->getObject(typeMap); - } - - Reference< XRef> DataColumn::getRef() throw( SQLException, RuntimeException ) - { - return m_xColumn->getRef(); - } - - Reference< XBlob> DataColumn::getBlob() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBlob(); - } - - Reference< XClob> DataColumn::getClob() throw( SQLException, RuntimeException ) - { - return m_xColumn->getClob(); - } - - Reference< XArray> DataColumn::getArray() throw( SQLException, RuntimeException ) - { - return m_xColumn->getArray(); - } - - // XColumnUpdate - void DataColumn::updateNull() throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateNull(); - } - - void DataColumn::updateBoolean(bool x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateBoolean(x); - } - - void DataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateByte(x); - } - - void DataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateShort(x); - } - - void DataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateInt(x); - } - - void DataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateLong(x); - } - - void DataColumn::updateFloat(float x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateFloat(x); - } - - void DataColumn::updateDouble(double x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateDouble(x); - } - - void DataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateString(x); - } - - void DataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateBytes(x); - } - - void DataColumn::updateDate(const com::sun::star::util::Date& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateDate(x); - } - - void DataColumn::updateTime(const com::sun::star::util::Time& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateTime(x); - } - - void DataColumn::updateTimestamp(const com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateTimestamp(x); - } - - void DataColumn::updateBinaryStream(const Reference< XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateBinaryStream(x, length); - } - - void DataColumn::updateCharacterStream(const Reference< XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateCharacterStream(x, length); - } - - void DataColumn::updateObject(const Any& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateObject(x); - } - - void DataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateNumericObject(x, scale); - } - - } diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index f2aa23c9f2df..60e19a946685 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -155,12 +155,9 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleViewforwarder - virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; - virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; - virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; protected: void checkChildIndexOnSelection( long nIndexOfChild ) throw (::com::sun::star::lang::IndexOutOfBoundsException ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index f41a186c5c4f..b2562e023659 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -303,7 +303,6 @@ namespace svxform bool DoMenuAction( sal_uInt16 _nMenuID ); void EnableMenuItems( Menu* _pMenu ); - inline SvTreeListEntry* GetSelectedItem() const { return m_pItemList->FirstSelected(); } inline const OUString& GetInstanceName() const { return m_sInstanceName; } inline const OUString& GetInstanceURL() const { return m_sInstanceURL; } inline bool GetLinkOnce() const { return m_bLinkOnce; } @@ -644,13 +643,6 @@ namespace svxform virtual ~AddInstanceDialog(); virtual void dispose() SAL_OVERRIDE; - void SetRenameMode() - { - m_pURLFT->Disable(); - m_pURLED->Disable(); - m_pFilePickerBtn->Disable(); - m_pLinkInstanceCB->Disable(); - } OUString GetName() const { return m_pNameED->GetText(); } void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} OUString GetURL() const { return m_pURLED->GetText(); } diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 5633f02ec3b8..16fbcba186dd 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -180,7 +180,6 @@ public: FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} void SetCurrentItems(FmFilterItems* pCurrent); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetControllers() const {return m_xControllers;} const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & GetCurrentController() const {return m_xController;} void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController); @@ -214,7 +213,6 @@ public: FmFormItem* getFormItem() const { return m_pFormItem; } void setFormItem( FmFormItem* _pItem ) { m_pFormItem = _pItem; } - void addSelectedItem( FmFilterItem* _pItem) { m_aDraggedEntries.push_back(_pItem); } protected: virtual void AddSupportedFormats() SAL_OVERRIDE; @@ -283,7 +281,6 @@ protected: void Remove(FmFilterData* pItem); DECL_LINK(OnRemove, SvTreeListEntry*); - DECL_LINK(OnEdited, SvTreeListEntry*); DECL_LINK_TYPED(OnDropActionTimer, Timer*, void); private: diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index bcb1127f0d4c..bbce39c3ac35 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -95,13 +95,6 @@ namespace svxform :xControl( _rxControl ) { } - void clear() - { - BorderDescriptor::clear(); - UnderlineDescriptor::clear(); - xControl.clear(); - sOriginalHelpText.clear(); - } }; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 227cbd42b621..d8a7557c6509 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -186,7 +186,6 @@ namespace svxform // (es erfolgt KEINE Ueberpruefung, ob dadurch auch tatsaechlich nur hidden Controls bezeichnet werden, dass muss der // Aufrufer sicherstellen) - SvTreeListEntry* focused() const { return m_pFocusEntry; } const ListBoxEntrySet& selected() const { return m_aSelectedEntries; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > hiddenControls() const { return m_aHiddenControlModels; } diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 0e9afbcef127..604a5a49979e 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -250,13 +250,6 @@ public: FmFormData( const FmFormData& rFormData ); virtual ~FmFormData(); - void SetForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm ) - { - m_xForm = xForm; - m_xContainer.set(m_xForm, css::uno::UNO_QUERY); - newObject( m_xForm ); - } - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& GetFormIface() const { return m_xForm; } const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& GetContainer() const { return m_xContainer; } @@ -351,7 +344,6 @@ namespace svxform ImageList m_aNormalImages; void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >& xForms ); - FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent ); void InsertForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm, sal_uInt32 nRelPos); void RemoveForm(FmFormData* pFormData); @@ -442,8 +434,6 @@ namespace svxform bool m_bInitialUpdate : 1; // bin ich das erste Mal im UpdateContent ? bool m_bKeyboardCut : 1; - - void UpdateContent(); FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName = true ); void NewForm( SvTreeListEntry* pParentEntry ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=TREELIST_APPEND ); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 6e8860756f38..edb11f337972 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -58,10 +58,6 @@ class SVX_DLLPRIVATE FmFormPageImpl bool m_bFirstActivation; bool m_bAttemptedFormCreation; - bool m_bInFind; - -protected: - void Init(); public: explicit FmFormPageImpl( FmFormPage& _rPage ); @@ -94,7 +90,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true ); void SetFormsCreationHdl( const Link<>& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; } - const Link<>& GetFormsCreationHdl() const { return m_aFormsCreationHdl; } protected: /** finds a form with a given data source signature diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index e7308fd76d46..12d302bb7819 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -393,7 +393,6 @@ public: SAL_DLLPRIVATE bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;} SAL_DLLPRIVATE bool hasDatabaseBar() const {return m_bDatabaseBar;} - SAL_DLLPRIVATE bool canNavigate() const {return m_xNavigationController.is();} SAL_DLLPRIVATE void ShowSelectionProperties( bool bShow ); SAL_DLLPRIVATE bool IsPropBrwOpen() const; diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 60134c9f3c5a..dc90e721dbe4 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -181,8 +181,6 @@ namespace svx */ void dispose(); - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations >& - getFormOperations() const { return m_xFormOperations; } protected: /// dtor virtual ~FormControllerHelper(); @@ -209,10 +207,6 @@ namespace svx { return impl_operateForm_nothrow( _eWhat, 0, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); } - bool impl_operateForm_nothrow( const sal_Int16 _nFeature ) const - { - return impl_operateForm_nothrow( EXECUTE, _nFeature, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); - } private: FormControllerHelper( const FormControllerHelper& ) SAL_DELETED_FUNCTION; diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index bd745d9dfa4e..0db4a8baa11c 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -56,13 +56,6 @@ namespace svxform */ SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const; - /** ensures that a given toolbox is visible - */ - inline void showToolbox( sal_uInt16 _SlotId ) const - { - if ( !isToolboxVisible( _SlotId ) ) - toggleToolbox( _SlotId ); - } }; } diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 441cb1e62b13..d03cb350ed0c 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -62,7 +62,6 @@ public: inline void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); } inline void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); } - inline void SetUIColorGap( bool bUseIt, const Color& rColor ) {maUIStyle.SetColorGap(bUseIt, rColor);} inline const frame::Style& GetUIStyle() const { return maUIStyle; } inline void ClearFocusArea() { maFocusArea.Clear(); } @@ -164,8 +163,6 @@ struct FrameSelectorImpl : public Resource void InitGlobalGeometry(); /** Initializes coordinates of all frame borders. */ void InitBorderGeometry(); - /** Initializes click areas of all enabled frame borders. */ - void InitClickAreas(); /** Draws the entire control into the internal virtual device. */ void InitVirtualDevice(); /** call this to recalculate based on parent size */ diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index d2af571ef927..e413fa136b86 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -126,13 +126,9 @@ public: sal_uInt16 GetId() const {return m_nId;} bool IsReadOnly() const {return m_bReadOnly;} bool IsAutoValue() const {return m_bAutoValue;} - bool IsUpdating() const {return m_bInSave;} sal_Int16 GetAlignment() const {return m_nAlign;} - sal_Int16 GetType() const {return m_nFieldType;} sal_Int16 GetFieldPos() const {return m_nFieldPos; } bool IsNumeric() const {return m_bNumeric;} - bool IsDateTime() const {return m_bDateTime;} - bool IsObject() const {return m_bObject;} bool IsHidden() const {return m_bHidden;} sal_Int32 GetKey() const {return m_nFormatKey;} const ::svt::CellControllerRef& GetController() const {return m_bLocked ? s_xEmptyController : m_xController;} @@ -705,7 +701,6 @@ public: void SetText(const OUString& rText); void SetCommitHdl( const Link<>& rLink ) { m_aCommitLink = rLink; } - const Link<>& GetCommitHdl() const { return m_aCommitLink; } protected: diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index d5270accec0b..4a4084b37e28 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -48,81 +48,14 @@ namespace svxform // (which is checked via the supported interfaces) _all_ members will be set to // void !, even if the object has some of the needed interfaces. - bool is() const { return m_xColumn.is(); } - bool Is() const { return m_xColumn.is(); } - bool supportsUpdate() const { return m_xColumnUpdate.is(); } - DataColumn* operator ->() { return this; } operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn.get(); } // 'conversions' - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& getPropertySet() const - { - return m_xPropertySet; - } inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& getColumn() const { return m_xColumn; } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& getColumnUpdate() const - { - OSL_ENSURE(m_xColumnUpdate.is() , "DataColumn::getColumnUpdate: NULL!"); - return m_xColumnUpdate; - } - - // das normale queryInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ) - { return m_xColumn->queryInterface(type); } - - // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException ); - inline void setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Any getPropertyValue(const OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - - // ::com::sun::star::sdb::XColumn - inline bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int64 getLong() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline float getFloat() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline double getDouble() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Sequence< sal_Int8 > getBytes() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::util::Date getDate() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::util::Time getTime() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::util::DateTime getTimestamp() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getBinaryStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getCharacterStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Any getObject(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& typeMap) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef> getRef() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> getBlob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob> getClob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - - // XColumnUpdate - inline void updateNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateString(const OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateBinaryStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateCharacterStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateObject(const ::com::sun::star::uno::Any& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); }; #endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 1d45b4e35678..9e75dc0e3f08 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -43,23 +43,6 @@ namespace svx _rStrings = m_aStrings; } - - /** returns the OUString with a given local resource id - - @param _nResId - The resource id. It will not be checked if this id exists. - - @return OUString - The string. - */ - OUString getString( sal_uInt16 _nResId ) - { - return ResId(_nResId, *m_pResMgr).toString(); - } - - size_t size() const { return m_aStrings.size(); } - bool empty() const { return m_aStrings.empty(); } - const OUString& operator[]( size_t _index ) const { return m_aStrings[ _index ]; } private: diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index b87cd5299be9..c64309a09cae 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -70,7 +70,6 @@ class SvxPixelCtlAccessibleChild : { SvxPixelCtl& mrParentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent; - void IsValid() throw (::com::sun::star::uno::RuntimeException); bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color Point maPoint; Rectangle* mpBoundingBox; @@ -235,19 +234,13 @@ public: void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); virtual void SAL_CALL disposing() SAL_OVERRIDE; - /// select child - void SelectChild( Point pos ); - void SelectChild( long nIndex); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild (long nIndex, Point mPoint); - void LoseFocus(); /// @returns true if it's disposed or in disposing inline bool IsAlive() const; - /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive() const; protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; @@ -260,11 +253,6 @@ inline bool SvxPixelCtlAccessible::IsAlive() const return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessible::IsNotAlive() const -{ - return rBHelper.bDisposed || rBHelper.bInDispose; -} - inline bool SvxPixelCtlAccessibleChild::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 88ac821d0560..90f612cd8fae 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -96,8 +96,6 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; - FmFieldWinData* GetData() const {return pData;} - void UpdateContent(FmFormShell*); void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index a1c479855d52..eaadd63ba0a7 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -148,7 +148,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } else if (rsResourceURL.endsWith("/StylesPropertyPanel")) { - pControl = StylesPropertyPanel::Create(pParentWindow, xFrame, pBindings); + pControl = StylesPropertyPanel::Create(pParentWindow, xFrame); } else if (rsResourceURL.endsWith("/ParaPropertyPanel")) { diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index b408123c8e91..7701b79c9639 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -47,7 +47,6 @@ public: void Rearrange(XFillFloatTransparenceItem* pGradientItem); void InitStatus(XFillFloatTransparenceItem* pGradientItem); void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol ); - void SetControlState_Impl(css::awt::GradientStyle eXGS); private: VclPtr<FixedText> maFtTrgrCenterX; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 749070b91c66..87064e08febf 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -96,7 +96,6 @@ private: DECL_LINK( ModifyContrastHdl, void * ); DECL_LINK( ModifyTransHdl, void * ); DECL_LINK( ClickColorModeHdl, void * ); - DECL_LINK( ImplPopupModeEndHdl, FloatingWindow* ); DECL_LINK( RedHdl, void*); DECL_LINK( GreenHdl, void*); DECL_LINK( BlueHdl, void*); diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 9e39384031eb..ae6036c72fcb 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -152,7 +152,6 @@ private: void SelectEndStyle(bool bStart); void SelectLineStyle(); - DECL_LINK(ImplWidthPopupModeEndHdl, FloatingWindow* ); DECL_LINK(ChangeLineStyleHdl, void*); DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void); DECL_LINK(ChangeTransparentHdl , void *); diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 12190cab81f4..9e310a9ad1c5 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -8,22 +8,18 @@ namespace svx { namespace sidebar { VclPtr<vcl::Window> StylesPropertyPanel::Create ( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings) + const css::uno::Reference<css::frame::XFrame>& rxFrame) { if (pParent == NULL) throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", NULL, 0); if ( ! rxFrame.is()) throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to StylesPropertyPanel::Create", NULL, 2); - return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame,pBindings); + return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame); } -StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings ) - : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame), - mpBindings(pBindings) +StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame ) + : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame) { } @@ -43,13 +39,6 @@ void StylesPropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) } -void StylesPropertyPanel::NotifyItemUpdate ( - const sal_uInt16 /*nSId*/, - const SfxItemState /*eState*/, - const SfxPoolItem* /*pState*/, - const bool /*bIsEnabled*/) -{ -} }} diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index 73bc30c8b22c..7408bdf888a0 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -25,26 +25,13 @@ public: static VclPtr<vcl::Window> Create ( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings); + const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual void DataChanged( const DataChangedEvent& rEvent ) SAL_OVERRIDE; - virtual void NotifyItemUpdate( - const sal_uInt16 nSId, - const SfxItemState eState, - const SfxPoolItem* pState, - const bool bIsEnabled); //SAL_OVERRIDE; - StylesPropertyPanel( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings); - SfxBindings* GetBindings() { return mpBindings; } - -private: - SfxBindings* mpBindings; - //more controls will be added later + const css::uno::Reference<css::frame::XFrame>& rxFrame); }; } } //end of namespace svx::sidebar diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 71da0f146c39..f4dd4f34b77d 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -664,15 +664,6 @@ SfxStyleSheet* Cell::GetStyleSheet() const return 0; } - - -const Rectangle& Cell::GetCurrentBoundRect() const -{ - return maCellRect; -} - - - void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const { rAnchorRect.Left() = maCellRect.Left() + GetTextLeftDistance(); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 66cc5a7427bd..4ddf5234604f 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -76,7 +76,6 @@ public: OutlinerParaObject* GetEditOutlinerParaObject() const; SVX_DLLPRIVATE void SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ); SVX_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual const Rectangle& GetCurrentBoundRect() const; SVX_DLLPRIVATE virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; SVX_DLLPRIVATE virtual const SfxItemSet& GetItemSet() const SAL_OVERRIDE; diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 0592f58637a1..793d7f641510 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -59,7 +59,6 @@ private: const OUString msExtrusionProjection; DECL_LINK( SelectHdl, void * ); - void FillValueSet(); void implSetDirection( sal_Int32 nSkew, bool bEnabled = true ); void implSetProjection( sal_Int32 nProjection, bool bEnabled = true ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index cb0715591e16..3b8140f7dce9 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -46,9 +46,7 @@ public: private: DECL_LINK( DictionaryHdl, void* ); - DECL_LINK( CommonTermsHdl, void* ); DECL_LINK( OkHdl, void* ); - void impl_UpdateVariantsCheckBox(); private: VclPtr<RadioButton> m_pRB_To_Simplified; |