[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - binfilter/bf_basic binfilter/bf_sch

[Caolán McNamara]

 binfilter/bf_basic/source/basmgr/basmgr.cxx              |   21 +++++++--------
 binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx |    2 -
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit f5a0183e895633e1d1ef49ef642a365ebfcd5f18
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 12 11:32:00 2010 +0000

    RTL_CONSTASCII_USTRINGPARAM used with nonarray
    (cherry picked from commit 0ec3dcb508858f278bc32498e6ae038ab3274fca)

diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index 8c85f92..a8e6a97 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -1364,7 +1364,7 @@ void	ChXChartObject::GetPropertyValue	(const SfxItemPropertyMap & rProperty,
                 case SFX_ITEM_UNKNOWN:
                     {
                         OUString sMessage (RTL_CONSTASCII_USTRINGPARAM ( "ChXChartObject::getPropertyValues: unknown property "));
-                        sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM (rProperty.pName));
+                        sMessage += OUString::createFromAscii(rProperty.pName);
                            throw UnknownPropertyException (sMessage, (::cppu::OWeakObject*)this);
                     }
                         
commit b678a529a2f75b21c320479bad7140323cfa51ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 12 11:32:42 2010 +0000

    RTL_CONSTASCII_USTRINGPARAM used with nonarray
    (cherry picked from commit ac729f078b9dbdedcda9141eec30288c8c263d9e)

diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index a463740..cc1b0e1 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -91,17 +91,16 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper;
 // Version 2
 //	+ BOOL		bReference
 
-static const char* szStdLibName = "Standard";
-static const char* szBasicStorage = "StarBASIC";
-static const char* szOldManagerStream = "BasicManager";
-static const char* szManagerStream = "BasicManager2";
-static const char* szImbedded = "LIBIMBEDDED";
-static const char* szCryptingKey = "CryptedBasic";
-static const char* szScriptLanguage = "StarBasic";
-
-static const String BasicStreamName( String::CreateFromAscii(szBasicStorage) );
-static const String ManagerStreamName( String::CreateFromAscii(szManagerStream) );
-
+static const char szStdLibName[] = "Standard";
+static const char szBasicStorage[] = "StarBASIC";
+static const char szOldManagerStream[] = "BasicManager";
+static const char szManagerStream[] = "BasicManager2";
+static const char szImbedded[] = "LIBIMBEDDED";
+static const char szCryptingKey[] = "CryptedBasic";
+static const char szScriptLanguage[] = "StarBasic";
+
+static const String BasicStreamName( RTL_CONSTASCII_USTRINGPARAM(szBasicStorage) );
+static const String ManagerStreamName( RTL_CONSTASCII_USTRINGPARAM(szManagerStream) );
 
 #define	DEFINE_CONST_UNICODE(CONSTASCII)    UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))