dr77: post rebase fixes

9 files changed, 65 insertions, 25 deletions

diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 037bef1a3765..52d96f64cdf5 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -60,6 +60,7 @@ mkdir: %_DEST%\inc%_EXT%\filter\msfilter
 ..\%__SRC%\misc\XSLTValidate.component %_DEST%\xml%_EXT%\XSLTValidate.component
 ..\%__SRC%\misc\filterconfig1.component %_DEST%\xml%_EXT%\filterconfig1.component
 ..\%__SRC%\misc\flash.component %_DEST%\xml%_EXT%\flash.component
+..\%__SRC%\misc\msfilter.component %_DEST%\xml%_EXT%\msfilter.component
 ..\%__SRC%\misc\pdffilter.component %_DEST%\xml%_EXT%\pdffilter.component
 ..\%__SRC%\misc\placeware.component %_DEST%\xml%_EXT%\placeware.component
 ..\%__SRC%\misc\svgfilter.component %_DEST%\xml%_EXT%\svgfilter.component
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index 1a8d27d85097..62ac9b5c90d4 100644
--- a/filter/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -25,11 +25,12 @@
 #
 #*************************************************************************
 
-PRJ=../..
+PRJ=..$/..
 
 PRJNAME=filter
 TARGET=msfilter
-ENABLE_EXCEPTIONS=true
+
+ENABLE_EXCEPTIONS=TRUE
 LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
@@ -81,7 +82,14 @@ SHL1STDLIBS= \
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/msfilter.component
 
+$(MISC)/msfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        msfilter.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt msfilter.component
diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component
new file mode 100755
index 000000000000..64128aa1385b
--- /dev/null
+++ b/filter/source/msfilter/msfilter.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.vba.VBAMacroResolver">
+    <service name="com.sun.star.script.vba.VBAMacroResolver"/>
+  </implementation>
+</component>
diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx
index cfe0bbdaaf12..09a303f72141 100755
--- a/filter/source/msfilter/services.cxx
+++ b/filter/source/msfilter/services.cxx
@@ -72,9 +72,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char*
     return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, spServices );
-}
-
 // ============================================================================
diff --git a/oox/inc/oox/xls/worksheethelper.hxx b/oox/inc/oox/xls/worksheethelper.hxx
index d946818b0e5e..55bf1c044e30 100644
--- a/oox/inc/oox/xls/worksheethelper.hxx
+++ b/oox/inc/oox/xls/worksheethelper.hxx
@@ -389,9 +389,8 @@ public:
     void                extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress );
     /** Extends the used area of this sheet by the passed cell range. */
     void                extendUsedArea( const ::com::sun::star::table::CellRangeAddress& rRange );
-    /** Extends the shape bounding box by the position and size of the passed rectangle. */
-    void                extendShapeBoundingBox(
-                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+    /** Extends the shape bounding box by the position and size of the passed rectangle (in 1/100 mm). */
+    void                extendShapeBoundingBox( const ::com::sun::star::awt::Rectangle& rShapeRect );
 
     /** Sets base width for all columns (without padding pixels). This value
         is only used, if width has not been set with setDefaultColumnWidth(). */
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 32278e425664..f7c6c6102b1d 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -49,6 +49,7 @@ namespace dump {
 
 // ============================================================================
 
+using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
diff --git a/oox/source/xls/biffcodec.cxx b/oox/source/xls/biffcodec.cxx
index 89b39ef4fc94..cb4829973fcc 100644
--- a/oox/source/xls/biffcodec.cxx
+++ b/oox/source/xls/biffcodec.cxx
@@ -37,6 +37,9 @@ namespace xls {
 
 // ============================================================================
 
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+
 using ::oox::core::FilterBase;
 using ::rtl::OString;
 using ::rtl::OUString;
diff --git a/oox/source/xls/drawingfragment.cxx b/oox/source/xls/drawingfragment.cxx
index e50883ec4fbc..e28608f728c6 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -601,8 +601,15 @@ void DrawingFragment::onEndElement()
                 if( (aShapeRect.X >= 0) && (aShapeRect.Y >= 0) && (aShapeRect.Width >= 0) && (aShapeRect.Height >= 0) )
                 {
                     mxShape->addShape( getOoxFilter(), &getTheme(), mxDrawPage, &aShapeRect );
-                    // collect all shape positions in the WorksheetHelper base class
-                    extendShapeBoundingBox( aShapeRect );
+                    /*  Collect all shape positions in the WorksheetHelper base
+                        class. But first, scale EMUs to 1/100 mm. */
+                    const UnitConverter& rUnitConv = getUnitConverter();
+                    Rectangle aShapeRectHmm(
+                        rUnitConv.scaleToMm100( aShapeRect.X, UNIT_EMU ),
+                        rUnitConv.scaleToMm100( aShapeRect.Y, UNIT_EMU ),
+                        rUnitConv.scaleToMm100( aShapeRect.Width, UNIT_EMU ),
+                        rUnitConv.scaleToMm100( aShapeRect.Height, UNIT_EMU ) );
+                    extendShapeBoundingBox( aShapeRectHmm );
                 }
             }
             mxShape.reset();
diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx
index 2bd8deeeae57..48ffac388cfd 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -997,25 +997,17 @@ void WorksheetData::extendUsedArea( const CellRangeAddress& rRange )
 
 void WorksheetData::extendShapeBoundingBox( const Rectangle& rShapeRect )
 {
-    // scale EMUs to 1/100 mm
-    const UnitConverter& rUnitConv = getUnitConverter();
-    Rectangle aShapeRectHmm(
-        rUnitConv.scaleToMm100( rShapeRect.X, UNIT_EMU ),
-        rUnitConv.scaleToMm100( rShapeRect.Y, UNIT_EMU ),
-        rUnitConv.scaleToMm100( rShapeRect.Width, UNIT_EMU ),
-        rUnitConv.scaleToMm100( rShapeRect.Height, UNIT_EMU ) );
-
     if( (maShapeBoundingBox.Width == 0) && (maShapeBoundingBox.Height == 0) )
     {
         // width and height of maShapeBoundingBox are assumed to be zero on first cell
-        maShapeBoundingBox = aShapeRectHmm;
+        maShapeBoundingBox = rShapeRect;
     }
     else
     {
-        sal_Int32 nEndX = ::std::max( maShapeBoundingBox.X + maShapeBoundingBox.Width, aShapeRectHmm.X + aShapeRectHmm.Width );
-        sal_Int32 nEndY = ::std::max( maShapeBoundingBox.Y + maShapeBoundingBox.Height, aShapeRectHmm.Y + aShapeRectHmm.Height );
-        maShapeBoundingBox.X = ::std::min( maShapeBoundingBox.X, aShapeRectHmm.X );
-        maShapeBoundingBox.Y = ::std::min( maShapeBoundingBox.Y, aShapeRectHmm.Y );
+        sal_Int32 nEndX = ::std::max( maShapeBoundingBox.X + maShapeBoundingBox.Width, rShapeRect.X + rShapeRect.Width );
+        sal_Int32 nEndY = ::std::max( maShapeBoundingBox.Y + maShapeBoundingBox.Height, rShapeRect.Y + rShapeRect.Height );
+        maShapeBoundingBox.X = ::std::min( maShapeBoundingBox.X, rShapeRect.X );
+        maShapeBoundingBox.Y = ::std::min( maShapeBoundingBox.Y, rShapeRect.Y );
         maShapeBoundingBox.Width = nEndX - maShapeBoundingBox.X;
         maShapeBoundingBox.Height = nEndY - maShapeBoundingBox.Y;
     }