[Libreoffice-commits] .: basic/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 3 10:07:31 PST 2013


 basic/source/basmgr/basicmanagerrepository.cxx |    2 +-
 basic/source/uno/scriptcont.cxx                |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9c06700874bc7fbbf6b663133954a0898957c075
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jan 3 19:04:15 2013 +0100

    fix build
    
    Change-Id: I2588b69280abbc510ee2fdc9845df56616db8b95

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 8b86596..4f8fd9e 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -310,7 +310,7 @@ namespace basic
         DBG_ASSERT(aAppBasic.GetProtocol() != INET_PROT_NOT_VALID,
             OString("Invalid URL: \"" +
                     OUStringToOString(aAppBasicDir, osl_getThreadTextEncoding()) +
-                    "\""));
+                    "\"").getStr());
         aAppBasic.insertName( aFileName );
         pBasicManager->SetStorageName( aAppBasic.PathToFileName() );
 
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index a7f870c..75b3828 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -681,7 +681,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                     OString aMessage = "invalid library element '" +
                                         OUStringToOString( aElementName, osl_getThreadTextEncoding() ) +
                                         "'.";
-                    OSL_FAIL( aMessage );
+                    OSL_FAIL( aMessage.getStr());
                     #endif
                     continue;
                 }
@@ -769,7 +769,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                     OString aMessage = "invalid library element '" +
                                        OUStringToOString( aElementName, osl_getThreadTextEncoding() ) +
                                        "'.";
-                    OSL_FAIL( aMessage );
+                    OSL_FAIL( aMessage.getStr());
                     #endif
                     continue;
                 }


More information about the Libreoffice-commits mailing list