diff options
42 files changed, 219 insertions, 248 deletions
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 0ffe6c2b2afa..1550bc4c7771 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -170,6 +170,8 @@ private: sal_uLong mnUpdateEvent; }; +rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController ); + } } #endif // INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index a8b03dc36568..776e9643ec3d 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -84,9 +84,6 @@ namespace accessibility AccessibleEmptyEditSource_Impl() {} virtual ~AccessibleEmptyEditSource_Impl() {} - // from the SfxListener interface - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // SvxEditSource SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE { return this; } SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE { return this; } @@ -136,7 +133,6 @@ namespace accessibility bool IsValid() const SAL_OVERRIDE { return true; } - void SetNotifyHdl( const Link& ) {} LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE { return LANGUAGE_DONTKNOW; } sal_Int32 GetFieldCount( sal_Int32 ) const SAL_OVERRIDE { return 0; } EFieldInfo GetFieldInfo( sal_Int32, sal_uInt16 ) const SAL_OVERRIDE { return EFieldInfo(); } diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index bd8231c09f78..5ad3284aed4f 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -34,6 +34,8 @@ #include "rtl/ustring.hxx" #include "vcl/svapp.hxx" +#include <lookupcolorname.hxx> + namespace { class ColorNameMap: private boost::noncopyable { diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 4258864056e9..998a2ebeab75 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -24,37 +24,12 @@ #include "osl/diagnose.h" #include "cppuhelper/factory.hxx" +#include <coreservices.hxx> + using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -namespace svx -{ -extern OUString SAL_CALL ExtrusionDepthController_getImplementationName(); -extern Reference< XInterface > SAL_CALL ExtrusionDepthController_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException ); -extern Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ); - -extern OUString SAL_CALL ExtrusionDirectionControl_getImplementationName(); -extern Reference< XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException ); -extern Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ); - -extern OUString SAL_CALL ExtrusionLightingControl_getImplementationName(); -extern Reference< XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException ); -extern Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ); - -extern OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName(); -extern Reference< XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException ); -extern Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ); - -extern OUString SAL_CALL FontworkAlignmentControl_getImplementationName(); -extern Reference< XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException ); -extern Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ); - -extern OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName(); -extern Reference< XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const Reference< XMultiServiceFactory > &) throw( RuntimeException ); -extern Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ); -} - extern "C" { diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 07d28be8550c..f876e2a06602 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -68,11 +68,6 @@ class ColorWindow : public Control public: - - ColorWindow( Window* pParent, WinBits nWinStyle ) : - Control( pParent, nWinStyle ), - aColor( COL_WHITE ) {}; - ColorWindow( Window* pParent, const ResId& rId ) : Control( pParent, rId ), aColor( COL_WHITE ) {}; diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 73bf3061234c..9a9a012bdcd2 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -46,7 +46,6 @@ struct Cell explicit Cell(); inline bool IsMerged() const { return mbMergeOrig || mbOverlapX || mbOverlapY; } - inline bool IsOverlapped() const { return mbOverlapX || mbOverlapY; } void MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ); }; @@ -163,7 +162,6 @@ struct ArrayImpl bool IsRowInClipRange( size_t nRow ) const; inline size_t GetMirrorCol( size_t nCol ) const { return mnWidth - nCol - 1; } - inline size_t GetMirrorRow( size_t nRow ) const { return mnHeight - nRow - 1; } long GetColPosition( size_t nCol ) const; long GetRowPosition( size_t nRow ) const; diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 7c6ea1fcf572..d38445dfb8d8 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -54,7 +54,6 @@ public: // data read access const E3dCompoundObject* getObject() const { return mpObject; } - double getDepth() const { return mfDepth; } }; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 307140898e15..53237ea2d61d 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -350,6 +350,7 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) + throw (css::uno::Exception) { return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) )); } @@ -1034,16 +1035,6 @@ void FmXGridPeer::GridListenerDelegator::columnChanged() m_pPeer->columnChanged(); } - - -Reference< XInterface > FmXGridPeer_CreateInstance(const Reference< XMultiServiceFactory>& _rxFactory) -{ - FmXGridPeer* pNewObject = new FmXGridPeer( comphelper::getComponentContext(_rxFactory) ); - pNewObject->Create(NULL, WB_TABSTOP); - return *pNewObject; -} - - Sequence< Type> SAL_CALL FmXGridPeer::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( VCLXWindow::getTypes(), FmXGridPeer_BASE::getTypes() ); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 3b46a5731376..35eb806bef2d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4609,13 +4609,6 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& /*************************************************************************/ TYPEINIT1(FmXFilterCell, FmXGridCell); - -Reference< XInterface > FmXFilterCell_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& /*_rxFactory*/) -{ - return *new FmXFilterCell(); -} - - FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl ) :FmXGridCell( pColumn, pControl ) ,m_aTextListeners(m_aMutex) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index baf0c666a117..a1ea29f2abd8 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -121,8 +121,6 @@ namespace svxform m_xNode( _rxNode ) {} ItemNode( const Reference< XPropertySet >& _rxSet ) : m_xPropSet( _rxSet ) {} - - DataGroupType GetDataGroupType() const; }; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index bb87ef395444..624a4d1d7863 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -38,6 +38,7 @@ #include <sfx2/app.hxx> #include <basic/basmgr.hxx> +#include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <boost/assign/list_of.hpp> #include <utility> @@ -140,7 +141,8 @@ namespace svxform //= FormScriptingEnvironment - class FormScriptingEnvironment : public IFormScriptingEnvironment + class FormScriptingEnvironment: + public IFormScriptingEnvironment, private boost::noncopyable { private: typedef ::comphelper::ImplementationReference< FormScriptListener, XScriptListener > ListenerImplementation; @@ -170,11 +172,6 @@ namespace svxform private: void impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister ); - - private: - FormScriptingEnvironment(); // never implemented - FormScriptingEnvironment( const FormScriptingEnvironment& ); // never implemented - FormScriptingEnvironment& operator=( const FormScriptingEnvironment& ); // never implemented }; diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index 670c26e83fea..145b9338108b 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -24,10 +24,6 @@ using namespace com::sun::star; - -#define DECL_SERVICE(ImplName) \ -uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::Exception ); - #define REGISTER_SERVICE(ImplName, ServiceName) \ sString = (ServiceName); \ xSingleFactory = ::cppu::createSingleFactory(xServiceFactory, \ @@ -36,23 +32,8 @@ uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno if (xSingleFactory.is()) \ xSet->insert(uno::makeAny(xSingleFactory)); - - DECL_SERVICE( FmXGridControl ) - DECL_SERVICE( FormController ) - DECL_SERVICE( LegacyFormController ) - - - namespace svxform { - - - // declare selfaware service - uno::Reference< uno::XInterface > SAL_CALL OAddConditionDialog_Create( const uno::Reference< lang::XMultiServiceFactory >& ); - OUString SAL_CALL OAddConditionDialog_GetImplementationName(); - uno::Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames(); - - void ImplSmartRegisterUnoServices() { uno::Reference< lang::XMultiServiceFactory > xServiceFactory(::comphelper::getProcessServiceFactory(), uno::UNO_QUERY); diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index f50f0089f436..4bc46c2d6cb3 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -160,12 +160,6 @@ struct PropertySetInfo // sal_False -> the set has _no_ such property or it's value isn't empty }; -sal_Bool operator < (const Reference< XPropertySet >& lhs, - const Reference< XPropertySet >& rhs) -{ - return lhs.get() < rhs.get(); -} - typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index ceefb3e4465b..0db6820b2826 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -99,6 +99,7 @@ using namespace ::connectivity::simple; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) + throw (css::uno::Exception) { return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) ); } @@ -469,8 +470,6 @@ struct FmFieldInfo class FmXAutoControl: public UnoControl { - friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl(); - public: FmXAutoControl() :UnoControl() { diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 3176818a6737..da0d3d618e2f 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -201,6 +201,7 @@ namespace svxform ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL LegacyFormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) + throw (css::uno::Exception) { return ::svxform::LegacyFormController::Create( _rxORB ); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 2bdc7edf0013..66109e29b356 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -77,16 +77,9 @@ struct ColumnInfo { OUString sColumnName; OUString sLabel; - bool bColumn; ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) - , bColumn(true) - { - } - ColumnInfo(const OUString& i_sColumnName) - : sColumnName(i_sColumnName) - , bColumn(false) { } }; diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index f8c01420793a..a9d6eb6b4f67 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -23,6 +23,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/typeprovider.hxx> #include "datanavi.hxx" +#include "fmservs.hxx" #include <vcl/msgbox.hxx> diff --git a/svx/source/inc/coreservices.hxx b/svx/source/inc/coreservices.hxx new file mode 100644 index 000000000000..4a83c5126a88 --- /dev/null +++ b/svx/source/inc/coreservices.hxx @@ -0,0 +1,65 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SVX_SOURCE_INC_CORESERVICES_HXX +#define INCLUDED_SVX_SOURCE_INC_CORESERVICES_HXX + +#include <sal/config.h> + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> +#include <sal/types.h> + +namespace com { namespace sun { namespace star { + namespace lang { class XMultiServiceFactory; } + namespace uno { class XInterface; } +} } } + +namespace svx +{ +OUString SAL_CALL ExtrusionDepthController_getImplementationName(); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( css::uno::RuntimeException ); + +OUString SAL_CALL ExtrusionDirectionControl_getImplementationName(); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); + +OUString SAL_CALL ExtrusionLightingControl_getImplementationName(); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); + +OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName(); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); + +OUString SAL_CALL FontworkAlignmentControl_getImplementationName(); +css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); + +OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName(); +css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 81812e73b7f6..ec85a53862d2 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -19,8 +19,15 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX #define INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX +#include <sal/config.h> + +#include <com/sun/star/uno/Reference.hxx> #include <svx/svxdllapi.h> +namespace com { namespace sun { namespace star { namespace lang { + class XMultiServiceFactory; +} } } } + #define FM_COMPONENT_EDIT OUString( "stardiv.one.form.component.Edit" ) #define FM_COMPONENT_TEXTFIELD OUString( "stardiv.one.form.component.TextField" ) #define FM_COMPONENT_LISTBOX OUString( "stardiv.one.form.component.ListBox" ) @@ -74,7 +81,31 @@ namespace svxform { SVX_DLLPUBLIC void ImplSmartRegisterUnoServices(); -} // namespace svxform + + css::uno::Reference<css::uno::XInterface> SAL_CALL + OAddConditionDialog_Create( + css::uno::Reference<css::lang::XMultiServiceFactory> const &); + + OUString SAL_CALL OAddConditionDialog_GetImplementationName(); + + css::uno::Sequence<OUString> SAL_CALL + OAddConditionDialog_GetSupportedServiceNames(); +} + +css::uno::Reference<css::uno::XInterface> SAL_CALL +FmXGridControl_NewInstance_Impl( + css::uno::Reference<css::lang::XMultiServiceFactory> const &) + throw (css::uno::Exception); + +css::uno::Reference<css::uno::XInterface> SAL_CALL +FormController_NewInstance_Impl( + css::uno::Reference<css::lang::XMultiServiceFactory> const &) + throw (css::uno::Exception); + +css::uno::Reference<css::uno::XInterface> SAL_CALL +LegacyFormController_NewInstance_Impl( + css::uno::Reference<css::lang::XMultiServiceFactory> const &) + throw (css::uno::Exception); #endif // INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 8a33b2976a4f..f4efab5d2601 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> +#include <boost/noncopyable.hpp> #include <svx/sdr/contact/viewcontactofunocontrol.hxx> #include <svx/sdr/contact/viewobjectcontactofunocontrol.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> @@ -51,15 +53,11 @@ namespace sdr { namespace contact { //= ViewContactOfUnoControl - class ViewContactOfUnoControl_Impl + class ViewContactOfUnoControl_Impl: private boost::noncopyable { public: ViewContactOfUnoControl_Impl(); ~ViewContactOfUnoControl_Impl(); - - private: - ViewContactOfUnoControl_Impl( const ViewContactOfUnoControl_Impl& ); // never implemented - ViewContactOfUnoControl_Impl& operator=( const ViewContactOfUnoControl_Impl& ); // never implemented }; diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 7f45e6c2309a..6628d211ea43 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -56,6 +56,7 @@ #include <drawinglayer/primitive2d/controlprimitive2d.hxx> #include <boost/bind.hpp> +#include <boost/noncopyable.hpp> /* @@ -199,9 +200,6 @@ namespace sdr { namespace contact { inline Reference< XControlModel > getModel() const { return m_xControl->getModel(); } inline void setModel( const Reference< XControlModel >& _m ) const { m_xControl->setModel( _m ); } - inline bool isTransparent() const { return m_xControl->isTransparent(); } - inline Reference< XWindowPeer > - getPeer() const { return m_xControl->getPeer(); } inline void addWindowListener( const Reference< XWindowListener >& _l ) const { m_xControlWindow->addWindowListener( _l ); } inline void removeWindowListener( const Reference< XWindowListener >& _l ) const { m_xControlWindow->removeWindowListener( _l ); } @@ -212,11 +210,6 @@ namespace sdr { namespace contact { ::basegfx::B2DVector getZoom() const; - inline void setGraphics( const Reference< XGraphics >& _g ) const { m_xControlView->setGraphics( _g ); } - inline Reference< XGraphics > - getGraphics() const { return m_xControlView->getGraphics(); } - inline void draw( const Point& _rTopLeft ) const { m_xControlView->draw( _rTopLeft.X(), _rTopLeft.Y() ); } - void invalidate() const; public: @@ -229,25 +222,11 @@ namespace sdr { namespace contact { return _rControl.getControl() == _rxCompare; } - - bool operator==( const Reference< XInterface >& _rxCompare, const ControlHolder& _rControl ) - { - return _rxCompare == _rControl.getControl(); - } - - bool operator==( const ControlHolder& _rControl, const Any& _rxCompare ) { return _rControl == Reference< XInterface >( _rxCompare, UNO_QUERY ); } - - bool operator==( const Any& _rxCompare, const ControlHolder& _rControl ) - { - return Reference< XInterface >( _rxCompare, UNO_QUERY ) == _rControl; - } - - void ControlHolder::setPosSize( const Rectangle& _rPosSize ) const { // no check whether we're valid, this is the responsibility of the caller @@ -310,35 +289,11 @@ namespace sdr { namespace contact { return aZoom; } + namespace UnoControlContactHelper { - //= UnoControlContactHelper - - class UnoControlContactHelper - { - public: - /** positions a control, and sets its zoom mode, using a given transformation and output device - */ - static void adjustControlGeometry_throw( - const ControlHolder& _rControl, - const Rectangle& _rLogicBoundingRect, - const ::basegfx::B2DHomMatrix& _rViewTransformation, - const ::basegfx::B2DHomMatrix& _rZoomLevelNormalization - ); - - /** disposes the given control - */ - static void disposeAndClearControl_nothrow( - ControlHolder& _rControl - ); - - private: - UnoControlContactHelper(); // never implemented - UnoControlContactHelper( const UnoControlContactHelper& ); // never implemented - UnoControlContactHelper& operator=( const UnoControlContactHelper& ); // never implemented - }; - - - void UnoControlContactHelper::adjustControlGeometry_throw( const ControlHolder& _rControl, const Rectangle& _rLogicBoundingRect, + /** positions a control, and sets its zoom mode, using a given transformation and output device + */ + void adjustControlGeometry_throw( const ControlHolder& _rControl, const Rectangle& _rLogicBoundingRect, const basegfx::B2DHomMatrix& _rViewTransformation, const ::basegfx::B2DHomMatrix& _rZoomLevelNormalization ) { OSL_PRECOND( _rControl.is(), "UnoControlContactHelper::adjustControlGeometry_throw: illegal control!" ); @@ -372,8 +327,9 @@ namespace sdr { namespace contact { _rControl.setZoom( aScale ); } - - void UnoControlContactHelper::disposeAndClearControl_nothrow( ControlHolder& _rControl ) + /** disposes the given control + */ + void disposeAndClearControl_nothrow( ControlHolder& _rControl ) { try { @@ -388,6 +344,7 @@ namespace sdr { namespace contact { _rControl.clear(); } + } //= IPageViewAccess @@ -554,7 +511,9 @@ namespace sdr { namespace contact { , XModeChangeListener > ViewObjectContactOfUnoControl_Impl_Base; - class SVX_DLLPRIVATE ViewObjectContactOfUnoControl_Impl : public ViewObjectContactOfUnoControl_Impl_Base + class SVX_DLLPRIVATE ViewObjectContactOfUnoControl_Impl: + public ViewObjectContactOfUnoControl_Impl_Base, + private boost::noncopyable { private: // fdo#41935 note that access to members is protected with SolarMutex; @@ -603,10 +562,6 @@ namespace sdr { namespace contact { */ bool isDisposed() const { return impl_isDisposed_nofail(); } - /** determines whether the instance is alive - */ - bool isAlive() const { return !isDisposed(); } - /** returns the SdrUnoObject associated with the ViewContact @precond @@ -847,11 +802,6 @@ namespace sdr { namespace contact { ); const OutputDevice& impl_getOutputDevice_throw() const; - - private: - ViewObjectContactOfUnoControl_Impl(); // never implemented - ViewObjectContactOfUnoControl_Impl( const ViewObjectContactOfUnoControl_Impl& ); // never implemented - ViewObjectContactOfUnoControl_Impl& operator=( const ViewObjectContactOfUnoControl_Impl& ); // never implemented }; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index ea6bb85672dd..d950e216016f 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -58,6 +58,7 @@ #include <svx/sdrpaintwindow.hxx> #include <svx/sdrundomanager.hxx> #include <svx/sdr/overlay/overlaytools.hxx> +#include <svx/sdr/table/tablecontroller.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> @@ -1817,10 +1818,6 @@ void SdrObjEditView::getTextSelection( ::com::sun::star::uno::Any& rSelection ) } } -namespace sdr { namespace table { -extern rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController ); -} } - /* check if we have a single selection and that single object likes to handle the mouse and keyboard events itself diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 1b81975f4626..d978094adc4e 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -49,8 +49,6 @@ public: virtual void Closed() SAL_OVERRIDE; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; - - bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; ImpSdrObjTextLink::~ImpSdrObjTextLink() diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 22c6b38535fc..83cac52987a6 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -177,20 +177,6 @@ OUString SdrVirtObj::TakeObjNamePlural() const return sName.makeStringAndClear(); } -void operator +=(PolyPolygon& rPoly, const Point& rOfs) -{ - if (rOfs.X()!=0 || rOfs.Y()!=0) { - sal_uInt16 i,j; - for (j=0; j<rPoly.Count(); j++) { - Polygon aP1(rPoly.GetObject(j)); - for (i=0; i<aP1.GetSize(); i++) { - aP1[i]+=rOfs; - } - rPoly.Replace(aP1,j); - } - } -} - basegfx::B2DPolyPolygon SdrVirtObj::TakeXorPoly() const { basegfx::B2DPolyPolygon aPolyPolygon(rRefObj.TakeXorPoly()); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 24d8247c76a0..5e22fbaba37e 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1704,28 +1704,6 @@ OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const return SdrTextObj::GetEditOutlinerParaObject(); } - - -struct ImplTableShadowPaintInfo -{ - Color maShadowColor; - sal_uInt32 mnXDistance; - sal_uInt32 mnYDistance; - sal_uInt16 mnShadowTransparence; - - ImplTableShadowPaintInfo( const SfxItemSet& rSet ) - { - const SdrShadowColorItem& rShadColItem = ((const SdrShadowColorItem&)(rSet.Get(SDRATTR_SHADOWCOLOR))); - maShadowColor = rShadColItem.GetColorValue(); - mnShadowTransparence = ((const SdrShadowTransparenceItem&)(rSet.Get(SDRATTR_SHADOWTRANSPARENCE))).GetValue(); - - mnXDistance = ((SdrShadowXDistItem&)(rSet.Get(SDRATTR_SHADOWXDIST))).GetValue(); - mnYDistance = ((SdrShadowYDistItem&)(rSet.Get(SDRATTR_SHADOWYDIST))).GetValue(); - } -}; - - - OUString SdrTableObj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulTable)); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 1ae9cd8fc961..a4ac4362c87e 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -38,6 +38,7 @@ #include <svx/dialmgr.hxx> #include "svx/extrusioncolorcontrol.hxx" +#include "coreservices.hxx" #include "helpid.hrc" #include "extrusioncontrols.hxx" #include "extrusioncontrols.hrc" diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 601c1183baa4..b0e3deaa9d2b 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -48,6 +48,7 @@ #include <svx/dlgutil.hxx> #include <svx/fontworkgallery.hxx> +#include "coreservices.hxx" #include "fontworkgallery.hrc" #include <algorithm> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 064e7818e067..325b26e6fa68 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -103,7 +103,6 @@ public: virtual ~ImplGrafMetricField(); void Update( const SfxPoolItem* pItem ); - const OUString& GetCommand() const { return maCommand; } }; ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index d9eef1f18c4c..fe928d6304fb 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -433,8 +433,6 @@ public: virtual void Paint( const Rectangle& ) SAL_OVERRIDE; virtual void PopupModeEnd() SAL_OVERRIDE; virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; - - sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; } }; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 2e0ab018d915..fdfbe9ce8463 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <boost/noncopyable.hpp> #include <tools/debug.hxx> #include <sal/types.h> #include <vcl/lstbox.hxx> @@ -52,7 +55,7 @@ class SvxPopupWindowListBox; -class SvxPopupWindowListBox : public SfxPopupWindow +class SvxPopupWindowListBox: public SfxPopupWindow, private boost::noncopyable { using FloatingWindow::StateChanged; @@ -63,9 +66,6 @@ class SvxPopupWindowListBox : public SfxPopupWindow OUString maCommandURL; // disallow copy-constructor and assignment-operator - SvxPopupWindowListBox(const int& ); - SvxPopupWindowListBox & operator = (const int& ); - // SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId ); public: diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 557177168a77..9c36b7221dec 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -145,7 +145,6 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; inline void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; } - inline void RemoveVisibilityListener() { aVisibilityListener = Link(); } void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } DECL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control* ); diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index d2bcded9d563..fe10726f4070 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -68,6 +68,8 @@ #include "boost/scoped_ptr.hpp" +#include <UnoGraphicExporter.hxx> + #define MAX_EXT_PIX 2048 using namespace ::comphelper; diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx new file mode 100644 index 000000000000..dafb10e3c6c7 --- /dev/null +++ b/svx/source/unodraw/UnoGraphicExporter.hxx @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SVX_SOURCE_UNODRAW_UNOGRAPHICEXPORTER_HXX +#define INCLUDED_SVX_SOURCE_UNODRAW_UNOGRAPHICEXPORTER_HXX + +#include <sal/config.h> + +#include <vcl/graph.hxx> + +class SdrObject; + +Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 860221f5f84d..a03385f7eed2 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -28,6 +28,8 @@ #include <svx/svdglue.hxx> #include <svx/svdpage.hxx> +#include <gluepts.hxx> + using namespace ::com::sun::star; using namespace ::rtl; using namespace ::cppu; diff --git a/svx/source/unodraw/gluepts.hxx b/svx/source/unodraw/gluepts.hxx new file mode 100644 index 000000000000..2fb26c82163a --- /dev/null +++ b/svx/source/unodraw/gluepts.hxx @@ -0,0 +1,38 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SVX_SOURCE_UNODRAW_GLUEPTS_HXX +#define INCLUDED_SVX_SOURCE_UNODRAW_GLUEPTS_HXX + +#include <sal/config.h> + +#include <com/sun/star/uno/Reference.hxx> +#include <sal/types.h> + +namespace com { namespace sun { namespace star { namespace uno { + class XInterface; +} } } } +class SdrObject; + +css::uno::Reference<css::uno::XInterface> SAL_CALL +SvxUnoGluePointAccess_createInstance(SdrObject * pObject); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 5af2ac07428b..f93464c89e0d 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> +#include "UnoGraphicExporter.hxx" #include "shapeimpl.hxx" #include "svx/unoshprp.hxx" #include "svx/svdotable.hxx" @@ -101,8 +103,6 @@ bool SvxTableShape::setPropertyValueImpl( } } -extern Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ); - bool SvxTableShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index a17c36c90987..db97e84a179a 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -43,6 +43,8 @@ #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> +#include <shapeimpl.hxx> + using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index c6b830fc02a8..df6270c13cb9 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -84,6 +84,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/unotools.hxx> +#include "gluepts.hxx" #include "shapeimpl.hxx" #include <sal/log.hxx> @@ -107,8 +108,6 @@ using ::svx::IPropertyValueProvider; class GDIMetaFile; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoGluePointAccess_createInstance( SdrObject* pObject ); - /*********************************************************************** * class SvxShapeImpl * ***********************************************************************/ @@ -1024,17 +1023,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() return css::uno::Sequence<sal_Int8>(); } - - -Reference< uno::XInterface > SvxShape_NewInstance() -{ - return uno::Reference< uno::XInterface >(static_cast< OWeakObject* >( new SvxShape() ) ); -} - - -// SfxListener - - void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() { DBG_TESTSOLARMUTEX(); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index a45539b049f3..79ab5888315d 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -130,7 +130,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - SvxEditSource* Clone() const; SvxTextForwarder* GetTextForwarder(); SvxEditViewForwarder* GetEditViewForwarder( sal_Bool ); void UpdateData(); @@ -139,8 +138,6 @@ public: void removeRange( SvxUnoTextRangeBase* pOldRange ); const SvxUnoTextRangeBaseList& getRanges() const; - SdrObject* GetSdrObject() const { return mpObject; } - void lock(); void unlock(); diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 811e074adbe9..3f4a051a8151 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <boost/noncopyable.hpp> #include <comphelper/string.hxx> #include <sal/macros.h> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -69,7 +72,8 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) return pComment; } -class SvXMLGraphicInputStream : public::cppu::WeakImplHelper1< XInputStream > +class SvXMLGraphicInputStream: + public cppu::WeakImplHelper1<XInputStream>, private boost::noncopyable { private: @@ -84,11 +88,6 @@ private: ::utl::TempFile maTmp; Reference< XInputStream > mxStmWrapper; - // not available - SvXMLGraphicInputStream(); - SvXMLGraphicInputStream( const SvXMLGraphicInputStream& ); - SvXMLGraphicInputStream& operator==( SvXMLGraphicInputStream& ); - public: SvXMLGraphicInputStream( const OUString& rGraphicId ); @@ -199,7 +198,8 @@ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException mxStmWrapper->closeInput(); } -class SvXMLGraphicOutputStream : public::cppu::WeakImplHelper1< XOutputStream > +class SvXMLGraphicOutputStream: + public cppu::WeakImplHelper1<XOutputStream>, private boost::noncopyable { private: @@ -216,10 +216,6 @@ private: GraphicObject maGrfObj; sal_Bool mbClosed; - // not available - SvXMLGraphicOutputStream( const SvXMLGraphicOutputStream& ); - SvXMLGraphicOutputStream& operator==( SvXMLGraphicOutputStream& ); - public: SvXMLGraphicOutputStream(); diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index cd36fb985006..dce846eaaae0 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -88,7 +88,6 @@ class SvxXMLLineEndEntryExporter : public SvxXMLTableEntryExporter { public: SvxXMLLineEndEntryExporter( SvXMLExport& rExport ); - SvxXMLLineEndEntryExporter(); virtual ~SvxXMLLineEndEntryExporter(); virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index e8ad9d47ceae..bce885e94a86 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -89,8 +89,6 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) SAL_OVERRIDE; - SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); } - protected: void importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); void importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); |