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, 8 insertions, 8 deletions

diff --git a/sc/source/ui/vba/vbashapes.cxx b/sc/source/ui/vba/vbashapes.cxx
index 3bdb72a4ded1..8aac090d0337 100644
--- a/sc/source/ui/vba/vbashapes.cxx
+++ b/sc/source/ui/vba/vbashapes.cxx
@@ -30,14 +30,14 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-#include <org/openoffice/msforms/XShapeRange.hpp>
-#include <org/openoffice/office/MsoAutoShapeType.hpp>
+#include <ooo/vba/msforms/XShapeRange.hpp>
+#include <ooo/vba/office/MsoAutoShapeType.hpp>
 
 #include "vbashapes.hxx"
 #include "vbashape.hxx"
 #include "vbashaperange.hxx"
 
-using namespace ::org::openoffice;
+using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 class VbShapeEnumHelper : public EnumerationHelper_BASE
@@ -76,7 +76,7 @@ void ScVbaShapes::initBaseCollection()
     m_xNameAccess.set( xShapes, uno::UNO_QUERY );
 }
 
-ScVbaShapes::ScVbaShapes( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0)
+ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0)
 {
     m_xShapes.set( xShapes, uno::UNO_QUERY_THROW );
     m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW );
@@ -103,7 +103,7 @@ ScVbaShapes::createCollectionObject( const css::uno::Any& aSource )
 uno::Type
 ScVbaShapes::getElementType() throw (uno::RuntimeException)
 {
-    return org::openoffice::msforms::XShape::static_type(0);
+    return ooo::vba::msforms::XShape::static_type(0);
 }
 rtl::OUString&
 ScVbaShapes::getServiceImplName()
@@ -119,7 +119,7 @@ ScVbaShapes::getServiceNames()
     if ( aServiceNames.getLength() == 0 )
     {
         aServiceNames.realloc( 1 );
-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.msform.Shapes" ) );
+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shapes" ) );
     }
     return aServiceNames;
 }
@@ -172,7 +172,7 @@ ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::R
     {
         uno::Reference< container::XIndexAccess > xIndexAccess( getShapesByArrayIndices( Index ) );
         // return new collection instance
-        uno::Reference< vba::XCollection > xShapesCollection(  new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) );
+        uno::Reference< XCollection > xShapesCollection(  new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) );
         return uno::makeAny( xShapesCollection );
     }
 */
@@ -385,7 +385,7 @@ ScVbaShapes::createName( rtl::OUString sName )
 #if 0
 //TODO helperapi using a writer document
 awt::Point
-calculateTopLeftMargin( uno::Reference< vba::XHelperInterface > xDocument )
+calculateTopLeftMargin( uno::Reference< XHelperInterface > xDocument )
 {
     awt::Point aPoint( 0, 0 );
     uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );