summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--automation/source/server/recorder.cxx6
-rw-r--r--extensions/prj/d.lst3
-rw-r--r--extensions/source/oooimprovement/Logging.xcu8
-rw-r--r--extensions/source/oooimprovement/config.cxx17
-rw-r--r--extensions/source/oooimprovement/config.hxx1
-rw-r--r--extensions/source/oooimprovement/corecontroller.cxx4
-rw-r--r--extensions/source/oooimprovement/errormail.cxx4
-rw-r--r--extensions/source/oooimprovement/makefile.mk10
8 files changed, 41 insertions, 12 deletions
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 98e09de655ad..49f6f7608ef0 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -180,7 +180,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bLog )
{
- LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
+// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
}
// cleanup
aKeyString.Erase();
@@ -682,8 +682,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
if ( m_bLog )
{
- if ( aKeyString.Len() == 0 )
- LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
+// HACK Too many KeyEvents generated if ( aKeyString.Len() == 0 )
+// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
}
if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
(( aKeyCode.GetGroup() == KEYGROUP_NUM) ||
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index 93ef09071824..053796a2c365 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -29,11 +29,12 @@ mkdir: %_DEST%\bin%_EXT%\so
mkdir: %_DEST%\xml%_EXT%\registry\spool
mkdir: %_DEST%\xml%_EXT%\registry\spool\org
mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\misc\registry\spool\org\openoffice\Office\Addons\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
+..\%__SRC%\misc\registry\spool\org\openoffice\Office\Logging\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*
diff --git a/extensions/source/oooimprovement/Logging.xcu b/extensions/source/oooimprovement/Logging.xcu
new file mode 100644
index 000000000000..4ea492d67737
--- /dev/null
+++ b/extensions/source/oooimprovement/Logging.xcu
@@ -0,0 +1,8 @@
+<?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
index 8e6aa8ac0ee0..8733cbd577e4 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -45,10 +45,11 @@ namespace
{
using namespace oooimprovement;
- static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts");
static const OUString CFG_COUNTERS = OUString::createFromAscii("Counters");
+ static const OUString CFG_ENABLINGALLOWED = OUString::createFromAscii("EnablingAllowed");
static const OUString CFG_EVENTSCOUNT = OUString::createFromAscii("LoggedEvents");
static const OUString CFG_EXTENSION = OUString::createFromAscii("ooSetupExtension");
+ static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts");
static const OUString CFG_INVACCEPT = OUString::createFromAscii("InvitationAccepted");
static const OUString CFG_L10N = OUString::createFromAscii("L10N");
static const OUString CFG_LOCALE = OUString::createFromAscii("ooLocale");
@@ -60,9 +61,9 @@ namespace
static const OUString CFG_OOOIMPROVEMENTPACK = OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings");
static const OUString CFG_PARTICIPATION = OUString::createFromAscii("Participation");
static const OUString CFG_PRODUCT = OUString::createFromAscii("Product");
- static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup");
static const OUString CFG_REPORTCOUNT = OUString::createFromAscii("UploadedReports");
static const OUString CFG_REPORTEREMAIL = OUString::createFromAscii("ReporterEmail");
+ static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup");
static const OUString CFG_SHOWEDINV = OUString::createFromAscii("ShowedInvitation");
static const OUString CFG_SOAPIDADD = OUString::createFromAscii("SoapIdAdditions");
static const OUString CFG_SOAPURL = OUString::createFromAscii("SoapUrl");
@@ -144,6 +145,16 @@ namespace oooimprovement
return result;
}
+ bool Config::getEnablingAllowed()
+ {
+ bool result = false;
+ MyConfigurationHelper::readDirectKey(
+ m_ServiceFactory,
+ CFG_LOGGING, CFG_OOOIMPROVEMENT, CFG_ENABLINGALLOWED,
+ MyConfigurationHelper::E_READONLY) >>= result;
+ return result;
+ }
+
bool Config::getInvitationAccepted()
{
bool result = false;
@@ -174,12 +185,14 @@ namespace oooimprovement
MyConfigurationHelper::E_READONLY) >>= value;
result.append(value);
+ value = OUString::createFromAscii("");
MyConfigurationHelper::readDirectKey(
m_ServiceFactory,
CFG_SETUP, CFG_PRODUCT, CFG_VERSION,
MyConfigurationHelper::E_READONLY) >>= value;
if(value.getLength()) result.appendAscii(" ").append(value);
+ value = OUString::createFromAscii("");
MyConfigurationHelper::readDirectKey(
m_ServiceFactory,
CFG_SETUP, CFG_PRODUCT, CFG_EXTENSION,
diff --git a/extensions/source/oooimprovement/config.hxx b/extensions/source/oooimprovement/config.hxx
index 5ec836814a80..d081c77577d4 100644
--- a/extensions/source/oooimprovement/config.hxx
+++ b/extensions/source/oooimprovement/config.hxx
@@ -43,6 +43,7 @@ namespace oooimprovement
{
public:
Config(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& sf);
+ bool getEnablingAllowed();
bool getInvitationAccepted();
bool getShowedInvitation();
const ::rtl::OUString getCompleteProductname();
diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx
index 79f7ce930bfa..34fc24e42302 100644
--- a/extensions/source/oooimprovement/corecontroller.cxx
+++ b/extensions/source/oooimprovement/corecontroller.cxx
@@ -59,7 +59,7 @@ namespace oooimprovement
sal_Bool SAL_CALL CoreController::enablingUiEventsLoggerAllowed(sal_Int16 version) throw(RuntimeException)
{
Config config(m_ServiceFactory);
- if(version==1 && config.getShowedInvitation() && config.getInvitationAccepted())
+ if(version==1 && config.getEnablingAllowed() && config.getShowedInvitation() && config.getInvitationAccepted())
return true;
return false;
}
@@ -67,7 +67,7 @@ namespace oooimprovement
sal_Bool SAL_CALL CoreController::showBuiltinOptionsPage(sal_Int16 version) throw(RuntimeException)
{
Config config(m_ServiceFactory);
- if(version==1 && config.getShowedInvitation())
+ if(version==1 && config.getEnablingAllowed())
return true;
return false;
}
diff --git a/extensions/source/oooimprovement/errormail.cxx b/extensions/source/oooimprovement/errormail.cxx
index da19c6aaaf35..fdfec120695f 100644
--- a/extensions/source/oooimprovement/errormail.cxx
+++ b/extensions/source/oooimprovement/errormail.cxx
@@ -127,9 +127,9 @@ namespace {
ZeroMemory(&info, sizeof(OSVERSIONINFO));
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&info);
- OStringBuffer result =
+ OStringBuffer result = OString(
"<systeminfo:systeminfo xmlns:systeminfo=\"http://openoffice.org/2002/systeminfo\">\n"
- "<systeminfo:System name=\"";
+ "<systeminfo:System name=\"");
if(VER_PLATFORM_WIN32_NT == info.dwPlatformId)
result.append(OString("Windows NT"));
else
diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk
index 32a30f8dd0ba..41f91fc7b5ca 100644
--- a/extensions/source/oooimprovement/makefile.mk
+++ b/extensions/source/oooimprovement/makefile.mk
@@ -79,10 +79,13 @@ PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
SPOOLDIR=$(MISC)$/registry$/spool
XCUFILES= \
- Jobs.xcu
+ Jobs.xcu \
+ Logging.xcu
MYXCUFILES= \
- $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu
+ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu \
+ $(SPOOLDIR)$/$(PACKAGEDIR)$/Logging$/Logging-oooimprovement.xcu
+
# --- Targets ---
@@ -96,3 +99,6 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Jo
@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
+$(SPOOLDIR)$/$(PACKAGEDIR)$/Logging$/Logging-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Logging.xcu
+ @-$(MKDIRHIER) $(@:d)
+ @$(COPY) $< $@
generated by cgit (git 2.34.1) at 2025-02-24 19:31:04 +0000