More filter types (+apply them) to minimize the AOOi svn differences.

4 files changed, 110 insertions, 11 deletions

diff --git a/aooi-repositories.txt b/aooi-repositories.txt
index a9a8aca..634eb57 100644
--- a/aooi-repositories.txt
+++ b/aooi-repositories.txt
@@ -1,12 +1,21 @@
 # rewrite tabs to spaces (and other trivial filtering)
-:set filter=4,combined644,^(cui/source/dialogs/cuiimapdlg.hrc|cui/source/dialogs/hyphen.cxx|cui/source/dialogs/hyphen.hrc|cui/source/dialogs/hyphen.src|cui/source/dialogs/thesdlg.hrc|cui/source/dialogs/thesdlg.src|cui/source/inc/hyphen.hxx|cui/source/inc/thesdlg.hxx|editeng/inc/editeng/splwrap.hxx|extensions/source/update/check/download.cxx|odk/examples/java/Inspector/InspectorPane.java|odk/examples/java/Inspector/Introspector.java|odk/examples/java/Inspector/ProtocolHandlerAddon.java|odk/examples/java/Inspector/UnoTreeRenderer.java|offapi/com/sun/star/awt/SpinEvent.idl|offapi/com/sun/star/awt/UnoControlSpinButton.idl|offapi/com/sun/star/awt/XSpinField.idl|offapi/com/sun/star/awt/XSpinListener.idl|offapi/com/sun/star/awt/XSpinValue.idl|offapi/com/sun/star/text/TextFrame.idl|scripting/source/vbaevents/eventhelper.cxx|sd/inc/CustomAnimationCloner.hxx|sd/inc/CustomAnimationEffect.hxx|sd/inc/CustomAnimationPreset.hxx|sd/inc/SdShapeTypes.hxx|sd/inc/TransitionPreset.hxx|sd/inc/animations.hxx|sd/inc/anmdef.hxx|sd/inc/app.hxx|sd/inc/diadef.h|sd/inc/eetext.hxx|sd/inc/fadedef.h|sd/inc/helper/simplereferencecomponent.hxx|sd/inc/imapinfo.hxx|sd/inc/misc.hxx|sd/inc/misc/scopelock.hxx|sd/inc/movedef.hxx|sd/inc/pch/precompiled_sd.cxx|sd/inc/pglink.hxx|sd/inc/prlayout.hxx|sd/inc/resltn.hxx|sd/inc/sd_primitivetypes2d.hxx|sd/inc/sdattr.hrc|sd/inc/sdcgmfilter.hxx|sd/inc/sddll.hxx|sd/inc/sddllapi.h|sd/inc/sdenumdef.hxx|sd/inc/sdfilter.hxx|sd/inc/sdobjfac.hxx|sd/inc/sdpptwrp.hxx|sd/inc/sduiks.hrc|sd/inc/sdundo.hxx|sd/inc/stlfamily.hxx|sd/inc/strmname.h|sd/inc/undo/undofactory.hxx|sd/inc/undo/undoobjects.hxx|sd/inc/undoanim.hxx|sd/res/webview/common.pl|sd/res/webview/edit.pl|sd/res/webview/editpic.pl|sd/res/webview/index.pl|sd/res/webview/poll.pl|sd/res/webview/savepic.pl|sd/res/webview/show.pl|sd/res/webview/webview.pl|sd/sdi/_docsh.sdi|sd/sdi/app.sdi|sd/sdi/docshell.sdi|sd/sdi/drbezob.sdi|sd/sdi/drgrfob.sdi|sd/sdi/drviewsh.sdi|sd/sdi/grdocsh.sdi|sd/sdi/grviewsh.sdi|sd/sdi/mediaob.sdi|sd/sdi/sdgslots.sdi|sd/sdi/sdnew.sdi|sd/sdi/sdslots.hrc|sd/sdi/tables.sdi|sd/source/core/CustomAnimationCloner.cxx|sd/source/core/PageListWatcher.cxx|sd/source/core/PageListWatcher.hxx|sd/source/core/TransitionPreset.cxx|sd/source/core/annotations/Annotation.cxx|sd/source/core/annotations/AnnotationAccess.cxx|sd/source/core/annotations/AnnotationEnumeration.cxx|sd/source/core/sdobjfac.cxx|sd/source/core/sdpage_animations.cxx|sd/source/core/stlfamily.cxx|sd/source/core/typemap.cxx|sd/source/core/undo/undofactory.cxx|sd/source/core/undoanim.cxx|sd/source/filter/eppt/epptso.cxx|sd/source/filter/eppt/pptexanimations.cxx|sd/source/filter/eppt/pptexanimations.hxx|sd/source/filter/eppt/pptexsoundcollection.cxx|sd/source/filter/eppt/pptexsoundcollection.hxx|sd/source/filter/html/HtmlOptionsDialog.cxx|sd/source/filter/html/buttonset.cxx|sd/source/filter/html/buttonset.hxx|sd/source/filter/html/pubdlg.src|sd/source/filter/html/sdhtmlfilter.cxx|sd/source/filter/ppt/pptanimations.hxx|sd/source/filter/ppt/propread.cxx|sd/source/filter/sdfilter.cxx|sd/source/filter/xml/sdtransform.cxx|sd/source/helper/simplereferencecomponent.cxx|sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx|sd/source/ui/accessibility/AccessibleOutlineView.cxx|sd/source/ui/accessibility/AccessiblePageShape.cxx|sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx|sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx|sd/source/ui/accessibility/AccessiblePresentationShape.cxx|sd/source/ui/accessibility/AccessibleScrollPanel.cxx|sd/source/ui/accessibility/SdShapeTypes.cxx|sd/source/ui/accessibility/accessibility.hrc|sd/source/ui/accessibility/accessibility.src|sd/source/ui/animations/CustomAnimation.hrc|sd/source/ui/animations/CustomAnimation.src|sd/source/ui/animations/CustomAnimationCreateDialog.hrc|sd/source/ui/animations/CustomAnimationCreateDialog.hxx|sd/source/ui/animations/CustomAnimationCreateDialog.src|sd/source/ui/animations/CustomAnimationDialog.hrc|sd/source/ui/animations/CustomAnimationDialog.src|sd/source/ui/animations/CustomAnimationPane.hrc|sd/source/ui/animations/CustomAnimationPane.src|sd/source/ui/animations/STLPropertySet.cxx|sd/source/ui/animations/STLPropertySet.hxx|sd/source/ui/animations/SlideTransitionPane.hrc|sd/source/ui/animations/SlideTransitionPane.hxx|sd/source/ui/animations/SlideTransitionPane.src|sd/source/ui/annotations/annotations.hrc|sd/source/ui/annotations/annotations.src|sd/source/ui/app/_app.hrc|sd/source/ui/app/accelids_tmpl.src|sd/source/ui/app/app.src|sd/source/ui/app/menu_tmpl.src|sd/source/ui/app/menuids3_tmpl.src|sd/source/ui/app/menuids4_tmpl.src|sd/source/ui/app/menuids_tmpl.src|sd/source/ui/app/menuportal_tmpl.src|sd/source/ui/app/popup.src|sd/source/ui/app/popup2_tmpl.src|sd/source/ui/app/sddll.cxx|sd/source/ui/app/sdstring.src|sd/source/ui/app/tbxids_tmpl.src|sd/source/ui/app/toolbox.src|sd/source/ui/app/toolbox2_tmpl.src|sd/source/ui/dlg/LayerDialog.src|sd/source/ui/dlg/PaneDockingWindow.src|sd/source/ui/dlg/TemplateScanner.cxx|sd/source/ui/dlg/brkdlg.src|sd/source/ui/dlg/celltempl.src|sd/source/ui/dlg/copydlg.src|sd/source/ui/dlg/dlg_char.src|sd/source/ui/dlg/dlgass.src|sd/source/ui/dlg/dlgfield.src|sd/source/ui/dlg/dlgolbul.src|sd/source/ui/dlg/dlgpage.src|sd/source/ui/dlg/dlgsnap.src|sd/source/ui/dlg/headerfooterdlg.src|sd/source/ui/dlg/ins_paste.src|sd/source/ui/dlg/inspagob.src|sd/source/ui/dlg/layeroptionsdlg.cxx|sd/source/ui/dlg/layeroptionsdlg.src|sd/source/ui/dlg/masterlayoutdlg.src|sd/source/ui/dlg/morphdlg.src|sd/source/ui/dlg/paragr.src|sd/source/ui/dlg/present.src|sd/source/ui/dlg/prltempl.src|sd/source/ui/dlg/prntopts.src|sd/source/ui/dlg/sdabstdlg.cxx|sd/source/ui/dlg/sdpreslt.src|sd/source/ui/dlg/sduiexp.cxx|sd/source/ui/dlg/tabtempl.src|sd/source/ui/dlg/tpoption.src|sd/source/ui/docshell/sdclient.cxx|sd/source/ui/framework/configuration/ChangeRequestQueue.cxx|sd/source/ui/framework/configuration/ChangeRequestQueue.hxx|sd/source/ui/framework/configuration/Configuration.cxx|sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx|sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx|sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx|sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx|sd/source/ui/framework/configuration/ResourceFactoryManager.cxx|sd/source/ui/framework/configuration/ResourceFactoryManager.hxx|sd/source/ui/framework/configuration/UpdateRequest.cxx|sd/source/ui/framework/configuration/UpdateRequest.hxx|sd/source/ui/framework/factories/FrameWindowPane.cxx|sd/source/ui/framework/factories/FullScreenPane.hxx|sd/source/ui/framework/module/CenterViewFocusModule.cxx|sd/source/ui/framework/module/CenterViewFocusModule.hxx|sd/source/ui/framework/module/DrawModule.cxx|sd/source/ui/framework/module/ShellStackGuard.cxx|sd/source/ui/framework/module/SlideSorterModule.cxx|sd/source/ui/framework/module/SlideSorterModule.hxx|sd/source/ui/framework/module/ToolBarModule.cxx|sd/source/ui/framework/module/ToolBarModule.hxx|sd/source/ui/framework/module/ViewTabBarModule.cxx|sd/source/ui/framework/module/ViewTabBarModule.hxx|sd/source/ui/func/fuconnct.cxx|sd/source/ui/func/fulink.cxx|sd/source/ui/func/fumeasur.cxx|sd/source/ui/func/futhes.cxx|sd/source/ui/func/fuvect.cxx|sd/source/ui/func/sdundo.cxx|sd/source/ui/func/undoback.cxx|sd/source/ui/func/undoheaderfooter.cxx|sd/source/ui/func/undolayer.cxx|sd/source/ui/func/undopage.cxx|sd/source/ui/func/unmovss.cxx|sd/source/ui/inc/AccessibleDocumentViewBase.hxx|sd/source/ui/inc/AccessibleDrawDocumentView.hxx|sd/source/ui/inc/AccessibleOutlineView.hxx|sd/source/ui/inc/AccessiblePageShape.hxx|sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx|sd/source/ui/inc/AccessiblePresentationOLEShape.hxx|sd/source/ui/inc/AccessiblePresentationShape.hxx|sd/source/ui/inc/AccessibleScrollPanel.hxx|sd/source/ui/inc/AccessibleSlideSorterObject.hxx|sd/source/ui/inc/AccessibleSlideSorterView.hxx|sd/source/ui/inc/BezierObjectBar.hxx|sd/source/ui/inc/Client.hxx|sd/source/ui/inc/ClientView.hxx|sd/source/ui/inc/CustomAnimation.hxx|sd/source/ui/inc/DialogListBox.hxx|sd/source/ui/inc/DocumentRenderer.hxx|sd/source/ui/inc/EventMultiplexer.hxx|sd/source/ui/inc/FormShellManager.hxx|sd/source/ui/inc/GraphicViewShellBase.hxx|sd/source/ui/inc/ImpressViewShellBase.hxx|sd/source/ui/inc/LayerDialog.hrc|sd/source/ui/inc/LayerTabBar.hxx|sd/source/ui/inc/MediaObjectBar.hxx|sd/source/ui/inc/MutexOwner.hxx|sd/source/ui/inc/NotesChildWindow.hrc|sd/source/ui/inc/OutlineViewShellBase.hxx|sd/source/ui/inc/PresentationViewShellBase.hxx|sd/source/ui/inc/ShellFactory.hxx|sd/source/ui/inc/SlideSorterChildWindow.hrc|sd/source/ui/inc/SlideSorterViewShellBase.hxx|sd/source/ui/inc/TextLogger.hxx|sd/source/ui/inc/TextObjectBar.hxx|sd/source/ui/inc/ViewShellHint.hxx|sd/source/ui/inc/ViewTabBar.hxx|sd/source/ui/inc/WindowUpdater.hxx|sd/source/ui/inc/assclass.hxx|sd/source/ui/inc/brkdlg.hrc|sd/source/ui/inc/bulmaper.hxx|sd/source/ui/inc/celltempl.hrc|sd/source/ui/inc/cfgids.hxx|sd/source/ui/inc/copydlg.hrc|sd/source/ui/inc/custsdlg.hrc|sd/source/ui/inc/dialogs.hrc|sd/source/ui/inc/dlg_char.hrc|sd/source/ui/inc/dlgass.hrc|sd/source/ui/inc/dlgfield.hrc|sd/source/ui/inc/dlgolbul.hrc|sd/source/ui/inc/dlgpage.hrc|sd/source/ui/inc/dlgsnap.hrc|sd/source/ui/inc/enumdlg.hrc|sd/source/ui/inc/fontwork.hrc|sd/source/ui/inc/framework/ConfigurationController.hxx|sd/source/ui/inc/framework/DrawModule.hxx|sd/source/ui/inc/framework/ImpressModule.hxx|sd/source/ui/inc/framework/ModuleController.hxx|sd/source/ui/inc/framework/PresentationModule.hxx|sd/source/ui/inc/fuarea.hxx|sd/source/ui/inc/fubullet.hxx|sd/source/ui/inc/fuchar.hxx|sd/source/ui/inc/fuconnct.hxx|sd/source/ui/inc/fucopy.hxx|sd/source/ui/inc/fucushow.hxx|sd/source/ui/inc/fuexpand.hxx|sd/source/ui/inc/fugrid.hxx|sd/source/ui/inc/fuinsert.hxx|sd/source/ui/inc/fuline.hxx|sd/source/ui/inc/fulinend.hxx|sd/source/ui/inc/fulink.hxx|sd/source/ui/inc/fumeasur.hxx|sd/source/ui/inc/fuoaprms.hxx|sd/source/ui/inc/fuolbull.hxx|sd/source/ui/inc/fuparagr.hxx|sd/source/ui/inc/fuprlout.hxx|sd/source/ui/inc/fuprobjs.hxx|sd/source/ui/inc/fuscale.hxx|sd/source/ui/inc/fusldlg.hxx|sd/source/ui/inc/fuslhide.hxx|sd/source/ui/inc/fusnapln.hxx|sd/source/ui/inc/fusumry.hxx|sd/source/ui/inc/futempl.hxx|sd/source/ui/inc/futhes.hxx|sd/source/ui/inc/futxtatt.hxx|sd/source/ui/inc/fuvect.hxx|sd/source/ui/inc/headerfooterdlg.hrc|sd/source/ui/inc/ins_paste.hrc|sd/source/ui/inc/inspagob.hrc|sd/source/ui/inc/layeroptionsdlg.hrc|sd/source/ui/inc/layeroptionsdlg.hxx|sd/source/ui/inc/masterlayoutdlg.hrc|sd/source/ui/inc/morphdlg.hrc|sd/source/ui/inc/optdlg.hrc|sd/source/ui/inc/packgdlg.hrc|sd/source/ui/inc/paragr.hrc|sd/source/ui/inc/paragr.hxx|sd/source/ui/inc/pgjump.hxx|sd/source/ui/inc/present.hrc|sd/source/ui/inc/present.hxx|sd/source/ui/inc/preview.hrc|sd/source/ui/inc/prltempl.hrc|sd/source/ui/inc/prntopts.hrc|sd/source/ui/inc/pubdlg.hrc|sd/source/ui/inc/sdpopup.hxx|sd/source/ui/inc/sdpreslt.hrc|sd/source/ui/inc/sdpreslt.hxx|sd/source/ui/inc/sdstring.hrc|sd/source/ui/inc/tabtempl.hrc|sd/source/ui/inc/tbx_ww.hrc|sd/source/ui/inc/tools/AsynchronousCall.hxx|sd/source/ui/inc/tools/ConfigurationAccess.hxx|sd/source/ui/inc/tools/IdleDetection.hxx|sd/source/ui/inc/tpoption.hrc|sd/source/ui/inc/unchss.hxx|sd/source/ui/inc/undoback.hxx|sd/source/ui/inc/undoheaderfooter.hxx|sd/source/ui/inc/undolayer.hxx|sd/source/ui/inc/unmovss.hxx|sd/source/ui/inc/unokywds.hxx|sd/source/ui/inc/unomodel.hxx|sd/source/ui/inc/unoprnms.hxx|sd/source/ui/inc/unslsel.hxx|sd/source/ui/inc/vectdlg.hrc|sd/source/ui/presenter/CanvasUpdateRequester.cxx|sd/source/ui/presenter/PresenterCanvas.hxx|sd/source/ui/presenter/PresenterCanvasFactory.cxx|sd/source/ui/presenter/PresenterHelper.hxx|sd/source/ui/presenter/PresenterPreviewCache.hxx|sd/source/ui/presenter/PresenterTextView.hxx|sd/source/ui/presenter/SlideRenderer.cxx|sd/source/ui/presenter/SlideRenderer.hxx|sd/source/ui/slideshow/PaneHider.hxx|sd/source/ui/slideshow/SlideShowRestarter.cxx|sd/source/ui/slideshow/SlideShowRestarter.hxx|sd/source/ui/slideshow/slideshowviewimpl.cxx|sd/source/ui/slideshow/slideshowviewimpl.hxx|sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx|sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx|sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx|sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx|sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx|sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx|sd/source/ui/slidesorter/controller/SlsCommand.hxx|sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx|sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx|sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx|sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx|sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx|sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx|sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx|sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx|sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx|sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src|sd/source/ui/slidesorter/view/SlsPageObject.cxx|sd/source/ui/table/TableDesignPane.hrc|sd/source/ui/table/TableDesignPane.hxx|sd/source/ui/table/TableDesignPane.src|sd/source/ui/table/tableobjectbar.hxx|sd/source/ui/toolpanel/ConstrainedIterator.cxx|sd/source/ui/toolpanel/ConstrainedIterator.hxx|sd/source/ui/toolpanel/ControlContainerDescriptor.hxx|sd/source/ui/toolpanel/ControlList.hxx|sd/source/ui/toolpanel/ToolPanelDescriptor.hxx|sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx|sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx|sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx|sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx|sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx|sd/source/ui/tools/AsynchronousCall.cxx|sd/source/ui/tools/EventMultiplexer.cxx|sd/source/ui/tools/IdleDetection.cxx|sd/source/ui/tools/TimerBasedTaskExecution.cxx|sd/source/ui/unoidl/UnoDocumentSettings.hxx|sd/source/ui/unoidl/randomnode.cxx|sd/source/ui/unoidl/sddetect.hxx|sd/source/ui/unoidl/unohelp.hxx|sd/source/ui/unoidl/unokywds.cxx|sd/source/ui/unoidl/unolayer.hxx|sd/source/ui/unoidl/unomodule.cxx|sd/source/ui/unoidl/unomodule.hxx|sd/source/ui/unoidl/unopback.cxx|sd/source/ui/unoidl/unopback.hxx|sd/source/ui/view/FormShellManager.cxx|sd/source/ui/view/UpdateLockManager.cxx|sd/source/ui/view/ViewShellHint.cxx|sd/source/ui/view/WindowUpdater.cxx|sd/source/ui/view/clview.cxx|sd/uiconfig/sdraw/statusbar/statusbar.xml|sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml|sd/uiconfig/sdraw/toolbar/alignmentbar.xml|sd/uiconfig/sdraw/toolbar/arrowsbar.xml|sd/uiconfig/sdraw/toolbar/arrowshapes.xml|sd/uiconfig/sdraw/toolbar/basicshapes.xml|sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml|sd/uiconfig/sdraw/toolbar/calloutshapes.xml|sd/uiconfig/sdraw/toolbar/choosemodebar.xml|sd/uiconfig/sdraw/toolbar/colorbar.xml|sd/uiconfig/sdraw/toolbar/commentsbar.xml|sd/uiconfig/sdraw/toolbar/connectorsbar.xml|sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml|sd/uiconfig/sdraw/toolbar/ellipsesbar.xml|sd/uiconfig/sdraw/toolbar/flowchartshapes.xml|sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml|sd/uiconfig/sdraw/toolbar/formcontrols.xml|sd/uiconfig/sdraw/toolbar/formdesign.xml|sd/uiconfig/sdraw/toolbar/formsfilterbar.xml|sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml|sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml|sd/uiconfig/sdraw/toolbar/fullscreenbar.xml|sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml|sd/uiconfig/sdraw/toolbar/graffilterbar.xml|sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml|sd/uiconfig/sdraw/toolbar/insertbar.xml|sd/uiconfig/sdraw/toolbar/linesbar.xml|sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml|sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml|sd/uiconfig/sdraw/toolbar/moreformcontrols.xml|sd/uiconfig/sdraw/toolbar/optimizetablebar.xml|sd/uiconfig/sdraw/toolbar/optionsbar.xml|sd/uiconfig/sdraw/toolbar/positionbar.xml|sd/uiconfig/sdraw/toolbar/rectanglesbar.xml|sd/uiconfig/sdraw/toolbar/standardbar.xml|sd/uiconfig/sdraw/toolbar/starshapes.xml|sd/uiconfig/sdraw/toolbar/symbolshapes.xml|sd/uiconfig/sdraw/toolbar/tableobjectbar.xml|sd/uiconfig/sdraw/toolbar/textbar.xml|sd/uiconfig/sdraw/toolbar/textobjectbar.xml|sd/uiconfig/sdraw/toolbar/toolbar.xml|sd/uiconfig/sdraw/toolbar/viewerbar.xml|sd/uiconfig/sdraw/toolbar/zoombar.xml|sd/uiconfig/simpress/statusbar/statusbar.xml|sd/uiconfig/simpress/toolbar/3dobjectsbar.xml|sd/uiconfig/simpress/toolbar/alignmentbar.xml|sd/uiconfig/simpress/toolbar/arrowsbar.xml|sd/uiconfig/simpress/toolbar/arrowshapes.xml|sd/uiconfig/simpress/toolbar/basicshapes.xml|sd/uiconfig/simpress/toolbar/bezierobjectbar.xml|sd/uiconfig/simpress/toolbar/calloutshapes.xml|sd/uiconfig/simpress/toolbar/choosemodebar.xml|sd/uiconfig/simpress/toolbar/colorbar.xml|sd/uiconfig/simpress/toolbar/commentsbar.xml|sd/uiconfig/simpress/toolbar/connectorsbar.xml|sd/uiconfig/simpress/toolbar/drawingobjectbar.xml|sd/uiconfig/simpress/toolbar/ellipsesbar.xml|sd/uiconfig/simpress/toolbar/flowchartshapes.xml|sd/uiconfig/simpress/toolbar/fontworkshapetype.xml|sd/uiconfig/simpress/toolbar/formcontrols.xml|sd/uiconfig/simpress/toolbar/formdesign.xml|sd/uiconfig/simpress/toolbar/formsfilterbar.xml|sd/uiconfig/simpress/toolbar/formsnavigationbar.xml|sd/uiconfig/simpress/toolbar/formtextobjectbar.xml|sd/uiconfig/simpress/toolbar/fullscreenbar.xml|sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml|sd/uiconfig/simpress/toolbar/graffilterbar.xml|sd/uiconfig/simpress/toolbar/graphicobjectbar.xml|sd/uiconfig/simpress/toolbar/linesbar.xml|sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml|sd/uiconfig/simpress/toolbar/mediaobjectbar.xml|sd/uiconfig/simpress/toolbar/moreformcontrols.xml|sd/uiconfig/simpress/toolbar/optimizetablebar.xml|sd/uiconfig/simpress/toolbar/optionsbar.xml|sd/uiconfig/simpress/toolbar/outlinetoolbar.xml|sd/uiconfig/simpress/toolbar/positionbar.xml|sd/uiconfig/simpress/toolbar/rectanglesbar.xml|sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml|sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml|sd/uiconfig/simpress/toolbar/standardbar.xml|sd/uiconfig/simpress/toolbar/starshapes.xml|sd/uiconfig/simpress/toolbar/symbolshapes.xml|sd/uiconfig/simpress/toolbar/tableobjectbar.xml|sd/uiconfig/simpress/toolbar/textbar.xml|sd/uiconfig/simpress/toolbar/textobjectbar.xml|sd/uiconfig/simpress/toolbar/toolbar.xml|sd/uiconfig/simpress/toolbar/viewerbar.xml|sd/uiconfig/simpress/toolbar/zoombar.xml|sd/util/hidother.hrc|sd/util/sdfilt.map|sd/util/sdui.map|sd/xml/AccessibleDrawDocumentView.xml|sd/xml/AccessibleOutlineView.xml|sd/xml/AccessiblePageShape.xml|sd/xml/AccessiblePresentationGraphicShape.xml|sd/xml/AccessiblePresentationOLEShape.xml|sd/xml/AccessiblePresentationShape.xml|sd/xml/AccessibleSlideView.xml|sd/xml/AccessibleSlideViewObject.xml|sd/xml/DrawingView.xml|sd/xml/HandoutView.xml|sd/xml/NotesView.xml|sd/xml/OutlineView.xml|sd/xml/PresentationView.xml|sd/xml/SdDocLinkTargets.xml|sd/xml/SdDrawPage.xml|sd/xml/SdDrawPagesAccess.xml|sd/xml/SdGenericDrawPage.xml|sd/xml/SdLayer.xml|sd/xml/SdLayerManager.xml|sd/xml/SdMasterPage.xml|sd/xml/SdMasterPagesAccess.xml|sd/xml/SdPageLinkTargets.xml|sd/xml/SdXCustomPresentation.xml|sd/xml/SdXCustomPresentationAccess.xml|sd/xml/SdXImpressDocument.xml|sd/xml/SdXPresentation.xml|sd/xml/SdXShape.xml|sd/xml/SlidesView.xml|sd/xml/effects.xml|sd/xml/transitions-ogl.xml|sd/xml/transitions.xml|sdext/source/minimizer/description.xml|sfx2/source/doc/sfxacldetect.cxx|sfx2/source/doc/syspath.cxx|shell/inc/internal/propsheets.hxx|smoketestoo_native/version.map|svl/qa/export.map|svtools/source/control/fileurlbox.cxx|svtools/source/control/fixedhyper.cxx|svtools/source/control/hyperlabel.cxx|svtools/source/control/urlcontrol.cxx|svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx|svx/inc/svx/unoshprp.hxx|svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx|sw/inc/dochdl.hrc|sw/source/ui/dochdl/dochdl.src|testautomation/extensions/optional/input/issues/Logging.xcu|testautomation/global/input/xml_filter/docbook.xml|tools/inc/tools/solarmutex.hxx|ucb/source/core/cmdenv.cxx|unotools/inc/unotools/options.hxx|unotools/source/config/options.cxx|uui/source/nameclashdlg.src|xmloff/source/forms/handler/form_handler_factory.cxx|xmloff/source/forms/handler/property_handler_base.hxx|xmloff/source/forms/property_description.hxx|xmloff/source/forms/property_meta_data.cxx)$
+:set filter=4,combined644,^(cui/source/dialogs/cuiimapdlg.hrc|cui/source/dialogs/hyphen.cxx|cui/source/dialogs/hyphen.hrc|cui/source/dialogs/hyphen.src|cui/source/dialogs/thesdlg.hrc|cui/source/dialogs/thesdlg.src|cui/source/inc/hyphen.hxx|cui/source/inc/thesdlg.hxx|editeng/inc/editeng/splwrap.hxx|extensions/source/update/check/download.cxx|odk/examples/java/Inspector/Introspector.java|odk/examples/java/Inspector/ProtocolHandlerAddon.java|odk/examples/java/Inspector/UnoTreeRenderer.java|offapi/com/sun/star/awt/SpinEvent.idl|offapi/com/sun/star/awt/UnoControlSpinButton.idl|offapi/com/sun/star/awt/XSpinField.idl|offapi/com/sun/star/awt/XSpinListener.idl|offapi/com/sun/star/awt/XSpinValue.idl|offapi/com/sun/star/text/TextFrame.idl|scripting/source/vbaevents/eventhelper.cxx|sd/inc/CustomAnimationCloner.hxx|sd/inc/CustomAnimationEffect.hxx|sd/inc/CustomAnimationPreset.hxx|sd/inc/SdShapeTypes.hxx|sd/inc/TransitionPreset.hxx|sd/inc/animations.hxx|sd/inc/anmdef.hxx|sd/inc/app.hxx|sd/inc/diadef.h|sd/inc/eetext.hxx|sd/inc/fadedef.h|sd/inc/helper/simplereferencecomponent.hxx|sd/inc/imapinfo.hxx|sd/inc/misc.hxx|sd/inc/misc/scopelock.hxx|sd/inc/movedef.hxx|sd/inc/pch/precompiled_sd.cxx|sd/inc/pglink.hxx|sd/inc/prlayout.hxx|sd/inc/resltn.hxx|sd/inc/sd_primitivetypes2d.hxx|sd/inc/sdattr.hrc|sd/inc/sdcgmfilter.hxx|sd/inc/sddll.hxx|sd/inc/sddllapi.h|sd/inc/sdenumdef.hxx|sd/inc/sdfilter.hxx|sd/inc/sdobjfac.hxx|sd/inc/sdpptwrp.hxx|sd/inc/sduiks.hrc|sd/inc/sdundo.hxx|sd/inc/stlfamily.hxx|sd/inc/strmname.h|sd/inc/undo/undofactory.hxx|sd/inc/undo/undoobjects.hxx|sd/inc/undoanim.hxx|sd/res/webview/common.pl|sd/res/webview/edit.pl|sd/res/webview/editpic.pl|sd/res/webview/index.pl|sd/res/webview/poll.pl|sd/res/webview/savepic.pl|sd/res/webview/show.pl|sd/res/webview/webview.pl|sd/sdi/_docsh.sdi|sd/sdi/app.sdi|sd/sdi/docshell.sdi|sd/sdi/drbezob.sdi|sd/sdi/drgrfob.sdi|sd/sdi/drviewsh.sdi|sd/sdi/grdocsh.sdi|sd/sdi/grviewsh.sdi|sd/sdi/mediaob.sdi|sd/sdi/sdgslots.sdi|sd/sdi/sdnew.sdi|sd/sdi/sdslots.hrc|sd/sdi/tables.sdi|sd/source/core/CustomAnimationCloner.cxx|sd/source/core/PageListWatcher.cxx|sd/source/core/PageListWatcher.hxx|sd/source/core/TransitionPreset.cxx|sd/source/core/annotations/Annotation.cxx|sd/source/core/annotations/AnnotationAccess.cxx|sd/source/core/annotations/AnnotationEnumeration.cxx|sd/source/core/sdobjfac.cxx|sd/source/core/sdpage_animations.cxx|sd/source/core/stlfamily.cxx|sd/source/core/typemap.cxx|sd/source/core/undo/undofactory.cxx|sd/source/core/undoanim.cxx|sd/source/filter/eppt/epptso.cxx|sd/source/filter/eppt/pptexanimations.cxx|sd/source/filter/eppt/pptexanimations.hxx|sd/source/filter/eppt/pptexsoundcollection.cxx|sd/source/filter/eppt/pptexsoundcollection.hxx|sd/source/filter/html/HtmlOptionsDialog.cxx|sd/source/filter/html/buttonset.cxx|sd/source/filter/html/buttonset.hxx|sd/source/filter/html/pubdlg.src|sd/source/filter/html/sdhtmlfilter.cxx|sd/source/filter/ppt/pptanimations.hxx|sd/source/filter/ppt/propread.cxx|sd/source/filter/sdfilter.cxx|sd/source/filter/xml/sdtransform.cxx|sd/source/helper/simplereferencecomponent.cxx|sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx|sd/source/ui/accessibility/AccessibleOutlineView.cxx|sd/source/ui/accessibility/AccessiblePageShape.cxx|sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx|sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx|sd/source/ui/accessibility/AccessiblePresentationShape.cxx|sd/source/ui/accessibility/AccessibleScrollPanel.cxx|sd/source/ui/accessibility/SdShapeTypes.cxx|sd/source/ui/accessibility/accessibility.hrc|sd/source/ui/accessibility/accessibility.src|sd/source/ui/animations/CustomAnimation.hrc|sd/source/ui/animations/CustomAnimation.src|sd/source/ui/animations/CustomAnimationCreateDialog.hrc|sd/source/ui/animations/CustomAnimationCreateDialog.hxx|sd/source/ui/animations/CustomAnimationCreateDialog.src|sd/source/ui/animations/CustomAnimationDialog.hrc|sd/source/ui/animations/CustomAnimationDialog.src|sd/source/ui/animations/CustomAnimationPane.hrc|sd/source/ui/animations/CustomAnimationPane.src|sd/source/ui/animations/STLPropertySet.cxx|sd/source/ui/animations/STLPropertySet.hxx|sd/source/ui/animations/SlideTransitionPane.hrc|sd/source/ui/animations/SlideTransitionPane.hxx|sd/source/ui/animations/SlideTransitionPane.src|sd/source/ui/annotations/annotations.hrc|sd/source/ui/annotations/annotations.src|sd/source/ui/app/_app.hrc|sd/source/ui/app/accelids_tmpl.src|sd/source/ui/app/app.src|sd/source/ui/app/menu_tmpl.src|sd/source/ui/app/menuids3_tmpl.src|sd/source/ui/app/menuids4_tmpl.src|sd/source/ui/app/menuids_tmpl.src|sd/source/ui/app/menuportal_tmpl.src|sd/source/ui/app/popup.src|sd/source/ui/app/popup2_tmpl.src|sd/source/ui/app/sddll.cxx|sd/source/ui/app/sdstring.src|sd/source/ui/app/tbxids_tmpl.src|sd/source/ui/app/toolbox.src|sd/source/ui/app/toolbox2_tmpl.src|sd/source/ui/dlg/LayerDialog.src|sd/source/ui/dlg/PaneDockingWindow.src|sd/source/ui/dlg/TemplateScanner.cxx|sd/source/ui/dlg/brkdlg.src|sd/source/ui/dlg/celltempl.src|sd/source/ui/dlg/copydlg.src|sd/source/ui/dlg/dlg_char.src|sd/source/ui/dlg/dlgass.src|sd/source/ui/dlg/dlgfield.src|sd/source/ui/dlg/dlgolbul.src|sd/source/ui/dlg/dlgpage.src|sd/source/ui/dlg/dlgsnap.src|sd/source/ui/dlg/headerfooterdlg.src|sd/source/ui/dlg/ins_paste.src|sd/source/ui/dlg/inspagob.src|sd/source/ui/dlg/layeroptionsdlg.cxx|sd/source/ui/dlg/layeroptionsdlg.src|sd/source/ui/dlg/masterlayoutdlg.src|sd/source/ui/dlg/morphdlg.src|sd/source/ui/dlg/paragr.src|sd/source/ui/dlg/present.src|sd/source/ui/dlg/prltempl.src|sd/source/ui/dlg/prntopts.src|sd/source/ui/dlg/sdabstdlg.cxx|sd/source/ui/dlg/sdpreslt.src|sd/source/ui/dlg/sduiexp.cxx|sd/source/ui/dlg/tabtempl.src|sd/source/ui/dlg/tpoption.src|sd/source/ui/docshell/sdclient.cxx|sd/source/ui/framework/configuration/ChangeRequestQueue.cxx|sd/source/ui/framework/configuration/ChangeRequestQueue.hxx|sd/source/ui/framework/configuration/Configuration.cxx|sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx|sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx|sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx|sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx|sd/source/ui/framework/configuration/ResourceFactoryManager.cxx|sd/source/ui/framework/configuration/ResourceFactoryManager.hxx|sd/source/ui/framework/configuration/UpdateRequest.cxx|sd/source/ui/framework/configuration/UpdateRequest.hxx|sd/source/ui/framework/factories/FrameWindowPane.cxx|sd/source/ui/framework/factories/FullScreenPane.hxx|sd/source/ui/framework/module/CenterViewFocusModule.cxx|sd/source/ui/framework/module/CenterViewFocusModule.hxx|sd/source/ui/framework/module/DrawModule.cxx|sd/source/ui/framework/module/ShellStackGuard.cxx|sd/source/ui/framework/module/SlideSorterModule.cxx|sd/source/ui/framework/module/SlideSorterModule.hxx|sd/source/ui/framework/module/ToolBarModule.cxx|sd/source/ui/framework/module/ToolBarModule.hxx|sd/source/ui/framework/module/ViewTabBarModule.cxx|sd/source/ui/framework/module/ViewTabBarModule.hxx|sd/source/ui/func/fuconnct.cxx|sd/source/ui/func/fulink.cxx|sd/source/ui/func/fumeasur.cxx|sd/source/ui/func/futhes.cxx|sd/source/ui/func/fuvect.cxx|sd/source/ui/func/sdundo.cxx|sd/source/ui/func/undoback.cxx|sd/source/ui/func/undoheaderfooter.cxx|sd/source/ui/func/undolayer.cxx|sd/source/ui/func/undopage.cxx|sd/source/ui/func/unmovss.cxx|sd/source/ui/inc/AccessibleDocumentViewBase.hxx|sd/source/ui/inc/AccessibleDrawDocumentView.hxx|sd/source/ui/inc/AccessibleOutlineView.hxx|sd/source/ui/inc/AccessiblePageShape.hxx|sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx|sd/source/ui/inc/AccessiblePresentationOLEShape.hxx|sd/source/ui/inc/AccessiblePresentationShape.hxx|sd/source/ui/inc/AccessibleScrollPanel.hxx|sd/source/ui/inc/AccessibleSlideSorterObject.hxx|sd/source/ui/inc/AccessibleSlideSorterView.hxx|sd/source/ui/inc/BezierObjectBar.hxx|sd/source/ui/inc/Client.hxx|sd/source/ui/inc/ClientView.hxx|sd/source/ui/inc/CustomAnimation.hxx|sd/source/ui/inc/DialogListBox.hxx|sd/source/ui/inc/DocumentRenderer.hxx|sd/source/ui/inc/EventMultiplexer.hxx|sd/source/ui/inc/FormShellManager.hxx|sd/source/ui/inc/GraphicViewShellBase.hxx|sd/source/ui/inc/ImpressViewShellBase.hxx|sd/source/ui/inc/LayerDialog.hrc|sd/source/ui/inc/LayerTabBar.hxx|sd/source/ui/inc/MediaObjectBar.hxx|sd/source/ui/inc/MutexOwner.hxx|sd/source/ui/inc/NotesChildWindow.hrc|sd/source/ui/inc/OutlineViewShellBase.hxx|sd/source/ui/inc/PresentationViewShellBase.hxx|sd/source/ui/inc/ShellFactory.hxx|sd/source/ui/inc/SlideSorterChildWindow.hrc|sd/source/ui/inc/SlideSorterViewShellBase.hxx|sd/source/ui/inc/TextLogger.hxx|sd/source/ui/inc/TextObjectBar.hxx|sd/source/ui/inc/ViewShellHint.hxx|sd/source/ui/inc/ViewTabBar.hxx|sd/source/ui/inc/WindowUpdater.hxx|sd/source/ui/inc/assclass.hxx|sd/source/ui/inc/brkdlg.hrc|sd/source/ui/inc/bulmaper.hxx|sd/source/ui/inc/celltempl.hrc|sd/source/ui/inc/cfgids.hxx|sd/source/ui/inc/copydlg.hrc|sd/source/ui/inc/custsdlg.hrc|sd/source/ui/inc/dialogs.hrc|sd/source/ui/inc/dlg_char.hrc|sd/source/ui/inc/dlgass.hrc|sd/source/ui/inc/dlgfield.hrc|sd/source/ui/inc/dlgolbul.hrc|sd/source/ui/inc/dlgpage.hrc|sd/source/ui/inc/dlgsnap.hrc|sd/source/ui/inc/enumdlg.hrc|sd/source/ui/inc/fontwork.hrc|sd/source/ui/inc/framework/ConfigurationController.hxx|sd/source/ui/inc/framework/DrawModule.hxx|sd/source/ui/inc/framework/ImpressModule.hxx|sd/source/ui/inc/framework/ModuleController.hxx|sd/source/ui/inc/framework/PresentationModule.hxx|sd/source/ui/inc/fuarea.hxx|sd/source/ui/inc/fubullet.hxx|sd/source/ui/inc/fuchar.hxx|sd/source/ui/inc/fuconnct.hxx|sd/source/ui/inc/fucopy.hxx|sd/source/ui/inc/fucushow.hxx|sd/source/ui/inc/fuexpand.hxx|sd/source/ui/inc/fugrid.hxx|sd/source/ui/inc/fuinsert.hxx|sd/source/ui/inc/fuline.hxx|sd/source/ui/inc/fulinend.hxx|sd/source/ui/inc/fulink.hxx|sd/source/ui/inc/fumeasur.hxx|sd/source/ui/inc/fuoaprms.hxx|sd/source/ui/inc/fuolbull.hxx|sd/source/ui/inc/fuparagr.hxx|sd/source/ui/inc/fuprlout.hxx|sd/source/ui/inc/fuprobjs.hxx|sd/source/ui/inc/fuscale.hxx|sd/source/ui/inc/fusldlg.hxx|sd/source/ui/inc/fuslhide.hxx|sd/source/ui/inc/fusnapln.hxx|sd/source/ui/inc/fusumry.hxx|sd/source/ui/inc/futempl.hxx|sd/source/ui/inc/futhes.hxx|sd/source/ui/inc/futxtatt.hxx|sd/source/ui/inc/fuvect.hxx|sd/source/ui/inc/headerfooterdlg.hrc|sd/source/ui/inc/ins_paste.hrc|sd/source/ui/inc/inspagob.hrc|sd/source/ui/inc/layeroptionsdlg.hrc|sd/source/ui/inc/layeroptionsdlg.hxx|sd/source/ui/inc/masterlayoutdlg.hrc|sd/source/ui/inc/morphdlg.hrc|sd/source/ui/inc/optdlg.hrc|sd/source/ui/inc/packgdlg.hrc|sd/source/ui/inc/paragr.hrc|sd/source/ui/inc/paragr.hxx|sd/source/ui/inc/pgjump.hxx|sd/source/ui/inc/present.hrc|sd/source/ui/inc/present.hxx|sd/source/ui/inc/preview.hrc|sd/source/ui/inc/prltempl.hrc|sd/source/ui/inc/prntopts.hrc|sd/source/ui/inc/pubdlg.hrc|sd/source/ui/inc/sdpopup.hxx|sd/source/ui/inc/sdpreslt.hrc|sd/source/ui/inc/sdpreslt.hxx|sd/source/ui/inc/sdstring.hrc|sd/source/ui/inc/tabtempl.hrc|sd/source/ui/inc/tbx_ww.hrc|sd/source/ui/inc/tools/AsynchronousCall.hxx|sd/source/ui/inc/tools/ConfigurationAccess.hxx|sd/source/ui/inc/tools/IdleDetection.hxx|sd/source/ui/inc/tpoption.hrc|sd/source/ui/inc/unchss.hxx|sd/source/ui/inc/undoback.hxx|sd/source/ui/inc/undoheaderfooter.hxx|sd/source/ui/inc/undolayer.hxx|sd/source/ui/inc/unmovss.hxx|sd/source/ui/inc/unokywds.hxx|sd/source/ui/inc/unomodel.hxx|sd/source/ui/inc/unoprnms.hxx|sd/source/ui/inc/unslsel.hxx|sd/source/ui/inc/vectdlg.hrc|sd/source/ui/presenter/CanvasUpdateRequester.cxx|sd/source/ui/presenter/PresenterCanvas.hxx|sd/source/ui/presenter/PresenterCanvasFactory.cxx|sd/source/ui/presenter/PresenterHelper.hxx|sd/source/ui/presenter/PresenterPreviewCache.hxx|sd/source/ui/presenter/PresenterTextView.hxx|sd/source/ui/presenter/SlideRenderer.cxx|sd/source/ui/presenter/SlideRenderer.hxx|sd/source/ui/slideshow/PaneHider.hxx|sd/source/ui/slideshow/SlideShowRestarter.cxx|sd/source/ui/slideshow/SlideShowRestarter.hxx|sd/source/ui/slideshow/slideshowviewimpl.cxx|sd/source/ui/slideshow/slideshowviewimpl.hxx|sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx|sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx|sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx|sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx|sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx|sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx|sd/source/ui/slidesorter/controller/SlsCommand.hxx|sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx|sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx|sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx|sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx|sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx|sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx|sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx|sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx|sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx|sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src|sd/source/ui/slidesorter/view/SlsPageObject.cxx|sd/source/ui/table/TableDesignPane.hrc|sd/source/ui/table/TableDesignPane.hxx|sd/source/ui/table/TableDesignPane.src|sd/source/ui/table/tableobjectbar.hxx|sd/source/ui/toolpanel/ConstrainedIterator.cxx|sd/source/ui/toolpanel/ConstrainedIterator.hxx|sd/source/ui/toolpanel/ControlContainerDescriptor.hxx|sd/source/ui/toolpanel/ControlList.hxx|sd/source/ui/toolpanel/ToolPanelDescriptor.hxx|sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx|sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx|sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx|sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx|sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx|sd/source/ui/tools/AsynchronousCall.cxx|sd/source/ui/tools/EventMultiplexer.cxx|sd/source/ui/tools/IdleDetection.cxx|sd/source/ui/tools/TimerBasedTaskExecution.cxx|sd/source/ui/unoidl/UnoDocumentSettings.hxx|sd/source/ui/unoidl/randomnode.cxx|sd/source/ui/unoidl/sddetect.hxx|sd/source/ui/unoidl/unohelp.hxx|sd/source/ui/unoidl/unokywds.cxx|sd/source/ui/unoidl/unolayer.hxx|sd/source/ui/unoidl/unomodule.cxx|sd/source/ui/unoidl/unomodule.hxx|sd/source/ui/unoidl/unopback.cxx|sd/source/ui/unoidl/unopback.hxx|sd/source/ui/view/FormShellManager.cxx|sd/source/ui/view/UpdateLockManager.cxx|sd/source/ui/view/ViewShellHint.cxx|sd/source/ui/view/WindowUpdater.cxx|sd/source/ui/view/clview.cxx|sd/uiconfig/sdraw/statusbar/statusbar.xml|sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml|sd/uiconfig/sdraw/toolbar/alignmentbar.xml|sd/uiconfig/sdraw/toolbar/arrowsbar.xml|sd/uiconfig/sdraw/toolbar/arrowshapes.xml|sd/uiconfig/sdraw/toolbar/basicshapes.xml|sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml|sd/uiconfig/sdraw/toolbar/calloutshapes.xml|sd/uiconfig/sdraw/toolbar/choosemodebar.xml|sd/uiconfig/sdraw/toolbar/colorbar.xml|sd/uiconfig/sdraw/toolbar/commentsbar.xml|sd/uiconfig/sdraw/toolbar/connectorsbar.xml|sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml|sd/uiconfig/sdraw/toolbar/ellipsesbar.xml|sd/uiconfig/sdraw/toolbar/flowchartshapes.xml|sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml|sd/uiconfig/sdraw/toolbar/formcontrols.xml|sd/uiconfig/sdraw/toolbar/formdesign.xml|sd/uiconfig/sdraw/toolbar/formsfilterbar.xml|sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml|sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml|sd/uiconfig/sdraw/toolbar/fullscreenbar.xml|sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml|sd/uiconfig/sdraw/toolbar/graffilterbar.xml|sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml|sd/uiconfig/sdraw/toolbar/insertbar.xml|sd/uiconfig/sdraw/toolbar/linesbar.xml|sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml|sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml|sd/uiconfig/sdraw/toolbar/moreformcontrols.xml|sd/uiconfig/sdraw/toolbar/optimizetablebar.xml|sd/uiconfig/sdraw/toolbar/optionsbar.xml|sd/uiconfig/sdraw/toolbar/positionbar.xml|sd/uiconfig/sdraw/toolbar/rectanglesbar.xml|sd/uiconfig/sdraw/toolbar/standardbar.xml|sd/uiconfig/sdraw/toolbar/starshapes.xml|sd/uiconfig/sdraw/toolbar/symbolshapes.xml|sd/uiconfig/sdraw/toolbar/tableobjectbar.xml|sd/uiconfig/sdraw/toolbar/textbar.xml|sd/uiconfig/sdraw/toolbar/textobjectbar.xml|sd/uiconfig/sdraw/toolbar/toolbar.xml|sd/uiconfig/sdraw/toolbar/viewerbar.xml|sd/uiconfig/sdraw/toolbar/zoombar.xml|sd/uiconfig/simpress/statusbar/statusbar.xml|sd/uiconfig/simpress/toolbar/3dobjectsbar.xml|sd/uiconfig/simpress/toolbar/alignmentbar.xml|sd/uiconfig/simpress/toolbar/arrowsbar.xml|sd/uiconfig/simpress/toolbar/arrowshapes.xml|sd/uiconfig/simpress/toolbar/basicshapes.xml|sd/uiconfig/simpress/toolbar/bezierobjectbar.xml|sd/uiconfig/simpress/toolbar/calloutshapes.xml|sd/uiconfig/simpress/toolbar/choosemodebar.xml|sd/uiconfig/simpress/toolbar/colorbar.xml|sd/uiconfig/simpress/toolbar/commentsbar.xml|sd/uiconfig/simpress/toolbar/connectorsbar.xml|sd/uiconfig/simpress/toolbar/drawingobjectbar.xml|sd/uiconfig/simpress/toolbar/ellipsesbar.xml|sd/uiconfig/simpress/toolbar/flowchartshapes.xml|sd/uiconfig/simpress/toolbar/fontworkshapetype.xml|sd/uiconfig/simpress/toolbar/formcontrols.xml|sd/uiconfig/simpress/toolbar/formdesign.xml|sd/uiconfig/simpress/toolbar/formsfilterbar.xml|sd/uiconfig/simpress/toolbar/formsnavigationbar.xml|sd/uiconfig/simpress/toolbar/formtextobjectbar.xml|sd/uiconfig/simpress/toolbar/fullscreenbar.xml|sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml|sd/uiconfig/simpress/toolbar/graffilterbar.xml|sd/uiconfig/simpress/toolbar/graphicobjectbar.xml|sd/uiconfig/simpress/toolbar/linesbar.xml|sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml|sd/uiconfig/simpress/toolbar/mediaobjectbar.xml|sd/uiconfig/simpress/toolbar/moreformcontrols.xml|sd/uiconfig/simpress/toolbar/optimizetablebar.xml|sd/uiconfig/simpress/toolbar/optionsbar.xml|sd/uiconfig/simpress/toolbar/outlinetoolbar.xml|sd/uiconfig/simpress/toolbar/positionbar.xml|sd/uiconfig/simpress/toolbar/rectanglesbar.xml|sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml|sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml|sd/uiconfig/simpress/toolbar/standardbar.xml|sd/uiconfig/simpress/toolbar/starshapes.xml|sd/uiconfig/simpress/toolbar/symbolshapes.xml|sd/uiconfig/simpress/toolbar/tableobjectbar.xml|sd/uiconfig/simpress/toolbar/textbar.xml|sd/uiconfig/simpress/toolbar/textobjectbar.xml|sd/uiconfig/simpress/toolbar/toolbar.xml|sd/uiconfig/simpress/toolbar/viewerbar.xml|sd/uiconfig/simpress/toolbar/zoombar.xml|sd/util/hidother.hrc|sd/util/sdfilt.map|sd/util/sdui.map|sd/xml/AccessibleDrawDocumentView.xml|sd/xml/AccessibleOutlineView.xml|sd/xml/AccessiblePageShape.xml|sd/xml/AccessiblePresentationGraphicShape.xml|sd/xml/AccessiblePresentationOLEShape.xml|sd/xml/AccessiblePresentationShape.xml|sd/xml/AccessibleSlideView.xml|sd/xml/AccessibleSlideViewObject.xml|sd/xml/DrawingView.xml|sd/xml/HandoutView.xml|sd/xml/NotesView.xml|sd/xml/OutlineView.xml|sd/xml/PresentationView.xml|sd/xml/SdDocLinkTargets.xml|sd/xml/SdDrawPage.xml|sd/xml/SdDrawPagesAccess.xml|sd/xml/SdGenericDrawPage.xml|sd/xml/SdLayer.xml|sd/xml/SdLayerManager.xml|sd/xml/SdMasterPage.xml|sd/xml/SdMasterPagesAccess.xml|sd/xml/SdPageLinkTargets.xml|sd/xml/SdXCustomPresentation.xml|sd/xml/SdXCustomPresentationAccess.xml|sd/xml/SdXImpressDocument.xml|sd/xml/SdXPresentation.xml|sd/xml/SdXShape.xml|sd/xml/SlidesView.xml|sd/xml/effects.xml|sd/xml/transitions-ogl.xml|sd/xml/transitions.xml|sdext/source/minimizer/description.xml|sfx2/source/doc/sfxacldetect.cxx|sfx2/source/doc/syspath.cxx|shell/inc/internal/propsheets.hxx|smoketestoo_native/version.map|svl/qa/export.map|svtools/source/control/fileurlbox.cxx|svtools/source/control/fixedhyper.cxx|svtools/source/control/hyperlabel.cxx|svtools/source/control/urlcontrol.cxx|svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx|svx/inc/svx/unoshprp.hxx|svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx|sw/inc/dochdl.hrc|sw/source/ui/dochdl/dochdl.src|testautomation/extensions/optional/input/issues/Logging.xcu|testautomation/global/input/xml_filter/docbook.xml|tools/inc/tools/solarmutex.hxx|ucb/source/core/cmdenv.cxx|unotools/inc/unotools/options.hxx|unotools/source/config/options.cxx|uui/source/nameclashdlg.src|xmloff/source/forms/handler/form_handler_factory.cxx|xmloff/source/forms/handler/property_handler_base.hxx|xmloff/source/forms/property_description.hxx|xmloff/source/forms/property_meta_data.cxx)$
 :set filter=4,combined755,^(basic/source/sbx/sbxvalue.cxx|binaryurp/source/bridgefactory.hxx|binaryurp/source/cache.hxx|binaryurp/source/marshal.hxx|binaryurp/source/reader.cxx|binaryurp/source/unmarshal.cxx|binaryurp/source/writer.cxx|canvas/inc/canvas/canvastools.hxx|canvas/source/tools/canvastools.cxx|canvas/source/vcl/spritehelper.cxx|chart2/source/controller/chartapiwrapper/AreaWrapper.cxx|chart2/source/controller/chartapiwrapper/AxisWrapper.cxx|chart2/source/controller/chartapiwrapper/AxisWrapper.hxx|chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx|chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx|chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx|chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx|chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx|chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx|chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx|chart2/source/controller/chartapiwrapper/GridWrapper.cxx|chart2/source/controller/chartapiwrapper/GridWrapper.hxx|chart2/source/controller/chartapiwrapper/LegendWrapper.cxx|chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx|chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx|chart2/source/controller/chartapiwrapper/TitleWrapper.cxx|chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx|chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx|chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx|chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx|chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx|chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx|chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx|chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx|chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx|chart2/source/model/main/Axis.cxx|chart2/source/model/main/BaseCoordinateSystem.cxx|chart2/source/model/main/ChartModel.hxx|chart2/source/model/main/DataPoint.cxx|chart2/source/model/main/DataPoint.hxx|chart2/source/model/main/DataSeries.cxx|chart2/source/model/main/FormattedString.cxx|chart2/source/model/main/GridProperties.cxx|chart2/source/model/main/Legend.cxx|chart2/source/model/main/Legend.hxx|chart2/source/model/main/PageBackground.cxx|chart2/source/model/main/StockBar.cxx|chart2/source/model/main/Title.cxx|chart2/source/model/main/Wall.cxx|chart2/source/model/template/AreaChartTypeTemplate.cxx|chart2/source/model/template/BarChartTypeTemplate.cxx|chart2/source/model/template/BubbleChartType.cxx|chart2/source/model/template/BubbleChartTypeTemplate.cxx|chart2/source/model/template/BubbleDataInterpreter.cxx|chart2/source/model/template/CandleStickChartType.cxx|chart2/source/model/template/ChartType.cxx|chart2/source/model/template/ChartTypeTemplate.cxx|chart2/source/model/template/ColumnChartType.cxx|chart2/source/model/template/ColumnLineChartTypeTemplate.cxx|chart2/source/model/template/DataInterpreter.cxx|chart2/source/model/template/DataInterpreter.hxx|chart2/source/model/template/LineChartType.cxx|chart2/source/model/template/LineChartTypeTemplate.cxx|chart2/source/model/template/NetChartType.cxx|chart2/source/model/template/PieChartType.cxx|chart2/source/model/template/PieChartTypeTemplate.cxx|chart2/source/model/template/ScatterChartType.cxx|chart2/source/model/template/ScatterChartTypeTemplate.cxx|chart2/source/model/template/StockChartTypeTemplate.cxx|chart2/source/model/template/XYDataInterpreter.cxx|chart2/source/model/template/_serviceregistration_charttypes.cxx|chart2/source/tools/AxisHelper.cxx|chart2/source/tools/ChartModelHelper.cxx|chart2/source/tools/ChartTypeHelper.cxx|chart2/source/tools/ChartViewHelper.cxx|chart2/source/tools/ColorPerPointHelper.cxx|chart2/source/tools/CommonConverters.cxx|chart2/source/tools/DataSourceHelper.cxx|chart2/source/tools/DiagramHelper.cxx|chart2/source/tools/ErrorBar.cxx|chart2/source/tools/ExplicitCategoriesProvider.cxx|chart2/source/tools/FillProperties.cxx|chart2/source/tools/InternalDataProvider.cxx|chart2/source/tools/LegendHelper.cxx|chart2/source/tools/LineProperties.cxx|chart2/source/tools/NamedFillProperties.cxx|chart2/source/tools/NamedLineProperties.cxx|chart2/source/tools/NamedProperties.cxx|chart2/source/tools/ObjectIdentifier.cxx|chart2/source/tools/RegressionCurveCalculator.cxx|chart2/source/tools/RegressionCurveHelper.cxx|chart2/source/tools/RegressionCurveModel.cxx|chart2/source/tools/RegressionEquation.cxx|chart2/source/tools/RelativePositionHelper.cxx|chart2/source/tools/RelativeSizeHelper.cxx|chart2/source/tools/ResId.cxx|chart2/source/tools/StatisticsHelper.cxx|chart2/source/tools/ThreeDHelper.cxx|chart2/source/tools/WrappedIgnoreProperty.cxx|chart2/source/tools/WrappedPropertySet.cxx|comphelper/inc/comphelper/anycompare.hxx|comphelper/inc/comphelper/componentguard.hxx|comphelper/inc/comphelper/docpasswordrequest.hxx|comphelper/source/misc/docpasswordrequest.cxx|cui/source/dialogs/passwdomdlg.hrc|cui/source/dialogs/passwdomdlg.src|cui/source/inc/cuires.hrc|cui/source/inc/passwdomdlg.hxx|cui/source/options/optinet2.hrc|dbaccess/source/inc/OAuthenticationContinuation.hxx|dbaccess/source/ui/uno/dbinteraction.cxx|desktop/source/app/check_ext_deps.cxx|desktop/source/deployment/gui/dp_gui.hrc|desktop/source/deployment/gui/dp_gui_dialog2.cxx|desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx|desktop/source/deployment/gui/dp_gui_updatedata.hxx|desktop/source/deployment/gui/dp_gui_updatedialog.cxx|desktop/source/deployment/gui/dp_gui_updatedialog.hxx|desktop/source/deployment/gui/dp_gui_updatedialog.src|desktop/source/deployment/inc/dp_update.hxx|desktop/source/deployment/misc/dp_misc.src|desktop/source/deployment/registry/inc/dp_backend.h|desktop/source/deployment/registry/sfwk/dp_sfwk.cxx|desktop/source/migration/migration.cxx|extensions/source/update/check/updatecheckconfig.hxx|extensions/source/update/check/updateprotocol.cxx|framework/inc/helper/ilayoutnotifications.hxx|framework/inc/services/modelwinservice.hxx|framework/inc/uielement/panelwindow.hxx|framework/inc/uielement/panelwrapper.hxx|framework/inc/uielement/uielement.hxx|framework/source/helper/dockingareadefaultacceptor.cxx|framework/source/helper/ocomponentaccess.cxx|framework/source/helper/ocomponentenumeration.cxx|framework/source/helper/oframes.cxx|framework/source/layoutmanager/helpers.cxx|framework/source/layoutmanager/helpers.hxx|framework/source/layoutmanager/panel.cxx|framework/source/layoutmanager/panel.hxx|framework/source/layoutmanager/panelmanager.cxx|framework/source/layoutmanager/panelmanager.hxx|framework/source/layoutmanager/toolbarlayoutmanager.hxx|framework/source/services/modelwinservice.cxx|framework/source/uielement/panelwindow.cxx|lingucomponent/source/lingutil/lingutil.cxx|offapi/com/sun/star/awt/grid/SortableGridDataModel.idl|offapi/com/sun/star/awt/grid/XSortableGridData.idl|offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl|offapi/com/sun/star/chart/ChartLegendExpansion.idl|offapi/com/sun/star/deployment/XPackage.idl|offapi/com/sun/star/script/NativeObjectWrapper.idl|offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl|offapi/com/sun/star/task/DocumentPasswordRequest2.idl|offapi/com/sun/star/text/PrintPreviewSettings.idl|oox/inc/oox/xls/excelvbaproject.hxx|oox/source/xls/excelvbaproject.cxx|sal/osl/w32/thread.c|sal/qa/osl/setthreadname/test-setthreadname.cxx|sc/inc/eventuno.hxx|sc/source/filter/xml/XMLCodeNameProvider.hxx|sc/source/ui/unoobj/eventuno.cxx|sc/source/ui/vba/vbahyperlinks.hxx|sc/source/ui/vba/vbasheetobject.hxx|sc/source/ui/vba/vbasheetobjects.cxx|sc/source/ui/vba/vbasheetobjects.hxx|sfx2/inc/sfx2/brokenpackageint.hxx|sfx2/source/appl/appbaslib.cxx|sfx2/source/dialog/securitypage.hrc|sfx2/source/dialog/securitypage.src|sfx2/source/doc/syspathw32.cxx|sfx2/source/inc/helpid.hrc|solenv/src/reg-component.map|starmath/sdi/smath.sdi|starmath/sdi/smslots.sdi|starmath/source/toolbox.hrc|starmath/source/toolbox.src|starmath/uiconfig/smath/menubar/menubar.xml|stoc/source/simpleregistry/simpleregistry.cxx|svtools/inc/svtools/table/tablesort.hxx|svtools/source/table/mousefunction.hxx|svtools/source/uno/unogridcolumnfacade.cxx|svtools/source/uno/unogridcolumnfacade.hxx|svx/inc/svx/svxids.hrc|svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx|sw/source/ui/uiview/view.hrc|toolkit/qa/complex/toolkit/AccessibleStatusBar.java|toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java|toolkit/qa/complex/toolkit/Assert.java|toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java|toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java|toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java|toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java|toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java|toolkit/qa/complex/toolkit/awtgrid/DummyColumn.java|toolkit/qa/complex/toolkit/awtgrid/GridDataListener.java|toolkit/source/controls/grid/grideventforwarder.cxx|toolkit/source/controls/grid/grideventforwarder.hxx|toolkit/source/controls/grid/initguard.hxx|uui/source/ids.hrc|uui/source/logindlg.hrc|uui/source/logindlg.src|uui/source/masterpasscrtdlg.cxx|uui/source/passworddlg.hrc|uui/source/passworderrs.src|vbahelper/source/msforms/vbasystemaxcontrol.cxx|vbahelper/source/msforms/vbasystemaxcontrol.hxx|vcl/inc/vcl/region.hxx|writerfilter/source/ooxml/efforts.sh|xmloff/inc/forms/form_handler_factory.hxx|xmloff/inc/forms/property_handler.hxx|xmloff/inc/forms/property_ids.hxx|xmloff/source/chart/SchXMLEnumConverter.cxx|xmloff/source/chart/SchXMLEnumConverter.hxx|xmloff/source/chart/SchXMLLegendContext.cxx|xmloff/source/chart/SchXMLLegendContext.hxx)$
