[Libreoffice-commits] .: Branch 'feature/gnumake4' - 114 commits - accessibility/prj accessibility/source automation/inc automation/source basctl/source basctl/util bean/com bean/native cui/Library_cui.mk cui/source cui/util embedserv/prj embedserv/source embedserv/util extensions/prj extensions/source extensions/test forms/Library_frm.mk forms/source forms/util lingucomponent/source package/prj package/source package/util setup_native/prj setup_native/source UnoControls/prj UnoControls/source wizards/com wizards/prj wizards/source xmlsecurity/inc xmlsecurity/source xmlsecurity/util
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:03:49 PDT 2011
UnoControls/prj/build.lst | 2
UnoControls/source/base/registercontrols.cxx | 10
accessibility/prj/build.lst | 2
accessibility/source/helper/accresmgr.cxx | 4
automation/inc/automation/communi.hxx | 1
automation/inc/automation/simplecm.hxx | 47
automation/source/communi/communi.cxx | 7
automation/source/miniapp/servres.cxx | 6
automation/source/miniapp/servres.hxx | 7
automation/source/miniapp/testapp.cxx | 2
automation/source/server/XMLParser.cxx | 10
automation/source/server/cmdbasestream.cxx | 8
automation/source/server/sta_list.cxx | 7
automation/source/server/statemnt.cxx | 3
automation/source/simplecm/simplecm.cxx | 149
automation/source/testtool/httprequest.cxx | 41
automation/source/testtool/httprequest.hxx | 24
automation/source/testtool/objtest.cxx | 55
automation/source/testtool/tcommuni.cxx | 6
basctl/source/basicide/iderdll.cxx | 3
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/basicide/register.cxx | 8
basctl/util/basctl.map | 1
bean/com/sun/star/comp/beans/HasConnectionException.java | 2
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 8
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 23
cui/Library_cui.mk | 6
cui/source/customize/acccfg.cxx | 2
cui/source/customize/macropg.cxx | 18
cui/source/dialogs/SpellDialog.cxx | 10
cui/source/dialogs/about.cxx | 247 -
cui/source/dialogs/about.hrc | 7
cui/source/dialogs/about.src | 10
cui/source/dialogs/cuigaldlg.cxx | 55
cui/source/dialogs/cuihyperdlg.cxx | 1
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hlinettp.cxx | 50
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/hyperdlg.hrc | 1
cui/source/dialogs/hyperdlg.src | 27
cui/source/dialogs/iconcdlg.cxx | 4
cui/source/dialogs/multipat.cxx | 3
cui/source/dialogs/srchxtra.cxx | 8
cui/source/factory/cuiresmgr.cxx | 7
cui/source/inc/about.hxx | 13
cui/source/inc/autocdlg.hxx | 8
cui/source/inc/cuigaldlg.hxx | 15
cui/source/inc/hlinettp.hxx | 9
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/multipat.hxx | 1
cui/source/inc/radiobtnbox.hxx | 2
cui/source/options/fontsubs.cxx | 4
cui/source/options/fontsubs.hxx | 8
cui/source/options/optcolor.cxx | 7
cui/source/options/optfltr.cxx | 3
cui/source/options/optfltr.hxx | 7
cui/source/options/optgdlg.cxx | 22
cui/source/options/optinet2.cxx | 407 --
cui/source/options/optinet2.hrc | 23
cui/source/options/optinet2.hxx | 65
cui/source/options/optinet2.src | 166
cui/source/options/optjava.cxx | 7
cui/source/options/optjava.hxx | 1
cui/source/options/optpath.cxx | 1
cui/source/options/radiobtnbox.cxx | 15
cui/source/options/treeopt.cxx | 2
cui/source/options/treeopt.src | 3
cui/source/options/webconninfo.cxx | 8
cui/source/options/webconninfo.hxx | 3
cui/source/tabpages/autocdlg.cxx | 6
cui/source/tabpages/autocdlg.src | 2
cui/source/tabpages/border.cxx | 15
cui/source/tabpages/chardlg.cxx | 6
cui/source/uno/services.cxx | 6
cui/util/cui.map | 1
dev/null |binary
embedserv/prj/build.lst | 2
embedserv/source/embed/register.cxx | 5
embedserv/source/inc/embservconst.h | 2
embedserv/util/exports.dxp | 1
extensions/prj/build.lst | 5
extensions/prj/d.lst | 1
extensions/source/abpilot/abpservices.cxx | 13
extensions/source/abpilot/exports.dxp | 1
extensions/source/bibliography/bibload.cxx | 6
extensions/source/config/ldap/componentdef.cxx | 7
extensions/source/config/ldap/exports.dxp | 1
extensions/source/dbpilots/dbpservices.cxx | 13
extensions/source/logging/log_module.cxx | 19
extensions/source/logging/log_module.hxx | 50
extensions/source/logging/log_services.cxx | 7
extensions/source/nsplugin/source/nsplugin.rc | 6
extensions/source/nsplugin/source/nsplugin_oo.rc | 6
extensions/source/ole/oleautobridge.uno.dxp | 1
extensions/source/ole/servreg.cxx | 8
extensions/source/oooimprovecore/core.cxx | 1
extensions/source/oooimprovecore/oooimprovecore_module.cxx | 19
extensions/source/oooimprovecore/oooimprovecore_module.hxx | 51
extensions/source/oooimprovecore/oooimprovecore_services.cxx | 7
extensions/source/oooimprovement/oooimprovement_exports.cxx | 3
extensions/source/plugin/base/service.cxx | 7
extensions/source/preload/makefile.mk | 93
extensions/source/preload/modulepreload.cxx | 34
extensions/source/preload/oemwiz.cxx | 445 --
extensions/source/preload/oemwiz.hxx | 156
extensions/source/preload/preload.component | 34
extensions/source/preload/preload.hrc | 58
extensions/source/preload/preload.src | 290 -
extensions/source/preload/preloadservices.cxx | 73
extensions/source/preload/preloadservices.hxx | 57
extensions/source/preload/services.cxx | 87
extensions/source/preload/unoautopilot.hxx | 109
extensions/source/preload/unoautopilot.inl | 128
extensions/source/propctrlr/pcrservices.cxx | 13
extensions/source/resource/ResourceIndexAccess.cxx | 208 +
extensions/source/resource/ResourceIndexAccess.hxx | 75
extensions/source/resource/exports.dxp | 1
extensions/source/resource/makefile.mk | 8
extensions/source/resource/oooresourceloader.cxx | 169
extensions/source/resource/oooresourceloader.hxx | 87
extensions/source/resource/res.component | 6
extensions/source/resource/res_services.cxx | 89
extensions/source/resource/res_services.hxx | 67
extensions/source/resource/resource.cxx | 476 --
extensions/source/resource/resourceservices.cxx | 58
extensions/source/scanner/exports.dxp | 1
extensions/source/scanner/sanedlg.cxx | 8
extensions/source/scanner/scnserv.cxx | 12
extensions/source/update/check/Jobs.xcu | 2
extensions/source/update/check/updatecheckjob.cxx | 7
extensions/source/update/feed/updatefeed.cxx | 7
extensions/source/update/ui/updatecheckui.cxx | 7
extensions/source/xmlextract/xmxuno.cxx | 7
extensions/test/ole/cpnt/cpnt.cxx | 6
extensions/test/ole/cpnt/exports.dxp | 1
extensions/test/sax/exports.dxp | 2
extensions/test/sax/factory.hxx | 33
extensions/test/sax/makefile.mk | 64
extensions/test/sax/testsax.cxx | 902 -----
extensions/test/sax/testwriter.cxx | 758 ----
forms/Library_frm.mk | 7
forms/source/component/DatabaseForm.cxx | 89
forms/source/component/Edit.cxx | 4
forms/source/misc/services.cxx | 6
forms/source/resource/frm_resource.cxx | 4
forms/util/frm.dxp | 1
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp | 1
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx | 6
lingucomponent/source/languageguessing/guesslang.cxx | 6
lingucomponent/source/spellcheck/macosxspell/macreg.cxx | 6
lingucomponent/source/spellcheck/spell/exports.dxp | 1
lingucomponent/source/spellcheck/spell/sreg.cxx | 6
lingucomponent/source/thesaurus/libnth/exports.dxp | 1
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 6
package/prj/d.lst | 1
package/source/manifest/UnoRegister.cxx | 8
package/source/xstor/register.cxx | 5
package/source/xstor/xstor.dxp | 1
package/source/zipapi/sha1context.hxx | 1
package/util/exports.dxp | 1
package/util/makefile.mk | 4
setup_native/prj/build.lst | 2
setup_native/prj/d.lst | 1
setup_native/source/mac/broffice/osxdndinstall.svg | 1765 ----------
setup_native/source/packinfo/packinfo_office_lang.txt | 16
setup_native/source/win32/customactions/javafilter/makefile.mk | 4
setup_native/source/win32/customactions/languagepacks/makefile.mk | 2
setup_native/source/win32/customactions/patch/makefile.mk | 3
setup_native/source/win32/customactions/quickstarter/makefile.mk | 3
setup_native/source/win32/customactions/rebase/makefile.mk | 2
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 2
setup_native/source/win32/customactions/reg64/makefile.mk | 3
setup_native/source/win32/customactions/regactivex/makefile.mk | 3
setup_native/source/win32/customactions/regpatchactivex/makefile.mk | 10
setup_native/source/win32/customactions/sellang/makefile.mk | 20
setup_native/source/win32/customactions/shellextensions/makefile.mk | 4
setup_native/source/win32/customactions/thesaurus/makefile.mk | 9
setup_native/source/win32/customactions/tools/makefile.mk | 4
wizards/com/sun/star/wizards/RemoteFaxWizard | 7
wizards/com/sun/star/wizards/RemoteLetterWizard | 7
wizards/com/sun/star/wizards/common/ConfigGroup.py | 38
wizards/com/sun/star/wizards/common/ConfigNode.py | 15
wizards/com/sun/star/wizards/common/Configuration.py | 213 +
wizards/com/sun/star/wizards/common/DebugHelper.py | 10
wizards/com/sun/star/wizards/common/Desktop.py | 280 +
wizards/com/sun/star/wizards/common/FileAccess.py | 771 ++++
wizards/com/sun/star/wizards/common/HelpIds.py | 1012 +++++
wizards/com/sun/star/wizards/common/Helper.py | 186 +
wizards/com/sun/star/wizards/common/NoValidPathException.py | 10
wizards/com/sun/star/wizards/common/NumberFormatter.py | 231 +
wizards/com/sun/star/wizards/common/PropertyNames.py | 15
wizards/com/sun/star/wizards/common/PropertySetHelper.py | 250 +
wizards/com/sun/star/wizards/common/Resource.java | 85
wizards/com/sun/star/wizards/common/Resource.java.orig | 140
wizards/com/sun/star/wizards/common/Resource.py | 69
wizards/com/sun/star/wizards/common/SystemDialog.py | 236 +
wizards/com/sun/star/wizards/common/__init__.py | 1
wizards/com/sun/star/wizards/common/prova.py | 7
wizards/com/sun/star/wizards/document/OfficeDocument.py | 293 +
wizards/com/sun/star/wizards/fax/CGFax.py | 31
wizards/com/sun/star/wizards/fax/CGFaxWizard.py | 10
wizards/com/sun/star/wizards/fax/CallWizard.py | 156
wizards/com/sun/star/wizards/fax/FaxDocument.py | 131
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 645 +++
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py | 83
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 697 +++
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 141
wizards/com/sun/star/wizards/fax/__init__.py | 1
wizards/com/sun/star/wizards/letter/CGLetter.py | 37
wizards/com/sun/star/wizards/letter/CGLetterWizard.py | 10
wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py | 10
wizards/com/sun/star/wizards/letter/LetterDocument.py | 261 +
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 1141 ++++++
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py | 60
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 1267 +++++++
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 219 +
wizards/com/sun/star/wizards/letter/LocaleCodes.py | 154
wizards/com/sun/star/wizards/text/TextDocument.py | 285 +
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 190 +
wizards/com/sun/star/wizards/text/TextSectionHandler.py | 133
wizards/com/sun/star/wizards/text/ViewHandler.py | 37
wizards/com/sun/star/wizards/ui/PathSelection.py | 121
wizards/com/sun/star/wizards/ui/UIConsts.py | 53
wizards/com/sun/star/wizards/ui/UnoDialog.py | 552 +++
wizards/com/sun/star/wizards/ui/UnoDialog2.py | 259 +
wizards/com/sun/star/wizards/ui/WizardDialog.py | 499 ++
wizards/com/sun/star/wizards/ui/XPathSelectionListener.py | 7
wizards/com/sun/star/wizards/ui/__init__.py | 1
wizards/com/sun/star/wizards/ui/event/CommonListener.py | 85
wizards/com/sun/star/wizards/ui/event/DataAware.py | 127
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py | 39
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py | 74
wizards/prj/build.lst | 2
wizards/source/tools/Misc.xba | 15
xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 4
xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 3
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 3
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 3
xmlsecurity/source/component/registerservices.cxx | 5
xmlsecurity/source/dialogs/certificatechooser.cxx | 3
xmlsecurity/source/dialogs/certificateviewer.cxx | 12
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5
xmlsecurity/source/dialogs/macrosecurity.cxx | 3
xmlsecurity/source/framework/xsec_framework.cxx | 7
xmlsecurity/source/xmlsec/saxhelper.cxx | 30
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 6
xmlsecurity/util/exports_xsmscrypt.dxp | 1
xmlsecurity/util/exports_xsnss.dxp | 1
xmlsecurity/util/xsec_fw.dxp | 1
249 files changed, 12402 insertions(+), 7730 deletions(-)
New commits:
commit adf7c3b1c101c080f1813ea5422386d2324fa977
Merge: 460adb0... c302693...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:34:26 2011 +0200
resyncing to master
diff --cc cui/Library_cui.mk
index 820e3da,5567650..6b23cb1
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,cu
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/cui/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,cui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
$(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
diff --cc wizards/prj/build.lst
index 2c2a845,09c8333..97a8b05
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@@ -1,2 -1,28 +1,2 @@@
- wz wizards : TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL
+ wz wizards : TRANSLATIONS:translations DESKTOP:rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz wizards\util nmake - all wz_util NULL
-wz wizards\source\config nmake - all wz_config NULL
-wz wizards\source\configshare nmake - all wz_configshare NULL
-wz wizards\source\imagelists nmake - all wz_imglists NULL
-wz wizards\source\euro nmake - all wz_eurowiz NULL
-wz wizards\source\formwizard nmake - all wz_reswiz NULL
-wz wizards\source\gimmicks nmake - all wz_gimmickswz NULL
-wz wizards\source\importwizard nmake - all wz_importwiz NULL
-wz wizards\source\schedule nmake - all wz_schedulewiz NULL
-wz wizards\source\template nmake - all wz_templatewiz NULL
-wz wizards\source\tools nmake - all wz_toolswiz NULL
-wz wizards\source\depot nmake - all wz_depot NULL
-wz wizards\source\tutorials nmake - all wz_tutorials NULL
-wz wizards\source\standard nmake - all wz_standard NULL
-wz wizards\com\sun\star\wizards nmake - all wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\query nmake - all wz_querywiz wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\report nmake - all wz_reportwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder\layout nmake - all wz_rptlayoutwiz wz_reportwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder nmake - all wz_rptbldwiz wz_rptlayoutwiz NULL
-wz wizards\com\sun\star\wizards\table nmake - all wz_tablewiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\form nmake - all wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\letter nmake - all wz_letterwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\fax nmake - all wz_faxwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\agenda nmake - all wz_agendawiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\data nmake - all wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\export nmake - all wz_webexport wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web nmake - all wz_webwiz wz_webexport NULL
+wz wizards\prj nmake - all wz_prj NULL
commit c302693bb67d7064f9c472a53a34b0f6219e119f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jul 21 13:28:01 2011 +0200
Do not use macros from comphelper's componentmodule.hxx
diff --git a/extensions/source/logging/log_module.cxx b/extensions/source/logging/log_module.cxx
index 5cdf5e7..8fbdb09 100644
--- a/extensions/source/logging/log_module.cxx
+++ b/extensions/source/logging/log_module.cxx
@@ -36,7 +36,24 @@ namespace logging
{
//........................................................................
- IMPLEMENT_COMPONENT_MODULE( LogModule );
+ struct LogModuleCreator
+ {
+ LogModule m_aLogModule;
+ };
+ namespace
+ {
+ class theLogModuleInstance : public rtl::Static<LogModuleCreator, theLogModuleInstance> {};
+ }
+
+ LogModule::LogModule()
+ :BaseClass()
+ {
+ }
+
+ LogModule& LogModule::getInstance()
+ {
+ return theLogModuleInstance::get().m_aLogModule;
+ }
//........................................................................
} // namespace logging
diff --git a/extensions/source/logging/log_module.hxx b/extensions/source/logging/log_module.hxx
index dbc0681..7f825da 100644
--- a/extensions/source/logging/log_module.hxx
+++ b/extensions/source/logging/log_module.hxx
@@ -36,7 +36,55 @@ namespace logging
{
//........................................................................
- DECLARE_COMPONENT_MODULE( LogModule, LogModuleClient )
+ class LogModule : public ::comphelper::OModule
+ {
+ friend struct LogModuleCreator;
+ typedef ::comphelper::OModule BaseClass;
+
+ public:
+ static LogModule& getInstance();
+
+ private:
+ LogModule();
+ };
+
+ /* -------------------------------------------------------------------- */
+ class LogModuleClient : public ::comphelper::OModuleClient
+ {
+ private:
+ typedef ::comphelper::OModuleClient BaseClass;
+
+ public:
+ LogModuleClient() : BaseClass( LogModule::getInstance() )
+ {
+ }
+ };
+
+ /* -------------------------------------------------------------------- */
+ template < class TYPE >
+ class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE >
+ {
+ private:
+ typedef ::comphelper::OAutoRegistration< TYPE > BaseClass;
+
+ public:
+ OAutoRegistration() : BaseClass( LogModule::getInstance() )
+ {
+ }
+ };
+
+ /* -------------------------------------------------------------------- */
+ template < class TYPE >
+ class OSingletonRegistration : public ::comphelper::OSingletonRegistration< TYPE >
+ {
+ private:
+ typedef ::comphelper::OSingletonRegistration< TYPE > BaseClass;
+
+ public:
+ OSingletonRegistration() : BaseClass( LogModule::getInstance() )
+ {
+ }
+ };
//........................................................................
} // namespace logging
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index 224febd..f568f63 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -59,6 +59,11 @@ namespace logging
} // namespace logging
//........................................................................
-IMPLEMENT_COMPONENT_LIBRARY_API( ::logging::LogModule, ::logging::initializeModule )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+ const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
+{
+ ::logging::initializeModule();
+ return ::logging::LogModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey );
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index ac8363b..1836e4d 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/oooimprovement/XCoreController.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <comphelper/componentmodule.hxx>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/uieventslogger.hxx>
diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.cxx b/extensions/source/oooimprovecore/oooimprovecore_module.cxx
index c686bee..6457da1 100644
--- a/extensions/source/oooimprovecore/oooimprovecore_module.cxx
+++ b/extensions/source/oooimprovecore/oooimprovecore_module.cxx
@@ -33,7 +33,24 @@
namespace oooimprovecore
{
- IMPLEMENT_COMPONENT_MODULE( OooimprovecoreModule );
+ struct OooimprovecoreModuleCreator
+ {
+ OooimprovecoreModule m_aOooimprovecoreModule;
+ };
+ namespace
+ {
+ class theOooimprovecoreModuleInstance : public rtl::Static<OooimprovecoreModuleCreator, theOooimprovecoreModuleInstance> {};
+ }
+
+ OooimprovecoreModule::OooimprovecoreModule()
+ :BaseClass()
+ {
+ }
+
+ OooimprovecoreModule& OooimprovecoreModule::getInstance()
+ {
+ return theOooimprovecoreModuleInstance::get().m_aOooimprovecoreModule;
+ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.hxx b/extensions/source/oooimprovecore/oooimprovecore_module.hxx
index 3cf4d71..aeb1ff0 100644
--- a/extensions/source/oooimprovecore/oooimprovecore_module.hxx
+++ b/extensions/source/oooimprovecore/oooimprovecore_module.hxx
@@ -33,7 +33,56 @@
namespace oooimprovecore
{
- DECLARE_COMPONENT_MODULE( OooimprovecoreModule, OooimprovecoreModuleClient )
+ /* -------------------------------------------------------------------- */
+ class OooimprovecoreModule : public ::comphelper::OModule
+ {
+ friend struct OooimprovecoreModuleCreator;
+ typedef ::comphelper::OModule BaseClass;
+
+ public:
+ static OooimprovecoreModule& getInstance();
+
+ private:
+ OooimprovecoreModule();
+ };
+
+ /* -------------------------------------------------------------------- */
+ class OooimprovecoreModuleClient : public ::comphelper::OModuleClient
+ {
+ private:
+ typedef ::comphelper::OModuleClient BaseClass;
+
+ public:
+ OooimprovecoreModuleClient() : BaseClass( OooimprovecoreModule::getInstance() )
+ {
+ }
+ };
+
+ /* -------------------------------------------------------------------- */
+ template < class TYPE >
+ class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE >
+ {
+ private:
+ typedef ::comphelper::OAutoRegistration< TYPE > BaseClass;
+
+ public:
+ OAutoRegistration() : BaseClass( OooimprovecoreModule::getInstance() )
+ {
+ }
+ };
+
+ /* -------------------------------------------------------------------- */
+ template < class TYPE >
+ class OSingletonRegistration : public ::comphelper::OSingletonRegistration< TYPE >
+ {
+ private:
+ typedef ::comphelper::OSingletonRegistration< TYPE > BaseClass;
+
+ public:
+ OSingletonRegistration() : BaseClass( OooimprovecoreModule::getInstance() )
+ {
+ }
+ };
}
#endif
diff --git a/extensions/source/oooimprovecore/oooimprovecore_services.cxx b/extensions/source/oooimprovecore/oooimprovecore_services.cxx
index dbfdd4e..d080086 100644
--- a/extensions/source/oooimprovecore/oooimprovecore_services.cxx
+++ b/extensions/source/oooimprovecore/oooimprovecore_services.cxx
@@ -43,6 +43,11 @@ namespace oooimprovecore
}
-IMPLEMENT_COMPONENT_LIBRARY_API( ::oooimprovecore::OooimprovecoreModule, ::oooimprovecore::initializeModule)
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+ const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
+{
+ ::oooimprovecore::initializeModule();
+ return ::oooimprovecore::OooimprovecoreModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey );
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f8c503e629c2ba59335f7a23737ae6b6246d85d5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 13:54:09 2011 +0300
Generate correctly named import library for WNTGCC
diff --git a/package/prj/d.lst b/package/prj/d.lst
index bcb9c08..7b3aff2 100644
--- a/package/prj/d.lst
+++ b/package/prj/d.lst
@@ -1,6 +1,7 @@
..\%__SRC%\misc\*.map %_DEST%\bin\*.map
..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
..\dtd\*.dtd %_DEST%\bin\*.*
diff --git a/package/util/makefile.mk b/package/util/makefile.mk
index 0a3f0d7..cf94fe8 100644
--- a/package/util/makefile.mk
+++ b/package/util/makefile.mk
@@ -54,7 +54,11 @@ LIB1FILES= \
# --- Shared-Library -----------------------------------------------
SHL1TARGET=$(TARGET)$(MAJOR_VERSION)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=$(TARGET)$(MAJOR_VERSION)
+.ENDIF
SHL1USE_EXPORTS=name
SHL1STDLIBS=\
commit 3373a1b4df4235dfcba12c545795b4befef1906c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 13:02:34 2011 +0300
Make compatible with windres (uppercase keywords)
diff --git a/extensions/source/nsplugin/source/nsplugin.rc b/extensions/source/nsplugin/source/nsplugin.rc
index 7d4b60b..ee7107a 100644
--- a/extensions/source/nsplugin/source/nsplugin.rc
+++ b/extensions/source/nsplugin/source/nsplugin.rc
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
- value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-#define ADDITIONAL_VERINFO2 value "FileDescription", "Oracle Open Office Plug-in handles all its documents" value "ProductName", "Oracle Open Office Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
+#define ADDITIONAL_VERINFO1 VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
+ VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
+#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "Oracle Open Office Plug-in handles all its documents" VALUE "ProductName", "Oracle Open Office Plug-in" VALUE "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|
#define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc
index 9d30de3..1fc8285 100644
--- a/extensions/source/nsplugin/source/nsplugin_oo.rc
+++ b/extensions/source/nsplugin/source/nsplugin_oo.rc
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
- value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-#define ADDITIONAL_VERINFO2 value "FileDescription", "LibreOffice Plug-in handles all its documents" value "ProductName", "LibreOffice Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
+#define ADDITIONAL_VERINFO1 VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
+ VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
+#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "LibreOffice Plug-in handles all its documents" VALUE "ProductName", "LibreOffice Plug-in" VALUE "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
#define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
commit 9fd52d35c1e49ce7d3fdba3825a862e875aa41c3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 21 09:26:51 2011 +0100
unused methods
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index b5b2241..69c75cb 100644
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@ -114,14 +114,12 @@ private:
class PacketHandler;
class CommunicationManager;
-class SingleCommunicationManager;
class MultiCommunicationManager;
class CommunicationManagerServerAcceptThread;
class CommunicationLink : public SvRefBase
{
protected:
friend class CommunicationManager;
- friend class SingleCommunicationManager;
friend class MultiCommunicationManager;
friend class CommunicationManagerServerAcceptThread;
// Darf nicht abger�umt werden zwischen Empfang des Streams und ende des Callbacks
@@ -287,24 +285,6 @@ private:
sal_Bool bIsMultiChannel;
};
-class SingleCommunicationManager : public CommunicationManager
-{
-public:
- SingleCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
- virtual ~SingleCommunicationManager();
- virtual sal_Bool StopCommunication(); // H�lt alle CommunicationLinks an
- virtual sal_Bool IsLinkValid( CommunicationLink* pCL );
- virtual sal_uInt16 GetCommunicationLinkCount();
- virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr );
-
-protected:
- virtual void CallConnectionOpened( CommunicationLink* pCL );
- virtual void CallConnectionClosed( CommunicationLink* pCL );
- CommunicationLinkRef xActiveLink;
- CommunicationLink *pInactiveLink;
- virtual void DestroyingLink( CommunicationLink *pCL ); // Link tr�gt sich im Destruktor aus
-};
-
class ICommunicationManagerClient
{
friend class CommonSocketFunctions;
@@ -347,17 +327,6 @@ protected:
void SetNewPacketAsCurrent();
};
-class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
-{
-public:
- SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket );
- ~SimpleCommunicationLinkViaSocketWithReceiveCallbacks();
- virtual sal_Bool ReceiveDataStream();
-protected:
- virtual sal_Bool ShutdownCommunication(); /// Really stop the Communication
- virtual void WaitForShutdown();
-};
-
class CommonSocketFunctions
{
public:
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index a0a11db..1322968 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -343,17 +343,6 @@ sal_Bool SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandsha
return !bWasError;
}
-SimpleCommunicationLinkViaSocketWithReceiveCallbacks::SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket )
-: SimpleCommunicationLinkViaSocket( pMan, pSocket )
-{
-}
-
-SimpleCommunicationLinkViaSocketWithReceiveCallbacks::~SimpleCommunicationLinkViaSocketWithReceiveCallbacks()
-{
- if ( pMyManager && pMyManager->IsLinkValid( this ) && !bIsRequestShutdownPending )
- StopCommunication();
-}
-
bool SimpleCommunicationLinkViaSocket::IsReceiveReady()
{
if ( !IsCommunicationError() )
@@ -365,50 +354,6 @@ bool SimpleCommunicationLinkViaSocket::IsReceiveReady()
return false;
}
-void SimpleCommunicationLinkViaSocketWithReceiveCallbacks::WaitForShutdown()
-{
- CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method
-
- while( pMyManager && !IsCommunicationError() && IsReceiveReady())
- ReceiveDataStream();
-}
-
-sal_Bool SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ReceiveDataStream()
-{
- if ( DoReceiveDataStream() )
- {
- SetNewPacketAsCurrent();
- StartCallback();
- DataReceived();
- return sal_True;
- }
- else
- {
- StartCallback();
- ShutdownCommunication();
- return sal_False;
- }
-}
-
-sal_Bool SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication()
-{
- if ( GetStreamSocket() )
- GetStreamSocket()->shutdown();
-
- if ( GetStreamSocket() )
- GetStreamSocket()->close();
-
- osl::StreamSocket* pTempSocket = GetStreamSocket();
- SetStreamSocket( NULL );
- delete pTempSocket;
-
- ConnectionClosed();
-
- return sal_True;
-}
-
-
-
CommunicationManager::CommunicationManager( sal_Bool bUseMultiChannel )
: nInfoType( CM_NONE )
, bIsCommunicationRunning( sal_False )
@@ -577,83 +522,6 @@ void CommunicationManager::SetApplication( const ByteString& aApp, sal_Bool bRun
}
}
-
-
-SingleCommunicationManager::SingleCommunicationManager( sal_Bool bUseMultiChannel )
-: CommunicationManager( bUseMultiChannel )
-{
- xActiveLink = NULL;
- pInactiveLink = NULL;
-}
-
-SingleCommunicationManager::~SingleCommunicationManager()
-{
- StopCommunication();
- if ( pInactiveLink )
- pInactiveLink->InvalidateManager();
-}
-
-sal_Bool SingleCommunicationManager::StopCommunication()
-{
- if ( xActiveLink.Is() )
- {
- sal_Bool bSuccess = xActiveLink->StopCommunication();
- if ( pInactiveLink )
- pInactiveLink->InvalidateManager();
- pInactiveLink = xActiveLink;
- xActiveLink.Clear();
- return bSuccess;
- }
- return sal_True;
-}
-
-sal_Bool SingleCommunicationManager::IsLinkValid( CommunicationLink* pCL )
-{
- return &xActiveLink == pCL;
-}
-
-sal_uInt16 SingleCommunicationManager::GetCommunicationLinkCount()
-{
- return IsCommunicationRunning()?1:0;
-}
-
-CommunicationLinkRef SingleCommunicationManager::GetCommunicationLink( sal_uInt16 )
-{
- return xActiveLink;
-}
-
-void SingleCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
-{
- DBG_ASSERT( !xActiveLink.Is(), "Es ist bereits ein CommunicationLink aktiv");
- if ( xActiveLink.Is() )
- {
- if ( pInactiveLink )
- pInactiveLink->InvalidateManager();
- pInactiveLink = xActiveLink;
- xActiveLink->StopCommunication(); // Den alten Link brutal abw�rgen
- }
- xActiveLink = pCL;
- CommunicationManager::CallConnectionOpened( pCL );
-}
-
-void SingleCommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
-{
- CommunicationManager::CallConnectionClosed( pCL );
-
- DBG_ASSERT( pCL == xActiveLink, "SingleCommunicationManager::CallConnectionClosed mit fremdem Link");
- if ( pInactiveLink )
- pInactiveLink->InvalidateManager();
- pInactiveLink = xActiveLink;
- xActiveLink.Clear();
- bIsCommunicationRunning = sal_False;
-}
-
-void SingleCommunicationManager::DestroyingLink( CommunicationLink *pCL )
-{
- pInactiveLink = NULL;
- pCL->InvalidateManager();
-}
-
sal_Bool CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort )
{
osl::SocketAddr Addr( rtl::OUString( UniString( aHost, RTL_TEXTENCODING_UTF8 ) ), nPort );
commit c53c4610cbd815fadb9d9f7ae81009c1eadda6a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 22:18:43 2011 +0100
remove unused ByteString using methods
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index f9b1242..7b0ceb8 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -164,7 +164,6 @@ class CommunicationManagerClientViaSocket : public CommunicationManagerClient, C
public:
using CommunicationManager::StartCommunication;
- CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False );
CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False );
virtual ~CommunicationManagerClientViaSocket();
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index d13abf4..b5b2241 100644
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@ -366,22 +366,6 @@ protected:
virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS )=0;
};
-class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
-{
-public:
- using CommunicationManager::StartCommunication;
-
- SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False );
- SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False );
- virtual sal_Bool StartCommunication(){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHostToTalk, nPortToTalk );}
- virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );}
-private:
- ByteString aHostToTalk;
- sal_uLong nPortToTalk;
-protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index f7da08f..876ae11 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -567,13 +567,6 @@ IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYAR
return 1;
}
-CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel )
-: CommunicationManagerClient( bUseMultiChannel )
-, aHostToTalk( aHost )
-, nPortToTalk( nPort )
-{
-}
-
CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel )
: CommunicationManagerClient( bUseMultiChannel )
, aHostToTalk( "" )
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index b9597c3..a0a11db 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -654,23 +654,6 @@ void SingleCommunicationManager::DestroyingLink( CommunicationLink *pCL )
pCL->InvalidateManager();
}
-
-SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel )
-: SingleCommunicationManager( bUseMultiChannel )
-, aHostToTalk( aHost )
-, nPortToTalk( nPort )
-{
-}
-
-
-SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel )
-: SingleCommunicationManager( bUseMultiChannel )
-, aHostToTalk()
-, nPortToTalk( 0 )
-{
-}
-
-
sal_Bool CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort )
{
osl::SocketAddr Addr( rtl::OUString( UniString( aHost, RTL_TEXTENCODING_UTF8 ) ), nPort );
commit fba6f775870fbb0bc5550d3ce7957649a0306889
Author: Andras Timar <atimar at suse.com>
Date: Tue Jul 19 11:29:26 2011 +0200
remove duplicated en-US entries
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index e483e1a..3076af0 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -434,7 +434,6 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
Pos = MAP_APPFONT ( 137 , 78 ) ;
Size = MAP_APPFONT ( 111 , 10 ) ;
Text [ en-US ] = "~AutoInclude";
- Text [ en-US ] = "~AutoInclude" ;
TabStop = TRUE ;
};
FixedLine FL_DOUBLECAPS
@@ -483,7 +482,6 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
Pos = MAP_APPFONT ( 137 , 169 ) ;
Size = MAP_APPFONT ( 111 , 10 ) ;
Text [ en-US ] = "A~utoInclude";
- Text [ en-US ] = "A~utoInclude" ;
};
String STR_PB_NEWABBREV
{
commit 867f395ffe637948e5b07ae8d444562b8870b846
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 22:52:33 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index a0aedbb..9d6ef73 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -39,6 +39,7 @@
#include <grid.hxx>
#include <math.h>
#include <sal/macros.h>
+#include <rtl/strbuf.hxx>
ResId SaneResId( sal_uInt32 nID )
{
@@ -1270,9 +1271,10 @@ void SaneDlg::SaveState()
sal_Bool bValue;
if( mrSane.GetOptionValue( nOption, bValue ) )
{
- ByteString aString( "BOOL=" );
- aString += ByteString::CreateFromInt32(bValue);
- aConfig.WriteKey( aOption, aString );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
+ "BOOL="));
+ aString.append(static_cast<sal_Int32>(bValue));
+ aConfig.WriteKey(aOption, aString.makeStringAndClear());
}
}
break;
commit 067739ebe567a53d270e994fcee54d285b075058
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Jul 18 11:09:34 2011 +0100
adapt to new InsertAutomaticEntryColor method, to show automatic color
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 1308e3d..b41c115 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -935,7 +935,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
}
XColorTable aColorTable( SvtPathOptions().GetPalettePath() );
- aColorBoxes[0]->InsertAutomaticEntry();
for( sal_Int32 i = 0; i < aColorTable.Count(); i++ )
{
XColorEntry* pEntry = aColorTable.GetColor(i);
@@ -944,7 +943,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
- OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
+ OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
for( sal_Int32 i = 1; i < nCount; i++ )
{
if(aColorBoxes[i])
@@ -952,8 +951,10 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) )
aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
+ aColorBoxes[i]->InsertAutomaticEntryColor(ColorConfig::GetDefaultColor((ColorConfigEntry) i));
}
}
+ aColorBoxes[0]->InsertAutomaticEntryColor(ColorConfig::GetDefaultColor((ColorConfigEntry) 0));
}
ColorConfigWindow_Impl::~ColorConfigWindow_Impl()
@@ -1414,7 +1415,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox)
if(pBox && aScrollWindow.aColorBoxes[i] == pBox)
{
ColorConfigValue aColorEntry = pColorConfig->GetColorValue(ColorConfigEntry(i));
- if(!pBox->GetSelectEntryPos())
+ if(pBox->IsAutomaticSelected())
{
aColorEntry.nColor = COL_AUTO;
if(aScrollWindow.aWindows[i])
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 3bdb445..daf8b6d 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1553,9 +1553,9 @@ void SvxCharEffectsPage::Initialize()
if ( !pFrame ||
SFX_ITEM_DEFAULT > pFrame->GetBindings().QueryState( SID_ATTR_AUTO_COLOR_INVALID, pDummy ) )
{
- m_aUnderlineColorLB.InsertAutomaticEntry();
- m_aOverlineColorLB.InsertAutomaticEntry();
- m_aFontColorLB.InsertAutomaticEntry();
+ m_aUnderlineColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
+ m_aOverlineColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
+ m_aFontColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
}
}
for ( long i = 0; i < pColorTable->Count(); i++ )
commit 7a1e293b35dfabfad0c887a5774609dbf442c9a9
Author: Andras Timar <atimar at suse.com>
Date: Sun Jul 17 18:30:24 2011 +0200
remove unused OOo brand image
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index deac2fd..ebee2ec 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -33,7 +33,6 @@ mkdir: %_DEST%\bin\osolsmf
..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin\osl\osxdndinstall_nologo.png
..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
-..\source\java\openofficeorg_setup.gif %_DEST%\bin\osl\Setup.gif
..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat
..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed
diff --git a/setup_native/source/java/openofficeorg_setup.gif b/setup_native/source/java/openofficeorg_setup.gif
deleted file mode 100644
index 8beb9e1..0000000
Binary files a/setup_native/source/java/openofficeorg_setup.gif and /dev/null differ
commit 07b4148f70cb785242fb484a2d914a20da93bc1e
Author: Andras Timar <atimar at suse.com>
Date: Sun Jul 17 18:29:53 2011 +0200
remove BrOffice branding
diff --git a/setup_native/source/java/brofficeorg_setup.gif b/setup_native/source/java/brofficeorg_setup.gif
deleted file mode 100644
index 570d8e4..0000000
Binary files a/setup_native/source/java/brofficeorg_setup.gif and /dev/null differ
diff --git a/setup_native/source/mac/broffice/DS_Store b/setup_native/source/mac/broffice/DS_Store
deleted file mode 100644
index a534e3b..0000000
Binary files a/setup_native/source/mac/broffice/DS_Store and /dev/null differ
diff --git a/setup_native/source/mac/broffice/osxdndinstall.png b/setup_native/source/mac/broffice/osxdndinstall.png
deleted file mode 100644
index cab66ea..0000000
Binary files a/setup_native/source/mac/broffice/osxdndinstall.png and /dev/null differ
diff --git a/setup_native/source/mac/broffice/osxdndinstall.svg b/setup_native/source/mac/broffice/osxdndinstall.svg
deleted file mode 100644
index 7b7c6c6..0000000
--- a/setup_native/source/mac/broffice/osxdndinstall.svg
+++ /dev/null
@@ -1,1765 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="550"
- height="442"
- id="svg3134"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- sodipodi:docname="Installation (OOo3_refresh_mac_install_image).svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0">
- <defs
- id="defs3136">
- <linearGradient
- id="linearGradient7426">
- <stop
- id="stop7428"
- offset="0"
- style="stop-color:#f2f2f2;stop-opacity:1" />
- <stop
- id="stop7430"
- offset="1"
- style="stop-color:#ffffff;stop-opacity:1" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective3142" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2570"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2572"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2694"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2696"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2818"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2820"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2942"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2944"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <inkscape:perspective
- id="perspective2777"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3076"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,979.0216)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3079"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,577.0216)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4800" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective3742" />
- <inkscape:perspective
- id="perspective3744"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2870" />
- <inkscape:perspective
- id="perspective2802"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2531" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2854" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- id="perspective4034" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- id="perspective3939" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- id="perspective3852" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 21.26 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="62.360001 : 21.26 : 1"
- inkscape:persp3d-origin="31.18 : 14.173333 : 1"
- id="perspective3771" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- id="perspective59" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective3532" />
- <inkscape:perspective
- id="perspective2543"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2818"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3379"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3381"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3383"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3385"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3387"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3389"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3391"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3393"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3395"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,577.0216)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3397"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,979.0216)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3752"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3754"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3819"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3821"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3886"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3888"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3953"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,1863.9451)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3955"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,-0.4990909,2265.9451)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3092"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,979.0216)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3095"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,577.0216)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2521" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4715" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4717" />
- <inkscape:perspective
- id="perspective4719"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4721"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4723"
- inkscape:persp3d-origin="31.18 : 14.173333 : 1"
- inkscape:vp_z="62.360001 : 21.26 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 21.26 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4725"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4727"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4729"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4731"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4733"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4735" />
- <inkscape:perspective
- id="perspective4737"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4739" />
- <inkscape:perspective
- id="perspective4741"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4743"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4211" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 12.41 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="391.03 : 12.41 : 1"
- inkscape:persp3d-origin="195.515 : 8.2733332 : 1"
- id="perspective3301" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 12.41 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="399.49701 : 12.41 : 1"
- inkscape:persp3d-origin="199.7485 : 8.2733332 : 1"
- id="perspective3226" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 18.512501 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="393.207 : 18.512501 : 1"
- inkscape:persp3d-origin="196.6035 : 12.341667 : 1"
- id="perspective3158" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 18.512501 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="393.207 : 18.512501 : 1"
- inkscape:persp3d-origin="196.6035 : 12.341667 : 1"
- id="perspective3146" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2902" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2900" />
- <inkscape:perspective
- id="perspective2898"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2896"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2894"
- inkscape:persp3d-origin="31.18 : 14.173333 : 1"
- inkscape:vp_z="62.360001 : 21.26 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 21.26 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2892"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2890"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2888"
- inkscape:persp3d-origin="420.94501 : 198.42668 : 1"
- inkscape:vp_z="841.89001 : 297.64001 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 297.64001 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2886"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2884"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2753" />
- <inkscape:perspective
- id="perspective2881"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2879" />
- <inkscape:perspective
- id="perspective2877"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2875"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 18.512501 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="401.944 : 18.512501 : 1"
- inkscape:persp3d-origin="200.972 : 12.341667 : 1"
- id="perspective2645" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 18.512501 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="385.51999 : 18.512501 : 1"
- inkscape:persp3d-origin="192.75999 : 12.341667 : 1"
- id="perspective2633" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 48.070499 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="212.035 : 48.070499 : 1"
- inkscape:persp3d-origin="106.0175 : 32.047 : 1"
- id="perspective2474" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 48.070499 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="212.035 : 48.070499 : 1"
- inkscape:persp3d-origin="106.0175 : 32.047 : 1"
- id="perspective2426" />
- <inkscape:perspective
- id="perspective2869"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2869"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.71518,979.02157)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2922"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.7152,577.0947)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2982"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,979.0216)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient2985"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,577.0216)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3045"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,979.0216)"
- x1="275.5"
- y1="369.22446"
- x2="275.5"
- y2="-3.224514" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7426"
- id="linearGradient3048"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9981818,0,0,0.109589,150.2152,577.0216)"
- x1="286.08203"
- y1="-1.6191231"
- x2="286.08203"
- y2="357.27634" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.90030045"
- inkscape:cx="258.99473"
- inkscape:cy="241.49108"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1264"
- inkscape:window-height="750"
- inkscape:window-x="0"
- inkscape:window-y="14"
- showguides="true"
- inkscape:guide-bbox="true">
- <sodipodi:guide
- orientation="0,1"
- position="74.144094,396.21835"
- id="guide2444" />
- <sodipodi:guide
- orientation="1,0"
- position="74.504535,396.63219"
- id="guide2446" />
- <sodipodi:guide
- orientation="0,1"
- position="71.833579,326.0027"
- id="guide2448" />
- <sodipodi:guide
- orientation="1,0"
- position="474.05203,326.11834"
- id="guide2946" />
- </sodipodi:namedview>
- <metadata
- id="metadata3139">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Camada 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-150.71429,-577.0765)">
- <g
- id="g4297"
- style="fill:#800000"
- transform="translate(-30.90885,443.41812)" />
- <text
- transform="scale(1.0168078,0.98347)"
- font-size="103.091"
- id="text43"
- style="font-size:48.89245605px;font-family:Vegur-Regular"
- x="2415.6145"
- y="514.5885" />
- <text
- transform="scale(0.9979479,1.0020563)"
- font-size="103.091"
- id="text3748"
- style="font-size:91.03964996px;font-family:Vegur-Regular"
- x="2310.8984"
- y="391.8399" />
- <g
- id="g3200"
- inkscape:export-filename="C:\Users\Marcelo\Desktop\Trabalhos\LibreOffice\Finais\Telas\Installation (OOo3_refresh_mac_install_image).png"
- inkscape:export-xdpi="89.916817"
- inkscape:export-ydpi="89.916817">
- <rect
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- y="577.07648"
- x="150.71429"
- height="442"
- width="550"
- id="rect13743"
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- <image
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAiYAAAG6CAIAAACz4Bq0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAL EwAACxMBAJqcGAAAAAd0SU1FB9oJFwAWNxuKiGYAAAcMSURBVHja7d3BTqNQGIBRKAXBmEjrWve+ /xupWwluRCqBWTSZxYzVOqMU7z1nYUwlTXqLfP1pStNpmhIA+H4rSwCA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgAxWEfy OPu+b5qm67phGMZxnKbJcw/MIE3TLMvyPK+qarPZFEUR9WrEcPB9fHxs23a329n7gVOFJ0mSsizr uq7rWnJC7k3TNMMw2OmBk1enKIrtdhttdQJ/L6fv+7Zt9QY4uf3r+9fX16enp2hPugSenKZpnE8D llOdaZr2L4UlJ0Bd19nLga
WFJ9pDU+DJcUoNWGBy+r6XnACN42j/BhbVm98/I7SO4dkFcFwy5QAg OQAgOQD8UGtLAPC19hca+Jt3l005AJhyAOKYfkw5ACA5AEgOAEgOAJIDgOQAgOQAIDlAEM7Pzy0C kgPM4fr6uixL64DkAN9/XFitbm5uVAfJAeaQZZnqIDmA6iA5gOqA5ACqwxL48oIYvXkF9Q9vPHTd 9UPb/LH9m3/67DafupN3fvnn+z/yPv9zm+NX8s3n5cNbPnsJ/X117u7uXl5e/PtgygHMOkgOoDog OYDqIDmA6iA5AKqD5ACqg+QAqgOSA6gOkgOoDpIDoDpIDqA6SA6gOiA5gOogOYDqIDkA7xjH8eHh wXccIDnAt/fm/v7++fnZUiA5gN4gOYDeIDkAeoPkAHqD5AB6A5ID6A2SA+gNkgOgN0gOoDdIDqA3 IDmA3iA5gN4Qg7UliNA0TUfeSJxub2/1BlMOYL5BcgC9AckB9AbJAfQGyQH0Rm+QHGAGeoPkADPR GyQHAMkBgCO4+gDAFzt0LY80TU05AGDKAQhx+ol23DHlACA5AEgOAEgOAJIDgORYAgAkBwDJ+Tl8 1hdAcuZ6eCtjHODVsOTMYr12eQVgcfI8l5wAVVVl5wYWNd9kWXZxcSE5Adput0VR2MuBhfQmTdOz s7O6riUnQPun1uk1YAm9SZIkz/PLy8toXwqHfyy+urpKkqRt291uZ6cHTtibsizruo52xEmSJD30 VUKB6fu+aZqu64ZhGMcxkkcNLCE2WZbleV5V1WazifxUf+rgC8A8fGwFAMkBQHIAQHIAkBwAJMcS ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAE
gOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOALP7BU35aWAYh0xJAAAAAElFTkSuQmCC "
- width="550"
- height="442"
- id="image13745"
- x="150.71429"
- y="577.07648"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- style="display:inline" />
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect2452"
- width="550"
- height="442"
- x="150.71429"
- y="577.07648"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <image
- style="display:inline"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- y="577.07648"
- x="150.71429"
- id="image2454"
- height="442"
- width="550"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAiYAAAG6CAIAAACz4Bq0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAL EwAACxMBAJqcGAAAAAd0SU1FB9oJFwAWNxuKiGYAAAcMSURBVHja7d3BTqNQGIBRKAXBmEjrWve+ /xupWwluRCqBWTSZxYzVOqMU7z1nYUwlTXqLfP1pStNpmhIA+H4rSwCA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgCSAwCS A4DkAIDkACA5AEgOAEgOAJIDAJIDgOQAIDkAIDkASA4ASA4AkgOA5ACA5AAgOQAgOQBIDgAxWEfy OPu+b5qm67phGMZxnKbJcw/MIE3TLMvyPK+qarPZFEUR9WrEcPB9fHxs23a329n7gVOFJ0mSsizr uq7rWnJC7k3TNMMw2OmBk1enKIrtdhttdQJ/L6fv+7Zt9QY4uf3r+9fX16enp2hPugSenKZpnE8D llOdaZr2L4UlJ0Bd19nLga
WFJ9pDU+DJcUoNWGBy+r6XnACN42j/BhbVm98/I7SO4dkFcFwy5QAg OQAgOQD8UGtLAPC19hca+Jt3l005AJhyAOKYfkw5ACA5AEgOAEgOAJIDgOQAgOQAIDlAEM7Pzy0C kgPM4fr6uixL64DkAN9/XFitbm5uVAfJAeaQZZnqIDmA6iA5gOqA5ACqwxL48oIYvXkF9Q9vPHTd 9UPb/LH9m3/67DafupN3fvnn+z/yPv9zm+NX8s3n5cNbPnsJ/X117u7uXl5e/PtgygHMOkgOoDog OYDqIDmA6iA5AKqD5ACqg+QAqgOSA6gOkgOoDpIDoDpIDqA6SA6gOiA5gOogOYDqIDkA7xjH8eHh wXccIDnAt/fm/v7++fnZUiA5gN4gOYDeIDkAeoPkAHqD5AB6A5ID6A2SA+gNkgOgN0gOoDdIDqA3 IDmA3iA5gN4Qg7UliNA0TUfeSJxub2/1BlMOYL5BcgC9AckB9AbJAfQGyQH0Rm+QHGAGeoPkADPR GyQHAMkBgCO4+gDAFzt0LY80TU05AGDKAQhx+ol23DHlACA5AEgOAEgOAJIDgORYAgAkBwDJ+Tl8 1hdAcuZ6eCtjHODVsOTMYr12eQVgcfI8l5wAVVVl5wYWNd9kWXZxcSE5Adput0VR2MuBhfQmTdOz s7O6riUnQPun1uk1YAm9SZIkz/PLy8toXwqHfyy+urpKkqRt291uZ6cHTtibsizruo52xEmSJD30 VUKB6fu+aZqu64ZhGMcxkkcNLCE2WZbleV5V1WazifxUf+rgC8A8fGwFAMkBQHIAQHIAkBwAJMcS ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAE
gOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOAJIDgOQAgOQAIDkAIDkASA4AkgMAkgOA5ACA5AAgOQBIDgBIDgCSAwCSA4DkACA5 ACA5AEgOAEgOALP7BU35aWAYh0xJAAAAAElFTkSuQmCC " />
- <rect
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- style="fill:url(#linearGradient3095);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect2456"
- width="549"
- height="40"
- x="150.71429"
- y="577.07648" />
- <rect
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- style="fill:url(#linearGradient3092);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect2458"
- width="549"
- height="40"
- x="150.71429"
- y="979.07648" />
- <g
- transform="matrix(0.8999997,0,0,0.8999997,204.81441,-875.1749)"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/christoph/Desktop/LibreOffice Artwork/OOo3_refresh_mac_install_image.png"
- id="g2526">
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2528"
- d="M 432.93612,2084.725 C 432.18148,2084.706 431.43803,2085.1779 431.14306,2085.8632 C 430.84807,2086.5485 431.02025,2087.4039 431.55836,2087.9261 L 447.75462,2104.1736 C 448.27697,2104.6968 449.12749,2104.8703 449.81733,2104.5942 C 450.50718,2104.3182 450.99483,2103.6092 450.99999,2102.875 L 450.99999,2086.5974 C 451.00199,2085.6166 450.09611,2084.7233 449.10176,2084.725 L 432.93612,2084.725 L 432.93612,2084.725 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.01000001;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2530"
- d="M 532.93616,1984.7249 C 532.18152,1984.7059 531.43807,1985.1778 531.1431,1985.8631 C 530.84811,1986.5484 531.02029,1987.4038 531.5584,1987.926 L 547.75466,2004.1735 C 548.27701,2004.6967 549.12753,2004.8702 549.81737,2004.5941 C 550.50722,2004.3181 550.99487,2003.6091 551.00003,2002.8749 L 551.00003,1986.5973 C 551.00203,1985.6165 550.09615,1984.7232 549.1018,1984.7249 L 532.93616,1984.7249 L 532.93616,1984.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.01000001;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.125;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 532.93616,2084.7249 C 532.18152,2084.7059 531.43807,2085.1778 531.1431,2085.8631 C 530.84811,2086.5484 531.02029,2087.4038 531.5584,2087.926 L 547.75466,2104.1735 C 548.27701,2104.6967 549.12753,2104.8702 549.81737,2104.5941 C 550.50722,2104.3181 550.99487,2103.6091 551.00003,2102.8749 L 551.00003,2086.5973 C 551.00203,2085.6165 550.09615,2084.7232 549.1018,2084.7249 L 532.93616,2084.7249 L 532.93616,2084.7249 z"
- id="path2532"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2534"
- d="M 512.93616,2084.7249 C 512.18152,2084.7059 511.43807,2085.1778 511.1431,2085.8631 C 510.84811,2086.5484 511.02029,2087.4038 511.5584,2087.926 L 527.75466,2104.1735 C 528.27701,2104.6967 529.12753,2104.8702 529.81737,2104.5941 C 530.50722,2104.3181 530.99487,2103.6091 531.00003,2102.8749 L 531.00003,2086.5973 C 531.00203,2085.6165 530.09615,2084.7232 529.1018,2084.7249 L 512.93616,2084.7249 L 512.93616,2084.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.075;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 492.93616,2084.7249 C 492.18152,2084.7059 491.43807,2085.1778 491.1431,2085.8631 C 490.84811,2086.5484 491.02029,2087.4038 491.5584,2087.926 L 507.75466,2104.1735 C 508.27701,2104.6967 509.12753,2104.8702 509.81737,2104.5941 C 510.50722,2104.3181 510.99487,2103.6091 511.00003,2102.8749 L 511.00003,2086.5973 C 511.00203,2085.6165 510.09615,2084.7232 509.1018,2084.7249 L 492.93616,2084.7249 L 492.93616,2084.7249 z"
- id="path2536"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2538"
- d="M 472.93616,2084.7249 C 472.18152,2084.7059 471.43807,2085.1778 471.1431,2085.8631 C 470.84811,2086.5484 471.02029,2087.4038 471.5584,2087.926 L 487.75466,2104.1735 C 488.27701,2104.6967 489.12753,2104.8702 489.81737,2104.5941 C 490.50722,2104.3181 490.99487,2103.6091 491.00003,2102.8749 L 491.00003,2086.5973 C 491.00203,2085.6165 490.09615,2084.7232 489.1018,2084.7249 L 472.93616,2084.7249 L 472.93616,2084.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.025;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 452.93616,2084.7249 C 452.18152,2084.7059 451.43807,2085.1778 451.1431,2085.8631 C 450.84811,2086.5484 451.02029,2087.4038 451.5584,2087.926 L 467.75466,2104.1735 C 468.27701,2104.6967 469.12753,2104.8702 469.81737,2104.5941 C 470.50722,2104.3181 470.99487,2103.6091 471.00003,2102.8749 L 471.00003,2086.5973 C 471.00203,2085.6165 470.09615,2084.7232 469.1018,2084.7249 L 452.93616,2084.7249 L 452.93616,2084.7249 z"
- id="path2540"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2542"
- d="M 532.93616,2064.7249 C 532.18152,2064.7059 531.43807,2065.1778 531.1431,2065.8631 C 530.84811,2066.5484 531.02029,2067.4038 531.5584,2067.926 L 547.75466,2084.1735 C 548.27701,2084.6967 549.12753,2084.8702 549.81737,2084.5941 C 550.50722,2084.3181 550.99487,2083.6091 551.00003,2082.8749 L 551.00003,2066.5973 C 551.00203,2065.6165 550.09615,2064.7232 549.1018,2064.7249 L 532.93616,2064.7249 L 532.93616,2064.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.075;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 512.93616,2064.7249 C 512.18152,2064.7059 511.43807,2065.1778 511.1431,2065.8631 C 510.84811,2066.5484 511.02029,2067.4038 511.5584,2067.926 L 527.75466,2084.1735 C 528.27701,2084.6967 529.12753,2084.8702 529.81737,2084.5941 C 530.50722,2084.3181 530.99487,2083.6091 531.00003,2082.8749 L 531.00003,2066.5973 C 531.00203,2065.6165 530.09615,2064.7232 529.1018,2064.7249 L 512.93616,2064.7249 L 512.93616,2064.7249 z"
- id="path2544"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2546"
- d="M 492.93616,2064.7249 C 492.18152,2064.7059 491.43807,2065.1778 491.1431,2065.8631 C 490.84811,2066.5484 491.02029,2067.4038 491.5584,2067.926 L 507.75466,2084.1735 C 508.27701,2084.6967 509.12753,2084.8702 509.81737,2084.5941 C 510.50722,2084.3181 510.99487,2083.6091 511.00003,2082.8749 L 511.00003,2066.5973 C 511.00203,2065.6165 510.09615,2064.7232 509.1018,2064.7249 L 492.93616,2064.7249 L 492.93616,2064.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.025;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 472.93616,2064.7249 C 472.18152,2064.7059 471.43807,2065.1778 471.1431,2065.8631 C 470.84811,2066.5484 471.02029,2067.4038 471.5584,2067.926 L 487.75466,2084.1735 C 488.27701,2084.6967 489.12753,2084.8702 489.81737,2084.5941 C 490.50722,2084.3181 490.99487,2083.6091 491.00003,2082.8749 L 491.00003,2066.5973 C 491.00203,2065.6165 490.09615,2064.7232 489.1018,2064.7249 L 472.93616,2064.7249 L 472.93616,2064.7249 z"
- id="path2548"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2550"
- d="M 452.93616,2064.7249 C 452.18152,2064.7059 451.43807,2065.1778 451.1431,2065.8631 C 450.84811,2066.5484 451.02029,2067.4038 451.5584,2067.926 L 467.75466,2084.1735 C 468.27701,2084.6967 469.12753,2084.8702 469.81737,2084.5941 C 470.50722,2084.3181 470.99487,2083.6091 471.00003,2082.8749 L 471.00003,2066.5973 C 471.00203,2065.6165 470.09615,2064.7232 469.1018,2064.7249 L 452.93616,2064.7249 L 452.93616,2064.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.01000001;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.075;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 532.93616,2044.7249 C 532.18152,2044.7059 531.43807,2045.1778 531.1431,2045.8631 C 530.84811,2046.5484 531.02029,2047.4038 531.5584,2047.926 L 547.75466,2064.1735 C 548.27701,2064.6967 549.12753,2064.8702 549.81737,2064.5941 C 550.50722,2064.3181 550.99487,2063.6091 551.00003,2062.8749 L 551.00003,2046.5973 C 551.00203,2045.6165 550.09615,2044.7232 549.1018,2044.7249 L 532.93616,2044.7249 L 532.93616,2044.7249 z"
- id="path2552"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2554"
- d="M 512.93616,2044.7249 C 512.18152,2044.7059 511.43807,2045.1778 511.1431,2045.8631 C 510.84811,2046.5484 511.02029,2047.4038 511.5584,2047.926 L 527.75466,2064.1735 C 528.27701,2064.6967 529.12753,2064.8702 529.81737,2064.5941 C 530.50722,2064.3181 530.99487,2063.6091 531.00003,2062.8749 L 531.00003,2046.5973 C 531.00203,2045.6165 530.09615,2044.7232 529.1018,2044.7249 L 512.93616,2044.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.025;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
- d="M 492.93616,2044.7249 C 492.18152,2044.7059 491.43807,2045.1778 491.1431,2045.8631 C 490.84811,2046.5484 491.02029,2047.4038 491.5584,2047.926 L 507.75466,2064.1735 C 508.27701,2064.6967 509.12753,2064.8702 509.81737,2064.5941 C 510.50722,2064.3181 510.99487,2063.6091 511.00003,2062.8749 L 511.00003,2046.5973 C 511.00203,2045.6165 510.09615,2044.7232 509.1018,2044.7249 L 492.93616,2044.7249 L 492.93616,2044.7249 z"
- id="path2556"
- sodipodi:nodetypes="csccscccc" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2558"
- d="M 472.93616,2044.7249 C 472.18152,2044.7059 471.43807,2045.1778 471.1431,2045.8631 C 470.84811,2046.5484 471.02029,2047.4038 471.5584,2047.926 L 487.75466,2064.1735 C 488.27701,2064.6967 489.12753,2064.8702 489.81737,2064.5941 C 490.50722,2064.3181 490.99487,2063.6091 491.00003,2062.8749 L 491.00003,2046.5973 C 491.00203,2045.6165 490.09615,2044.7232 489.1018,2044.7249 L 472.93616,2044.7249 L 472.93616,2044.7249 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.01000001;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86823654;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
- <path
- sodipodi:nodetypes="csccscccc"
- id="path2560"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list