1 merge (anonymous namespace)::C2 with (anonymous namespace)::C3
2 merge (anonymous namespace)::C3 with (anonymous namespace)::C4
3 merge (anonymous namespace)::C4 with (anonymous namespace)::C5
4 merge (anonymous namespace)::Char1 with (anonymous namespace)::Char2
5 merge (anonymous namespace)::Char2 with (anonymous namespace)::Char3
6 merge (anonymous namespace)::DIBInfoHeader with (anonymous namespace)::DIBV5Header
7 merge (anonymous namespace)::Data with cppu::PropertySetMixinImpl::Impl
8 merge (anonymous namespace)::N with (anonymous namespace)::P
9 merge (anonymous namespace)::O with (anonymous namespace)::O2
10 merge (anonymous namespace)::ParserData with (anonymous namespace)::Entity
11 merge (anonymous namespace)::PublishableDescription with cppu::ImplInheritanceHelper1
12 merge (anonymous namespace)::RecursiveTest with (anonymous namespace)::SimpleRecursiveTest
13 merge (anonymous namespace)::ReflectionTransition with (anonymous namespace)::RochadeTransition
14 merge (anonymous namespace)::SimpleTransition with (anonymous namespace)::DiamondTransition
15 merge (anonymous namespace)::StrEntries with (anonymous namespace)::RemoveEditAttribsHandler
16 merge (anonymous namespace)::empty with (anonymous namespace)::second
17 merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl
18 merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl
19 merge AddressWalker with AddressWalkerWriter
20 merge B3dTransformationSet with B3dViewport
21 merge B3dViewport with B3dCamera
22 merge CSS1Parser with SvxCSS1Parser
23 merge CffGlobal with CffSubsetterContext
24 merge DbGridControl with FmGridControl
25 merge DdeItem with DdeGetPutItem
26 merge DdeLink with DdeHotLink
27 merge DomVisitor with DomExport
28 merge E3dScene with E3dPolyScene
29 merge E3dUndoAction with E3dRotateUndoAction
30 merge EscherPersistTable with EscherEx
31 merge ExcBoolRecord with Exc1904
32 merge ExportTyp with ExportBiff5
33 merge FailTest with testMathMalformedXml
34 merge FillAttrLB with SvxFillAttrBox
35 merge FillTypeLB with SvxFillTypeBox
36 merge FmGridListener with FmXGridPeer::GridListenerDelegator
37 merge FmXDisposeListener with DisposeListenerGridBridge
38 merge FontSelectPatternAttributes with FontSelectPattern
39 merge GLWindow with GLX11Window
40 merge GraphiteLayout with GraphiteLayoutImpl
41 merge GroupTable with PPTWriterBase
42 merge HostDetailsContainer with DavDetailsContainer
43 merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager
44 merge IDocumentContentOperations with sw::DocumentContentOperationsManager
45 merge IDocumentDeviceAccess with sw::DocumentDeviceManager
46 merge IDocumentDrawModelAccess with sw::DocumentDrawModelManager
47 merge IDocumentExternalData with sw::DocumentExternalDataManager
48 merge IDocumentFieldsAccess with sw::DocumentFieldsManager
49 merge IDocumentLayoutAccess with sw::DocumentLayoutManager
50 merge IDocumentLinksAdministration with sw::DocumentLinksAdministrationManager
51 merge IDocumentListItems with sw::DocumentListItemsManager
52 merge IDocumentListsAccess with sw::DocumentListsManager
53 merge IDocumentMarkAccess with sw::mark::MarkManager
54 merge IDocumentMarkAccess::ILazyDeleter with sw::mark::LazyFieldmarkDeleter
55 merge IDocumentOutlineNodes with sw::DocumentOutlineNodesManager
56 merge IDocumentRedlineAccess with sw::DocumentRedlineManager
57 merge IDocumentSettingAccess with sw::DocumentSettingManager
58 merge IDocumentState with sw::DocumentStateManager
59 merge IDocumentStatistics with sw::DocumentStatisticsManager
60 merge IDocumentStylePoolAccess with sw::DocumentStylePoolManager
61 merge IDocumentTimerAccess with sw::DocumentTimerManager
62 merge IDocumentUndoRedo with sw::UndoManager
63 merge IFinishedThreadListener with ThreadListener
64 merge IGrammarContact with SwGrammarContact
65 merge IInterface with SwDoc
66 merge IMailDispatcherListener with SwMailDispatcherListener_Impl
67 merge IStyleAccess with SwStyleManager
68 merge IStylePoolIteratorAccess with (anonymous namespace)::Iterator
69 merge ISwFrameControl with SwFrameMenuButtonBase
70 merge IXFAttrList with XFSaxAttrList
71 merge IXFStream with XFSaxStream
72 merge IXFStyle with XFStyle
73 merge IconChoicePage with SvxHyperlinkTabPageBase
74 merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstitution
75 merge ImplPreMatchFontSubstitution with FcPreMatchSubstitution
76 merge LwpDLList with LwpParaProperty
77 merge LwpDLVListHead with LwpPropList
78 merge LwpMarker with LwpStoryMarker
79 merge ObservableThread with SwAsyncRetrieveInputStreamThread
80 merge OldBasicPassword with basic::SfxScriptLibraryContainer
81 merge OpenGLDeviceInfo with X11OpenGLDeviceInfo
82 merge OpenGLSalGraphicsImpl with X11OpenGLSalGraphicsImpl
83 merge PPTExBulletProvider with PPTWriter
84 merge RefNode with RscTop
85 merge SOParagraph with ParagraphObj
86 merge SalData with SalGenericData
87 merge SalInfoPrinter with PspSalInfoPrinter
88 merge SalInstance with SalGenericInstance
89 merge SalMenu with GtkSalMenu
90 merge SalMenuItem with GtkSalMenuItem
91 merge SalPrinter with PspSalPrinter
92 merge SalSession with (anonymous namespace)::IceSalSession
93 merge SalSystem with SalGenericSystem
94 merge ScBiffReader with ScQProReader
95 merge ScDBFunc with ScTabViewShell
96 merge ScDPCache::DBConnector with (anonymous namespace)::DBConnector
97 merge ScDocFunc with ScDocFuncDirect
98 merge ScEEAbsImport with ScEEImport
99 merge ScEnginePoolHelper with ScEditEngineDefaulter
100 merge ScMultiBlockUndo with ScUndoPaste
101 merge ScOrcusFilters with ScOrcusFiltersImpl
102 merge ScOrcusXMLContext with ScOrcusXMLContextImpl
103 merge ScRangeManagerTable::InitListener with ScNameDlg
104 merge ScRefHandler with ScRefHdlrImplBase
105 merge ScRefHandlerCaller with ScTPValidationValue
106 merge ScRefHandlerHelper with ScValidationDlg
107 merge ScSimpleEditSourceHelper with ScEditEngineTextObj
108 merge ScTabView with ScViewFunc
109 merge ScVbaControlContainer with ScVbaButtonContainer
110 merge ScVbaObjectContainer with ScVbaControlContainer
111 merge ScViewFunc with ScDBFunc
112 merge SceneObject with (anonymous namespace)::Iris
113 merge SdOptionsGrid with SdOptions
114 merge SdOptionsZoom with SdOptions
115 merge SdTransferable::UserData with sd::slidesorter::controller::TransferableData
116 merge SdUnoSearchReplaceShape with SdGenericDrawPage
117 merge SdrDragView with SdrCreateView
118 merge SdrEditView with SdrPolyEditView
119 merge SdrEscherImport with SdrPowerPointImport
120 merge SdrExchangeView with SdrDragView
121 merge SdrGlueEditView with SdrObjEditView
122 merge SdrMarkView with SdrEditView
123 merge SdrObjEditView with SdrExchangeView
124 merge SdrPaintView with SdrSnapView
125 merge SdrPolyEditView with SdrGlueEditView
126 merge SdrPowerPointImport with ImplSdPPTImport
127 merge SdrSnapView with SdrMarkView
128 merge SdwTextBoxRecord with SdwTextArt
129 merge ServerFontLayoutEngine with HbLayoutEngine
130 merge SfxModelSubComponent with sfx2::DocumentUndoManager
131 merge SfxMultiFixRecordWriter with SfxMultiVarRecordWriter
132 merge SfxSingleRecordReader with SfxMultiRecordReader
133 merge SfxSingleRecordWriter with SfxMultiFixRecordWriter
134 merge SmFontPickList with SmFontPickListBox
135 merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl
136 merge StgAvlIterator with StgIterator
137 merge StgAvlNode with StgDirEntry
138 merge StgCache with StgIo
139 merge StgReader with WW8Reader
140 merge StringNode with RscDefine
141 merge SvHashTable with SvStringHashTable
142 merge SvListView with SvTreeListBox
143 merge SvXMLExportItemMapper with SwXMLTableItemMapper_Impl
144 merge SvXMLImportItemMapper with SwXMLImportTableItemMapper_Impl
145 merge SvXMLItemSetContext with SwXMLItemSetContext_Impl
146 merge SvxCSS1Parser with SwCSS1Parser
147 merge SvxRTFParser with EditRTFParser
148 merge SvxShapeMaster with SdXShape
149 merge SwAccessibleFrame with SwAccessibleContext
150 merge SwCursorShell with SwEditShell
151 merge SwEditShell with SwFEShell
152 merge SwFEShell with SwWrtShell
153 merge SwImpBlocks with SwXMLTextBlocks
154 merge SwInterHyphInfo with SwHyphArgs
155 merge SwNumberTreeNode with SwNodeNum
156 merge SwSelPaintRects with SwShellCursor
157 merge SwSidebarItem with SwAnnotationItem
158 merge SwTextAdjuster with SwTextCursor
159 merge SwUnoCursor with SwUnoTableCursor
160 merge SwXParaFrameEnumeration with SwXParaFrameEnumerationImpl
161 merge SwXParagraphEnumeration with SwXParagraphEnumerationImpl
162 merge SwXTextRanges with SwXTextRangesImpl
163 merge TextObj with TextObjBinary
164 merge TextRenderImpl with CairoTextRender
165 merge UniqueIndexImpl with UniqueIndex
166 merge ValueGetter with CellValueGetter
167 merge ValueSetter with CellValueSetter
168 merge VariableTextField with VariableDateTimeField
169 merge Viewport3D with Camera3D
170 merge WW8PLCFx_Fc_FKP with WW8PLCFx_Cp_FKP
171 merge WW8Style with WW8RStyle
172 merge X11Pixmap with GdkX11Pixmap
173 merge XFDate with XFDateStart
174 merge XFDateTimePart with XFTimePart
175 merge XMLNode with XMLChildNode
176 merge XMLTransformer with XMLTransformerBase
177 merge XclDebugObjCounter with XclRootData
178 merge XclExpFutureRecord with XclExpChFutureRecordBase
179 merge XclExpSubStream with XclExpChart
180 merge XclNumFmtBuffer with XclImpNumFmtBuffer
181 merge abp::OModuleResourceClient with abp::OABSPilotUno
182 merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase
183 merge accessibility::IComboListBoxHelper with VCLListBoxHelper
184 merge basctl::docs::IDocumentDescriptorFilter with basctl::(anonymous namespace)::FilterDocuments
185 merge basegfx::InterpolatorProvider3D with basegfx::RasterConverter3D
186 merge bib::OComponentListener with bib::OLoadListener
187 merge bib::OLoadListener with bib::FormControlContainer
188 merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base
189 merge canvas::ISurfaceProxy with canvas::SurfaceProxy
190 merge canvas::ISurfaceProxyManager with canvas::SurfaceProxyManager
191 merge chart::CategoryPositionHelper with chart::BarPositionHelper
192 merge chart::ExplicitValueProvider with chart::ChartView
193 merge chart::LegendEntryProvider with chart::VSeriesPlotter
194 merge chart::MarkHandleProvider with chart::SelectionHelper
195 merge chart::ResourceChangeListener with chart::ChartTypeTabPage
196 merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState
197 merge comphelper::NameContainerImpl with comphelper::NameContainer
198 merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent
199 merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration
200 merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper
201 merge comphelper::OProxyAggregation with comphelper::OComponentProxyAggregationHelper
202 merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper
203 merge comphelper::PropertySetInfo_BASE with comphelper::PropertySetInfo
204 merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection
205 merge connectivity::java_lang_Exception with connectivity::java_sql_SQLException_BASE
206 merge connectivity::odbc::ODBCDriver with connectivity::odbc::ORealObdcDriver
207 merge connectivity::sdbcx::IObjectCollection with (anonymous namespace)::OHardRefMap
208 merge connectivity::sdbcx::OKey with connectivity::OTableKeyHelper
209 merge cppcanvas::Bitmap with cppcanvas::internal::ImplBitmap
210 merge cppcanvas::BitmapCanvas with cppcanvas::internal::ImplBitmapCanvas
211 merge cppcanvas::Color with cppcanvas::internal::ImplColor
212 merge cppcanvas::CustomSprite with cppcanvas::internal::ImplCustomSprite
213 merge cppcanvas::Font with cppcanvas::internal::ImplFont
214 merge cppcanvas::PolyPolygon with cppcanvas::internal::ImplPolyPolygon
215 merge cppcanvas::Renderer with cppcanvas::internal::ImplRenderer
216 merge cppcanvas::SpriteCanvas with cppcanvas::internal::ImplSpriteCanvas
217 merge cppcanvas::internal::ImplSprite with cppcanvas::internal::ImplCustomSprite
218 merge cppu::OSingleFactoryHelper with cppu::OFactoryComponentHelper
219 merge cppu::PropertySetMixinImpl with cppu::PropertySetMixin
220 merge dbaccess::IPropertyContainer with dbaccess::OColumn
221 merge dbaccess::IRefreshListener with dbaccess::OConnection
222 merge dbaccess::OColumnWrapper with dbaccess::OTableColumnDescriptorWrapper
223 merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId
224 merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper
225 merge dbaui::OSplitterView with dbaui::OApplicationDetailView
226 merge dbaui::OTableRowView with dbaui::OTableEditorCtrl
227 merge dbaui::SbaGridListener with dbaui::SbaXDataBrowserController
228 merge dbmm::IMigrationProgress with dbmm::ProgressPage
229 merge dbmm::IProgressConsumer with dbmm::ProgressDelegator
230 merge dbp::OGridPage with dbp::OGridFieldsSelection
231 merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
232 merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
233 merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks
234 merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D
235 merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D
236 merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D
237 merge fileaccess::TaskManager with fileaccess::shell
238 merge frm::ICommandImageProvider with frm::DocumentCommandImageProvider
239 merge frm::IEngineStatusListener with frm::RichTextControlImpl
240 merge frm::IEngineTextChangeListener with frm::ORichTextModel
241 merge frm::IFeatureDispatcher with frm::OFormNavigationHelper
242 merge frm::IMultiAttributeDispatcher with frm::RichTextControl
243 merge frm::ITextAttributeListener with frm::OAttributeDispatcher
244 merge frm::ITextSelectionListener with frm::ORichTextPeer
245 merge frm::OFormComponents with frm::ODatabaseForm
246 merge ftp::CurlInput with InsertData
247 merge gio::Seekable with gio::OutputStream
248 merge i_xml_parser_event_handler with (anonymous namespace)::recently_used_file_filter
249 merge oglcanvas::IBufferContext with oglcanvas::(anonymous namespace)::BufferContextImpl
250 merge old_SdrDownCompat with SdIOCompat
251 merge oox::dump::ItemFormat with oox::dump::CombiList::ExtItemFormat
252 merge oox::dump::OleStreamObject with oox::dump::OleCompObjObject
253 merge oox::formulaimport::XmlStream with oox::formulaimport::XmlStreamBuilder
254 merge oox::ole::VbaFilterConfig with oox::ole::VbaProject
255 merge oox::vml::CustomShape with oox::vml::ComplexShape
256 merge oox::xls::FormulaParserImpl with oox::xls::OoxFormulaParserImpl
257 merge oox::xls::FunctionProvider with oox::xls::OpCodeProvider
258 merge oox::xls::IWorksheetProgress with oox::xls::WorksheetGlobals
259 merge pcr::(anonymous namespace)::ISQLCommandPropertyUI with pcr::(anonymous namespace)::SQLCommandPropertyUI
260 merge pcr::CommonBehaviourControlHelper with pcr::CommonBehaviourControl
261 merge pcr::IButtonClickListener with pcr::OBrowserListBox
262 merge pcr::IPropertyControlObserver with pcr::OPropertyBrowserController
263 merge pcr::IPropertyInfoService with pcr::OPropertyInfoService
264 merge pcr::IPropertyLineListener with pcr::OPropertyBrowserController
265 merge pcr::ISQLCommandAdapter with pcr::(anonymous namespace)::ISQLCommandPropertyUI
266 merge pcr::PropertyHandler with pcr::PropertyHandlerComponent
267 merge pcr::PropertyHandlerComponent with pcr::HandlerComponentBase
268 merge psp::Ascii85Encoder with psp::LZWEncoder
269 merge psp::PrinterBmp with SalPrinterBmp
270 merge registry::tools::Options with Options_Impl
271 merge reportdesign::ITraverseReport with rptui::NavigatorTree
272 merge rptui::IConditionalFormatAction with rptui::ConditionalFormattingDialog
273 merge sc::CompiledFormula with sc::opencl::DynamicKernel
274 merge sc::opencl::Cumipmt with sc::opencl::OpCumipmt
275 merge sc::opencl::Fvschedule with sc::opencl::OpFvschedule
276 merge sc::opencl::IRR with sc::opencl::OpIRR
277 merge sc::opencl::MIRR with sc::opencl::OpMIRR
278 merge sc::opencl::PriceMat with sc::opencl::OpPriceMat
279 merge sc::opencl::RATE with sc::opencl::OpIntrate
280 merge sc::opencl::RRI with sc::opencl::OpRRI
281 merge sc::opencl::SumOfProduct with sc::opencl::OpSumProduct
282 merge sc::opencl::XNPV with sc::opencl::OpXNPV
283 merge sd::BroadcastHelperOwner with sd::DrawController
284 merge sd::ClientInfo with sd::ClientInfoInternal
285 merge sd::IBluetoothSocket with sd::BufferedStreamSocket
286 merge sd::ICustomAnimationListController with sd::CustomAnimationPane
287 merge sd::sidebar::IDisposable with sd::sidebar::PanelBase
288 merge sd::sidebar::ISidebarReceiver with sd::sidebar::PanelBase
289 merge sd::sidebar::MasterPageContainerFiller::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation
290 merge sd::sidebar::MasterPageContainerQueue::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation
291 merge sd::sidebar::PreviewValueSet with sd::sidebar::MasterPagesSelector
292 merge sd::slidesorter::view::(anonymous namespace)::AnimatorAccess with sd::slidesorter::view::InsertAnimator::Implementation
293 merge sd::slidesorter::view::ILayerInvalidator with sd::slidesorter::view::(anonymous namespace)::LayerInvalidator
294 merge sdext::presenter::IPresentationTime with sdext::presenter::(anonymous namespace)::PresentationTimeLabel
295 merge sdext::presenter::PresenterClockTimer::Listener with sdext::presenter::(anonymous namespace)::TimeLabel::Listener
296 merge sdext::presenter::PresenterScrollBar with sdext::presenter::PresenterVerticalScrollBar
297 merge sdext::presenter::PresenterSlidePreview with sdext::presenter::(anonymous namespace)::NextSlidePreview
298 merge sdr::SelectionController with sdr::table::SvxTableController
299 merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveExtractor
300 merge sdr::table::TableDesignUser with sdr::table::SdrTableObjImpl
301 merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry
302 merge sfx::DummyWindowWrapper with sfx::DummyItemConnection
303 merge sfx::MultiControlWrapperHelper with sfx::MultiControlWrapper
304 merge slideshow::internal::(anonymous namespace)::EventContainer with slideshow::internal::ClickEventHandler
305 merge slideshow::internal::AnimatableShape with slideshow::internal::AttributableShape
306 merge slideshow::internal::AnimationFunction with slideshow::internal::ExpressionNode
307 merge slideshow::internal::AnimationNode with slideshow::internal::BaseNode
308 merge slideshow::internal::AttributableShape with slideshow::internal::DrawShape
309 merge slideshow::internal::BoolAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
310 merge slideshow::internal::ColorAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
311 merge slideshow::internal::DocTreeNodeSupplier with slideshow::internal::DrawShape
312 merge slideshow::internal::EnumAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
313 merge slideshow::internal::HSLColorAnimation with slideshow::internal::(anonymous namespace)::HSLWrapper
314 merge slideshow::internal::HyperlinkArea with slideshow::internal::DrawShape
315 merge slideshow::internal::HyperlinkHandler with (anonymous namespace)::SlideShowImpl::SeparateListenerImpl
316 merge slideshow::internal::PairAnimation with slideshow::internal::(anonymous namespace)::TupleAnimation
317 merge slideshow::internal::PauseEventHandler with slideshow::internal::SoundPlayer
318 merge slideshow::internal::ScreenUpdater::UpdateLock with (anonymous namespace)::UpdateLock
319 merge slideshow::internal::ShapeListenerEventHandler with slideshow::internal::ShapeManagerImpl
320 merge slideshow::internal::ShapeManager with slideshow::internal::SubsettableShapeManager
321 merge slideshow::internal::Slide with slideshow::internal::(anonymous namespace)::SlideImpl
322 merge slideshow::internal::StringAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
323 merge slideshow::internal::SubsettableShapeManager with slideshow::internal::ShapeManagerImpl
324 merge slideshow::internal::UnoView with slideshow::internal::(anonymous namespace)::SlideView
325 merge slideshow::internal::UserPaintEventHandler with slideshow::internal::PaintOverlayHandler
326 merge slideshow::internal::View with slideshow::internal::UnoView
327 merge slideshow::internal::ViewRepaintHandler with (anonymous namespace)::SlideShowImpl::SeparateListenerImpl
328 merge slideshow::internal::ViewUpdate with slideshow::internal::ShapeManagerImpl
329 merge store::OStorePageBIOS with store::OStorePageManager
330 merge svgio::svgreader::InfoProvider with svgio::svgreader::SvgNode
331 merge svl::StyleSheetCallback with (anonymous namespace)::AddStyleSheetCallback
332 merge svl::StyleSheetDisposer with (anonymous namespace)::StyleSheetDisposerFunctor
333 merge svt::IContentTitleTranslation with NameTranslator_Impl
334 merge svt::IEditImplementation with svt::GenericEditImplementation
335 merge svt::IEnumerationResultHandler with SvtFileView_Impl
336 merge svt::IFilePickerController with SvtFileDialog_Base
337 merge svt::IFilePickerListener with SvtFilePicker
338 merge svt::table::IAccessibleTable with svt::table::TableControl
339 merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade
340 merge svt::table::ITableControl with svt::table::TableControl_Impl
341 merge svt::table::ITableDataSort with svt::table::UnoControlTableModel
342 merge svt::table::ITableInputHandler with svt::table::DefaultInputHandler
343 merge svt::table::ITableModelListener with svt::table::TableControl_Impl
344 merge svt::table::ITableRenderer with svt::table::GridTableRenderer
345 merge svx::IContextRequestObserver with svx::FmTextControlShell
346 merge svx::IControllerFeatureInvalidation with FmXFormShell
347 merge svx::IFocusObserver with svx::FmTextControlShell
348 merge svx::IPropertyValueProvider with svx::PropertyValueProvider
349 merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
350 merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
351 merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript
352 merge svxform::DispatchInterceptor with svxform::FormController
353 merge svxform::IFormScriptingEnvironment with svxform::FormScriptingEnvironment
354 merge sw::ICoreFrameStyle with SwXFrameStyle
355 merge sw::IShellCursorSupplier with SwCursorShell
356 merge sw::WriterListener with SwClient
357 merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl
358 merge sw::mark::IBookmark with sw::mark::Bookmark
359 merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark
360 merge sw::sidebarwindows::SwSidebarWin with sw::annotation::SwAnnotationWin
361 merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor
362 merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper
363 merge unographic::GraphicTransformer with unographic::Graphic
364 merge vcl::DeletionNotifier with SalFrame
365 merge vcl::ExtOutDevData with vcl::PDFExtOutDevData
366 merge vcl::IPrioritable with VclContainer
367 merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThreadExecutor
368 merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base
369 merge webdav_ucp::DAVAuthListener with webdav_ucp::DAVAuthListener_Impl
370 merge webdav_ucp::DAVSession with webdav_ucp::NeonSession
371 merge writerfilter::Stream with writerfilter::LoggedStream
372 merge writerfilter::Table with writerfilter::LoggedTable
373 merge writerfilter::dmapper::TableManager with writerfilter::dmapper::DomainMapperTableManager
374 merge writerfilter::ooxml::OOXMLDocument with writerfilter::ooxml::OOXMLDocumentImpl
375 merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with writerfilter::ooxml::OOXMLFastContextHandlerMath
376 merge writerfilter::ooxml::OOXMLStream with writerfilter::ooxml::OOXMLStreamImpl
377 merge writerfilter::rtftok::RTFDocument with writerfilter::rtftok::RTFDocumentImpl
378 merge xmloff::IEventAttacher with xmloff::OElementImport
379 merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager
380 merge xmloff::IFormsExportContext with xmloff::OFormLayerXMLExport_Impl
381 merge xmloff::OPropertyExport with xmloff::OElementExport
382 merge xmloff::OPropertyImport with xmloff::OElementImport
383 merge xmloff::OURLReferenceImport with xmloff::OButtonImport
384 merge xmlsecurity::Certificate with X509Certificate_NssImpl