summaryrefslogtreecommitdiff
path: root/reportdesign/inc
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/inc')
-rw-r--r--reportdesign/inc/RptDef.hxx5
-rw-r--r--reportdesign/inc/RptObject.hxx4
-rw-r--r--reportdesign/inc/RptPage.hxx14
-rw-r--r--reportdesign/inc/RptResId.hrc28
-rw-r--r--reportdesign/inc/UndoEnv.hxx30
-rw-r--r--reportdesign/inc/helpids.hrc3
-rw-r--r--reportdesign/inc/reportformula.hxx5
-rw-r--r--reportdesign/inc/rptui_slotid.hrc4
8 files changed, 81 insertions, 12 deletions
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index e86b3134cab8..9b30bef5ade3 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -46,6 +46,11 @@ FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
namespace rptui
{
+// not all used at the moment
+#define RPT_LAYER_FRONT 0
+#define RPT_LAYER_BACK 1
+#define RPT_LAYER_HIDDEN 2
+
const UINT32 ReportInventor = UINT32('R')*0x00000001+
UINT32('P')*0x00000100+
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 50e0afa4afb3..87778659ea23 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -280,6 +280,10 @@ public:
virtual UINT16 GetObjIdentifier() const;
virtual UINT32 GetObjInventor() const;
virtual SdrObject* Clone() const;
+
+private:
+ void impl_setReportComponent_nothrow();
+ void impl_initializeModel_nothrow();
};
//============================================================================
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 66a726bcda37..caed8c0c4eb1 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -46,18 +46,19 @@ class OReportModel;
class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
{
- OReportModel& rModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
- m_xSection;
+ OReportModel& rModel;
+ ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
+ bool m_bSpecialInsertMode;
+ std::vector<SdrObject*> m_aTemporaryObjectList;
OReportPage(const OReportPage&);
- bool m_bSpecialInsertMode;
- std::vector<SdrObject*> m_aTemporaryObjectList;
// methode to remove temporary objects, created by 'special mode'
// (BegDragObj)
void removeTempObject(SdrObject *_pToRemoveObj);
+ virtual ~OReportPage();
+
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
public:
@@ -67,7 +68,6 @@ public:
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
,FASTBOOL bMasterPage=FALSE );
- virtual ~OReportPage();
virtual SdrPage* Clone() const;
using SdrPage::Clone;
@@ -75,7 +75,7 @@ public:
virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason);
virtual SdrObject* RemoveObject(ULONG nObjNum);
- /** returns teh index inside the object list which belongs to the report component.
+ /** returns the index inside the object list which belongs to the report component.
@param _xObject the report component
*/
ULONG getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 10723d4c66b8..c87ae1a9c216 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -228,6 +228,12 @@
#define RID_ERR_NO_OBJECTS (RID_STRING_START + 152)
#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_ (RID_STRING_START + 130)
@@ -263,12 +269,17 @@
#define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3)
#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4)
#define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5)
-#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 6)
-#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 7)
-#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 8)
-#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 9)
+#define IMGLST_GROUPSORT_DLG_SC (RID_IMAGELIST_START + 6)
+#define IMGLST_GROUPSORT_DLG_SCH (RID_IMAGELIST_START + 7)
+#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8)
+#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 9)
+#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 10)
+#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 11)
+
+#define ADDFIELD_FL_HELP_SEPARATOR (RID_IMAGELIST_START + 12)
+#define ADDFIELD_HELP_FIELD (RID_IMAGELIST_START + 13)
-// untyped
+// untyped ---------------------------------------------------------------------
#define RID_STR_BOOL (RID_UNTYPED_START + 0 )
#define RID_STR_FORCENEWPAGE_CONST (RID_UNTYPED_START + 1 )
#define RID_STR_KEEPTOGETHER_CONST (RID_UNTYPED_START + 2)
@@ -277,4 +288,11 @@
#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5)
#define RID_STR_TYPE_CONST (RID_UNTYPED_START + 6)
+// toolbox lists ---------------------------------------------------------------------
+
+#define SID_RPT_GROUPSORT_MOVE_UP ( RID_TOOLBOX_START + 0 )
+#define SID_RPT_GROUPSORT_MOVE_DOWN ( RID_TOOLBOX_START + 1 )
+#define SID_RPT_GROUPSORT_DELETE ( RID_TOOLBOX_START + 2 )
+
#endif // _RPTUI_DLGRESID_HRC
+
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 8385ad6cd15c..af02366b3ff6 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -57,9 +57,15 @@ namespace rptui
protected:
virtual ~OXUndoEnvironment();
+ void SetUndoMode(sal_Bool _bUndo);
+
public:
OXUndoEnvironment(OReportModel& _rModel);
+ /**
+ Create an object ob OUndoEnvLock locks the undo possibility
+ As long as in the OUndoEnvLock scope, no undo is possible for manipulated object.
+ */
class OUndoEnvLock
{
OXUndoEnvironment& m_rUndoEnv;
@@ -68,10 +74,34 @@ namespace rptui
~OUndoEnvLock(){ m_rUndoEnv.UnLock(); }
};
+ /**
+ This is near the same as OUndoEnvLock but it is also possible to ask for the current mode.
+ UndoMode will set if SID_UNDO is called in execute()
+ */
+ class OUndoMode
+ {
+ OXUndoEnvironment& m_rUndoEnv;
+ public:
+ OUndoMode(OXUndoEnvironment& _rUndoEnv)
+ :m_rUndoEnv(_rUndoEnv)
+ {
+ m_rUndoEnv.Lock();
+ m_rUndoEnv.SetUndoMode(sal_True);
+ }
+ ~OUndoMode()
+ {
+ m_rUndoEnv.SetUndoMode(sal_False);
+ m_rUndoEnv.UnLock();
+ }
+ };
+
void Lock();
void UnLock();
sal_Bool IsLocked() const;
+ // returns sal_True is we are in UNDO
+ sal_Bool IsUndoMode() const;
+
// access control
struct Accessor { friend class OReportModel; private: Accessor() { } };
void Clear(const Accessor& _r);
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index 2366621db2e2..6026634499a1 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -120,6 +120,9 @@
#define UID_RPT_PROP_DLG_LINKFIELDS (HID_RPT_START + 81)
#define UID_RPT_PROP_FORMULA (HID_RPT_START + 82)
+#define HID_RPT_GROUPSORT_MOVE_UP (HID_RPT_START + 82)
+#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83)
+#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84)
#if UID_RPT_PROP_FORMULA > HID_RPT_END
#error Help-Id Ueberlauf in #file, #line
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index f4e217acc450..18d70930edc6 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -99,6 +99,11 @@ namespace rptui
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression
inline ::rtl::OUString getFieldName() const;
+ /**
+ @returns "=" + getFieldName()
+ */
+ ::rtl::OUString getEqualUndecoratedContent() const;
+
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on a field
inline ::rtl::OUString getExpression() const;
diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc
index 472eefd523b0..68b3019f2d86 100644
--- a/reportdesign/inc/rptui_slotid.hrc
+++ b/reportdesign/inc/rptui_slotid.hrc
@@ -204,5 +204,9 @@
#define SID_SELECT_ALL_LABELS ( SID_RPTUI_START + 161 )
#define SID_SELECT_ALL_EDITS ( SID_RPTUI_START + 162 )
+#define SID_SECTION_SHRINK ( SID_RPTUI_START + 163 )
+#define SID_SECTION_SHRINK_TOP ( SID_RPTUI_START + 164 )
+#define SID_SECTION_SHRINK_BOTTOM ( SID_RPTUI_START + 165 )
+#define SID_SECTION_SHRINK_MENU ( SID_RPTUI_START + 166 )
#endif // _RPTUI_SLOTID_HRC_
generated by cgit (git 2.34.1) at 2025-05-19 04:58:42 +0000