Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

8 files changed, 41 insertions, 51 deletions

diff --git a/package/prj/d.lst b/package/prj/d.lst
index d673a91ba8d2..7b3aff2482d8 100644
--- a/package/prj/d.lst
+++ b/package/prj/d.lst
@@ -1,11 +1,12 @@
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\misc\package2.component %_DEST%\xml%_EXT%\package2.component
-..\%__SRC%\misc\xstor.component %_DEST%\xml%_EXT%\xstor.component
-..\inc\Inflater.hxx %_DEST%\inc%_EXT%\package\Inflater.hxx
-..\inc\Deflater.hxx %_DEST%\inc%_EXT%\package\Deflater.hxx
-..\inc\packagedllapi.hxx %_DEST%\inc%_EXT%\package\packagedllapi.hxx
+..\%__SRC%\misc\*.map %_DEST%\bin\*.map
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\dtd\*.dtd %_DEST%\bin\*.*
+..\%__SRC%\misc\package2.component %_DEST%\xml\package2.component
+..\%__SRC%\misc\xstor.component %_DEST%\xml\xstor.component
+..\inc\Inflater.hxx %_DEST%\inc\package\Inflater.hxx
+..\inc\Deflater.hxx %_DEST%\inc\package\Deflater.hxx
+..\inc\packagedllapi.hxx %_DEST%\inc\package\packagedllapi.hxx
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index e71f6fe99d6b..fc0781c11088 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -46,14 +46,6 @@ using namespace ::com::sun::star::packages::manifest;
 
 using rtl::OUString;
 
