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