• Michael Meeks's avatar
    Merge remote-tracking branch 'origin/feature/vclptr' · e8b97a52
    Michael Meeks yazdı
    Resolve several thousand lines of conflicts.
    
    Conflicts:
    	accessibility/source/extended/accessiblelistbox.cxx
    	accessibility/source/standard/vclxaccessiblecombobox.cxx
    	accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
    	accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
    	accessibility/source/standard/vclxaccessiblelistbox.cxx
    	accessibility/source/standard/vclxaccessibletextfield.cxx
    	basctl/source/basicide/basidesh.cxx
    	cui/source/inc/chardlg.hxx
    	cui/source/tabpages/tpbitmap.cxx
    	dbaccess/source/ui/dlg/UserAdmin.cxx
    	dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
    	extensions/source/propctrlr/propertyeditor.hxx
    	extensions/source/scanner/sanedlg.cxx
    	filter/source/pdf/impdialog.cxx
    	include/sfx2/mgetempl.hxx
    	include/sfx2/sidebar/SidebarToolBox.hxx
    	include/sfx2/viewsh.hxx
    	include/svtools/brwbox.hxx
    	include/svtools/filectrl.hxx
    	include/svtools/scrwin.hxx
    	include/svx/dlgctrl.hxx
    	include/svx/sidebar/Popup.hxx
    	include/svx/sidebar/PopupContainer.hxx
    	include/svx/sidebar/PopupControl.hxx
    	include/svx/sidebar/SidebarDialControl.hxx
    	include/svx/sidebar/ValueSetWithTextControl.hxx
    	sc/source/ui/condformat/condformatdlgentry.cxx
    	sc/source/ui/navipi/navipi.cxx
    	sc/source/ui/sidebar/CellBorderStyleControl.hxx
    	sd/source/ui/animations/CustomAnimationDialog.cxx
    	sd/source/ui/inc/DrawViewShell.hxx
    	sd/source/ui/inc/Ruler.hxx
    	sd/source/ui/inc/SlideSorter.hxx
    	sd/source/ui/inc/ViewTabBar.hxx
    	sd/source/ui/inc/Window.hxx
    	sd/source/ui/inc/morphdlg.hxx
    	sd/source/ui/inc/sdpreslt.hxx
    	sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
    	sd/source/ui/sidebar/LayoutMenu.hxx
    	sd/source/ui/sidebar/MasterPagesSelector.hxx
    	sd/source/ui/sidebar/NavigatorWrapper.hxx
    	sd/source/ui/sidebar/PanelBase.hxx
    	sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
    	sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
    	sd/source/ui/slideshow/showwindow.hxx
    	sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
    	sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
    	sd/source/ui/view/ViewShellBase.cxx
    	sd/source/ui/view/drviewsa.cxx
    	sfx2/source/appl/fileobj.hxx
    	sfx2/source/appl/opengrf.cxx
    	sfx2/source/control/thumbnailviewacc.hxx
    	sfx2/source/dialog/securitypage.cxx
    	sfx2/source/dialog/templdlg.cxx
    	sfx2/source/doc/docinsert.cxx
    	sfx2/source/doc/guisaveas.cxx
    	sfx2/source/inc/alienwarn.hxx
    	sfx2/source/sidebar/Deck.cxx
    	sfx2/source/sidebar/Deck.hxx
    	sfx2/source/sidebar/DeckTitleBar.cxx
    	sfx2/source/sidebar/DeckTitleBar.hxx
    	sfx2/source/sidebar/MenuButton.cxx
    	sfx2/source/sidebar/MenuButton.hxx
    	sfx2/source/sidebar/Panel.cxx
    	sfx2/source/sidebar/Panel.hxx
    	sfx2/source/sidebar/PanelTitleBar.hxx
    	sfx2/source/sidebar/SidebarDockingWindow.hxx
    	sfx2/source/sidebar/SidebarToolBox.cxx
    	sfx2/source/sidebar/TabBar.hxx
    	sfx2/source/sidebar/TabItem.cxx
    	sfx2/source/sidebar/TabItem.hxx
    	sfx2/source/sidebar/TitleBar.hxx
    	sfx2/source/toolbox/imgmgr.cxx
    	starmath/inc/edit.hxx
    	starmath/inc/smmod.hxx
    	starmath/qa/cppunit/test_starmath.cxx
    	starmath/source/edit.cxx
    	starmath/source/smmod.cxx
    	svtools/source/brwbox/brwbox1.cxx
    	svtools/source/brwbox/datwin.hxx
    	svtools/source/contnr/fileview.cxx
    	svtools/source/contnr/simptabl.cxx
    	svtools/source/control/filectrl.cxx
    	svtools/source/control/valueimp.hxx
    	svx/inc/GalleryControl.hxx
    	svx/source/dialog/dlgctrl.cxx
    	svx/source/dialog/swframeexample.cxx
    	svx/source/fmcomp/fmgridif.cxx
    	svx/source/gallery2/GalleryControl.cxx
    	svx/source/sidebar/EmptyPanel.hxx
    	svx/source/sidebar/area/AreaPropertyPanel.hxx
    	svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
    	svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
    	svx/source/sidebar/insert/InsertPropertyPanel.cxx
    	svx/source/sidebar/insert/InsertPropertyPanel.hxx
    	svx/source/sidebar/line/LinePropertyPanel.hxx
    	svx/source/sidebar/line/LineWidthControl.cxx
    	svx/source/sidebar/line/LineWidthControl.hxx
    	svx/source/sidebar/line/LineWidthValueSet.hxx
    	svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
    	svx/source/sidebar/possize/SidebarDialControl.cxx
    	svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
    	svx/source/sidebar/text/TextPropertyPanel.hxx
    	svx/source/sidebar/tools/PopupContainer.cxx
    	svx/source/sidebar/tools/PopupControl.cxx
    	svx/source/sidebar/tools/ValueSetWithTextControl.cxx
    	svx/source/svdraw/svdfmtf.hxx
    	svx/source/svdraw/svdibrow.cxx
    	svx/source/tbxctrls/colrctrl.cxx
    	svx/source/tbxctrls/tbcontrl.cxx
    	sw/source/ui/dbui/mmaddressblockpage.cxx
    	sw/source/ui/dialog/uiregionsw.cxx
    	sw/source/ui/index/cnttab.cxx
    	sw/source/uibase/inc/drpcps.hxx
    	sw/source/uibase/sidebar/PageColumnControl.hxx
    	sw/source/uibase/sidebar/PageMarginControl.hxx
    	sw/source/uibase/sidebar/PageOrientationControl.hxx
    	sw/source/uibase/sidebar/PagePropertyPanel.hxx
    	sw/source/uibase/sidebar/PageSizeControl.hxx
    	sw/source/uibase/uiview/view2.cxx
    	sw/source/uibase/utlui/navipi.cxx
    	vcl/inc/svdata.hxx
    	vcl/source/control/combobox.cxx
    	vcl/source/control/lstbox.cxx
    	vcl/source/window/dockwin.cxx
    	vcl/source/window/winproc.cxx
    
    Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95
    e8b97a52
Adı
Son kayıt (commit)
Son güncelleme
..
alloc.h Loading commit data...
bootstrap.h Loading commit data...
bootstrap.hxx Loading commit data...
byteseq.h Loading commit data...
byteseq.hxx Loading commit data...
character.hxx Loading commit data...
cipher.h Loading commit data...
crc.h Loading commit data...
digest.h Loading commit data...
instance.hxx Loading commit data...
locale.h Loading commit data...
malformeduriexception.hxx Loading commit data...
math.h Loading commit data...
math.hxx Loading commit data...
process.h Loading commit data...
random.h Loading commit data...
ref.hxx Loading commit data...
strbuf.h Loading commit data...
strbuf.hxx Loading commit data...
string.h Loading commit data...
string.hxx Loading commit data...
stringconcat.hxx Loading commit data...
stringutils.hxx Loading commit data...
tencinfo.h Loading commit data...
textcvt.h Loading commit data...
textenc.h Loading commit data...
unload.h Loading commit data...
uri.h Loading commit data...
uri.hxx Loading commit data...
ustrbuf.h Loading commit data...
ustrbuf.hxx Loading commit data...
ustring.h Loading commit data...
ustring.hxx Loading commit data...
uuid.h Loading commit data...