-// C functions to implement this as a component
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 /**
  * This function is called to get service factories for an implementation.
  * @param pImplName name of implementation
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 2d6b64ef1b5d..89a6b5b17c53 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -71,7 +71,7 @@ bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1,
     bool bResult = ( aHash1.size() && aHash1.size() == aHash2.size() );
     for ( ::comphelper::SequenceAsHashMap::const_iterator aIter = aHash1.begin();
           bResult && aIter != aHash1.end();
-          aIter++ )
+          ++aIter )
     {
         uno::Sequence< sal_Int8 > aKey1;
         bResult = ( ( aIter->second >>= aKey1 ) && aKey1.getLength() );
@@ -491,7 +491,7 @@ void OWriteStream_Impl::DisposeWrappers()
     if ( !m_aInputStreamsList.empty() )
     {
         for ( InputStreamsList_Impl::iterator pStreamIter = m_aInputStreamsList.begin();
-              pStreamIter != m_aInputStreamsList.end(); pStreamIter++ )
+              pStreamIter != m_aInputStreamsList.end(); ++pStreamIter )
         {
             if ( (*pStreamIter) )
             {
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index 688d0a9414eb..60ddc68e8712 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -41,11 +41,6 @@ using namespace ::com::sun::star;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp
index f0e1c69934bc..70033078921a 100644
--- a/package/source/xstor/xstor.dxp
+++ b/package/source/xstor/xstor.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index ba448b104703..ed25369717cb 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -328,7 +328,7 @@ OStorage_Impl::~OStorage_Impl()
         else if ( !m_aReadOnlyWrapList.empty() )
         {
             for ( OStorageList_Impl::iterator pStorageIter = m_aReadOnlyWrapList.begin();
-                  pStorageIter != m_aReadOnlyWrapList.end(); pStorageIter++ )
+                  pStorageIter != m_aReadOnlyWrapList.end(); ++pStorageIter )
             {
                 uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef;
                 if ( xTmp.is() )
@@ -348,13 +348,13 @@ OStorage_Impl::~OStorage_Impl()
     }
 
     for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
-          pElementIter != m_aChildrenList.end(); pElementIter++ )
+          pElementIter != m_aChildrenList.end(); ++pElementIter )
         delete *pElementIter;
 
     m_aChildrenList.clear();
 
     for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin();
-          pDeletedIter != m_aDeletedList.end(); pDeletedIter++ )
+          pDeletedIter != m_aDeletedList.end(); ++pDeletedIter )
         delete *pDeletedIter;
 
     m_aDeletedList.clear();
@@ -369,7 +369,7 @@ OStorage_Impl::~OStorage_Impl()
     m_xPackage = uno::Reference< lang::XSingleServiceFactory >();
 
     ::rtl::OUString aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
-    for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); aInd++ )
+    for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); ++aInd )
     {
         if ( m_xProperties[aInd].Name.equals( aPropertyName ) )
         {
@@ -451,11 +451,11 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
             }
 
             OStorageList_Impl::iterator pIterToDelete( pStorageIter );
-            pStorageIter++;
+            ++pStorageIter;
             m_aReadOnlyWrapList.erase( pIterToDelete );
         }
         else
-            pStorageIter++;
+            ++pStorageIter;
     }
 }
 
@@ -726,7 +726,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
         throw embed::InvalidStorageException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
     for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
-          pElementIter != m_aChildrenList.end(); pElementIter++ )
+          pElementIter != m_aChildrenList.end(); ++pElementIter )
     {
         if ( !(*pElementIter)->m_bIsRemoved )
             CopyStorageElement( *pElementIter, xDest, (*pElementIter)->m_aName, bDirect );
@@ -1088,7 +1088,7 @@ void OStorage_Impl::Commit()
     // remove replaced removed elements
     for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin();
           pDeletedIter != m_aDeletedList.end();
-          pDeletedIter++ )
+          ++pDeletedIter )
     {
 
         if ( m_nStorageType == embed::StorageFormats::OFOPXML && !(*pDeletedIter)->m_bIsStorage )
@@ -1120,17 +1120,17 @@ void OStorage_Impl::Commit()
 
             SotElement_Impl* pToDelete = *pElementIter;
 
-            pElementIter++; // to let the iterator be valid it should be increased before removing
+            ++pElementIter; // to let the iterator be valid it should be increased before removing
 
             m_aChildrenList.remove( pToDelete );
             delete pToDelete;
         }
         else
-            pElementIter++;
+            ++pElementIter;
     }
 
     // there should be no more deleted elements
-    for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); pElementIter++ )
+    for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); ++pElementIter )
     {
         // if it is a 'duplicate commit' inserted elements must be really inserted to package later
         // since thay can conflict with renamed elements
@@ -1204,7 +1204,7 @@ void OStorage_Impl::Commit()
         }
     }
 
-    for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); pElementIter++ )
+    for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); ++pElementIter )
     {
         // now inserted elements can be inserted to the package
         if ( (*pElementIter)->m_bIsInserted )
@@ -1317,7 +1317,7 @@ void OStorage_Impl::Revert()
         {
             SotElement_Impl* pToDelete = *pElementIter;
 
-            pElementIter++; // to let the iterator be valid it should be increased before removing
+            ++pElementIter; // to let the iterator be valid it should be increased before removing
 
             m_aChildrenList.remove( pToDelete );
             delete pToDelete;
@@ -1329,14 +1329,14 @@ void OStorage_Impl::Revert()
             (*pElementIter)->m_aName = (*pElementIter)->m_aOriginalName;
             (*pElementIter)->m_bIsRemoved = sal_False;
 
-            pElementIter++;
+            ++pElementIter;
         }
     }
 
     // return replaced removed elements
     for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin();
           pDeletedIter != m_aDeletedList.end();
-          pDeletedIter++ )
+          ++pDeletedIter )
     {
         m_aChildrenList.push_back( (*pDeletedIter) );
 
@@ -1396,7 +1396,7 @@ SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName )
     ReadContents();
 
     for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
-          pElementIter != m_aChildrenList.end(); pElementIter++ )
+          pElementIter != m_aChildrenList.end(); ++pElementIter )
     {
         if ( (*pElementIter)->m_aName == rName && !(*pElementIter)->m_bIsRemoved )
             return *pElementIter;
@@ -1532,7 +1532,7 @@ SotElement_Impl* OStorage_Impl::InsertElement( ::rtl::OUString aName, sal_Bool b
     SotElement_Impl* pDeletedElm = NULL;
 
     for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
-          pElementIter != m_aChildrenList.end(); pElementIter++ )
+          pElementIter != m_aChildrenList.end(); ++pElementIter )
     {
         if ( (*pElementIter)->m_aName == aName )
         {
@@ -1627,7 +1627,7 @@ uno::Sequence< ::rtl::OUString > OStorage_Impl::GetElementNames()
 
     sal_uInt32 nInd = 0;
     for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
-          pElementIter != m_aChildrenList.end(); pElementIter++ )
+          pElementIter != m_aChildrenList.end(); ++pElementIter )
     {
         if ( !(*pElementIter)->m_bIsRemoved )
             aElementNames[nInd++] = (*pElementIter)->m_aName;
@@ -2029,7 +2029,7 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
             if ( !m_pData->m_aOpenSubComponentsList.empty() )
             {
                 for ( WeakComponentList::iterator pCompIter = m_pData->m_aOpenSubComponentsList.begin();
-                      pCompIter != m_pData->m_aOpenSubComponentsList.end(); pCompIter++ )
+                      pCompIter != m_pData->m_aOpenSubComponentsList.end(); ++pCompIter )
                 {
                     uno::Reference< lang::XComponent > xTmp = (*pCompIter);
                     if ( xTmp.is() )
@@ -2090,11 +2090,11 @@ void OStorage::ChildIsDisposed( const uno::Reference< uno::XInterface >& xChild
             if ( !xTmp.is() || xTmp == xChild )
             {
                 WeakComponentList::iterator pIterToRemove = pCompIter;
-                pCompIter++;
+                ++pCompIter;
                 m_pData->m_aOpenSubComponentsList.erase( pIterToRemove );
             }
             else
-                pCompIter++;
+                ++pCompIter;
         }
     }
 }
@@ -2662,7 +2662,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
                            pElementIter != pElement->m_pStorage->m_aChildrenList.end(); )
                        {
                         SotElement_Impl* pElementToDel = (*pElementIter);
-                        pElementIter++;
+                        ++pElementIter;
 
                         m_pImpl->RemoveElement( pElementToDel );
                        }
@@ -4180,7 +4180,7 @@ void SAL_CALL OStorage::revert()
     }
 
     for ( SotElementList_Impl::iterator pElementIter = m_pImpl->m_aChildrenList.begin();
-          pElementIter != m_pImpl->m_aChildrenList.end(); pElementIter++ )
+          pElementIter != m_pImpl->m_aChildrenList.end(); ++pElementIter )
     {
         if ( ((*pElementIter)->m_pStorage
                 && ( (*pElementIter)->m_pStorage->m_pAntiImpl || !(*pElementIter)->m_pStorage->m_aReadOnlyWrapList.empty() ))
diff --git a/package/util/exports.dxp b/package/util/exports.dxp
index f0e1c69934bc..70033078921a 100644
--- a/package/util/exports.dxp
+++ b/package/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/package/util/makefile.mk b/package/util/makefile.mk
index 0a3f0d77a076..cf94fe80ed61 100644
--- a/package/util/makefile.mk
+++ b/package/util/makefile.mk
@@ -54,7 +54,11 @@ LIB1FILES=	\
 # --- Shared-Library -----------------------------------------------
 
 SHL1TARGET=$(TARGET)$(MAJOR_VERSION)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=$(TARGET)$(MAJOR_VERSION)
+.ENDIF
 SHL1USE_EXPORTS=name
 
 SHL1STDLIBS=\