Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


Hi all,
          In order to escape from errors while building oox (with latest
repo,9th October late night) made some changes to code manually, please 
tell me is it possible to build oox without these changes.As these  tweaks
involved changing of header files , commenting a line which are  not
recommended,  just tried to escape from situation.
          secondly i am sharing couple of things i experienced while
building on Ubuntu Lucid distro.
             - changes to patches/dev300/apply to disable some patches
which are not working - dev300-apply.diff
             - Missing dependencies(Ubuntu Lucid) in ./download or
apt-get build-dep to build ixion module :- libboost-dev,
libboostthread-dev, libbboost-program-options-dev

Thanks & Regards,
Rajesh Sola.


#This patch is just for info, not in git diff format
#Of course changing header file is not suggestible, just tweaked to escape for time being
--- oox/inc/oox/drawingml/shape.hxx     2010-10-07 00:02:21.820067911 +0530
+++ oox/inc/oox/drawingml/shape.hxx     2010-10-08 18:49:26.663570433 +0530
@@ -117,7 +117,9 @@
     table::TablePropertiesPtr          getTableProperties();
 
     void                            setPosition( com::sun::star::awt::Point nPosition ){ 
maPosition = nPosition; }
+    com::sun::star::awt::Point      getPosition() { return maPosition; } // To avoid error - 
undefined symbol getPosition
     void                            setSize( com::sun::star::awt::Size aSize ){ maSize = aSize; }
+    com::sun::star::awt::Size       getSize() { return maSize; }  // To avoid error - undefined 
symbol getSize
     void                            setRotation( sal_Int32 nRotation ) { mnRotation = nRotation; }
     void                            setFlip( sal_Bool bFlipH, sal_Bool bFlipV ) { mbFlipH = 
bFlipH; mbFlipV = bFlipV; }
     void                            addChild( const ShapePtr pChildPtr ) { maChildren.push_back( 
pChildPtr ); }
--- oox/inc/oox/drawingml/customshapeproperties.hxx     2010-10-07 00:02:21.780054445 +0530
+++ oox/inc/oox/drawingml/customshapeproperties.hxx     2010-10-08 18:53:40.223571706 +0530
@@ -125,7 +125,7 @@
                         const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape 
& xShape) const;
 
     void setShapePresetType( const rtl::OUString& rShapePresetType ){ maShapePresetType = 
rShapePresetType; };
-
+    rtl::OUString& getShapePresetType() { return maShapePresetType; } // To avoid error - 
undefined symbol getShapePresetType
     std::vector< CustomShapeGuide >&   getAdjustmentGuideList(){ return maAdjustmentGuideList; };
     std::vector< CustomShapeGuide >&   getGuideList(){ return maGuideList; };
     std::vector< AdjustHandle >&               getAdjustHandleList(){ return maAdjustHandleList; };

