Kaydet (Commit) c4c2c7e4 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in remotebridges,reportdesign

Change-Id: Id210cbc3481a8a31e6fc0ba2028346fc585c8744
Reviewed-on: https://gerrit.libreoffice.org/19597Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst cc906ec4
......@@ -183,7 +183,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
OUString::createFromAscii( urls[i] ) ,
OUString( "_blank"),
0 ,
Sequence < ::com::sun::star::beans::PropertyValue >() );
Sequence < css::beans::PropertyValue >() );
if( 0 == i )
{
......
......@@ -69,9 +69,9 @@ public:
virtual ~ResolverImpl();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(css::uno::RuntimeException, std::exception) override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XUnoUrlResolver
virtual Reference< XInterface > SAL_CALL resolve( const OUString & rUnoUrl )
......@@ -87,19 +87,19 @@ ResolverImpl::~ResolverImpl() {}
// XServiceInfo
OUString ResolverImpl::getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return resolver_getImplementationName();
}
sal_Bool ResolverImpl::supportsService( const OUString & rServiceName )
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > ResolverImpl::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
throw(css::uno::RuntimeException, std::exception)
{
return resolver_getSupportedServiceNames();
}
......
......@@ -32,7 +32,7 @@
namespace rptui
{
typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::beans::XPropertyChangeListener
typedef ::cppu::WeakComponentImplHelper< css::beans::XPropertyChangeListener
> OPropertyForward_Base;
/** \class OPropertyMediator
......@@ -43,12 +43,12 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex
,public OPropertyForward_Base
{
TPropertyNamePair m_aNameMap;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSource;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo;
bool m_bInChange;
TPropertyNamePair m_aNameMap;
css::uno::Reference< css::beans::XPropertySet> m_xSource;
css::uno::Reference< css::beans::XPropertySetInfo> m_xSourceInfo;
css::uno::Reference< css::beans::XPropertySet> m_xDest;
css::uno::Reference< css::beans::XPropertySetInfo> m_xDestInfo;
bool m_bInChange;
OPropertyMediator(OPropertyMediator&) = delete;
void operator =(OPropertyMediator&) = delete;
protected:
......@@ -58,16 +58,16 @@ namespace rptui
*/
virtual void SAL_CALL disposing() override;
public:
OPropertyMediator(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource
,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest
OPropertyMediator(const css::uno::Reference< css::beans::XPropertySet>& _xSource
,const css::uno::Reference< css::beans::XPropertySet>& _xDest
,const TPropertyNamePair& _aNameMap
,bool _bReverse = false);
// ::com::sun::star::beans::XPropertyChangeListener
virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
// css::beans::XPropertyChangeListener
virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
// ::com::sun::star::lang::XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// css::lang::XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
/** stop the listening mode.
*/
......
......@@ -28,20 +28,20 @@ namespace reportdesign
class SAL_NO_VTABLE ITraverseReport
{
public:
virtual void traverseReport(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport) = 0;
virtual void traverseReportFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0;
virtual void traverseReportHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traverseReportFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traversePageHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traversePageFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traverseReport(const css::uno::Reference< css::report::XReportDefinition>& _xReport) = 0;
virtual void traverseReportFunctions(const css::uno::Reference< css::report::XFunctions>& _xFunctions) = 0;
virtual void traverseReportHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
virtual void traverseReportFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
virtual void traversePageHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
virtual void traversePageFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
virtual void traverseGroups(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& _xGroups) = 0;
virtual void traverseGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup) = 0;
virtual void traverseGroupFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0;
virtual void traverseGroupHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traverseGroupFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traverseGroups(const css::uno::Reference< css::report::XGroups>& _xGroups) = 0;
virtual void traverseGroup(const css::uno::Reference< css::report::XGroup>& _xGroup) = 0;
virtual void traverseGroupFunctions(const css::uno::Reference< css::report::XFunctions>& _xFunctions) = 0;
virtual void traverseGroupHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
virtual void traverseGroupFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
virtual void traverseDetail(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
virtual void traverseDetail(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
protected:
~ITraverseReport() {}
......@@ -52,8 +52,8 @@ namespace reportdesign
ITraverseReport* m_pTraverseReport;
public:
OReportVisitor(ITraverseReport* _pTraverseReport);
void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReportDefinition);
void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup);
void start(const css::uno::Reference< css::report::XReportDefinition>& _xReportDefinition);
void start(const css::uno::Reference< css::report::XGroup>& _xGroup);
};
} // namespace reportdesign
......
......@@ -80,11 +80,11 @@ namespace ControlModification
static const ::sal_Int32 HEIGHT_GREATEST = (sal_Int32)10;
}
class AnyConverter : public ::std::binary_function< OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any >
class AnyConverter : public ::std::binary_function< OUString,css::uno::Any,css::uno::Any >
{
public:
virtual ~AnyConverter(){}
virtual ::com::sun::star::uno::Any operator() (const OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const
virtual css::uno::Any operator() (const OUString& /*_sPropertyName*/,const css::uno::Any& lhs) const
{
return lhs;
}
......@@ -95,12 +95,12 @@ typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
@param _nObjectId the object id
*/
REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId);
REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport);
REPORTDESIGN_DLLPUBLIC css::uno::Reference< css::style::XStyle> getUsedStyle(const css::uno::Reference< css::report::XReportDefinition>& _xReport);
template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
template < typename T> T getStyleProperty(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
{
T nReturn = T();
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY_THROW);
css::uno::Reference< css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW);
xProp->getPropertyValue(_sPropertyName) >>= nReturn;
return nReturn;
}
......
......@@ -47,7 +47,7 @@ private:
::dbaui::DBSubComponentController* m_pController;
::reportdesign::OReportDefinition* m_pReportDefinition;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override;
virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override;
OReportModel( const OReportModel& ) = delete;
void operator=(const OReportModel& rSrcModel) = delete;
......@@ -71,20 +71,20 @@ public:
inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; }
void detachController();
OReportPage* createNewPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
OReportPage* createNewPage(const css::uno::Reference< css::report::XSection >& _xSection);
/** returns the page which belongs to a section
*
* @param _xSection
* @return The page or <NULL/> when no page could be found.
*/
OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
OReportPage* getPage(const css::uno::Reference< css::report::XSection >& _xSection);
/// returns the XReportDefinition which the OReportModel belongs to
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >
css::uno::Reference< css::report::XReportDefinition >
getReportDefinition() const;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1);
css::uno::Reference< css::uno::XInterface > createShape(const OUString& aServiceSpecifier,css::uno::Reference< css::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1);
};
}
......
......@@ -72,17 +72,16 @@ public:
typedef rtl::Reference<OPropertyMediator> TMediator;
protected:
mutable TMediator m_xMediator;
mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener;
//mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>
mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xReportComponent;
::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener;
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive;
mutable TMediator m_xMediator;
mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener;
mutable css::uno::Reference< css::report::XReportComponent> m_xReportComponent;
css::uno::Reference< css::container::XContainerListener> m_xContainerListener;
css::uno::Reference< css::report::XSection> m_xSection;
css::uno::Reference< css::uno::XInterface > m_xKeepShapeAlive;
OUString m_sComponentName;
bool m_bIsListening;
OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
OObjectBase(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
OObjectBase(const OUString& _sComponentName);
virtual ~OObjectBase();
......@@ -95,33 +94,33 @@ protected:
/** called by instances of derived classes to implement their overriding of getUnoShape
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
css::uno::Reference< css::uno::XInterface >
getUnoShapeOf( SdrObject& _rSdrObject );
private:
static void ensureSdrObjectOwnership(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxShape );
const css::uno::Reference< css::uno::XInterface >& _rxShape );
public:
void StartListening();
void EndListening(bool bRemoveListener = true);
// PropertyChangeListener
virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
virtual void _propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException);
virtual void initializeOle() {}
bool supportsService( const OUString& _sServiceName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const { return m_xReportComponent;}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const;
css::uno::Reference< css::report::XReportComponent> getReportComponent() const { return m_xReportComponent;}
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent();
css::uno::Reference< css::report::XSection> getSection() const;
inline const OUString getServiceName() const { return m_sComponentName; }
/** releases the reference to our UNO shape (m_xKeepShapeAlive)
*/
void releaseUnoShape() { m_xKeepShapeAlive.clear(); }
static SdrObject* createObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
static sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
static SdrObject* createObject(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
static sal_uInt16 getObjectType(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
};
// OCustomShape
......@@ -132,13 +131,13 @@ class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OOb
friend class DlgEdFactory;
public:
static OCustomShape* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent )
static OCustomShape* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent )
{
return new OCustomShape( _xComponent );
}
protected:
OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
OCustomShape(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
OCustomShape(const OUString& _sComponentName);
virtual void NbcMove( const Size& rSize ) override;
......@@ -153,14 +152,14 @@ public:
virtual ~OCustomShape();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override;
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override;
virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
virtual sal_uInt16 GetObjIdentifier() const override;
virtual sal_uInt32 GetObjInventor() const override;
private:
virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override;
virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
};
......@@ -173,16 +172,16 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase
sal_uInt16 m_nType;
bool m_bOnlyOnce;
void impl_createDataProvider_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override;
void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel);
virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
public:
static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType )
static OOle2Obj* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType )
{
return new OOle2Obj( _xComponent,_nType );
}
protected:
OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType);
OOle2Obj(const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType);
OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType);
......@@ -198,9 +197,9 @@ public:
virtual ~OOle2Obj();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override;
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override;
virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
virtual sal_uInt16 GetObjIdentifier() const override;
virtual sal_uInt32 GetObjInventor() const override;
// Clone() should make a complete copy of the object.
......@@ -209,7 +208,7 @@ public:
OOle2Obj& operator=(const OOle2Obj& rObj);
void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
void initializeChart( const css::uno::Reference< css::frame::XModel>& _xModel);
};
......@@ -226,7 +225,7 @@ protected:
OUnoObject(const OUString& _sComponentName
,const OUString& rModelName
,sal_uInt16 _nObjectType);
OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent
OUnoObject( const css::uno::Reference< css::report::XReportComponent>& _xComponent
,const OUString& rModelName
,sal_uInt16 _nObjectType);
......@@ -242,18 +241,18 @@ protected:
public:
TYPEINFO_OVERRIDE();
virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException) override;
virtual void _propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException) override;
/** creates the m_xMediator when it doesn't already exist.
@param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control
*/
void CreateMediator(bool _bReverse = false);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override;
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
static OUString GetDefaultName(const OUnoObject* _pObj);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override;
virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
virtual sal_uInt16 GetObjIdentifier() const override;
virtual sal_uInt32 GetObjInventor() const override;
virtual OUnoObject* Clone() const override;
......@@ -261,7 +260,7 @@ public:
OUnoObject& operator=(const OUnoObject& rObj);
private:
virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override;
virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
void impl_setReportComponent_nothrow();
void impl_initializeModel_nothrow();
};
......
......@@ -37,7 +37,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
OReportPage& operator=(const OReportPage&) = delete;
OReportModel& rModel;
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
css::uno::Reference< css::report::XSection > m_xSection;
bool m_bSpecialInsertMode;
std::vector<SdrObject*> m_aTemporaryObjectList;
......@@ -50,12 +50,12 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
virtual ~OReportPage();
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override;
virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
public:
TYPEINFO_OVERRIDE();
OReportPage( OReportModel& rModel
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
,const css::uno::Reference< css::report::XSection >& _xSection
,bool bMasterPage = false );
......@@ -68,12 +68,12 @@ public:
/** returns the index inside the object list which belongs to the report component.
@param _xObject the report component
*/
sal_uLong getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
sal_uLong getIndexOf(const css::uno::Reference< css::report::XReportComponent >& _xObject);
/** removes the SdrObject which belongs to the report component.
@param _xObject the report component
*/
void removeSdrObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
void removeSdrObject(const css::uno::Reference< css::report::XReportComponent >& _xObject);
void setSpecialMode() {m_bSpecialInsertMode = true;}
bool getSpecialMode() {return m_bSpecialInsertMode;}
......@@ -83,9 +83,9 @@ public:
/** insert a new SdrObject which belongs to the report component.
@param _xObject the report component
*/
void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
void insertObject(const css::uno::Reference< css::report::XReportComponent >& _xObject);
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection;}
css::uno::Reference< css::report::XSection > getSection() const { return m_xSection;}
};
}
#endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
......
......@@ -34,9 +34,9 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment
: public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener
, ::com::sun::star::container::XContainerListener
, ::com::sun::star::util::XModifyListener
: public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener
, css::container::XContainerListener
, css::util::XModifyListener
>
, public SfxListener
{
......@@ -97,11 +97,11 @@ namespace rptui
struct Accessor { friend class OReportModel; private: Accessor() { } };
void Clear(const Accessor& _r);
void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
void AddElement(const css::uno::Reference< css::uno::XInterface>& Element);
void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element);
void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection);
void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection );
void AddSection( const css::uno::Reference< css::report::XSection>& _xSection);
void RemoveSection( const css::uno::Reference< css::report::XSection>& _xSection );
/** removes the section from the page out of the undo env
*
* \param _pPage
......@@ -110,33 +110,33 @@ namespace rptui
protected:
// XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
// XPropertyChangeListener
virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
// XContainerListener
virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
// XModifyListener
virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
void ModeChanged();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
private:
void TogglePropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
void TogglePropertyListening(const css::uno::Reference< css::uno::XInterface>& Element);
void implSetModified();
void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening );
void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening );
void switchListening( const css::uno::Reference< css::container::XIndexAccess >& _rxContainer, bool _bStartListening );
void switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening );
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator
getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const;
::std::vector< css::uno::Reference< css::container::XChild> >::const_iterator
getSection(const css::uno::Reference< css::container::XChild>& _xContainer) const;
};
}
......
......@@ -53,7 +53,7 @@ void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException, std::exception)
void SAL_CALL OFunctions::disposing()
{
::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose));
::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&css::report::XFunction::dispose));
m_aFunctions.clear();
lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) );
m_aContainerListeners.disposeAndClear( aDisposeEvent );
......
......@@ -174,7 +174,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container
void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL )
throwIllegallArgumentException("com::sun::star::report::GroupOn"
throwIllegallArgumentException("css::report::GroupOn"
,*this
,1
,m_xContext);
......@@ -201,7 +201,7 @@ void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno:
void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL )
throwIllegallArgumentException("com::sun::star::report::KeepTogether"
throwIllegallArgumentException("css::report::KeepTogether"
,*this
,1
,m_xContext);
......
......@@ -52,7 +52,7 @@ void SAL_CALL OGroups::dispose() throw(uno::RuntimeException, std::exception)
void SAL_CALL OGroups::disposing()
{
::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose));
::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&css::report::XGroup::dispose));
m_aGroups.clear();
lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) );
m_aContainerListeners.disposeAndClear( aDisposeEvent );
......
......@@ -24,7 +24,7 @@ namespace reportdesign
using namespace com::sun::star;
using namespace comphelper;