From bf301e0764af1d9575baf7f156f77d5c51cf4269 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Thu, 6 May 2010 15:32:15 +0200
Subject: fwk139: #i110801# integrate the patch

---
 package/source/xstor/owriteablestream.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index c5381a11cfea..cf2962b28985 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -3279,7 +3279,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
 
     if ( ( ( m_pData->m_nStorageType == PACKAGE_STORAGE || m_pData->m_nStorageType == OFOPXML_STORAGE )
             && aPropertyName.equalsAscii( "MediaType" ) )
-      || m_pData->m_nStorageType == PACKAGE_STORAGE && aPropertyName.equalsAscii( "Encrypted" )
+      || ( m_pData->m_nStorageType == PACKAGE_STORAGE && aPropertyName.equalsAscii( "Encrypted" ) )
       || aPropertyName.equalsAscii( "Compressed" ) )
     {
         m_pImpl->GetStreamProperties();
-- 
cgit v1.2.3


From bfafc3a17eb47e87565aaa60cb1c4ba513177ba4 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Wed, 26 May 2010 15:15:37 +0200
Subject: fwk139: #i110802# integrate patch

---
 package/source/xstor/xstorage.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 55ff5a87e78d..9c2a9617d6c9 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4807,11 +4807,11 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
                 m_pImpl->m_bIsModified = sal_True;
             }
         }
-        else if ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "HasEncryptedEntries" )
+        else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "HasEncryptedEntries" )
                                     || aPropertyName.equalsAscii( "HasNonEncryptedEntries" )
                                     || aPropertyName.equalsAscii( "IsInconsistent" )
                                     || aPropertyName.equalsAscii( "URL" )
-                                    || aPropertyName.equalsAscii( "RepairPackage" ) )
+                                    || aPropertyName.equalsAscii( "RepairPackage" ) ) )
            || aPropertyName.equalsAscii( "IsRoot" )
            || aPropertyName.equalsAscii( "MediaTypeFallbackUsed" ) )
             throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -4855,8 +4855,8 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
             else
                 throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
         }
-        else if ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "URL" )
-                                    || aPropertyName.equalsAscii( "RepairPackage" ) )
+        else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "URL" )
+                                    || aPropertyName.equalsAscii( "RepairPackage" ) ) )
            || aPropertyName.equalsAscii( "IsRoot" ) )
             throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
         else
-- 
cgit v1.2.3


From d806a700d8a3145225d224f6d83295772a95bbd9 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Wed, 26 May 2010 15:20:34 +0200
Subject: fwk139: #i110803# integrate patch

---
 package/source/xstor/xfactory.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index e78742641a0b..ab3c682d6d35 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -257,7 +257,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
     }
     else if ( xStream.is() )
     {
-        if ( ( nStorageMode & embed::ElementModes::WRITE ) && !xStream->getOutputStream().is()
+               if ( ( ( nStorageMode & embed::ElementModes::WRITE ) && !xStream->getOutputStream().is() )
           || !xStream->getInputStream().is() )
               throw uno::Exception(); // TODO: access denied
 
-- 
cgit v1.2.3


From 9cfca129cb6df9a99db641890543c512169b5806 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Thu, 3 Jun 2010 16:40:59 +0200
Subject: fwk139: #i10000# avoid warnings on solaris

---
 basctl/source/basicide/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index 62c4755112d1..b225b987b24b 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -49,6 +49,7 @@ CDEFS+=-DBASICDEBUG
 
 EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj  \
                 $(SLO)$/scriptdocument.obj  \
+                $(SLO)$/basicbox.obj	\
                 $(SLO)$/basidesh.obj	\
                 $(SLO)$/basides1.obj	\
                 $(SLO)$/basides2.obj	\
@@ -75,7 +76,6 @@ EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj  \
                 $(SLO)$/documentenumeration.obj
 
 SLOFILES =  $(EXCEPTIONSFILES) \
-            $(SLO)$/basicbox.obj	\
             $(SLO)$/baside2b.obj	\
             $(SLO)$/brkdlg.obj	\
             $(SLO)$/objdlg.obj	\
-- 
cgit v1.2.3