--- oox/source/ole/vbaproject.cxx       2010-10-07 00:07:13.540050414 +0530
+++ oox/source/ole/vbaproject.cxx       2010-10-08 19:04:05.363624475 +0530
@@ -358,7 +358,10 @@
         // set library container to VBA compatibility mode
         try
         {
-            Reference< XVBACompatibility >( getLibraryContainer( PROP_BasicLibraries ), 
UNO_QUERY_THROW )->setVBACompatibilityMode( sal_True );
+            Reference< XVBACompatibility > xVBACompat( getLibraryContainer( PROP_BasicLibraries ), 
UNO_QUERY_THROW );
+            xVBACompat->setVBACompatibilityMode( sal_True );
+            //xVBACompat->setProjectName( maPrjName ); // A very blind change just to escape from 
errors - undefined symbol maPrjName and no such property called setProject name
+
         }
         catch( Exception& )
         {
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8f9a783..8d2a8bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1040,54 +1040,54 @@ mono-component-support.diff
 SectionOwner => noelpwer
 # FIXME: half of the diff is somehow fixed to apply by pmladek
 #        few things need double checking
-cws-vbasupportdev300.diff
+# cws-vbasupportdev300.diff
 # FIXME ooo330-m2 old version (m83) of the diff cws-vbasupportdev300_m83.diff, noelpwer
 
 # fix vbasupport for field related changes ( note this code
 # is disabled in vbasupportdev300 upstream )
-cws-vbasupportdev300_m83-fix.diff, cbosdo
-vba-enable-fieldrelatedbits.diff
-vba-container-controls.diff
+# cws-vbasupportdev300_m83-fix.diff, cbosdo
+# vba-enable-fieldrelatedbits.diff
+# vba-container-controls.diff
 # need to adapt ooo-build wrt the changes intorduced into container_controls
-oox-projectname-oobuild-specifix.diff
+# oox-projectname-oobuild-specifix.diff
 # fix problem with inserting imported modules with oox
 oox-insert-module-bug.diff
 # tweak oox filter to handle any passed generated code names
 # there is a strange scenario with one cust doc where a code module is missing
-vba-oox-autocodename.diff,  n#507768
+# vba-oox-autocodename.diff,  n#507768
 # tweak oox filter to handle strange scenario where there might be some
 # missing codenmames in excel
-vba-oox-olenameoverride.diff, n#359933, n#403974
+# vba-oox-olenameoverride.diff, n#359933, n#403974
 # fix strange ranges seperator regression problem
-fix-name-range-separator.diff, n#597351
+# fix-name-range-separator.diff, n#597351
 # remove dependency of vbahelper on oox ( added by container_controls.diff )
-vbahelper-no-oox.diff
+# vbahelper-no-oox.diff
 # misc changes to modify strange upstream changes
 vba-misc-tweakupstream.diff
 # unoize msvbahelper to solve some dependency issues for split build
 # FIXME disabled for m3f
 # FIXME cause build problems with m4; some stuff is missing
-vba-msvbahelper-splitbuilt.diff
+# vba-msvbahelper-splitbuilt.diff
 # fix upstream introduced Application::Intersection problem
 # FIXME The problem seems to be gone, but double-check.
-#vba-fix-interesection.diff
+# vba-fix-interesection.diff
 # use oox filter exclusively for import of controls  ( excel/word )
-vba-use-ooxfilter-forcontrols.diff
+# vba-use-ooxfilter-forcontrols.diff
 # fix hlink & macro import/export for autoshapes and pictures
-vba-fix-shapepic-hlinkmacro.diff
+# vba-fix-shapepic-hlinkmacro.diff
 # remove some events from base ( sun/oracle ) sources and replace with own
-vba-override-base-vbaevents.diff
+# vba-override-base-vbaevents.diff
 # add some rolled up patches from vbasupport
 # i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 i#112530
-vbasupport-patch-roll-up.diff, i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 
i#112530
+# vbasupport-patch-roll-up.diff, i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 
i#112530
 # fix column address for Range.Cell
-vba-rangecell-colparam.diff, bnc#639297
+# vba-rangecell-colparam.diff, bnc#639297
 # fix logical Operator precendence for VBA
 # disabled as it causes a regression
-vba-fix-logical-precedence-order.diff, bnc#644156
+# vba-fix-logical-precedence-order.diff, bnc#644156
 # fix bug with implicit handling of XIndexAccess for
 # objects ( introduced in vbasupportdev300.diff )
-vba-fix-implicit-indexaccess.diff
+# vba-fix-implicit-indexaccess.diff
 [ VBAUntested ]
 SectionOwner => noelpwer
 # KEEP - unfinished autotext stuff
@@ -1659,14 +1659,14 @@ SectionOwner => ccheney
 
 ubuntu-palette.diff
 ubuntu-dictionary.diff
-ubuntu-lpi-help-translate.diff, i#64895, mklose
+# ubuntu-lpi-help-translate.diff, i#64895, mklose
 #ubuntu-lpi-bugs.diff, i#64895, mklose
 ubuntu-sparc-hack.diff, mklose
-human-icons-add.diff, mklose
+# human-icons-add.diff, mklose
 ubuntu-no-stack-protector.diff, doko
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
-f11-fullscreen.diff, ccheney
+# f11-fullscreen.diff, ccheney
 
 [ UbuntuOnly ]
 unxlngi6-notune.diff, doko
@@ -2227,30 +2227,30 @@ pptx-fix-connector-crash.diff, n#499129, thorsten
 # Snapshot of the xlsx export filter at the time of creation of ooxml03
 # This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
 # should contain all the available changes.
-xlsx-shared-xlsx-snapshot.diff
+# xlsx-shared-xlsx-snapshot.diff
 
 # Make the xlsx export and import work at the same time
 # (converts the xlsx export to a UNO filter)
-xlsx-shared-xlsx-shared-import-and-export.diff
+# xlsx-shared-xlsx-shared-import-and-export.diff
 
 xlsx-shared-xlsx-arabic-export-crash.diff, n#497419, janneke
 
-xlsx-shared-xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
+# xlsx-shared-xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
 
 xlsx-shared-xlsx-export-simple-autofilter.diff, n#497559, janneke
 
-xlsx-shared-xlsx-export-skip-auto-format.diff, n#497560, janneke
+# xlsx-shared-xlsx-export-skip-auto-format.diff, n#497560, janneke
 
 xlsx-shared-xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
 
 xlsx-shared-oox-calc-export-export-pivot-content.diff, n#505917, janneke
 
-xlsx-shared-oox-calc-export-sotstorage-init.diff, n#505917, janneke
+# xlsx-shared-oox-calc-export-sotstorage-init.diff, n#505917, janneke
 
 #FIXME xlsx-shared-xlsx-export-row-limit-fix.diff, n#504623, kohei
 
 # No more SvStream/SotStorage as they conflict with their UNO counterparts.
-xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff, n#566581, kohei
+# xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff, n#566581, kohei
 
 # Only process rows with non-empty cells, to improve performance.
 xlsx-shared-xlsx-export-perf-rowbuffer.diff, n#558577, kohei
@@ -2277,7 +2277,7 @@ ooxml-filters.diff, cbosdo
 ooxml-filters-calc.diff, muthusuba
 ooxml-sc-page-date.diff, muthusuba
 ooxml-schema.diff, muthusuba
-ooxml-sc-paneexport.diff, muthusuba
+# ooxml-sc-paneexport.diff, muthusuba
 ooxml-sc-showdropdown-fix.diff, muthusuba
 ooxml-sc-docpropsimp.diff, muthusuba
 ooxml-sc-page-date-imp.diff, muthusuba
@@ -2304,9 +2304,9 @@ arm-vis.diff, cmc
 
 [ UbuntuLucidOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-arm-vis.diff, cmc
-ubuntu-arm-thumb.diff, doko
+# ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+# arm-vis.diff, cmc
+# ubuntu-arm-thumb.diff, doko
 
 [ UbuntuMaverickOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
@@ -2332,7 +2332,7 @@ oox-drawingml-fix-shapes-map-crash.diff, rodo
 
 [ OOXMLExportDevel ]
 # equivalent of ooxml-drawing-fix-shapes-map-crash-xlsx-part for shared filter
-xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
+# xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
 
 [ OOXMLExport ]
 oox-pptx-export-animations-filter.diff, n#497570, rodo
@@ -2445,7 +2445,7 @@ oox-pptx-export-update-to-ooo320.diff, rodo
 iso-ooxml-sw.diff, cbosdo
 
 [ OOXMLExportDevel ]
-xlsx-shared-oox-chart-export-part1.diff, Fong
+# xlsx-shared-oox-chart-export-part1.diff, Fong
 
 [ UnstableLibwpd ]
 config_office-testing.diff
@@ -2587,7 +2587,7 @@ speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
 [ CalcFixes ]
 
 # Allow export of filtered range selection, and show error when fails.
-calc-pdf-export-allow-filtered-range-sc.diff,     n#585028, kohei
+# calc-pdf-export-allow-filtered-range-sc.diff,     n#585028, kohei
 calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
 
 # Fix handling of DB functions.
@@ -2664,7 +2664,7 @@ calc-xls-import-cell-border.diff, n#636691, kohei
 
 [ OOXML ]
 oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
-oox-smartart-import.diff, thorsten
+# oox-smartart-import.diff, thorsten
 
 [ NovellOnlyWin32 ]
 sled10-splash.diff, i#123456, pmladek

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.