[Libreoffice-commits] .: 5 commits - sd/prj
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jun 6 05:13:09 PDT 2011
sd/prj/d.lst | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 1c94fbf6057a2a7f26f4dc3c070b07c816d259a6
Merge: 763b4a7... 347a809...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 14:06:46 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
sd/prj/d.lst
sd/util/makefile.mk
diff --cc sd/prj/d.lst
index 8d89045,ad4a52a..716d188
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@@ -1,2 -1,60 +1,3 @@@
- ..\%__SRC%\misc\sdfilt.component %_DEST%\xml\sdfilt.component
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%COMMON_OUTDIR%\srs\core_srs.hid %COMMON_DEST%\res%_EXT%\sdcore_srs.hid
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\sdi.lib %_DEST%\lib%_EXT%\sdi.lib
-..\%__SRC%\slb\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\bin\sd?????.dll %_DEST%\bin%_EXT%\sd?????.dll
-..\%__SRC%\bin\sd??????.dll %_DEST%\bin%_EXT%\sd??????.dll
-..\%__SRC%\bin\sd*.res %_DEST%\bin%_EXT%\sd*.res
-..\%__SRC%\bin\sd???????.dll %_DEST%\bin%_EXT%\sd???????.dll
-..\%__SRC%\bin\emp?????.* %_DEST%\bin%_EXT%\emp?????.*
-
-mkdir: %_DEST%\pck%_EXT%
-..\res\webview\common.inc %_DEST%\pck%_EXT%\common.inc
-..\res\webview\common.pl %_DEST%\pck%_EXT%\common.pl
-..\res\webview\edit.asp %_DEST%\pck%_EXT%\edit.asp
-..\res\webview\edit.pl %_DEST%\pck%_EXT%\edit.pl
-..\res\webview\editpic.asp %_DEST%\pck%_EXT%\editpic.asp
-..\res\webview\editpic.pl %_DEST%\pck%_EXT%\editpic.pl
-..\res\webview\index.pl %_DEST%\pck%_EXT%\index.pl
-..\res\webview\poll.asp %_DEST%\pck%_EXT%\poll.asp
-..\res\webview\poll.pl %_DEST%\pck%_EXT%\poll.pl
-..\res\webview\savepic.asp %_DEST%\pck%_EXT%\savepic.asp
-..\res\webview\savepic.pl %_DEST%\pck%_EXT%\savepic.pl
-..\res\webview\show.asp %_DEST%\pck%_EXT%\show.asp
-..\res\webview\show.pl %_DEST%\pck%_EXT%\show.pl
-..\res\webview\webview.asp %_DEST%\pck%_EXT%\webcast.asp
-..\res\webview\webview.pl %_DEST%\pck%_EXT%\webcast.pl
-
-..\res\buttons\*.zip %_DEST%\pck%_EXT%\*.zip
-
-mkdir: %_DEST%\inc%_EXT%\sd
-..\inc\sddll.hxx %_DEST%\inc%_EXT%\sd\sddll.hxx
-
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\uiconfig\sdraw\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar\*.xml
-..\uiconfig\simpress\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml
-..\uiconfig\sdraw\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml
-..\uiconfig\simpress\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml
-..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
-..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
-
-..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
-..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
-..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
++..\%__SRC%\misc\sdfilt.component %_DEST%\xml\sdfilt.component
++..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
commit 347a80976ef3f0f41077be80a8f8c42af968be7a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 20 12:49:55 2011 +0300
Typo
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 864f4ca..e4f0c5f 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -165,7 +165,11 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
PPTWriterBase::~PPTWriterBase()
{
- if ( mbStatusIndicator && mXStatusIndicator.is() ))
+ // Possibly unnecessary sanity check for mXStatusIndicator.is().
+ // In 3.3 we had a bug report of a crash where it was null,
+ // https://bugzilla.novell.com/show_bug.cgi?id=694119 (non-public,
+ // bug report, sorry).
+ if ( mbStatusIndicator && mXStatusIndicator.is() )
mXStatusIndicator->end();
}
commit 15c5a3c56e70c96e5b91fa5a6d9fadb42d87b9ef
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 20 11:00:26 2011 +0300
Add sanity check before dereference, bnc#694119
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 0556dd7..864f4ca 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -165,7 +165,7 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
PPTWriterBase::~PPTWriterBase()
{
- if ( mbStatusIndicator )
+ if ( mbStatusIndicator && mXStatusIndicator.is() ))
mXStatusIndicator->end();
}
commit e46599a115f82ddbd6b43c595d883ea367aa1da7
Author: Radek Doulik <rodo at novell.com>
Date: Fri May 20 10:35:14 2011 +0200
fix sdfilt component generation
Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Fridrich Strba <fstrba at novell.com>
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 8eda79e..1d25951 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -297,5 +297,5 @@ $(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
$(MISC)/sdfilt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
sdfilt.component
$(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt sdfilt.component
commit 13c95c52670c7d2756dd76c81612288f7fdc723b
Author: Radek Doulik <rodo at novell.com>
Date: Fri Apr 8 14:42:14 2011 +0200
added sdfilt.component for pptx export
Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Fridrich Strba <fstrba at novell.com>
diff --git a/sd/prj/d.lst b/sd/prj/d.lst
index 0ebbb9a..ad4a52a 100644
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@ -57,3 +57,4 @@ mkdir: %_DEST%\inc%_EXT%\sd
..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
+..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 702cc27..8eda79e 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -280,7 +280,7 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo Making: $@
@$(TYPE) sd.flt > $@
-ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component
+ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component $(MISC)/sdfilt.component
$(MISC)/sd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
sd.component
@@ -293,3 +293,9 @@ $(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt sdd.component
+
+$(MISC)/sdfilt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ sdfilt.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt sdfilt.component
diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component
new file mode 100644
index 0000000..397d31c
--- /dev/null
+++ b/sd/util/sdfilt.component
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport">
+ <service name="com.sun.star.comp.ooxpptx"/>
+ </implementation>
+</component>
More information about the Libreoffice-commits
mailing list