[ooo-build-commit] .: 3 commits - framework/source uui/source xmloff/source

[Caolán McNamara]

 framework/source/loadenv/loadenv.cxx |    3 +++
 uui/source/loginerr.hxx              |    2 +-
 xmloff/source/core/xmlexp.cxx        |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 98ba1c2671326f6b6d653fefa33cecae44548605
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 20:49:54 2010 +0100

    overly const

diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index ec1317d..8feb076 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -68,7 +68,7 @@ public:
     const String&   GetUserName() const                 { return m_aUserName; }
     const String&   GetPassword() const                 { return m_aPassword; }
     const String&   GetPasswordToModify() const         { return m_aPasswordToModify; }
-    const bool      IsRecommendToOpenReadonly() const   { return m_bRecommendToOpenReadonly; }
+    bool            IsRecommendToOpenReadonly() const   { return m_bRecommendToOpenReadonly; }
     const String&   GetPath() const                     { return m_aPath; }
     const String&   GetErrorText() const                { return m_aErrorText; }
     BOOL            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
commit c7146aef38f15ec872093dd3924e7ee8b7b15f75
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 15:56:57 2010 +0100

    we see stacktraces with this NULL sometimes :-(

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 63d11a1..a2ebd46 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1820,6 +1820,9 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
     ::vos::OClearableGuard aSolarLock1(Application::GetSolarMutex());
 
     Window*  pWindow       = VCLUnoHelper::GetWindow(xWindow);
+    if (!pWindow)
+        return;
+
     sal_Bool bSystemWindow = pWindow->IsSystemWindow();
     sal_Bool bWorkWindow   = (pWindow->GetType() == WINDOW_WORKWINDOW);
 
commit 198648266bf296749bacb5dd8dc525d7ae3c5df5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 15:11:29 2010 +0100

    #i113056# fix warning

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 57aa68c..01c6647 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -758,7 +758,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
                     sal_Int32 nIndex;
                     OUString aURL;
 
-                    for( nIndex = 0; nIndex < nCount; nIndex++, *pPrefix++ )
+                    for( nIndex = 0; nIndex < nCount; ++nIndex, ++pPrefix )
                     {
                         if( xNamespaceMap->getByName( *pPrefix ) >>= aURL )
                             _GetNamespaceMap().Add( *pPrefix, aURL, XML_NAMESPACE_UNKNOWN );