expand and remove macro STAR_NMSPC

7 files changed, 33 insertions, 34 deletions

diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
index 011abcd95a06..6029f8fbe13f 100644
--- a/sw/inc/swunodef.hxx
+++ b/sw/inc/swunodef.hxx
@@ -28,11 +28,10 @@
 #ifndef _SWUNODEF_HXX
 #define _SWUNODEF_HXX
 
-#define STAR_NMSPC              ::com::sun::star
-#define UNO_NMSPC               STAR_NMSPC::uno
-#define CLIP_NMSPC              STAR_NMSPC::datatransfer::clipboard
+#define UNO_NMSPC               ::com::sun::star::uno
+#define CLIP_NMSPC              ::com::sun::star::datatransfer::clipboard
 
-#define STAR_REFERENCE(aType)   UNO_NMSPC::Reference< STAR_NMSPC::aType >
+#define STAR_REFERENCE(aType)   UNO_NMSPC::Reference< ::com::sun::star::aType >
 
 #endif
 
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 9d641c4a01f0..f0f1b1daaeb1 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -49,30 +49,30 @@ class String;
 
 class SW_DLLPUBLIC IndexEntrySupplierWrapper
 {
-    STAR_NMSPC::lang::Locale aLcl;
-    STAR_NMSPC::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
+    ::com::sun::star::lang::Locale aLcl;
+    ::com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
 
 public:
     IndexEntrySupplierWrapper();
     ~IndexEntrySupplierWrapper();
 
-    void SetLocale( const STAR_NMSPC::lang::Locale& rLocale ) { aLcl = rLocale; }
+    void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; }
 
     String GetIndexKey( const String& rTxt, const String& rTxtReading,
-                        const STAR_NMSPC::lang::Locale& rLocale ) const;
+                        const ::com::sun::star::lang::Locale& rLocale ) const;
 
     String GetFollowingText( sal_Bool bMorePages ) const;
 
-    STAR_NMSPC::uno::Sequence< ::rtl::OUString >
-    GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const;
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const;
 
-    sal_Bool LoadAlgorithm( const STAR_NMSPC::lang::Locale& rLcl,
+    sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
                             const String& sSortAlgorithm, long nOptions ) const;
 
     sal_Int16 CompareIndexEntry( const String& rTxt1, const String& rTxtReading1,
-                                 const STAR_NMSPC::lang::Locale& rLcl1,
+                                 const ::com::sun::star::lang::Locale& rLcl1,
                                  const String& rTxt2, const String& rTxtReading2,
-                                 const STAR_NMSPC::lang::Locale& rLcl2 ) const;
+                                 const ::com::sun::star::lang::Locale& rLcl2 ) const;
 };
 
 #endif
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 2b7464aaf6f8..5f266343136f 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -268,7 +268,7 @@ SwCalc::SwCalc( SwDoc& rD )
     if( eLang != SvxLocaleToLanguage( pLclData->getLocale() ) ||
         eLang != SvxLocaleToLanguage( pCharClass->getLocale() ) )
     {
-        STAR_NMSPC::lang::Locale aLocale( SvxCreateLocale( eLang ));
+        ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
         STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF(
                             ::comphelper::getProcessServiceFactory() );
         pCharClass = new CharClass( xMSF, aLocale );
diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx
index b254874009bf..62db2c92c79e 100644
--- a/sw/source/core/inc/toxhlp.hxx
+++ b/sw/source/core/inc/toxhlp.hxx
@@ -48,30 +48,30 @@ class String;
 
 class IndexEntrySupplierWrapper
 {
-    STAR_NMSPC::lang::Locale aLcl;
-    STAR_NMSPC::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
+    ::com::sun::star::lang::Locale aLcl;
+    ::com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
 
 public:
     IndexEntrySupplierWrapper(
-            const STAR_NMSPC::lang::Locale& rLcl,
+            const ::com::sun::star::lang::Locale& rLcl,
             STAR_REFERENCE( lang::XMultiServiceFactory )& rxMSF );
     ~IndexEntrySupplierWrapper();
 
     String GetIndexKey( const String& rTxt, const String& rTxtReading,
-                        const STAR_NMSPC::lang::Locale& rLocale ) const;
+                        const ::com::sun::star::lang::Locale& rLocale ) const;
 
     String GetFollowingText( sal_Bool bMorePages ) const;
 
-    STAR_NMSPC::uno::Sequence< ::rtl::OUString >
-    GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const;
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const;
 
-    sal_Bool LoadAlgorithm( const STAR_NMSPC::lang::Locale& rLcl,
+    sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
                             const String& sSortAlgorithm, long nOptions ) const;
 
     sal_Int16 CompareIndexEntry( const String& rTxt1, const String& rTxtReading1,
-                                 const STAR_NMSPC::lang::Locale& rLcl1,
+                                 const ::com::sun::star::lang::Locale& rLcl1,
                                  const String& rTxt2, const String& rTxtReading2,
-                                 const STAR_NMSPC::lang::Locale& rLcl2 ) const;
+                                 const ::com::sun::star::lang::Locale& rLcl2 ) const;
 };
 
 #endif
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index f1ae9862d4b9..dc952ed6778b 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -75,7 +75,7 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper()
 
 String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
                                                const String& rTxtReading,
