| blob | 9d4e9d583926717675caa65ed9d2dafc8f7fbcae |
1 merge (anonymous namespace)::Base2 with (anonymous namespace)::Derived
2 merge (anonymous namespace)::Base3 with (anonymous namespace)::Derived
3 merge (anonymous namespace)::BasePixelPtr with (anonymous namespace)::TrueColorPixelPtr
4 merge (anonymous namespace)::BuiltinPropertyGetSetHelper with (anonymous namespace)::CustomPropertyGetSetHelper
5 merge (anonymous namespace)::C2 with (anonymous namespace)::C3
6 merge (anonymous namespace)::C3 with (anonymous namespace)::C4
7 merge (anonymous namespace)::C4 with (anonymous namespace)::C5
8 merge (anonymous namespace)::CffGlobal with (anonymous namespace)::CffSubsetterContext
9 merge (anonymous namespace)::Char1 with (anonymous namespace)::Char2
10 merge (anonymous namespace)::Char2 with (anonymous namespace)::Char3
11 merge (anonymous namespace)::DIBInfoHeader with (anonymous namespace)::DIBV5Header
12 merge (anonymous namespace)::DomVisitor with (anonymous namespace)::DomExport
13 merge (anonymous namespace)::GtkInstanceCheckButton with (anonymous namespace)::GtkInstanceRadioButton
14 merge (anonymous namespace)::N with (anonymous namespace)::P
15 merge (anonymous namespace)::O with (anonymous namespace)::O2
16 merge (anonymous namespace)::ParserData with (anonymous namespace)::Entity
17 merge (anonymous namespace)::PopupMenuToolbarController with (anonymous namespace)::GenericPopupToolbarController
18 merge (anonymous namespace)::PublishableDescription with cppu::ImplInheritanceHelper
19 merge (anonymous namespace)::RecursiveTest with (anonymous namespace)::SimpleRecursiveTest
20 merge (anonymous namespace)::ReflectionTransition with (anonymous namespace)::RochadeTransition
21 merge (anonymous namespace)::RunInitGuard with (anonymous namespace)::RunGuard
22 merge (anonymous namespace)::ScVbaControlContainer with (anonymous namespace)::ScVbaButtonContainer
23 merge (anonymous namespace)::SimpleTransition with (anonymous namespace)::DiamondTransition
24 merge (anonymous namespace)::StrEntries with (anonymous namespace)::RemoveEditAttribsHandler
25 merge (anonymous namespace)::VariableTextField with (anonymous namespace)::VariableDateTimeField
26 merge (anonymous namespace)::empty with (anonymous namespace)::second
27 merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl
28 merge AbstractSmParser with SmParser5
29 merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl
30 merge AbstractTabController_Impl with AbstractApplyTabController_Impl
31 merge AddressWalker with AddressWalkerWriter
32 merge AutoIdle with (anonymous namespace)::TestAutoIdleRR
33 merge B3dTransformationSet with B3dViewport
34 merge B3dViewport with B3dCamera
35 merge BaseJSWidget with JSWidget
36 merge BitmapConvolutionMatrixFilter with BitmapSharpenFilter
37 merge BrowseBox with svt::EditBrowseBox
38 merge BrowserHeader with svt::EditBrowserHeader
39 merge CSS1Parser with SvxCSS1Parser
40 merge DateField with CalendarField
41 merge DbGridControl with FmGridControl
42 merge DdeItem with DdeGetPutItem
43 merge DdeLink with DdeHotLink
44 merge E3DObjGeoData with E3DSceneGeoData
45 merge E3dUndoAction with E3dRotateUndoAction
46 merge EditTextObject with EditTextObjectImpl
47 merge ErrorInfo with DynamicErrorInfo
48 merge EscherPersistTable with EscherEx
49 merge ExcBoolRecord with Exc1904
50 merge ExcelConverterBase with ExcelToSc
51 merge ExportTyp with ExportBiff5
52 merge FmGridListener with FmXGridPeer::GridListenerDelegator
53 merge FmRecordCountListener_Base with FmRecordCountListener
54 merge FmXDisposeListener with DisposeListenerGridBridge
55 merge FmXFormShell_Base_Disambiguation with FmXFormShell
56 merge GLWindow with GLX11Window
57 merge GroupTable with PPTWriterBase
58 merge HostDetailsContainer with DavDetailsContainer
59 merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager
60 merge IDocumentContentOperations with sw::DocumentContentOperationsManager
61 merge IDocumentDeviceAccess with sw::DocumentDeviceManager
62 merge IDocumentDrawModelAccess with sw::DocumentDrawModelManager
63 merge IDocumentExternalData with sw::DocumentExternalDataManager
64 merge IDocumentFieldsAccess with sw::DocumentFieldsManager
65 merge IDocumentLayoutAccess with sw::DocumentLayoutManager
66 merge IDocumentLinksAdministration with sw::DocumentLinksAdministrationManager
67 merge IDocumentListItems with sw::DocumentListItemsManager
68 merge IDocumentListsAccess with sw::DocumentListsManager
69 merge IDocumentMarkAccess with sw::mark::MarkManager
70 merge IDocumentMarkAccess::ILazyDeleter with sw::mark::(anonymous namespace)::LazyFieldmarkDeleter
71 merge IDocumentOutlineNodes with sw::DocumentOutlineNodesManager
72 merge IDocumentRedlineAccess with sw::DocumentRedlineManager
73 merge IDocumentSettingAccess with sw::DocumentSettingManager
74 merge IDocumentState with sw::DocumentStateManager
75 merge IDocumentStatistics with sw::DocumentStatisticsManager
76 merge IDocumentStylePoolAccess with sw::DocumentStylePoolManager
77 merge IDocumentTimerAccess with sw::DocumentTimerManager
78 merge IDocumentUndoRedo with sw::UndoManager
79 merge IFinishedThreadListener with ThreadListener
80 merge IGrammarContact with (anonymous namespace)::SwGrammarContact
81 merge IStyleAccess with (anonymous namespace)::SwStyleManager
82 merge IStylePoolIteratorAccess with (anonymous namespace)::Iterator
83 merge IXFAttrList with XFSaxAttrList
84 merge IXFStream with XFSaxStream
85 merge IXFStyle with XFStyle
86 merge IconChoicePage with SvxHyperlinkTabPageBase
87 merge ListView with TemplateDlgLocalView
88 merge LongCurrencyFormatter with LongCurrencyBox
89 merge LotusConverterBase with LotusToSc
90 merge LwpDLVListHead with LwpPropList
91 merge LwpMarker with LwpStoryMarker
92 merge ObservableThread with SwAsyncRetrieveInputStreamThread
93 merge PPTExBulletProvider with PPTWriter
94 merge PriorityHBox with PriorityMergedHBox
95 merge PropertyAccessorBase with GenericPropertyAccessor
96 merge PropertyWrapperBase with PropertyWrapper
97 merge SOParagraph with ParagraphObj
98 merge SalData with GenericUnixSalData
99 merge SalDisplay with SalX11Display
100 merge SalGraphics with SalGraphicsAutoDelegateToImpl
101 merge SalInfoPrinter with PspSalInfoPrinter
102 merge SalInstance with SalGenericInstance
103 merge SalInstanceBox with JSWidget
104 merge SalInstanceBuilder with JSInstanceBuilder
105 merge SalInstanceCheckButton with JSWidget
106 merge SalInstanceComboBoxWithEdit with JSWidget
107 merge SalInstanceComboBoxWithoutEdit with JSWidget
108 merge SalInstanceDrawingArea with JSWidget
109 merge SalInstanceExpander with JSWidget
110 merge SalInstanceIconView with JSWidget
111 merge SalInstanceImage with JSWidget
112 merge SalInstanceLabel with JSWidget
113 merge SalInstanceNotebook with JSWidget
114 merge SalInstanceRadioButton with JSWidget
115 merge SalInstanceSpinButton with JSWidget
116 merge SalInstanceTextView with JSWidget
117 merge SalInstanceToolbar with JSWidget
118 merge SalInstanceTreeView with JSWidget
119 merge SalPrinter with PspSalPrinter
120 merge SalSession with (anonymous namespace)::IceSalSession
121 merge SalSystem with SalGenericSystem
122 merge ScAccessibleTableBase with ScAccessibleSpreadsheet
123 merge ScAsyncTabController with ScAsyncTabController_Impl
124 merge ScDBDataContainerBase with ScDBCollection::NamedDBs
125 merge ScDBFunc with ScTabViewShell
126 merge ScDPCache::DBConnector with (anonymous namespace)::DBConnector
127 merge ScDocFunc with ScDocFuncDirect
128 merge ScEEAbsImport with ScEEImport
129 merge ScEEParseEntry with ScHTMLEntry
130 merge ScEnginePoolHelper with ScEditEngineDefaulter
131 merge ScFormatFilterPlugin with ScFormatFilterPluginImpl
132 merge ScMultiBlockUndo with ScUndoPaste
133 merge ScOrcusFilters with ScOrcusFiltersImpl
134 merge ScOrcusXMLContext with ScOrcusXMLContextImpl
135 merge ScRefHandler with ScRefHdlrControllerImpl
136 merge ScRefHandlerCaller with ScTPValidationValue
137 merge ScRefHandlerHelper with ScValidationDlg
138 merge ScSimpleEditSourceHelper with ScEditEngineTextObj
139 merge ScTabView with ScViewFunc
140 merge ScVbaGraphicObjectsBase with ScVbaButtons
141 merge ScVbaObjectContainer with (anonymous namespace)::ScVbaControlContainer
142 merge ScViewFunc with ScDBFunc
143 merge SceneObject with (anonymous namespace)::Iris
144 merge SdNavigatorWin with sd::sidebar::NavigatorWrapper
145 merge SdOptionsContents with SdOptions
146 merge SdOptionsGrid with SdOptions
147 merge SdOptionsZoom with SdOptions
148 merge SdTransferable::UserData with sd::slidesorter::controller::TransferableData
149 merge SdUnoSearchReplaceShape with SdGenericDrawPage
150 merge SdrCreateView with SdrView
151 merge SdrDragView with SdrCreateView
152 merge SdrEditView with SdrPolyEditView
153 merge SdrEscherImport with SdrPowerPointImport
154 merge SdrExchangeView with SdrDragView
155 merge SdrGlueEditView with SdrObjEditView
156 merge SdrGrafModeItem_Base with SdrGrafModeItem
157 merge SdrMarkView with SdrEditView
158 merge SdrObjEditView with SdrExchangeView
159 merge SdrPaintView with SdrSnapView
160 merge SdrPolyEditView with SdrGlueEditView
161 merge SdrSnapView with SdrMarkView
162 merge SdrUndoInsertObj with SdrUndoNewObj
163 merge SdrUndoNewObj with SdrUndoCopyObj
164 merge SdrUndoNewPage with SdrUndoCopyPage
165 merge SdwTextBoxRecord with SdwTextArt
166 merge SfxExtItemPropertySetInfo_Base with SfxExtItemPropertySetInfo
167 merge SfxItemPropertySetInfo_Base with SfxItemPropertySetInfo
168 merge SfxModelSubComponent with sfx2::DocumentUndoManager
169 merge SkiaSalGraphicsImpl with X11SkiaSalGraphicsImpl
170 merge SmFontPickList with SmFontPickListBox
171 merge StarSymbolToMSMultiFont with (anonymous namespace)::StarSymbolToMSMultiFontImpl
172 merge StgAvlIterator with StgIterator
173 merge StgAvlNode with StgDirEntry
174 merge StgCache with StgIo
175 merge StylesPreviewWindow_Base with StylesPreviewWindow_Impl
176 merge SvHeaderTabListBox with LclHeaderTabListBox
177 merge SvIdlDataBase with SvIdlWorkingBase
178 merge SvListView with SvTreeListBox
179 merge SvXMLExportItemMapper with (anonymous namespace)::SwXMLTableItemMapper_Impl
180 merge SvXMLImportItemMapper with (anonymous namespace)::SwXMLImportTableItemMapper_Impl
181 merge SvxAreaTabPage with SvxBkgTabPage
182 merge SvxCSS1Parser with SwCSS1Parser
183 merge SvxLanguageItem_Base with SvxLanguageItem
184 merge SvxRTFItemStackType with MakeUniqueEnabler
185 merge SvxRTFParser with EditRTFParser
186 merge SvxVertCTLTextTbxCtrl_Base with SvxVertCTLTextTbxCtrl
187 merge SwAccessibleFrame with SwAccessibleContext
188 merge SwCursorShell with SwEditShell
189 merge SwDashedLine with SwBreakDashedLine
190 merge SwDrawModeGrf_Base with SwDrawModeGrf
191 merge SwEditShell with SwFEShell
192 merge SwEndNoteOptionPage with SwFootNoteOptionPage
193 merge SwFEShell with SwWrtShell
194 merge SwFrameAreaDefinition with SwFrame
195 merge SwImpBlocks with SwXMLTextBlocks
196 merge SwInterHyphInfo with (anonymous namespace)::SwHyphArgs
197 merge SwNumberTreeNode with SwNodeNum
198 merge SwSelPaintRects with SwShellCursor
199 merge SwSidebarItem with SwAnnotationItem
200 merge SwTextAdjuster with SwTextCursor
201 merge SwUndoTextFormatCollCreate with SwUndoCondTextFormatCollCreate
202 merge SwUnoCursor with SwUnoTableCursor
203 merge SwXParaFrameEnumeration with (anonymous namespace)::SwXParaFrameEnumerationImpl
204 merge SwXParagraphEnumeration with (anonymous namespace)::SwXParagraphEnumerationImpl
205 merge SwXTextRanges with (anonymous namespace)::SwXTextRangesImpl
206 merge Task with Timer
207 merge TestShape with (anonymous namespace)::ImplTestShape
208 merge TestView with (anonymous namespace)::ImplTestView
209 merge TextObj with TextObjBinary
210 merge TextRenderImpl with FreeTypeTextRenderImpl
211 merge TxtEncExportHiddenTest with testBulletsHidden
212 merge TxtEncExportNotHiddenTest with testBulletsNotHidden
213 merge ValueGetter with (anonymous namespace)::CellValueGetter
214 merge ValueSetter with (anonymous namespace)::CellValueSetter
215 merge VclVButtonBox with (anonymous namespace)::LeakTestClass
216 merge Viewport3D with Camera3D
217 merge WW8PLCFx_Fc_FKP with WW8PLCFx_Cp_FKP
218 merge WW8Style with WW8RStyle
219 merge X11SalGraphicsImpl with X11CairoSalGraphicsImpl
220 merge XFDate with XFDateStart
221 merge XFDateTimePart with XFTimePart
222 merge XMLNode with XMLChildNode
223 merge XMLTransformer with XMLTransformerBase
224 merge XclDebugObjCounter with XclRootData
225 merge XclExpChFutureRecordBase with XclExpChFrLabelProps
226 merge XclExpFutureRecord with XclExpChFutureRecordBase
227 merge XclExpObjectManager with XclExpEmbeddedObjectManager
228 merge XclExpSubStream with XclExpChart
229 merge XclImpCachedValue with (anonymous namespace)::XclImpCrn
230 merge XclImpCheckBoxObj with XclImpOptionButtonObj
231 merge XclNumFmtBuffer with XclImpNumFmtBuffer
232 merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase
233 merge accessibility::IComboListBoxHelper with VCLListBoxHelper
234 merge animcore::(anonymous namespace)::AnimationNodeBase with animcore::(anonymous namespace)::AnimationNode
235 merge basctl::Entry with basctl::DocumentEntry
236 merge basctl::docs::IDocumentDescriptorFilter with basctl::(anonymous namespace)::FilterDocuments
237 merge basegfx::InterpolatorProvider3D with basegfx::RasterConverter3D
238 merge basegfx::trapezoidhelper::(anonymous namespace)::TrDeSimpleEdge with basegfx::trapezoidhelper::(anonymous namespace)::TrDeEdgeEntry
239 merge bib::OComponentAdapterBase with bib::OLoadListenerAdapter
240 merge bib::OComponentListener with bib::OLoadListener
241 merge bib::OLoadListener with bib::FormControlContainer
242 merge cairocanvas::CanvasBaseSurfaceProvider_Base with canvas::CanvasBase
243 merge cairocanvas::CanvasBitmapSpriteSurface_Base with canvas::CanvasBase
244 merge cairocanvas::CanvasCustomSpriteSpriteBase_Base with canvas::CanvasBase
245 merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base
246 merge cairocanvas::SpriteCanvasBaseSpriteSurface_Base with canvas::CanvasBase
247 merge canvas::ISurfaceProxy with canvas::SurfaceProxy
248 merge canvas::ISurfaceProxyManager with canvas::(anonymous namespace)::SurfaceProxyManager
249 merge chart::CategoryPositionHelper with chart::BarPositionHelper
250 merge chart::ExplicitValueProvider with chart::ChartView
251 merge chart::LegendEntryProvider with chart::VSeriesPlotter
252 merge chart::MarkHandleProvider with chart::SelectionHelper
253 merge chart::wrapper::ChartDocumentWrapper_Base with chart::wrapper::ChartDocumentWrapper
254 merge comphelper::ChainablePropertySetInfo_Base with comphelper::ChainablePropertySetInfo
255 merge comphelper::ConfigurationListenerPropertyBase with comphelper::ConfigurationListenerProperty
256 merge comphelper::ConfigurationListener_Base with comphelper::ConfigurationListener
257 merge comphelper::MasterPropertySetInfo_Base with comphelper::MasterPropertySetInfo
258 merge comphelper::OAccessibleComponentHelper_Base with comphelper::OAccessibleComponentHelper
259 merge comphelper::OAccessibleWrapper_Base with comphelper::OAccessibleWrapper
260 merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration
261 merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper
262 merge comphelper::OContainerListenerAdapter_Base with comphelper::OContainerListenerAdapter
263 merge comphelper::OPropertyChangeMultiplexer_Base with comphelper::OPropertyChangeMultiplexer
264 merge comphelper::OProxyAggregation with comphelper::OComponentProxyAggregationHelper
265 merge comphelper::OSeekableInputWrapper_BASE with comphelper::OSeekableInputWrapper
266 merge comphelper::OSequenceOutputStream_Base with comphelper::OSequenceOutputStream
267 merge comphelper::OWeakListenerAdapterBase with comphelper::OWeakListenerAdapter
268 merge comphelper::PropertySetInfo_BASE with comphelper::PropertySetInfo
269 merge comphelper::TraceEvent with comphelper::NamedEvent
270 merge comphelper::WeakComponentImplHelperBase with comphelper::WeakComponentImplHelper
271 merge connectivity::OKeySet_Base with connectivity::OKeySet
272 merge connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper with connectivity::evoab::(anonymous namespace)::OEvoabVersion38Helper
273 merge connectivity::evoab::OEvoabVersionHelper with connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper
274 merge connectivity::file::OStatement_Base with connectivity::file::OStatement_BASE2
275 merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection
276 merge connectivity::java_lang_Exception with connectivity::java_sql_SQLException_BASE
277 merge connectivity::java_sql_Statement_Base with connectivity::OStatement_BASE2
278 merge connectivity::odbc::ODBCDriver with connectivity::odbc::(anonymous namespace)::ORealOdbcDriver
279 merge connectivity::odbc::OStatement_Base with connectivity::odbc::OStatement_BASE2
280 merge connectivity::sdbcx::IObjectCollection with (anonymous namespace)::OHardRefMap
281 merge connectivity::sdbcx::OKey with connectivity::OTableKeyHelper
282 merge cppcanvas::Bitmap with cppcanvas::internal::ImplBitmap
283 merge cppcanvas::BitmapCanvas with cppcanvas::internal::ImplBitmapCanvas
284 merge cppcanvas::CustomSprite with cppcanvas::internal::ImplCustomSprite
285 merge cppcanvas::PolyPolygon with cppcanvas::internal::ImplPolyPolygon
286 merge cppcanvas::Renderer with cppcanvas::internal::ImplRenderer
287 merge cppcanvas::SpriteCanvas with cppcanvas::internal::ImplSpriteCanvas
288 merge cppcanvas::internal::ImplSprite with cppcanvas::internal::ImplCustomSprite
289 merge cppu::PropertySetMixinImpl with cppu::PropertySetMixin
290 merge dbaccess::IPropertyContainer with dbaccess::OColumn
291 merge dbaccess::IRefreshListener with dbaccess::OConnection
292 merge dbaccess::OColumnWrapper with dbaccess::OTableColumnDescriptorWrapper
293 merge dbaccess::OComponentDefinition_Impl with dbaccess::OCommandDefinition_Impl
294 merge dbahsql::AlterStmtParser with dbahsql::FbAlterStmtParser
295 merge dbahsql::CreateStmtParser with dbahsql::FbCreateStmtParser
296 merge dbaui::IController with dbaui::OGenericUnoController
297 merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId
298 merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper
299 merge dbaui::OGenericUnoController with dbaui::OApplicationController
300 merge dbaui::OSQLNameEntry with dbaui::OPropColumnEditCtrl
301 merge dbaui::OTableRowView with dbaui::OTableEditorCtrl
302 merge dbaui::OTableWindowData with dbaui::OQueryTableWindowData
303 merge dbaui::SbaGridListener with dbaui::SbaXDataBrowserController
304 merge dbp::OGridPage with dbp::OGridFieldsSelection
305 merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
306 merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks
307 merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D
308 merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D
309 merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D
310 merge drawinglayer::texture::GeoTexSvxBitmapEx with drawinglayer::texture::GeoTexSvxBitmapExTiled
311 merge fileaccess::Notifier with fileaccess::BaseContent
312 merge framework::OReadStatusBarDocumentHandler_Base with framework::OReadStatusBarDocumentHandler
313 merge framework::OReadToolBoxDocumentHandler_Base with framework::OReadToolBoxDocumentHandler
314 merge framework::SaxNamespaceFilter_Base with framework::SaxNamespaceFilter
315 merge frm::IEngineStatusListener with frm::RichTextControlImpl
316 merge frm::IEngineTextChangeListener with frm::ORichTextModel
317 merge frm::IFeatureDispatcher with frm::OFormNavigationHelper
318 merge frm::IMultiAttributeDispatcher with frm::RichTextControl
319 merge frm::ITextAttributeListener with frm::OAttributeDispatcher
320 merge frm::ITextSelectionListener with frm::ORichTextPeer
321 merge frm::OFormComponents with frm::ODatabaseForm
322 merge ftp::CurlInput with (anonymous namespace)::InsertData
323 merge ftp::ResultSetBase with ftp::ResultSetI
324 merge gfx::DrawCommand with gfx::DrawBase
325 merge gfx::GradientInfo with gfx::LinearGradientInfo
326 merge gio::Seekable with gio::OutputStream
327 merge http_dav_ucp::DAVAuthListener with http_dav_ucp::DAVAuthListener_Impl
328 merge http_dav_ucp::DAVSession with http_dav_ucp::CurlSession
329 merge oglcanvas::IBufferContext with oglcanvas::(anonymous namespace)::BufferContextImpl
330 merge old_SdrDownCompat with SdIOCompat
331 merge oox::SequenceSeekableStream with oox::SequenceInputStream
332 merge oox::core::FilterBase with oox::core::XmlFilterBase
333 merge oox::drawingml::LayoutAtomVisitor with oox::drawingml::LayoutAtomVisitorBase
334 merge oox::drawingml::TextRun with oox::drawingml::TextField
335 merge oox::dump::ConstList with oox::dump::MultiList
336 merge oox::dump::FlagsList with oox::dump::CombiList
337 merge oox::dump::ItemFormat with oox::dump::CombiList::ExtItemFormat
338 merge oox::dump::OleStreamObject with oox::dump::OleCompObjObject
339 merge oox::dump::OutputObjectBase with oox::dump::InputObjectBase
340 merge oox::dump::RecordObjectBase with oox::dump::SequenceRecordObjectBase
341 merge oox::formulaimport::XmlStream with oox::formulaimport::XmlStreamBuilder
342 merge oox::ole::AxListBoxModel with oox::ole::HtmlSelectModel
343 merge oox::ole::AxTextBoxModel with oox::ole::HtmlTextBoxModel
344 merge oox::ole::VbaFilterConfig with oox::ole::VbaProject
345 merge oox::vml::CustomShape with oox::vml::ComplexShape
346 merge oox::vml::ShapeType with oox::vml::ShapeBase
347 merge oox::xls::FormulaParserImpl with oox::xls::(anonymous namespace)::OoxFormulaParserImpl
348 merge oox::xls::FormulaProcessorBase with oox::xls::FormulaParser
349 merge oox::xls::FunctionProvider with oox::xls::OpCodeProvider
350 merge oox::xls::IWorksheetProgress with oox::xls::WorksheetGlobals
351 merge pcr::(anonymous namespace)::BroadcastHelperBase with pcr::(anonymous namespace)::ShapeGeometryChangeNotifier
352 merge pcr::(anonymous namespace)::ISQLCommandPropertyUI with pcr::(anonymous namespace)::SQLCommandPropertyUI
353 merge pcr::CommonBehaviourControlHelper with pcr::CommonBehaviourControl
354 merge pcr::IButtonClickListener with pcr::OBrowserListBox
355 merge pcr::IPropertyControlObserver with pcr::OPropertyBrowserController
356 merge pcr::IPropertyInfoService with pcr::OPropertyInfoService
357 merge pcr::IPropertyLineListener with pcr::OPropertyBrowserController
358 merge pcr::ISQLCommandAdapter with pcr::(anonymous namespace)::ISQLCommandPropertyUI
359 merge pcr::PropertyHandler with pcr::PropertyHandlerComponent
360 merge psp::(anonymous namespace)::Ascii85Encoder with psp::(anonymous namespace)::LZWEncoder
361 merge psp::PrinterBmp with (anonymous namespace)::SalPrinterBmp
362 merge registry::tools::Options with (anonymous namespace)::Options_Impl
363 merge reportdesign::ITraverseReport with rptui::(anonymous namespace)::NavigatorTree
364 merge rptui::AnyConverter with rptui::(anonymous namespace)::ParaAdjust
365 merge rptui::IConditionalFormatAction with rptui::ConditionalFormattingDialog
366 merge sax_fastparser::FastSaxSerializer::ForMerge with sax_fastparser::FastSaxSerializer::ForSort
367 merge sax_fastparser::ForMergeBase with sax_fastparser::FastSaxSerializer::ForMerge
368 merge sc::CompiledFormula with sc::opencl::(anonymous namespace)::DynamicKernel
369 merge sc::FormulaGroupInterpreter with sc::opencl::FormulaGroupInterpreterOpenCL
370 merge sc::opencl::(anonymous namespace)::SumOfProduct with sc::opencl::(anonymous namespace)::OpSumProduct
371 merge sc::opencl::Cumipmt with sc::opencl::OpCumipmt
372 merge sc::opencl::Fvschedule with sc::opencl::OpFvschedule
373 merge sc::opencl::IRR with sc::opencl::OpIRR
374 merge sc::opencl::MIRR with sc::opencl::OpMIRR
375 merge sc::opencl::OpBase with sc::opencl::SlidingFunctionBase
376 merge sc::opencl::PriceMat with sc::opencl::OpPriceMat
377 merge sc::opencl::RATE with sc::opencl::OpIntrate
378 merge sc::opencl::RRI with sc::opencl::OpRRI
379 merge sc::opencl::XNPV with sc::opencl::OpXNPV
380 merge sc_apitest::(anonymous namespace)::TempFileBase with sc_apitest::ScDDELinkObj
381 merge sd::(anonymous namespace)::ModelTraverseHandler with sd::(anonymous namespace)::GraphicSizeCheckHandler
382 merge sd::BroadcastHelperOwner with sd::DrawController
383 merge sd::ClientInfo with sd::ClientInfoInternal
384 merge sd::IBluetoothSocket with sd::BufferedStreamSocket
385 merge sd::ICustomAnimationListController with sd::CustomAnimationPane
386 merge sd::TitledDockingWindow with sd::PaneDockingWindow
387 merge sd::ZeroconfService with sd::AvahiNetworkService
388 merge sd::sidebar::MasterPageContainerFiller::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation
389 merge sd::sidebar::MasterPageContainerQueue::ContainerAdapter with sd::sidebar::MasterPageContainer::Implementation
390 merge sd::slidesorter::view::(anonymous namespace)::AnimatorAccess with sd::slidesorter::view::InsertAnimator::Implementation
391 merge sd::slidesorter::view::ILayerInvalidator with sd::slidesorter::view::(anonymous namespace)::LayerInvalidator
392 merge sdext::presenter::IPresentationTime with sdext::presenter::(anonymous namespace)::PresentationTimeLabel
393 merge sdext::presenter::PresenterClockTimer::Listener with sdext::presenter::(anonymous namespace)::TimeLabel::Listener
394 merge sdext::presenter::PresenterScrollBar with sdext::presenter::PresenterVerticalScrollBar
395 merge sdext::presenter::PresenterSlidePreview with sdext::presenter::(anonymous namespace)::NextSlidePreview
396 merge sdr::SelectionController with sdr::table::SvxTableController
397 merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveExtractor
398 merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry
399 merge slideshow::internal::(anonymous namespace)::EventContainer with slideshow::internal::ClickEventHandler
400 merge slideshow::internal::AnimationFunction with slideshow::internal::ExpressionNode
401 merge slideshow::internal::AnimationNode with slideshow::internal::BaseNode
402 merge slideshow::internal::AttributableShape with slideshow::internal::DrawShape
403 merge slideshow::internal::BoolAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
404 merge slideshow::internal::ClickEventHandler with slideshow::internal::SkipEffectEventHandler
405 merge slideshow::internal::ColorAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
406 merge slideshow::internal::ContinuousKeyTimeActivityBase with slideshow::internal::(anonymous namespace)::ValuesActivity
407 merge slideshow::internal::DocTreeNodeSupplier with slideshow::internal::DrawShape
408 merge slideshow::internal::EnumAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
409 merge slideshow::internal::HSLColorAnimation with slideshow::internal::(anonymous namespace)::HSLWrapper
410 merge slideshow::internal::HyperlinkArea with slideshow::internal::DrawShape
411 merge slideshow::internal::HyperlinkHandler with (anonymous namespace)::SlideShowImpl::SeparateListenerImpl
412 merge slideshow::internal::IExternalMediaShapeBase with slideshow::internal::ExternalShapeBase
413 merge slideshow::internal::MediaFileManager with (anonymous namespace)::SlideShowImpl
414 merge slideshow::internal::PairAnimation with slideshow::internal::(anonymous namespace)::TupleAnimation
415 merge slideshow::internal::PauseEventHandler with slideshow::internal::SoundPlayer
416 merge slideshow::internal::ScreenUpdater::UpdateLock with (anonymous namespace)::UpdateLock
417 merge slideshow::internal::ShapeListenerEventHandler with slideshow::internal::ShapeManagerImpl
418 merge slideshow::internal::ShapeManager with slideshow::internal::SubsettableShapeManager
419 merge slideshow::internal::Slide with slideshow::internal::(anonymous namespace)::SlideImpl
420 merge slideshow::internal::SnakeWipe with slideshow::internal::ParallelSnakesWipe
421 merge slideshow::internal::SpiralWipe with slideshow::internal::BoxSnakesWipe
422 merge slideshow::internal::StringAnimation with slideshow::internal::(anonymous namespace)::GenericAnimation
423 merge slideshow::internal::SubsettableShapeManager with slideshow::internal::ShapeManagerImpl
424 merge slideshow::internal::UserPaintEventHandler with slideshow::internal::PaintOverlayHandler
425 merge slideshow::internal::View with slideshow::internal::UnoView
426 merge slideshow::internal::ViewRepaintHandler with (anonymous namespace)::SlideShowImpl::SeparateListenerImpl
427 merge slideshow::internal::ViewUpdate with slideshow::internal::ShapeManagerImpl
428 merge slideshow::internal::ZigZagWipe with slideshow::internal::BarnZigZagWipe
429 merge store::OStorePageBIOS with store::OStorePageManager
430 merge svgio::svgreader::Visitor with svgio::svgreader::SvgDrawVisitor
431 merge svl::StyleSheetCallback with (anonymous namespace)::AddStyleSheetCallback
432 merge svl::StyleSheetDisposer with (anonymous namespace)::StyleSheetDisposerFunctor
433 merge svt::FrameStatusListener with (anonymous namespace)::ToolbarPopupStatusListener
434 merge svt::IEnumerationResultHandler with SvtFileView_Impl
435 merge svt::IFilePickerController with SvtFileDialog_Base
436 merge svt::IFilePickerListener with SvtFilePicker
437 merge svt::PopupWindowController_Base with svt::PopupWindowController
438 merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade
439 merge svt::table::ITableControl with svt::table::TableControl_Impl
440 merge svt::table::ITableDataSort with svt::table::UnoControlTableModel
441 merge svt::table::ITableInputHandler with svt::table::DefaultInputHandler
442 merge svt::table::ITableModelListener with svt::table::TableControl_Impl
443 merge svt::table::ITableRenderer with svt::table::GridTableRenderer
444 merge svx::IContextRequestObserver with svx::FmTextControlShell
445 merge svx::IControllerFeatureInvalidation with FmXFormShell
446 merge svx::IFocusObserver with svx::FmTextControlShell
447 merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
448 merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
449 merge svxform::DispatchInterceptor with svxform::FormController
450 merge sw::ClientIteratorBase with SwIterator
451 merge sw::ICoreFrameStyle with (anonymous namespace)::SwXFrameStyle
452 merge sw::IShellCursorSupplier with SwCursorShell
453 merge sw::Meta with sw::MetaField
454 merge sw::WriterListener with SwClient
455 merge sw::mark::Bookmark with sw::mark::CrossRefBookmark
456 merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl
457 merge sw::mark::DdeBookmark with sw::mark::Bookmark
458 merge sw::mark::IBookmark with sw::mark::Bookmark
459 merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark
460 merge sw::mark::IDateFieldmark with sw::mark::DateFieldmark
461 merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor
462 merge testHFBase with testHFLinkToPrev
463 merge ucbhelper::ActiveDataSink_Base with ucbhelper::ActiveDataSink
464 merge ucbhelper::CommandEnvironment_Base with ucbhelper::CommandEnvironment
465 merge ucbhelper::InterceptedInteraction_Base with ucbhelper::InterceptedInteraction
466 merge utl::OInputStreamWrapper_Base with utl::OInputStreamWrapper
467 merge vcl::DeletionNotifier with SalFrame
468 merge vcl::ExtOutDevData with vcl::PDFExtOutDevData
469 merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThreadExecutor
470 merge vcl::SwapFile with ImpSwapFile
471 merge vcl::font::GlyphFallbackFontSubstitution with (anonymous namespace)::FcGlyphFallbackSubstitution
472 merge vcl::font::PreMatchFontSubstitution with (anonymous namespace)::FcPreMatchSubstitution
473 merge vcl::pdf::PDFium with vcl::pdf::(anonymous namespace)::PDFiumImpl
474 merge vcl::pdf::PDFiumAnnotation with vcl::pdf::(anonymous namespace)::PDFiumAnnotationImpl
475 merge vcl::pdf::PDFiumBitmap with vcl::pdf::(anonymous namespace)::PDFiumBitmapImpl
476 merge vcl::pdf::PDFiumDocument with vcl::pdf::(anonymous namespace)::PDFiumDocumentImpl
477 merge vcl::pdf::PDFiumPage with vcl::pdf::(anonymous namespace)::PDFiumPageImpl
478 merge vcl::pdf::PDFiumPageObject with vcl::pdf::(anonymous namespace)::PDFiumPageObjectImpl
479 merge vcl::pdf::PDFiumPathSegment with vcl::pdf::(anonymous namespace)::PDFiumPathSegmentImpl
480 merge vcl::pdf::PDFiumSearchHandle with vcl::pdf::(anonymous namespace)::PDFiumSearchHandleImpl
481 merge vcl::pdf::PDFiumSignature with vcl::pdf::(anonymous namespace)::PDFiumSignatureImpl
482 merge vcl::pdf::PDFiumTextPage with vcl::pdf::(anonymous namespace)::PDFiumTextPageImpl
483 merge vclcanvas::CanvasCustomSpriteSpriteBase_Base with canvas::CanvasBase
484 merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base
485 merge vclcanvas::SpriteCanvasBaseSpriteSurface_Base with canvas::CanvasBase
486 merge weld::AssistantController with vcl::WizardMachine
487 merge weld::WidgetStatusListener_Base with weld::WidgetStatusListener
488 merge writerfilter::Stream with writerfilter::LoggedStream
489 merge writerfilter::Table with writerfilter::LoggedTable
490 merge writerfilter::dmapper::TableManager with writerfilter::dmapper::DomainMapperTableManager
491 merge writerfilter::ooxml::OOXMLDocument with writerfilter::ooxml::OOXMLDocumentImpl
492 merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with writerfilter::ooxml::OOXMLFastContextHandlerMath
493 merge writerfilter::ooxml::OOXMLStream with writerfilter::ooxml::OOXMLStreamImpl
494 merge writerfilter::ooxml::OOXMLUniversalMeasureValue with writerfilter::ooxml::OOXMLNthPtMeasureValue
495 merge writerfilter::rtftok::RTFDocument with writerfilter::rtftok::RTFDocumentImpl
496 merge ww8::WW8Struct with ww8::WW8Sttb
497 merge xforms::OValueLimitedType_Base with xforms::OValueLimitedType
498 merge xmloff::IEventAttacher with xmloff::OElementImport
499 merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager
500 merge xmloff::IFormsExportContext with xmloff::OFormLayerXMLExport_Impl
501 merge xmloff::OPropertyExport with xmloff::OElementExport
502 merge xmloff::OPropertyImport with xmloff::OElementImport
503 merge xmloff::OURLReferenceImport with xmloff::OButtonImport