+:set filter=4,combineddos,^(migrationanalysis/src/wizard/res_defines.h|sc/inc/sccommands.h|starmath/inc/smcommands.h|svx/inc/svx/svxcommands.h|sw/inc/swcommands.h)$
+:set filter=4,combinedhack,^(extensions/test/ole/AxTestComponents/AxTestComponents.cpp|offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl|qadevOOo/runner/lib/TestResult.java|qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor.java|wizards/com/sun/star/wizards/web/WebWizardConst.java)$
+:set filter=4,combinedhack644,^odk/examples/java/Inspector/InspectorPane.java$
 :set filter=4,combined,\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|pl|pm|sdi|sh|src|tab|xcu|xml)$
 
 # ignore the file mode changes
-:set filter=-1,none644,^(automation/util/manually_added_ids.hid|default_images/desktop/res/shared_16.png|default_images/desktop/res/shared_16_h.png|extras/source/autotext/lang/eu/acor_eu.dat|extras/source/autotext/lang/lb-LU/acor_lb-LU.dat|extras/source/autotext/lang/vi/acor_vi-VN.dat|javainstaller2/src/Properties/setupfiles_template.properties|javainstaller2/src/Properties/setupstrings_template.properties|libxml2/libxml2-mingw.patch|odk/docs/cpp/ref/cpp.css|odk/setsdkenv_unix|scp2/source/binfilter/registryitem_binfilter.scp|scp2/source/math/registryitem_math.scp|scp2/source/winexplorerext/registryitem_winexplorerext.scp|scripting/prj/build.lst|sd/prj/struct.txt|sd/res/buttons/glas-blue.zip|sd/res/buttons/glas-green.zip|sd/res/buttons/glas-red.zip|sd/res/buttons/round-gorilla.zip|sd/res/buttons/round-white.zip|sd/res/buttons/simple.zip|sd/res/buttons/square-blue.zip|sd/res/buttons/square-gray.zip|sd/res/buttons/square-green.zip|sd/res/buttons/square-red.zip|sd/res/buttons/square-yellow.zip|sd/res/webview/common.inc|sd/res/webview/edit.asp|sd/res/webview/editpic.asp|sd/res/webview/poll.asp|sd/res/webview/savepic.asp|sd/res/webview/show.asp|sd/res/webview/webview.asp|sd/util/makefile.pmk|sd/util/sd.flt|sd/workben/testdll/makefile|sd/xsl/effect.xsl|smoketestoo_native/prj/d.lst|testautomation/chart2/optional/input/BubbleChartData.ods|testautomation/dbaccess/optional/input/hsql_datasource/hsql_macros_in_subdocument.odb|testautomation/extensions/optional/input/dependencies/version30.oxt|testautomation/extensions/optional/input/dependencies/version300.oxt|testautomation/extensions/optional/input/dependencies/version301.oxt|testautomation/extensions/optional/input/dependencies/version31.oxt|testautomation/extensions/optional/input/dependencies/version937.oxt|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties|testautomation/framework/optional/includes/basic_issues.inc|testautomation/framework/optional/includes/filedlg_rename.inc|testautomation/framework/optional/input/BasicDocs/basic.odf|testautomation/framework/optional/input/BasicDocs/basic.odg|testautomation/framework/optional/input/BasicDocs/basic.odm|testautomation/framework/optional/input/BasicDocs/basic.odp|testautomation/framework/optional/input/BasicDocs/basic.ods|testautomation/framework/optional/input/BasicDocs/basic.odt|testautomation/framework/optional/input/BasicDocs/basic.sxc|testautomation/framework/optional/input/BasicDocs/basic.sxd|testautomation/framework/optional/input/BasicDocs/basic.sxg|testautomation/framework/optional/input/BasicDocs/basic.sxi|testautomation/framework/optional/input/BasicDocs/basic.sxm|testautomation/framework/optional/input/BasicDocs/basic.sxw|testautomation/framework/optional/input/vba-compat/vba-compat-macros.txt|testautomation/framework/required/input/basic_ide/Dialog5.xdl|testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.default|testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.properties|testautomation/framework/required/input/basic_ide/Dialog5_ca_ES.properties|testautomation/framework/required/input/basic_ide/Dialog5_de_DE.properties|testautomation/framework/required/input/basic_ide/Dialog5_en_US.properties|testautomation/framework/required/input/basic_ide/Dialog5_fr_FR.properties|testautomation/global/input/filters/api_filternames.txt|testautomation/global/input/filters/build_to_filter.txt|testautomation/global/input/filters/build_to_suffix.txt|testautomation/global/input/java/java.htm|testautomation/global/input/officeinfo.txt|testautomation/global/input/proxies.txt|testautomation/global/input/servers.txt|testautomation/global/sid/bars.sid|testautomation/global/sid/basic.sid|testautomation/global/sid/context.sid|testautomation/global/sid/others.sid|testautomation/global/sid/sop.sid|testautomation/global/win/bars.win|testautomation/global/win/dial_a_c.win|testautomation/global/win/dial_i_o.win|testautomation/global/win/dial_p_s.win|testautomation/global/win/dial_t_z.win|testautomation/global/win/dokument.win|testautomation/global/win/e_mathop.win|testautomation/global/win/edia_a_c.win|testautomation/global/win/edia_i_o.win|testautomation/global/win/etab_e_g.win|testautomation/global/win/etab_h_o.win|testautomation/global/win/etab_p_s.win|testautomation/global/win/etab_t_z.win|testautomation/global/win/etoolbox.win|testautomation/global/win/mathop.win|testautomation/global/win/piloten.win|testautomation/global/win/reportdesigner.win|testautomation/global/win/spadmin.win|testautomation/global/win/sys_dial.win|testautomation/global/win/tab_a_d.win|testautomation/global/win/tab_e_g.win|testautomation/global/win/tab_h_o.win|testautomation/global/win/tab_p_s.win|testautomation/global/win/tab_t_z.win|testautomation/global/win/w_autop.win|testautomation/math/required/input/test.odt|testautomation/prj/build.lst|testautomation/prj/d.lst|testautomation/spreadsheet/optional/c_validity.bas|testautomation/spreadsheet/optional/input/Solver_testdoc01.ods|testautomation/spreadsheet/optional/input/stest_large.ods|testautomation/spreadsheet/required/input/DocwithMacro.ods|testautomation/spreadsheet/tools/includes/c_validity_tools.inc|testautomation/writer/optional/input/fields/diploma.ott|testautomation/writer/optional/input/formatparagraph/hyphenationNew.odt|testautomation/writer/optional/input/hangul/hangul.html|testautomation/writer/optional/input/hangul/hangul.sxw|testautomation/writer/optional/input/import/dostext.txt|testautomation/writer/optional/input/navigator/st1_1.sxw|testautomation/writer/optional/input/regression/issuezilla/i103265.odt|testautomation/writer/optional/input/section/bt.sxw|testautomation/writer/optional/input/undo/htmltest.sxg|testautomation/writer/optional/input/undo/htmltest.sxw|testautomation/writer/optional/input/undo/spellcheck_undo.odt|testgraphical/prj/d.lst|xmlsecurity/test_docs/test_description.odt|xmlsecurity/test_docs/tools/httpserv/nbproject/genfiles.properties|xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties)$
-:set filter=-1,none755,^(default_images/introabout/about.png|default_images/introabout/intro.png|desktop/test/deployment/simple_license/suppress_license.oxt|desktop/util/ooverinfo2.rc|desktop/win32/source/applauncher/ooo/verinfo.rc|desktop/win32/source/applauncher/verinfo.rc|jfreereport/patches/common_build.patch|officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs|officecfg/registry/schema/org/openoffice/Office/Jobs.xcs|ooo_custom_images/broffice/introabout/about.png|ooo_custom_images/broffice/introabout/intro.png|ooo_custom_images/dev/introabout/intro.png|ooo_custom_images/dev_broffice/introabout/intro.png|ooo_custom_images/dev_nologo/introabout/intro.png|ooo_custom_images/nologo/introabout/intro.png|remotebridges/prj/d.lst|sfx2/Library_qstart.mk|sfx2/Library_sfx.mk|sfx2/Module_sfx2.mk|solenv/inc/version.lst|solenv/inc/versionlist.mk|solenv/prj/d.lst|sysui/desktop/icons/hicolor/16x16/apps/main.png|sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png|sysui/desktop/icons/hicolor/32x32/apps/main.png|sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png|sysui/desktop/icons/hicolor/48x48/apps/main.png|sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png|sysui/desktop/icons/main.icns|sysui/desktop/icons/ooo3_base_app.ico|sysui/desktop/icons/ooo3_calc_app.ico|sysui/desktop/icons/ooo3_draw_app.ico|sysui/desktop/icons/ooo3_impress_app.ico|sysui/desktop/icons/ooo3_main_app.ico|sysui/desktop/icons/ooo3_math_app.ico|sysui/desktop/icons/ooo3_open.ico|sysui/desktop/icons/ooo3_writer_app.ico|testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_applications_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_content_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_and_whole_words_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_only_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_whole_words_only_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_without_filter_en-US.txt|testtools/source/cliversioning/version_libs/version_3_2.dll|tools/StaticLibrary_ooopathutils.mk|writerfilter/source/doctok/cleanupresources|writerfilter/source/resourcemodel/setdebugflags|xmlreader/prj/d.lst)$
-
+:set filter=-1,none644,^(automation/util/manually_added_ids.hid|default_images/desktop/res/shared_16.png|default_images/desktop/res/shared_16_h.png|extras/source/autotext/lang/eu/acor_eu.dat|extras/source/autotext/lang/lb-LU/acor_lb-LU.dat|extras/source/autotext/lang/vi/acor_vi-VN.dat|javainstaller2/src/Properties/setupfiles_template.properties|javainstaller2/src/Properties/setupstrings_template.properties|libxml2/libxml2-mingw.patch|odk/docs/cpp/ref/cpp.css|odk/setsdkenv_unix|scp2/source/binfilter/registryitem_binfilter.scp|scp2/source/math/registryitem_math.scp|scp2/source/winexplorerext/registryitem_winexplorerext.scp|scripting/prj/build.lst|sd/prj/struct.txt|sd/res/buttons/glas-blue.zip|sd/res/buttons/glas-green.zip|sd/res/buttons/glas-red.zip|sd/res/buttons/round-gorilla.zip|sd/res/buttons/round-white.zip|sd/res/buttons/simple.zip|sd/res/buttons/square-blue.zip|sd/res/buttons/square-gray.zip|sd/res/buttons/square-green.zip|sd/res/buttons/square-red.zip|sd/res/buttons/square-yellow.zip|sd/res/webview/common.inc|sd/res/webview/edit.asp|sd/res/webview/editpic.asp|sd/res/webview/poll.asp|sd/res/webview/savepic.asp|sd/res/webview/show.asp|sd/res/webview/webview.asp|sd/util/makefile.pmk|sd/util/sd.flt|sd/workben/testdll/makefile|sd/xsl/effect.xsl|smoketestoo_native/prj/d.lst|testautomation/chart2/optional/input/BubbleChartData.ods|testautomation/dbaccess/optional/input/hsql_datasource/hsql_macros_in_subdocument.odb|testautomation/extensions/optional/input/dependencies/version30.oxt|testautomation/extensions/optional/input/dependencies/version300.oxt|testautomation/extensions/optional/input/dependencies/version301.oxt|testautomation/extensions/optional/input/dependencies/version31.oxt|testautomation/extensions/optional/input/dependencies/version937.oxt|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties|testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties|testautomation/framework/optional/includes/basic_issues.inc|testautomation/framework/optional/includes/filedlg_rename.inc|testautomation/framework/optional/input/BasicDocs/basic.odf|testautomation/framework/optional/input/BasicDocs/basic.odg|testautomation/framework/optional/input/BasicDocs/basic.odm|testautomation/framework/optional/input/BasicDocs/basic.odp|testautomation/framework/optional/input/BasicDocs/basic.ods|testautomation/framework/optional/input/BasicDocs/basic.odt|testautomation/framework/optional/input/BasicDocs/basic.sxc|testautomation/framework/optional/input/BasicDocs/basic.sxd|testautomation/framework/optional/input/BasicDocs/basic.sxg|testautomation/framework/optional/input/BasicDocs/basic.sxi|testautomation/framework/optional/input/BasicDocs/basic.sxm|testautomation/framework/optional/input/BasicDocs/basic.sxw|testautomation/framework/optional/input/vba-compat/vba-compat-macros.txt|testautomation/framework/required/input/basic_ide/Dialog5.xdl|testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.default|testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.properties|testautomation/framework/required/input/basic_ide/Dialog5_ca_ES.properties|testautomation/framework/required/input/basic_ide/Dialog5_de_DE.properties|testautomation/framework/required/input/basic_ide/Dialog5_en_US.properties|testautomation/framework/required/input/basic_ide/Dialog5_fr_FR.properties|testautomation/global/input/filters/api_filternames.txt|testautomation/global/input/filters/build_to_filter.txt|testautomation/global/input/filters/build_to_suffix.txt|testautomation/global/input/java/java.htm|testautomation/global/input/officeinfo.txt|testautomation/global/input/proxies.txt|testautomation/global/input/servers.txt|testautomation/global/sid/bars.sid|testautomation/global/sid/basic.sid|testautomation/global/sid/context.sid|testautomation/global/sid/others.sid|testautomation/global/sid/sop.sid|testautomation/global/win/bars.win|testautomation/global/win/dial_a_c.win|testautomation/global/win/dial_i_o.win|testautomation/global/win/dial_p_s.win|testautomation/global/win/dial_t_z.win|testautomation/global/win/dokument.win|testautomation/global/win/e_mathop.win|testautomation/global/win/edia_a_c.win|testautomation/global/win/edia_i_o.win|testautomation/global/win/etab_e_g.win|testautomation/global/win/etab_h_o.win|testautomation/global/win/etab_p_s.win|testautomation/global/win/etab_t_z.win|testautomation/global/win/etoolbox.win|testautomation/global/win/mathop.win|testautomation/global/win/piloten.win|testautomation/global/win/reportdesigner.win|testautomation/global/win/spadmin.win|testautomation/global/win/sys_dial.win|testautomation/global/win/tab_a_d.win|testautomation/global/win/tab_e_g.win|testautomation/global/win/tab_h_o.win|testautomation/global/win/tab_p_s.win|testautomation/global/win/tab_t_z.win|testautomation/global/win/w_autop.win|testautomation/math/required/input/test.odt|testautomation/prj/build.lst|testautomation/prj/d.lst|testautomation/spreadsheet/optional/c_validity.bas|testautomation/spreadsheet/optional/input/Solver_testdoc01.ods|testautomation/spreadsheet/optional/input/stest_large.ods|testautomation/spreadsheet/required/input/DocwithMacro.ods|testautomation/spreadsheet/tools/includes/c_validity_tools.inc|testautomation/writer/optional/input/fields/diploma.ott|testautomation/writer/optional/input/formatparagraph/hyphenationNew.odt|testautomation/writer/optional/input/hangul/hangul.html|testautomation/writer/optional/input/hangul/hangul.sxw|testautomation/writer/optional/input/navigator/st1_1.sxw|testautomation/writer/optional/input/regression/issuezilla/i103265.odt|testautomation/writer/optional/input/section/bt.sxw|testautomation/writer/optional/input/undo/htmltest.sxg|testautomation/writer/optional/input/undo/htmltest.sxw|testautomation/writer/optional/input/undo/spellcheck_undo.odt|testgraphical/prj/d.lst|xmlsecurity/test_docs/test_description.odt|xmlsecurity/test_docs/tools/httpserv/nbproject/genfiles.properties|xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties)$
+:set filter=-1,none755,^(default_images/introabout/about.png|default_images/introabout/intro.png|desktop/test/deployment/simple_license/suppress_license.oxt|desktop/util/ooverinfo2.rc|desktop/win32/source/applauncher/ooo/verinfo.rc|desktop/win32/source/applauncher/verinfo.rc|jfreereport/patches/common_build.patch|officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs|officecfg/registry/schema/org/openoffice/Office/Jobs.xcs|ooo_custom_images/broffice/introabout/about.png|ooo_custom_images/broffice/introabout/intro.png|ooo_custom_images/dev/introabout/intro.png|ooo_custom_images/dev_broffice/introabout/intro.png|ooo_custom_images/dev_nologo/introabout/intro.png|ooo_custom_images/nologo/introabout/intro.png|remotebridges/prj/d.lst|solenv/inc/version.lst|solenv/inc/versionlist.mk|solenv/prj/d.lst|sysui/desktop/icons/hicolor/16x16/apps/main.png|sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png|sysui/desktop/icons/hicolor/32x32/apps/main.png|sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png|sysui/desktop/icons/hicolor/48x48/apps/main.png|sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png|sysui/desktop/icons/main.icns|sysui/desktop/icons/ooo3_base_app.ico|sysui/desktop/icons/ooo3_calc_app.ico|sysui/desktop/icons/ooo3_draw_app.ico|sysui/desktop/icons/ooo3_impress_app.ico|sysui/desktop/icons/ooo3_main_app.ico|sysui/desktop/icons/ooo3_math_app.ico|sysui/desktop/icons/ooo3_open.ico|sysui/desktop/icons/ooo3_writer_app.ico|testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_applications_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_content_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_and_whole_words_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_only_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_whole_words_only_en-US.txt|testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_without_filter_en-US.txt|testtools/source/cliversioning/version_libs/version_3_2.dll|writerfilter/source/doctok/cleanupresources|writerfilter/source/resourcemodel/setdebugflags|xmlreader/prj/d.lst)$
+
+# gnumake makefiles - technically we would prefer no tabs -> spaces here, but
+# we (by mistake) were doing the tabs -> spaces in the OOo imports, so let's
+# rather do it here too, to make the ooo/OOO340_m1 vs. AOOi initial import
+# smaller
+:set filter=4,old644,^(comphelper/JunitTest_comphelper_complex.mk|comphelper/Library_comphelp.mk|comphelper/Module_comphelper.mk|framework/AllLangResTarget_fwe.mk|framework/Library_fwe.mk|framework/Library_fwi.mk|framework/Library_fwk.mk|framework/Library_fwl.mk|framework/Library_fwm.mk|framework/Module_framework.mk|moz/extractfiles.mk|padmin/AllLangResTarget_spa.mk|padmin/Executable_spadmin.bin.mk|padmin/Library_spa.mk|padmin/Module_padmin.mk|sal/unosdk.mk|sfx2/AllLangResTarget_sfx2.mk|sfx2/JunitTest_sfx2_unoapi.mk|solenv/doc/gbuild/solenv/gbuild/types.mk|solenv/gbuild/AllLangResTarget.mk|solenv/gbuild/ComponentTarget.mk|solenv/gbuild/CppunitTest.mk|solenv/gbuild/CustomTarget.mk|solenv/gbuild/Deliver.mk|solenv/gbuild/Executable.mk|solenv/gbuild/Helper.mk|solenv/gbuild/JavaClassSet.mk|solenv/gbuild/JunitTest.mk|solenv/gbuild/Library.mk|solenv/gbuild/LinkTarget.mk|solenv/gbuild/Module.mk|solenv/gbuild/Output.mk|solenv/gbuild/Package.mk|solenv/gbuild/PrecompiledHeaders.mk|solenv/gbuild/SdiTarget.mk|solenv/gbuild/StaticLibrary.mk|solenv/gbuild/WinResTarget.mk|solenv/gbuild/extensions/post_PackModule.mk|solenv/gbuild/extensions/post_SetupLocal.mk|solenv/gbuild/gbuild.mk|solenv/gbuild/platform/linux.mk|solenv/gbuild/platform/macosx.mk|solenv/gbuild/platform/solaris.mk|solenv/gbuild/platform/windows.mk|solenv/gbuild/platform/winmingw.mk|solenv/gbuild/templates/AllLangResTarget.mk|solenv/gbuild/templates/CppunitTest.mk|solenv/gbuild/templates/Executable.mk|solenv/gbuild/templates/JunitTest.mk|solenv/gbuild/templates/Library.mk|sot/JunitTest_sot_complex.mk|sot/Library_sot.mk|sot/Module_sot.mk|stoc/unosdk.mk|svl/AllLangResTarget_svl.mk|svl/Library_fsstorage.mk|svl/Library_passwordcontainer.mk|svl/Library_svl.mk|svl/Module_svl.mk|svtools/AllLangResTarget_productregistration.mk|svtools/AllLangResTarget_svt.mk|svtools/Executable_bmp.mk|svtools/Executable_bmpsum.mk|svtools/Executable_g2g.mk|svtools/Library_hatchwindowfactory.mk|svtools/Library_productregistration.mk|svtools/Library_svt.mk|svtools/Module_svtools.mk|svx/AllLangResTarget_about.mk|svx/AllLangResTarget_ofa.mk|svx/AllLangResTarget_svx.mk|svx/AllLangResTarget_textconversiondlgs.mk|svx/Library_svx.mk|svx/Library_svxcore.mk|svx/Library_textconversiondlgs.mk|svx/Module_svx.mk|sw/AllLangResTarget_sw.mk|sw/Library_msword.mk|sw/Library_sw.mk|sw/Library_swd.mk|sw/Library_swui.mk|sw/Library_vbaswobj.mk|sw/Module_sw.mk|toolkit/AllLangResTarget_tk.mk|toolkit/Library_tk.mk|toolkit/Module_toolkit.mk|tools/Executable_mkunroll.mk|tools/Executable_rscdep.mk|tools/Executable_so_checksum.mk|tools/Executable_sspretty.mk|tools/Library_tl.mk|tools/Module_tools.mk|unoxml/JunitTest_unordf_complex.mk|unoxml/JunitTest_unoxml_complex.mk|unoxml/Library_unordf.mk|unoxml/Library_unoxml.mk|unoxml/Module_unoxml.mk|vcl/AllLangResTarget_vcl.mk|vcl/Library_desktop_detector.mk|vcl/Module_vcl.mk|vcl/Package_osx.mk|xmloff/Library_xo.mk|xmloff/Library_xof.mk|xmloff/Module_xmloff.mk)$
+:set filter=4,old755,^(editeng/AllLangResTarget_editeng.mk|editeng/Library_editeng.mk|framework/JunitTest_framework_complex.mk|framework/JunitTest_framework_unoapi.mk|sfx2/CppunitTest_sfx2_metadatable.mk|sfx2/JunitTest_sfx2_complex.mk|sfx2/Library_qstart.mk|sfx2/Library_sfx.mk|sfx2/Module_sfx2.mk|solenv/gbuild/TargetLocations.mk|solenv/inc/tg_propmerge.mk|svl/JunitTest_svl_complex.mk|svtools/JunitTest_svtools_unoapi.mk|svx/AllLangResTarget_gal.mk|svx/JunitTest_svx_unoapi.mk|sw/JunitTest_sw_complex.mk|sw/JunitTest_sw_unoapi.mk|toolkit/JunitTest_toolkit_complex.mk|toolkit/JunitTest_toolkit_unoapi.mk|tools/StaticLibrary_ooopathutils.mk|vbahelper/Library_msforms.mk|vbahelper/Library_vbahelper.mk|vcl/Library_vcl.mk|vcl/Library_vclplug_gen.mk|vcl/Library_vclplug_gtk.mk|vcl/Library_vclplug_kde.mk|vcl/Library_vclplug_kde4.mk|vcl/Library_vclplug_svp.mk|vcl/StaticLibrary_vclmain.mk|vcl/WinResTarget_vcl.mk|xmloff/JunitTest_xmloff_unoapi.mk)$
 # changes in makefiles
 :set filter=4,old644,^(cui/source/customize/makefile.mk|cui/source/factory/makefile.mk|cui/source/options/makefile.mk|cui/source/tabpages/makefile.mk|reportbuilder/util/makefile.mk|sd/inc/makefile.mk|sd/qa/unoapi/makefile.mk|sd/source/core/annotations/makefile.mk|sd/source/core/makefile.mk|sd/source/core/text/makefile.mk|sd/source/core/undo/makefile.mk|sd/source/filter/cgm/makefile.mk|sd/source/filter/eppt/makefile.mk|sd/source/filter/grf/makefile.mk|sd/source/filter/html/makefile.mk|sd/source/filter/makefile.mk|sd/source/filter/ppt/makefile.mk|sd/source/filter/xml/makefile.mk|sd/source/helper/makefile.mk|sd/source/ui/annotations/makefile.mk|sd/source/ui/docshell/makefile.mk|sd/source/ui/framework/configuration/makefile.mk|sd/source/ui/framework/factories/makefile.mk|sd/source/ui/framework/tools/makefile.mk|sd/source/ui/presenter/makefile.mk|sd/source/ui/slidesorter/makefile.mk|sd/source/ui/table/makefile.mk|sd/source/ui/tools/makefile.mk|sd/source/unotypes/makefile.mk|setup_native/source/win32/customactions/reg64/makefile.mk|shell/source/win32/shlxthandler/makefile.mk|shell/source/win32/shlxthandler/ooofilt/makefile.mk|shell/source/win32/shlxthandler/prophdl/makefile.mk|soltools/adjustvisibility/makefile.mk|soltools/mkdepend/makefile.mk)$
 :set filter=4,old755,^(officecfg/registry/data/org/openoffice/makefile.mk|solenv/inc/tg_propmerge.mk|solenv/makefile.mk)$
