diff options
Diffstat (limited to 'compilerplugins')
| -rwxr-xr-x | compilerplugins/clang/mergeclasses.py | 8 | ||||
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 112 |
2 files changed, 90 insertions, 30 deletions
diff --git a/compilerplugins/clang/mergeclasses.py b/compilerplugins/clang/mergeclasses.py index c859ef8daf0d..bc6d129eeb3f 100755 --- a/compilerplugins/clang/mergeclasses.py +++ b/compilerplugins/clang/mergeclasses.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import sys @@ -56,7 +56,7 @@ def extractModuleName(clazz): with open("compilerplugins/clang/mergeclasses.results", "wt") as f: # loop over defined, but not instantiated classes for clazz in sorted(definitionSet - instantiatedSet): - if clazz == "svl::IUndoManager": print parentChildDict[clazz] + if clazz == "svl::IUndoManager": print(parentChildDict[clazz]) # ignore classes without any children, and classes with more than one child if (clazz not in parentChildDict) or (len(parentChildDict[clazz]) != 1): continue @@ -69,8 +69,8 @@ with open("compilerplugins/clang/mergeclasses.results", "wt") as f: if ("mutex" in clazz) or ("Mutex" in clazz): continue otherclazz = next(iter(parentChildDict[clazz])) - if clazz == "svl::IUndoManager": print extractModuleName(clazz) - if otherclazz == "svl::IUndoManager": print extractModuleName(otherclazz) + if clazz == "svl::IUndoManager": print(extractModuleName(clazz)) + if otherclazz == "svl::IUndoManager": print(extractModuleName(otherclazz)) # exclude combinations that span modules because we often use those to make cross-module dependencies more manageable. if extractModuleName(clazz) != extractModuleName(otherclazz): continue diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index c0fd80c1fb17..e5076145b74d 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -1,6 +1,7 @@ merge (anonymous namespace)::Base2 with (anonymous namespace)::Derived merge (anonymous namespace)::Base3 with (anonymous namespace)::Derived merge (anonymous namespace)::BasePixelPtr with (anonymous namespace)::TrueColorPixelPtr +merge (anonymous namespace)::BuiltinPropertyGetSetHelper with (anonymous namespace)::CustomPropertyGetSetHelper merge (anonymous namespace)::C2 with (anonymous namespace)::C3 merge (anonymous namespace)::C3 with (anonymous namespace)::C4 merge (anonymous namespace)::C4 with (anonymous namespace)::C5 @@ -9,9 +10,11 @@ merge (anonymous namespace)::Char1 with (anonymous namespace)::Char2 merge (anonymous namespace)::Char2 with (anonymous namespace)::Char3 merge (anonymous namespace)::DIBInfoHeader with (anonymous namespace)::DIBV5Header merge (anonymous namespace)::DomVisitor with (anonymous namespace)::DomExport +merge (anonymous namespace)::GtkInstanceCheckButton with (anonymous namespace)::GtkInstanceRadioButton merge (anonymous namespace)::N with (anonymous namespace)::P merge (anonymous namespace)::O with (anonymous namespace)::O2 merge (anonymous namespace)::ParserData with (anonymous namespace)::Entity +merge (anonymous namespace)::PopupMenuToolbarController with (anonymous namespace)::GenericPopupToolbarController merge (anonymous namespace)::PublishableDescription with cppu::ImplInheritanceHelper merge (anonymous namespace)::RecursiveTest with (anonymous namespace)::SimpleRecursiveTest merge (anonymous namespace)::ReflectionTransition with (anonymous namespace)::RochadeTransition @@ -22,27 +25,38 @@ merge (anonymous namespace)::StrEntries with (anonymous namespace)::RemoveEditAt merge (anonymous namespace)::VariableTextField with (anonymous namespace)::VariableDateTimeField merge (anonymous namespace)::empty with (anonymous namespace)::second merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl +merge AbstractSmParser with SmParser5 merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl +merge AbstractTabController_Impl with AbstractApplyTabController_Impl merge AddressWalker with AddressWalkerWriter merge AutoIdle with (anonymous namespace)::TestAutoIdleRR merge B3dTransformationSet with B3dViewport merge B3dViewport with B3dCamera +merge BaseJSWidget with JSWidget merge BitmapConvolutionMatrixFilter with BitmapSharpenFilter +merge BrowseBox with svt::EditBrowseBox +merge BrowserHeader with svt::EditBrowserHeader merge CSS1Parser with SvxCSS1Parser +merge DateField with CalendarField merge DbGridControl with FmGridControl merge DdeItem with DdeGetPutItem merge DdeLink with DdeHotLink +merge E3DObjGeoData with E3DSceneGeoData merge E3dUndoAction with E3dRotateUndoAction +merge EditTextObject with EditTextObjectImpl merge ErrorInfo with DynamicErrorInfo merge EscherPersistTable with EscherEx merge ExcBoolRecord with Exc1904 merge ExcelConverterBase with ExcelToSc merge ExportTyp with ExportBiff5 -merge FailTest with testMathMalformedXml merge FmGridListener with FmXGridPeer::GridListenerDelegator +merge FmRecordCountListener_Base with FmRecordCountListener merge FmXDisposeListener with DisposeListenerGridBridge merge FmXFormShell_Base_Disambiguation with FmXFormShell merge GLWindow with GLX11Window +merge GalleryFileStorage with GalleryBinaryEngine +merge GalleryFileStorageEntry with GalleryBinaryEngineEntry +merge GalleryStorageLocations with GalleryBinaryStorageLocations merge GroupTable with PPTWriterBase merge HostDetailsContainer with DavDetailsContainer merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager @@ -69,22 +83,22 @@ merge IFinishedThreadListener with ThreadListener merge IGrammarContact with (anonymous namespace)::SwGrammarContact merge IStyleAccess with (anonymous namespace)::SwStyleManager merge IStylePoolIteratorAccess with (anonymous namespace)::Iterator -merge ISwFrameControl with SwFrameMenuButtonBase merge IXFAttrList with XFSaxAttrList merge IXFStream with XFSaxStream merge IXFStyle with XFStyle merge IconChoicePage with SvxHyperlinkTabPageBase merge ImplGlyphFallbackFontSubstitution with (anonymous namespace)::FcGlyphFallbackSubstitution merge ImplPreMatchFontSubstitution with (anonymous namespace)::FcPreMatchSubstitution +merge ListView with TemplateDlgLocalView +merge LongCurrencyFormatter with LongCurrencyBox merge LotusConverterBase with LotusToSc merge LwpDLVListHead with LwpPropList merge LwpMarker with LwpStoryMarker merge ObservableThread with SwAsyncRetrieveInputStreamThread merge OldBasicPassword with basic::SfxScriptLibraryContainer merge OpenGLDeviceInfo with X11OpenGLDeviceInfo -merge OpenGLSalGraphicsImpl with X11OpenGLSalGraphicsImpl merge PPTExBulletProvider with PPTWriter -merge PreviewControl3D with LightControl3D +merge PriorityHBox with PriorityMergedHBox merge PropertyAccessorBase with GenericPropertyAccessor merge PropertyWrapperBase with PropertyWrapper merge SOParagraph with ParagraphObj @@ -92,15 +106,31 @@ merge SalData with GenericUnixSalData merge SalDisplay with SalX11Display merge SalInfoPrinter with PspSalInfoPrinter merge SalInstance with SalGenericInstance +merge SalInstanceBox with JSWidget +merge SalInstanceCheckButton with JSWidget +merge SalInstanceComboBoxWithEdit with JSWidget +merge SalInstanceComboBoxWithoutEdit with JSWidget +merge SalInstanceDrawingArea with JSWidget +merge SalInstanceExpander with JSWidget +merge SalInstanceIconView with JSWidget +merge SalInstanceLabel with JSWidget +merge SalInstanceNotebook with JSWidget +merge SalInstanceRadioButton with JSWidget +merge SalInstanceSpinButton with JSWidget +merge SalInstanceTextView with JSWidget +merge SalInstanceToolbar with JSWidget +merge SalInstanceTreeView with JSWidget merge SalPrinter with PspSalPrinter merge SalSession with (anonymous namespace)::IceSalSession merge SalSystem with SalGenericSystem merge ScAccessibleTableBase with ScAccessibleSpreadsheet +merge ScAsyncTabController with ScAsyncTabController_Impl merge ScDBDataContainerBase with ScDBCollection::NamedDBs merge ScDBFunc with ScTabViewShell merge ScDPCache::DBConnector with (anonymous namespace)::DBConnector merge ScDocFunc with ScDocFuncDirect merge ScEEAbsImport with ScEEImport +merge ScEEParseEntry with ScHTMLEntry merge ScEnginePoolHelper with ScEditEngineDefaulter merge ScFormatFilterPlugin with ScFormatFilterPluginImpl merge ScMultiBlockUndo with ScUndoPaste @@ -115,6 +145,7 @@ merge ScVbaGraphicObjectsBase with ScVbaButtons merge ScVbaObjectContainer with (anonymous namespace)::ScVbaControlContainer merge ScViewFunc with ScDBFunc merge SceneObject with (anonymous namespace)::Iris +merge SdNavigatorWin with sd::sidebar::NavigatorWrapper merge SdOptionsContents with SdOptions merge SdOptionsGrid with SdOptions merge SdOptionsZoom with SdOptions @@ -146,17 +177,21 @@ merge StarSymbolToMSMultiFont with (anonymous namespace)::StarSymbolToMSMultiFon merge StgAvlIterator with StgIterator merge StgAvlNode with StgDirEntry merge StgCache with StgIo +merge StylesPreviewWindow_Base with StylesPreviewWindow_Impl +merge SvHeaderTabListBox with LclHeaderTabListBox merge SvIdlDataBase with SvIdlWorkingBase merge SvListView with SvTreeListBox merge SvXMLExportItemMapper with (anonymous namespace)::SwXMLTableItemMapper_Impl merge SvXMLImportItemMapper with (anonymous namespace)::SwXMLImportTableItemMapper_Impl -merge SvXMLItemSetContext with (anonymous namespace)::SwXMLItemSetContext_Impl merge SvxAreaTabPage with SvxBkgTabPage merge SvxCSS1Parser with SwCSS1Parser merge SvxLanguageItem_Base with SvxLanguageItem +merge SvxRTFItemStackType with MakeUniqueEnabler merge SvxRTFParser with EditRTFParser +merge SvxVertCTLTextTbxCtrl_Base with SvxVertCTLTextTbxCtrl merge SwAccessibleFrame with SwAccessibleContext merge SwCursorShell with SwEditShell +merge SwDashedLine with (anonymous namespace)::SwBreakDashedLine merge SwDrawModeGrf_Base with SwDrawModeGrf merge SwEditShell with SwFEShell merge SwEndNoteOptionPage with SwFootNoteOptionPage @@ -174,35 +209,34 @@ merge SwXParaFrameEnumeration with (anonymous namespace)::SwXParaFrameEnumeratio merge SwXParagraphEnumeration with (anonymous namespace)::SwXParagraphEnumerationImpl merge SwXTextRanges with (anonymous namespace)::SwXTextRangesImpl merge Task with Timer -merge TemplateLocalView with TemplateDefaultView merge TestShape with (anonymous namespace)::ImplTestShape merge TestView with (anonymous namespace)::ImplTestView merge TextObj with TextObjBinary -merge TextRenderImpl with CairoTextRender -merge TxtExportTest with testBullets -merge TxtImportTest with testTdf112191 -merge VCLXTopWindow_Base with VCLXTopWindow +merge TextRenderImpl with FreeTypeTextRenderImpl +merge TxtEncExportHiddenTest with testBulletsHidden +merge TxtEncExportNotHiddenTest with testBulletsNotHidden merge ValueGetter with (anonymous namespace)::CellValueGetter merge ValueSetter with (anonymous namespace)::CellValueSetter +merge VclVButtonBox with (anonymous namespace)::LeakTestClass merge Viewport3D with Camera3D merge WW8PLCFx_Fc_FKP with WW8PLCFx_Cp_FKP merge WW8Style with WW8RStyle merge XFDate with XFDateStart merge XFDateTimePart with XFTimePart -merge XHtmlExportTest with testImageEmbedding merge XMLNode with XMLChildNode merge XMLTransformer with XMLTransformerBase merge XclDebugObjCounter with XclRootData merge XclExpChFutureRecordBase with XclExpChFrLabelProps merge XclExpFutureRecord with XclExpChFutureRecordBase +merge XclExpObjectManager with XclExpEmbeddedObjectManager merge XclExpSubStream with XclExpChart merge XclImpCachedValue with (anonymous namespace)::XclImpCrn +merge XclImpCheckBoxObj with XclImpOptionButtonObj merge XclNumFmtBuffer with XclImpNumFmtBuffer merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase merge accessibility::IComboListBoxHelper with VCLListBoxHelper -merge accessibility::ListBoxAccessibleBase with accessibility::AccessibleListBoxEntry merge animcore::(anonymous namespace)::AnimationNodeBase with animcore::(anonymous namespace)::AnimationNode -merge avmedia::ThreadHelpBase with avmedia::SoundHandler +merge basctl::Entry with basctl::DocumentEntry merge basctl::docs::IDocumentDescriptorFilter with basctl::(anonymous namespace)::FilterDocuments merge basegfx::InterpolatorProvider3D with basegfx::RasterConverter3D merge basegfx::trapezoidhelper::(anonymous namespace)::TrDeSimpleEdge with basegfx::trapezoidhelper::(anonymous namespace)::TrDeEdgeEntry @@ -223,6 +257,7 @@ merge chart::MarkHandleProvider with chart::SelectionHelper merge chart::wrapper::ChartDocumentWrapper_Base with chart::wrapper::ChartDocumentWrapper merge comphelper::ChainablePropertySetInfo_Base with comphelper::ChainablePropertySetInfo merge comphelper::ConfigurationListenerPropertyBase with comphelper::ConfigurationListenerProperty +merge comphelper::ConfigurationListener_Base with comphelper::ConfigurationListener merge comphelper::MasterPropertySetInfo_Base with comphelper::MasterPropertySetInfo merge comphelper::OAccessibleComponentHelper_Base with comphelper::OAccessibleComponentHelper merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent @@ -230,11 +265,14 @@ merge comphelper::OAccessibleWrapper_Base with comphelper::OAccessibleWrapper merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper merge comphelper::OContainerListenerAdapter_Base with comphelper::OContainerListenerAdapter +merge comphelper::OPropertyChangeMultiplexer_Base with comphelper::OPropertyChangeMultiplexer merge comphelper::OProxyAggregation with comphelper::OComponentProxyAggregationHelper merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper merge comphelper::OSequenceOutputStream_Base with comphelper::OSequenceOutputStream merge comphelper::OWeakListenerAdapterBase with comphelper::OWeakListenerAdapter merge comphelper::PropertySetInfo_BASE with comphelper::PropertySetInfo +merge comphelper::TraceEvent with comphelper::NamedEvent +merge connectivity::OKeySet_Base with connectivity::OKeySet merge connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper with connectivity::evoab::(anonymous namespace)::OEvoabVersion38Helper merge connectivity::file::OStatement_Base with connectivity::file::OStatement_BASE2 merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection @@ -256,13 +294,16 @@ 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::OComponentDefinition_Impl with dbaccess::OCommandDefinition_Impl merge dbahsql::AlterStmtParser with dbahsql::FbAlterStmtParser merge dbahsql::CreateStmtParser with dbahsql::FbCreateStmtParser merge dbaui::IController with dbaui::OGenericUnoController merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper +merge dbaui::OGenericUnoController with dbaui::OApplicationController merge dbaui::OSQLNameEntry with dbaui::OPropColumnEditCtrl merge dbaui::OTableRowView with dbaui::OTableEditorCtrl +merge dbaui::OTableWindowData with dbaui::OQueryTableWindowData merge dbaui::SbaGridListener with dbaui::SbaXDataBrowserController merge dbp::OGridPage with dbp::OGridFieldsSelection merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables @@ -270,12 +311,11 @@ 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 drawinglayer::texture::GeoTexSvxBitmapEx with drawinglayer::texture::GeoTexSvxBitmapExTiled merge fileaccess::Notifier with fileaccess::BaseContent merge framework::OReadStatusBarDocumentHandler_Base with framework::OReadStatusBarDocumentHandler merge framework::OReadToolBoxDocumentHandler_Base with framework::OReadToolBoxDocumentHandler merge framework::SaxNamespaceFilter_Base with framework::SaxNamespaceFilter -merge framework::TransactionBase with framework::Desktop -merge frm::ICommandImageProvider with frm::(anonymous namespace)::DocumentCommandImageProvider merge frm::IEngineStatusListener with frm::RichTextControlImpl merge frm::IEngineTextChangeListener with frm::ORichTextModel merge frm::IFeatureDispatcher with frm::OFormNavigationHelper @@ -293,18 +333,23 @@ merge old_SdrDownCompat with SdIOCompat merge oox::SequenceSeekableStream with oox::SequenceInputStream merge oox::core::FilterBase with oox::core::XmlFilterBase merge oox::drawingml::LayoutAtomVisitor with oox::drawingml::LayoutAtomVisitorBase +merge oox::drawingml::TextRun with oox::drawingml::TextField +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::dump::OutputObjectBase with oox::dump::InputObjectBase merge oox::dump::RecordObjectBase with oox::dump::SequenceRecordObjectBase merge oox::formulaimport::XmlStream with oox::formulaimport::XmlStreamBuilder +merge oox::ole::AxListBoxModel with oox::ole::HtmlSelectModel +merge oox::ole::AxTextBoxModel with oox::ole::HtmlTextBoxModel merge oox::ole::VbaFilterConfig with oox::ole::VbaProject merge oox::vml::CustomShape with oox::vml::ComplexShape +merge oox::vml::ShapeType with oox::vml::ShapeBase merge oox::xls::FormulaParserImpl with oox::xls::(anonymous namespace)::OoxFormulaParserImpl merge oox::xls::FormulaProcessorBase with oox::xls::FormulaParser merge oox::xls::FunctionProvider with oox::xls::OpCodeProvider merge oox::xls::IWorksheetProgress with oox::xls::WorksheetGlobals -merge oox::xls::SheetDataContextBase with oox::xls::SheetDataContext merge pcr::(anonymous namespace)::BroadcastHelperBase with pcr::(anonymous namespace)::ShapeGeometryChangeNotifier merge pcr::(anonymous namespace)::ISQLCommandPropertyUI with pcr::(anonymous namespace)::SQLCommandPropertyUI merge pcr::CommonBehaviourControlHelper with pcr::CommonBehaviourControl @@ -314,12 +359,13 @@ 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::(anonymous namespace)::Ascii85Encoder with psp::(anonymous namespace)::LZWEncoder merge psp::PrinterBmp with (anonymous namespace)::SalPrinterBmp merge registry::tools::Options with (anonymous namespace)::Options_Impl merge reportdesign::ITraverseReport with rptui::(anonymous namespace)::NavigatorTree +merge rptui::AnyConverter with rptui::(anonymous namespace)::ParaAdjust merge rptui::IConditionalFormatAction with rptui::ConditionalFormattingDialog +merge sax_fastparser::FastSaxSerializer::ForMerge with sax_fastparser::FastSaxSerializer::ForSort merge sax_fastparser::ForMergeBase with sax_fastparser::FastSaxSerializer::ForMerge merge sc::CompiledFormula with sc::opencl::(anonymous namespace)::DynamicKernel merge sc::FormulaGroupInterpreter with sc::opencl::FormulaGroupInterpreterOpenCL @@ -333,16 +379,14 @@ merge sc::opencl::PriceMat with sc::opencl::OpPriceMat merge sc::opencl::RATE with sc::opencl::OpIntrate merge sc::opencl::RRI with sc::opencl::OpRRI merge sc::opencl::XNPV with sc::opencl::OpXNPV +merge sc_apitest::(anonymous namespace)::TempFileBase with sc_apitest::ScDDELinkObj merge sd::BroadcastHelperOwner with sd::DrawController merge sd::ClientInfo with sd::ClientInfoInternal merge sd::IBluetoothSocket with sd::BufferedStreamSocket merge sd::ICustomAnimationListController with sd::CustomAnimationPane merge sd::ZeroconfService with sd::AvahiNetworkService -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 @@ -359,6 +403,7 @@ merge slideshow::internal::AnimationFunction with slideshow::internal::Expressio merge slideshow::internal::AnimationNode with slideshow::internal::BaseNode merge slideshow::internal::AttributableShape with slideshow::internal::DrawShape merge slideshow::internal::BoolAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation +merge slideshow::internal::ClickEventHandler with slideshow::internal::SkipEffectEventHandler merge slideshow::internal::ColorAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation merge slideshow::internal::ContinuousKeyTimeActivityBase with slideshow::internal::(anonymous namespace)::ValuesActivity merge slideshow::internal::DocTreeNodeSupplier with slideshow::internal::DrawShape @@ -374,21 +419,24 @@ merge slideshow::internal::ScreenUpdater::UpdateLock with (anonymous namespace): merge slideshow::internal::ShapeListenerEventHandler with slideshow::internal::ShapeManagerImpl merge slideshow::internal::ShapeManager with slideshow::internal::SubsettableShapeManager merge slideshow::internal::Slide with slideshow::internal::(anonymous namespace)::SlideImpl +merge slideshow::internal::SnakeWipe with slideshow::internal::ParallelSnakesWipe +merge slideshow::internal::SpiralWipe with slideshow::internal::BoxSnakesWipe merge slideshow::internal::StringAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation merge slideshow::internal::SubsettableShapeManager with slideshow::internal::ShapeManagerImpl merge slideshow::internal::UserPaintEventHandler with slideshow::internal::PaintOverlayHandler 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 slideshow::internal::ZigZagWipe with slideshow::internal::BarnZigZagWipe merge store::OStorePageBIOS with store::OStorePageManager -merge svgio::svgreader::InfoProvider with svgio::svgreader::SvgNode merge svgio::svgreader::Visitor with svgio::svgreader::SvgDrawVisitor merge svl::StyleSheetCallback with (anonymous namespace)::AddStyleSheetCallback merge svl::StyleSheetDisposer with (anonymous namespace)::StyleSheetDisposerFunctor -merge svt::IEditImplementation with svt::GenericEditImplementation +merge svt::FrameStatusListener with (anonymous namespace)::ToolbarPopupStatusListener merge svt::IEnumerationResultHandler with SvtFileView_Impl merge svt::IFilePickerController with SvtFileDialog_Base merge svt::IFilePickerListener with SvtFilePicker +merge svt::PopupWindowController_Base with svt::PopupWindowController merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade merge svt::table::ITableControl with svt::table::TableControl_Impl merge svt::table::ITableDataSort with svt::table::UnoControlTableModel @@ -402,10 +450,11 @@ merge svx::IPropertyValueProvider with svx::PropertyValueProvider merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel merge svxform::DispatchInterceptor with svxform::FormController -merge svxform::IFormScriptingEnvironment with svxform::(anonymous namespace)::FormScriptingEnvironment merge sw::ClientIteratorBase with SwIterator merge sw::ICoreFrameStyle with (anonymous namespace)::SwXFrameStyle merge sw::IShellCursorSupplier with SwCursorShell +merge sw::Meta with sw::MetaField +merge sw::ModelTraverseHandler with sw::(anonymous namespace)::IndexingNodeHandler merge sw::WriterListener with SwClient merge sw::mark::Bookmark with sw::mark::CrossRefBookmark merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl @@ -415,21 +464,31 @@ merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark merge sw::mark::IDateFieldmark with sw::mark::DateFieldmark merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor merge testHFBase with testHFLinkToPrev -merge treeview::ExtensionIteratorBase with treeview::TreeFileIterator merge ucbhelper::ActiveDataSink_Base with ucbhelper::ActiveDataSink merge ucbhelper::CommandEnvironment_Base with ucbhelper::CommandEnvironment -merge unographic::GraphicTransformer with unographic::Graphic +merge ucbhelper::InterceptedInteraction_Base with ucbhelper::InterceptedInteraction merge utl::OInputStreamWrapper_Base with utl::OInputStreamWrapper merge vcl::DeletionNotifier with SalFrame merge vcl::ExtOutDevData with vcl::PDFExtOutDevData -merge vcl::IMnemonicEntryList with SvTreeListBox merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThreadExecutor +merge vcl::SwapFile with ImpSwapFile +merge vcl::pdf::PDFium with vcl::pdf::(anonymous namespace)::PDFiumImpl +merge vcl::pdf::PDFiumAnnotation with vcl::pdf::(anonymous namespace)::PDFiumAnnotationImpl +merge vcl::pdf::PDFiumBitmap with vcl::pdf::(anonymous namespace)::PDFiumBitmapImpl +merge vcl::pdf::PDFiumDocument with vcl::pdf::(anonymous namespace)::PDFiumDocumentImpl +merge vcl::pdf::PDFiumPage with vcl::pdf::(anonymous namespace)::PDFiumPageImpl +merge vcl::pdf::PDFiumPageObject with vcl::pdf::(anonymous namespace)::PDFiumPageObjectImpl +merge vcl::pdf::PDFiumPathSegment with vcl::pdf::(anonymous namespace)::PDFiumPathSegmentImpl +merge vcl::pdf::PDFiumSearchHandle with vcl::pdf::(anonymous namespace)::PDFiumSearchHandleImpl +merge vcl::pdf::PDFiumSignature with vcl::pdf::(anonymous namespace)::PDFiumSignatureImpl +merge vcl::pdf::PDFiumTextPage with vcl::pdf::(anonymous namespace)::PDFiumTextPageImpl merge vclcanvas::CanvasCustomSpriteSpriteBase_Base with canvas::CanvasBase merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base merge vclcanvas::SpriteCanvasBaseSpriteSurface_Base with canvas::CanvasBase merge webdav_ucp::DAVAuthListener with webdav_ucp::DAVAuthListener_Impl merge webdav_ucp::DAVSession with webdav_ucp::NeonSession merge weld::AssistantController with vcl::WizardMachine +merge weld::WidgetStatusListener_Base with weld::WidgetStatusListener merge writerfilter::Stream with writerfilter::LoggedStream merge writerfilter::Table with writerfilter::LoggedTable merge writerfilter::dmapper::TableManager with writerfilter::dmapper::DomainMapperTableManager @@ -438,6 +497,7 @@ merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with writerfilter::ooxm merge writerfilter::ooxml::OOXMLStream with writerfilter::ooxml::OOXMLStreamImpl merge writerfilter::ooxml::OOXMLUniversalMeasureValue with writerfilter::ooxml::OOXMLNthPtMeasureValue merge writerfilter::rtftok::RTFDocument with writerfilter::rtftok::RTFDocumentImpl +merge ww8::WW8Struct with ww8::WW8Sttb merge xforms::OValueLimitedType_Base with xforms::OValueLimitedType merge xmloff::IEventAttacher with xmloff::OElementImport merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager |