expand and remove macro STAR_REFERENCE

4 files changed, 15 insertions, 15 deletions

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 5f266343136f..09d8a09c5a03 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -269,7 +269,7 @@ SwCalc::SwCalc( SwDoc& rD )
         eLang != SvxLocaleToLanguage( pCharClass->getLocale() ) )
     {
         ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
-        STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF(
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(
                             ::comphelper::getProcessServiceFactory() );
         pCharClass = new CharClass( xMSF, aLocale );
         pLclData = new LocaleDataWrapper( xMSF, aLocale );
diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx
index 62db2c92c79e..887c3c6a6f0f 100644
--- a/sw/source/core/inc/toxhlp.hxx
+++ b/sw/source/core/inc/toxhlp.hxx
@@ -54,7 +54,7 @@ class IndexEntrySupplierWrapper
 public:
     IndexEntrySupplierWrapper(
             const ::com::sun::star::lang::Locale& rLcl,
-            STAR_REFERENCE( lang::XMultiServiceFactory )& rxMSF );
+            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF );
     ~IndexEntrySupplierWrapper();
 
     String GetIndexKey( const String& rTxt, const String& rTxtReading,
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index e1d24e3c1969..c27faefe2519 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -45,7 +45,7 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
                                     ::comphelper::getProcessServiceFactory();
 
     try {
-        STAR_REFERENCE( uno::XInterface ) xI =
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xI =
             rxMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                 "com.sun.star.i18n.IndexEntrySupplier")) );
         if( xI.is() )
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 35c100277c53..fbe24806d7d4 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -72,7 +72,7 @@ sal_Bool UCB_DeleteFile( const String& rURL )
     try
     {
         ucbhelper::Content aTempContent( rURL,
-                                STAR_REFERENCE( ucb::XCommandEnvironment )());
+                                ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
         aTempContent.executeCommand(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
                         ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
@@ -97,7 +97,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
         String sMainURL( aURL.GetMainURL(INetURLObject::NO_DECODE) );
 
         ucbhelper::Content aTempContent( sMainURL,
-                                STAR_REFERENCE( ucb::XCommandEnvironment )());
+                                ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
 
         ::com::sun::star::uno::Any aAny;
         ::com::sun::star::ucb::TransferInfo aInfo;
@@ -123,21 +123,21 @@ sal_Bool UCB_IsCaseSensitiveFileName( const String& rURL )
     sal_Bool bCaseSensitive;
     try
     {
-        STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF =
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF =
                                     comphelper::getProcessServiceFactory();
 
         INetURLObject aTempObj( rURL );
         aTempObj.SetBase( aTempObj.GetBase().toAsciiLowerCase() );
-        STAR_REFERENCE( ucb::XContentIdentifier ) xRef1 = new
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef1 = new
                 ucbhelper::ContentIdentifier( xMSF,
                             aTempObj.GetMainURL( INetURLObject::NO_DECODE ));
 
         aTempObj.SetBase(aTempObj.GetBase().toAsciiUpperCase());
-        STAR_REFERENCE( ucb::XContentIdentifier ) xRef2 = new
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef2 = new
                 ucbhelper::ContentIdentifier( xMSF,
                             aTempObj.GetMainURL( INetURLObject::NO_DECODE ));
 
-        STAR_REFERENCE( ucb::XContentProvider ) xProv =
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > xProv =
                 ucbhelper::ContentBroker::get()->getContentProviderInterface();
 
         sal_Int32 nCompare = xProv->compareContentIds( xRef1, xRef2 );
@@ -156,7 +156,7 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL )
     sal_Bool bIsReadOnly = sal_False;
     try
     {
-        ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
+        ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
         ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")));
         if(aAny.hasValue())
@@ -174,7 +174,7 @@ sal_Bool UCB_IsFile( const String& rURL )
     sal_Bool bExists = sal_False;
     try
     {
-        ::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
+        ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
         bExists = aContent.isDocument();
     }
     catch (::com::sun::star::uno::Exception &)
@@ -188,7 +188,7 @@ sal_Bool UCB_IsDirectory( const String& rURL )
     sal_Bool bExists = sal_False;
     try
     {
-        ::ucbhelper::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() );
+        ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
         bExists = aContent.isFolder();
     }
     catch (::com::sun::star::uno::Exception &)
@@ -210,8 +210,8 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
     sal_Bool bOk = sal_False;
     try
     {
-        ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
-        STAR_REFERENCE( sdbc::XResultSet ) xResultSet;
+        ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
 
         sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
         ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize );
@@ -231,7 +231,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL,
 
         if( xResultSet.is() )
         {
-            STAR_REFERENCE( sdbc::XRow ) xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
+            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
             xub_StrLen nExtLen = pExtension ? pExtension->Len() : 0;
             try
             {