Author: jani
Date: Sun Nov 3 00:51:34 2013
New Revision: 1538303
URL: http://svn.apache.org/r1538303
Log:
merge from trunk, and update to central Makefile
Added:
openoffice/branches/capstone2013/main/Makefile.gb.in
- copied unchanged from r1531526,
openoffice/branches/capstone2013/main/Makefile.in
Removed:
openoffice/branches/capstone2013/main/Makefile.in
Modified:
openoffice/branches/capstone2013/main/Makefile
openoffice/branches/capstone2013/main/cui/source/options/optsave.cxx
openoffice/branches/capstone2013/main/dtrans/source/win32/dtobj/DOTransferable.cxx
openoffice/branches/capstone2013/main/io/source/TextOutputStream/TextOutputStream.cxx
openoffice/branches/capstone2013/main/readlicense_oo/docs/readme/readme.xrm
openoffice/branches/capstone2013/main/sfx2/inc/sfx2/dinfdlg.hxx
openoffice/branches/capstone2013/main/sfx2/source/dialog/dinfdlg.cxx
openoffice/branches/capstone2013/main/sot/source/sdstor/stgstrms.cxx
openoffice/branches/capstone2013/main/svtools/source/graphic/grfmgr.cxx
openoffice/branches/capstone2013/main/svx/inc/svx/fillctrl.hxx
openoffice/branches/capstone2013/main/svx/source/tbxctrls/fillctrl.cxx
openoffice/branches/capstone2013/main/vcl/win/source/gdi/salbmp.cxx
Modified: openoffice/branches/capstone2013/main/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/Makefile?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/Makefile (original)
+++ openoffice/branches/capstone2013/main/Makefile Sun Nov 3 00:51:34 2013
@@ -29,314 +29,371 @@ ifeq ($(MODULE_TARGET),)
endif
SUB_TARGET := $(filter $(EXECUTE_TARGET), $(MAKECMDGOALS))
-MAKE_CALL= @cd $@; Make $(SUB_TARGET)
+MAKE_CALL= @cd $@; make $(SUB_TARGET)
+NO_CALL= @echo $@ $(SUB_TARGET)
+# default target if none is given
all: instsetoo_native
+# target to extract messages, called as "make genPO all" or "make genPO"
+genPO:
+
+
$(EXECUTE_TARGET) : $(MODULE_TARGET)
# ========== special targets (outside main) ==========
+# This is temporary and will be removed
l10n : l10ntools
- $(MAKE_CALL) ../extras
+ @cd ../extras/$@; echo $(SUB_TARGET)
+# build external libraries, just a ref. was build with bootstrap
ratscan hunspell coinmp apr serf apr-util:
- $(MAKE_CALL) ../ext_libraries
+ @cd ../ext_libraries/$@; echo $(SUB_TARGET)
# ========== module targets ==========
-afms : solenv
- $(MAKE_CALL)
+apache-commons : tomcat
+ $(NO_CALL)
-accessibility : l10n tools jurt offuh unoil vcl javaunohelper jvmaccess
cppu sal toolkit svtools libxslt
- $(MAKE_CALL)
+apple_remote : soltools
+ $(NO_CALL)
-animations : cppuhelper comphelper offuh libxslt
- $(MAKE_CALL)
+beanshell : solenv
+ $(NO_CALL)
-apache-commons : tomcat
- $(MAKE_CALL)
+boost : solenv
+ $(NO_CALL)
-apple_remote : soltools
- $(MAKE_CALL)
+cosv : soltools stlport
+ $(NO_CALL)
+
+epm : solenv
+ $(NO_CALL)
+
+expat : soltools
+ $(NO_CALL)
+
+external : soltools
+ $(NO_CALL)
+
+extras : solenv
+ $(NO_CALL)
+
+graphite : stlport
+ $(NO_CALL)
+
+hsqldb : solenv
+ $(NO_CALL)
+
+icu : external
+ $(NO_CALL)
+
+libtextcat : stlport soltools
+ $(NO_CALL)
+
+MathMLDTD : solenv
+ $(NO_CALL)
+
+mdds : boost
+ $(NO_CALL)
+
+more_fonts : solenv
+ $(NO_CALL)
+
+moz : nss
+ $(NO_CALL)
+
+mythes : soltools
+ $(NO_CALL)
+
+nss : stlport
+ $(NO_CALL)
+
+o3tl : sal
+ $(NO_CALL)
+
+openssl : external expat
+ $(NO_CALL)
+
+python : openssl
+ $(NO_CALL)
+
+sal : xml2cmp stlport external boost
+ $(NO_CALL)
+
+sane : solenv
+ $(NO_CALL)
+
+saxon : stax
+ $(NO_CALL)
+
+solenv :
+ $(NO_CALL)
+
+soltools : solenv
+ $(NO_CALL)
+
+stax : solenv
+ $(NO_CALL)
+
+stlport : boost
+ $(NO_CALL)
+
+tomcat : solenv
+ $(NO_CALL)
+
+twain : solenv
+ $(NO_CALL)
+
+unixODBC : solenv
+ $(NO_CALL)
+
+vigra : solenv
+ $(NO_CALL)
+
+vos : sal
+ $(NO_CALL)
+
+x11_extensions : solenv
+ $(NO_CALL)
+
+xml2cmp : soltools stlport
+ $(NO_CALL)
+
+xsltml : external
+ $(NO_CALL)
+
+
+
+
+# ========== module targets ==========
+accessibility : l10n tools jurt offuh unoil vcl javaunohelper jvmaccess
cppu sal toolkit svtools libxslt
+ $(NO_CALL)
+
+animations : cppuhelper comphelper offuh libxslt
+ $(NO_CALL)
autodoc : cosv udm sal
- $(MAKE_CALL)
+ $(NO_CALL)
automation : basic fpicker
- $(MAKE_CALL)
+ $(NO_CALL)
avmedia : l10n tools sfx2 libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
basctl : libxslt l10n svx
- $(MAKE_CALL)
+ $(NO_CALL)
basebmp : sal vigra basegfx boost
- $(MAKE_CALL)
+ $(NO_CALL)
basegfx : o3tl sal offuh cppuhelper cppu
- $(MAKE_CALL)
+ $(NO_CALL)
basic : l10n offuh oovbaapi svtools xmlscript framework salhelper libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
bean : javaunohelper jurt ridljar unoil offapi udkapi
- $(MAKE_CALL)
-
-beanshell : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
binaryurp : boost libxslt cppu cppuhelper offuh sal salhelper stlport
- $(MAKE_CALL)
-
-boost : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
bridges : cppuhelper jurt jvmaccess salhelper
- $(MAKE_CALL)
+ $(NO_CALL)
cairo : zlib soltools stlport
- $(MAKE_CALL)
+ $(NO_CALL)
canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl
basegfx cairo libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
chart2 : offapi offuh l10n comphelper cppu cppuhelper sal svtools svx tools
vcl toolkit unotools sfx2 libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges
- $(MAKE_CALL)
+ $(NO_CALL)
codemaker : udkapi
- $(MAKE_CALL)
+ $(NO_CALL)
comphelper : cppuhelper ucbhelper offuh vos salhelper libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
configmgr : boost libxslt comphelper cppu cppuhelper offuh sal salhelper
stlport xmlreader
- $(MAKE_CALL)
+ $(NO_CALL)
connectivity : shell l10n comphelper moz svl unixODBC unoil
javaunohelper hsqldb qadevOOo officecfg nss libxslt
- $(MAKE_CALL)
-
-cosv : soltools stlport
- $(MAKE_CALL)
+ $(NO_CALL)
cppcanvas : comphelper cppuhelper offuh tools vcl basegfx canvas
- $(MAKE_CALL)
+ $(NO_CALL)
cppuhelper : boost libxslt codemaker cppu offuh
- $(MAKE_CALL)
+ $(NO_CALL)
cppu : sal salhelper offuh boost
- $(MAKE_CALL)
+ $(NO_CALL)
cpputools : cppuhelper offuh libxml2
- $(MAKE_CALL)
+ $(NO_CALL)
crashrep : l10n sal sysui tools shell
- $(MAKE_CALL)
+ $(NO_CALL)
cui : svx sax sot
- $(MAKE_CALL)
+ $(NO_CALL)
curl : stlport external
- $(MAKE_CALL)
+ $(NO_CALL)
dbaccess : l10n boost connectivity svx stoc qadevOOo xmlscript
libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
desktop : l10n sfx2 stoc sysui boost svx xmlhelp sal unoil officecfg offuh
filter libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
drawinglayer : sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas
cppcanvas
- $(MAKE_CALL)
+ $(NO_CALL)
dtrans : unotools offapi offuh rdbmaker vos stoc libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
editeng : l10n svtools xmloff linguistic
- $(MAKE_CALL)
+ $(NO_CALL)
embeddedobj : offuh sal cppu cppuhelper comphelper tools unotools vos libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
embedserv : offuh sal cppu cppuhelper comphelper libxslt
- $(MAKE_CALL)
-
-epm : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
eventattacher : offapi cppuhelper vos libxslt
- $(MAKE_CALL)
-
-expat : soltools
- $(MAKE_CALL)
-
-extras : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
extensions : officecfg l10n rdbmaker svx sane twain offuh stoc zlib curl
libxslt
- $(MAKE_CALL)
-
-external : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
fileaccess : unotools rdbmaker tools ucbhelper libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
filter : l10n svtools unotools xmloff cppu tools cppuhelper sal svx
javaunohelper jvmaccess canvas saxon libxslt basegfx
- $(MAKE_CALL)
+ $(NO_CALL)
forms : l10n oovbaapi svx sfx2 qadevOOo libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
formula : boost libxslt comphelper svx
- $(MAKE_CALL)
+ $(NO_CALL)
fpicker : libxslt l10n rdbmaker svtools
- $(MAKE_CALL)
+ $(NO_CALL)
framework : libxslt l10n svtools
- $(MAKE_CALL)
-
-graphite : stlport solenv
- $(MAKE_CALL)
+ $(NO_CALL)
helpcontent2 : l10n xmlhelp
- $(MAKE_CALL)
-
-hsqldb : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
hwpfilter : offuh cppuhelper comphelper zlib libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
hyphen : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
i18npool : bridges sax stoc comphelper icu i18nutil libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
i18nutil : sal cppu offuh
- $(MAKE_CALL)
-
-icc : solenv stlport external sal
- $(MAKE_CALL)
+ $(NO_CALL)
-icu : solenv external
- $(MAKE_CALL)
+icc : stlport external sal
+ $(NO_CALL)
idlc : ucpp registry
- $(MAKE_CALL)
+ $(NO_CALL)
idl : tools
- $(MAKE_CALL)
+ $(NO_CALL)
instsetoo_native : l10n postprocess packimages ratscan
- $(MAKE_CALL)
+ $(NO_CALL)
io : libxslt rdbmaker
- $(MAKE_CALL)
+ $(NO_CALL)
javainstaller2 : l10n setup_native
- $(MAKE_CALL)
+ $(NO_CALL)
javaunohelper : libxslt bridges cppuhelper jurt ridljar unoil
- $(MAKE_CALL)
+ $(NO_CALL)
jpeg : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
jurt : ridljar sal
- $(MAKE_CALL)
+ $(NO_CALL)
jvmaccess : offuh ridljar cppu sal salhelper
- $(MAKE_CALL)
+ $(NO_CALL)
jvmfwk : cppu cppuhelper sal libxml2
- $(MAKE_CALL)
+ $(NO_CALL)
l10ntools : tools libxslt lucene python
- $(MAKE_CALL)
+ $(NO_CALL)
libpng : zlib soltools
- $(MAKE_CALL)
-
-libtextcat : stlport soltools solenv
- $(MAKE_CALL)
+ $(NO_CALL)
libxml2 : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
libxmlsec : stlport soltools libxml2 moz
- $(MAKE_CALL)
+ $(NO_CALL)
libxslt : soltools libxml2
- $(MAKE_CALL)
+ $(NO_CALL)
lingucomponent : linguistic libtextcat svl hyphen hunspell mythes libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
linguistic : svl xmloff ucbhelper vos comphelper icu libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
lucene : soltools expat
- $(MAKE_CALL)
-
-MathMLDTD : solenv
- $(MAKE_CALL)
-
-mdds : solenv boost
- $(MAKE_CALL)
+ $(NO_CALL)
migrationanalysis : soltools shell
- $(MAKE_CALL)
-
-more_fonts : solenv
- $(MAKE_CALL)
-
-moz : solenv nss
- $(MAKE_CALL)
+ $(NO_CALL)
mysqlc : solenv offuh cppu soltools cppuhelper readlicense_oo
- $(MAKE_CALL)
-
-mythes : soltools solenv
- $(MAKE_CALL)
-
-nss : solenv stlport
- $(MAKE_CALL)
-
-o3tl : sal boost
- $(MAKE_CALL)
+ $(NO_CALL)
odk : cppuhelper jurt javaunohelper udkapi ridljar offapi autodoc
unodevtools external
- $(MAKE_CALL)
+ $(NO_CALL)
offapi : udkapi idlc solenv
- $(MAKE_CALL)
+ $(NO_CALL)
officecfg : l10n soltools solenv libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
offuh : offapi oovbaapi codemaker
- $(MAKE_CALL)
+ $(NO_CALL)
oldep : svtools
- $(MAKE_CALL)
+ $(NO_CALL)
oovbaapi : offapi solenv
- $(MAKE_CALL)
+ $(NO_CALL)
oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools
vcl boost openssl libxslt
- $(MAKE_CALL)
-
-openssl : soltools external expat
- $(MAKE_CALL)
+ $(NO_CALL)
package : cppu cppuhelper comphelper ucbhelper sal sax zlib libxslt
@@ -345,255 +402,207 @@ packimages : postprocess
padmin : vcl svtools
postprocess : svgio accessibility automation basctl bean chart2
configmgr crashrep coinmp cui dbaccess desktop dtrans embeddedobj embedserv epm
eventattacher extensions extras fileaccess filter forms fpicker helpcontent2
hwpfilter io javainstaller2 lingucomponent MathMLDTD odk officecfg package
padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd
setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure
wizards xmerge xmlsecurity more_fonts pyuno readlicense_oo unodevtools
reportbuilder reportdesign sdext swext smoketestdoc uui writerfilter oox mysqlc
libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
psprint_config : soltools afms
- $(MAKE_CALL)
-
-python : solenv openssl
- $(MAKE_CALL)
+ $(NO_CALL)
pyuno : stoc cpputools cppuhelper bridges tools python libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
qadevOOo : javaunohelper jurt ridljar unoil
- $(MAKE_CALL)
+ $(NO_CALL)
rdbmaker : cppuhelper
- $(MAKE_CALL)
+ $(NO_CALL)
readlicense_oo : l10n solenv libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
redland : stlport soltools libxml2 libxslt openssl
- $(MAKE_CALL)
+ $(NO_CALL)
registry : salhelper store
- $(MAKE_CALL)
+ $(NO_CALL)
remotebridges : libxslt cppu cppuhelper offuh rdbmaker sal
- $(MAKE_CALL)
+ $(NO_CALL)
reportbuilder : boost wizards readlicense_oo apache-commons officecfg
- $(MAKE_CALL)
+ $(NO_CALL)
reportdesign : l10n boost comphelper dbaccess formula libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
rhino : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
ridljar : codemaker solenv udkapi
- $(MAKE_CALL)
+ $(NO_CALL)
rsc : tools
- $(MAKE_CALL)
+ $(NO_CALL)
salhelper : sal
- $(MAKE_CALL)
-
-sal : xml2cmp stlport external boost
- $(MAKE_CALL)
-
-sane : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
sax : offapi cppuhelper expat comphelper libxslt
- $(MAKE_CALL)
-
-saxon : solenv stax
- $(MAKE_CALL)
+ $(NO_CALL)
scaddins : libxslt l10n vcl
- $(MAKE_CALL)
+ $(NO_CALL)
sccomp : l10n offuh comphelper coinmp tools rsc libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
scp2 : l10n i18npool setup_native l10ntools python icu redland libxslt
apr apr-util serf
- $(MAKE_CALL)
+ $(NO_CALL)
sc : filter l10n vbahelper oovbaapi svx uui stoc boost formula mdds
oox libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
scripting : oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino
beanshell javaunohelper libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper
sal javaunohelper officecfg libxslt xmlhelp
- $(MAKE_CALL)
+ $(NO_CALL)
sd : filter l10n animations svx sfx2 stoc canvas libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
setup_native : l10n l10ntools soltools sal xml2cmp
- $(MAKE_CALL)
+ $(NO_CALL)
sfx2 : l10n idl basic xmlscript framework readlicense_oo shell
setup_native sax libxml2 libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
shell : l10n offuh rdbmaker tools sal expat libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx
svtools unotools toolkit animations avmedia libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
smoketestdoc : soltools codemaker unoil javaunohelper
- $(MAKE_CALL)
+ $(NO_CALL)
smoketestoo_native : instsetoo_native test smoketestdoc
- $(MAKE_CALL)
-
-solenv :
- $(MAKE_CALL)
-
-soltools : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
sot : tools ucbhelper unotools
- $(MAKE_CALL)
+ $(NO_CALL)
splitbuild : postprocess
- $(MAKE_CALL)
+ $(NO_CALL)
starmath : libxslt l10n svx
- $(MAKE_CALL)
-
-stax : solenv
- $(MAKE_CALL)
-
-stlport : solenv boost
- $(MAKE_CALL)
+ $(NO_CALL)
stoc : rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader
libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
store : sal
- $(MAKE_CALL)
+ $(NO_CALL)
svgio : sal basegfx drawinglayer cppuhelper cppu svtools
- $(MAKE_CALL)
+ $(NO_CALL)
svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot
libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
svtools : l10n svl offuh toolkit ucbhelper unotools jpeg cppu cppuhelper
comphelper sal sot jvmfwk libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia
drawinglayer editeng libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
swext : officecfg l10n javaunohelper ridljar unoil jurt apache-commons
readlicense_oo xsltml xmlhelp
- $(MAKE_CALL)
+ $(NO_CALL)
sw : filter l10n connectivity vbahelper svx stoc writerfilter libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
sysui : l10n offapi xml2cmp rdbmaker l10ntools setup_native
- $(MAKE_CALL)
+ $(NO_CALL)
testgraphical : instsetoo_native qadevOOo
- $(MAKE_CALL)
+ $(NO_CALL)
testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi
ure libxslt
- $(MAKE_CALL)
-
-tomcat : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
toolkit : libxslt vcl qadevOOo
- $(MAKE_CALL)
+ $(NO_CALL)
tools : cppu external offuh vos zlib expat basegfx comphelper i18npool
- $(MAKE_CALL)
-
-twain : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
ucbhelper : offuh sal cppu cppuhelper salhelper
- $(MAKE_CALL)
+ $(NO_CALL)
ucb : cppuhelper curl openssl libxml2 libxslt offapi sal salhelper ucbhelper
udkapi comphelper serf tools
- $(MAKE_CALL)
+ $(NO_CALL)
ucpp : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
udkapi : idlc
- $(MAKE_CALL)
+ $(NO_CALL)
udm : cosv
- $(MAKE_CALL)
-
-unixODBC : solenv
- $(MAKE_CALL)
+ $(NO_CALL)
UnoControls : libxslt cppuhelper offuh tools
- $(MAKE_CALL)
-
-unoil : codemaker offapi ridljar solenv cli_ure
- $(MAKE_CALL)
+ $(NO_CALL)
unodevtools : codemaker cppuhelper
- $(MAKE_CALL)
+ $(NO_CALL)
+
+unoil : codemaker offapi ridljar solenv cli_ure
+ $(NO_CALL)
unotools : libxslt comphelper cppuhelper offuh tools ucbhelper
- $(MAKE_CALL)
+ $(NO_CALL)
unoxml : offuh cppuhelper libxml2 libxslt redland sax comphelper ucbhelper
- $(MAKE_CALL)
+ $(NO_CALL)
ure : libxslt binaryurp cli_ure io javaunohelper remotebridges solenv stoc
- $(MAKE_CALL)
+ $(NO_CALL)
uui : l10n vcl svtools libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
vbahelper : oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper
svtools tools sal unotools libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
vcl : l10n apple_remote boost rsc sot ucbhelper unotools icu graphite i18npool
i18nutil unoil ridljar x11_extensions offuh basegfx basebmp tools l10ntools icc
cpputools shell svl libxslt
- $(MAKE_CALL)
-
-vigra : solenv
- $(MAKE_CALL)
-
-vos : sal solenv
- $(MAKE_CALL)
+ $(NO_CALL)
wizards : l10n rsc javaunohelper unoil libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
writerfilter : soltools sal boost cppu cppuhelper ucbhelper tools svx libxslt
oox
- $(MAKE_CALL)
+ $(NO_CALL)
writerperfect : sot comphelper xmloff libxslt
- $(MAKE_CALL)
-
-x11_extensions : solenv
- $(MAKE_CALL)
-
-xmerge : solenv unoil javaunohelper libxslt
- $(MAKE_CALL)
-
-xml2cmp : soltools stlport
- $(MAKE_CALL)
+ $(NO_CALL)
xmlhelp : comphelper ucbhelper libxslt unoil lucene javaunohelper
l10ntools
- $(MAKE_CALL)
+ $(NO_CALL)
xmloff : libxslt offapi svl vos
- $(MAKE_CALL)
+ $(NO_CALL)
+
+xmerge : solenv unoil javaunohelper libxslt
+ $(NO_CALL)
xmlreader : boost cppu offuh sal stlport
- $(MAKE_CALL)
+ $(NO_CALL)
xmlscript : comphelper tools offapi libxslt
- $(MAKE_CALL)
+ $(NO_CALL)
xmlsecurity : l10n xmloff unotools offapi unoil svx moz libxmlsec nss
libxslt
-xsltml : solenv external
- $(MAKE_CALL)
-
zlib : soltools
- $(MAKE_CALL)
+ $(NO_CALL)
Modified: openoffice/branches/capstone2013/main/cui/source/options/optsave.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/cui/source/options/optsave.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/cui/source/options/optsave.cxx
(original)
+++ openoffice/branches/capstone2013/main/cui/source/options/optsave.cxx Sun
Nov 3 00:51:34 2013
@@ -655,32 +655,29 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_
/* -----------------------------05.04.01 13:10--------------------------------
---------------------------------------------------------------------------*/
-OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
+OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties)
{
- OUString sRet;
- sal_Int32 nFlags;
- const PropertyValue* pProperties = rProperties.getConstArray();
- for(int nProp = 0; nProp < rProperties.getLength(); nProp++)
+ OUString sName;
+ const PropertyValue* pPropVal = rProperties.getConstArray();
+ const PropertyValue* const pEnd = pPropVal + rProperties.getLength();
+ for( ; pPropVal != pEnd; pPropVal++ )
{
- if(!pProperties[nProp].Name.compareToAscii("UIName"))
+ const OUString &rName = pPropVal->Name;
+ if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
{
- if ( pProperties[nProp].Value >>= sRet )
- break;
+ OUString sUIName;
+ if ( ( pPropVal->Value >>= sUIName ) && sUIName.getLength() )
+ return sUIName;
}
- else if(!pProperties[nProp].Name.compareToAscii("Flags"))
+ else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ) )
{
- if ( pProperties[nProp].Value >>= nFlags )
- {
- nFlags &= 0x100;
- }
- }
- else if(!pProperties[nProp].Name.compareToAscii("Name"))
- {
- if ( !sRet.getLength() )
- pProperties[nProp].Value >>= sRet;
+ pPropVal->Value >>= sName;
}
}
- return sRet;
+
+ OSL_ENSURE( false, "Filter without UIName!" );
+
+ return sName;
}
/* -----------------------------05.04.01 13:37--------------------------------
Modified:
openoffice/branches/capstone2013/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/dtrans/source/win32/dtobj/DOTransferable.cxx
(original)
+++
openoffice/branches/capstone2013/main/dtrans/source/win32/dtobj/DOTransferable.cxx
Sun Nov 3 00:51:34 2013
@@ -136,6 +136,21 @@ Any SAL_CALL CDOTransferable::getTransfe
Any aAny = makeAny( aUnicodeText );
return aAny;
}
+ else if(CF_DIBV5 == fetc.getClipformat())
+ {
+ // #123407# CF_DIBV5 has priority; if the try to fetch this
failed,
+ // check CF_DIB availability as an alternative
+ fetc.setClipformat(CF_DIB);
+
+ try
+ {
+ clipDataStream = getClipboardData( fetc );
+ }
+ catch( UnsupportedFlavorException& )
+ {
+ throw; // pass through, tried all possibilities
+ }
+ }
else
throw; // pass through exception
}
Modified:
openoffice/branches/capstone2013/main/io/source/TextOutputStream/TextOutputStream.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/io/source/TextOutputStream/TextOutputStream.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/io/source/TextOutputStream/TextOutputStream.cxx
(original)
+++
openoffice/branches/capstone2013/main/io/source/TextOutputStream/TextOutputStream.cxx
Sun Nov 3 00:51:34 2013
@@ -74,7 +74,8 @@ class OTextOutputStream : public TextOut
rtl_UnicodeToTextContext mContextUnicode2Text;
Sequence<sal_Int8> implConvert( const OUString& rSource );
-
+ void checkOutputStream() throw(IOException);
+
public:
OTextOutputStream();
~OTextOutputStream();
@@ -174,6 +175,7 @@ Sequence<sal_Int8> OTextOutputStream::im
void OTextOutputStream::writeString( const OUString& aString )
throw(IOException, RuntimeException)
{
+ checkOutputStream();
if( !mbEncodingInitialized )
{
OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM("utf8") );
@@ -205,22 +207,35 @@ void OTextOutputStream::setEncoding( con
void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
+ checkOutputStream();
mxStream->writeBytes( aData );
}
void OTextOutputStream::flush( )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
+ checkOutputStream();
mxStream->flush();
}
void OTextOutputStream::closeOutput( )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
+ checkOutputStream();
mxStream->closeOutput();
}
+void OTextOutputStream::checkOutputStream()
+ throw(IOException)
+{
+ if (! mxStream.is() )
+ throw IOException(
+ OUString(RTL_CONSTASCII_USTRINGPARAM("output stream is not
initialized, you have to use setOutputStream first")),
+ Reference<XInterface>());
+}
+
+
//===========================================================================
// XActiveDataSource
Modified:
openoffice/branches/capstone2013/main/readlicense_oo/docs/readme/readme.xrm
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/readlicense_oo/docs/readme/readme.xrm?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/readlicense_oo/docs/readme/readme.xrm
(original)
+++ openoffice/branches/capstone2013/main/readlicense_oo/docs/readme/readme.xrm
Sun Nov 3 00:51:34 2013
@@ -301,8 +301,8 @@
</div>
<div id="ModifiedSourceCode">
- <h2 id="sdffd23r3cefwefew" xml:lang="en-US">Used /
Modified Source Code</h2>
- <p id="sdffd23red32efew">For detailed information about used
and/or modified source code, see the NOTICE file which is part of the
installation.</p>
+ <h2 id="ModifiedSourceCodeHeading"
xml:lang="en-US">Used / Modified Source Code</h2>
+ <p id="ModifiedSourceCodePara" xml:lang="en-US">For detailed
information about used and/or modified source code, see the NOTICE file which
is part of the installation.</p>
</div>
</body>
</html>
Modified: openoffice/branches/capstone2013/main/sfx2/inc/sfx2/dinfdlg.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sfx2/inc/sfx2/dinfdlg.hxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sfx2/inc/sfx2/dinfdlg.hxx (original)
+++ openoffice/branches/capstone2013/main/sfx2/inc/sfx2/dinfdlg.hxx Sun Nov 3
00:51:34 2013
@@ -440,14 +440,10 @@ struct CustomPropertyLine
CustomPropertiesTimeField m_aTimeField;
const String m_sDurationFormat;
CustomPropertiesDurationField m_aDurationField;
- CustomPropertiesEditButton m_aEditButton;
+ CustomPropertiesEditButton m_aEditButton;
CustomPropertiesYesNoButton m_aYesNoButton;
CustomPropertiesRemoveButton m_aRemoveButton;
- Point m_aDatePos;
- Point m_aTimePos;
- Size m_aDateTimeSize;
-
bool m_bIsRemoved;
bool m_bTypeLostFocus;
@@ -471,6 +467,9 @@ private:
CustomPropertiesYesNoButton m_aYesNoButton;
ImageButton m_aRemoveButton;
+ long m_nDatePosX;
+ long m_nTimePosX;
+
sal_Int32 m_nLineHeight;
sal_Int32
m_nScrollPos;
SvtSysLocale m_aSysLocale;
Modified: openoffice/branches/capstone2013/main/sfx2/source/dialog/dinfdlg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sfx2/source/dialog/dinfdlg.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sfx2/source/dialog/dinfdlg.cxx
(original)
+++ openoffice/branches/capstone2013/main/sfx2/source/dialog/dinfdlg.cxx Sun
Nov 3 00:51:34 2013
@@ -1847,8 +1847,9 @@ IMPL_LINK( CustomPropertiesWindow, TypeH
}
else if( nType == CUSTOM_TYPE_DATETIME)
{
- pLine->m_aDateField.SetPosSizePixel( pLine->m_aDatePos,
pLine->m_aDateTimeSize );
- pLine->m_aTimeField.SetPosSizePixel(pLine->m_aTimePos,
pLine->m_aDateTimeSize );
+ const long nPosY( pLine->m_aDateField.GetPosPixel().Y() );
+ pLine->m_aDateField.SetPosPixel( ::Point( m_nDatePosX, nPosY ) );
+ pLine->m_aTimeField.SetPosPixel( ::Point( m_nTimePosX, nPosY ) );
}
return 0;
@@ -1871,10 +1872,15 @@ IMPL_LINK( CustomPropertiesWindow, Remov
if ( pLine->m_bIsRemoved )
continue;
- Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox,
&pLine->m_aValueEdit,
- &pLine->m_aDateField,
&pLine->m_aTimeField,
- &pLine->m_aDurationField,
&pLine->m_aEditButton,
- &pLine->m_aYesNoButton,
&pLine->m_aRemoveButton, NULL };
+ Window* pWindows[] = { &pLine->m_aNameBox,
+ &pLine->m_aTypeBox,
+ &pLine->m_aValueEdit,
+ &pLine->m_aDateField,
+ &pLine->m_aTimeField,
+ &pLine->m_aDurationField,
+ &pLine->m_aEditButton,
+ &pLine->m_aYesNoButton,
+ &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
while ( *pCurrent )
{
@@ -2042,6 +2048,9 @@ void CustomPropertiesWindow::InitControl
m_nLineHeight =
( m_aRemoveButton.GetPosPixel().Y() * 2 ) +
m_aRemoveButton.GetSizePixel().Height();
+
+ m_nDatePosX = m_aDateField.GetPosPixel().X();
+ m_nTimePosX = m_aTimeField.GetPosPixel().X();
}
sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
@@ -2096,10 +2105,6 @@ void CustomPropertiesWindow::AddLine( co
pCurrent++;
pNewCurrent++;
}
- //
- pNewLine->m_aDatePos = pNewLine->m_aDateField.GetPosPixel();
- pNewLine->m_aTimePos = pNewLine->m_aTimeField.GetPosPixel();
- pNewLine->m_aDateTimeSize = pNewLine->m_aDateField.GetSizePixel();
double nTmpValue = 0;
bool bTmpValue = false;
@@ -2208,8 +2213,15 @@ void CustomPropertiesWindow::DoScroll( s
if ( pLine->m_bIsRemoved )
continue;
- Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox,
&pLine->m_aValueEdit, &pLine->m_aDurationField,
- &pLine->m_aYesNoButton,
&pLine->m_aRemoveButton, NULL };
+ Window* pWindows[] = { &pLine->m_aNameBox,
+ &pLine->m_aTypeBox,
+ &pLine->m_aValueEdit,
+ &pLine->m_aDurationField,
+ &pLine->m_aEditButton,
+ &pLine->m_aDateField,
+ &pLine->m_aTimeField,
+ &pLine->m_aYesNoButton,
+ &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
while ( *pCurrent )
{
Modified: openoffice/branches/capstone2013/main/sot/source/sdstor/stgstrms.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sot/source/sdstor/stgstrms.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sot/source/sdstor/stgstrms.cxx
(original)
+++ openoffice/branches/capstone2013/main/sot/source/sdstor/stgstrms.cxx Sun
Nov 3 00:51:34 2013
@@ -29,6 +29,7 @@
#include <osl/file.hxx>
#include <tools/tempfile.hxx>
#include <tools/debug.hxx>
+#include <set>
#include "sot/stg.hxx"
#include "stgelem.hxx"
@@ -768,14 +769,26 @@ void StgDataStrm::Init( sal_Int32 nBgn,
// determine the actual size of the stream by scanning
// the FAT chain and counting the # of pages allocated
nSize = 0;
- sal_Int32 nOldBgn = -1;
- while( nBgn >= 0 && nBgn != nOldBgn )
+
+ // there may be files with double page numbers or loops of page
+ // references. This is not allowed. To be able to track this and
+ // to exit with an error, track already scanned PageNumbers here
+ // and use them to see if an already counted page is re-visited
+ std::set< sal_Int32 > nUsedPageNumbers;
+
+ while(nBgn >= 0)
{
- nOldBgn = nBgn;
- nBgn = pFat->GetNextPage( nBgn );
- if( nBgn == nOldBgn )
- rIo.SetError( ERRCODE_IO_WRONGFORMAT );
- nSize += nPageSize;
+ if(nUsedPageNumbers.find(nBgn) == nUsedPageNumbers.end())
+ {
+ nUsedPageNumbers.insert(nBgn);
+ nSize += nPageSize;
+ nBgn = pFat->GetNextPage(nBgn);
+ }
+ else
+ {
+ rIo.SetError(ERRCODE_IO_WRONGFORMAT);
+ nBgn = -1;
+ }
}
}
}
Modified:
openoffice/branches/capstone2013/main/svtools/source/graphic/grfmgr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svtools/source/graphic/grfmgr.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svtools/source/graphic/grfmgr.cxx
(original)
+++ openoffice/branches/capstone2013/main/svtools/source/graphic/grfmgr.cxx Sun
Nov 3 00:51:34 2013
@@ -946,23 +946,25 @@ Graphic GraphicObject::GetTransformedGra
if( aMapGraph == MAP_PIXEL )
{
- aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
Size( rAttr.GetLeftCrop(),
-
rAttr.GetTopCrop() ),
-
aMap100 );
- aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
Size( rAttr.GetRightCrop(),
-
rAttr.GetBottomCrop() ),
-
aMap100 );
+ // crops are in 1/100th mm -> to aMapGraph -> to MAP_PIXEL
+ aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMap100);
+ aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMap100);
}
else
{
- aCropLeftTop = OutputDevice::LogicToLogic( Size(
rAttr.GetLeftCrop(),
-
rAttr.GetTopCrop() ),
- aMap100,
- aMapGraph );
- aCropRightBottom = OutputDevice::LogicToLogic( Size(
rAttr.GetRightCrop(),
-
rAttr.GetBottomCrop() ),
- aMap100,
- aMapGraph );
+ // crops are in GraphicObject units -> to aMapGraph
+ aCropLeftTop = OutputDevice::LogicToLogic(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMap100,
+ aMapGraph);
+ aCropRightBottom = OutputDevice::LogicToLogic(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMap100,
+ aMapGraph);
}
// #104115# If the metafile is cropped, give it a special
@@ -1012,15 +1014,29 @@ Graphic GraphicObject::GetTransformedGra
BitmapEx aBitmapEx( aTransGraphic.GetBitmapEx() );
Rectangle aCropRect;
- // convert crops to pixel (crops are always in GraphicObject units)
+ // convert crops to pixel
if(rAttr.IsCropped())
{
- aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
- Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
- aMapGraph);
- aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
- Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
- aMapGraph);
+ if( aMapGraph == MAP_PIXEL )
+ {
+ // crops are in 1/100th mm -> to MAP_PIXEL
+ aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMap100);
+ aCropRightBottom =
Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMap100);
+ }
+ else
+ {
+ // crops are in GraphicObject units -> to MAP_PIXEL
+ aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMapGraph);
+ aCropRightBottom =
Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMapGraph);
+ }
// convert from prefmapmode to pixel
Size aSrcSizePixel(
@@ -1040,8 +1056,9 @@ Graphic GraphicObject::GetTransformedGra
// another possibility is to adapt the values created so far
with a factor; this
// will keep the original Bitmap untouched and thus quality
will not change
- const double fFactorX(aBitmapEx.GetSizePixel().Width() /
aSrcSizePixel.Width());
- const double fFactorY(aBitmapEx.GetSizePixel().Height() /
aSrcSizePixel.Height());
+ // caution: convert to double first, else pretty big errors
may occurr
+ const double fFactorX((double)aBitmapEx.GetSizePixel().Width()
/ aSrcSizePixel.Width());
+ const double
fFactorY((double)aBitmapEx.GetSizePixel().Height() / aSrcSizePixel.Height());
aCropLeftTop.Width() = basegfx::fround(aCropLeftTop.Width() *
fFactorX);
aCropLeftTop.Height() = basegfx::fround(aCropLeftTop.Height()
* fFactorY);
Modified: openoffice/branches/capstone2013/main/svx/inc/svx/fillctrl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svx/inc/svx/fillctrl.hxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svx/inc/svx/fillctrl.hxx (original)
+++ openoffice/branches/capstone2013/main/svx/inc/svx/fillctrl.hxx Sun Nov 3
00:51:34 2013
@@ -58,7 +58,6 @@ private:
SvxFillAttrBox* pFillAttrLB;
sal_Bool bUpdate;
- sal_Bool bIgnoreStatusUpdate;
sal_uInt16 eLastXFS;
public:
@@ -71,7 +70,6 @@ public:
const
SfxPoolItem* pState );
void Update( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
- void IgnoreStatusUpdate( sal_Bool bSet );
};
//========================================================================
Modified: openoffice/branches/capstone2013/main/svx/source/tbxctrls/fillctrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svx/source/tbxctrls/fillctrl.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svx/source/tbxctrls/fillctrl.cxx
(original)
+++ openoffice/branches/capstone2013/main/svx/source/tbxctrls/fillctrl.cxx Sun
Nov 3 00:51:34 2013
@@ -74,7 +74,6 @@ SvxFillToolBoxControl::SvxFillToolBoxCon
pFillTypeLB ( NULL ),
pFillAttrLB ( NULL ),
bUpdate ( sal_False ),
- bIgnoreStatusUpdate( sal_False ),
eLastXFS ( XFILL_NONE )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:FillColor" )));
@@ -107,9 +106,6 @@ void SvxFillToolBoxControl::StateChanged
{
bool bEnableControls = sal_False;
- if ( bIgnoreStatusUpdate )
- return;
-
if( eState == SFX_ITEM_DISABLED )
{
if( nSID == SID_ATTR_FILL_STYLE )
@@ -229,13 +225,6 @@ void SvxFillToolBoxControl::StateChanged
//========================================================================
-void SvxFillToolBoxControl::IgnoreStatusUpdate( sal_Bool bSet )
-{
- bIgnoreStatusUpdate = bSet;
-}
-
-//========================================================================
-
void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{
if ( pStyleItem && pState && bUpdate )
@@ -686,10 +675,8 @@ IMPL_LINK( FillControl, SelectFillAttrHd
aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"FillStyle" ));
aXFillStyleItem.QueryValue( a );
aArgs[0].Value = a;
- ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
((SvxFillToolBoxControl*)GetData())->Dispatch(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )),
aArgs );
- ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
switch( eXFS )
{
Modified: openoffice/branches/capstone2013/main/vcl/win/source/gdi/salbmp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/vcl/win/source/gdi/salbmp.cxx?rev=1538303&r1=1538302&r2=1538303&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/vcl/win/source/gdi/salbmp.cxx
(original)
+++ openoffice/branches/capstone2013/main/vcl/win/source/gdi/salbmp.cxx Sun Nov
3 00:51:34 2013
@@ -333,6 +333,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreat
if(pExtraRGB)
{
+ // #123478# shockingly, BitmapBuffer does not free the memory it is
controlling
+ // in it's destructor, this *has to be done handish*. Doing it here now
+ delete[] pExtraRGB->mpBits;
delete pExtraRGB;
}
else
@@ -471,6 +474,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreat
if(pExtraA)
{
+ // #123478# shockingly, BitmapBuffer does not free the memory it is
controlling
+ // in it's destructor, this *has to be done handish*. Doing it here now
+ delete[] pExtraA->mpBits;
delete pExtraA;
}
else
@@ -485,6 +491,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreat
if(pExtraRGB)
{
+ // #123478# shockingly, BitmapBuffer does not free the memory it is
controlling
+ // in it's destructor, this *has to be done handish*. Doing it here now
+ delete[] pExtraRGB->mpBits;
delete pExtraRGB;
}
else
