[Libreoffice-commits] core.git: 8 commits - framework/inc framework/source i18npool/source scaddins/source sd/source sfx2/inc sfx2/source svl/inc
Thomas Arnhold
thomas at arnhold.org
Tue Apr 2 05:21:47 PDT 2013
framework/inc/classes/menumanager.hxx | 43 --
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/macros/debug.hxx | 6
framework/inc/macros/debug/targeting.hxx | 236 -----------
framework/inc/services/logindialog.hxx | 143 +++----
framework/source/classes/menumanager.cxx | 47 +-
i18npool/source/breakiterator/breakiterator_unicode.cxx | 12
scaddins/source/analysis/analysis.cxx | 272 ++++++-------
scaddins/source/analysis/analysis.hxx | 306 +++++++--------
scaddins/source/analysis/analysisdefs.hxx | 20
scaddins/source/analysis/analysishelper.cxx | 199 ++++-----
scaddins/source/analysis/analysishelper.hxx | 200 ++++-----
scaddins/source/analysis/financial.cxx | 207 +++++-----
scaddins/source/pricing/pricing.cxx | 34 -
scaddins/source/pricing/pricing.hxx | 69 +--
sd/source/ui/unoidl/sddetect.cxx | 65 +--
sd/source/ui/unoidl/sddetect.hxx | 10
sd/source/ui/unoidl/unomodule.cxx | 50 +-
sd/source/ui/unoidl/unomodule.hxx | 36 -
sfx2/inc/sfx2/docfile.hxx | 53 +-
sfx2/inc/sfx2/sfxbasecontroller.hxx | 108 ++---
sfx2/inc/sfx2/sfxuno.hxx | 252 +++++-------
sfx2/source/doc/doctemplates.cxx | 31 -
sfx2/source/inc/doctemplates.hxx | 42 --
sfx2/source/inc/eventsupplier.hxx | 158 +++----
sfx2/source/notify/eventsupplier.cxx | 254 ++++++------
sfx2/source/view/frmload.cxx | 14
sfx2/source/view/sfxbasecontroller.cxx | 322 +++++++---------
sfx2/source/view/viewsh.cxx | 18
svl/inc/svl/nranges.hxx | 1
30 files changed, 1389 insertions(+), 1821 deletions(-)
New commits:
commit 299586c998a571029cceb35d7b1528f940f530ad
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 2 13:41:23 2013 +0200
nranges: add lost header guard
Change-Id: Ia1aea9dea8766b50a57e897bec9fb2557310168c
diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx
index 3e92331..364bf59 100644
--- a/svl/inc/svl/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
@@ -24,6 +24,7 @@
#endif
#ifndef _SFXNRANGES_HXX
+#define _SFXNRANGES_HXX
#include <tools/solar.h>
commit 9a063f939b7ddd4fe177aecc3e2c21b4cd2346d1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 2 13:15:16 2013 +0200
i18npool: cleanup macros
This is the last one :)
Change-Id: If3e546648a42bcc17e57fb4965f7cdc063243825
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 77ca831..5b24f81 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -37,8 +37,6 @@ using namespace ::rtl;
namespace com { namespace sun { namespace star { namespace i18n {
-#define ERROR ::com::sun::star::uno::RuntimeException()
-
BreakIterator_Unicode::BreakIterator_Unicode() :
cBreakIterator( "com.sun.star.i18n.BreakIterator_Unicode" ), // implementation name
@@ -111,7 +109,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
status = U_ZERO_ERROR;
udata_setAppData("OpenOffice", OpenOffice_dat, &status);
- if ( !U_SUCCESS(status) ) throw ERROR;
+ if ( !U_SUCCESS(status) ) throw uno::RuntimeException();
OOoRuleBasedBreakIterator *rbi = NULL;
@@ -172,14 +170,14 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
}
if ( !U_SUCCESS(status) ) {
icuBI->aBreakIterator=NULL;
- throw ERROR;
+ throw uno::RuntimeException();
}
}
if (icuBI->aBreakIterator) {
icuBI->maLocale=rLocale;
newBreak=sal_True;
} else {
- throw ERROR;
+ throw uno::RuntimeException();
}
}
@@ -191,12 +189,12 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
icuBI->ut = utext_openUChars(icuBI->ut, pText, rText.getLength(), &status);
if (!U_SUCCESS(status))
- throw ERROR;
+ throw uno::RuntimeException();
icuBI->aBreakIterator->setText(icuBI->ut, status);
if (!U_SUCCESS(status))
- throw ERROR;
+ throw uno::RuntimeException();
icuBI->aICUText = rText;
}
commit 381c5bf1ca968424585f679da8382ae3f8d6ac66
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 2 12:26:08 2013 +0200
sfx2: remove macros
Change-Id: I8871b0c95874ceab755b3cb304a60c34981c649c
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 05b6c91..ae055b5 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -56,15 +56,6 @@ class Timer;
class SfxItemSet;
class DateTime;
-#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define XSERVICEINFO ::com::sun::star::lang::XServiceInfo
-#define OWEAKOBJECT ::cppu::OWeakObject
-#define UNOREFERENCE ::com::sun::star::uno::Reference
-#define XINTERFACE ::com::sun::star::uno::XInterface
-#define EXCEPTION ::com::sun::star::uno::Exception
-#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define ANY ::com::sun::star::uno::Any
-
class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
{
SfxMedium_Impl* pImp;
@@ -99,26 +90,26 @@ public:
/**
* @param pSet does NOT take ownership
*/
- SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage,
const String& rBaseURL,
const SfxItemSet* pSet=0 );
/**
* @param pSet does NOT take ownership
*/
- SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage,
const String& rBaseURL,
const String& rTypeName,
const SfxItemSet* pSet=0 );
- SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
+ SfxMedium( const css::uno::Sequence< css::beans::PropertyValue >& aArgs );
~SfxMedium();
void UseInteractionHandler( sal_Bool );
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
+ css::uno::Reference< css::task::XInteractionHandler >
GetInteractionHandler();
void setStreamToLoadFrom(
- const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,
+ const css::uno::Reference<css::io::XInputStream>& xInputStream,
sal_Bool bIsReadOnly);
void SetLoadTargetFrame(SfxFrame* pFrame );
@@ -137,11 +128,11 @@ public:
const rtl::OUString& GetName() const;
const INetURLObject& GetURLObject() const;
- void CheckFileDate( const ::com::sun::star::util::DateTime& aInitDate );
+ void CheckFileDate( const css::util::DateTime& aInitDate );
sal_Bool DocNeedsFileDateCheck();
- ::com::sun::star::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue );
+ css::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue );
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const;
+ css::uno::Reference< css::ucb::XContent > GetContent() const;
const rtl::OUString& GetPhysicalName() const;
sal_Bool IsRemote();
sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; }
@@ -171,12 +162,12 @@ public:
sal_Bool Commit();
sal_Bool IsStorage();
- sal_Int8 ShowLockedDocumentDialog( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock );
+ sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock );
bool LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI );
void UnlockFile( sal_Bool bReleaseLockStream );
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage( sal_Bool bCreateTempIfNo = sal_True );
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetOutputStorage();
+ css::uno::Reference< css::embed::XStorage > GetStorage( sal_Bool bCreateTempIfNo = sal_True );
+ css::uno::Reference< css::embed::XStorage > GetOutputStorage();
void ResetError();
sal_Bool UsesCache() const;
void SetUsesCache( sal_Bool );
@@ -185,7 +176,7 @@ public:
sal_Bool IsAllowedForExternalBrowser() const;
long GetFileVersion() const;
- const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >&
+ const css::uno::Sequence < css::util::RevisionTag >&
GetVersionList( bool _bNoReload = false );
sal_Bool IsReadOnly();
@@ -194,7 +185,7 @@ public:
// medium across toggles via SID_EDITDOC (which do change SetOpenMode):
bool IsOriginallyReadOnly() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetInputStream();
+ css::uno::Reference< css::io::XInputStream > GetInputStream();
void CreateTempFile( sal_Bool bReplace = sal_True );
void CreateTempFileNoCopy();
@@ -210,15 +201,15 @@ public:
SAL_DLLPRIVATE void StorageBackup_Impl();
SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl();
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True );
+ SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True );
SAL_DLLPRIVATE void CloseZipStorage_Impl();
// the storage that will be returned by the medium on GetStorage request
- SAL_DLLPRIVATE void SetStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStorage );
+ SAL_DLLPRIVATE void SetStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xNewStorage );
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetInputStream_Impl();
+ SAL_DLLPRIVATE css::uno::Reference< css::io::XInputStream > GetInputStream_Impl();
SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl();
- SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( com::sun::star::util::RevisionTag& rVersion );
+ SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( css::util::RevisionTag& rVersion );
SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium );
SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML );
SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const ::rtl::OUString& rVersion );
@@ -258,13 +249,13 @@ public:
const String& aDestDir );
SAL_DLLPRIVATE sal_Bool UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv );
SAL_DLLPRIVATE sal_Bool StorageCommit_Impl();
SAL_DLLPRIVATE sal_Bool TransactedTransferForFS_Impl( const INetURLObject& aSource,
const INetURLObject& aDest,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv );
SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature );
@@ -274,10 +265,10 @@ public:
SAL_DLLPRIVATE sal_uInt16 GetCachedSignatureState_Impl();
SAL_DLLPRIVATE void SetCachedSignatureState_Impl( sal_uInt16 nState );
- static com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag > GetVersionList(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ static css::uno::Sequence < css::util::RevisionTag > GetVersionList(
+ const css::uno::Reference< css::embed::XStorage >& xStorage );
static ::rtl::OUString CreateTempCopyWithExt( const ::rtl::OUString& aURL );
- static sal_Bool CallApproveHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler, ::com::sun::star::uno::Any aRequest, sal_Bool bAllowAbort );
+ static sal_Bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, sal_Bool bAllowAbort );
static sal_Bool SetWritableForUserOnly( const ::rtl::OUString& aURL );
static sal_uInt32 CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter );
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 4db98d5..b502c72 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -50,24 +50,6 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/sfxuno.hxx>
-// Some defines to write better code :-)
-#define REFERENCE ::com::sun::star::uno::Reference
-#define ANY ::com::sun::star::uno::Any
-#define XDISPATCH ::com::sun::star::frame::XDispatch
-#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor
-#define XMODEL ::com::sun::star::frame::XModel
-#define XFRAME ::com::sun::star::frame::XFrame
-#define XEVENTLISTENER ::com::sun::star::lang::XEventListener
-#define MUTEX ::osl::Mutex
-#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNOTYPE ::com::sun::star::uno::Type
-#define UNOURL ::com::sun::star::util::URL
-#define XCONTEXTMENUINTERCEPTOR ::com::sun::star::ui::XContextMenuInterceptor
-
-//________________________________________________________________________________________________________
-// forwards
-//________________________________________________________________________________________________________
-
struct IMPL_SfxBaseController_DataContainer ; // impl. struct to hold member of class SfxBaseController
class SfxViewFrame;
@@ -78,15 +60,15 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID );
// class declarations
//________________________________________________________________________________________________________
-typedef ::cppu::WeakImplHelper9 < ::com::sun::star::frame::XController2
- , ::com::sun::star::frame::XControllerBorder
- , ::com::sun::star::frame::XDispatchProvider
- , ::com::sun::star::task::XStatusIndicatorSupplier
- , ::com::sun::star::ui::XContextMenuInterception
- , ::com::sun::star::awt::XUserInputInterception
- , ::com::sun::star::frame::XDispatchInformationProvider
- , ::com::sun::star::frame::XTitle
- , ::com::sun::star::frame::XTitleChangeBroadcaster
+typedef ::cppu::WeakImplHelper9 < css::frame::XController2
+ , css::frame::XControllerBorder
+ , css::frame::XDispatchProvider
+ , css::task::XStatusIndicatorSupplier
+ , css::ui::XContextMenuInterception
+ , css::awt::XUserInputInterception
+ , css::frame::XDispatchInformationProvider
+ , css::frame::XTitle
+ , css::frame::XTitleChangeBroadcaster
> SfxBaseController_Base;
class SFX2_DLLPUBLIC SfxBaseController :public SfxBaseController_Base
@@ -135,14 +117,14 @@ public:
SAL_DLLPRIVATE void ReleaseShell_Impl();
SAL_DLLPRIVATE void BorderWidthsChanged_Impl();
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (::com::sun::star::uno::RuntimeException);
+ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException);
//____________________________________________________________________________________________________
// XController2
//____________________________________________________________________________________________________
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getComponentWindow() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCreationArguments() throw (::com::sun::star::uno::RuntimeException);
+ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException);
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException);
//____________________________________________________________________________________________________
// XController
@@ -161,7 +143,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL attachFrame( const REFERENCE< XFRAME >& xFrame ) throw( RUNTIMEEXCEPTION ) ;
+ virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -176,7 +158,7 @@ public:
@onerror -
*/
- virtual sal_Bool SAL_CALL attachModel( const REFERENCE< XMODEL >& xModel ) throw( RUNTIMEEXCEPTION ) ;
+ virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -191,7 +173,7 @@ public:
@onerror -
*/
- virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( RUNTIMEEXCEPTION ) ;
+ virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -206,7 +188,7 @@ public:
@onerror -
*/
- ANY SAL_CALL getViewData() throw( RUNTIMEEXCEPTION ) ;
+ css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -221,7 +203,7 @@ public:
@onerror -
*/
- void SAL_CALL restoreViewData( const ANY& aValue ) throw( RUNTIMEEXCEPTION ) ;
+ void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -236,7 +218,7 @@ public:
@onerror -
*/
- REFERENCE< XFRAME > SAL_CALL getFrame() throw( RUNTIMEEXCEPTION ) ;
+ css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -251,7 +233,7 @@ public:
@onerror -
*/
- REFERENCE< XMODEL > SAL_CALL getModel() throw( RUNTIMEEXCEPTION ) ;
+ css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException ) ;
//____________________________________________________________________________________________________
// XDispatchProvider
@@ -270,9 +252,9 @@ public:
@onerror -
*/
- virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
- const ::rtl::OUString & sTargetFrameName,
- FrameSearchFlags eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL ,
+ const ::rtl::OUString & sTargetFrameName,
+ FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -287,16 +269,16 @@ public:
@onerror -
*/
- virtual ::com::sun::star::uno::Sequence< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ;
//____________________________________________________________________________________________________
// XControllerBorder
//____________________________________________________________________________________________________
- virtual ::com::sun::star::frame::BorderWidths SAL_CALL getBorder() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addBorderResizeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XBorderResizeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeBorderResizeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XBorderResizeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL queryBorderedArea( const ::com::sun::star::awt::Rectangle& aPreliminaryRectangle ) throw (::com::sun::star::uno::RuntimeException);
+ virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException);
+ virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException);
//____________________________________________________________________________________________________
// XComponent
@@ -315,7 +297,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL dispose() throw( RUNTIMEEXCEPTION ) ;
+ virtual void SAL_CALL dispose() throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -330,7 +312,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL addEventListener( const REFERENCE< XEVENTLISTENER >& aListener ) throw( RUNTIMEEXCEPTION ) ;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException ) ;
/**___________________________________________________________________________________________________
@short -
@@ -345,28 +327,28 @@ public:
@onerror -
*/
- virtual void SAL_CALL removeEventListener( const REFERENCE< XEVENTLISTENER >& aListener ) throw( RUNTIMEEXCEPTION ) ;
- virtual void SAL_CALL registerContextMenuInterceptor( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) throw( RUNTIMEEXCEPTION );
- virtual void SAL_CALL releaseContextMenuInterceptor( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) throw( RUNTIMEEXCEPTION );
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException ) ;
+ virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException );
+ virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException );
- virtual void SAL_CALL addKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException);
//____________________________________________________________________________________________________
// XDispatchInformationProvider
//____________________________________________________________________________________________________
- virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (::com::sun::star::uno::RuntimeException);
+ virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException);
+ virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException);
// css::frame::XTitle
- virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (css::uno::RuntimeException);
// css::frame::XTitleChangeBroadcaster
- virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException);
// FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
// either the _Impl name should vanish or there should be an "official" API
@@ -374,8 +356,8 @@ public:
SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent );
SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
- SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs );
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper ();
+ SAL_DLLPRIVATE void SetCreationArguments_Impl( const css::uno::Sequence< css::beans::PropertyValue >& i_rCreationArgs );
+ SAL_DLLPRIVATE css::uno::Reference< css::frame::XTitle > impl_getTitleHelper ();
private:
enum ConnectSfxFrame
{
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index f622116..3f48698 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -31,10 +31,6 @@
#include <com/sun/star/task/ErrorCodeIOException.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-
-//________________________________________________________________________________________________________________________
-// fix uno header
-//________________________________________________________________________________________________________________________
#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Reference.h>
@@ -43,39 +39,11 @@
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/factory.hxx>
-//________________________________________________________________________________________________________________________
-// something else ... header
-//________________________________________________________________________________________________________________________
#include <osl/mutex.hxx>
-
#include <rtl/ustring.hxx>
-//________________________________________________________________________________________________________________________
-// defines for namespaces !
-//________________________________________________________________________________________________________________________
-
-#define UNOANY ::com::sun::star::uno::Any
-#define UNOEXCEPTION ::com::sun::star::uno::Exception
-#define UNOMUTEX ::osl::Mutex
-#define UNOMUTEXGUARD ::osl::MutexGuard
-#define UNOOIMPLEMENTATIONID ::cppu::OImplementationId
-#define UNOOTYPECOLLECTION ::cppu::OTypeCollection
-#define UNOPROPERTYVALUE ::com::sun::star::beans::PropertyValue
-#define UNOREFERENCE ::com::sun::star::uno::Reference
-#define UNORUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNOSEQUENCE ::com::sun::star::uno::Sequence
-#define UNOTYPE ::com::sun::star::uno::Type
-#define UNOURL ::com::sun::star::util::URL
-#define UNOXINTERFACE ::com::sun::star::uno::XInterface
-#define UNOXMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNOXSINGLESERVICEFACTORY ::com::sun::star::lang::XSingleServiceFactory
-#define UNOXTYPEPROVIDER ::com::sun::star::lang::XTypeProvider
-//________________________________________________________________________________________________________________________
-// declarations and defines for sfx
-//________________________________________________________________________________________________________________________
-
-inline sal_Bool operator==( const UNOURL& aURL1, const UNOURL& aURL2 )
+inline sal_Bool operator==( const css::util::URL& aURL1, const css::util::URL& aURL2 )
{
return aURL1.Complete == aURL2.Complete;
}
@@ -85,16 +53,16 @@ class SfxItemSet ;
class SfxSlot ;
SFX2_DLLPUBLIC void TransformParameters( sal_uInt16 nSlotId ,
- const UNOSEQUENCE< UNOPROPERTYVALUE >& seqArgs ,
- SfxAllItemSet& aSet ,
- const SfxSlot* pSlot = 0 );
+ const css::uno::Sequence< css::beans::PropertyValue >& seqArgs ,
+ SfxAllItemSet& aSet ,
+ const SfxSlot* pSlot = 0 );
-SFX2_DLLPUBLIC void TransformItems( sal_uInt16 nSlotId ,
- const SfxItemSet& aSet ,
- UNOSEQUENCE< UNOPROPERTYVALUE >& seqArgs ,
+SFX2_DLLPUBLIC void TransformItems( sal_uInt16 nSlotId ,
+ const SfxItemSet& aSet ,
+ css::uno::Sequence< css::beans::PropertyValue >& seqArgs ,
const SfxSlot* pSlot = 0 );
-bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData );
+bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::beans::NamedValue >& aEncryptionData );
#define FrameSearchFlags sal_Int32
@@ -115,17 +83,17 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
// XTypeProvider::getImplementationId()
//************************************************************************************************************************
#define SFX_DECL_XINTERFACE \
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); \
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException ); \
virtual void SAL_CALL acquire() throw(); \
virtual void SAL_CALL release() throw();
#define SFX_DECL_XTYPEPROVIDER \
- /* XTypeProvider */ \
- virtual UNOSEQUENCE< UNOTYPE > SAL_CALL getTypes() throw( UNORUNTIMEEXCEPTION ); \
- virtual UNOSEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( UNORUNTIMEEXCEPTION );
+ /* XTypeProvider */ \
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException ); \
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException );
-#define SFX_DECL_XINTERFACE_XTYPEPROVIDER \
- SFX_DECL_XINTERFACE \
+#define SFX_DECL_XINTERFACE_XTYPEPROVIDER \
+ SFX_DECL_XINTERFACE \
SFX_DECL_XTYPEPROVIDER
//************************************************************************************************************************
@@ -141,18 +109,18 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
// static xxx::impl_getStaticImplementationName()
// static xxx::impl_createInstance()
//************************************************************************************************************************
-#define SFX_DECL_XSERVICEINFO_NOFACTORY \
- /* XServiceInfo */ \
- virtual rtl::OUString SAL_CALL getImplementationName() throw( UNORUNTIMEEXCEPTION ); \
- virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION ); \
- virtual UNOSEQUENCE< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ); \
- \
- /* Helper for XServiceInfo */ \
- static UNOSEQUENCE< rtl::OUString > impl_getStaticSupportedServiceNames(); \
- static rtl::OUString impl_getStaticImplementationName(); \
- \
- /* Helper for registry */ \
- static UNOREFERENCE< UNOXINTERFACE > SAL_CALL impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION );
+#define SFX_DECL_XSERVICEINFO_NOFACTORY \
+ /* XServiceInfo */ \
+ virtual rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); \
+ virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); \
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); \
+ \
+ /* Helper for XServiceInfo */ \
+ static css::uno::Sequence< rtl::OUString > impl_getStaticSupportedServiceNames(); \
+ static rtl::OUString impl_getStaticImplementationName(); \
+ \
+ /* Helper for registry */ \
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
//************************************************************************************************************************
// declaration of XInterface::queryInterface()
@@ -170,7 +138,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
//************************************************************************************************************************
#define SFX_DECL_XSERVICEINFO \
SFX_DECL_XSERVICEINFO_NOFACTORY \
- static UNOREFERENCE< UNOXSINGLESERVICEFACTORY > impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager );
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
#define SFX_DECL_XINTERFACE_XTYPEPROVIDER_XSERVICEINFO \
\
@@ -187,24 +155,24 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
// DON'T USE FOLLOW MACROS DIRECTLY!!!
#define SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, IMPLINTERFACES ) \
\
- void SAL_CALL IMPLCLASS::acquire() throw() \
+ void SAL_CALL IMPLCLASS::acquire() throw() \
{ \
/* Don't use mutex in methods of XInterface! */ \
BASECLASS::acquire(); \
} \
\
- void SAL_CALL IMPLCLASS::release() throw() \
+ void SAL_CALL IMPLCLASS::release() throw() \
{ \
/* Don't use mutex in methods of XInterface! */ \
BASECLASS::release(); \
} \
\
- UNOANY SAL_CALL IMPLCLASS::queryInterface( const UNOTYPE& rType ) throw( UNORUNTIMEEXCEPTION ) \
+ css::uno::Any SAL_CALL IMPLCLASS::queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException ) \
{ \
/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \
/* Ask for my own supported interfaces ... */ \
- UNOANY aReturn ( ::cppu::queryInterface( rType, \
- IMPLINTERFACES \
+ css::uno::Any aReturn ( ::cppu::queryInterface( rType, \
+ IMPLINTERFACES \
) \
); \
/* If searched interface supported by this class ... */ \
@@ -221,58 +189,58 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
}
#define SFX_IMPL_INTERFACE_0 \
- static_cast< UNOXTYPEPROVIDER* >( this )
+ static_cast< css::lang::XTypeProvider* >( this )
#define SFX_IMPL_INTERFACE_1( INTERFACE1 ) \
SFX_IMPL_INTERFACE_0, \
static_cast< INTERFACE1* >( this )
#define SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ) \
- SFX_IMPL_INTERFACE_1( INTERFACE1 ), \
+ SFX_IMPL_INTERFACE_1( INTERFACE1 ), \
static_cast< INTERFACE2* >( this )
#define SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) \
- SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ), \
+ SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ), \
static_cast< INTERFACE3* >( this )
#define SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \
- SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ), \
+ SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ), \
static_cast< INTERFACE4* >( this )
#define SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \
- SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ), \
+ SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ), \
static_cast< INTERFACE5* >( this )
#define SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \
- SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ), \
+ SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ), \
static_cast< INTERFACE6* >( this )
-#define SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \
- SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \
+#define SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \
+ SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \
static_cast< INTERFACE7* >( this )
-#define SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \
- SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ), \
+#define SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \
+ SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ), \
static_cast< INTERFACE8* >( this )
-#define SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \
- SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ), \
+#define SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \
+ SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ), \
static_cast< INTERFACE9* >( this )
-#define SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \
+#define SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \
SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ), \
static_cast< INTERFACE10* >( this )
-#define SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
- SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \
+#define SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
+ SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \
static_cast< INTERFACE11* >( this )
-#define SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \
- SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ), \
+#define SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \
+ SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ), \
static_cast< INTERFACE12* >( this )
-#define SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \
- SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ), \
+#define SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \
+ SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ), \
static_cast< INTERFACE13* >( this )
/*_________________________________________________________________________________________________________________________*/
@@ -341,23 +309,23 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
// DON'T USE FOLLOW MACROS DIRECTLY!!!
#define SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, IMPLTYPES ) \
\
- UNOSEQUENCE< sal_Int8 > SAL_CALL IMPLCLASS::getImplementationId() throw( UNORUNTIMEEXCEPTION ) \
+ css::uno::Sequence< sal_Int8 > SAL_CALL IMPLCLASS::getImplementationId() throw( css::uno::RuntimeException ) \
{ \
/* Create one Id for all instances of this class. */ \
/* Use ethernet address to do this! (sal_True) */ \
/* Optimize this method */ \
/* We initialize a static variable only one time. And we don't must use a mutex at every call! */ \
/* For the first call; pID is NULL - for the second call pID is different from NULL! */ \
- static UNOOIMPLEMENTATIONID* pID = NULL ; \
+ static ::cppu::OImplementationId* pID = NULL ; \
if ( pID == NULL ) \
{ \
/* Ready for multithreading; get global mutex for first call of this method only! see before */ \
- UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); \
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \
/* Control these pointer again ... it can be, that another instance will be faster then these! */ \
if ( pID == NULL ) \
{ \
/* Create a new static ID ... */ \
- static UNOOIMPLEMENTATIONID aID( sal_False ); \
+ static ::cppu::OImplementationId aID( sal_False ); \
/* ... and set his address to static pointer! */ \
pID = &aID ; \
} \
@@ -365,21 +333,21 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
return pID->getImplementationId(); \
} \
\
- UNOSEQUENCE< UNOTYPE > SAL_CALL IMPLCLASS::getTypes() throw( UNORUNTIMEEXCEPTION ) \
+ css::uno::Sequence< css::uno::Type > SAL_CALL IMPLCLASS::getTypes() throw( css::uno::RuntimeException ) \
{ \
/* Optimize this method ! */ \
/* We initialize a static variable only one time. And we don't must use a mutex at every call! */ \
/* For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!*/ \
- static UNOOTYPECOLLECTION* pTypeCollection = NULL ; \
+ static ::cppu::OTypeCollection* pTypeCollection = NULL ; \
if ( pTypeCollection == NULL ) \
{ \
/* Ready for multithreading; get global mutex for first call of this method only! see before */ \
- UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); \
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \
/* Control these pointer again ... it can be, that another instance will be faster then these! */ \
if ( pTypeCollection == NULL ) \
{ \
/* Create a static typecollection ... */ \
- static UNOOTYPECOLLECTION aTypeCollection( IMPLTYPES ); \
+ static ::cppu::OTypeCollection aTypeCollection( IMPLTYPES ); \
/* ... and set his address to static pointer! */ \
pTypeCollection = &aTypeCollection ; \
} \
@@ -388,59 +356,59 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
}
#define SFX_IMPL_TYPE_0 \
- ::getCppuType(( const UNOREFERENCE< UNOXTYPEPROVIDER >*)NULL )
+ ::getCppuType(( const css::uno::Reference< css::lang::XTypeProvider >*)NULL )
#define SFX_IMPL_TYPE_1( TYPE1 ) \
SFX_IMPL_TYPE_0, \
- ::getCppuType(( const UNOREFERENCE< TYPE1 >*)NULL )
+ ::getCppuType(( const css::uno::Reference< TYPE1 >*)NULL )
#define SFX_IMPL_TYPE_2( TYPE1, TYPE2 ) \
SFX_IMPL_TYPE_1( TYPE1 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE2 >*)NULL )
+ ::getCppuType(( const css::uno::Reference< TYPE2 >*)NULL )
#define SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ) \
- SFX_IMPL_TYPE_2( TYPE1, TYPE2 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE3 >*)NULL )
+ SFX_IMPL_TYPE_2( TYPE1, TYPE2 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE3 >*)NULL )
#define SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) \
- SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE4 >*)NULL )
+ SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE4 >*)NULL )
#define SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \
- SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE5 >*)NULL )
+ SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE5 >*)NULL )
#define SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \
- SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE6 >*)NULL )
+ SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE6 >*)NULL )
#define SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \
- SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE7 >*)NULL )
+ SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE7 >*)NULL )
#define SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \
- SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE8 >*)NULL )
+ SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE8 >*)NULL )
#define SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \
- SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE9 >*)NULL )
+ SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE9 >*)NULL )
#define SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \
- SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE10 >*)NULL )
+ SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE10 >*)NULL )
#define SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
- SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE11 >*)NULL )
+ SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE11 >*)NULL )
-#define SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \
- SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE12 >*)NULL )
+#define SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \
+ SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE12 >*)NULL )
-#define SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \
- SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ), \
- ::getCppuType(( const UNOREFERENCE< TYPE13 >*)NULL )
+#define SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \
+ SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ), \
+ ::getCppuType(( const css::uno::Reference< TYPE13 >*)NULL )
/*_________________________________________________________________________________________________________________________*/
// FOLLOW MACROS CAN USED DIRECTLY :-)
@@ -512,15 +480,15 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
#define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \
\
/* XServiceInfo */ \
- rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \
+ rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticImplementationName(); \
} \
\
/* XServiceInfo */ \
- sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \
+ sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \
{ \
- UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \
+ css::uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \
const rtl::OUString* pArray = seqServiceNames.getConstArray(); \
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) \
{ \
@@ -533,15 +501,15 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
} \
\
/* XServiceInfo */ \
- UNOSEQUENCE< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \
+ css::uno::Sequence< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticSupportedServiceNames(); \
} \
\
/* Helper for XServiceInfo */ \
- UNOSEQUENCE< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \
+ css::uno::Sequence< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \
{ \
- UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); \
+ css::uno::Sequence< rtl::OUString > seqServiceNames( 1 ); \
seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \
return seqServiceNames ; \
} \
@@ -553,9 +521,9 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
} \
\
/* Helper for registry */ \
- UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION ) \
+ css::uno::Reference< css::uno::XInterface > SAL_CALL IMPLCLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ) \
{ \
- return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS( xServiceManager ) ); \
+ return css::uno::Reference< css::uno::XInterface >( *new IMPLCLASS( xServiceManager ) ); \
}
//************************************************************************************************************************
@@ -566,18 +534,18 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
// static xxx::impl_getStaticImplementationName()
// static xxx::impl_createInstance()
//************************************************************************************************************************
-#define SFX_IMPL_XSERVICEINFO_CTX( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \
+#define SFX_IMPL_XSERVICEINFO_CTX( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \
\
/* XServiceInfo */ \
- rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \
+ rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticImplementationName(); \
} \
\
/* XServiceInfo */ \
- sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \
+ sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \
{ \
- UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \
+ css::uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \
const rtl::OUString* pArray = seqServiceNames.getConstArray(); \
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) \
{ \
@@ -590,15 +558,15 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
} \
\
/* XServiceInfo */ \
- UNOSEQUENCE< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \
+ css::uno::Sequence< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticSupportedServiceNames(); \
} \
\
/* Helper for XServiceInfo */ \
- UNOSEQUENCE< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \
+ css::uno::Sequence< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \
{ \
- UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); \
+ css::uno::Sequence< rtl::OUString > seqServiceNames( 1 ); \
seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \
return seqServiceNames ; \
} \
@@ -610,9 +578,9 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
} \
\
/* Helper for registry */ \
- UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION ) \
+ css::uno::Reference< css::uno::XInterface > SAL_CALL IMPLCLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ) \
{ \
- return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS( comphelper::getComponentContext(xServiceManager) ) ); \
+ return css::uno::Reference< css::uno::XInterface >( *new IMPLCLASS( comphelper::getComponentContext(xServiceManager) ) ); \
}
//************************************************************************************************************************
@@ -620,12 +588,12 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
//************************************************************************************************************************
#define SFX_IMPL_SINGLEFACTORY( IMPLCLASS ) \
\
- UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) \
+ css::uno::Reference< css::lang::XSingleServiceFactory > IMPLCLASS::impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) \
{ \
- UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn ( \
+ css::uno::Reference< css::lang::XSingleServiceFactory > xReturn ( \
cppu::createSingleFactory( xServiceManager , \
IMPLCLASS::impl_getStaticImplementationName() , \
- IMPLCLASS::impl_createInstance , \
+ IMPLCLASS::impl_createInstance , \
IMPLCLASS::impl_getStaticSupportedServiceNames() ) \
); \
return xReturn ; \
@@ -636,12 +604,12 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
//************************************************************************************************************************
#define SFX_IMPL_ONEINSTANCEFACTORY( IMPLCLASS ) \
\
- UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) \
+ css::uno::Reference< css::lang::XSingleServiceFactory > IMPLCLASS::impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) \
{ \
- UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn( \
+ css::uno::Reference< css::lang::XSingleServiceFactory > xReturn( \
cppu::createOneInstanceFactory( xServiceManager , \
IMPLCLASS::impl_getStaticImplementationName() , \
- IMPLCLASS::impl_createInstance , \
+ IMPLCLASS::impl_createInstance , \
IMPLCLASS::impl_getStaticSupportedServiceNames() ) \
); \
return xReturn ; \
@@ -662,7 +630,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
\
if ( CLASS::impl_getStaticImplementationName().equals( rtl::OUString::createFromAscii( pImplementationName ) ) ) \
{ \
- CREATEFACTORY ( CLASS ) \
+ CREATEFACTORY ( CLASS ) \
}
#endif // _SFX_SFXUNO_HXX
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 9d2b6b2..130777f 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -114,7 +114,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
-using namespace ::rtl;
using namespace ::ucbhelper;
using namespace ::comphelper;
@@ -278,7 +277,7 @@ public:
sal_Bool storeTemplate( const OUString& rGroupName,
const OUString& rTemplateName,
- const uno::Reference< XSTORABLE >& rStorable );
+ const uno::Reference< frame::XStorable >& rStorable );
sal_Bool addTemplate( const OUString& rGroupName,
const OUString& rTemplateName,
@@ -1754,7 +1753,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
//-----------------------------------------------------------------------------
sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
const OUString& rTemplateName,
- const uno::Reference< XSTORABLE >& rStorable )
+ const uno::Reference< frame::XStorable >& rStorable )
{
::osl::MutexGuard aGuard( maMutex );
@@ -2224,7 +2223,7 @@ SfxDocTplService::~SfxDocTplService()
//-----------------------------------------------------------------------------
Locale SAL_CALL SfxDocTplService::getLocale()
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
return pImp->getLocale();
}
@@ -2232,7 +2231,7 @@ Locale SAL_CALL SfxDocTplService::getLocale()
//-----------------------------------------------------------------------------
void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
pImp->setLocale( rLocale );
}
@@ -2240,8 +2239,8 @@ void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale )
//-----------------------------------------------------------------------------
//--- XDocumentTemplates ---
//-----------------------------------------------------------------------------
-uno::Reference< XCONTENT > SAL_CALL SfxDocTplService::getContent()
- throw( RUNTIMEEXCEPTION )
+uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent()
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
return pImp->getContent().get();
@@ -2252,8 +2251,8 @@ uno::Reference< XCONTENT > SAL_CALL SfxDocTplService::getContent()
//-----------------------------------------------------------------------------
sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName,
const OUString& TemplateName,
- const uno::Reference< XSTORABLE >& Storable )
- throw( RUNTIMEEXCEPTION )
+ const uno::Reference< frame::XStorable >& Storable )
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
return pImp->storeTemplate( GroupName, TemplateName, Storable );
@@ -2265,7 +2264,7 @@ sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName,
sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName,
const OUString& rTemplateName,
const OUString& rSourceURL )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
return pImp->addTemplate( rGroupName, rTemplateName, rSourceURL );
@@ -2276,7 +2275,7 @@ sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName,
//-----------------------------------------------------------------------------
sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName,
const OUString& rTemplateName )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
return pImp->removeTemplate( rGroupName, rTemplateName );
@@ -2288,7 +2287,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName,
sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName,
const OUString& rOldName,
const OUString& rNewName )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( rOldName == rNewName )
return sal_True;
@@ -2301,7 +2300,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName,
//-----------------------------------------------------------------------------
sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
return pImp->addGroup( rGroupName );
@@ -2311,7 +2310,7 @@ sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName )
//-----------------------------------------------------------------------------
sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
return pImp->removeGroup( rGroupName );
@@ -2322,7 +2321,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName )
//-----------------------------------------------------------------------------
sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName,
const OUString& rNewName )
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( rOldName == rNewName )
return sal_True;
@@ -2335,7 +2334,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName,
//-----------------------------------------------------------------------------
void SAL_CALL SfxDocTplService::update()
- throw( RUNTIMEEXCEPTION )
+ throw( uno::RuntimeException )
{
if ( pImp->init() )
pImp->update( sal_True );
diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx
index 390d2b7..a363f9e 100644
--- a/sfx2/source/inc/doctemplates.hxx
+++ b/sfx2/source/inc/doctemplates.hxx
@@ -37,57 +37,41 @@
#include <ucbhelper/content.hxx>
#include <sfx2/sfxuno.hxx>
-//--------------------------------------------------------------------------------------------------------
-
-#define UNOLOCALE ::com::sun::star::lang::Locale
-#define REFERENCE ::com::sun::star::uno::Reference
-#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define PROPERTYVALUE ::com::sun::star::beans::PropertyValue
-#define XCONTENT ::com::sun::star::ucb::XContent
-#define XDOCUMENTTEMPLATES ::com::sun::star::frame::XDocumentTemplates
-#define XINTERFACE ::com::sun::star::uno::XInterface
-#define XLOCALIZABLE ::com::sun::star::lang::XLocalizable
-#define XMODEL ::com::sun::star::frame::XModel
-#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define XSERVICEINFO ::com::sun::star::lang::XServiceInfo
-#define XSTORABLE ::com::sun::star::frame::XStorable
-
-//--------------------------------------------------------------------------------------------------------
class SfxDocTplService_Impl;
-class SfxDocTplService: public ::cppu::WeakImplHelper3< XLOCALIZABLE, XDOCUMENTTEMPLATES, XSERVICEINFO >
+class SfxDocTplService: public ::cppu::WeakImplHelper3< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo >
{
SfxDocTplService_Impl *pImp;
public:
SFX_DECL_XSERVICEINFO
- SfxDocTplService( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+ SfxDocTplService( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
~SfxDocTplService();
// --- XLocalizable ---
- void SAL_CALL setLocale( const UNOLOCALE & eLocale ) throw( RUNTIMEEXCEPTION );
- UNOLOCALE SAL_CALL getLocale() throw( RUNTIMEEXCEPTION );
+ void SAL_CALL setLocale( const css::lang::Locale & eLocale ) throw( css::uno::RuntimeException );
+ css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException );
// --- XDocumentTemplates ---
- REFERENCE< XCONTENT > SAL_CALL getContent() throw( RUNTIMEEXCEPTION );
+ css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException );
sal_Bool SAL_CALL storeTemplate( const ::rtl::OUString& GroupName,
const ::rtl::OUString& TemplateName,
- const REFERENCE< XSTORABLE >& Storable ) throw( RUNTIMEEXCEPTION );
+ const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException );
sal_Bool SAL_CALL addTemplate( const ::rtl::OUString& GroupName,
const ::rtl::OUString& TemplateName,
- const ::rtl::OUString& SourceURL ) throw( RUNTIMEEXCEPTION );
+ const ::rtl::OUString& SourceURL ) throw( css::uno::RuntimeException );
sal_Bool SAL_CALL removeTemplate( const ::rtl::OUString& GroupName,
- const ::rtl::OUString& TemplateName ) throw( RUNTIMEEXCEPTION );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list