summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-29 21:26:09 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-11-30 14:36:36 +0100
commit66a175834c39ccde9475eac3adb72a843110d01f (patch)
treeef925daaf84a85731525c2b14f0cd4a2ed84e2de /filter
parent90eac3e69749a9227c4b6902b1f3cef1e338c6d1 (diff)
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
Diffstat (limited to 'filter')
-rw-r--r--filter/inc/filter/msfilter/mstoolbar.hxx2
-rw-r--r--filter/source/config/cache/basecontainer.cxx2
-rw-r--r--filter/source/config/cache/cacheitem.cxx5
-rw-r--r--filter/source/config/cache/cacheitem.hxx2
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx5
-rw-r--r--filter/source/config/cache/configflush.cxx2
-rw-r--r--filter/source/config/cache/contenthandlerfactory.cxx5
-rw-r--r--filter/source/config/cache/contenthandlerfactory.hxx2
-rw-r--r--filter/source/config/cache/filtercache.cxx2
-rw-r--r--filter/source/config/cache/filterfactory.cxx3
-rw-r--r--filter/source/config/cache/filterfactory.hxx2
-rw-r--r--filter/source/config/cache/frameloaderfactory.cxx5
-rw-r--r--filter/source/config/cache/frameloaderfactory.hxx2
-rw-r--r--filter/source/config/cache/lateinitlistener.cxx5
-rw-r--r--filter/source/config/cache/typedetection.cxx2
-rw-r--r--filter/source/config/cache/typedetection.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
-rw-r--r--filter/source/xsltfilter/LibXSLTTransformer.cxx2
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx2
19 files changed, 0 insertions, 54 deletions
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index a1ae5075fdf3..db479002fa6f 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 c25a8af0d9c3..431bac69a3c7 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 a743c605d445..005285d1524c 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 9b24cdbd9b4f..33e7272d4df8 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 6062d2a6657f..287b07646d18 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 ede6ce6258ac..a6371f025663 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 c25f01130673..2733d22aefd8 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 4f37e73022fa..1db718e12064 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 ee0ac397818a..3e512edc0417 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 cfba722a43aa..d4eed05328c7 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 6e912eb032e4..3010561257af 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 d393b6a89901..2f25149218f7 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 c1fc76c50f50..c361dc2e07f6 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 c3c5a265e7eb..5f6dbf7aae92 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 144ea33e9388..0732f06b5e5d 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 0aa87e81d228..00537c80481b 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 9be12e01aca4..f1ccc52dc09b 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 56aaffc3a4f6..b0b570510fe0 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 94c2253dd47e..85add7168f13 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
{
/*