diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-10 13:41:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-10 13:41:25 +0000 |
| commit | 024b1b81e95fb6ad5f22f68977bc0e7f73d63d08 (patch) | |
| tree | 23437753863d3c8d8f568c344b6aa6998fad8022 /reportdesign/inc | |
| parent | b3294437e2d0f70224e16a7e8cd787407a8c53c2 (diff) | |
CWS-TOOLING: integrate CWS dba31f
2008-12-10 14:16:09 +0100 oj r265185 : #i96658# remove is
2008-12-10 08:46:07 +0100 oj r265147 : remove duplicate ids
2008-12-10 08:35:02 +0100 oj r265146 : #i96658# remove is
2008-12-09 11:44:35 +0100 oj r265072 : use of tools::StringresourceList
2008-12-09 11:43:41 +0100 oj r265071 : new class to read string elements from a Resource
2008-12-09 11:41:56 +0100 oj r265070 : export StringListResource
2008-12-09 11:38:17 +0100 oj r265068 : change string ; to more string objects
2008-12-08 12:11:43 +0100 oj r264985 : change default-license-id to lic-en-US
2008-12-05 12:06:09 +0100 oj r264896 : disable check to uncheck
2008-12-04 08:58:50 +0100 oj r264814 : #i96517,i96520,i96522# d&d, background, state fixed
2008-12-04 08:53:29 +0100 oj r264813 : #i96434# use document ui name from filter
2008-12-04 08:41:06 +0100 oj r264812 : #i96434# use document ui name from filter
2008-12-02 13:48:49 +0100 lla r264697 : #i96526# extra string for default otr wasn't found
2008-11-28 11:46:31 +0100 oj r264536 : move toolbar and resize add field dlg
2008-11-28 08:38:22 +0100 oj r264526 : load string resources
2008-11-27 19:28:52 +0100 oj r264520 : unsigned
2008-11-27 19:10:19 +0100 oj r264517 : move class into unnamed namespace
2008-11-27 18:33:38 +0100 oj r264514 : wrong param
2008-11-27 16:52:39 +0100 oj r264510 : #i96622# wrong string replacement
2008-11-27 16:46:03 +0100 oj r264509 : remove unused var
2008-11-27 13:37:16 +0100 oj r264484 : #i96432# notify only when not in special mode of the page
2008-11-27 13:16:47 +0100 oj r264479 : #i95224# accept alias in group by
2008-11-27 12:35:19 +0100 oj r264477 : #i95416# always show localized strings in the start marker
2008-11-27 09:49:29 +0100 oj r264455 : #i93460# set split pos
2008-11-27 09:05:27 +0100 oj r264447 : #i96453# use extension from mimetype / mediatype
2008-11-26 16:24:43 +0100 oj r264416 : #i96520# #i96522# #i96519# some changes at the add field dialog
2008-11-26 16:20:27 +0100 oj r264414 : #i93420# prevent to register a none system file url
2008-11-26 16:19:02 +0100 oj r264413 : #i96522# new class to paste multiple objects
2008-11-26 10:06:12 +0100 oj r264349 : #i96191# introduce new error message and check if type was defined aand should not be changed
2008-11-26 10:06:12 +0100 oj r264348 : #i96191# throw error when decimal is to big
2008-11-25 12:08:59 +0100 oj r264281 : #i96431# correct state for align and move
2008-11-25 11:54:47 +0100 oj r264280 : #i96428# when new bind to first table
2008-11-25 11:49:55 +0100 oj r264279 : #i96434# add report output format to inspection
2008-11-25 11:49:05 +0100 oj r264278 : #i96434# add report output format to inspection
2008-11-24 10:46:23 +0100 oj r264215 : #i96458# size width for controls
2008-11-24 09:28:56 +0100 oj r264199 : #i96459# mark detail section when nothing is selected
2008-11-20 12:02:35 +0100 oj r264038 : #i96191# fix check for prec
2008-11-20 08:06:32 +0100 oj r264026 : #i90949# patch MID function
2008-11-11 13:14:58 +0100 oj r263555 : #i96086# apply patch
2008-11-11 11:34:46 +0100 oj r263549 : #i94128# correct height of section when controls moved outside
2008-11-11 07:52:08 +0100 oj r263544 : #i94729# fix string with ; as sep
2008-11-11 07:45:27 +0100 oj r263543 : #i95222# export chart title style
2008-11-11 07:43:37 +0100 oj r263542 : #i92541# fix line height
Diffstat (limited to 'reportdesign/inc')
| -rw-r--r-- | reportdesign/inc/RptResId.hrc | 29 | ||||
| -rw-r--r-- | reportdesign/inc/UndoActions.hxx | 5 | ||||
| -rw-r--r-- | reportdesign/inc/helpids.hrc | 2 |
3 files changed, 28 insertions, 8 deletions
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 0faa2de30a08..bb90a0c66873 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -147,7 +147,7 @@ #define RID_STR_PROPPAGE_DATA ( RID_STRING_START + 75 ) #define RID_STR_FILTER ( RID_STRING_START + 76 ) -#define RID_STR_BOOL ( RID_STRING_START + 77 ) +// free #define RID_STR_FORCENEWPAGE (RID_STRING_START + 78) #define RID_STR_NEWROWORCOL (RID_STRING_START + 79) @@ -179,14 +179,14 @@ #define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) #define RID_STR_VISIBLE (RID_STRING_START + 105) -#define RID_STR_FORCENEWPAGE_CONST (RID_STRING_START + 106) -#define RID_STR_KEEPTOGETHER_CONST (RID_STRING_START + 107) +#define RID_STR_DETAIL (RID_STRING_START + 106) +#define RID_STR_PAGE_HEADER (RID_STRING_START + 107) #define RID_STR_GROUPKEEPTOGETHER (RID_STRING_START + 108) -#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_STRING_START + 109) +#define RID_STR_PAGE_FOOTER (RID_STRING_START + 109) #define RID_STR_PAGEHEADEROPTION (RID_STRING_START + 110) #define RID_STR_PAGEFOOTEROPTION (RID_STRING_START + 111) -#define RID_STR_REPORTPRINTOPTION_CONST (RID_STRING_START + 112) -#define RID_STR_SECTIONPAGEBREAK_CONST (RID_STRING_START + 113) +#define RID_STR_REPORT_HEADER (RID_STRING_START + 112) +#define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) #define RID_STR_SCOPE_GROUP (RID_STRING_START + 114) #define RID_APP_TITLE (RID_STRING_START + 115) #define RID_APP_NEW_DOC (RID_STRING_START + 116) @@ -216,7 +216,7 @@ #define RID_STR_FORMULALIST (RID_STRING_START + 140) #define RID_STR_SCOPE (RID_STRING_START + 141) #define RID_STR_TYPE (RID_STRING_START + 142) -#define RID_STR_TYPE_CONST (RID_STRING_START + 143) +#define RID_STR_MIMETYPE (RID_STRING_START + 143) #define RID_STR_CHARTTYPE (RID_STRING_START + 144) #define RID_STR_MASTERFIELDS (RID_STRING_START + 145) #define RID_STR_DETAILFIELDS (RID_STRING_START + 146) @@ -229,6 +229,7 @@ #define RID_STR_AREA (RID_STRING_START + 153) #define RID_STR_NONE (RID_STRING_START + 154) + // #define RID_STR_ (RID_STRING_START + 130) // ----------------------------------------------------------------------- #define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 ) @@ -253,6 +254,7 @@ #define RID_MENU_REPORT ( RID_MENU_START + 0 ) #define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 1 ) #define RID_MENU_NAVIGATOR ( RID_MENU_START + 2 ) +#define RID_TB_SORTING ( RID_MENU_START + 3 ) // image lists ----------------------------------------------------------------------- #define IMG_CONDFORMAT_DLG_SC (RID_IMAGELIST_START + 0) @@ -261,5 +263,18 @@ #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)
+ +// 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) +#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_UNTYPED_START + 3) +#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) #endif // _RPTUI_DLGRESID_HRC diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index d953af088cf1..3ec771c90844 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -113,6 +113,11 @@ namespace rptui inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } + inline ::sal_Bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } + inline ::sal_Bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } + inline ::sal_Bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); } + inline ::sal_Bool getPageFooterOn() { return m_xReport->getPageFooterOn(); } + static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); }; diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index cf0794543a25..4bcc6df1a78d 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -76,7 +76,7 @@ #define HID_RPT_PROP_DETAILFIELDS (HID_RPT_START + 38) #define HID_RPT_PROP_AREA (HID_RPT_START + 39) #define UID_RPT_RPT_PROP_DLG_AREA (HID_RPT_START + 40) -// free +#define HID_RPT_PROP_MIMETYPE (HID_RPT_START + 41) // free // free #define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44) |