diff options
29 files changed, 420 insertions, 170 deletions
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 4bea3330f617..2bbf94ed50c7 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -55,12 +55,11 @@ // warning, next range is RID_FILTER_START + 100 ! -#define HID_FILTER_XSLT_START (HID_FILTER_START + 0) // see source/xsltdialog/xmlfilterhelpids.hrc for range -#define HID_FILTER_XSLT_END (HID_FILTER_START + 99) -#define HID_FILTER_PDF_OPTIONS (HID_FILTER_START + 100) -#define HID_FILTER_PDF_INITIAL_VIEW (HID_FILTER_START + 101) -#define HID_FILTER_PDF_USER_INTERFACE (HID_FILTER_START + 102) -#define HID_FILTER_PDF_SECURITY (HID_FILTER_START + 103) -#define HID_FILTER_PDF_LINKS (HID_FILTER_START + 104) +#define HID_FILTER_PDF_OPTIONS "HID_FILTER_PDF_OPTIONS" +#define HID_FILTER_PDF_INITIAL_VIEW "HID_FILTER_PDF_INITIAL_VIEW" +#define HID_FILTER_PDF_USER_INTERFACE "HID_FILTER_PDF_USER_INTERFACE" +#define HID_FILTER_PDF_SECURITY "HID_FILTER_PDF_SECURITY" +#define HID_FILTER_PDF_LINKS "HID_FILTER_PDF_LINKS" + #endif diff --git a/filter/source/config/fragments/filters/Rich_Text_Format.xcu b/filter/source/config/fragments/filters/Rich_Text_Format.xcu index dc8b07e45536..d8fb18c96d06 100644 --- a/filter/source/config/fragments/filters/Rich_Text_Format.xcu +++ b/filter/source/config/fragments/filters/Rich_Text_Format.xcu @@ -1,7 +1,7 @@ <node oor:name="Rich Text Format" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"/> + <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.RtfFilter</value></prop> <prop oor:name="UserData"><value>RTF</value></prop> <prop oor:name="UIName"> <value xml:lang="x-default">Rich Text Format</value> diff --git a/filter/source/flash/impswfdialog.src b/filter/source/flash/impswfdialog.src index 3e38dde68441..83015a3adfeb 100644 --- a/filter/source/flash/impswfdialog.src +++ b/filter/source/flash/impswfdialog.src @@ -29,6 +29,7 @@ ModalDialog DLG_OPTIONS { + HelpID = "filter:ModalDialog:DLG_OPTIONS"; Size = MAP_APPFONT ( 200 , 200 ) ; OutputSize = TRUE ; SVLook = TRUE ; @@ -44,6 +45,7 @@ ModalDialog DLG_OPTIONS }; NumericField NUM_FLD_QUALITY { + HelpID = "filter:NumericField:DLG_OPTIONS:NUM_FLD_QUALITY"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -57,6 +59,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_ALL { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_ALL"; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -69,6 +72,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_MULTIPLE_FILES { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_MULTIPLE_FILES"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -81,6 +85,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_BACKGROUNDS { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_BACKGROUNDS"; Pos = MAP_APPFONT ( 22 , 95 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -93,6 +98,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_BACKGROUND_OBJECTS { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_BACKGROUND_OBJECTS"; Pos = MAP_APPFONT ( 22 , 107) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -105,6 +111,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_SLIDE_CONTENTS { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_SLIDE_CONTENTS"; Pos = MAP_APPFONT ( 22 , 119 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -117,6 +124,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_SOUND { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_SOUND"; Pos = MAP_APPFONT ( 12 , 134 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -129,6 +137,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_OLE_AS_JPEG { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_OLE_AS_JPEG"; Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src index 76e64e87c173..248d7d8491f7 100644 --- a/filter/source/pdf/impdialog.src +++ b/filter/source/pdf/impdialog.src @@ -65,24 +65,28 @@ TabPage RID_PDF_TAB_GENER }; RadioButton RB_ALL { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~All"; }; RadioButton RB_RANGE { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 101 , 10 ) ; Text[ en-US ] = "~Pages"; }; Edit ED_PAGES { + HelpID = "filter:Edit:RID_PDF_TAB_GENER:ED_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 116, 26 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; }; RadioButton RB_SELECTION { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Selection"; @@ -95,12 +99,14 @@ TabPage RID_PDF_TAB_GENER }; RadioButton RB_LOSSLESSCOMPRESSION { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION"; Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Lossless compression"; }; RadioButton RB_JPEGCOMPRESSION { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION"; Pos = MAP_APPFONT ( 12 , 76 ) ; Size = MAP_APPFONT ( 158, 10 ) ; Text[ en-US ] = "~JPEG compression"; @@ -113,6 +119,7 @@ TabPage RID_PDF_TAB_GENER }; MetricField NF_QUALITY { + HelpID = "filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY"; Border = TRUE ; Pos = MAP_APPFONT ( 116, 88 ) ; Size = MAP_APPFONT ( 48, 12 ) ; @@ -124,6 +131,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_REDUCEIMAGERESOLUTION { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION"; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 101 , 10 ) ; TabStop = TRUE ; @@ -131,6 +139,7 @@ TabPage RID_PDF_TAB_GENER }; ComboBox CO_REDUCEIMAGERESOLUTION { + HelpID = "filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION"; Pos = MAP_APPFONT ( 116 , 102 ) ; Size = MAP_APPFONT ( 48 , 50 ) ; TabStop = TRUE ; @@ -152,6 +161,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_PDFA_1B_SELECT { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_PDFA_1B_SELECT"; Pos = MAP_APPFONT ( 12, 128 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -159,6 +169,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_TAGGEDPDF { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF"; Pos = MAP_APPFONT ( 12 , 141 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -166,6 +177,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTFORMFIELDS { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS"; Pos = MAP_APPFONT ( 12 , 154 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -179,6 +191,7 @@ TabPage RID_PDF_TAB_GENER }; ListBox LB_FORMSFORMAT { + HelpID = "filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 126, 166 ) ; Size = MAP_APPFONT ( 38, 48 ) ; @@ -195,6 +208,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_ALLOWDUPLICATEFIELDNAMES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES"; Pos = MAP_APPFONT( 30, 178 ); Size = MAP_APPFONT( 128, 10 ); TabStop = TRUE; @@ -202,6 +216,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTBOOKMARKS { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS"; Pos = MAP_APPFONT ( 12 , 190 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -209,6 +224,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTNOTES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES"; Pos = MAP_APPFONT ( 12 , 203 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -216,6 +232,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTNOTESPAGES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES"; Pos = MAP_APPFONT ( 12 , 216 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -223,6 +240,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTEMPTYPAGES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES"; Pos = MAP_APPFONT ( 12 , 229 ) ; Size = MAP_APPFONT ( 158 , 16 ) ; TabStop = TRUE ; @@ -231,6 +249,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EMBEDSTANDARDFONTS { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS"; Pos = MAP_APPFONT ( 12 , 248 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -238,6 +257,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_ADDSTREAM { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM"; Pos = MAP_APPFONT ( 12 , 261 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -263,18 +283,21 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_OPNMODE_PAGEONLY { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Page only" ; }; RadioButton RB_OPNMODE_OUTLINE { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Bookmarks and page" ; }; RadioButton RB_OPNMODE_THUMBS { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Thumbnails and page" ; @@ -288,6 +311,7 @@ TabPage RID_PDF_TAB_OPNFTR }; NumericField NUM_MAGNF_INITIAL_PAGE { + HelpID = "filter:NumericField:RID_PDF_TAB_OPNFTR:NUM_MAGNF_INITIAL_PAGE"; Pos = MAP_APPFONT( 124, 52 ); Size = MAP_APPFONT( 40, 12 ); Value = 1; @@ -305,6 +329,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_DEFAULT { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /XYZ ) Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -312,6 +337,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_WIND { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /Fit ) Pos = MAP_APPFONT ( 12 , 92 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -319,6 +345,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_WIDTH { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitH top ) Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -326,6 +353,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_VISIBLE { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitBH top ) Pos = MAP_APPFONT ( 12 , 116 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -333,6 +361,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_ZOOM { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_ZOOM"; // see PDF ref v 1.6 tab 8.2, pg. 551 ( /XYZ left top zoom ) Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; @@ -340,6 +369,7 @@ TabPage RID_PDF_TAB_OPNFTR }; MetricField NUM_MAGNF_ZOOM { + HelpID = "filter:MetricField:RID_PDF_TAB_OPNFTR:NUM_MAGNF_ZOOM"; Pos = MAP_APPFONT( 124, 128 ) ; Size = MAP_APPFONT( 40, 12 ) ; Unit = FUNIT_PERCENT; @@ -358,30 +388,35 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_PGLY_DEFAULT { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "D~efault" ; }; RadioButton RB_PGLY_SINGPG { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG"; Pos = MAP_APPFONT ( 12 , 170 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Single page" ; }; RadioButton RB_PGLY_CONT { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT"; Pos = MAP_APPFONT ( 12 , 182 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Continuous" ; }; RadioButton RB_PGLY_CONTFAC { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC"; Pos = MAP_APPFONT ( 12 , 194 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "C~ontinuous facing" ; }; CheckBox CB_PGLY_FIRSTLEFT { + HelpID = "filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT"; Pos = MAP_APPFONT ( 22 , 206 ) ; Size = MAP_APPFONT ( 148 , 10 ) ; Text[ en-US ] = "First page is ~left" ; @@ -407,6 +442,7 @@ TabPage RID_PDF_TAB_VPREFER CheckBox CB_WNDOPT_RESINIT { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -414,6 +450,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_WNDOPT_CNTRWIN { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -421,12 +458,14 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_WNDOPT_OPNFULL { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Open in full screen mode" ; }; CheckBox CB_DISPDOCTITLE { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_DISPDOCTITLE"; Pos = MAP_APPFONT ( 12 , 50 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -442,6 +481,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_UOP_HIDEVMENUBAR { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR"; Pos = MAP_APPFONT ( 12 , 76 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -449,6 +489,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_UOP_HIDEVTOOLBAR { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR"; Pos = MAP_APPFONT ( 12 , 88 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -456,6 +497,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_UOP_HIDEVWINCTRL { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -471,6 +513,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_TRANSITIONEFFECTS { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_TRANSITIONEFFECTS"; Pos = MAP_APPFONT ( 12 , 126 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -485,18 +528,21 @@ TabPage RID_PDF_TAB_VPREFER }; RadioButton RB_ALLBOOKMARKLEVELS { + HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_ALLBOOKMARKLEVELS"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "All bookmark levels"; }; RadioButton RB_VISIBLEBOOKMARKLEVELS { + HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_VISIBLEBOOKMARKLEVELS"; Pos = MAP_APPFONT ( 12 , 166 ) ; Size = MAP_APPFONT ( 117 , 10 ) ; Text[ en-US ] = "Visible bookmark levels"; }; NumericField NUM_BOOKMARKLEVELS { + HelpID = "filter:NumericField:RID_PDF_TAB_VPREFER:NUM_BOOKMARKLEVELS"; Pos = MAP_APPFONT ( 132 , 165 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; Border = TRUE; @@ -518,6 +564,7 @@ TabPage RID_PDF_TAB_SECURITY ////////////////////////////////////// PushButton BTN_USER_PWD { + HelpID = "filter:PushButton:RID_PDF_TAB_SECURITY:BTN_USER_PWD"; TabStop = TRUE ; Disable = TRUE ; Pos = MAP_APPFONT ( 12, 5 ) ; @@ -553,6 +600,7 @@ TabPage RID_PDF_TAB_SECURITY PushButton BTN_OWNER_PWD { + HelpID = "filter:PushButton:RID_PDF_TAB_SECURITY:BTN_OWNER_PWD"; TabStop = TRUE ; Disable = TRUE ; Pos = MAP_APPFONT ( 12, 45 ) ; @@ -595,18 +643,21 @@ TabPage RID_PDF_TAB_SECURITY }; RadioButton RB_PRINT_NONE { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE"; Pos = MAP_APPFONT ( 18 , 101 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Not permitted"; }; RadioButton RB_PRINT_LOWRES { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_LOWRES"; Pos = MAP_APPFONT ( 18 , 112 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Low resolution (150 dpi)"; }; RadioButton RB_PRINT_HIGHRES { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_HIGHRES"; Pos = MAP_APPFONT ( 18 , 123 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~High resolution"; @@ -621,24 +672,28 @@ TabPage RID_PDF_TAB_SECURITY }; RadioButton RB_CHANGES_NONE { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_NONE"; Pos = MAP_APPFONT ( 18 , 145 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "No~t permitted"; }; RadioButton RB_CHANGES_INSDEL { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_INSDEL"; Pos = MAP_APPFONT ( 18 , 157 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Inserting, deleting, and rotating pages"; }; RadioButton RB_CHANGES_FILLFORM { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_FILLFORM"; Pos = MAP_APPFONT ( 18 , 168 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Filling in form fields"; }; RadioButton RB_CHANGES_COMMENT { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_COMMENT"; Pos = MAP_APPFONT ( 18 , 179 ) ; Size = MAP_APPFONT ( 152 , 16 ) ; WordBreak = TRUE ; @@ -646,6 +701,7 @@ TabPage RID_PDF_TAB_SECURITY }; RadioButton RB_CHANGES_ANY_NOCOPY { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_ANY_NOCOPY"; Pos = MAP_APPFONT ( 18 , 198 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text[ en-US ] = "~Any except extracting pages"; @@ -653,6 +709,7 @@ TabPage RID_PDF_TAB_SECURITY CheckBox CB_ENDAB_COPY { + HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENDAB_COPY"; Pos = MAP_APPFONT ( 12 , 211 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -661,6 +718,7 @@ TabPage RID_PDF_TAB_SECURITY CheckBox CB_ENAB_ACCESS { + HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENAB_ACCESS"; Pos = MAP_APPFONT ( 12 , 224 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -679,6 +737,7 @@ TabPage RID_PDF_TAB_LINKS CheckBox CB_EXP_BMRK_TO_DEST { + HelpID = "filter:CheckBox:RID_PDF_TAB_LINKS:CB_EXP_BMRK_TO_DEST"; Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 164 , 16 ) ; TabStop = TRUE ; @@ -688,6 +747,7 @@ TabPage RID_PDF_TAB_LINKS CheckBox CB_CNV_OOO_DOCTOPDF { + HelpID = "filter:CheckBox:RID_PDF_TAB_LINKS:CB_CNV_OOO_DOCTOPDF"; Pos = MAP_APPFONT ( 6 , 22 ) ; Size = MAP_APPFONT ( 164 , 16 ) ; TabStop = TRUE ; @@ -697,6 +757,7 @@ TabPage RID_PDF_TAB_LINKS CheckBox CB_ENAB_RELLINKFSYS { + HelpID = "filter:CheckBox:RID_PDF_TAB_LINKS:CB_ENAB_RELLINKFSYS"; Pos = MAP_APPFONT ( 6 , 41 ) ; Size = MAP_APPFONT ( 164 , 16 ) ; TabStop = TRUE ; @@ -713,6 +774,7 @@ TabPage RID_PDF_TAB_LINKS RadioButton CB_VIEW_PDF_DEFAULT { + HelpID = "filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_DEFAULT"; Pos = MAP_APPFONT ( 12 , 71 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -721,6 +783,7 @@ TabPage RID_PDF_TAB_LINKS RadioButton CB_VIEW_PDF_APPLICATION { + HelpID = "filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_APPLICATION"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -729,6 +792,7 @@ TabPage RID_PDF_TAB_LINKS RadioButton CB_VIEW_PDF_BROWSER { + HelpID = "filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_BROWSER"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -782,6 +846,7 @@ TabDialog RID_PDF_EXPORT_DLG ModalDialog RID_PDF_ERROR_DLG { + HelpID = "filter:ModalDialog:RID_PDF_ERROR_DLG"; OutputSize = TRUE; SVLook = TRUE; Moveable = TRUE; diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx index a9cb18bed8d2..8bd0001dc198 100644 --- a/filter/source/xsltdialog/xmlfileview.cxx +++ b/filter/source/xsltdialog/xmlfileview.cxx @@ -55,6 +55,8 @@ #include "xmlfileview.hrc" #include "xmlfilterhelpids.hrc" +#include <deque> + using namespace rtl; using namespace osl; using namespace com::sun::star::lang; @@ -77,8 +79,7 @@ struct SwTextPortion svtools::ColorConfigEntry eType; }; -SV_DECL_VARARR(SwTextPortions, SwTextPortion,16,16) -SV_IMPL_VARARR(SwTextPortions, SwTextPortion); +typedef std::deque<SwTextPortion> SwTextPortions; class XMLErrorHandler : public ::cppu::WeakImplHelper1< XErrorHandler > { @@ -688,10 +689,10 @@ void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) const USHORT nStrLen = rSource.Len(); - USHORT nInsert = 0; // Anzahl der eingefuegten Portions - USHORT nActPos = 0; //Position, an der '<' gefunden wurde - USHORT nOffset = 0; //Offset von nActPos zur '<' - USHORT nPortStart = USHRT_MAX; // fuer die TextPortion + USHORT nInsert = 0; // Number of inserted Portions + USHORT nActPos = 0; // Position, at the '<' was found + USHORT nOffset = 0; // Offset of nActPos for '<' + USHORT nPortStart = USHRT_MAX; // For the TextPortion USHORT nPortEnd = 0; // SwTextPortion aText; while(nActPos < nStrLen) @@ -709,7 +710,8 @@ void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) aText.nStart += 1; aText.nEnd = nActPos - 1; aText.eType = svtools::HTMLUNKNOWN; - aPortionList.Insert(aText, nInsert++); + aPortionList.push_back( aText ); + nInsert++; } sal_Unicode cFollowFirst = rSource.GetChar((xub_StrLen)(nActPos + 1)); sal_Unicode cFollowNext = rSource.GetChar((xub_StrLen)(nActPos + 2)); @@ -801,7 +803,8 @@ void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) aText2.nStart = nPortStart + 1; aText2.nEnd = nPortEnd; aText2.eType = eFoundType; - aPortionList.Insert(aText2, nInsert++); + aPortionList.push_back( aText2 ); + nInsert++; eFoundType = svtools::HTMLUNKNOWN; } @@ -815,7 +818,8 @@ void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) aText.nStart = nPortEnd + 1; aText.nEnd = nActPos - 1; aText.eType = svtools::HTMLUNKNOWN; - aPortionList.Insert(aText, nInsert++); + aPortionList.push_back( aText ); + nInsert++; } } @@ -833,7 +837,7 @@ void XMLFileWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) SwTextPortions aPortionList; lcl_Highlight(rSource, aPortionList); - USHORT nCount = aPortionList.Count(); + size_t nCount = aPortionList.size(); if ( !nCount ) return; @@ -841,7 +845,7 @@ void XMLFileWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) if ( rLast.nStart > rLast.nEnd ) // Nur bis Bug von MD behoeben { nCount--; - aPortionList.Remove( nCount); + aPortionList.pop_back(); if ( !nCount ) return; } @@ -857,7 +861,7 @@ void XMLFileWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) // Wenn zwei gleiche Attribute hintereinander eingestellt werden, // optimiert das die TextEngine. USHORT nLastEnd = 0; - for ( USHORT i = 0; i < nCount; i++ ) + for ( size_t i = 0; i < nCount; i++ ) { SwTextPortion& r = aPortionList[i]; DBG_ASSERT( r.nLine == aPortionList[0].nLine, "doch mehrere Zeilen ?" ); @@ -877,7 +881,7 @@ void XMLFileWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) } svtools::ColorConfig aConfig; - for ( USHORT i = 0; i < aPortionList.Count(); i++ ) + for ( size_t i = 0; i < aPortionList.size(); i++ ) { SwTextPortion& r = aPortionList[i]; if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index 9c49d0537723..cced0609f5f4 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -27,62 +27,55 @@ #ifndef _XMLFILTERHELPIDS_HRC_ #define _XMLFILTERHELPIDS_HRC_ -#ifndef _FILTER_HRC -#include "filter.hrc" -#endif - -#define HID_XML_SOURCE_FILE_DIALOG (HID_FILTER_XSLT_START + 0) -#define HID_XML_SOURCE_FILE_VALIDATE (HID_FILTER_XSLT_START + 1) -#define HID_XML_FILTER_SETTINGS_DIALOG (HID_FILTER_XSLT_START + 2) -#define HID_XML_FILTER_LIST (HID_FILTER_XSLT_START + 3) -#define HID_XML_FILTER_NEW (HID_FILTER_XSLT_START + 4) -#define HID_XML_FILTER_EDIT (HID_FILTER_XSLT_START + 5) -#define HID_XML_FILTER_TEST (HID_FILTER_XSLT_START + 6) -#define HID_XML_FILTER_DELETE (HID_FILTER_XSLT_START + 7) -#define HID_XML_FILTER_SAVE (HID_FILTER_XSLT_START + 8) -#define HID_XML_FILTER_OPEN (HID_FILTER_XSLT_START + 9) -#define HID_XML_FILTER_CLOSE (HID_FILTER_XSLT_START + 10) - -#define HID_XML_FILTER_TABDIALOG (HID_FILTER_XSLT_START + 11) -#define HID_XML_FILTER_TABPAGE_BASIC (HID_FILTER_XSLT_START + 12) -#define HID_XML_FILTER_TABPAGE_XSLT (HID_FILTER_XSLT_START + 13) -#define HID_XML_FILTER_NAME (HID_FILTER_XSLT_START + 14) -#define HID_XML_FILTER_APPLICATION (HID_FILTER_XSLT_START + 15) -#define HID_XML_FILTER_INTERFACE_NAME (HID_FILTER_XSLT_START + 16) -#define HID_XML_FILTER_EXTENSION (HID_FILTER_XSLT_START + 17) -#define HID_XML_FILTER_DESCRIPTION (HID_FILTER_XSLT_START + 18) -#define HID_XML_FILTER_DOCTYPE (HID_FILTER_XSLT_START + 19) -#define HID_XML_FILTER_DTD (HID_FILTER_XSLT_START + 20) -#define HID_XML_FILTER_DTD_BROWSE (HID_FILTER_XSLT_START + 21) -#define HID_XML_FILTER_EXPORT_XSLT (HID_FILTER_XSLT_START + 22) -#define HID_XML_FILTER_EXPORT_XSLT_BROWSE (HID_FILTER_XSLT_START + 23) -#define HID_XML_FILTER_IMPORT_XSLT (HID_FILTER_XSLT_START + 24) -#define HID_XML_FILTER_IMPORT_XSLT_BROWSE (HID_FILTER_XSLT_START + 25) -#define HID_XML_FILTER_IMPORT_TEMPLATE (HID_FILTER_XSLT_START + 26) -#define HID_XML_FILTER_TEST_DIALOG (HID_FILTER_XSLT_START + 27) +#define HID_XML_SOURCE_FILE_DIALOG "FILTER_HID_XML_SOURCE_FILE_DIALOG" +#define HID_XML_SOURCE_FILE_VALIDATE "FILTER_HID_XML_SOURCE_FILE_VALIDATE" +#define HID_XML_FILTER_SETTINGS_DIALOG "FILTER_HID_XML_FILTER_SETTINGS_DIALOG" +#define HID_XML_FILTER_LIST "FILTER_HID_XML_FILTER_LIST" +#define HID_XML_FILTER_NEW "FILTER_HID_XML_FILTER_NEW" +#define HID_XML_FILTER_EDIT "FILTER_HID_XML_FILTER_EDIT" +#define HID_XML_FILTER_TEST "FILTER_HID_XML_FILTER_TEST" +#define HID_XML_FILTER_DELETE "FILTER_HID_XML_FILTER_DELETE" +#define HID_XML_FILTER_SAVE "FILTER_HID_XML_FILTER_SAVE" +#define HID_XML_FILTER_OPEN "FILTER_HID_XML_FILTER_OPEN" +#define HID_XML_FILTER_CLOSE "FILTER_HID_XML_FILTER_CLOSE" -#define HID_XML_FILTER_TEST_EXPORT_BROWSE (HID_FILTER_XSLT_START + 28) -#define HID_XML_FILTER_TEST_EXPORT_CURRENT (HID_FILTER_XSLT_START + 29) -#define HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE (HID_FILTER_XSLT_START + 30) +#define HID_XML_FILTER_TABDIALOG "FILTER_HID_XML_FILTER_TABDIALOG" +#define HID_XML_FILTER_TABPAGE_BASIC "FILTER_HID_XML_FILTER_TABPAGE_BASIC" +#define HID_XML_FILTER_TABPAGE_XSLT "FILTER_HID_XML_FILTER_TABPAGE_XSLT" +#define HID_XML_FILTER_NAME "FILTER_HID_XML_FILTER_NAME" +#define HID_XML_FILTER_APPLICATION "FILTER_HID_XML_FILTER_APPLICATION" +#define HID_XML_FILTER_INTERFACE_NAME "FILTER_HID_XML_FILTER_INTERFACE_NAME" +#define HID_XML_FILTER_EXTENSION "FILTER_HID_XML_FILTER_EXTENSION" +#define HID_XML_FILTER_DESCRIPTION "FILTER_HID_XML_FILTER_DESCRIPTION" +#define HID_XML_FILTER_DOCTYPE "FILTER_HID_XML_FILTER_DOCTYPE" +#define HID_XML_FILTER_DTD "FILTER_HID_XML_FILTER_DTD" +#define HID_XML_FILTER_DTD_BROWSE "FILTER_HID_XML_FILTER_DTD_BROWSE" +#define HID_XML_FILTER_EXPORT_XSLT "FILTER_HID_XML_FILTER_EXPORT_XSLT" +#define HID_XML_FILTER_EXPORT_XSLT_BROWSE "FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE" +#define HID_XML_FILTER_IMPORT_XSLT "FILTER_HID_XML_FILTER_IMPORT_XSLT" +#define HID_XML_FILTER_IMPORT_XSLT_BROWSE "FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE" +#define HID_XML_FILTER_IMPORT_TEMPLATE "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE" +#define HID_XML_FILTER_TEST_DIALOG "FILTER_HID_XML_FILTER_TEST_DIALOG" -#define HID_XML_FILTER_TEST_IMPORT_XSLT_FILE (HID_FILTER_XSLT_START + 31) -#define HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE (HID_FILTER_XSLT_START + 32) -#define HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE (HID_FILTER_XSLT_START + 33) -#define HID_XML_FILTER_TEST_IMPORT_BROWSE (HID_FILTER_XSLT_START + 34) -#define HID_XML_FILTER_TEST_IMPORT_RECENT (HID_FILTER_XSLT_START + 35) -#define HID_XML_FILTER_TEST_IMPORT_RECENT_FILE (HID_FILTER_XSLT_START + 36) -#define HID_XML_FILTER_TEST_CLOSE (HID_FILTER_XSLT_START + 37) +#define HID_XML_FILTER_TEST_EXPORT_BROWSE "FILTER_HID_XML_FILTER_TEST_EXPORT_BROWSE" +#define HID_XML_FILTER_TEST_EXPORT_CURRENT "FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT" +#define HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE "FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE" -#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE (HID_FILTER_XSLT_START + 38) +#define HID_XML_FILTER_TEST_IMPORT_XSLT_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_XSLT_FILE" +#define HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE" +#define HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE "FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE" +#define HID_XML_FILTER_TEST_IMPORT_BROWSE "FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE" +#define HID_XML_FILTER_TEST_IMPORT_RECENT "FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT" +#define HID_XML_FILTER_TEST_IMPORT_RECENT_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE" +#define HID_XML_FILTER_TEST_CLOSE "FILTER_HID_XML_FILTER_TEST_CLOSE" -#define HID_XML_FILTER_TEST_VALIDATE_OUPUT (HID_FILTER_XSLT_START + 39) -#define HID_XML_FILTER_OUTPUT_WINDOW (HID_FILTER_XSLT_START + 40) +#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE" -#define HID_XML_FILTER_TEST_EXPORT_XSLT_FILE (HID_FILTER_XSLT_START + 41) +#define HID_XML_FILTER_TEST_VALIDATE_OUPUT "FILTER_HID_XML_FILTER_TEST_VALIDATE_OUPUT" +#define HID_XML_FILTER_OUTPUT_WINDOW "FILTER_HID_XML_FILTER_OUTPUT_WINDOW" -#define HID_XML_FILTER_TABPAGE_CTRL (HID_FILTER_XSLT_START + 42) +#define HID_XML_FILTER_TEST_EXPORT_XSLT_FILE "FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE" -// last help id is HID_FILTER_XSLT_END ! -// #define HID_FILTER_XSLT_END (HID_FILTER_START + 99) +#define HID_XML_FILTER_TABPAGE_CTRL "FILTER_HID_XML_FILTER_TABPAGE_CTRL" #endif diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 46cab18f6c77..9334c892028e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1433,9 +1433,7 @@ XMLFilterListBox::XMLFilterListBox( SvxPathControl_Impl * pParent ) static long nTabs[] = {3, 0, nTabSize, 2*nTabSize }; Size aHeadSize( mpHeaderBar->GetSizePixel() ); - WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP; pParent->SetFocusControl( this ); - SetWindowBits( nBits ); // SetDoubleClickHdl( aLink ); // SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) ); SetSelectionMode( MULTIPLE_SELECTION ); diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 656aa1cbef6c..fcd43832adf0 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -53,50 +53,12 @@ namespace DOM { - void CDocument::addnode(xmlNodePtr aNode) - { - if (aNode != (xmlNodePtr)m_aDocPtr) - { - Reference< XNode >* nref = new Reference< XNode >(CNode::get(aNode)); - m_aNodeRefList.push_back(nref); - } - } - CDocument::~CDocument() { - Reference< XNode >* pRef; - nodereflist_t::const_iterator r = m_aNodeRefList.begin(); - while (r!=m_aNodeRefList.end()) - { - pRef = *r; - delete pRef; - r++; - } - - // get rid of leftover instances, if anybody still holds a - // reference to one of these, it will be invalid! - /* - CNode* aNode = 0; - nodelist_t::const_iterator i = m_aNodeList.begin(); - while (i!=m_aNodeList.end()) - { - aNode = CNode::get(*i, sal_False); - if (aNode != 0) - { - // CNode::remove(*i); - // delete will remove - delete aNode; - } - i++; - } - */ - xmlFreeDoc(m_aDocPtr); - } CDocument::CDocument(xmlDocPtr aDocPtr): - m_aNodeRefList(), m_aDocPtr(aDocPtr), m_streamListeners() { diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index b653619031a1..3fe593ff2b24 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -72,12 +72,9 @@ namespace DOM XActiveDataControl, XActiveDataSource, XSAXSerializable, XFastSAXSerializable> { friend class CNode; - typedef std::list< Reference< XNode >* > nodereflist_t; typedef set< Reference< XStreamListener > > listenerlist_t; private: - nodereflist_t m_aNodeRefList; - xmlDocPtr m_aDocPtr; // datacontrol/source state @@ -87,8 +84,6 @@ namespace DOM protected: CDocument(xmlDocPtr aDocPtr); - void addnode(xmlNodePtr aNode); - public: virtual ~CDocument(); diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index fb4a6bf508b3..d4b317b425b3 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -228,7 +228,7 @@ namespace DOM // m_aNodeType = NodeType::NOTATION_NODE; pNode = static_cast< CNode* >(new CAttr((xmlAttrPtr)aNode)); break; - // unsopported node types + // unsupported node types case XML_HTML_DOCUMENT_NODE: case XML_ELEMENT_DECL: case XML_ATTRIBUTE_DECL: @@ -238,18 +238,10 @@ namespace DOM pNode = 0; break; } - } - if ( pNode != 0 ) - { - if(CNode::theNodeMap.insert(nodemap_t::value_type(aNode, pNode)).second) + + if ( pNode != 0 ) { - // insertion done, register node with document - xmlDocPtr doc = aNode->doc; - if( doc != NULL) - { - CDocument* pDoc = static_cast< CDocument* >(CNode::get((xmlNodePtr)doc)); - pDoc->addnode(aNode); - } else + if(!CNode::theNodeMap.insert(nodemap_t::value_type(aNode, pNode)).second) { // if insertion failed, delete the new instance and return null delete pNode; diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index a7e50e7e232d..83de4df8050f 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -39,7 +39,10 @@ #include <boost/shared_array.hpp> #include <boost/bind.hpp> -#include <librdf.h> +#include <libxslt/security.h> + +// #i114999# do not include librdf.h, it is broken in redland 1.0.11 +#include <redland.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -64,19 +67,6 @@ #include <comphelper/stlunosequence.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/makesequence.hxx> -#include <librdf.h> -#include <libxslt/security.h> - -#include <boost/utility.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/shared_array.hpp> -#include <boost/bind.hpp> - -#include <map> -#include <functional> -#include <algorithm> - -#include <string.h> /** diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 80666d9e2031..f40082e25e9b 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -352,7 +352,7 @@ namespace XPath throw XPathException(); } xmlXPathFreeContext(xpathCtx); - Reference< XXPathObject > aObj(new CXPathObject(xpathObj)); + Reference< XXPathObject > aObj(new CXPathObject(xpathObj, contextNode)); return aObj; } diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index fdfff24353cc..048fafaae8e9 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -69,7 +69,7 @@ namespace XPath private: nsmap_t m_nsmap; - const Reference < XMultiServiceFactory >& m_aFactory; + const Reference< XMultiServiceFactory > m_aFactory; extensions_t m_extensions; public: diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx index 083d19080c4b..757de0c5aac4 100644 --- a/unoxml/source/xpath/xpathobject.cxx +++ b/unoxml/source/xpath/xpathobject.cxx @@ -31,8 +31,8 @@ namespace XPath { - CXPathObject::CXPathObject(xmlXPathObjectPtr xpathObj) - : m_pXPathObj(xpathObj, xmlXPathFreeObject) + CXPathObject::CXPathObject(xmlXPathObjectPtr xpathObj, const Reference< XNode >& contextNode) + : m_pXPathObj(xpathObj, xmlXPathFreeObject), m_xContextNode(contextNode) { switch (m_pXPathObj->type) { diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index 8e256bc8a994..348fae8e21e6 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -52,10 +52,11 @@ namespace XPath { private: boost::shared_ptr<xmlXPathObject> m_pXPathObj; + const Reference< XNode > m_xContextNode; XPathObjectType m_xPathObjectType; public: - CXPathObject(xmlXPathObjectPtr xpathObj); + CXPathObject(xmlXPathObjectPtr xpathObj, const Reference< XNode >& contextNode); /** get object type diff --git a/writerfilter/qa/cppunittests/doctok/makefile.mk b/writerfilter/qa/cppunittests/doctok/makefile.mk index 298bb4da906b..e7de9f8b4446 100644 --- a/writerfilter/qa/cppunittests/doctok/makefile.mk +++ b/writerfilter/qa/cppunittests/doctok/makefile.mk @@ -28,8 +28,6 @@ PRJ=..$/..$/.. PRJNAME=writerfilter TARGET=test-doctok -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk index c2e989d91beb..2f51eb3844c7 100644 --- a/writerfilter/qa/cppunittests/qname/makefile.mk +++ b/writerfilter/qa/cppunittests/qname/makefile.mk @@ -28,8 +28,6 @@ PRJ=..$/..$/.. PRJNAME=writerfilter TARGET=test-qname -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/writerfilter/qa/cppunittests/sl/makefile.mk b/writerfilter/qa/cppunittests/sl/makefile.mk index b7a943e376e9..fa7cafc1dd00 100644 --- a/writerfilter/qa/cppunittests/sl/makefile.mk +++ b/writerfilter/qa/cppunittests/sl/makefile.mk @@ -28,8 +28,6 @@ PRJ=..$/..$/.. PRJNAME=writerfilter TARGET=test-od_sl -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/writerfilter/qa/cppunittests/xxml/makefile.mk b/writerfilter/qa/cppunittests/xxml/makefile.mk index 32d0febc1c85..7f0d3f9731b4 100644 --- a/writerfilter/qa/cppunittests/xxml/makefile.mk +++ b/writerfilter/qa/cppunittests/xxml/makefile.mk @@ -28,8 +28,6 @@ PRJ=..$/..$/.. PRJNAME=writerfilter TARGET=test-xxml -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index df2503793884..9fa737f47de2 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -51,6 +51,9 @@ BorderHandler::BorderHandler( bool bOOXML ) : m_nLineDistance(0), m_bOOXML( bOOXML ) { + const int nBorderCount(BORDER_COUNT); + std::fill_n(m_aFilledLines, nBorderCount, false); + std::fill_n(m_aBorderLines, nBorderCount, table::BorderLine()); } /*-- 24.04.2007 09:06:35--------------------------------------------------- diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 4c176b59b4ef..301774dc2b96 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -627,7 +627,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) #ifdef DEBUG_DOMAINMAPPER dmapper_logger->attribute("isTextAppend", xTextAppend.is()); - dmapper_logger->attribute("isIgnor", m_TableManager.isIgnore()); + dmapper_logger->attribute("isIgnor", getTableManager().isIgnore()); #endif if(xTextAppend.is() && ! getTableManager( ).isIgnore()) diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 20f3d602156b..4bde0ac275b5 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -39,7 +39,7 @@ namespace dmapper struct FontTable_Impl { - std::vector< FontEntry > aFontEntries; + std::vector< FontEntry::Pointer_t > aFontEntries; FontEntry::Pointer_t pCurrentEntry; FontTable_Impl() {} }; @@ -568,7 +568,7 @@ void FontTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_ m_pImpl->pCurrentEntry.reset(new FontEntry); ref->resolve(*this); //append it to the table - m_pImpl->aFontEntries.push_back( *m_pImpl->pCurrentEntry ); + m_pImpl->aFontEntries.push_back( m_pImpl->pCurrentEntry ); m_pImpl->pCurrentEntry.reset(); } /*-- 19.06.2006 12:04:34--------------------------------------------------- @@ -657,12 +657,9 @@ void FontTable::endShape( ) -----------------------------------------------------------------------*/ const FontEntry::Pointer_t FontTable::getFontEntry(sal_uInt32 nIndex) { - FontEntry::Pointer_t pRet; - if(m_pImpl->aFontEntries.size() > nIndex) - { - pRet.reset(&m_pImpl->aFontEntries[nIndex]); - } - return pRet; + return (m_pImpl->aFontEntries.size() > nIndex) + ? m_pImpl->aFontEntries[nIndex] + : FontEntry::Pointer_t(); } /*-- 21.06.2006 11:21:38--------------------------------------------------- diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 5f2e2268abb8..5088e8729577 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -235,7 +235,7 @@ void lcl_mergeProps( PropertyMapPtr pToFill, PropertyMapPtr pToAdd, TblStyleTyp ( nStyleId == TBL_STYLE_FIRSTCOL ) }; - for ( int i = 0 ; i < 7; i++ ) + for ( unsigned i = 0 ; i != sizeof(pPropsToCheck) / sizeof(PropertyIds); i++ ) { PropertyIds nId = pPropsToCheck[i]; PropertyDefinition aProp( nId, false ); diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx new file mode 100644 index 000000000000..040843afd7ce --- /dev/null +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -0,0 +1,146 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Miklos Vajna. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_ +#include <cppuhelper/implementationentry.hxx> +#endif +#include <osl/module.hxx> +#include <tools/solar.h> +#include <RtfFilter.hxx> + +using namespace ::rtl; +using namespace ::cppu; +using namespace ::com::sun::star; + +RtfFilter::RtfFilter( const uno::Reference< uno::XComponentContext >& rxContext) : + m_xContext( rxContext ) +{ +} + +RtfFilter::~RtfFilter() +{ +} + +sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) + throw (uno::RuntimeException) +{ + OSL_TRACE("%s", OSL_THIS_FUNC); + if( m_xSrcDoc.is() ) + { + uno::Reference< lang::XMultiServiceFactory > xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW); + uno::Reference< uno::XInterface > xIfc( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.RtfExport" ))), uno::UNO_QUERY_THROW); + if (!xIfc.is()) + return sal_False; + uno::Reference< document::XExporter > xExprtr(xIfc, uno::UNO_QUERY_THROW); + uno::Reference< document::XFilter > xFltr(xIfc, uno::UNO_QUERY_THROW); + if (!xExprtr.is() || !xFltr.is()) + return sal_False; + xExprtr->setSourceDocument(m_xSrcDoc); + return xFltr->filter(aDescriptor); + } + else if ( m_xDstDoc.is() ) + { + uno::Reference< lang::XMultiServiceFactory > xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW); + uno::Reference< uno::XInterface > xIfc( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.RtfImport" ))), uno::UNO_QUERY_THROW); + if (!xIfc.is()) + return sal_False; + uno::Reference< document::XImporter > xImprtr(xIfc, uno::UNO_QUERY_THROW); + uno::Reference< document::XFilter > xFltr(xIfc, uno::UNO_QUERY_THROW); + if (!xImprtr.is() || !xFltr.is()) + return sal_False; + xImprtr->setTargetDocument(m_xDstDoc); + return xFltr->filter(aDescriptor); + } + return sal_False; +} + +void RtfFilter::cancel( ) throw (uno::RuntimeException) +{ +} + +void RtfFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) + throw (lang::IllegalArgumentException, uno::RuntimeException) +{ + m_xSrcDoc = xDoc; +} + +void RtfFilter::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc ) + throw (lang::IllegalArgumentException, uno::RuntimeException) +{ + m_xDstDoc = xDoc; +} + +void RtfFilter::initialize( const uno::Sequence< uno::Any >& /*aArguments*/ ) throw (uno::Exception, uno::RuntimeException) +{ + // The DOCX exporter here extracts 'type' of the filter, ie 'Word' or + // 'Word Template' but we don't need it for RTF. +} + +OUString RtfFilter::getImplementationName( ) throw (uno::RuntimeException) +{ + return RtfFilter_getImplementationName(); +} + +#define SERVICE_NAME1 "com.sun.star.document.ImportFilter" +#define SERVICE_NAME2 "com.sun.star.document.ExportFilter" +sal_Bool RtfFilter::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) +{ + return (rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || + rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) )); +} + +uno::Sequence< OUString > RtfFilter::getSupportedServiceNames( ) throw (uno::RuntimeException) +{ + return RtfFilter_getSupportedServiceNames(); +} + +/* Helpers, used by shared lib exports. */ + +OUString RtfFilter_getImplementationName () throw (uno::RuntimeException) +{ + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.RtfFilter" ) ); +} + +uno::Sequence< OUString > RtfFilter_getSupportedServiceNames( ) throw (uno::RuntimeException) +{ + uno::Sequence < OUString > aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); + pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); + return aRet; +} +#undef SERVICE_NAME1 +#undef SERVICE_NAME2 + +uno::Reference< uno::XInterface > RtfFilter_createInstance( const uno::Reference< uno::XComponentContext >& xContext) + throw( uno::Exception ) +{ + return (cppu::OWeakObject*) new RtfFilter( xContext ); +} + +/* vi:set shiftwidth=4 expandtab: */ diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx new file mode 100644 index 000000000000..3a4be622ab17 --- /dev/null +++ b/writerfilter/source/filter/RtfFilter.hxx @@ -0,0 +1,102 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Miklos Vajna. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RTFFILTER_HXX +#define _RTFFILTER_HXX + +#include <com/sun/star/document/XFilter.hpp> +#include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#include <cppuhelper/implbase5.hxx> +#include <WriterFilterDllApi.hxx> + +class WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5 +< + com::sun::star::document::XFilter, + com::sun::star::document::XImporter, + com::sun::star::document::XExporter, + com::sun::star::lang::XInitialization, + com::sun::star::lang::XServiceInfo +> +{ + +protected: + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc, m_xDstDoc; + ::rtl::OUString m_sFilterName; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; + + +public: + RtfFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); + virtual ~RtfFilter(); + + // XFilter + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) + throw (::com::sun::star::uno::RuntimeException); + + // XImporter + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + + // XExporter + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + + // XInitialization + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) + throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + throw (::com::sun::star::uno::RuntimeException); + +}; + + +::rtl::OUString RtfFilter_getImplementationName() + throw ( ::com::sun::star::uno::RuntimeException ); + +::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL RtfFilter_getSupportedServiceNames( ) + throw ( ::com::sun::star::uno::RuntimeException ); + +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL RtfFilter_createInstance( + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XComponentContext > &xContext) + throw( ::com::sun::star::uno::Exception ); +#endif + diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index f8775d097f66..deede335d9af 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -30,6 +30,7 @@ #endif #include <WriterFilter.hxx> #include <WriterFilterDetection.hxx> +#include <RtfFilter.hxx> using namespace ::rtl; using namespace ::cppu; @@ -56,6 +57,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = { { WriterFilter_createInstance, WriterFilter_getImplementationName, WriterFilter_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0 }, { WriterFilterDetection_createInstance, WriterFilterDetection_getImplementationName, WriterFilterDetection_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0} , + { RtfFilter_createInstance, RtfFilter_getImplementationName, RtfFilter_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0 }, { 0, 0, 0, 0, 0, 0 } // terminate with NULL }; diff --git a/writerfilter/source/filter/makefile.mk b/writerfilter/source/filter/makefile.mk index f578e2853243..6b11fd4ff1f3 100644 --- a/writerfilter/source/filter/makefile.mk +++ b/writerfilter/source/filter/makefile.mk @@ -40,7 +40,8 @@ ENABLE_EXCEPTIONS=TRUE SLOFILES= $(SLO)$/WriterFilter.obj \ $(SLO)$/WriterFilterDetection.obj \ - $(SLO)$/ImportFilter.obj + $(SLO)$/ImportFilter.obj \ + $(SLO)$/RtfFilter.obj # --- Targets ---------------------------------- diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx index 964d9e1cb5ee..a277d5928af6 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.cxx +++ b/writerfilter/source/ooxml/OOXMLFactory.cxx @@ -25,6 +25,8 @@ * ************************************************************************/ +#include <stdio.h> + #include <rtl/instance.hxx> #include <osl/mutex.hxx> #include "OOXMLFactory.hxx" diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index 1768d486c80d..83c568dfba50 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -193,9 +193,6 @@ void SAL_CALL OOXMLFastDocumentHandler::startDocument() void SAL_CALL OOXMLFastDocumentHandler::endDocument() throw (uno::RuntimeException, xml::sax::SAXException) { -#ifdef DEBUG_CONTEXT_STACK - OOXMLFastContextHandler::dumpOpenContexts(); -#endif } void SAL_CALL OOXMLFastDocumentHandler::setDocumentLocator |