expand and remove macro UNO_NMSPC

5 files changed, 28 insertions, 29 deletions

diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
index 6029f8fbe13f..01942f51b0e2 100644
--- a/sw/inc/swunodef.hxx
+++ b/sw/inc/swunodef.hxx
@@ -28,10 +28,9 @@
 #ifndef _SWUNODEF_HXX
 #define _SWUNODEF_HXX
 
-#define UNO_NMSPC               ::com::sun::star::uno
 #define CLIP_NMSPC              ::com::sun::star::datatransfer::clipboard
 
-#define STAR_REFERENCE(aType)   UNO_NMSPC::Reference< ::com::sun::star::aType >
+#define STAR_REFERENCE(aType)   ::com::sun::star::uno::Reference< ::com::sun::star::aType >
 
 #endif
 
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index dc952ed6778b..e1d24e3c1969 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -50,12 +50,12 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
                                 "com.sun.star.i18n.IndexEntrySupplier")) );
         if( xI.is() )
         {
-            UNO_NMSPC::Any x = xI->queryInterface( ::getCppuType(
+            ::com::sun::star::uno::Any x = xI->queryInterface( ::getCppuType(
                     (const uno::Reference< i18n::XExtendedIndexEntrySupplier>*)0) );
             x >>= xIES;
         }
     }
-    catch (const UNO_NMSPC::Exception&
+    catch (const ::com::sun::star::uno::Exception&
 #if OSL_DEBUG_LEVEL > 0
         e
 #endif
@@ -81,7 +81,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
     try {
         sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
     }
-    catch (const UNO_NMSPC::Exception&
+    catch (const ::com::sun::star::uno::Exception&
 #if OSL_DEBUG_LEVEL > 0
         e
 #endif
@@ -102,7 +102,7 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
     try {
         sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
     }
-    catch (const UNO_NMSPC::Exception&
+    catch (const ::com::sun::star::uno::Exception&
 #if OSL_DEBUG_LEVEL > 0
         e
 #endif
@@ -125,7 +125,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local
     try {
         sRet = xIES->getAlgorithmList( rLcl );
     }
-    catch (const UNO_NMSPC::Exception&
+    catch (const ::com::sun::star::uno::Exception&
 #if OSL_DEBUG_LEVEL > 0
         e
 #endif
@@ -148,7 +148,7 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
     try {
         bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
     }
-    catch (const UNO_NMSPC::Exception&
+    catch (const ::com::sun::star::uno::Exception&
 #if OSL_DEBUG_LEVEL > 0
         e
 #endif
@@ -174,7 +174,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
         nRet = xIES->compareIndexEntry( rTxt1, rTxtReading1, rLocale1,
                                         rTxt2, rTxtReading2, rLocale2 );
     }
-    catch (const UNO_NMSPC::Exception&
+    catch (const ::com::sun::star::uno::Exception&
 #if OSL_DEBUG_LEVEL > 0
         e
 #endif
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 87d24e1ba888..35c100277c53 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -49,14 +49,14 @@
 
 namespace SWUnoHelper {
 
-sal_Int32 GetEnumAsInt32( const UNO_NMSPC::Any& rVal )
+sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal )
 {
     sal_Int32 eVal;
     try
     {
         eVal = comphelper::getEnumAsINT32( rVal );
     }
-    catch( UNO_NMSPC::Exception & )
+    catch( ::com::sun::star::uno::Exception & )
     {
         eVal = 0;
         OSL_FAIL( "can't get EnumAsInt32" );
@@ -75,10 +75,10 @@ sal_Bool UCB_DeleteFile( const String& rURL )
                                 STAR_REFERENCE( ucb::XCommandEnvironment )());
         aTempContent.executeCommand(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
-                        UNO_NMSPC::makeAny( sal_Bool( sal_True ) ) );
+                        ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
         bRemoved = sal_True;
     }
-    catch( UNO_NMSPC::Exception& )
+    catch( ::com::sun::star::uno::Exception& )
     {
         bRemoved = sal_False;
         OSL_FAIL( "Exeception from executeCommand( delete )" );
@@ -99,7 +99,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
         ucbhelper::Content aTempContent( sMainURL,
                                 STAR_REFERENCE( ucb::XCommandEnvironment )());
 
-        UNO_NMSPC::Any aAny;
+        ::com::sun::star::uno::Any aAny;
         ::com::sun::star::ucb::TransferInfo aInfo;
         aInfo.NameClash = ::com::sun::star::ucb::NameClash::ERROR;
         aInfo.NewTitle = sName;
@@ -110,7 +110,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
                             aAny );
     }
-    catch( UNO_NMSPC::Exception& )
+    catch( ::com::sun::star::uno::Exception& )
     {
         OSL_FAIL( "Exeception from executeCommand( transfer )" );
         bCopyCompleted = sal_False;
@@ -143,7 +143,7 @@ sal_Bool UCB_IsCaseSensitiveFileName( const String& rURL )
         sal_Int32 nCompare = xProv->compareContentIds( xRef1, xRef2 );
         bCaseSensitive = 0 != nCompare;
     }
-    catch( UNO_NMSPC::Exception& )
+    catch( ::com::sun::star::uno::Exception& )
     {
         bCaseSensitive = sal_False;
         OSL_FAIL( "Exeception from compareContentIds()" );
@@ -157,12 +157,12 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL )
     try
     {
         ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
-        UNO_NMSPC::Any aAny = aCnt.getPropertyValue(
+        ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")));
         if(aAny.hasValue())
             bIsReadOnly = *(sal_Bool*)aAny.getValue();
     }
-    catch( UNO_NMSPC::Exception& )
+    catch( ::com::sun::star::uno::Exception& )
     {
         bIsReadOnly = sal_False;
     }
@@ -177,7 +177,7 @@ sal_Bool UCB_IsFile( const String& rURL )
         ::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
         bExists = aContent.isDocument();
     }
-    catch (UNO_NMSPC::Exception &)
+    catch (::com::sun::star::uno::Exception &)
     {
     }
     return bExists;
@@ -191,7 +191,7 @@ sal_Bool UCB_IsDirectory( const String& rURL )
         ::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
         bExists = aContent.isFolder();
     }
-    catch (UNO_NMSPC::Exception &)
+    catch (::com::sun::star::uno::Exception &)
     {
     }
     return bExists;
@@ -214,7 +214,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
         STAR_REFERENCE( sdbc::XResultSet ) xResultSet;
 
         sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
-        UNO_NMSPC::Sequence < rtl::OUString > aProps( nSeqSize );
+        ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize );
         rtl::OUString* pProps = aProps.getArray();
         pProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         if( pDateTimeList )
@@ -224,14 +224,14 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
         {
             xResultSet = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY );
         }
-        catch( UNO_NMSPC::Exception& )
+        catch( ::com::sun::star::uno::Exception& )
         {
             OSL_FAIL( "create cursor failed!" );
         }
 
         if( xResultSet.is() )
         {
-            STAR_REFERENCE( sdbc::XRow ) xRow( xResultSet, UNO_NMSPC::UNO_QUERY );
+            STAR_REFERENCE( sdbc::XRow ) xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
             xub_StrLen nExtLen = pExtension ? pExtension->Len() : 0;
             try
             {
@@ -267,13 +267,13 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
                 }
                 bOk = sal_True;
             }
-            catch( UNO_NMSPC::Exception& )
+            catch( ::com::sun::star::uno::Exception& )
             {
                 OSL_FAIL( "Exception caught!" );
             }
         }
     }
-    catch( UNO_NMSPC::Exception& )
+    catch( ::com::sun::star::uno::Exception& )
     {
         OSL_FAIL( "Exception caught!" );
         bOk = sal_False;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 44a627143654..66a68a8f1334 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -467,7 +467,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
             if (aPasswdDlg.Execute())
             {
                 String sNewPasswd( aPasswdDlg.GetPassword() );
-                UNO_NMSPC::Sequence <sal_Int8 > aNewPasswd;
+                ::com::sun::star::uno::Sequence <sal_Int8 > aNewPasswd;
                 SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd );
                 if (SvPasswordHelper::CompareHashPassword(
                         pRepr->GetSectionData().GetPassword(), sNewPasswd))
@@ -623,7 +623,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
 
     aProtectCB  .Enable(sal_True);
     aFileCB     .Enable(sal_True);
-    UNO_NMSPC::Sequence <sal_Int8> aCurPasswd;
+    ::com::sun::star::uno::Sequence <sal_Int8> aCurPasswd;
     if( 1 < pBox->GetSelectionCount() )
     {
         aHideCB.EnableTriState( sal_True );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 0867c37a9d09..6c19c61e51d5 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -168,7 +168,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
         pRecs->C40_INSERT( SwLabRec, pRec, 0 );
 
     sal_uInt16 nLstGroup = 0;
-    const UNO_NMSPC::Sequence<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers();
+    const ::com::sun::star::uno::Sequence<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers();
     const rtl::OUString* pMan = rMan.getConstArray();
     for(sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++)
     {
@@ -510,7 +510,7 @@ void SwLabPage::InitDatabaseBox()
     if( GetNewDBMgr() )
     {
         aDatabaseLB.Clear();
-        UNO_NMSPC::Sequence<rtl::OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
+        ::com::sun::star::uno::Sequence<rtl::OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
         const rtl::OUString* pDataNames = aDataNames.getConstArray();
         for (long i = 0; i < aDataNames.getLength(); i++)
             aDatabaseLB.InsertEntry(pDataNames[i]);