[Libreoffice-commits] .: 32 commits - Makefile Module_tail_build.mk postprocess/prj RepositoryExternal.mk Repository.mk RepositoryModule_ooo.mk sdext/Configuration_minimizer.mk sdext/Configuration_presenter.mk sdext/CppunitTest_pdfimport.mk sdext/Executable_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Executable_xpdfimport.mk sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/inc sdext/Library_minimizer.mk sdext/Library_pdfimport.mk sdext/Library_presenter.mk sdext/Makefile sdext/Module_sdext.mk sdext/Package_pdfimport_keywords.mk sdext/Package_presenter_help.mk sdext/platform.mk sdext/prj sdext/source sdext/util sdext/Zip_minimizer.mk sdext/Zip_presenter.mk solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Tue Mar 6 01:34:46 PST 2012
Makefile | 2
Module_tail_build.mk | 1
Repository.mk | 6
RepositoryExternal.mk | 53
RepositoryModule_ooo.mk | 1
dev/null |binary
postprocess/prj/build.lst | 2
postprocess/prj/build.lst.orig | 12
sdext/Configuration_minimizer.mk | 43
sdext/Configuration_presenter.mk | 43
sdext/CppunitTest_pdfimport.mk | 90
sdext/Executable_pdf2xml.mk | 77
sdext/Executable_pdfunzip.mk | 76
sdext/Executable_xpdfimport.mk | 45
sdext/Extension_minimizer.mk | 54
sdext/Extension_pdfimport.mk | 59
sdext/Extension_presenter.mk | 158 +
sdext/Library_minimizer.mk | 58
sdext/Library_pdfimport.mk | 87
sdext/Library_presenter.mk | 85
sdext/Makefile | 7
sdext/Module_sdext.mk | 64
sdext/Package_pdfimport_keywords.mk | 36
sdext/Package_presenter_help.mk | 36
sdext/Zip_minimizer.mk | 35
sdext/Zip_presenter.mk | 34
sdext/inc/makefile.mk | 39
sdext/platform.mk | 49
sdext/prj/build.lst | 18
sdext/prj/d.lst | 13
sdext/prj/makefile.mk | 1
sdext/source/minimizer/delzip | 1
sdext/source/minimizer/description.xml | 4
sdext/source/minimizer/makefile.mk | 158 -
sdext/source/minimizer/manifest.xml | 2
sdext/source/minimizer/minimizer.pmk | 28
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk | 50
sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk | 48
sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs | 69
sdext/source/pdfimport/config/manifest.xml | 14
sdext/source/pdfimport/delzip | 1
sdext/source/pdfimport/description.xml | 4
sdext/source/pdfimport/makefile.mk | 172 -
sdext/source/pdfimport/manifest.xml | 14
sdext/source/pdfimport/misc/makefile.mk | 51
sdext/source/pdfimport/odf/makefile.mk | 50
sdext/source/pdfimport/pdfiadaptor.cxx | 16
sdext/source/pdfimport/pdfiadaptor.hxx | 3
sdext/source/pdfimport/pdfisettings.pmk | 28
sdext/source/pdfimport/pdfparse/makefile.mk | 58
sdext/source/pdfimport/sax/makefile.mk | 51
sdext/source/pdfimport/test/makefile.mk | 141 -
sdext/source/pdfimport/test/tests.cxx | 101
sdext/source/pdfimport/tree/makefile.mk | 56
sdext/source/pdfimport/wrapper/Makefile | 37
sdext/source/pdfimport/wrapper/makefile.mk | 59
sdext/source/pdfimport/wrapper/wrapper.cxx | 4
sdext/source/pdfimport/xpdfwrapper/makefile.mk | 82
sdext/source/presenter/PresenterClock.cxx | 1287 ----------
sdext/source/presenter/PresenterClock.hxx | 196 -
sdext/source/presenter/PresenterExtensionIdentifier.hxx | 38
sdext/source/presenter/PresenterExtensionIdentifier.txx | 41
sdext/source/presenter/delzip | 1
sdext/source/presenter/description.xml | 4
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile | 40
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk | 51
sdext/source/presenter/makefile.mk | 355 --
sdext/source/presenter/manifest.xml | 2
sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk | 51
sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk | 48
sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs | 7
sdext/util/makefile.pmk | 37
solenv/gbuild/Extension.mk | 106
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5
solenv/gbuild/platform/com_GCC_defs.mk | 5
solenv/gbuild/platform/solaris.mk | 5
78 files changed, 1629 insertions(+), 3242 deletions(-)
New commits:
commit 3324a076b8ec86b16bae7aaa99b21c9c4a8cdf09
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 6 10:19:58 2012 +0100
add dummy dep for generated file
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index ccedc42..c9e725b 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -151,4 +151,8 @@ $(eval $(call gb_Extension_localize_help,presenter-screen,\
help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,\
$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
+# this file is created by a custom target, but we depend on it: ensure
+# make knows about it
+$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp :| $(gb_Helper_DUMMY)
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit e5fab5a0ebbdeede66288f7d4d38c2b9dd56850b
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 6 06:15:02 2012 +0100
update makefile
diff --git a/sdext/Makefile b/sdext/Makefile
index 7bbbe6c..ccb1c85 100644
--- a/sdext/Makefile
+++ b/sdext/Makefile
@@ -1,40 +1,7 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
# vim: set noet sw=4 ts=4:
commit 71eb43357bf2e4d98f67a17cdf1071e018289d1a
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 6 06:11:58 2012 +0100
this code is still used by pdfimport's test apps
This reverts commit 4001370ba5900dd0a0ec04c62f5aeb347bde025a.
Conflicts:
unusedcode.easy
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 1d1a3ad..1fc25d8 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -260,6 +260,22 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput
return bSuccess;
}
+bool PDFIRawAdaptor::odfConvert( const rtl::OUString& rURL,
+ const uno::Reference<io::XOutputStream>& xOutput,
+ const uno::Reference<task::XStatusIndicator>& xStatus )
+{
+ XmlEmitterSharedPtr pEmitter = createOdfEmitter(xOutput);
+ const bool bSuccess = parse(uno::Reference<io::XInputStream>(),
+ uno::Reference<task::XInteractionHandler>(),
+ rtl::OUString(),
+ xStatus,pEmitter,rURL);
+
+ // tell input stream that it is no longer needed
+ xOutput->closeOutput();
+
+ return bSuccess;
+}
+
// XImportFilter
sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::PropertyValue >& rSourceData,
const uno::Reference< xml::sax::XDocumentHandler >& rHdl,
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index d2b2943..d9d6d71 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -121,6 +121,9 @@ namespace pdfi
@param xStatus
Optional status indicator
*/
+ bool odfConvert( const rtl::OUString& rURL,
+ const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOutput,
+ const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus );
// XImportFilter
virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData,
commit e02aeba0d7a69bc5c50d930351406a269b7cbf00
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 5 14:36:16 2012 +0100
move sdext to gbuild section
diff --git a/Makefile b/Makefile
index 5834728..5da1387 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,7 @@ scaddins\
sccomp\
scripting\
sd\
+sdext\
sfx2\
slideshow\
smoketest\
@@ -220,7 +221,6 @@ reportbuilder\
rhino\
saxon\
scp2\
-sdext\
setup_native\
shell\
solenv\
commit 50d5361abb2cbcad84791fba152c647a367d8a1c
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 19:15:09 2012 +0100
the passed string is already quoted
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 807bcdd..27d8567 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -63,7 +63,6 @@
#include "basegfx/tools/unopolypolygon.hxx"
#include <boost/bind.hpp>
-#include <boost/preprocessor/stringize.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
@@ -1017,8 +1016,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR
converterURL.insert(
0,
xProvider->getPackageLocation(
- rtl::OUString::createFromAscii(
- BOOST_PP_STRINGIZE(PDFI_IMPL_IDENTIFIER))));
+ rtl::OUString::createFromAscii(PDFI_IMPL_IDENTIFIER)));
}
// spawn separate process to keep LGPL/GPL code apart.
commit 9bb97a34f0a0ebad0eb6815b70c883e8db92e510
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 17:18:50 2012 +0100
remove leftover makefiles
diff --git a/sdext/source/minimizer/delzip b/sdext/source/minimizer/delzip
deleted file mode 100644
index 8b13789..0000000
--- a/sdext/source/minimizer/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sdext/source/minimizer/minimizer.pmk b/sdext/source/minimizer/minimizer.pmk
deleted file mode 100644
index f832f2d..0000000
--- a/sdext/source/minimizer/minimizer.pmk
+++ /dev/null
@@ -1,28 +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.
-#
-#*************************************************************************
-
-EXTENSIONNAME:=PresentationMinimizer
diff --git a/sdext/source/pdfimport/delzip b/sdext/source/pdfimport/delzip
deleted file mode 100644
index e16c76d..0000000
--- a/sdext/source/pdfimport/delzip
+++ /dev/null
@@ -1 +0,0 @@
-""
diff --git a/sdext/source/pdfimport/pdfisettings.pmk b/sdext/source/pdfimport/pdfisettings.pmk
deleted file mode 100644
index b0f6ae4..0000000
--- a/sdext/source/pdfimport/pdfisettings.pmk
+++ /dev/null
@@ -1,28 +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.
-#
-#*************************************************************************
-
-IMPLEMENTATION_IDENTIFIER="com.sun.star.PDFImport-$(PLATFORMID)"
diff --git a/sdext/source/presenter/delzip b/sdext/source/presenter/delzip
deleted file mode 100644
index 636fda9..0000000
--- a/sdext/source/presenter/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
commit 6f223177f995d3c9347226356e96c67a62a7ec51
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 13:43:14 2012 +0100
convert pdfimport test
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
new file mode 100644
index 0000000..bbda2d5
--- /dev/null
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -0,0 +1,90 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sdext_pdfimport))
+
+$(eval $(call gb_CppunitTest_add_defs,sdext_pdfimport,\
+ -DPDFIMPORT_EXECUTABLE_LOCATION=\"file://$(dir $(call gb_Executable_get_target,xpdfimport))\" \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sdext_pdfimport,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sdext_pdfimport,\
+ -I$(SRCDIR)/sdext/source/pdfimport/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
+ zlib \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sdext_pdfimport,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ test \
+ unotest \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_static_libs,sdext_pdfimport,\
+ basegfx_s \
+))
+
+$(eval $(call gb_CppunitTest_add_library_objects,sdext_pdfimport,\
+ pdfimport \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
+ sdext/source/pdfimport/test/tests \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sdext_pdfimport))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sdext_pdfimport,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sdext_pdfimport,\
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ i18npool/util/i18npool \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sdext_pdfimport,\
+ --headless \
+ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index a8fef26..8f49690 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -45,6 +45,10 @@ $(eval $(call gb_Module_add_targets,sdext,\
Library_pdfimport \
Package_pdfimport_keywords \
))
+
+$(eval $(call gb_Module_add_check_targets,sdext,\
+ CppunitTest_pdfimport \
+))
endif
ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk
deleted file mode 100755
index fdc3966..0000000
--- a/sdext/source/pdfimport/test/makefile.mk
+++ /dev/null
@@ -1,141 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sdext
-TARGET=tests
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- test lib ------------------------------------------------------
-
-.IF "$(ENABLE_PDFIMPORT)" == "NO"
- at all:
- @echo "PDF Import extension disabled."
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
-SHL1OBJS= \
- $(SLO)$/tests.obj
-
-SHL1LIBS=\
- $(SLB)$/pdfmisc.lib \
- $(SLB)$/pdfparse.lib \
- $(SLB)$/pdfsax.lib \
- $(SLB)$/pdfparsetree.lib \
- $(SLB)$/pdfodf.lib \
- $(SLB)$/xpdfwrapper.lib \
- $(SLB)$/pdfimport.lib
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
- $(BASEGFXLIB) \
- $(UNOTOOLSLIB) \
- $(CANVASTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPUNITLIB) \
- $(ZLIB3RDLIB) \
- $(CPPULIB) \
- $(UNOTESTLIB) \
- $(TESTLIB) \
- $(SALLIB)
-
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-
-# --- pdf2xml binary ------------------------------------------------------
-
-TARGET2=pdf2xml
-
-APP1TARGET=$(TARGET2)
-APP1LIBSALCPPRT=
-APP1OBJS=$(SLO)$/pdf2xml.obj
-
-APP1LIBS=\
- $(SLB)$/pdfmisc.lib \
- $(SLB)$/pdfparse.lib \
- $(SLB)$/pdfsax.lib \
- $(SLB)$/pdfparsetree.lib \
- $(SLB)$/pdfodf.lib \
- $(SLB)$/xpdfwrapper.lib \
- $(SLB)$/pdfimport.lib
-
-APP1STDLIBS=\
- $(BASEGFXLIB) \
- $(UNOTOOLSLIB) \
- $(CANVASTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPUNITLIB) \
- $(ZLIB3RDLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-# --- pdfunzip binary ------------------------------------------------------
-
-TARGET3=pdfunzip
-
-APP2TARGET=$(TARGET3)
-APP2LIBSALCPPRT=
-APP2OBJS=$(SLO)$/pdfunzip.obj
-
-APP2LIBS=\
- $(SLB)$/pdfmisc.lib \
- $(SLB)$/pdfparse.lib \
- $(SLB)$/pdfsax.lib \
- $(SLB)$/pdfparsetree.lib \
- $(SLB)$/pdfodf.lib \
- $(SLB)$/xpdfwrapper.lib \
- $(SLB)$/pdfimport.lib
-
-APP2STDLIBS=\
- $(BASEGFXLIB) \
- $(UNOTOOLSLIB) \
- $(CANVASTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPUNITLIB) \
- $(ZLIB3RDLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 0fd470e..78d0a5e 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -60,6 +60,7 @@
#include "cppunit/plugin/TestPlugIn.h"
#include <test/bootstrapfixture.hxx>
+#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XColorSpace.hpp>
#include <com/sun/star/rendering/PathJoinType.hpp>
@@ -79,6 +80,7 @@
#include <vector>
#include <boost/unordered_map.hpp>
+#include <cassert>
using namespace ::pdfparse;
using namespace ::pdfi;
@@ -477,6 +479,92 @@ namespace
bool m_bDashedLineSeen;
};
+ /*
+ This is a (hackish) way to set correct path to the xpdfimport executable
+ during build. Because $OUTDIR/bin is not in $PATH, it will not be found
+ directly. We also know that xpdf_ImportFromFile() tries to get the path
+ through the extension mechanism, but there are no registered extensions
+ available when this test is run. So we create a phony
+ PackageInformationProvider that pretends such extension exists and passes
+ out the path we need .-)
+ */
+
+ typedef cppu::WeakComponentImplHelper1<deployment::XPackageInformationProvider> PackageInformationProvider_Base;
+
+ class PackageInformationProvider
+ : private cppu::BaseMutex
+ , public PackageInformationProvider_Base
+ {
+ public:
+ PackageInformationProvider()
+ : PackageInformationProvider_Base(m_aMutex)
+ {
+ }
+
+ private:
+ virtual rtl::OUString SAL_CALL getPackageLocation(rtl::OUString const&)
+ throw()
+ {
+ rtl::OUString const aLocation(RTL_CONSTASCII_USTRINGPARAM(PDFIMPORT_EXECUTABLE_LOCATION));
+ return aLocation;
+ }
+
+ virtual uno::Sequence<uno::Sequence<rtl::OUString> > SAL_CALL isUpdateAvailable(rtl::OUString const&)
+ throw()
+ {
+ // dummy impl.
+ uno::Sequence<uno::Sequence<rtl::OUString> > const aSeq;
+ return aSeq;
+ }
+
+ virtual uno::Sequence<uno::Sequence<rtl::OUString> > SAL_CALL getExtensionList()
+ throw()
+ {
+ // dummy impl.
+ uno::Sequence<uno::Sequence<rtl::OUString> > const aSeq;
+ return aSeq;
+ }
+ };
+
+ typedef cppu::WeakComponentImplHelper1<uno::XComponentContext> ComponentContext_Base;
+
+ class ComponentContext
+ : private cppu::BaseMutex
+ , public ComponentContext_Base
+ {
+ public:
+ explicit ComponentContext(uno::Reference<uno::XComponentContext> const& xParent)
+ : ComponentContext_Base(m_aMutex)
+ , m_xParent(xParent)
+ {
+ assert(m_xParent.is());
+ }
+
+ private:
+ virtual uno::Any SAL_CALL getValueByName(rtl::OUString const& rName)
+ throw()
+ {
+ if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/singletons/com.sun.star.deployment.PackageInformationProvider")))
+ {
+ uno::Reference<deployment::XPackageInformationProvider> const xProvider(new PackageInformationProvider());
+ uno::Any aComponent;
+ aComponent <<= xProvider;
+ return aComponent;
+ }
+
+ return m_xParent->getValueByName(rName);
+ }
+
+ virtual uno::Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager()
+ throw()
+ {
+ return m_xParent->getServiceManager();
+ }
+
+ private:
+ uno::Reference<uno::XComponentContext> m_xParent;
+ };
+
class PDFITest : public test::BootstrapFixture
{
public:
@@ -487,7 +575,7 @@ namespace
pSink,
uno::Reference< task::XInteractionHandler >(),
rtl::OUString(),
- getComponentContext() );
+ impl_getComponentContext() );
// make destruction explicit, a bunch of things are
// checked in the destructor
@@ -496,7 +584,7 @@ namespace
void testOdfDrawExport()
{
- pdfi::PDFIRawAdaptor aAdaptor( getComponentContext() );
+ pdfi::PDFIRawAdaptor aAdaptor( impl_getComponentContext() );
aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() );
::rtl::OUString aURL, aAbsURL, aBaseURL;
@@ -512,7 +600,7 @@ namespace
void testOdfWriterExport()
{
- pdfi::PDFIRawAdaptor aAdaptor( getComponentContext() );
+ pdfi::PDFIRawAdaptor aAdaptor( impl_getComponentContext() );
aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() );
::rtl::OUString aURL, aAbsURL, aBaseURL;
@@ -531,6 +619,13 @@ namespace
CPPUNIT_TEST(testOdfWriterExport);
CPPUNIT_TEST(testOdfDrawExport);
CPPUNIT_TEST_SUITE_END();
+
+ private:
+ uno::Reference<uno::XComponentContext> impl_getComponentContext()
+ {
+ uno::Reference<uno::XComponentContext> const xCtxt(new ComponentContext(getComponentContext()));
+ return xCtxt;
+ }
};
}
commit 19dd86582b4fa55e9e22d1e92d27ee15c44960d9
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 11:50:22 2012 +0100
the include must be at the beginning
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index e04c2eb..485a14a 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -25,6 +25,8 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
+
$(eval $(call gb_Library_Library,pdfimport))
$(eval $(call gb_Library_add_api,pdfimport,\
@@ -32,8 +34,6 @@ $(eval $(call gb_Library_add_api,pdfimport,\
udkapi \
))
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
-
$(eval $(call gb_Library_add_defs,pdfimport,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
commit 5e5d02fbbe16ad4ebda67cac693ceae67c64e5d4
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 11:44:22 2012 +0100
fix platform ID
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index f59d988..e04c2eb 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -32,11 +32,11 @@ $(eval $(call gb_Library_add_api,pdfimport,\
udkapi \
))
-include $(OUTDIR)/inc/rtlbootstrap.mk
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
$(eval $(call gb_Library_add_defs,pdfimport,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
- -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(RTL_OS)-$(RTL_ARCH)\" \
+ -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
))
$(eval $(call gb_Library_add_package_headers,pdfimport,\
commit 09d3721aa82b8407f76cfb4415401f02ba7c6ed1
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 09:45:51 2012 +0100
remove unused bitmap
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png
deleted file mode 100644
index 65073e4..0000000
Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png and /dev/null differ
commit 270e9214500f0f767251a46c4bbe5e0c8ca0d114
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 09:45:14 2012 +0100
remove unused sources
diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
deleted file mode 100644
index e52f2e0..0000000
--- a/sdext/source/presenter/PresenterClock.cxx
+++ /dev/null
@@ -1,1287 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "PresenterClock.hxx"
-#include "PresenterComponent.hxx"
-#include "PresenterConfigurationAccess.hxx"
-#include "PresenterGeometryHelper.hxx"
-#include <com/sun/star/awt/InvalidateStyle.hpp>
-#include <com/sun/star/awt/MouseButton.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/XWindowPeer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
-#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/rendering/CompositeOperation.hpp>
-#include <com/sun/star/rendering/PathCapType.hpp>
-#include <com/sun/star/rendering/TextDirection.hpp>
-#include <com/sun/star/rendering/XCanvasFont.hpp>
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <com/sun/star/util/Color.hpp>
-#include <osl/mutex.hxx>
-#include <osl/time.h>
-#include <rtl/ref.hxx>
-#include <salhelper/timer.hxx>
-#include <boost/bind.hpp>
-#include <cmath>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
-using ::rtl::OUString;
-
-namespace sdext { namespace presenter {
-
-/** Wrapper around a library timer.
-*/
-class PresenterClock::Timer : public salhelper::Timer
-{
-public:
- explicit Timer (const ::rtl::Reference<PresenterClock>& rpClock);
- virtual ~Timer (void);
-
- void Stop (void);
-
-protected:
- virtual void SAL_CALL onShot (void);
-
-private:
- ::rtl::Reference<PresenterClock> mpClock;
-};
-
-namespace {
- bool GetDateTime (oslDateTime& rDateTime);
-
- class BitmapDescriptor
- {
- public:
- Reference<rendering::XBitmap> mxBitmap;
- awt::Point maOffset;
- Reference<rendering::XBitmap> mxScaledBitmap;
- geometry::RealPoint2D maScaledOffset;
- };
-}
-
-class PresenterClock::Painter
-{
-public:
- virtual void Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bShowSeconds) = 0;
- virtual void Resize (const awt::Size& rSize) = 0;
-};
-
-namespace {
- class AnalogDefaultPainter : public PresenterClock::Painter
- {
- public:
- AnalogDefaultPainter (void);
- virtual ~AnalogDefaultPainter (void) {}
- virtual void Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bShowSeconds);
- virtual void Resize (const awt::Size& rSize);
- private:
- geometry::RealPoint2D maCenter;
- double mnOuterRadius;
- awt::Size maSize;
- Reference<rendering::XBitmap> mxBitmap;
-
- /** Relative length (with respect to radius) from center to the tip of
- the hand.
- */
- static const double mnRelativeHourHandLength;
- /** Relative length (with respect to radius) from center to the
- oposing end of the tip of the hand.
- */
- static const double mnRelativeHourHandLength2;
- static const double mnRelativeHourHandWidth;
- static const double mnRelativeMinuteHandLength;
- static const double mnRelativeMinuteHandLength2;
- static const double mnRelativeMinuteHandWidth;
- static const double mnRelativeSecondHandLength;
- static const double mnRelativeSecondHandLength2;
- static const double mnRelativeSecondHandWidth;
-
- void PaintAngledLine (
- const double nAngle,
- const double nInnerRadius,
- const double nOuterRadius,
- const double nStrokeWidth,
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState);
- };
-
- class AnalogBitmapPainter : public PresenterClock::Painter
- {
- public:
- AnalogBitmapPainter(
- const Reference<XComponentContext>& rxContext,
- const OUString& rsThemeName);
- virtual ~AnalogBitmapPainter (void) {}
- virtual void Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bShowSeconds);
- virtual void Resize (const awt::Size& rSize);
- private:
- css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
- const OUString msThemeName;
- bool mbThemeLoaded;
- bool mbThemeLoadingFailed;
- geometry::RealPoint2D maCenter;
- double mnOuterRadius;
- BitmapDescriptor maFace;
- BitmapDescriptor maMinuteHand;
- BitmapDescriptor maHourHand;
-
- void PrepareBitmaps (const Reference<rendering::XCanvas>& rxCanvas);
- Reference<container::XNameAccess> GetTheme (
- PresenterConfigurationAccess& rConfiguration);
- bool ThemeNameComparator (
- const ::rtl::OUString& rsKey,
- const Reference<container::XNameAccess>& rxCandidate,
- const ::rtl::OUString& rsCurrentThemeName);
- void LoadBitmaps (
- PresenterConfigurationAccess& rConfiguration,
- const Reference<container::XNameAccess>& rxNameAccess,
- const Reference<rendering::XCanvas>& rxCanvas);
- void LoadBitmap (
- const OUString& rsKey,
- const ::std::vector<Any>& rValues,
- const OUString& rsBitmapPath,
- const Reference<container::XNameAccess>& rxBitmapLoader);
- void ScaleBitmaps (void);
- };
-
- class DigitalDefaultPainter : public PresenterClock::Painter
- {
- public:
- DigitalDefaultPainter (
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const Reference<XResourceId>& rxViewId);
- virtual ~DigitalDefaultPainter (void);
-
- virtual void Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bShowSeconds);
- virtual void Resize (const awt::Size& rSize);
-
- private:
- ::rtl::Reference<PresenterController> mpPresenterController;
- bool mbIs24HourFormat;
- bool mbIsAdaptFontSize;
- Reference<rendering::XCanvasFont> mxFont;
- awt::Size maWindowSize;
- OUString msViewURL;
-
- void CreateFont (
- const Reference<rendering::XCanvas>& rxCanvas,
- const bool bIsShowSeconds);
- };
-
-} // end of anonymous namespace
-
-//===== PresenterClock =================================================================
-
-::rtl::Reference<PresenterClock> PresenterClock::Create (
- const Reference<XComponentContext>& rxContext,
- const Reference<XResourceId>& rxViewId,
- const Reference<frame::XController>& rxController,
- const ::rtl::Reference<PresenterController>& rpPresenterController)
-{
- ::rtl::Reference<PresenterClock> pClock (new PresenterClock(
- rxContext,
- rxViewId,
- rxController,
- rpPresenterController));
- pClock->LateInit();
- return pClock;
-}
-
-PresenterClock::PresenterClock (
- const Reference<XComponentContext>& rxContext,
- const Reference<XResourceId>& rxViewId,
- const Reference<frame::XController>& rxController,
- const ::rtl::Reference<PresenterController>& rpPresenterController)
- : PresenterClockInterfaceBase(m_aMutex),
- mxComponentContext(rxContext),
- mxViewId(rxViewId),
- mxWindow(),
- mxCanvas(),
- mxPane(),
- mpPresenterController(rpPresenterController),
- mbIsResizePending(true),
- maViewState(),
- maRenderState(),
- mpTimer(),
- mpClockPainter(),
- mpClockPainter2(),
- mnMode(1),
- mnHour(-1),
- mnMinute(-1),
- mnSecond(-1),
- mbIsShowSeconds(true)
-{
- SetMode(mnMode);
-
- maViewState.AffineTransform = geometry::AffineMatrix2D(1,0,0, 0,1,0);
- maRenderState.AffineTransform = geometry::AffineMatrix2D(1,0,0, 0,1,0);
- maRenderState.DeviceColor = Sequence<double>(4);
- PresenterCanvasHelper::SetDeviceColor(maRenderState, util::Color(0x00000000));
-
- try
- {
-
- Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW);
- Reference<XConfigurationController> xCC (xCM->getConfigurationController(), UNO_QUERY_THROW);
- mxPane = Reference<XPane>(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW);
-
- mxWindow = mxPane->getWindow();
- if (mxWindow.is())
- {
- mxWindow->addPaintListener(this);
- mxWindow->addWindowListener(this);
- mxWindow->addMouseListener(this);
- Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
- if (xPeer.is())
- xPeer->setBackground(util::Color(0xff000000));
- mxWindow->setVisible(sal_True);
- }
-
- Resize();
- }
- catch (RuntimeException&)
- {
- disposing();
- throw;
- }
-}
-
-PresenterClock::~PresenterClock (void)
-{
-}
-
-void PresenterClock::LateInit (void)
-{
- mpTimer = new Timer(this);
-}
-
-void SAL_CALL PresenterClock::disposing (void)
-{
- if (mpTimer != NULL)
- {
- mpTimer->Stop();
- }
- if (mxWindow.is())
- {
- mxWindow->removePaintListener(this);
- mxWindow->removeWindowListener(this);
- mxWindow->removeMouseListener(this);
- mxWindow = NULL;
- }
- mxCanvas = NULL;
- mxViewId = NULL;
-}
-
-void PresenterClock::UpdateTime (void)
-{
- // Get current time and check whether it is different from last time.
- oslDateTime aDateTime;
- if ( ! GetDateTime(aDateTime))
- return;
- if (aDateTime.Hours != mnHour
- || aDateTime.Minutes != mnMinute
- || aDateTime.Seconds != mnSecond)
- {
- mnHour = aDateTime.Hours % 24;
- mnMinute = aDateTime.Minutes % 60;
- mnSecond = aDateTime.Seconds % 60;
-
- Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
- if (xPeer.is())
- xPeer->invalidate(awt::InvalidateStyle::NOERASE |
- awt::InvalidateStyle::UPDATE);
- }
-}
-
-//----- lang::XEventListener -------------------------------------------------
-
-void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
- throw (RuntimeException)
-{
- if (rEventObject.Source == mxWindow)
- {
- mxWindow = NULL;
- if (mpTimer != NULL)
- mpTimer->Stop();
- }
-}
-
-//----- XPaintListener --------------------------------------------------------
-
-void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent)
- throw (RuntimeException)
-{
- ThrowIfDisposed();
- Paint(rEvent.UpdateRect);
-}
-
-//----- XWindowListener -------------------------------------------------------
-
-void SAL_CALL PresenterClock::windowResized (const awt::WindowEvent& rEvent)
- throw (RuntimeException)
-{
- (void)rEvent;
- mbIsResizePending = true;
-}
-
-void SAL_CALL PresenterClock::windowMoved (const awt::WindowEvent& rEvent)
- throw (RuntimeException)
-{
- (void)rEvent;
- mbIsResizePending = true;
-}
-
-void SAL_CALL PresenterClock::windowShown (const lang::EventObject& rEvent)
- throw (RuntimeException)
-{
- (void)rEvent;
- mbIsResizePending = true;
-}
-
-void SAL_CALL PresenterClock::windowHidden (const lang::EventObject& rEvent)
- throw (RuntimeException)
-{
- (void)rEvent;
-}
-
-//----- XMouseListener --------------------------------------------------------
-
-void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException)
-{
- if (rEvent.Buttons == awt::MouseButton::LEFT)
- {
- SetMode(mnMode+1);
- }
-}
-
-void SAL_CALL PresenterClock::mouseReleased (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException)
-{
- (void)rEvent;
-}
-
-void SAL_CALL PresenterClock::mouseEntered (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException)
-{
- (void)rEvent;
-}
-
-void SAL_CALL PresenterClock::mouseExited (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException)
-{
- (void)rEvent;
-}
-
-//----- XResourceId -----------------------------------------------------------
-
-Reference<XResourceId> SAL_CALL PresenterClock::getResourceId (void)
- throw (RuntimeException)
-{
- return mxViewId;
-}
-
-sal_Bool SAL_CALL PresenterClock::isAnchorOnly (void)
- throw (RuntimeException)
-{
- return false;
-}
-
-//-----------------------------------------------------------------------------
-
-void PresenterClock::Resize (void)
-{
- if (mxPane.is())
- mxCanvas = Reference<rendering::XCanvas>(mxPane->getCanvas(), UNO_QUERY);
- if (mxWindow.is() && mxCanvas.is())
- {
- const awt::Rectangle aWindowBox (mxWindow->getPosSize());
- const awt::Size aWindowSize(aWindowBox.Width,aWindowBox.Height);
- if (mpClockPainter.get() != NULL)
- mpClockPainter->Resize(aWindowSize);
- if (mpClockPainter2.get() != NULL)
- mpClockPainter2->Resize(aWindowSize);
- mbIsResizePending = false;
- }
-}
-
-void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
-{
- if ( ! mxCanvas.is() && mxPane.is())
- mxCanvas = Reference<rendering::XCanvas>(mxPane->getCanvas(), UNO_QUERY);
- if ( ! mxWindow.is()
- || ! mxCanvas.is()
- || ! mxCanvas->getDevice().is())
- {
- return;
- }
-
- try
- {
- if (mbIsResizePending)
- Resize();
-
- Reference<rendering::XPolyPolygon2D> xUpdatePolygon (
- PresenterGeometryHelper::CreatePolygon(rUpdateBox, mxCanvas->getDevice()));
-
- Clear(xUpdatePolygon);
-
- if (mpClockPainter.get() != NULL)
- mpClockPainter->Paint(mxCanvas,
- maViewState,
- maRenderState,
- mpPresenterController->GetViewBackgroundColor(mxViewId->getResourceURL()),
- mnHour,
- mnMinute,
- mnSecond,
- mbIsShowSeconds);
-
- if (mpClockPainter2.get() != NULL)
- mpClockPainter2->Paint(
- mxCanvas,
- maViewState,
- maRenderState,
- mpPresenterController->GetViewBackgroundColor(mxViewId->getResourceURL()),
- mnHour,
- mnMinute,
- mnSecond,
- mbIsShowSeconds);
- }
- catch (RuntimeException& e)
- {
- (void)e;
- }
-
- // Make the back buffer visible.
- Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY);
- if (xSpriteCanvas.is())
- xSpriteCanvas->updateScreen(sal_False);
-}
-
-void PresenterClock::Clear (const Reference<rendering::XPolyPolygon2D>& rxUpdatePolygon)
-{
- rendering::RenderState aRenderState = maRenderState;
- const sal_Int32 nColor (
- mpPresenterController->GetViewBackgroundColor(mxViewId->getResourceURL()));
- aRenderState.DeviceColor[0] = ((nColor&0x00ff0000) >> 16) / 255.0;
- aRenderState.DeviceColor[1] = ((nColor&0x0000ff00) >> 8) / 255.0;
- aRenderState.DeviceColor[2] = ((nColor&0x000000ff) >> 0) / 255.0;
-
- if (rxUpdatePolygon.is())
- mxCanvas->fillPolyPolygon(
- rxUpdatePolygon,
- maViewState,
- aRenderState);
-}
-
-void PresenterClock::SetMode (const sal_Int32 nMode)
-{
- mnMode = nMode % 3;
-
- switch (mnMode)
- {
- case 0:
- mpClockPainter.reset(
- new AnalogBitmapPainter(
- mxComponentContext,
- OUString(RTL_CONSTASCII_USTRINGPARAM("ClockTheme"))));
- mpClockPainter2.reset();
- break;
-
- case 1:
- mpClockPainter.reset();
- mpClockPainter2.reset(new AnalogDefaultPainter());
- break;
-
- case 2:
- mpClockPainter.reset();
- mpClockPainter2.reset(new DigitalDefaultPainter(mpPresenterController, mxViewId));
- break;
-
- case 3:
- mpClockPainter.reset(
- new AnalogBitmapPainter(
- mxComponentContext,
- OUString(RTL_CONSTASCII_USTRINGPARAM("ClockTheme"))));
- mpClockPainter2.reset(new AnalogDefaultPainter());
- break;
- }
- Resize();
-}
-
-void PresenterClock::ThrowIfDisposed (void)
- throw (::com::sun::star::lang::DisposedException)
-{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "PresenterClock object has already been disposed")),
- static_cast<uno::XWeak*>(this));
- }
-}
-
-//===== Timer =================================================================
-
-PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock)
- : salhelper::Timer(salhelper::TTimeValue(10), salhelper::TTimeValue(100/*ms*/)),
- mpClock(rpClock)
-{
- acquire();
- start();
-}
-
-PresenterClock::Timer::~Timer (void)
-{
- if (mpClock.is())
- Stop();
-}
-
-void PresenterClock::Timer::Stop (void)
-{
- mpClock = NULL;
- stop();
- release();
-}
-
-void SAL_CALL PresenterClock::Timer::onShot (void)
-{
- if (mpClock.get() != NULL)
- mpClock->UpdateTime();
-}
-
-namespace {
-
-//=============================================================================
-
-bool GetDateTime (oslDateTime& rDateTime)
-{
- TimeValue aSystemTime;
- TimeValue aLocalTime;
- if (osl_getSystemTime(&aSystemTime))
- if (osl_getLocalTimeFromSystemTime(&aSystemTime, &aLocalTime))
- if (osl_getDateTimeFromTimeValue(&aLocalTime, &rDateTime))
- return true;
- return false;
-}
-
-//===== AnalogDefaultPainter ==================================================
-
-const double AnalogDefaultPainter::mnRelativeHourHandLength = 0.65;
-const double AnalogDefaultPainter::mnRelativeHourHandLength2 (-0.1);
-const double AnalogDefaultPainter::mnRelativeHourHandWidth (0.055);
-const double AnalogDefaultPainter::mnRelativeMinuteHandLength (-0.2);
-const double AnalogDefaultPainter::mnRelativeMinuteHandLength2 (0.85);
-const double AnalogDefaultPainter::mnRelativeMinuteHandWidth (0.025);
-const double AnalogDefaultPainter::mnRelativeSecondHandLength (-0.25);
-const double AnalogDefaultPainter::mnRelativeSecondHandLength2 (0.95);
-const double AnalogDefaultPainter::mnRelativeSecondHandWidth (0.015);
-
-AnalogDefaultPainter::AnalogDefaultPainter (void)
- : maCenter(0,0),
- mnOuterRadius(0),
- maSize(0,0),
- mxBitmap()
-{
-}
-
-void AnalogDefaultPainter::Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bShowSeconds)
-{
- double nInnerRadius (0);
- double nStrokeWidth (0.1);
- const double nClockSize (2*mnOuterRadius);
-
- // Some antialiasing is created by painting into a bitmap twice the
- // screen size and then scaling it down.
- const sal_Int32 nSuperSampleFactor (2);
- if ( ! mxBitmap.is())
- {
- mxBitmap = (rxCanvas->getDevice()->createCompatibleBitmap(
- geometry::IntegerSize2D(
- maSize.Width*nSuperSampleFactor,
- maSize.Height*nSuperSampleFactor)));
- }
- Reference<rendering::XCanvas> xBitmapCanvas (mxBitmap, UNO_QUERY);
- rendering::RenderState aRenderState(rRenderState);
- aRenderState.AffineTransform.m00 = nSuperSampleFactor;
- aRenderState.AffineTransform.m11 = nSuperSampleFactor;
-
- // Clear the background.
- aRenderState.DeviceColor[0] = ((rBackgroundColor&0x00ff0000) >> 16) / 255.0;
- aRenderState.DeviceColor[1] = ((rBackgroundColor&0x0000ff00) >> 8) / 255.0;
- aRenderState.DeviceColor[2] = ((rBackgroundColor&0x000000ff) >> 0) / 255.0;
- Reference<rendering::XPolyPolygon2D> xPolygon (
- PresenterGeometryHelper::CreatePolygon(
- awt::Rectangle(0,0,maSize.Width,maSize.Height),
- xBitmapCanvas->getDevice()));
- if (xPolygon.is())
- xBitmapCanvas->fillPolyPolygon(xPolygon, rViewState, aRenderState);
-
- // Clock face and clock hands are painted in black.
- aRenderState.DeviceColor[0] = 0;
- aRenderState.DeviceColor[1] = 0;
- aRenderState.DeviceColor[2] = 0;
-
- // Paint the clock face.
- for (sal_Int32 nHourMark=0; nHourMark<12; ++nHourMark)
- {
- if (nHourMark%3 == 0)
- {
- nInnerRadius = 0.7 * mnOuterRadius;
- nStrokeWidth = 0.05 * nClockSize;
- }
- else
- {
- nInnerRadius = 0.8 * mnOuterRadius;
- nStrokeWidth = 0.03 * nClockSize;
- }
-
- const double nAngle (nHourMark * 2 * M_PI / 12);
- PaintAngledLine(nAngle, nInnerRadius, mnOuterRadius, nStrokeWidth,
- xBitmapCanvas, rViewState, aRenderState);
- }
-
- // Paint the hour hand.
- const double nHoursAngle (((nHour%12)+nMinute/60.0) * 2 * M_PI / 12);
- PaintAngledLine(nHoursAngle,
- mnRelativeHourHandLength2*mnOuterRadius,
- mnRelativeHourHandLength*mnOuterRadius,
- mnRelativeHourHandWidth*nClockSize,
- xBitmapCanvas, rViewState, aRenderState);
-
- // Paint the minute hand.
- const double nMinutesAngle ((nMinute+nSecond/60.0) * 2 * M_PI / 60);
- PaintAngledLine(nMinutesAngle,
- mnRelativeMinuteHandLength2*mnOuterRadius,
- mnRelativeMinuteHandLength*mnOuterRadius,
- mnRelativeMinuteHandWidth*nClockSize,
- xBitmapCanvas, rViewState, aRenderState);
-
- // Optionally paint the second hand.
- if (bShowSeconds)
- {
- const double nSecondsAngle (nSecond * 2 * M_PI / 60);
- PaintAngledLine(nSecondsAngle,
- mnRelativeSecondHandLength2*mnOuterRadius,
- mnRelativeSecondHandLength*mnOuterRadius,
- mnRelativeSecondHandWidth*nClockSize,
- xBitmapCanvas, rViewState, aRenderState);
- }
-
- aRenderState.AffineTransform.m00 = 1.0 / nSuperSampleFactor;
- aRenderState.AffineTransform.m11 = 1.0 / nSuperSampleFactor;
- rxCanvas->drawBitmap(mxBitmap,rViewState,aRenderState);
-}
-
-void AnalogDefaultPainter::PaintAngledLine (
- const double nAngle,
- const double nInnerRadius,
- const double nOuterRadius,
- const double nStrokeWidth,
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState)
-{
- if ( ! rxCanvas.is())
- return;
-
- rendering::StrokeAttributes aStrokeAttributes;
- aStrokeAttributes.StrokeWidth = nStrokeWidth;
- aStrokeAttributes.StartCapType = rendering::PathCapType::SQUARE;
- aStrokeAttributes.EndCapType = rendering::PathCapType::SQUARE;
- aStrokeAttributes.StartCapType = rendering::PathCapType::BUTT;
- aStrokeAttributes.EndCapType = rendering::PathCapType::BUTT;
- const double nCos (cos(nAngle - M_PI/2));
- const double nSin (sin(nAngle - M_PI/2));
-
- Sequence<Sequence<geometry::RealPoint2D> > aPoints(1);
- aPoints[0] = Sequence<geometry::RealPoint2D>(2);
- aPoints[0][0] = geometry::RealPoint2D(
- maCenter.X + nInnerRadius*nCos + 0.5,
- maCenter.Y + nInnerRadius*nSin + 0.5);
- aPoints[0][1] = geometry::RealPoint2D(
- maCenter.X + nOuterRadius*nCos + 0.5,
- maCenter.Y + nOuterRadius*nSin + 0.5);
-
- Reference<rendering::XPolyPolygon2D> xLine (
- rxCanvas->getDevice()->createCompatibleLinePolyPolygon(aPoints),
- UNO_QUERY);
- if ( ! xLine.is())
- return;
- rxCanvas->strokePolyPolygon(
- xLine,
- rViewState,
- rRenderState,
- aStrokeAttributes);
-}
-
-void AnalogDefaultPainter::Resize (const awt::Size& rWindowSize)
-{
- maSize = rWindowSize;
- maCenter = geometry::RealPoint2D(rWindowSize.Width/2.0, rWindowSize.Height/2.0);
- mnOuterRadius = ::std::min(rWindowSize.Width, rWindowSize.Height) / 2.0 - 2;
- mxBitmap = NULL;
-}
-
-//===== AnalogBitmapPainter ===================================================
-
-AnalogBitmapPainter::AnalogBitmapPainter (
- const Reference<XComponentContext>& rxContext,
- const OUString& rsThemeName)
- : mxComponentContext(rxContext),
- msThemeName(rsThemeName),
- mbThemeLoaded(false),
- mbThemeLoadingFailed(false),
- maCenter(),
- mnOuterRadius(),
- maFace(),
- maMinuteHand(),
- maHourHand()
-{
-}
-
-void AnalogBitmapPainter::Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bShowSeconds)
-{
- (void)rBackgroundColor;
- (void)nSecond;
- (void)bShowSeconds;
-
- if ( ! rxCanvas.is())
- return;
-
- rendering::RenderState aRenderState = rRenderState;
-
- try
- {
- PrepareBitmaps(rxCanvas);
-
- if (maFace.mxScaledBitmap.is())
- {
- aRenderState.AffineTransform = geometry::AffineMatrix2D(
- 1,0, maCenter.X - maFace.maScaledOffset.X,
- 0,1, maCenter.Y - maFace.maScaledOffset.Y);
- rxCanvas->drawBitmap(maFace.mxScaledBitmap, rViewState, aRenderState);
- }
-
- if (maMinuteHand.mxScaledBitmap.is())
- {
- const double nMinuteAngle ((nMinute+nSecond/60.0) * 2.0 * M_PI / 60.0);
- const double nCos (cos(nMinuteAngle - M_PI/2));
- const double nSin (sin(nMinuteAngle - M_PI/2));
- aRenderState.AffineTransform = geometry::AffineMatrix2D(
- nCos,
- -nSin,
- -maMinuteHand.maScaledOffset.X*nCos
- + maMinuteHand.maScaledOffset.Y*nSin+maCenter.X,
- nSin,
- nCos,
- -maMinuteHand.maScaledOffset.X*nSin
- - maMinuteHand.maScaledOffset.Y*nCos+maCenter.Y);
- rxCanvas->drawBitmap(maMinuteHand.mxScaledBitmap, rViewState, aRenderState);
- }
-
- if (maHourHand.mxScaledBitmap.is())
- {
- const double nHoursAngle ((nHour%12+nMinute/60.0) * 2.0 * M_PI / 12.0);
- const double nCos (cos(nHoursAngle - M_PI/2));
- const double nSin (sin(nHoursAngle - M_PI/2));
- aRenderState.AffineTransform = geometry::AffineMatrix2D(
- nCos,
- -nSin,
- -maHourHand.maScaledOffset.X*nCos+maHourHand.maScaledOffset.Y*nSin+maCenter.X,
- nSin,
- nCos,
- -maHourHand.maScaledOffset.X*nSin-maHourHand.maScaledOffset.Y*nCos+maCenter.Y);
- rxCanvas->drawBitmap(maHourHand.mxScaledBitmap, rViewState, aRenderState);
- }
- }
- catch(beans::UnknownPropertyException&)
- {
- }
- catch(RuntimeException&)
- {
- }
-}
-
-void AnalogBitmapPainter::Resize (const awt::Size& rWindowSize)
-{
- maCenter = geometry::RealPoint2D(rWindowSize.Width/2.0, rWindowSize.Height/2.0);
- mnOuterRadius = ::std::min(rWindowSize.Width, rWindowSize.Height) / 2.0 - 2;
- maFace.mxScaledBitmap = NULL;
- maHourHand.mxScaledBitmap = NULL;
- maMinuteHand.mxScaledBitmap = NULL;
-}
-
-void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& rxCanvas)
-{
- if (mbThemeLoadingFailed)
- {
- // Theme loading has failed previously. Do not try a second time.
- return;
- }
- if ( ! rxCanvas.is())
- {
- // No canvas => bitmaps can neither be loaded, transformed into the
- // right format, nor can they be painted.
- return;
- }
-
- if ( ! mbThemeLoaded)
- {
- mbThemeLoaded = true;
-
- // Get access to the clock bitmaps in the configuration.
- PresenterConfigurationAccess aConfiguration (
- mxComponentContext,
- OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")),
- PresenterConfigurationAccess::READ_ONLY);
-
- Reference<container::XNameAccess> xTheme (GetTheme(aConfiguration));
- if (xTheme.is())
- LoadBitmaps(aConfiguration, xTheme, rxCanvas);
- else
- mbThemeLoadingFailed = true;
- }
-
- ScaleBitmaps();
-}
-
-Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme (
- PresenterConfigurationAccess& rConfiguration)
-{
- Reference<container::XNameAccess> xTheme;
-
- // Get root of clock themes.
- Reference<container::XHierarchicalNameAccess> xClock (
- rConfiguration.GetConfigurationNode(
- OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/AnalogBitmapClock"))),
- UNO_QUERY);
-
- // Determine the name of the theme to use.
- OUString sCurrentThemeName (RTL_CONSTASCII_USTRINGPARAM("DefaultTheme"));
- rConfiguration.GetConfigurationNode(
- xClock,
- OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTheme"))) >>= sCurrentThemeName;
-
- // Load the clock theme.
- Reference<container::XNameAccess> xThemes (
- rConfiguration.GetConfigurationNode(
- xClock,
- OUString(RTL_CONSTASCII_USTRINGPARAM("Themes"))),
- UNO_QUERY);
- if (xThemes.is())
- {
- xTheme = Reference<container::XNameAccess>(
- PresenterConfigurationAccess::Find(
- xThemes,
- ::boost::bind(&AnalogBitmapPainter::ThemeNameComparator,
- this, _1, _2, sCurrentThemeName)),
- UNO_QUERY);
- }
-
- return xTheme;
-}
-
-bool AnalogBitmapPainter::ThemeNameComparator (
- const OUString& rsKey,
- const Reference<container::XNameAccess>& rxCandidate,
- const OUString& rsCurrentThemeName)
-{
- (void)rsKey;
- if (rxCandidate.is())
- {
- OUString sThemeName;
- if (rxCandidate->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ThemeName"))) >>= sThemeName)
- {
- return sThemeName == rsCurrentThemeName;
- }
- }
- return false;
-}
-
-void AnalogBitmapPainter::LoadBitmaps (
- PresenterConfigurationAccess& rConfiguration,
- const Reference<container::XNameAccess>& rxClockTheme,
- const Reference<rendering::XCanvas>& rxCanvas)
-{
- (void)rConfiguration;
-
- // Get base path to bitmaps.
- Reference<deployment::XPackageInformationProvider> xInformationProvider (
- mxComponentContext->getValueByName(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "/singletons/com.sun.star.deployment.PackageInformationProvider"))),
- UNO_QUERY);
- OUString sLocation;
- if (xInformationProvider.is())
- sLocation = xInformationProvider->getPackageLocation(gsExtensionIdentifier);
- sLocation += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-
- // Create the bitmap loader.
- Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_QUERY);
- if ( ! xFactory.is())
- return;
- Sequence<Any> aArguments(1);
- aArguments[0] <<= rxCanvas;
- Reference<container::XNameAccess> xBitmapLoader(
- xFactory->createInstanceWithArgumentsAndContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterWorkaroundService")),
- aArguments,
- mxComponentContext),
- UNO_QUERY);
- if ( ! xBitmapLoader.is())
- return;
-
- // Iterate over all entries in the bitmap list and load the bitmaps.
- Reference<container::XNameAccess> xBitmaps (
- rxClockTheme->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmaps"))),
- UNO_QUERY);
- ::std::vector<rtl::OUString> aBitmapProperties (3);
- aBitmapProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("FileName"));
- aBitmapProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("XOffset"));
- aBitmapProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("YOffset"));
- PresenterConfigurationAccess::ForAll(
- xBitmaps,
- aBitmapProperties,
- ::boost::bind(&AnalogBitmapPainter::LoadBitmap,
- this,
- _1,
- _2,
- sLocation,
- xBitmapLoader));
-}
-
-void AnalogBitmapPainter::LoadBitmap (
- const OUString& rsKey,
- const ::std::vector<Any>& rValues,
- const OUString& rsBitmapPath,
- const Reference<container::XNameAccess>& rxBitmapLoader)
-{
- if (rValues.size() == 3)
- {
- BitmapDescriptor* pDescriptor = NULL;
- if (rsKey.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Face")))
- pDescriptor = &maFace;
- else if (rsKey.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HourHand")))
- pDescriptor = &maHourHand;
- else if (rsKey.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MinuteHand")))
- pDescriptor = &maMinuteHand;
-
- if (pDescriptor == NULL)
- return;
-
- OUString sFileName;
- if ( ! (rValues[0] >>= sFileName))
- return;
-
- rValues[1] >>= pDescriptor->maOffset.X;
- rValues[2] >>= pDescriptor->maOffset.Y;
-
- pDescriptor->mxBitmap = Reference<rendering::XBitmap>(
- rxBitmapLoader->getByName(rsBitmapPath+sFileName), UNO_QUERY);
-
- if ( ! pDescriptor->mxBitmap.is())
- mbThemeLoadingFailed = true;
- }
-}
-
-void AnalogBitmapPainter::ScaleBitmaps (void)
-{
- if (mbThemeLoadingFailed)
- return;
- if ( ! maFace.mxBitmap.is())
- return;
-
- const geometry::IntegerSize2D aFaceSize (maFace.mxBitmap->getSize());
- const sal_Int32 nSize = std::max(aFaceSize.Width, aFaceSize.Height);
- const double nScale = mnOuterRadius*2 / nSize;
-
- BitmapDescriptor* aDescriptors[3] = { &maFace, &maHourHand, &maMinuteHand };
- for (int nIndex=0; nIndex<3; ++nIndex)
- {
- BitmapDescriptor& rDescriptor (*aDescriptors[nIndex]);
- if ( ! rDescriptor.mxScaledBitmap.is() && rDescriptor.mxBitmap.is())
- {
- const geometry::IntegerSize2D aBitmapSize (rDescriptor.mxBitmap->getSize());
- rDescriptor.mxScaledBitmap = rDescriptor.mxBitmap->getScaledBitmap(
- geometry::RealSize2D(aBitmapSize.Width*nScale, aBitmapSize.Height*nScale),
- sal_False);
- rDescriptor.maScaledOffset = geometry::RealPoint2D(
- rDescriptor.maOffset.X * nScale,
- rDescriptor.maOffset.Y * nScale);
- }
- }
-}
-
-//===== DigitalDefaultPainter =================================================
-
-DigitalDefaultPainter::DigitalDefaultPainter (
- const ::rtl::Reference<PresenterController>& rpPresenterController,
- const Reference<XResourceId>& rxViewId)
- : mpPresenterController(rpPresenterController),
- mbIs24HourFormat(false),
- mbIsAdaptFontSize(true),
- mxFont(),
- maWindowSize(0,0),
- msViewURL(rxViewId.is() ? rxViewId->getResourceURL() : OUString())
-{
-}
-
-DigitalDefaultPainter::~DigitalDefaultPainter (void)
-{
-}
-
-void DigitalDefaultPainter::Paint (
- const Reference<rendering::XCanvas>& rxCanvas,
- const rendering::ViewState& rViewState,
- const rendering::RenderState& rRenderState,
- const util::Color& rBackgroundColor,
- const sal_Int32 nHour,
- const sal_Int32 nMinute,
- const sal_Int32 nSecond,
- const bool bIsShowSeconds)
-{
- (void)rBackgroundColor;
- (void)rRenderState;
-
- if ( ! mxFont.is())
- CreateFont(rxCanvas,bIsShowSeconds);
- if ( ! mxFont.is())
- return;
-
- OUString sText;
-
- if (mbIs24HourFormat)
- sText = OUString::valueOf(nHour);
- else
- {
- sText = OUString::valueOf(nHour>12 ? nHour-12 : nHour);
- }
- sText += OUString(RTL_CONSTASCII_USTRINGPARAM(":"));
- const OUString sMinutes (OUString::valueOf(nMinute));
- switch (sMinutes.getLength())
- {
- case 1 :
- sText += OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + sMinutes;
- break;
- case 2:
- sText += sMinutes;
- break;
-
- default:
- return;
- }
- if (bIsShowSeconds)
- {
- sText += OUString(RTL_CONSTASCII_USTRINGPARAM(":"));
- const OUString sSeconds (OUString::valueOf(nSecond));
- switch (sSeconds.getLength())
- {
- case 1 :
- sText += OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + sSeconds;
- break;
- case 2:
- sText += sSeconds;
- break;
-
- default:
- return;
- }
- }
-
- rendering::StringContext aContext (
- sText,
- 0,
- sText.getLength());
- Reference<rendering::XTextLayout> xLayout (mxFont->createTextLayout(
- aContext,
- rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
- 0));
- if ( ! xLayout.is())
- return;
- geometry::RealRectangle2D aBox (xLayout->queryTextBounds());
-
- rendering::RenderState aRenderState(
- geometry::AffineMatrix2D(1,0,0, 0,1,0),
- NULL,
- Sequence<double>(4),
- rendering::CompositeOperation::SOURCE);
-
- util::Color aFontColor (mpPresenterController->GetViewFontColor(msViewURL));
- PresenterCanvasHelper::SetDeviceColor(aRenderState, aFontColor);
- aRenderState.AffineTransform.m02
- = (maWindowSize.Width - (aBox.X2-aBox.X1+1)) / 2 - aBox.X1;
- aRenderState.AffineTransform.m12
- = (maWindowSize.Height - (aBox.Y2-aBox.Y1+1)) / 2 - aBox.Y1;
- rxCanvas->drawText(
- aContext,
- mxFont,
- rViewState,
- aRenderState,
- rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
-}
-
-void DigitalDefaultPainter::Resize (const awt::Size& rSize)
-{
- if (maWindowSize.Width != rSize.Width || maWindowSize.Height != rSize.Height)
- {
- maWindowSize = rSize;
- if (mbIsAdaptFontSize)
- mxFont = NULL;
- }
-}
-
-void DigitalDefaultPainter::CreateFont (
- const Reference<rendering::XCanvas>& rxCanvas,
- const bool bIsShowSeconds)
-{
- if (rxCanvas.is()
- && rxCanvas->getDevice().is()
- && maWindowSize.Width>0
- && maWindowSize.Height>0)
- {
- // Create a time template for determinging the right font size.
- // Assume that 0 is the widest digit or that all digits have the
- // same width.
- OUString sTimeTemplate;
- // For the case that not all digits have the same width, create
- // different templates for 12 and 24 hour mode.
- if (mbIs24HourFormat)
- sTimeTemplate = OUString(RTL_CONSTASCII_USTRINGPARAM("20"));
- else
- sTimeTemplate = OUString(RTL_CONSTASCII_USTRINGPARAM("10"));
- if (bIsShowSeconds)
- sTimeTemplate += OUString(RTL_CONSTASCII_USTRINGPARAM(":00:00"));
- else
- sTimeTemplate += OUString(RTL_CONSTASCII_USTRINGPARAM(":00"));
-
- rendering::StringContext aContext (
- sTimeTemplate,
- 0,
- sTimeTemplate.getLength());
-
- // When the font size is adapted to the window size (as large as
- // possible without overlapping) then that is done in a four step
- // process:
- // 1. Create a font in a default size, e.g. 10pt.
- // 2. Determine a scale factor from enlarging the text bounding box
- // to maximal size inside the window.
- // 3. Create a new font by scaling the default size with the factor
- // calculated in step 2.
- // 4. Text may be rendered differently in different sizes.
- // Therefore repeat step 2 and 3 once. More iterations may lead to
- // even better results but probably not to visible differences.
- rendering::FontRequest aFontRequest (mpPresenterController->GetViewFontRequest(msViewURL));
- // TODO: use font from view style from configuration
- aFontRequest.CellSize = 10;
-
- for (sal_Int32 nLoop=0; nLoop<3; ++nLoop)
- {
- mxFont = rxCanvas->createFont(
- aFontRequest,
- Sequence<beans::PropertyValue>(),
- geometry::Matrix2D(1,0,0,1));
- if (mxFont.is())
- {
- Reference<rendering::XTextLayout> xLayout (mxFont->createTextLayout(
- aContext,
- rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
- 0));
-
- if ( ! xLayout.is())
- break;
-
- geometry::RealRectangle2D aBox (xLayout->queryTextBounds());
- if (aBox.X2<=aBox.X1 || aBox.Y2<=aBox.Y1)
- break;
- const double nHorizontalFactor = maWindowSize.Width / (aBox.X2-aBox.X1+1);
- const double nVerticalFactor = maWindowSize.Height / (aBox.Y2-aBox.Y1+1);
- aFontRequest.CellSize *= ::std::min(nHorizontalFactor,nVerticalFactor);
- }
- }
- }
-}
-
-} // end of anonymous namespace
-
-} } // end of namespace ::sdext::presenter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx
deleted file mode 100644
index fcf6d1a..0000000
--- a/sdext/source/presenter/PresenterClock.hxx
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 SDEXT_PRESENTER_CLOCK_HXX
-#define SDEXT_PRESENTER_CLOCK_HXX
-
-#include "PresenterController.hxx"
-
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
-#include <com/sun/star/awt/XMouseListener.hpp>
-#include <com/sun/star/awt/XPaintListener.hpp>
-#include <com/sun/star/awt/XWindowListener.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/framework/XPane.hpp>
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/drawing/framework/XView.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/thread.hxx>
-#include <rtl/ref.hxx>
-#include <boost/scoped_ptr.hpp>
-
-namespace css = ::com::sun::star;
-
-namespace {
- typedef cppu::WeakComponentImplHelper4<
- css::awt::XPaintListener,
- css::awt::XWindowListener,
- css::awt::XMouseListener,
- css::drawing::framework::XView
- > PresenterClockInterfaceBase;
-}
-
-namespace sdext { namespace presenter {
-
-/** A clock that displays the current time. This class is work in
- progress. Future extensions may include
- other times like time since presentation started or remaining time.
- Painting of the clock is done by the inner Painer class which includes
- at the moment a simple analog and a simple digital clock.
-*/
-class PresenterClock
- : private ::cppu::BaseMutex,
- public PresenterClockInterfaceBase
-{
-public:
- static ::rtl::Reference<PresenterClock> Create (
- const css::uno::Reference<css::uno::XComponentContext>& rxContext,
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
- const css::uno::Reference<css::frame::XController>& rxController,
- const ::rtl::Reference<PresenterController>& rpPresenterController);
-
- virtual void SAL_CALL disposing (void);
-
- /** Callback for an external timer or thread that initiates updates when
- the time changes (seconds or minutes).
- */
- void UpdateTime (void);
-
- /** An internally used base class for different painters.
- */
- class Painter;
-
- // lang::XEventListener
-
- virtual void SAL_CALL
- disposing (const css::lang::EventObject& rEventObject)
- throw (css::uno::RuntimeException);
-
- // XPaintListener
-
- virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- // XWindowListener
-
- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
- throw (css::uno::RuntimeException);
-
- // XMouseListener
-
- virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
- throw (css::uno::RuntimeException);
-
- // XResourceId
-
- virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
- throw (css::uno::RuntimeException);
-
- virtual sal_Bool SAL_CALL isAnchorOnly (void)
- throw (com::sun::star::uno::RuntimeException);
-
-private:
- css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
- css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
- css::uno::Reference<css::awt::XWindow> mxWindow;
- css::uno::Reference<css::rendering::XCanvas> mxCanvas;
- css::uno::Reference<css::drawing::framework::XPane> mxPane;
- ::rtl::Reference<PresenterController> mpPresenterController;
- bool mbIsResizePending;
- css::rendering::ViewState maViewState;
- css::rendering::RenderState maRenderState;
- /** A Timer is used for sampling the current time and schedule repaints
- when the minute or second (when these are displayed) values have changed.
- */
- class Timer;
- Timer* mpTimer;
- ::boost::scoped_ptr<Painter> mpClockPainter;
- /**
- This is used for debugging to show one clock atop another to compare
- the output of the painters.
- */
- ::boost::scoped_ptr<Painter> mpClockPainter2;
- int mnMode;
- sal_Int32 mnHour;
- sal_Int32 mnMinute;
- sal_Int32 mnSecond;
-
- bool mbIsShowSeconds;
-
- /** Use the static Create() method for creating a new PresenterClock
- object.
- */
- PresenterClock (
- const css::uno::Reference<css::uno::XComponentContext>& rxContext,
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
- const css::uno::Reference<css::frame::XController>& rxController,
- const ::rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~PresenterClock (void);
-
- void LateInit (void);
- void Resize (void);
- void Paint (const css::awt::Rectangle& rUpdateRectangle);
- css::uno::Reference<css::rendering::XPolyPolygon2D> CreatePolygon (
- const css::awt::Rectangle& rBox);
- void Clear (const css::uno::Reference<css::rendering::XPolyPolygon2D>& rxUpdatePolygon);
- void SetMode (sal_Int32 nMode);
-
- /** This method throws a DisposedException when the object has already been
- disposed.
- */
- void ThrowIfDisposed (void)
- throw (css::lang::DisposedException);
-};
-
-} } // end of namespace ::sdext::presenter
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2985d0169aa7ce7ca1751eec142960812e7d545b
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 09:37:48 2012 +0100
fix placement of help file
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 260a007..ccedc42 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -143,8 +143,12 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi
$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
))
+$(eval $(call gb_Extension_add_files,presenter-screen,help/en-US/com.sun.PresenterScreen-$(sdext_PLATFORM),\
+ $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
+))
+
$(eval $(call gb_Extension_localize_help,presenter-screen,\
- help/lang/com.sun.presenter-screen/presenter.xhp,\
- $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.presenter-screen/presenter.xhp))
+ help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,\
+ $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 97d8cbb955b7ac9bece46a1524f744a35fb5a52e
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 09:16:43 2012 +0100
fix added library names
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 547a63a..d061599 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -31,7 +31,9 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz
$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_add_file,presentation-minimizer,$(call gb_Library_get_dllname,SunPresentationMinimizer),$(call gb_Library_get_target,SunPresentationMinimizer)))
+$(eval $(call gb_Extension_add_files,presentation-minimizer,,\
+ $(call gb_Library_get_target,SunPresentationMinimizer) \
+))
$(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
$(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 724c00e..2e32699 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Extension_add_package_dependencies,pdfimport,\
sdext_pdfimport_keywords \
))
-$(eval $(call gb_Extension_add_files,pdfimport,.,\
+$(eval $(call gb_Extension_add_files,pdfimport,,\
$(call gb_Executable_get_target,xpdfimport) \
$(call gb_Library_get_target,pdfimport) \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index ee31f44..260a007 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Extension_add_package_dependencies,presenter-screen,\
))
$(eval $(call gb_Extension_add_files,presenter-screen,,\
- $(call gb_Library_get_target,presenter-screen) \
+ $(call gb_Library_get_target,PresenterScreen) \
))
$(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\
commit 35750371f7ecf65523caf031099aadf0ef14462e
Author: David Tardon <dtardon at redhat.com>
Date: Sat Feb 25 09:15:58 2012 +0100
fix adding files to extension's root dir
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index c9cf884..49186c1 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -147,9 +147,10 @@ endef
#
# This function avoids the need to specify each file's name twice. The
# files are added directly under specified path in the extension,
-# without any subpath.
+# without any subpath. If no path is specified, they are added directly
+# to the root dir of the extension.
define gb_Extension_add_files
-$(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(2)/$(notdir $(file)),$(file)))
+$(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if $(strip $(2)),$(strip $(2))/)$(notdir $(file)),$(file)))
endef
commit 371efa17fa22d1eeac89a6977f0ba734a612ab9a
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 18:29:22 2012 +0100
set localize.sdf path separately for each file
It cannot be done at the main target, because there is no guarantee that
all help (or properties) files are in one directory.
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index d5a5173..c9cf884 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -159,15 +159,15 @@ define gb_Extension_localize_properties
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_SDFLOCATION)/$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_Extension_get_target,$(1)) : $$(SDF2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
endif
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@) && \
cp -f $$< $$@ \
- $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2))
+ $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF))
endef
@@ -175,8 +175,6 @@ endef
define gb_Extension_localize_help
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := $(gb_SDFLOCATION)/$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_Extension_get_target,$(1)) : $$(SDF3)
$(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_localize_help_onelang,$(1),$(subst lang,$(lang),$(2)),$(3),$(lang)))
endif
@@ -184,10 +182,13 @@ endef
define gb_Extension_localize_help_onelang
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@) && \
- $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
+ $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF)
endef
commit 66a7815451514121b86dd4b851d4aa74555fd5c8
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 18:05:12 2012 +0100
fail if any previous command failed
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 86c1c1d..d5a5173 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -138,7 +138,7 @@ define gb_Extension_add_file
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
- mkdir -p $$(dir $$@)
+ mkdir -p $$(dir $$@) && \
cp -f $$< $$@
endef
@@ -165,11 +165,9 @@ endif
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
- mkdir -p $$(dir $$@)
- cp -f $$< $$@
-ifneq ($(strip $(gb_WITH_LANG)),)
- $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)
-endif
+ mkdir -p $$(dir $$@) && \
+ cp -f $$< $$@ \
+ $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2))
endef
@@ -188,7 +186,7 @@ define gb_Extension_localize_help_onelang
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET)
$(call gb_Output_announce,$(2),$(true),XHP,3)
- mkdir -p $$(dir $$@)
+ mkdir -p $$(dir $$@) && \
$(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
endef
commit 861c23e9e017a775bdaeb89b487fd732b0ab00c5
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 17:49:14 2012 +0100
fix platform ID
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
index 68f6dcd..ecef202 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
@@ -28,10 +28,10 @@
PARTIAL_BUILD := T
SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-include $(OUTDIR)/inc/rtlbootstrap.mk
+include $(SRCDIR)/sdext/platform.mk
presenter.xhp :
- sed "s/PLATFORMID/$(RTL_OS)_$(RTL_ARCH)/" < $(SOURCEDIR)/presenter.xhp > $@
+ sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $(SOURCEDIR)/presenter.xhp > $@
.DEFAULT_GOAL := all
.PHONY : all
commit 5ea827280149bc47592bf570278373f111e8ed52
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 16:52:31 2012 +0100
hardcode manifest source path again
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 0a7a3cd..86c1c1d 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -92,7 +92,7 @@ $(call gb_Extension_get_target,%) : \
mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \
$(call gb_Extension_get_rootdir,$*)/registration && \
$(call gb_Extension__subst_platform,$(call gb_Extension_get_workdir,$*)/description.xml,$(call gb_Extension_get_rootdir,$*)/description.xml) && \
- $(call gb_Extension__subst_platform,$(MANIFEST),$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
+ $(call gb_Extension__subst_platform,$(LOCATION)/manifest.xml,$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_rootdir,$*)/registration && \
cd $(call gb_Extension_get_rootdir,$*) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync \
@@ -110,8 +110,6 @@ $(call gb_Extension_get_target,%) : \
define gb_Extension_Extension
$(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registration
$(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
-$(call gb_Extension_get_target,$(1)) : MANIFEST := $(SRCDIR)/$(2)/manifest.xml
-$(call gb_Extension_get_target,$(1)) : $$(MANIFEST)
$(call gb_Extension_get_target,$(1)) : PLATFORM :=
$(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
@@ -126,12 +124,6 @@ $(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1
endef
-# Set custom manifest
-define gb_Extension_set_manifest
-$(call gb_Extension_get_target,$(1)) : MANIFEST := $(2)
-
-endef
-
# Set platform.
#
# Only use this if the extension is platform-dependent.
commit 20a30f13896779fbedc01b70deb290f42b70c1c3
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 17:10:26 2012 +0100
let gb_Extension do the necessary manifest updates
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 2954d46..547a63a 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -31,10 +31,6 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz
$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_add_package_dependencies,presentation-minimizer,\
- sdext_minimizer_manifest \
-))
-
$(eval $(call gb_Extension_add_file,presentation-minimizer,$(call gb_Library_get_dllname,SunPresentationMinimizer),$(call gb_Library_get_target,SunPresentationMinimizer)))
$(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 2cba816..724c00e 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -31,11 +31,8 @@ $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_set_manifest,pdfimport,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config/manifest.xml))
-
$(eval $(call gb_Extension_add_package_dependencies,pdfimport,\
sdext_pdfimport_keywords \
- sdext_pdfimport_manifest \
))
$(eval $(call gb_Extension_add_files,pdfimport,.,\
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 0f47585..ee31f44 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -31,11 +31,8 @@ $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_set_manifest,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/manifest.xml))
-
$(eval $(call gb_Extension_add_package_dependencies,presenter-screen,\
sdext_presenter_help \
- sdext_presenter_manifest \
))
$(eval $(call gb_Extension_add_files,presenter-screen,,\
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 10a7643..a8fef26 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
Configuration_minimizer \
Extension_minimizer \
Library_minimizer \
- Package_minimizer_manifest \
Zip_minimizer \
))
endif
@@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
Extension_pdfimport \
Library_pdfimport \
Package_pdfimport_keywords \
- Package_pdfimport_manifest \
))
endif
@@ -55,7 +53,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
Extension_presenter \
Library_presenter \
Package_presenter_help \
- Package_presenter_manifest \
Zip_presenter \
))
endif
diff --git a/sdext/Package_minimizer_manifest.mk b/sdext/Package_minimizer_manifest.mk
deleted file mode 100644
index dd4fe59..0000000
--- a/sdext/Package_minimizer_manifest.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sdext_minimizer_manifest,$(WORKDIR)/CustomTarget/sdext/source/minimizer))
-
-$(eval $(call gb_Package_add_customtarget,sdext_minimizer_manifest,sdext/source/minimizer))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/minimizer,\
- sdext/source/minimizer/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_pdfimport_manifest.mk b/sdext/Package_pdfimport_manifest.mk
deleted file mode 100644
index 91e5644..0000000
--- a/sdext/Package_pdfimport_manifest.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sdext_pdfimport_manifest,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config))
-
-$(eval $(call gb_Package_add_customtarget,sdext_pdfimport_manifest,sdext/source/pdfimport/config))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/pdfimport/config,\
- sdext/source/pdfimport/config/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_presenter_manifest.mk b/sdext/Package_presenter_manifest.mk
deleted file mode 100644
index 43c1a5e..0000000
--- a/sdext/Package_presenter_manifest.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sdext_presenter_manifest,$(WORKDIR)/CustomTarget/sdext/source/presenter))
-
-$(eval $(call gb_Package_add_customtarget,sdext_presenter_manifest,sdext/source/presenter))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/presenter,\
- sdext/source/presenter/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/minimizer/Makefile b/sdext/source/minimizer/Makefile
deleted file mode 100644
index 2f7171a..0000000
--- a/sdext/source/minimizer/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
- sed "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" $(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml
index 5f86b4d..4b55ddd 100644
--- a/sdext/source/minimizer/manifest.xml
+++ b/sdext/source/minimizer/manifest.xml
@@ -2,7 +2,7 @@
<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
- manifest:full-path="SunPresentationMinimizer.unoSHARED_EXTENSION"/>
+ manifest:full-path="SunPresentationMinimizer.uno at SHARED_EXTENSION@"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/pdfimport/config/Makefile b/sdext/source/pdfimport/config/Makefile
deleted file mode 100644
index 8fa754b..0000000
--- a/sdext/source/pdfimport/config/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list