Thanks to review and push it quite quickly if possible.
Changes have been done (for RTL_OUSTRING_...) without looking that the
namespace rtl is not declared.
I did not introduced it but just corrected the entries, since I am not
enough familiar to know which is the prefered situation within the project.
regards
>From a70f9654155a6fd17747305afb717471aac92b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= <pjacq...@alumni.ethz.ch>
Date: Fri, 3 Dec 2010 20:39:37 +0100
Subject: [PATCH] making binfilter compiling again
changes for RTL_CONSTASCII_USTRINGPARAM without taking into account
namespaces
---
binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx | 14 +++++++-------
.../bf_sfx2/source/notify/sfx2_eventsupplier.cxx | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
index b66811f..7f31956 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
@@ -374,13 +374,13 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*N*/ OUSTRING aLib = pMacro->GetLibName();
/*N*/ OUSTRING aMacro = pMacro->GetMacName();
/*N*/
-/*N*/ pValues[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+/*N*/ pValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
/*N*/ pValues[ 0 ].Value <<= aType;
/*N*/
-/*N*/ pValues[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
+/*N*/ pValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
/*N*/ pValues[ 1 ].Value <<= aLib;
/*N*/
-/*N*/ pValues[ 2 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+/*N*/ pValues[ 2 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
/*N*/ pValues[ 2 ].Value <<= aMacro;
/*N*/
/*N*/ aEventData <<= aProperties;
@@ -393,10 +393,10 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*?*/ OUSTRING aLib = pMacro->GetLibName();
/*?*/ OUSTRING aMacro = pMacro->GetMacName();
/*?*/
-/*?*/ pValues[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+/*?*/ pValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
/*?*/ pValues[ 0 ].Value <<= aLib;
/*?*/
-/*?*/ pValues[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
+/*?*/ pValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
/*?*/ pValues[ 1 ].Value <<= aMacro;
/*?*/
/*?*/ aEventData <<= aProperties;
@@ -408,10 +408,10 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*?*/
/*?*/ OUSTRING aMacro = pMacro->GetMacName();
/*?*/
-/*?*/ pValues[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+/*?*/ pValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
/*?*/ pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
/*?*/
-/*?*/ pValues[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+/*?*/ pValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
/*?*/ pValues[ 1 ].Value <<= aMacro;
/*?*/
/*?*/ aEventData <<= aProperties;
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
index 117b1ef..bdd2134 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
@@ -387,11 +387,11 @@ namespace binfilter {
aLibrary = sDocument;
}
/*N*/
-/*N*/ aOutProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
+/*N*/ aOutProps[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
/*N*/ aOutProps[1].Value <<= aScript;
-/*N*/ aOutProps[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
+/*N*/ aOutProps[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
/*N*/ aOutProps[2].Value <<= aLibrary;
-/*N*/ aOutProps[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+/*N*/ aOutProps[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
/*N*/ aOutProps[3].Value <<= aMacroName;
/*N*/ rRet <<= aOutProps;
/*N*/ }
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
