-- cgit From 4b45e95af3f851ca68ef5acaeaa7d8231798baa6 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 10 Jul 2009 14:03:42 +0200 Subject: #i103452#: replace PRODUCT by !DBG_UTIL; replace assert by OSL_ASSERT where possible --- reportbuilder/template/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reportbuilder/template/makefile.mk b/reportbuilder/template/makefile.mk index a9ee2cf544d9..2db1c2b5a38f 100644 --- a/reportbuilder/template/makefile.mk +++ b/reportbuilder/template/makefile.mk @@ -37,7 +37,7 @@ TARGET=rpt_templates no_common_build_zip=true EXTENSION_VERSION_BASE=1.0.0 -.IF "$(PRODUCT)" != "" +.IF "$(DBG_LEVEL)" == "0" EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) .ELSE EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).$(BUILD) -- cgit From 2a2ce92adee00ec2b600f500d623dd4c9cbb8e31 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 28 Jul 2009 16:29:26 +0200 Subject: #i103496#: remove superfluous dependencies in external libraries --- xpdf/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpdf/prj/build.lst b/xpdf/prj/build.lst index 9d4b9563a40f..527985ff0cf2 100644 --- a/xpdf/prj/build.lst +++ b/xpdf/prj/build.lst @@ -1,2 +1,2 @@ -xp xpdf : solenv sal soltools NULL +xp xpdf : solenv soltools NULL xp xpdf nmake - all xp_xpdf NULL -- cgit From f867b6a89e89898fd16a63a227d8858bdc0276d9 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Jul 2009 09:37:08 +0200 Subject: more dependencies fixed --- swext/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swext/prj/build.lst b/swext/prj/build.lst index 6b8c4dd96f20..b748f749f16f 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,4 +1,4 @@ -swext swext : l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons officecfg readlicense_oo xsltml filter NULL +swext swext : l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml filter 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 -- cgit From 572c44a17ff476581d25bc49e42fe3d5bc3199f7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Jul 2009 10:17:58 +0200 Subject: more dependencies fixed --- apache-commons/prj/build.lst | 2 +- swext/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst index 0a9f79b5ffd7..80940d4ed32b 100644 --- a/apache-commons/prj/build.lst +++ b/apache-commons/prj/build.lst @@ -1,4 +1,4 @@ -ac apache-commons : solenv TOMCAT:tomcat NULL +ac apache-commons : solenv TOMCAT:tomcat officecfg filter NULL ac apache-commons usr1 - all ac_mkout NULL ac apache-commons\java\codec nmake - all ac_codec NULL ac apache-commons\java\lang nmake - all ac_lang NULL diff --git a/swext/prj/build.lst b/swext/prj/build.lst index b748f749f16f..64084c2ed34b 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,4 +1,4 @@ -swext swext : l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml filter NULL +swext swext : l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml 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 -- cgit -- cgit From ae703f9be4855a65f672c07ad8059cd98bf935d8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 9 Sep 2009 15:58:49 +0200 Subject: #i103496#: remove superfluous includes of sal headers --- sdext/source/minimizer/configurationaccess.cxx | 1 - sdext/source/minimizer/fileopendialog.cxx | 1 - sdext/source/minimizer/fileopendialog.hxx | 2 +- sdext/source/minimizer/pppoptimizer.cxx | 2 ++ sdext/source/minimizer/pppoptimizer.hxx | 1 - sdext/source/pdfimport/misc/pwdinteract.cxx | 7 ------ sdext/source/pdfimport/odf/odfemitter.cxx | 1 - sdext/source/pdfimport/sax/emitcontext.cxx | 31 -------------------------- sdext/source/pdfimport/services.cxx | 1 - sdext/source/presenter/PresenterComponent.hxx | 2 +- 10 files changed, 4 insertions(+), 45 deletions(-) diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 357f908c7312..a902e2e7c486 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -33,7 +33,6 @@ #include "precompiled_sdext.hxx" #include "configurationaccess.hxx" -#include #include #include #include diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index a20d6900964e..8135335a8221 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -60,7 +60,6 @@ #include #include #include -#include using namespace ::rtl; diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index 6ab275fe95f0..afcfee1e49ac 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -33,10 +33,10 @@ #define _FILEOPEN_DIALOG_HXX_ #include -#include #include #include #include +#include class FileOpenDialog { diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 5bc80399ff3d..fc0b19997eb5 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -36,6 +36,8 @@ #include "impoptimizer.hxx" #include +#include + using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index 53e2aedb3bfa..c02b5579082b 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -39,7 +39,6 @@ #include #include #include -#include // ---------------- // - PPPOptimizer - diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 1545bec51f3d..eb194b36c75b 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -42,7 +42,6 @@ #include #include #include -#include using namespace com::sun::star; @@ -150,12 +149,6 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, } catch( uno::Exception& ) { -#if 0 - OSL_ENSURE( false, - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); -#endif } OSL_TRACE( "request %s selected\n", pRequest->isSelected() ? "was" : "was not" ); diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index 12750db201b4..283e0f9500df 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -35,7 +35,6 @@ #include "odfemitter.hxx" #include -#include #include #include #include diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index fc5809c4f7d5..17ff27e8dfc5 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -37,7 +37,6 @@ #include "saxattrlist.hxx" #include -#include #include #include @@ -62,12 +61,6 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc } catch( xml::sax::SAXException& ) { -#if 0 - OSL_ENSURE( false, - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); -#endif } #if OSL_DEBUG_LEVEL > 1 static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" ); @@ -99,12 +92,6 @@ SaxEmitter::~SaxEmitter() } catch( xml::sax::SAXException& ) { -#if 0 - OSL_ENSURE( false, - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); -#endif } #if OSL_DEBUG_LEVEL > 1 if( pStream ) @@ -127,12 +114,6 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) } catch( xml::sax::SAXException& ) { -#if 0 - OSL_ENSURE( false, - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); -#endif } #if OSL_DEBUG_LEVEL > 1 if( pStream ) @@ -167,12 +148,6 @@ void SaxEmitter::write( const rtl::OUString& rText ) } catch( xml::sax::SAXException& ) { -#if 0 - OSL_ENSURE( false, - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); -#endif } #if OSL_DEBUG_LEVEL > 1 if( pStream ) @@ -193,12 +168,6 @@ void SaxEmitter::endTag( const char* pTag ) } catch( xml::sax::SAXException& ) { -#if 0 - OSL_ENSURE( false, - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); -#endif } #if OSL_DEBUG_LEVEL > 1 if( pStream ) diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index d6d79204cef1..548961ace6f2 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -38,7 +38,6 @@ #include #include -#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx index 5b2a17760152..87758b2954dc 100644 --- a/sdext/source/presenter/PresenterComponent.hxx +++ b/sdext/source/presenter/PresenterComponent.hxx @@ -32,7 +32,7 @@ #ifndef SDEXT_PRESENTER_COMPONENT_HXX #define SDEXT_PRESENTER_COMPONENT_HXX -#include +#include namespace css = ::com::sun::star; -- cgit From 6ea3256cb28af95e5ee8cd432fd93770d6784df6 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 11 Sep 2009 09:03:06 +0200 Subject: #i103496#: get rid of filter dependency in swext by moving wiki filter into extension --- swext/mediawiki/build.xml | 6 +- swext/mediawiki/src/filter/mediawiki.ott | Bin 0 -> 6304 bytes swext/mediawiki/src/filter/odt2mediawiki.xsl | 1567 ++++++++++++++++++++++++++ 3 files changed, 1571 insertions(+), 2 deletions(-) create mode 100644 swext/mediawiki/src/filter/mediawiki.ott create mode 100755 swext/mediawiki/src/filter/odt2mediawiki.xsl diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index eb815b6df762..85cee3089555 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -147,8 +147,8 @@ - - + + @@ -170,6 +170,8 @@ --> + + diff --git a/swext/mediawiki/src/filter/mediawiki.ott b/swext/mediawiki/src/filter/mediawiki.ott new file mode 100644 index 000000000000..eb94e9607bc0 Binary files /dev/null and b/swext/mediawiki/src/filter/mediawiki.ott differ diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl new file mode 100755 index 000000000000..8d21a1cda1fd --- /dev/null +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -0,0 +1,1567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit From e10e4ddb2a08f1a4f49f4ba8a72075d51b91c3cd Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 14 Sep 2009 19:06:55 +0200 Subject: #i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2 --- sdext/source/pdfimport/test/makefile.mk | 7 +++++-- sdext/source/pdfimport/test/tests.cxx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk index 2fb8d3a62417..eea005178ae3 100755 --- a/sdext/source/pdfimport/test/makefile.mk +++ b/sdext/source/pdfimport/test/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -70,6 +70,7 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ + $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -103,6 +104,7 @@ APP1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ + $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -131,6 +133,7 @@ APP2STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ + $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -161,5 +164,5 @@ APP2STDLIBS=\ @echo ---------------------------------------------------------- testshl2 -forward $(BIN)$/ $(SHL1TARGETN) $(TOUCH) $@ - + #ALLTAR : $(MISC)$/pdfi_unittest_succeeded diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index b66e1812d9e0..075116e3784a 100755 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include -- cgit From e7e8d94bb6d31abc98bbeb4026481aa052f29278 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 15 Sep 2009 16:19:42 +0200 Subject: obvious c/p error fixed --- apache-commons/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst index 80940d4ed32b..c509ce0336dd 100644 --- a/apache-commons/prj/build.lst +++ b/apache-commons/prj/build.lst @@ -1,4 +1,4 @@ -ac apache-commons : solenv TOMCAT:tomcat officecfg filter NULL +ac apache-commons : solenv TOMCAT:tomcat NULL ac apache-commons usr1 - all ac_mkout NULL ac apache-commons\java\codec nmake - all ac_codec NULL ac apache-commons\java\lang nmake - all ac_lang NULL -- cgit From c4c61d816976edd6c68ee5d4ef3b371c53e88c43 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 22 Sep 2009 18:14:05 +0200 Subject: #i97509# continued matrix tooling and adapting the usages now to all the ooo code --- sdext/source/pdfimport/tree/pdfiprocessor.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 2a025430b722..997ede16f454 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -502,8 +503,7 @@ GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph ) FontAttributes aFontAttrs = m_aIdToFont[ rGlyph.getGC().FontId ]; // add transformation to GC - basegfx::B2DHomMatrix aFontTransform; - aFontTransform.translate( -rRect.X1, -rRect.Y1 ); + basegfx::B2DHomMatrix aFontTransform(basegfx::tools::createTranslateB2DHomMatrix(-rRect.X1, -rRect.Y1)); aFontTransform *= aFontMatrix; aFontTransform.translate( rRect.X1, rRect.Y1 ); -- cgit -- cgit -- cgit From fd49d307fa36fc0a7cbf7b9de1c38bdc1a51827e Mon Sep 17 00:00:00 2001 From: mb93783 Date: Wed, 4 Nov 2009 15:39:48 +0100 Subject: #i106432#, #i103496#: some fixes found while building on more platforms --- swext/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swext/prj/build.lst b/swext/prj/build.lst index 64084c2ed34b..eb1aaca61422 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,4 +1,4 @@ -swext swext : 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 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 -- cgit From b7cbd2ef8e1caff38e590cc48a3d7b15928a074d Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 10 Dec 2009 15:53:30 +0100 Subject: aus111: #i107498# - xhp localization outside helpcontent2 and the according cleanup in sdext --- sdext/prj/build.lst | 3 +- .../help/en-US/com.sun.PresenterScreen/makefile.mk | 55 ++++++ .../en-US/com.sun.PresenterScreen/presenter.xhp | 189 +++++++++++++++++++++ sdext/source/presenter/makefile.mk | 15 +- 4 files changed, 252 insertions(+), 10 deletions(-) create mode 100644 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk create mode 100755 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index 9d99c119ad83..8ced1e83edad 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -6,7 +6,8 @@ dx sdext\source\minimizer\registry\data\org\openoffice\Office\extension nmake - dx sdext\source\minimizer\registry\data\org\openoffice\Office\UI nmake - all sdext_minimizer_rdooou NULL dx sdext\source\minimizer\registry\data\org\openoffice\Office nmake - all sdext_minimizer_rdooo NULL dx sdext\source\presenter\registry\data\org\openoffice\Office\extension nmake - all sdext_presenter_xcu NULL -dx sdext\source\presenter nmake - all sdext_presenter sdext_inc sdext_presenter_xcu NULL +dx sdext\source\presenter\help\en-US\com.sun.PresenterScreen nmake - all sdext_presenter_help NULL +dx sdext\source\presenter nmake - all sdext_presenter sdext_inc sdext_presenter_xcu sdext_presenter_help NULL dx sdext\inc nmake - all sdext_inc NULL dx sdext\source\pdfimport\xpdfwrapper nmake - all dx_xpdfwrap NULL dx sdext\source\pdfimport\xpdftest nmake - all dx_parsetest dx_xpdfwrap NULL diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk new file mode 100644 index 000000000000..854644169f17 --- /dev/null +++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk @@ -0,0 +1,55 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.10 $ +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=../../../../.. +PRJNAME=sdext +TARGET=PresenterScreenHelp +EXTNAME=PresenterScreen + +PACKAGE = com.sun.PresenterScreen + +# --- Settings ---------------------------------- + +.INCLUDE : settings.mk + +.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO" +do_nothing: + @echo "Presenter Screen build disabled." +.ELSE + +XHPFILES= \ + presenter.xhp + + +.INCLUDE : target.mk +.INCLUDE : tg_help.mk + +.ENDIF 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 new file mode 100755 index 000000000000..8ef828812dd6 --- /dev/null +++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp @@ -0,0 +1,189 @@ + + + + + + + + + Sun Presenter Console Keyboard Shortcuts + /com.sun.PresenterScreen-PLATFORMID/presenter.xhp + + + + +Presenter Console shortcuts + +Sun Presenter Console Keyboard Shortcuts + When running a slide show using the Sun Presenter Console, you can use the following keys: + + + + Action + + + Key or Keys + + + + + Next slide, or next effect + + + Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' + + + + + Previous slide, or previous effect + + + Right click, left arrow, up arrow, page up, backspace, 'P' + + + + + First slide + + + Home + + + + + Last slide + + + End + + + + + Previous slide without effects + + + Alt+Page Up + + + + + Next slide without effects + + + Alt+Page Down + + + + + Black/Unblack the screen + + + 'B', '.' + + + + + White/Unwhite the screen + + + 'W', ',' + + + + + End slide show + + + Esc, '-' + + + + + Go to slide number + + + Number followed by Enter + + + + + Grow/Shrink size of notes font + + + 'G', 'S' + + + + + Scroll notes up/down + + + 'A', 'Z' + + + + + Move caret in notes view backward/forward + + + 'H', 'L' + + + + + Show the Presenter Console + + + Ctrl-'1' + + + + + Show the Presentation Notes + + + Ctrl-'2' + + + + + Show the Slides Overview + + + Ctrl-'3' + + +
+ + + diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 2144809b32df..a4b08861004d 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -247,7 +247,8 @@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) COMPONENT_HELP= \ $(ZIP1DIR)$/help/component.txt \ - $(ZIP1DIR)$/help$/en-US$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp + $(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) @@ -282,14 +283,10 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp - @echo copying $@ to $< - $(MKDIRHIER) $(@:d) - $(COPY) $< $@ - -#$(COMPONENT_FILES) : $$(@:f) -# -$(MKDIRHIER) $(@:d) -# $(COPY) $< $@ +$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp + @echo creating $@ + @@-$(MKDIRHIER) $(@:d) + $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" > $@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) -- cgit From 5d3dc92d7477ff0e0094d1c40d4732ce2f9a1fe8 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 10 Dec 2009 18:02:55 +0100 Subject: aus111: #i107498# - xhp localization outside helpcontent2 and the according cleanup in sdext --- .../presenter.xhp | 189 --------------------- .../presenter.xhp | 189 --------------------- .../presenter.xhp | 189 --------------------- .../presenter.xhp | 189 --------------------- .../presenter.xhp | 189 --------------------- .../presenter.xhp | 189 --------------------- 6 files changed, 1134 deletions(-) delete mode 100755 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86/presenter.xhp delete mode 100644 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86_64/presenter.xhp delete mode 100755 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-macosx_x86/presenter.xhp delete mode 100755 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_sparc/presenter.xhp delete mode 100644 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_x86/presenter.xhp delete mode 100755 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-windows_x86/presenter.xhp diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86/presenter.xhp deleted file mode 100755 index ba804733ac7d..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86/presenter.xhp +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - Sun Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen-linux_x86/presenter.xhp - - - - -Presenter Console shortcuts - -Sun Presenter Console Keyboard Shortcuts - When running a slide show using the Sun Presenter Console, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the Presenter Console - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86_64/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86_64/presenter.xhp deleted file mode 100644 index 2ad489b265d4..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86_64/presenter.xhp +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - Sun Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen-linux_x86_64/presenter.xhp - - - - -Presenter Console shortcuts - -Sun Presenter Console Keyboard Shortcuts - When running a slide show using the Sun Presenter Console, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the Presenter Console - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-macosx_x86/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-macosx_x86/presenter.xhp deleted file mode 100755 index 551fa61b5849..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-macosx_x86/presenter.xhp +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - Sun Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen-macosx_x86/presenter.xhp - - - - -Presenter Console shortcuts - -Sun Presenter Console Keyboard Shortcuts - When running a slide show using the Sun Presenter Console, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the Presenter Console - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_sparc/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_sparc/presenter.xhp deleted file mode 100755 index a6e2b55d2e7d..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_sparc/presenter.xhp +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - Sun Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen-solaris_sparc/presenter.xhp - - - - -Presenter Console shortcuts - -Sun Presenter Console Keyboard Shortcuts - When running a slide show using the Sun Presenter Console, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the Presenter Console - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_x86/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_x86/presenter.xhp deleted file mode 100644 index 5bbf174953e5..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-solaris_x86/presenter.xhp +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - Sun Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen-solaris_x86/presenter.xhp - - - - -Presenter Console shortcuts - -Sun Presenter Console Keyboard Shortcuts - When running a slide show using the Sun Presenter Console, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the Presenter Console - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-windows_x86/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-windows_x86/presenter.xhp deleted file mode 100755 index fabd7a3fa35c..000000000000 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen-windows_x86/presenter.xhp +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - Sun Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen-windows_x86/presenter.xhp - - - - -Presenter Console shortcuts - -Sun Presenter Console Keyboard Shortcuts - When running a slide show using the Sun Presenter Console, you can use the following keys: - - - - Action - - - Key or Keys - - - - - Next slide, or next effect - - - Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N' - - - - - Previous slide, or previous effect - - - Right click, left arrow, up arrow, page up, backspace, 'P' - - - - - First slide - - - Home - - - - - Last slide - - - End - - - - - Previous slide without effects - - - Alt+Page Up - - - - - Next slide without effects - - - Alt+Page Down - - - - - Black/Unblack the screen - - - 'B', '.' - - - - - White/Unwhite the screen - - - 'W', ',' - - - - - End slide show - - - Esc, '-' - - - - - Go to slide number - - - Number followed by Enter - - - - - Grow/Shrink size of notes font - - - 'G', 'S' - - - - - Scroll notes up/down - - - 'A', 'Z' - - - - - Move caret in notes view backward/forward - - - 'H', 'L' - - - - - Show the Presenter Console - - - Ctrl-'1' - - - - - Show the Presentation Notes - - - Ctrl-'2' - - - - - Show the Slides Overview - - - Ctrl-'3' - - -
- - - -- cgit