[Libreoffice-commits] .: comphelper/inc comphelper/Library_comphelp.mk comphelper/Package_inc.mk comphelper/source cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/source extensions/prj extensions/source framework/source offapi/com offapi/UnoApi_offapi.mk postprocess/packcomponents postprocess/packregistry postprocess/rebase scp2/source setup_native/source sfx2/source svx/inc svx/source
August Sodora
augsod at kemper.freedesktop.org
Wed Dec 7 18:59:38 PST 2011
comphelper/Library_comphelp.mk | 1
comphelper/Package_inc.mk | 1
comphelper/inc/comphelper/uieventslogger.hxx | 60
comphelper/source/misc/uieventslogger.cxx | 680 ----------
cui/AllLangResTarget_cui.mk | 1
cui/Library_cui.mk | 2
cui/source/factory/dlgfact.cxx | 9
cui/source/inc/optimprove.hxx | 120 -
cui/source/options/optimprove.cxx | 197 --
cui/source/options/optimprove.hrc | 50
cui/source/options/optimprove.src | 124 -
cui/source/options/optimprove2.cxx | 267 ---
cui/source/options/treeopt.cxx | 43
cui/source/options/treeopt.src | 1
extensions/prj/build.lst | 4
extensions/prj/d.lst | 2
extensions/source/oooimprovecore/core.cxx | 190 --
extensions/source/oooimprovecore/makefile.mk | 82 -
extensions/source/oooimprovecore/oooimprovecore.component | 34
extensions/source/oooimprovecore/oooimprovecore_module.cxx | 54
extensions/source/oooimprovecore/oooimprovecore_module.hxx | 89 -
extensions/source/oooimprovecore/oooimprovecore_services.cxx | 51
extensions/source/oooimprovement/Jobs.xcu | 25
extensions/source/oooimprovement/Logging.xcu | 8
extensions/source/oooimprovement/config.cxx | 297 ----
extensions/source/oooimprovement/config.hxx | 67
extensions/source/oooimprovement/corecontroller.cxx | 90 -
extensions/source/oooimprovement/corecontroller.hxx | 86 -
extensions/source/oooimprovement/errormail.cxx | 206 ---
extensions/source/oooimprovement/errormail.hxx | 57
extensions/source/oooimprovement/invite_job.cxx | 125 -
extensions/source/oooimprovement/invite_job.hxx | 84 -
extensions/source/oooimprovement/logpacker.cxx | 115 -
extensions/source/oooimprovement/logpacker.hxx | 54
extensions/source/oooimprovement/logstorage.cxx | 147 --
extensions/source/oooimprovement/logstorage.hxx | 58
extensions/source/oooimprovement/makefile.mk | 110 -
extensions/source/oooimprovement/makefile.pmk | 29
extensions/source/oooimprovement/myconfigurationhelper.cxx | 156 --
extensions/source/oooimprovement/myconfigurationhelper.hxx | 213 ---
extensions/source/oooimprovement/onlogrotate_job.cxx | 241 ---
extensions/source/oooimprovement/onlogrotate_job.hxx | 85 -
extensions/source/oooimprovement/oooimprovement.component | 38
extensions/source/oooimprovement/oooimprovement_exports.cxx | 86 -
extensions/source/oooimprovement/soaprequest.cxx | 201 --
extensions/source/oooimprovement/soaprequest.hxx | 63
extensions/source/oooimprovement/soapsender.cxx | 161 --
extensions/source/oooimprovement/soapsender.hxx | 59
framework/source/inc/dispatch/uieventloghelper.hxx | 85 -
framework/source/uielement/buttontoolbarcontroller.cxx | 3
framework/source/uielement/complextoolbarcontroller.cxx | 7
framework/source/uielement/controlmenucontroller.cxx | 3
framework/source/uielement/fontmenucontroller.cxx | 7
framework/source/uielement/fontsizemenucontroller.cxx | 3
framework/source/uielement/footermenucontroller.cxx | 1
framework/source/uielement/generictoolbarcontroller.cxx | 4
framework/source/uielement/headermenucontroller.cxx | 3
framework/source/uielement/langselectionmenucontroller.cxx | 3
framework/source/uielement/langselectionstatusbarcontroller.cxx | 3
framework/source/uielement/macrosmenucontroller.cxx | 3
framework/source/uielement/menubarmanager.cxx | 3
framework/source/uielement/newmenucontroller.cxx | 3
framework/source/uielement/objectmenucontroller.cxx | 3
framework/source/uielement/recentfilesmenucontroller.cxx | 3
framework/source/uielement/toolbarsmenucontroller.cxx | 3
offapi/UnoApi_offapi.mk | 8
offapi/com/sun/star/oooimprovement/Core.idl | 55
offapi/com/sun/star/oooimprovement/CoreController.idl | 56
offapi/com/sun/star/oooimprovement/XCore.idl | 59
offapi/com/sun/star/oooimprovement/XCoreController.idl | 57
postprocess/packcomponents/makefile.mk | 1
postprocess/packregistry/makefile.mk | 6
postprocess/rebase/coffbase.txt | 2
scp2/source/ooo/file_library_ooo.scp | 2
setup_native/source/packinfo/packinfo_office.txt | 46
sfx2/source/control/bindings.cxx | 20
sfx2/source/toolbox/tbxitem.cxx | 41
svx/inc/svx/dialogs.hrc | 1
svx/source/dialog/svxruler.cxx | 29
79 files changed, 1 insertion(+), 5445 deletions(-)
New commits:
commit bd7f8380113b0cbe706d131b33e7551b2c484205
Author: August Sodora <augsod at gmail.com>
Date: Wed Dec 7 21:58:26 2011 -0500
Remove oooimprovement
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 29ab780..be36994 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -115,7 +115,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/string \
comphelper/source/misc/synchronousdispatch \
comphelper/source/misc/types \
- comphelper/source/misc/uieventslogger \
comphelper/source/misc/weak \
comphelper/source/misc/weakeventlistener \
comphelper/source/officeinstdir/officeinstallationdirectories \
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
index 87e4a2a..bb5490b 100644
--- a/comphelper/Package_inc.mk
+++ b/comphelper/Package_inc.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/TypeGeneration.h
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/MasterPropertySetInfo.hxx,comphelper/MasterPropertySetInfo.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessiblewrapper.hxx,comphelper/accessiblewrapper.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sequence.hxx,comphelper/sequence.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/uieventslogger.hxx,comphelper/uieventslogger.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/docpasswordhelper.hxx,comphelper/docpasswordhelper.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertystatecontainer.hxx,comphelper/propertystatecontainer.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertysetinfo.hxx,comphelper/propertysetinfo.hxx))
diff --git a/comphelper/inc/comphelper/uieventslogger.hxx b/comphelper/inc/comphelper/uieventslogger.hxx
deleted file mode 100644
index 40e9a68..0000000
--- a/comphelper/inc/comphelper/uieventslogger.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _COMPHELPER_UIEVENTSLOGGER_HXX
-#define _COMPHELPER_UIEVENTSLOGGER_HXX
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/util/URL.hpp>
-#include <comphelper/comphelperdllapi.h>
-#include <rtl/ustring.hxx>
-
-
-namespace comphelper
-{
- // this class is part of the OOo Improvement Program Core
- class COMPHELPER_DLLPUBLIC UiEventsLogger
- {
- public:
- static sal_Bool isEnabled();
- static sal_Int32 getSessionLogEventCount();
- static void appendDispatchOrigin( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args, const ::rtl::OUString& originapp, const ::rtl::OUString& originwidget);
- static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> purgeDispatchOrigin(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args);
- static void logDispatch(const ::com::sun::star::util::URL& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& args);
- static void logVcl(const ::rtl::OUString& parent_id, sal_Int32 window_type, const ::rtl::OUString& id, const ::rtl::OUString& method, const ::rtl::OUString& param);
- static void logVcl(const ::rtl::OUString& parent_id, sal_Int32 window_type, const ::rtl::OUString& id, const ::rtl::OUString& method, sal_Int32 param);
- static void logVcl(const ::rtl::OUString& parent_id, sal_Int32 window_type, const ::rtl::OUString& id, const ::rtl::OUString& method);
- static void disposing();
- static void reinit();
- virtual ~UiEventsLogger() {}
- };
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
deleted file mode 100644
index 5fa210d..0000000
--- a/comphelper/source/misc/uieventslogger.cxx
+++ /dev/null
@@ -1,680 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-***********************************************************************/
-
-
-#include <comphelper/uieventslogger.hxx>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/logging/LogLevel.hpp>
-#include <com/sun/star/logging/XCsvLogFormatter.hpp>
-#include <com/sun/star/logging/XLogHandler.hpp>
-#include <com/sun/star/logging/XLogger.hpp>
-#include <com/sun/star/logging/XLoggerPool.hpp>
-#include <com/sun/star/oooimprovement/XCoreController.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/util/XStringSubstitution.hpp>
-#include <comphelper/configurationhelper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <map>
-#include <osl/file.hxx>
-#include <osl/mutex.hxx>
-#include <osl/time.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/instance.hxx>
-
-
-using namespace com::sun::star::beans;
-using namespace com::sun::star::frame;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::logging;
-using namespace com::sun::star::oooimprovement;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::util;
-using namespace cppu;
-using namespace osl;
-using namespace std;
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-namespace
-{
- static void lcl_SetupOriginAppAbbr(map<OUString, OUString>& abbrs)
- {
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))] = OUString(sal_Unicode('W')); // Writer
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))] = OUString(sal_Unicode('C')); // Calc
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"))] = OUString(sal_Unicode('I')); // Impress
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"))] = OUString(sal_Unicode('D')); // Draw
- };
-
- static void lcl_SetupOriginWidgetAbbr(map<OUString,OUString>& abbrs)
- {
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))] = OUString(sal_Unicode('0'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))] = OUString(sal_Unicode('1'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))] = OUString(sal_Unicode('2'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))] = OUString(sal_Unicode('3'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("FontSizeMenuController"))] = OUString(sal_Unicode('4'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("FooterMenuController"))] = OUString(sal_Unicode('5'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))] = OUString(sal_Unicode('6'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderMenuController"))] = OUString(sal_Unicode('7'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("LanguageSelectionMenuController"))] = OUString(sal_Unicode('8'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("LangSelectionStatusbarController"))] = OUString(sal_Unicode('9'));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("10"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("MenuBarManager"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("11"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("NewMenuController"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("12"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectMenuController"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("13"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("14"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("ToolbarsMenuController"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("15"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("16"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("SfxAsyncExec"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("17"));
- abbrs[OUString(RTL_CONSTASCII_USTRINGPARAM("AcceleratorExecute"))] = OUString(RTL_CONSTASCII_USTRINGPARAM("18"));
- };
-}
-
-namespace comphelper
-{
- // declaration of implementation
- class UiEventsLogger_Impl;
- class UiEventsLogger_Impl : public UiEventsLogger
- {
- private:
- //typedefs and friends
- friend class UiEventsLogger;
- typedef UiEventsLogger_Impl* ptr;
-
- // instance methods and data
- UiEventsLogger_Impl();
- void initializeLogger();
- void logDispatch(const ::com::sun::star::util::URL& url,
- const Sequence<PropertyValue>& args);
- void logRotated();
- void logVcl(const ::rtl::OUString& parent_id,
- sal_Int32 window_type,
- const ::rtl::OUString& id,
- const ::rtl::OUString& method,
- const ::rtl::OUString& param);
- void rotate();
- void hotRotate();
- void prepareLogHandler();
- void checkIdleTimeout();
- OUString getCurrentPath();
- OUString getRotatedPath();
- void disposing();
-
- bool m_Active;
- TimeValue m_LastLogEventTime;
- const OUString m_LogPath;
- const TimeValue m_IdleTimeout;
- sal_Int32 m_SessionLogEventCount;
- Reference<XLogger> m_Logger;
- Reference<XLogHandler> m_LogHandler;
- Reference<XCsvLogFormatter> m_Formatter;
- map<OUString, OUString> m_OriginAppAbbr;
- map<OUString, OUString> m_OriginWidgetAbbr;
-
-
- // static methods and data
- static ptr getInstance();
- static bool shouldActivate();
- static bool getEnabledFromCoreController();
- static bool getEnabledFromCfg();
- static TimeValue getIdleTimeoutFromCfg();
- static OUString getLogPathFromCfg();
- static sal_Int32 findIdx(const Sequence<PropertyValue>& args, const OUString& key);
-
- static ptr instance;
- static const sal_Int32 COLUMNS;
- static const OUString CFG_ENABLED;
- static const OUString CFG_IDLETIMEOUT;
- static const OUString CFG_LOGGING;
- static const OUString CFG_LOGPATH;
- static const OUString CFG_OOOIMPROVEMENT;
- static const OUString ETYPE_DISPATCH;
- static const OUString ETYPE_ROTATED;
- static const OUString ETYPE_VCL;
- static const OUString CSSL_CSVFORMATTER;
- static const OUString CSSL_FILEHANDLER;
- static const OUString CSSL_LOGGERPOOL;
- static const OUString CSSO_CORECONTROLLER;
- static const OUString CSST_JOBEXECUTOR;
- static const OUString CSSU_PATHSUB;
- static const OUString LOGGERNAME;
- static const OUString LOGORIGINAPP;
- static const OUString LOGORIGINWIDGET;
- static const OUString UNKNOWN_ORIGIN;
- static const OUString FN_CURRENTLOG;
- static const OUString FN_ROTATEDLOG;
- static const OUString LOGROTATE_EVENTNAME;
- static const OUString URL_UNO;
- static const OUString URL_SPECIAL;
- static const OUString URL_FILE;
- };
-}
-
-namespace comphelper
-{
- // consts
- const sal_Int32 UiEventsLogger_Impl::COLUMNS = 9;
- const OUString UiEventsLogger_Impl::CFG_ENABLED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed"));
- const OUString UiEventsLogger_Impl::CFG_IDLETIMEOUT(RTL_CONSTASCII_USTRINGPARAM("IdleTimeout"));
- const OUString UiEventsLogger_Impl::CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging"));
- const OUString UiEventsLogger_Impl::CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath"));
- const OUString UiEventsLogger_Impl::CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement"));
-
- const OUString UiEventsLogger_Impl::CSSL_CSVFORMATTER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.logging.CsvFormatter"));
- const OUString UiEventsLogger_Impl::CSSL_FILEHANDLER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.logging.FileHandler"));
- const OUString UiEventsLogger_Impl::CSSL_LOGGERPOOL(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.logging.LoggerPool"));
- const OUString UiEventsLogger_Impl::CSSO_CORECONTROLLER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"));
- const OUString UiEventsLogger_Impl::CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution"));
-
- const OUString UiEventsLogger_Impl::ETYPE_DISPATCH(RTL_CONSTASCII_USTRINGPARAM("dispatch"));
- const OUString UiEventsLogger_Impl::ETYPE_ROTATED(RTL_CONSTASCII_USTRINGPARAM("rotated"));
- const OUString UiEventsLogger_Impl::ETYPE_VCL(RTL_CONSTASCII_USTRINGPARAM("vcl"));
-
- const OUString UiEventsLogger_Impl::LOGGERNAME(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.oooimprovement.Core.UiEventsLogger"));
- const OUString UiEventsLogger_Impl::LOGORIGINWIDGET(RTL_CONSTASCII_USTRINGPARAM("comphelper.UiEventsLogger.LogOriginWidget"));
- const OUString UiEventsLogger_Impl::LOGORIGINAPP(RTL_CONSTASCII_USTRINGPARAM("comphelper.UiEventsLogger.LogOriginApp"));
-
- const OUString UiEventsLogger_Impl::UNKNOWN_ORIGIN(RTL_CONSTASCII_USTRINGPARAM("unknown origin"));
- const OUString UiEventsLogger_Impl::FN_CURRENTLOG(RTL_CONSTASCII_USTRINGPARAM("Current"));
- const OUString UiEventsLogger_Impl::FN_ROTATEDLOG(RTL_CONSTASCII_USTRINGPARAM("OOoImprove"));
- const OUString UiEventsLogger_Impl::LOGROTATE_EVENTNAME(RTL_CONSTASCII_USTRINGPARAM("onOOoImprovementLogRotated"));
-
- const OUString UiEventsLogger_Impl::URL_UNO(RTL_CONSTASCII_USTRINGPARAM(".uno:"));
- const OUString UiEventsLogger_Impl::URL_SPECIAL(RTL_CONSTASCII_USTRINGPARAM(".special:"));
- const OUString UiEventsLogger_Impl::URL_FILE(RTL_CONSTASCII_USTRINGPARAM("file:"));
-
- namespace
- {
- struct theSingletonMutex : public rtl::Static< Mutex, theSingletonMutex > {};
- }
-
- // public UiEventsLogger interface
- sal_Bool UiEventsLogger::isEnabled()
- {
- if ( UiEventsLogger_Impl::getEnabledFromCfg() )
- {
- try {
- Guard<Mutex> singleton_guard(theSingletonMutex::get());
- return UiEventsLogger_Impl::getInstance()->m_Active;
- } catch(...) { return false; } // never throws
- } // if ( )
- return sal_False;
- }
-
- sal_Int32 UiEventsLogger::getSessionLogEventCount()
- {
- try {
- Guard<Mutex> singleton_guard(theSingletonMutex::get());
- return UiEventsLogger_Impl::getInstance()->m_SessionLogEventCount;
- } catch(...) { return 0; } // never throws
- }
-
- void UiEventsLogger::appendDispatchOrigin(
- Sequence<PropertyValue>& args,
- const OUString& originapp,
- const OUString& originwidget)
- {
- sal_Int32 old_length = args.getLength();
- args.realloc(old_length+2);
- args[old_length].Name = UiEventsLogger_Impl::LOGORIGINAPP;
- args[old_length].Value = static_cast<Any>(originapp);
- args[old_length+1].Name = UiEventsLogger_Impl::LOGORIGINWIDGET;
- args[old_length+1].Value = static_cast<Any>(originwidget);
- }
-
- Sequence<PropertyValue> UiEventsLogger::purgeDispatchOrigin(
- const Sequence<PropertyValue>& args)
- {
- Sequence<PropertyValue> result(args.getLength());
- sal_Int32 target_idx=0;
- for(sal_Int32 source_idx=0; source_idx<args.getLength(); source_idx++)
- if(args[source_idx].Name != UiEventsLogger_Impl::LOGORIGINAPP
- && args[source_idx].Name != UiEventsLogger_Impl::LOGORIGINWIDGET)
- result[target_idx++] = args[source_idx];
- result.realloc(target_idx);
- return result;
- }
-
- void UiEventsLogger::logDispatch(
- const URL& url,
- const Sequence<PropertyValue>& args)
- {
- try {
- Guard<Mutex> singleton_guard(theSingletonMutex::get());
- UiEventsLogger_Impl::getInstance()->logDispatch(url, args);
- } catch(...) { } // never throws
- }
-
- void UiEventsLogger::logVcl(
- const OUString& parent_id,
- sal_Int32 window_type,
- const OUString& id,
- const OUString& method,
- const OUString& param)
- {
- try {
- Guard<Mutex> singleton_guard(theSingletonMutex::get());
- UiEventsLogger_Impl::getInstance()->logVcl(parent_id, window_type, id, method, param);
- } catch(...) { } // never throws
- }
-
- void UiEventsLogger::logVcl(
- const OUString& parent_id,
- sal_Int32 window_type,
- const OUString& id,
- const OUString& method,
- sal_Int32 param)
- {
- OUStringBuffer buf;
- UiEventsLogger::logVcl(parent_id, window_type, id, method, buf.append(param).makeStringAndClear());
- }
-
- void UiEventsLogger::logVcl(
- const OUString& parent_id,
- sal_Int32 window_type,
- const OUString& id,
- const OUString& method)
- {
- OUString empty;
- UiEventsLogger::logVcl(parent_id, window_type, id, method, empty);
- }
-
- void UiEventsLogger::disposing()
- {
- // we dont want to create an instance just to dispose it
- Guard<Mutex> singleton_guard(theSingletonMutex::get());
- if(UiEventsLogger_Impl::instance!=UiEventsLogger_Impl::ptr())
- UiEventsLogger_Impl::getInstance()->disposing();
- }
-
- void UiEventsLogger::reinit()
- {
- Guard<Mutex> singleton_guard(theSingletonMutex::get());
- if(UiEventsLogger_Impl::instance)
- {
- UiEventsLogger_Impl::instance->disposing();
- delete UiEventsLogger_Impl::instance;
- UiEventsLogger_Impl::instance = NULL;
- }
- }
-
- // private UiEventsLogger_Impl methods
- UiEventsLogger_Impl::UiEventsLogger_Impl()
- : m_Active(UiEventsLogger_Impl::shouldActivate())
- , m_LogPath(UiEventsLogger_Impl::getLogPathFromCfg())
- , m_IdleTimeout(UiEventsLogger_Impl::getIdleTimeoutFromCfg())
- , m_SessionLogEventCount(0)
- {
- lcl_SetupOriginAppAbbr(m_OriginAppAbbr);
- lcl_SetupOriginWidgetAbbr(m_OriginWidgetAbbr);
- m_LastLogEventTime.Seconds = m_LastLogEventTime.Nanosec = 0;
- if(m_Active) rotate();
- if(m_Active) initializeLogger();
- }
-
- void UiEventsLogger_Impl::logDispatch(
- const URL& url,
- const Sequence<PropertyValue>& args)
- {
- if(!m_Active) return;
- if(!url.Complete.match(URL_UNO)
- && !url.Complete.match(URL_FILE)
- && !url.Complete.match(URL_SPECIAL))
- {
- return;
- }
- checkIdleTimeout();
-
- Sequence<OUString> logdata = Sequence<OUString>(COLUMNS);
- logdata[0] = ETYPE_DISPATCH;
- sal_Int32 originapp_idx = findIdx(args, LOGORIGINAPP);
- if(originapp_idx!=-1)
- {
- OUString app;
- args[originapp_idx].Value >>= app;
- map<OUString, OUString>::iterator abbr_it = m_OriginAppAbbr.find(app);
- if(abbr_it != m_OriginAppAbbr.end())
- app = abbr_it->second;
- logdata[1] = app;
- }
- else
- logdata[1] = UNKNOWN_ORIGIN;
- sal_Int32 originwidget_idx = findIdx(args, LOGORIGINWIDGET);
- if(originwidget_idx!=-1)
- {
- OUString widget;
- args[originwidget_idx].Value >>= widget;
- map<OUString, OUString>::iterator widget_it = m_OriginWidgetAbbr.find(widget);
- if(widget_it != m_OriginWidgetAbbr.end())
- widget = widget_it->second;
- logdata[2] = widget;
- }
- else
- logdata[2] = UNKNOWN_ORIGIN;
- if(url.Complete.match(URL_FILE))
- logdata[3] = URL_FILE;
- else
- logdata[3] = url.Main;
- OSL_TRACE("UiEventsLogger Logging: %s,%s,%s,%s,%s,%s,%s,%s",
- OUStringToOString(logdata[0],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[1],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[2],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[3],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[4],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[5],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[6],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[7],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[8],RTL_TEXTENCODING_UTF8).getStr());
- m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata));
- m_SessionLogEventCount++;
- }
-
- void UiEventsLogger_Impl::logRotated()
- {
- Sequence<OUString> logdata = Sequence<OUString>(COLUMNS);
- logdata[0] = ETYPE_ROTATED;
- OSL_TRACE("UiEventsLogger Logging: %s,%s,%s,%s,%s,%s,%s,%s",
- OUStringToOString(logdata[0],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[1],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[2],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[3],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[4],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[5],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[6],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[7],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[8],RTL_TEXTENCODING_UTF8).getStr());
- m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata));
- }
-
- void UiEventsLogger_Impl::logVcl(
- const OUString& parent_id,
- sal_Int32 window_type,
- const OUString& id,
- const OUString& method,
- const OUString& param)
- {
- if(!m_Active) return;
- checkIdleTimeout();
-
- OUStringBuffer buf;
- Sequence<OUString> logdata = Sequence<OUString>(COLUMNS);
- logdata[0] = ETYPE_VCL;
- logdata[4] = parent_id;
- logdata[5] = buf.append(window_type).makeStringAndClear();
- logdata[6] = id;
- logdata[7] = method;
- logdata[8] = param;
- OSL_TRACE("UiEventsLogger Logging: %s,%s,%s,%s,%s,%s,%s,%s",
- OUStringToOString(logdata[0],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[1],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[2],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[3],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[4],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[5],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[6],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[7],RTL_TEXTENCODING_UTF8).getStr(),
- OUStringToOString(logdata[8],RTL_TEXTENCODING_UTF8).getStr());
- m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata));
- m_SessionLogEventCount++;
- }
-
- void UiEventsLogger_Impl::rotate()
- {
- FileBase::RC result = File::move(getCurrentPath(), getRotatedPath());
- if(result!=FileBase::E_None && result!=FileBase::E_NOENT)
- m_Active = false;
- }
-
- void UiEventsLogger_Impl::hotRotate()
- {
- logRotated();
- m_Logger->removeLogHandler(m_LogHandler);
- m_LogHandler = NULL;
- rotate();
- prepareLogHandler();
- if(m_Formatter.is() && m_LogHandler.is() && m_Logger.is())
- {
- m_LogHandler->setFormatter(Reference<XLogFormatter>(m_Formatter, UNO_QUERY));
- m_LogHandler->setLevel(LogLevel::ALL);
- m_Logger->addLogHandler(m_LogHandler);
- }
- else
- m_Active = false;
- }
-
- void UiEventsLogger_Impl::prepareLogHandler()
- {
- Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
-
- Sequence<Any> init_args = Sequence<Any>(1);
- init_args[0] = static_cast<Any>(getCurrentPath());
- Reference< XInterface > temp =
- sm->createInstanceWithArguments(CSSL_FILEHANDLER, init_args);
- m_LogHandler = Reference<XLogHandler>(temp, UNO_QUERY);
- }
-
- void UiEventsLogger_Impl::checkIdleTimeout()
- {
- TimeValue now;
- osl_getSystemTime(&now);
- if(now.Seconds - m_LastLogEventTime.Seconds > m_IdleTimeout.Seconds && m_SessionLogEventCount>0)
- hotRotate();
- m_LastLogEventTime = now;
- }
-
- OUString UiEventsLogger_Impl::getCurrentPath()
- {
- OUStringBuffer current_path(m_LogPath);
- current_path.appendAscii("/");
- current_path.append(FN_CURRENTLOG);
- current_path.appendAscii(".csv");
- return current_path.makeStringAndClear();
- }
-
- OUString UiEventsLogger_Impl::getRotatedPath()
- {
- OUStringBuffer rotated_path(m_LogPath);
- rotated_path.appendAscii("/");
- rotated_path.append(FN_ROTATEDLOG);
- rotated_path.appendAscii("-");
- {
- // ISO 8601
- char tsrotated_pathfer[20];
- oslDateTime now;
- TimeValue now_tv;
- osl_getSystemTime(&now_tv);
- osl_getDateTimeFromTimeValue(&now_tv, &now);
- const size_t rotated_pathfer_size = sizeof(tsrotated_pathfer);
- snprintf(tsrotated_pathfer, rotated_pathfer_size, "%04i-%02i-%02iT%02i_%02i_%02i",
- now.Year,
- now.Month,
- now.Day,
- now.Hours,
- now.Minutes,
- now.Seconds);
- rotated_path.appendAscii(tsrotated_pathfer);
- rotated_path.appendAscii(".csv");
- }
- return rotated_path.makeStringAndClear();
- }
-
- void UiEventsLogger_Impl::initializeLogger()
- {
- Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
-
- // getting the Core Uno proxy object
- // It will call disposing and make sure we clear all our references
- {
- Reference<XTerminateListener> xCore(
- sm->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"))),
- UNO_QUERY);
- Reference<XDesktop> xDesktop(
- sm->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
- UNO_QUERY);
- if(!(xCore.is() && xDesktop.is()))
- {
- m_Active = false;
- return;
- }
- xDesktop->addTerminateListener(xCore);
- }
- // getting the LoggerPool
- Reference<XLoggerPool> pool;
- {
- Reference<XInterface> temp =
- sm->createInstance(CSSL_LOGGERPOOL);
- pool = Reference<XLoggerPool>(temp, UNO_QUERY);
- }
-
- // getting the Logger
- m_Logger = pool->getNamedLogger(LOGGERNAME);
-
- // getting the FileHandler
- prepareLogHandler();
-
- // getting the Formatter
- {
- Reference<XInterface> temp =
- sm->createInstance(CSSL_CSVFORMATTER);
- m_Formatter = Reference<XCsvLogFormatter>(temp, UNO_QUERY);
- }
-
- if(m_Formatter.is() && m_LogHandler.is() && m_Logger.is())
- {
- Sequence<OUString> columns = Sequence<OUString>(COLUMNS);
- columns[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("eventtype"));
- columns[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("originapp"));
- columns[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("originwidget"));
- columns[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("uno url"));
- columns[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("parent id"));
- columns[5] = OUString(RTL_CONSTASCII_USTRINGPARAM("window type"));
- columns[6] = OUString(RTL_CONSTASCII_USTRINGPARAM("id"));
- columns[7] = OUString(RTL_CONSTASCII_USTRINGPARAM("method"));
- columns[8] = OUString(RTL_CONSTASCII_USTRINGPARAM("parameter"));
- m_Formatter->setColumnnames(columns);
- m_LogHandler->setFormatter(Reference<XLogFormatter>(m_Formatter, UNO_QUERY));
- m_Logger->setLevel(LogLevel::ALL);
- m_LogHandler->setLevel(LogLevel::ALL);
- m_Logger->addLogHandler(m_LogHandler);
- }
- else
- m_Active = false;
- }
-
- // private static UiEventsLogger_Impl
- bool UiEventsLogger_Impl::shouldActivate()
- {
- return getEnabledFromCfg() && getEnabledFromCoreController();
- }
-
- OUString UiEventsLogger_Impl::getLogPathFromCfg()
- {
- OUString result;
- Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
-
- ConfigurationHelper::readDirectKey(
- sm,
- CFG_LOGGING, CFG_OOOIMPROVEMENT, CFG_LOGPATH,
- ConfigurationHelper::E_READONLY
- ) >>= result;
-
- Reference<XStringSubstitution> path_sub(
- sm->createInstance(CSSU_PATHSUB),
- UNO_QUERY);
- if(path_sub.is())
- result = path_sub->substituteVariables(result, sal_False);
- return result;
- }
-
- TimeValue UiEventsLogger_Impl::getIdleTimeoutFromCfg()
- {
- sal_Int32 timeoutminutes = 360;
- Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
-
- ConfigurationHelper::readDirectKey(
- sm,
- CFG_LOGGING, CFG_OOOIMPROVEMENT, CFG_IDLETIMEOUT,
- ConfigurationHelper::E_READONLY
- ) >>= timeoutminutes;
- TimeValue result;
- result.Seconds = static_cast<sal_uInt32>(timeoutminutes)*60;
- result.Nanosec = 0;
- return result;
- }
-
- bool UiEventsLogger_Impl::getEnabledFromCfg()
- {
- sal_Bool result = false;
- Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
- ConfigurationHelper::readDirectKey(
- sm,
- CFG_LOGGING, CFG_OOOIMPROVEMENT, CFG_ENABLED,
- ::comphelper::ConfigurationHelper::E_READONLY
- ) >>= result;
- return result;
- }
-
- bool UiEventsLogger_Impl::getEnabledFromCoreController()
- {
- Reference<XMultiServiceFactory> sm = getProcessServiceFactory();
- Reference<XCoreController> core_c(
- sm->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"))),
- UNO_QUERY);
- if(!core_c.is()) return false;
- return core_c->enablingUiEventsLoggerAllowed(1);
- }
-
- UiEventsLogger_Impl::ptr UiEventsLogger_Impl::instance = UiEventsLogger_Impl::ptr();
- UiEventsLogger_Impl::ptr UiEventsLogger_Impl::getInstance()
- {
- if(instance == NULL)
- instance = UiEventsLogger_Impl::ptr(new UiEventsLogger_Impl());
- return instance;
- }
-
- sal_Int32 UiEventsLogger_Impl::findIdx(const Sequence<PropertyValue>& args, const OUString& key)
- {
- for(sal_Int32 i=0; i<args.getLength(); i++)
- if(args[i].Name == key)
- return i;
- return -1;
- }
-
- void UiEventsLogger_Impl::disposing()
- {
- m_Active = false;
- m_Logger.clear() ;
- m_LogHandler.clear();
- m_Formatter.clear();
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index bbe5492..9d40d82 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -91,7 +91,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optgdlg.src \
cui/source/options/optgenrl.src \
cui/source/options/opthtml.src \
- cui/source/options/optimprove.src \
cui/source/options/optinet2.src \
cui/source/options/optjava.src \
cui/source/options/optjsearch.src \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index fa6df22..6a5e683 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -156,8 +156,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optgenrl \
cui/source/options/optHeaderTabListbox \
cui/source/options/opthtml \
- cui/source/options/optimprove2 \
- cui/source/options/optimprove \
cui/source/options/optinet2 \
cui/source/options/optjava \
cui/source/options/optjsearch \
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 2a6340d..dc7c368 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -36,7 +36,6 @@
#include <cuires.hrc>
#include <svx/dialogs.hrc>
#include "numfmt.hxx"
-#include "optimprove.hxx"
#include "splitcelldlg.hxx"
#include "gallery.hrc"
#include "dstribut.hxx"
@@ -1667,14 +1666,6 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
case RID_SFXPAGE_DBREGISTER :
pDlg = new DatabaseRegistrationDialog( pParent, rAttr );
break;
- case RID_SVXPAGE_IMPROVEMENT :
- {
- String help_url;
- SFX_ITEMSET_ARG( &rAttr, pItem, SfxStringItem, SID_CURRENT_URL, sal_False );
- if ( pItem )
- help_url = pItem->GetValue();
- pDlg = new SvxImprovementDialog( pParent, help_url);
- }
default:
break;
}
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
deleted file mode 100644
index 0666c78..0000000
--- a/cui/source/inc/optimprove.hxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTIMPROVE_HXX
-#define _SVX_OPTIMPROVE_HXX
-
-// include ---------------------------------------------------------------
-
-#include <vcl/tabpage.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <svtools/fixedhyper.hxx>
-#include <sfx2/basedlgs.hxx>
-#include <sfx2/tabdlg.hxx>
-
-// class SvxImprovementPage ----------------------------------------------
-
-class SvxImprovementPage : public TabPage
-{
-private:
- FixedLine m_aImproveFL;
- FixedText m_aInvitationFT;
- RadioButton m_aYesRB;
- RadioButton m_aNoRB;
- FixedLine m_aDataFL;
- FixedText m_aNumberOfReportsFT;
- FixedText m_aNumberOfReportsValueFT;
- FixedText m_aNumberOfActionsFT;
- FixedText m_aNumberOfActionsValueFT;
- PushButton m_aShowDataPB;
-
- String m_sInfo;
- String m_sMoreInfo;
-
-public:
- SvxImprovementPage( Window* pParent );
- ~SvxImprovementPage();
-
- inline bool IsYesChecked() const { return m_aYesRB.IsChecked() != sal_False; }
-
- inline String GetPageText() const { return GetText(); }
- inline String GetInvitationText() const { return m_aInvitationFT.GetText(); }
- inline String GetYesButtonText() const { return m_aYesRB.GetText(); }
- inline String GetNoButtonText() const { return m_aNoRB.GetText(); }
- inline String GetInfoText() const { return m_sInfo; }
- inline String GetTitleText() const { return m_aImproveFL.GetText(); }
-};
-
-class SvxImprovementOptionsPage : public SfxTabPage
-{
-private:
- FixedLine m_aImproveFL;
- FixedText m_aInvitationFT;
- RadioButton m_aYesRB;
- RadioButton m_aNoRB;
- svt::FixedHyperlinkImage m_aInfoFI;
- FixedLine m_aDataFL;
- FixedText m_aNumberOfReportsFT;
- FixedText m_aNumberOfReportsValueFT;
- FixedText m_aNumberOfActionsFT;
- FixedText m_aNumberOfActionsValueFT;
- PushButton m_aShowDataPB;
-
- String m_sInfo;
- String m_sMoreInfo;
- ::rtl::OUString m_sLogPath;
-
- SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet );
-
- DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * );
- DECL_LINK( HandleShowData, PushButton * );
-
-public:
- virtual ~SvxImprovementOptionsPage();
-
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
-
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
-};
-
-class SvxImprovementDialog : public SfxSingleTabDialog
-{
-private:
- SvxImprovementPage* m_pPage;
-
- DECL_LINK( HandleOK, OKButton * );
- DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * );
-
-public:
- SvxImprovementDialog( Window* pParent, const String& rInfoURL );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx
deleted file mode 100644
index 27d5e9f..0000000
--- a/cui/source/options/optimprove.cxx
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// include ---------------------------------------------------------------
-
-#define _SVX_OPTIMPROVE_CXX
-
-#include <optimprove.hxx>
-#include <dialmgr.hxx>
-#include <vcl/msgbox.hxx>
-#include <svx/dialogs.hrc>
-#include "optimprove.hrc"
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/oooimprovement/XCoreController.hpp>
-#include <comphelper/configurationhelper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/uieventslogger.hxx>
-
-namespace lang = ::com::sun::star::lang;
-namespace uno = ::com::sun::star::uno;
-using namespace com::sun::star::system;
-
-// class SvxImprovementPage ----------------------------------------------
-
-SvxImprovementPage::SvxImprovementPage( Window* pParent ) :
-
- TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ),
-
- m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ),
- m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ),
- m_aYesRB ( this, CUI_RES( RB_YES ) ),
- m_aNoRB ( this, CUI_RES( RB_NO ) ),
- m_aDataFL ( this, CUI_RES( FL_DATA ) ),
- m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ),
- m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
- m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ),
- m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
- m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ),
-
- m_sInfo ( CUI_RES( STR_INFO ) ),
- m_sMoreInfo ( CUI_RES( STR_MOREINFO ) )
-
-{
- FreeResource();
-
- m_aInvitationFT.Show();
- m_aDataFL.Hide();
- m_aNumberOfReportsFT.Hide();
- m_aNumberOfReportsValueFT.Hide();
- m_aNumberOfActionsFT.Hide();
- m_aNumberOfActionsValueFT.Hide();
- m_aShowDataPB.Hide();
-
- Size aNewSize = m_aInvitationFT.GetSizePixel();
- const long nMinWidth = m_aYesRB.CalcMinimumSize().Width();
- const long nNewWidth = std::max( aNewSize.Width() * 4 / 5, nMinWidth );
- const long nWDelta = aNewSize.Width() - nNewWidth;
- aNewSize.Width() = nNewWidth;
- const Size aCalcSize = m_aInvitationFT.CalcMinimumSize( nNewWidth );
- const long nHDelta = aCalcSize.Height() - aNewSize.Height();
- aNewSize.Height() = aCalcSize.Height();
- m_aInvitationFT.SetSizePixel( aNewSize );
-
- aNewSize = m_aYesRB.GetSizePixel();
- aNewSize.Width() = nNewWidth;
- Point aNewPos = m_aYesRB.GetPosPixel();
- aNewPos.Y() += nHDelta;
- m_aYesRB.SetPosSizePixel( aNewPos, aNewSize );
- aNewSize = m_aNoRB.GetSizePixel();
- aNewSize.Width() = nNewWidth;
- aNewPos = m_aNoRB.GetPosPixel();
- aNewPos.Y() += nHDelta;
- m_aNoRB.SetPosSizePixel( aNewPos, aNewSize );
- aNewSize = m_aImproveFL.GetSizePixel();
- aNewSize.Width() -= nWDelta;
- m_aImproveFL.SetSizePixel( aNewSize );
-
- Size aSize = GetOutputSizePixel();
- aSize.Width() -= nWDelta;
- aSize.Height() = m_aDataFL.GetPosPixel().Y();
- aSize.Height() += nHDelta;
- SetSizePixel( aSize );
-}
-
-// -----------------------------------------------------------------------
-
-SvxImprovementPage::~SvxImprovementPage()
-{
-}
-
-// class SvxImprovementDialog --------------------------------------------
-
-SvxImprovementDialog::SvxImprovementDialog( Window* pParent, const String& rInfoURL ) :
-
- SfxSingleTabDialog( pParent, RID_SVXPAGE_IMPROVEMENT, rInfoURL ),
-
- m_pPage( NULL )
-
-{
- m_pPage = new SvxImprovementPage( this );
- SetInfoLink( LINK( this, SvxImprovementDialog, HandleHyperlink ) );
- SetPage( m_pPage );
- if ( GetOKButton() )
- GetOKButton()->SetClickHdl( LINK( this, SvxImprovementDialog, HandleOK ) );
-}
-
-IMPL_LINK( SvxImprovementDialog, HandleHyperlink, svt::FixedHyperlinkImage*, pHyperlinkImage )
-{
- ::rtl::OUString sURL( pHyperlinkImage->GetURL() );
-
- if ( sURL.getLength() > 0 )
- {
- try
- {
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
- uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
- if ( xSystemShell.is() )
- {
- xSystemShell->execute(
- sURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
- }
- }
- catch( const uno::Exception& e )
- {
- OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
- rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- }
-
- return 0;
-}
-
-IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG )
-{
- uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
- uno::Reference< com::sun::star::oooimprovement::XCoreController > core_c(
- xSMGR->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController") ) ),
- uno::UNO_QUERY);
- if(core_c.is())
- {
- ::comphelper::ConfigurationHelper::writeDirectKey(
- xSMGR,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation") ),
- uno::makeAny( true ),
- ::comphelper::ConfigurationHelper::E_STANDARD );
- ::comphelper::ConfigurationHelper::writeDirectKey(
- xSMGR,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted") ),
- uno::makeAny( m_pPage->IsYesChecked() ),
- ::comphelper::ConfigurationHelper::E_STANDARD );
- // TODO: refactor
- ::comphelper::UiEventsLogger::reinit();
- }
- EndDialog( RET_OK );
- return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optimprove.hrc b/cui/source/options/optimprove.hrc
deleted file mode 100644
index 024e5d5..0000000
--- a/cui/source/options/optimprove.hrc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTIMPROVE_HRC
-#define _SVX_OPTIMPROVE_HRC
-
-// defines ---------------------------------------------------------------
-
-#define FL_IMPROVE 10
-#define FT_INVITATION 11
-#define RB_YES 12
-#define RB_NO 13
-#define FL_DATA 14
-#define FT_NR_REPORTS 15
-#define FT_NR_REPORTS_VALUE 16
-#define FT_NR_ACTIONS 17
-#define FT_NR_ACTIONS_VALUE 18
-#define PB_SHOWDATA 19
-#define FI_INFO 20
-#define WIN_INFO 21
-#define BTN_OK 22
-
-#define STR_INFO 10
-#define STR_MOREINFO 11
-
-#endif
-
diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
deleted file mode 100644
index 523dc85..0000000
--- a/cui/source/options/optimprove.src
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// include --------------------------------------------------------------
-
-#include "optimprove.hrc"
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-TabPage RID_SVXPAGE_IMPROVEMENT
-{
- HelpId = "cui:TabPage:RID_SVXPAGE_IMPROVEMENT" ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
- Text [ en-US ] = "%PRODUCTNAME Improvement Program" ;
- FixedLine FL_IMPROVE
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Improvement Program" ;
- };
- FixedText FT_INVITATION
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 242 , 72 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "We invite you to join our %PRODUCTNAME Improvement Program to help optimize the quality of %PRODUCTNAME.\n\nIf you are willing to participate, we will collect anonymous statistics about how you use %PRODUCTNAME. The data is used to identify usage patterns.\n\nThe %PRODUCTNAME Improvement Program will not collect any personal data, or document content." ;
- };
- RadioButton RB_YES
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES";
- Pos = MAP_APPFONT ( 12 , 92 ) ;
- Size = MAP_APPFONT ( 215 , 10 ) ;
- Check = TRUE ;
- Text [ en-US ] = "~Yes, I am willing to participate in the %PRODUCTNAME Improvement Program" ;
- };
- RadioButton RB_NO
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO";
- Pos = MAP_APPFONT ( 12 , 105 ) ;
- Size = MAP_APPFONT ( 215 , 10 ) ;
- Text [ en-US ] = "~No, I do not wish to participate" ;
- };
- FixedImage FI_INFO
- {
- Pos = MAP_APPFONT ( 230 , 91 ) ;
- Size = MAP_APPFONT ( 24 , 24 ) ;
- Fixed = Image
- {
- ImageBitmap = Bitmap { File = "info.png"; };
- };
- };
- FixedLine FL_DATA
- {
- Pos = MAP_APPFONT ( 6 , 121 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Tracked Data" ;
- };
- FixedText FT_NR_REPORTS
- {
- Pos = MAP_APPFONT ( 12 , 132 ) ;
- Size = MAP_APPFONT ( 96 , 8 ) ;
- Text [ en-US ] = "Number of reports sent:" ;
- };
- FixedText FT_NR_REPORTS_VALUE
- {
- Pos = MAP_APPFONT ( 111 , 132 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- };
- FixedText FT_NR_ACTIONS
- {
- Pos = MAP_APPFONT ( 12 , 145 ) ;
- Size = MAP_APPFONT ( 96 , 8 ) ;
- Text [ en-US ] = "Number of tracked actions:" ;
- };
- FixedText FT_NR_ACTIONS_VALUE
- {
- Pos = MAP_APPFONT ( 111 , 145 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- };
- PushButton PB_SHOWDATA
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA";
- Pos = MAP_APPFONT ( 12 , 161 ) ;
- Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Show Data" ;
- };
- String STR_INFO
- {
- Text [ en-US ] = "Help Optimize the Quality of %PRODUCTNAME" ;
- };
- String STR_MOREINFO
- {
- Text [ en-US ] = "More Information" ;
- };
-};
-
diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx
deleted file mode 100644
index 4d6f238..0000000
--- a/cui/source/options/optimprove2.cxx
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define _SVX_OPTIMPROVE_CXX
-
-#include <optimprove.hxx>
-#include <dialmgr.hxx>
-#include <vcl/msgbox.hxx>
-
-#include "optimprove.hrc"
-#include "helpid.hrc"
-#include <cuires.hrc>
-#include <svx/dialogs.hrc>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/oooimprovement/XCore.hpp>
-#include <com/sun/star/oooimprovement/XCoreController.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/util/XStringSubstitution.hpp>
-#include <comphelper/configurationhelper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/synchronousdispatch.hxx>
-#include <comphelper/uieventslogger.hxx>
-#include <osl/file.hxx>
-
-#define C2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
-
-namespace beans = ::com::sun::star::beans;
-namespace lang = ::com::sun::star::lang;
-namespace uno = ::com::sun::star::uno;
-namespace util = ::com::sun::star::util;
-using namespace com::sun::star::system;
-
-
-namespace
-{
- bool lcl_doesLogfileExist(const ::rtl::OUString& sLogPath)
- {
- ::rtl::OUString sLogFile( sLogPath );
- sLogFile += C2S("/Current.csv");
- ::osl::File aLogFile(sLogFile);
- return aLogFile.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None;
- }
-}
-
-// class SvxImprovementOptionsPage ---------------------------------------
-
-SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
-
- SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
-
- m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ),
- m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ),
- m_aYesRB ( this, CUI_RES( RB_YES ) ),
- m_aNoRB ( this, CUI_RES( RB_NO ) ),
- m_aInfoFI ( this, CUI_RES( FI_INFO ) ),
- m_aDataFL ( this, CUI_RES( FL_DATA ) ),
- m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ),
- m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
- m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ),
- m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
- m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ),
-
- m_sInfo ( CUI_RES( STR_INFO ) ),
- m_sMoreInfo ( CUI_RES( STR_MOREINFO ) )
-
-{
- FreeResource();
-
- m_aInfoFI.SetURL( C2S( "www.sun.com/privacy/" ) );
- m_aInfoFI.SetClickHdl( LINK( this, SvxImprovementOptionsPage, HandleHyperlink ) );
- m_aShowDataPB.SetClickHdl( LINK( this, SvxImprovementOptionsPage, HandleShowData ) );
-}
-
-SvxImprovementOptionsPage::~SvxImprovementOptionsPage()
-{
-}
-
-IMPL_LINK( SvxImprovementOptionsPage, HandleHyperlink, svt::FixedHyperlinkImage*, EMPTYARG )
-{
- ::rtl::OUString sURL( m_aInfoFI.GetURL() );
-
- if ( sURL.getLength() > 0 )
- {
- try
- {
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
- uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
- if ( xSystemShell.is() )
- {
- xSystemShell->execute(
- sURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
- }
- }
- catch( const uno::Exception& e )
- {
- OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
- rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- }
-
- return 0;
-}
-
-IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG )
-{
- uno::Reference < uno::XInterface > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
- C2S("com.sun.star.frame.Desktop") ), uno::UNO_QUERY );
- if ( xDesktop.is() )
- {
- ::rtl::OUString sLogFile( m_sLogPath );
- sLogFile += C2S("/Current.csv");
- uno::Sequence< beans::PropertyValue > aArgs(3);
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName") );
- aArgs[0].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ) );
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions") );
- aArgs[1].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("44,34,12,1,") ) );
- aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
- aArgs[2].Value = uno::makeAny(true);
-
- uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch(
- xDesktop, sLogFile, C2S("_default"), 0, aArgs );
- if ( xDoc.is() )
- {
- dynamic_cast<Dialog*>(GetParent())->EndDialog( RET_CANCEL );
- return 1;
- }
- }
-
- return 0;
-}
-
-SfxTabPage* SvxImprovementOptionsPage::Create( Window* pParent, const SfxItemSet& rSet )
-{
- return new SvxImprovementOptionsPage( pParent, rSet );
-}
-
-sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ )
-{
- uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
- uno::Reference< uno::XInterface > xConfig;
-
- try
- {
- xConfig = ::comphelper::ConfigurationHelper::openConfig(
- xSMGR, C2S("/org.openoffice.Office.OOoImprovement.Settings"),
- ::comphelper::ConfigurationHelper::E_STANDARD );
- ::comphelper::ConfigurationHelper::writeRelativeKey(
- xConfig, C2S("Participation"), C2S("ShowedInvitation"), uno::makeAny( true ) );
- ::comphelper::ConfigurationHelper::writeRelativeKey(
- xConfig, C2S("Participation"), C2S("InvitationAccepted"), uno::makeAny( m_aYesRB.IsChecked() != sal_False ) );
- ::comphelper::ConfigurationHelper::flush( xConfig );
- // TODO: refactor
- ::comphelper::UiEventsLogger::reinit();
- }
- catch( uno::Exception& )
- {
- }
-
- return sal_False;
-}
-
-void SvxImprovementOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
-{
- uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
- uno::Reference< com::sun::star::oooimprovement::XCore > xCore(
- xSMGR->createInstance( C2S("com.sun.star.oooimprovement.Core") ),
- uno::UNO_QUERY );
- uno::Reference< uno::XInterface > xConfig;
-
- try
- {
- m_aNoRB.Check();
- xConfig = ::comphelper::ConfigurationHelper::openConfig(
- xSMGR, C2S("/org.openoffice.Office.OOoImprovement.Settings"),
- ::comphelper::ConfigurationHelper::E_READONLY );
- if ( xConfig.is() )
- {
- bool bYesChecked = false;
- uno::Any aAny = ::comphelper::ConfigurationHelper::
- readRelativeKey( xConfig, C2S("Participation"), C2S("ShowedInvitation") );
- if ( ( aAny >>= bYesChecked ) && bYesChecked )
- {
- bool bTemp = false;
- aAny = ::comphelper::ConfigurationHelper::
- readRelativeKey( xConfig, C2S("Participation"), C2S("InvitationAccepted") );
- if ( aAny >>= bTemp )
- {
- bYesChecked &= bTemp;
- if ( bYesChecked )
- m_aYesRB.Check();
- }
- }
-
- ::rtl::OUString sURL;
- aAny = ::comphelper::ConfigurationHelper::
- readRelativeKey( xConfig, C2S("Participation"), C2S("HelpUrl") );
- if ( aAny >>= sURL )
- m_aInfoFI.SetURL( sURL );
-
- sal_Int32 nCount = 0;
- aAny = ::comphelper::ConfigurationHelper::
- readRelativeKey( xConfig, C2S("Counters"), C2S("UploadedReports") );
- if ( aAny >>= nCount )
- m_aNumberOfReportsValueFT.SetText( String::CreateFromInt32( nCount ) );
- aAny = ::comphelper::ConfigurationHelper::
- readRelativeKey( xConfig, C2S("Counters"), C2S("LoggedEvents") );
- if ( aAny >>= nCount )
- {
- if ( xCore.is() )
- nCount += xCore->getSessionLogEventCount();
- m_aNumberOfActionsValueFT.SetText( String::CreateFromInt32( nCount ) );
- }
-
- ::rtl::OUString sPath;
- aAny = ::comphelper::ConfigurationHelper::readDirectKey(
- xSMGR, C2S("/org.openoffice.Office.Logging"), C2S("OOoImprovement"),
- C2S("LogPath"), ::comphelper::ConfigurationHelper::E_READONLY );
- if ( aAny >>= sPath )
- {
- uno::Reference< util::XStringSubstitution > xSubst(
- xSMGR->createInstance( C2S("com.sun.star.util.PathSubstitution") ),
- uno::UNO_QUERY );
- if ( xSubst.is() )
- sPath = xSubst->substituteVariables( sPath, sal_False );
- m_sLogPath = sPath;
- m_aShowDataPB.Enable(lcl_doesLogfileExist(m_sLogPath));
- }
- }
- }
- catch( uno::Exception& )
- {
- m_aShowDataPB.Enable(false);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index d5f4881..66210b7 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -45,7 +45,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/oooimprovement/XCoreController.hpp>
#include <comphelper/configurationhelper.hxx>
#include <com/sun/star/awt/XDialogProvider.hpp>
#include <com/sun/star/awt/XDialogProvider2.hpp>
@@ -99,7 +98,6 @@
#include "optjsearch.hxx"
#include "connpooloptions.hxx"
#include "optupdt.hxx"
-#include <optimprove.hxx>
#include "optchart.hxx"
#include "optgdlg.hxx"
#include "optmemory.hxx"
@@ -361,7 +359,6 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem
case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break;
case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break;
- case RID_SVXPAGE_IMPROVEMENT: fnCreate = &SvxImprovementOptionsPage::Create; break;
}
SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL;
@@ -394,7 +391,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA },
{ "ProductName", "NetworkIdentity", RID_SVXPAGE_SSO },
{ "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE },
- { "ProductName", "ImprovementProgram", RID_SVXPAGE_IMPROVEMENT },
{ "LanguageSettings", NULL, SID_LANGUAGE_OPTIONS },
{ "LanguageSettings", "Languages", OFA_TP_LANGUAGES },
{ "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU },
@@ -1823,50 +1819,11 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
continue;
}
}
- // Disable OOoImprovement page if not enabled
- if( RID_SVXPAGE_IMPROVEMENT == nPageId )
- {
- continue;
- }
- if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
- {
- AddTabPage( nPageId, sNewTitle, nGroup );
- }
- }
- do
- {
- String sNewTitle = C2U("Improvement Program");
- {
- SvxImprovementPage aTempTabPage(this);
- sNewTitle = aTempTabPage.GetTitleText();
- }
- nPageId = RID_SVXPAGE_IMPROVEMENT;
- if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
- continue;
- // Disable OOoImprovement page if not enabled
- {
- const ::rtl::OUString sService = C2U("com.sun.star.oooimprovement.CoreController");
- try
- {
- Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
- Reference < ::com::sun::star::oooimprovement::XCoreController > xService( xFactory->createInstance( sService ), UNO_QUERY );
-
- if( ! xService.is() )
- continue;
- if( ! xService->showBuiltinOptionsPage(1))
- continue;
- }
- catch ( ::com::sun::star::loader::CannotActivateFactoryException& )
- {
- continue;
- }
- }
if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
{
AddTabPage( nPageId, sNewTitle, nGroup );
}
}
- while (0);
}
// Load and Save options
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 62be8ce..acfc312 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -162,7 +162,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Java" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
< "Network Identity" ; RID_SVXPAGE_SSO ; > ;
< "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
- < "" ; RID_SVXPAGE_IMPROVEMENT ; > ;
};
};
StringArray SID_LANGUAGE_OPTIONS
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 45bea6a..f29d117 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -23,15 +23,13 @@ ex extensions\source\propctrlr nmake - all ex_propctrlr ex_
ex extensions\source\dbpilots nmake - all ex_dbpilots ex_inc NULL
ex extensions\source\abpilot nmake - all ex_abpilot ex_inc NULL
ex extensions\source\logging nmake - all ex_logging ex_inc NULL
-ex extensions\source\oooimprovecore nmake - all ex_oooimprovecore ex_inc NULL
-ex extensions\source\oooimprovement nmake - all ex_oooimprovement ex_inc NULL
ex extensions\source\config\ldap nmake - all ex_ldap ex_inc NULL
ex extensions\source\nsplugin\source nmake - u ex_nsplugin ex_inc NULL
ex extensions\source\nsplugin\source nmake - w ex_nsplugin ex_inc NULL
ex extensions\source\update\feed nmake - all ex_updchkfeed ex_inc NULL
ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL
ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL
-ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
+ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil NULL
# Fails at the moment
# ex extensions\qa\complex\extensions nmake - all ex_complex ex_util NULL
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index 8f726eb..01025ae 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -45,8 +45,6 @@ mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\misc\dbp.component %_DEST%\xml\dbp.component
..\%__SRC%\misc\ldapbe2.component %_DEST%\xml\ldapbe2.component
..\%__SRC%\misc\log.component %_DEST%\xml\log.component
-..\%__SRC%\misc\oooimprovecore.component %_DEST%\xml\oooimprovecore.component
-..\%__SRC%\misc\oooimprovement.component %_DEST%\xml\oooimprovement.component
..\%__SRC%\misc\pcr.component %_DEST%\xml\pcr.component
..\%__SRC%\misc\pl.component %_DEST%\xml\pl.component
..\%__SRC%\misc\res.component %_DEST%\xml\res.component
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
deleted file mode 100644
index b857c68..0000000
--- a/extensions/source/oooimprovecore/core.cxx
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <com/sun/star/oooimprovement/XCore.hpp>
-
-#include "oooimprovecore_module.hxx"
-#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/oooimprovement/XCoreController.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <comphelper/configurationhelper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/uieventslogger.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <svx/svxdlg.hxx>
-#include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
-#include <svl/itemset.hxx>
-#include <svl/stritem.hxx>
-#include <sfx2/app.hxx>
-#include <svx/dialogs.hrc>
-#include <sfx2/sfxsids.hrc>
-
-using namespace ::com::sun::star::oooimprovement;
-using ::com::sun::star::frame::XTerminateListener;
-using ::com::sun::star::lang::EventObject;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::lang::XServiceInfo;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::XComponentContext;
-using ::com::sun::star::uno::XInterface;
-using ::comphelper::UiEventsLogger;
-using ::rtl::OUString;
-
-// declaration
-namespace oooimprovecore
-{
- class Core : public ::cppu::WeakImplHelper3<XCore,XServiceInfo,XTerminateListener>
- {
- public:
- // XServiceInfo - static version
- static OUString SAL_CALL getImplementationName_static();
- static Sequence<OUString> SAL_CALL getSupportedServiceNames_static();
- static Reference<XInterface> Create(const Reference<XComponentContext>& context );
-
- protected:
- Core(const Reference<XComponentContext>&);
- virtual ~Core();
-
- // XCore
- virtual sal_Int32 SAL_CALL getSessionLogEventCount() throw(RuntimeException);
- virtual sal_Bool SAL_CALL getUiEventsLoggerEnabled() throw(RuntimeException);
- virtual void SAL_CALL inviteUser() throw(RuntimeException);
-
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(RuntimeException);
- virtual sal_Bool SAL_CALL supportsService(const OUString& service_name) throw(RuntimeException);
- virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException);
-
- // XTerminateListener
- virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException);
- virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException);
-
- // XEventListener
- virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException);
- };
-}
-
-
-// implementation
-namespace oooimprovecore
-{
-
- Core::Core(const Reference<XComponentContext>&)
- { }
-
- Core::~Core()
- { }
-
- sal_Int32 SAL_CALL Core::getSessionLogEventCount() throw(RuntimeException)
- { return UiEventsLogger::getSessionLogEventCount(); }
-
- sal_Bool SAL_CALL Core::getUiEventsLoggerEnabled() throw(RuntimeException)
- { return UiEventsLogger::isEnabled(); }
-
- void SAL_CALL Core::inviteUser() throw(RuntimeException)
- {
- Reference<XMultiServiceFactory> xServiceFactory = ::comphelper::getProcessServiceFactory();
-
- OUString help_url;
- Reference<XCoreController> core_c(
- xServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"))),
- UNO_QUERY);
- if(core_c.is())
- ::comphelper::ConfigurationHelper::readDirectKey(
- xServiceFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Participation")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("HelpUrl")),
- ::comphelper::ConfigurationHelper::E_READONLY) >>= help_url;
- else
- help_url = OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.libreoffice.org"));
- {
- SolarMutexGuard aGuard;
- SfxAllItemSet aSet( SFX_APP()->GetPool() );
- aSet.Put( SfxStringItem( SID_CURRENT_URL, help_url ) );
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- if ( pFact )
- {
- SfxAbstractDialog *pDlg = pFact->CreateSfxDialog( NULL, aSet, 0, RID_SVXPAGE_IMPROVEMENT );
- pDlg->Execute();
- delete pDlg;
- }
- }
- }
-
- sal_Bool SAL_CALL Core::supportsService(const OUString& service_name) throw(RuntimeException)
- {
- const Sequence<OUString> service_names(getSupportedServiceNames());
- for (sal_Int32 idx = service_names.getLength()-1; idx>=0; --idx)
- if(service_name == service_names[idx]) return sal_True;
- return sal_False;
- }
-
- OUString SAL_CALL Core::getImplementationName() throw(RuntimeException)
- { return getImplementationName_static(); }
-
- Sequence<OUString> SAL_CALL Core::getSupportedServiceNames() throw(RuntimeException)
- { return getSupportedServiceNames_static(); }
-
- OUString SAL_CALL Core::getImplementationName_static()
- { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovecore.Core")); }
-
- Sequence<OUString> SAL_CALL Core::getSupportedServiceNames_static()
- {
- Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"));
- return aServiceNames;
- }
-
- void Core::queryTermination(const EventObject&) throw(RuntimeException)
- { }
-
- void Core::notifyTermination(const EventObject&) throw(RuntimeException)
- {
- UiEventsLogger::disposing();
- }
-
- void Core::disposing(const EventObject&) throw(RuntimeException)
- { }
-
- Reference<XInterface> Core::Create(const Reference<XComponentContext>& context)
- { return *(new Core(context)); }
-
- void createRegistryInfo_Core()
- {
- static OAutoRegistration<Core> auto_reg;
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk
deleted file mode 100644
index 66ab6cd..0000000
--- a/extensions/source/oooimprovecore/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=extensions
-TARGET=oooimprovecore
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-EXCEPTIONSFILES= \
- $(SLO)$/core.obj \
- $(SLO)$/oooimprovecore_services.obj \
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/oooimprovecore_module.obj \
-
-LIB1TARGET=$(SLB)$/$(TARGET)_t.lib
-LIB1FILES= \
- $(SLB)$/$(TARGET).lib \
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(SFXLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(TOOLSLIB)
-
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/oooimprovecore.component
-
-$(MISC)/oooimprovecore.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
diff --git a/extensions/source/oooimprovecore/oooimprovecore.component b/extensions/source/oooimprovecore/oooimprovecore.component
deleted file mode 100644
index 58bdaf3..0000000
--- a/extensions/source/oooimprovecore/oooimprovecore.component
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.SharedLibrary"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.extensions.oooimprovecore.Core">
- <service name="com.sun.star.oooimprovement.Core"/>
- </implementation>
-</component>
diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.cxx b/extensions/source/oooimprovecore/oooimprovecore_module.cxx
deleted file mode 100644
index 11be045..0000000
--- a/extensions/source/oooimprovecore/oooimprovecore_module.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "oooimprovecore_module.hxx"
-#include <rtl/instance.hxx>
-
-namespace oooimprovecore
-{
- 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
deleted file mode 100644
index 3dda474..0000000
--- a/extensions/source/oooimprovecore/oooimprovecore_module.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef EXTENSIONS_OOOIMPROVECORE_MODULE_HXX
-#define EXTENSIONS_OOOIMPROVECORE_MODULE_HXX
-
-#include <comphelper/componentmodule.hxx>
-
-namespace oooimprovecore
-{
- /* -------------------------------------------------------------------- */
- 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
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovecore/oooimprovecore_services.cxx b/extensions/source/oooimprovecore/oooimprovecore_services.cxx
deleted file mode 100644
index 56c8ed5..0000000
--- a/extensions/source/oooimprovecore/oooimprovecore_services.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "oooimprovecore_module.hxx"
-
-namespace oooimprovecore
-{
- extern void createRegistryInfo_Core();
-
- static void initializeModule()
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- createRegistryInfo_Core();
- }
-
-}
-
-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: */
diff --git a/extensions/source/oooimprovement/Jobs.xcu b/extensions/source/oooimprovement/Jobs.xcu
deleted file mode 100644
index 206d83d..0000000
--- a/extensions/source/oooimprovement/Jobs.xcu
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="Jobs">
- <node oor:name="OOoImprovement.OnLogRotateJob" oor:op="replace">
- <prop oor:name="Service">
- <value>com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob</value>
- </prop>
- <node oor:name="Arguments"/>
- </node>
- <node oor:name="OOoImprovement.InviteJob" oor:op="replace">
- <prop oor:name="Service">
- <value>com.sun.star.comp.extensions.oooimprovement.InviteJob</value>
- </prop>
- <node oor:name="Arguments"/>
- </node>
- </node>
- <node oor:name="Events">
- <node oor:name="onFirstVisibleTask" oor:op="fuse">
- <node oor:name="JobList">
- <node oor:name="OOoImprovement.OnLogRotateJob" oor:op="replace"/>
- <node oor:name="OOoImprovement.InviteJob" oor:op="replace"/>
- </node>
- </node>
- </node>
-</oor:component-data>
diff --git a/extensions/source/oooimprovement/Logging.xcu b/extensions/source/oooimprovement/Logging.xcu
deleted file mode 100644
index 4ea492d..0000000
--- a/extensions/source/oooimprovement/Logging.xcu
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data oor:name="Logging" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="OOoImprovement">
- <prop oor:name="EnablingAllowed">
- <value>true</value>
- </prop>
- </node>
-</oor:component-data>
diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
deleted file mode 100644
index 7611ffe..0000000
--- a/extensions/source/oooimprovement/config.cxx
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "config.hxx"
-#include "myconfigurationhelper.hxx"
-#include <rtl/ustrbuf.hxx>
-
-
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-
-namespace
-{
- using namespace oooimprovement;
-
- static const OUString CFG_COUNTERS(RTL_CONSTASCII_USTRINGPARAM("Counters"));
- static const OUString CFG_ENABLINGALLOWED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed"));
- static const OUString CFG_EVENTSCOUNT(RTL_CONSTASCII_USTRINGPARAM("LoggedEvents"));
- static const OUString CFG_EXTENSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension"));
- static const OUString CFG_FAILEDATTEMPTS(RTL_CONSTASCII_USTRINGPARAM("FailedAttempts"));
- static const OUString CFG_INVACCEPT(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted"));
- static const OUString CFG_L10N(RTL_CONSTASCII_USTRINGPARAM("L10N"));
- static const OUString CFG_LOCALE(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
- static const OUString CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging"));
- static const OUString CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath"));
- static const OUString CFG_NAME(RTL_CONSTASCII_USTRINGPARAM("ooName"));
- static const OUString CFG_OFFICESTARTCOUNTDOWN(RTL_CONSTASCII_USTRINGPARAM("OfficeStartCounterdown"));
- static const OUString CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement"));
- static const OUString CFG_OOOIMPROVEMENTPACK(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings"));
- static const OUString CFG_PARTICIPATION(RTL_CONSTASCII_USTRINGPARAM("Participation"));
- static const OUString CFG_PRODUCT(RTL_CONSTASCII_USTRINGPARAM("Product"));
- static const OUString CFG_REPORTCOUNT(RTL_CONSTASCII_USTRINGPARAM("UploadedReports"));
- static const OUString CFG_REPORTEREMAIL(RTL_CONSTASCII_USTRINGPARAM("ReporterEmail"));
- static const OUString CFG_SETUP(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
- static const OUString CFG_SHOWEDINV(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation"));
- static const OUString CFG_SOAPIDADD(RTL_CONSTASCII_USTRINGPARAM("SoapIdAdditions"));
- static const OUString CFG_SOAPURL(RTL_CONSTASCII_USTRINGPARAM("SoapUrl"));
- static const OUString CFG_UPLOAD(RTL_CONSTASCII_USTRINGPARAM("Upload"));
- static const OUString CFG_VERSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion"));
-
- static const OUString SOAPID(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org Improvement Report - Version 1\n"));
-
- static sal_Int32 incrementCfgValue(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list