[ooo-build-commit] .: 19 commits - reportbuilder/java reportbuilder/util sdext/prj sdext/source swext/mediawiki swext/prj
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Oct 6 07:09:47 PDT 2010
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java | 10
reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java | 7
reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java | 9
reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java | 4
reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java | 3
reportbuilder/util/description.xml | 2
sdext/prj/build.lst | 2
sdext/prj/d.lst | 2
sdext/source/minimizer/aboutdialog.cxx | 276 ----------
sdext/source/minimizer/aboutdialog.hxx | 91 ---
sdext/source/minimizer/informationdialog.cxx | 7
sdext/source/minimizer/makefile.mk | 15
sdext/source/minimizer/pppoptimizerdialog.cxx | 6
sdext/source/minimizer/pppoptimizertoken.cxx | 3
sdext/source/minimizer/pppoptimizertoken.hxx | 3
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu | 26
sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs | 24
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp | 10
sdext/source/presenter/makefile.mk | 36 +
swext/mediawiki/build.xml | 16
swext/mediawiki/help/makefile.mk | 60 +-
swext/prj/build.lst | 2
22 files changed, 133 insertions(+), 481 deletions(-)
New commits:
commit 8855b7b173d6e3769e89c5d41df10793cda2e4f2
Merge: 268c5e9... 7b26ee5...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 6 16:03:56 2010 +0200
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/extensions
commit 268c5e95cadc46f05a4e57be42693a5e0a629add
Merge: d1bbebd... 4582083...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 6 13:35:21 2010 +0200
Merge commit 'ooo/OOO330_m9'
Conflicts:
swext/mediawiki/build.xml
swext/prj/build.lst
diff --cc reportbuilder/util/description.xml
index 05f3266,454656d..367f59b
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@@ -3,9 -3,14 +3,9 @@@
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<display-name>
- <name lang="en-US">Oracle Report Builder</name>
+ <name lang="en-US">Report Builder</name>
<!-- <name lang="en-US">Oracle(TM) Report Builder</name> -->
</display-name>
- <registration>
- <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
- </simple-license>
- </registration>
<version value="#VERSION#"/>
<identifier value="com.sun.reportdesigner"/>
<dependencies>
diff --cc sdext/source/presenter/makefile.mk
index 17bc1ed,a26cf54..8e48155
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@@ -242,12 -259,9 +253,8 @@@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l
COMPONENT_HELP= \
$(ZIP1DIR)$/help/component.txt \
$(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
- # $(ZIP1DIR)$/help$/en-US$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp
-
- # no localization yet - see #i107498#
- # $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
ZIP1DEPS= \
- $(PACKLICS) \
$(DESCRIPTION) \
$(COMPONENT_MANIFEST) \
$(COMPONENT_FILES) \
diff --cc swext/mediawiki/build.xml
index 74a4573,daa51e9..79ad883
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@@ -148,6 -139,9 +139,8 @@@
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
- <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="**/*.idxl/*,**/*.*_,**/*.jar" casesensitive="yes" prefix="help"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
<zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
</zip>
</target>
@@@ -167,9 -161,11 +160,10 @@@
<fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help"/>
+ <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
- <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
<zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
</zip>
</target>
diff --cc swext/prj/build.lst
index aa56c04,aa07df3..2e96591
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- swext swext : officecfg l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml NULL
-swext swext : officecfg l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
++swext swext : officecfg l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
swext swext usr1 - all swext_mkout NULL
swext swext\mediawiki\help nmake - all swext_mwhelp NULL
swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL
commit 4582083268fb25b6a0d0d80aaad5439c4232f62a
Author: obo <obo at openoffice.org>
Date: Thu Sep 16 12:34:53 2010 +0200
masterfix OOO330: #i10000# build problem with cygwin shell (Windows)
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 86773dc..1804ec2 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -74,11 +74,11 @@ HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(XHPDEST)$/
ALLTAR : $(OUT_MEDIAWIKI)/help/component.txt
$(OUT_MEDIAWIKI)/help/component.txt : component.txt
- @@-$(MKDIRHIER) $(@:d)
+ @-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)$(COPY) component.txt $@
$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
- @@-$(MKDIRHIER) $(@:d)
+ @-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g' | \
sed 's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
commit 208f8ee15f93c37cbb9ff5b196492f725f56b529
Author: obo <obo at openoffice.org>
Date: Thu Sep 16 12:33:53 2010 +0200
masterfix OOO330: #i10000# build problem with cygwin shell (Windows)
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 687ac51..a26cf54 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -302,9 +302,9 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
+$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
@echo creating $@
- @@-$(MKDIRHIER) $(@:d)
+ @-$(MKDIRHIER) $(@:d)
$(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
@@ -390,7 +390,7 @@ DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
PHONYDESC=.PHONY
.ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
- @@-$(MKDIRHIER) $(@:d)
+ @-$(MKDIRHIER) $(@:d)
$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
$(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
commit ebf34a04bbd094b700f6dd8b3bd3558e98fd6294
Merge: b844940... ba22d06...
Author: obo <obo at openoffice.org>
Date: Tue Sep 14 13:03:44 2010 +0200
CWS-TOOLING: integrate CWS jl158
diff --cc sdext/prj/d.lst
index 54cefac,c5105c3..bcaa430
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@@ -5,5 -5,5 +5,6 @@@ mkdir: %_DEST%\bin%_EXT%\pdfimpor
..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
+..\%__SRC%\bin\presentation_minimizer_develop.zip %_DEST%\bin%_EXT%\minimizer\presentation_minimizer_develop.zip
..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
+ ..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip
commit b8449402b5ebb9caebe1621fda16e56e65f1f842
Merge: 7549289... 335647b...
Author: obo <obo at openoffice.org>
Date: Tue Sep 14 09:23:13 2010 +0200
CWS-TOOLING: integrate CWS impress199
commit 75492890fcba4ea273639e8d44820ef1badb0757
Merge: 89ba628... bedf0cc...
Author: obo <obo at openoffice.org>
Date: Tue Sep 14 08:56:44 2010 +0200
CWS-TOOLING: integrate CWS dba33h
commit ba22d069336ffb358f54f613dbc9048eda58a2d7
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Sep 10 17:05:00 2010 +0200
jl158 #i114008# sed problem on solaris fixed
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index eacc4c7..687ac51 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -305,7 +305,7 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
@echo creating $@
@@-$(MKDIRHIER) $(@:d)
- $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/ ; s/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g " > $@
+ $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 72608a8..86773dc 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -79,7 +79,9 @@ $(OUT_MEDIAWIKI)/help/component.txt : component.txt
$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
@@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g ; s/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g ; s/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
+ $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g' | \
+ sed 's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
+ sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
.ENDIF # "$(ENABLE_MEDIAWIKI)" != "YES"
commit 335647bd76392de5dd5ea10a927433500337013a
Author: sj <sj at openoffice.org>
Date: Mon Sep 6 17:25:36 2010 +0200
impress199: #i114275# unbranding presentation minimizer extension
diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst
index 71a9165..54cefac 100644
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@ -5,4 +5,5 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
+..\%__SRC%\bin\presentation_minimizer_develop.zip %_DEST%\bin%_EXT%\minimizer\presentation_minimizer_develop.zip
..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
diff --git a/sdext/source/minimizer/aboutdialog.cxx b/sdext/source/minimizer/aboutdialog.cxx
deleted file mode 100644
index b188cfb..0000000
--- a/sdext/source/minimizer/aboutdialog.cxx
+++ /dev/null
@@ -1,276 +0,0 @@
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sdext.hxx"
-
-#include "aboutdialog.hxx"
-#include "optimizationstats.hxx"
-#include "fileopendialog.hxx"
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-
-// ---------------
-// - ABOUTDIALOG -
-// ---------------
-
-using namespace ::rtl;
-using namespace ::com::sun::star::ui;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::container;
-
-#define ABOUT_DIALOG_WIDTH 200
-#define ABOUT_DIALOG_HEIGHT 155
-
-// -----------------------------------------------------------------------------
-
-
-rtl::OUString InsertFixedText( AboutDialog& rAboutDialog, const rtl::OUString& rControlName, const OUString& rLabel,
- sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
-{
- OUString pNames[] = {
- TKGet( TK_Height ),
- TKGet( TK_Label ),
- TKGet( TK_MultiLine ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
-
- Any pValues[] = {
- Any( nHeight ),
- Any( rLabel ),
- Any( bMultiLine ),
- Any( nXPos ),
- Any( nYPos ),
- Any( (sal_Int16)0 ),
- Any( nTabIndex ),
- Any( nWidth ) };
-
- sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
-
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
-
- rAboutDialog.insertFixedText( rControlName, aNames, aValues );
- return rControlName;
-}
-
-#if 0
-rtl::OUString InsertSeparator( AboutDialog& rAboutDialog, const OUString& rControlName, sal_Int32 nOrientation,
- sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
-{
- OUString pNames[] = {
- TKGet( TK_Height ),
- TKGet( TK_Orientation ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_Width ) };
-
- Any pValues[] = {
- Any( nHeight ),
- Any( nOrientation ),
- Any( nPosX ),
- Any( nPosY ),
- Any( sal_Int16( 0 ) ),
- Any( nWidth ) };
-
- sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
-
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
-
- rAboutDialog.insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ),
- rControlName, aNames, aValues );
- return rControlName;
-}
-
-#endif
-
-rtl::OUString InsertImage( AboutDialog& rAboutDialog, const OUString& rControlName, const OUString& rURL,
- sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
-{
- OUString pNames[] = {
- TKGet( TK_Border ),
- TKGet( TK_Height ),
- TKGet( TK_ImageURL ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_ScaleImage ),
- TKGet( TK_Width ) };
-
- Any pValues[] = {
- Any( sal_Int16( 1 ) ),
- Any( nHeight ),
- Any( rURL ),
- Any( nPosX ),
- Any( nPosY ),
- Any( sal_False ),
- Any( nWidth ) };
- sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
-
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
-
- rAboutDialog.insertImage( rControlName, aNames, aValues );
- return rControlName;
-}
-
-rtl::OUString InsertButton( AboutDialog& rAboutDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener,
- sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID )
-{
- OUString pNames[] = {
- TKGet( TK_Enabled ),
- TKGet( TK_Height ),
- TKGet( TK_Label ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_PushButtonType ),
- TKGet( TK_Step ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
-
- Any pValues[] = {
- Any( sal_True ),
- Any( nHeight ),
- Any( rAboutDialog.getString( nResID ) ),
- Any( nXPos ),
- Any( nYPos ),
- Any( static_cast< sal_Int16 >( PushButtonType_OK ) ),
- Any( (sal_Int16)0 ),
- Any( nTabIndex ),
- Any( nWidth ) };
-
-
- sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
-
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
-
- rAboutDialog.insertButton( rControlName, xActionListener, aNames, aValues );
- return rControlName;
-}
-
-void AboutDialog::InitDialog()
-{
- // setting the dialog properties
- OUString pNames[] = {
- rtl::OUString::createFromAscii( "BackgroundColor" ) ,
- TKGet( TK_Closeable ),
- TKGet( TK_Height ),
- TKGet( TK_Moveable ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Title ),
- TKGet( TK_Width ) };
-
- Any pValues[] = {
- Any( sal_Int32( 0xffffff ) ),
- Any( sal_True ),
- Any( sal_Int32( ABOUT_DIALOG_HEIGHT ) ),
- Any( sal_True ),
- Any( sal_Int32( 113 ) ),
- Any( sal_Int32( 42 ) ),
- Any( getString( STR_ABOUT_VERSION2 ) ),
- Any( sal_Int32( ABOUT_DIALOG_WIDTH ) ) };
-
- sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
-
- Sequence< rtl::OUString > aNames( pNames, nCount );
- Sequence< Any > aValues( pValues, nCount );
-
- rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) );
- rtl::OUString sBitmap( rtl::OUString::createFromAscii( "/aboutlogo.png" ) );
- rtl::OUString sURL( sBitmapPath += sBitmap );
-
- mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
- sal_Int32 nWidth = getMapsFromPixels( 387 );
- if ( nWidth )
- mxDialogModelPropertySet->setPropertyValue( TKGet( TK_Width ), Any( nWidth ) );
- else
- nWidth = ABOUT_DIALOG_WIDTH;
-
-// int nHeight = (int) getMapsFromPixels( 95 );
-
- InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), sURL, 0, 0, nWidth, 60 );
- InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), getString( STR_ABOUT_PRN ), 9, 66, nWidth - 18, 50, sal_True, 0 );
-// InsertSeparator( *this, rtl::OUString( rtl::OUString::createFromAscii( "separator" ) ), 0, 0, ABOUT_DIALOG_HEIGHT - 25, nWidth, 8 );
- InsertButton( *this, rtl::OUString( rtl::OUString::createFromAscii( "button" ) ), mxActionListener, ( nWidth / 2 ) - 25, 120, 50, 14, 1, STR_OK );
-}
-
-// -----------------------------------------------------------------------------
-
-AboutDialog::AboutDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame ) :
- UnoDialog( rxMSF, rxFrame ),
- ConfigurationAccess( rxMSF, NULL ),
- mxMSF( rxMSF ),
- mxFrame( rxFrame ),
- mxActionListener( new AboutActionListener( *this ) )
-{
- Reference< XFrame > xFrame( mxController->getFrame() );
- Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() );
- Reference< XWindowPeer > xWindowPeer( xContainerWindow, UNO_QUERY_THROW );
- createWindowPeer( xWindowPeer );
-
- InitDialog();
-}
-
-// -----------------------------------------------------------------------------
-
-AboutDialog::~AboutDialog()
-{
-}
-
-// -----------------------------------------------------------------------------
-
-sal_Bool AboutDialog::execute()
-{
- UnoDialog::execute();
- return mbStatus;
-}
-
-// -----------------------------------------------------------------------------
-
-void AboutActionListener::actionPerformed( const ActionEvent& rEvent )
- throw ( com::sun::star::uno::RuntimeException )
-{
- if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString::createFromAscii( "button" ) ) )
- {
- mrAboutDialog.endExecute( sal_True );
- }
-}
-void AboutActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw ( com::sun::star::uno::RuntimeException )
-{
-}
diff --git a/sdext/source/minimizer/aboutdialog.hxx b/sdext/source/minimizer/aboutdialog.hxx
deleted file mode 100644
index 8be5304..0000000
--- a/sdext/source/minimizer/aboutdialog.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef ABOUTDIALOG_HXX
-#define ABOUTDIALOG_HXX
-#include <vector>
-#include "unodialog.hxx"
-#include "configurationaccess.hxx"
-#include "pppoptimizertoken.hxx"
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/awt/XItemListener.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/awt/PushButtonType.hpp>
-
-#define DIALOG_WIDTH 310
-#define DIALOG_HEIGHT 210
-#define BUTTON_WIDTH 50
-#define BUTTON_HEIGHT 14
-
-// -------------------
-// - OPTIMIZERDIALOG -
-// -------------------
-class AboutDialog : public UnoDialog, public ConfigurationAccess
-{
-public :
-
- AboutDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame );
- ~AboutDialog();
-
- sal_Bool execute();
-
-private :
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
-
- void InitDialog();
-
-public :
-
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; };
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxMSF; };
-};
-
-class AboutActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XActionListener >
-{
-public:
- AboutActionListener( AboutDialog& rAboutDialog ) : mrAboutDialog( rAboutDialog ){};
-
- virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
-private:
-
- AboutDialog& mrAboutDialog;
-};
-
-#endif // ABOUTDIALOG_HXX
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 8e47b05..b2be8ac 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -265,7 +265,7 @@ void InformationDialog::InitDialog()
Any( sal_True ),
Any( sal_Int32( 245 ) ),
Any( sal_Int32( 115 ) ),
- Any( getString( STR_ABOUT2 ) ),
+ Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
Any( sal_Int32( DIALOG_WIDTH ) ) };
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
@@ -321,7 +321,6 @@ void InformationDialog::InitDialog()
const OUString aOldSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%OLDFILESIZE" ) );
const OUString aNewSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%NEWFILESIZE" ) );
const OUString aTitlePlaceholder( aTitle.getLength() ? OUString::createFromAscii( "%TITLE" ) : OUString::createFromAscii( "'%TITLE'" ) );
- const OUString aExtensionPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%EXTENSIONNAME" ) );
sal_Int32 i = aInfoString.indexOf( aOldSizePlaceholder, 0 );
if ( i >= 0 )
@@ -335,10 +334,6 @@ void InformationDialog::InitDialog()
if ( k >= 0 )
aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle );
- sal_Int32 l = aInfoString.indexOf( aExtensionPlaceholder, 0 );
- if ( l >= 0 )
- aInfoString = aInfoString.replaceAt( l, aExtensionPlaceholder.getLength(), getString( STR_SUN_OPTIMIZATION_WIZARD2 ) );
-
com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 );
InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 8a3a385..969a0cb 100755
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -61,7 +61,6 @@ SLOFILES= $(SLO)$/unodialog.obj \
$(SLO)$/pppoptimizerdialog.obj \
$(SLO)$/fileopendialog.obj \
$(SLO)$/optimizationstats.obj \
- $(SLO)$/aboutdialog.obj \
$(SLO)$/graphiccollector.obj \
$(SLO)$/pagecollector.obj \
$(SLO)$/informationdialog.obj
@@ -81,6 +80,8 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1RPATH= OXT
DEF1NAME= $(SHL1TARGET)
+COMPONENT_XCU_REPLACEMENT=s/@MINIMIZEREXTENSIONPRODUCTNAME@/Presentation Minimizer/g
+
COMPONENT_MERGED_XCU= \
$(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \
$(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \
@@ -115,6 +116,18 @@ COMPONENT_HELP= \
# make sure to add your custom files here
EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
+ZIP2TARGET= presentation_minimizer_develop
+.IF "$(WITH_LANG)"!=""
+ZIP2DIR= $(MISC)/$(EXTENSIONNAME)_in/merge
+.ELSE # "$(WITH_LANG)"!=""
+ZIP2DIR= registry/data
+.ENDIF # "$(WITH_LANG)"!=""
+ZIP2EXT= .zip
+ZIP2FLAGS=-r
+ZIP2LIST= \
+ org/openoffice/Office/Addons.xcu \
+ org/openoffice/Office/extension/*.xcu
+
# --- Targets ----------------------------------
.INCLUDE : extension_pre.mk
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index e2fe2dc..86f06ff 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -30,7 +30,6 @@
#include "pppoptimizerdialog.hxx"
#include "optimizerdialog.hxx"
-#include "aboutdialog.hxx"
using namespace ::rtl;
using namespace ::com::sun::star::uno;
@@ -175,11 +174,6 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
if ( mpOptimizerDialog )
mpOptimizerDialog->UpdateStatus( rArguments );
}
- else if ( rURL.Path.compareToAscii( "about" ) == 0 )
- {
- AboutDialog aAboutDialog( mxMSF, mxFrame );
- aAboutDialog.execute();
- }
}
}
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index 2de8f0e..04dab55 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -286,9 +286,6 @@ static const TokenTable pTokenTableArray[] =
{ "STR_DEFAULT_SESSION", STR_DEFAULT_SESSION },
{ "STR_MODIFY_WARNING", STR_MODIFY_WARNING },
{ "STR_YES", STR_YES },
- { "STR_ABOUT2", STR_ABOUT2 },
- { "STR_ABOUT_VERSION2", STR_ABOUT_VERSION2 },
- { "STR_ABOUT_PRN", STR_ABOUT_PRN },
{ "STR_OK", STR_OK },
{ "STR_INFO_1", STR_INFO_1 },
{ "STR_INFO_2", STR_INFO_2 },
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 1701e67..c5010fb 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -262,9 +262,6 @@ enum PPPOptimizerTokenEnum
STR_DEFAULT_SESSION,
STR_MODIFY_WARNING,
STR_YES,
- STR_ABOUT2,
- STR_ABOUT_VERSION2,
- STR_ABOUT_PRN,
STR_OK,
STR_INFO_1,
STR_INFO_2,
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
index 66b7cf0..0cf4147 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
@@ -11,7 +11,7 @@
<node oor:name="Strings">
<prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2">
- <value xml:lang="en-US">Oracle Presentation Minimizer</value>
+ <value xml:lang="en-US">@MINIMIZEREXTENSIONPRODUCTNAME@</value>
</prop>
<prop oor:name="STR_STEPS">
<value xml:lang="en-US">Steps</value>
@@ -35,12 +35,12 @@
<value xml:lang="en-US">Introduction</value>
</prop>
<prop oor:name="STR_INTRODUCTION_T">
- <value xml:lang="en-US">The Oracle Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed.
+ <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed.
At the last step of the wizard you can choose to apply the changes to the current presentation or to create an optimized new version of the presentation.</value>
</prop>
<prop oor:name="STR_CHOSE_SETTINGS">
- <value xml:lang="en-US">~Choose settings for Oracle Presentation Minimizer</value>
+ <value xml:lang="en-US">~Choose settings for @MINIMIZEREXTENSIONPRODUCTNAME@</value>
</prop>
<prop oor:name="STR_REMOVE">
<value xml:lang="en-US">~Delete</value>
@@ -181,32 +181,20 @@ The current presentation contains no OLE objects.</value>
<prop oor:name="STR_YES">
<value xml:lang="en-US">~Yes</value>
</prop>
- <prop oor:name="STR_ABOUT2">
- <value xml:lang="en-US">Oracle Presentation Minimizer</value>
- </prop>
- <prop oor:name="STR_ABOUT_VERSION2">
- <value xml:lang="en-US">About Oracle Presentation Minimizer 1.0.2</value>
- </prop>
- <prop oor:name="STR_ABOUT_PRN">
- <value xml:lang="en-US">Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.
-
-This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html
- </value>
- </prop>
<prop oor:name="STR_OK">
<value xml:lang="en-US">OK</value>
</prop>
<prop oor:name="STR_INFO_1">
- <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value>
+ <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_INFO_2">
- <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value>
+ <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_INFO_3">
- <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value>
+ <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_INFO_4">
- <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value>
+ <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_DUPLICATING_PRESENTATION">
<value xml:lang="en-US">Duplicating presentation...</value>
diff --git a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
index 59c9477..f121768 100644
--- a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
+++ b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
@@ -106,7 +106,7 @@
<prop oor:name="HelpFile" oor:type="xs:string"/>
<group oor:name="Strings">
<prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2" oor:type="xs:string" oor:localized="true">
- <value>Oracle Presentation Minimizer</value>
+ <value>Presentation Minimizer</value>
</prop>
<prop oor:name="STR_STEPS" oor:type="xs:string" oor:localized="true">
<value>Steps</value>
@@ -130,7 +130,7 @@
<value>Introduction</value>
</prop>
<prop oor:name="STR_INTRODUCTION_T" oor:type="xs:string" oor:localized="true">
- <value>The Oracle Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed.
+ <value>The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed.
At the last step of the wizard you can choose to apply the changes to the current presentation or to create an optimized new version of the presentation.</value>
</prop>
@@ -279,32 +279,20 @@ The current presentation contains no OLE objects.</value>
<prop oor:name="STR_YES" oor:type="xs:string" oor:localized="true">
<value>~Yes</value>
</prop>
- <prop oor:name="STR_ABOUT2" oor:type="xs:string" oor:localized="true">
- <value>Oracle Presentation Minimizer</value>
- </prop>
- <prop oor:name="STR_ABOUT_VERSION2" oor:type="xs:string" oor:localized="true">
- <value>About Oracle Presentation Minimizer 1.0.2</value>
- </prop>
- <prop oor:name="STR_ABOUT_PRN" oor:type="xs:string" oor:localized="true">
- <value>Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.
-
-This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html/value>
- </value>
- </prop>
<prop oor:name="STR_OK" oor:type="xs:string" oor:localized="true">
<value>OK</value>
</prop>
<prop oor:name="STR_INFO_1" oor:type="xs:string" oor:localized="true">
- <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value>
+ <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_INFO_2" oor:type="xs:string" oor:localized="true">
- <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value>
+ <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_INFO_3" oor:type="xs:string" oor:localized="true">
- <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value>
+ <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_INFO_4" oor:type="xs:string" oor:localized="true">
- <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value>
+ <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value>
</prop>
<prop oor:name="STR_DUPLICATING_PRESENTATION" oor:type="xs:string" oor:localized="true">
<value>Duplicating presentation...</value>
commit 2c361a10602b93d07fb912658ebbff242d112daf
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Wed Sep 1 17:22:19 2010 +0200
jl158: #i114008# add dependency on xmlhelp
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index c593a26..3603afb 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,4 +1,4 @@
-dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt NULL
+dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL
dx sdext usr1 - all sdext_mkout NULL
dx sdext\prj get - all sdext_prj NULL
dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL
commit cdff8d95870b7c39ae7457a3fdd3b9bbec60dd13
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Wed Sep 1 13:01:03 2010 +0200
jl158: #i114008# pre-indexing of extension help
diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst
index 71a9165..c5105c3 100644
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@ -6,3 +6,4 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
+..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
index a1172d5..ba8f29b 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
@@ -33,16 +33,16 @@
<meta>
<topic id="textpresenterxml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit" l10n="NEW">Oracle Presenter Console Keyboard Shortcuts</title>
+ <title xml-lang="en-US" id="tit" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</title>
<filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/com.sun.PresenterScreen" id="bm_id3138439" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>Presenter Console shortcuts</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>@PRESENTEREXTENSIONPRODUCTNAME@ shortcuts</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">Oracle Presenter Console Keyboard Shortcuts</paragraph>
- <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the Oracle Presenter Console, you can use the following keys:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the @PRESENTEREXTENSIONPRODUCTNAME@, you can use the following keys:</paragraph>
<table id="tbl_id0921200901051232">
<tablerow>
<tablecell>
@@ -158,7 +158,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the Presenter Console</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the @PRESENTEREXTENSIONPRODUCTNAME@</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id0921200901104544" role="tablecontent" l10n="NEW">Ctrl-'1'</paragraph>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 08a3470..eacc4c7 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -32,11 +32,16 @@ GEN_HID=FALSE
EXTNAME=PresenterScreen
ENABLE_EXCEPTIONS=TRUE
+# survive zip dependencies
+MAXLINELENGTH:=80000
# --- Settings ----------------------------------
.INCLUDE : rtlbootstrap.mk
.INCLUDE : settings.mk
+
+PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
+
.IF "$(L10N_framework)"==""
.INCLUDE : $(PRJ)$/util$/makefile.pmk
@@ -107,6 +112,12 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1RPATH= OXT
DEF1NAME= $(SHL1TARGET)
+ZIP2TARGET= presenter-screen_develop
+ZIP2DIR= $(COMMONMISC)
+ZIP2EXT= .zip
+ZIP2FLAGS=-r
+ZIP2LIST= */com.sun.PresenterScreen/*.xhp
+
ZIP1TARGET= presenter-screen
ZIP1DIR= $(MISC)$/$(TARGET)
ZIP1EXT= .oxt
@@ -248,10 +259,6 @@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
COMPONENT_HELP= \
$(ZIP1DIR)$/help/component.txt \
$(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
-# $(ZIP1DIR)$/help$/en-US$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp
-
-# no localization yet - see #i107498#
-# $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
ZIP1DEPS= \
$(PACKLICS) \
@@ -262,14 +269,25 @@ ZIP1DEPS= \
$(COMPONENT_IMAGES) \
$(COMPONENT_LIBRARY) \
$(COMPONENT_HELP)
+
# $(COMPONENT_MERGED_XCU) \
+LINKNAME:=help
+XHPLINKSRC:=$(ZIP1DIR)/help
+
+my_XHPFILES= \
+ presenter.xhp
+
+LINKLINKFILES= \
+ $(PACKAGE)/{$(my_XHPFILES)}
# --- Targets ----------------------------------
.ENDIF # L10N_framework
.INCLUDE : target.mk
+.INCLUDE : extension_helplink.mk
+
.IF "$(L10N_framework)"==""
$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
@@ -287,7 +305,9 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
@echo creating $@
@@-$(MKDIRHIER) $(@:d)
- $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" > $@
+ $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/ ; s/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g " > $@
+
+$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index f991581..daa51e9 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -123,15 +123,6 @@
<filter token="WIKIEXTENSIONFILENAME" value="${name}"/>
</filterset>
</copy>
- <copy todir="${out}/misc/${target}/package_tmp/help" overwrite="true" encoding="UTF-8">
- <fileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes"/>
- <filterset>
- <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/>
- <filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/>
- <filter token="WIKIEXTENSIONFILENAME" value="${name}"/>
- </filterset>
- <mapper type="regexp" from="^(.*[/\\])com.sun.sun-mediawiki([/\\].*)" to="\1com.sun.wiki-publisher\2"/>
- </copy>
</target>
<target name="uno-package" depends="tmpdir, xcumerge, jar, init">
@@ -149,6 +140,8 @@
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
<zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="**/*.idxl/*,**/*.*_,**/*.jar" casesensitive="yes" prefix="help"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
<zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
</zip>
</target>
@@ -161,14 +154,15 @@
<fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes"/>
<fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" casesensitive="yes"/>
+ <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes"/>
<!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378
<fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
-->
<fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help"/>
+ <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
<zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 1cb200a..72608a8 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -30,16 +30,29 @@ PRJNAME=swext
TARGET=$(PRJNAME)_help
.INCLUDE : settings.mk
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-PACKAGE=com.sun.sun-mediawiki
+.IF "$(WITH_LANG)"!=""
# workaround for the problem in help, the help uses en instead of en-US
-MEDIAWIKI_LANG= en $(alllangiso)
+MEDIAWIKI_LANG=$(uniq en $(alllangiso))
+aux_alllangiso:=$(MEDIAWIKI_LANG)
+.ELSE # "$(WITH_LANG)"!=""
+aux_alllangiso:=$(defaultlangiso)
+MEDIAWIKI_LANG=$(uniq en $(alllangiso))
+.ENDIF # "$(WITH_LANG)"!=""
+
+.IF "$(ENABLE_MEDIAWIKI)" != "YES"
+all:
+ @echo Building mediawiki disabled...
+.ELSE # "$(ENABLE_MEDIAWIKI)" != "YES"
+
+PACKAGE=com.sun.wiki-publisher
-OUT_MEDIAWIKI=$(MISC)$/mediawiki
-OUT_HELP=$(OUT_MEDIAWIKI)$/help
+OUT_MEDIAWIKI:=$(MISC)$/mediawiki
+
+LINKNAME:=help
+XHPLINKSRC:=$(OUT_MEDIAWIKI)/help
+
+XHPDEST=$(OUT_MEDIAWIKI)_merge/help
XHPFILES= \
wiki.xhp\
@@ -48,26 +61,25 @@ XHPFILES= \
wikisend.xhp\
wikisettings.xhp
-HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(OUT_HELP)$/$j$/$(PACKAGE)$/$(i:f)))
+LINKLINKFILES= \
+ $(PACKAGE)/{$(XHPFILES)}
-ALLTAR : $(OUT_MEDIAWIKI)$/$(TARGET).done $(OUT_HELP)$/component.txt
+# define with own language set
+HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(XHPDEST)$/$j$/$(PACKAGE)$/$(i:f)))
-#$(OUT_MEDIAWIKI)$/xhp_changed.flag optix
-
-$(OUT_HELP)$/component.txt : component.txt
- $(COPY) component.txt $(OUT_HELP)$/component.txt
+.INCLUDE : target.mk
+.INCLUDE : tg_help.mk
+.INCLUDE : extension_helplink.mk
-$(HLANGXHPFILES) : #$$(@:d)thisdir.created
- -$(MKDIRHIER) $(@:d)
- $(TOUCH) $(@:d)thisdir.created
+ALLTAR : $(OUT_MEDIAWIKI)/help/component.txt
-$(OUT_HELP)$/{$(MEDIAWIKI_LANG)}$/$(PACKAGE)$/%.xhp :| %.xhp
- @$(TOUCH) $@
-# internal dependencies not sufficient to trigger merge?
-# @$(NULL)
+$(OUT_MEDIAWIKI)/help/component.txt : component.txt
+ @@-$(MKDIRHIER) $(@:d)
+ $(COMMAND_ECHO)$(COPY) component.txt $@
+$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
+ @@-$(MKDIRHIER) $(@:d)
+ $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g ; s/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g ; s/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
-$(OUT_MEDIAWIKI)$/$(TARGET).done : $(LOCALIZESDF) $(XHPFILES) $(HLANGXHPFILES)
- @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
-.ENDIF
+.ENDIF # "$(ENABLE_MEDIAWIKI)" != "YES"
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index eb1aaca..aa07df3 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext : officecfg l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml NULL
+swext swext : officecfg l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
swext swext usr1 - all swext_mkout NULL
swext swext\mediawiki\help nmake - all swext_mwhelp NULL
swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL
commit bedf0cc12cf628517b40c169a6a458cf5baf4aff
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Mon Aug 30 11:33:41 2010 +0200
dba3h: #i114111#: reportbuilder: do not use Double.toString() when writing the 2 column-width attribute, it may write an exponent, which is invalid..
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index d3629a5..f163029 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -624,7 +624,9 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
final Section tableColumnProperties = new Section();
tableColumnProperties.setType("table-column-properties");
tableColumnProperties.setNamespace(style.getNamespace());
- tableColumnProperties.setAttribute(style.getNamespace(), "column-width", columnWidth + getUnitsOfMeasure(null));
+ final String width = String.format("%f", columnWidth);
+ tableColumnProperties.setAttribute(style.getNamespace(),
+ "column-width", width + getUnitsOfMeasure(null));
style.addNode(tableColumnProperties);
final AttributeList myAttrList = new AttributeList();
commit 244032fd853a253188810c560a9ea2eb6a499638
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Mon Aug 30 11:31:28 2010 +0200
dba33h: #i114106# fix missing value-type
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 7c18121..3ce77c6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -84,6 +84,13 @@ public class TableCellLayoutController extends SectionLayoutController
attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
FormatValueUtility.VALUE, "NaN");
}
+ // #i114108#: except on form elements, the only value-type that can
+ // occur without an accomanying value attribute is "string"
+ else if (!"string".equals(valueType))
+ {
+ attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
+ FormatValueUtility.VALUE_TYPE, "string");
+ }
}
catch (Exception e)
{
commit b40a860f62ccd7f097a716af05042dfc7fdd2ecc
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Mon Aug 30 11:28:34 2010 +0200
dba33h: #i114106# fix invalid root element for styles
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index 408eaa9..5ab27b4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -117,11 +117,11 @@ public class StylesWriter
{
globals
});
- writeAutomaticStylesSection(new OfficeStylesCollection[]
+ writeCommonStylesSection(new OfficeStylesCollection[]
{
globals
});
- writeCommonStylesSection(new OfficeStylesCollection[]
+ writeAutomaticStylesSection(new OfficeStylesCollection[]
{
globals
});
@@ -379,7 +379,7 @@ public class StylesWriter
this.xmlWriter.writeXmlDeclaration("UTF-8");
this.xmlWriter.writeTag(OfficeNamespaces.OFFICE_NS,
- "document-content", rootAttributes, XmlWriterSupport.OPEN);
+ "document-styles", rootAttributes, XmlWriterSupport.OPEN);
}
public void close()
commit 27bf1d57468097b6ebe924a18d400c98b62c5d7f
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Mon Aug 30 11:26:49 2010 +0200
dba33h: #i114105# fix version number
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index 00ca09c..68bf323 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -138,6 +138,10 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
public static final String VERTICAL_POS = "vertical-pos";
private static final String ZERO_CM = "0cm";
+ /** the verison of the ODF specification to which generated documents
+ * shall conform. */
+ public static final String ODF_VERSION = "1.2";
+
protected static class BufferState
{
@@ -376,7 +380,8 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
- rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2");
+ rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
+ ODF_VERSION);
this.rootXmlWriter.writeXmlDeclaration("UTF-8");
this.rootXmlWriter.writeTag(OfficeNamespaces.OFFICE_NS, "document-content", rootAttributes, XmlWriterSupport.OPEN);
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index 6844ab2..408eaa9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -374,7 +374,8 @@ public class StylesWriter
rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
- rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2");
+ rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
+ OfficeDocumentReportTarget.ODF_VERSION);
this.xmlWriter.writeXmlDeclaration("UTF-8");
this.xmlWriter.writeTag(OfficeNamespaces.OFFICE_NS,
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
index d6ee542..a780e0a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
@@ -1269,7 +1269,8 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
rootAttributes.addNamespaceDeclaration("office", OfficeNamespaces.OFFICE_NS);
rootAttributes.addNamespaceDeclaration("config", OfficeNamespaces.CONFIG);
rootAttributes.addNamespaceDeclaration("ooo", OfficeNamespaces.OO2004_NS);
- rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.0");
+ rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
+ OfficeDocumentReportTarget.ODF_VERSION);
final OutputStream outputStream = getOutputRepository().createOutputStream("settings.xml", "text/xml");
final XmlWriter xmlWriter = new XmlWriter(new OutputStreamWriter(outputStream, "UTF-8"), createTagDescription());
xmlWriter.setAlwaysAddNamespace(true);
commit 2b4a0df57372f5ea822ed2a496e04d4932198e9f
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Aug 27 12:23:43 2010 +0200
dba33h: #i112652#: reportbuilder: write XMLSchema-2 conformant NaN
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 8b56dd1..7c18121 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -81,7 +81,8 @@ public class TableCellLayoutController extends SectionLayoutController
}
else if ( "float".equals(valueType))
{
- attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE, "1.#NAN");
+ attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
+ FormatValueUtility.VALUE, "NaN");
}
}
catch (Exception e)
commit d5c0295c9ce51577724ec0ffd9b3b809e58b7b31
Merge: 89ba628... 3ae9145...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Aug 27 13:59:59 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33h
commit 3ae9145027f02c77a674e01aa26ebb234c9f4f4e
Merge: 89ba628... 89ba628...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Aug 27 13:55:38 2010 +0200
commit after merge
diff --cc reportbuilder/util/description.xml
index 22f95ef,22f95ef..454656d
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@@ -3,7 -3,7 +3,7 @@@
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<display-name>
-- <name lang="en-US">Oracle Report Builder</name>
++ <name lang="en-US">Report Builder</name>
<!-- <name lang="en-US">Oracle(TM) Report Builder</name> -->
</display-name>
<registration>
commit 56026f7ab0fcf8a9a9dd8e1ba05840f880844c26
Merge: 4571732... 89ba628...
Author: Joachim Lingner <jl at openoffice.org>
Date: Tue Aug 24 10:01:56 2010 +0200
jl158 merging with OOO330_m5
More information about the ooo-build-commit
mailing list