summaryrefslogtreecommitdiff
path: root/reportdesign/inc
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/inc')
-rw-r--r--reportdesign/inc/ReportDefinition.hxx40
-rw-r--r--reportdesign/inc/ReportHelperDefines.hxx4
-rw-r--r--reportdesign/inc/RptDef.hxx16
-rw-r--r--reportdesign/inc/RptObject.hxx3
-rw-r--r--reportdesign/inc/RptResId.hrc5
-rw-r--r--reportdesign/inc/helpids.hrc4
6 files changed, 47 insertions, 25 deletions
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 2223cf443051..ec9a5c4f5248 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -33,7 +33,7 @@
#include "dllapi.h"
#include <com/sun/star/report/XReportDefinition.hpp>
-#include <cppuhelper/compbase11.hxx>
+#include <cppuhelper/compbase12.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -41,13 +41,15 @@
#include <com/sun/star/frame/XTitle.hpp>
#include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
#include <com/sun/star/frame/XUntitledNumbers.hpp>
+#include <com/sun/star/frame/XModule.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <cppuhelper/propertysetmixin.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
#include <svx/unomod.hxx>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/frame/XModule.hpp>
+
#include "ReportHelperDefines.hxx"
#include <boost/shared_ptr.hpp>
@@ -63,7 +65,7 @@ namespace comphelper
namespace reportdesign
{
class OReportComponentProperties;
- typedef ::cppu::WeakComponentImplHelper11< com::sun::star::report::XReportDefinition
+ typedef ::cppu::WeakComponentImplHelper12< com::sun::star::report::XReportDefinition
,com::sun::star::document::XEventBroadcaster
,com::sun::star::lang::XServiceInfo
,com::sun::star::frame::XModule
@@ -73,6 +75,7 @@ namespace reportdesign
,::com::sun::star::frame::XTitleChangeBroadcaster
,::com::sun::star::frame::XUntitledNumbers
,::com::sun::star::document::XDocumentPropertiesSupplier
+ ,::com::sun::star::datatransfer::XTransferable
,SvxUnoDrawMSFactory> ReportDefinitionBase;
typedef ::cppu::PropertySetMixin<com::sun::star::report::XReportDefinition> ReportDefinitionPropertySet;
@@ -145,6 +148,17 @@ namespace reportdesign
::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper_throw();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers > impl_getUntitledHelper_throw();
+
+ /** loads the report definition from the given storage
+ @precond
+ our mutex is locked
+ @throws
+ */
+ void impl_loadFromStorage_nolck_throw(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage,
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments
+ );
+
protected:
virtual ~OReportDefinition();
@@ -359,6 +373,11 @@ namespace reportdesign
// XDocumentPropertiesSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException);
+ // XTransferable
+ virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException);
+
// comphelper::IEmbeddedHelper
virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const;
virtual ::comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const;
@@ -366,19 +385,6 @@ namespace reportdesign
virtual bool isEnableSetModified() const;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const;
-
- private:
- /** loads the report definition from the given storage
-
- @precond
- our mutex is locked
- @throws
- */
- void impl_loadFromStorage_nolck_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments
- );
-
};
// =============================================================================
} // namespace reportdesign
diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx
index 939c98115b9f..6be7ae969300 100644
--- a/reportdesign/inc/ReportHelperDefines.hxx
+++ b/reportdesign/inc/ReportHelperDefines.hxx
@@ -143,8 +143,8 @@
virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharScaleWidth() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::sal_Int16 SAL_CALL getParaVertAlignment() throw (::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setParaVertAlignment( ::sal_Int16 _paravertalignment ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);\
+ virtual ::com::sun::star::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setVerticalAlign( ::com::sun::star::style::VerticalAlignment _paravertalignment ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::rtl::OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setHyperLinkURL( const ::rtl::OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::rtl::OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 9b30bef5ade3..31aaa2062305 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -37,6 +37,7 @@
#include <comphelper/stl_types.hxx>
#include <comphelper/uno3.hxx>
#include <svx/fmglob.hxx>
+#include <boost/shared_ptr.hpp>
FORWARD_DECLARE_INTERFACE(report,XReportComponent)
@@ -81,13 +82,22 @@ namespace ControlModification
static const ::sal_Int32 HEIGHT_GREATEST = (sal_Int32)10;
}
+class AnyConverter : public ::std::binary_function< ::rtl::OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any >
+{
+public:
+ virtual ~AnyConverter(){}
+ virtual ::com::sun::star::uno::Any operator() (const ::rtl::OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const
+ {
+ return lhs;
+ }
+};
/** returns teh object type depending on the service name
@param _xComponent the report component
*/
REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
-
-DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString , TPropertyNamePair);
-/** returns teh property name map for the givern property id
+typedef ::std::pair< ::rtl::OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter;
+DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair);
+/** returns the property name map for the givern property id
@param _nObjectId the object id
*/
REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId);
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 87778659ea23..8415fd128e1d 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -125,6 +125,7 @@ public:
void EndListening(sal_Bool bRemoveListener = sal_True);
// PropertyChangeListener
virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void initializeOle() {}
sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const;
@@ -193,6 +194,7 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase
friend class DlgEdFactory;
UINT16 m_nType;
+ bool m_bOnlyOnce;
void impl_createDataProvider_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
public:
static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType )
@@ -227,6 +229,7 @@ public:
virtual UINT32 GetObjInventor() const;
// Clone() soll eine komplette Kopie des Objektes erzeugen.
virtual SdrObject* Clone() const;
+ virtual void initializeOle();
void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
};
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index c87ae1a9c216..c9cc382ca253 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -229,11 +229,12 @@
#define RID_STR_AREA (RID_STRING_START + 153)
#define RID_STR_INSERT (RID_STRING_START + 154)
#define RID_STR_UNDO_SHRINK (RID_STRING_START + 155)
-
#define RID_STR_F_COUNTER (RID_STRING_START + 156)
#define RID_STR_F_ACCUMULATION (RID_STRING_START + 157)
#define RID_STR_F_MINIMUM (RID_STRING_START + 158)
#define RID_STR_F_MAXIMUM (RID_STRING_START + 159)
+#define RID_STR_VERTICALALIGN (RID_STRING_START + 160)
+#define RID_STR_PARAADJUST (RID_STRING_START + 161)
// #define RID_STR_ (RID_STRING_START + 130)
@@ -287,6 +288,8 @@
#define RID_STR_REPORTPRINTOPTION_CONST (RID_UNTYPED_START + 4)
#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5)
#define RID_STR_TYPE_CONST (RID_UNTYPED_START + 6)
+#define RID_STR_VERTICAL_ALIGN_CONST (RID_UNTYPED_START + 7)
+#define RID_STR_PARAADJUST_CONST (RID_UNTYPED_START + 8)
// toolbox lists ---------------------------------------------------------------------
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index 6026634499a1..b60f66823623 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -81,11 +81,11 @@
// free
#define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44)
#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45)
-// free
+#define HID_RPT_PROP_VERTICALALIGN (HID_RPT_START + 46)
#define HID_RPT_PROP_STARTNEWCOLUMN (HID_RPT_START + 47)
#define HID_RPT_PROP_STARTNEWPAGE (HID_RPT_START + 48)
#define HID_RPT_PROP_RESETPAGENUMBER (HID_RPT_START + 49)
-// free
+#define HID_RPT_PROP_PARAADJUST (HID_RPT_START + 50)
#define HID_RPT_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51)
#define HID_RPT_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52)
#define HID_RPT_PROP_CHARTTYPE (HID_RPT_START + 53)
generated by cgit (git 2.34.1) at 2024-08-10 03:24:30 +0000