@@ -15,8 +24,10 @@
 :set filter=4,old,\.(mk|MK|pmk)$
 
 # dos and unx line ends rewriting, to minimize the diff
-:set filter=-1,dos,\<(description/readme\.txt|defect/readme\.txt|web6/readme\.txt|web7/readme\.txt|WriterDemo/readme\.txt|OleClient/readme\.txt|OleConverterVar1/readme\.txt|StarBasic_OleClient/readme\.txt|VisualBasic/readme\.txt|ole/unloading/readme\.txt|unoTocomCalls/readme\.txt|wizard/rcfooter\.txt|wizard/rcheader\.txt|wizard/rctmpl\.txt|moz/README|moz/patches/index\.txt|import/dostext\.txt|import/swdos\.txt|EventListenerSample/readme\.txt)$
+:set filter=-1,dos,\<(description/readme\.txt|defect/readme\.txt|web6/readme\.txt|web7/readme\.txt|WriterDemo/readme\.txt|OleClient/readme\.txt|OleConverterVar1/readme\.txt|StarBasic_OleClient/readme\.txt|VisualBasic/readme\.txt|ole/unloading/readme\.txt|unoTocomCalls/readme\.txt|wizard/rcfooter\.txt|wizard/rcheader\.txt|wizard/rctmpl\.txt|moz/README|moz/patches/index\.txt|import/swdos\.txt|EventListenerSample/readme\.txt)$
 :set filter=-1,dos,\<(update/web1_en-US-region1\.html|update/web1_en-US\.html|util/hh\.html|tableimport/HTML_Doc_Numberformats_in_table\.html|doctok/escher\.html)$
