You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/01/17 12:06:20 UTC
svn commit: r1434615 [10/11] - in /openoffice/branches/alg/clibboard: ./
ext_libraries/apr-util/ ext_libraries/apr/ extras/l10n/source/eu/ main/
main/boost/ main/canvas/source/cairo/ main/cli_ure/source/basetypes/
main/cli_ure/source/native/ main/cli_u...
Modified: openoffice/branches/alg/clibboard/main/sysui/desktop/macosx/Info.plist
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/macosx/Info.plist?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/macosx/Info.plist (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/macosx/Info.plist Thu Jan 17 11:06:13 2013
@@ -32,7 +32,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.text</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -80,7 +80,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.spreadsheet</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -128,7 +128,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.presentation</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -178,7 +178,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.graphics</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -226,7 +226,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.text-master</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -272,7 +272,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.formula</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -320,7 +320,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.text-template</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -366,7 +366,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.spreadsheet-template</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -412,7 +412,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.presentation-template</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -458,7 +458,7 @@
<key>UTTypeIdentifier</key>
<string>org.openoffice.graphics-template</string>
<key>UTTypeDescription</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -868,7 +868,7 @@
<key>CFBundleTypeIconFile</key>
<string>text.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -906,7 +906,7 @@
<key>CFBundleTypeIconFile</key>
<string>spreadsheet.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -946,7 +946,7 @@
<key>CFBundleTypeIconFile</key>
<string>presentation.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -984,7 +984,7 @@
<key>CFBundleTypeIconFile</key>
<string>drawing.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -1020,7 +1020,7 @@
<key>CFBundleTypeIconFile</key>
<string>master-document.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -1058,7 +1058,7 @@
<key>CFBundleTypeIconFile</key>
<string>formula.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -1094,7 +1094,7 @@
<key>CFBundleTypeIconFile</key>
<string>text-template.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -1130,7 +1130,7 @@
<key>CFBundleTypeIconFile</key>
<string>spreadsheet-template.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -1166,7 +1166,7 @@
<key>CFBundleTypeIconFile</key>
<string>presentation-template.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
@@ -1202,7 +1202,7 @@
<key>CFBundleTypeIconFile</key>
<string>drawing-template.icns</string>
<key>CFBundleTypeName</key>
- <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+ <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSIsAppleDefaultForType</key>
Modified: openoffice/branches/alg/clibboard/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/mandriva/mandriva-menus.spec Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/productversion.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/productversion.mk Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/redhat/redhat-menus.spec?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/redhat/redhat-menus.spec Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/share/brand.pl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/share/brand.pl Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_mime_xml.pl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_mime_xml.pl Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/share/create_tree.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_tree.sh?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_tree.sh (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_tree.sh Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/share/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/share/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/share/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/share/makefile.mk Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/share/translate.pl?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/share/translate.pl (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/share/translate.pl Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/solaris/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/makefile.mk Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/solaris/prototype
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/prototype?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/prototype (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/prototype Thu Jan 17 11:06:13 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/alg/clibboard/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/sysui/desktop/suse/suse-menus.spec?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/branches/alg/clibboard/main/sysui/desktop/suse/suse-menus.spec Thu Jan 17 11:06:13 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/alg/clibboard/main/toolkit/source/awt/vclxwindows.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/toolkit/source/awt/vclxwindows.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/toolkit/source/awt/vclxwindows.cxx (original)
+++ openoffice/branches/alg/clibboard/main/toolkit/source/awt/vclxwindows.cxx Thu Jan 17 11:06:13 2013
@@ -37,7 +37,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <com/sun/star/awt/ImageScaleMode.hpp>
@@ -2626,8 +2626,8 @@ void VCLXFixedHyperlink::ProcessWindowEv
if ( pBase )
sURL = pBase->GetURL();
Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
- ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), uno::UNO_QUERY );
+ ::com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( sURL.getLength() > 0 && xSystemShellExecute.is() )
{
try
Modified: openoffice/branches/alg/clibboard/main/ucb/source/ucp/file/bc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/ucb/source/ucp/file/bc.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/ucb/source/ucp/file/bc.cxx (original)
+++ openoffice/branches/alg/clibboard/main/ucb/source/ucp/file/bc.cxx Thu Jan 17 11:06:13 2013
@@ -1186,7 +1186,7 @@ void SAL_CALL BaseContent::insert( sal_I
// Inserts the content, which has the flag m_bIsFresh
- if( ! m_nState & NameForInsertionSet )
+ if ( !m_nState | !NameForInsertionSet )
{
m_pMyShell->installError( nMyCommandIdentifier,
TASKHANDLING_NONAMESET_INSERT_COMMAND );
Modified: openoffice/branches/alg/clibboard/main/unoil/climaker/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/unoil/climaker/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/unoil/climaker/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/main/unoil/climaker/makefile.mk Thu Jan 17 11:06:13 2013
@@ -64,8 +64,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
$(CLIMAKER) $(CLIMAKERFLAGS) \
--out $@ \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
- --assembly-company "OpenOffice.org" \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+ --assembly-company "Apache OpenOffice" \
+ --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
-X $(EXTRA_RDB) \
-r $(SOLARBINDIR)$/cli_uretypes.dll \
--keyfile $(SOLARBINDIR)$/cliuno.snk \
Modified: openoffice/branches/alg/clibboard/main/uui/source/newerverwarn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/uui/source/newerverwarn.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/uui/source/newerverwarn.cxx (original)
+++ openoffice/branches/alg/clibboard/main/uui/source/newerverwarn.cxx Thu Jan 17 11:06:13 2013
@@ -27,7 +27,7 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
@@ -98,12 +98,9 @@ IMPL_LINK( NewerVersionWarningDialog, Up
{
if ( ( sNotifyURL.getLength() > 0 ) && ( m_sVersion.getLength() > 0 ) )
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
sNotifyURL += m_sVersion;
if ( xSystemShell.is() && sNotifyURL.getLength() )
{
Modified: openoffice/branches/alg/clibboard/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/Library_vclplug_gen.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/Library_vclplug_gen.mk (original)
+++ openoffice/branches/alg/clibboard/main/vcl/Library_vclplug_gen.mk Thu Jan 17 11:06:13 2013
@@ -124,7 +124,6 @@ $(eval $(call gb_Library_set_defs,vclplu
ifeq ($(XRANDR_DLOPEN),FALSE)
$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
$$(CXXFLAGS) \
- $$(XRANDR_CFLAGS) \
))
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/alpha.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/alpha.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/alpha.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/alpha.hxx Thu Jan 17 11:06:13 2013
@@ -50,7 +50,7 @@ public:
AlphaMask( const Bitmap& rBitmap );
AlphaMask( const AlphaMask& rAlphaMask );
AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL );
- ~AlphaMask();
+ virtual ~AlphaMask();
AlphaMask& operator=( const Bitmap& rBitmap );
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/bitmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/bitmap.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/bitmap.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/bitmap.hxx Thu Jan 17 11:06:13 2013
@@ -420,7 +420,7 @@ public:
Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL );
Bitmap( const ResId& rResId );
Bitmap( SalBitmap* pSalBitmap );
- ~Bitmap();
+ virtual ~Bitmap();
Bitmap& operator=( const Bitmap& rBitmap );
inline sal_Bool operator!() const;
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/button.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/button.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/button.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/button.hxx Thu Jan 17 11:06:13 2013
@@ -66,12 +66,12 @@ public:
SAL_DLLPRIVATE void ImplSetSymbolRect(const Rectangle&);
protected:
- Button( WindowType nType );
+ explicit Button( WindowType nType );
public:
- Button( Window* pParent, WinBits nStyle = 0 );
- Button( Window* pParent, const ResId& rResId );
- ~Button();
+ explicit Button( Window* pParent, WinBits nStyle = 0 );
+ explicit Button( Window* pParent, const ResId& );
+ virtual ~Button();
virtual void Click();
@@ -149,7 +149,7 @@ public:
SAL_DLLPRIVATE sal_Bool ImplIsDefButton() const;
protected:
- PushButton( WindowType nType );
+ explicit PushButton( WindowType nType );
virtual void FillLayoutData() const;
virtual const Font&
@@ -157,9 +157,9 @@ protected:
virtual const Color&
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- PushButton( Window* pParent, WinBits nStyle = 0 );
- PushButton( Window* pParent, const ResId& rResId );
- ~PushButton();
+ explicit PushButton( Window* pParent, WinBits nStyle = 0 );
+ explicit PushButton( Window* pParent, const ResId& );
+ virtual ~PushButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -232,8 +232,8 @@ private:
SAL_DLLPRIVATE OKButton & operator= (const OKButton &);
public:
- OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
- OKButton( Window* pParent, const ResId& rResId );
+ explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
+ explicit OKButton( Window* pParent, const ResId& );
virtual void Click();
};
@@ -254,8 +254,8 @@ private:
SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &);
public:
- CancelButton( Window* pParent, WinBits nStyle = 0 );
- CancelButton( Window* pParent, const ResId& rResId );
+ explicit CancelButton( Window* pParent, WinBits nStyle = 0 );
+ explicit CancelButton( Window* pParent, const ResId& );
virtual void Click();
};
@@ -276,8 +276,8 @@ private:
SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & );
public:
- HelpButton( Window* pParent, WinBits nStyle = 0 );
- HelpButton( Window* pParent, const ResId& rResId );
+ explicit HelpButton( Window* pParent, WinBits nStyle = 0 );
+ explicit HelpButton( Window* pParent, const ResId& );
virtual void Click();
};
@@ -344,9 +344,9 @@ protected:
void DrawRadioButtonState( );
public:
- RadioButton( Window* pParent, WinBits nWinStyle = 0 );
- RadioButton( Window* pParent, const ResId& rResId );
- ~RadioButton();
+ explicit RadioButton( Window* pParent, WinBits nWinStyle = 0 );
+ explicit RadioButton( Window* pParent, const ResId& );
+ virtual ~RadioButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -450,8 +450,8 @@ public:
SAL_DLLPRIVATE void ImplCheck();
SAL_DLLPRIVATE void ImplSetMinimumNWFSize();
public:
- CheckBox( Window* pParent, WinBits nStyle = 0 );
- CheckBox( Window* pParent, const ResId& rResId );
+ explicit CheckBox( Window* pParent, WinBits nStyle = 0 );
+ explicit CheckBox( Window* pParent, const ResId& );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -515,12 +515,12 @@ private:
SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & );
protected:
- ImageButton( WindowType nType );
+ explicit ImageButton( WindowType nType );
public:
- ImageButton( Window* pParent, WinBits nStyle = 0 );
- ImageButton( Window* pParent, const ResId& rResId );
- ~ImageButton();
+ explicit ImageButton( Window* pParent, WinBits nStyle = 0 );
+ explicit ImageButton( Window* pParent, const ResId& );
+ virtual ~ImageButton();
};
class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
@@ -530,9 +530,9 @@ class VCL_DLLPUBLIC ImageRadioButton : p
SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & );
public:
- ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
- ImageRadioButton( Window* pParent, const ResId& rResId );
- ~ImageRadioButton();
+ explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
+ explicit ImageRadioButton( Window* pParent, const ResId& );
+ virtual ~ImageRadioButton();
};
class VCL_DLLPUBLIC TriStateBox : public CheckBox
@@ -542,9 +542,9 @@ class VCL_DLLPUBLIC TriStateBox : public
SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & );
public:
- TriStateBox( Window* pParent, WinBits nStyle = 0 );
- TriStateBox( Window* pParent, const ResId& rResId );
- ~TriStateBox();
+ explicit TriStateBox( Window* pParent, WinBits nStyle = 0 );
+ explicit TriStateBox( Window* pParent, const ResId& );
+ virtual ~TriStateBox();
};
class VCL_DLLPUBLIC DisclosureButton : public CheckBox
@@ -552,10 +552,11 @@ class VCL_DLLPUBLIC DisclosureButton : p
protected:
SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
public:
- DisclosureButton( Window* pParent, WinBits nStyle = 0 );
- DisclosureButton( Window* pParent, const ResId& rResId );
+ explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 );
+ explicit DisclosureButton( Window* pParent, const ResId& );
virtual void KeyInput( const KeyEvent& rKEvt );
};
#endif // _SV_BUTTON_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/combobox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/combobox.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/combobox.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/combobox.hxx Thu Jan 17 11:06:13 2013
@@ -77,14 +77,14 @@ protected:
//#endif
protected:
- ComboBox( WindowType nType );
+ explicit ComboBox( WindowType nType );
sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; }
virtual void FillLayoutData() const;
public:
- ComboBox( Window* pParent, WinBits nStyle = 0 );
- ComboBox( Window* pParent, const ResId& rResId );
- ~ComboBox();
+ explicit ComboBox( Window* pParent, WinBits nStyle = 0 );
+ explicit ComboBox( Window* pParent, const ResId& );
+ virtual ~ComboBox();
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Resize();
@@ -224,3 +224,4 @@ public:
};
#endif // _COMBOBOX_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/ctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/ctrl.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/ctrl.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/ctrl.hxx Thu Jan 17 11:06:13 2013
@@ -130,9 +130,9 @@ public:
//#endif
public:
- Control( Window* pParent, WinBits nWinStyle = 0 );
- Control( Window* pParent, const ResId& rResId );
- ~Control();
+ explicit Control( Window* pParent, WinBits nWinStyle = 0 );
+ explicit Control( Window* pParent, const ResId& );
+ virtual ~Control();
virtual void GetFocus();
virtual void LoseFocus();
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dialog.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dialog.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dialog.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dialog.hxx Thu Jan 17 11:06:13 2013
@@ -74,8 +74,8 @@ protected:
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
public:
- Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
- Dialog( Window* pParent, const ResId& rResId );
+ explicit Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
+ explicit Dialog( Window* pParent, const ResId& );
virtual ~Dialog();
virtual long Notify( NotifyEvent& rNEvt );
@@ -128,8 +128,8 @@ class VCL_DLLPUBLIC ModelessDialog : pub
//#endif
public:
- ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS );
- ModelessDialog( Window* pParent, const ResId& rResId );
+ explicit ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS );
+ explicit ModelessDialog( Window* pParent, const ResId& );
};
// ---------------
@@ -139,8 +139,8 @@ public:
class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
- ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
- ModalDialog( Window* pParent, const ResId& rResId );
+ explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
+ explicit ModalDialog( Window* pParent, const ResId& );
private:
using Window::Show;
@@ -156,3 +156,4 @@ private:
};
#endif // _SV_DIALOG_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dockingarea.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dockingarea.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dockingarea.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dockingarea.hxx Thu Jan 17 11:06:13 2013
@@ -44,8 +44,8 @@ private:
SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &);
public:
- DockingAreaWindow( Window *pParent );
- ~DockingAreaWindow();
+ explicit DockingAreaWindow( Window* pParent );
+ virtual ~DockingAreaWindow();
void SetAlign( WindowAlign eNewAlign );
WindowAlign GetAlign() const;
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/event.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/event.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/event.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/event.hxx Thu Jan 17 11:06:13 2013
@@ -128,8 +128,8 @@ private:
sal_uInt16 mnCode;
public:
- MouseEvent();
- MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1,
+ explicit MouseEvent();
+ explicit MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1,
sal_uInt16 nMode = 0, sal_uInt16 nButtons = 0,
sal_uInt16 nModifier = 0 );
@@ -207,9 +207,9 @@ private:
sal_Bool mbKeyboardActivated;
public:
- HelpEvent();
- HelpEvent( sal_uInt16 nHelpMode );
- HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
+ explicit HelpEvent();
+ explicit HelpEvent( sal_uInt16 nHelpMode );
+ explicit HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
const Point& GetMousePosPixel() const;
sal_uInt16 GetMode() const { return mnMode; }
@@ -300,8 +300,8 @@ private:
sal_uInt16 mnFlags;
public:
- TrackingEvent();
- TrackingEvent( const MouseEvent& rMEvt,
+ explicit TrackingEvent();
+ explicit TrackingEvent( const MouseEvent&,
sal_uInt16 nTrackFlags = 0 );
const MouseEvent& GetMouseEvent() const { return maMEvt; }
@@ -435,8 +435,8 @@ private:
sal_uInt16 mnType;
public:
- DataChangedEvent();
- DataChangedEvent( sal_uInt16 nType,
+ explicit DataChangedEvent();
+ explicit DataChangedEvent( sal_uInt16 nType,
const void* pData = NULL,
sal_uLong nFlags = 0 );
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/field.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/field.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/field.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/field.hxx Thu Jan 17 11:06:13 2013
@@ -64,7 +64,7 @@ protected:
sal_Bool IsDefaultLocale() const { return mbDefaultLocale; }
public:
- FormatterBase( Edit* pField = NULL );
+ explicit FormatterBase( Edit* pField = NULL );
virtual ~FormatterBase();
const LocaleDataWrapper& GetLocaleDataWrapper() const;
@@ -502,9 +502,9 @@ public:
class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter
{
public:
- PatternField( Window* pParent, WinBits nWinStyle );
- PatternField( Window* pParent, const ResId& rResId );
- ~PatternField();
+ explicit PatternField( Window* pParent, WinBits nWinStyle );
+ explicit PatternField( Window* pParent, const ResId& );
+ virtual ~PatternField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -522,9 +522,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- NumericField( Window* pParent, WinBits nWinStyle );
- NumericField( Window* pParent, const ResId& rResId );
- ~NumericField();
+ explicit NumericField( Window* pParent, WinBits nWinStyle );
+ explicit NumericField( Window* pParent, const ResId& );
+ virtual ~NumericField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -549,9 +549,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- MetricField( Window* pParent, WinBits nWinStyle );
- MetricField( Window* pParent, const ResId& rResId );
- ~MetricField();
+ explicit MetricField( Window* pParent, WinBits nWinStyle );
+ explicit MetricField( Window* pParent, const ResId& );
+ virtual ~MetricField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -616,9 +616,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- CurrencyField( Window* pParent, WinBits nWinStyle );
- CurrencyField( Window* pParent, const ResId& rResId );
- ~CurrencyField();
+ explicit CurrencyField( Window* pParent, WinBits nWinStyle );
+ explicit CurrencyField( Window* pParent, const ResId& );
+ virtual ~CurrencyField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -648,9 +648,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- DateField( Window* pParent, WinBits nWinStyle );
- DateField( Window* pParent, const ResId& rResId );
- ~DateField();
+ explicit DateField( Window* pParent, WinBits nWinStyle );
+ explicit DateField( Window* pParent, const ResId& );
+ virtual ~DateField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -684,9 +684,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- TimeField( Window* pParent, WinBits nWinStyle );
- TimeField( Window* pParent, const ResId& rResId );
- ~TimeField();
+ explicit TimeField( Window* pParent, WinBits nWinStyle );
+ explicit TimeField( Window* pParent, const ResId& );
+ virtual ~TimeField();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -715,9 +715,9 @@ public:
class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter
{
public:
- PatternBox( Window* pParent, WinBits nWinStyle );
- PatternBox( Window* pParent, const ResId& rResId );
- ~PatternBox();
+ explicit PatternBox( Window* pParent, WinBits nWinStyle );
+ explicit PatternBox( Window* pParent, const ResId& );
+ virtual ~PatternBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -742,9 +742,9 @@ public:
class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
{
public:
- NumericBox( Window* pParent, WinBits nWinStyle );
- NumericBox( Window* pParent, const ResId& rResId );
- ~NumericBox();
+ explicit NumericBox( Window* pParent, WinBits nWinStyle );
+ explicit NumericBox( Window* pParent, const ResId& );
+ virtual ~NumericBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -769,9 +769,9 @@ public:
class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
{
public:
- MetricBox( Window* pParent, WinBits nWinStyle );
- MetricBox( Window* pParent, const ResId& rResId );
- ~MetricBox();
+ explicit MetricBox( Window* pParent, WinBits nWinStyle );
+ explicit MetricBox( Window* pParent, const ResId& );
+ virtual ~MetricBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -802,9 +802,9 @@ public:
class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
{
public:
- CurrencyBox( Window* pParent, WinBits nWinStyle );
- CurrencyBox( Window* pParent, const ResId& rResId );
- ~CurrencyBox();
+ explicit CurrencyBox( Window* pParent, WinBits nWinStyle );
+ explicit CurrencyBox( Window* pParent, const ResId& );
+ virtual ~CurrencyBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -831,9 +831,9 @@ public:
class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter
{
public:
- DateBox( Window* pParent, WinBits nWinStyle );
- DateBox( Window* pParent, const ResId& rResId );
- ~DateBox();
+ explicit DateBox( Window* pParent, WinBits nWinStyle );
+ explicit DateBox( Window* pParent, const ResId& );
+ virtual ~DateBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -858,9 +858,9 @@ public:
class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter
{
public:
- TimeBox( Window* pParent, WinBits nWinStyle );
- TimeBox( Window* pParent, const ResId& rResId );
- ~TimeBox();
+ explicit TimeBox( Window* pParent, WinBits nWinStyle );
+ explicit TimeBox( Window* pParent, const ResId& );
+ virtual ~TimeBox();
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fixed.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fixed.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fixed.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fixed.hxx Thu Jan 17 11:06:13 2013
@@ -58,9 +58,9 @@ protected:
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- FixedText( Window* pParent, WinBits nStyle = 0 );
- FixedText( Window* pParent, const ResId& rResId );
- FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation );
+ explicit FixedText( Window* pParent, WinBits nStyle = 0 );
+ explicit FixedText( Window* pParent, const ResId& );
+ explicit FixedText( Window* pParent, const ResId&, bool bDisableAccessibleLabelForRelation );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -95,8 +95,8 @@ protected:
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- FixedLine( Window* pParent, WinBits nStyle = WB_HORZ );
- FixedLine( Window* pParent, const ResId& rResId );
+ explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ );
+ explicit FixedLine( Window* pParent, const ResId& );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -129,9 +129,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- FixedBitmap( Window* pParent, WinBits nStyle = 0 );
- FixedBitmap( Window* pParent, const ResId& rResId );
- ~FixedBitmap();
+ explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 );
+ explicit FixedBitmap( Window* pParent, const ResId& );
+ virtual ~FixedBitmap();
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -170,9 +170,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- FixedImage( Window* pParent, WinBits nStyle = 0 );
- FixedImage( Window* pParent, const ResId& rResId );
- ~FixedImage();
+ explicit FixedImage( Window* pParent, WinBits nStyle = 0 );
+ explicit FixedImage( Window* pParent, const ResId& );
+ virtual ~FixedImage();
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -193,3 +193,4 @@ public:
};
#endif // _SV_FIXED_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/floatwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/floatwin.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/floatwin.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/floatwin.hxx Thu Jan 17 11:06:13 2013
@@ -121,9 +121,9 @@ public:
//#endif
public:
- FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN );
- FloatingWindow( Window* pParent, const ResId& rResId );
- ~FloatingWindow();
+ explicit FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN );
+ explicit FloatingWindow( Window* pParent, const ResId& );
+ virtual ~FloatingWindow();
virtual long Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fontmanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fontmanager.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fontmanager.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fontmanager.hxx Thu Jan 17 11:06:13 2013
@@ -290,7 +290,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
std::map< sal_Unicode, sal_Int32 > m_aEncodingVector;
std::map< sal_Unicode, rtl::OString > m_aNonEncoded;
- PrintFont( fonttype::type eType );
+ explicit PrintFont( fonttype::type eType );
virtual ~PrintFont();
virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) = 0;
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/group.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/group.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/group.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/group.hxx Thu Jan 17 11:06:13 2013
@@ -50,8 +50,8 @@ private:
GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
public:
- GroupBox( Window* pParent, WinBits nStyle = 0 );
- GroupBox( Window* pParent, const ResId& rResId );
+ explicit GroupBox( Window* pParent, WinBits nStyle = 0 );
+ explicit GroupBox( Window* pParent, const ResId& );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -61,3 +61,4 @@ public:
};
#endif // _SV_GROUP_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/lstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/lstbox.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/lstbox.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/lstbox.hxx Thu Jan 17 11:06:13 2013
@@ -79,9 +79,9 @@ protected:
virtual void FillLayoutData() const;
public:
- ListBox( Window* pParent, WinBits nStyle = WB_BORDER );
- ListBox( Window* pParent, const ResId& rResId );
- ~ListBox();
+ explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER );
+ explicit ListBox( Window* pParent, const ResId& );
+ virtual ~ListBox();
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Resize();
@@ -255,8 +255,9 @@ private:
sal_uInt16 GetSavedValue();
public:
- MultiListBox( Window* pParent, WinBits nStyle = 0 );
- MultiListBox( Window* pParent, const ResId& rResId );
+ explicit MultiListBox( Window* pParent, WinBits nStyle = 0 );
+ explicit MultiListBox( Window* pParent, const ResId& );
};
#endif // _SV_LSTBOX_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menu.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menu.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menu.hxx Thu Jan 17 11:06:13 2013
@@ -104,7 +104,7 @@ struct ImplMenuDelData
ImplMenuDelData* mpNext;
const Menu* mpMenu;
- ImplMenuDelData( const Menu* pMenu );
+ explicit ImplMenuDelData( const Menu* );
~ImplMenuDelData();
bool isDeleted() const { return mpMenu == 0; }
@@ -201,7 +201,7 @@ public:
SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const;
Menu();
- Menu( sal_Bool bMenuBar );
+ explicit Menu( sal_Bool bMenuBar );
SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; }
@@ -410,9 +410,9 @@ class VCL_DLLPUBLIC MenuBar : public Men
public:
MenuBar();
- MenuBar( const ResId& rResId );
+ explicit MenuBar( const ResId& );
MenuBar( const MenuBar& rMenu );
- ~MenuBar();
+ virtual ~MenuBar();
MenuBar& operator =( const MenuBar& rMenu );
@@ -500,8 +500,8 @@ protected:
public:
PopupMenu();
PopupMenu( const PopupMenu& rMenu );
- PopupMenu( const ResId& rResId );
- ~PopupMenu();
+ explicit PopupMenu( const ResId& );
+ virtual ~PopupMenu();
void SetText( const XubString& rTitle ) { aTitleText = rTitle; }
const XubString& GetText() const { return aTitleText; }
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menubtn.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menubtn.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menubtn.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menubtn.hxx Thu Jan 17 11:06:13 2013
@@ -67,9 +67,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- MenuButton( Window* pParent, WinBits nStyle = 0 );
- MenuButton( Window* pParent, const ResId& rResId );
- ~MenuButton();
+ explicit MenuButton( Window* pParent, WinBits nStyle = 0 );
+ explicit MenuButton( Window* pParent, const ResId& );
+ virtual ~MenuButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -92,3 +92,4 @@ public:
};
#endif // _SV_MENUBTN_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/metaact.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/metaact.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/metaact.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/metaact.hxx Thu Jan 17 11:06:13 2013
@@ -159,7 +159,7 @@ protected:
public:
MetaAction();
- MetaAction( sal_uInt16 nType );
+ explicit MetaAction( sal_uInt16 nType );
virtual void Execute( OutputDevice* pOut );
@@ -221,7 +221,7 @@ private:
public:
DECL_META_ACTION( Point, META_POINT_ACTION )
- MetaPointAction( const Point& rPt );
+ explicit MetaPointAction( const Point& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -272,7 +272,7 @@ private:
public:
DECL_META_ACTION( Rect, META_RECT_ACTION )
- MetaRectAction( const Rectangle& rRect );
+ explicit MetaRectAction( const Rectangle& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -323,7 +323,7 @@ private:
public:
DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION )
- MetaEllipseAction( const Rectangle& rRect );
+ explicit MetaEllipseAction( const Rectangle& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -431,8 +431,8 @@ private:
public:
DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION )
- MetaPolyLineAction( const Polygon& rPoly );
- MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo );
+ explicit MetaPolyLineAction( const Polygon& );
+ explicit MetaPolyLineAction( const Polygon&, const LineInfo& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -456,7 +456,7 @@ private:
public:
DECL_META_ACTION( Polygon, META_POLYGON_ACTION )
- MetaPolygonAction( const Polygon& rPoly );
+ explicit MetaPolygonAction( const Polygon& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -479,7 +479,7 @@ private:
public:
DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION )
- MetaPolyPolygonAction( const PolyPolygon& rPolyPoly );
+ explicit MetaPolyPolygonAction( const PolyPolygon& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1065,7 +1065,7 @@ private:
public:
DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION )
- MetaISectRectClipRegionAction( const Rectangle& rRect );
+ explicit MetaISectRectClipRegionAction( const Rectangle& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1088,7 +1088,7 @@ private:
public:
DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION )
- MetaISectRegionClipRegionAction( const Region& rRegion );
+ explicit MetaISectRegionClipRegionAction( const Region& );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1179,7 +1179,7 @@ private:
public:
DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION )
- MetaTextColorAction( const Color& rColor );
+ explicit MetaTextColorAction( const Color& );
const Color& GetColor() const { return maColor; }
};
@@ -1265,7 +1265,7 @@ private:
public:
DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION )
- MetaTextAlignAction( TextAlign aAlign );
+ explicit MetaTextAlignAction( TextAlign eAlign );
TextAlign GetTextAlign() const { return maAlign; }
};
@@ -1285,7 +1285,7 @@ private:
public:
DECL_META_ACTION( MapMode, META_MAPMODE_ACTION )
- MetaMapModeAction( const MapMode& rMapMode );
+ explicit MetaMapModeAction( const MapMode& );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1307,7 +1307,7 @@ private:
public:
DECL_META_ACTION( Font, META_FONT_ACTION )
- MetaFontAction( const Font& rFont );
+ explicit MetaFontAction( const Font& );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1329,7 +1329,7 @@ private:
public:
DECL_META_ACTION( Push, META_PUSH_ACTION )
- MetaPushAction( sal_uInt16 nFlags );
+ explicit MetaPushAction( sal_uInt16 nFlags );
sal_uInt16 GetFlags() const { return mnFlags; }
};
@@ -1360,7 +1360,7 @@ private:
public:
DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION )
- MetaRasterOpAction( RasterOp eRasterOp );
+ explicit MetaRasterOpAction( RasterOp eRasterOp );
RasterOp GetRasterOp() const { return meRasterOp; }
};
@@ -1489,13 +1489,13 @@ private:
virtual sal_Bool Compare( const MetaAction& ) const;
protected:
- ~MetaCommentAction();
+ virtual ~MetaCommentAction();
public:
- MetaCommentAction( sal_Int32 nValue = 0L );
- MetaCommentAction( const MetaCommentAction& rAct );
- MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
- MetaCommentAction( const sal_uInt8* pData, sal_uInt32 nDataSize );
+ explicit MetaCommentAction( sal_Int32 nValue = 0L );
+ explicit MetaCommentAction( const MetaCommentAction& );
+ explicit MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
+ explicit MetaCommentAction( const sal_uInt8* pData, sal_uInt32 nDataSize );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1525,7 +1525,7 @@ private:
public:
DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
- MetaLayoutModeAction( sal_uInt32 nLayoutMode );
+ explicit MetaLayoutModeAction( sal_uInt32 nLayoutMode );
sal_uInt32 GetLayoutMode() const { return mnLayoutMode; }
};
@@ -1544,9 +1544,10 @@ private:
public:
DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION )
- MetaTextLanguageAction( LanguageType );
+ explicit MetaTextLanguageAction( LanguageType );
LanguageType GetTextLanguage() const { return meTextLanguage; }
};
#endif // _SV_METAACT_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/morebtn.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/morebtn.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/morebtn.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/morebtn.hxx Thu Jan 17 11:06:13 2013
@@ -54,9 +54,9 @@ protected:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
- MoreButton( Window* pParent, WinBits nStyle = 0 );
- MoreButton( Window* pParent, const ResId& rResId );
- ~MoreButton();
+ explicit MoreButton( Window* pParent, WinBits nStyle = 0 );
+ explicit MoreButton( Window* pParent, const ResId& );
+ virtual ~MoreButton();
void Click();
@@ -89,3 +89,4 @@ inline void MoreButton::SetState( sal_Bo
}
#endif // _SV_MOREBTN_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/pngread.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/pngread.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/pngread.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/pngread.hxx Thu Jan 17 11:06:13 2013
@@ -44,7 +44,7 @@ namespace vcl
/* the PNG chunks are read within the c'tor, so the stream will
be positioned at the end of the PNG */
- PNGReader( SvStream& rStm );
+ explicit PNGReader( SvStream& rStm );
~PNGReader();
/* an empty preview size hint (=default) will read the whole image
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/scrbar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/scrbar.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/scrbar.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/scrbar.hxx Thu Jan 17 11:06:13 2013
@@ -93,9 +93,9 @@ private:
DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, AutoTimer* );
public:
- ScrollBar( Window* pParent, WinBits nStyle = WB_VERT );
- ScrollBar( Window* pParent, const ResId& rResId );
- ~ScrollBar();
+ explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT );
+ explicit ScrollBar( Window* pParent, const ResId& );
+ virtual ~ScrollBar();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
@@ -156,11 +156,12 @@ private:
SAL_DLLPRIVATE void ImplInitSettings();
public:
- ScrollBarBox( Window* pParent, WinBits nStyle = 0 );
- ScrollBarBox( Window* pParent, const ResId& rResId );
+ explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 );
+ explicit ScrollBarBox( Window* pParent, const ResId& );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
#endif // _SV_SCRBAR_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spin.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spin.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spin.hxx Thu Jan 17 11:06:13 2013
@@ -60,9 +60,9 @@ private:
DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* );
public:
- SpinButton( Window* pParent, WinBits nStyle = 0 );
- SpinButton( Window* pParent, const ResId& rResId );
- ~SpinButton();
+ explicit SpinButton( Window* pParent, WinBits nStyle = 0 );
+ explicit SpinButton( Window* pParent, const ResId& );
+ virtual ~SpinButton();
virtual void Up();
virtual void Down();
@@ -111,3 +111,4 @@ private:
};
#endif // _SV_SPIN_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spinfld.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spinfld.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spinfld.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spinfld.hxx Thu Jan 17 11:06:13 2013
@@ -63,7 +63,7 @@ private:
SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea );
protected:
- SpinField( WindowType nTyp );
+ explicit SpinField( WindowType nTyp );
virtual long Notify( NotifyEvent& rNEvt );
virtual void Command( const CommandEvent& rCEvt );
@@ -73,9 +73,9 @@ protected:
virtual void FillLayoutData() const;
Rectangle * ImplFindPartRect( const Point& rPt );
public:
- SpinField( Window* pParent, WinBits nWinStyle = 0 );
- SpinField( Window* pParent, const ResId& rResId );
- ~SpinField();
+ explicit SpinField( Window* pParent, WinBits nWinStyle = 0 );
+ explicit SpinField( Window* pParent, const ResId& );
+ virtual ~SpinField();
virtual sal_Bool ShowDropDown( sal_Bool bShow );
@@ -109,3 +109,4 @@ public:
};
#endif // _SV_SPINFLD_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/split.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/split.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/split.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/split.hxx Thu Jan 17 11:06:13 2013
@@ -70,9 +70,9 @@ protected:
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle );
public:
- Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL );
- Splitter( Window* pParent, const ResId& rResId );
- ~Splitter();
+ explicit Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL );
+ explicit Splitter( Window* pParent, const ResId& );
+ virtual ~Splitter();
virtual void StartSplit();
virtual void EndSplit();
@@ -120,3 +120,4 @@ public:
};
#endif // _SV_SPLIT_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/syschild.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/syschild.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/syschild.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/syschild.hxx Thu Jan 17 11:06:13 2013
@@ -47,11 +47,11 @@ private:
SAL_DLLPRIVATE SystemChildWindow & operator= (const SystemChildWindow &);
public:
- SystemChildWindow( Window* pParent, WinBits nStyle = 0 );
+ explicit SystemChildWindow( Window* pParent, WinBits nStyle = 0 );
// create a SystemChildWindow using the given SystemWindowData
- SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True );
- SystemChildWindow( Window* pParent, const ResId& rResId );
- ~SystemChildWindow();
+ explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData* pData, sal_Bool bShow = sal_True );
+ explicit SystemChildWindow( Window* pParent, const ResId& );
+ virtual ~SystemChildWindow();
const SystemEnvData* GetSystemData() const;
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/tabpage.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/tabpage.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/tabpage.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/tabpage.hxx Thu Jan 17 11:06:13 2013
@@ -40,8 +40,8 @@ private:
SAL_DLLPRIVATE void ImplInitSettings();
public:
- TabPage( Window* pParent, WinBits nStyle = 0 );
- TabPage( Window* pParent, const ResId& rResId );
+ explicit TabPage( Window* pParent, WinBits nStyle = 0 );
+ explicit TabPage( Window* pParent, const ResId& );
virtual void Paint( const Rectangle& rRect );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
@@ -56,3 +56,4 @@ public:
};
#endif // _SV_TABPAGE_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/virdev.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/virdev.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/virdev.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/virdev.hxx Thu Jan 17 11:06:13 2013
@@ -68,8 +68,8 @@ private:
SAL_DLLPRIVATE bool ForceZeroExtleadBug() const
{ return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); }
public:
- VirtualDevice( sal_uInt16 nBitCount = 0 );
- VirtualDevice( const OutputDevice& rCompDev,
+ explicit VirtualDevice( sal_uInt16 nBitCount = 0 );
+ explicit VirtualDevice( const OutputDevice& rCompDev,
sal_uInt16 nBitCount = 0 );
/** Create a virtual device with alpha channel
@@ -94,7 +94,7 @@ public:
Any rendering will happen directly on the context and not on any intermediate bitmap.
Note: This might not be suported on all platforms !
*/
- VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount );
+ explicit VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount );
virtual ~VirtualDevice();
@@ -123,3 +123,4 @@ private:
};
#endif // _SV_VIRDEV_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/inc/vcl/wrkwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/inc/vcl/wrkwin.hxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/inc/vcl/wrkwin.hxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/inc/vcl/wrkwin.hxx Thu Jan 17 11:06:13 2013
@@ -67,11 +67,11 @@ protected:
SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState );
public:
- WorkWindow( Window* pParent, const ResId& rResId );
- WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK );
- WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK );
- WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version
- ~WorkWindow();
+ explicit WorkWindow( Window* pParent, const ResId& );
+ explicit WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK );
+ explicit WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK );
+ explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version
+ virtual ~WorkWindow();
virtual sal_Bool Close();
@@ -102,3 +102,4 @@ public:
};
#endif // _SV_WRKWIN_HXX
+
Modified: openoffice/branches/alg/clibboard/main/vcl/source/app/settings.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/source/app/settings.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/source/app/settings.cxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/source/app/settings.cxx Thu Jan 17 11:06:13 2013
@@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSu
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+ "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
@@ -1245,7 +1245,7 @@ void MiscSettings::SetEnableATToolSuppor
// If the accessibility key in the Windows registry exists, change it synchronously
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+ "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
Modified: openoffice/branches/alg/clibboard/main/vcl/source/window/toolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/vcl/source/window/toolbox.cxx?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/vcl/source/window/toolbox.cxx (original)
+++ openoffice/branches/alg/clibboard/main/vcl/source/window/toolbox.cxx Thu Jan 17 11:06:13 2013
@@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons()
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+ "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType = 0;
Modified: openoffice/branches/alg/clibboard/main/xmerge/source/activesync/XMergeFilter.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/xmerge/source/activesync/XMergeFilter.cpp?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/xmerge/source/activesync/XMergeFilter.cpp (original)
+++ openoffice/branches/alg/clibboard/main/xmerge/source/activesync/XMergeFilter.cpp Thu Jan 17 11:06:13 2013
@@ -38,8 +38,8 @@
const LPTSTR CXMergeFilter::m_pszPSWExportCLSID = _T("{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}");
const LPTSTR CXMergeFilter::m_pszPSWExportExt = _T("sxw");
-const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org Writer XML Document");
-const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org Writer");
+const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org XML Writer Document");
+const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org XML Writer");
const LPTSTR CXMergeFilter::m_pszPSWImportCLSID = _T("{CB43F086-838D-4FA4-B5F6-3406B9A57439}");
const LPTSTR CXMergeFilter::m_pszPSWImportExt = _T("psw");
@@ -48,8 +48,8 @@ const LPTSTR CXMergeFilter::m_pszPSWImpo
const LPTSTR CXMergeFilter::m_pszPXLExportCLSID = _T("{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}");
const LPTSTR CXMergeFilter::m_pszPXLExportExt = _T("sxc");
-const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org Calc XML Document");
-const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org Calc");
+const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org XML Calc Document");
+const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org XML Calc");
const LPTSTR CXMergeFilter::m_pszPXLImportCLSID = _T("{43887C67-4D5D-4127-BAAC-87A288494C7C}");
const LPTSTR CXMergeFilter::m_pszPXLImportExt = _T("pxl");
@@ -237,7 +237,7 @@ STDMETHODIMP CXMergeFilter::NextConvertF
}
}
- // Get the StarOffice/OpenOffice class directory
+ // Get the Apache OpenOffice class directory
if (m_szClasspath == NULL)
{
m_szClasspath = GetXMergeClassPath();
Modified: openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/converter.xml?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/converter.xml (original)
+++ openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/converter.xml Thu Jan 17 11:06:13 2013
@@ -29,7 +29,7 @@
<converter-description>
StarWriter XML to/from AportisDoc conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html (original)
+++ openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html Thu Jan 17 11:06:13 2013
@@ -163,7 +163,7 @@ then passed back to the client via the <
<tt><text:change*></tt> [Not implemented yet]</p>
<p>Change tracking elements are not supported yet on the current
- OpenOffice XML filters, will have to watch out on this. The text
+ OpenOffice.org XML filters, will have to watch out on this. The text
within these elements have to be interpreted properly during the
conversion process.</p>
</li>
Modified: openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/converter.xml?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/converter.xml (original)
+++ openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/converter.xml Thu Jan 17 11:06:13 2013
@@ -30,7 +30,7 @@
<converter-description>
Converter which performs xslt transformations
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/package.html
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/package.html?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/package.html (original)
+++ openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/package.html Thu Jan 17 11:06:13 2013
@@ -38,8 +38,8 @@ Transformation</B></FONT></FONT></P>
of one or more XSLT style sheets, which are used in the
DocumentSerializer and DocumentDeserializer, to perform the actual
translations. The location of these stylesheets is extracted from the {@link org.openoffice.xmerge.util.registry.ConverterInfo ConverterInfo} data structure, and are specified using the optional converter-xslt-serialize and converter-xsltdeserialize tags in a plugins converter.xml file. Please refer to the SDK document for more information about how to implement a Plugin Configuration XML File for a specific plugin.
-A sample OpenOffice to Html stylesheet and Html to
-Openffice stylesheet, has been provided as a sample implementation.
+A sample OpenOffice.org XML to Html stylesheet and Html to
+Openffice.org XML stylesheet, has been provided as a sample implementation.
The converter also makes use of an XsltPlugin.properties file, which may be edited by the user to provide MIME-TYPE to file extension mappings. This file is used by the {@link org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl getDeviceFileExtension} method.
</p>