ooo-build r13156 - in trunk: . patches/dev300
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13156 - in trunk: . patches/dev300
- Date: Fri, 11 Jul 2008 11:04:02 +0000 (UTC)
Author: strba
Date: Fri Jul 11 11:04:02 2008
New Revision: 13156
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13156&view=rev
Log:
2008-07-11 Fridrich Strba <fridrich strba bluewin ch>
* patches/dev300/fit-list-to-size-binfilter.diff,
patches/dev300/fit-list-to-size.diff patches/dev300/apply: fix build when
binfilter modules are not present.
* patches/dev300/svg-import-filter-gfxfilter.diff: separate svg_Import.xcu from
svg_Export.xcu.
Added:
trunk/patches/dev300/fit-list-to-size-binfilter.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/fit-list-to-size.diff
trunk/patches/dev300/svg-import-filter-gfxfilter.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Fri Jul 11 11:04:02 2008
@@ -2456,3 +2456,6 @@
[ Win32Only ]
dont-build-transex3-layout-on-windows.diff, tml
+
+[ BFFixes ]
+fit-list-to-size-binfilter.diff, thorsten
Added: trunk/patches/dev300/fit-list-to-size-binfilter.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fit-list-to-size-binfilter.diff Fri Jul 11 11:04:02 2008
@@ -0,0 +1,11 @@
+--- binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
++++ binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+@@ -678,7 +678,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
+ { XML_FALSE, drawing::TextFitToSizeType_NONE },
+ { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
+ { XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
+- { XML_TRUE, drawing::TextFitToSizeType_RESIZEATTR },
++ { XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
+ { XML_TOKEN_INVALID, 0 }
+ };
+
Modified: trunk/patches/dev300/fit-list-to-size.diff
==============================================================================
--- trunk/patches/dev300/fit-list-to-size.diff (original)
+++ trunk/patches/dev300/fit-list-to-size.diff Fri Jul 11 11:04:02 2008
@@ -1,39 +1,3 @@
- .../bf_xmloff/source/draw/xmloff_sdpropls.cxx | 2
- offapi/com/sun/star/drawing/TextFitToSizeType.idl | 7 +
- offapi/util/makefile.mk | 7 +
- qadevOOo/runner/util/ValueChanger.java | 2
- sd/sdi/_drvwsh.sdi | 12 --
- svx/inc/svx/sdtfsitm.hxx | 26 +++--
- svx/inc/svx/svdotext.hxx | 10 ++
- svx/source/dialog/textattr.cxx | 1
- svx/source/editeng/editobj2.hxx | 10 ++
- svx/source/editeng/impedit3.cxx | 7 +
- svx/source/editeng/impedit4.cxx | 6 +
- svx/source/outliner/outliner.cxx | 5 +
- svx/source/svdraw/svdedxv.cxx | 4 -
- svx/source/svdraw/svdfppt.cxx | 12 ++
- svx/source/svdraw/svdotext.cxx | 100 ++++++++++++++++----
- svx/source/svdraw/svdotxat.cxx | 3 -
- svx/source/svdraw/svdotxed.cxx | 17 ++-
- svx/source/svdraw/svdotxtr.cxx | 9 --
- svx/source/svdraw/svdtxhdl.cxx | 3 -
- svx/source/svdraw/svdview.cxx | 3 -
- xmloff/source/draw/sdpropls.cxx | 4 -
- 21 files changed, 162 insertions(+), 88 deletions(-)
-
-diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
-index 0b6589a..166e5cd 100644
---- binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
-+++ binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
-@@ -678,7 +678,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
- { XML_FALSE, drawing::TextFitToSizeType_NONE },
- { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
- { XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
-- { XML_TRUE, drawing::TextFitToSizeType_RESIZEATTR },
-+ { XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
- { XML_TOKEN_INVALID, 0 }
- };
-
diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index 68557cc..6692ca5 100644
--- offapi/com/sun/star/drawing/TextFitToSizeType.idl
Modified: trunk/patches/dev300/svg-import-filter-gfxfilter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter-gfxfilter.diff (original)
+++ trunk/patches/dev300/svg-import-filter-gfxfilter.diff Fri Jul 11 11:04:02 2008
@@ -9,12 +9,9 @@
diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
index 8b73f15..f0cd69d 100644
---- filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
-+++ filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
-@@ -8,3 +8,13 @@
- </prop>
- <prop oor:name="Flags"><value>EXPORT</value></prop>
- </node>
+--- /dev/null
++++ filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
+@@ -0,0 +1,10 @@
+ <node oor:name="svg_Import" oor:op="replace" >
+ <prop oor:name="Type"><value>svg_Scalable_Vector_Graphics</value></prop>
+ <prop oor:name="FormatName"><value>svgfilter</value></prop>
@@ -25,6 +22,16 @@
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT</value></prop>
+ </node>
+--- filter/source/config/fragments/fcfg_internalgraphics.mk
++++ filter/source/config/fragments/fcfg_internalgraphics.mk
+@@ -68,6 +68,7 @@
+ sgf_Import \
+ sgv_Import \
+ svg_Export \
++ svg_Import \
+ svm_Export \
+ svm_Import \
+ tga_Import \
diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
index acb4748..d56c225 100644
--- filter/source/svg/exports.map
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]