[ooo-build-commit] .: patches/dev300

[Katarina Machalkova]

 patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff |    2 -
 patches/dev300/xlsx-shared-xlsx-snapshot.diff                 |   11 +---------
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 0deb0977974a6881abade011456c3dab94ec9324
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Wed Jun 30 16:26:36 2010 +0200

    Adjusted to m83, round 1
    
    (don't conflict with cws-vbasupportdev300_m83.diff)
    
    * patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff:
    * patches/dev300/xlsx-shared-xlsx-snapshot.diff:

diff --git a/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff b/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
index 7968ad5..739c7e9 100644
--- a/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
+++ b/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
@@ -7,8 +7,8 @@
 +    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
 +
  private:
+     virtual GraphicHelper* implCreateGraphicHelper() const;
      virtual ::rtl::OUString implGetImplementationName() const;
- };
 --- oox/source/xls/excelfilter.cxx.old	2009-10-08 16:17:33.000000000 +0200
 +++ oox/source/xls/excelfilter.cxx	2010-03-03 17:00:06.000000000 +0100
 @@ -43,7 +43,9 @@ using ::com::sun::star::uno::Any;
diff --git a/patches/dev300/xlsx-shared-xlsx-snapshot.diff b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
index f8cb51b..c23a926 100644
--- a/patches/dev300/xlsx-shared-xlsx-snapshot.diff
+++ b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
@@ -274,7 +274,7 @@
 --- sc/source/filter/excel/xeescher.cxx.old	2010-03-03 17:00:05.000000000 +0100
 +++ sc/source/filter/excel/xeescher.cxx	2010-03-03 17:00:06.000000000 +0100
 @@ -71,6 +71,7 @@
- #include "xestyle.hxx"
+ #include "svx/unoapi.hxx"
  
  #include <oox/core/tokens.hxx>
 +#include <oox/export/drawingml.hxx>
@@ -1969,7 +1969,7 @@
          }
          else if( nObjType == OBJ_UNO )
          {
-@@ -250,13 +250,13 @@
+@@ -250,7 +250,7 @@
              pCurrXclObj = CreateCtrlObj( rxShape, pChildAnchor );
  #endif
              if( !pCurrXclObj )
@@ -1978,13 +1978,6 @@
          }
          else if( !ScDrawLayer::IsNoteCaption( pObj ) )
          {
-             // #107540# ignore permanent note shapes
-             // #i12190# do not ignore callouts (do not filter by object type ID)
--            pCurrXclObj = new XclObjAny( mrObjMgr );   // just a metafile
-+            pCurrXclObj = new XclObjAny( mrObjMgr, rxShape );   // just a metafile
-         }
-        }
-        if ( pCurrXclObj )
 --- sc/source/filter/xcl97/xcl97rec.cxx.old	2010-03-03 17:00:05.000000000 +0100
 +++ sc/source/filter/xcl97/xcl97rec.cxx	2010-03-03 17:00:06.000000000 +0100
 @@ -77,7 +77,12 @@