CWS-TOOLING: integrate CWS fwk98

2008-12-12 22:28:04 +0100 pb  r265444 : fix: #i44211# precompiled directive was missed
2008-12-11 10:43:34 +0100 pb  r265262 : fix: #i87952# #i84982# SID_INSERT_APPLET and SID_CHAR_DLG_FOR_PARAGRAPH not configurable any longer
2008-12-11 10:40:05 +0100 pb  r265261 : fix: #i64346# SID_MAIL_SENDDOCASFORMAT not configurable any longer
2008-12-11 10:36:53 +0100 pb  r265260 : fix: #i41265# #i64346# ui name for MacroOrganizer and SendMailDocAs...
2008-12-11 10:29:07 +0100 pb  r265258 : fix: #i60617# #i92080# ui name for ContinueNumbering and SaveGraphic
2008-12-11 10:25:52 +0100 pb  r265256 : fix: #i80850# ui name for ToggleFormula and AssignMacro
2008-12-08 14:16:20 +0100 pb  r264996 : fix: #i44211# querytemplate.obj added
2008-12-08 12:54:02 +0100 pb  r264992 : fix: #i44211# use the new query template box
2008-12-08 12:50:45 +0100 pb  r264991 : fix: #i44211# STR_QRYTEMPL_... added
2008-12-08 12:48:21 +0100 pb  r264990 : fix: #i44211# new query box
2008-12-02 11:06:54 +0100 pb  r264681 : fix: #i88478# ScStyleFamilyObj: XPropertySet support added
2008-12-02 11:05:29 +0100 pb  r264680 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 11:03:22 +0100 pb  r264679 : fix: #i88478# ScStyleFamilyObj: XPropertySet support added
2008-12-02 10:54:27 +0100 pb  r264678 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 10:50:16 +0100 pb  r264677 : fix: #i88478# SwXStyleFamily: XpropertySet support added
2008-12-02 10:48:12 +0100 pb  r264676 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 10:45:46 +0100 pb  r264674 : fix: #i88478# SwXStyleFamily: XpropertySet support added
2008-12-02 10:43:44 +0100 pb  r264673 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 10:40:45 +0100 pb  r264671 : fix: #i88478# table.srs added
2008-12-02 10:37:45 +0100 pb  r264669 : fix: #i88478# dummy text of DisplayName replaced
2008-12-02 10:35:26 +0100 pb  r264668 : fix: #i88478# RID_SVXSTR_STYLEFAMILY_TABLEDESIGN added
2008-12-02 10:30:24 +0100 pb  r264666 : fix: #i88478# RID_SVXSTR_STYLEFAMILY_TABLEDESIGN added
2008-11-24 10:42:03 +0100 pb  r264214 : fix: #i92765# set search algorithm with sense
2008-11-24 07:02:31 +0100 pb  r264194 : fix: #i61775# dont display more than 100 fonts
2008-11-24 06:15:20 +0100 pb  r264193 : fix: #i96418# map module swxform to swriter for help
2008-11-20 11:34:21 +0100 pb  r264035 : fix: #i93453# map 'swform' and 'swreport' to 'sdatabase'
2008-11-20 09:55:30 +0100 pb  r264030 : fix: #i94023# after copy a ResId dont forget to set RT correctly

4 files changed, 94 insertions, 3 deletions

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 93d5633f27aa..08125d494d12 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -571,8 +571,10 @@
 
 #define STR_UNDO_INSERTNOTE         431
 #define STR_UNDO_DELETENOTE         432
+#define STR_STYLE_FAMILY_CELL       433
+#define STR_STYLE_FAMILY_PAGE       434
 
-#define STR_COUNT                   433
+#define STR_COUNT                   435
 
 #endif
 
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 959036df02e8..7c5da1d82f8f 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
+//#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase7.hxx>
 
@@ -125,9 +125,10 @@ public:
 };
 
 
-class ScStyleFamilyObj : public ::cppu::WeakImplHelper3<
+class ScStyleFamilyObj : public ::cppu::WeakImplHelper4<
                             ::com::sun::star::container::XNameContainer,
                             ::com::sun::star::container::XIndexAccess,
+                            ::com::sun::star::beans::XPropertySet,
                             ::com::sun::star::lang::XServiceInfo >,
                         public SfxListener
 {
@@ -186,6 +187,22 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException);
 
+                            // XPropertySet
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+                                throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+                                throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+                                throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+                                throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+                                throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+                                throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+                                throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
                             // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName()
                                 throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 545684424054..f121f61393aa 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1721,5 +1721,13 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "Unknown User";
     };
+    String STR_STYLE_FAMILY_CELL
+    {
+        Text [ en-US ] = "Cell Styles";
+    };
+    String STR_STYLE_FAMILY_PAGE
+    {
+        Text [ en-US ] = "Page Styles";
+    };
 };
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 6786234067fb..ae8331ffa5fe 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1013,6 +1013,70 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName )
     return sal_False;
 }
 
+// XPropertySet
+
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo(  ) throw (uno::RuntimeException)
+{
+    OSL_ENSURE( 0, "###unexpected!" );
+    return uno::Reference< beans::XPropertySetInfo >();
+}
+
+void SAL_CALL ScStyleFamilyObj::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    OSL_ENSURE( 0, "###unexpected!" );
+}
+
+uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    uno::Any aRet;
+
+    if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) )
+    {
+        ScUnoGuard aGuard;
+        sal_uInt32 nResId = 0;
+        switch ( eFamily )
+        {
+            case SFX_STYLE_FAMILY_PARA:
+                nResId = STR_STYLE_FAMILY_CELL; break;
+            case SFX_STYLE_FAMILY_PAGE:
+                nResId = STR_STYLE_FAMILY_PAGE; break;
+            default:
+                OSL_ENSURE( 0, "ScStyleFamilyObj::getPropertyValue(): invalid family" );
+        }
+        if ( nResId > 0 )
+        {
+            ::rtl::OUString sDisplayName( ScGlobal::GetRscString( static_cast< USHORT >( nResId ) ) );
+            aRet = uno::makeAny( sDisplayName );
+        }
+    }
+    else
+    {
+        throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + sPropertyName, static_cast<OWeakObject *>(this) );
+    }
+
+    return aRet;
+}
+
+void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    OSL_ENSURE( 0, "###unexpected!" );
+}
+
+void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    OSL_ENSURE( 0, "###unexpected!" );
+}
+
+void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    OSL_ENSURE( 0, "###unexpected!" );
+}
+
+void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    OSL_ENSURE( 0, "###unexpected!" );
+}
+
 //------------------------------------------------------------------------
 
 //  Default-ctor wird fuer die Reflection gebraucht