[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Jul 19 09:51:34 PDT 2010
patches/dev300/fpicker-kde-dont-overwrite.diff | 5 -
patches/dev300/pptx-snapshot-at-ooxml03-creation.diff | 47 ------------------
2 files changed, 52 deletions(-)
New commits:
commit c42418f1f337c954834c2313d4e22fde905f6c03
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Jul 19 18:51:12 2010 +0200
Massaging patches to apply with recent patch
* patches/dev300/fpicker-kde-dont-overwrite.diff:
* patches/dev300/pptx-snapshot-at-ooxml03-creation.diff:
diff --git a/patches/dev300/fpicker-kde-dont-overwrite.diff b/patches/dev300/fpicker-kde-dont-overwrite.diff
index 2f6e6d9..765c593 100644
--- a/patches/dev300/fpicker-kde-dont-overwrite.diff
+++ b/patches/dev300/fpicker-kde-dont-overwrite.diff
@@ -1,8 +1,3 @@
-diff --git fpicker/source/unx/kde/.kdefilepicker.cxx.swp fpicker/source/unx/kde/.kdefilepicker.cxx.swp
-index 6b29b66..7ed80d0 100644
-Binary files fpicker/source/unx/kde/.kdefilepicker.cxx.swp and fpicker/source/unx/kde/.kdefilepicker.cxx.swp differ
-diff --git fpicker/source/unx/kde/kdefilepicker.cxx fpicker/source/unx/kde/kdefilepicker.cxx
-index 5d21699..62e453b 100644
--- fpicker/source/unx/kde/kdefilepicker.cxx
+++ fpicker/source/unx/kde/kdefilepicker.cxx
@@ -315,7 +315,6 @@ void FileDialog::customEvent( QCustomEvent *pEvent )
diff --git a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
index cdadbed..07e1269 100644
--- a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
+++ b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
@@ -7,8 +7,6 @@
# scp2 bits were commented out
# sd/util/makefile.mk commented out
# sd/source/filter/pptx/makefile.mk commented out
-diff --git filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
-index 0fcdc21..3f125ec 100644
--- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
+++ filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
@@ -1,5 +1,5 @@
@@ -18,8 +16,6 @@ index 0fcdc21..3f125ec 100644
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
-diff --git filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
-index f080848..d74fd60 100644
--- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
+++ filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
@@ -1,5 +1,5 @@
@@ -40,8 +36,6 @@ index f080848..d74fd60 100644
<prop oor:name="MediaType"/>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML</value></prop>
-diff --git oox/inc/oox/ppt/pptimport.hxx oox/inc/oox/ppt/pptimport.hxx
-index 6d4fd19..4fe5c43 100644
--- oox/inc/oox/ppt/pptimport.hxx
+++ oox/inc/oox/ppt/pptimport.hxx
@@ -70,6 +70,9 @@ public:
@@ -54,8 +48,6 @@ index 6d4fd19..4fe5c43 100644
private:
virtual ::rtl::OUString implGetImplementationName() const;
-diff --git oox/source/ppt/pptimport.cxx oox/source/ppt/pptimport.cxx
-index 421987d..d360d8b 100644
--- oox/source/ppt/pptimport.cxx
+++ oox/source/ppt/pptimport.cxx
@@ -39,6 +39,9 @@ using namespace ::com::sun::star::uno;
@@ -117,16 +109,11 @@ index 421987d..d360d8b 100644
sd sd usr1 - all sd_mkout NULL
sd sd\inc nmake - all sd_inc NULL
sd sd\prj get - all sd_prj NULL
-diff --git sd/source/filter/eppt/NOTES sd/source/filter/eppt/NOTES
-new file mode 100644
-index 0000000..1e2f168
--- /dev/null
+++ sd/source/filter/pptx/pptx-NOTES
@@ -0,0 +1,2 @@
+* ParaAdjust of empty text paragraph in shapes is by default set to left, but
+should be set to center. Same problem exist for ppt as well as pptx export
-diff --git sd/source/filter/eppt/eppt.cxx sd/source/filter/eppt/eppt.cxx
-index 29f6829..9a6c761 100644
--- sd/source/filter/pptx/pptx-eppt.cxx
+++ sd/source/filter/pptx/pptx-eppt.cxx
@@ -59,62 +59,13 @@
@@ -1926,8 +1913,6 @@ index 29f6829..9a6c761 100644
bStatus = ( pPPTWriter->IsValid() == TRUE );
delete pPPTWriter;
}
-diff --git sd/source/filter/eppt/eppt.hxx sd/source/filter/eppt/eppt.hxx
-index 9d0ab80..70ce541 100644
--- sd/source/filter/pptx/eppt.hxx
+++ sd/source/filter/pptx/eppt.hxx
@@ -36,13 +36,11 @@
@@ -2663,9 +2648,6 @@ index 9d0ab80..70ce541 100644
};
-diff --git sd/source/filter/eppt/epptbase.cxx sd/source/filter/eppt/epptbase.cxx
-new file mode 100644
-index 0000000..43ec8c0
--- /dev/null
+++ sd/source/filter/pptx/pptx-epptbase.cxx
@@ -0,0 +1,947 @@
@@ -3616,9 +3598,6 @@ index 0000000..43ec8c0
+
+ return bOtherThanPlaceHolders;
+}
-diff --git sd/source/filter/eppt/epptbase.hxx sd/source/filter/eppt/epptbase.hxx
-new file mode 100644
-index 0000000..ba5eca6
--- /dev/null
+++ sd/source/filter/pptx/epptbase.hxx
@@ -0,0 +1,411 @@
@@ -4033,9 +4012,6 @@ index 0000000..ba5eca6
+#define PPT_TRANSITION_TYPE_CIRCLE 27
+
+#endif
-diff --git sd/source/filter/eppt/epptooxml.cxx sd/source/filter/eppt/epptooxml.cxx
-new file mode 100644
-index 0000000..f8e0790
--- /dev/null
+++ sd/source/filter/pptx/pptx-epptooxml.cxx
@@ -0,0 +1,1449 @@
@@ -5488,9 +5464,6 @@ index 0000000..f8e0790
+ }
+}
+);
-diff --git sd/source/filter/eppt/epptooxml.hxx sd/source/filter/eppt/epptooxml.hxx
-new file mode 100644
-index 0000000..2a49d1f
--- /dev/null
+++ sd/source/filter/pptx/epptooxml.hxx
@@ -0,0 +1,120 @@
@@ -5614,8 +5587,6 @@ index 0000000..2a49d1f
+}
+
+#endif
-diff --git sd/source/filter/eppt/epptso.cxx sd/source/filter/eppt/epptso.cxx
-index 84d6e3b..c846a85 100644
--- sd/source/filter/pptx/pptx-epptso.cxx
+++ sd/source/filter/pptx/pptx-epptso.cxx
@@ -32,6 +32,7 @@
@@ -7960,12 +7931,6 @@ index 84d6e3b..c846a85 100644
+
+ }
+}
-diff --git sd/source/filter/eppt/exports.map sd/source/filter/eppt/exports.map
-deleted file mode 100644
-index e69de29..0000000
-diff --git sd/source/filter/eppt/grouptable.cxx sd/source/filter/eppt/grouptable.cxx
-new file mode 100644
-index 0000000..1ed031c
--- /dev/null
+++ sd/source/filter/pptx/pptx-grouptable.cxx
@@ -0,0 +1,114 @@
@@ -8083,9 +8048,6 @@ index 0000000..1ed031c
+ if ( mnCurrentGroupEntry )
+ delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
+}
-diff --git sd/source/filter/eppt/grouptable.hxx sd/source/filter/eppt/grouptable.hxx
-new file mode 100644
-index 0000000..c79ffa8
--- /dev/null
+++ sd/source/filter/pptx/grouptable.hxx
@@ -0,0 +1,58 @@
@@ -8169,9 +8131,6 @@ index 0000000..c79ffa8
# commented out for the libpptx
# commented out for the libpptx # --- Targets --------------------------------------------------------------
# commented out for the libpptx
-diff --git sd/source/filter/eppt/stylesheet.cxx sd/source/filter/eppt/stylesheet.cxx
-new file mode 100644
-index 0000000..8e4ef54
--- /dev/null
+++ sd/source/filter/pptx/pptx-stylesheet.cxx
@@ -0,0 +1,485 @@
@@ -8660,9 +8619,6 @@ index 0000000..8e4ef54
+ << rCharStyle.mnFontHeight
+ << rCharStyle.mnFontColor;
+}
-diff --git sd/source/filter/eppt/text.cxx sd/source/filter/eppt/text.cxx
-new file mode 100644
-index 0000000..e5820ca
--- /dev/null
+++ sd/source/filter/pptx/pptx-text.cxx
@@ -0,0 +1,1411 @@
@@ -10077,9 +10033,6 @@ index 0000000..e5820ca
+
+// ---------------------------------------------------------------------------------------------
+
-diff --git sd/source/filter/eppt/text.hxx sd/source/filter/eppt/text.hxx
-new file mode 100644
-index 0000000..472c258
--- /dev/null
+++ sd/source/filter/pptx/text.hxx
@@ -0,0 +1,246 @@
More information about the ooo-build-commit
mailing list