offapi/com/sun/star/sheet/GlobalSheetSettings.idl | 3 +++
offapi/com/sun/star/sheet/XGlobalSheetSettings.idl | 9 +--------
sc/inc/appluno.hxx | 5 ++++-
3 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 33a4d7624fd30454306e659d24665fa251fc9eff
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jun 5 16:01:16 2013 +0200
Fixes for new-style service com.sun.star.sheet.GlobalSheetSettings
...changed from old-style with a39c96af53ec3364de70012ebfa7c09c4a55a7c3
"fdo#46808, Convert sheet::GlobalSheetSettings service to new style." The
XPropertySet can be treated as an implementation detail (but kept in the
implementation for backwards compatibility). Also, this should arguably be
a
singleton rather than a service, like some related services (e.g.,
com.sun.star.sheet.RecentFunctions), too.
Change-Id: Ibfe3254188aff91a08b39cbc295fb610ae0dfa5f
diff --git a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
index 44438f3..385a83c 100644
--- a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
@@ -28,6 +28,9 @@ module com { module sun { module star { module sheet {
/** contributes properties to access the settings for all spreadsheets of
a spreadsheet document.
+
+ For backwards compatibility, the attributes of XGlobalSheetSettings can
+ still be accessed via com::sun::star::beans::XPropertySet, too.
*/
published service GlobalSheetSettings : XGlobalSheetSettings;
diff --git a/offapi/com/sun/star/sheet/XGlobalSheetSettings.idl
b/offapi/com/sun/star/sheet/XGlobalSheetSettings.idl
index 0843d30..c0a7c32 100644
--- a/offapi/com/sun/star/sheet/XGlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/XGlobalSheetSettings.idl
@@ -20,7 +20,7 @@
#ifndef __com_sun_star_sheet_XGlobalSheetSettings_idl__
#define __com_sun_star_sheet_XGlobalSheetSettings_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/uno/XInterface.idl>
module com { module sun { module star { module sheet {
@@ -31,13 +31,6 @@ module com { module sun { module star { module sheet {
*/
published interface XGlobalSheetSettings
{
-
-//! service com::sun::star::beans::PropertySet;
- /** provides access to the properties.
- */
- interface com::sun::star::beans::XPropertySet;
-
-
/** specifies whether the cursor is moved after entering into cells.
*/
[attribute] boolean MoveSelection;
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 2189fa1..b63fdab 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -22,12 +22,14 @@
#include <svl/itemprop.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XRecentFunctions.hpp>
#include <com/sun/star/sheet/XFunctionDescriptions.hpp>
#include <com/sun/star/sheet/XGlobalSheetSettings.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
#include <rtl/ustring.hxx>
@@ -47,8 +49,9 @@
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
com::sun::star::lang::XMultiServiceFactory>& rSMgr );
-class ScSpreadsheetSettings : public cppu::WeakImplHelper2<
+class ScSpreadsheetSettings : public cppu::WeakImplHelper3<
com::sun::star::sheet::XGlobalSheetSettings,
+ com::sun::star::beans::XPropertySet,
com::sun::star::lang::XServiceInfo>
{
private:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
