[Libreoffice-commits] .: 2 commits - accessibility/inc accessibility/source avmedia/source basctl/source basic/inc binaryurp/qa binaryurp/source bridges/source bridges/test cli_ure/qa cli_ure/source codemaker/inc codemaker/source comphelper/inc comphelper/qa comphelper/source configmgr/qa configmgr/source connectivity/source cppuhelper/qa cppuhelper/source cppu/qa cppu/source cui/source dbaccess/source desktop/source desktop/test extensions/source filter/inc filter/source fpicker/source framework/inc framework/source idlc/inc idlc/source idlc/test javaunohelper/source jvmaccess/source lingucomponent/source linguistic/source odk/examples offapi/com offapi/type_reference oox/source sal/inc scripting/source sc/source sdext/source sd/inc sd/source sfx2/inc sfx2/source shell/source slideshow/source smoketest/smoketest.cxx stoc/source stoc/test svl/qa svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source testtools/source toolkit/source tubes/source ucbhelper/inc ucbhelper/so urce udkapi/com unodevtools/source unotest/source unotools/source unoxml/source ure/source uui/source vbahelper/inc vcl/generic vcl/source vcl/unx writerfilter/source xmlreader/source xmlscript/source xmlsecurity/inc xmlsecurity/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 30 05:39:11 PST 2012


 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx               |    2 
 accessibility/source/extended/textwindowaccessibility.cxx                          |    2 
 avmedia/source/framework/soundhandler.hxx                                          |    2 
 basctl/source/basicide/basides2.cxx                                                |    1 
 basic/inc/basic/sbobjmod.hxx                                                       |    2 
 binaryurp/qa/test-unmarshal.cxx                                                    |    2 
 binaryurp/source/binaryany.cxx                                                     |    6 -
 binaryurp/source/bridge.cxx                                                        |    2 
 binaryurp/source/bridgefactory.cxx                                                 |    6 -
 binaryurp/source/currentcontext.cxx                                                |    6 -
 binaryurp/source/incomingrequest.cxx                                               |    6 -
 binaryurp/source/marshal.cxx                                                       |    2 
 binaryurp/source/outgoingrequests.cxx                                              |    6 -
 binaryurp/source/proxy.cxx                                                         |    2 
 binaryurp/source/reader.cxx                                                        |    2 
 binaryurp/source/unmarshal.cxx                                                     |    2 
 binaryurp/source/writer.cxx                                                        |    6 -
 bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx                             |    2 
 bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx                          |    2 
 bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx                             |    2 
 bridges/source/jni_uno/jni_info.cxx                                                |    1 
 bridges/test/java_uno/acquire/testacquire.cxx                                      |    2 
 bridges/test/java_uno/equals/testequals.cxx                                        |    2 
 bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx              |    2 
 bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx              |    2 
 bridges/test/test_bridge.idl                                                       |    4 
 cli_ure/qa/climaker/types.idl                                                      |    2 
 cli_ure/source/climaker/climaker_share.h                                           |    2 
 cli_ure/source/uno_bridge/cli_data.cxx                                             |    6 -
 cli_ure/source/uno_bridge/cli_proxy.cxx                                            |    1 
 cli_ure/source/uno_bridge/cli_uno.cxx                                              |    1 
 codemaker/inc/codemaker/commoncpp.hxx                                              |   12 +-
 codemaker/source/commoncpp/commoncpp.cxx                                           |   17 +--
 comphelper/inc/comphelper/configurationhelper.hxx                                  |   11 --
 comphelper/inc/comphelper/numberedcollection.hxx                                   |    9 -
 comphelper/inc/comphelper/servicedecl.hxx                                          |    1 
 comphelper/qa/weakbag/test_weakbag.cxx                                             |    2 
 comphelper/source/misc/configuration.cxx                                           |    2 
 comphelper/source/misc/configurationhelper.cxx                                     |    3 
 comphelper/source/misc/mediadescriptor.cxx                                         |    3 
 comphelper/source/misc/numberedcollection.cxx                                      |    3 
 comphelper/source/misc/sequenceashashmap.cxx                                       |    3 
 comphelper/source/misc/stillreadwriteinteraction.cxx                               |    2 
 configmgr/qa/unit/test.cxx                                                         |    2 
 configmgr/source/access.cxx                                                        |    6 -
 configmgr/source/broadcaster.cxx                                                   |    2 
 configmgr/source/childaccess.cxx                                                   |    6 -
 configmgr/source/components.cxx                                                    |    2 
 configmgr/source/configurationprovider.cxx                                         |    2 
 configmgr/source/configurationregistry.cxx                                         |    2 
 configmgr/source/data.cxx                                                          |    2 
 configmgr/source/defaultprovider.cxx                                               |    2 
 configmgr/source/localizedvaluenode.cxx                                            |    6 -
 configmgr/source/node.cxx                                                          |    6 -
 configmgr/source/parsemanager.cxx                                                  |    6 -
 configmgr/source/partial.cxx                                                       |    2 
 configmgr/source/propertynode.cxx                                                  |    6 -
 configmgr/source/readonlyaccess.cxx                                                |    2 
 configmgr/source/readwriteaccess.cxx                                               |    2 
 configmgr/source/rootaccess.cxx                                                    |    6 -
 configmgr/source/services.cxx                                                      |    2 
 configmgr/source/type.cxx                                                          |    6 -
 configmgr/source/update.cxx                                                        |    2 
 configmgr/source/valueparser.cxx                                                   |    2 
 configmgr/source/writemodfile.cxx                                                  |    2 
 configmgr/source/xcdparser.cxx                                                     |    6 -
 configmgr/source/xcsparser.cxx                                                     |    2 
 configmgr/source/xcuparser.cxx                                                     |    6 -
 configmgr/source/xmldata.cxx                                                       |    6 -
 connectivity/source/drivers/mork/MConnection.hxx                                   |    2 
 connectivity/source/drivers/mork/MDriver.hxx                                       |    1 
 cppu/qa/test_any.cxx                                                               |    2 
 cppu/qa/test_unotype.cxx                                                           |    2 
 cppu/source/threadpool/thread.cxx                                                  |    6 -
 cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx                           |    2 
 cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx                           |    2 
 cppuhelper/qa/weak/test_weak.cxx                                                   |    2 
 cppuhelper/source/defaultbootstrap.cxx                                             |    2 
 cppuhelper/source/paths.cxx                                                        |    6 -
 cppuhelper/source/propertysetmixin.cxx                                             |    2 
 cppuhelper/source/servicefactory.cxx                                               |    1 
 cppuhelper/source/supportsservice.cxx                                              |    6 -
 cui/source/customize/acccfg.cxx                                                    |    6 -
 cui/source/customize/cfg.cxx                                                       |    1 
 cui/source/inc/acccfg.hxx                                                          |    2 
 cui/source/inc/cfgutil.hxx                                                         |    2 
 cui/source/options/optlingu.cxx                                                    |    1 
 cui/source/tabpages/tpcolor.cxx                                                    |    2 
 dbaccess/source/core/dataaccess/ModelImpl.cxx                                      |    1 
 dbaccess/source/core/dataaccess/datasource.cxx                                     |    1 
 dbaccess/source/core/dataaccess/documentdefinition.cxx                             |    1 
 dbaccess/source/filter/xml/dbloader2.cxx                                           |    1 
 dbaccess/source/ui/control/sqledit.cxx                                             |    1 
 desktop/source/app/app.cxx                                                         |    2 
 desktop/source/deployment/gui/dp_gui_service.cxx                                   |    1 
 desktop/source/deployment/gui/dp_gui_shared.hxx                                    |    2 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx                       |    1 
 desktop/source/deployment/inc/dp_interact.h                                        |    2 
 desktop/source/deployment/inc/dp_ucb.h                                             |    2 
 desktop/source/deployment/inc/dp_xml.h                                             |    2 
 desktop/source/deployment/manager/dp_commandenvironments.cxx                       |    1 
 desktop/source/deployment/manager/dp_commandenvironments.hxx                       |    2 
 desktop/source/deployment/manager/dp_extensionmanager.cxx                          |    1 
 desktop/source/deployment/manager/dp_extensionmanager.hxx                          |    2 
 desktop/source/deployment/manager/dp_manager.h                                     |    2 
 desktop/source/deployment/manager/dp_properties.cxx                                |    1 
 desktop/source/deployment/manager/dp_properties.hxx                                |    2 
 desktop/source/deployment/misc/dp_dependencies.cxx                                 |    2 
 desktop/source/deployment/misc/dp_descriptioninfoset.cxx                           |    1 
 desktop/source/deployment/misc/dp_identifier.cxx                                   |    4 
 desktop/source/deployment/misc/dp_platform.cxx                                     |    1 
 desktop/source/deployment/registry/component/dp_compbackenddb.cxx                  |    1 
 desktop/source/deployment/registry/component/dp_compbackenddb.hxx                  |    2 
 desktop/source/deployment/registry/component/dp_component.cxx                      |    1 
 desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx     |    1 
 desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx     |    2 
 desktop/source/deployment/registry/dp_backenddb.cxx                                |    1 
 desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx           |    2 
 desktop/source/deployment/registry/help/dp_helpbackenddb.cxx                       |    1 
 desktop/source/deployment/registry/help/dp_helpbackenddb.hxx                       |    2 
 desktop/source/deployment/registry/inc/dp_backend.h                                |    2 
 desktop/source/deployment/registry/inc/dp_backenddb.hxx                            |    2 
 desktop/source/deployment/registry/package/dp_extbackenddb.cxx                     |    1 
 desktop/source/deployment/registry/package/dp_extbackenddb.hxx                     |    2 
 desktop/source/deployment/registry/package/dp_package.cxx                          |    2 
 desktop/source/deployment/registry/script/dp_lib_container.h                       |    2 
 desktop/source/deployment/registry/script/dp_script.cxx                            |    1 
 desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx                   |    1 
 desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx                          |    1 
 desktop/source/migration/services/jvmfwk.cxx                                       |    1 
 desktop/source/migration/services/jvmfwk.hxx                                       |    2 
 desktop/source/pkgchk/unopkg/unopkg_app.cxx                                        |    1 
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx                                     |    1 
 desktop/source/pkgchk/unopkg/unopkg_shared.h                                       |    2 
 desktop/source/splash/splash.cxx                                                   |    2 
 desktop/test/deployment/active/active_native.cxx                                   |    2 
 desktop/test/deployment/passive/passive_native.cxx                                 |    2 
 extensions/source/config/ldap/ldapaccess.hxx                                       |    1 
 extensions/source/config/ldap/ldapuserprofilebe.hxx                                |    1 
 extensions/source/nsplugin/source/so_instance.cxx                                  |    1 
 extensions/source/update/check/updateprotocol.cxx                                  |    1 
 filter/inc/filter/msfilter/mstoolbar.hxx                                           |    2 
 filter/source/config/cache/basecontainer.cxx                                       |    2 
 filter/source/config/cache/cacheitem.cxx                                           |    5 
 filter/source/config/cache/cacheitem.hxx                                           |    2 
 filter/source/config/cache/cacheupdatelistener.cxx                                 |    5 
 filter/source/config/cache/configflush.cxx                                         |    2 
 filter/source/config/cache/contenthandlerfactory.cxx                               |    5 
 filter/source/config/cache/contenthandlerfactory.hxx                               |    2 
 filter/source/config/cache/filtercache.cxx                                         |    2 
 filter/source/config/cache/filterfactory.cxx                                       |    3 
 filter/source/config/cache/filterfactory.hxx                                       |    2 
 filter/source/config/cache/frameloaderfactory.cxx                                  |    5 
 filter/source/config/cache/frameloaderfactory.hxx                                  |    2 
 filter/source/config/cache/lateinitlistener.cxx                                    |    5 
 filter/source/config/cache/typedetection.cxx                                       |    2 
 filter/source/config/cache/typedetection.hxx                                       |    2 
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx                                  |    2 
 filter/source/xsltfilter/LibXSLTTransformer.cxx                                    |    2 
 filter/source/xsltfilter/XSLTFilter.cxx                                            |    2 
 fpicker/source/generic/fpicker.cxx                                                 |    2 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx                                |    2 
 fpicker/source/win32/filepicker/VistaFilePicker.hxx                                |    2 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx                    |    2 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx                    |    2 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx                            |    2 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx                            |    2 
 fpicker/source/win32/filepicker/asyncrequests.hxx                                  |    2 
 framework/inc/framework/preventduplicateinteraction.hxx                            |    2 
 framework/inc/framework/titlehelper.hxx                                            |    2 
 framework/inc/general.h                                                            |   10 -
 framework/inc/services/autorecovery.hxx                                            |    4 
 framework/inc/services/modulemanager.hxx                                           |    2 
 framework/source/accelerators/storageholder.cxx                                    |    2 
 framework/source/dispatch/dispatchinformationprovider.cxx                          |    2 
 framework/source/dispatch/loaddispatcher.cxx                                       |    2 
 framework/source/dispatch/windowcommanddispatch.cxx                                |    2 
 framework/source/fwe/helper/titlehelper.cxx                                        |    2 
 framework/source/fwe/interaction/preventduplicateinteraction.cxx                   |    2 
 framework/source/inc/accelerators/storageholder.hxx                                |    2 
 framework/source/inc/dispatch/loaddispatcher.hxx                                   |    2 
 framework/source/inc/dispatch/windowcommanddispatch.hxx                            |    2 
 framework/source/inc/loadenv/actionlockguard.hxx                                   |    5 
 framework/source/inc/loadenv/loadenv.hxx                                           |    1 
 framework/source/inc/loadenv/loadenvexception.hxx                                  |    4 
 framework/source/inc/pattern/configuration.hxx                                     |    4 
 framework/source/inc/pattern/frame.hxx                                             |    4 
 framework/source/inc/pattern/window.hxx                                            |    4 
 framework/source/loadenv/loadenv.cxx                                               |    6 -
 framework/source/services/autorecovery.cxx                                         |    4 
 framework/source/services/uriabbreviation.cxx                                      |    5 
 framework/source/uielement/statusbarmanager.cxx                                    |    1 
 idlc/inc/idlc/astoperation.hxx                                                     |    8 -
 idlc/inc/idlc/idlctypes.hxx                                                        |    2 
 idlc/source/astoperation.cxx                                                       |   16 --
 idlc/source/errorhandler.cxx                                                       |    4 
 idlc/source/idlc.cxx                                                               |   10 -
 idlc/source/parser.y                                                               |   37 +-----
 idlc/source/scanner.l                                                              |    1 
 idlc/test/interface.idl                                                            |    2 
 javaunohelper/source/vm.cxx                                                        |    2 
 jvmaccess/source/classpath.cxx                                                     |    6 -
 lingucomponent/source/languageguessing/guesslang.cxx                               |    2 
 linguistic/source/defs.hxx                                                         |    3 
 odk/examples/cpp/complextoolbarcontrols/MyListener.cxx                             |    3 
 odk/examples/cpp/complextoolbarcontrols/MyListener.h                               |   10 -
 odk/examples/cpp/complextoolbarcontrols/exports.cxx                                |    2 
 offapi/com/sun/star/accessibility/XAccessibleComponent.idl                         |    2 
 offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl                  |    4 
 offapi/com/sun/star/accessibility/XAccessibleSelection.idl                         |    4 
 offapi/com/sun/star/awt/XActionListener.idl                                        |    2 
 offapi/com/sun/star/awt/XActivateListener.idl                                      |    4 
 offapi/com/sun/star/awt/XAdjustmentListener.idl                                    |    2 
 offapi/com/sun/star/awt/XButton.idl                                                |    8 -
 offapi/com/sun/star/awt/XCheckBox.idl                                              |   10 -
 offapi/com/sun/star/awt/XComboBox.idl                                              |   16 +-
 offapi/com/sun/star/awt/XControl.idl                                               |    6 -
 offapi/com/sun/star/awt/XControlContainer.idl                                      |    6 -
 offapi/com/sun/star/awt/XCurrencyField.idl                                         |   16 +-
 offapi/com/sun/star/awt/XDateField.idl                                             |   14 +-
 offapi/com/sun/star/awt/XDialog.idl                                                |    2 
 offapi/com/sun/star/awt/XDisplayConnection.idl                                     |    8 -
 offapi/com/sun/star/awt/XExtendedToolkit.idl                                       |   16 +-
 offapi/com/sun/star/awt/XFileDialog.idl                                            |    6 -
 offapi/com/sun/star/awt/XFixedHyperlink.idl                                        |   10 -
 offapi/com/sun/star/awt/XFixedText.idl                                             |    4 
 offapi/com/sun/star/awt/XFocusListener.idl                                         |    4 
 offapi/com/sun/star/awt/XGraphics.idl                                              |   54 +++++-----
 offapi/com/sun/star/awt/XImageButton.idl                                           |    6 -
 offapi/com/sun/star/awt/XImageConsumer.idl                                         |   10 -
 offapi/com/sun/star/awt/XImageProducer.idl                                         |    6 -
 offapi/com/sun/star/awt/XItemEventBroadcaster.idl                                  |    4 
 offapi/com/sun/star/awt/XItemListener.idl                                          |    2 
 offapi/com/sun/star/awt/XKeyListener.idl                                           |    4 
 offapi/com/sun/star/awt/XListBox.idl                                               |   26 ++--
 offapi/com/sun/star/awt/XMenu.idl                                                  |   14 +-
 offapi/com/sun/star/awt/XMenuListener.idl                                          |    8 -
 offapi/com/sun/star/awt/XMessageBox.idl                                            |    4 
 offapi/com/sun/star/awt/XMouseListener.idl                                         |    8 -
 offapi/com/sun/star/awt/XNumericField.idl                                          |   16 +-
 offapi/com/sun/star/awt/XPaintListener.idl                                         |    2 
 offapi/com/sun/star/awt/XPatternField.idl                                          |    6 -
 offapi/com/sun/star/awt/XPointer.idl                                               |    2 
 offapi/com/sun/star/awt/XPopupMenu.idl                                             |    6 -
 offapi/com/sun/star/awt/XProgressBar.idl                                           |    8 -
 offapi/com/sun/star/awt/XProgressMonitor.idl                                       |    6 -
 offapi/com/sun/star/awt/XRadioButton.idl                                           |    8 -
 offapi/com/sun/star/awt/XRegion.idl                                                |   20 +--
 offapi/com/sun/star/awt/XScrollBar.idl                                             |   18 +--
 offapi/com/sun/star/awt/XSpinField.idl                                             |   14 +-
 offapi/com/sun/star/awt/XSpinListener.idl                                          |    8 -
 offapi/com/sun/star/awt/XSpinValue.idl                                             |   14 +-
 offapi/com/sun/star/awt/XTabController.idl                                         |   12 +-
 offapi/com/sun/star/awt/XTabControllerModel.idl                                    |    6 -
 offapi/com/sun/star/awt/XTextComponent.idl                                         |   14 +-
 offapi/com/sun/star/awt/XTextEditField.idl                                         |    2 
 offapi/com/sun/star/awt/XTextListener.idl                                          |    2 
 offapi/com/sun/star/awt/XTimeField.idl                                             |   12 +-
 offapi/com/sun/star/awt/XTopWindow.idl                                             |   10 -
 offapi/com/sun/star/awt/XTopWindowListener.idl                                     |   14 +-
 offapi/com/sun/star/awt/XUnoControlContainer.idl                                   |    6 -
 offapi/com/sun/star/awt/XUserInputInterception.idl                                 |    8 -
 offapi/com/sun/star/awt/XVclContainer.idl                                          |    4 
 offapi/com/sun/star/awt/XVclContainerListener.idl                                  |    4 
 offapi/com/sun/star/awt/XVclContainerPeer.idl                                      |    6 -
 offapi/com/sun/star/awt/XVclWindowPeer.idl                                         |    8 -
 offapi/com/sun/star/awt/XView.idl                                                  |    4 
 offapi/com/sun/star/awt/XWindow.idl                                                |   32 ++---
 offapi/com/sun/star/awt/XWindowListener.idl                                        |    8 -
 offapi/com/sun/star/awt/XWindowListener2.idl                                       |    4 
 offapi/com/sun/star/awt/XWindowPeer.idl                                            |    8 -
 offapi/com/sun/star/awt/grid/XGridSelectionListener.idl                            |    2 
 offapi/com/sun/star/awt/tab/XTabPageContainer.idl                                  |    4 
 offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl                          |    2 
 offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl              |    4 
 offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl                          |    2 
 offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl                  |    2 
 offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl                  |    4 
 offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl                     |    2 
 offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl                               |    2 
 offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl                      |    2 
 offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl                    |    4 
 offapi/com/sun/star/datatransfer/dnd/XDragSource.idl                               |    2 
 offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl                        |    6 -
 offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl                       |   10 -
 offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl                               |    6 -
 offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl                    |    4 
 offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl                    |    6 -
 offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl                       |   10 -
 offapi/com/sun/star/document/XEventBroadcaster.idl                                 |    4 
 offapi/com/sun/star/document/XEventListener.idl                                    |    2 
 offapi/com/sun/star/document/XStorageChangeListener.idl                            |    2 
 offapi/com/sun/star/drawing/XControlShape.idl                                      |    2 
 offapi/com/sun/star/form/XApproveActionBroadcaster.idl                             |    4 
 offapi/com/sun/star/form/XBoundControl.idl                                         |    2 
 offapi/com/sun/star/form/XChangeBroadcaster.idl                                    |    4 
 offapi/com/sun/star/form/XChangeListener.idl                                       |    2 
 offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl                             |    4 
 offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl                         |    4 
 offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl                        |    4 
 offapi/com/sun/star/form/XErrorBroadcaster.idl                                     |    4 
 offapi/com/sun/star/form/XFormController.idl                                       |    4 
 offapi/com/sun/star/form/XFormControllerListener.idl                               |    4 
 offapi/com/sun/star/form/XGrid.idl                                                 |    2 
 offapi/com/sun/star/form/XGridPeer.idl                                             |    2 
 offapi/com/sun/star/form/XLoadListener.idl                                         |   10 -
 offapi/com/sun/star/form/XLoadable.idl                                             |   10 -
 offapi/com/sun/star/form/XPositioningListener.idl                                  |    2 
 offapi/com/sun/star/form/XReset.idl                                                |    6 -
 offapi/com/sun/star/form/XResetListener.idl                                        |    2 
 offapi/com/sun/star/form/XSubmit.idl                                               |    6 -
 offapi/com/sun/star/form/XUpdateBroadcaster.idl                                    |    4 
 offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl                               |    4 
 offapi/com/sun/star/frame/XConfigManager.idl                                       |    6 -
 offapi/com/sun/star/frame/XDesktop.idl                                             |    4 
 offapi/com/sun/star/frame/XDispatch.idl                                            |    6 -
 offapi/com/sun/star/frame/XDocumentTemplates.idl                                   |    2 
 offapi/com/sun/star/frame/XFrame.idl                                               |   12 +-
 offapi/com/sun/star/frame/XFrameActionListener.idl                                 |    2 
 offapi/com/sun/star/frame/XFrameLoader.idl                                         |    4 
 offapi/com/sun/star/frame/XLoadEventListener.idl                                   |    4 
 offapi/com/sun/star/frame/XModel.idl                                               |    8 -
 offapi/com/sun/star/frame/XNotifyingDispatch.idl                                   |    2 
 offapi/com/sun/star/frame/XRecordableDispatch.idl                                  |    2 
 offapi/com/sun/star/frame/XSessionManagerClient.idl                                |   10 -
 offapi/com/sun/star/frame/XSessionManagerListener.idl                              |    6 -
 offapi/com/sun/star/frame/XSessionManagerListener2.idl                             |    2 
 offapi/com/sun/star/frame/XStatusListener.idl                                      |    2 
 offapi/com/sun/star/frame/XTask.idl                                                |    6 -
 offapi/com/sun/star/frame/XWindowArranger.idl                                      |    2 
 offapi/com/sun/star/inspection/XPropertyControlContext.idl                         |    2 
 offapi/com/sun/star/inspection/XPropertyControlObserver.idl                        |    4 
 offapi/com/sun/star/mozilla/XCloseSessionListener.idl                              |    2 
 offapi/com/sun/star/mozilla/XMenuProxy.idl                                         |    4 
 offapi/com/sun/star/mozilla/XPluginInstance.idl                                    |   12 +-
 offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl                          |    2 
 offapi/com/sun/star/mozilla/XPluginInstancePeer.idl                                |   10 -
 offapi/com/sun/star/mozilla/XPluginWindowPeer.idl                                  |    2 
 offapi/com/sun/star/script/vba/XVBACompatibility.idl                               |    4 
 offapi/com/sun/star/sdb/XDatabaseAccess.idl                                        |    4 
 offapi/com/sun/star/sdb/XDatabaseAccessListener.idl                                |    4 
 offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl                              |    4 
 offapi/com/sun/star/sdb/XRowSetChangeListener.idl                                  |    2 
 offapi/com/sun/star/sdb/XRowSetSupplier.idl                                        |    2 
 offapi/com/sun/star/sdb/XRowsChangeListener.idl                                    |    2 
 offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl                                   |    4 
 offapi/com/sun/star/sdbc/XRowSet.idl                                               |    4 
 offapi/com/sun/star/sdbc/XRowSetListener.idl                                       |    6 -
 offapi/com/sun/star/sheet/XCalculatable.idl                                        |    2 
 offapi/com/sun/star/sheet/XVolatileResult.idl                                      |    4 
 offapi/com/sun/star/task/XJobExecutor.idl                                          |    2 
 offapi/com/sun/star/task/XStatusIndicator.idl                                      |   10 -
 offapi/com/sun/star/text/XSimpleText.idl                                           |    2 
 offapi/com/sun/star/text/XTextCursor.idl                                           |    4 
 offapi/com/sun/star/text/XTextRange.idl                                            |    2 
 offapi/com/sun/star/text/XTextViewCursor.idl                                       |    2 
 offapi/com/sun/star/ucb/XCommandProcessor.idl                                      |    2 
 offapi/com/sun/star/ucb/XCommandProcessor2.idl                                     |    2 
 offapi/com/sun/star/ucb/XContent.idl                                               |    4 
 offapi/com/sun/star/ucb/XContentProviderManager.idl                                |    2 
 offapi/com/sun/star/ucb/XContentTransmitter.idl                                    |    2 
 offapi/com/sun/star/ucb/XPropertySetRegistry.idl                                   |    2 
 offapi/com/sun/star/ui/XUIConfigurationListener.idl                                |    6 -
 offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl                             |    4 
 offapi/com/sun/star/util/XBroadcaster.idl                                          |    4 
 offapi/com/sun/star/util/XChangesListener.idl                                      |    2 
 offapi/com/sun/star/util/XChangesNotifier.idl                                      |    4 
 offapi/com/sun/star/util/XCloseBroadcaster.idl                                     |    4 
 offapi/com/sun/star/util/XFlushable.idl                                            |    4 
 offapi/com/sun/star/util/XModeChangeListener.idl                                   |    2 
 offapi/com/sun/star/util/XModifyBroadcaster.idl                                    |    4 
 offapi/com/sun/star/util/XRefreshable.idl                                          |    4 
 offapi/com/sun/star/util/XSearchDescriptor.idl                                     |    2 
 offapi/com/sun/star/view/XPrintJobBroadcaster.idl                                  |    4 
 offapi/com/sun/star/view/XPrintJobListener.idl                                     |    2 
 offapi/com/sun/star/view/XPrintableBroadcaster.idl                                 |    4 
 offapi/com/sun/star/view/XPrintableListener.idl                                    |    2 
 offapi/com/sun/star/view/XSelectionChangeListener.idl                              |    2 
 offapi/type_reference/types.rdb                                                    |binary
 oox/source/shape/ShapeContextHandler.hxx                                           |    2 
 sal/inc/sal/types.h                                                                |    8 +
 sc/source/filter/excel/xltoolbar.hxx                                               |    2 
 sc/source/ui/collab/sccollaboration.cxx                                            |    2 
 scripting/source/dlgprov/DialogModelProvider.cxx                                   |    2 
 scripting/source/dlgprov/DialogModelProvider.hxx                                   |    2 
 scripting/source/inc/util/MiscUtils.hxx                                            |    2 
 scripting/source/protocolhandler/scripthandler.cxx                                 |    3 
 scripting/source/protocolhandler/scripthandler.hxx                                 |    2 
 scripting/source/provider/ActiveMSPList.hxx                                        |    2 
 scripting/source/provider/BrowseNodeFactoryImpl.hxx                                |    2 
 scripting/source/provider/MasterScriptProvider.hxx                                 |    2 
 scripting/source/provider/MasterScriptProviderFactory.hxx                          |    2 
 scripting/source/provider/ProviderCache.hxx                                        |    2 
 scripting/source/provider/ScriptImpl.hxx                                           |    2 
 scripting/source/provider/ScriptingContext.hxx                                     |    2 
 scripting/source/provider/URIHelper.hxx                                            |    2 
 sd/inc/stlfamily.hxx                                                               |    2 
 sd/source/core/annotations/AnnotationAccess.cxx                                    |    2 
 sd/source/core/annotations/AnnotationEnumeration.cxx                               |    1 
 sd/source/ui/annotations/annotationtag.hxx                                         |    2 
 sd/source/ui/dlg/filedlg.cxx                                                       |    5 
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx        |    2 
 sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx    |    2 
 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx                      |    2 
 sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx         |    2 
 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx                    |    2 
 sd/source/ui/framework/factories/BasicPaneFactory.hxx                              |    2 
 sd/source/ui/framework/factories/BasicToolBarFactory.hxx                           |    2 
 sd/source/ui/framework/factories/BasicViewFactory.hxx                              |    2 
 sd/source/ui/framework/factories/FullScreenPane.hxx                                |    2 
 sd/source/ui/framework/factories/TaskPanelFactory.hxx                              |    2 
 sd/source/ui/framework/module/ResourceManager.hxx                                  |    2 
 sd/source/ui/framework/module/ShellStackGuard.hxx                                  |    3 
 sd/source/ui/framework/module/SlideSorterModule.hxx                                |    2 
 sd/source/ui/framework/module/ToolBarModule.hxx                                    |    2 
 sd/source/ui/framework/module/ToolPanelModule.hxx                                  |    2 
 sd/source/ui/framework/module/ViewTabBarModule.hxx                                 |    2 
 sd/source/ui/inc/DocumentRenderer.hxx                                              |    2 
 sd/source/ui/inc/DrawController.hxx                                                |    2 
 sd/source/ui/inc/RemoteServer.hxx                                                  |    3 
 sd/source/ui/inc/SdUnoDrawView.hxx                                                 |    2 
 sd/source/ui/inc/SdUnoOutlineView.hxx                                              |    2 
 sd/source/ui/inc/SdUnoSlideView.hxx                                                |    2 
 sd/source/ui/inc/ViewShell.hxx                                                     |    2 
 sd/source/ui/inc/framework/ConfigurationController.hxx                             |    2 
 sd/source/ui/inc/framework/FrameworkHelper.hxx                                     |    2 
 sd/source/ui/inc/framework/ModuleController.hxx                                    |    2 
 sd/source/ui/inc/framework/Pane.hxx                                                |    1 
 sd/source/ui/inc/framework/PresentationFactory.hxx                                 |    2 
 sd/source/ui/inc/framework/ResourceId.hxx                                          |    3 
 sd/source/ui/inc/tools/ConfigurationAccess.hxx                                     |    2 
 sd/source/ui/inc/tools/PropertySet.hxx                                             |    2 
 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx                               |    2 
 sd/source/ui/presenter/CanvasUpdateRequester.hxx                                   |    2 
 sd/source/ui/presenter/PresenterCanvas.hxx                                         |    2 
 sd/source/ui/presenter/PresenterHelper.hxx                                         |    2 
 sd/source/ui/presenter/PresenterPreviewCache.hxx                                   |    2 
 sd/source/ui/presenter/PresenterTextView.hxx                                       |    2 
 sd/source/ui/presenter/SlideRenderer.hxx                                           |    2 
 sd/source/ui/remotecontrol/Communicator.hxx                                        |    2 
 sd/source/ui/remotecontrol/DiscoveryService.hxx                                    |    2 
 sd/source/ui/remotecontrol/ImagePreparer.hxx                                       |    2 
 sd/source/ui/remotecontrol/Listener.hxx                                            |    2 
 sd/source/ui/remotecontrol/Receiver.hxx                                            |    2 
 sd/source/ui/slideshow/slideshowimpl.hxx                                           |    2 
 sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx                         |    2 
 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx                  |    2 
 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx                            |    2 
 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx                           |    2 
 sd/source/ui/slidesorter/shell/SlideSorterService.hxx                              |    2 
 sdext/source/presenter/PresenterAccessibility.hxx                                  |    1 
 sdext/source/presenter/PresenterBitmapContainer.hxx                                |    2 
 sdext/source/presenter/PresenterButton.hxx                                         |    2 
 sdext/source/presenter/PresenterCanvasHelper.hxx                                   |    2 
 sdext/source/presenter/PresenterConfigurationAccess.hxx                            |    2 
 sdext/source/presenter/PresenterController.hxx                                     |    2 
 sdext/source/presenter/PresenterCurrentSlideObserver.hxx                           |    2 
 sdext/source/presenter/PresenterFrameworkObserver.hxx                              |    2 
 sdext/source/presenter/PresenterGeometryHelper.hxx                                 |    2 
 sdext/source/presenter/PresenterHelpView.hxx                                       |    2 
 sdext/source/presenter/PresenterHelper.hxx                                         |    2 
 sdext/source/presenter/PresenterNotesView.hxx                                      |    2 
 sdext/source/presenter/PresenterPaintManager.hxx                                   |    2 
 sdext/source/presenter/PresenterPane.hxx                                           |    2 
 sdext/source/presenter/PresenterPaneBase.hxx                                       |    1 
 sdext/source/presenter/PresenterPaneBorderManager.hxx                              |    2 
 sdext/source/presenter/PresenterPaneBorderPainter.hxx                              |    2 
 sdext/source/presenter/PresenterPaneContainer.hxx                                  |    2 
 sdext/source/presenter/PresenterPaneFactory.hxx                                    |    2 
 sdext/source/presenter/PresenterProtocolHandler.hxx                                |    2 
 sdext/source/presenter/PresenterScreen.hxx                                         |    2 
 sdext/source/presenter/PresenterScrollBar.hxx                                      |    2 
 sdext/source/presenter/PresenterSlidePreview.hxx                                   |    2 
 sdext/source/presenter/PresenterSlideShowView.hxx                                  |    2 
 sdext/source/presenter/PresenterSlideSorter.hxx                                    |    2 
 sdext/source/presenter/PresenterSprite.hxx                                         |    2 
 sdext/source/presenter/PresenterSpritePane.hxx                                     |    2 
 sdext/source/presenter/PresenterTextView.hxx                                       |    1 
 sdext/source/presenter/PresenterTheme.hxx                                          |    2 
 sdext/source/presenter/PresenterTimer.hxx                                          |    2 
 sdext/source/presenter/PresenterToolBar.hxx                                        |    2 
 sdext/source/presenter/PresenterUIPainter.hxx                                      |    2 
 sdext/source/presenter/PresenterViewFactory.hxx                                    |    2 
 sdext/source/presenter/PresenterWindowManager.hxx                                  |    2 
 sfx2/inc/sfx2/sfxbasemodel.hxx                                                     |    2 
 sfx2/source/appl/appinit.cxx                                                       |    1 
 sfx2/source/appl/appopen.cxx                                                       |    2 
 sfx2/source/appl/appserv.cxx                                                       |    2 
 sfx2/source/appl/fileobj.cxx                                                       |    2 
 sfx2/source/appl/imestatuswindow.cxx                                               |    2 
 sfx2/source/appl/openuriexternally.cxx                                             |    6 -
 sfx2/source/appl/workwin.cxx                                                       |    1 
 sfx2/source/control/unoctitm.cxx                                                   |    1 
 sfx2/source/dialog/mailmodel.cxx                                                   |    1 
 sfx2/source/doc/SfxDocumentMetaData.cxx                                            |    3 
 sfx2/source/doc/docfac.cxx                                                         |    1 
 sfx2/source/doc/objstor.cxx                                                        |    2 
 sfx2/source/doc/sfxbasemodel.cxx                                                   |    1 
 sfx2/source/inc/SfxDocumentMetaData.hxx                                            |    4 
 sfx2/source/menu/thessubmenu.hxx                                                   |    2 
 sfx2/source/notify/eventsupplier.cxx                                               |    1 
 sfx2/source/view/sfxbasecontroller.cxx                                             |    1 
 sfx2/source/view/viewfrm.cxx                                                       |    1 
 sfx2/source/view/viewsh.cxx                                                        |    1 
 shell/source/backends/desktopbe/desktopbackend.cxx                                 |    2 
 shell/source/backends/gconfbe/gconfaccess.cxx                                      |    1 
 shell/source/backends/gconfbe/gconfbackend.cxx                                     |    2 
 shell/source/backends/kde4be/kde4access.cxx                                        |    1 
 shell/source/backends/kde4be/kde4backend.cxx                                       |    2 
 shell/source/backends/kdebe/kdeaccess.cxx                                          |    1 
 shell/source/backends/kdebe/kdebackend.cxx                                         |    2 
 shell/source/backends/localebe/localebackend.hxx                                   |    1 
 shell/source/backends/macbe/macbackend.hxx                                         |    1 
 shell/source/backends/wininetbe/wininetbackend.hxx                                 |    1 
 shell/source/unix/exec/shellexec.cxx                                               |    2 
 shell/source/win32/SysShExec.cxx                                                   |    2 
 shell/source/win32/simplemail/smplmailclient.hxx                                   |    2 
 slideshow/source/engine/effectrewinder.hxx                                         |    2 
 smoketest/smoketest.cxx                                                            |    2 
 stoc/source/javaloader/javaloader.cxx                                              |    2 
 stoc/source/javavm/interact.cxx                                                    |    2 
 stoc/source/javavm/javavm.cxx                                                      |    2 
 stoc/source/registry_tdprovider/functiondescription.cxx                            |    2 
 stoc/source/registry_tdprovider/methoddescription.cxx                              |    2 
 stoc/source/registry_tdprovider/structtypedescription.cxx                          |    1 
 stoc/source/simpleregistry/simpleregistry.cxx                                      |    2 
 stoc/source/simpleregistry/textualservices.cxx                                     |    2 
 stoc/source/tdmanager/tdmgr_common.hxx                                             |    2 
 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx                             |    2 
 stoc/source/uriproc/UriReference.cxx                                               |    1 
 stoc/source/uriproc/UriReferenceFactory.cxx                                        |    2 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx                  |    2 
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx                  |    2 
 stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx                           |    2 
 stoc/test/language_binding.idl                                                     |    2 
 stoc/test/registry_tdprovider/testregistrytdprovider.cxx                           |    2 
 stoc/test/registry_tdprovider/types.idl                                            |    2 
 stoc/test/tdmanager/testtdmanager.cxx                                              |    2 
 stoc/test/testcorefl.idl                                                           |    2 
 stoc/test/testintrosp.idl                                                          |    4 
 stoc/test/uriproc/test_uriproc.cxx                                                 |    2 
 svl/qa/unit/test_URIHelper.cxx                                                     |    2 
 svl/source/config/asiancfg.cxx                                                     |    2 
 svl/source/config/itemholder2.cxx                                                  |    6 -
 svl/source/config/itemholder2.hxx                                                  |    6 -
 svl/source/misc/getstringresource.cxx                                              |    2 
 svl/source/misc/urihelper.cxx                                                      |    1 
 svl/source/uno/pathservice.cxx                                                     |    1 
 svl/source/uno/registerservices.cxx                                                |    1 
 svtools/inc/svtools/acceleratorexecute.hxx                                         |    2 
 svtools/source/config/accessibilityoptions.cxx                                     |    2 
 svtools/source/config/itemholder2.cxx                                              |    6 -
 svtools/source/config/itemholder2.hxx                                              |    5 
 svtools/source/config/printoptions.cxx                                             |    1 
 svtools/source/contnr/DocumentInfoPreview.cxx                                      |    6 -
 svtools/source/dialogs/restartdialog.cxx                                           |    2 
 svtools/source/edit/svmedit.cxx                                                    |    2 
 svtools/source/edit/textwindowpeer.cxx                                             |    2 
 svtools/source/misc/acceleratorexecute.cxx                                         |    2 
 svx/inc/tbunosearchcontrollers.hxx                                                 |    1 
 svx/source/accessibility/lookupcolorname.cxx                                       |    2 
 svx/source/dialog/docrecovery.cxx                                                  |    2 
 svx/source/form/datanavi.cxx                                                       |    2 
 svx/source/inc/docrecovery.hxx                                                     |    2 
 svx/source/inc/recoveryui.hxx                                                      |    2 
 svx/source/unodraw/recoveryui.cxx                                                  |    1 
 svx/source/unodraw/unoshtxt.cxx                                                    |    3 
 sw/inc/unoflatpara.hxx                                                             |    2 
 sw/inc/unotxdoc.hxx                                                                |    2 
 sw/source/core/access/accfrmobj.cxx                                                |    2 
 sw/source/core/access/parachangetrackinginfo.cxx                                   |    2 
 sw/source/core/docnode/finalthreadmanager.cxx                                      |    2 
 sw/source/filter/ww8/ww8toolbar.hxx                                                |    2 
 sw/source/ui/docvw/SidebarTxtControl.cxx                                           |    2 
 sw/source/ui/docvw/SidebarTxtControlAcc.cxx                                        |    2 
 sw/source/ui/docvw/SidebarWin.cxx                                                  |    2 
 sw/source/ui/docvw/SidebarWinAcc.cxx                                               |    2 
 sw/source/ui/docvw/srcedtw.cxx                                                     |    6 -
 sw/source/ui/wrtsh/navmgr.cxx                                                      |    2 
 testtools/source/bridgetest/constructors.cxx                                       |    1 
 testtools/source/bridgetest/currentcontextchecker.cxx                              |    2 
 testtools/source/bridgetest/idl/bridgetest.idl                                     |    8 -
 testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl |    4 
 testtools/source/bridgetest/multi.cxx                                              |    2 
 toolkit/source/awt/asynccallback.cxx                                               |    4 
 toolkit/source/awt/vclxmenu.cxx                                                    |    2 
 toolkit/source/awt/vclxtoolkit.cxx                                                 |    2 
 tubes/source/manager.cxx                                                           |    2 
 ucbhelper/inc/ucbhelper/fd_inputstream.hxx                                         |    2 
 ucbhelper/inc/ucbhelper/std_inputstream.hxx                                        |    2 
 ucbhelper/inc/ucbhelper/std_outputstream.hxx                                       |    2 
 ucbhelper/source/client/interceptedinteraction.cxx                                 |    3 
 ucbhelper/source/provider/getcomponentcontext.cxx                                  |    2 
 udkapi/com/sun/star/beans/XMultiPropertySet.idl                                    |    6 -
 udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl                            |    4 
 udkapi/com/sun/star/container/XContainer.idl                                       |    4 
 udkapi/com/sun/star/container/XContainerListener.idl                               |    6 -
 udkapi/com/sun/star/container/XNamed.idl                                           |    2 
 udkapi/com/sun/star/io/XDataExporter.idl                                           |    4 
 udkapi/com/sun/star/io/XDataImporter.idl                                           |    4 
 udkapi/com/sun/star/io/XDataTransferEventListener.idl                              |    4 
 udkapi/com/sun/star/lang/XConnectionPointContainer.idl                             |    4 
 udkapi/com/sun/star/script/XAllListener.idl                                        |    4 
 udkapi/com/sun/star/uno/XInterface.idl                                             |    4 
 udkapi/com/sun/star/uno/XReference.idl                                             |    2 
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx                               |   28 ++---
 unodevtools/source/skeletonmaker/cpptypemaker.cxx                                  |    8 -
 unotest/source/cpp/officeconnection.cxx                                            |    6 -
 unotest/source/cpp/toabsolutefileurl.cxx                                           |    6 -
 unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx                 |    2 
 unotools/source/config/configmgr.cxx                                               |    2 
 unotools/source/config/historyoptions.cxx                                          |    2 
 unotools/source/config/itemholder1.cxx                                             |    6 -
 unotools/source/config/itemholder1.hxx                                             |    6 -
 unotools/source/config/moduleoptions.cxx                                           |    8 -
 unotools/source/config/saveopt.cxx                                                 |    2 
 unotools/source/config/viewoptions.cxx                                             |    6 -
 unotools/source/i18n/instance.hxx                                                  |    2 
 unotools/source/ucbhelper/ucbhelper.cxx                                            |    2 
 unotools/source/ucbhelper/xtempfile.cxx                                            |    2 
 unoxml/source/rdf/CBlankNode.cxx                                                   |    2 
 unoxml/source/rdf/CLiteral.cxx                                                     |    2 
 unoxml/source/rdf/CNodes.hxx                                                       |    6 -
 unoxml/source/rdf/CURI.cxx                                                         |    2 
 unoxml/source/rdf/librdf_repository.hxx                                            |    2 
 ure/source/uretest/cppmain.cc                                                      |    2 
 ure/source/uretest/cppserver.cc                                                    |    2 
 ure/source/uretest/cpptest.cc                                                      |    2 
 uui/source/secmacrowarnings.hxx                                                    |    2 
 vbahelper/inc/vbahelper/vbaaccesshelper.hxx                                        |    2 
 vbahelper/inc/vbahelper/vbahelper.hxx                                              |    1 
 vcl/generic/fontmanager/fontmanager.cxx                                            |    6 -
 vcl/source/app/session.cxx                                                         |    6 -
 vcl/source/app/svdata.cxx                                                          |    6 -
 vcl/source/gdi/impimagetree.cxx                                                    |    2 
 vcl/source/helper/xconnection.cxx                                                  |    6 -
 vcl/source/window/dialog.cxx                                                       |    2 
 vcl/unx/generic/dtrans/X11_selection.cxx                                           |    6 -
 vcl/unx/generic/dtrans/X11_service.cxx                                             |    6 -
 writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx                                |    2 
 xmlreader/source/span.cxx                                                          |    6 -
 xmlreader/source/xmlreader.cxx                                                     |    2 
 xmlscript/source/xmldlg_imexp/exp_share.hxx                                        |    2 
 xmlscript/source/xmldlg_imexp/imp_share.hxx                                        |    2 
 xmlsecurity/inc/xmlsecurity/certificatechooser.hxx                                 |    1 
 xmlsecurity/inc/xmlsecurity/certificateviewer.hxx                                  |    1 
 xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx                            |    1 
 xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx                            |    2 
 xmlsecurity/inc/xmlsecurity/macrosecurity.hxx                                      |    1 
 xmlsecurity/inc/xmlsecurity/warnings.hxx                                           |    1 
 xmlsecurity/source/component/documentdigitalsignatures.cxx                         |    1 
 xmlsecurity/source/dialogs/certificateviewer.cxx                                   |    2 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                             |    1 
 xmlsecurity/source/helper/documentsignaturehelper.cxx                              |    2 
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx                                   |    1 
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx                            |    1 
 656 files changed, 604 insertions(+), 1717 deletions(-)

