diff options
| -rw-r--r-- | compilerplugins/clang/mergeclasses.cxx | 7 | ||||
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 169 |
2 files changed, 172 insertions, 4 deletions
diff --git a/compilerplugins/clang/mergeclasses.cxx b/compilerplugins/clang/mergeclasses.cxx index b6fccfe9418f..a6c1722206ff 100644 --- a/compilerplugins/clang/mergeclasses.cxx +++ b/compilerplugins/clang/mergeclasses.cxx @@ -120,11 +120,12 @@ bool MergeClasses::VisitCXXConstructExpr( const CXXConstructExpr* pCXXConstructE if (ignoreLocation(pCXXConstructExpr)) { return true; } - const CXXConstructorDecl* pCXXConstructorDecl = pCXXConstructExpr->getConstructor(); - const CXXRecordDecl* pParentCXXRecordDecl = pCXXConstructorDecl->getParent(); - if (ignoreLocation(pParentCXXRecordDecl)) { + // ignore calls when a sub-class is constructing it's superclass + if (pCXXConstructExpr->getConstructionKind() != CXXConstructExpr::ConstructionKind::CK_Complete) { return true; } + const CXXConstructorDecl* pCXXConstructorDecl = pCXXConstructExpr->getConstructor(); + const CXXRecordDecl* pParentCXXRecordDecl = pCXXConstructorDecl->getParent(); std::string s = pParentCXXRecordDecl->getQualifiedNameAsString(); addToInstantiatedSet(s); return true; diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 95bd5daf01ac..eaf3caf258dd 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -1,14 +1,36 @@ merge (anonymous namespace)::Data with cppu::PropertySetMixinImpl::Impl +merge (anonymous namespace)::ParserData with (anonymous namespace)::Entity +merge (anonymous namespace)::RecursiveTest with (anonymous namespace)::SimpleRecursiveTest +merge (anonymous namespace)::StrEntries with (anonymous namespace)::RemoveEditAttribsHandler merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl +merge AddressWalker with AddressWalkerWriter +merge B3dTransformationSet with B3dViewport +merge B3dViewport with B3dCamera +merge BibTabPage with BibGeneralPage +merge BroadcasterHelperHolder with PluginModel +merge CGMOutAct with CGMImpressOutAct +merge CSS1Parser with SvxCSS1Parser merge CffGlobal with CffSubsetterContext +merge DIBInfoHeader with DIBV5Header +merge DbGridControl with FmGridControl +merge DdeItem with DdeGetPutItem merge DomVisitor with DomExport merge DownloadInteractionHandler with UpdateCheck +merge E3dScene with E3dPolyScene +merge E3dUndoAction with E3dRotateUndoAction merge EscherPersistTable with EscherEx merge ExcBoolRecord with Exc1904 +merge ExportTyp with ExportBiff5 merge FailTest with testMathMalformedXml +merge FillAttrLB with SvxFillAttrBox +merge FillTypeLB with SvxFillTypeBox merge FmGridListener with FmXGridPeer::GridListenerDelegator +merge FmXDisposeListener with DisposeListenerGridBridge +merge FontSelectPatternAttributes with FontSelectPattern +merge GraphiteLayout with GraphiteLayoutImpl merge GroupTable with PPTWriterBase +merge HostDetailsContainer with DavDetailsContainer merge IActionListener with UpdateCheck merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager merge IDocumentContentOperations with sw::DocumentContentOperationsManager @@ -30,6 +52,7 @@ merge IDocumentStatistics with sw::DocumentStatisticsManager merge IDocumentStylePoolAccess with sw::DocumentStylePoolManager merge IDocumentTimerAccess with sw::DocumentTimerManager merge IDocumentUndoRedo with sw::UndoManager +merge IFinishedThreadListener with ThreadListener merge IGrammarContact with SwGrammarContact merge IInterface with SwDoc merge IMailDispatcherListener with SwMailDispatcherListener_Impl @@ -39,67 +62,159 @@ merge ISwFrameControl with SwFrameMenuButtonBase merge IXFAttrList with XFSaxAttrList merge IXFStream with XFSaxStream merge IXFStyle with XFStyle +merge IconChoicePage with SvxHyperlinkTabPageBase +merge ImplEESdrWriter with ImplEscherExSdr merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstititution merge ImplPreMatchFontSubstitution with FcPreMatchSubstititution +merge LineLB with SvxLineBox +merge LineProperties with chart::ErrorBar merge LwpDLList with LwpParaProperty merge LwpDLVListHead with LwpPropList +merge LwpMarker with LwpStoryMarker +merge Mediator with PluginConnector +merge ObservableThread with SwAsyncRetrieveInputStreamThread merge OldBasicPassword with basic::SfxScriptLibraryContainer merge OpenGLDeviceInfo with X11OpenGLDeviceInfo merge OpenGLSalBitmapOp with ScaleOp +merge OpenGLSalGraphicsImpl with X11OpenGLSalGraphicsImpl merge PPTExBulletProvider with PPTWriter +merge PluginComm with UnxPluginComm +merge PluginControl_Impl with XPlugin_Impl +merge RefNode with RscTop +merge SOParagraph with ParagraphObj +merge SalData with SalGenericData merge SalInfoPrinter with PspSalInfoPrinter merge SalInstance with SalGenericInstance merge SalPrinter with PspSalPrinter merge SalSession with (anonymous namespace)::IceSalSession merge SalSystem with SalGenericSystem +merge ScBiffReader with ScQProReader +merge ScCbWarningBox with ScReplaceWarnBox +merge ScDBFunc with ScTabViewShell merge ScDPCache::DBConnector with (anonymous namespace)::DBConnector +merge ScDocFunc with ScDocFuncDirect merge ScEEAbsImport with ScEEImport +merge ScEnginePoolHelper with ScEditEngineDefaulter +merge ScMultiBlockUndo with ScUndoPaste merge ScOrcusFilters with ScOrcusFiltersImpl +merge ScOrcusXMLContext with ScOrcusXMLContextImpl merge ScRangeManagerTable::InitListener with ScNameDlg merge ScRefHandler with ScRefHdlrImplBase merge ScRefHandlerCaller with ScTPValidationValue merge ScRefHandlerHelper with ScValidationDlg merge ScSimpleEditSourceHelper with ScEditEngineTextObj +merge ScTabView with ScViewFunc +merge ScTextWnd with ScMultiTextWnd +merge ScVbaControlContainer with ScVbaButtonContainer +merge ScVbaObjectContainer with ScVbaControlContainer +merge ScViewFunc with ScDBFunc +merge SceneObject with Iris +merge SdOptionsGrid with SdOptions +merge SdOptionsZoom with SdOptions merge SdTransferable::UserData with sd::slidesorter::controller::TransferableData +merge SdUnoSearchReplaceShape with SdGenericDrawPage +merge SdrDragView with SdrCreateView +merge SdrEditView with SdrPolyEditView +merge SdrEscherImport with SdrPowerPointImport +merge SdrExchangeView with SdrDragView +merge SdrGlueEditView with SdrObjEditView +merge SdrMarkView with SdrEditView +merge SdrObjEditView with SdrExchangeView +merge SdrPaintView with SdrSnapView +merge SdrPolyEditView with SdrGlueEditView +merge SdrPowerPointImport with ImplSdPPTImport +merge SdrSnapView with SdrMarkView merge SdwTextBoxRecord with SdwTextArt merge ServerFontLayoutEngine with HbLayoutEngine +merge SfxMenuManager with SfxPopupMenuManager +merge SfxModelSubComponent with sfx2::DocumentUndoManager +merge SfxMultiFixRecordWriter with SfxMultiVarRecordWriter merge SfxSingleRecordReader with SfxMultiRecordReader +merge SfxSingleRecordWriter with SfxMultiFixRecordWriter +merge SfxWorkWindow with SfxFrameWorkWin_Impl +merge SmFontPickList with SmFontPickListBox merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl +merge StgAvlIterator with StgIterator +merge StgAvlNode with StgDirEntry +merge StgCache with StgIo merge StgReader with WW8Reader +merge StringNode with RscDefine +merge SvHashTable with SvStringHashTable merge SvListView with SvTreeListBox +merge SvXMLExportItemMapper with SwXMLTableItemMapper_Impl +merge SvXMLImportItemMapper with SwXMLImportTableItemMapper_Impl +merge SvXMLItemSetContext with SwXMLItemSetContext_Impl +merge SvxCSS1Parser with SwCSS1Parser +merge SvxListBoxControl with SvxUndoRedoControl +merge SvxRTFParser with EditRTFParser merge SvxShapeMaster with SdXShape merge SvxUnoDrawMSFactory with SvxFmMSFactory +merge SwAccessibleFrame with SwAccessibleContext +merge SwCrsrShell with SwEditShell +merge SwEditShell with SwFEShell +merge SwFEShell with SwWrtShell +merge SwImpBlocks with SwXMLTextBlocks +merge SwInterHyphInfo with SwHyphArgs +merge SwNumberTreeNode with SwNodeNum +merge SwSelPaintRects with SwShellCrsr +merge SwSidebarItem with SwAnnotationItem +merge SwTextAdjuster with SwTextCursor +merge SwTextAttrIterator with SwLanguageIterator +merge SwUnoCrsr with SwUnoTableCrsr merge SwXParaFrameEnumeration with SwXParaFrameEnumerationImpl merge SwXParagraphEnumeration with SwXParagraphEnumerationImpl merge SwXTextRanges with SwXTextRangesImpl +merge TextObj with TextObjBinary +merge TextView with ExtTextView merge UniqueIndexImpl with UniqueIndex merge UpdateCheckConfigListener with UpdateCheck merge ValueGetter with CellValueGetter merge ValueSetter with CellValueSetter merge VariableTextField with VariableDateTimeField merge Viewport3D with Camera3D +merge WW8PLCFx_Fc_FKP with WW8PLCFx_Cp_FKP +merge WW8Style with WW8RStyle +merge X11Pixmap with GdkX11Pixmap merge XFDate with XFDateStart merge XFDateTimePart with XFTimePart +merge XMLNode with XMLChildNode merge XMLTransformer with XMLTransformerBase merge XclDebugObjCounter with XclRootData +merge XclExpFutureRecord with XclExpChFutureRecordBase +merge XclExpSubStream with XclExpChart +merge XclNumFmtBuffer with XclImpNumFmtBuffer +merge _SdrItemBrowserWindow with SdrItemBrowser +merge _SfxMacroTabPage with SfxMacroTabPage merge abp::OModuleResourceClient with abp::OABSPilotUno +merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase merge accessibility::IComboListBoxHelper with VCLListBoxHelper merge basctl::docs::IDocumentDescriptorFilter with basctl::(anonymous namespace)::FilterDocuments merge basebmp::BitmapDevice with basebmp::(anonymous namespace)::BitmapRenderer +merge basegfx::InterpolatorProvider3D with basegfx::RasterConverter3D +merge bib::OComponentListener with bib::OLoadListener +merge bib::OLoadListener with bib::FormControlContainer merge cairocanvas::CanvasHelper with cairocanvas::SpriteCanvasHelper merge cairocanvas::DeviceHelper with cairocanvas::SpriteDeviceHelper merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base merge canvas::ISurfaceProxy with canvas::SurfaceProxy merge canvas::ISurfaceProxyManager with canvas::SurfaceProxyManager +merge chart::CategoryPositionHelper with chart::BarPositionHelper merge chart::ExplicitValueProvider with chart::ChartView merge chart::LegendEntryProvider with chart::VSeriesPlotter merge chart::MarkHandleProvider with chart::SelectionHelper merge chart::ResourceChangeListener with chart::ChartTypeTabPage +merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState merge comphelper::NameContainerImpl with comphelper::NameContainer +merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent +merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper +merge comphelper::OProxyAggregation with comphelper::OComponentProxyAggregationHelper merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper merge comphelper::PropertySetInfo_BASE with comphelper::PropertySetInfo merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection +merge connectivity::java_lang_Exception with connectivity::java_sql_SQLException_BASE +merge connectivity::odbc::ODBCDriver with connectivity::odbc::ORealObdcDriver merge connectivity::sdbcx::IObjectCollection with (anonymous namespace)::OHardRefMap +merge connectivity::sdbcx::OKey with connectivity::OTableKeyHelper merge cppcanvas::Bitmap with cppcanvas::internal::ImplBitmap merge cppcanvas::BitmapCanvas with cppcanvas::internal::ImplBitmapCanvas merge cppcanvas::Color with cppcanvas::internal::ImplColor @@ -107,15 +222,31 @@ merge cppcanvas::CustomSprite with cppcanvas::internal::ImplCustomSprite merge cppcanvas::Font with cppcanvas::internal::ImplFont merge cppcanvas::PolyPolygon with cppcanvas::internal::ImplPolyPolygon merge cppcanvas::Renderer with cppcanvas::internal::ImplRenderer +merge cppcanvas::SpriteCanvas with cppcanvas::internal::ImplSpriteCanvas +merge cppcanvas::internal::ImplSprite with cppcanvas::internal::ImplCustomSprite +merge cppu::OSingleFactoryHelper with cppu::OFactoryComponentHelper merge cppu::PropertySetMixinImpl with cppu::PropertySetMixin merge dbaccess::IPropertyContainer with dbaccess::OColumn merge dbaccess::IRefreshListener with dbaccess::OConnection +merge dbaccess::OColumnWrapper with dbaccess::OTableColumnDescriptorWrapper +merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream +merge dbaui::DBSubComponentController with rptui::OReportController merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId +merge dbaui::OGenericUnoController with dbaui::OApplicationController +merge dbaui::OQueryView with dbaui::OQueryDesignView +merge dbaui::OSplitterView with dbaui::OApplicationDetailView +merge dbaui::OTableRowView with dbaui::OTableEditorCtrl merge dbaui::SbaGridListener with dbaui::SbaXDataBrowserController merge dbmm::IMigrationProgress with dbmm::ProgressPage merge dbmm::IProgressConsumer with dbmm::ProgressDelegator +merge dbp::OGridPage with dbp::OGridFieldsSelection merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables +merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks +merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D +merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D +merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D +merge fileaccess::TaskManager with fileaccess::shell merge frm::ICommandDescriptionProvider with frm::DefaultCommandDescriptionProvider merge frm::ICommandImageProvider with frm::DocumentCommandImageProvider merge frm::IEngineStatusListener with frm::RichTextControlImpl @@ -124,25 +255,38 @@ merge frm::IFeatureDispatcher with frm::OFormNavigationHelper merge frm::IMultiAttributeDispatcher with frm::RichTextControl merge frm::ITextAttributeListener with frm::OAttributeDispatcher merge frm::ITextSelectionListener with frm::ORichTextPeer +merge frm::OFormComponents with frm::ODatabaseForm merge ftp::CurlInput with InsertData merge ftp::ResultSetFactory with ResultSetFactoryI +merge gio::Seekable with gio::OutputStream merge i_xml_parser_event_handler with (anonymous namespace)::recently_used_file_filter merge oglcanvas::CanvasHelper with oglcanvas::BitmapCanvasHelper merge oglcanvas::IBufferContext with oglcanvas::(anonymous namespace)::BufferContextImpl +merge old_SdrDownCompat with SdIOCompat merge oox::dump::Address with oox::dump::TokenAddress +merge oox::dump::ConstList with oox::dump::MultiList +merge oox::dump::FlagsList with oox::dump::CombiList merge oox::dump::ItemFormat with oox::dump::CombiList::ExtItemFormat +merge oox::dump::OleStreamObject with oox::dump::OleCompObjObject merge oox::formulaimport::XmlStream with oox::formulaimport::XmlStreamBuilder merge oox::ole::OleObjectInfo with oox::vml::OleObjectInfo +merge oox::ole::VbaFilterConfig with oox::ole::VbaProject +merge oox::vml::CustomShape with oox::vml::ComplexShape +merge oox::xls::BiffFragmentHandler with oox::xls::BiffWorkbookFragmentBase +merge oox::xls::BiffInputStreamPos with oox::xls::BiffInputStreamPosGuard +merge oox::xls::FunctionProvider with oox::xls::OpCodeProvider merge oox::xls::IWorksheetProgress with oox::xls::WorksheetGlobals merge pcr::(anonymous namespace)::ISQLCommandPropertyUI with pcr::(anonymous namespace)::SQLCommandPropertyUI +merge pcr::CommonBehaviourControlHelper with pcr::CommonBehaviourControl merge pcr::IButtonClickListener with pcr::OBrowserListBox -merge pcr::IModifyListener with pcr::CommonBehaviourControl merge pcr::IPropertyControlObserver with pcr::OPropertyBrowserController merge pcr::IPropertyInfoService with pcr::OPropertyInfoService merge pcr::IPropertyLineListener with pcr::OPropertyBrowserController merge pcr::ISQLCommandAdapter with pcr::(anonymous namespace)::ISQLCommandPropertyUI +merge pcr::PropertyHandler with pcr::PropertyHandlerComponent merge pcr::PropertyHandlerComponent with pcr::HandlerComponentBase merge psp::PrinterBmp with SalPrinterBmp +merge registry::tools::Options with Options_Impl merge reportdesign::ITraverseReport with rptui::NavigatorTree merge rptui::IConditionalFormatAction with rptui::ConditionalFormattingDialog merge sc::CompiledFormula with sc::opencl::DynamicKernel @@ -155,26 +299,35 @@ merge sc::opencl::RATE with sc::opencl::OpIntrate merge sc::opencl::RRI with sc::opencl::OpRRI merge sc::opencl::SumOfProduct with sc::opencl::OpSumProduct merge sc::opencl::XNPV with sc::opencl::OpXNPV +merge sd::BroadcastHelperOwner with sd::DrawController +merge sd::FuOutline with sd::FuOutlineText merge sd::IBluetoothSocket with sd::BufferedStreamSocket merge sd::ICustomAnimationListController with sd::CustomAnimationPane merge sd::sidebar::IDisposable with sd::sidebar::PanelBase merge sd::sidebar::ISidebarReceiver with sd::sidebar::PanelBase merge sd::sidebar::MasterPageContainerFiller::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation merge sd::sidebar::MasterPageContainerQueue::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation +merge sd::sidebar::PreviewValueSet with sd::sidebar::MasterPagesSelector merge sd::slidesorter::view::(anonymous namespace)::AnimatorAccess with sd::slidesorter::view::InsertAnimator::Implementation merge sd::slidesorter::view::ILayerInvalidator with sd::slidesorter::view::(anonymous namespace)::LayerInvalidator merge sdext::presenter::IPresentationTime with sdext::presenter::(anonymous namespace)::PresentationTimeLabel merge sdext::presenter::PresenterClockTimer::Listener with sdext::presenter::(anonymous namespace)::TimeLabel::Listener +merge sdext::presenter::PresenterScrollBar with sdext::presenter::PresenterVerticalScrollBar +merge sdext::presenter::PresenterSlidePreview with sdext::presenter::(anonymous namespace)::NextSlidePreview merge sdr::SelectionController with sdr::table::SvxTableController +merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveExtractor merge sdr::event::EventHandler with sdr::event::TimerEventHandler merge sdr::table::TableDesignUser with sdr::table::SdrTableObjImpl merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry merge sfx2::IXmlIdRegistrySupplier with SfxObjectShell +merge sfx::DummyWindowWrapper with sfx::DummyItemConnection merge sfx::MultiControlWrapperHelper with sfx::MultiControlWrapper +merge slideshow::internal::(anonymous namespace)::EventContainer with slideshow::internal::ClickEventHandler merge slideshow::internal::AnimatableShape with slideshow::internal::AttributableShape merge slideshow::internal::AnimationFunction with slideshow::internal::ExpressionNode merge slideshow::internal::AnimationNode with slideshow::internal::BaseNode merge slideshow::internal::AttributableShape with slideshow::internal::DrawShape +merge slideshow::internal::ClickEventHandler with slideshow::internal::SkipEffectEventHandler merge slideshow::internal::DocTreeNodeSupplier with slideshow::internal::DrawShape merge slideshow::internal::HSLColorAnimation with slideshow::internal::(anonymous namespace)::HSLWrapper merge slideshow::internal::HyperlinkArea with slideshow::internal::DrawShape @@ -191,6 +344,7 @@ merge slideshow::internal::UserPaintEventHandler with slideshow::internal::Paint merge slideshow::internal::View with slideshow::internal::UnoView merge slideshow::internal::ViewRepaintHandler with (anonymous namespace)::SlideShowImpl::SeparateListenerImpl merge slideshow::internal::ViewUpdate with slideshow::internal::ShapeManagerImpl +merge store::OStorePageBIOS with store::OStorePageManager merge svgio::svgreader::InfoProvider with svgio::svgreader::SvgNode merge svl::StyleSheetCallback with (anonymous namespace)::AddStyleSheetCallback merge svl::StyleSheetDisposer with (anonymous namespace)::StyleSheetDisposerFunctor @@ -199,6 +353,8 @@ merge svt::IEditImplementation with svt::GenericEditImplementation merge svt::IEnumerationResultHandler with SvtFileView_Impl merge svt::IFilePickerController with SvtFileDialog_Base merge svt::IFilePickerListener with SvtFilePicker +merge svt::OCommonPicker with SvtFilePicker +merge svt::StoreString with svt::StoreContentURL merge svt::table::IAccessibleTable with svt::table::TableControl merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade merge svt::table::ITableControl with svt::table::TableControl_Impl @@ -211,6 +367,7 @@ merge svx::IControllerFeatureInvalidation with FmXFormShell merge svx::IFocusObserver with svx::FmTextControlShell merge svx::IPropertyValueProvider with svx::PropertyValueProvider merge svx::ISlotInvalidator with svx::FmTextControlShell +merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript merge svxform::DispatchInterceptor with svxform::FormController merge svxform::IFormScriptingEnvironment with svxform::FormScriptingEnvironment @@ -219,8 +376,10 @@ merge sw::WriterListener with SwClient merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl merge sw::mark::IBookmark with sw::mark::Bookmark merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark +merge sw::sidebarwindows::SwSidebarWin with sw::annotation::SwAnnotationWin merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor merge tdoc_ucp::OfficeDocumentsEventListener with tdoc_ucp::ContentProvider +merge toolkit::NameContainer_Impl with toolkit::ScriptEventContainer merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper merge unographic::GraphicTransformer with unographic::Graphic merge vcl::DisplayConnectionDispatch with vcl::DisplayConnection @@ -229,15 +388,23 @@ merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThread merge vclcanvas::DeviceHelper with vclcanvas::SpriteDeviceHelper merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base merge webdav_ucp::DAVAuthListener with webdav_ucp::DAVAuthListener_Impl +merge webdav_ucp::DAVSession with webdav_ucp::NeonSession merge writerfilter::Stream with writerfilter::LoggedStream merge writerfilter::Table with writerfilter::LoggedTable merge writerfilter::dmapper::TableManager with writerfilter::dmapper::DomainMapperTableManager merge writerfilter::ooxml::OOXMLDocument with writerfilter::ooxml::OOXMLDocumentImpl +merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with writerfilter::ooxml::OOXMLFastContextHandlerMath +merge writerfilter::ooxml::OOXMLProperty with writerfilter::ooxml::OOXMLPropertyImpl merge writerfilter::ooxml::OOXMLPropertySet with writerfilter::ooxml::OOXMLPropertySetImpl merge writerfilter::ooxml::OOXMLStream with writerfilter::ooxml::OOXMLStreamImpl merge writerfilter::ooxml::OOXMLTable with writerfilter::ooxml::OOXMLTableImpl merge writerfilter::rtftok::RTFDocument with writerfilter::rtftok::RTFDocumentImpl merge ww8::WW8Struct with ww8::WW8Sttb +merge xforms::OXSDDataType with xforms::OValueLimitedType_Base merge xmloff::IEventAttacher with xmloff::OElementImport merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager merge xmloff::IFormsExportContext with xmloff::OFormLayerXMLExport_Impl +merge xmloff::OElementImport with xmloff::OControlImport +merge xmloff::OPropertyExport with xmloff::OElementExport +merge xmloff::OPropertyImport with xmloff::OElementImport +merge xmloff::OURLReferenceImport with xmloff::OButtonImport |