-                                               const STAR_NMSPC::lang::Locale& rLocale ) const
+                                               const ::com::sun::star::lang::Locale& rLocale ) const
 {
     String sRet;
     try {
@@ -117,8 +117,8 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
     return sRet;
 }
 
-STAR_NMSPC::uno::Sequence< ::rtl::OUString >
-IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const
+::com::sun::star::uno::Sequence< ::rtl::OUString >
+IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const
 {
     uno::Sequence< ::rtl::OUString > sRet;
 
@@ -141,7 +141,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
 }
 
 sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
-        const STAR_NMSPC::lang::Locale& rLcl,
+        const ::com::sun::star::lang::Locale& rLcl,
         const String& sSortAlgorithm, long nOptions ) const
 {
     sal_Bool bRet = sal_False;
@@ -165,9 +165,9 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
 
 sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
             const String& rTxt1, const String& rTxtReading1,
-            const STAR_NMSPC::lang::Locale& rLocale1,
+            const ::com::sun::star::lang::Locale& rLocale1,
             const String& rTxt2, const String& rTxtReading2,
-            const STAR_NMSPC::lang::Locale& rLocale2 ) const
+            const ::com::sun::star::lang::Locale& rLocale2 ) const
 {
     sal_Int16 nRet = 0;
     try {
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index c3896faa8b84..87d24e1ba888 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -100,8 +100,8 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
                                 STAR_REFERENCE( ucb::XCommandEnvironment )());
 
         UNO_NMSPC::Any aAny;
-        STAR_NMSPC::ucb::TransferInfo aInfo;
-        aInfo.NameClash = STAR_NMSPC::ucb::NameClash::ERROR;
+        ::com::sun::star::ucb::TransferInfo aInfo;
+        aInfo.NameClash = ::com::sun::star::ucb::NameClash::ERROR;
         aInfo.NewTitle = sName;
         aInfo.SourceURL = rURL;
         aInfo.MoveData = bCopyIsMove;
@@ -248,7 +248,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
 
                             if( pDateTimeList )
                             {
-                                STAR_NMSPC::util::DateTime aStamp = xRow->getTimestamp(2);
+                                ::com::sun::star::util::DateTime aStamp = xRow->getTimestamp(2);
                                 ::DateTime* pDateTime = new ::DateTime(
                                         ::Date( aStamp.Day,
                                                 aStamp.Month,
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index 4c349a047c67..cf712f88dfac 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -54,7 +54,7 @@ namespace com{ namespace sun{ namespace star {
 }}}
 
 class SwScannerEventListener : public ::cppu::WeakImplHelper1<
-    STAR_NMSPC::lang::XEventListener >
+    ::com::sun::star::lang::XEventListener >
 {
     SwView* pView;
 
@@ -77,7 +77,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
     SwView* pView;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject )
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject )
         throw ( com::sun::star::uno::RuntimeException );
 
     // XClipboardListener