From cd1bbf0a2b9141c0d20f676503b5cc3dc2b00ee3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 5 Jun 2013 16:01:16 +0200
Subject: 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
(cherry picked from commit 33a4d7624fd30454306e659d24665fa251fc9eff)
---
 sc/inc/appluno.hxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sc')

diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 2189fa1cd412..b63fdab835ee 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:
-- 
cgit