Tag: cws_src680_oj14 User: fs Date: 2007-06-18 12:50:05+0000 Modified: dba/reportdesign/inc/helpids.hrc dba/reportdesign/source/ui/dlg/Condition.cxx dba/reportdesign/source/ui/inspection/GeometryHandler.cxx dba/reportdesign/source/ui/inspection/metadata.cxx dba/reportdesign/util/hidother.src
Log: help id long names must be unique across modules File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: helpids.hrc Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/helpids.hrc?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +8 -8 ------------------- --- helpids.hrc 2007-05-11 09:24:18+0000 1.1.2.2 +++ helpids.hrc 2007-06-18 12:50:02+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: helpids.hrc,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2007/05/11 09:24:18 $ + * last change: $Author: fs $ $Date: 2007/06/18 12:50:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,8 +61,8 @@ #define HID_CONDFORMAT_TB (HID_RPT_START + 19) #define HID_CRTL_FORMAT_PREVIEW (HID_RPT_START + 20) #define HID_COND_DLG (HID_RPT_START + 21) -#define HID_POPUP_COLOR_CTRL (HID_RPT_START + 22) -#define HID_POPUP_COLOR (HID_RPT_START + 23) +#define HID_RPT_POPUP_COLOR_CTRL (HID_RPT_START + 22) +#define HID_RPT_POPUP_COLOR (HID_RPT_START + 23) #define HID_FIELD_SEL (HID_RPT_START + 24) #define HID_FIELD_SEL_WIN (HID_RPT_START + 25) #define HID_PROPDLG_TAB_GENERAL (HID_RPT_START + 26) @@ -103,8 +103,8 @@ // free #define HID_PROP_DATAFIELD (HID_RPT_START + 61) #define HID_PROP_BACKCOLOR (HID_RPT_START + 62) -#define HID_PROP_POSITIONX (HID_RPT_START + 63) -#define HID_PROP_POSITIONY (HID_RPT_START + 64) +#define HID_RPT_PROP_POSITIONX (HID_RPT_START + 63) +#define HID_RPT_PROP_POSITIONY (HID_RPT_START + 64) #define HID_PROP_WIDTH (HID_RPT_START + 65) #define HID_PROP_HEIGHT (HID_RPT_START + 66) #define HID_START_TITLE (HID_RPT_START + 67) @@ -115,8 +115,8 @@ #define HID_REPORT_NAVIGATOR_TREE (HID_RPT_START + 72) #define HID_PROP_FORMULA (HID_RPT_START + 73) #define HID_PROP_INITIALFORMULA (HID_RPT_START + 74) -#define HID_PROP_FONT (HID_RPT_START + 75) -#define UID_PROP_DLG_FONT_TYPE (HID_RPT_START + 76) +#define HID_RPT_PROP_FONT (HID_RPT_START + 75) +#define UID_RPT_PROP_DLG_FONT_TYPE (HID_RPT_START + 76) #define HID_PROP_PRESERVEIRI (HID_RPT_START + 77) #define HID_PROP_BACKTRANSPARENT (HID_RPT_START + 78) #define HID_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79) Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: Condition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/Condition.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +4 -4 ------------------- --- Condition.cxx 2007-05-24 09:55:04+0000 1.1.2.4 +++ Condition.cxx 2007-06-18 12:50:02+0000 1.1.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: Condition.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: fs $ $Date: 2007/05/24 09:55:04 $ + * last change: $Author: fs $ $Date: 2007/06/18 12:50:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,8 +120,8 @@ ,m_nSlotId(0) ,m_aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ) { - m_aColorSet.SetHelpId( HID_POPUP_COLOR_CTRL ); - SetHelpId( HID_POPUP_COLOR ); + m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL ); + SetHelpId( HID_RPT_POPUP_COLOR ); const Size aSize12( 13, 13 ); ::std::auto_ptr<XColorTable> pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() )); short i = 0; Directory: /dba/reportdesign/source/ui/inspection/ ================================================== File [changed]: GeometryHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/GeometryHandler.cxx?r1=1.1.2.11&r2=1.1.2.12 Delta lines: +3 -3 ------------------- --- GeometryHandler.cxx 2007-06-13 13:23:23+0000 1.1.2.11 +++ GeometryHandler.cxx 2007-06-18 12:50:02+0000 1.1.2.12 @@ -4,9 +4,9 @@ * * $RCSfile: GeometryHandler.cxx,v $ * - * $Revision: 1.1.2.11 $ + * $Revision: 1.1.2.12 $ * - * last change: $Author: fs $ $Date: 2007/06/13 13:23:23 $ + * last change: $Author: fs $ $Date: 2007/06/18 12:50:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -615,7 +615,7 @@ aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); break; case PROPERTY_ID_CHARFONTNAME: - aOut.PrimaryButtonId = UID_PROP_DLG_FONT_TYPE; + aOut.PrimaryButtonId = UID_RPT_PROP_DLG_FONT_TYPE; aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; File [changed]: metadata.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/metadata.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +7 -8 ------------------- --- metadata.cxx 2007-06-06 09:16:51+0000 1.1.2.3 +++ metadata.cxx 2007-06-18 12:50:02+0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: metadata.cxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: oj $ $Date: 2007/06/06 09:16:51 $ + * last change: $Author: fs $ $Date: 2007/06/18 12:50:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -170,12 +170,11 @@ ,DEF_INFO_1( GROUPKEEPTOGETHER, GROUPKEEPTOGETHER, GROUPKEEPTOGETHER, COMPOSEABLE ) ,DEF_INFO_1( PAGEHEADEROPTION, PAGEHEADEROPTION, PAGEHEADEROPTION, COMPOSEABLE ) ,DEF_INFO_1( PAGEFOOTEROPTION, PAGEFOOTEROPTION, PAGEFOOTEROPTION, COMPOSEABLE ) - ,DEF_INFO_1( POSITIONX, POSITIONX, POSITIONX, COMPOSEABLE ) - ,DEF_INFO_1( POSITIONY, POSITIONY, POSITIONY, COMPOSEABLE ) - ,DEF_INFO_1( WIDTH, WIDTH, WIDTH, COMPOSEABLE ) - ,DEF_INFO_1( HEIGHT, HEIGHT, HEIGHT, COMPOSEABLE ) - ,DEF_INFO_1( HEIGHT, HEIGHT, HEIGHT, COMPOSEABLE ) - ,DEF_INFO_1( CHARFONTNAME, FONT, FONT, COMPOSEABLE ) + ,DEF_INFO_1( POSITIONX, POSITIONX, RPT_POSITIONX, COMPOSEABLE ) + ,DEF_INFO_1( POSITIONY, POSITIONY, RPT_POSITIONY, COMPOSEABLE ) + ,DEF_INFO_1( WIDTH, WIDTH, RPT_WIDTH, COMPOSEABLE ) + ,DEF_INFO_1( HEIGHT, HEIGHT, RPT_HEIGHT, COMPOSEABLE ) + ,DEF_INFO_1( CHARFONTNAME, FONT, RPT_FONT, COMPOSEABLE ) ,DEF_INFO_1( PREEVALUATED, PREEVALUATED, PREEVALUATED, COMPOSEABLE ) ,DEF_INFO_1( DEEPTRAVERSING, DEEPTRAVERSING, DEEPTRAVERSING, COMPOSEABLE ) ,DEF_INFO_1( FORMULA, FORMULA, FORMULA, COMPOSEABLE ) Directory: /dba/reportdesign/util/ ================================== File [changed]: hidother.src Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/hidother.src?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +10 -10 --------------------- --- hidother.src 2007-05-30 16:25:20+0000 1.1.2.3 +++ hidother.src 2007-06-18 12:50:03+0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: oj $ $Date: 2007/05/30 16:25:20 $ + * last change: $Author: fs $ $Date: 2007/06/18 12:50:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,8 +71,8 @@ hidspecial HID_CONDFORMAT_DLG { HelpId = HID_CONDFORMAT_DLG ; }; hidspecial HID_CRTL_FORMAT_PREVIEW { HelpId = HID_CRTL_FORMAT_PREVIEW ; }; hidspecial HID_COND_DLG { HelpId = HID_COND_DLG ; }; -hidspecial HID_POPUP_COLOR_CTRL { HelpId = HID_POPUP_COLOR_CTRL ; }; -hidspecial HID_POPUP_COLOR { HelpId = HID_POPUP_COLOR ; }; +hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; }; +hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; }; hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; hidspecial HID_PROPDLG_TAB_GENERAL { HelpId = HID_PROPDLG_TAB_GENERAL ; }; hidspecial HID_PROPDLG_TAB_DATA { HelpId = HID_PROPDLG_TAB_DATA ; }; @@ -95,10 +95,10 @@ hidspecial HID_PROP_PAGEHEADEROPTION { HelpId = HID_PROP_PAGEHEADEROPTION; }; hidspecial HID_PROP_PAGEFOOTEROPTION { HelpId = HID_PROP_PAGEFOOTEROPTION; }; hidspecial UID_PROP_DLG_LINE_STYLE { HelpId = UID_PROP_DLG_LINE_STYLE; }; -hidspecial HID_PROP_POSITIONX { HelpId = HID_PROP_POSITIONX; }; -hidspecial HID_PROP_POSITIONY { HelpId = HID_PROP_POSITIONY; }; -hidspecial HID_PROP_WIDTH { HelpId = HID_PROP_WIDTH; }; -hidspecial HID_PROP_HEIGHT { HelpId = HID_PROP_HEIGHT; }; +hidspecial HID_RPT_PROP_POSITIONX { HelpId = HID_RPT_PROP_POSITIONX; }; +hidspecial HID_RPT_PROP_POSITIONY { HelpId = HID_RPT_PROP_POSITIONY; }; +hidspecial HID_RPT_PROP_WIDTH { HelpId = HID_RPT_PROP_WIDTH; }; +hidspecial HID_RPT_PROP_HEIGHT { HelpId = HID_RPT_PROP_HEIGHT; }; hidspecial HID_START_TITLE { HelpId = HID_START_TITLE; }; hidspecial HID_START_IMAGE { HelpId = HID_START_IMAGE; }; hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; @@ -113,8 +113,8 @@ hidspecial HID_PROP_FORMULA { HelpId = HID_PROP_FORMULA; }; hidspecial HID_PROP_INITIALFORMULA { HelpId = HID_PROP_INITIALFORMULA; };x hidspecial HID_PROP_DATAFIELD { HelpId = HID_PROP_DATAFIELD; }; -hidspecial HID_PROP_FONT { HelpId = HID_PROP_FONT; }; -hidspecial UID_PROP_DLG_FONT_TYPE { HelpId = UID_PROP_DLG_FONT_TYPE; }; +hidspecial HID_RPT_PROP_FONT { HelpId = HID_RPT_PROP_FONT; }; +hidspecial UID_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_PROP_DLG_FONT_TYPE; }; hidspecial HID_PROP_BACKCOLOR { HelpId = HID_PROP_BACKCOLOR; }; hidspecial HID_PROP_PRESERVEIRI { HelpId = HID_PROP_PRESERVEIRI; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
