You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [29/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec Fri Feb 1 08:46:00 2013
@@ -33,7 +33,7 @@ BuildArch: noarch
# here and check for the 'mandriva-release' in the future (next year).
#
Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
Modified: openoffice/branches/ia2/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/productversion.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/ia2/main/sysui/desktop/productversion.mk Fri Feb 1 08:46:00 2013
@@ -40,8 +40,9 @@ PKGDIR=$(BIN)
.ENDIF
# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
-# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty (!)
-PRODUCTLIST = openoffice.org
+# but should not be.
+# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
+PRODUCTLIST = apache_openoffice
# default values to minimize maintainance effort
@@ -65,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.openoffice.org = OpenOffice.org
+PRODUCTNAME.apache_openoffice = Apache OpenOffice
-PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
-ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
+PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.apache_openoffice = $(PKGVERSION)
+UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
+ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
Modified: openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec Fri Feb 1 08:46:00 2013
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
Modified: openoffice/branches/ia2/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/brand.pl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/brand.pl Fri Feb 1 08:46:00 2013
@@ -34,8 +34,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = "OpenOffice.org";
-$productfilename = "openoffice";
+$productname = "Apache OpenOffice";
+$productfilename = "apacheopenoffice";
$prefix = "";
$iconprefix = "";
Modified: openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@
# *************************************************************
use File::Basename;
$basedir = dirname($0);
-$productname = 'OpenOffice.org';
+$productname = 'Apache OpenOffice';
$mimedir = $basedir.'/../mimetypes';
$FS= ' '; # field seperator (space) - for documents.ulf
Modified: openoffice/branches/ia2/main/sysui/desktop/share/create_tree.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/create_tree.sh?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/share/create_tree.sh (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/create_tree.sh Fri Feb 1 08:46:00 2013
@@ -121,8 +121,8 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${
chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp apacheopenoffice.xml ${DESTDIR}/usr/share/mime/packages/
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/apacheopenoffice.xml
mkdir -p ${DESTDIR}/usr/share/applications
for i in `cat launcherlist`; do
Modified: openoffice/branches/ia2/main/sysui/desktop/share/launcher_comment.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/launcher_comment.ulf?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/share/launcher_comment.ulf (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/launcher_comment.ulf Fri Feb 1 08:46:00 2013
@@ -38,5 +38,5 @@ en-US = "Create and edit scientific form
en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
[startcenter]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
+en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Apache OpenOffice."
Modified: openoffice/branches/ia2/main/sysui/desktop/share/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/share/makefile.mk (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/makefile.mk Fri Feb 1 08:46:00 2013
@@ -157,8 +157,8 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
#
# Create shared mime info xml file
#
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
@echo Create shared mime info xml file ..
@echo ---------------------------------
@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)
@@ -173,8 +173,8 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoff
@@-$(MKDIRHIER) $(@:d)
@echo Creating GNOME .keys file for $(@:d:d:f) ..
@echo ---------------------------------
- @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
- @$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
+ @$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
+ @$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
@mv -f $@.$(INPATH) $@
@@ -249,7 +249,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.f
$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
- $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml \
+ $(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
@touch $@
Modified: openoffice/branches/ia2/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/translate.pl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/share/translate.pl (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/translate.pl Fri Feb 1 08:46:00 2013
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "OpenOffice.org";
+$productname = "Apache OpenOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
Modified: openoffice/branches/ia2/main/sysui/desktop/slackware/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/slackware/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/slackware/makefile.mk (original)
+++ openoffice/branches/ia2/main/sysui/desktop/slackware/makefile.mk Fri Feb 1 08:46:00 2013
@@ -36,7 +36,7 @@ TARGET=slackware
# --- Files --------------------------------------------------------
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.4-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.5-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
# --- Targets -------------------------------------------------------
@@ -55,26 +55,26 @@ $(MISC)/$(TARGET)/usr/share/applications
# FIXME: removal of *-extension.* only to create identical packages to OOF680
%/usr/share/applications :
@$(MKDIRHIER) $@
- /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.4//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.5//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png
$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop
$(RM) $*$/usr$/share$/applications$/*.desktop
$(RM) $*$/usr$/bin$/soffice
%$/install$/doinst.sh : update-script
- @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" > $@
- @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" >> $@
+ @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" > $@
+ @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" >> $@
@echo "( cd usr/bin ; rm -rf soffice )" >> $@
- @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/program/soffice soffice )" >> $@
- @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )") >> $@
+ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/program/soffice soffice )" >> $@
+ @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )") >> $@
@cat $< >> $@
%$/install$/slack-desc : slack-desc
@$(MKDIRHIER) $(@:d)
- @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.4//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
- -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
- -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//))/g" \
- -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/g" $< > $@
+ @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.5//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
+ -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
+ -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//))/g" \
+ -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/g" $< > $@
# needed to satisfy the slackware package tools - they need
# the entries like this
Modified: openoffice/branches/ia2/main/sysui/desktop/solaris/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/solaris/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/solaris/makefile.mk (original)
+++ openoffice/branches/ia2/main/sysui/desktop/solaris/makefile.mk Fri Feb 1 08:46:00 2013
@@ -94,9 +94,9 @@ $(MISC)/{$(PRODUCTLIST)}/postremove : $$
# --- openoffice.xml---------------------------
.IF "$(common_build)"=="TRUE"
-# Copy the openoffice.org.xml file to $(MISC)
-#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml
-$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml
+# Copy the apacheopenoffice.xml file to $(MISC)
+#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
+$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
$(MKDIRHIER) $(@:d)
echo hier hier $@
cat $< | tr -d "\015" > $@
@@ -112,7 +112,7 @@ $(MISC)/{$(PRODUCTLIST)}$/prototype : $$
# --- packaging ---------------------------------------------------
#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
-$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml
+$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml
$(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
@-$(RM) $(BIN)$/$(@:f)
@$(MKDIRHIER) $(@:d)
Modified: openoffice/branches/ia2/main/sysui/desktop/solaris/prototype
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/solaris/prototype?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/solaris/prototype (original)
+++ openoffice/branches/ia2/main/sysui/desktop/solaris/prototype Fri Feb 1 08:46:00 2013
@@ -21,7 +21,7 @@ d none share/mime/packages 0755 root oth
!default 0644 root bin
e build etc/mime.types=./mime.types
e build etc/mailcap=mailcap
-f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml
+f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/apacheopenoffice.xml
f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop
s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop
Modified: openoffice/branches/ia2/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/suse/suse-menus.spec?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/branches/ia2/main/sysui/desktop/suse/suse-menus.spec Fri Feb 1 08:46:00 2013
@@ -32,7 +32,7 @@ BuildArch: noarch
Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
-Provides: openoffice.org3-desktop-integration
+Provides: apacheopenoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
Modified: openoffice/branches/ia2/main/testtools/source/bridgetest/pyuno/core.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/testtools/source/bridgetest/pyuno/core.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/testtools/source/bridgetest/pyuno/core.py (original)
+++ openoffice/branches/ia2/main/testtools/source/bridgetest/pyuno/core.py Fri Feb 1 08:46:00 2013
@@ -211,7 +211,7 @@ class TestCase( unittest.TestCase):
wasHere = 0
try:
raise ioExc( "huhuh" , self.tobj )
- except unoExc , instance:
+ except unoExc as instance:
wasHere = 1
self.failUnless( wasHere , "exceptiont test 1" )
@@ -239,7 +239,7 @@ class TestCase( unittest.TestCase):
self.failUnless( 0 , "exception test 5a" )
except ioExc:
self.failUnless( 0 , "exception test 5b" )
- except illegalArg, i:
+ except illegalArg as i:
self.failUnless( 1 == i.ArgumentPosition , "exception member test" )
self.failUnless( "foo" == i.Message , "exception member test 2 " )
wasHere = 1
Modified: openoffice/branches/ia2/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/Library_tk.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/Library_tk.mk (original)
+++ openoffice/branches/ia2/main/toolkit/Library_tk.mk Fri Feb 1 08:46:00 2013
@@ -84,8 +84,6 @@ $(eval $(call gb_Library_add_exception_o
toolkit/source/awt/vclxwindow \
toolkit/source/awt/vclxwindow1 \
toolkit/source/awt/vclxwindows \
- toolkit/source/awt/xsimpleanimation \
- toolkit/source/awt/xthrobber \
toolkit/source/controls/accessiblecontrolcontext \
toolkit/source/controls/controlmodelcontainerbase \
toolkit/source/controls/dialogcontrol \
@@ -105,9 +103,7 @@ $(eval $(call gb_Library_add_exception_o
toolkit/source/controls/stdtabcontroller \
toolkit/source/controls/stdtabcontrollermodel \
toolkit/source/controls/tkscrollbar \
- toolkit/source/controls/tksimpleanimation \
toolkit/source/controls/tkspinbutton \
- toolkit/source/controls/tkthrobber \
toolkit/source/controls/animatedimages \
toolkit/source/controls/spinningprogress \
toolkit/source/controls/tree/treecontrol \
Modified: openoffice/branches/ia2/main/toolkit/Module_toolkit.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/Module_toolkit.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/Module_toolkit.mk (original)
+++ openoffice/branches/ia2/main/toolkit/Module_toolkit.mk Fri Feb 1 08:46:00 2013
@@ -24,7 +24,6 @@
$(eval $(call gb_Module_Module,toolkit))
$(eval $(call gb_Module_add_targets,toolkit,\
- AllLangResTarget_tk \
Library_tk \
Package_inc \
Package_source \
Modified: openoffice/branches/ia2/main/toolkit/inc/pch/precompiled_toolkit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/inc/pch/precompiled_toolkit.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/inc/pch/precompiled_toolkit.hxx (original)
+++ openoffice/branches/ia2/main/toolkit/inc/pch/precompiled_toolkit.hxx Fri Feb 1 08:46:00 2013
@@ -110,7 +110,6 @@
#include "com/sun/star/awt/XLayoutConstrains.hpp"
#include "com/sun/star/awt/XListBox.hpp"
#include "com/sun/star/awt/XMenuBar.hpp"
-#include "com/sun/star/awt/XMenuExtended.hpp"
#include "com/sun/star/awt/XMenuListener.hpp"
#include "com/sun/star/awt/XMessageBox.hpp"
#include "com/sun/star/awt/XMouseListener.hpp"
Modified: openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxmenu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxmenu.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxmenu.hxx (original)
+++ openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxmenu.hxx Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,176 +7,144 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _TOOLKIT_AWT_VCLXMENU_HXX_
#define _TOOLKIT_AWT_VCLXMENU_HXX_
#include <toolkit/dllapi.h>
-#include <com/sun/star/awt/XMenuBarExtended.hpp>
-#include <com/sun/star/awt/XPopupMenuExtended.hpp>
+#include <toolkit/helper/listenermultiplexer.hxx>
+
+#include <com/sun/star/awt/XMenuBar.hpp>
+#include <com/sun/star/awt/XPopupMenu.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
+
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
-
-#include <tools/list.hxx>
#include <tools/link.hxx>
+#include <tools/list.hxx>
-#include <toolkit/helper/listenermultiplexer.hxx>
+namespace css = ::com::sun::star;
class Menu;
class MenuBar;
class VclSimpleEvent;
-DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* )
+DECLARE_LIST( PopupMenuRefList, css::uno::Reference< css::awt::XPopupMenu >* )
-// ----------------------------------------------------
-// class VCLXMenu
-// ----------------------------------------------------
-
-class TOOLKIT_DLLPUBLIC VCLXMenu : public ::com::sun::star::awt::XMenuBarExtended,
- public ::com::sun::star::awt::XPopupMenuExtended,
- public ::com::sun::star::lang::XServiceInfo,
- public ::com::sun::star::lang::XTypeProvider,
- public ::com::sun::star::lang::XUnoTunnel,
- public ::cppu::OWeakObject
+class TOOLKIT_DLLPUBLIC VCLXMenu : public css::awt::XMenuBar,
+ public css::awt::XPopupMenu,
+ public css::lang::XServiceInfo,
+ public css::lang::XTypeProvider,
+ public css::lang::XUnoTunnel,
+ public ::cppu::OWeakObject
{
private:
- ::osl::Mutex maMutex;
- Menu* mpMenu;
- MenuListenerMultiplexer maMenuListeners;
- PopupMenuRefList maPopupMenueRefs;
+ ::osl::Mutex maMutex;
+ Menu* mpMenu;
+ MenuListenerMultiplexer maMenuListeners;
+ PopupMenuRefList maPopupMenueRefs;
protected:
- ::osl::Mutex& GetMutex() { return maMutex; }
+ ::osl::Mutex& GetMutex() { return maMutex; }
- DECL_LINK( MenuEventListener, VclSimpleEvent* );
+ DECL_LINK( MenuEventListener, VclSimpleEvent* );
- void ImplCreateMenu( sal_Bool bPopup );
+ void ImplCreateMenu( sal_Bool bPopup );
public:
- VCLXMenu();
- VCLXMenu( Menu* pMenu );
- ~VCLXMenu();
-
-
- Menu* GetMenu() const { return mpMenu; }
- sal_Bool IsPopupMenu() const;
-
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
- void SAL_CALL release() throw() { OWeakObject::release(); }
-
- // ::com::sun::star::lang::XUnoTunnel
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw();
- static VCLXMenu* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
- sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::lang::XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::awt::XMenu
- void SAL_CALL addMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL removeMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL insertItem( sal_Int16 nItemId, const ::rtl::OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException);
- sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL setItemText( sal_Int16 nItemId, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException);
- ::rtl::OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& aPopupMenu ) throw(::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::awt::XPopupMenu
- void SAL_CALL insertSeparator( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL setDefaultItem( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int16 SAL_CALL getDefaultItem( ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) throw(::com::sun::star::uno::RuntimeException);
- sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int16 SAL_CALL execute( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent, const ::com::sun::star::awt::Rectangle& Area, sal_Int16 Direction ) throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::awt::XMenuBar
-
- // ::com::sun::star::awt::XMenuExtended
- virtual void SAL_CALL setCommand( sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException);
-
- // ========================================================================
- // ========================================================================
- // ========================================================================
-
- // XMenuExtended2 Methods
- virtual ::sal_Bool SAL_CALL isPopupMenu( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL hideDisabledEntries( ::sal_Bool bHide ) throw (::com::sun::star::uno::RuntimeException);
-
- // XMenuBarExtended Methods
-
- // XPopupMenuExtended Methods
- virtual ::sal_Bool SAL_CALL isInExecute( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endExecute( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setLogo( const ::com::sun::star::awt::MenuLogo& aMenuLogo ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::MenuLogo SAL_CALL getLogo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const ::com::sun::star::awt::KeyEvent& aKeyEvent ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setItemImageAngle( ::sal_Int16 nItemId, ::sal_Int32 nAngle ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Int32 SAL_CALL getItemImageAngle( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setItemImageMirrorMode( ::sal_Int16 nItemId, ::sal_Bool bMirror ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL isItemImageInMirrorMode( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::lang::XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
-
+ VCLXMenu();
+ VCLXMenu( Menu* pMenu );
+ ~VCLXMenu();
+
+ Menu* GetMenu() const { return mpMenu; }
+ sal_Bool IsPopupMenu() const;
+
+ // css::uno::XInterface
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException);
+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+ void SAL_CALL release() throw() { OWeakObject::release(); }
+
+ // css::lang::XUnoTunnel
+ static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw();
+ static VCLXMenu* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw();
+ sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException);
+
+ // css::lang::XTypeProvider
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException);
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException);
+
+ // css::awt::XMenu
+ virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL insertItem( ::sal_Int16 nItemId, const ::rtl::OUString& aText, ::sal_Int16 nItemStyle, ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL removeItem( ::sal_Int16 nItemPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL clear( ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getItemId( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getItemPos( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL enableItem( ::sal_Int16 nItemId, ::sal_Bool bEnable ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isItemEnabled( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL hideDisabledEntries( ::sal_Bool bHide ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setItemText( ::sal_Int16 nItemId, const ::rtl::OUString& aText ) throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getItemText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setCommand( ::sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getCommand( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setHelpCommand( ::sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getHelpCommand( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText ) throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText ) throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isPopupMenu( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setPopupMenu( ::sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+
+ // css::awt::XPopupMenu
+ virtual void SAL_CALL insertSeparator( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setDefaultItem( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getDefaultItem( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL checkItem( ::sal_Int16 nItemId, ::sal_Bool bCheck ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isItemChecked( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Point& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isInExecute( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL endExecute( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException);
+ virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+
+ // css::lang::XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException);
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException);
};
-// ----------------------------------------------------
-// class VCLXMenuBar
-// ----------------------------------------------------
class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu
{
public:
- VCLXMenuBar();
- VCLXMenuBar( MenuBar* pMenuBar );
+ VCLXMenuBar();
+ VCLXMenuBar( MenuBar* pMenuBar );
};
-// ----------------------------------------------------
-// class VCLXPopupMenu
-// ----------------------------------------------------
class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
{
public:
- VCLXPopupMenu();
+ VCLXPopupMenu();
};
-#endif // _TOOLKIT_AWT_VCLXMENU_HXX_
+#endif
Modified: openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx (original)
+++ openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx Fri Feb 1 08:46:00 2013
@@ -135,7 +135,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::awt::XMessageBoxFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, const ::com::sun::star::awt::Rectangle& aPosSize, const ::rtl::OUString& aType, ::sal_Int32 aButtons, const ::rtl::OUString& aTitle, const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, ::com::sun::star::awt::MessageBoxType eType, ::sal_Int32 nButtons, const ::rtl::OUString& sTitle, const ::rtl::OUString& sMessage ) throw (::com::sun::star::uno::RuntimeException);
// ::com::sun::star::awt::XDataTransfer
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException);
Modified: openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx (original)
+++ openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx Fri Feb 1 08:46:00 2013
@@ -209,10 +209,10 @@ DECL_LISTENERMULTIPLEXER_END
// class MenuListenerMultiplexer
// ----------------------------------------------------
DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener )
- void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
DECL_LISTENERMULTIPLEXER_END
// ----------------------------------------------------
Modified: openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/servicenames.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/servicenames.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/servicenames.hxx (original)
+++ openoffice/branches/ia2/main/toolkit/inc/toolkit/helper/servicenames.hxx Fri Feb 1 08:46:00 2013
@@ -95,10 +95,6 @@ extern const sal_Char __FAR_DATA szServi
extern const sal_Char __FAR_DATA szServiceName_GridColumn[];
extern const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName2_UnoThrobberControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[];
extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[];
extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[];
extern const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[];
Modified: openoffice/branches/ia2/main/toolkit/qa/unoapi/knownissues.xcl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/qa/unoapi/knownissues.xcl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/qa/unoapi/knownissues.xcl (original)
+++ openoffice/branches/ia2/main/toolkit/qa/unoapi/knownissues.xcl Fri Feb 1 08:46:00 2013
@@ -122,22 +122,6 @@ toolkit.UnoControlFormattedField
toolkit.UnoControlListBox
# -> disabled in toolkit.sce
-### i86020 ###
-toolkit.UnoSimpleAnimationControl
-# -> disabled in toolkit.sce
-
-### i86021 ###
-toolkit.UnoSimpleAnimationControlModel
-# -> disabled in toolkit.sce
-
-### i86022 ###
-toolkit.UnoThrobberControl
-# -> disabled in toolkit.sce
-
-### i86023 ###
-toolkit.UnoThrobberControlModel
-# -> disabled in toolkit.sce
-
### i86298 ###
toolkit.UnoTreeControl
# -> disabled in toolkit.sce
@@ -161,10 +145,8 @@ toolkit.UnoControlListBox::com::sun::sta
toolkit.UnoControlEdit::com::sun::star::awt::XView
toolkit.UnoControlImageControl::com::sun::star::awt::XView
toolkit.UnoControlDialog::com::sun::star::awt::XView
-toolkit.UnoThrobberControl::com::sun::star::awt::XView
toolkit.UnoControlFileControl::com::sun::star::awt::XView
toolkit.UnoControlCurrencyField::com::sun::star::awt::XView
-toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView
toolkit.UnoControlComboBox::com::sun::star::awt::XView
toolkit.UnoControlNumericField::com::sun::star::awt::XView
toolkit.UnoControlCheckBox::com::sun::star::awt::XView
@@ -201,7 +183,6 @@ toolkit.UnoControlContainer::com::sun::s
toolkit.UnoControlFixedText::com::sun::star::lang::XComponent
toolkit.UnoControlListBox::com::sun::star::lang::XComponent
toolkit.UnoControlCheckBoxModel::com::sun::star::lang::XComponent
-toolkit.UnoThrobberControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlEditModel::com::sun::star::lang::XComponent
toolkit.UnoControlEdit::com::sun::star::lang::XComponent
toolkit.UnoControlImageControl::com::sun::star::lang::XComponent
@@ -209,12 +190,9 @@ toolkit.UnoControlDialog::com::sun::star
toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent
toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent
-toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent
-toolkit.UnoThrobberControl::com::sun::star::lang::XComponent
toolkit.UnoControlFileControl::com::sun::star::lang::XComponent
toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent
toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent
-toolkit.UnoSimpleAnimationControl::com::sun::star::lang::XComponent
toolkit.UnoControlComboBox::com::sun::star::lang::XComponent
toolkit.UnoControlNumericField::com::sun::star::lang::XComponent
toolkit.UnoControlScrollBarModel::com::sun::star::lang::XComponent
Modified: openoffice/branches/ia2/main/toolkit/qa/unoapi/toolkit.sce
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/qa/unoapi/toolkit.sce?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/qa/unoapi/toolkit.sce (original)
+++ openoffice/branches/ia2/main/toolkit/qa/unoapi/toolkit.sce Fri Feb 1 08:46:00 2013
@@ -87,11 +87,7 @@
-o toolkit.UnoControlTimeField
-o toolkit.UnoControlTimeFieldModel
-o toolkit.UnoScrollBarControl
-#i86020 -o toolkit.UnoSimpleAnimationControl
-#i86021 -o toolkit.UnoSimpleAnimationControlModel
-o toolkit.UnoSpinButtonControl
-o toolkit.UnoSpinButtonControlModel
-#i86022 -o toolkit.UnoThrobberControl
-#i86023 -o toolkit.UnoThrobberControlModel
#i86298 -o toolkit.UnoTreeControl
-o toolkit.UnoTreeModel
Modified: openoffice/branches/ia2/main/toolkit/source/awt/animatedimagespeer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/source/awt/animatedimagespeer.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/source/awt/animatedimagespeer.cxx (original)
+++ openoffice/branches/ia2/main/toolkit/source/awt/animatedimagespeer.cxx Fri Feb 1 08:46:00 2013
@@ -365,7 +365,7 @@ namespace toolkit
case BASEPROPERTY_IMAGE_SCALE_MODE:
{
- sal_Int16 nScaleMode( ImageScaleMode::Anisotropic );
+ sal_Int16 nScaleMode( ImageScaleMode::ANISOTROPIC );
ImageControl* pImageControl = dynamic_cast< ImageControl* >( GetWindow() );
if ( pImageControl && ( i_value >>= nScaleMode ) )
{
@@ -405,7 +405,7 @@ namespace toolkit
case BASEPROPERTY_IMAGE_SCALE_MODE:
{
ImageControl const* pImageControl = dynamic_cast< ImageControl* >( GetWindow() );
- aReturn <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::Anisotropic );
+ aReturn <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::ANISOTROPIC );
}
break;
Modified: openoffice/branches/ia2/main/toolkit/source/awt/vclxbitmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/source/awt/vclxbitmap.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/source/awt/vclxbitmap.cxx (original)
+++ openoffice/branches/ia2/main/toolkit/source/awt/vclxbitmap.cxx Fri Feb 1 08:46:00 2013
@@ -19,18 +19,16 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
-
#include <toolkit/awt/vclxbitmap.hxx>
#include <toolkit/helper/macros.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <tools/stream.hxx>
#include <rtl/memory.h>
#include <rtl/uuid.h>
+#include <vcl/dibtools.hxx>
// ----------------------------------------------------
// class VCLXBitmap
@@ -71,7 +69,7 @@ IMPL_XTYPEPROVIDER_END
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
SvMemoryStream aMem;
- aMem << maBitmap.GetBitmap();
+ WriteDIB(maBitmap.GetBitmap(), aMem, false, true);
return ::com::sun::star::uno::Sequence<sal_Int8>( (sal_Int8*) aMem.GetData(), aMem.Tell() );
}
@@ -80,10 +78,8 @@ IMPL_XTYPEPROVIDER_END
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
SvMemoryStream aMem;
- aMem << maBitmap.GetMask();
+ WriteDIB(maBitmap.GetMask(), aMem, false, true);
return ::com::sun::star::uno::Sequence<sal_Int8>( (sal_Int8*) aMem.GetData(), aMem.Tell() );
}
-
-
-
+// eof