summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/include/fpdfapi/fpdf_module.h6
-rw-r--r--core/include/fpdfapi/fpdf_objects.h8
-rw-r--r--core/include/fpdfapi/fpdf_page.h6
-rw-r--r--core/include/fpdfapi/fpdf_pageobj.h16
-rw-r--r--core/include/fpdfapi/fpdf_parser.h18
-rw-r--r--core/include/fpdfapi/fpdf_render.h12
-rw-r--r--core/include/fpdfapi/fpdf_resource.h19
-rw-r--r--core/include/fpdfapi/fpdf_serial.h2
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h46
-rw-r--r--core/include/fpdfdoc/fpdf_tagged.h4
-rw-r--r--core/include/fpdfdoc/fpdf_vt.h4
-rw-r--r--core/include/fpdftext/fpdf_text.h8
-rw-r--r--core/include/fxcodec/fx_codec.h34
-rw-r--r--core/include/fxcrt/fx_basic.h38
-rw-r--r--core/include/fxcrt/fx_coordinates.h8
-rw-r--r--core/include/fxcrt/fx_memory.h71
-rw-r--r--core/include/fxcrt/fx_string.h10
-rw-r--r--core/include/fxcrt/fx_ucd.h2
-rw-r--r--core/include/fxcrt/fx_xml.h8
-rw-r--r--core/include/fxge/fx_dib.h16
-rw-r--r--core/include/fxge/fx_font.h20
-rw-r--r--core/include/fxge/fx_ge.h14
-rw-r--r--core/src/fpdfapi/fpdf_edit/editint.h4
-rw-r--r--core/src/fpdfapi/fpdf_font/font_int.h14
-rw-r--r--core/src/fpdfapi/fpdf_font/fpdf_font.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_font/ttgsubtable.h4
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_page/pageint.h16
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/render_int.h24
-rw-r--r--core/src/fpdfdoc/doc_form.cpp6
-rw-r--r--core/src/fpdfdoc/pdf_vt.h10
-rw-r--r--core/src/fpdftext/fpdf_text_search.cpp2
-rw-r--r--core/src/fpdftext/text_int.h6
-rw-r--r--core/src/fpdftext/txtproc.h8
-rw-r--r--core/src/fxcodec/codec/codec_int.h4
-rw-r--r--core/src/fxcodec/codec/fx_codec_fax.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_flate.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_icc.cpp6
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpx_opj.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_progress.h6
-rw-r--r--core/src/fxcodec/codec/fx_codec_tiff.cpp2
-rw-r--r--core/src/fxcodec/lgif/fx_gif.h4
-rw-r--r--core/src/fxcrt/extension.h6
-rw-r--r--core/src/fxcrt/fx_arabic.h4
-rw-r--r--core/src/fxcrt/fx_basic_util.cpp2
-rw-r--r--core/src/fxcrt/fxcrt_platforms.h2
-rw-r--r--core/src/fxcrt/fxcrt_posix.h2
-rw-r--r--core/src/fxcrt/fxcrt_windows.h2
-rw-r--r--core/src/fxcrt/xml_int.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_array.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_basics.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_curves.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_path_storage.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_pixfmt_gray.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h10
-rw-r--r--core/src/fxge/agg/agg23/agg_renderer_base.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_renderer_scanline.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_rendering_buffer.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_scanline_u.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_vcgen_dash.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_vcgen_stroke.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_vertex_sequence.h2
-rw-r--r--core/src/fxge/agg/agg23/fx_agg_driver.cpp2
-rw-r--r--core/src/fxge/agg/include/fx_agg_driver.h2
-rw-r--r--core/src/fxge/android/fpf_skiafont.h2
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.h4
-rw-r--r--core/src/fxge/android/fpf_skiamodule.h2
-rw-r--r--core/src/fxge/apple/apple_int.h2
-rw-r--r--core/src/fxge/dib/dib_int.h6
-rw-r--r--core/src/fxge/dib/fx_dib_convert.cpp2
-rw-r--r--core/src/fxge/ge/fx_ge_ps.cpp2
-rw-r--r--core/src/fxge/ge/text_int.h8
-rw-r--r--core/src/fxge/skia/fx_skia_blitter_new.h6
-rw-r--r--core/src/fxge/skia/fx_skia_device.cpp2
-rw-r--r--core/src/fxge/win32/fx_win32_dwrite.cpp8
-rw-r--r--core/src/fxge/win32/fx_win32_gdipext.cpp2
-rw-r--r--core/src/fxge/win32/win32_int.h4
-rw-r--r--core/src/reflow/autoreflow.h6
-rw-r--r--core/src/reflow/layoutprovider_taggedpdf.h4
-rw-r--r--core/src/reflow/reflowedpage.h17
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_app.h2
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h2
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_page.h4
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_util.h4
-rw-r--r--fpdfsdk/include/fsdk_baseannot.h2
-rw-r--r--fpdfsdk/include/fsdk_define.h4
-rw-r--r--fpdfsdk/include/fsdk_rendercontext.h2
-rw-r--r--fpdfsdk/include/javascript/JS_Object.h4
-rw-r--r--fpdfsdk/src/fpdf_dataavail.cpp2
-rw-r--r--fpdfsdk/src/fpdfview.cpp2
-rw-r--r--fpdfsdk/src/jsapi/fxjs_v8.cpp4
-rw-r--r--xfa/include/fwl/adapter/fwl_sdadapterimp.h4
-rw-r--r--xfa/include/fwl/core/fwl_grid.h2
-rw-r--r--xfa/include/fwl/core/fwl_note.h2
-rw-r--r--xfa/include/fwl/core/fwl_theme.h2
-rw-r--r--xfa/include/fwl/core/fwl_widget.h2
-rw-r--r--xfa/include/fwl/lightwidget/app.h2
-rw-r--r--xfa/include/fwl/lightwidget/combobox.h2
-rw-r--r--xfa/include/fwl/lightwidget/listbox.h4
-rw-r--r--xfa/include/fwl/lightwidget/theme.h2
-rw-r--r--xfa/include/fwl/lightwidget/widget.h6
-rw-r--r--xfa/include/fwl/theme/checkboxtp.h3
-rw-r--r--xfa/include/fwl/theme/datetimepickertp.h3
-rw-r--r--xfa/include/fwl/theme/formtp.h3
-rw-r--r--xfa/include/fwl/theme/monthcalendartp.h2
-rw-r--r--xfa/include/fwl/theme/pushbuttontp.h3
-rw-r--r--xfa/include/fwl/theme/scrollbartp.h3
-rw-r--r--xfa/include/fwl/theme/widgettp.h11
-rw-r--r--xfa/include/fxbarcode/BC_BarCode.h2
-rw-r--r--xfa/include/fxfa/fxfa.h4
-rw-r--r--xfa/include/fxfa/fxfa_objectacc.h2
-rw-r--r--xfa/include/fxgraphics/fx_graphics.h13
-rw-r--r--xfa/src/fee/include/ifde_txtedtengine.h4
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtblock.h8
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtbuf.h8
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtengine.h16
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtpage.h6
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtparag.h2
-rw-r--r--xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h4
-rw-r--r--xfa/src/fgas/include/fx_datetime.h4
-rw-r--r--xfa/src/fgas/include/fx_fnt.h2
-rw-r--r--xfa/src/fgas/include/fx_locale.h2
-rw-r--r--xfa/src/fgas/include/fx_utl.h2
-rw-r--r--xfa/src/fgas/src/crt/fx_stream.h18
-rw-r--r--xfa/src/fgas/src/crt/fx_utils.cpp2
-rw-r--r--xfa/src/fgas/src/font/fx_gdifont.h4
-rw-r--r--xfa/src/fgas/src/font/fx_gefont.h2
-rw-r--r--xfa/src/fgas/src/font/fx_stdfontmgr.h10
-rw-r--r--xfa/src/fgas/src/layout/fx_rtfbreak.h4
-rw-r--r--xfa/src/fgas/src/layout/fx_textbreak.h4
-rw-r--r--xfa/src/fgas/src/localization/fx_locale.cpp2
-rw-r--r--xfa/src/fgas/src/localization/fx_localeimp.h4
-rw-r--r--xfa/src/fgas/src/localization/fx_localemgr.h2
-rw-r--r--xfa/src/fgas/src/xml/fx_sax_imp.h8
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_caretimp.h2
-rw-r--r--xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h2
-rw-r--r--xfa/src/fwl/src/core/fwl_noteimp.cpp2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_formimp.h2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_gridimp.h6
-rw-r--r--xfa/src/fwl/src/core/include/fwl_noteimp.h8
-rw-r--r--xfa/src/fwl/src/core/include/fwl_targetimp.h3
-rw-r--r--xfa/src/fwl/src/core/include/fwl_threadimp.h2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_widgetimp.h2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h6
-rw-r--r--xfa/src/fxbarcode/BC_Binarizer.h2
-rw-r--r--xfa/src/fxbarcode/BC_BinaryBitmap.h2
-rw-r--r--xfa/src/fxbarcode/BC_DecoderResult.h8
-rw-r--r--xfa/src/fxbarcode/BC_Dimension.h2
-rw-r--r--xfa/src/fxbarcode/BC_LuminanceSource.h2
-rw-r--r--xfa/src/fxbarcode/BC_Reader.h2
-rw-r--r--xfa/src/fxbarcode/BC_ResultPoint.h2
-rw-r--r--xfa/src/fxbarcode/BC_UtilCodingConvert.h2
-rw-r--r--xfa/src/fxbarcode/BC_UtilRSS.h2
-rw-r--r--xfa/src/fxbarcode/BC_Writer.h2
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitArray.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitMatrix.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonBitSource.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteArray.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteMatrix.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonDecoderResult.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonECI.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h3
-rw-r--r--xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h3
-rw-r--r--xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h7
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_Encoder.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h3
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h4
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Common.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h2
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h3
-rw-r--r--xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoder.h4
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h2
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDataMask.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h3
-rw-r--r--xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h4
-rw-r--r--xfa/src/fxfa/src/app/xfa_checksum.h6
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffConfigAcc.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffapp.h6
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdoc.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdochandler.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdocview.h6
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffnotify.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpageview.h6
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidget.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgetacc.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgethandler.h4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fontmgr.h6
-rw-r--r--xfa/src/fxfa/src/app/xfa_fwltheme.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_rendercontext.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_textlayout.h10
-rw-r--r--xfa/src/fxfa/src/common/fxfa_localevalue.h2
-rw-r--r--xfa/src/fxfa/src/common/xfa_doclayout.h2
-rw-r--r--xfa/src/fxfa/src/common/xfa_document.h2
-rw-r--r--xfa/src/fxfa/src/common/xfa_localemgr.h4
-rw-r--r--xfa/src/fxfa/src/common/xfa_object.h6
-rw-r--r--xfa/src/fxfa/src/common/xfa_script.h2
-rw-r--r--xfa/src/fxfa/src/common/xfa_utils.h2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_error.h2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_expression.h2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_fmparse.h2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_lexer.h4
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_program.h2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_basic_imp.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_layout_imp.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_serialize.h4
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h4
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h4
-rw-r--r--xfa/src/fxfa/src/parser/xfa_locale.h4
-rw-r--r--xfa/src/fxfa/src/parser/xfa_object_imp.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_parser_imp.h6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_imp.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_nodehelper.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h4
-rw-r--r--xfa/src/fxgraphics/src/fx_graphics.cpp2
-rw-r--r--xfa/src/fxgraphics/src/fx_metafile_interpreter.h2
-rw-r--r--xfa/src/fxgraphics/src/fx_path_generator.h2
-rw-r--r--xfa/src/fxjse/src/class.h2
-rw-r--r--xfa/src/fxjse/src/context.h2
-rw-r--r--xfa/src/fxjse/src/runtime.h4
-rw-r--r--xfa/src/fxjse/src/value.h2
273 files changed, 592 insertions, 717 deletions
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index cec8155d41..9b3a5bf7dc 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -23,7 +23,7 @@ class ICodec_IccModule;
class ICodec_FlateModule;
#define ADDIN_NAME_CJK "Eastern Asian Language Support"
#define ADDIN_NAME_DECODER "JPEG2000 and JBIG2 Image Decoders"
-class CPDF_ModuleMgr : public CFX_Object
+class CPDF_ModuleMgr
{
public:
@@ -123,7 +123,7 @@ class CPDF_FontGlobals;
class IPDF_FontMgr;
class IPDF_FontMapper;
class CPDF_ColorSpace;
-class CPDF_PageModuleDef : public CFX_Object
+class CPDF_PageModuleDef
{
public:
virtual ~CPDF_PageModuleDef() {}
@@ -161,7 +161,7 @@ class CPDF_Stream;
class CFX_DIBSource;
class CPDF_RenderConfig;
class CPDF_Image;
-class CPDF_RenderModuleDef : public CFX_Object
+class CPDF_RenderModuleDef
{
public:
virtual ~CPDF_RenderModuleDef() {}
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index bb449dd457..df5803c76c 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -35,7 +35,7 @@ class CPDF_CryptoHandler;
#define PDFOBJ_NULL 8
#define PDFOBJ_REFERENCE 9
typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream *pStream, FX_LPVOID pUserData);
-class CPDF_Object : public CFX_Object
+class CPDF_Object
{
public:
@@ -568,7 +568,7 @@ protected:
friend class CPDF_StreamAcc;
friend class CPDF_AttachmentAcc;
};
-class CPDF_StreamAcc : public CFX_Object
+class CPDF_StreamAcc
{
public:
@@ -622,7 +622,7 @@ protected:
};
CFX_DataFilter* FPDF_CreateFilter(FX_BSTR name, const CPDF_Dictionary* pParam, int width = 0, int height = 0);
#define FPDF_FILTER_BUFFER_SIZE 20480
-class CPDF_StreamFilter : public CFX_Object
+class CPDF_StreamFilter
{
public:
@@ -705,7 +705,7 @@ protected:
FX_DWORD m_RefObjNum;
friend class CPDF_Object;
};
-class CPDF_IndirectObjects : public CFX_Object
+class CPDF_IndirectObjects
{
public:
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 3fea866730..0bac0595c2 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -32,7 +32,7 @@ class CPDF_ResourceNaming;
#define PDF_CONTENT_NOT_PARSED 0
#define PDF_CONTENT_PARSING 1
#define PDF_CONTENT_PARSED 2
-class CPDF_PageObjects : public CFX_Object
+class CPDF_PageObjects
{
public:
@@ -199,7 +199,7 @@ protected:
CPDF_PageRenderCache* m_pPageRender;
};
-class CPDF_ParseOptions : public CFX_Object
+class CPDF_ParseOptions
{
public:
@@ -229,7 +229,7 @@ public:
CPDF_Form* Clone() const;
};
-class CPDF_PageContentGenerate : public CFX_Object
+class CPDF_PageContentGenerate
{
public:
CPDF_PageContentGenerate(CPDF_Page* pPage);
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h
index f211254791..bd11a209f0 100644
--- a/core/include/fpdfapi/fpdf_pageobj.h
+++ b/core/include/fpdfapi/fpdf_pageobj.h
@@ -99,7 +99,7 @@ public:
return m_pObject->IsRect();
}
};
-class CPDF_ClipPathData : public CFX_Object
+class CPDF_ClipPathData
{
public:
@@ -161,7 +161,7 @@ public:
void Transform(const CFX_AffineMatrix& matrix);
};
-class CPDF_ColorStateData : public CFX_Object
+class CPDF_ColorStateData
{
public:
@@ -208,7 +208,7 @@ class CPDF_GraphState : public CFX_CountRef<CFX_GraphStateData>
{
public:
};
-class CPDF_TextStateData : public CFX_Object
+class CPDF_TextStateData
{
public:
@@ -267,7 +267,7 @@ public:
};
class CPDF_TransferFunc;
-class CPDF_GeneralStateData : public CFX_Object
+class CPDF_GeneralStateData
{
public:
@@ -336,7 +336,7 @@ public:
return m_pObject ? FXSYS_round((bStroke ? m_pObject->m_StrokeAlpha : m_pObject->m_FillAlpha) * 255) : 255;
}
};
-class CPDF_ContentMarkItem : public CFX_Object
+class CPDF_ContentMarkItem
{
public:
@@ -388,7 +388,7 @@ private:
void* m_pParam;
};
-class CPDF_ContentMarkData : public CFX_Object
+class CPDF_ContentMarkData
{
public:
@@ -434,7 +434,7 @@ public:
#define PDFPAGE_SHADING 4
#define PDFPAGE_FORM 5
#define PDFPAGE_INLINES 6
-class CPDF_GraphicStates : public CFX_Object
+class CPDF_GraphicStates
{
public:
@@ -507,7 +507,7 @@ protected:
virtual ~CPDF_PageObject() {}
};
-struct CPDF_TextObjectItem : public CFX_Object {
+struct CPDF_TextObjectItem {
FX_DWORD m_CharCode;
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 4b91802601..c72acc834f 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -211,7 +211,7 @@ protected:
#define PDFWORD_TEXT 2
#define PDFWORD_DELIMITER 3
#define PDFWORD_NAME 4
-class CPDF_SimpleParser : public CFX_Object
+class CPDF_SimpleParser
{
public:
@@ -250,7 +250,7 @@ private:
FX_DWORD m_dwCurPos;
};
-class CPDF_SyntaxParser : public CFX_Object
+class CPDF_SyntaxParser
{
public:
@@ -372,7 +372,7 @@ struct PARSE_CONTEXT {
FX_FILESIZE m_DataEnd;
};
-class IPDF_DocParser : public CFX_Object
+class IPDF_DocParser
{
public:
virtual ~IPDF_DocParser() { }
@@ -613,7 +613,7 @@ protected:
#define FXCIPHER_RC4 1
#define FXCIPHER_AES 2
#define FXCIPHER_AES2 3
-class CPDF_SecurityHandler : public CFX_Object
+class CPDF_SecurityHandler
{
public:
@@ -715,7 +715,7 @@ private:
int m_KeyLen;
};
-class CPDF_CryptoHandler : public CFX_Object
+class CPDF_CryptoHandler
{
public:
@@ -772,7 +772,7 @@ protected:
FX_LPBYTE m_pAESContext;
};
-class CPDF_Point : public CFX_Object
+class CPDF_Point
{
public:
@@ -829,7 +829,7 @@ void FPDF_FileSpec_SetWin32Path(CPDF_Object* pFileSpec, const CFX_WideString&
void FlateEncode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
FX_DWORD FlateDecode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
FX_DWORD RunLengthDecode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
-class CPDF_NumberTree : public CFX_Object
+class CPDF_NumberTree
{
public:
@@ -885,7 +885,7 @@ protected:
IFX_FileAvail* m_pFileAvail;
IFX_FileRead* m_pFileRead;
};
-class CPDF_SortObjNumArray : public CFX_Object
+class CPDF_SortObjNumArray
{
public:
@@ -910,7 +910,7 @@ enum PDF_PAGENODE_TYPE {
PDF_PAGENODE_PAGES,
PDF_PAGENODE_ARRAY,
};
-class CPDF_PageNode : public CFX_Object
+class CPDF_PageNode
{
public:
CPDF_PageNode() : m_type(PDF_PAGENODE_UNKOWN) {}
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index e2801f61f2..2028550546 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -55,7 +55,7 @@ public:
#define RENDER_NOPATHSMOOTH 0x20000000
#define RENDER_NOIMAGESMOOTH 0x40000000
#define RENDER_LIMITEDIMAGECACHE 0x80000000
-class CPDF_RenderOptions : public CFX_Object
+class CPDF_RenderOptions
{
public:
@@ -81,7 +81,7 @@ public:
FX_ARGB TranslateColor(FX_ARGB argb) const;
};
-class CPDF_RenderContext : public CFX_Object
+class CPDF_RenderContext
{
public:
@@ -144,7 +144,7 @@ public:
const CFX_AffineMatrix* pOriginal2Bitmap
) = 0;
};
-class CPDF_ProgressiveRenderer : public CFX_Object
+class CPDF_ProgressiveRenderer
{
public:
@@ -201,7 +201,7 @@ protected:
void RenderStep();
};
-class CPDF_TextRenderer : public CFX_Object
+class CPDF_TextRenderer
{
public:
@@ -249,7 +249,7 @@ public:
virtual void SetCacheLimit(FX_DWORD limit) = 0;
};
-class CPDF_PageRenderCache : public CFX_Object
+class CPDF_PageRenderCache
{
public:
CPDF_PageRenderCache(CPDF_Page* pPage)
@@ -307,7 +307,7 @@ protected:
FX_DWORD m_nCacheSize;
FX_BOOL m_bCurFindCache;
};
-class CPDF_RenderConfig : public CFX_Object
+class CPDF_RenderConfig
{
public:
CPDF_RenderConfig();
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 02edd558ba..86084d0b72 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -39,7 +39,7 @@ typedef struct FT_FaceRec_* FXFT_Face;
class CFX_CTTGSUBTable;
class CPDF_Page;
-template <class ObjClass> class CPDF_CountedObject : public CFX_Object
+template <class ObjClass> class CPDF_CountedObject
{
public:
ObjClass m_Obj;
@@ -76,7 +76,7 @@ typedef CFX_MapPtrTemplate<CPDF_Stream*, CPDF_CountedStreamAcc*> CPDF_FontFil
#define PDFFONT_USEEXTERNATTR 0x80000
FX_WCHAR PDF_UnicodeFromAdobeName(const FX_CHAR* name);
CFX_ByteString PDF_AdobeNameFromUnicode(FX_WCHAR unicode);
-class CPDF_Font : public CFX_Object
+class CPDF_Font
{
public:
@@ -323,7 +323,7 @@ protected:
#define PDFFONT_ENCODING_PDFDOC 7
#define PDFFONT_ENCODING_MS_SYMBOL 8
#define PDFFONT_ENCODING_UNICODE 9
-class CPDF_FontEncoding : public CFX_Object
+class CPDF_FontEncoding
{
public:
@@ -438,7 +438,7 @@ protected:
virtual FX_BOOL _Load();
virtual void LoadGlyphMap();
};
-class CPDF_Type3Char : public CFX_Object
+class CPDF_Type3Char
{
public:
@@ -582,7 +582,8 @@ protected:
#define PDFCS_DEVICEN 9
#define PDFCS_INDEXED 10
#define PDFCS_PATTERN 11
-class CPDF_ColorSpace : public CFX_Object
+
+class CPDF_ColorSpace
{
public:
@@ -677,7 +678,7 @@ protected:
FX_DWORD m_dwStdConversion;
};
-class CPDF_Color : public CFX_Object
+class CPDF_Color
{
public:
@@ -726,7 +727,7 @@ protected:
};
#define PATTERN_TILING 1
#define PATTERN_SHADING 2
-class CPDF_Pattern : public CFX_Object
+class CPDF_Pattern
{
public:
@@ -803,7 +804,7 @@ struct CPDF_MeshVertex {
FX_FLOAT x, y;
FX_FLOAT r, g, b;
};
-class CPDF_MeshStream : public CFX_Object
+class CPDF_MeshStream
{
public:
@@ -843,7 +844,7 @@ public:
FX_ARGB* pMatteColor;
FX_INT32 nQuality;
};
-class CPDF_Image : public CFX_Object
+class CPDF_Image
{
public:
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index a91870b5a5..50e5fbc346 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -113,7 +113,7 @@ protected:
#define FPDFCREATE_NO_ORIGINAL 2
#define FPDFCREATE_PROGRESSIVE 4
#define FPDFCREATE_OBJECTSTREAM 8
-class CPDF_Creator : public CFX_Object
+class CPDF_Creator
{
public:
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 5c73764590..69daa140be 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -42,7 +42,7 @@ class CPDF_FormControl;
class CPDF_LWinParam;
class CFieldTree;
class CPDF_ApSettings;
-class CPDF_NameTree : public CFX_Object
+class CPDF_NameTree
{
public:
@@ -73,7 +73,7 @@ protected:
CPDF_Dictionary* m_pRoot;
};
-class CPDF_BookmarkTree : public CFX_Object
+class CPDF_BookmarkTree
{
public:
CPDF_BookmarkTree(CPDF_Document* pDoc) : m_pDocument(pDoc) {}
@@ -89,7 +89,7 @@ protected:
};
#define PDFBOOKMARK_ITALIC 1
#define PDFBOOKMARK_BOLD 2
-class CPDF_Bookmark : public CFX_Object
+class CPDF_Bookmark
{
public:
@@ -121,7 +121,7 @@ public:
#define PDFZOOM_FITBBOX 6
#define PDFZOOM_FITBHORZ 7
#define PDFZOOM_FITBVERT 8
-class CPDF_Dest : public CFX_Object
+class CPDF_Dest
{
public:
CPDF_Dest() : m_pObj(nullptr) { }
@@ -139,7 +139,7 @@ public:
protected:
CPDF_Object* m_pObj;
};
-class CPDF_OCContext : public CFX_Object, public IPDF_OCContext
+class CPDF_OCContext : public IPDF_OCContext
{
public:
@@ -185,7 +185,7 @@ protected:
CFX_MapPtrTemplate<const CPDF_Dictionary*, void*> m_OCGStates;
};
-class CPDF_LWinParam : public CFX_Object
+class CPDF_LWinParam
{
public:
@@ -224,7 +224,7 @@ public:
CPDF_Dictionary* m_pDict;
};
-class CPDF_ActionFields : public CFX_Object
+class CPDF_ActionFields
{
public:
@@ -252,7 +252,7 @@ public:
#define PDFNAMED_FIRSTPAGE 3
#define PDFNAMED_LASTPAGE 4
#define PDFJS_MAXLENGTH 64
-class CPDF_Action : public CFX_Object
+class CPDF_Action
{
public:
enum ActionType {
@@ -412,7 +412,7 @@ public:
protected:
CPDF_Dictionary* m_pDict;
};
-class CPDF_AAction : public CFX_Object
+class CPDF_AAction
{
public:
@@ -460,7 +460,7 @@ public:
CPDF_Dictionary* m_pDict;
};
-class CPDF_DocJSActions : public CFX_Object
+class CPDF_DocJSActions
{
public:
CPDF_DocJSActions(CPDF_Document* pDoc);
@@ -484,7 +484,7 @@ protected:
CPDF_Document* m_pDocument;
};
-class CPDF_FileSpec : public CFX_Object
+class CPDF_FileSpec
{
public:
@@ -511,7 +511,7 @@ protected:
CPDF_Object *m_pObj;
};
-class CPDF_LinkList : public CFX_Object
+class CPDF_LinkList
{
public:
@@ -542,7 +542,7 @@ protected:
void LoadPageLinks(CPDF_Page* pPage, CFX_PtrArray* pList);
};
-class CPDF_Link : public CFX_Object
+class CPDF_Link
{
public:
CPDF_Link() : m_pDict(nullptr) { }
@@ -566,7 +566,7 @@ protected:
#define ANNOTFLAG_READONLY 0x40
#define ANNOTFLAG_LOCKED 0x80
#define ANNOTFLAG_TOGGLENOVIEW 0x100
-class CPDF_Annot : public CFX_PrivateData, public CFX_Object
+class CPDF_Annot : public CFX_PrivateData
{
public:
@@ -623,7 +623,7 @@ protected:
CPDF_Reference* NewAnnotRef();
};
-class CPDF_AnnotList : public CFX_Object
+class CPDF_AnnotList
{
public:
@@ -695,7 +695,7 @@ protected:
#define COLORTYPE_GRAY 1
#define COLORTYPE_RGB 2
#define COLORTYPE_CMYK 3
-class CPDF_DefaultAppearance : public CFX_Object
+class CPDF_DefaultAppearance
{
public:
@@ -767,7 +767,7 @@ protected:
#define FIELDTYPE_LISTBOX 5
#define FIELDTYPE_TEXTFIELD 6
#define FIELDTYPE_SIGNATURE 7
-class CPDF_InterForm : public CFX_PrivateData, public CFX_Object
+class CPDF_InterForm : public CFX_PrivateData
{
public:
@@ -1025,7 +1025,7 @@ protected:
#define FORMTEXT_COMB 0x800
#define FORMCOMBO_EDIT 0x100
#define FORMLIST_MULTISELECT 0x100
-class CPDF_FormField : public CFX_Object
+class CPDF_FormField
{
public:
@@ -1248,7 +1248,7 @@ protected:
CPDF_Font* m_pFont;
};
CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, const FX_CHAR* name, int nLevel = 0);
-class CPDF_IconFit : public CFX_Object
+class CPDF_IconFit
{
public:
@@ -1300,7 +1300,7 @@ public:
#define TEXTPOS_RIGHT 4
#define TEXTPOS_LEFT 5
#define TEXTPOS_OVERLAID 6
-class CPDF_FormControl : public CFX_Object
+class CPDF_FormControl
{
public:
@@ -1508,7 +1508,7 @@ protected:
friend class CPDF_InterForm;
friend class CPDF_FormField;
};
-class CPDF_FormNotify : public CFX_Object
+class CPDF_FormNotify
{
public:
@@ -1560,7 +1560,7 @@ public:
}
};
FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
-class CPDF_PageLabel : public CFX_Object
+class CPDF_PageLabel
{
public:
@@ -1624,7 +1624,7 @@ public:
protected:
CPDF_Document* m_pDoc;
};
-class CPDF_ApSettings : public CFX_Object
+class CPDF_ApSettings
{
public:
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index 1a2a5d4ffa..a5862e0a8f 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -13,7 +13,7 @@ class CPDF_Document;
class CPDF_Page;
class IPDF_ReflowEngine;
class IPDF_ReflowedPage;
-class CPDF_StructTree : public CFX_Object
+class CPDF_StructTree
{
public:
@@ -65,7 +65,7 @@ struct CPDF_StructKid {
} m_Object;
};
};
-class CPDF_StructElement : public CFX_Object
+class CPDF_StructElement
{
public:
virtual ~CPDF_StructElement() { }
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index c9a66020d8..18ea709bcf 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -164,7 +164,7 @@ struct CPVT_WordRange {
CPVT_WordPlace EndPos;
};
-struct CPVT_SecProps : public CFX_Object {
+struct CPVT_SecProps {
CPVT_SecProps() : fLineLeading(0.0f), fLineIndent(0.0f), nAlignment(0)
{
@@ -186,7 +186,7 @@ struct CPVT_SecProps : public CFX_Object {
FX_INT32 nAlignment;
};
-struct CPVT_WordProps : public CFX_Object {
+struct CPVT_WordProps {
CPVT_WordProps() : nFontIndex(-1), fFontSize(0.0f), dwWordColor(0), nScriptType(0), nWordStyle(0),
fCharSpace(0.0f), nHorzScale(0)
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index 39008063f3..8673c1aac1 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -59,7 +59,7 @@ class IPDF_ReflowedPage;
#define FPDFTEXT_WRITINGMODE_LRTB 1
#define FPDFTEXT_WRITINGMODE_RLTB 2
#define FPDFTEXT_WRITINGMODE_TBRL 3
-class CPDFText_ParseOptions : public CFX_Object
+class CPDFText_ParseOptions
{
public:
@@ -68,7 +68,7 @@ public:
FX_BOOL m_bNormalizeObjs;
FX_BOOL m_bOutputHyphen;
};
-class IPDF_TextPage : public CFX_Object
+class IPDF_TextPage
{
public:
@@ -130,7 +130,7 @@ public:
#define FPDFTEXT_MATCHCASE 0x00000001
#define FPDFTEXT_MATCHWHOLEWORD 0x00000002
#define FPDFTEXT_CONSECUTIVE 0x00000004
-class IPDF_TextPageFind : public CFX_Object
+class IPDF_TextPageFind
{
public:
@@ -151,7 +151,7 @@ public:
virtual int GetMatchedCount() const = 0;
};
-class IPDF_LinkExtract : public CFX_Object
+class IPDF_LinkExtract
{
public:
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index b0eecc3e52..3a00fd3835 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -28,7 +28,7 @@ class ICodec_BmpModule;
class ICodec_TiffModule;
class CFX_DIBAttribute;
class ICodec_ScanlineDecoder;
-class CCodec_ModuleMgr : public CFX_Object
+class CCodec_ModuleMgr
{
public:
@@ -109,7 +109,7 @@ protected:
ICodec_TiffModule* m_pTiffModule;
};
-class ICodec_BasicModule : public CFX_Object
+class ICodec_BasicModule
{
public:
@@ -121,7 +121,7 @@ public:
virtual ICodec_ScanlineDecoder* CreateRunLengthDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
int nComps, int bpc) = 0;
};
-class ICodec_ScanlineDecoder : public CFX_Object
+class ICodec_ScanlineDecoder
{
public:
@@ -147,7 +147,7 @@ public:
virtual void ClearImageData() = 0;
};
-class ICodec_FlateModule : public CFX_Object
+class ICodec_FlateModule
{
public:
@@ -162,7 +162,7 @@ public:
FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
virtual FX_BOOL Encode(FX_LPCBYTE src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
};
-class ICodec_FaxModule : public CFX_Object
+class ICodec_FaxModule
{
public:
@@ -175,7 +175,7 @@ public:
virtual FX_BOOL Encode(FX_LPCBYTE src_buf, int width, int height, int pitch,
FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
};
-class ICodec_JpegModule : public CFX_Object
+class ICodec_JpegModule
{
public:
@@ -210,7 +210,7 @@ public:
virtual FX_DWORD GetAvailInput(void* pContext, FX_LPBYTE* avail_buf_ptr = NULL) = 0;
};
-class ICodec_JpxModule : public CFX_Object
+class ICodec_JpxModule
{
public:
@@ -226,7 +226,7 @@ public:
virtual void DestroyDecoder(FX_LPVOID ctx) = 0;
};
-class ICodec_PngModule : public CFX_Object
+class ICodec_PngModule
{
public:
@@ -244,7 +244,7 @@ public:
void (*FillScanlineBufCompletedCallback)(void* pModule, int pass, int line);
};
-class ICodec_GifModule : public CFX_Object
+class ICodec_GifModule
{
public:
@@ -276,7 +276,7 @@ public:
void (*ReadScanlineCallback)(void* pModule, FX_INT32 row_num, FX_LPBYTE row_buf);
};
-class ICodec_BmpModule : public CFX_Object
+class ICodec_BmpModule
{
public:
@@ -299,7 +299,7 @@ public:
void (*ReadScanlineCallback)(void* pModule, FX_INT32 row_num, FX_LPBYTE row_buf);
};
-class ICodec_TiffModule : public CFX_Object
+class ICodec_TiffModule
{
public:
@@ -317,7 +317,7 @@ public:
virtual void DestroyDecoder(FX_LPVOID ctx) = 0;
};
-class ICodec_Jbig2Module : public CFX_Object
+class ICodec_Jbig2Module
{
public:
@@ -338,7 +338,7 @@ public:
virtual FXCODEC_STATUS ContinueDecode(void* pJbig2Content, IFX_Pause* pPause) = 0;
virtual void DestroyJbig2Context(void* pJbig2Content) = 0;
};
-class ICodec_ProgressiveDecoder : public CFX_Object
+class ICodec_ProgressiveDecoder
{
public:
@@ -366,13 +366,13 @@ public:
virtual FXCODEC_STATUS ContinueDecode(IFX_Pause* pPause = NULL) = 0;
};
-class ICodec_Jbig2Encoder : public CFX_Object
+class ICodec_Jbig2Encoder
{
public:
virtual ~ICodec_Jbig2Encoder() {}
};
-class ICodec_IccModule : public CFX_Object
+class ICodec_IccModule
{
public:
typedef enum {
@@ -434,7 +434,7 @@ public:
void AdobeCMYK_to_sRGB(FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B);
void AdobeCMYK_to_sRGB1(FX_BYTE c, FX_BYTE m, FX_BYTE y, FX_BYTE k, FX_BYTE& R, FX_BYTE& G, FX_BYTE& B);
FX_BOOL MD5ComputeID(FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16]);
-class CFX_DIBAttribute : public CFX_Object
+class CFX_DIBAttribute
{
public:
CFX_DIBAttribute();
@@ -462,7 +462,7 @@ public:
FX_INT32 m_nBmpCompressType;
class IFX_DIBAttributeExif* m_pExif;
};
-class IFX_DIBAttributeExif : public CFX_Object
+class IFX_DIBAttributeExif
{
public:
virtual ~IFX_DIBAttributeExif() {};
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 33d5881c6a..1ef9410fb3 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -27,7 +27,7 @@
template <typename T, size_t N>
char (&ArraySizeHelper(T (&array)[N]))[N];
-class CFX_BinaryBuf : public CFX_Object
+class CFX_BinaryBuf
{
public:
CFX_BinaryBuf();
@@ -155,7 +155,7 @@ public:
CFX_WideStringC GetWideString() const;
};
-class CFX_ArchiveSaver : public CFX_Object
+class CFX_ArchiveSaver
{
public:
CFX_ArchiveSaver() : m_pStream(NULL) {}
@@ -198,7 +198,7 @@ protected:
IFX_FileStream* m_pStream;
};
-class CFX_ArchiveLoader : public CFX_Object
+class CFX_ArchiveLoader
{
public:
@@ -260,7 +260,7 @@ protected:
FX_STRSIZE m_Length;
};
-class CFX_FileBufferArchive : public IFX_BufferArchive, public CFX_Object
+class CFX_FileBufferArchive : public IFX_BufferArchive
{
public:
CFX_FileBufferArchive(FX_STRSIZE size = 32768);
@@ -352,7 +352,7 @@ CFX_ByteString FX_UrlEncode(const CFX_WideString& wsUrl);
CFX_WideString FX_UrlDecode(const CFX_ByteString& bsUrl);
CFX_ByteString FX_EncodeURI(const CFX_WideString& wsURI);
CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI);
-class CFX_BasicArray : public CFX_Object
+class CFX_BasicArray
{
protected:
CFX_BasicArray(int unit_size);
@@ -665,7 +665,7 @@ public:
};
typedef CFX_ObjectArray<CFX_ByteString> CFX_ByteStringArray;
typedef CFX_ObjectArray<CFX_WideString> CFX_WideStringArray;
-class CFX_BaseSegmentedArray : public CFX_Object
+class CFX_BaseSegmentedArray
{
public:
CFX_BaseSegmentedArray(int unit_size = 1, int segment_units = 512, int index_size = 8);
@@ -734,7 +734,7 @@ public:
}
};
template <class DataType, int FixedSize>
-class CFX_FixedBufGrow : public CFX_Object
+class CFX_FixedBufGrow
{
public:
CFX_FixedBufGrow() : m_pData(NULL)
@@ -799,7 +799,7 @@ public:
private:
DataType* m_pData;
};
-class CFX_MapPtrToPtr : public CFX_Object
+class CFX_MapPtrToPtr
{
protected:
@@ -916,7 +916,7 @@ public:
rValue = (ValueType)(FX_UINTPTR)pValue;
}
};
-class CFX_CMapDWordToDWord : public CFX_Object
+class CFX_CMapDWordToDWord
{
public:
@@ -933,7 +933,7 @@ protected:
CFX_BinaryBuf m_Buffer;
};
-class CFX_MapByteStringToPtr : public CFX_Object
+class CFX_MapByteStringToPtr
{
protected:
@@ -1013,7 +1013,7 @@ public:
~CFX_MapByteStringToPtr();
};
-class CFX_CMapByteStringToPtr : public CFX_Object
+class CFX_CMapByteStringToPtr
{
public:
CFX_CMapByteStringToPtr();
@@ -1041,7 +1041,7 @@ private:
CFX_BaseSegmentedArray m_Buffer;
};
-class CFX_PtrList : public CFX_Object
+class CFX_PtrList
{
protected:
@@ -1190,7 +1190,7 @@ protected:
void AddData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback, FX_BOOL bSelfDestruct);
};
-class CFX_BitStream : public CFX_Object
+class CFX_BitStream
{
public:
@@ -1223,7 +1223,7 @@ protected:
FX_LPCBYTE m_pData;
};
-template <class ObjClass> class CFX_CountRef : public CFX_Object
+template <class ObjClass> class CFX_CountRef
{
public:
@@ -1373,7 +1373,7 @@ public:
virtual ~IFX_Pause() { }
virtual FX_BOOL NeedToPauseNow() = 0;
};
-class CFX_DataFilter : public CFX_Object
+class CFX_DataFilter
{
public:
@@ -1448,7 +1448,7 @@ protected:
};
#define FX_DATALIST_LENGTH 1024
template<size_t unit>
-class CFX_SortListArray : public CFX_Object
+class CFX_SortListArray
{
protected:
@@ -1562,7 +1562,7 @@ protected:
CFX_ArrayTemplate<DataList> m_DataLists;
};
template<typename T1, typename T2>
-class CFX_ListArrayTemplate : public CFX_Object
+class CFX_ListArrayTemplate
{
public:
@@ -1610,7 +1610,7 @@ public:
};
#define FX_IsOdd(a) ((a) & 1)
-class CFX_Vector_3by1 : public CFX_Object
+class CFX_Vector_3by1
{
public:
@@ -1626,7 +1626,7 @@ public:
FX_FLOAT b;
FX_FLOAT c;
};
-class CFX_Matrix_3by3 : public CFX_Object
+class CFX_Matrix_3by3
{
public:
diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h
index 0b4b920195..758d33762e 100644
--- a/core/include/fxcrt/fx_coordinates.h
+++ b/core/include/fxcrt/fx_coordinates.h
@@ -18,7 +18,7 @@ template<class baseType> class CFX_ATemplate;
template<class baseType> class CFX_RRTemplate;
class CFX_Matrix;
template<class baseType>
-class CFX_PSVTemplate : public CFX_Object
+class CFX_PSVTemplate
{
public:
typedef CFX_PSVTemplate<baseType> FXT_PSV;
@@ -230,7 +230,7 @@ public:
typedef CFX_VTemplate<FX_INT32> CFX_Vector;
typedef CFX_VTemplate<FX_FLOAT> CFX_VectorF;
template<class baseType>
-class CFX_RTemplate: public CFX_Object
+class CFX_RTemplate
{
public:
typedef CFX_PSVTemplate<baseType> FXT_POINT;
@@ -610,7 +610,7 @@ struct FX_SMALL_RECT {
FX_SHORT Bottom;
};
-class CFX_FloatRect : public CFX_Object
+class CFX_FloatRect
{
public:
@@ -749,7 +749,7 @@ public:
FX_FLOAT top;
};
-class CFX_Matrix : public CFX_Object
+class CFX_Matrix
{
public:
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index 15dc7da8cf..7884d6b11d 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -10,6 +10,7 @@
#include "fx_system.h"
#ifdef __cplusplus
+#include <new>
extern "C" {
#endif
#define FX_Alloc(type, size) (type*)calloc(size, sizeof(type))
@@ -22,76 +23,18 @@ void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
void FXMEM_DefaultFree(void* pointer, int flags);
#ifdef __cplusplus
}
-#endif
-#ifdef __cplusplus
-class CFX_Object
-{
-public:
- void* operator new (size_t size, FX_LPCSTR file, int line)
- {
- return malloc(size);
- }
- void operator delete (void* p, FX_LPCSTR file, int line)
- {
- free(p);
- }
- void* operator new (size_t size)
- {
- return malloc(size);
- }
- void operator delete (void* p)
- {
- free(p);
- }
- void* operator new[] (size_t size, FX_LPCSTR file, int line)
- {
- return malloc(size);
- }
- void operator delete[] (void* p, FX_LPCSTR file, int line)
- {
- free(p);
- }
- void* operator new[] (size_t size)
- {
- return malloc(size);
- }
- void operator delete[] (void* p)
- {
- free(p);
- }
- void* operator new (size_t, void* buf)
- {
- return buf;
- }
- void operator delete (void*, void*) {}
-};
-#endif
-#ifdef __cplusplus
-#if defined(_DEBUG)
-#define FX_NEW new(__FILE__, __LINE__)
-#else
-#define FX_NEW new
-#endif
-#define FX_NEW_VECTOR(Pointer, Class, Count) \
- { \
- Pointer = FX_Alloc(Class, Count); \
- if (Pointer) { \
- for (int i = 0; i < (Count); i ++) new (Pointer + i) Class; \
- } \
- }
-#define FX_DELETE_VECTOR(Pointer, Class, Count) \
- { \
- for (int i = 0; i < (Count); i ++) Pointer[i].~Class(); \
- FX_Free(Pointer); \
- }
-class CFX_DestructObject : public CFX_Object
+#define FX_NEW new(std::nothrow)
+#define FX_NEW_VECTOR(Pointer, Class, Count) (Pointer = FX_NEW Class[Count])
+#define FX_DELETE_VECTOR(Pointer, Class, Count) delete[] Pointer
+
+class CFX_DestructObject
{
public:
virtual ~CFX_DestructObject() {}
};
-class CFX_GrowOnlyPool : public CFX_Object
+class CFX_GrowOnlyPool
{
public:
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index ad1d083323..df7dd0c762 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -21,7 +21,7 @@ class CFX_WideStringL;
// An immutable string with caller-provided storage which must outlive the
// string itself.
-class CFX_ByteStringC : public CFX_Object
+class CFX_ByteStringC
{
public:
typedef FX_CHAR value_type;
@@ -171,7 +171,7 @@ struct CFX_StringData {
FX_CHAR m_String[1];
};
-class CFX_ByteString : public CFX_Object
+class CFX_ByteString
{
public:
typedef FX_CHAR value_type;
@@ -428,7 +428,7 @@ inline CFX_ByteString operator + (FX_BSTR str1, const CFX_ByteString& str2)
{
return CFX_ByteString(str1, str2);
}
-class CFX_StringBufBase : public CFX_Object
+class CFX_StringBufBase
{
public:
@@ -484,7 +484,7 @@ public:
FX_CHAR m_Buffer[limit];
};
typedef CFX_StringBufTemplate<256> CFX_StringBuf256;
-class CFX_WideStringC : public CFX_Object
+class CFX_WideStringC
{
public:
typedef FX_WCHAR value_type;
@@ -630,7 +630,7 @@ struct CFX_StringDataW {
FX_WCHAR m_String[1];
};
-class CFX_WideString : public CFX_Object
+class CFX_WideString
{
public:
typedef FX_WCHAR value_type;
diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h
index 0b0f7b8051..66e980e13c 100644
--- a/core/include/fxcrt/fx_ucd.h
+++ b/core/include/fxcrt/fx_ucd.h
@@ -112,7 +112,7 @@ FX_BOOL FX_IsCombinationChar(FX_WCHAR wch);
FX_BOOL FX_IsBidiChar(FX_WCHAR wch);
FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical);
FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, FX_BOOL bVertical);
-class CFX_Char : public CFX_Object
+class CFX_Char
{
public:
CFX_Char() : m_wCharCode(0)
diff --git a/core/include/fxcrt/fx_xml.h b/core/include/fxcrt/fx_xml.h
index 8fb00158a7..7f3dbcc205 100644
--- a/core/include/fxcrt/fx_xml.h
+++ b/core/include/fxcrt/fx_xml.h
@@ -9,14 +9,14 @@
#include "fx_basic.h"
-class CXML_AttrItem : public CFX_Object
+class CXML_AttrItem
{
public:
CFX_ByteString m_QSpaceName;
CFX_ByteString m_AttrName;
CFX_WideString m_Value;
};
-class CXML_AttrMap : public CFX_Object
+class CXML_AttrMap
{
public:
CXML_AttrMap()
@@ -35,7 +35,7 @@ public:
CXML_AttrItem& GetAt(int index) const;
CFX_ObjectArray<CXML_AttrItem>* m_pMap;
};
-class CXML_Content : public CFX_Object
+class CXML_Content
{
public:
CXML_Content() : m_bCDATA(FALSE), m_Content() {}
@@ -47,7 +47,7 @@ public:
FX_BOOL m_bCDATA;
CFX_WideString m_Content;
};
-class CXML_Element : public CFX_Object
+class CXML_Element
{
public:
static CXML_Element* Parse(const void* pBuffer, size_t size, FX_BOOL bSaveSpaceChars = FALSE, FX_FILESIZE* pParsedSize = NULL);
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h
index f7e435d966..d6e99b7f73 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/include/fxge/fx_dib.h
@@ -136,7 +136,7 @@ FX_ARGB ArgbEncode(int a, FX_COLORREF rgb);
#define FXSETFLAG_COLORTYPE(flag, val) flag = (((val)<<8)|(flag&0xffff00ff))
#define FXSETFLAG_ALPHA_FILL(flag, val) flag = ((val)|(flag&0xffffff00))
#define FXSETFLAG_ALPHA_STROKE(flag, val) flag = (((val)<<16)|(flag&0xff00ffff))
-class CFX_DIBSource : public CFX_Object
+class CFX_DIBSource
{
public:
@@ -353,7 +353,7 @@ protected:
FX_BOOL GetGrayData(void* pIccTransform = NULL);
};
-class CFX_DIBExtractor : public CFX_Object
+class CFX_DIBExtractor
{
public:
@@ -408,7 +408,7 @@ public:
virtual FX_BOOL SetInfo(int width, int height, FXDIB_Format src_format, FX_DWORD* pSrcPalette) = 0;
};
-class CFX_ScanlineCompositor : public CFX_Object
+class CFX_ScanlineCompositor
{
public:
CFX_ScanlineCompositor();
@@ -450,7 +450,7 @@ protected:
int m_CacheSize;
FX_BOOL m_bRgbByteOrder;
};
-class CFX_BitmapComposer : public IFX_ScanlineComposer, public CFX_Object
+class CFX_BitmapComposer : public IFX_ScanlineComposer
{
public:
@@ -487,7 +487,7 @@ protected:
void ComposeScanlineV(int line, FX_LPCBYTE scanline, FX_LPCBYTE scan_extra_alpha = NULL);
FX_LPBYTE m_pScanlineV, m_pClipScanV, m_pAddClipScan, m_pScanlineAlphaV;
};
-class CFX_BitmapStorer : public IFX_ScanlineComposer, public CFX_Object
+class CFX_BitmapStorer : public IFX_ScanlineComposer
{
public:
@@ -511,7 +511,7 @@ private:
CFX_DIBitmap* m_pBitmap;
};
class CStretchEngine;
-class CFX_ImageStretcher : public CFX_Object
+class CFX_ImageStretcher
{
public:
@@ -548,7 +548,7 @@ public:
FX_INT32 ContinueStretch(IFX_Pause* pPause);
};
-class CFX_ImageTransformer : public CFX_Object
+class CFX_ImageTransformer
{
public:
@@ -569,7 +569,7 @@ public:
FX_DWORD m_Flags;
int m_Status;
};
-class CFX_ImageRenderer : public CFX_Object
+class CFX_ImageRenderer
{
public:
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 73292a0fd1..1199147f31 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -51,7 +51,7 @@ class CFontFileFaceInfo;
#define FXFONT_FF_SCRIPT (4<<4)
#define FXFONT_FW_NORMAL 400
#define FXFONT_FW_BOLD 700
-class CFX_Font : public CFX_Object
+class CFX_Font
{
public:
CFX_Font();
@@ -150,7 +150,7 @@ protected:
};
#define ENCODING_INTERNAL 0
#define ENCODING_UNICODE 1
-class IFX_FontEncoding : public CFX_Object
+class IFX_FontEncoding
{
public:
virtual ~IFX_FontEncoding() {}
@@ -195,7 +195,7 @@ IFX_FontEncodingEx* FX_CreateFontEncodingEx(CFX_Font* pFont, FX_DWORD nEncodingI
#define FXFONT_SUBST_NONSYMBOL 0x20
#define FXFONT_SUBST_EXACT 0x40
#define FXFONT_SUBST_STANDARD 0x80
-class CFX_SubstFont : public CFX_Object
+class CFX_SubstFont
{
public:
@@ -230,7 +230,7 @@ typedef struct {
FX_LPCBYTE m_pFontData;
FX_DWORD m_dwSize;
} FoxitFonts;
-class CFX_FontMgr : public CFX_Object
+class CFX_FontMgr
{
public:
CFX_FontMgr();
@@ -260,7 +260,7 @@ public:
FXFT_Library m_FTLibrary;
FoxitFonts m_ExternalFonts[16];
};
-class IFX_FontMapper : public CFX_Object
+class IFX_FontMapper
{
public:
@@ -325,7 +325,7 @@ private:
FXFT_Face m_FoxitFaces[14];
IFX_FontEnumerator* m_pFontEnumerator;
};
-class IFX_SystemFontInfo : public CFX_Object
+class IFX_SystemFontInfo
{
public:
static IFX_SystemFontInfo* CreateDefault();
@@ -376,14 +376,14 @@ protected:
void ScanFile(CFX_ByteString& path);
void ReportFace(CFX_ByteString& path, FXSYS_FILE* pFile, FX_DWORD filesize, FX_DWORD offset);
};
-class CFX_CountedFaceCache : public CFX_Object
+class CFX_CountedFaceCache
{
public:
CFX_FaceCache* m_Obj;
FX_DWORD m_nCount;
};
typedef CFX_MapPtrTemplate<FXFT_Face, CFX_CountedFaceCache*> CFX_FTCacheMap;
-class CFX_FontCache : public CFX_Object
+class CFX_FontCache
{
public:
~CFX_FontCache();
@@ -411,14 +411,14 @@ public:
CFX_Font* m_pFont;
};
#define FX_FONTCACHE_DEFINE(pFontCache, pFont) CFX_AutoFontCache autoFontCache((pFontCache), (pFont))
-class CFX_GlyphBitmap : public CFX_Object
+class CFX_GlyphBitmap
{
public:
int m_Top;
int m_Left;
CFX_DIBitmap m_Bitmap;
};
-class CFX_FaceCache : public CFX_Object
+class CFX_FaceCache
{
public:
~CFX_FaceCache();
diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h
index 0c4bce8003..f9c4e9b9ae 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/include/fxge/fx_ge.h
@@ -23,7 +23,7 @@ class CFX_RenderDevice;
class IFX_RenderDeviceDriver;
class CCodec_ModuleMgr;
class IFXG_PaintModuleMgr;
-class CFX_GEModule : public CFX_Object
+class CFX_GEModule
{
public:
@@ -87,7 +87,7 @@ typedef struct {
#define FXPT_TYPE 0x06
#define FXFILL_ALTERNATE 1
#define FXFILL_WINDING 2
-class CFX_ClipRgn : public CFX_Object
+class CFX_ClipRgn
{
public:
@@ -146,7 +146,7 @@ inline FX_ARGB ArgbGammaInverse(FX_ARGB argb)
{
return argb;
}
-class CFX_PathData : public CFX_Object
+class CFX_PathData
{
public:
@@ -222,7 +222,7 @@ protected:
int m_AllocCount;
};
-class CFX_GraphStateData : public CFX_Object
+class CFX_GraphStateData
{
public:
@@ -305,7 +305,7 @@ typedef struct {
FX_DWORD m_ExtGID;
FX_BOOL m_bFontStyle;
} FXTEXT_CHARPOS;
-class CFX_RenderDevice : public CFX_Object
+class CFX_RenderDevice
{
public:
CFX_RenderDevice();
@@ -505,7 +505,7 @@ protected:
FX_BOOL m_bOwnedBitmap;
};
-class IFX_RenderDeviceDriver : public CFX_Object
+class IFX_RenderDeviceDriver
{
public:
@@ -644,7 +644,7 @@ protected:
~IFX_PSOutput() { }
};
class CPSFont;
-class CFX_PSRenderer : public CFX_Object
+class CFX_PSRenderer
{
public:
diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h
index 6346f06136..73b28e3735 100644
--- a/core/src/fpdfapi/fpdf_edit/editint.h
+++ b/core/src/fpdfapi/fpdf_edit/editint.h
@@ -6,7 +6,7 @@
#ifndef _FPDF_EDITINT_
#define _FPDF_EDITINT_
-class CPDF_ObjectStream : public CFX_Object
+class CPDF_ObjectStream
{
public:
CPDF_ObjectStream();
@@ -27,7 +27,7 @@ protected:
CFX_DWordArray m_OffsetArray;
};
-class CPDF_XRefStream : public CFX_Object
+class CPDF_XRefStream
{
public:
diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h
index 43f4e302af..a2d544afe9 100644
--- a/core/src/fpdfapi/fpdf_font/font_int.h
+++ b/core/src/fpdfapi/fpdf_font/font_int.h
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
typedef void* FXFT_Library;
-class CPDF_CMapManager : public CFX_Object
+class CPDF_CMapManager
{
public:
CPDF_CMapManager();
@@ -22,7 +22,7 @@ private:
CFX_MapByteStringToPtr m_CMaps;
CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6];
};
-class CPDF_FontGlobals : public CFX_Object
+class CPDF_FontGlobals
{
public:
CPDF_FontGlobals();
@@ -48,7 +48,7 @@ struct _CMap_CodeRange {
FX_BYTE m_Lower[4];
FX_BYTE m_Upper[4];
};
-class CPDF_CMapParser : public CFX_Object
+class CPDF_CMapParser
{
public:
CPDF_CMapParser();
@@ -73,7 +73,7 @@ private:
#define CIDCODING_UCS2 5
#define CIDCODING_CID 6
#define CIDCODING_UTF16 7
-class CPDF_CMap : public CFX_Object
+class CPDF_CMap
{
public:
CPDF_CMap();
@@ -138,7 +138,7 @@ typedef struct _FileHeader {
FX_DWORD dwDataOffset;
FX_DWORD dwRecordSize;
} FXMP_FILEHEADER;
-class CPDF_CID2UnicodeMap : public CFX_Object
+class CPDF_CID2UnicodeMap
{
public:
CPDF_CID2UnicodeMap();
@@ -152,7 +152,7 @@ protected:
const FX_WORD* m_pEmbeddedMap;
FX_DWORD m_EmbeddedCount;
};
-class CPDF_ToUnicodeMap : public CFX_Object
+class CPDF_ToUnicodeMap
{
public:
void Load(CPDF_Stream* pStream);
@@ -163,7 +163,7 @@ protected:
CPDF_CID2UnicodeMap* m_pBaseMap;
CFX_WideTextBuf m_MultiCharBuf;
};
-class CPDF_FontCharMap : public CFX_CharMap, public CFX_Object
+class CPDF_FontCharMap : public CFX_CharMap
{
public:
CPDF_FontCharMap(CPDF_Font* pFont);
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index 41bb95a89d..91d4010b80 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -35,7 +35,7 @@ CPDF_FontGlobals::~CPDF_FontGlobals()
FX_Free(m_pContrastRamps);
}
}
-class CFX_StockFontArray : public CFX_Object
+class CFX_StockFontArray
{
public:
CFX_StockFontArray()
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
index 6b1b4f2443..d231c13ca2 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
@@ -19,7 +19,7 @@ public:
protected:
CFX_BinaryBuf m_Buffer;
};
-class CFX_CTTGSUBTable : public CFX_Object
+class CFX_CTTGSUBTable
{
public:
CFX_CTTGSUBTable(void): m_bFeautureMapLoad(FALSE), loaded(false) {};
@@ -406,7 +406,7 @@ private:
struct TFeatureList FeatureList;
struct TLookupList LookupList;
};
-class CFX_GSUBTable FX_FINAL : public IFX_GSUBTable, public CFX_Object
+class CFX_GSUBTable FX_FINAL : public IFX_GSUBTable
{
public:
virtual void Release() FX_OVERRIDE
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
index ae912ac50f..c786df5a5b 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
@@ -21,7 +21,7 @@ typedef enum {PSOP_ADD, PSOP_SUB, PSOP_MUL, PSOP_DIV, PSOP_IDIV, PSOP_MOD,
PSOP_IF, PSOP_IFELSE, PSOP_POP, PSOP_EXCH, PSOP_DUP, PSOP_COPY,
PSOP_INDEX, PSOP_ROLL, PSOP_PROC, PSOP_CONST
} PDF_PSOP;
-class CPDF_PSProc : public CFX_Object
+class CPDF_PSProc
{
public:
~CPDF_PSProc();
@@ -30,7 +30,7 @@ public:
CFX_PtrArray m_Operators;
};
#define PSENGINE_STACKSIZE 100
-class CPDF_PSEngine : public CFX_Object
+class CPDF_PSEngine
{
public:
CPDF_PSEngine();
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 9048fb7874..73c6ec4121 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -11,7 +11,7 @@
#define PARSE_STEP_LIMIT 100
#define STREAM_PARSE_BUFSIZE 20480
class CPDF_QuickFontCache;
-class CPDF_StreamParser : public CFX_Object
+class CPDF_StreamParser
{
public:
@@ -118,7 +118,7 @@ typedef struct {
#define _FPDF_MAX_FORM_LEVEL_ 30
#define _FPDF_MAX_TYPE3_FORM_LEVEL_ 4
#define _FPDF_MAX_OBJECT_STACK_SIZE_ 512
-class CPDF_StreamContentParser : public CFX_Object
+class CPDF_StreamContentParser
{
public:
CPDF_StreamContentParser();
@@ -280,7 +280,7 @@ public:
void Handle_NextLineShowText_Space();
void Handle_Invalid();
};
-class CPDF_ContentParser : public CFX_Object
+class CPDF_ContentParser
{
public:
CPDF_ContentParser();
@@ -359,7 +359,7 @@ FX_BOOL PDF_DocPageData_Release(CFX_MapPtrTemplate<KeyType, CPDF_CountedObject<V
}
return FALSE;
}
-class CPDF_DocPageData : public CFX_Object
+class CPDF_DocPageData
{
public:
CPDF_DocPageData(CPDF_Document *pPDFDoc);
@@ -393,7 +393,7 @@ public:
CPDF_FontFileMap m_FontFileMap;
FX_BOOL m_bForceClear;
};
-class CPDF_Function : public CFX_Object
+class CPDF_Function
{
public:
static CPDF_Function* Load(CPDF_Object* pFuncObj);
@@ -416,7 +416,7 @@ protected:
virtual FX_BOOL v_Init(CPDF_Object* pObj) = 0;
virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const = 0;
};
-class CPDF_IccProfile : public CFX_Object
+class CPDF_IccProfile
{
public:
CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize);
@@ -451,10 +451,10 @@ public:
CPDF_CountedColorSpace* m_pCountedBaseCS;
};
#define MAX_PAGE_OBJECTS_UNIFY_NAMING 4096
-class CPDF_ResourceNaming : public CFX_Object
+class CPDF_ResourceNaming
{
public:
- struct _NamingState : public CFX_Object {
+ struct _NamingState {
CFX_ByteString m_Prefix;
int m_nIndex;
};
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
index b6d6dc70c0..4fb9b4db13 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
@@ -54,7 +54,7 @@ CPDF_CryptoHandler* CPDF_StandardSecurityHandler::CreateCryptoHandler()
{
return FX_NEW CPDF_StandardCryptoHandler;
}
-typedef struct _PDF_CRYPTOITEM : public CFX_Object {
+typedef struct _PDF_CRYPTOITEM {
FX_INT32 m_Cipher;
FX_INT32 m_KeyLen;
FX_BOOL m_bChecked;
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index 5a7837dc71..792846ea34 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -2728,7 +2728,7 @@ void CPDF_SyntaxParser::GetBinary(FX_BYTE* buffer, FX_DWORD size)
}
}
-class CPDF_DataAvail FX_FINAL : public CFX_Object, public IPDF_DataAvail
+class CPDF_DataAvail FX_FINAL : public IPDF_DataAvail
{
public:
CPDF_DataAvail(IFX_FileAvail* pFileAvail, IFX_FileRead* pFileRead);
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index 5606562bf3..086a1c24b2 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -9,7 +9,7 @@
#endif
class CPDF_QuickStretcher;
#define TYPE3_MAX_BLUES 16
-class CPDF_Type3Glyphs : public CFX_Object
+class CPDF_Type3Glyphs
{
public:
CPDF_Type3Glyphs()
@@ -25,7 +25,7 @@ public:
int m_TopBlueCount, m_BottomBlueCount;
};
class CFX_GlyphBitmap;
-class CPDF_Type3Cache : public CFX_Object
+class CPDF_Type3Cache
{
public:
CPDF_Type3Cache(CPDF_Type3Font* pFont)
@@ -39,7 +39,7 @@ protected:
CPDF_Type3Font* m_pFont;
CFX_MapByteStringToPtr m_SizeMap;
};
-class CPDF_TransferFunc : public CFX_Object
+class CPDF_TransferFunc
{
public:
CPDF_Document* m_pPDFDoc;
@@ -51,7 +51,7 @@ public:
};
typedef CFX_MapPtrTemplate<CPDF_Font*, CPDF_CountedObject<CPDF_Type3Cache*>*> CPDF_Type3CacheMap;
typedef CFX_MapPtrTemplate<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc*>*> CPDF_TransferFuncMap;
-class CPDF_DocRenderData : public CFX_Object
+class CPDF_DocRenderData
{
public:
CPDF_DocRenderData(CPDF_Document* pPDFDoc = NULL);
@@ -78,7 +78,7 @@ public:
CFX_AffineMatrix m_Matrix;
};
typedef CFX_ArrayTemplate<_PDF_RenderItem> CPDF_RenderLayer;
-class IPDF_ObjectRenderer : public CFX_Object
+class IPDF_ObjectRenderer
{
public:
static IPDF_ObjectRenderer* Create(int type);
@@ -87,7 +87,7 @@ public:
virtual FX_BOOL Continue(IFX_Pause* pPause) = 0;
FX_BOOL m_Result;
};
-class CPDF_RenderStatus : public CFX_Object
+class CPDF_RenderStatus
{
public:
CPDF_RenderStatus();
@@ -179,7 +179,7 @@ protected:
FX_ARGB m_T3FillColor;
int m_curBlend;
};
-class CPDF_ImageLoader : public CFX_Object
+class CPDF_ImageLoader
{
public:
CPDF_ImageLoader()
@@ -205,7 +205,7 @@ protected:
FX_INT32 m_nDownsampleWidth;
FX_INT32 m_nDownsampleHeight;
};
-class CPDF_ProgressiveImageLoaderHandle : public CFX_Object
+class CPDF_ProgressiveImageLoaderHandle
{
public:
CPDF_ProgressiveImageLoaderHandle();
@@ -258,7 +258,7 @@ protected:
FX_BOOL DrawMaskedImage();
FX_BOOL DrawPatternImage(const CFX_Matrix* pObj2Device);
};
-class CPDF_ScaledRenderBuffer : public CFX_Object
+class CPDF_ScaledRenderBuffer
{
public:
CPDF_ScaledRenderBuffer();
@@ -283,7 +283,7 @@ private:
CFX_AffineMatrix m_Matrix;
};
class ICodec_ScanlineDecoder;
-class CPDF_QuickStretcher : public CFX_Object
+class CPDF_QuickStretcher
{
public:
CPDF_QuickStretcher();
@@ -300,7 +300,7 @@ public:
CPDF_StreamAcc m_StreamAcc;
int m_LineIndex;
};
-class CPDF_DeviceBuffer : public CFX_Object
+class CPDF_DeviceBuffer
{
public:
CPDF_DeviceBuffer();
@@ -324,7 +324,7 @@ private:
CFX_DIBitmap* m_pBitmap;
CFX_AffineMatrix m_Matrix;
};
-class CPDF_ImageCache : public CFX_Object
+class CPDF_ImageCache
{
public:
CPDF_ImageCache(CPDF_Document* pDoc, CPDF_Stream* pStream);
diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp
index d695cb98ba..d8ca525f0a 100644
--- a/core/src/fpdfdoc/doc_form.cpp
+++ b/core/src/fpdfdoc/doc_form.cpp
@@ -29,7 +29,7 @@ FX_BOOL NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0)
void EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT);
void UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0);
const int nMaxRecursion = 32;
-class _CFieldNameExtractor : public CFX_Object
+class _CFieldNameExtractor
{
public:
_CFieldNameExtractor(const CFX_WideString& full_name)
@@ -54,10 +54,10 @@ protected:
FX_LPCWSTR m_pEnd;
FX_LPCWSTR m_pCur;
};
-class CFieldTree : public CFX_Object
+class CFieldTree
{
public:
- struct _Node : public CFX_Object {
+ struct _Node {
_Node *parent;
CFX_PtrArray children;
CFX_WideString short_name;
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index 8fc9c7c099..f910dfd372 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -136,7 +136,7 @@ struct CPVT_LineInfo {
FX_FLOAT fLineAscent;
FX_FLOAT fLineDescent;
};
-struct CPVT_WordInfo : public CFX_Object {
+struct CPVT_WordInfo {
CPVT_WordInfo() : Word(0), nCharset(0),
fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL)
{
@@ -215,7 +215,7 @@ public:
}
}
};
-class CLine : public CFX_Object
+class CLine
{
public:
CLine();
@@ -282,7 +282,7 @@ private:
CPVT_ArrayTemplate<CLine*> m_Lines;
FX_INT32 m_nTotal;
};
-class CSection : public CFX_Object
+class CSection
{
friend class CTypeset;
public:
@@ -400,7 +400,7 @@ private:
CPDF_Rect m_rcPlate;
CPVT_FloatRect m_rcContent;
};
-class CPDF_VariableText : public IPDF_VariableText, public CFX_Object, private CPDF_EditContainer
+class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer
{
friend class CTypeset;
friend class CSection;
@@ -613,7 +613,7 @@ private:
IPDF_VariableText_Provider * m_pVTProvider;
CPDF_VariableText_Iterator * m_pVTIterator;
};
-class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator, public CFX_Object
+class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator
{
public:
CPDF_VariableText_Iterator(CPDF_VariableText * pVT);
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp
index 3bd6450303..bfd742f1ab 100644
--- a/core/src/fpdftext/fpdf_text_search.cpp
+++ b/core/src/fpdftext/fpdf_text_search.cpp
@@ -7,7 +7,7 @@
#include "../../include/fpdfapi/fpdf_pageobj.h"
#include "../../include/fpdftext/fpdf_text.h"
#include "../../include/fpdfapi/fpdf_page.h"
-class CPDF_TextStream : public CFX_Object
+class CPDF_TextStream
{
public:
CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray);
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index 65ffddea0a..d0a434300b 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -6,7 +6,7 @@
#ifndef _PDF_TEXT_INT_H_
#define _PDF_TEXT_INT_H_
-class CPDF_TextParseOptions : public CFX_Object
+class CPDF_TextParseOptions
{
public:
CPDF_TextParseOptions();
@@ -27,7 +27,7 @@ class CPDF_DocProgressiveSearch;
#define FPDFTEXT_MC_PASS 0
#define FPDFTEXT_MC_DONE 1
#define FPDFTEXT_MC_DELAY 2
-typedef struct _PAGECHAR_INFO: public CFX_Object {
+typedef struct _PAGECHAR_INFO {
int m_CharCode;
FX_WCHAR m_Unicode;
FX_FLOAT m_OriginX;
@@ -172,7 +172,7 @@ private:
CFX_RectArray m_resArray;
FX_BOOL m_IsFind;
};
-class CPDF_LinkExt: public CFX_Object
+class CPDF_LinkExt
{
public:
CPDF_LinkExt() {};
diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h
index 5a88ee52f9..abbe105305 100644
--- a/core/src/fpdftext/txtproc.h
+++ b/core/src/fpdftext/txtproc.h
@@ -6,14 +6,14 @@
#ifndef _PDF_TXTPROC_H_
#define _PDF_TXTPROC_H_
-class CTextColumn : public CFX_Object
+class CTextColumn
{
public:
FX_FLOAT m_AvgPos;
int m_Count;
int m_TextPos;
};
-class CTextBox : public CFX_Object
+class CTextBox
{
public:
CFX_WideString m_Text;
@@ -25,7 +25,7 @@ public:
FX_FLOAT m_FontSizeV;
CTextColumn* m_pColumn;
};
-class CTextBaseLine : public CFX_Object
+class CTextBaseLine
{
public:
CTextBaseLine();
@@ -46,7 +46,7 @@ public:
};
class CPDF_PageObject;
class CPDF_TextObject;
-class CTextPage : public CFX_Object
+class CTextPage
{
public:
CTextPage();
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h
index 752eb3f1a5..ae9f22bc4a 100644
--- a/core/src/fxcodec/codec/codec_int.h
+++ b/core/src/fxcodec/codec/codec_int.h
@@ -268,7 +268,7 @@ public:
virtual FX_BOOL Decode(FX_LPVOID ctx, class CFX_DIBitmap* pDIBitmap);
virtual void DestroyDecoder(FX_LPVOID ctx);
};
-class CPDF_Jbig2Interface : public CFX_Object, public CJBig2_Module
+class CPDF_Jbig2Interface : public CJBig2_Module
{
public:
virtual void *JBig2_Malloc(FX_DWORD dwSize)
@@ -302,7 +302,7 @@ public:
FX_Free(pMem);
}
};
-class CCodec_Jbig2Context : public CFX_Object
+class CCodec_Jbig2Context
{
public:
CCodec_Jbig2Context();
diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp
index c6c13f98bb..c6ab791a0e 100644
--- a/core/src/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/src/fxcodec/codec/fx_codec_fax.cpp
@@ -926,7 +926,7 @@ static void _FaxEncode2DLine(FX_LPBYTE dest_buf, int& dest_bitpos, FX_LPCBYTE sr
}
}
}
-class CCodec_FaxEncoder : public CFX_Object
+class CCodec_FaxEncoder
{
public:
CCodec_FaxEncoder(FX_LPCBYTE src_buf, int width, int height, int pitch);
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp
index e17c32a2c7..afdb8354e6 100644
--- a/core/src/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/src/fxcodec/codec/fx_codec_flate.cpp
@@ -74,7 +74,7 @@ extern "C"
compress(dest_buf, dest_size, src_buf, src_size);
}
}
-class CLZWDecoder : public CFX_Object
+class CLZWDecoder
{
public:
FX_BOOL Decode(FX_LPBYTE output, FX_DWORD& outlen, const FX_BYTE* input, FX_DWORD& size, FX_BOOL bEarlyChange);
diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp
index 6bdc225adf..1a4fce63f2 100644
--- a/core/src/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/src/fxcodec/codec/fx_codec_icc.cpp
@@ -17,7 +17,7 @@ FX_BOOL MD5ComputeID( FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16] )
{
return cmsMD5computeIDExt(buf, dwSize, ID);
}
-struct CLcmsCmm : public CFX_Object {
+struct CLcmsCmm {
cmsHTRANSFORM m_hTransform;
int m_nSrcComponents;
int m_nDstComponents;
@@ -342,7 +342,7 @@ FX_DWORD TransferProfileType(FX_LPVOID pProfile, FX_DWORD dwFormat)
return 0;
}
}
-class CFX_IccProfileCache : public CFX_Object
+class CFX_IccProfileCache
{
public:
CFX_IccProfileCache();
@@ -366,7 +366,7 @@ CFX_IccProfileCache::~CFX_IccProfileCache()
void CFX_IccProfileCache::Purge()
{
}
-class CFX_IccTransformCache : public CFX_Object
+class CFX_IccTransformCache
{
public:
CFX_IccTransformCache(CLcmsCmm* pCmm = NULL);
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
index d98cb03f09..0f0d2e5e41 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -584,7 +584,7 @@ void color_apply_conversion(opj_image_t *image)
return;
}
}
-class CJPX_Decoder : public CFX_Object
+class CJPX_Decoder
{
public:
CJPX_Decoder();
diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/src/fxcodec/codec/fx_codec_progress.h
index 6a618e2f51..ea53c8f010 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.h
+++ b/core/src/fxcodec/codec/fx_codec_progress.h
@@ -17,7 +17,7 @@ struct PixelWeight {
int m_SrcEnd;
int m_Weights[1];
};
-class CFXCODEC_WeightTable : public CFX_Object
+class CFXCODEC_WeightTable
{
public:
CFXCODEC_WeightTable()
@@ -40,7 +40,7 @@ public:
int m_DestMin, m_ItemSize;
FX_LPBYTE m_pWeightTables;
};
-class CFXCODEC_HorzTable : public CFX_Object
+class CFXCODEC_HorzTable
{
public:
CFXCODEC_HorzTable()
@@ -63,7 +63,7 @@ public:
int m_ItemSize;
FX_LPBYTE m_pWeightTables;
};
-class CFXCODEC_VertTable : public CFX_Object
+class CFXCODEC_VertTable
{
public:
CFXCODEC_VertTable()
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp
index 51fde42c70..b51444592d 100644
--- a/core/src/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp
@@ -13,7 +13,7 @@ extern "C" {
void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData, unsigned int dwProfileSize, int nComponents, int intent, FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT);
void IccLib_TranslateImage(void* pTransform, unsigned char* pDest, const unsigned char* pSrc, int pixels);
void IccLib_DestroyTransform(void* pTransform);
-class CCodec_TiffContext : public CFX_Object
+class CCodec_TiffContext
{
public:
CCodec_TiffContext();
diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h
index b499a542b6..3d2b232267 100644
--- a/core/src/fxcodec/lgif/fx_gif.h
+++ b/core/src/fxcodec/lgif/fx_gif.h
@@ -117,7 +117,7 @@ typedef struct tagGifPlainText {
GifPTE* pte_ptr;
CFX_ByteString* string_ptr;
} GifPlainText;
-class CGifLZWDecoder : public CFX_Object
+class CGifLZWDecoder
{
public:
struct tag_Table {
@@ -158,7 +158,7 @@ private:
FX_LPSTR err_msg_ptr;
};
-class CGifLZWEncoder : public CFX_Object
+class CGifLZWEncoder
{
public:
struct tag_Table {
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h
index bf60292a4d..bda7f62297 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/src/fxcrt/extension.h
@@ -28,7 +28,7 @@ public:
virtual FX_BOOL Truncate(FX_FILESIZE szFile) = 0;
};
IFXCRT_FileAccess* FXCRT_FileAccess_Create();
-class CFX_CRTFileAccess : public IFX_FileAccess, public CFX_Object
+class CFX_CRTFileAccess : public IFX_FileAccess
{
public:
CFX_CRTFileAccess() : m_RefCount(0) {}
@@ -66,7 +66,7 @@ protected:
CFX_WideString m_path;
FX_DWORD m_RefCount;
};
-class CFX_CRTFileStream FX_FINAL : public IFX_FileStream, public CFX_Object
+class CFX_CRTFileStream FX_FINAL : public IFX_FileStream
{
public:
CFX_CRTFileStream(IFXCRT_FileAccess* pFA) : m_pFile(pFA), m_dwCount(1), m_bUseRange(FALSE), m_nOffset(0), m_nSize(0) {}
@@ -171,7 +171,7 @@ public:
#define FX_MEMSTREAM_BlockSize (64 * 1024)
#define FX_MEMSTREAM_Consecutive 0x01
#define FX_MEMSTREAM_TakeOver 0x02
-class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream, public CFX_Object
+class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream
{
public:
CFX_MemoryStream(FX_BOOL bConsecutive)
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h
index f55f7c60cf..eb05801849 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -10,7 +10,7 @@ typedef struct _FX_ARABICCHARRANGE {
FX_WCHAR wStart;
FX_WCHAR wEnd;
} FX_ARABICCHARRANGE;
-class CFX_ArabicChar : public IFX_ArabicChar, public CFX_Object
+class CFX_ArabicChar : public IFX_ArabicChar
{
public:
virtual void Release()
@@ -179,7 +179,7 @@ void FX_BidiResolveImplicit(const CFX_Int32Array &classes, CFX_Int32Array &level
void FX_BidiResolveWhitespace(FX_INT32 iBaseLevel, const CFX_Int32Array &classes, CFX_Int32Array &levels);
FX_INT32 FX_BidiReorderLevel(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels, FX_INT32 iStart, FX_BOOL bReverse = FALSE);
void FX_BidiReorder(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels);
-class CFX_BidiChar : public IFX_BidiChar, public CFX_Object
+class CFX_BidiChar FX_FINAL : public IFX_BidiChar
{
public:
CFX_BidiChar();
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index c3df07fef5..272d43eef7 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -294,7 +294,7 @@ CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI)
return CFX_WideString::FromUTF8(rURI, rURI.GetLength());
}
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-class CFindFileData : public CFX_Object
+class CFindFileData
{
public:
virtual ~CFindFileData() {}
diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h
index dbdff6aba0..dbfa58be1a 100644
--- a/core/src/fxcrt/fxcrt_platforms.h
+++ b/core/src/fxcrt/fxcrt_platforms.h
@@ -10,7 +10,7 @@
#if _FX_OS_ == _FX_ANDROID_
void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode);
void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_WideString &wsMode);
-class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess, public CFX_Object
+class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess
{
public:
CFXCRT_FileAccess_CRT();
diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h
index db4377f5f2..89162cd037 100644
--- a/core/src/fxcrt/fxcrt_posix.h
+++ b/core/src/fxcrt/fxcrt_posix.h
@@ -8,7 +8,7 @@
#define _FXCRT_LINUX_
#include "extension.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
-class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess, public CFX_Object
+class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess
{
public:
CFXCRT_FileAccess_Posix();
diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h
index 39d72554da..92646b2757 100644
--- a/core/src/fxcrt/fxcrt_windows.h
+++ b/core/src/fxcrt/fxcrt_windows.h
@@ -8,7 +8,7 @@
#define _FXCRT_WINDOWS_
#include "extension.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess, public CFX_Object
+class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess
{
public:
CFXCRT_FileAccess_Win64();
diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h
index 1f75928e51..964c7944d1 100644
--- a/core/src/fxcrt/xml_int.h
+++ b/core/src/fxcrt/xml_int.h
@@ -6,7 +6,7 @@
#ifndef _FXCRT_XML_INT_
#define _FXCRT_XML_INT_
-class CXML_DataBufAcc : public IFX_BufferRead, public CFX_Object
+class CXML_DataBufAcc : public IFX_BufferRead
{
public:
CXML_DataBufAcc(FX_LPCBYTE pBuffer, size_t size)
@@ -61,7 +61,7 @@ protected:
size_t m_dwCurPos;
};
#define FX_XMLDATASTREAM_BufferSize (32 * 1024)
-class CXML_DataStmAcc : public IFX_BufferRead, public CFX_Object
+class CXML_DataStmAcc : public IFX_BufferRead
{
public:
CXML_DataStmAcc(IFX_FileRead *pFileRead)
diff --git a/core/src/fxge/agg/agg23/agg_array.h b/core/src/fxge/agg/agg23/agg_array.h
index f5680d90fe..b3b5f2b877 100644
--- a/core/src/fxge/agg/agg23/agg_array.h
+++ b/core/src/fxge/agg/agg23/agg_array.h
@@ -18,7 +18,7 @@
#include "agg_basics.h"
namespace agg
{
-template<class T> class pod_array : public CFX_Object
+template<class T> class pod_array
{
public:
typedef T value_type;
@@ -157,7 +157,7 @@ pod_array<T>::operator = (const pod_array<T>&v)
}
return *this;
}
-template<class T, unsigned S = 6> class pod_deque : public CFX_Object
+template<class T, unsigned S = 6> class pod_deque
{
public:
enum block_scale_e {
@@ -409,7 +409,7 @@ unsigned pod_deque<T, S>::byte_size() const
{
return m_size * sizeof(T);
}
-class pod_allocator : public CFX_Object
+class pod_allocator
{
public:
void remove_all()
diff --git a/core/src/fxge/agg/agg23/agg_basics.h b/core/src/fxge/agg/agg23/agg_basics.h
index a78fed8c23..d2fad58feb 100644
--- a/core/src/fxge/agg/agg23/agg_basics.h
+++ b/core/src/fxge/agg/agg23/agg_basics.h
@@ -58,7 +58,7 @@ enum cover_scale_e {
cover_none = 0,
cover_full = cover_mask
};
-template<class T> struct rect_base : public CFX_Object {
+template<class T> struct rect_base {
typedef rect_base<T> self_type;
T x1;
T y1;
@@ -257,7 +257,7 @@ inline unsigned set_orientation(unsigned c, unsigned o)
c &= ~path_flags_jr;
return clear_orientation(c) | o;
}
-struct point_type : public CFX_Object {
+struct point_type {
FX_FLOAT x, y;
unsigned flag;
point_type() {}
@@ -271,7 +271,7 @@ struct point_type_flag : public point_type {
}
point_type_flag(FX_FLOAT x_, FX_FLOAT y_, unsigned flag_ = 0) : point_type(x_, y_), flag(flag_) {}
};
-struct vertex_type : public CFX_Object {
+struct vertex_type {
FX_FLOAT x, y;
unsigned cmd;
vertex_type() {}
diff --git a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
index 1cf817a1c7..0d8d6ff99e 100644
--- a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
+++ b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
@@ -18,7 +18,7 @@
#include "agg_basics.h"
namespace agg
{
-struct null_markers : public CFX_Object {
+struct null_markers {
void remove_all() {}
void add_vertex(FX_FLOAT, FX_FLOAT, unsigned) {}
void prepare_src() {}
@@ -30,7 +30,7 @@ struct null_markers : public CFX_Object {
};
template<class VertexSource,
class Generator,
- class Markers = null_markers> class conv_adaptor_vcgen : public CFX_Object
+ class Markers = null_markers> class conv_adaptor_vcgen
{
enum status {
initial,
diff --git a/core/src/fxge/agg/agg23/agg_curves.h b/core/src/fxge/agg/agg23/agg_curves.h
index 61270e64a5..495f7a6a8f 100644
--- a/core/src/fxge/agg/agg23/agg_curves.h
+++ b/core/src/fxge/agg/agg23/agg_curves.h
@@ -19,7 +19,7 @@
#include "agg_array.h"
namespace agg
{
-struct curve4_points : public CFX_Object {
+struct curve4_points {
FX_FLOAT cp[8];
curve4_points() {}
curve4_points(FX_FLOAT x1, FX_FLOAT y1,
@@ -59,7 +59,7 @@ struct curve4_points : public CFX_Object {
return cp[i];
}
};
-class curve4_div : public CFX_Object
+class curve4_div
{
public:
curve4_div() :
@@ -135,7 +135,7 @@ private:
unsigned m_count;
pod_deque<point_type> m_points;
};
-class curve4 : public CFX_Object
+class curve4
{
public:
curve4() {}
diff --git a/core/src/fxge/agg/agg23/agg_path_storage.h b/core/src/fxge/agg/agg23/agg_path_storage.h
index 64ea0b4753..dc13851d09 100644
--- a/core/src/fxge/agg/agg23/agg_path_storage.h
+++ b/core/src/fxge/agg/agg23/agg_path_storage.h
@@ -18,7 +18,7 @@
#include "agg_basics.h"
namespace agg
{
-class path_storage : public CFX_Object
+class path_storage
{
enum block_scale_e {
block_shift = 8,
@@ -27,7 +27,7 @@ class path_storage : public CFX_Object
block_pool = 256
};
public:
- class vertex_source : public CFX_Object
+ class vertex_source
{
public:
vertex_source() {}
diff --git a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
index 052a2e35d8..5a80935479 100644
--- a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
+++ b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
@@ -28,7 +28,7 @@
#include "agg_rendering_buffer.h"
namespace agg
{
-template<class ColorT> struct blender_gray : public CFX_Object {
+template<class ColorT> struct blender_gray {
typedef ColorT color_type;
typedef typename color_type::value_type value_type;
typedef typename color_type::calc_type calc_type;
@@ -40,7 +40,7 @@ template<class ColorT> struct blender_gray : public CFX_Object {
}
};
template<class Blender, unsigned Step = 1, unsigned Offset = 0>
-class pixel_formats_gray : public CFX_Object
+class pixel_formats_gray
{
public:
typedef rendering_buffer::row_data row_data;
diff --git a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
index e9f0defbe8..e06322c24d 100644
--- a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
+++ b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
@@ -46,7 +46,7 @@ inline int poly_coord(FX_FLOAT c)
{
return int(c * poly_base_size);
}
-struct cell_aa : public CFX_Object {
+struct cell_aa {
int x;
int y;
int cover;
@@ -56,7 +56,7 @@ struct cell_aa : public CFX_Object {
void set_cover(int c, int a);
void add_cover(int c, int a);
};
-class outline_aa : public CFX_Object
+class outline_aa
{
enum cell_block_scale_e {
cell_block_shift = 12,
@@ -65,7 +65,7 @@ class outline_aa : public CFX_Object
cell_block_pool = 256,
cell_block_limit = 1024
};
- struct sorted_y : public CFX_Object {
+ struct sorted_y {
unsigned start;
unsigned num;
};
@@ -134,7 +134,7 @@ private:
int m_max_y;
bool m_sorted;
};
-class scanline_hit_test : public CFX_Object
+class scanline_hit_test
{
public:
scanline_hit_test(int x) : m_x(x), m_hit(false) {}
@@ -168,7 +168,7 @@ enum filling_rule_e {
fill_non_zero,
fill_even_odd
};
-class rasterizer_scanline_aa : public CFX_Object
+class rasterizer_scanline_aa
{
enum status {
status_initial,
diff --git a/core/src/fxge/agg/agg23/agg_renderer_base.h b/core/src/fxge/agg/agg23/agg_renderer_base.h
index 3e20a6d408..bd1b203b9a 100644
--- a/core/src/fxge/agg/agg23/agg_renderer_base.h
+++ b/core/src/fxge/agg/agg23/agg_renderer_base.h
@@ -23,7 +23,7 @@
#include "agg_rendering_buffer.h"
namespace agg
{
-template<class PixelFormat> class renderer_base : public CFX_Object
+template<class PixelFormat> class renderer_base
{
public:
typedef PixelFormat pixfmt_type;
diff --git a/core/src/fxge/agg/agg23/agg_renderer_scanline.h b/core/src/fxge/agg/agg23/agg_renderer_scanline.h
index b02b6b5f66..62d104f7f2 100644
--- a/core/src/fxge/agg/agg23/agg_renderer_scanline.h
+++ b/core/src/fxge/agg/agg23/agg_renderer_scanline.h
@@ -20,7 +20,7 @@
#include "agg_render_scanlines.h"
namespace agg
{
-template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa : public CFX_Object
+template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa
{
public:
typedef BaseRenderer base_ren_type;
diff --git a/core/src/fxge/agg/agg23/agg_rendering_buffer.h b/core/src/fxge/agg/agg23/agg_rendering_buffer.h
index 5a8681b537..9c1c0c6899 100644
--- a/core/src/fxge/agg/agg23/agg_rendering_buffer.h
+++ b/core/src/fxge/agg/agg23/agg_rendering_buffer.h
@@ -22,17 +22,17 @@
#include "agg_basics.h"
namespace agg
{
-class rendering_buffer : public CFX_Object
+class rendering_buffer
{
public:
- struct row_data : public CFX_Object {
+ struct row_data {
int x1, x2;
const int8u* ptr;
row_data() {}
row_data(int x1_, int x2_, const int8u* ptr_) :
x1(x1_), x2(x2_), ptr(ptr_) {}
};
- struct span_data : public CFX_Object {
+ struct span_data {
int x;
unsigned len;
int8u* ptr;
diff --git a/core/src/fxge/agg/agg23/agg_scanline_u.h b/core/src/fxge/agg/agg23/agg_scanline_u.h
index f99feef91c..5b132907fd 100644
--- a/core/src/fxge/agg/agg23/agg_scanline_u.h
+++ b/core/src/fxge/agg/agg23/agg_scanline_u.h
@@ -26,13 +26,13 @@
#include "agg_array.h"
namespace agg
{
-template<class CoverT> class scanline_u : public CFX_Object
+template<class CoverT> class scanline_u
{
public:
typedef scanline_u<CoverT> self_type;
typedef CoverT cover_type;
typedef int16 coord_type;
- struct span : public CFX_Object {
+ struct span {
coord_type x;
coord_type len;
cover_type* covers;
diff --git a/core/src/fxge/agg/agg23/agg_vcgen_dash.h b/core/src/fxge/agg/agg23/agg_vcgen_dash.h
index 961da2d718..9c3aa630c2 100644
--- a/core/src/fxge/agg/agg23/agg_vcgen_dash.h
+++ b/core/src/fxge/agg/agg23/agg_vcgen_dash.h
@@ -23,7 +23,7 @@
#include "agg_vertex_sequence.h"
namespace agg
{
-class vcgen_dash : public CFX_Object
+class vcgen_dash
{
enum max_dashes_e {
max_dashes = 32
diff --git a/core/src/fxge/agg/agg23/agg_vcgen_stroke.h b/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
index 38fe1fc25d..84fadd6ed8 100644
--- a/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
+++ b/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
@@ -18,7 +18,7 @@
#include "agg_math_stroke.h"
namespace agg
{
-class vcgen_stroke : public CFX_Object
+class vcgen_stroke
{
enum status_e {
initial,
diff --git a/core/src/fxge/agg/agg23/agg_vertex_sequence.h b/core/src/fxge/agg/agg23/agg_vertex_sequence.h
index 29486d4787..6600bf2085 100644
--- a/core/src/fxge/agg/agg23/agg_vertex_sequence.h
+++ b/core/src/fxge/agg/agg23/agg_vertex_sequence.h
@@ -70,7 +70,7 @@ void vertex_sequence<T, S>::close(bool closed)
}
}
const FX_FLOAT vertex_dist_epsilon = 1e-14f;
-struct vertex_dist : public CFX_Object {
+struct vertex_dist {
FX_FLOAT x;
FX_FLOAT y;
FX_FLOAT dist;
diff --git a/core/src/fxge/agg/agg23/fx_agg_driver.cpp b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
index 8cea42d661..5944332fd8 100644
--- a/core/src/fxge/agg/agg23/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
@@ -369,7 +369,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathStroke(const CFX_PathData* pPathData,
SetClipMask(rasterizer);
return TRUE;
}
-class CFX_Renderer : public CFX_Object
+class CFX_Renderer
{
private:
int m_Alpha,
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h
index c3411905b9..c87fc246be 100644
--- a/core/src/fxge/agg/include/fx_agg_driver.h
+++ b/core/src/fxge/agg/include/fx_agg_driver.h
@@ -8,7 +8,7 @@
#define _FX_AGG_DEVICE_DRIVER_
#include "fxfx_agg_path_storage.h"
#include "fxfx_agg_rasterizer_scanline_aa.h"
-class CAgg_PathData : public CFX_Object
+class CAgg_PathData
{
public:
CAgg_PathData() {}
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index 1d1073c1fe..4285e13554 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -10,7 +10,7 @@
class CFPF_SkiaFontDescriptor;
class CFPF_SkiaFontMgr;
class SkTypeface;
-class CFPF_SkiaFont : public IFPF_Font, public CFX_Object
+class CFPF_SkiaFont : public IFPF_Font
{
public:
CFPF_SkiaFont();
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h
index 472fbbd416..1ec4a1d678 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.h
+++ b/core/src/fxge/android/fpf_skiafontmgr.h
@@ -11,7 +11,7 @@
#define FPF_SKIAFONTTYPE_Path 1
#define FPF_SKIAFONTTYPE_File 2
#define FPF_SKIAFONTTYPE_Buffer 3
-class CFPF_SkiaFontDescriptor : public CFX_Object
+class CFPF_SkiaFontDescriptor
{
public:
CFPF_SkiaFontDescriptor() : m_pFamily(NULL), m_dwStyle(0), m_iFaceIndex(0), m_dwCharsets(0), m_iGlyphNum(0) {}
@@ -88,7 +88,7 @@ public:
FX_LPVOID m_pBuffer;
size_t m_szBuffer;
};
-class CFPF_SkiaFontMgr : public IFPF_FontMgr, public CFX_Object
+class CFPF_SkiaFontMgr : public IFPF_FontMgr
{
public:
CFPF_SkiaFontMgr();
diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h
index c3a78bf658..7f5375172a 100644
--- a/core/src/fxge/android/fpf_skiamodule.h
+++ b/core/src/fxge/android/fpf_skiamodule.h
@@ -8,7 +8,7 @@
#define _FPF_MODULE_H_
#if _FX_OS_ == _FX_ANDROID_
class CFPF_SkiaFontMgr;
-class CFPF_SkiaDeviceModule : public IFPF_DeviceModule, public CFX_Object
+class CFPF_SkiaDeviceModule : public IFPF_DeviceModule
{
public:
CFPF_SkiaDeviceModule() : m_pFontMgr(NULL) {}
diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h
index e3794159b8..6d8260c60f 100644
--- a/core/src/fxge/apple/apple_int.h
+++ b/core/src/fxge/apple/apple_int.h
@@ -61,7 +61,7 @@ public:
void saveGraphicsState(void* graphics);
void restoreGraphicsState(void* graphics);
};
-class CApplePlatform : public CFX_Object
+class CApplePlatform
{
public:
CApplePlatform()
diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h
index 19dc358133..844c3566ce 100644
--- a/core/src/fxge/dib/dib_int.h
+++ b/core/src/fxge/dib/dib_int.h
@@ -7,7 +7,7 @@
#ifndef _DIB_INT_H_
#define _DIB_INT_H_
-class CPDF_FixedMatrix : public CFX_Object
+class CPDF_FixedMatrix
{
public:
CPDF_FixedMatrix(const CFX_AffineMatrix& src, int bits)
@@ -34,7 +34,7 @@ struct PixelWeight {
int m_SrcEnd;
int m_Weights[1];
};
-class CWeightTable : public CFX_Object
+class CWeightTable
{
public:
CWeightTable()
@@ -56,7 +56,7 @@ public:
int m_DestMin, m_ItemSize;
FX_LPBYTE m_pWeightTables;
};
-class CStretchEngine : public CFX_Object
+class CStretchEngine
{
public:
CStretchEngine(IFX_ScanlineComposer* pDestBitmap, FXDIB_Format dest_format,
diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp
index ddc24cc4ad..cfcbc707cd 100644
--- a/core/src/fxge/dib/fx_dib_convert.cpp
+++ b/core/src/fxge/dib/fx_dib_convert.cpp
@@ -97,7 +97,7 @@ const FX_DWORD g_dwMacPalette[256] = {
0xffEEEEEE, 0xffDDDDDD, 0xffBBBBBB, 0xffAAAAAA, 0xff888888, 0xff777777,
0xff555555, 0xff444444, 0xff222222, 0xff111111, 0xff000000
};
-class CFX_Palette : public CFX_Object
+class CFX_Palette
{
public:
CFX_Palette();
diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp
index d664b706b0..9da224602e 100644
--- a/core/src/fxge/ge/fx_ge_ps.cpp
+++ b/core/src/fxge/ge/fx_ge_ps.cpp
@@ -13,7 +13,7 @@ struct PSGlyph {
FX_BOOL m_bGlyphAdjust;
FX_FLOAT m_AdjustMatrix[4];
};
-class CPSFont : public CFX_Object
+class CPSFont
{
public:
PSGlyph m_Glyphs[256];
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index e51976f172..7f30b9c802 100644
--- a/core/src/fxge/ge/text_int.h
+++ b/core/src/fxge/ge/text_int.h
@@ -12,7 +12,7 @@ struct _CFX_UniqueKeyGen {
FX_CHAR m_Key[128];
int m_KeyLen;
};
-class CFX_SizeGlyphCache : public CFX_Object
+class CFX_SizeGlyphCache
{
public:
CFX_SizeGlyphCache()
@@ -22,7 +22,7 @@ public:
~CFX_SizeGlyphCache();
CFX_MapPtrToPtr m_GlyphMap;
};
-class CTTFontDesc : public CFX_Object
+class CTTFontDesc
{
public:
CTTFontDesc()
@@ -74,7 +74,7 @@ private:
#define CHARSET_FLAG_BIG5 8
#define CHARSET_FLAG_GB 16
#define CHARSET_FLAG_KOREAN 32
-class CFontFaceInfo : public CFX_Object
+class CFontFaceInfo
{
public:
CFX_ByteString m_FilePath;
@@ -85,7 +85,7 @@ public:
FX_DWORD m_FileSize;
CFX_ByteString m_FontTables;
};
-class CFontFileFaceInfo : public CFX_Object
+class CFontFileFaceInfo
{
public:
CFontFileFaceInfo();
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h
index 6482832fe9..84fe89dce6 100644
--- a/core/src/fxge/skia/fx_skia_blitter_new.h
+++ b/core/src/fxge/skia/fx_skia_blitter_new.h
@@ -6,7 +6,7 @@
#define _FX_SKIABLITTER_H_
//#define _SKIA_SUPPORT_
#if defined(_SKIA_SUPPORT_)
-class CFX_SkiaRenderer : public SkBlitter, public CFX_Object
+class CFX_SkiaRenderer : public SkBlitter
{
protected:
int m_Alpha,
@@ -208,7 +208,7 @@ public:
FX_BOOL Init(CFX_DIBitmap* pDevice, CFX_DIBitmap* pOriDevice, const CFX_ClipRgn* pClipRgn, FX_DWORD color, FX_BOOL bFullCover, FX_BOOL bRgbByteOrder,
int alpha_flag = 0, void* pIccTransform = NULL); //The alpha flag must be fill_flag if exist.
};
-class CFX_SkiaA8Renderer : public SkBlitter, public CFX_Object
+class CFX_SkiaA8Renderer : public SkBlitter
{
public:
//--------------------------------------------------------------------
@@ -226,4 +226,4 @@ public:
int m_dstHeight;
};
#endif
-#endif \ No newline at end of file
+#endif
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index 00fe228476..6c329eee4e 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -117,7 +117,7 @@ void SuperBlitter_skia::DrawPath(const SkPath& srcPath, SkBlitter* blitter, cons
proc(*devPathPtr, rect, blitter);
}
-class CSkia_PathData : public CFX_Object
+class CSkia_PathData
{
public:
CSkia_PathData() {}
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
index 2b32d572b5..1ad4f8c457 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
@@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject)
}
return newObject;
}
-class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream, public CFX_Object
+class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream
{
public:
explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize);
@@ -46,7 +46,7 @@ private:
void const* resourcePtr_;
DWORD resourceSize_;
};
-class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader, public CFX_Object
+class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader
{
public:
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject);
@@ -71,7 +71,7 @@ private:
ULONG refCount_;
static IDWriteFontFileLoader* instance_;
};
-class CDwFontContext : public CFX_Object
+class CDwFontContext
{
public:
CDwFontContext(IDWriteFactory* dwriteFactory);
@@ -83,7 +83,7 @@ private:
HRESULT hr_;
IDWriteFactory* dwriteFactory_;
};
-class CDwGdiTextRenderer : public CFX_Object
+class CDwGdiTextRenderer
{
public:
CDwGdiTextRenderer(
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 0f13721c70..e668b49200 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -1008,7 +1008,7 @@ BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData,
CallFunc(GdipDeleteGraphics)(pGraphics);
return TRUE;
}
-class GpStream FX_FINAL : public IStream, public CFX_Object
+class GpStream FX_FINAL : public IStream
{
LONG m_RefCount;
int m_ReadPos;
diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h
index 83595cbf8d..bc3eb878d9 100644
--- a/core/src/fxge/win32/win32_int.h
+++ b/core/src/fxge/win32/win32_int.h
@@ -58,7 +58,7 @@ protected:
HMODULE m_GdiModule;
};
#include "dwrite_int.h"
-class CWin32Platform : public CFX_Object
+class CWin32Platform
{
public:
FX_BOOL m_bHalfTone;
@@ -164,7 +164,7 @@ protected:
int m_HorzSize, m_VertSize;
FX_BOOL m_bSupportROP;
};
-class CPSOutput : public IFX_PSOutput, public CFX_Object
+class CPSOutput : public IFX_PSOutput
{
public:
CPSOutput(HDC hDC);
diff --git a/core/src/reflow/autoreflow.h b/core/src/reflow/autoreflow.h
index d98f33bf4e..6a137e9ae2 100644
--- a/core/src/reflow/autoreflow.h
+++ b/core/src/reflow/autoreflow.h
@@ -12,7 +12,7 @@ class CPDF_AutoReflowElement;
class CPDF_AutoReflowLayoutProvider;
typedef CFX_ArrayTemplate<CPDF_AutoReflowElement*> CAR_ElmPtrArray;
typedef CFX_ArrayTemplate<CPDF_PageObject*> CAR_ObjPtrArray;
-class CRF_CELL : public CFX_Object
+class CRF_CELL
{
public:
CRF_CELL() { };
@@ -21,7 +21,7 @@ public:
int m_CellWritingMode;
FX_RECT m_BBox;
};
-class CPDF_AutoReflowElement : public IPDF_LayoutElement, public CFX_Object
+class CPDF_AutoReflowElement : public IPDF_LayoutElement
{
public:
CPDF_AutoReflowElement(LayoutType layoutType = LayoutUnknown , CPDF_AutoReflowElement* pParent = NULL) ;
@@ -68,7 +68,7 @@ public:
#define AUTOREFLOW_STEP_GENERATEParagraph 2
#define AUTOREFLOW_STEP_CREATEELEMENT 3
#define AUTOREFLOW_STEP_REMOVEDATA 4
-class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider, public CFX_Object
+class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider
{
public:
CPDF_AutoReflowLayoutProvider(CPDF_PageObjects* pPage, FX_BOOL bReadOrder);
diff --git a/core/src/reflow/layoutprovider_taggedpdf.h b/core/src/reflow/layoutprovider_taggedpdf.h
index b2c8947a82..b573c3e5bf 100644
--- a/core/src/reflow/layoutprovider_taggedpdf.h
+++ b/core/src/reflow/layoutprovider_taggedpdf.h
@@ -7,7 +7,7 @@
#ifndef LayoutProvider_TaggedPDF_H
#define LayoutProvider_TaggedPDF_H
#include "../../include/reflow/reflowengine.h"
-class CPDF_LayoutElement : public IPDF_LayoutElement, public CFX_Object
+class CPDF_LayoutElement : public IPDF_LayoutElement
{
public:
CPDF_LayoutElement();
@@ -47,7 +47,7 @@ protected:
FX_COLORREF GetDefaultColorValue(LayoutAttr attr_type);
CFX_PtrArray m_ObjArray;
};
-class CPDF_LayoutProvider_TaggedPDF : public IPDF_LayoutProvider, public CFX_Object
+class CPDF_LayoutProvider_TaggedPDF : public IPDF_LayoutProvider
{
public:
CPDF_LayoutProvider_TaggedPDF();
diff --git a/core/src/reflow/reflowedpage.h b/core/src/reflow/reflowedpage.h
index b76834132e..5ca7a8d947 100644
--- a/core/src/reflow/reflowedpage.h
+++ b/core/src/reflow/reflowedpage.h
@@ -18,7 +18,6 @@ class CRF_AttrOperation;
class CRF_OperationDate;
class CPDF_ReflowedPage;
class CPDF_Rect;
-class CFX_Object;
typedef CFX_SegmentedArray<CRF_Data*> CRF_DataPtrArray;
class CRF_CharState;
typedef CFX_SegmentedArray<CRF_CharState> CRF_CharStateArray;
@@ -26,7 +25,7 @@ typedef CFX_SegmentedArray<CRF_CharState> CRF_CharStateArray;
#define SST_BLSE 2
#define SST_ILSE 3
#define SST_IE 4
-class CPDF_LayoutProcessor_Reflow : public IPDF_LayoutProcessor, public CFX_Object
+class CPDF_LayoutProcessor_Reflow : public IPDF_LayoutProcessor
{
public:
CPDF_LayoutProcessor_Reflow();
@@ -106,7 +105,7 @@ struct RF_TableCell {
LayoutEnum m_InlineAlign;
};
typedef CFX_ArrayTemplate<RF_TableCell*> CRF_TableCellArray;
-class CRF_Table : public CFX_Object
+class CRF_Table
{
public:
CRF_Table()
@@ -120,7 +119,7 @@ public:
FX_FLOAT m_TableWidth;
FX_FLOAT m_ReflowPageHeight;
};
-class CRF_CharState : public CFX_Object
+class CRF_CharState
{
public:
CPDF_Font* m_pFont;
@@ -132,7 +131,7 @@ public:
CPDF_TextObject* m_pTextObj;
};
-class CRF_PageInfo : public CFX_Object
+class CRF_PageInfo
{
public:
CRF_PageInfo(CPDF_PageObject* pPageObj, CRF_PageInfo* pParent = NULL)
@@ -158,7 +157,7 @@ protected:
CPDF_PageObject* m_pPageObj;
CRF_PageInfo* m_pParent;
};
-class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData, public CFX_Object
+class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData
{
public:
@@ -192,7 +191,7 @@ public:
CFX_MapPtrToPtr* m_pPageInfos;
};
-class CPDF_ProgressiveReflowPageParser : public IPDF_ProgressiveReflowPageParser, public CFX_Object
+class CPDF_ProgressiveReflowPageParser : public IPDF_ProgressiveReflowPageParser
{
public:
CPDF_ProgressiveReflowPageParser();
@@ -227,7 +226,7 @@ protected:
int m_nObjProcessed;
int m_flags;
};
-class CPDF_ProgressiveReflowPageRender : public IPDF_ProgressiveReflowPageRender, public CFX_Object
+class CPDF_ProgressiveReflowPageRender : public IPDF_ProgressiveReflowPageRender
{
public:
CPDF_ProgressiveReflowPageRender();
@@ -292,7 +291,7 @@ protected:
#define TYPE_PATH 2
#define TYPE_IMAGE 3
#define TYPE_LINE 4
-class CRF_Data : public CFX_Object
+class CRF_Data
{
public:
typedef enum {Unknow, Text, Image, Path, Line, paragraph} RF_DataType;
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
index c77aae3b12..a2bc2cc5a7 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
@@ -11,7 +11,7 @@ class CPDFXFA_App;
class IFXJS_Runtime;
class CJS_RuntimeFactory;
-class CPDFXFA_App : public IXFA_AppProvider, public CFX_Object
+class CPDFXFA_App : public IXFA_AppProvider
{
public:
CPDFXFA_App();
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index 317200c2fa..954162e338 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -16,7 +16,7 @@ class IFXJS_Runtime;
class IFXJS_Context;
class IXFA_DocHandler;
-class CPDFXFA_Document : public IXFA_DocProvider, public CFX_Object
+class CPDFXFA_Document : public IXFA_DocProvider
{
public:
CPDFXFA_Document(CPDF_Document* pPDFDoc, CPDFXFA_App* pProvider);
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
index 1d60c33e43..f55a42496d 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
@@ -7,9 +7,7 @@
#ifndef _FPDFXFA_PAGEVIEW_H_
#define _FPDFXFA_PAGEVIEW_H_
-class CPDFXFA_Page;
-
-class CPDFXFA_Page : public CFX_Object
+class CPDFXFA_Page
{
public:
CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index);
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
index 28904e2ca6..6c3d15e4f1 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
@@ -12,7 +12,7 @@
#define JS_STR_VIEWERVARIATION L"Full"
#define JS_STR_VIEWERVERSION_XFA L"11"
-class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr, public CFX_Object
+class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr
{
public:
CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv)
@@ -29,7 +29,7 @@ protected:
CPDFDoc_Environment* m_pEnv;
};
-class CFWL_TimerInfo : public CFX_Object
+class CFWL_TimerInfo
{
public:
CFWL_TimerInfo()
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index 0655e9ca61..efa7c0be52 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -27,7 +27,7 @@ class CFX_RenderDevice;
#define CFX_IntArray CFX_ArrayTemplate<int>
-class CPDFSDK_DateTime : public CFX_Object
+class CPDFSDK_DateTime
{
public:
CPDFSDK_DateTime();
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 3509e8e2ab..4c59a28f94 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -75,7 +75,7 @@ typedef unsigned int FX_UINT;
#include "fpdfview.h"
-class CPDF_CustomAccess FX_FINAL : public IFX_FileRead, public CFX_Object
+class CPDF_CustomAccess FX_FINAL : public IFX_FileRead
{
public:
CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess);
@@ -95,7 +95,7 @@ public:
FX_DWORD m_BufferOffset;
};
-class CFPDF_FileStream : public IFX_FileStream, public CFX_Object
+class CFPDF_FileStream : public IFX_FileStream
{
public:
CFPDF_FileStream(FPDF_FILEHANDLER* pFS);
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index 51c37b3624..94ad48e7c9 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -10,7 +10,7 @@
#include "../include/fpdf_progressive.h"
// Everything about rendering is put here: for OOM recovery
-class CRenderContext : public CFX_Object
+class CRenderContext
{
public:
CRenderContext() { Clear(); }
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h
index 74af9ba12d..02d2f57663 100644
--- a/fpdfsdk/include/javascript/JS_Object.h
+++ b/fpdfsdk/include/javascript/JS_Object.h
@@ -17,7 +17,7 @@ class CJS_Object;
class CJS_Timer;
class CJS_Context;
-class CJS_EmbedObj : public CFX_Object
+class CJS_EmbedObj
{
public:
CJS_EmbedObj(CJS_Object* pJSObject);
@@ -39,7 +39,7 @@ protected:
CJS_Object* m_pJSObject;
};
-class CJS_Object : public CFX_Object
+class CJS_Object
{
public:
CJS_Object(JSFXObject pObject);
diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp
index 2deba316f9..a04e7a2120 100644
--- a/fpdfsdk/src/fpdf_dataavail.cpp
+++ b/fpdfsdk/src/fpdf_dataavail.cpp
@@ -80,7 +80,7 @@ private:
FX_DOWNLOADHINTS* m_pDownloadHints;
};
-class CFPDF_DataAvail : public CFX_Object
+class CFPDF_DataAvail
{
public:
CFPDF_DataAvail()
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index c0b39ed3b8..2430324f30 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -342,7 +342,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_LoadXFA(FPDF_DOCUMENT document)
extern void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code);
-class CMemFile FX_FINAL: public IFX_FileRead, public CFX_Object
+class CMemFile FX_FINAL: public IFX_FileRead
{
public:
CMemFile(FX_BYTE* pBuf, FX_FILESIZE size):m_pBuf(pBuf),m_size(size) {}
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp
index 2b77766b7a..f048b5319c 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp
@@ -28,7 +28,7 @@ static double GetNan()
}
-class CJS_PrivateData: public CFX_Object
+class CJS_PrivateData
{
public:
CJS_PrivateData():ObjDefID(-1), pPrivate(NULL) {}
@@ -37,7 +37,7 @@ public:
};
-class CJS_ObjDefintion: public CFX_Object
+class CJS_ObjDefintion
{
public:
CJS_ObjDefintion(v8::Isolate* isolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew):
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index 98b2ecbaf0..6f8170ff5c 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -14,7 +14,7 @@ class IFWL_WidgetMgrDelegate;
class CFWL_SDAdatperNative;
class CFWL_SDAdapterWidgetMgr;
class CFWL_SDAdapterTimerMgr;
-class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr, public CFX_Object
+class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr
{
public:
CFWL_SDAdapterWidgetMgr();
@@ -56,7 +56,7 @@ public:
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook);
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b);
};
-class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr, public CFX_Object
+class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr
{
public:
CFWL_SDAdapterThreadMgr();
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 2883fd3784..e86c3dabe9 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -12,7 +12,7 @@ class IFWL_Grid;
#define FWL_CLASS_Grid L"FWL_GRID"
#define FWL_CLASSHASH_Grid 3150298670
#define FWL_GRIDSTYLEEXT_ShowGridLines (1L << 0)
-struct FWL_LAYOUTDATA : public CFX_Object {
+struct FWL_LAYOUTDATA {
FX_FLOAT fWidth;
FX_FLOAT fHeight;
};
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index 01d7ae44ca..1cc88a6593 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -120,7 +120,7 @@ class IFWL_NoteLoop;
#define FWL_KEYFLAG_LButton (1 << 4)
#define FWL_KEYFLAG_RButton (1 << 5)
#define FWL_KEYFLAG_MButton (1 << 6)
-class CFWL_Note : public CFX_Object
+class CFWL_Note
{
public:
virtual FX_DWORD Release()
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index efef288afc..59d5ab0a2a 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -26,7 +26,7 @@ class IFWL_ThemeProvider;
#define FWL_WGTCAPACITY_UIMargin 12
#define FWL_WGTCAPACITY_SpaceAboveBelow 13
#define FWL_WGTCAPACITY_MAX 65535
-class CFWL_ThemePart : public CFX_Object
+class CFWL_ThemePart
{
public:
CFWL_ThemePart()
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index f29932f2f2..3127f0683d 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -63,7 +63,7 @@ public:
virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent) = 0;
virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0;
};
-class CFWL_WidgetImpProperties : public CFX_Object
+class CFWL_WidgetImpProperties
{
public:
CFWL_WidgetImpProperties()
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 11919508aa..b69be8368b 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -9,7 +9,7 @@
class CFWL_Theme;
class IFWL_App;
class CFWL_App;
-class CFWL_App : public CFX_Object
+class CFWL_App
{
public:
CFWL_App();
diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index eac58569aa..46aec5bc8a 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -96,7 +96,7 @@ protected:
};
CFWL_ComboBoxDP m_comboBoxData;
};
-class CFWL_ComboBoxItem : public CFX_Object
+class CFWL_ComboBoxItem
{
public:
CFWL_ComboBoxItem()
diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index 3cb1131e8b..55eddabb48 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -41,7 +41,7 @@ public:
CFWL_ListBox();
virtual ~CFWL_ListBox();
protected:
- class CFWL_ListBoxDP : public IFWL_ListBoxDP, public CFX_Object
+ class CFWL_ListBoxDP : public IFWL_ListBoxDP
{
public:
CFWL_ListBoxDP();
@@ -74,7 +74,7 @@ protected:
};
CFWL_ListBoxDP m_ListBoxDP;
};
-class CFWL_ListItem : public CFX_Object
+class CFWL_ListItem
{
public:
CFWL_ListItem()
diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h
index 95e4ed16e3..0edd9d4b3d 100644
--- a/xfa/include/fwl/lightwidget/theme.h
+++ b/xfa/include/fwl/lightwidget/theme.h
@@ -12,7 +12,7 @@ class CFWL_ThemePart;
class CFWL_WidgetTP;
class IFWL_Widget;
class CFWL_Theme;
-class CFWL_Theme : public CFX_Object
+class CFWL_Theme
{
public:
virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index af5bddb5e7..222ce1c768 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -13,7 +13,7 @@ class IFWL_WidgetDelegate;
class IFWL_Widget;
class CFWL_Widget;
class CFWL_WidgetDelegate;
-class CFWL_WidgetProperties : public CFX_Object
+class CFWL_WidgetProperties
{
public:
CFWL_WidgetProperties()
@@ -35,7 +35,7 @@ public:
CFWL_Widget *m_pParent;
CFWL_Widget *m_pOwner;
};
-class CFWL_Widget : public CFX_Object
+class CFWL_Widget
{
public:
IFWL_Widget* GetWidget();
@@ -89,7 +89,7 @@ public:
CFWL_WidgetMgr *m_pWidgetMgr;
CFWL_WidgetProperties *m_pProperties;
};
-class CFWL_WidgetDelegate : public CFX_Object, public IFWL_WidgetDelegate
+class CFWL_WidgetDelegate
{
public:
CFWL_WidgetDelegate();
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index 384effe732..b11407063e 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -32,8 +32,7 @@ protected:
void DrawSignBorder(IFWL_Widget *pWidget, CFX_Graphics *pGraphics, const CFX_RectF *pRtBox, FX_BOOL bDisable = FALSE, CFX_Matrix *pMatrix = NULL);
void SetThemeData(FX_DWORD dwID);
void initCheckPath(FX_FLOAT fCheckLen);
- struct CKBThemeData : public CFX_Object {
- public:
+ struct CKBThemeData {
FX_ARGB clrBoxBk[13][2];
FX_ARGB clrSignBorderNormal;
FX_ARGB clrSignBorderDisable;
diff --git a/xfa/include/fwl/theme/datetimepickertp.h b/xfa/include/fwl/theme/datetimepickertp.h
index 01a775a6f1..39e509530c 100644
--- a/xfa/include/fwl/theme/datetimepickertp.h
+++ b/xfa/include/fwl/theme/datetimepickertp.h
@@ -18,8 +18,7 @@ public:
protected:
void DrawDropDownButton(CFWL_ThemeBackground *pParams, CFX_Matrix *pMatrix);
void initThemeData();
- struct DTPThemeData : public CFX_Object {
- public:
+ struct DTPThemeData {
FX_ARGB BoxBkColor[13][2];
} *m_pThemeData;
};
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index b7e68e2d5b..8f715e77b6 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -48,8 +48,7 @@ protected:
CFX_RectF m_rtDisLBorder;
CFX_RectF m_rtDisRBorder;
CFX_RectF m_rtDisBBorder;
- struct SBThemeData : public CFX_Object {
- public:
+ struct SBThemeData {
FX_ARGB clrHeadBK[2][4];
FX_ARGB clrHeadEdgeLeft[2][3];
FX_ARGB clrHeadEdgeRight[2][3];
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index 55d991d404..6f0624ae9c 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -32,7 +32,7 @@ protected:
FX_BOOL DrawWeekNumSep(CFWL_ThemeBackground *pParams, CFX_Matrix *pMatrix);
FWLTHEME_STATE GetState(FX_DWORD dwFWLStates);
void SetThemeData(FX_DWORD dwThemeID);
- class MCThemeData : public CFX_Object
+ class MCThemeData
{
public:
FX_ARGB clrCaption;
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index 676a5fce50..b27afc47f4 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -30,8 +30,7 @@ protected:
void SetCornerColor(FX_DWORD *pData);
FX_INT32 GetColorID(FX_DWORD dwStates);
- struct PBThemeData : CFX_Object {
- public:
+ struct PBThemeData {
FX_ARGB clrBorder[5];
FX_ARGB clrStart[5];
FX_ARGB clrEnd[5];
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index b7f1926029..3153c79ead 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -23,8 +23,7 @@ protected:
void DrawMaxMinBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);
void DrawPaw(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);
void SetThemeData(FX_DWORD dwID);
- struct SBThemeData : public CFX_Object {
- public:
+ struct SBThemeData {
FX_ARGB clrPawColorLight[4];
FX_ARGB clrPawColorDark[4];
FX_ARGB clrBtnBK[4][2];
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 3ede92f5d7..57348e4c75 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -6,7 +6,6 @@
#ifndef _FWL_WIDGETTP_H
#define _FWL_WIDGETTP_H
-class CFX_Object;
class IFWL_ThemeProvider;
class IFWL_Widget;
class IFDE_TextOut;
@@ -17,7 +16,7 @@ class IFX_FontSourceEnum;
#endif
class CFWL_WidgetTP;
class CFWL_ArrowData;
-class CFWL_WidgetTP : public CFX_Object
+class CFWL_WidgetTP
{
public:
virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
@@ -71,7 +70,7 @@ void FWLTHEME_Release();
FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID);
FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID);
FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor);
-class CFWL_ArrowData : public CFX_Object
+class CFWL_ArrowData
{
public:
static CFWL_ArrowData* GetInstance();
@@ -80,7 +79,7 @@ public:
virtual ~CFWL_ArrowData();
void SetColorData(FX_DWORD dwID);
- class CColorData : public CFX_Object
+ class CColorData
{
public:
FX_ARGB clrBorder[4];
@@ -92,7 +91,7 @@ protected:
CFWL_ArrowData();
static CFWL_ArrowData *m_pInstance;
};
-class CFWL_FontData : public CFX_Object
+class CFWL_FontData
{
public:
CFWL_FontData();
@@ -113,7 +112,7 @@ protected:
IFX_FontSourceEnum *m_pFontSource;
#endif
};
-class CFWL_FontManager : public CFX_Object
+class CFWL_FontManager
{
public:
CFWL_FontManager();
diff --git a/xfa/include/fxbarcode/BC_BarCode.h b/xfa/include/fxbarcode/BC_BarCode.h
index 9ace5e0451..1893bc3e98 100644
--- a/xfa/include/fxbarcode/BC_BarCode.h
+++ b/xfa/include/fxbarcode/BC_BarCode.h
@@ -36,7 +36,7 @@ enum BC_TYPE {
BC_PDF417,
BC_DATAMATRIX
};
-class CBC_CodeBase : public CFX_Object
+class CBC_CodeBase
{
public:
CBC_CodeBase();
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 57ee6d82b8..ef2a1a837f 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -385,7 +385,7 @@ enum XFA_EVENTTYPE {
#define XFA_VALIDATE_prePrint 2
#define XFA_VALIDATE_preExecute 3
#define XFA_VALIDATE_preSave 4
-class CXFA_EventParam : public CFX_Object
+class CXFA_EventParam
{
public:
CXFA_EventParam()
@@ -492,7 +492,7 @@ public:
virtual XFA_HWIDGET GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual IXFA_WidgetIterator* CreateWidgetIterator(FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0;
};
-class CXFA_RenderOptions : public CFX_Object
+class CXFA_RenderOptions
{
public:
CXFA_RenderOptions()
diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index 14bd1ed69d..b03ebb5a23 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -59,7 +59,7 @@ inline FX_BOOL XFA_IsDigit(FX_WCHAR c)
}
typedef CFX_ArrayTemplate<CXFA_Node*> CXFA_NodeArray;
typedef CFX_ArrayTemplate<CXFA_Object*> CXFA_ObjArray;
-class CXFA_Data : public CFX_Object
+class CXFA_Data
{
public:
CXFA_Data(CXFA_Node* pNode) : m_pNode(pNode) {}
diff --git a/xfa/include/fxgraphics/fx_graphics.h b/xfa/include/fxgraphics/fx_graphics.h
index ddec9605b7..0eb3cf4e9f 100644
--- a/xfa/include/fxgraphics/fx_graphics.h
+++ b/xfa/include/fxgraphics/fx_graphics.h
@@ -94,7 +94,6 @@ enum {
};
typedef FX_INT32 FX_DeviceCap;
typedef FX_INT32 FX_FillMode;
-class CFX_Object;
class CFX_RenderDevice;
class CFX_GraphStateData;
class CFX_Matrix;
@@ -110,7 +109,7 @@ class CFX_Color;
class CFX_Path;
class CFX_Pattern;
class CFX_Shading;
-class CFX_Graphics : public CFX_Object
+class CFX_Graphics
{
public:
@@ -295,7 +294,7 @@ private:
protected:
FX_INT32 _type;
private:
- struct TInfo : public CFX_Object {
+ struct TInfo {
CFX_GraphStateData _graphState;
FX_BOOL _isAntialiasing;
FX_StrokeAlignment _strokeAlignment;
@@ -314,7 +313,7 @@ private:
friend class CAGG_Graphics;
};
-class CFX_Path : public CFX_Object
+class CFX_Path
{
public:
@@ -388,7 +387,7 @@ public:
private:
CFX_PathGenerator * _generator;
};
-class CFX_Color : public CFX_Object
+class CFX_Color
{
public:
@@ -426,7 +425,7 @@ private:
friend class CFX_Graphics;
};
-class CFX_Pattern : public CFX_Object
+class CFX_Pattern
{
public:
@@ -468,7 +467,7 @@ private:
};
friend class CFX_Graphics;
};
-class CFX_Shading : public CFX_Object
+class CFX_Shading
{
public:
diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h
index a47739c3c5..5c16696845 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/include/ifde_txtedtengine.h
@@ -79,7 +79,7 @@ enum FDE_TXTEDIT_LINEEND {
FDE_TXTEDIT_LINEEND_CR,
FDE_TXTEDIT_LINEEND_LF,
};
-struct _FDE_TXTEDTPARAMS : public CFX_Object {
+struct _FDE_TXTEDTPARAMS {
_FDE_TXTEDTPARAMS()
: fPlateWidth(0)
, fPlateHeight(0)
@@ -129,7 +129,7 @@ enum FDE_TXTEDT_TEXTCHANGE_TYPE {
FDE_TXTEDT_TEXTCHANGE_TYPE_Delete ,
FDE_TXTEDT_TEXTCHANGE_TYPE_Replace ,
};
-struct _FDE_TXTEDT_TEXTCHANGE_INFO : public CFX_Object {
+struct _FDE_TXTEDT_TEXTCHANGE_INFO {
FX_INT32 nChangeType;
CFX_WideString wsInsert;
CFX_WideString wsDelete;
diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.h b/xfa/src/fee/src/fee/fde_txtedtblock.h
index 12aee74d39..9ae19ed61f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtblock.h
+++ b/xfa/src/fee/src/fee/fde_txtedtblock.h
@@ -39,7 +39,7 @@ enum FDE_FORMAT_CARET_DIRECTION {
FDE_FORMAT_CARET_MIDDLE,
FDE_FORMAT_CARET_BACKWARD
};
-class CFDE_TxtEdtBlock : public CFX_Object
+class CFDE_TxtEdtBlock
{
public:
CFDE_TxtEdtBlock(CFDE_TxtEdtEngine * pEngine, const CFX_WideString &wsBlock, FX_INT32 nPosition);
@@ -72,7 +72,7 @@ private:
CFX_ArrayTemplate<CFDE_TxtEdtField*> m_FieldArr;
CFX_ArrayTemplate<CFDE_TxtEdtField*> m_EditFieldArr;
};
-class CFDE_TxtEdtFieldFormatParser : public CFX_Object
+class CFDE_TxtEdtFieldFormatParser
{
public:
CFDE_TxtEdtFieldFormatParser();
@@ -81,7 +81,7 @@ public:
FX_INT32 CountItems() const;
void GetItem(FX_INT32 nIndex, CFX_WideString &wsKey, CFX_WideString &wsValue) const;
private:
- typedef struct : public CFX_Object {
+ typedef struct {
FX_INT32 nKeyStart;
FX_INT32 nKeyCount;
FX_INT32 nValStart;
@@ -91,7 +91,7 @@ private:
CFX_WideString m_wsFormat;
CFX_ArrayTemplate<FDE_LPTXTEDTFORMATITEM> m_ItemArr;
};
-class CFDE_TxtEdtField : public CFX_Object
+class CFDE_TxtEdtField
{
public:
static CFDE_TxtEdtField * Create(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h
index 5baeacd2f6..7a9100c833 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h
@@ -9,7 +9,7 @@
class IFX_CharIter;
class CFDE_TxtEdtBufIter;
class CFDE_TxtEdtBuf;
-class CFDE_TxtEdtBufIter : public IFX_CharIter, public CFX_Object
+class CFDE_TxtEdtBufIter : public IFX_CharIter
{
public:
#ifdef FDE_USEFORMATBLOCK
@@ -39,16 +39,16 @@ private:
#endif
FX_WCHAR m_Alias;
};
-class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf, public CFX_Object
+class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf
{
friend class CFDE_TxtEdtBufIter;
- struct _FDE_CHUNKHEADER : public CFX_Object {
+ struct _FDE_CHUNKHEADER {
FX_INT32 nUsed;
FX_WCHAR wChars[1];
};
typedef _FDE_CHUNKHEADER FDE_CHUNKHEADER;
typedef _FDE_CHUNKHEADER* FDE_LPCHUNKHEADER;
- struct _FDE_CHUNKPLACE : public CFX_Object {
+ struct _FDE_CHUNKPLACE {
FX_INT32 nChunkIndex;
FX_INT32 nCharIndex;
};
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h
index f9f7a6dc8e..dec152c630 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.h
@@ -35,7 +35,7 @@ public:
virtual FX_BOOL Undo() = 0;
virtual void Serialize(CFX_ByteString &bsDoRecord) const = 0;
};
-class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine, public CFX_Object
+class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine
{
friend class CFDE_TxtEdtDoRecord_Insert;
friend class CFDE_TxtEdtDoRecord_DeleteRange;
@@ -46,13 +46,13 @@ class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine, public CFX_Object
friend class CFDE_TxtEdtDoRecord_FormatReplace;
friend class CFDE_TxtEdtBlock;
#endif
- struct _FDE_TXTEDTSELRANGE : public CFX_Object {
+ struct _FDE_TXTEDTSELRANGE {
FX_INT32 nStart;
FX_INT32 nCount;
};
typedef _FDE_TXTEDTSELRANGE FDE_TXTEDTSELRANGE;
typedef _FDE_TXTEDTSELRANGE * FDE_LPTXTEDTSELRANGE;
- struct _FDE_TXTEDTPARAGPOS : public CFX_Object {
+ struct _FDE_TXTEDTPARAGPOS {
FX_INT32 nParagIndex;
FX_INT32 nCharIndex;
};
@@ -197,7 +197,7 @@ private:
FDE_TXTEDT_TEXTCHANGE_INFO m_ChangeInfo;
};
-class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord, public CFX_Object
+class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord
{
public:
CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord);
@@ -217,7 +217,7 @@ private:
FX_INT32 m_nCaret;
CFX_WideString m_wsInsert;
};
-class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord, public CFX_Object
+class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord
{
public:
CFDE_TxtEdtDoRecord_DeleteRange(FX_BSTR bsDoRecord);
@@ -241,7 +241,7 @@ private:
CFX_WideString m_wsRange;
};
#ifdef FDE_USEFORMATBLOCK
-class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord, public CFX_Object
+class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord
{
public:
CFDE_TxtEdtDoRecord_FieldInsert(FX_BSTR bsDoRecord);
@@ -273,7 +273,7 @@ private:
CFX_WideString m_wsIns;
FX_BOOL m_bSel;
};
-class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord, public CFX_Object
+class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord
{
public:
CFDE_TxtEdtDoRecord_FieldDelete(FX_BSTR bsDoRecord);
@@ -304,7 +304,7 @@ private:
CFX_WideString m_wsDel;
FX_BOOL m_bSel;
};
-class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord, public CFX_Object
+class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord
{
public:
CFDE_TxtEdtDoRecord_FieldReplace(FX_BSTR bsDoRecord);
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h
index 36021b66aa..7c0d0d1ae0 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.h
@@ -43,7 +43,7 @@ static FDE_TXTEDT_CHARTYPE FDE_GetEditSelCharType(FX_WCHAR wChar)
return FDE_TXTEDT_CHARTYPE_Char;
}
}
-typedef struct _FDE_TXTEDTPIECE : public CFX_Object {
+typedef struct _FDE_TXTEDTPIECE {
FX_INT32 nStart;
FX_INT32 nCount;
FX_INT32 nBidiLevel;
@@ -51,7 +51,7 @@ typedef struct _FDE_TXTEDTPIECE : public CFX_Object {
FX_DWORD dwCharStyles;
} FDE_TEXTEDITPIECE, * FDE_LPTEXTEDITPIECE;
typedef CFX_MassArrayTemplate<FDE_TEXTEDITPIECE> CFDE_TXTEDTPieceMassArray;
-class CFDE_TxtEdtTextSet : public IFDE_TextSet, public CFX_Object
+class CFDE_TxtEdtTextSet : public IFDE_TextSet
{
public:
CFDE_TxtEdtTextSet(CFDE_TxtEdtPage * pPage);
@@ -73,7 +73,7 @@ private:
CFDE_TxtEdtPage * m_pPage;
};
-class CFDE_TxtEdtPage : public CFX_Object, public IFDE_TxtEdtPage
+class CFDE_TxtEdtPage : public IFDE_TxtEdtPage
{
public:
CFDE_TxtEdtPage(IFDE_TxtEdtEngine * pEngine, FX_INT32 nLineIndex);
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h
index 72584feca8..276654e2fa 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.h
+++ b/xfa/src/fee/src/fee/fde_txtedtparag.h
@@ -8,7 +8,7 @@
#define _FDE_TXTEDTPARAG_H
class CFDE_TxtEdtEngine;
class CFDE_TxtEdtParag;
-class CFDE_TxtEdtParag : public IFDE_TxtEdtParag, public CFX_Object
+class CFDE_TxtEdtParag : public IFDE_TxtEdtParag
{
public:
CFDE_TxtEdtParag(CFDE_TxtEdtEngine * pEngine);
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
index 91895a54d7..d897fc5867 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
@@ -24,7 +24,7 @@ enum FX_WordBreakProp {
FX_WordBreakProp_ExtendNumLet ,
};
FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint);
-class CFX_CharIter : public IFX_CharIter, public CFX_Object
+class CFX_CharIter : public IFX_CharIter
{
public:
CFX_CharIter(const CFX_WideString & wsText);
@@ -41,7 +41,7 @@ private:
const CFX_WideString &m_wsText;
FX_INT32 m_nIndex;
};
-class CFX_WordBreak : public IFX_WordBreak, public CFX_Object
+class CFX_WordBreak : public IFX_WordBreak
{
public:
CFX_WordBreak();
diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h
index dd0a5d6147..d18b899fc6 100644
--- a/xfa/src/fgas/include/fx_datetime.h
+++ b/xfa/src/fgas/include/fx_datetime.h
@@ -21,7 +21,7 @@ enum FX_WEEKDAY {
FX_BOOL FX_IsLeapYear(FX_INT32 iYear);
FX_INT32 FX_DaysInYear(FX_INT32 iYear);
FX_BYTE FX_DaysInMonth(FX_INT32 iYear, FX_BYTE iMonth);
-class CFX_Unitime : public CFX_Object
+class CFX_Unitime
{
public:
CFX_Unitime()
@@ -278,7 +278,7 @@ typedef FX_DATETIMEZONE const * FX_LPCDATETIMEZONE;
#if _FX_OS_ != _FX_ANDROID_
#pragma pack(pop)
#endif
-class CFX_DateTime : public CFX_Object
+class CFX_DateTime
{
public:
CFX_DateTime() {}
diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h
index d664853df7..491feaea37 100644
--- a/xfa/src/fgas/include/fx_fnt.h
+++ b/xfa/src/fgas/include/fx_fnt.h
@@ -73,7 +73,7 @@ public:
#endif
};
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-typedef struct _FX_FONTMATCHPARAMS : public CFX_Object {
+typedef struct _FX_FONTMATCHPARAMS {
FX_LPCWSTR pwsFamily;
FX_DWORD dwFontStyles;
FX_DWORD dwUSB;
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 6886974fd2..25a6dda4e1 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -108,7 +108,7 @@ public:
virtual FX_BOOL FormatZero(const CFX_WideString& wsPattern, CFX_WideString& wsOutput) = 0;
virtual FX_BOOL FormatNull(const CFX_WideString& wsPattern, CFX_WideString& wsOutput) = 0;
};
-class CFX_Decimal : CFX_Object
+class CFX_Decimal
{
public:
CFX_Decimal();
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index 354d4bf2bb..850543786c 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -752,7 +752,7 @@ protected:
friend class CFX_CPLTree<baseType>;
};
template<class baseType>
-class CFX_CPLTree : public CFX_Object
+class CFX_CPLTree
{
public:
typedef CFX_CPLTreeNode<baseType> CPLTreeNode;
diff --git a/xfa/src/fgas/src/crt/fx_stream.h b/xfa/src/fgas/src/crt/fx_stream.h
index 630a0fb77f..30cb98486e 100644
--- a/xfa/src/fgas/src/crt/fx_stream.h
+++ b/xfa/src/fgas/src/crt/fx_stream.h
@@ -17,7 +17,7 @@ class CFX_TextStream;
class CFX_FileRead;
class CFX_FileWrite;
class CFX_BufferAccImp;
-class CFX_StreamImp : public CFX_ThreadLock, public CFX_Object
+class CFX_StreamImp : public CFX_ThreadLock
{
public:
virtual void Release()
@@ -197,7 +197,7 @@ enum FX_STREAMTYPE {
FX_STREAMTYPE_Stream ,
FX_STREAMTYPE_BufferRead ,
};
-class CFX_Stream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object
+class CFX_Stream : public IFX_Stream, public CFX_ThreadLock
{
public:
CFX_Stream();
@@ -245,7 +245,7 @@ protected:
FX_INT32 m_iLength;
FX_INT32 m_iRefCount;
};
-class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object
+class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock
{
public:
CFX_TextStream(IFX_Stream *pStream, FX_BOOL bDelStream);
@@ -292,7 +292,7 @@ protected:
void InitStream();
};
#ifdef FX_FILESIZE
-class CFGAS_FileRead : public IFX_FileRead, public CFX_Object
+class CFGAS_FileRead : public IFX_FileRead
{
public:
CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream);
@@ -308,7 +308,7 @@ protected:
IFX_Stream *m_pStream;
};
#else
-class CFGAS_FileRead : public IFX_FileRead, public CFX_Object
+class CFGAS_FileRead : public IFX_FileRead
{
public:
CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream);
@@ -327,7 +327,7 @@ protected:
};
#endif
#ifdef FX_FILESIZE
-class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object
+class CFX_BufferAccImp : public IFX_FileRead
{
public:
CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_FILESIZE iFileSize, FX_BOOL bReleaseStream);
@@ -344,7 +344,7 @@ protected:
FX_FILESIZE m_iBufSize;
};
#else
-class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object
+class CFX_BufferAccImp : public IFX_FileRead
{
public:
CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_INT32 iFileSize, FX_BOOL bReleaseStream);
@@ -364,7 +364,7 @@ protected:
};
#endif
#ifdef FX_FILESIZE
-class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object
+class CFGAS_FileWrite : public IFX_FileWrite
{
public:
CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream);
@@ -382,7 +382,7 @@ protected:
FX_BOOL m_bReleaseStream;
};
#else
-class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object
+class CFGAS_FileWrite : public IFX_FileWrite
{
public:
CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream);
diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp
index 0ee8152854..6f8452237f 100644
--- a/xfa/src/fgas/src/crt/fx_utils.cpp
+++ b/xfa/src/fgas/src/crt/fx_utils.cpp
@@ -340,7 +340,7 @@ void CFX_BaseMassArray::RemoveAll(FX_BOOL bLeaveMemory)
{
m_pData->RemoveAll(bLeaveMemory);
}
-typedef struct _FX_BASEDISCRETEARRAYDATA : public CFX_Object {
+typedef struct _FX_BASEDISCRETEARRAYDATA {
FX_INT32 iBlockSize;
FX_INT32 iChunkSize;
FX_INT32 iChunkCount;
diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h
index f6d88f38a0..3c159f5057 100644
--- a/xfa/src/fgas/src/font/fx_gdifont.h
+++ b/xfa/src/fgas/src/font/fx_gdifont.h
@@ -13,7 +13,7 @@ typedef struct _FX_GDIGOCACHE {
FX_LPBYTE pOutline;
} FX_GDIGOCACHE, * FX_LPGDIGOCACHE;
typedef FX_GDIGOCACHE const * FX_LPCGDIGOCACHE;
-class CFX_GdiFontCache : public CFX_Object
+class CFX_GdiFontCache
{
public:
CFX_GdiFontCache();
@@ -23,7 +23,7 @@ public:
protected:
CFX_MapPtrToPtr m_GlyphMap;
};
-class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock, public CFX_Object
+class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock
{
public:
CFX_GdiFont(IFX_FontMgr *pFontMgr);
diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h
index 430ff09852..585a04c638 100644
--- a/xfa/src/fgas/src/font/fx_gefont.h
+++ b/xfa/src/fgas/src/font/fx_gefont.h
@@ -11,7 +11,7 @@ class CFX_GEFontMgr;
#ifndef FXFONT_SUBST_ITALIC
#define FXFONT_SUBST_ITALIC 0x02
#endif
-class CFX_GEFont : public IFX_Font, public CFX_ThreadLock, public CFX_Object
+class CFX_GEFont : public IFX_Font, public CFX_ThreadLock
{
public:
CFX_GEFont(const CFX_GEFont &src, FX_DWORD dwFontStyles);
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index adcc737ca5..ba44233ad0 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -9,7 +9,7 @@
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
FX_INT32 FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles);
FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData);
-class CFX_StdFontMgrImp : public IFX_FontMgr, public CFX_Object
+class CFX_StdFontMgrImp : public IFX_FontMgr
{
public:
CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, FX_LPVOID pUserData);
@@ -48,7 +48,7 @@ protected:
};
FX_DWORD FX_GetGdiFontStyles(const LOGFONTW &lf);
#else
-class CFX_FontDescriptor : public CFX_Object
+class CFX_FontDescriptor
{
public:
CFX_FontDescriptor()
@@ -92,7 +92,7 @@ public:
};
};
typedef CFX_ArrayTemplate<FX_FontDescriptorInfo> CFX_FontDescriptorInfos;
-struct FX_HandleParentPath : public CFX_Object {
+struct FX_HandleParentPath {
FX_HandleParentPath()
{
}
@@ -104,7 +104,7 @@ struct FX_HandleParentPath : public CFX_Object {
void* pFileHandle;
CFX_ByteString bsParentPath;
};
-class CFX_FontSourceEnum_File : public IFX_FontSourceEnum, public CFX_Object
+class CFX_FontSourceEnum_File : public IFX_FontSourceEnum
{
public:
CFX_FontSourceEnum_File();
@@ -127,7 +127,7 @@ typedef CFX_MapPtrTemplate<FX_DWORD, CFX_ArrayTemplate<IFX_Font*>* > CFX_HashFon
typedef CFX_MapPtrTemplate<FX_WCHAR, IFX_Font*> CFX_UnicodeFontMap;
typedef CFX_MapPtrTemplate<IFX_FileAccess*, CFX_ArrayTemplate<IFX_Font*>* > CFX_FileFontMap;
typedef CFX_MapPtrTemplate<IFX_Font*, IFX_FileRead*> CFX_FonStreamtMap;
-class CFX_FontMgrImp : public IFX_FontMgr, public CFX_Object
+class CFX_FontMgrImp : public IFX_FontMgr
{
public:
CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, FX_LPVOID pUserData = NULL);
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h
index bf5f1ee4b5..c8f69277da 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.h
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h
@@ -8,7 +8,7 @@
#define _FX_RTFBREAK_IMP
class CFX_RTFLine;
class CFX_RTFBreak;
-class CFX_RTFLine : public CFX_Object
+class CFX_RTFLine
{
public:
CFX_RTFLine() : m_LinePieces(16)
@@ -78,7 +78,7 @@ public:
FX_INT32 m_iArabicChars;
FX_INT32 m_iMBCSChars;
};
-class CFX_RTFBreak : public IFX_RTFBreak, public CFX_Object
+class CFX_RTFBreak : public IFX_RTFBreak
{
public:
CFX_RTFBreak(FX_DWORD dwPolicies);
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h
index c5bbc40946..a80b16c1b3 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.h
+++ b/xfa/src/fgas/src/layout/fx_textbreak.h
@@ -8,7 +8,7 @@
#define _FX_TEXTBREAK_IMP
class CFX_TxtLine;
class CFX_Txtbreak;
-class CFX_TxtLine : public CFX_Object
+class CFX_TxtLine
{
public:
CFX_TxtLine(FX_INT32 iBlockSize) : m_iStart(0)
@@ -66,7 +66,7 @@ public:
FX_INT32 m_iWidth;
FX_INT32 m_iArabicChars;
};
-class CFX_TxtBreak : public IFX_TxtBreak, public CFX_Object
+class CFX_TxtBreak : public IFX_TxtBreak
{
public:
CFX_TxtBreak(FX_DWORD dwPolicies);
diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp
index e519e37257..4998201871 100644
--- a/xfa/src/fgas/src/localization/fx_locale.cpp
+++ b/xfa/src/fgas/src/localization/fx_locale.cpp
@@ -256,7 +256,7 @@ static const FX_FLOAT gs_fraction_scales[] = {0.1f, 0.01f, 0.001f, 0.0001f, 0.00
0.0000001f, 0.00000001f, 0.000000001f, 0.0000000001f, 0.00000000001f
};
static const FX_INT32 gs_fraction_count = sizeof(gs_fraction_scales) / sizeof(FX_FLOAT);
-class CFX_LCNumeric : public CFX_Object
+class CFX_LCNumeric
{
public:
CFX_LCNumeric();
diff --git a/xfa/src/fgas/src/localization/fx_localeimp.h b/xfa/src/fgas/src/localization/fx_localeimp.h
index 7698388020..c7d534d106 100644
--- a/xfa/src/fgas/src/localization/fx_localeimp.h
+++ b/xfa/src/fgas/src/localization/fx_localeimp.h
@@ -7,7 +7,7 @@
#ifndef _FX_LOCALE_IMP_H_
#define _FX_LOCALE_IMP_H_
class CFX_LCNumeric;
-class CFX_Locale : public IFX_Locale, public CFX_Object
+class CFX_Locale : public IFX_Locale
{
public:
CFX_Locale(CXML_Element* pLocaleData);
@@ -33,7 +33,7 @@ protected:
virtual ~CFX_Locale();
CXML_Element* m_pElement;
};
-class CFX_FormatString : public IFX_FormatString, public CFX_Object
+class CFX_FormatString : public IFX_FormatString
{
public:
CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID);
diff --git a/xfa/src/fgas/src/localization/fx_localemgr.h b/xfa/src/fgas/src/localization/fx_localemgr.h
index b23940e8d5..5e995b2e1b 100644
--- a/xfa/src/fgas/src/localization/fx_localemgr.h
+++ b/xfa/src/fgas/src/localization/fx_localemgr.h
@@ -6,7 +6,7 @@
#ifndef _FX_LOCALEMGR_IMP_H_
#define _FX_LOCALEMGR_IMP_H_
-class CFX_LocaleMgr : public IFX_LocaleMgr, public CFX_Object
+class CFX_LocaleMgr : public IFX_LocaleMgr
{
public:
CFX_LocaleMgr(FX_WORD wDefLCID);
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h
index f18173183f..444bcbdf8e 100644
--- a/xfa/src/fgas/src/xml/fx_sax_imp.h
+++ b/xfa/src/fgas/src/xml/fx_sax_imp.h
@@ -7,7 +7,7 @@
#ifndef _FX_SAX_IMP_
#define _FX_SAX_IMP_
#define FX_SAXFILE_BUFSIZE 32768
-class CFX_SAXFile : public CFX_Object
+class CFX_SAXFile
{
public:
CFX_SAXFile();
@@ -39,7 +39,7 @@ enum FX_SAXMODE {
FX_SAXMODE_TargetData,
FX_SAXMODE_MAX,
};
-class CFX_SAXItem : public CFX_Object
+class CFX_SAXItem
{
public:
CFX_SAXItem() : m_pNode(NULL)
@@ -56,7 +56,7 @@ public:
CFX_SAXItem* m_pPrev;
CFX_SAXItem* m_pNext;
};
-class CFX_SAXCommentContext : public CFX_Object
+class CFX_SAXCommentContext
{
public:
CFX_SAXCommentContext() : m_iHeaderCount(0)
@@ -66,7 +66,7 @@ public:
FX_INT32 m_iHeaderCount;
FX_INT32 m_iTailCount;
};
-class CFX_SAXReader : public IFX_SAXReader, public CFX_Object
+class CFX_SAXReader : public IFX_SAXReader
{
public:
CFX_SAXReader();
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
index fcae080130..673c720841 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
@@ -33,7 +33,7 @@ public:
virtual FWL_ERR SetColor(CFX_Color crFill);
protected:
FX_BOOL DrawCaretBK(CFX_Graphics *pGraphics, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix);
- class CFWL_CaretTimer : public CFX_Object
+ class CFWL_CaretTimer
{
public:
CFWL_CaretTimer(CFWL_CaretImp *m_pCaret);
diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
index bb859968f2..8fe41b762c 100644
--- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
@@ -6,7 +6,7 @@
#ifndef _FXMATH_BARCODEIMP_H_
#define _FXMATH_BARCODEIMP_H_
-class CFX_Barcode : public IFX_Barcode, public CFX_Object
+class CFX_Barcode : public IFX_Barcode
{
public:
CFX_Barcode();
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp
index 417020ac0f..51041dba5b 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp
@@ -808,7 +808,7 @@ void CFWL_NoteDriver::ClearInvalidEventTargets(FX_BOOL bRemoveAll)
}
}
}
-class CFWL_CoreToopTipDP : public IFWL_ToolTipDP, public CFX_Object
+class CFWL_CoreToopTipDP : public IFWL_ToolTipDP
{
public:
FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);
diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h
index 357f8e86de..b283c121e9 100644
--- a/xfa/src/fwl/src/core/include/fwl_formimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_formimp.h
@@ -19,7 +19,7 @@ class CFWL_FormDelegate;
#define FWL_SYSBUTTONSTATE_Hover 0x0001
#define FWL_SYSBUTTONSTATE_Pressed 0x0002
#define FWL_SYSBUTTONSTATE_Disabled 0x0010
-class CFWL_SysBtn : public CFX_Object
+class CFWL_SysBtn
{
public:
CFWL_SysBtn()
diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h
index 7538f1b048..1bd7ada04b 100644
--- a/xfa/src/fwl/src/core/include/fwl_gridimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h
@@ -12,7 +12,7 @@ class CFWL_GridLength;
class CFWL_GridColRow;
class CFWL_GridWidgetInfo;
class CFWL_GridImp;
-class CFWL_GridLength : public CFX_Object
+class CFWL_GridLength
{
public:
CFWL_GridLength()
@@ -28,7 +28,7 @@ public:
FX_FLOAT fLength;
FWL_GRIDUNIT eUnit;
};
-class CFWL_GridColRow : public CFX_Object
+class CFWL_GridColRow
{
public:
CFWL_GridColRow()
@@ -45,7 +45,7 @@ public:
FX_FLOAT m_fActualSize;
FX_FLOAT m_fActualPos;
};
-class CFWL_GridWidgetInfo : public CFX_Object
+class CFWL_GridWidgetInfo
{
public:
CFWL_GridWidgetInfo()
diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h
index aeed0b3955..08ab13d3e7 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h
@@ -16,7 +16,7 @@ class CFWL_NoteLoop;
class CFWL_NoteDriver;
class CFWL_EventTarget;
class CFWL_ToolTipContainer;
-class CFWL_NoteLoop : public CFX_Object
+class CFWL_NoteLoop
{
public:
CFWL_NoteLoop(CFWL_WidgetImp *pForm = NULL);
@@ -33,7 +33,7 @@ protected:
CFWL_WidgetImp *m_pForm;
FX_BOOL m_bContinueModal;
};
-class CFWL_NoteDriver : public CFX_Object
+class CFWL_NoteDriver
{
public:
CFWL_NoteDriver();
@@ -97,7 +97,7 @@ protected:
FX_LPVOID m_hookInfo;
};
typedef CFX_MapPtrTemplate<FX_LPVOID, FX_DWORD> CFWL_EventSource;
-class CFWL_EventTarget : public CFX_Object
+class CFWL_EventTarget
{
public:
CFWL_EventTarget(CFWL_NoteDriver *pNoteDriver, IFWL_Widget *pListener)
@@ -124,7 +124,7 @@ protected:
CFWL_NoteDriver *m_pNoteDriver;
FX_BOOL m_bInvalid;
};
-class CFWL_ToolTipContainer: public CFX_Object
+class CFWL_ToolTipContainer
{
public:
static CFWL_ToolTipContainer* getInstance();
diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h
index 14e54cdebc..2fa2bf7322 100644
--- a/xfa/src/fwl/src/core/include/fwl_targetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h
@@ -7,8 +7,7 @@
#ifndef _FWL_TARGET_IMP_H
#define _FWL_TARGET_IMP_H
class IFWL_Target;
-class CFWL_Target;
-class CFWL_Target : public CFX_Object
+class CFWL_Target
{
public:
virtual FX_DWORD Release();
diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h
index d7ac365c61..e03e6c6e15 100644
--- a/xfa/src/fwl/src/core/include/fwl_threadimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h
@@ -13,7 +13,7 @@ class IFWL_NoteDriver;
class CFWL_Thread;
class CFWL_NoteThread;
class CFWL_ControlThread;
-class CFWL_Thread : public CFX_Object
+class CFWL_Thread
{
public:
CFWL_Thread();
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
index 439bdac956..862bb53665 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
@@ -117,7 +117,7 @@ protected:
friend void FWL_SetWidgetStates(IFWL_Widget *widget, FX_DWORD dwStates);
friend void FWL_SetWidgetStyles(IFWL_Widget *widget, FX_DWORD dwStyles);
};
-class CFWL_WidgetImpDelegate : public CFX_Object
+class CFWL_WidgetImpDelegate
{
public:
CFWL_WidgetImpDelegate();
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index 3defb63f08..314021f9b6 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -13,7 +13,7 @@ class CFWL_WidgetMgrItem;
class CFWL_WidgetMgr;
class CFWL_WidgetMgrDelegate;
class IFWL_AdapterNative;
-class CFWL_WidgetMgrItem : public CFX_Object
+class CFWL_WidgetMgrItem
{
public:
CFWL_WidgetMgrItem()
@@ -49,7 +49,7 @@ public:
FX_BOOL bOutsideChanged;
#endif
};
-class CFWL_WidgetMgr : public CFX_Object
+class CFWL_WidgetMgr
{
public:
CFWL_WidgetMgr(IFWL_AdapterNative *pAdapterNative);
@@ -123,7 +123,7 @@ protected:
CFX_RectF m_rtScreen;
#endif
};
-class CFWL_WidgetMgrDelegate : public CFX_Object
+class CFWL_WidgetMgrDelegate
{
public:
CFWL_WidgetMgrDelegate(CFWL_WidgetMgr *pWidgetMgr);
diff --git a/xfa/src/fxbarcode/BC_Binarizer.h b/xfa/src/fxbarcode/BC_Binarizer.h
index 357aef67c2..730829aba1 100644
--- a/xfa/src/fxbarcode/BC_Binarizer.h
+++ b/xfa/src/fxbarcode/BC_Binarizer.h
@@ -10,7 +10,7 @@ class CBC_LuminanceSource;
class CBC_CommonBitMatrix;
class CBC_CommonBitArray;
class CBC_BinaryBitmap;
-class CBC_Binarizer : public CFX_Object
+class CBC_Binarizer
{
public:
CBC_Binarizer(CBC_LuminanceSource *source);
diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.h b/xfa/src/fxbarcode/BC_BinaryBitmap.h
index 638d16f5a9..e555a2b42c 100644
--- a/xfa/src/fxbarcode/BC_BinaryBitmap.h
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.h
@@ -10,7 +10,7 @@ class CBC_Binarizer;
class CBC_CommonBitMatrix;
class CBC_CommonBitArray;
class CBC_BinaryBitmap;
-class CBC_BinaryBitmap : public CFX_Object
+class CBC_BinaryBitmap
{
public:
CBC_BinaryBitmap(CBC_Binarizer *binarizer);
diff --git a/xfa/src/fxbarcode/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h
index ff98b2c407..9655d66383 100644
--- a/xfa/src/fxbarcode/BC_DecoderResult.h
+++ b/xfa/src/fxbarcode/BC_DecoderResult.h
@@ -7,7 +7,7 @@
#ifndef _BC_DECODERRESULT_H_
#define _BC_DECODERRESULT_H_
class CBC_DecoderResult;
-class CBC_DecoderResult : public CFX_Object
+class CBC_DecoderResult
{
public:
CBC_DecoderResult(CFX_ByteArray* rawBytes, CFX_ByteString text, CFX_ByteString ecLevel);
@@ -19,14 +19,14 @@ public:
void setErrorsCorrected(FX_INT32 errorsCorrected);
FX_INT32 getErasures();
void setErasures(FX_INT32 erasures);
- CFX_Object* getOther();
- void setOther(CFX_Object* other);
+ void* getOther();
+ void setOther(void* other);
private:
CFX_ByteArray* m_rawBytes;
CFX_ByteString m_text;
CFX_ByteString m_ecLevel;
FX_INT32 m_errorsCorrected;
FX_INT32 m_erasures;
- CFX_Object* m_other;
+ void* m_other;
};
#endif
diff --git a/xfa/src/fxbarcode/BC_Dimension.h b/xfa/src/fxbarcode/BC_Dimension.h
index ff4aecace4..42c87a6cb3 100644
--- a/xfa/src/fxbarcode/BC_Dimension.h
+++ b/xfa/src/fxbarcode/BC_Dimension.h
@@ -7,7 +7,7 @@
#ifndef _BC_DIMENSION_H_
#define _BC_DIMENSION_H_
class CBC_Dimension;
-class CBC_Dimension : public CFX_Object
+class CBC_Dimension
{
public:
CBC_Dimension();
diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.h b/xfa/src/fxbarcode/BC_LuminanceSource.h
index 6aa85101c9..013f1b84f3 100644
--- a/xfa/src/fxbarcode/BC_LuminanceSource.h
+++ b/xfa/src/fxbarcode/BC_LuminanceSource.h
@@ -7,7 +7,7 @@
#ifndef _BC_LUMINANCESOURCE_H
#define _BC_LUMINANCESOURCE_H
class CBC_LuminanceSource;
-class CBC_LuminanceSource : public CFX_Object
+class CBC_LuminanceSource
{
public:
CBC_LuminanceSource(FX_INT32 width, FX_INT32 height);
diff --git a/xfa/src/fxbarcode/BC_Reader.h b/xfa/src/fxbarcode/BC_Reader.h
index 42b2aa11f5..74c12b6e2c 100644
--- a/xfa/src/fxbarcode/BC_Reader.h
+++ b/xfa/src/fxbarcode/BC_Reader.h
@@ -8,7 +8,7 @@
#define _BC_READER_H_
class CBC_BinaryBitmap;
class CBC_Reader;
-class CBC_Reader : public CFX_Object
+class CBC_Reader
{
public:
CBC_Reader();
diff --git a/xfa/src/fxbarcode/BC_ResultPoint.h b/xfa/src/fxbarcode/BC_ResultPoint.h
index 7001cfa2a5..03a23d417b 100644
--- a/xfa/src/fxbarcode/BC_ResultPoint.h
+++ b/xfa/src/fxbarcode/BC_ResultPoint.h
@@ -7,7 +7,7 @@
#ifndef _BC_RESULTPOINT_H_
#define _BC_RESULTPOINT_H_
class CBC_ResultPoint;
-class CBC_ResultPoint : public CFX_Object
+class CBC_ResultPoint
{
public:
CBC_ResultPoint();
diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.h b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
index 1ee3a8c64c..c5dc5a415e 100644
--- a/xfa/src/fxbarcode/BC_UtilCodingConvert.h
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
@@ -7,7 +7,7 @@
#ifndef _BC_UTILCODINGCONVERT_H_
#define _BC_UTILCODINGCONVERT_H_
class CBC_UtilCodingConvert;
-class CBC_UtilCodingConvert : public CFX_Object
+class CBC_UtilCodingConvert
{
public:
CBC_UtilCodingConvert();
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.h b/xfa/src/fxbarcode/BC_UtilRSS.h
index 37834eaa76..076e2f263d 100644
--- a/xfa/src/fxbarcode/BC_UtilRSS.h
+++ b/xfa/src/fxbarcode/BC_UtilRSS.h
@@ -7,7 +7,7 @@
#ifndef _BC_UTILRESS_H_
#define _BC_UTILRESS_H_
class CBC_RssPair;
-class CBC_UtilRSS : public CFX_Object
+class CBC_UtilRSS
{
public:
virtual ~CBC_UtilRSS();
diff --git a/xfa/src/fxbarcode/BC_Writer.h b/xfa/src/fxbarcode/BC_Writer.h
index deb68c07be..d92dc9b2ea 100644
--- a/xfa/src/fxbarcode/BC_Writer.h
+++ b/xfa/src/fxbarcode/BC_Writer.h
@@ -7,7 +7,7 @@
#ifndef _BC_WRITER_H_
#define _BC_WRITER_H_
class CBC_Writer;
-class CBC_Writer : public CFX_Object
+class CBC_Writer
{
public:
CBC_Writer();
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.h b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
index 484d87d5a7..d1c8f6d528 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
@@ -6,8 +6,7 @@
#ifndef _BC_COMMONBITARRAY_H_
#define _BC_COMMONBITARRAY_H_
-class CBC_CommonBitArray;
-class CBC_CommonBitArray : public CFX_Object
+class CBC_CommonBitArray
{
public:
CBC_CommonBitArray(CBC_CommonBitArray* array);
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
index f69d7a0e33..8641ef1f63 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
@@ -7,8 +7,7 @@
#ifndef _BC_COMMONBITMATRIX_H_
#define _BC_COMMONBITMATRIX_H_
class CBC_CommonBitArray;
-class CBC_CommonBitMatrix;
-class CBC_CommonBitMatrix : public CFX_Object
+class CBC_CommonBitMatrix
{
public:
CBC_CommonBitMatrix();
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.h b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
index 53891cf671..f6a5985ae2 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
@@ -6,8 +6,7 @@
#ifndef _BC_COMMONBITSOURCE_H_
#define _BC_COMMONBITSOURCE_H_
-class CBC_CommonBitSource;
-class CBC_CommonBitSource : public CFX_Object
+class CBC_CommonBitSource
{
public:
CBC_CommonBitSource(CFX_ByteArray *bytes);
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.h b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
index fe0a67ffd1..b9baf8a964 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
@@ -6,8 +6,7 @@
#ifndef _BC_COMMONBYTEARRAY_H_
#define _BC_COMMONBYTEARRAY_H_
-class CBC_CommonByteArray;
-class CBC_CommonByteArray : public CFX_Object
+class CBC_CommonByteArray
{
private:
FX_INT32 m_size;
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
index 3d831d1911..55277660f3 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
@@ -6,8 +6,7 @@
#ifndef _BC_COMMONBYTEMATRIX_H_
#define _BC_COMMONBYTEMATRIX_H_
-class CBC_CommonByteMatrix;
-class CBC_CommonByteMatrix : public CFX_Object
+class CBC_CommonByteMatrix
{
public:
CBC_CommonByteMatrix(FX_INT32 width, FX_INT32 height);
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 808203bd01..5f41afc774 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
@@ -8,8 +8,7 @@
#define _BC_COMMONDECODERRESULT_H_
class CBC_QRCoderErrorCorrectionLevel;
class CBC_PDF417ResultMetadata;
-class CBC_CommonDecoderResult;
-class CBC_CommonDecoderResult : public CFX_Object
+class CBC_CommonDecoderResult
{
public:
CBC_CommonDecoderResult();
diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.h b/xfa/src/fxbarcode/common/BC_CommonECI.h
index 3907066066..7a4ae6b8a6 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.h
@@ -6,8 +6,7 @@
#ifndef _BC_COMMONECI_H_
#define _BC_COMMONECI_H_
-class CBC_CommonECI;
-class CBC_CommonECI : public CFX_Object
+class CBC_CommonECI
{
public:
CBC_CommonECI(FX_INT32 value);
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
index 5c42a1a6a7..cf7f804a2c 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
@@ -6,8 +6,7 @@
#ifndef _BC_COMMONPERSPECTIVETRANSFORM_H_
#define _BC_COMMONPERSPECTIVETRANSFORM_H_
-class CBC_CommonPerspectiveTransform;
-class CBC_CommonPerspectiveTransform : public CFX_Object
+class CBC_CommonPerspectiveTransform
{
public:
CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, FX_FLOAT a31,
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index 83d91ced92..40146d39de 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -8,8 +8,7 @@
#define _BC_WHITERECTANLEDETECTOR_H_
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
-class CBC_WhiteRectangleDetector;
-class CBC_WhiteRectangleDetector : public CFX_Object
+class CBC_WhiteRectangleDetector
{
public:
CBC_WhiteRectangleDetector(CBC_CommonBitMatrix *image);
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 2950b8f315..713f343d98 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -8,8 +8,7 @@
#define _BC_READSOLOMON_H_
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
-class CBC_ReedSolomonEncoder;
-class CBC_ReedSolomonEncoder : public CFX_Object
+class CBC_ReedSolomonEncoder
{
private:
CBC_ReedSolomonGF256* m_field;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index c1dd0f03f5..db026edd01 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
@@ -8,8 +8,7 @@
#define _BC_REEDSOLOMONDECODER_H_
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
-class CBC_ReedSolomonDecoder;
-class CBC_ReedSolomonDecoder : public CFX_Object
+class CBC_ReedSolomonDecoder
{
private:
CBC_ReedSolomonGF256 * m_field;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 1687b95e09..40e7ffef28 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -7,8 +7,7 @@
#ifndef _BC_REEDSOLOMONGF256_H_
#define _BC_REEDSOLOMONGF256_H_
class CBC_ReedSolomonGF256Poly;
-class CBC_ReedSolomonGF256;
-class CBC_ReedSolomonGF256 : public CFX_Object
+class CBC_ReedSolomonGF256
{
public:
static void Initialize();
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index a6db24e231..5c9ae6cce6 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -7,8 +7,7 @@
#ifndef _BC_READSOLOMONGF256POLY_H_
#define _BC_READSOLOMONGF256POLY_H_
class CBC_ReedSolomonGF256;
-class CBC_ReedSolomonGF256Poly;
-class CBC_ReedSolomonGF256Poly : public CFX_Object
+class CBC_ReedSolomonGF256Poly
{
public:
CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, FX_INT32 coefficients);
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index c5f1f3f7a0..812aa6424f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -8,8 +8,7 @@
#define _BC_DATAMATRIXBITMATRIXPARSER_H_
class CBC_CommonBitMatrix;
class CBC_DataMatrixVersion;
-class CBC_DataMatrixBitMatrixParser;
-class CBC_DataMatrixBitMatrixParser : public CFX_Object
+class CBC_DataMatrixBitMatrixParser
{
public:
CBC_DataMatrixBitMatrixParser();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 1dd62fe1fe..d0f4af036e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -7,8 +7,7 @@
#ifndef _BC_DATAMATRIXDATABLOCK_H_
#define _BC_DATAMATRIXDATABLOCK_H_
class CBC_DataMatrixVersion;
-class CBC_DataMatrixDataBlock;
-class CBC_DataMatrixDataBlock : public CFX_Object
+class CBC_DataMatrixDataBlock
{
public:
virtual ~CBC_DataMatrixDataBlock();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 060972d53a..45db800176 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
@@ -8,8 +8,7 @@
#define _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_
class CBC_CommonDecoderResult;
class CBC_CommonBitSource;
-class CBC_DataMatrixDecodedBitStreamParser;
-class CBC_DataMatrixDecodedBitStreamParser : public CFX_Object
+class CBC_DataMatrixDecodedBitStreamParser
{
public:
CBC_DataMatrixDecodedBitStreamParser();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 44f7efc7b7..1d6059379b 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
@@ -9,8 +9,7 @@
class CBC_ReedSolomonDecoder;
class CBC_CommonDecoderResult;
class CBC_CommonBitMatrix;
-class CBC_DataMatrixDecoder;
-class CBC_DataMatrixDecoder : public CFX_Object
+class CBC_DataMatrixDecoder
{
public:
CBC_DataMatrixDecoder();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 2d3ca744fe..a9e244c5f4 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
@@ -12,7 +12,7 @@ class CBC_ResultPoint;
class CBC_QRDetectorResult;
class CBC_DataMatrixDetector;
class ResultPointsAndTransitions;
-class CBC_ResultPointsAndTransitions : public CFX_Object
+class CBC_ResultPointsAndTransitions
{
public:
CBC_ResultPointsAndTransitions(CBC_ResultPoint *from, CBC_ResultPoint *to, FX_INT32 transitions)
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 41d2f23db6..9661834bd8 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -6,10 +6,9 @@
#ifndef _BC_DATAMATRIXVERSION_H_
#define _BC_DATAMATRIXVERSION_H_
-class ECB;
class ECBlocks;
class CBC_DataMatrixVersion;
-class ECB : public CFX_Object
+class ECB
{
public:
ECB(FX_INT32 count, FX_INT32 dataCodewords)
@@ -31,7 +30,7 @@ private:
FX_INT32 m_count;
FX_INT32 m_dataCodewords;
};
-class ECBlocks : public CFX_Object
+class ECBlocks
{
public:
ECBlocks(FX_INT32 ecCodewords, ECB *ecBlocks)
@@ -67,7 +66,7 @@ private:
FX_INT32 m_ecCodewords;
CFX_PtrArray m_ecBlocks;
};
-class CBC_DataMatrixVersion : public CFX_Object
+class CBC_DataMatrixVersion
{
public:
CBC_DataMatrixVersion(FX_INT32 versionNumber,
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index ba2da03408..2194e9f18a 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -6,8 +6,7 @@
#ifndef _BC_DEFAULTPLACEMENT_H_
#define _BC_DEFAULTPLACEMENT_H_
-class CBC_DefaultPlacement;
-class CBC_DefaultPlacement : public CFX_Object
+class CBC_DefaultPlacement
{
public:
CBC_DefaultPlacement(CFX_WideString codewords, FX_INT32 numcols, FX_INT32 numrows);
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index 10ac8763e5..7d1a1b5b62 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
@@ -7,8 +7,7 @@
#ifndef _BC_ENCODER_H_
#define _BC_ENCODER_H_
class CBC_EncoderContext;
-class CBC_Encoder;
-class CBC_Encoder : public CFX_Object
+class CBC_Encoder
{
public:
CBC_Encoder();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 973ff33b8e..0bc71cdeb5 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -7,8 +7,7 @@
#ifndef _BC_ERRORCORRECTION_H_
#define _BC_ERRORCORRECTION_H_
class CBC_SymbolInfo;
-class CBC_ErrorCorrection;
-class CBC_ErrorCorrection : public CFX_Object
+class CBC_ErrorCorrection
{
public:
CBC_ErrorCorrection();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 2b030012a3..adda8c8ea8 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
@@ -6,8 +6,7 @@
#ifndef _BC_SYMBOLSHAPEHINT_H_
#define _BC_SYMBOLSHAPEHINT_H_
-class CBC_SymbolShapeHint;
-class CBC_SymbolShapeHint : public CFX_Object
+class CBC_SymbolShapeHint
{
public:
CBC_SymbolShapeHint();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index ab31244add..928afe80d2 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
@@ -9,8 +9,7 @@
class CBC_Compaction;
class CBC_BarcodeRow;
class CBC_BarcodeMatrix;
-class CBC_PDF417;
-class CBC_PDF417 : public CFX_Object
+class CBC_PDF417
{
public:
CBC_PDF417();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index d8a0c5d0ae..ce0681bfa8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -7,8 +7,7 @@
#ifndef _BC_BARCODEMATRIX_H_
#define _BC_BARCODEMATRIX_H_
class CBC_BarcodeRow;
-class CBC_BarcodeMatrix;
-class CBC_BarcodeMatrix : public CFX_Object
+class CBC_BarcodeMatrix
{
public:
CBC_BarcodeMatrix();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
index 62b1282827..6e2aa4d952 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
@@ -7,7 +7,7 @@
#ifndef _BC_BARCODEMETADATA_H_
#define _BC_BARCODEMETADATA_H_
class CBC_BarcodeMetadata;
-class CBC_BarcodeMetadata : public CFX_Object
+class CBC_BarcodeMetadata
{
public:
CBC_BarcodeMetadata(FX_INT32 columnCount, FX_INT32 rowCountUpperPart, FX_INT32 rowCountLowerPart, FX_INT32 errorCorrectionLevel);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 75fd15b653..c5520f6440 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -6,8 +6,7 @@
#ifndef _BC_BARCODEROW_H_
#define _BC_BARCODEROW_H_
-class CBC_BarcodeRow;
-class CBC_BarcodeRow : public CFX_Object
+class CBC_BarcodeRow
{
public:
CBC_BarcodeRow(FX_INT32 width);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index 1695c8ac5a..6922d410f0 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
@@ -6,8 +6,7 @@
#ifndef _BC_BARCODEVALUE_H_
#define _BC_BARCODEVALUE_H_
-class CBC_BarcodeValue;
-class CBC_BarcodeValue : public CFX_Object
+class CBC_BarcodeValue
{
public:
CBC_BarcodeValue();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index efae2b706f..26bd1881c3 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -8,8 +8,7 @@
#define _BC_BOUNDINGBOX_H_
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
-class CBC_BoundingBox;
-class CBC_BoundingBox : public CFX_Object
+class CBC_BoundingBox
{
public:
CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, CBC_ResultPoint* bottomLeft, CBC_ResultPoint* topRight, CBC_ResultPoint* bottomRight, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index 93b3cf6bb3..ea0524cbf8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -6,8 +6,7 @@
#ifndef _BC_CODEWORD_H_
#define _BC_CODEWORD_H_
-class CBC_Codeword;
-class CBC_Codeword : public CFX_Object
+class CBC_Codeword
{
public:
CBC_Codeword(FX_INT32 startX, FX_INT32 endX, FX_INT32 bucket, FX_INT32 value);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index da22683bfa..f76d16d015 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
@@ -6,10 +6,10 @@
#ifndef _BC_PDF417CODEWORDDECODER_H_
#define _BC_PDF417CODEWORDDECODER_H_
-class CBC_PDF417Common;
class CBC_PDF417CodewordDecoder;
#define column 8
-class CBC_PDF417CodewordDecoder : public CFX_Object
+class CBC_PDF417Common;
+class CBC_PDF417CodewordDecoder
{
public:
CBC_PDF417CodewordDecoder();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
index 19e3fe57da..2d6258951e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
@@ -6,8 +6,7 @@
#ifndef _BC_PDF417COMMON_H_
#define _BC_PDF417COMMON_H_
-class CBC_PDF417Common;
-class CBC_PDF417Common : public CFX_Object
+class CBC_PDF417Common
{
public:
CBC_PDF417Common();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
index 774a23fbdf..34af4ac0f6 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
@@ -13,7 +13,7 @@ enum Compaction {
BYTES,
NUMERIC
};
-class CBC_Compaction : public CFX_Object
+class CBC_Compaction
{
public:
CBC_Compaction();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index 64ae2aee53..4c97bc3f24 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
@@ -8,8 +8,7 @@
#define _BC_DECODEDBITSTREAMPARSER_H_
class CBC_CommonDecoderResult;
class CBC_PDF417ResultMetadata;
-class CBC_DecodedBitStreamPaser;
-class CBC_DecodedBitStreamPaser : public CFX_Object
+class CBC_DecodedBitStreamPaser
{
public:
CBC_DecodedBitStreamPaser();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
index 9c3401459b..55a5a8f134 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
@@ -10,8 +10,7 @@ class CBC_BarcodeMetadata;
class CBC_BoundingBox;
class CBC_Codeword;
class CBC_DetectionResultColumn;
-class CBC_DetectionResult;
-class CBC_DetectionResult : public CFX_Object
+class CBC_DetectionResult
{
public:
CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
index eddc3bce6d..202272d2e9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
@@ -8,8 +8,7 @@
#define _BC_DETECTIONRESULTCOLUMN_H_
class CBC_Codeword;
class CBC_BoundingBox;
-class CBC_DetectionResultColumn;
-class CBC_DetectionResultColumn : public CFX_Object
+class CBC_DetectionResultColumn
{
public:
CBC_DetectionResultColumn(CBC_BoundingBox* boundingBox);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
index 557559e1f7..c160779122 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
@@ -10,8 +10,7 @@ class CBC_PDF417DetectorResult;
class CBC_BinaryBitmap;
class CBC_CommonBitMatrix;
class CBC_CommonBitArray;
-class CBC_Detector;
-class CBC_Detector : public CFX_Object
+class CBC_Detector
{
public:
CBC_Detector();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index ba557f1541..dabffe4c07 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
@@ -7,8 +7,7 @@
#ifndef _BC_PDF417DETECTORRESULT_H_
#define _BC_PDF417DETECTORRESULT_H_
class CBC_CommonBitMatrix;
-class CBC_PDF417DetectorResult;
-class CBC_PDF417DetectorResult : public CFX_Object
+class CBC_PDF417DetectorResult
{
public:
CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
index 6f8eaffed7..b8e9763081 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
@@ -6,8 +6,7 @@
#ifndef _BC_DIMENSIONS_H_
#define _BC_DIMENSIONS_H_
-class CBC_Dimensions;
-class CBC_Dimensions : public CFX_Object
+class CBC_Dimensions
{
public:
CBC_Dimensions(FX_INT32 minCols, FX_INT32 maxCols, FX_INT32 minRows, FX_INT32 maxRows);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
index 4ce8eda7d6..0fca2e6c39 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
@@ -8,8 +8,7 @@
#define _BC_PDF417ECERRORCORRECTION_H_
class CBC_PDF417ECModulusGF;
class CBC_PDF417ECModulusPoly;
-class CBC_PDF417ECErrorCorrection;
-class CBC_PDF417ECErrorCorrection : public CFX_Object
+class CBC_PDF417ECErrorCorrection
{
public:
CBC_PDF417ECErrorCorrection();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
index 7ebe33ecfd..fbb79e3586 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
@@ -8,8 +8,7 @@
#define _BC_PDF417ECMODULUSGF_H_
class CBC_PDF417ECModulusPoly;
class CBC_PDF417Common;
-class CBC_PDF417ECModulusGF;
-class CBC_PDF417ECModulusGF : public CFX_Object
+class CBC_PDF417ECModulusGF
{
public:
CBC_PDF417ECModulusGF(FX_INT32 modulus, FX_INT32 generator, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
index 9a9d6c16f2..172cc76cc8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
@@ -7,8 +7,7 @@
#ifndef _BC_PDF417ECMODULUSPOLY_H_
#define _BC_PDF417ECMODULUSPOLY_H_
class CBC_PDF417ECModulusGF;
-class CBC_PDF417ECModulusPoly;
-class CBC_PDF417ECModulusPoly : public CFX_Object
+class CBC_PDF417ECModulusPoly
{
public:
CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field, CFX_Int32Array &coefficients, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 4e3aee8d26..9af8b72f17 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -6,8 +6,7 @@
#ifndef _BC_PDF417ERRORCORRECTION_H_
#define _BC_PDF417ERRORCORRECTION_H_
-class CBC_PDF417ErrorCorrection;
-class CBC_PDF417ErrorCorrection : public CFX_Object
+class CBC_PDF417ErrorCorrection
{
public:
CBC_PDF417ErrorCorrection();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index ed962030ac..7c8801cb21 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -9,7 +9,7 @@
#include "BC_PDF417Compaction.h"
-class CBC_PDF417HighLevelEncoder : public CFX_Object
+class CBC_PDF417HighLevelEncoder
{
public:
static CFX_WideString encodeHighLevel(CFX_WideString msg, Compaction compaction, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index e6c7780304..7639c032ba 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -6,8 +6,7 @@
#ifndef _BC_PDF417READER_H_
#define _BC_PDF417READER_H_
-class CBC_PDF417ResultMetadata;
-class CBC_PDF417ResultMetadata : public CFX_Object
+class CBC_PDF417ResultMetadata
{
public:
CBC_PDF417ResultMetadata();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
index 924e5f798a..8cb5d2856c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
@@ -16,8 +16,8 @@ class CBC_BarcodeMetadata;
class CBC_BarcodeValue;
class CBC_DetectionResult;
class CBC_DetectionResultRowIndicatorColumn;
-class CBC_PDF417ScanningDecoder;
-class CBC_PDF417ScanningDecoder : public CFX_Object
+
+class CBC_PDF417ScanningDecoder
{
public:
CBC_PDF417ScanningDecoder();
diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
index bac9291947..8e4cb13ed2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
@@ -7,8 +7,7 @@
#ifndef _BC_FINDERPATTERNINFO_H_
#define _BC_FINDERPATTERNINFO_H_
class CBC_QRFinderPattern;
-class CBC_QRFinderPatternInfo;
-class CBC_QRFinderPatternInfo : public CFX_Object
+class CBC_QRFinderPatternInfo
{
private:
CBC_QRFinderPattern *m_bottomLeft;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 5471c4e62a..c1d224a8eb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
@@ -8,8 +8,7 @@
#define _BC_QRALIGNMENTPATTERNFINDER_H_
class CBC_CommonBitMatrix;
class CBC_QRAlignmentPattern;
-class CBC_QRAlignmentPatternFinder;
-class CBC_QRAlignmentPatternFinder : public CFX_Object
+class CBC_QRAlignmentPatternFinder
{
private:
CBC_CommonBitMatrix *m_image;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 2e176f63d3..0189ba7c81 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -10,8 +10,7 @@ class CBC_CommonBitMatrix ;
class CBC_QRCoderVersion;
class CBC_QRCoderFormatInformation;
class CBC_QRDataMask;
-class CBC_QRBitMatrixParser;
-class CBC_QRBitMatrixParser : public CFX_Object
+class CBC_QRBitMatrixParser
{
private:
CBC_CommonBitMatrix *m_bitMatrix;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
index 89ce140fbd..3c24dc2bc9 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
@@ -9,8 +9,8 @@
class CBC_QRCoderErrorCorrectionLevel ;
class CBC_QRCoderMode;
class CBC_CommonByteMatrix;
-class CBC_QRCoder;
-class CBC_QRCoder : public CFX_Object
+
+class CBC_QRCoder
{
private:
CBC_QRCoderMode* m_mode;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 6e9abba6c9..ae73fe8c88 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -6,8 +6,7 @@
#ifndef _BC_QRECODERBITVECTOR_H_
#define _BC_QRECODERBITVECTOR_H_
-class CBC_QRCoderBitVector;
-class CBC_QRCoderBitVector : public CFX_Object
+class CBC_QRCoderBitVector
{
private:
FX_INT32 m_sizeInBits;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
index 234ac1a776..6fb79bb596 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
@@ -7,8 +7,7 @@
#ifndef _BC_QRCODERBLOCKPAIR_H_
#define _BC_QRCODERBLOCKPAIR_H_
class CBC_CommonByteArray;
-class CBC_QRCoderBlockPair;
-class CBC_QRCoderBlockPair : public CFX_Object
+class CBC_QRCoderBlockPair
{
private:
CBC_CommonByteArray* m_dataBytes;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
index 355af78180..00238544c3 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
@@ -12,8 +12,7 @@ class CBC_CommonDecoderResult;
class CBC_QRBitMatrixParser;
class CBC_QRCoderVersion;
class CBC_QRDataBlock;
-class CBC_QRCoderDecoder;
-class CBC_QRCoderDecoder : public CFX_Object
+class CBC_QRCoderDecoder
{
private:
CBC_ReedSolomonDecoder *m_rsDecoder;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
index c6494b75cd..e8c2d36999 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
@@ -6,8 +6,7 @@
#ifndef _BC_QRCODERECB_H_
#define _BC_QRCODERECB_H_
-class CBC_QRCoderECB;
-class CBC_QRCoderECB : public CFX_Object
+class CBC_QRCoderECB
{
private:
FX_INT32 m_count;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index 385837510a..7f229742ab 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -7,8 +7,7 @@
#ifndef _BC_QRCODERECBLOCKS_H_
#define _BC_QRCODERECBLOCKS_H_
class CBC_QRCoderECB;
-class CBC_QRCoderECBlocks;
-class CBC_QRCoderECBlocks : public CFX_Object
+class CBC_QRCoderECBlocks
{
private:
FX_INT32 m_ecCodeWordsPerBlock;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index e072dc337e..3f6a644f0f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -50,7 +50,7 @@ CBC_QRCoderEncoder::CBC_QRCoderEncoder()
CBC_QRCoderEncoder::~CBC_QRCoderEncoder()
{
}
-class Make_Pair : public CFX_Object
+class Make_Pair
{
public:
CBC_QRCoderMode* m_mode;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 8dea2a6477..f08d608fb8 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -14,7 +14,7 @@ class CBC_QRCoderBitVector;
class CBC_CommonByteArray;
class CBC_CommonByteMatrix;
class CBC_QRCoderEncoder;
-class CBC_QRCoderEncoder : public CFX_Object
+class CBC_QRCoderEncoder
{
private:
const static FX_INT32 m_alphaNumbericTable[96];
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 2c0ad7b0b7..907c20d1cc 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -6,8 +6,7 @@
#ifndef _BC_QRCODERERRORCORRECTIONLEVEL_H_
#define _BC_QRCODERERRORCORRECTIONLEVEL_H_
-class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRCoderErrorCorrectionLevel : public CFX_Object
+class CBC_QRCoderErrorCorrectionLevel
{
private:
FX_INT32 m_ordinal;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
index 9d828c8380..49265e5033 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
@@ -7,8 +7,7 @@
#ifndef _BC_QRCODERFORMATINFORMATION_H_
#define _BC_QRCODERFORMATINFORMATION_H_
class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRCoderFormatInformation;
-class CBC_QRCoderFormatInformation : public CFX_Object
+class CBC_QRCoderFormatInformation
{
private:
const static FX_INT32 FORMAT_INFO_MASK_QR;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
index 134d344e72..13bb11691a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
@@ -7,8 +7,7 @@
#ifndef _BC_QRCODERMASKUTIL_H_
#define _BC_QRCODERMASKUTIL_H_
class CBC_CommonByteMatrix;
-class CBC_QRCoderMaskUtil;
-class CBC_QRCoderMaskUtil : public CFX_Object
+class CBC_QRCoderMaskUtil
{
public:
CBC_QRCoderMaskUtil();
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index 23a9d88128..ce1e65d4c2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
@@ -9,8 +9,7 @@
class CBC_CommonByteMatrix;
class CBC_QRCoderErrorCorrectionLevel;
class CBC_QRCoderBitVector;
-class CBC_QRCoderMatrixUtil;
-class CBC_QRCoderMatrixUtil : public CFX_Object
+class CBC_QRCoderMatrixUtil
{
private:
const static FX_INT32 POSITION_DETECTION_PATTERN[7][7];
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
index 71cea9fc78..fbd90871cf 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -7,8 +7,7 @@
#ifndef _BC_QRCODERMODE_H_
#define _BC_QRCODERMODE_H_
class CBC_QRCoderVersion;
-class CBC_QRCoderMode;
-class CBC_QRCoderMode : public CFX_Object
+class CBC_QRCoderMode
{
private:
FX_INT32* m_characterCountBitsForVersions;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index b693dd6dd7..17d392121d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -9,8 +9,7 @@
class CBC_QRCoderECBlocks;
class CBC_CommonBitMatrix;
class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRCoderVersion;
-class CBC_QRCoderVersion : public CFX_Object
+class CBC_QRCoderVersion
{
private:
const static FX_INT32 VERSION_DECODE_INFO[34];
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index 4f68c7a9f3..d5697ff724 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -10,8 +10,7 @@ class CBC_QRCoderVersion;
class CBC_QRCoderECBlocks;
class CBC_QRCoderECB;
class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRDataBlock;
-class CBC_QRDataBlock : public CFX_Object
+class CBC_QRDataBlock
{
private:
FX_INT32 m_numDataCodewords;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
index 6fcc09d556..221218f34a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
@@ -7,8 +7,7 @@
#ifndef _BC_QRDATAMASK_H_
#define _BC_QRDATAMASK_H_
class CBC_CommonBitMatrix;
-class CBC_QRDataMask;
-class CBC_QRDataMask : public CFX_Object
+class CBC_QRDataMask
{
public:
static CFX_PtrArray *DATA_MASKS;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
index b64485f788..f4ac06b984 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
@@ -11,8 +11,7 @@ class CBC_QRCoderErrorCorrectionLevel;
class CBC_CommonBitSource;
class CBC_QRCoderVersion;
class CBC_CommonCharacterSetECI;
-class CBC_QRDecodedBitStreamParser;
-class CBC_QRDecodedBitStreamParser : public CFX_Object
+class CBC_QRDecodedBitStreamParser
{
private:
const static FX_CHAR ALPHANUMERIC_CHARS[45];
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 13f6d3dc46..f6b38e5a30 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -8,8 +8,7 @@
#define _BC_QRDETECTORRESULT_H_
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
-class CBC_QRDetectorResult;
-class CBC_QRDetectorResult : public CFX_Object
+class CBC_QRDetectorResult
{
private:
CBC_CommonBitMatrix *m_bits;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index 7470b553ee..d0fde46542 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
@@ -10,8 +10,8 @@ class CBC_CommonBitMatrix;
class CBC_QRFinderPattern;
class CBC_ResultPoint;
class CBC_QRFinderPatternInfo;
-class CBC_QRFinderPatternFinder;
-class CBC_QRFinderPatternFinder : public CFX_Object
+
+class CBC_QRFinderPatternFinder
{
private:
const static FX_INT32 CENTER_QUORUM;
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h
index 5e2eca72f0..dc080096bd 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.h
+++ b/xfa/src/fxfa/src/app/xfa_checksum.h
@@ -8,7 +8,7 @@
#define _FXFA_FORMFILLER_CHECKSUM_IMP_H
class CXFA_SAXReaderHandler;
class CXFA_ChecksumContext;
-class CXFA_SAXContext : public CFX_Object
+class CXFA_SAXContext
{
public:
CXFA_SAXContext() : m_eNode(FX_SAXNODE_Unknown)
@@ -18,7 +18,7 @@ public:
CFX_ByteString m_bsTagName;
FX_SAXNODE m_eNode;
};
-class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler, public CFX_Object
+class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler
{
public:
CXFA_SAXReaderHandler(CXFA_ChecksumContext *pContext);
@@ -36,7 +36,7 @@ protected:
CXFA_ChecksumContext *m_pContext;
CXFA_SAXContext m_SAXContext;
};
-class CXFA_ChecksumContext : public IXFA_ChecksumContext, public CFX_Object
+class CXFA_ChecksumContext : public IXFA_ChecksumContext
{
public:
CXFA_ChecksumContext();
diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
index 9cd7fc345a..73237b9f01 100644
--- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h
@@ -6,7 +6,7 @@
#ifndef _FXFA_FORMFILLERCONFIGACC_IMP_H
#define _FXFA_FORMFILLERCONFIGACC_IMP_H
-class CXFA_FFConfigAcc : public CFX_Object
+class CXFA_FFConfigAcc
{
public:
CXFA_FFConfigAcc(CXFA_Node *pNode);
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/src/app/xfa_ffapp.h
index 8df5fcde65..82d0b95e02 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.h
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.h
@@ -6,7 +6,7 @@
#ifndef _FXFA_FORMFILLER_APP_IMP_H
#define _FXFA_FORMFILLER_APP_IMP_H
-class CXFA_FileRead : public IFX_FileRead, public CFX_Object
+class CXFA_FileRead : public IFX_FileRead
{
public:
CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*> &streams);
@@ -22,7 +22,7 @@ protected:
CFX_DWordArray m_StreamSize;
FX_DWORD m_dwSize;
};
-class CXFA_FileRead2 : public IFX_FileRead, public CFX_Object
+class CXFA_FileRead2 : public IFX_FileRead
{
public:
CXFA_FileRead2(const CFX_ArrayTemplate<CPDF_Stream*> &streams);
@@ -43,7 +43,7 @@ class CXFA_FWLTheme;
class CXFA_FFDocHandler;
class CXFA_FFMenuHandler;
class CXFA_FontMgr;
-class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative, public CFX_Object
+class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative
{
public:
CXFA_FFApp(IXFA_AppProvider* pProvider);
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h
index c11c675ea6..0f95d0b2ff 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h
@@ -15,7 +15,7 @@ typedef struct _FX_IMAGEDIB_AND_DPI {
FX_INT32 iImageXDpi;
FX_INT32 iImageYDpi;
} FX_IMAGEDIB_AND_DPI;
-class CXFA_FFDoc : public CFX_Object
+class CXFA_FFDoc
{
public:
CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider);
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
index c4c0853f12..27b5b920be 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
@@ -6,7 +6,7 @@
#ifndef _FXFA_FORMFILLER_DOCHANDLER_IMP_H
#define _FXFA_FORMFILLER_DOCHANDLER_IMP_H
-class CXFA_FFDocHandler : public IXFA_DocHandler, public CFX_Object
+class CXFA_FFDocHandler : public IXFA_DocHandler
{
public:
CXFA_FFDocHandler();
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h
index 1e73499032..2f7919bded 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h
@@ -28,7 +28,7 @@ enum XFA_DOCVIEW_LAYOUTSTATUS {
XFA_DOCVIEW_LAYOUTSTATUS_End,
XFA_DOCVIEW_LAYOUTSTATUS_Next,
};
-class CXFA_FFDocView : public IXFA_DocView, public CFX_Object
+class CXFA_FFDocView : public IXFA_DocView
{
public:
CXFA_FFDocView(CXFA_FFDoc* pDoc);
@@ -116,7 +116,7 @@ protected:
FX_INT32 m_iLock;
friend class CXFA_FFNotify;
};
-class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator, public CFX_Object
+class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator
{
public:
CXFA_FFDocWidgetIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot);
@@ -139,7 +139,7 @@ protected:
CXFA_FFDocView* m_pDocView;
CXFA_FFWidget* m_pCurWidget;
};
-class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator, public CFX_Object
+class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator
{
public:
CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot);
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h
index dd2b80ed29..a0f0820cbb 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.h
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h
@@ -6,7 +6,7 @@
#ifndef _FXFA_FFNOTIFY_H_
#define _FXFA_FFNOTIFY_H_
-class CXFA_FFNotify : public IXFA_Notify, public CFX_Object
+class CXFA_FFNotify : public IXFA_Notify
{
public:
CXFA_FFNotify(CXFA_FFDoc* pDoc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h
index 3ebe1b9d31..019c324174 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h
@@ -33,7 +33,7 @@ protected:
FX_BOOL m_bLoaded;
};
typedef CXFA_NodeIteratorTemplate<CXFA_LayoutItem, CXFA_TraverseStrategy_LayoutItem> CXFA_LayoutItemIterator;
-class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator, public CFX_Object
+class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator
{
public:
CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter);
@@ -59,7 +59,7 @@ protected:
CXFA_LayoutItemIterator m_sIterator;
};
typedef CFX_ArrayTemplate<CXFA_FFWidget*> CXFA_WidgetArray;
-class CXFA_TabParam : public CFX_Object
+class CXFA_TabParam
{
public:
CXFA_TabParam() : m_pWidget(NULL) {}
@@ -68,7 +68,7 @@ public:
CXFA_FFWidget* m_pWidget;
CXFA_WidgetArray m_Children;
};
-class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator, public CFX_Object
+class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator
{
public:
CXFA_FFTabOrderPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter);
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h
index bfac36e398..2e757238e6 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h
@@ -23,7 +23,7 @@ enum XFA_WIDGETITEM {
XFA_WIDGETITEM_NextSibling,
XFA_WIDGETITEM_PrevSibling,
};
-class CXFA_CalcData : public CFX_Object
+class CXFA_CalcData
{
public:
CXFA_CalcData() : m_iRefCount(0) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
index df9ad9f466..d51b1faabf 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
@@ -25,7 +25,7 @@ static void XFA_FFDeleteCalcData(FX_LPVOID pData)
}
}
static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADeleteCalcData = {XFA_FFDeleteCalcData, NULL};
-class CXFA_WidgetLayoutData : public CFX_Object
+class CXFA_WidgetLayoutData
{
public:
CXFA_WidgetLayoutData()
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
index 38f9678140..6c6ccea8cb 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
@@ -14,7 +14,7 @@ enum XFA_TEXTPROVIDERTYPE {
XFA_TEXTPROVIDERTYPE_Rollover,
XFA_TEXTPROVIDERTYPE_Down,
};
-class CXFA_TextProvider : public IXFA_TextProvider, public CFX_Object
+class CXFA_TextProvider : public IXFA_TextProvider
{
public:
CXFA_TextProvider(CXFA_WidgetAcc *pWidgetAcc, XFA_TEXTPROVIDERTYPE eType, CXFA_Node* pTextNode = NULL)
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
index 1d58790a02..286770a0ad 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
@@ -7,7 +7,7 @@
#ifndef _FXFA_FORMFILLER_ANNOTHANDLER_IMP_H
#define _FXFA_FORMFILLER_ANNOTHANDLER_IMP_H
class CXFA_FFDocView;
-class CXFA_FFWidgetHandler : public IXFA_WidgetHandler, public CFX_Object
+class CXFA_FFWidgetHandler : public IXFA_WidgetHandler
{
public:
CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView);
@@ -77,7 +77,7 @@ protected:
CXFA_FFDocView* m_pDocView;
};
-class CXFA_FFMenuHandler : public IXFA_MenuHandler, public CFX_Object
+class CXFA_FFMenuHandler : public IXFA_MenuHandler
{
public:
CXFA_FFMenuHandler();
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h
index b5781c4954..09e0d19096 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h
@@ -13,7 +13,7 @@ struct XFA_FONTINFO {
FX_WORD dwStyles;
FX_WORD wCodePage;
};
-class CXFA_DefFontMgr : public IXFA_FontMgr, public CFX_Object
+class CXFA_DefFontMgr : public IXFA_FontMgr
{
public:
CXFA_DefFontMgr() {}
@@ -27,7 +27,7 @@ public:
protected:
CFX_PtrArray m_CacheFonts;
};
-class CXFA_PDFFontMgr : public IFX_FontProvider, public CFX_Object
+class CXFA_PDFFontMgr : public IFX_FontProvider
{
public:
CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
@@ -42,7 +42,7 @@ protected:
CXFA_FFDoc* m_pDoc;
CFX_CMapByteStringToPtr m_FontArray;
};
-class CXFA_FontMgr : public CFX_Object
+class CXFA_FontMgr
{
public:
CXFA_FontMgr();
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h
index beb5e6abf6..34003b4eb1 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.h
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h
@@ -6,7 +6,7 @@
#ifndef _XFA_FWL_THEME_IMP_H
#define _XFA_FWL_THEME_IMP_H
-class CXFA_FWLTheme : public IFWL_ThemeProvider, public CFX_Object
+class CXFA_FWLTheme : public IFWL_ThemeProvider
{
public:
CXFA_FWLTheme(CXFA_FFApp *pApp);
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h
index f50adddec1..974f0a3492 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.h
+++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h
@@ -6,7 +6,7 @@
#ifndef _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H
#define _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H
-class CXFA_RenderContext : public IXFA_RenderContext, public CFX_Object
+class CXFA_RenderContext : public IXFA_RenderContext
{
public:
CXFA_RenderContext();
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h
index 47b37720ed..a47189cb3f 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.h
@@ -18,7 +18,7 @@ public:
virtual CXFA_FFDoc* GetDocNode() = 0;
virtual FX_BOOL GetEmbbedObj(FX_BOOL bURI, FX_BOOL bRaw, const CFX_WideString &wsAttr, CFX_WideString &wsValue) = 0;
};
-class CXFA_CSSTagProvider : public IFDE_CSSTagProvider, public CFX_Object
+class CXFA_CSSTagProvider : public IFDE_CSSTagProvider
{
public:
CXFA_CSSTagProvider ()
@@ -79,7 +79,7 @@ protected:
FX_DWORD m_dwMatchedDecls : 28;
FDE_CSSDISPLAY m_eDisplay : 4;
};
-class CXFA_TextParser : public CFX_Object
+class CXFA_TextParser
{
public:
CXFA_TextParser() : m_pAllocator(NULL), m_pSelector(NULL), m_pUASheet(NULL) {}
@@ -120,7 +120,7 @@ private:
IFDE_CSSStyleSheet *m_pUASheet;
CFX_MapPtrTemplate<IFDE_XMLNode*, CXFA_TextParseContext*> m_mapXMLNodeToParseContext;
};
-class CXFA_LoaderContext : public CFX_Object
+class CXFA_LoaderContext
{
public:
CXFA_LoaderContext() : m_bSaveLineHeight(FALSE)
@@ -278,7 +278,7 @@ struct XFA_TABSTOPS {
FX_DWORD dwAlign;
FX_FLOAT fTabstops;
};
-class CXFA_TextTabstopsContext : public CFX_Object
+class CXFA_TextTabstopsContext
{
public:
CXFA_TextTabstopsContext() : m_iTabCount(0), m_iTabIndex(-1), m_bTabstops(FALSE), m_fTabWidth(0), m_fLeft(0) {}
@@ -317,7 +317,7 @@ public:
FX_FLOAT m_fTabWidth;
FX_FLOAT m_fLeft;
};
-class CXFA_TextLayout : public CFX_Object
+class CXFA_TextLayout
{
public:
CXFA_TextLayout(IXFA_TextProvider *pTextProvider);
diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h
index 7e4ceed134..b6a3db5096 100644
--- a/xfa/src/fxfa/src/common/fxfa_localevalue.h
+++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h
@@ -18,7 +18,7 @@ class CXFA_LocaleMgr;
#define XFA_VT_DATE 32
#define XFA_VT_TIME 64
#define XFA_VT_DATETIME 128
-class CXFA_LocaleValue : public CFX_Object
+class CXFA_LocaleValue
{
public:
CXFA_LocaleValue();
diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h
index 3d6df9f199..d5aaaa9cf8 100644
--- a/xfa/src/fxfa/src/common/xfa_doclayout.h
+++ b/xfa/src/fxfa/src/common/xfa_doclayout.h
@@ -23,7 +23,7 @@ public:
CXFA_LayoutItem* GetNext() const;
CXFA_LayoutItem* GetLast() const;
};
-class CXFA_LayoutItemImpl : public CFX_Object
+class CXFA_LayoutItemImpl
{
public:
CXFA_LayoutItemImpl(CXFA_Node *pNode, FX_BOOL bIsContentLayoutItem);
diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h
index 502aa2591a..e935940c37 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/src/common/xfa_document.h
@@ -106,7 +106,7 @@ class CScript_HostPseudoModel;
class CScript_LogPseudoModel;
class CScript_LayoutPseudoModel;
class CScript_SignaturePseudoModel;
-class CXFA_Document : public IXFA_ObjFactory, public CFX_Object
+class CXFA_Document : public IXFA_ObjFactory
{
public:
CXFA_Document(IXFA_DocParser *pParser);
diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h
index f425a903fc..ff3ab3927f 100644
--- a/xfa/src/fxfa/src/common/xfa_localemgr.h
+++ b/xfa/src/fxfa/src/common/xfa_localemgr.h
@@ -25,7 +25,7 @@ class CXFA_LocaleMgr;
#define XFA_LANGID_pt_BR 0x0416
#define XFA_LANGID_nl_NL 0x0413
#define XFA_LANGID_ru_RU 0x0419
-class CXFA_LocaleMgr : public IFX_LocaleMgr, public CFX_Object
+class CXFA_LocaleMgr : public IFX_LocaleMgr
{
public:
CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid);
@@ -56,7 +56,7 @@ public:
virtual void GetTimeZone(FX_TIMEZONE& tz) = 0;
};
-class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider, public CFX_Object
+class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider
{
public:
CXFA_TimeZoneProvider();
diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h
index c285b9d902..d2b0f1df96 100644
--- a/xfa/src/fxfa/src/common/xfa_object.h
+++ b/xfa/src/fxfa/src/common/xfa_object.h
@@ -38,7 +38,7 @@ enum XFA_OBJECTTYPE {
XFA_NODEFLAG_UnusedNode = 0x08000,
XFA_NODEFLAG_LayoutGeneratedNode = 0x10000,
};
-class CXFA_Object : public CFX_Object
+class CXFA_Object
{
public:
CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags);
@@ -109,7 +109,7 @@ typedef struct _XFA_MAPDATABLOCKCALLBACKINFO {
PD_CALLBACK_FREEDATA pFree;
PD_CALLBACK_DUPLICATEDATA pCopy;
} XFA_MAPDATABLOCKCALLBACKINFO;
-typedef struct _XFA_MAPDATABLOCK : public CFX_Object {
+typedef struct _XFA_MAPDATABLOCK {
FX_LPBYTE GetData() const
{
return (FX_LPBYTE)this + sizeof(_XFA_MAPDATABLOCK);
@@ -117,7 +117,7 @@ typedef struct _XFA_MAPDATABLOCK : public CFX_Object {
XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo;
FX_INT32 iBytes;
} XFA_MAPDATABLOCK, * XFA_LPMAPDATABLOCK;
-typedef struct _XFA_MAPMODULEDATA : public CFX_Object {
+typedef struct _XFA_MAPMODULEDATA {
CFX_MapPtrToPtr m_ValueMap;
CFX_MapPtrTemplate<FX_LPVOID, XFA_LPMAPDATABLOCK> m_BufferMap;
} XFA_MAPMODULEDATA, * XFA_LPMAPMODULEDATA;
diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h
index eb3b8472d4..a61dc959b3 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/src/common/xfa_script.h
@@ -48,7 +48,7 @@ public:
}
FXJSE_HRUNTIME m_hRunTime;
};
-typedef struct _XFA_RESOLVENODE_RS : public CFX_Object {
+typedef struct _XFA_RESOLVENODE_RS {
_XFA_RESOLVENODE_RS() : dwFlags(XFA_RESOVENODE_RSTYPE_Nodes), pScriptAttribute(NULL) { }
~_XFA_RESOLVENODE_RS()
{
diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h
index df51ff6baa..c6f0c4773b 100644
--- a/xfa/src/fxfa/src/common/xfa_utils.h
+++ b/xfa/src/fxfa/src/common/xfa_utils.h
@@ -8,7 +8,7 @@
#define _XFA_UTILS_H_
FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier(IFDE_XMLElement* pNode, FX_WSTR wsQualifier, CFX_WideString& wsNamespaceURI);
template <class NodeType, class TraverseStrategy>
-class CXFA_NodeIteratorTemplate : public CFX_Object
+class CXFA_NodeIteratorTemplate
{
public:
CXFA_NodeIteratorTemplate(NodeType* pRootNode = NULL)
diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h
index 8ec0250b22..84f3917c94 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_error.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_error.h
@@ -17,7 +17,7 @@ enum XFA_FM_ERRMSG {
FMERR_EXPTECTED_OPERATOR,
FMERR_MAXIMUM
};
-class CXFA_FMErrorInfo : public CFX_Object
+class CXFA_FMErrorInfo
{
public:
CXFA_FMErrorInfo() : linenum(0) {};
diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h
index ffd7cf2442..6a51925527 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_expression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h
@@ -16,7 +16,7 @@ enum XFA_FM_EXPTYPE {
XFA_FM_EXPTYPE_BREAK,
XFA_FM_EXPTYPE_CONTINUE,
};
-class CXFA_FMExpression : public CFX_Object
+class CXFA_FMExpression
{
public:
CXFA_FMExpression(FX_DWORD line);
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
index 95451bbd7b..466050d662 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
@@ -6,7 +6,7 @@
#ifndef _XFA_FM2JS_CONTEXT_H
#define _XFA_FM2JS_CONTEXT_H
-class CXFA_FM2JSContext : public CFX_Object
+class CXFA_FM2JSContext
{
public:
static void Abs (FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Arguments &args);
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
index 06df65135f..d3adca7075 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
@@ -6,7 +6,7 @@
#ifndef _XFA_FM_PARSE_H
#define _XFA_FM_PARSE_H
-class CXFA_FMParse : public CFX_Object
+class CXFA_FMParse
{
public:
CXFA_FMParse();
diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h
index b073ceb047..3047a5028d 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h
@@ -27,7 +27,7 @@ struct XFA_FMKeyword {
FX_LPCWSTR m_keword;
};
FX_LPCWSTR XFA_FM_KeywordToString(XFA_FM_TOKEN op);
-class CXFA_FMToken : public CFX_Object
+class CXFA_FMToken
{
public:
CXFA_FMToken();
@@ -38,7 +38,7 @@ public:
FX_DWORD m_uLinenum;
CXFA_FMToken* m_pNext;
};
-class CXFA_FMLexer : public CFX_Object
+class CXFA_FMLexer
{
public:
CXFA_FMLexer(FX_WSTR wsFormcalc, CXFA_FMErrorInfo *pErrorInfo);
diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.h b/xfa/src/fxfa/src/fm2js/xfa_program.h
index a90af5e32f..157d1e1faa 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_program.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_program.h
@@ -6,7 +6,7 @@
#ifndef _XFA_FM_PROGRAM_H
#define _XFA_FM_PROGRAM_H
-class CXFA_FMProgram : public CFX_Object
+class CXFA_FMProgram
{
public:
CXFA_FMProgram();
diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
index 2a6245d348..b492b80e04 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
@@ -49,7 +49,7 @@ enum XFA_FM_AccessorIndex {
ACCESSOR_POSITIVE_INDEX,
ACCESSOR_NEGATIVE_INDEX
};
-class CXFA_FMSimpleExpression : public CFX_Object
+class CXFA_FMSimpleExpression
{
public:
CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op);
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/src/parser/xfa_basic_imp.h
index 7fced07a05..71bcbb6167 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.h
@@ -14,7 +14,7 @@ typedef struct _XFA_NOTSUREATTRIBUTE {
} XFA_NOTSUREATTRIBUTE, * XFA_LPNOTSUREATTRIBUTE;
typedef XFA_NOTSUREATTRIBUTE const * XFA_LPCNOTSUREATTRIBUTE;
XFA_LPCNOTSUREATTRIBUTE XFA_GetNotsureAttribute(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType = XFA_ATTRIBUTETYPE_NOTSURE);
-class CXFA_WideTextRead : public IFX_Stream, public CFX_Object
+class CXFA_WideTextRead : public IFX_Stream
{
public:
CXFA_WideTextRead(const CFX_WideString &wsBuffer);
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
index 178268caf9..b1c9e0bc14 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
@@ -10,7 +10,7 @@ class CXFA_ItemLayoutProcessor;
class CXFA_LayoutPageMgr;
class CXFA_LayoutAppAdapter;
class CXFA_ContainerLayoutItemImpl;
-class CXFA_LayoutProcessor : public IXFA_DocLayout, public CFX_Object
+class CXFA_LayoutProcessor : public IXFA_DocLayout
{
public:
CXFA_LayoutProcessor(CXFA_Document* pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h
index 1caf96a76c..b4548de07c 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h
@@ -6,7 +6,7 @@
#ifndef _XFA_DOCUMENT_SERIALIZE_H_
#define _XFA_DOCUMENT_SERIALIZE_H_
-class CXFA_DataImporter : public IXFA_PacketImport, public CFX_Object
+class CXFA_DataImporter : public IXFA_PacketImport
{
public:
CXFA_DataImporter(CXFA_Document *pDocument);
@@ -18,7 +18,7 @@ public:
protected:
CXFA_Document *m_pDocument;
};
-class CXFA_DataExporter : public IXFA_PacketExport, public CFX_Object
+class CXFA_DataExporter : public IXFA_PacketExport
{
public:
CXFA_DataExporter(CXFA_Document *pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
index 7844fb556f..eaa1a9b15c 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
@@ -30,7 +30,7 @@ enum XFA_ItemLayoutProcessorStages {
XFA_ItemLayoutProcessorStages_BookendTrailer,
XFA_ItemLayoutProcessorStages_Done,
};
-class CXFA_LayoutContext : public CFX_Object
+class CXFA_LayoutContext
{
public:
CXFA_LayoutContext(): m_prgSpecifiedColumnWidths(NULL)
@@ -50,7 +50,7 @@ public:
CXFA_ItemLayoutProcessor* m_pOverflowProcessor;
CXFA_Node* m_pOverflowNode;
};
-class CXFA_ItemLayoutProcessor : public CFX_Object
+class CXFA_ItemLayoutProcessor
{
public:
CXFA_ItemLayoutProcessor(CXFA_Node *pNode, CXFA_LayoutPageMgr* pPageMgr);
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
index dcaf01c739..4faf9e30db 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
@@ -6,7 +6,7 @@
#ifndef _XFA_LAYOUT_PAGEMGR_H_
#define _XFA_LAYOUT_PAGEMGR_H_
-class CXFA_ContainerRecord : public CFX_Object
+class CXFA_ContainerRecord
{
public:
CXFA_ContainerRecord(CXFA_ContainerLayoutItemImpl* pPageSet = NULL, CXFA_ContainerLayoutItemImpl* pPageArea = NULL, CXFA_ContainerLayoutItemImpl* pContentArea = NULL)
@@ -17,7 +17,7 @@ public:
CXFA_ContainerLayoutItemImpl* pCurPageArea;
CXFA_ContainerLayoutItemImpl* pCurContentArea;
};
-class CXFA_LayoutPageMgr : public CFX_Object
+class CXFA_LayoutPageMgr
{
public:
CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor);
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h
index 3f0b13a20d..ccea088741 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.h
+++ b/xfa/src/fxfa/src/parser/xfa_locale.h
@@ -6,7 +6,7 @@
#ifndef _FXFA_LOCALE_H
#define _FXFA_LOCALE_H
-class CXFA_XMLLocale : public IFX_Locale, public CFX_Object
+class CXFA_XMLLocale : public IFX_Locale
{
public:
CXFA_XMLLocale(CXML_Element* pLocaleData);
@@ -32,7 +32,7 @@ protected:
private:
CXML_Element* m_pLocaleData;
};
-class CXFA_NodeLocale : public IFX_Locale, public CFX_Object
+class CXFA_NodeLocale : public IFX_Locale
{
public:
CXFA_NodeLocale(CXFA_Node* pLocale);
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
index 789cd10a87..cdbe2ad85b 100644
--- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
@@ -2714,7 +2714,7 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes_SortNodeArrayByDocumentId
}
}
}
-struct CXFA_DualNodeArray : CFX_Object {
+struct CXFA_DualNodeArray {
CXFA_NodeSet firstNodeList;
CXFA_NodeSet secondNodeList;
};
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/src/parser/xfa_parser_imp.h
index 41b1462b94..626141a02c 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.h
@@ -8,7 +8,7 @@
#define _XFA_PARSER_IMP
#define _XFA_VERIFY_Checksum_
class CXFA_XMLParser;
-class CXFA_SimpleParser : public IXFA_Parser, public CFX_Object
+class CXFA_SimpleParser : public IXFA_Parser
{
public:
CXFA_SimpleParser(IXFA_ObjFactory *pFactory, FX_BOOL bDocumentParser = FALSE);
@@ -63,7 +63,7 @@ protected:
FX_BOOL m_bDocumentParser;
friend class CXFA_DocumentParser;
};
-class CXFA_DocumentParser : public IXFA_DocParser, public CFX_Object
+class CXFA_DocumentParser : public IXFA_DocParser
{
public:
CXFA_DocumentParser(IXFA_Notify *pNotify);
@@ -103,7 +103,7 @@ protected:
CXFA_Document* m_pDocument;
};
typedef CFX_StackTemplate<IFDE_XMLNode*> CXFA_XMLNodeStack;
-class CXFA_XMLParser : public IFDE_XMLParser, public CFX_Object
+class CXFA_XMLParser : public IFDE_XMLParser
{
public:
CXFA_XMLParser(IFDE_XMLNode *pRoot, IFX_Stream *pStream);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h
index d8aec1a2f6..9ffb8bcda0 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h
@@ -10,7 +10,7 @@
#define XFA_JSBUILTIN_Initialized 0x0001
#define XFA_JSBUILTIN_HasCount 0x0002
class CXFA_ResolveProcessor;
-class CXFA_ScriptContext : public IXFA_ScriptContext, public CFX_Object
+class CXFA_ScriptContext : public IXFA_ScriptContext
{
public:
CXFA_ScriptContext(CXFA_Document* pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
index 5b3be76803..2c3faea324 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
@@ -11,7 +11,7 @@ enum XFA_LOGIC_TYPE {
XFA_LOGIC_NoTransparent,
XFA_LOGIC_Transparent,
};
-class CXFA_NodeHelper : public CFX_Object
+class CXFA_NodeHelper
{
public:
CXFA_NodeHelper(void);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
index 08fe52ddca..3555b0a470 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
@@ -8,7 +8,7 @@
#define _XFA_RESOLVEPROCESSOR_H_
class CXFA_NodeHelper;
class CXFA_ScriptContext;
-class CXFA_ResolveNodesData : public CFX_Object
+class CXFA_ResolveNodesData
{
public:
CXFA_ResolveNodesData(CXFA_ScriptContext *pSC = NULL)
@@ -39,7 +39,7 @@ public:
XFA_LPCSCRIPTATTRIBUTEINFO m_pScriptAttribute;
XFA_RESOVENODE_RSTYPE m_dwFlag;
};
-class CXFA_ResolveProcessor : public CFX_Object
+class CXFA_ResolveProcessor
{
public:
CXFA_ResolveProcessor(void);
diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp
index 340d46dfa9..56f6cee026 100644
--- a/xfa/src/fxgraphics/src/fx_graphics.cpp
+++ b/xfa/src/fxgraphics/src/fx_graphics.cpp
@@ -6,7 +6,7 @@
#include "pre.h"
#include "fx_path_generator.h"
-class CAGG_Graphics : public CFX_Object
+class CAGG_Graphics
{
public:
CAGG_Graphics();
diff --git a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h
index 6d827b6f30..64b63852ac 100644
--- a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h
+++ b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h
@@ -6,7 +6,7 @@
#ifndef __H_FX_METAFILE_INTERPRETER__
#define __H_FX_METAFILE_INTERPRETER__
-class CFX_MetafileInterpreter : public CFX_Object
+class CFX_MetafileInterpreter
{
public:
CFX_MetafileInterpreter();
diff --git a/xfa/src/fxgraphics/src/fx_path_generator.h b/xfa/src/fxgraphics/src/fx_path_generator.h
index c1447f6c3a..4ecc90ae35 100644
--- a/xfa/src/fxgraphics/src/fx_path_generator.h
+++ b/xfa/src/fxgraphics/src/fx_path_generator.h
@@ -6,7 +6,7 @@
#ifndef __H_FX_PATH_GENERATOR__
#define __H_FX_PATH_GENERATOR__
-class CFX_PathGenerator : public CFX_Object
+class CFX_PathGenerator
{
public:
CFX_PathGenerator();
diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h
index 6a0f89fc72..26ebb91bfa 100644
--- a/xfa/src/fxjse/src/class.h
+++ b/xfa/src/fxjse/src/class.h
@@ -8,7 +8,7 @@
#define FXJSE_CLASS_H_
class CFXJSE_Context;
class CFXJSE_Value;
-class CFXJSE_Class : public CFX_Object
+class CFXJSE_Class
{
protected:
CFXJSE_Class(CFXJSE_Context* lpContext) : m_pContext(lpContext) {}
diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h
index 6579cd973a..8d3300150f 100644
--- a/xfa/src/fxjse/src/context.h
+++ b/xfa/src/fxjse/src/context.h
@@ -8,7 +8,7 @@
#define FXJSE_CONTEXT_H_
class CFXJSE_Class;
class CFXJSE_Value;
-class CFXJSE_Context : public CFX_Object
+class CFXJSE_Context
{
protected:
CFXJSE_Context(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h
index 78e891bfe4..87d540ec9b 100644
--- a/xfa/src/fxjse/src/runtime.h
+++ b/xfa/src/fxjse/src/runtime.h
@@ -7,7 +7,7 @@
#ifndef FXJSE_RUNTIME_H_
#define FXJSE_RUNTIME_H_
class CFXJSE_RuntimeList;
-class CFXJSE_RuntimeData : public CFX_Object
+class CFXJSE_RuntimeData
{
protected:
CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {};
@@ -25,7 +25,7 @@ protected:
CFXJSE_RuntimeData(const CFXJSE_RuntimeData&);
CFXJSE_RuntimeData& operator = (const CFXJSE_RuntimeData&);
};
-class CFXJSE_RuntimeList : public CFX_Object
+class CFXJSE_RuntimeList
{
public:
typedef void (*RuntimeDisposeCallback)(v8::Isolate*);
diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h
index aca23bf310..eb118fd5c6 100644
--- a/xfa/src/fxjse/src/value.h
+++ b/xfa/src/fxjse/src/value.h
@@ -7,7 +7,7 @@
#ifndef FXJSE_VALUE_H_
#define FXJSE_VALUE_H_
#include "scope_inline.h"
-class CFXJSE_Value : public CFX_Object
+class CFXJSE_Value
{
public:
CFXJSE_Value(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}