Re: blanket license statement ...
Hi, Here goes my blanket statement regarding my contributions to LibreOffice: "All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license" Regards -- Santiago Alessandri Forensic Analyst, Co-Founder. Nasel (http://www.nasel.com.ar) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Replaced createFromAscii with RTL_CONSTASCII_USTRINGPARAM in base repo
With this patch I think there are no more misuses of createFromAscii in the
base repository.
It is released under MPL 1.1 / GPLv3+ / LGPLv3+
--
Santiago Alessandri
From 23bf6c3ca93c68e50c0a1f5e08ddd05c38db64b5 Mon Sep 17 00:00:00 2001
From: Santiago Alessandri
Date: Sat, 13 Nov 2010 12:48:57 -0300
Subject: [PATCH] Replaced all createFromAscii with macro RTL_CONSTASCII_USTRINGPARAM in base
---
reportdesign/source/core/api/ReportDefinition.cxx |6 +++---
reportdesign/source/filter/xml/dbloader2.cxx |2 +-
reportdesign/source/filter/xml/xmlExport.cxx | 20 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 0a1e08b..1cbe0ef 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2283,7 +2283,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
uno::Reference< drawing::XShape > xShape;
-if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.report.") ) == 0 )
+if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.")) ) == 0 )
{
if ( aServiceSpecifier == SERVICE_SHAPE )
xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ),uno::UNO_QUERY_THROW);
@@ -2295,7 +2295,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
else
xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW);
}
-else if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 )
+else if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 )
{
xShape.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier,m_aProps->m_xContext),uno::UNO_QUERY);
}
@@ -2761,7 +2761,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel
m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW);
pHelper->setOwner (xThis);
-pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : "));
+pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
}
return m_pImpl->m_xNumberedControllers;
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index b029a0d..8cfac9f 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -116,7 +116,7 @@ Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames
Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString > aSNS( 1 );
-aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection");
+aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection"));
return aSNS;
}
// -
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index a99de7c..8c49955 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -88,13 +88,13 @@ namespace rptxml
//-
::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
-return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLSettingsExporter");
+return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLSettingsExporter"));
}
//-
Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
-aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+aSupported[0] = ::rtl::OUSt
Re: [Libreoffice] [PUSHED] Replaced createFromAscii with RTL_CONSTASCII_USTRINGPARAM in /dbaccess/source/ in base repo
Oops, missed that ones, sry! Won't happen in the next patch =)
On Fri, Nov 12, 2010 at 4:20 AM, David Tardon wrote:
> On Thu, Nov 11, 2010 at 06:03:31PM -0300, Santiago Alessandri wrote:
> > Hi!
> >
> > I'm attaching the patch for changing the use of createFromAscii
> > with RTL_CONSTASCII_USTRINGPARAM in the directories:
> > /dbaccess/source/shared/
> > /dbaccess/source/ui/app/
> > /dbaccess/source/ui/browser/
> > /dbaccess/source/ui/control/
> > /dbaccess/source/ui/dlg/
> > /dbaccess/source/ui/misc/
> >
> > from the base repository.
> >
> > Released under LGPLv3+ / MPL.
> >
> > --
> > Santiago Alessandri
>
> I only changed lines like
>
> rtl::OUString aFoo = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("blah"));
>
> to
>
> rtl::OUString aFoo(RTL_CONSTASCII_USTRINGPARAM("blah"));
>
> , which is the form we prefer.
>
>
> D.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
--
Santiago Alessandri
Forensic Analyst, Co-Founder.
Nasel Corporation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Replaced createFromAscii with RTL_CONSTASCII_USTRINGPARAM in dbaccess/source/core/dataaccess/
Here goes a patch for the base repo.
It's my first patch, hoping it's fine :-)
(LGPLv3+ / MPL)
Santiago Alessandri
From ea85fc8fe1d340502be04ceb7b6759c252ba029d Mon Sep 17 00:00:00 2001
From: Santiago Alessandri
Date: Thu, 11 Nov 2010 10:19:47 -0300
Subject: [PATCH] Replaced the use of createFromAscii for the macro RTL_CONSTASCII_USTRINGPARAM
---
dbaccess/source/core/dataaccess/ContentHelper.cxx | 33 +++
dbaccess/source/core/dataaccess/ModelImpl.cxx |4 +-
.../source/core/dataaccess/bookmarkcontainer.cxx |4 +-
.../source/core/dataaccess/commanddefinition.cxx |2 +-
dbaccess/source/core/dataaccess/connection.cxx |2 +-
.../source/core/dataaccess/databasedocument.cxx|6 ++--
.../core/dataaccess/databaseregistrations.cxx |6 ++--
dbaccess/source/core/dataaccess/datasource.cxx |6 ++--
dbaccess/source/core/dataaccess/intercept.cxx |6 ++--
9 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index dc5bee8..4f41cda 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -363,24 +363,27 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
{
// Read-only property!
aRet[ n ] <<= IllegalAccessException(
-rtl::OUString::createFromAscii(
-"Property is read-only!" ),
+::rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")
+),
static_cast< cppu::OWeakObject * >( this ) );
}
else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
{
// Read-only property!
aRet[ n ] <<= IllegalAccessException(
-rtl::OUString::createFromAscii(
-"Property is read-only!" ),
+::rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")
+),
static_cast< cppu::OWeakObject * >( this ) );
}
else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
{
// Read-only property!
aRet[ n ] <<= IllegalAccessException(
-rtl::OUString::createFromAscii(
-"Property is read-only!" ),
+::rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")
+),
static_cast< cppu::OWeakObject * >( this ) );
}
else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
@@ -415,8 +418,9 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
else
{
aRet[ n ] <<= IllegalTypeException(
-rtl::OUString::createFromAscii(
-"Property value has wrong type!" ),
+::rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM("Property value has wrong type!")
+),
static_cast< cppu::OWeakObject * >( this ) );
}
}
@@ -424,8 +428,9 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
else
{
aRet[ n ] <<= Exception(
-rtl::OUString::createFromAscii(
-"No property set for storing the value!" ),
+::rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM("No property set for storing the value!")
+),
static_cast< cppu::OWeakObject * >( this ) );
}
}
@@ -486,27 +491,27 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
{
// Append all Core Properties.
xRow->appendString (
-Property( rtl::OUString::createFromAscii( "ContentType" ),
+Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
PropertyAtt
