CWS-TOOLING: integrate CWS npower11

2009-01-21 11:00:00 +0100 npower  r266639 : replace ScAddress::CONV_XL_R1C1 with
formula::FormulaGrammar::CONV_XL_R1C1
2009-01-21 10:58:33 +0100 npower  r266638 : fixup access for changes to compiler.[ch]xx
2009-01-21 10:57:46 +0100 npower  r266637 : replace the static with non-static  member ( to align with the latest
m39 ) changes
2009-01-20 11:53:52 +0100 npower  r266562 : CWS-TOOLING: rebase CWS npower11 to trunk@266428 (milestone: DEV300:m39)
2009-01-09 23:31:00 +0100 cloph  r266122 : fix typo (missing "="), initialize variables to avoid WaE breakage
2009-01-09 11:57:20 +0100 npower  r266071 : wae Mac OSX gcc-4.0.1 (PPC)
2009-01-08 11:09:49 +0100 npower  r265986 : wae - Mac OSX gcc-4.0.1 (PPC)
2009-01-07 10:33:20 +0100 npower  r265952 : wae Mac OSX gcc-4.0.1
2008-12-18 19:14:10 +0100 npower  r265712 : wae for wntmsci12 target
2008-12-17 16:14:54 +0100 npower  r265640 : add Outline property for Font, also remove growing list of friend classes
for ScCellRangeObj and replace by a single class.
2008-12-17 16:11:02 +0100 npower  r265639 : fix path variable for 3.1, also tweak the unix logs
2008-12-11 02:39:58 +0100 hanbo  r265233 : fix the vba/vba namespace of constants
2008-11-25 17:05:39 +0100 npower  r264317 : namespace changes
2008-11-25 14:12:37 +0100 npower  r264308 : revert changes made by mistake when migrating cws
2008-11-25 13:30:59 +0100 npower  r264296 : i#93944# namespace changes
2008-11-25 13:29:25 +0100 npower  r264293 : i#93944# namespace changes
2008-11-25 13:27:08 +0100 npower  r264289 : i#93944# namespace changes
2008-11-24 18:24:17 +0100 npower  r264263 : svn migration
2008-11-24 18:22:47 +0100 npower  r264262 : not needed anymore
2008-11-24 18:21:23 +0100 npower  r264261 : svn migration
2008-11-24 18:18:31 +0100 npower  r264260 : svn migration

1 files changed, 24 insertions, 3 deletions

diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx
index 566bed86c6b7..1184d33e6cd9 100644
--- a/sc/source/ui/vba/vbainterior.hxx
+++ b/sc/source/ui/vba/vbainterior.hxx
@@ -30,7 +30,7 @@
 #ifndef SC_VBA_INTERIOR_HXX
 #define SC_VBA_INTERIOR_HXX
 
-#include <org/openoffice/excel/XInterior.hpp>
+#include <ooo/vba/excel/XInterior.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -40,16 +40,31 @@
 
 class ScDocument;
 
-typedef InheritedHelperInterfaceImpl1< oo::excel::XInterior > ScVbaInterior_BASE;
+typedef InheritedHelperInterfaceImpl1< ov::excel::XInterior > ScVbaInterior_BASE;
 
 class ScVbaInterior :  public ScVbaInterior_BASE
 {
     css::uno::Reference< css::beans::XPropertySet > m_xProps;
     ScDocument* m_pScDoc;
+    Color m_aPattColor;
+    sal_Int32 m_nPattern;
 
         css::uno::Reference< css::container::XIndexAccess > getPalette();
+    css::uno::Reference< css::container::XNameContainer > GetAttributeContainer();
+    css::uno::Any SetAttributeData( sal_Int32 nValue );
+    sal_Int32 GetAttributeData( css::uno::Any aValue );
+    Color GetBackColor();
+protected:
+    Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern );
+    Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans );
+    sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans );
+    css::uno::Any GetIndexColor( const sal_Int32& nColorIndex );
+    sal_Int32 GetColorIndex( const sal_Int32 nColor );
+    css::uno::Any GetUserDefinedAttributes( const rtl::OUString& sName );
+    void SetUserDefinedAttributes( const rtl::OUString& sName, const css::uno::Any& aValue );
+    void SetMixedColor();
 public:
-        ScVbaInterior( const css::uno::Reference< oo::vba::XHelperInterface >& xParent,  const css::uno::Reference< css::uno::XComponentContext >& xContext,
+        ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent,  const css::uno::Reference< css::uno::XComponentContext >& xContext,
                  const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = NULL) throw ( css::lang::IllegalArgumentException);
 
         virtual ~ScVbaInterior(){}
@@ -59,6 +74,12 @@ public:
 
     virtual css::uno::Any SAL_CALL getColorIndex() throw ( css::uno::RuntimeException);
     virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException );
+    virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException);
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();