New commits:
commit 66a175834c39ccde9475eac3adb72a843110d01f
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Thu Nov 29 21:26:09 2012 +0100

    c++ API: use css alias in generated headers, adds global css decl
    
    This changes all generated API headers (.hpp and .hdl) to use a
    namespace alias 'css' instead of the pointlessly long com::sun::star
    
    Makes the change in cppumaker & associated tools, adds a global
    namespace alias definition in sal/types.h, and removes a kiloton
    of local, now pointless-to-harmful versions of that alias from all
    over the code.
    
    Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f

diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 267d7de..6d8db68 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -55,8 +55,6 @@
 class TextEngine;
 class TextView;
 
-namespace css = ::com::sun::star;
-
 namespace accessibility
 {
 
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 547319e..71e6c78 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -28,8 +28,6 @@
 #include <vector>
 #include <boost/unordered_map.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace accessibility
 {
 
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 2db52ed..96203ab 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -40,8 +40,6 @@
 #include <avmedia/mediawindow.hxx>
 #include <osl/mutex.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace avmedia{
 
 struct ThreadHelpBase
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index fe91e70..3337f9f 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -46,7 +46,6 @@ namespace basctl
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-namespace css = ::com::sun::star;
 
 Reference< view::XRenderable > Shell::GetRenderable()
 {
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 768a273..14ca486 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -29,8 +29,6 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include "basicdllapi.h"
 
-namespace css = ::com::sun::star;
-
 // Basic-Module for excel object.
 
 class BASIC_DLLPUBLIC SbObjModule : public SbModule
diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 9846673..759b120 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -36,8 +36,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Test: public CppUnit::TestFixture {
 private:
     CPPUNIT_TEST_SUITE(Test);
diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx
index 9a60dac..a56663a 100644
--- a/binaryurp/source/binaryany.cxx
+++ b/binaryurp/source/binaryany.cxx
@@ -29,12 +29,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 BinaryAny::BinaryAny() throw () {
     uno_any_construct(&data_, 0, 0, 0);
 }
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 5256ac0..5b463f5 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -73,8 +73,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 sal_Int32 random() {
     sal_Int32 n;
     rtlRandomPool pool = rtl_random_createPool();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 4050e06..24105f3 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -38,12 +38,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create(
     css::uno::Reference< css::uno::XComponentContext > const & xContext)
     SAL_THROW((css::uno::Exception))
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index a2d6c1a..143dd34 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -32,12 +32,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 namespace current_context {
 
 css::uno::UnoInterfaceReference get() {
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index b156196..1ac6e10 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -40,12 +40,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 IncomingRequest::IncomingRequest(
     rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
     OUString const & oid, css::uno::UnoInterfaceReference const & object,
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index d5c9f71..476fb19 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -50,8 +50,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 void write64(std::vector< unsigned char > * buffer, sal_uInt64 value) {
     Marshal::write8(buffer, value >> 56);
     Marshal::write8(buffer, (value >> 48) & 0xFF);
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index 2a15d04..a0fb6d2 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -29,12 +29,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 OutgoingRequests::OutgoingRequests() {}
 
 OutgoingRequests::~OutgoingRequests() {}
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index fde8b31..355ac87 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -41,8 +41,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 extern "C" void SAL_CALL proxy_acquireInterface(uno_Interface * pInterface) {
     assert(pInterface != 0);
     static_cast< Proxy * >(pInterface)->do_acquire();
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index cbfb7dd..522b165 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -56,8 +56,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 css::uno::Sequence< sal_Int8 > read(
     css::uno::Reference< css::connection::XConnection > const & connection,
     sal_uInt32 size, bool eofOk)
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index f0c9ef5..d413e5f 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -55,8 +55,6 @@ namespace binaryurp {
 
 namespace {
 
-namespace css = com::sun::star;
-
 void * allocate(sal_Size size) {
     void * p = rtl_allocateMemory(size);
     if (p == 0) {
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index dbbaf85..3d5c199 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -38,12 +38,6 @@
 
 namespace binaryurp {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 Writer::Item::Item() {}
 
 Writer::Item::Item(
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
index 9822979..7f9323f 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
@@ -45,8 +45,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 void loadFpRegsFromStruct(typelib_TypeDescription * type, void * data) {
     for (typelib_CompoundTypeDescription * t =
              reinterpret_cast< typelib_CompoundTypeDescription * >(type);
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
index 2a55fcd..d192036 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
@@ -49,8 +49,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 typedef void (* Function)(void *);
 
 Function toFunction(void * pointer) {
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
index cf4545a..b91f2ab 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
@@ -46,8 +46,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 void storeFpRegsToStruct(typelib_TypeDescription * type, void * data) {
     for (typelib_CompoundTypeDescription * t =
              reinterpret_cast< typelib_CompoundTypeDescription * >(type);
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 713b3f6..61dd3e8 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -29,7 +29,6 @@
 #include "uno/lbnames.h"
 
 
-namespace css = ::com::sun::star;
 using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index f7a94a1..fddc097 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -50,8 +50,6 @@
 #include <iostream>
 #include <cstdlib>
 
-namespace css = com::sun::star;
-
 namespace {
 
 class WaitCondition {
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index d64efc3..106e0a3 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -46,8 +46,6 @@
 #include "uno/environment.h"
 #include "uno/lbnames.h"
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Service: public cppu::WeakImplHelper2<
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index b30f203..df0991c 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -46,8 +46,6 @@
 
 #include <iostream>
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Client: public cppu::WeakImplHelper2<
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index c430803..607a054 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -41,8 +41,6 @@
 #include "sal/types.h"
 #include "uno/lbnames.h"
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Server:
diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h
index f70fe70..f6e987f 100755
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -34,8 +34,6 @@
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 
 
-namespace css = ::com::sun::star;
-
 namespace climaker
 {
 
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 9292b4a..373e4bf 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -37,8 +37,6 @@
 
 #undef VOID
 
-namespace css = com::sun::star;
-
 namespace sri = System::Runtime::InteropServices;
 namespace sr = System::Reflection;
 namespace st = System::Text;
@@ -542,7 +540,7 @@ System::String^ mapUnoTypeName(rtl_uString const * typeName)
     The values in the type list
     are uno types and are replaced by cli types, such as System.Char,
     System.Int32, etc.
-    The präfix unoidl is not added.
+    The präfix unoidl is not added.
  */
 inline System::String^ mapUnoPolymorphicName(System::String^ unoName)
 {
@@ -553,7 +551,7 @@ inline System::String^ mapUnoPolymorphicName(System::String^ unoName)
     The values in the type list
     are CLI types and are replaced by uno types, such as char,
     long, etc.
-    The präfix unoidl remains.
+    The präfix unoidl remains.
  */
 inline System::String^ mapCliPolymorphicName(System::String^ unoName)
 {
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index aaa59e9..61c3036 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -35,7 +35,6 @@ namespace srrm = System::Runtime::Remoting::Messaging;
 namespace srr = System::Runtime::Remoting;
 namespace srrp = System::Runtime::Remoting::Proxies;
 namespace sd = System::Diagnostics;
-namespace css = com::sun::star;
 namespace ucss = unoidl::com::sun::star;
 
 using namespace cli_uno;
diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx
index e72b865..93ab81e 100644
--- a/cli_ure/source/uno_bridge/cli_uno.cxx
+++ b/cli_ure/source/uno_bridge/cli_uno.cxx
@@ -23,7 +23,6 @@
 #include "cli_bridge.h"
 
 namespace sr=System::Reflection;
-namespace css=com::sun::star;
 
 using ::rtl::OUStringBuffer;
 
diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx
index db5c468..3cfd713 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -24,8 +24,16 @@
 
 namespace codemaker { namespace cpp {
 
-rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace=false,
-                           bool shortname=false);
+/** Stick a namespace scope to c++ type
+
+    @param type
+    Undecorated type
+
+    @param ns_alias
+    Use common namespace aliases instead of fully specified (nested)
+    namespace. currently replaces com::sun::star with css.
+ */
+rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true);
 
 rtl::OString translateUnoToCppType(
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx
index 53cd5da..989052d 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -37,8 +37,7 @@
 
 namespace codemaker { namespace cpp {
 
-rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace,
-                           bool shortname)
+rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias)
 {
     char c('/');
     sal_Int32 nPos = type.lastIndexOf( c );
@@ -49,8 +48,6 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace,
 
         c = '.';
     }
-    if (bNoNameSpace)
-        return type.copy(nPos+1);
 
     rtl::OStringBuffer tmpBuf(type.getLength()*2);
     nPos = 0;
@@ -60,15 +57,13 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace,
         tmpBuf.append(type.getToken(0, c, nPos));
     } while( nPos != -1 );
 
-    if (shortname) {
-        rtl::OString s(tmpBuf.makeStringAndClear());
-        if (s.indexOf("::com::sun::star") == 0)
-            return s.replaceAt(0, 16, "css");
-        else
-            return s;
+    rtl::OString s(tmpBuf.makeStringAndClear());
+    if (ns_alias && s.indexOf("::com::sun::star::") == 0)
+    {
+        return s.replaceAt(0, 18, "css::"); // nicer shorthand
     }
 
-    return tmpBuf.makeStringAndClear();
+    return s;
 }
 
 
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index 2f6c941..1a31c9a 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.hxx
@@ -34,15 +34,6 @@
 //_______________________________________________
 // namespaces
 
-// no panic .. this define will be reseted at the end of this file.
-// BUT doing so it's neccessary to add all includes BEFORE this css-value
-// will be defined :_)
-#ifdef css
-#error "Who use css? I need it as namespace alias."
-#else
-#define css ::com::sun::star
-#endif
-
 namespace comphelper{
 
 
@@ -244,8 +235,6 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
 
 } // namespace comphelper
 
-#undef css // important!
-
 #endif // _COMPHELPER_CONFIGURATIONHELPER_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index d2ea6b8..59183e4 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -37,13 +37,6 @@
 
 namespace comphelper{
 
-#ifdef css
-    #error "Ambigious namespace definition of css."
-#else
-    #define css ::com::sun::star
-#endif
-
-
 /** @short  defines a collection of UNO components, where every component will get it's own unique number.
 
     @descr  Such number will be unique at runtime only ... but it supports fragmentation.
@@ -176,8 +169,6 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
         css::uno::WeakReference< css::uno::XInterface > m_xOwner;
 };
 
-#undef css
-
 } // namespace comphelper
 
 #endif // _COMPHELPER_NUMBEREDCOLLECTION_HXX_
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 442bf9f..d02e47f 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -37,7 +37,6 @@ namespace service_decl {
 class ServiceDecl;
 
 namespace detail {
-namespace css = ::com::sun::star;
 typedef ::boost::function3<
     css::uno::Reference<css::uno::XInterface> /* return */,
     ServiceDecl const&,
diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx
index 742b1b2..ddc515e 100644
--- a/comphelper/qa/weakbag/test_weakbag.cxx
+++ b/comphelper/qa/weakbag/test_weakbag.cxx
@@ -28,8 +28,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Test: public CppUnit::TestFixture {
 public:
     void test() {
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index dd5e6ca..e4bb82d 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -52,8 +52,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 struct TheConfigurationWrapper:
     public rtl::StaticWithArg<
         comphelper::detail::ConfigurationWrapper,
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 7c16385..add324b 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -28,9 +28,6 @@
 
 namespace comphelper{
 
-namespace css = ::com::sun::star;
-
-
 //-----------------------------------------------
 css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                                             const ::rtl::OUString&                                    sPackage,
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 84d3331..1957ab6 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -50,9 +50,6 @@
 
 namespace comphelper{
 
-namespace css = ::com::sun::star;
-
-
 const ::rtl::OUString& MediaDescriptor::PROP_ABORTED()
 {
     static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Aborted"));
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 0bba81e..a23690e 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -25,9 +25,6 @@
 
 namespace comphelper{
 
-namespace css = ::com::sun::star;
-
-
 static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed.";
 
 //-----------------------------------------------
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index 3760b3c..2867447 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -22,9 +22,6 @@
 
 namespace comphelper{
 
-namespace css = ::com::sun::star;
-
-
 SequenceAsHashMap::SequenceAsHashMap()
     : SequenceAsHashMapBase()
 {
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
index b3dd6e8..c1999e9 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -27,8 +27,6 @@
 
 namespace comphelper{
 
-    namespace css = ::com::sun::star;
-
 StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler)
              : m_bUsed                    (sal_False)
              , m_bHandledByMySelf         (sal_False)
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index abfc224..a721f77 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -57,8 +57,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 void normalize(
     rtl::OUString const & path, rtl::OUString const & relative,
     rtl::OUString * normalizedPath, rtl::OUString * name)
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index e8c91ac..6641273 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -101,12 +101,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 oslInterlockedCount Access::acquireCounting() {
     return osl_atomic_increment(&m_refCount);
 }
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index adceeef..d7592c6 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -44,8 +44,6 @@ namespace configmgr {
 
 namespace {
 
-namespace css = com::sun::star;
-
 void appendMessage(
     rtl::OUStringBuffer & buffer, css::uno::Exception const & exception)
 {
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 99c4d2d..6b2cd41 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -61,12 +61,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 namespace
 {
     class theChildAccessUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theChildAccessUnoTunnelId > {};
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 82b4be7..779a030 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -70,8 +70,6 @@ namespace configmgr {
 
 namespace {
 
-namespace css = com::sun::star;
-
 struct UnresolvedListItem {
     rtl::OUString name;
     rtl::Reference< ParseManager > manager;
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index db10168..4f0b532 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -66,8 +66,6 @@ namespace configmgr { namespace configuration_provider {
 
 namespace {
 
-namespace css = com::sun::star;
-
 char const accessServiceName[] =
     "com.sun.star.configuration.ConfigurationAccess";
 char const updateAccessServiceName[] =
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 40b6941..7df357e 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -67,8 +67,6 @@ namespace configmgr { namespace configuration_registry {
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::registry::XSimpleRegistry,
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index d7d7755..4602f00 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -45,8 +45,6 @@ namespace configmgr {
 
 namespace {
 
-namespace css = com::sun::star;
-
 bool decode(
     rtl::OUString const & encoded, sal_Int32 begin, sal_Int32 end,
     rtl::OUString * decoded)
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 06b8356..ea62032 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -33,8 +33,6 @@
 
 namespace configmgr { namespace default_provider {
 
-namespace css = com::sun::star;
-
 css::uno::Reference< css::uno::XInterface > create(
     css::uno::Reference< css::uno::XComponentContext > const & context)
 {
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index db09891..b5f36e9 100644
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
@@ -29,12 +29,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 LocalizedValueNode::LocalizedValueNode(int layer, css::uno::Any const & value):
     Node(layer), value_(value)
 {}
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index 456723c..59662ff 100644
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -34,12 +34,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 NodeMap & Node::getMembers() {
     assert(false);
     throw css::uno::RuntimeException(
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index 27f3f20..bf2a998 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -33,12 +33,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 ParseManager::ParseManager(
     rtl::OUString const & url, rtl::Reference< Parser > const & parser)
     SAL_THROW((
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 29d85dd..e82cf59 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -37,8 +37,6 @@ namespace configmgr {
 
 namespace {
 
-namespace css = com::sun::star;
-
 bool parseSegment(
     rtl::OUString const & path, sal_Int32 * index, rtl::OUString * segment)
 {
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index e5ecb6b..4ef895b 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -35,12 +35,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 PropertyNode::PropertyNode(
     int layer, Type staticType, bool nillable, css::uno::Any const & value,
     bool extension):
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 264eae1..aee1212 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -60,8 +60,6 @@ namespace configmgr { namespace read_only_access {
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::lang::XInitialization,
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 5d8d1de..b302ad8 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -62,8 +62,6 @@ namespace configmgr { namespace read_write_access {
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::lang::XInitialization,
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 56e5204..6b9b3b5 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -57,12 +57,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 RootAccess::RootAccess(
     Components & components, rtl::OUString const & pathRepresentation,
     rtl::OUString const & locale, bool update):
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 6d691bf..3fa16fa 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -38,8 +38,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
     SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
         const &)
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 2265daa..01d930e 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -38,12 +38,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 bool isListType(Type type) {
     return type >= TYPE_BOOLEAN_LIST;
 }
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 2440099..157a398 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -49,8 +49,6 @@ namespace configmgr { namespace update {
 
 namespace {
 
-namespace css = com::sun::star;
-
 std::set< rtl::OUString > seqToSet(
     css::uno::Sequence< rtl::OUString > const & sequence)
 {
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 75ddef2..65190e4 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -49,8 +49,6 @@ namespace configmgr {
 
 namespace {
 
-namespace css = com::sun::star;
-
 bool parseHexDigit(char c, int * value) {
     assert(value != 0);
     if (c >= '0' && c <= '9') {
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 7e69cd9..89616bc 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -57,8 +57,6 @@ class Components;
 
 namespace {
 
-namespace css = com::sun::star;
-
 rtl::OString convertToUtf8(
     rtl::OUString const & text, sal_Int32 offset, sal_Int32 length)
 {
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index d7bc544..0f267db 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -40,12 +40,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 XcdParser::XcdParser(
     int layer, std::set< OUString > const & processedDependencies, Data & data):
     layer_(layer), processedDependencies_(processedDependencies), data_(data),
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 686bfdb..1e6f914 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -51,8 +51,6 @@ namespace configmgr {
 
 namespace {
 
-namespace css = com::sun::star;
-
 // Conservatively merge a template or component (and its recursive parts) into
 // an existing instance:
 void merge(
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 56f9e21..3515cce 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -54,12 +54,6 @@
 
 namespace configmgr {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 XcuParser::XcuParser(
     int layer, Data & data, Partial const * partial,
     Modifications * broadcastModifications, Additions * additions):
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index 8ba6ae5..6e3def0 100644
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -54,12 +54,6 @@ namespace configmgr {
 
 namespace xmldata {
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 Type parseType(
     xmlreader::XmlReader const & reader, xmlreader::Span const & text)
 {
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index 5dd1a78..ff2f359 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -31,8 +31,6 @@ namespace connectivity
 {
     namespace mork
     {
-        namespace css = com::sun::star;
-
         class MorkDriver;
         class ProfileAccess;
         class ErrorDescriptor;
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index 722bb92..994b276 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -43,7 +43,6 @@ namespace rtl { class OUString; }
 
 namespace connectivity { namespace mork {
 class ProfileAccess;
-namespace css = com::sun::star;
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL
 create(css::uno::Reference< css::uno::XComponentContext > const &);
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 05a07b8..d53f0e2 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -59,8 +59,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Base {
 public:
     Base(): m_count(0) {}
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 60921c8..527cac5 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -47,8 +47,6 @@ namespace com { namespace sun { namespace star { namespace uno {
 
 namespace {
 
-namespace css = com::sun::star;
-
 struct DerivedStruct1: css::lang::EventObject {};
 
 struct DerivedStruct2: css::beans::PropertyChangeEvent {};
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index 70961cc..f0dc4d6 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -31,12 +31,6 @@
 #include "jobqueue.hxx"
 #include "threadpool.hxx"
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 using namespace osl;
 
 namespace cppu_threadpool {
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 1d7448a..9d4f9cd 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -62,8 +62,6 @@ namespace com { namespace sun { namespace star {
     class XEventListener;
 } } }
 
-namespace css = com::sun::star;
-
 namespace {
 
 class Empty1:
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 85bb689..e46ff6f 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -77,8 +77,6 @@ namespace com { namespace sun { namespace star {
     struct EventObject;
 } } }
 
-namespace css = com::sun::star;
-
 namespace {
 
 std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) {
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 861433f..a9d0c48 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -44,8 +44,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Reference: public cppu::WeakImplHelper1< css::uno::XReference > {
 public:
     Reference(): m_disposed(false) {}
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index f27d82c..1fe1aa7 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -77,8 +77,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 bool nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) {
     assert(url != 0);
     for (;;) {
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index d834e25..ba491c3 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -38,12 +38,6 @@
 
 #include "paths.hxx"
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 rtl::OUString cppu::get_this_libpath() {
     static rtl::OUString s_uri;
     if (s_uri.isEmpty()) {
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index c3c30fb..3f309ee 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -92,8 +92,6 @@
 
 using cppu::PropertySetMixinImpl;
 
-namespace css = com::sun::star;
-
 namespace {
 
 template< typename T > struct AutoDispose {
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 062e7ff..6b3acb2 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -69,7 +69,6 @@ using namespace ::rtl;
 using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-namespace css = com::sun::star;
 
 namespace cppu
 {
diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx
index 9a37713..afef759 100644
--- a/cppuhelper/source/supportsservice.cxx
+++ b/cppuhelper/source/supportsservice.cxx
@@ -17,12 +17,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
 bool cppu::supportsService(
     css::lang::XServiceInfo * implementation, rtl::OUString const & name)
 {
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 78b9e73..931a025 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -70,12 +70,6 @@
 //-----------------------------------------------
 // namespaces
 
-#ifdef css
-    #error "ambigous praeprozessor directive for css ..."
-#else
-    namespace css = ::com::sun::star;
-#endif
-
 using namespace com::sun::star;
 
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 1db51dc..a6bc4d8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -118,7 +118,6 @@ static const char aMenuSeparatorStr[] = " | ";
 #endif
 
 using rtl::OUString;
-namespace css = com::sun::star;
 namespace uno = com::sun::star::uno;
 namespace frame = com::sun::star::frame;
 namespace lang = com::sun::star::lang;
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index a837b8d..e3b6431 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -46,8 +46,6 @@
 #include <sfx2/minarray.hxx>
 #include "cfgutil.hxx"
 
-namespace css = ::com::sun::star;
-
 class SfxMacroInfoItem;
 class SfxConfigGroupListBox_Impl;
 class SfxConfigFunctionListBox_Impl;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index d2ec922..a675484 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -36,8 +36,6 @@
 
 class SfxMacroInfoItem;
 
-namespace css = ::com::sun::star;
-
 struct SfxStyleInfo_Impl
 {
     ::rtl::OUString sFamily;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index ae328c0..21c0414 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -79,7 +79,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::beans;
-namespace css = com::sun::star;
 
 #define CBCOL_FIRST     0
 #define CBCOL_SECOND    1
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d464e68..f8c3aff 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -49,8 +49,6 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-namespace css = ::com::sun::star;
-
 
 // Load save embed functionality
 SvxLoadSaveEmbed::SvxLoadSaveEmbed( Window *pParent, Window *pDialog,
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 2d62e2c..5432375 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -81,7 +81,6 @@ using namespace ::cppu;
 using namespace ::osl;
 using namespace ::dbtools;
 using namespace ::comphelper;
-namespace css = ::com::sun::star;
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index b692bb5..7d7bc99 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -90,7 +90,6 @@ using namespace ::cppu;
 using namespace ::osl;
 using namespace ::dbtools;
 using namespace ::comphelper;
-namespace css = ::com::sun::star;
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 47c6cd3..d3e660e 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -123,7 +123,6 @@ using namespace drawing;
 using namespace ::osl;
 using namespace ::comphelper;
 using namespace ::cppu;
-namespace css = ::com::sun::star;
 
 using sdb::application::XDatabaseDocumentUI;
 namespace DatabaseObject = sdb::application::DatabaseObject;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 07fe9f2..5d6db82 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -85,7 +85,6 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::embed;
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
 using ::com::sun::star::awt::XWindow;
 using ::com::sun::star::sdb::application::NamedDatabaseObject;
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 5a46fcd..4154c28 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -35,7 +35,6 @@
 #include "QueryDesignView.hxx"
 #include <svl/smplhint.hxx>
 
-namespace css = ::com::sun::star;
 using namespace dbaui;
 
 class OSqlEdit::ChangesListener:
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 34ef4c4..f83d8c2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -127,8 +127,6 @@ using namespace ::com::sun::star::system;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::container;
 
-namespace css = ::com::sun::star;
-
 ResMgr* desktop::Desktop::pResMgr = 0;
 
 namespace desktop
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index de558fb..c287391 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno;
 
 using ::rtl::OUString;
 
-namespace css = ::com::sun::star;
 namespace dp_gui {
 
 //==============================================================================
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 31fa1aa..f407ed9 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -24,8 +24,6 @@
 #include "tools/resmgr.hxx"
 
 
-namespace css = ::com::sun::star;
-
 namespace dp_gui {
 
 struct DeploymentGuiResMgr :
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index e844cb8..d123cec 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -76,7 +76,6 @@
 class Window;
 
 namespace cssu = ::com::sun::star::uno;
-namespace css = ::com::sun::star;
 
 using dp_misc::StrTitle;
 using ::rtl::OUString;
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 9f803c7..9d3a105 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -27,8 +27,6 @@
 #include "com/sun/star/task/XAbortChannel.hpp"
 #include "dp_misc_api.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace dp_misc
 {
 
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 3709058..7da43b7 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -33,8 +33,6 @@ namespace ucbhelper
 class Content;
 }
 
-namespace css = ::com::sun::star;
-
 namespace dp_misc {
 
 struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index d5fbb52..607c717 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -33,8 +33,6 @@ namespace ucbhelper
 class Content;
 }
 
-namespace css = ::com::sun::star;
-
 namespace dp_misc
 {
 
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index baaa0cb..fcd51f4 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -34,7 +34,6 @@ namespace deployment = com::sun::star::deployment;
 namespace task = com::sun::star::task;
 namespace ucb = com::sun::star::ucb;
 namespace uno = com::sun::star::uno;
-namespace css = com::sun::star;
 
 #define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
 
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index adead8c..93d1626 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -24,8 +24,6 @@
 #include "ucbhelper/content.hxx"
 #include "com/sun/star/uno/Type.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace dp_manager {
 
 /**
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 492c33a..3213c1a 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -66,7 +66,6 @@ namespace ucb = com::sun::star::ucb;
 namespace uno = com::sun::star::uno;
 namespace beans = com::sun::star::beans;
 namespace util = com::sun::star::util;
-namespace css = com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::rtl::OUString;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index dd4f374..b57a155 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -33,8 +33,6 @@
 #include <list>
 #include <boost/unordered_map.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace dp_manager {
 
 typedef ::boost::unordered_map<
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 79301d6..17d170d 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -33,8 +33,6 @@
 #include <memory>
 
 
-namespace css = ::com::sun::star;
-
 namespace dp_manager {
 
 typedef ::cppu::WeakComponentImplHelper1<
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index 7ca3f7e..7c227aa 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -31,7 +31,6 @@
 namespace lang  = com::sun::star::lang;
 namespace ucb = com::sun::star::ucb;
 namespace uno = com::sun::star::uno;
-namespace css = com::sun::star;
 
 #define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
 
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index 25a0594..34d8ebe 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -27,8 +27,6 @@
 #include "boost/optional.hpp"
 
 
-namespace css = ::com::sun::star;
-
 namespace dp_manager {
 
 
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 66cd269..84f72fd 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -40,8 +40,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 static char const namespaceLibreOffice[] =
     "http://libreoffice.org/extensions/description/2011";
 
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 534b1c6..81c0e85 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -56,7 +56,6 @@
 
 namespace {
 
-namespace css = ::com::sun::star;
 using css::uno::Reference;
 using ::rtl::OUString;
 
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index ec90c1d..c1528f2 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -31,10 +31,6 @@
 
 #include "dp_identifier.hxx"
 
-namespace {
-    namespace css = ::com::sun::star;
-}
-
 namespace dp_misc {
 
 ::rtl::OUString generateIdentifier(
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index a5500f6..4a39d8d 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -73,7 +73,6 @@
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 using ::rtl::OUString;
-namespace css = ::com::sun::star;
 
 namespace dp_misc
 {
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 648a19a..3e57d15 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -29,7 +29,6 @@
 #include "dp_compbackenddb.hxx"
 
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 24a08e8..c7b9522 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -26,8 +26,6 @@
 #include <list>
 #include "dp_backenddb.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star {
         namespace uno {
         class XComponentContext;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 5d7082a..7205a17 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using ::rtl::OUString;
-namespace css = com::sun::star;
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 0fd3ba1..3d97ce2 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -29,7 +29,6 @@
 #include "dp_configurationbackenddb.hxx"
 
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 2d17e72..3143501 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -26,8 +26,6 @@
 #include "boost/optional.hpp"
 #include "dp_backenddb.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star {
         namespace uno {
         class XComponentContext;
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 308fb23..40a15c9 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -35,7 +35,6 @@
 #include "dp_backenddb.hxx"
 
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 4113d07..496d276 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -23,8 +23,6 @@
 #include "rtl/ustring.hxx"
 #include "dp_backenddb.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star {
         namespace uno {
         class XComponentContext;
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 7d61cf3..24382f8 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -29,7 +29,6 @@
 #include "dp_helpbackenddb.hxx"
 
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 9a38d0e..eeda035 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -25,8 +25,6 @@
 #include "boost/optional.hpp"
 #include "dp_backenddb.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star {
         namespace uno {
         class XComponentContext;
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 9416f36..457ca62 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -43,8 +43,6 @@ namespace dp_registry
 namespace backend
 {
 
-namespace css = ::com::sun::star;
-
 class PackageRegistryBackend;
 
 #define BACKEND_SERVICE_NAME "com.sun.star.deployment.PackageRegistryBackend"
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index bb47e3c..53e555c 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -24,8 +24,6 @@
 #include <list>
 #include <vector>
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star {
         namespace uno {
         class XComponentContext;
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index fe527e6..7c8b614 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -28,7 +28,6 @@
 #include "dp_extbackenddb.hxx"
 
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 59ffacf..9cb5b36 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -27,8 +27,6 @@
 
 #include "dp_backenddb.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star {
         namespace uno {
         class XComponentContext;
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 3e2615b..3e5d31c 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -70,8 +70,6 @@ using namespace ::dp_misc;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace css = ::com::sun::star;
-
 using ::rtl::OUString;
 
 namespace dp_registry {
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 90efd68..53696cf 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -35,8 +35,6 @@ namespace rtl {
     class OUString;
 }
 
-namespace css = ::com::sun::star;
-
 namespace dp_registry {
 namespace backend {
 namespace script {
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 3f061f1..0791ef5 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using ::rtl::OUString;
-namespace css = ::com::sun::star;
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index cd7a6d7..37266ef 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -23,7 +23,6 @@
 #include "rtl/ustring.hxx"
 #include "dp_backenddb.hxx"
 #include "boost/optional.hpp"
-namespace css = ::com::sun::star;
 
 namespace com { namespace sun { namespace star {
         namespace uno {
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 04bd407..34f9a4d 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -27,7 +27,6 @@
 
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
-namespace css = ::com::sun::star;
 namespace dp_registry
 {
 namespace backend
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index c13cc74..6a6067f 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -51,7 +51,6 @@ using ::rtl::OUString;
 #define ENABLE_JAVA     1
 #define USER_CLASS_PATH 2
 
-namespace css = com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 0d28c75..0cd512e 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -29,8 +29,6 @@
 #include "com/sun/star/task/XJob.hpp"
 
 
-namespace css = com::sun::star;
-
 namespace migration
 {
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 91ab6e3..b2b09a6 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::unopkg;
 using ::rtl::OUString;
-namespace css = ::com::sun::star;
 namespace {
 
 struct ExtensionName
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 39844e3..f93a049 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -43,7 +43,6 @@
 #include "deployment.hrc"
 #include "dp_version.hxx"
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index d75ca67..93afa90 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -28,8 +28,6 @@
 
 #define APP_NAME "unopkg"
 
-namespace css = ::com::sun::star;
-
 namespace unopkg {
 
     inline ::com::sun::star::lang::Locale toLocale( ::rtl::OUString const & slang )
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index d8ad660..2c2ecd2 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -47,8 +47,6 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-namespace css = com::sun::star;
-
 class  SplashScreen
     : public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
     , public IntroWindow
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 0881e04..3e5e0c5 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -58,8 +58,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Provider:
     public cppu::WeakImplHelper2<
         css::lang::XServiceInfo, css::frame::XDispatchProvider >,
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 401e50f..c3fb5a3 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -55,8 +55,6 @@
 
 namespace {
 
-namespace css = com::sun::star;
-
 class Provider:
     public cppu::WeakImplHelper2<
         css::lang::XServiceInfo, css::frame::XDispatchProvider >,
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 17a8790..8f68170 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -39,7 +39,6 @@
 
 namespace extensions { namespace config { namespace ldap {
 
-namespace css = com::sun::star ;
 namespace uno = css::uno ;
 namespace lang = css::lang ;
 namespace ldap = css::ldap ;
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index cc9dde6..c91cc55 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace uno {
 
 namespace extensions { namespace config { namespace ldap {
 
-namespace css = com::sun::star ;
 namespace uno = css::uno ;
 namespace lang = css::lang ;
 namespace container = css::container;
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 1a97e59..7e63683 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -57,7 +57,6 @@
 #include "so_closelistener.hxx"
 #include <osl/process.h>
 
-namespace css=com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::connection;
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index bdbeb1a..989bf18 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -35,7 +35,6 @@
 
 #include <cppuhelper/implbase1.hxx>
 
-namespace css = com::sun::star ;
 namespace container = css::container ;
 namespace deployment = css::deployment ;
 namespace lang = css::lang ;
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index a1ae507..db47900 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -45,8 +45,6 @@
 #include <vcl/bitmap.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-namespace css = ::com::sun::star;
-
 class TBCHeader;
 
 
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index c25a8af..431bac6 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -30,8 +30,6 @@
 
 #define LOAD_IMPLICIT
 
-namespace css = ::com::sun::star;
-
 namespace filter{
     namespace config{
 
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index a743c60..005285d 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -30,11 +30,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
-
-
-
 CacheItem::CacheItem()
     : SequenceAsHashMap()
 {
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 9b24cdb..33e7272 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -35,8 +35,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
 
 /** @short  Must be used as first derived base class
             to get a full initialized mutex member,
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 6062d2a..287b076 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -31,11 +31,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
-
-
-
 CacheUpdateListener::CacheUpdateListener(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR,
                                          FilterCache &rFilterCache,
                                          const css::uno::Reference< css::uno::XInterface >& xConfigAccess,
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index ede6ce6..a6371f0 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -24,8 +24,6 @@
 #include <osl/diagnose.h>
 
 
-namespace css = ::com::sun::star;
-
 namespace filter{
     namespace config{
 
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index c25f011..2733d22 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -31,11 +31,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
-
-
-
 ContentHandlerFactory::ContentHandlerFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
 {
     BaseContainer::init(xSMGR                                                 ,
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index 4f37e73..1db718e 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -29,8 +29,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
 
 //_______________________________________________
 
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index ee0ac39..3e512ed 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -56,8 +56,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
 FilterCache::FilterCache()
     : BaseLock    (                                        )
     , m_xSMGR     (::comphelper::getProcessServiceFactory())
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index cfba722..d4eed05 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -33,9 +33,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
-
 /** @short  define all possible parts of a filter query.
 
     @descr  syntax: "<query>[:<param>[=<value>]]"
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index 6e912eb..3010561 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -30,8 +30,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
 
 //_______________________________________________
 
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index d393b6a..2f25149 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -30,11 +30,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
-
-
-
 FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
 {
     BaseContainer::init(xSMGR                                              ,
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index c1fc76c..c361dc2 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -29,8 +29,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
 
 //_______________________________________________
 
diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx
index c3c5a26..5f6dbf7 100644
--- a/filter/source/config/cache/lateinitlistener.cxx
+++ b/filter/source/config/cache/lateinitlistener.cxx
@@ -31,11 +31,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
-
-
-
 LateInitListener::LateInitListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
     : BaseLock(     )
 {
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 144ea33..0732f06 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -38,8 +38,6 @@
 namespace filter{
     namespace config{
 
-namespace css = ::com::sun::star;
-
 TypeDetection::TypeDetection(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
 {
     BaseContainer::init(xSMGR                                         ,
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 0aa87e8..00537c8 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -28,8 +28,6 @@
 
 namespace filter{ namespace config {
 
-namespace css = ::com::sun::star;
-
 
 //_______________________________________________
 
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 9be12e0..f1ccc52 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 
-namespace css = com::sun::star;
-
 XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, const css::uno::Reference< XMultiServiceFactory >& rxMSF ) :
     TabPage( pParent, ResId( RID_XML_FILTER_TABPAGE_XSLT, rResMgr ) ),
 
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 56aaffc..b0b5705 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -80,8 +80,6 @@ using ::std::list;
 using ::std::map;
 using ::std::pair;
 
-namespace css = com::sun::star;
-
 #define _INPUT_BUFFER_SIZE 4096
 #define _OUTPUT_BUFFER_SIZE 4096
 
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 94c2253..85add71 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -89,8 +89,6 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::task;
 
-namespace css = com::sun::star;
-
 namespace XSLT
 {
     /*
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index cf1ec47..43f5845 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -35,8 +35,6 @@
 #include <odma_lib.hxx>
 #endif
 
-namespace css = com::sun::star;
-
 using css::uno::Reference;
 using css::uno::Sequence;
 using rtl::OUString;
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index da1cc07..40c2fa3 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -56,8 +56,6 @@
 // namespace directives
 //------------------------------------------------------------------------
 
-namespace css = ::com::sun::star;
-
 namespace fpicker{
 namespace win32{
 namespace vista{
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 86a2784..0fdd42d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -40,8 +40,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ustring.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace fpicker{
 namespace win32{
 namespace vista{
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 988b7fd..cef6ad3 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -41,8 +41,6 @@
 // namespace directives
 //------------------------------------------------------------------------
 
-namespace css = ::com::sun::star;
-
 namespace fpicker{
 namespace win32{
 namespace vista{
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index dd22a75..4da4bee 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -40,8 +40,6 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <osl/interlck.h>
 
-namespace css = ::com::sun::star;
-
 namespace fpicker{
 namespace win32{
 namespace vista{
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index d3d1689..6555685 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -55,8 +55,6 @@ namespace fpicker{
 namespace win32{
 namespace vista{
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------------------------------------
 // types, const etcpp.
 //-----------------------------------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 15ed136..03e5a92 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -54,8 +54,6 @@
 #include <osl/conditn.hxx>
 #include <rtl/ustring.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace fpicker{
 namespace win32{
 namespace vista{
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 6e3fc52..265259d 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -28,8 +28,6 @@
 #include <queue>
 #include <boost/shared_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace fpicker{
 namespace win32{
 namespace vista{
diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index a510110..921a54b 100644
--- a/framework/inc/framework/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -30,8 +30,6 @@
 
 #include <cppuhelper/implbase1.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace framework{
 
 /**
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index b46a45f..92fff24 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -44,8 +44,6 @@
 #include <framework/fwedllapi.h>
 
 
-namespace css = ::com::sun::star;
-
 namespace framework{
 
 
diff --git a/framework/inc/general.h b/framework/inc/general.h
index fe7899b..57e2410 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -29,16 +29,6 @@
 
 #include <rtl/ustring.hxx>
 
-
-//-----------------------------------------------------------------------------
-/** will make our code more readable if we can use such short name css instead
-    of typing ::com::sun::star everytimes.
-
-    On the other side we had so many problems with "using namespace" so we dont use
-    it here any longer.
- */
-namespace css = ::com::sun::star;
-
 #endif // #ifndef __FRAMEWORK_GENERAL_H_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index e61e24e..9ef0a2f 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -51,10 +51,6 @@
 //_______________________________________________
 // definition
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 namespace framework
 {
 
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index eb1b9f4..849d550 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -36,8 +36,6 @@ namespace com { namespace sun { namespace star { namespace lang {
     class XSingleServiceFactory;
 } } } }
 
-namespace css = com::sun::star;
-
 //_______________________________________________
 // definition
 
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 8e9d7c3..42bb80c 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -50,8 +50,6 @@
 namespace framework
 {
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------
 StorageHolder::StorageHolder()
     : ThreadHelpBase(                                        )
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 7c700d4..b0c6db5 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -30,8 +30,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 DEFINE_XINTERFACE_1(DispatchInformationProvider                               ,
                     OWeakObject                                               ,
                     DIRECT_INTERFACE(css::frame::XDispatchInformationProvider))
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 96edcac..4d0a12b 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -25,8 +25,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR       ,
                                const css::uno::Reference< css::frame::XFrame >&              xOwnerFrame ,
                                const ::rtl::OUString                                         sTargetName ,
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index e293764..620f544 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -39,8 +39,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------
 WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
                          const css::uno::Reference< css::frame::XFrame >&              xFrame)
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index fe8d24a..b54c304 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -38,8 +38,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 //-----------------------------------------------
 TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
     : ::cppu::BaseMutex ()
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 59cf842..eeddfd7 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -24,8 +24,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))
 
 PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 5541d3c..9b4955b 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 
-namespace css = ::com::sun::star;
-
 namespace framework
 {
 
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 41e0332..20c0039 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -29,8 +29,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 /** @short      implements a dispatch object which can be used to load
                 non-visible components (by using the mechanism of ContentHandler)
                 or visible-components (by using the mechanism of FrameLoader).
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 0597e32..4d561cb 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -32,8 +32,6 @@
 
 namespace framework{
 
-namespace css = ::com::sun::star;
-
 /** @short  internal helper to bind e.g. MAC-Menu events to our internal dispatch API.
 
     @descr  On e.g. MAC platform system menus are merged together with some fix entries as
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 9ccde9e..832a3a9 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -29,11 +29,6 @@
 
 namespace framework{
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
-
 /** @short  implements a guard, which can use the interface
             <type scope="com::sun::star::document">XActionLockable</type>.
 
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 6658824..ba50b7d 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -43,7 +43,6 @@
 
 namespace framework {
 
-namespace css = ::com::sun::star;
 class QuietInteraction;
 
 /** @short  implements general mechainsm for loading documents.
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 858f7b1..a1b4be2 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -27,10 +27,6 @@
 
 namespace framework{
 
-#ifndef css // conflict with define :-(
-namespace css = ::com::sun::star;
-#endif
-
 /** @short  specify an exception, which can be used inside the
             load environment only.
 
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index e1ad982..01d97c1 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -33,10 +33,6 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 namespace framework{
     namespace pattern{
         namespace configuration{
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 5a51422..6bb2b8e 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -31,10 +31,6 @@
 
 // namespaces
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 namespace framework{
     namespace pattern{
         namespace frame{
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index e91a3ba..6604488 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -36,10 +36,6 @@
 //_______________________________________________
 // namespaces
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 namespace framework{
 
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3176246..c676fe4 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -83,10 +83,6 @@ const char PROP_NAME[] = "Name";
 
 namespace framework {
 
-// may there exist already a define .-(
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
 using namespace com::sun::star;
 
 
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 2cb8309..3d4a794 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -90,10 +90,6 @@
 //_______________________________________________
 // namespaces
 
-#ifndef css
-namespace css = ::com::sun::star;
-#endif
-
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 67f3c1d..6c0e37c 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -26,15 +26,10 @@
 
 #include "tools/urlobj.hxx"
 
-// component helper namespace
-namespace css = ::com::sun::star;
-
 // framework namespace
 namespace framework
 {
 
-namespace css = ::com::sun::star;
-
 //*****************************************************************************************************************
 //  XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index c6fd9f1..25b29a4 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -50,7 +50,6 @@
 #include <rtl/logfile.hxx>
 
 using namespace ::com::sun::star;
-namespace css = ::com::sun::star;
 
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index 0aaacdf..d73a058 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -32,8 +32,6 @@
 
 namespace {
 
-namespace css = ::com::sun::star;
-
 struct MutexHolder
 {
     ::osl::Mutex m_mutex;
diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index d92b119..4861849 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -40,12 +40,6 @@
 #include "jni.h"
 #endif
 
-namespace {
-
-namespace css = ::com::sun::star;
-
-}
-
 void * ::jvmaccess::ClassPath::doTranslateToUrls(
     css::uno::Reference< css::uno::XComponentContext > const & context,
     void * environment, ::rtl::OUString const & classPath)
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index d6330ff..981de86 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -54,8 +54,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
-namespace css = ::com::sun::star;
-
 //==================================================================================================
 
 #define A2OU(x) ::rtl::OUString::createFromAscii( x )
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 8176391..47878f2 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -33,9 +33,6 @@ class SvStream;
 
 typedef boost::shared_ptr< SvStream > SvStreamPtr;
 
-namespace css = ::com::sun::star;
-
-
 struct LangSvcEntries
 {
     css::uno::Sequence< ::rtl::OUString >   aSvcImplNames;
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
index 59d964f..bea9976 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
@@ -24,9 +24,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 
-namespace css = ::com::sun::star;
-
-
 MyListener::MyListener(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
     : m_xSMGR(xSMGR)
 {}
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
index 25fd45c..12d485c 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
@@ -29,14 +29,12 @@
 #define MYLISTENER_IMPLEMENTATIONNAME  "vnd.My.impl.NewDocListener"
 #define MYLISTENER_SERVICENAME         "vnd.My.NewDocListener"
 
-namespace css = ::com::sun::star;
-
 /*---------------------------------------------------
  * Registriert sich in der Office Konfiguration als Job.
- * Dieser wird dann für alle neu geöffneten Dokumente automatisch
- * gerufen. Man bekommt eine Reference auf das geöffnete Dokument
- * überreicht und kann dann prüfen, ob es ein unterstütztes Format
- * hat. (Wir interessieren uns ja schließlich nur für Writer/Calc Dokumente.)
+ * Dieser wird dann für alle neu geöffneten Dokumente automatisch
+ * gerufen. Man bekommt eine Reference auf das geöffnete Dokument
+ * überreicht und kann dann prüfen, ob es ein unterstütztes Format
+ * hat. (Wir interessieren uns ja schließlich nur für Writer/Calc Dokumente.)
  *
  * @see CalcListener
  * @see WriterListener
diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
index b7196bc..f1dd0b8 100644
--- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
@@ -22,8 +22,6 @@
 #include "MyProtocolHandler.h"
 #include "MyListener.h"
 
-namespace css = ::com::sun::star;
-
 extern "C"
 {
 
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 8f2fee3..6128bc5 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -30,8 +30,6 @@
 #include "oox/core/xmlfilterbase.hxx"
 #include "ShapeFilterBase.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace oox { namespace shape {
 
 class ShapeFragmentHandler : public core::FragmentHandler
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 318bfa7..a6be155 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -411,6 +411,14 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
 
 }
 
+namespace com { namespace sun { namespace star { } } }
+
+/** short-circuit extra-verbose API namespaces
+
+ @since LibreOffice 4.0
+*/
+namespace css = ::com::sun::star;
+
 #else /* __cplusplus */
 
 /**
diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx
index ed598d5..41b1002 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -33,8 +33,6 @@
 
 #include <filter/msfilter/mstoolbar.hxx>
 
-namespace css = ::com::sun::star;
-
 class ScCTBWrapper;
 // hmm I don't normally use these packed structures
 // but.. hey always good to do something different
diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx
index 3b07f1a..26d688f 100644
--- a/sc/source/ui/collab/sccollaboration.cxx
+++ b/sc/source/ui/collab/sccollaboration.cxx
@@ -16,8 +16,6 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
 
-namespace css = ::com::sun::star;
-
 ScCollaboration::ScCollaboration( ScDocShell* pScDocShell ) :
     mpScDocShell( pScDocShell )
 {
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx
index 176ed14..8567d88 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -26,7 +26,6 @@
 // component helper namespace
 namespace comp_DialogModelProvider {
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace awt;
 using namespace lang;
@@ -47,7 +46,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc
 /// anonymous implementation namespace
 namespace dlgprov {
 
-namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace awt;
 using namespace lang;
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
index e80e12a..9ce8518 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -27,8 +27,6 @@
 /// anonymous implementation namespace
 namespace dlgprov{
 
-namespace css = ::com::sun::star;
-
 class DialogModelProvider:
     public ::cppu::WeakImplHelper4<
         css::lang::XInitialization,
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index 41a57fe..657355c 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -39,8 +39,6 @@
 
 #include "util.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace sf_misc
 {
 
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index faa25bb..36ca322 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -489,9 +489,6 @@ const Reference< XMultiServiceFactory >& xServiceManager )
 
 extern "C"
 {
-
-    namespace css = ::com::sun::star;
-
     SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
                                          void * pServiceManager ,
                                          void * pRegistryKey )
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 87bd9b7..d2bf743 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -63,8 +63,6 @@ namespace com { namespace sun { namespace star {
 namespace scripting_protocolhandler
 {
 
-namespace css = ::com::sun::star;
-
 class ScriptProtocolHandler :
 public ::cppu::WeakImplHelper4< css::frame::XDispatchProvider,
     css::frame::XNotifyingDispatch, css::lang::XServiceInfo, css::lang::XInitialization >
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index efb38fb..37fd8d6 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -36,8 +36,6 @@
 
 #include <comphelper/stl_types.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index cf9a109..0953a9f 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -29,8 +29,6 @@
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace browsenodefactory
 {
 
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 8664372..3299fcf 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -36,8 +36,6 @@
 
 #include "ProviderCache.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index 8ee4c76..f07a03b 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -30,8 +30,6 @@
 
 #include "ActiveMSPList.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index eefa9fb..2021baa 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -35,8 +35,6 @@
 
 #include "ScriptingContext.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index ffe1147..f6f1f6b 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -32,8 +32,6 @@
 #include <drafts/com/sun/star/script/framework/provider/XScript.hpp>
 #include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace func_provider
 {
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list