+:set filter=-1,dos,^(cli_ure/source/climaker/climaker.exe.config|migrationanalysis/src/resources/analysis.dtd|migrationanalysis/src/wizard/DocAnalysisWizard.exe.manifest|solenv/bin/fix_def_file.cmd|solenv/bin/fix_def_ord.cmd|solenv/bin/fix_dxp_file.cmd|solenv/bin/fix_exp_file.cmd|solenv/bin/fix_lin_file.cmd|solenv/bin/fix_shl.cmd|stlport/dos_lineends.patch)$
+:set filter=-1,dos644,^testautomation/writer/optional/input/import/dostext.txt$
 :set filter=-1,unx,\<(AxTestComponents/AxTestComponents\.dsp|MfcControl/MfcControl\.dsp|unoTocomCalls/Test/Test\.dsp|XCallback_Impl/XCallback_Impl\.dsp)$
 
 # ignore some revisions completely (broken ones, mostly deletions of entire
diff --git a/filter.cxx b/filter.cxx
index 6ee8daf..11d06ca 100644
--- a/filter.cxx
+++ b/filter.cxx
@@ -135,6 +135,56 @@ inline void addDataLoopCombined( char*& dest, char what, int& column, int& space
     }
 }
 
+/// Combine the 'old' way of tabs -> spaces with all + convert to DOS line ends
+inline void addDataLoopCombinedDos( char*& dest, char what, int& column, int& spaces_to_write, bool& nonspace_appeared, int no_spaces )
+{
+    if ( what == '\t' )
+    {
+        if ( nonspace_appeared )
+        {
+            // new behavior
+            const int tab_size = no_spaces - ( column % no_spaces );
+            column += tab_size;
+            spaces_to_write += tab_size;
+        }
+        else
+        {
+            // old one
+            column += no_spaces;
+            spaces_to_write += no_spaces;
+        }
+    }
+    else if ( what == ' ' )
+    {
+        ++column;
+        ++spaces_to_write;
+    }
+    else if ( what == '\n' )
+    {
+        // write out any spaces that we need
+        for ( int i = 0; i < spaces_to_write; ++i )
+            *dest++ = ' ';
+
+        *dest++ = '\r';
+        *dest++ = what;
+        column = 0;
+        spaces_to_write = 0;
+        nonspace_appeared = false;
+    }
+    else
+    {
+        nonspace_appeared = true;
+
+        // write out any spaces that we need
+        for ( int i = 0; i < spaces_to_write; ++i )
+            *dest++ = ' ';
+
+        *dest++ = what;
+        ++column;
+        spaces_to_write = 0;
+    }
+}
+
 /// The best tabs -> spaces: converts all, strips trailing whitespace
 inline void addDataLoopTabs( char*& dest, char what, int& column, int& spaces_to_write, bool& nonspace_appeared, int no_spaces )
 {
@@ -206,9 +256,14 @@ void Filter::addData( const char* data_, size_t len_ )
                 addDataLoopOld( dest, *it, column, spaces_to_write, nonspace_appeared, spaces );
             break;
         case FILTER_COMBINED:
+        case FILTER_COMBINED_HACK:
             for ( const char* it = data_; it < data_ + len_; ++it )
                 addDataLoopCombined( dest, *it, column, spaces_to_write, nonspace_appeared, spaces );
             break;
+        case FILTER_COMBINED_DOS:
+            for ( const char* it = data_; it < data_ + len_; ++it )
+                addDataLoopCombinedDos( dest, *it, column, spaces_to_write, nonspace_appeared, spaces );
+            break;
         case FILTER_TABS:
             for ( const char* it = data_; it < data_ + len_; ++it )
                 addDataLoopTabs( dest, *it, column, spaces_to_write, nonspace_appeared, spaces );
@@ -238,6 +293,13 @@ void Filter::addData( const string& data_ )
 
 void Filter::write( std::ostream& out_ )
 {
+    if ( type == FILTER_COMBINED_HACK )
+    {
+        // write out any spaces that we need
+        for ( int i = 0; i < spaces_to_write; ++i )
+            data += ' ';
+    }
+
     out_ << "data " << data.size() << endl
          << data << endl;
 }
diff --git a/filter.hxx b/filter.hxx
index 9fd2033..f1d7408 100644
--- a/filter.hxx
+++ b/filter.hxx
@@ -12,12 +12,14 @@
 #include <ostream>
 
 enum FilterType {
-    NO_FILTER,       ///< No filtering at all
-    FILTER_OLD,      ///< Old way of filtering - each tab is exactly <n> spaces, no filtering after 1st non-tab, non-space character
-    FILTER_COMBINED, ///< Combined way of filtering - for the tabs before 1st non-tab, non-space character, behave like _OLD, for the rest as _TABS
-    FILTER_TABS,     ///< New way of filtering - each tab is converted as if it was a real tab + strip trailing whitespace
-    FILTER_DOS,      ///< Convert to the DOS line ends
-    FILTER_UNX,      ///< Convert to the Unx line ends
+    NO_FILTER,           ///< No filtering at all
+    FILTER_OLD,          ///< Old way of filtering - each tab is exactly <n> spaces, no filtering after 1st non-tab, non-space character
+    FILTER_COMBINED,     ///< Combined way of filtering - for the tabs before 1st non-tab, non-space character, behave like _OLD, for the rest as _TABS
+    FILTER_COMBINED_DOS, ///< Combined way of filtering (as described above) + convert to DOS line ends
+    FILTER_COMBINED_HACK,///< Combined way of filtering + let the spaces at the end of file untouched when the file does not end with \n
+    FILTER_TABS,         ///< New way of filtering - each tab is converted as if it was a real tab + strip trailing whitespace
+    FILTER_DOS,          ///< Convert to the DOS line ends
+    FILTER_UNX,          ///< Convert to the Unx line ends
 };
 
 enum FilePermission {
diff --git a/repository.cxx b/repository.cxx
index 0d98d36..ef77093 100644
--- a/repository.cxx
+++ b/repository.cxx
@@ -476,10 +476,34 @@ bool Repositories::load( const char* fname_, unsigned int max_revs_, int& min_re
                                     filter_type = FILTER_COMBINED;
                                     file_perm = PERMISSION_EXEC;
                                 }
+                                else if ( line.substr( comma + 1, regex - comma - 1 ) == "combineddos" )
+                                    filter_type = FILTER_COMBINED_DOS;
+                                else if ( line.substr( comma + 1, regex - comma - 1 ) == "combinedhack" )
+                                    filter_type = FILTER_COMBINED_HACK;
+                                else if ( line.substr( comma + 1, regex - comma - 1 ) == "combinedhack644" )
+                                {
+                                    filter_type = FILTER_COMBINED_HACK;
+                                    file_perm = PERMISSION_NOEXEC;
+                                }
+                                else if ( line.substr( comma + 1, regex - comma - 1 ) == "combinedhack755" )
+                                {
+                                    filter_type = FILTER_COMBINED_HACK;
+                                    file_perm = PERMISSION_EXEC;
+                                }
                                 else if ( line.substr( comma + 1, regex - comma - 1 ) == "tabs" )
                                     filter_type = FILTER_TABS;
                                 else if ( line.substr( comma + 1, regex - comma - 1 ) == "dos" )
                                     filter_type = FILTER_DOS;
+                                else if ( line.substr( comma + 1, regex - comma - 1 ) == "dos644" )
+                                {
+                                    filter_type = FILTER_DOS;
+                                    file_perm = PERMISSION_NOEXEC;
+                                }
+                                else if ( line.substr( comma + 1, regex - comma - 1 ) == "dos755" )
+                                {
+                                    filter_type = FILTER_DOS;
+                                    file_perm = PERMISSION_EXEC;
+                                }
                                 else if ( line.substr( comma + 1, regex - comma - 1 ) == "unx" )
                                     filter_type = FILTER_UNX;
                                 else