summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/swabstdlg.hxx8
-rw-r--r--sw/source/core/bastyp/calc.cxx2
-rw-r--r--sw/source/core/inc/toxhlp.hxx2
-rw-r--r--sw/source/core/tox/toxhlp.cxx2
-rw-r--r--sw/source/core/unocore/swunohelper.cxx24
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/ui/app/docsh2.cxx2
-rw-r--r--sw/source/ui/dbui/dbtree.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx8
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx8
-rw-r--r--sw/source/ui/docvw/romenu.cxx2
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx16
-rw-r--r--sw/source/ui/inc/uivwimp.hxx8
-rw-r--r--sw/source/ui/inc/unotools.hxx8
14 files changed, 47 insertions, 47 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 2c6045ca1e87..1824413d400a 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -306,8 +306,8 @@ class AbstractSwRenameXNamedDlg : public VclAbstractDialog //add for SwRenameXNa
public:
virtual void SetForbiddenChars( const String& rSet ) = 0;
virtual void SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird ) = 0;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) = 0;
};
class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg
@@ -416,8 +416,8 @@ public:
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ) = 0;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess, int nResId ) = 0;
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ) = 0; //add for SwModalRedlineAcceptDlg
virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
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
{
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ad88e9885597..20cfe7129564 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -366,7 +366,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
SvStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
OSL_ENSURE(rReader.pFormImpl, "No Form Implementation!");
- STAR_REFERENCE( drawing::XShape ) xShape;
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
if ( (!(rReader.bIsHeader || rReader.bIsFooter)) &&
rReader.pFormImpl->ReadOCXStream(xSrc,&xShape,true))
{
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 5064712280a4..6a12af57aa4d 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1115,7 +1115,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
TransferDataContainer* pClipCntnr =
new TransferDataContainer;
- STAR_REFERENCE( datatransfer::XTransferable )
+ ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
xRef( pClipCntnr );
pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*)
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index a79a7520a8ed..6070f90ff289 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -489,7 +489,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
if( sDBName.Len() )
{
TransferDataContainer* pContainer = new TransferDataContainer;
- STAR_REFERENCE( datatransfer::XTransferable ) xRef( pContainer );
+ ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pContainer );
if( sColumnName.Len() )
{
// drag database field
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 71430bcb6679..ca2698b2498c 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -372,8 +372,8 @@ void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const String& rSet )
}
void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird )
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
{
pDlg->SetAlternativeAccess( xSecond, xThird);
}
@@ -1114,8 +1114,8 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView&
}
AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg( Window* pParent,
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess,int nResId )
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess,int nResId )
{
SwRenameXNamedDlg* pDlg=NULL;
switch ( nResId )
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 66ee0aba9167..94849005d097 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -242,8 +242,8 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
virtual void SetForbiddenChars( const String& rSet );
virtual void SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird );
};
//add for SwRenameXNamedDlg end
//add for SwModalRedlineAcceptDlg begin
@@ -493,8 +493,8 @@ public:
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess, int nResId );
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ); //add for SwModalRedlineAcceptDlg
virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index dada27df5541..96b4a8fcc2bd 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -378,7 +378,7 @@ void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId )
if( pClipCntnr )
{
- STAR_REFERENCE( datatransfer::XTransferable ) xRef( pClipCntnr );
+ ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pClipCntnr );
if( pClipCntnr->HasAnyData() )
pClipCntnr->CopyToClipboard( pWin );
}
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index 1f2130589dfe..33c5e2289dfc 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -52,25 +52,25 @@ class SwRenameXNamedDlg : public ModalDialog
String sRemoveWarning;
- STAR_REFERENCE( container::XNamed ) & xNamed;
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess;
- STAR_REFERENCE( container::XNameAccess ) xSecondAccess;
- STAR_REFERENCE( container::XNameAccess ) xThirdAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xSecondAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xThirdAccess;
DECL_LINK(OkHdl, OKButton*);
DECL_LINK(ModifyHdl, NoSpaceEdit*);
public:
SwRenameXNamedDlg( Window* pParent,
- STAR_REFERENCE( container::XNamed ) & xNamed,
- STAR_REFERENCE( container::XNameAccess ) & xNameAccess );
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess );
void SetForbiddenChars( const String& rSet )
{ aNewNameED.SetForbiddenChars( rSet ); }
void SetAlternativeAccess(
- STAR_REFERENCE( container::XNameAccess ) & xSecond,
- STAR_REFERENCE( container::XNameAccess ) & xThird )
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
{
xSecondAccess = xSecond;
xThirdAccess = xThird;
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index d65053f885b6..d0c678184ed2 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -97,10 +97,10 @@ class SwMailMergeConfigItem;
class SwView_Impl
{
- STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr;
- STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr;
- STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor;
- STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xScanEvtLstnr;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xClipEvtLstnr;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xDisProvInterceptor;
+ ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier > *pxXTextView; // UNO object
com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable;
// temporary document for printing text of selection / multi selection
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index aa710f182a6f..a47151bf924a 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -110,10 +110,10 @@ public:
String* pURL = 0);
~SwOneExampleFrame();
- STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; }
- STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;}
- STAR_REFERENCE( frame::XController ) & GetController() {return _xController;}
- STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & GetControl() {return _xControl; }
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & GetModel() {return _xModel;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & GetController() {return _xController;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & GetTextCursor() {return _xCursor;}
void ClearDocument( sal_Bool bStartTimer = sal_False );
generated by cgit (git 2.34.1) at 2025-02-15 03:20:14 +0000